diff --git a/px-files/_sys/php/pickles.php b/px-files/_sys/php/pickles.php index 012f00c4..75010bea 100644 --- a/px-files/_sys/php/pickles.php +++ b/px-files/_sys/php/pickles.php @@ -82,7 +82,7 @@ class pickles{ * @return string バージョン番号を示す文字列 */ public function get_version(){ - return '2.0.12-alpha+nb'; + return '2.0.12'; } /** diff --git a/sample_pages/phpdoc/classes/picklesFramework2.bowl.html b/sample_pages/phpdoc/classes/picklesFramework2.bowl.html index 01c664e2..f2e74c1b 100644 --- a/sample_pages/phpdoc/classes/picklesFramework2.bowl.html +++ b/sample_pages/phpdoc/classes/picklesFramework2.bowl.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -762,7 +762,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/classes/picklesFramework2.commands.api.html b/sample_pages/phpdoc/classes/picklesFramework2.commands.api.html index 1368168a..22793dec 100644 --- a/sample_pages/phpdoc/classes/picklesFramework2.commands.api.html +++ b/sample_pages/phpdoc/classes/picklesFramework2.commands.api.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -1100,7 +1100,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/classes/picklesFramework2.commands.clearcache.html b/sample_pages/phpdoc/classes/picklesFramework2.commands.clearcache.html index bcef19fc..e5123170 100644 --- a/sample_pages/phpdoc/classes/picklesFramework2.commands.clearcache.html +++ b/sample_pages/phpdoc/classes/picklesFramework2.commands.clearcache.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -821,7 +821,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/classes/picklesFramework2.commands.config.html b/sample_pages/phpdoc/classes/picklesFramework2.commands.config.html index bc977a8b..ac05df0d 100644 --- a/sample_pages/phpdoc/classes/picklesFramework2.commands.config.html +++ b/sample_pages/phpdoc/classes/picklesFramework2.commands.config.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -739,7 +739,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/classes/picklesFramework2.commands.phpinfo.html b/sample_pages/phpdoc/classes/picklesFramework2.commands.phpinfo.html index c801a3f4..51d3b011 100644 --- a/sample_pages/phpdoc/classes/picklesFramework2.commands.phpinfo.html +++ b/sample_pages/phpdoc/classes/picklesFramework2.commands.phpinfo.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -623,7 +623,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/classes/picklesFramework2.commands.publish.html b/sample_pages/phpdoc/classes/picklesFramework2.commands.publish.html index 3872eeec..fe1ced83 100644 --- a/sample_pages/phpdoc/classes/picklesFramework2.commands.publish.html +++ b/sample_pages/phpdoc/classes/picklesFramework2.commands.publish.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -1577,7 +1577,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/classes/picklesFramework2.pickles.html b/sample_pages/phpdoc/classes/picklesFramework2.pickles.html index 21bcdc80..eb91cd04 100644 --- a/sample_pages/phpdoc/classes/picklesFramework2.pickles.html +++ b/sample_pages/phpdoc/classes/picklesFramework2.pickles.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -2573,7 +2573,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/classes/picklesFramework2.processors.autoindex.autoindex.html b/sample_pages/phpdoc/classes/picklesFramework2.processors.autoindex.autoindex.html index 17e8a1b0..b5e109c3 100644 --- a/sample_pages/phpdoc/classes/picklesFramework2.processors.autoindex.autoindex.html +++ b/sample_pages/phpdoc/classes/picklesFramework2.processors.autoindex.autoindex.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -662,7 +662,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/classes/picklesFramework2.processors.encodingconverter.encodingconverter.html b/sample_pages/phpdoc/classes/picklesFramework2.processors.encodingconverter.encodingconverter.html index 57e83995..5c703809 100644 --- a/sample_pages/phpdoc/classes/picklesFramework2.processors.encodingconverter.encodingconverter.html +++ b/sample_pages/phpdoc/classes/picklesFramework2.processors.encodingconverter.encodingconverter.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -704,7 +704,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/classes/picklesFramework2.processors.md.ext.html b/sample_pages/phpdoc/classes/picklesFramework2.processors.md.ext.html index 2104b4f9..d432ecc0 100644 --- a/sample_pages/phpdoc/classes/picklesFramework2.processors.md.ext.html +++ b/sample_pages/phpdoc/classes/picklesFramework2.processors.md.ext.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -530,7 +530,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/classes/picklesFramework2.processors.scss.ext.html b/sample_pages/phpdoc/classes/picklesFramework2.processors.scss.ext.html index a406a0bb..c7a7ad26 100644 --- a/sample_pages/phpdoc/classes/picklesFramework2.processors.scss.ext.html +++ b/sample_pages/phpdoc/classes/picklesFramework2.processors.scss.ext.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -530,7 +530,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/classes/picklesFramework2.processors.ssi.ssi.html b/sample_pages/phpdoc/classes/picklesFramework2.processors.ssi.ssi.html index 7960f6e3..88175edd 100644 --- a/sample_pages/phpdoc/classes/picklesFramework2.processors.ssi.ssi.html +++ b/sample_pages/phpdoc/classes/picklesFramework2.processors.ssi.ssi.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -640,7 +640,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/classes/picklesFramework2.pxcmd.html b/sample_pages/phpdoc/classes/picklesFramework2.pxcmd.html index e520b574..04d0e877 100644 --- a/sample_pages/phpdoc/classes/picklesFramework2.pxcmd.html +++ b/sample_pages/phpdoc/classes/picklesFramework2.pxcmd.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -791,7 +791,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/classes/picklesFramework2.site.html b/sample_pages/phpdoc/classes/picklesFramework2.site.html index ef01ff5f..7d290a47 100644 --- a/sample_pages/phpdoc/classes/picklesFramework2.site.html +++ b/sample_pages/phpdoc/classes/picklesFramework2.site.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -2054,7 +2054,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/classes/picklesFramework2.theme.theme.html b/sample_pages/phpdoc/classes/picklesFramework2.theme.theme.html index 1987ae8a..b6761754 100644 --- a/sample_pages/phpdoc/classes/picklesFramework2.theme.theme.html +++ b/sample_pages/phpdoc/classes/picklesFramework2.theme.theme.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -845,7 +845,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/classes/picklesFramework2.theme.theme_top.html b/sample_pages/phpdoc/classes/picklesFramework2.theme.theme_top.html index 44b02906..dd0bf911 100644 --- a/sample_pages/phpdoc/classes/picklesFramework2.theme.theme_top.html +++ b/sample_pages/phpdoc/classes/picklesFramework2.theme.theme_top.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -809,7 +809,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/classes/tomk79.filesystem.html b/sample_pages/phpdoc/classes/tomk79.filesystem.html index bfc4c0c5..890ceca7 100644 --- a/sample_pages/phpdoc/classes/tomk79.filesystem.html +++ b/sample_pages/phpdoc/classes/tomk79.filesystem.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -2252,7 +2252,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/classes/tomk79.request.html b/sample_pages/phpdoc/classes/tomk79.request.html index ab343184..9d8b102f 100644 --- a/sample_pages/phpdoc/classes/tomk79.request.html +++ b/sample_pages/phpdoc/classes/tomk79.request.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -1804,7 +1804,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/files/px-files%2F_sys%2Fphp%2Fcommands%2Fconfig.php.txt b/sample_pages/phpdoc/files/px-files%2F_sys%2Fphp%2Fcommands%2Fconfig.php.txt index eeda2263..b79d572e 100644 --- a/sample_pages/phpdoc/files/px-files%2F_sys%2Fphp%2Fcommands%2Fconfig.php.txt +++ b/sample_pages/phpdoc/files/px-files%2F_sys%2Fphp%2Fcommands%2Fconfig.php.txt @@ -63,9 +63,13 @@ print $this->mk_config_unit('path_controot', 'コンテンツルートのパス' print $this->mk_config_unit('path_top', 'トップページのパス', 'string'); print $this->mk_config_unit('path_publish_dir', 'パブリッシュ先ディレクトリのパス', 'string'); print $this->mk_config_unit('public_cache_dir', '公開キャッシュディレクトリのパス', 'string'); +print $this->mk_config_unit('path_files', 'リソースディレクトリのパス', 'string'); print $this->mk_config_unit('contents_manifesto', 'コンテンツマニフェストのパス', 'string'); print $this->mk_config_unit('directory_index', 'ディレクトリインデックス', 'array'); print $this->mk_config_unit('commands', 'コマンド', 'hash'); +print $this->mk_config_unit('path_phpini', 'php.ini のパス', 'string'); +print $this->mk_config_unit('allow_pxcommands', 'PXコマンドを許可', 'bool'); +print $this->mk_config_unit('default_timezone', 'タイムゾーン設定', 'string'); ?>

filesystem

@@ -85,7 +89,6 @@ print $this->mk_config_unit('output_eol_coding', '出力時の改行コード', mk_config_unit('session_name', 'セッション名', 'string'); print $this->mk_config_unit('session_expire', 'セッション有効期限', 'int'); -print $this->mk_config_unit('allow_pxcommands', 'PXコマンドを許可', 'bool'); ?> @@ -144,7 +147,7 @@ print $this->mk_config_unit('funcs', 'プロセス機能', 'hash'); /** * コンフィグ項目1件を出力する。 - * + * * @param string $key コンフィグのキー * @param string $label コンフィグラベル * @param string $type 値に期待される型 @@ -252,9 +255,9 @@ print $this->mk_config_unit('funcs', 'プロセス機能', 'hash'); /** * HTML特殊文字をエスケープする。 - * + * * このメソッドは改行コードを改行タグ `
` に変換します。 - * + * * @param string $txt 文字列 * @return string HTML特殊文字がエスケープされた文字列 */ diff --git a/sample_pages/phpdoc/files/px-files%2F_sys%2Fphp%2Fcommands%2Fpublish.php.txt b/sample_pages/phpdoc/files/px-files%2F_sys%2Fphp%2Fcommands%2Fpublish.php.txt index 73621062..54810006 100644 --- a/sample_pages/phpdoc/files/px-files%2F_sys%2Fphp%2Fcommands%2Fpublish.php.txt +++ b/sample_pages/phpdoc/files/px-files%2F_sys%2Fphp%2Fcommands%2Fpublish.php.txt @@ -349,6 +349,14 @@ function cont_EditPublishTargetPathApply(formElm){ ) ); } + if( strlen(@$this->px->req()->get_cli_option( '-d' )) ){ + $php_command = array_merge( + $php_command, + array( + '-d', @$this->px->req()->get_cli_option( '-d' ),// ← php.ini definition + ) + ); + } $php_command = array_merge( $php_command, array( @@ -470,7 +478,7 @@ function cont_EditPublishTargetPathApply(formElm){ /** * ディレクトリを同期する。 - * + * * @param string $path_sync_from 同期元のルートディレクトリ * @param string $path_sync_to 同期先のルートディレクトリ * @param string $path_region ルート以下のパス @@ -484,9 +492,9 @@ function cont_EditPublishTargetPathApply(formElm){ /** * ディレクトリを複製する(下層ディレクトリも全てコピー) - * + * * ただし、ignore指定されているパスに対しては操作を行わない。 - * + * * @param string $from コピー元ファイルのパス * @param string $to コピー先のパス * @param string $path_region ルート以下のパス @@ -557,7 +565,7 @@ function cont_EditPublishTargetPathApply(formElm){ * ディレクトリの内部を比較し、$comparisonに含まれない要素を$targetから削除する。 * * ただし、ignore指定されているパスに対しては操作を行わない。 - * + * * @param string $target クリーニング対象のディレクトリパス * @param string $comparison 比較するディレクトリのパス * @param string $path_region ルート以下のパス @@ -785,7 +793,7 @@ function cont_EditPublishTargetPathApply(formElm){ /** * パブリッシュをロックする。 - * + * * @return bool ロック成功時に `true`、失敗時に `false` を返します。 */ private function lock(){ @@ -820,7 +828,7 @@ function cont_EditPublishTargetPathApply(formElm){ /** * パブリッシュがロックされているか確認する。 - * + * * @return bool ロック中の場合に `true`、それ以外の場合に `false` を返します。 */ private function is_locked(){ @@ -842,7 +850,7 @@ function cont_EditPublishTargetPathApply(formElm){ /** * パブリッシュロックを解除する。 - * + * * @return bool ロック解除成功時に `true`、失敗時に `false` を返します。 */ private function unlock(){ @@ -856,7 +864,7 @@ function cont_EditPublishTargetPathApply(formElm){ /** * パブリッシュロックファイルの更新日を更新する。 - * + * * @return bool 成功時に `true`、失敗時に `false` を返します。 */ private function touch_lockfile(){ diff --git a/sample_pages/phpdoc/files/px-files%2F_sys%2Fphp%2Fpickles.php.txt b/sample_pages/phpdoc/files/px-files%2F_sys%2Fphp%2Fpickles.php.txt index ee01c507..2fecb6c8 100644 --- a/sample_pages/phpdoc/files/px-files%2F_sys%2Fphp%2Fpickles.php.txt +++ b/sample_pages/phpdoc/files/px-files%2F_sys%2Fphp%2Fpickles.php.txt @@ -134,6 +134,13 @@ class pickles{ } $this->conf = json_decode( json_encode( $this->conf ) ); + if ( @strlen($this->conf->default_timezone) ) { + @date_default_timezone_set($this->conf->default_timezone); + } + if ( !@strlen($this->conf->path_files) ) { + $this->conf->path_files = '{$dirname}/{$filename}_files/'; + } + // make instance $bowl require_once(__DIR__.'/bowl.php'); $this->bowl = new bowl(); @@ -970,8 +977,19 @@ class pickles{ } unset($tmp_page_info); - $rtn = $path_content; - $rtn = $this->fs()->get_realpath( $this->fs()->trim_extension($rtn).'_files/'.$localpath_resource ); + $rtn = $this->conf->path_files; + $data = array( + 'dirname'=>dirname($path_content), + 'filename'=>basename($this->fs()->trim_extension($path_content)), + 'ext'=>strtolower($this->fs()->get_extension($path_content)), + ); + $rtn = str_replace( '{$dirname}', $data['dirname'], $rtn ); + $rtn = str_replace( '{$filename}', $data['filename'], $rtn ); + $rtn = str_replace( '{$ext}', $data['ext'], $rtn ); + $rtn = preg_replace( '/^\/*/', '/', $rtn ); + $rtn = preg_replace( '/\/*$/', '', $rtn ).'/'; + + $rtn = $rtn.$localpath_resource; if( $this->fs()->is_dir('./'.$rtn) ){ $rtn .= '/'; } diff --git a/sample_pages/phpdoc/files/px-files._sys.php.bowl.html b/sample_pages/phpdoc/files/px-files._sys.php.bowl.html index 9c400d3e..dd0384d2 100644 --- a/sample_pages/phpdoc/files/px-files._sys.php.bowl.html +++ b/sample_pages/phpdoc/files/px-files._sys.php.bowl.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -447,7 +447,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/files/px-files._sys.php.commands.api.html b/sample_pages/phpdoc/files/px-files._sys.php.commands.api.html index 5d721ebe..fdee1a6d 100644 --- a/sample_pages/phpdoc/files/px-files._sys.php.commands.api.html +++ b/sample_pages/phpdoc/files/px-files._sys.php.commands.api.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -440,7 +440,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/files/px-files._sys.php.commands.clearcache.html b/sample_pages/phpdoc/files/px-files._sys.php.commands.clearcache.html index 3b59aa88..af6ceacc 100644 --- a/sample_pages/phpdoc/files/px-files._sys.php.commands.clearcache.html +++ b/sample_pages/phpdoc/files/px-files._sys.php.commands.clearcache.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -440,7 +440,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/files/px-files._sys.php.commands.config.html b/sample_pages/phpdoc/files/px-files._sys.php.commands.config.html index 6f805129..5a604a07 100644 --- a/sample_pages/phpdoc/files/px-files._sys.php.commands.config.html +++ b/sample_pages/phpdoc/files/px-files._sys.php.commands.config.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -440,7 +440,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/files/px-files._sys.php.commands.phpinfo.html b/sample_pages/phpdoc/files/px-files._sys.php.commands.phpinfo.html index a307c2a5..6bdf72c5 100644 --- a/sample_pages/phpdoc/files/px-files._sys.php.commands.phpinfo.html +++ b/sample_pages/phpdoc/files/px-files._sys.php.commands.phpinfo.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -440,7 +440,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/files/px-files._sys.php.commands.publish.html b/sample_pages/phpdoc/files/px-files._sys.php.commands.publish.html index 49b2d89c..3c6d69ef 100644 --- a/sample_pages/phpdoc/files/px-files._sys.php.commands.publish.html +++ b/sample_pages/phpdoc/files/px-files._sys.php.commands.publish.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -440,7 +440,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/files/px-files._sys.php.pickles.html b/sample_pages/phpdoc/files/px-files._sys.php.pickles.html index 469a84aa..8057d87b 100644 --- a/sample_pages/phpdoc/files/px-files._sys.php.pickles.html +++ b/sample_pages/phpdoc/files/px-files._sys.php.pickles.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -440,7 +440,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/files/px-files._sys.php.processors.autoindex.html b/sample_pages/phpdoc/files/px-files._sys.php.processors.autoindex.html index ccc1b987..3ba8784c 100644 --- a/sample_pages/phpdoc/files/px-files._sys.php.processors.autoindex.html +++ b/sample_pages/phpdoc/files/px-files._sys.php.processors.autoindex.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -440,7 +440,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/files/px-files._sys.php.processors.encodingconverter.html b/sample_pages/phpdoc/files/px-files._sys.php.processors.encodingconverter.html index 91df10aa..eb5987b1 100644 --- a/sample_pages/phpdoc/files/px-files._sys.php.processors.encodingconverter.html +++ b/sample_pages/phpdoc/files/px-files._sys.php.processors.encodingconverter.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -440,7 +440,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/files/px-files._sys.php.processors.md.html b/sample_pages/phpdoc/files/px-files._sys.php.processors.md.html index d5484565..ed112c60 100644 --- a/sample_pages/phpdoc/files/px-files._sys.php.processors.md.html +++ b/sample_pages/phpdoc/files/px-files._sys.php.processors.md.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -440,7 +440,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/files/px-files._sys.php.processors.scss.html b/sample_pages/phpdoc/files/px-files._sys.php.processors.scss.html index 9f1e8b24..64795201 100644 --- a/sample_pages/phpdoc/files/px-files._sys.php.processors.scss.html +++ b/sample_pages/phpdoc/files/px-files._sys.php.processors.scss.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -440,7 +440,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/files/px-files._sys.php.processors.ssi.html b/sample_pages/phpdoc/files/px-files._sys.php.processors.ssi.html index bef85cb7..9c529795 100644 --- a/sample_pages/phpdoc/files/px-files._sys.php.processors.ssi.html +++ b/sample_pages/phpdoc/files/px-files._sys.php.processors.ssi.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -440,7 +440,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/files/px-files._sys.php.pxcmd.html b/sample_pages/phpdoc/files/px-files._sys.php.pxcmd.html index 8e9fc7e7..52eb0c66 100644 --- a/sample_pages/phpdoc/files/px-files._sys.php.pxcmd.html +++ b/sample_pages/phpdoc/files/px-files._sys.php.pxcmd.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -447,7 +447,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/files/px-files._sys.php.site.html b/sample_pages/phpdoc/files/px-files._sys.php.site.html index 350968ca..3880ff04 100644 --- a/sample_pages/phpdoc/files/px-files._sys.php.site.html +++ b/sample_pages/phpdoc/files/px-files._sys.php.site.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -447,7 +447,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/files/px-files.themes.pickles2.php.theme.html b/sample_pages/phpdoc/files/px-files.themes.pickles2.php.theme.html index d101d2b7..cc3d6273 100644 --- a/sample_pages/phpdoc/files/px-files.themes.pickles2.php.theme.html +++ b/sample_pages/phpdoc/files/px-files.themes.pickles2.php.theme.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -440,7 +440,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/files/px-files.themes.pickles2.php.top.html b/sample_pages/phpdoc/files/px-files.themes.pickles2.php.top.html index b5562e6c..dd10d8ea 100644 --- a/sample_pages/phpdoc/files/px-files.themes.pickles2.php.top.html +++ b/sample_pages/phpdoc/files/px-files.themes.pickles2.php.top.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -440,7 +440,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/files/vendor%2Ftomk79%2Ffilesystem%2Fphp%2Ffilesystem.php.txt b/sample_pages/phpdoc/files/vendor%2Ftomk79%2Ffilesystem%2Fphp%2Ffilesystem.php.txt index a937adf0..a3fbbcaf 100644 --- a/sample_pages/phpdoc/files/vendor%2Ftomk79%2Ffilesystem%2Fphp%2Ffilesystem.php.txt +++ b/sample_pages/phpdoc/files/vendor%2Ftomk79%2Ffilesystem%2Fphp%2Ffilesystem.php.txt @@ -1,7 +1,7 @@ */ @@ -9,7 +9,7 @@ namespace tomk79; /** * tomk79/filesystem core class - * + * * @author Tomoya Koyanagi */ class filesystem{ @@ -25,7 +25,7 @@ class filesystem{ /** * コンストラクタ - * + * * @param object $conf 設定オブジェクト */ public function __construct($conf=null){ @@ -42,7 +42,7 @@ class filesystem{ /** * 書き込み/上書きしてよいアイテムか検証する。 - * + * * @param string $path 検証対象のパス * @return bool 書き込み可能な場合 `true`、不可能な場合に `false` を返します。 */ @@ -56,7 +56,7 @@ class filesystem{ /** * 読み込んでよいアイテムか検証する。 - * + * * @param string $path 検証対象のパス * @return bool 読み込み可能な場合 `true`、不可能な場合に `false` を返します。 */ @@ -67,7 +67,7 @@ class filesystem{ /** * ファイルが存在するかどうか調べる。 - * + * * @param string $path 検証対象のパス * @return bool ファイルが存在する場合 `true`、存在しない場合、またはディレクトリが存在する場合に `false` を返します。 */ @@ -78,7 +78,7 @@ class filesystem{ /** * ディレクトリが存在するかどうか調べる。 - * + * * @param string $path 検証対象のパス * @return bool ディレクトリが存在する場合 `true`、存在しない場合、またはファイルが存在する場合に `false` を返します。 */ @@ -89,7 +89,7 @@ class filesystem{ /** * ファイルまたはディレクトリが存在するかどうか調べる。 - * + * * @param string $path 検証対象のパス * @return bool ファイルまたはディレクトリが存在する場合 `true`、存在しない場合に `false` を返します。 */ @@ -100,7 +100,7 @@ class filesystem{ /** * ディレクトリを作成する。 - * + * * @param string $dirpath 作成するディレクトリのパス * @param int $perm 作成するディレクトリに与えるパーミッション * @return bool 成功時に `true`、失敗時に `false` を返します。 @@ -121,7 +121,7 @@ class filesystem{ /** * ディレクトリを作成する(上層ディレクトリも全て作成) - * + * * @param string $dirpath 作成するディレクトリのパス * @param int $perm 作成するディレクトリに与えるパーミッション * @return bool 成功時に `true`、失敗時に `false` を返します。 @@ -156,11 +156,11 @@ class filesystem{ /** * ファイルやディレクトリを中身ごと完全に削除する。 - * + * * このメソッドは、ファイルやシンボリックリンクも削除します。 * ディレクトリを削除する場合は、中身ごと完全に削除します。 * シンボリックリンクは、その先を追わず、シンボリックリンク本体のみを削除します。 - * + * * @param string $path 対象のパス * @return bool 成功時に `true`、失敗時に `false` を返します。 */ @@ -194,10 +194,10 @@ class filesystem{ /** * ディレクトリを削除する。 - * + * * このメソッドはディレクトリを削除します。 * 中身のない、空のディレクトリ以外は削除できません。 - * + * * @param string $path 対象ディレクトリのパス * @return bool 成功時に `true`、失敗時に `false` を返します。 */ @@ -228,10 +228,10 @@ class filesystem{ /** * ディレクトリを再帰的に削除する。 - * + * * このメソッドはディレクトリを再帰的に削除します。 * 中身のない、空のディレクトリ以外は削除できません。 - * + * * @param string $path 対象ディレクトリのパス * @return bool 成功時に `true`、失敗時に `false` を返します。 */ @@ -269,10 +269,10 @@ class filesystem{ /** * ファイルを上書き保存する。 - * + * * このメソッドは、`$filepath` にデータを保存します。 * もともと保存されていた内容は破棄され、新しいデータで上書きします。 - * + * * @param string $filepath 保存先ファイルのパス * @param string $content 保存する内容 * @param int $perm 保存するファイルに与えるパーミッション @@ -322,7 +322,7 @@ class filesystem{ /** * ファイルの中身を文字列として取得する。 - * + * * @param string $path ファイルのパス * @return string ファイル `$path` の内容 */ @@ -333,14 +333,14 @@ class filesystem{ /** * ファイルの更新日時を比較する。 - * + * * @param string $path_a 比較対象A * @param string $path_b 比較対象B - * @return bool|null + * @return bool|null * `$path_a` の方が新しかった場合に `true`、 * `$path_b` の方が新しかった場合に `false`、 * 同時だった場合に `null` を返します。 - * + * * いずれか一方、または両方のファイルが存在しない場合、次のように振る舞います。 * - 両方のファイルが存在しない場合 = `null` * - $path_a が存在せず、$path_b は存在する場合 = `false` @@ -407,11 +407,11 @@ class filesystem{ /** * 絶対パスを得る。 - * + * * パス情報を受け取り、スラッシュから始まるサーバー内部絶対パスに変換して返します。 - * + * * このメソッドは、PHPの `realpath()` と異なり、存在しないパスも絶対パスに変換します。 - * + * * @param string $path 対象のパス * @param string $cd カレントディレクトリパス。 * 実在する有効なディレクトリのパス、または絶対パスの表現で指定される必要があります。 @@ -484,9 +484,9 @@ class filesystem{ /** * 相対パスを得る。 - * + * * パス情報を受け取り、ドットスラッシュから始まる相対絶対パスに変換して返します。 - * + * * @param string $path 対象のパス * @param string $cd カレントディレクトリパス。 * 実在する有効なディレクトリのパス、または絶対パスの表現で指定される必要があります。 @@ -557,66 +557,76 @@ class filesystem{ /** * パス情報を得る。 - * + * * @param string $path 対象のパス * @return array パス情報 */ public function pathinfo( $path ){ - $path = $this->localize_path($path); + if(strpos($path,'#')!==false){ list($path, $hash) = @explode( '#', $path, 2 ); } + if(strpos($path,'?')!==false){ list($path, $query) = @explode( '?', $path, 2 ); } $pathinfo = pathinfo( $path ); $pathinfo['filename'] = $this->trim_extension( $pathinfo['basename'] ); + $pathinfo['extension'] = $this->get_extension( $pathinfo['basename'] ); + $pathinfo['query'] = (@strlen($query) ? '?'.$query : null); + $pathinfo['hash'] = (@strlen($hash) ? '#'.$hash : null); return $pathinfo; } /** * パス情報から、ファイル名を取得する。 - * + * * @param string $path 対象のパス * @return string 抜き出されたファイル名 */ public function get_basename( $path ){ - return pathinfo( $path , PATHINFO_BASENAME ); + $path = pathinfo( $path , PATHINFO_BASENAME ); + if( !strlen($path) ){$path = null;} + return $path; } /** * パス情報から、拡張子を除いたファイル名を取得する。 - * + * * @param string $path 対象のパス * @return string 拡張子が除かれたパス */ public function trim_extension( $path ){ $pathinfo = pathinfo( $path ); - $RTN = preg_replace( '/\.'.preg_quote( $pathinfo['extension'], '/' ).'$/' , '' , $path ); + $RTN = preg_replace( '/\.'.preg_quote( @$pathinfo['extension'], '/' ).'$/' , '' , $path ); return $RTN; } /** * ファイル名を含むパス情報から、ファイルが格納されているディレクトリ名を取得する。 - * + * * @param string $path 対象のパス * @return string 親ディレクトリのパス */ public function get_dirpath( $path ){ - return pathinfo( $path , PATHINFO_DIRNAME ); + $path = pathinfo( $path , PATHINFO_DIRNAME ); + if( !strlen($path) ){$path = null;} + return $path; } /** * パス情報から、拡張子を取得する。 - * + * * @param string $path 対象のパス * @return string 拡張子 */ public function get_extension( $path ){ $path = preg_replace('/\#.*$/si', '', $path); $path = preg_replace('/\?.*$/si', '', $path); - return pathinfo( $path , PATHINFO_EXTENSION ); + $path = pathinfo( $path , PATHINFO_EXTENSION ); + if(!strlen($path)){$path = null;} + return $path; } /** * CSVファイルを読み込む。 - * + * * @param string $path 対象のCSVファイルのパス * @param array $options オプション * - delimiter = 区切り文字(省略時、カンマ) @@ -659,9 +669,9 @@ class filesystem{ /** * 配列をCSV形式に変換する。 - * + * * 改行コードはLFで出力されます。 - * + * * @param array $array 2次元配列 * @param array $options オプション * - charset = 文字セット(省略時、UTF-8) @@ -697,7 +707,7 @@ class filesystem{ /** * ファイルを複製する。 - * + * * @param string $from コピー元ファイルのパス * @param string $to コピー先のパス * @param int $perm 保存するファイルに与えるパーミッション @@ -729,7 +739,7 @@ class filesystem{ /** * ディレクトリを複製する(下層ディレクトリも全てコピー) - * + * * @param string $from コピー元ファイルのパス * @param string $to コピー先のパス * @param int $perm 保存するファイルに与えるパーミッション @@ -784,7 +794,7 @@ class filesystem{ /** * パーミッションを変更する。 - * + * * @param string $filepath 対象のパス * @param int $perm 保存するファイルに与えるパーミッション * @return bool 成功時に `true`、失敗時に `false` を返します。 @@ -807,7 +817,7 @@ class filesystem{ /** * パーミッション情報を調べ、3桁の数字で返す。 - * + * * @param string $path 対象のパス * @return int|bool 成功時に 3桁の数字、失敗時に `false` を返します。 */ @@ -825,7 +835,7 @@ class filesystem{ /** * ディレクトリにあるファイル名のリストを配列で返す。 - * + * * @param string $path 対象ディレクトリのパス * @return array|bool 成功時にファイルまたはディレクトリ名の一覧を格納した配列、失敗時に `false` を返します。 */ @@ -886,7 +896,7 @@ class filesystem{ /** * ディレクトリを同期する。 - * + * * @param string $path_sync_from 同期元ディレクトリ * @param string $path_sync_to 同期先ディレクトリ * @return bool 常に `true` を返します。 @@ -899,7 +909,7 @@ class filesystem{ /** * 指定されたディレクトリ以下の、全ての空っぽのディレクトリを削除する。 - * + * * @param string $path ディレクトリパス * @param array $options オプション * @return bool 成功時 `true`、失敗時 `false` を返します。 @@ -1050,7 +1060,7 @@ class filesystem{ /** * サーバがUNIXパスか調べる。 - * + * * @return bool UNIXパスなら `true`、それ以外なら `false` を返します。 */ public function is_unix(){ @@ -1062,7 +1072,7 @@ class filesystem{ /** * サーバがWindowsパスか調べる。 - * + * * @return bool Windowsパスなら `true`、それ以外なら `false` を返します。 */ public function is_windows(){ @@ -1075,9 +1085,9 @@ class filesystem{ /** * パスを正規化する。 - * + * * 受け取ったパスを、スラッシュ区切りの表現に正規化します。 - * + * * @param string $path 正規化するパス * @return string 正規化されたパス */ @@ -1093,10 +1103,10 @@ class filesystem{ /** * パスをOSの標準的な表現に変換する。 - * + * * 受け取ったパスを、OSの標準的な表現に変換します。 * - スラッシュとバックスラッシュの違いを吸収し、`DIRECTORY_SEPARATOR` に置き換えます。 - * + * * @param string $path ローカライズするパス * @return string ローカライズされたパス */ @@ -1116,7 +1126,7 @@ class filesystem{ /** * 受け取ったテキストを、ファイルシステムエンコードに変換する。 - * + * * @param mixed $text テキスト * @return string 文字セット変換後のテキスト */ @@ -1138,7 +1148,7 @@ class filesystem{ /** * 受け取ったテキストを、ファイルシステムエンコードに変換する。 - * + * * @param mixed $text テキスト * @param string $to_encoding 文字セット(省略時、内部文字セット) * @param string $from_encoding 変換前の文字セット @@ -1180,7 +1190,7 @@ class filesystem{ /** * 受け取ったテキストを、指定の改行コードに変換する。 - * + * * @param mixed $text テキスト * @param string $crlf 改行コード名。CR|LF(default)|CRLF * @return string 改行コード変換後のテキスト @@ -1221,3 +1231,4 @@ class filesystem{ } } + diff --git a/sample_pages/phpdoc/files/vendor.tomk79.filesystem.php.filesystem.html b/sample_pages/phpdoc/files/vendor.tomk79.filesystem.php.filesystem.html index dbb12687..375fd735 100644 --- a/sample_pages/phpdoc/files/vendor.tomk79.filesystem.php.filesystem.html +++ b/sample_pages/phpdoc/files/vendor.tomk79.filesystem.php.filesystem.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -447,7 +447,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/files/vendor.tomk79.request.php.request.html b/sample_pages/phpdoc/files/vendor.tomk79.request.php.request.html index 23c54b1f..8446c0a6 100644 --- a/sample_pages/phpdoc/files/vendor.tomk79.request.php.request.html +++ b/sample_pages/phpdoc/files/vendor.tomk79.request.php.request.html @@ -145,28 +145,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -185,19 +185,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -212,10 +212,10 @@
- + encodingconverter
-
+
@@ -230,10 +230,10 @@
- + md
-
+
@@ -248,10 +248,10 @@
- + scss
-
+
@@ -266,10 +266,10 @@
- + ssi
-
+
@@ -292,10 +292,10 @@
- + theme
-
+
@@ -323,10 +323,10 @@
- + tomk79
-
+
@@ -447,7 +447,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/graphs/class.html b/sample_pages/phpdoc/graphs/class.html index a2237ca0..9e228298 100644 --- a/sample_pages/phpdoc/graphs/class.html +++ b/sample_pages/phpdoc/graphs/class.html @@ -163,7 +163,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/index.html b/sample_pages/phpdoc/index.html index aa075256..0e08c039 100644 --- a/sample_pages/phpdoc/index.html +++ b/sample_pages/phpdoc/index.html @@ -97,28 +97,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -137,19 +137,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -164,10 +164,10 @@
- + encodingconverter
-
+
@@ -182,10 +182,10 @@
- + md
-
+
@@ -200,10 +200,10 @@
- + scss
-
+
@@ -218,10 +218,10 @@
- + ssi
-
+
@@ -244,10 +244,10 @@
- + theme
-
+
@@ -275,10 +275,10 @@
- + tomk79
-
+
@@ -377,7 +377,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/namespaces/default.html b/sample_pages/phpdoc/namespaces/default.html index d821a838..e3b61d7d 100644 --- a/sample_pages/phpdoc/namespaces/default.html +++ b/sample_pages/phpdoc/namespaces/default.html @@ -97,28 +97,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -137,19 +137,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -164,10 +164,10 @@
- + encodingconverter
-
+
@@ -182,10 +182,10 @@
- + md
-
+
@@ -200,10 +200,10 @@
- + scss
-
+
@@ -218,10 +218,10 @@
- + ssi
-
+
@@ -244,10 +244,10 @@
- + theme
-
+
@@ -275,10 +275,10 @@
- + tomk79
-
+
@@ -377,7 +377,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/namespaces/picklesFramework2.commands.html b/sample_pages/phpdoc/namespaces/picklesFramework2.commands.html index 88c922eb..1de51898 100644 --- a/sample_pages/phpdoc/namespaces/picklesFramework2.commands.html +++ b/sample_pages/phpdoc/namespaces/picklesFramework2.commands.html @@ -97,28 +97,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -137,19 +137,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -164,10 +164,10 @@
- + encodingconverter
-
+
@@ -182,10 +182,10 @@
- + md
-
+
@@ -200,10 +200,10 @@
- + scss
-
+
@@ -218,10 +218,10 @@
- + ssi
-
+
@@ -244,10 +244,10 @@
- + theme
-
+
@@ -275,10 +275,10 @@
- + tomk79
-
+
@@ -395,7 +395,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/namespaces/picklesFramework2.html b/sample_pages/phpdoc/namespaces/picklesFramework2.html index e8a38098..94407f81 100644 --- a/sample_pages/phpdoc/namespaces/picklesFramework2.html +++ b/sample_pages/phpdoc/namespaces/picklesFramework2.html @@ -97,28 +97,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -137,19 +137,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -164,10 +164,10 @@
- + encodingconverter
-
+
@@ -182,10 +182,10 @@
- + md
-
+
@@ -200,10 +200,10 @@
- + scss
-
+
@@ -218,10 +218,10 @@
- + ssi
-
+
@@ -244,10 +244,10 @@
- + theme
-
+
@@ -275,10 +275,10 @@
- + tomk79
-
+
@@ -401,7 +401,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/namespaces/picklesFramework2.processors.autoindex.html b/sample_pages/phpdoc/namespaces/picklesFramework2.processors.autoindex.html index 50e85c84..43389f4f 100644 --- a/sample_pages/phpdoc/namespaces/picklesFramework2.processors.autoindex.html +++ b/sample_pages/phpdoc/namespaces/picklesFramework2.processors.autoindex.html @@ -97,28 +97,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -137,19 +137,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -164,10 +164,10 @@
- + encodingconverter
-
+
@@ -182,10 +182,10 @@
- + md
-
+
@@ -200,10 +200,10 @@
- + scss
-
+
@@ -218,10 +218,10 @@
- + ssi
-
+
@@ -244,10 +244,10 @@
- + theme
-
+
@@ -275,10 +275,10 @@
- + tomk79
-
+
@@ -381,7 +381,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/namespaces/picklesFramework2.processors.encodingconverter.html b/sample_pages/phpdoc/namespaces/picklesFramework2.processors.encodingconverter.html index 1487010d..81c9f61f 100644 --- a/sample_pages/phpdoc/namespaces/picklesFramework2.processors.encodingconverter.html +++ b/sample_pages/phpdoc/namespaces/picklesFramework2.processors.encodingconverter.html @@ -97,28 +97,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -137,19 +137,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -164,10 +164,10 @@
- + encodingconverter
-
+
@@ -182,10 +182,10 @@
- + md
-
+
@@ -200,10 +200,10 @@
- + scss
-
+
@@ -218,10 +218,10 @@
- + ssi
-
+
@@ -244,10 +244,10 @@
- + theme
-
+
@@ -275,10 +275,10 @@
- + tomk79
-
+
@@ -381,7 +381,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/namespaces/picklesFramework2.processors.html b/sample_pages/phpdoc/namespaces/picklesFramework2.processors.html index b937b61f..cae9895d 100644 --- a/sample_pages/phpdoc/namespaces/picklesFramework2.processors.html +++ b/sample_pages/phpdoc/namespaces/picklesFramework2.processors.html @@ -97,28 +97,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -137,19 +137,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -164,10 +164,10 @@
- + encodingconverter
-
+
@@ -182,10 +182,10 @@
- + md
-
+
@@ -200,10 +200,10 @@
- + scss
-
+
@@ -218,10 +218,10 @@
- + ssi
-
+
@@ -244,10 +244,10 @@
- + theme
-
+
@@ -275,10 +275,10 @@
- + tomk79
-
+
@@ -390,7 +390,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/namespaces/picklesFramework2.processors.md.html b/sample_pages/phpdoc/namespaces/picklesFramework2.processors.md.html index 415b1f82..312acd5d 100644 --- a/sample_pages/phpdoc/namespaces/picklesFramework2.processors.md.html +++ b/sample_pages/phpdoc/namespaces/picklesFramework2.processors.md.html @@ -97,28 +97,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -137,19 +137,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -164,10 +164,10 @@
- + encodingconverter
-
+
@@ -182,10 +182,10 @@
- + md
-
+
@@ -200,10 +200,10 @@
- + scss
-
+
@@ -218,10 +218,10 @@
- + ssi
-
+
@@ -244,10 +244,10 @@
- + theme
-
+
@@ -275,10 +275,10 @@
- + tomk79
-
+
@@ -381,7 +381,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/namespaces/picklesFramework2.processors.scss.html b/sample_pages/phpdoc/namespaces/picklesFramework2.processors.scss.html index 3b978b4c..b33ffb06 100644 --- a/sample_pages/phpdoc/namespaces/picklesFramework2.processors.scss.html +++ b/sample_pages/phpdoc/namespaces/picklesFramework2.processors.scss.html @@ -97,28 +97,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -137,19 +137,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -164,10 +164,10 @@
- + encodingconverter
-
+
@@ -182,10 +182,10 @@
- + md
-
+
@@ -200,10 +200,10 @@
- + scss
-
+
@@ -218,10 +218,10 @@
- + ssi
-
+
@@ -244,10 +244,10 @@
- + theme
-
+
@@ -275,10 +275,10 @@
- + tomk79
-
+
@@ -381,7 +381,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/namespaces/picklesFramework2.processors.ssi.html b/sample_pages/phpdoc/namespaces/picklesFramework2.processors.ssi.html index a6f0a43b..6c7262a2 100644 --- a/sample_pages/phpdoc/namespaces/picklesFramework2.processors.ssi.html +++ b/sample_pages/phpdoc/namespaces/picklesFramework2.processors.ssi.html @@ -97,28 +97,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -137,19 +137,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -164,10 +164,10 @@
- + encodingconverter
-
+
@@ -182,10 +182,10 @@
- + md
-
+
@@ -200,10 +200,10 @@
- + scss
-
+
@@ -218,10 +218,10 @@
- + ssi
-
+
@@ -244,10 +244,10 @@
- + theme
-
+
@@ -275,10 +275,10 @@
- + tomk79
-
+
@@ -381,7 +381,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/namespaces/picklesFramework2.theme.html b/sample_pages/phpdoc/namespaces/picklesFramework2.theme.html index c4cfa5a5..750a0413 100644 --- a/sample_pages/phpdoc/namespaces/picklesFramework2.theme.html +++ b/sample_pages/phpdoc/namespaces/picklesFramework2.theme.html @@ -97,28 +97,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -137,19 +137,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -164,10 +164,10 @@
- + encodingconverter
-
+
@@ -182,10 +182,10 @@
- + md
-
+
@@ -200,10 +200,10 @@
- + scss
-
+
@@ -218,10 +218,10 @@
- + ssi
-
+
@@ -244,10 +244,10 @@
- + theme
-
+
@@ -275,10 +275,10 @@
- + tomk79
-
+
@@ -383,7 +383,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/namespaces/tomk79.html b/sample_pages/phpdoc/namespaces/tomk79.html index 695d5393..ca11b165 100644 --- a/sample_pages/phpdoc/namespaces/tomk79.html +++ b/sample_pages/phpdoc/namespaces/tomk79.html @@ -97,28 +97,28 @@
- + \
-
+
- + picklesFramework2
-
+
- + commands
-
+
@@ -137,19 +137,19 @@
- + processors
-
+
- + autoindex
-
+
@@ -164,10 +164,10 @@
- + encodingconverter
-
+
@@ -182,10 +182,10 @@
- + md
-
+
@@ -200,10 +200,10 @@
- + scss
-
+
@@ -218,10 +218,10 @@
- + ssi
-
+
@@ -244,10 +244,10 @@
- + theme
-
+
@@ -275,10 +275,10 @@
- + tomk79
-
+
@@ -381,7 +381,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/phpdoc-cache-0e/phpdoc-cache-file_3e60d772f0c210dc9aa9d66f7a6a9219.dat b/sample_pages/phpdoc/phpdoc-cache-0e/phpdoc-cache-file_3e60d772f0c210dc9aa9d66f7a6a9219.dat index e85118e8..280482dd 100644 Binary files a/sample_pages/phpdoc/phpdoc-cache-0e/phpdoc-cache-file_3e60d772f0c210dc9aa9d66f7a6a9219.dat and b/sample_pages/phpdoc/phpdoc-cache-0e/phpdoc-cache-file_3e60d772f0c210dc9aa9d66f7a6a9219.dat differ diff --git a/sample_pages/phpdoc/phpdoc-cache-5f/phpdoc-cache-file_ae381b15f0ffbd1226d12929de849d03.dat b/sample_pages/phpdoc/phpdoc-cache-5f/phpdoc-cache-file_ae381b15f0ffbd1226d12929de849d03.dat index f22451ba..db98e1b5 100644 Binary files a/sample_pages/phpdoc/phpdoc-cache-5f/phpdoc-cache-file_ae381b15f0ffbd1226d12929de849d03.dat and b/sample_pages/phpdoc/phpdoc-cache-5f/phpdoc-cache-file_ae381b15f0ffbd1226d12929de849d03.dat differ diff --git a/sample_pages/phpdoc/phpdoc-cache-8d/phpdoc-cache-file_7f1f44b7a08fe3059ae9c9ee9a59616a.dat b/sample_pages/phpdoc/phpdoc-cache-8d/phpdoc-cache-file_7f1f44b7a08fe3059ae9c9ee9a59616a.dat index 0eb6aed3..16a0b616 100644 Binary files a/sample_pages/phpdoc/phpdoc-cache-8d/phpdoc-cache-file_7f1f44b7a08fe3059ae9c9ee9a59616a.dat and b/sample_pages/phpdoc/phpdoc-cache-8d/phpdoc-cache-file_7f1f44b7a08fe3059ae9c9ee9a59616a.dat differ diff --git a/sample_pages/phpdoc/phpdoc-cache-91/phpdoc-cache-file_e738596e3de786bc07d12f72e0dd875d.dat b/sample_pages/phpdoc/phpdoc-cache-91/phpdoc-cache-file_e738596e3de786bc07d12f72e0dd875d.dat index 1c705492..1567cfe5 100644 Binary files a/sample_pages/phpdoc/phpdoc-cache-91/phpdoc-cache-file_e738596e3de786bc07d12f72e0dd875d.dat and b/sample_pages/phpdoc/phpdoc-cache-91/phpdoc-cache-file_e738596e3de786bc07d12f72e0dd875d.dat differ diff --git a/sample_pages/phpdoc/reports/deprecated.html b/sample_pages/phpdoc/reports/deprecated.html index 58483968..35ba181c 100644 --- a/sample_pages/phpdoc/reports/deprecated.html +++ b/sample_pages/phpdoc/reports/deprecated.html @@ -153,7 +153,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/reports/errors.html b/sample_pages/phpdoc/reports/errors.html index c901785b..6b880dc7 100644 --- a/sample_pages/phpdoc/reports/errors.html +++ b/sample_pages/phpdoc/reports/errors.html @@ -186,7 +186,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.
diff --git a/sample_pages/phpdoc/reports/markers.html b/sample_pages/phpdoc/reports/markers.html index 4daa6a3e..13760357 100644 --- a/sample_pages/phpdoc/reports/markers.html +++ b/sample_pages/phpdoc/reports/markers.html @@ -152,7 +152,7 @@

Documentation is powered by phpDocumentor and authored - on July 23rd, 2015 at 11:19. + on August 3rd, 2015 at 10:03.