Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
標準で読み込むスタイルシート（jQueryUIのテーマ、標準スタイルシート）をRenderクラス側で読み込むようにした
XHTML Strict動作時にエラーが起きる問題を修正。（テーマのみ） ログ処理を少し書き直し。 モバイルスキンが動かないので修正。 DNSBLの処理はPEARを用いるようにするため、不要となったDnsBl.phpを削除 Netbeansプロジェクトファイルを追加 barchart、bluffを削除。
- Loading branch information
Showing
27 changed files
with
660 additions
and
1,256 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| /nbproject/private/ | ||
| /vendor/ | ||
| /wiki-data/cache/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| include.path=${php.global.include.path} | ||
| php.version=PHP_54 | ||
| source.encoding=UTF-8 | ||
| src.dir=. | ||
| tags.asp=false | ||
| tags.short=true | ||
| web.root=. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://www.netbeans.org/ns/project/1"> | ||
| <type>org.netbeans.modules.php.project</type> | ||
| <configuration> | ||
| <data xmlns="http://www.netbeans.org/ns/php-project/1"> | ||
| <name>pukiwiki</name> | ||
| </data> | ||
| </configuration> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,7 +20,6 @@ | |
| use PukiWiki\Utility; | ||
| use SplFileInfo; | ||
|
|
||
|
|
||
| /** | ||
| * ファイルの読み書きを行うクラス | ||
| */ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| <?php | ||
| /** | ||
| * みなしユーザログファイルクラス | ||
| * | ||
| * @package PukiWiki\File\Log | ||
| * @access public | ||
| * @author Logue <logue@hotmail.co.jp> | ||
| * @copyright 2013 PukiWiki Advance Developers Team | ||
| * @create 2013/05/14 | ||
| * @license GPL v2 or (at your option) any later version | ||
| * @version $Id: GuessLog.php,v 1.0.0 2013/05/14 16:34:00 Logue Exp $ | ||
| */ | ||
| namespace PukiWiki\File\Log; | ||
|
|
||
| use PukiWiki\File\LogFile; | ||
|
|
||
| /** | ||
| * みなしユーザログファイルクラス（Wikiに保存するためGuessLog()->get()は使わないこと。） | ||
| */ | ||
| class GuessLog extends LogFile{ | ||
| public function __construct($page = null) { | ||
| $this->kind = 'guess_user'; | ||
| $this->isWiki = true; | ||
| parent::__construct(null); | ||
| } | ||
| /** | ||
| * 推測ユーザデータの出力 | ||
| */ | ||
| public function set($data){ | ||
| // ユーザを推測する | ||
| $user = self::guess_user( $data['user'], $data['ntlm'], $data['sig'] ); | ||
| if (empty($user)) return; | ||
|
|
||
| if ($this->has()){ | ||
| // ログが存在する場合前のデーターを読み込んで重複を確認 | ||
| $sw = FALSE; | ||
|
|
||
| foreach($this->get() as $_src) { | ||
| $x = trim($_src); | ||
| $field = parent::table2array($x); // PukiWiki 表形式データを配列データに変換 | ||
| if (count($field) == 0) continue; | ||
| if ($field[0] != $data['ua'] ) continue; | ||
| if ($field[1] != $data['host']) continue; | ||
| if ($field[2] != $user ) continue; | ||
| $sw = TRUE; | ||
| break; | ||
| } | ||
| if ($sw) return; // 重複 | ||
| } | ||
| // 追記するデーター | ||
| $data = parent::array2table( array( $data['ua'], $data['host'], $user, '' ) ); | ||
| return parent::set($data); | ||
| } | ||
| /** | ||
| * ユーザを推測する | ||
| * @static | ||
| */ | ||
| private static function guess_user($user,$ntlm,$sig) { | ||
| if (!empty($user)) return $user; // 署名ユーザ | ||
| if (!empty($ntlm)) return $ntlm; // NTLM認証ユーザ | ||
| if (!empty($sig)) return $sig; // 本人の署名 | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| /* End of file GuessLog.php */ | ||
| /* Location: /vendor/PukiWiki/File/Log/GuessLog.php */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.