phpwiki-checkins Mailing List for PhpWiki

Revision: 9855
 http://sourceforge.net/p/phpwiki/code/9855
Author: vargenau
Date: 2016年05月25日 16:21:23 +0000 (2016年5月25日)
Log Message:
-----------
Use jquery.autoheight.js plugin for Transclude plugin
Modified Paths:
--------------
 trunk/lib/WikiTheme.php
 trunk/lib/plugin/Transclude.php
Added Paths:
-----------
 trunk/themes/default/jquery.autoheight.js
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2016年05月25日 12:30:10 UTC (rev 9854)
+++ trunk/lib/WikiTheme.php	2016年05月25日 16:21:23 UTC (rev 9855)
@@ -262,6 +262,7 @@
 $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("jquery-2.2.4.min.js"))));
 $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("jquery.tablesorter.min.js"))));
 }
+ $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("jquery.autoheight.js"))));
 // by pixels
 if ((is_object($request) // guard against unittests
 and $request->getPref('doubleClickEdit'))
Modified: trunk/lib/plugin/Transclude.php
===================================================================
--- trunk/lib/plugin/Transclude.php	2016年05月25日 12:30:10 UTC (rev 9854)
+++ trunk/lib/plugin/Transclude.php	2016年05月25日 16:21:23 UTC (rev 9855)
@@ -102,8 +102,7 @@
 'height' => $height,
 'marginwidth' => 0,
 'marginheight' => 0,
- 'class' => 'transclude',
- "onload" => "adjust_iframe_height(this);");
+ 'class' => 'autoHeight transclude');
 
 $noframe_msg[] = fmt("See: %s", HTML::a(array('href' => $src), $src));
 
@@ -117,47 +116,10 @@
 */
 
 if ($quiet) {
- return HTML($this->_js(), $iframe);
+ return $iframe;
 } else {
 return HTML(HTML::p(array('class' => 'transclusion-title'),
- fmt("Transcluded from %s", LinkURL($src))),
- $this->_js(), $iframe);
+ fmt("Transcluded from %s", LinkURL($src))), $iframe);
 }
 }
-
- /**
- * Produce our javascript.
- *
- * This is used to resize the iframe to fit the content.
- * Currently it only works if the transcluded document comes
- * from the same server as the wiki server.
- */
- private function _js()
- {
- static $seen = false;
-
- if ($seen)
- return '';
- $seen = true;
-
- return JavaScript('
- function adjust_iframe_height(frame) {
- var content = frame.contentDocument;
- try {
- frame.height = content.height + 2 * frame.marginHeight;
- }
- catch (e) {
- // Cannot get content.height unless transcluded doc
- // is from the same server...
- return;
- }
- }
-
- window.addEventListener("resize", function() {
- f = this.document.body.getElementsByTagName("iframe");
- for (var i = 0; i < f.length; i++)
- adjust_iframe_height(f[i]);
- }, false);
- ');
- }
 }
Added: trunk/themes/default/jquery.autoheight.js
===================================================================
--- trunk/themes/default/jquery.autoheight.js	 (rev 0)
+++ trunk/themes/default/jquery.autoheight.js	2016年05月25日 16:21:23 UTC (rev 9855)
@@ -0,0 +1,33 @@
+function doIframe(){
+ o = document.getElementsByTagName('iframe');
+ for(i=0;i<o.length;i++){
+ if (/\bautoHeight\b/.test(o[i].className)){
+ setHeight(o[i]);
+ addEvent(o[i],'load', doIframe);
+ }
+ }
+}
+
+function setHeight(e){
+ if(e.contentDocument){
+ e.height = e.contentDocument.body.offsetHeight + 35;
+ } else {
+ e.height = e.contentWindow.document.body.scrollHeight;
+ }
+}
+
+function addEvent(obj, evType, fn){
+ if(obj.addEventListener) {
+ obj.addEventListener(evType, fn,false);
+ return true;
+ } else if (obj.attachEvent){
+ var r = obj.attachEvent("on"+evType, fn);
+ return r;
+ } else {
+ return false;
+ }
+}
+
+if (document.getElementById && document.createTextNode){
+ addEvent(window,'load', doIframe);
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9854
 http://sourceforge.net/p/phpwiki/code/9854
Author: vargenau
Date: 2016年05月25日 12:30:10 +0000 (2016年5月25日)
Log Message:
-----------
Be case consistent
Modified Paths:
--------------
 trunk/lib/BlockParser.php
 trunk/lib/Template.php
 trunk/lib/WikiPluginCached.php
 trunk/lib/editpage.php
 trunk/lib/plugin/RecentChanges.php
 trunk/lib/upgrade.php
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2016年05月25日 12:16:28 UTC (rev 9853)
+++ trunk/lib/BlockParser.php	2016年05月25日 12:30:10 UTC (rev 9854)
@@ -242,7 +242,7 @@
 //return ;
 $where = $this->where();
 $tab = str_repeat('____', $this->getDepth()) . $tab;
- printXML(HTML::div("$tab $msg: at: '",
+ PrintXML(HTML::div("$tab $msg: at: '",
 HTML::samp($where),
 "'"));
 flush();
Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2016年05月25日 12:16:28 UTC (rev 9853)
+++ trunk/lib/Template.php	2016年05月25日 12:30:10 UTC (rev 9854)
@@ -266,7 +266,7 @@
 if (!isset($args['HEADER']))
 $args['HEADER'] = $title;
 
- printXML(new Template('html', $request, $args));
+ PrintXML(new Template('html', $request, $args));
 }
 
 /**
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2016年05月25日 12:16:28 UTC (rev 9853)
+++ trunk/lib/WikiPluginCached.php	2016年05月25日 12:30:10 UTC (rev 9854)
@@ -1054,7 +1054,7 @@
 // It is important that you close any pipes before calling
 // proc_close in order to avoid a deadlock
 proc_close($process);
- if (empty($buf)) printXML($this->error($stderr));
+ if (empty($buf)) PrintXML($this->error($stderr));
 return $buf;
 }
 return '';
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2016年05月25日 12:16:28 UTC (rev 9853)
+++ trunk/lib/editpage.php	2016年05月25日 12:30:10 UTC (rev 9854)
@@ -644,7 +644,7 @@
 $WikiTheme->addMoreHeaders($js);
 $WikiTheme->addMoreAttr('body', "SearchReplace", " onload='define_f()'");
 } else { // from an actionpage: WikiBlog, AddComment, WikiForum
- printXML($js);
+ PrintXML($js);
 }
 } else {
 $WikiTheme->addMoreAttr('body', "editfocus", "document.getElementById('edit-content]').editarea.focus()");
@@ -660,9 +660,9 @@
 $WikiTheme->addMoreHeaders($init);
 $WikiTheme->addMoreHeaders($js);
 } else { // from an actionpage: WikiBlog, AddComment, WikiForum
- printXML($init);
- printXML($js);
- printXML(JavaScript('define_f()'));
+ PrintXML($init);
+ PrintXML($js);
+ PrintXML(JavaScript('define_f()'));
 }
 $toolbar = HTML::div(array('class' => 'edit-toolbar', 'id' => 'toolbar'));
 $toolbar->pushContent(HTML::input(array('src' => $WikiTheme->getImageURL("ed_save.png"),
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2016年05月25日 12:16:28 UTC (rev 9853)
+++ trunk/lib/plugin/RecentChanges.php	2016年05月25日 12:30:10 UTC (rev 9854)
@@ -451,7 +451,7 @@
 $sidebar_button = $WikiTheme->makeButton("sidebar", 'javascript:addPanel();', 'sidebaricon',
 array('title' => _("Click to add this feed to your sidebar"),
 'style' => 'font-size:9pt;font-weight:normal; vertical-align:middle;'));
- $addsidebarjsclick = asXML($sidebar_button);
+ $addsidebarjsclick = AsXML($sidebar_button);
 $jsc = JavaScript("if ((typeof window.sidebar == 'object') &&\n"
 . " (typeof window.sidebar.addPanel == 'function'))\n"
 . " {\n"
@@ -744,11 +744,11 @@
 printf("<title>" . $title . "</title>\n");
 global $WikiTheme;
 $css = $WikiTheme->getCSS();
- $css->PrintXML();
+ $css->printXML();
 printf("</head>\n");
 
 printf("<body class=\"sidebar\">\n");
- $html->PrintXML();
+ $html->printXML();
 echo '<a href=" src="themes/default/buttons/valid-rss.png" alt="[Valid RSS]" title="Validate the RSS feed" width="44" height="15" /></a>';
 printf("\n</body>\n");
 printf("</html>\n");
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2016年05月25日 12:16:28 UTC (rev 9853)
+++ trunk/lib/upgrade.php	2016年05月25日 12:30:10 UTC (rev 9854)
@@ -816,7 +816,7 @@
 HTML::raw('&nbsp;'),
 Button("submit:dbadmin[cancel]", _("Cancel"),
 'button')))));
- $form->printXml();
+ $form->printXML();
 echo "</div><!-- content -->\n";
 echo AsXML(Template("bottom"));
 echo "</body></html>\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9853
 http://sourceforge.net/p/phpwiki/code/9853
Author: vargenau
Date: 2016年05月25日 12:16:28 +0000 (2016年5月25日)
Log Message:
-----------
Be case consistent
Modified Paths:
--------------
 trunk/lib/Captcha.php
 trunk/lib/Template.php
 trunk/lib/plugin/RecentChanges.php
 trunk/lib/upgrade.php
Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php	2016年05月25日 10:30:28 UTC (rev 9852)
+++ trunk/lib/Captcha.php	2016年05月25日 12:16:28 UTC (rev 9853)
@@ -102,7 +102,7 @@
 function get_dictionary_word()
 {
 // Load In the Word List
- $fp = fopen(findfile("lib/captcha/dictionary"), "r");
+ $fp = fopen(findFile("lib/captcha/dictionary"), "r");
 $text = array();
 while (!feof($fp))
 $text[] = trim(fgets($fp, 1024));
@@ -170,7 +170,7 @@
 elseif ($y > $height - 10) $y = $height - 11;
 $x += rand($size, $size * 2);
 imagettftext($jpg, $size, $angle, $x, $y, $tx,
- realpath(findfile("lib/captcha/Vera.ttf")),
+ realpath(findFile("lib/captcha/Vera.ttf")),
 $word[$i]);
 }
 
Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2016年05月25日 10:30:28 UTC (rev 9852)
+++ trunk/lib/Template.php	2016年05月25日 12:16:28 UTC (rev 9853)
@@ -294,7 +294,7 @@
 $WikiTheme->DUMP_MODE = 'HTML';
 
 // FIXME: unfatal errors and login requirements
- $html = asXML(new Template('htmldump', $request, $args));
+ $html = AsXML(new Template('htmldump', $request, $args));
 
 $HIDE_TOOLBARS = false;
 //$WikiTheme->DUMP_MODE = false;
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2016年05月25日 10:30:28 UTC (rev 9852)
+++ trunk/lib/plugin/RecentChanges.php	2016年05月25日 12:16:28 UTC (rev 9853)
@@ -688,7 +688,7 @@
 $linkurl->setAttr('target', '_content');
 $linkurl->setAttr('rel', 'nofollow');
 // FIXME: Smelly hack to get smaller diff buttons in sidebar
- $linkurl = new RawXML(str_replace('<img ', '<img style="height:2ex" ', asXML($linkurl)));
+ $linkurl = new RawXML(str_replace('<img ', '<img style="height:2ex" ', AsXML($linkurl)));
 return $linkurl;
 }
 
@@ -697,7 +697,7 @@
 $linkurl = parent::historyLink($rev);
 $linkurl->setAttr('target', '_content');
 // FIXME: Smelly hack to get smaller history buttons in sidebar
- $linkurl = new RawXML(str_replace('<img ', '<img style="height:2ex" ', asXML($linkurl)));
+ $linkurl = new RawXML(str_replace('<img ', '<img style="height:2ex" ', AsXML($linkurl)));
 return $linkurl;
 }
 
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2016年05月25日 10:30:28 UTC (rev 9852)
+++ trunk/lib/upgrade.php	2016年05月25日 12:16:28 UTC (rev 9853)
@@ -818,7 +818,7 @@
 'button')))));
 $form->printXml();
 echo "</div><!-- content -->\n";
- echo asXML(Template("bottom"));
+ echo AsXML(Template("bottom"));
 echo "</body></html>\n";
 $this->request->finish();
 exit();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9852
 http://sourceforge.net/p/phpwiki/code/9852
Author: vargenau
Date: 2016年05月25日 10:30:28 +0000 (2016年5月25日)
Log Message:
-----------
Be case consistent
Modified Paths:
--------------
 trunk/doc/HISTORY
 trunk/lib/FileFinder.php
 trunk/lib/Google.php
 trunk/lib/IniConfig.php
 trunk/lib/PageType.php
 trunk/lib/WikiDB/ADODB.php
 trunk/lib/WikiDB/PDO.php
 trunk/lib/WikiDB/backend/ADODB_sqlite.php
 trunk/lib/WikiTheme.php
 trunk/lib/WikiUser.php
 trunk/lib/loadsave.php
 trunk/lib/main.php
 trunk/lib/plugin/SqlResult.php
 trunk/lib/plugin/SystemInfo.php
 trunk/lib/plugin/WikiTranslation.php
 trunk/lib/stdlib.php
 trunk/lib/upgrade.php
 trunk/pgsrc/ReleaseNotes
Modified: trunk/doc/HISTORY
===================================================================
--- trunk/doc/HISTORY	2016年05月25日 10:17:43 UTC (rev 9851)
+++ trunk/doc/HISTORY	2016年05月25日 10:30:28 UTC (rev 9852)
@@ -59,7 +59,7 @@
 * new Error-style with collapsed output of repeated messages
 * trim pagenames to avoid abuse
 * no double login page header, better login msg.
-* improved FileFinder include_path logic (NormalizeLocalFileName, ...)
+* improved FileFinder include_path logic (normalizeLocalFileName, ...)
 ** init global FileFinder to add proper include paths at startup
 adds PHPWIKI_DIR if started from another dir, lib/pear also
 ** fix slashify for Windows
Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php	2016年05月25日 10:17:43 UTC (rev 9851)
+++ trunk/lib/FileFinder.php	2016年05月25日 10:30:28 UTC (rev 9852)
@@ -456,7 +456,7 @@
 }
 
 // Search PHP's include_path to find file or directory.
-function FindFile($file, $missing_okay = false, $slashify = false)
+function findFile($file, $missing_okay = false, $slashify = false)
 {
 static $finder;
 if (!isset($finder)) {
@@ -478,7 +478,7 @@
 
 // Search PHP's include_path to find file or directory.
 // Searches for "locale/$LANG/$file", then for "$file".
-function FindLocalizedFile($file, $missing_okay = false, $re_init = false)
+function findLocalizedFile($file, $missing_okay = false, $re_init = false)
 {
 static $finder;
 if ($re_init or !isset($finder))
@@ -486,7 +486,7 @@
 return $finder->findFile($file, $missing_okay);
 }
 
-function FindLocalizedButtonFile($file, $missing_okay = false, $re_init = false)
+function findLocalizedButtonFile($file, $missing_okay = false, $re_init = false)
 {
 static $buttonfinder;
 if ($re_init or !isset($buttonfinder))
@@ -501,9 +501,9 @@
 * require_once 'lib/file.php' loading style.
 * Doesn't expand "~" or symlinks yet. truename would be perfect.
 *
- * NormalizeLocalFileName("lib/config.php") => /home/user/phpwiki/lib/config.php
+ * normalizeLocalFileName("lib/config.php") => /home/user/phpwiki/lib/config.php
 */
-function NormalizeLocalFileName($file)
+function normalizeLocalFileName($file)
 {
 static $finder;
 if (!isset($finder)) {
@@ -525,7 +525,7 @@
 /**
 * Prefixes with DATA_PATH and slashify
 */
-function NormalizeWebFileName($file)
+function normalizeWebFileName($file)
 {
 static $finder;
 if (!isset($finder)) {
Modified: trunk/lib/Google.php
===================================================================
--- trunk/lib/Google.php	2016年05月25日 10:17:43 UTC (rev 9851)
+++ trunk/lib/Google.php	2016年05月25日 10:30:28 UTC (rev 9852)
@@ -170,7 +170,7 @@
 } else
 $this->license_key = GOOGLE_LICENSE_KEY;
 
- $this->soapclient = new soapclient(SERVER_URL . NormalizeWebFileName("GoogleSearch.wsdl"), "wsdl");
+ $this->soapclient = new soapclient(SERVER_URL . normalizeWebFileName("GoogleSearch.wsdl"), "wsdl");
 $this->proxy = $this->soapclient->getProxy();
 if ($maxResults > 10) $maxResults = 10;
 if ($maxResults < 1) $maxResults = 1;
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2016年05月25日 10:17:43 UTC (rev 9851)
+++ trunk/lib/IniConfig.php	2016年05月25日 10:30:28 UTC (rev 9852)
@@ -512,16 +512,16 @@
 $GLOBALS['INCLUDE_PATH'] = $rs['INCLUDE_PATH'];
 }
 $rs['PLUGIN_CACHED_CACHE_DIR'] = TEMP_DIR . '/cache';
- if (!FindFile($rs['PLUGIN_CACHED_CACHE_DIR'], 1)) { // [29ms]
- FindFile(TEMP_DIR, false, 1); // TEMP must exist!
+ if (!findFile($rs['PLUGIN_CACHED_CACHE_DIR'], 1)) { // [29ms]
+ findFile(TEMP_DIR, false, 1); // TEMP must exist!
 mkdir($rs['PLUGIN_CACHED_CACHE_DIR'], 0777);
 }
 // will throw an error if not exists.
- define('PLUGIN_CACHED_CACHE_DIR', FindFile($rs['PLUGIN_CACHED_CACHE_DIR'], false, 1));
+ define('PLUGIN_CACHED_CACHE_DIR', findFile($rs['PLUGIN_CACHED_CACHE_DIR'], false, 1));
 } else {
 define('PLUGIN_CACHED_CACHE_DIR', $rs['PLUGIN_CACHED_CACHE_DIR']);
 // will throw an error if not exists.
- FindFile(PLUGIN_CACHED_CACHE_DIR);
+ findFile(PLUGIN_CACHED_CACHE_DIR);
 }
 }
 
@@ -556,7 +556,7 @@
 global $FieldSeparator, $AllActionPages;
 global $DBParams;
 // init FileFinder to add proper include paths
- FindFile("lib/interwiki.map", true);
+ findFile("lib/interwiki.map", true);
 
 // $FieldSeparator = "\xFF"; // this byte should never appear in utf-8
 $FieldSeparator = "\xFF";
@@ -735,7 +735,7 @@
 
 // If user has not defined PHPWIKI_DIR, and we need it
 if (!defined('PHPWIKI_DIR') and !file_exists("themes/default")) {
- $themes_dir = FindFile("themes");
+ $themes_dir = findFile("themes");
 define('PHPWIKI_DIR', dirname($themes_dir));
 }
 
@@ -884,7 +884,7 @@
 // 1. If the script is not index.php but something like "de", on a different path
 // then bindtextdomain() fails, but after chdir to the correct path it will work okay.
 // 2. But the weird error "Undefined variable: bindtextdomain" is generated then.
- $bindtextdomain_path = FindFile("locale", false, true);
+ $bindtextdomain_path = findFile("locale", false, true);
 if (isWindows())
 $bindtextdomain_path = str_replace("/", "\\", $bindtextdomain_path);
 $bindtextdomain_real = @bindtextdomain("phpwiki", $bindtextdomain_path);
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2016年05月25日 10:17:43 UTC (rev 9851)
+++ trunk/lib/PageType.php	2016年05月25日 10:30:28 UTC (rev 9852)
@@ -212,8 +212,8 @@
 $url = getUploadFilePath();
 // calculate to a relative local path to /uploads for PDF images.
 $doc_root = $request->get("DOCUMENT_ROOT");
- $ldir = NormalizeLocalFileName($url);
- $wikiroot = NormalizeLocalFileName('');
+ $ldir = normalizeLocalFileName($url);
+ $wikiroot = normalizeLocalFileName('');
 if (isWindows()) {
 $ldir = strtolower($ldir);
 $doc_root = strtolower($doc_root);
@@ -222,7 +222,7 @@
 if (string_starts_with($ldir, $doc_root)) {
 $link_prefix = substr($url, strlen($doc_root));
 } elseif (string_starts_with($ldir, $wikiroot)) {
- $link_prefix = NormalizeWebFileName(substr($url, strlen($wikiroot)));
+ $link_prefix = normalizeWebFileName(substr($url, strlen($wikiroot)));
 }
 }
 
Modified: trunk/lib/WikiDB/ADODB.php
===================================================================
--- trunk/lib/WikiDB/ADODB.php	2016年05月25日 10:17:43 UTC (rev 9851)
+++ trunk/lib/WikiDB/ADODB.php	2016年05月25日 10:30:28 UTC (rev 9852)
@@ -26,7 +26,7 @@
 if (is_string($dbparams['dsn']))
 $dbparams['dsn'] = $backend . ':' . substr($dbparams['dsn'], 6);
 }
- if (FindFile("lib/WikiDB/backend/ADODB_" . $backend . ".php", true)) {
+ if (findFile("lib/WikiDB/backend/ADODB_" . $backend . ".php", true)) {
 $backend = 'ADODB_' . $backend;
 } else {
 $backend = 'ADODB';
Modified: trunk/lib/WikiDB/PDO.php
===================================================================
--- trunk/lib/WikiDB/PDO.php	2016年05月25日 10:17:43 UTC (rev 9851)
+++ trunk/lib/WikiDB/PDO.php	2016年05月25日 10:30:28 UTC (rev 9852)
@@ -25,7 +25,7 @@
 elseif (preg_match('/^(\w+):/', $dbparams['dsn'], $m))
 $backend = $m[1];
 // Do we have a override? Currently none: mysql, sqlite, oci, mssql
- if (FindFile("lib/WikiDB/backend/PDO_$backend.php", true)) {
+ if (findFile("lib/WikiDB/backend/PDO_$backend.php", true)) {
 $backend = 'PDO_' . $backend;
 } else {
 $backend = 'PDO';
Modified: trunk/lib/WikiDB/backend/ADODB_sqlite.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_sqlite.php	2016年05月25日 10:17:43 UTC (rev 9851)
+++ trunk/lib/WikiDB/backend/ADODB_sqlite.php	2016年05月25日 10:30:28 UTC (rev 9852)
@@ -17,7 +17,7 @@
 if (!file_exists($parsed['database'])) {
 // creating the empty database
 $db = $parsed['database'];
- $schema = FindFile("schemas/sqlite-initialize.sql");
+ $schema = findFile("schemas/sqlite-initialize.sql");
 `sqlite $db < $schema`;
 `echo "CREATE USER wikiuser" | sqlite $db`;
 }
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2016年05月25日 10:17:43 UTC (rev 9851)
+++ trunk/lib/WikiTheme.php	2016年05月25日 10:30:28 UTC (rev 9852)
@@ -227,8 +227,8 @@
 global $request;
 
 $this->_name = $theme_name;
- $this->_themes_dir = NormalizeLocalFileName("themes");
- $this->_path = defined('PHPWIKI_DIR') ? NormalizeLocalFileName("") : "";
+ $this->_themes_dir = normalizeLocalFileName("themes");
+ $this->_path = defined('PHPWIKI_DIR') ? normalizeLocalFileName("") : "";
 $this->_theme = "themes/$theme_name";
 $this->_parents = array();
 
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2016年05月25日 10:17:43 UTC (rev 9851)
+++ trunk/lib/WikiUser.php	2016年05月25日 10:30:28 UTC (rev 9852)
@@ -1638,7 +1638,7 @@
 
 function sanify($value)
 {
- if (!empty($value) and FindFile($this->_themefile($value)))
+ if (!empty($value) and findFile($this->_themefile($value)))
 return $value;
 return $this->default_value;
 }
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2016年05月25日 10:17:43 UTC (rev 9851)
+++ trunk/lib/loadsave.php	2016年05月25日 10:30:28 UTC (rev 9852)
@@ -558,12 +558,12 @@
 // check if the dumped file will be accessible from outside
 $doc_root = $request->get("DOCUMENT_ROOT");
 if ($WikiTheme->DUMP_MODE == 'HTML') {
- $ldir = NormalizeLocalFileName($directory);
- $wikiroot = NormalizeLocalFileName('');
+ $ldir = normalizeLocalFileName($directory);
+ $wikiroot = normalizeLocalFileName('');
 if (string_starts_with($ldir, $doc_root)) {
 $link_prefix = substr($directory, strlen($doc_root)) . "/";
 } elseif (string_starts_with($ldir, $wikiroot)) {
- $link_prefix = NormalizeWebFileName(substr($directory, strlen($wikiroot))) . "/";
+ $link_prefix = normalizeWebFileName(substr($directory, strlen($wikiroot))) . "/";
 } else {
 $prefix = '';
 if (isWindows()) {
@@ -1126,7 +1126,7 @@
 $error_html = sprintf(" " . _("%s: not defined"), "INTERWIKI_MAP_FILE");
 $goback = true;
 }
- $mapfile = FindFile(INTERWIKI_MAP_FILE, 1);
+ $mapfile = findFile(INTERWIKI_MAP_FILE, 1);
 if (!$goback && !file_exists($mapfile)) {
 $error_html = sprintf(" " . _("File "%s" not found."), INTERWIKI_MAP_FILE);
 $goback = true;
@@ -1401,7 +1401,7 @@
 // with broken dirname or basename functions.
 // FIXME: windows uses \ and :
 if (is_integer(strpos($file_or_dir, "/"))) {
- $newfile = FindFile($file_or_dir, true);
+ $newfile = findFile($file_or_dir, true);
 // Panic. urlencoded by the browser (e.g. San%20Diego => San Diego)
 if (!$newfile)
 $file_or_dir = dirname($file_or_dir) . "/"
@@ -1498,9 +1498,9 @@
 
 StartLoadDump($request, _("Loading up virgin wiki"));
 
- $pgsrc = FindLocalizedFile(WIKI_PGSRC);
- $default_pgsrc = FindFile(DEFAULT_WIKI_PGSRC);
- $theme_pgsrc = FindFile("themes/".THEME."/".WIKI_PGSRC, true);
+ $pgsrc = findLocalizedFile(WIKI_PGSRC);
+ $default_pgsrc = findFile(DEFAULT_WIKI_PGSRC);
+ $theme_pgsrc = findFile("themes/".THEME."/".WIKI_PGSRC, true);
 
 $request->setArg('overwrite', true);
 // Load theme pgsrc, if it exists
@@ -1540,10 +1540,10 @@
 $epage = urlencode($page);
 if (!$dbi->isWikiPage($page)) {
 // translated version provided?
- if ($lf = FindLocalizedFile($pgsrc . $finder->_pathsep . $epage, 1)) {
+ if ($lf = findLocalizedFile($pgsrc . $finder->_pathsep . $epage, 1)) {
 LoadAny($request, $lf);
 } else { // load english version of required action page
- LoadAny($request, FindFile(DEFAULT_WIKI_PGSRC . $finder->_pathsep . urlencode($f)));
+ LoadAny($request, findFile(DEFAULT_WIKI_PGSRC . $finder->_pathsep . urlencode($f)));
 $page = $f;
 }
 }
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2016年05月25日 10:17:43 UTC (rev 9851)
+++ trunk/lib/main.php	2016年05月25日 10:30:28 UTC (rev 9852)
@@ -171,7 +171,7 @@
 if (isset($this->_user->_authhow) and $this->_user->_authhow == 'session')
 $user_lang = $GLOBALS['LANG'];
 update_locale($user_lang);
- FindLocalizedButtonFile(".", 'missing_ok', 'reinit');
+ findLocalizedButtonFile(".", 'missing_ok', 'reinit');
 }
 //if (empty($_lang->lang) and $GLOBALS['LANG'] != $_lang->default_value) ;
 }
Modified: trunk/lib/plugin/SqlResult.php
===================================================================
--- trunk/lib/plugin/SqlResult.php	2016年05月25日 10:17:43 UTC (rev 9851)
+++ trunk/lib/plugin/SqlResult.php	2016年05月25日 10:30:28 UTC (rev 9852)
@@ -83,7 +83,7 @@
 
 function getDsn($alias)
 {
- $ini = parse_ini_file(FindFile("config/SqlResult.ini"));
+ $ini = parse_ini_file(findFile("config/SqlResult.ini"));
 return $ini[$alias];
 }
 
Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2016年05月25日 10:17:43 UTC (rev 9851)
+++ trunk/lib/plugin/SystemInfo.php	2016年05月25日 10:30:28 UTC (rev 9852)
@@ -453,7 +453,7 @@
 
 function available_plugins()
 {
- $fileset = new FileSet(FindFile('lib/plugin'), '*.php');
+ $fileset = new FileSet(findFile('lib/plugin'), '*.php');
 $list = $fileset->getFiles();
 natcasesort($list);
 reset($list);
Modified: trunk/lib/plugin/WikiTranslation.php
===================================================================
--- trunk/lib/plugin/WikiTranslation.php	2016年05月25日 10:17:43 UTC (rev 9851)
+++ trunk/lib/plugin/WikiTranslation.php	2016年05月25日 10:30:28 UTC (rev 9852)
@@ -437,7 +437,7 @@
 if (!is_array($exclude))
 $exclude = $pagelist->explodePageList($exclude, false, $sortby,
 $limit, $exclude);
- $path = FindLocalizedFile(WIKI_PGSRC);
+ $path = findLocalizedFile(WIKI_PGSRC);
 $pgsrc = new FileSet($path);
 foreach ($pgsrc->getFiles($exclude, $sortby, $limit) as $pagename) {
 $pagename = urldecode($pagename);
@@ -474,7 +474,7 @@
 // navbar links, actionpages, and admin requests
 case 'buttons':
 $buttons = $GLOBALS['AllActionPages'];
- $fileset = new FileSet(FindFile("themes/MacOSX/buttons/en"),
+ $fileset = new FileSet(findFile("themes/MacOSX/buttons/en"),
 "*.png");
 foreach ($fileset->getFiles() as $file) {
 $b = urldecode(substr($file, 0, -4));
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2016年05月25日 10:17:43 UTC (rev 9851)
+++ trunk/lib/stdlib.php	2016年05月25日 10:30:28 UTC (rev 9852)
@@ -465,7 +465,7 @@
 // Correct silently the most common error
 if ($url != $ori_url and empty($arr) and !preg_match("/^http/", $url)) {
 // space belongs to the path
- $file = NormalizeLocalFileName($ori_url);
+ $file = normalizeLocalFileName($ori_url);
 if (file_exists($file)) {
 $link = HTML::img(array('src' => $ori_url));
 trigger_error(
@@ -508,9 +508,9 @@
 elseif (preg_match("/^http/", $url)) { // external url
 $size = @getimagesize($url);
 } else { // local file
- if (file_exists($file = NormalizeLocalFileName($url))) { // here
+ if (file_exists($file = normalizeLocalFileName($url))) { // here
 $size = @getimagesize($file);
- } elseif (file_exists(NormalizeLocalFileName(urldecode($url)))) {
+ } elseif (file_exists(normalizeLocalFileName(urldecode($url)))) {
 $size = @getimagesize($file);
 $link->setAttr('src', rawurldecode($url));
 } elseif (string_starts_with($url, getUploadDataPath())) { // there
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2016年05月25日 10:17:43 UTC (rev 9851)
+++ trunk/lib/upgrade.php	2016年05月25日 10:30:28 UTC (rev 9852)
@@ -134,10 +134,10 @@
 $this->_rename_page_helper("_GroupInfo", "GroupAuthInfo"); //never officially existed
 $this->_rename_page_helper("InterWikiKarte", "InterWikiListe"); // german only
 
- $path = FindFile('pgsrc');
+ $path = findFile('pgsrc');
 $pgsrc = new FileSet($path);
 // most actionpages have the same name as the plugin
- $loc_path = FindLocalizedFile('pgsrc');
+ $loc_path = findLocalizedFile('pgsrc');
 foreach ($pgsrc->getFiles() as $filename) {
 if (substr($filename, -1, 1) == '~') continue;
 if (substr($filename, -5, 5) == '.orig') continue;
@@ -146,7 +146,7 @@
 $translation = __($pagename);
 if ($translation == $pagename)
 $this->doPgsrcUpdate($pagename, $path, $filename);
- elseif (FindLocalizedFile('pgsrc/' . urlencode($translation), 1))
+ elseif (findLocalizedFile('pgsrc/' . urlencode($translation), 1))
 $this->doPgsrcUpdate($translation, $loc_path, urlencode($translation)); else
 $this->doPgsrcUpdate($pagename, $path, $filename);
 }
@@ -184,9 +184,9 @@
 }
 $translation = __("HomePage");
 if ($translation == "HomePage") {
- $path = FindFile(WIKI_PGSRC);
+ $path = findFile(WIKI_PGSRC);
 } else {
- $path = FindLocalizedFile(WIKI_PGSRC);
+ $path = findLocalizedFile(WIKI_PGSRC);
 }
 $pgsrc = new FileSet($path);
 // fixme: verification, ...
@@ -943,7 +943,7 @@
 {
 $o_filename = $filename;
 if (!file_exists($filename))
- $filename = FindFile($filename);
+ $filename = findFile($filename);
 if (!file_exists($filename))
 return array(false, sprintf(_("File "%s" not found."), $o_filename));
 $found = false;
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2016年05月25日 10:17:43 UTC (rev 9851)
+++ trunk/pgsrc/ReleaseNotes	2016年05月25日 10:30:28 UTC (rev 9852)
@@ -614,7 +614,7 @@
 * new Error-style with collapsed output of repeated messages
 * whitespace trim pagenames to avoid abuse
 * no double login page header, better login msg.
-* improved ~FileFinder include_path logic (~NormalizeLocalFileName, ...)
+* improved ~FileFinder include_path logic (~normalizeLocalFileName, ...)
 ** init global ~FileFinder to add proper include paths at startup
 adds PHPWIKI_DIR to the front if started from another dir, lib/pear to the end.
 ** fix slashify for Windows
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9851
 http://sourceforge.net/p/phpwiki/code/9851
Author: vargenau
Date: 2016年05月25日 10:17:43 +0000 (2016年5月25日)
Log Message:
-----------
Be case consistent
Modified Paths:
--------------
 trunk/lib/WikiPlugin.php
 trunk/lib/WikiPluginCached.php
 trunk/lib/WikiTheme.php
 trunk/lib/WikiUser.php
 trunk/lib/plugin/RateIt.php
 trunk/lib/plugin/UpLoad.php
 trunk/lib/plugin/VisualWiki.php
 trunk/lib/plugin/text2png.php
 trunk/lib/wikilens/CustomPrefs.php
 trunk/themes/Sidebar/hyperapplet.php
 trunk/themes/Sidebar/hyperwiki.php
 trunk/themes/Sidebar/themeinfo.php
Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2016年05月25日 10:01:54 UTC (rev 9850)
+++ trunk/lib/WikiPlugin.php	2016年05月25日 10:17:43 UTC (rev 9851)
@@ -467,7 +467,7 @@
 
 function expandPI($pi, &$request, &$markup, $basepage = false)
 {
- if (!($ppi = $this->parsePi($pi)))
+ if (!($ppi = $this->parsePI($pi)))
 return false;
 list($pi_name, $plugin, $plugin_args) = $ppi;
 
@@ -513,7 +513,7 @@
 
 function getWikiPageLinks($pi, $basepage)
 {
- if (!($ppi = $this->parsePi($pi)))
+ if (!($ppi = $this->parsePI($pi)))
 return false;
 list($pi_name, $plugin, $plugin_args) = $ppi;
 if (!is_object($plugin))
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2016年05月25日 10:01:54 UTC (rev 9850)
+++ trunk/lib/WikiPluginCached.php	2016年05月25日 10:17:43 UTC (rev 9851)
@@ -736,7 +736,7 @@
 }
 if (is_resource($imagehandle)) {
 $this->writeImage($content['imagetype'], $imagehandle, $tmpfile);
- ImageDestroy($imagehandle);
+ imagedestroy($imagehandle);
 sleep(0.2);
 } elseif (is_string($imagehandle)) {
 $content['file'] = getUploadFilePath() . basename($tmpfile);
@@ -930,7 +930,7 @@
 }
 $this->writeHeader($imgtype);
 $this->writeImage($imgtype, $im);
- ImageDestroy($im);
+ imagedestroy($im);
 }
 } // printError
 
@@ -977,8 +977,8 @@
 'width' => 600,
 'height' => 350);
 
- $charx = ImageFontWidth($fontnr);
- $chary = ImageFontHeight($fontnr);
+ $charx = imagefontwidth($fontnr);
+ $chary = imagefontheight($fontnr);
 $marginx = $charx;
 $marginy = floor($chary / 2);
 
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2016年05月25日 10:01:54 UTC (rev 9850)
+++ trunk/lib/WikiTheme.php	2016年05月25日 10:17:43 UTC (rev 9851)
@@ -1484,7 +1484,7 @@
 * A list of name => _UserPreference class pairs.
 * Rationale: Certain themes should be able to extend the predefined list
 * of preferences. Display/editing is done in the theme specific userprefs.tmpl
- * but storage/sanification/update/... must be extended to the Get/SetPreferences methods.
+ * but storage/sanification/update/... must be extended to the get/setPreferences methods.
 * See themes/wikilens/themeinfo.php
 */
 //$this->customUserPreference();
@@ -1506,7 +1506,7 @@
 * A list of name => _UserPreference class pairs.
 * Rationale: Certain themes should be able to extend the predefined list
 * of preferences. Display/editing is done in the theme specific userprefs.tmpl
- * but storage/sanification/update/... must be extended to the Get/SetPreferences methods.
+ * but storage/sanification/update/... must be extended to the get/setPreferences methods.
 * These values are just ignored if another theme is used.
 */
 function customUserPreferences($array)
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2016年05月25日 10:01:54 UTC (rev 9850)
+++ trunk/lib/WikiUser.php	2016年05月25日 10:17:43 UTC (rev 9851)
@@ -88,7 +88,7 @@
 * 2004年04月04日 rurban
 * 7) Certain themes should be able to extend the predefined list
 * of preferences. Display/editing is done in the theme specific userprefs.tmpl,
- * but storage must be extended to the Get/SetPreferences methods.
+ * but storage must be extended to the get/setPreferences methods.
 * <theme>/themeinfo.php must provide CustomUserPreferences:
 * A list of name => _UserPreference class pairs.
 * 2010年06月07日 rurban
@@ -1335,7 +1335,7 @@
 /** The default method is storing the password in prefs.
 * Child methods (DB, File) may store in external auth also, but this
 * must be explicitly enabled.
- * This may be called by plugin/UserPreferences or by ->SetPreferences()
+ * This may be called by plugin/UserPreferences or by ->setPreferences()
 */
 function changePass($submitted_password)
 {
@@ -1350,7 +1350,7 @@
 if ($stored_password != $submitted_password) {
 $this->_prefs->set('passwd', $submitted_password);
 //update the storage (session, homepage, ...)
- $this->SetPreferences($this->_prefs);
+ $this->setPreferences($this->_prefs);
 return true;
 }
 //Todo: return an error msg to the caller what failed?
Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2016年05月25日 10:01:54 UTC (rev 9850)
+++ trunk/lib/plugin/RateIt.php	2016年05月25日 10:17:43 UTC (rev 9851)
@@ -528,7 +528,7 @@
 if (!$this->rating)
 $imgprops['style'] = 'display:none';
 $a0->pushContent(HTML::img($imgprops));
- $a0->addToolTip($msg);
+ $a0->addTooltip($msg);
 $html->pushContent($a0);
 }
 
Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2016年05月25日 10:01:54 UTC (rev 9850)
+++ trunk/lib/plugin/UpLoad.php	2016年05月25日 10:17:43 UTC (rev 9851)
@@ -186,7 +186,7 @@
 return HTML($message, $form);
 }
 if (move_uploaded_file($userfile_tmpname, $file_dir . $sanified_userfile_name) or
- (IsWindows() and rename($userfile_tmpname, $file_dir . $sanified_userfile_name))) {
+ (isWindows() and rename($userfile_tmpname, $file_dir . $sanified_userfile_name))) {
 $interwiki = new PageType_interwikimap();
 if (UPLOAD_USERDIR) {
 $link = $interwiki->link("[[Upload:$username/$sanified_userfile_name]]");
Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php	2016年05月25日 10:01:54 UTC (rev 9850)
+++ trunk/lib/plugin/VisualWiki.php	2016年05月25日 10:17:43 UTC (rev 9851)
@@ -548,7 +548,7 @@
 $upload_dir = getUploadDataPath();
 $tmpfile = tempnam($file_dir, "VisualWiki") . "." . $argarray['imgtype'];
 WikiPluginCached::writeImage($argarray['imgtype'], $imagehandle, $tmpfile);
- ImageDestroy($imagehandle);
+ imagedestroy($imagehandle);
 return WikiPluginCached::embedMap(1, $upload_dir . basename($tmpfile), $content['html'],
 $dbi, $argarray, $request);
 }
Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2016年05月25日 10:01:54 UTC (rev 9850)
+++ trunk/lib/plugin/text2png.php	2016年05月25日 10:17:43 UTC (rev 9851)
@@ -180,15 +180,15 @@
 $rgb = $this->hexcolor($shadowcolor, array(175, 175, 175));
 $text_color = imagecolorallocate($im, $rgb[0], $rgb[1], $rgb[2]);
 // shadow is 1 pixel down and 2 pixels right
- ImageTTFText($im, $fontsize, 0, 12, abs($s[7]) + 6, $text_color, $ttfont, $text);
+ imagettftext($im, $fontsize, 0, 12, abs($s[7]) + 6, $text_color, $ttfont, $text);
 }
 // draw text
 $rgb = $this->hexcolor($fontcolor, array(0, 0, 0));
 $text_color = imagecolorallocate($im, $rgb[0], $rgb[1], $rgb[2]);
- ImageTTFText($im, $fontsize, 0, 10, abs($s[7]) + 5, $text_color, $ttfont, $text);
+ imagettftext($im, $fontsize, 0, 10, abs($s[7]) + 5, $text_color, $ttfont, $text);
 
 /**
- * An alternate text drawing method in case ImageTTFText
+ * An alternate text drawing method in case imagettftext
 * doesn't work.
 **/
 //imagestring($im, 2, 10, 40, $text, $text_color);
@@ -198,7 +198,7 @@
 //imagepng($im);
 
 // to save to file:
- $success = ImagePng($im, $filepath . $filename);
+ $success = imagepng($im, $filepath . $filename);
 
 } else {
 $filepath .= "/";
Modified: trunk/lib/wikilens/CustomPrefs.php
===================================================================
--- trunk/lib/wikilens/CustomPrefs.php	2016年05月25日 10:01:54 UTC (rev 9850)
+++ trunk/lib/wikilens/CustomPrefs.php	2016年05月25日 10:17:43 UTC (rev 9851)
@@ -5,7 +5,7 @@
 * A list of name => _UserPreference class pairs.
 * Rationale: Certain themes should be able to extend the predefined list
 * of preferences. Display/editing is done in the theme specific userprefs.tmpl
- * but storage/sanification/update/... must be extended to the Get/SetPreferences methods.
+ * but storage/sanification/update/... must be extended to the get/setPreferences methods.
 *
 * This is just at alpha stage, a recommendation to the wikilens group.
 */
Modified: trunk/themes/Sidebar/hyperapplet.php
===================================================================
--- trunk/themes/Sidebar/hyperapplet.php	2016年05月25日 10:01:54 UTC (rev 9850)
+++ trunk/themes/Sidebar/hyperapplet.php	2016年05月25日 10:17:43 UTC (rev 9851)
@@ -10,12 +10,12 @@
 global $WikiTheme;
 ?>
 <applet code="hypergraph.applications.hexplorer.HExplorerApplet.class" align="baseline"
- archive="<?php echo $WikiTheme->_finddata("hyperapplet.jar") ?>"
+ archive="<?php echo $WikiTheme->_findData("hyperapplet.jar") ?>"
 width="160" height="360">
 <?php // the dynamic version: ?>
 <!--param name="file" value="<?php echo WikiURL("LinkDatabase", array('format' => 'xml')) ?>" /-->
 <?php // The faster static version: dump it periodically ?>
- <param name="file" value="<?php echo $WikiTheme->_finddata("LinkDatabase.xml") ?>"/>
- <!--param name="properties" value="<?php echo $WikiTheme->_finddata("hwiki.prop") ?>" /-->
+ <param name="file" value="<?php echo $WikiTheme->_findData("LinkDatabase.xml") ?>"/>
+ <!--param name="properties" value="<?php echo $WikiTheme->_findData("hwiki.prop") ?>" /-->
 <param name="center" value="<?php echo $page->getName() ?>"/>
 </applet>
Modified: trunk/themes/Sidebar/hyperwiki.php
===================================================================
--- trunk/themes/Sidebar/hyperwiki.php	2016年05月25日 10:01:54 UTC (rev 9850)
+++ trunk/themes/Sidebar/hyperwiki.php	2016年05月25日 10:17:43 UTC (rev 9851)
@@ -8,9 +8,9 @@
 // via the RPC interface it goes like this...
 ?>
 <applet code="hypergraph.applications.hwiki.HWikiApplet.class"
- archive="<?php echo $WikiTheme->_finddata("hyperwiki.jar") ?>"
+ archive="<?php echo $WikiTheme->_findData("hyperwiki.jar") ?>"
 width="162" height="240">
 <param name="startPage" value="<?php echo $page->getName() ?>"/>
- <param name="properties" value="<?php echo $WikiTheme->_finddata("hwiki.prop") ?>"/>
+ <param name="properties" value="<?php echo $WikiTheme->_findData("hwiki.prop") ?>"/>
 <param name="wikiURL" value="<?php echo PHPWIKI_BASE_URL ?>"/>
 </applet>
Modified: trunk/themes/Sidebar/themeinfo.php
===================================================================
--- trunk/themes/Sidebar/themeinfo.php	2016年05月25日 10:01:54 UTC (rev 9850)
+++ trunk/themes/Sidebar/themeinfo.php	2016年05月25日 10:17:43 UTC (rev 9851)
@@ -181,7 +181,7 @@
 * A list of name => _UserPreference class pairs.
 * Rationale: Certain themes should be able to extend the predefined list
 * of preferences. Display/editing is done in the theme specific userprefs.tmpl
- * but storage/sanification/update/... must be extended to the Get/SetPreferences methods.
+ * but storage/sanification/update/... must be extended to the get/setPreferences methods.
 * See themes/wikilens/themeinfo.php
 */
 //$this->customUserPreference();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9850
 http://sourceforge.net/p/phpwiki/code/9850
Author: vargenau
Date: 2016年05月25日 10:01:54 +0000 (2016年5月25日)
Log Message:
-----------
Be case consistent
Modified Paths:
--------------
 trunk/lib/Captcha.php
 trunk/lib/WikiPluginCached.php
 trunk/lib/plugin/AppendText.php
 trunk/lib/plugin/AuthorHistory.php
 trunk/lib/plugin/GoogleMaps.php
 trunk/lib/plugin/GraphViz.php
 trunk/lib/plugin/RateIt.php
 trunk/lib/plugin/WikiPoll.php
 trunk/lib/plugin/text2png.php
 trunk/themes/Wordpress/templates/signin.tmpl
 trunk/themes/default/templates/signin.tmpl
Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php	2016年05月25日 09:41:56 UTC (rev 9849)
+++ trunk/lib/Captcha.php	2016年05月25日 10:01:54 UTC (rev 9850)
@@ -183,15 +183,15 @@
 imageline($jpg, 0, $height - 1, $width - 1, $height - 1, $tx);
 imageline($jpg, $width - 1, 0, $width - 1, $height - 1, $tx);
 
- if (function_exists("ImageJpeg")) {
+ if (function_exists("imagejpeg")) {
 header("Content-type: image/jpeg");
- ImageJpeg($jpg);
- } elseif (function_exists("ImagePNG")) {
+ imagejpeg($jpg);
+ } elseif (function_exists("imagepng")) {
 header("Content-type: image/png");
- ImagePNG($jpg);
- } elseif (function_exists("ImageGIF")) {
+ imagepng($jpg);
+ } elseif (function_exists("imagegif")) {
 header("Content-type: image/gif");
- ImageGIF($jpg);
+ imagegif($jpg);
 } else {
 trigger_error("missing GD bitmap support", E_USER_WARNING);
 }
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2016年05月25日 09:41:56 UTC (rev 9849)
+++ trunk/lib/WikiPluginCached.php	2016年05月25日 10:01:54 UTC (rev 9850)
@@ -916,7 +916,7 @@
 $talkedallready = ob_get_contents() || headers_sent();
 if (($imgtype == 'html') || $talkedallready) {
 if (is_object($errortext))
- $errortext = $errortext->asXml();
+ $errortext = $errortext->asXML();
 trigger_error($errortext, E_USER_WARNING);
 } else {
 $red = array(255, 0, 0);
Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php	2016年05月25日 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/AppendText.php	2016年05月25日 10:01:54 UTC (rev 9850)
@@ -148,7 +148,7 @@
 
 } else {
 $link = HTML::em(WikiLink($pagename));
- $message->pushContent(HTML::raw(sprintf(_("Go to %s."), $link->asXml())));
+ $message->pushContent(HTML::raw(sprintf(_("Go to %s."), $link->asXML())));
 }
 
 return $message;
Modified: trunk/lib/plugin/AuthorHistory.php
===================================================================
--- trunk/lib/plugin/AuthorHistory.php	2016年05月25日 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/AuthorHistory.php	2016年05月25日 10:01:54 UTC (rev 9850)
@@ -136,7 +136,7 @@
 'if_known'), $nbsp),
 HTML::td($nbsp, $rev->get('summary')),
 HTML::td(array('class' => 'align-right'),
- $WikiTheme->formatdatetime($rev->get('mtime')))
+ $WikiTheme->formatDateTime($rev->get('mtime')))
 );
 
 $class = $isminor ? 'evenrow' : 'oddrow';
@@ -180,7 +180,7 @@
 $includeminor ? (HTML::td($nbsp, ($isminor ? "minor" : "major"), $nbsp)) : "",
 HTML::td($nbsp, $rev->get('summary')),
 HTML::td(array('class' => 'align-right'),
- $WikiTheme->formatdatetime($rev->get('mtime')), $nbsp)
+ $WikiTheme->formatDateTime($rev->get('mtime')), $nbsp)
 );
 
 $class = $isminor ? 'evenrow' : 'oddrow';
Modified: trunk/lib/plugin/GoogleMaps.php
===================================================================
--- trunk/lib/plugin/GoogleMaps.php	2016年05月25日 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/GoogleMaps.php	2016年05月25日 10:01:54 UTC (rev 9850)
@@ -148,7 +148,7 @@
 ($Marker
 ? "
 var point = new GPoint(" . $Longitude . "," . $Latitude . ");
-var marker = createMarker(point, '" . $markertext->asXml() . "'); map.addOverlay(marker);"
+var marker = createMarker(point, '" . $markertext->asXML() . "'); map.addOverlay(marker);"
 : "")
 );
 if ($Marker)
Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php	2016年05月25日 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/GraphViz.php	2016年05月25日 10:01:54 UTC (rev 9850)
@@ -383,7 +383,7 @@
 $source = $this->processSource($argarray);
 if (empty($source)) {
 $this->complain("No dot graph given");
- return array(false, $this->GetError());
+ return array(false, $this->getError());
 }
 //$ok = $ok and $this->createDotFile($tempfiles.'.dot', $argarray);
 
@@ -455,8 +455,8 @@
 . (file_exists("$tempfiles.map") ? filesize("$tempfiles.map") : 'missing'));
 $this->complain("\ncmd-line: $cmdline1");
 $this->complain("\ncmd-line: $cmdline2");
- //trigger_error($this->GetError(), E_USER_WARNING);
- return array(false, $this->GetError());
+ //trigger_error($this->getError(), E_USER_WARNING);
+ return array(false, $this->getError());
 }
 
 // clean up tempfiles
@@ -469,7 +469,7 @@
 if ($ok)
 return array($img, $map);
 else
- return array(false, $this->GetError());
+ return array(false, $this->getError());
 }
 
 }
Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2016年05月25日 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/RateIt.php	2016年05月25日 10:01:54 UTC (rev 9850)
@@ -506,7 +506,7 @@
 . "'$reImgId','$dimension','X')",
 'style' => 'outline: 0'));
 $msg = _("Cancel your rating");
- $imgprops = array('src' => $WikiTheme->getImageUrl("RateIt" . $imgPrefix . "Cancel"),
+ $imgprops = array('src' => $WikiTheme->getImageURL("RateIt" . $imgPrefix . "Cancel"),
 'id' => $imgId . $imgPrefix . 'Cancel',
 'alt' => $msg,
 'title' => $msg,
@@ -521,7 +521,7 @@
 $a0 = HTML::a(array('href' => "javascript:clickRating('$reImgPrefix','$rePagename','$version',"
 . "'$reImgId','$dimension','X')"));
 $msg = _("Cancel your rating");
- $imgprops = array('src' => $WikiTheme->getImageUrl("RateIt" . $imgPrefix . "Cancel"),
+ $imgprops = array('src' => $WikiTheme->getImageURL("RateIt" . $imgPrefix . "Cancel"),
 'id' => $imgId . $imgPrefix . 'Cancel',
 'alt' => $msg,
 'title' => $msg);
Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php	2016年05月25日 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/WikiPoll.php	2016年05月25日 10:01:54 UTC (rev 9850)
@@ -251,13 +251,13 @@
 private function bar($percent)
 {
 global $WikiTheme;
- return HTML(HTML::img(array('src' => $WikiTheme->getImageUrl('leftbar'),
+ return HTML(HTML::img(array('src' => $WikiTheme->getImageURL('leftbar'),
 'alt' => '<')),
- HTML::img(array('src' => $WikiTheme->getImageUrl('mainbar'),
+ HTML::img(array('src' => $WikiTheme->getImageURL('mainbar'),
 'alt' => '-',
 'width' => sprintf("%02d", $percent),
 'height' => 14)),
- HTML::img(array('src' => $WikiTheme->getImageUrl('rightbar'),
+ HTML::img(array('src' => $WikiTheme->getImageURL('rightbar'),
 'alt' => '>')));
 }
 
Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2016年05月25日 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/text2png.php	2016年05月25日 10:01:54 UTC (rev 9850)
@@ -163,7 +163,7 @@
 */
 
 // get ready to draw
- $s = ImageTTFBBox($fontsize, 0, $ttfont, $text);
+ $s = imagettfbbox($fontsize, 0, $ttfont, $text);
 $im = @imagecreate(abs($s[4]) + 20, abs($s[7]) + 10);
 if (empty($im)) {
 $error_html = _("PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details.");
Modified: trunk/themes/Wordpress/templates/signin.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/signin.tmpl	2016年05月25日 09:41:56 UTC (rev 9849)
+++ trunk/themes/Wordpress/templates/signin.tmpl	2016年05月25日 10:01:54 UTC (rev 9850)
@@ -41,7 +41,7 @@
 $userid = $user->getId();
 if ($user->isSignedIn())
 echo sprintf(_("You are signed but not authenticated as %s. "),
- asXml(HTML::a(array(
+ asXML(HTML::a(array(
 'href'=>'#',
 'title' => sprintf(_("Click to authenticate as %s"),$userid),
 'onclick'=>'SignIn(document.forms["'.$FORMNAME.'"],"'.$userid.'");'),
Modified: trunk/themes/default/templates/signin.tmpl
===================================================================
--- trunk/themes/default/templates/signin.tmpl	2016年05月25日 09:41:56 UTC (rev 9849)
+++ trunk/themes/default/templates/signin.tmpl	2016年05月25日 10:01:54 UTC (rev 9850)
@@ -33,7 +33,7 @@
 $userid = $user->getId();
 if ($user->isSignedIn()) {
 echo sprintf(_("You are signed but not authenticated as %s. "),
- asXml(HTML::a(array(
+ asXML(HTML::a(array(
 'href'=>'#',
 'title' => sprintf(_("Click to authenticate as %s"),$userid),
 'onclick'=>'SignIn(document.forms["'.$FORMNAME.'"],"'.$userid.'");'),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9849
 http://sourceforge.net/p/phpwiki/code/9849
Author: vargenau
Date: 2016年05月25日 09:41:56 +0000 (2016年5月25日)
Log Message:
-----------
Be case consistent
Modified Paths:
--------------
 trunk/lib/Captcha.php
 trunk/lib/Template.php
 trunk/lib/WikiPluginCached.php
 trunk/lib/WysiwygEdit/CKeditor.php
 trunk/lib/WysiwygEdit/Wikiwyg.php
 trunk/lib/WysiwygEdit/tinymce.php
 trunk/lib/editpage.php
 trunk/lib/loadsave.php
 trunk/lib/plugin/AddComment.php
 trunk/lib/plugin/CacheTest.php
 trunk/lib/plugin/Calendar.php
 trunk/lib/plugin/TexToPng.php
 trunk/lib/plugin/text2png.php
Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php	2016年05月25日 09:22:44 UTC (rev 9848)
+++ trunk/lib/Captcha.php	2016年05月25日 09:41:56 UTC (rev 9849)
@@ -146,10 +146,10 @@
 $height =& $this->height;
 
 // Create the Image
- $jpg = ImageCreate($width, $height);
- $bg = ImageColorAllocate($jpg, 255, 255, 255);
- $tx = ImageColorAllocate($jpg, 185, 140, 140);
- ImageFilledRectangle($jpg, 0, 0, $width, $height, $bg);
+ $jpg = imagecreate($width, $height);
+ $bg = imagecolorallocate($jpg, 255, 255, 255);
+ $tx = imagecolorallocate($jpg, 185, 140, 140);
+ imagefilledrectangle($jpg, 0, 0, $width, $height, $bg);
 
 $x = rand(0, $width);
 $y = rand(0, $height);
Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2016年05月25日 09:22:44 UTC (rev 9848)
+++ trunk/lib/Template.php	2016年05月25日 09:41:56 UTC (rev 9849)
@@ -273,7 +273,7 @@
 * For dumping pages as html to a file.
 * Used for action=dumphtml,action=ziphtml,format=pdf,format=xml
 */
-function GeneratePageasXML($content, $title, $page_revision = null, $args = array())
+function GeneratePageAsXML($content, $title, $page_revision = null, $args = array())
 {
 global $request;
 
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2016年05月25日 09:22:44 UTC (rev 9848)
+++ trunk/lib/WikiPluginCached.php	2016年05月25日 09:41:56 UTC (rev 9849)
@@ -1010,16 +1010,16 @@
 $IMAGESIZE['height'] = $IMAGESIZE['rows'] * $chary + 2 * $marginy;
 
 // create blank image
- $im = @ImageCreate($IMAGESIZE['width'], $IMAGESIZE['height']);
+ $im = @imagecreate($IMAGESIZE['width'], $IMAGESIZE['height']);
 
- $col = ImageColorAllocate($im, $textcol[0], $textcol[1], $textcol[2]);
- $bg = ImageColorAllocate($im, $bgcol[0], $bgcol[1], $bgcol[2]);
+ $col = imagecolorallocate($im, $textcol[0], $textcol[1], $textcol[2]);
+ $bg = imagecolorallocate($im, $bgcol[0], $bgcol[1], $bgcol[2]);
 
- ImageFilledRectangle($im, 0, 0, $IMAGESIZE['width'] - 1, $IMAGESIZE['height'] - 1, $bg);
+ imagefilledrectangle($im, 0, 0, $IMAGESIZE['width'] - 1, $IMAGESIZE['height'] - 1, $bg);
 
 // write text lines
 foreach ($lines as $nr => $textstr) {
- ImageString($im, $fontnr, $marginx, $marginy + $nr * $chary,
+ imagestring($im, $fontnr, $marginx, $marginy + $nr * $chary,
 $textstr, $col);
 }
 return $im;
Modified: trunk/lib/WysiwygEdit/CKeditor.php
===================================================================
--- trunk/lib/WysiwygEdit/CKeditor.php	2016年05月25日 09:22:44 UTC (rev 9848)
+++ trunk/lib/WysiwygEdit/CKeditor.php	2016年05月25日 09:41:56 UTC (rev 9849)
@@ -39,7 +39,7 @@
 {
 global $WikiTheme;
 $WikiTheme->addMoreHeaders
- (Javascript('', array('src' => $this->BasePath . 'ckeditor.js',
+ (JavaScript('', array('src' => $this->BasePath . 'ckeditor.js',
 'language' => 'JavaScript')));
 return JavaScript("
 window.onload = function()
Modified: trunk/lib/WysiwygEdit/Wikiwyg.php
===================================================================
--- trunk/lib/WysiwygEdit/Wikiwyg.php	2016年05月25日 09:22:44 UTC (rev 9848)
+++ trunk/lib/WysiwygEdit/Wikiwyg.php	2016年05月25日 09:41:56 UTC (rev 9849)
@@ -42,7 +42,7 @@
 "Wikiwyg/Wysiwyg.js", "Wikiwyg/Phpwiki.js", "Wikiwyg/HTML.js",
 "Wikiwyg/Toolbar.js") as $js) {
 $WikiTheme->addMoreHeaders
- (Javascript('', array('src' => $this->BasePath . '/' . $js,
+ (JavaScript('', array('src' => $this->BasePath . '/' . $js,
 'language' => 'JavaScript')));
 }
 $doubleClickToEdit = ($request->getPref('doubleClickEdit') or ENABLE_DOUBLECLICKEDIT)
Modified: trunk/lib/WysiwygEdit/tinymce.php
===================================================================
--- trunk/lib/WysiwygEdit/tinymce.php	2016年05月25日 09:22:44 UTC (rev 9848)
+++ trunk/lib/WysiwygEdit/tinymce.php	2016年05月25日 09:41:56 UTC (rev 9849)
@@ -31,9 +31,9 @@
 {
 global $LANG, $WikiTheme;
 $WikiTheme->addMoreHeaders
- (Javascript('', array('src' => $this->BasePath . 'tiny_mce.js',
+ (JavaScript('', array('src' => $this->BasePath . 'tiny_mce.js',
 'language' => 'JavaScript')));
- return Javascript("
+ return JavaScript("
 tinyMCE.init({
 mode : 'exact',
 elements: '$name',
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2016年05月25日 09:22:44 UTC (rev 9848)
+++ trunk/lib/editpage.php	2016年05月25日 09:41:56 UTC (rev 9849)
@@ -626,7 +626,7 @@
 $undo_btn = $WikiTheme->getImageURL("ed_undo.png");
 $undo_d_btn = $WikiTheme->getImageURL("ed_undo_d.png");
 // JS_SEARCHREPLACE from walterzorn.de
- $js = Javascript("
+ $js = JavaScript("
 uri_undo_btn = '" . $undo_btn . "'
 msg_undo_alt = '" . _("Undo") . "'
 uri_undo_d_btn = '" . $undo_d_btn . "'
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2016年05月25日 09:22:44 UTC (rev 9848)
+++ trunk/lib/loadsave.php	2016年05月25日 09:41:56 UTC (rev 9849)
@@ -651,7 +651,7 @@
 $msg = HTML();
 
 $DUMP_MODE = $WikiTheme->DUMP_MODE;
- $data = GeneratePageasXML(new Template('browse', $request, $args),
+ $data = GeneratePageAsXML(new Template('browse', $request, $args),
 $pagename, $current, $args);
 $WikiTheme->DUMP_MODE = $DUMP_MODE;
 
Modified: trunk/lib/plugin/AddComment.php
===================================================================
--- trunk/lib/plugin/AddComment.php	2016年05月25日 09:22:44 UTC (rev 9848)
+++ trunk/lib/plugin/AddComment.php	2016年05月25日 09:41:56 UTC (rev 9849)
@@ -93,7 +93,7 @@
 if ($args['jshide']) {
 $div = HTML::div(array('id' => 'comments', 'style' => 'display:none;'));
 //$list->setAttr('style','display:none;');
- $div->pushContent(Javascript("
+ $div->pushContent(JavaScript("
 function togglecomments(a) {
 comments=document.getElementById('comments');
 if (comments.style.display=='none') {
Modified: trunk/lib/plugin/CacheTest.php
===================================================================
--- trunk/lib/plugin/CacheTest.php	2016年05月25日 09:22:44 UTC (rev 9848)
+++ trunk/lib/plugin/CacheTest.php	2016年05月25日 09:41:56 UTC (rev 9849)
@@ -125,7 +125,7 @@
 function produceGraphics($text, $font)
 {
 // The idea (and some code) is stolen from the text2png plugin
- // but I did not want to use TTF. ImageString is quite ugly
+ // but I did not want to use TTF. Imagestring is quite ugly
 // and quite compatible. It's only a usage example.
 
 if ($font < 1 || $font > 5) {
@@ -134,14 +134,14 @@
 $font = 3;
 }
 
- $ok = ($im = @ImageCreate(400, 40));
- $bg_color = ImageColorAllocate($im, 240, 240, 240);
- $text_color1 = ImageColorAllocate($im, 120, 120, 120);
- $text_color2 = ImageColorAllocate($im, 0, 0, 0);
+ $ok = ($im = @imagecreate(400, 40));
+ $bg_color = imagecolorallocate($im, 240, 240, 240);
+ $text_color1 = imagecolorallocate($im, 120, 120, 120);
+ $text_color2 = imagecolorallocate($im, 0, 0, 0);
 
- ImageFilledRectangle($im, 0, 0, 149, 49, $bg_color);
- ImageString($im, $font, 11, 12, $text, $text_color1);
- ImageString($im, $font, 10, 10, $text, $text_color2);
+ imagefilledrectangle($im, 0, 0, 149, 49, $bg_color);
+ imagestring($im, $font, 11, 12, $text, $text_color1);
+ imagestring($im, $font, 10, 10, $text, $text_color2);
 
 if (!$ok) {
 // simple error handling by WikiPluginImageCache
Modified: trunk/lib/plugin/Calendar.php
===================================================================
--- trunk/lib/plugin/Calendar.php	2016年05月25日 09:22:44 UTC (rev 9848)
+++ trunk/lib/plugin/Calendar.php	2016年05月25日 09:41:56 UTC (rev 9849)
@@ -119,7 +119,7 @@
 
 $fs = $this->args['wday_format'];
 $row = HTML::tr();
- $row->setattr('class', 'cal-dayname');
+ $row->setAttr('class', 'cal-dayname');
 if ($this->args['display_weeknum'])
 $row->pushContent(HTML::td(array('class' => 'cal-dayname align-center'),
 _("Wk")));
Modified: trunk/lib/plugin/TexToPng.php
===================================================================
--- trunk/lib/plugin/TexToPng.php	2016年05月25日 09:22:44 UTC (rev 9848)
+++ trunk/lib/plugin/TexToPng.php	2016年05月25日 09:41:56 UTC (rev 9849)
@@ -287,7 +287,7 @@
 file_exists($tempfiles . '.png');
 
 if ($ok) {
- if (!($img = ImageCreateFromPNG($tempfiles . '.png'))) {
+ if (!($img = imagecreatefrompng($tempfiles . '.png'))) {
 $this->dbg("Could not open just created image file: $tempfiles");
 $ok = false;
 }
Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2016年05月25日 09:22:44 UTC (rev 9848)
+++ trunk/lib/plugin/text2png.php	2016年05月25日 09:41:56 UTC (rev 9849)
@@ -164,7 +164,7 @@
 
 // get ready to draw
 $s = ImageTTFBBox($fontsize, 0, $ttfont, $text);
- $im = @ImageCreate(abs($s[4]) + 20, abs($s[7]) + 10);
+ $im = @imagecreate(abs($s[4]) + 20, abs($s[7]) + 10);
 if (empty($im)) {
 $error_html = _("PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details.");
 // FIXME: Error manager does not transform URLs passed
@@ -175,27 +175,27 @@
 return HTML::p($error_html);
 }
 $rgb = $this->hexcolor($backcolor, array(255, 255, 255));
- $bg_color = ImageColorAllocate($im, $rgb[0], $rgb[1], $rgb[2]);
+ $bg_color = imagecolorallocate($im, $rgb[0], $rgb[1], $rgb[2]);
 if ($with_shadow) {
 $rgb = $this->hexcolor($shadowcolor, array(175, 175, 175));
- $text_color = ImageColorAllocate($im, $rgb[0], $rgb[1], $rgb[2]);
+ $text_color = imagecolorallocate($im, $rgb[0], $rgb[1], $rgb[2]);
 // shadow is 1 pixel down and 2 pixels right
 ImageTTFText($im, $fontsize, 0, 12, abs($s[7]) + 6, $text_color, $ttfont, $text);
 }
 // draw text
 $rgb = $this->hexcolor($fontcolor, array(0, 0, 0));
- $text_color = ImageColorAllocate($im, $rgb[0], $rgb[1], $rgb[2]);
+ $text_color = imagecolorallocate($im, $rgb[0], $rgb[1], $rgb[2]);
 ImageTTFText($im, $fontsize, 0, 10, abs($s[7]) + 5, $text_color, $ttfont, $text);
 
 /**
 * An alternate text drawing method in case ImageTTFText
 * doesn't work.
 **/
- //ImageString($im, 2, 10, 40, $text, $text_color);
+ //imagestring($im, 2, 10, 40, $text, $text_color);
 
 // To dump directly to browser:
 //header("Content-type: image/png");
- //ImagePng($im);
+ //imagepng($im);
 
 // to save to file:
 $success = ImagePng($im, $filepath . $filename);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9848
 http://sourceforge.net/p/phpwiki/code/9848
Author: vargenau
Date: 2016年05月25日 09:22:44 +0000 (2016年5月25日)
Log Message:
-----------
Be case consistent
Modified Paths:
--------------
 trunk/lib/RssWriter091.php
 trunk/lib/WikiGroup.php
 trunk/lib/WikiPluginCached.php
 trunk/lib/loadsave.php
 trunk/lib/pdf.php
 trunk/lib/plugin/AuthorHistory.php
 trunk/lib/plugin/FacebookLike.php
 trunk/lib/plugin/PageDump.php
 trunk/lib/plugin/RecentChanges.php
 trunk/themes/Wordpress/templates/signin.tmpl
 trunk/themes/blog/templates/calendar.tmpl
 trunk/themes/default/templates/online.tmpl
 trunk/themes/default/templates/signin.tmpl
 trunk/themes/smaller/templates/signin.tmpl
 trunk/themes/wikilens/templates/newuserwelcomepage.tmpl
Modified: trunk/lib/RssWriter091.php
===================================================================
--- trunk/lib/RssWriter091.php	2016年05月25日 09:02:48 UTC (rev 9847)
+++ trunk/lib/RssWriter091.php	2016年05月25日 09:22:44 UTC (rev 9848)
@@ -74,7 +74,7 @@
 }
 
 class _RecentChanges_RssFormatter091
- extends _RecentChanges_RSSFormatter
+ extends _RecentChanges_RssFormatter
 // This class should probably go at then of RecentChanges.php
 {
 function format($changes)
Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2016年05月25日 09:02:48 UTC (rev 9847)
+++ trunk/lib/WikiGroup.php	2016年05月25日 09:22:44 UTC (rev 9848)
@@ -87,7 +87,7 @@
 {
 global $request;
 $user = (!empty($this->user)) ? $this->user : $request->getUser();
- $username = $user->getID();
+ $username = $user->getId();
 if ($username != $this->username) {
 $this->membership = array();
 $this->username = $username;
@@ -114,7 +114,7 @@
 break;
 case "DB":
 if ($GLOBALS['DBParams']['dbtype'] == 'ADODB') {
- return new GroupDB_ADODB($not_current);
+ return new GroupDb_ADODB($not_current);
 } elseif ($GLOBALS['DBParams']['dbtype'] == 'SQL') {
 return new GroupDb_PearDB($not_current);
 } else {
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2016年05月25日 09:02:48 UTC (rev 9847)
+++ trunk/lib/WikiPluginCached.php	2016年05月25日 09:22:44 UTC (rev 9848)
@@ -570,7 +570,7 @@
 } // writeImage
 
 /**
- * Sends HTTP Header for some predefined file types.
+ * Sends HTTP header for some predefined file types.
 * There is no parameter check.
 *
 * @param string $doctype 'gif', 'png', 'jpeg', 'html'
@@ -589,7 +589,7 @@
 'wbmp' => 'Content-type: image/vnd.wap.wbmp', // wireless bitmaps for PDA's and such.
 'html' => 'Content-type: text/html');
 // Todo: swf, pdf, svg, svgz
- Header($IMAGEHEADER[$doctype]);
+ header($IMAGEHEADER[$doctype]);
 }
 
 /**
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2016年05月25日 09:02:48 UTC (rev 9847)
+++ trunk/lib/loadsave.php	2016年05月25日 09:22:44 UTC (rev 9848)
@@ -848,7 +848,7 @@
 fclose($fp);
 }
 if (!headers_sent()) {
- Header('Content-Type: application/pdf');
+ header('Content-Type: application/pdf');
 passthru($cmd);
 } else {
 $tmpdir = getUploadFilePath();
Modified: trunk/lib/pdf.php
===================================================================
--- trunk/lib/pdf.php	2016年05月25日 09:02:48 UTC (rev 9847)
+++ trunk/lib/pdf.php	2016年05月25日 09:22:44 UTC (rev 9848)
@@ -80,7 +80,7 @@
 if (defined('USE_EXTERNAL_HTML2PDF')
 and USE_EXTERNAL_HTML2PDF
 ) { // htmldoc or ghostscript + html2ps or docbook (dbdoclet, xsltproc, fop)
- Header('Content-Type: application/pdf');
+ header('Content-Type: application/pdf');
 $request->discardOutput();
 $request->buffer_output(false /*'nocompress'*/);
 require_once 'lib/WikiPluginCached.php';
Modified: trunk/lib/plugin/AuthorHistory.php
===================================================================
--- trunk/lib/plugin/AuthorHistory.php	2016年05月25日 09:02:48 UTC (rev 9847)
+++ trunk/lib/plugin/AuthorHistory.php	2016年05月25日 09:22:44 UTC (rev 9848)
@@ -128,7 +128,7 @@
 if ($authordoesmatch && (!$isminor || ($includeminor && $isminor))) {
 $difflink = Button(array('action' => 'diff',
 'previous' => 'minor'),
- $rev->getversion(), $rev);
+ $rev->getVersion(), $rev);
 $tr = HTML::tr(HTML::td(array('class' => 'align-right'),
 $difflink, $nbsp),
 $includeminor ? (HTML::td($nbsp, ($isminor ? "minor" : "major"), $nbsp)) : "",
@@ -170,7 +170,7 @@
 if ($authordoesmatch && (!$isminor || ($includeminor && $isminor))) {
 $difflink = Button(array('action' => 'diff',
 'previous' => 'minor'),
- $rev->getversion(), $rev);
+ $rev->getVersion(), $rev);
 $tr = HTML::tr(
 HTML::td($nbsp,
 ($isminor ? $rev->_pagename : WikiLink($rev->_pagename, 'auto'))
Modified: trunk/lib/plugin/FacebookLike.php
===================================================================
--- trunk/lib/plugin/FacebookLike.php	2016年05月25日 09:02:48 UTC (rev 9847)
+++ trunk/lib/plugin/FacebookLike.php	2016年05月25日 09:22:44 UTC (rev 9848)
@@ -71,7 +71,7 @@
 );
 $pagename = $request->getArg('pagename');
 $url = "http://www.facebook.com/plugins/like.php?"
- . "href=" . urlencode(WikiUrl($pagename, $urlargs, true));
+ . "href=" . urlencode(WikiURL($pagename, $urlargs, true));
 $url = str_replace("%3D", "=", $url);
 $params = array("src" => $url,
 "scrolling" => 'no',
Modified: trunk/lib/plugin/PageDump.php
===================================================================
--- trunk/lib/plugin/PageDump.php	2016年05月25日 09:02:48 UTC (rev 9847)
+++ trunk/lib/plugin/PageDump.php	2016年05月25日 09:22:44 UTC (rev 9848)
@@ -113,19 +113,19 @@
 ob_end_clean(); // clean up after hijacking $request
 //while (@ob_end_flush()); //debugging
 $filename = FilenameForPage($page);
- Header("Content-disposition: attachment; filename=\""
+ header("Content-disposition: attachment; filename=\""
 . $filename . "\"");
 // We generate 3 Content-Type headers! first in loadsave,
 // then here and the mimified string $mailified also has it!
 // This one is correct and overwrites the others.
- Header("Content-Type: application/octet-stream; name=\""
+ header("Content-Type: application/octet-stream; name=\""
 . $filename . "\"; charset=\"" . 'UTF-8'
 . "\"");
 $request->checkValidators();
 // let $request provide last modified & etag
- Header("Content-Id: <" . $this->MessageId . ">");
+ header("Content-Id: <" . $this->MessageId . ">");
 // be nice to http keepalive~s
- Header("Content-Length: " . strlen($mailified));
+ header("Content-Length: " . strlen($mailified));
 
 // Here comes our prepared mime file
 echo $mailified;
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2016年05月25日 09:02:48 UTC (rev 9847)
+++ trunk/lib/plugin/RecentChanges.php	2016年05月25日 09:22:44 UTC (rev 9848)
@@ -48,13 +48,13 @@
 if ($author) {
 $title = $author;
 if ($title == '[]') {
- $title = $request->_user->getID();
+ $title = $request->_user->getId();
 }
 $title = _("UserContribs") . ": $title";
 } elseif ($owner) {
 $title = $owner;
 if ($title == '[]') {
- $title = $request->_user->getID();
+ $title = $request->_user->getId();
 }
 $title = _("UserContribs") . ": $title";
 } elseif ($only_new) {
@@ -333,13 +333,13 @@
 if (!empty($author)) {
 global $request;
 if ($author == '[]')
- $author = $request->_user->getID();
+ $author = $request->_user->getId();
 $edits .= sprintf(_(" for pages changed by %s"), $author);
 }
 if (!empty($owner)) {
 global $request;
 if ($owner == '[]')
- $owner = $request->_user->getID();
+ $owner = $request->_user->getId();
 $edits .= sprintf(_(" for pages owned by %s"), $owner);
 }
 if (!empty($category)) {
@@ -572,8 +572,8 @@
 {
 global $request;
 extract($this->_args);
- if ($author == '[]') $author = $request->_user->getID();
- if ($owner == '[]') $owner = $request->_user->getID();
+ if ($author == '[]') $author = $request->_user->getId();
+ if ($owner == '[]') $owner = $request->_user->getId();
 $author_args = $owner
 ? array('owner' => $owner)
 : array('author' => $author);
@@ -1354,13 +1354,13 @@
 if (!empty($args['author'])) {
 global $request;
 if ($args['author'] == '[]')
- $args['author'] = $request->_user->getID();
+ $args['author'] = $request->_user->getId();
 $params['author'] = $args['author'];
 }
 if (!empty($args['owner'])) {
 global $request;
 if ($args['owner'] == '[]')
- $args['owner'] = $request->_user->getID();
+ $args['owner'] = $request->_user->getId();
 $params['owner'] = $args['owner'];
 }
 if (!empty($days)) {
Modified: trunk/themes/Wordpress/templates/signin.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/signin.tmpl	2016年05月25日 09:02:48 UTC (rev 9847)
+++ trunk/themes/Wordpress/templates/signin.tmpl	2016年05月25日 09:22:44 UTC (rev 9848)
@@ -51,7 +51,7 @@
 function SignIn(form,userid) {
 <?php if (defined('EDITING_POLICY') and $request->_dbi->isWikiPage(EDITING_POLICY)) { ?>
 if (window.focus) {
- window.open('<?php echo WikiUrl(EDITING_POLICY) ?>',<!-- url -->
+ window.open('<?php echo WikiURL(EDITING_POLICY) ?>',<!-- url -->
 'PleaseReadThisFirst',<!-- window name -->
 'width=600,height=430,scrollbars=yes,resizable=yes,toolbar=yes');
 }
Modified: trunk/themes/blog/templates/calendar.tmpl
===================================================================
--- trunk/themes/blog/templates/calendar.tmpl	2016年05月25日 09:02:48 UTC (rev 9847)
+++ trunk/themes/blog/templates/calendar.tmpl	2016年05月25日 09:22:44 UTC (rev 9848)
@@ -7,7 +7,7 @@
 var d = calendar.date.getDate(); // integer, 1..31
 m = m < 10 ? "0" + m : m;
 d = d < 10 ? "0" + d : d;
- window.location = "' . WikiUrl($WikiTheme->calendarBase(),0,1) . '/' . '" + y + "-" + m + "-" + d;
+ window.location = "' . WikiURL($WikiTheme->calendarBase(),0,1) . '/' . '" + y + "-" + m + "-" + d;
 }
 };
 Calendar.setup({flat : "calendar", flatCallback : dateChanged, setDateStatusFunc : dateStatusFunc, weekNumbers : false})') ?>
Modified: trunk/themes/default/templates/online.tmpl
===================================================================
--- trunk/themes/default/templates/online.tmpl	2016年05月25日 09:02:48 UTC (rev 9847)
+++ trunk/themes/default/templates/online.tmpl	2016年05月25日 09:22:44 UTC (rev 9848)
@@ -10,7 +10,7 @@
 
 <?php if ($mode == 'summary') {
 if ($allow_detail) {
- $url = WikiUrl($pagename,array("mode"=>"detail"));
+ $url = WikiURL($pagename,array("mode"=>"detail"));
 $header = HTML::a(array('href'=>$url,'title'=>_("Switch to detailed list")),_("Who is Online"));
 }
 ?>
@@ -53,7 +53,7 @@
 <?php } ?>
 
 <?php if ($mode == 'detail') {
- $url = WikiUrl($pagename,array("mode"=>"summary"));
+ $url = WikiURL($pagename,array("mode"=>"summary"));
 $header = HTML::a(array('href'=>$url,'title'=>_("Switch to summary")),_("Who is Online"));
 ?>
 <table class="forumline fullwidth">
Modified: trunk/themes/default/templates/signin.tmpl
===================================================================
--- trunk/themes/default/templates/signin.tmpl	2016年05月25日 09:02:48 UTC (rev 9847)
+++ trunk/themes/default/templates/signin.tmpl	2016年05月25日 09:22:44 UTC (rev 9848)
@@ -43,7 +43,7 @@
 $SignInJS = JavaScript('
 function SignIn(form,userid) {'.($editing_policy ? '
 if (window.focus) {
- window.open("' . WikiUrl(EDITING_POLICY) . '",<!-- url -->
+ window.open("' . WikiURL(EDITING_POLICY) . '",<!-- url -->
 "PleaseReadThisFirst",<!-- window name -->
 "width=600,height=430,scrollbars=yes,resizable=yes,toolbar=yes");
 }':'').'
Modified: trunk/themes/smaller/templates/signin.tmpl
===================================================================
--- trunk/themes/smaller/templates/signin.tmpl	2016年05月25日 09:02:48 UTC (rev 9847)
+++ trunk/themes/smaller/templates/signin.tmpl	2016年05月25日 09:22:44 UTC (rev 9848)
@@ -37,7 +37,7 @@
 $SignInJS = JavaScript('
 function SignIn(form,userid) {'.($editing_policy ? '
 if (window.focus) {
- window.open("' . WikiUrl(EDITING_POLICY) . '",<!-- url -->
+ window.open("' . WikiURL(EDITING_POLICY) . '",<!-- url -->
 "PleaseReadThisFirst",<!-- window name -->
 "width=600,height=430,scrollbars=yes,resizable=yes,toolbar=yes");
 }':'').'
Modified: trunk/themes/wikilens/templates/newuserwelcomepage.tmpl
===================================================================
--- trunk/themes/wikilens/templates/newuserwelcomepage.tmpl	2016年05月25日 09:02:48 UTC (rev 9847)
+++ trunk/themes/wikilens/templates/newuserwelcomepage.tmpl	2016年05月25日 09:22:44 UTC (rev 9848)
@@ -3,7 +3,7 @@
 ?>
 <div>
 <h2>Welcome <?php echo $FRIEND ?></h2>
-<p>Welcome to <?php echo WIKI_NAME ?>. A good place to learn about <?php echo WIKI_NAME ?> is to check out the <a href="<?php echo WikiUrl(WIKI_NAME.'/'
+<p>Welcome to <?php echo WIKI_NAME ?>. A good place to learn about <?php echo WIKI_NAME ?> is to check out the <a href="<?php echo WikiURL(WIKI_NAME.'/'
 ._("Tutorial"), '', true); ?>"><?php echo WIKI_NAME ?> Tutorial</a></p>
 <br />
 <?php if ($PAGE1 || $PAGE2 || $PAGE3) { ?>
@@ -12,7 +12,7 @@
 foreach (array($PAGE1, $PAGE2, $PAGE3) as $pagename) {
 if ($dbi->isWikiPage($pagename)) {
 ?>
- <a href="<?php echo WikiUrl($pagename, '', true); ?>"><?php echo $pagename ?></a><br>
+ <a href="<?php echo WikiURL($pagename, '', true); ?>"><?php echo $pagename ?></a><br>
 <?php
 }
 }
@@ -20,8 +20,8 @@
 ?>
 <br />
 <?php if ($dbi->isWikiPage($SENDERUSERNAME)) { ?>
-<p>Also, <?php echo $SENDER; ?> has his own homepage at <?php echo WIKI_NAME ?>: <a href="<?php echo WikiUrl($SENDERUSERNAME, '', true); ?>"><?php echo $SENDER ?>'s page</a></p>
+<p>Also, <?php echo $SENDER; ?> has his own homepage at <?php echo WIKI_NAME ?>: <a href="<?php echo WikiURL($SENDERUSERNAME, '', true); ?>"><?php echo $SENDER ?>'s page</a></p>
 <?php } ?>
 <br>
-<p>To create your own login on <?php echo WIKI_NAME ?>, you can <a href="<?php echo WikiUrl('NewUserRegister', '', true) ?>">Register</a></p>
+<p>To create your own login on <?php echo WIKI_NAME ?>, you can <a href="<?php echo WikiURL('NewUserRegister', '', true) ?>">Register</a></p>
 </div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9847
 http://sourceforge.net/p/phpwiki/code/9847
Author: vargenau
Date: 2016年05月25日 09:02:48 +0000 (2016年5月25日)
Log Message:
-----------
Be case consistent
Modified Paths:
--------------
 trunk/config/config-dist.ini
 trunk/lib/PageList.php
 trunk/lib/WikiPlugin.php
 trunk/lib/WikiPluginCached.php
 trunk/lib/plugin/FuzzyPages.php
 trunk/lib/plugin/PageGroup.php
 trunk/lib/plugin/PhotoAlbum.php
 trunk/lib/plugin/PrevNext.php
 trunk/lib/plugin/TeX2png.php
 trunk/lib/plugin/VisualWiki.php
 trunk/lib/plugin/text2png.php
 trunk/themes/Hawaiian/themeinfo.php
 trunk/themes/MacOSX/themeinfo.php
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2016年05月25日 08:49:19 UTC (rev 9846)
+++ trunk/config/config-dist.ini	2016年05月25日 09:02:48 UTC (rev 9847)
@@ -1305,7 +1305,7 @@
 ; (As it is the case for a graphical site map.)
 ;PLUGIN_CACHED_FORCE_SYNCMAP = true
 
-; If ImageTypes() does not exist (PHP < 4.0.2) allow the
+; If imagetypes() does not exist (PHP < 4.0.2) allow the
 ; following image formats (IMG_PNG | IMG_GIF | IMG_JPG | IMG_WBMP)
 ; In principal all image types which are compiled into php:
 ; libgd, libpng, libjpeg, libungif, libtiff, libgd2, ...
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2016年05月25日 08:49:19 UTC (rev 9846)
+++ trunk/lib/PageList.php	2016年05月25日 09:02:48 UTC (rev 9847)
@@ -90,7 +90,7 @@
 //Fixme: pass all also other GET args along. (limit, p[])
 //TODO: support GET and POST
 $s = HTML::a(array('href' =>
- $request->GetURLtoSelf(array('sortby' => $sortby)),
+ $request->getURLtoSelf(array('sortby' => $sortby)),
 'class' => 'pagetitle',
 'title' => sprintf(_("Sort by %s"), $this->_field)),
 HTML::u($this->_heading));
@@ -140,7 +140,7 @@
 }
 $s = HTML::a(array('href' =>
 //Fixme: pass all also other GET args along. (limit is ok, p[])
- $request->GetURLtoSelf(array('sortby' => $sortby,
+ $request->getURLtoSelf(array('sortby' => $sortby,
 'id' => $pagelist->id)),
 'class' => 'gridbutton',
 'title' => sprintf($title, $this->_heading)),
Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2016年05月25日 08:49:19 UTC (rev 9846)
+++ trunk/lib/WikiPlugin.php	2016年05月25日 09:02:48 UTC (rev 9847)
@@ -454,7 +454,7 @@
 } else
 if (stristr($default, ' '))
 $default = "'$default'";
- $arguments->pushcontent("$arg=$default", HTML::br());
+ $arguments->pushContent("$arg=$default", HTML::br());
 }
 return $arguments;
 }
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2016年05月25日 08:49:19 UTC (rev 9846)
+++ trunk/lib/WikiPluginCached.php	2016年05月25日 09:02:48 UTC (rev 9847)
@@ -534,7 +534,7 @@
 'xbm' => IMG_XBM,
 */
 );
- $presenttypes = ImageTypes();
+ $presenttypes = imagetypes();
 foreach ($imagetypes as $imgtype => $bitmask)
 if ($presenttypes && $bitmask)
 array_push($supportedtypes, $imgtype);
Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php	2016年05月25日 08:49:19 UTC (rev 9846)
+++ trunk/lib/plugin/FuzzyPages.php	2016年05月25日 09:02:48 UTC (rev 9847)
@@ -198,7 +198,7 @@
 $debug_metaphone = sprintf("(%s, %s)", metaphone($pagename),
 $this->_searchterm_metaphone);
 
- $row->pushcontent(HTML::td(array('class' => 'align-center'), $debug_spelling),
+ $row->pushContent(HTML::td(array('class' => 'align-center'), $debug_spelling),
 HTML::td(array('class' => 'align-center'), $debug_sound),
 HTML::td($debug_metaphone));
 }
Modified: trunk/lib/plugin/PageGroup.php
===================================================================
--- trunk/lib/plugin/PageGroup.php	2016年05月25日 08:49:19 UTC (rev 9846)
+++ trunk/lib/plugin/PageGroup.php	2016年05月25日 09:02:48 UTC (rev 9847)
@@ -145,8 +145,8 @@
 
 $go = array('previous', 'next');
 $links = HTML();
- $links->pushcontent($label);
- $links->pushcontent(" [ "); // an experiment
+ $links->pushContent($label);
+ $links->pushContent(" [ "); // an experiment
 $lastindex = count($c) - 1; // array is 0-based, count is 1-based!
 
 foreach ($go as $go_item) {
@@ -161,8 +161,8 @@
 // mind the French : punctuation
 $text = fmt("%s: %s", $directions[$go_item],
 $WikiTheme->makeLinkButton($linkpage));
- $links->pushcontent($text);
- $links->pushcontent($sep); // this works because
+ $links->pushContent($text);
+ $links->pushContent($sep); // this works because
 // there are only 2 go
 // items, previous,next
 } else {
@@ -172,8 +172,8 @@
 $linkpage = $c[$thispage - 1];
 $text = fmt("%s: %s", $directions[$go_item],
 $WikiTheme->makeLinkButton($linkpage));
- $links->pushcontent($text);
- $links->pushcontent($sep); //this works
+ $links->pushContent($text);
+ $links->pushContent($sep); //this works
 //because there are
 //only 2 go items,
 //previous,next
@@ -197,10 +197,10 @@
 $WikiTheme->makeLinkButton($linkpage));
 }
 }
- $links->pushcontent($text);
+ $links->pushContent($text);
 }
 }
- $links->pushcontent(" ] "); // an experiment
+ $links->pushContent(" ] "); // an experiment
 return $links;
 }
 }
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2016年05月25日 08:49:19 UTC (rev 9846)
+++ trunk/lib/plugin/PhotoAlbum.php	2016年05月25日 09:02:48 UTC (rev 9847)
@@ -491,9 +491,9 @@
 $p
 ) {
 if ($mode == 'row')
- $html->pushcontent(HTML::div($row));
+ $html->pushContent(HTML::div($row));
 else
- $html->pushcontent(HTML::tr($row));
+ $html->pushContent(HTML::tr($row));
 $row->setContent('');
 }
 }
Modified: trunk/lib/plugin/PrevNext.php
===================================================================
--- trunk/lib/plugin/PrevNext.php	2016年05月25日 08:49:19 UTC (rev 9846)
+++ trunk/lib/plugin/PrevNext.php	2016年05月25日 09:02:48 UTC (rev 9847)
@@ -99,9 +99,9 @@
 if ($align == 'center') {
 $tr->pushContent(HTML::td(array('class' => 'align-'.$align), " [ "));
 } elseif ($align == 'right') {
- $td->pushcontent(" [ ");
+ $td->pushContent(" [ ");
 } else {
- $links->pushcontent(" [ ");
+ $links->pushContent(" [ ");
 }
 }
 $last_is_text = false;
@@ -117,9 +117,9 @@
 if ($align == 'center') {
 $tr->pushContent(HTML::td(array('class' => 'align-'.$align), $sep));
 } elseif ($align == 'right') {
- $td->pushcontent($sep);
+ $td->pushContent($sep);
 } else {
- $links->pushcontent($sep);
+ $links->pushContent($sep);
 }
 }
 if ($align == 'center') {
@@ -127,7 +127,7 @@
 } elseif ($align == 'right') {
 $td->pushContent(new ImageButton($label, $url, false, $imgurl));
 } else {
- $links->pushcontent(new ImageButton($label, $url, false, $imgurl));
+ $links->pushContent(new ImageButton($label, $url, false, $imgurl));
 }
 $last_is_text = false;
 // generic version: prev.gif
@@ -136,9 +136,9 @@
 if ($align == 'center') {
 $tr->pushContent(HTML::td(array('class' => 'align-'.$align), $sep));
 } elseif ($align == 'right') {
- $td->pushcontent($sep);
+ $td->pushContent($sep);
 } else {
- $links->pushcontent($sep);
+ $links->pushContent($sep);
 }
 }
 if ($align == 'center') {
@@ -146,7 +146,7 @@
 } elseif ($align == 'right') {
 $td->pushContent(new ImageButton($label, $url, false, $imgurl));
 } else {
- $links->pushcontent(new ImageButton($label, $url, false, $imgurl));
+ $links->pushContent(new ImageButton($label, $url, false, $imgurl));
 }
 $last_is_text = false;
 } else { // text only
@@ -154,9 +154,9 @@
 if ($align == 'center') {
 $tr->pushContent(HTML::td(array('class' => 'align-'.$align), $sep));
 } elseif ($align == 'right') {
- $td->pushcontent($sep);
+ $td->pushContent($sep);
 } else {
- $links->pushcontent($sep);
+ $links->pushContent($sep);
 }
 }
 if ($align == 'center') {
@@ -164,7 +164,7 @@
 } elseif ($align == 'right') {
 $td->pushContent(new Button($label, $url, $class));
 } else {
- $links->pushcontent(new Button($label, $url, $class));
+ $links->pushContent(new Button($label, $url, $class));
 }
 $last_is_text = true;
 }
@@ -173,9 +173,9 @@
 if ($align == 'center') {
 $tr->pushContent(HTML::td(array('class' => 'align-'.$align), $sep));
 } elseif ($align == 'right') {
- $td->pushcontent($sep);
+ $td->pushContent($sep);
 } else {
- $links->pushcontent($sep);
+ $links->pushContent($sep);
 }
 }
 if ($align == 'center') {
@@ -183,7 +183,7 @@
 } elseif ($align == 'right') {
 $td->pushContent(new Button($label, $url, $class));
 } else {
- $links->pushcontent(new Button($label, $url, $class));
+ $links->pushContent(new Button($label, $url, $class));
 }
 $last_is_text = true;
 }
@@ -194,9 +194,9 @@
 if ($align == 'center') {
 $tr->pushContent(HTML::td(array('class' => 'align-'.$align), " ] "));
 } elseif ($align == 'right') {
- $td->pushcontent(" ] ");
+ $td->pushContent(" ] ");
 } else {
- $links->pushcontent(" ] ");
+ $links->pushContent(" ] ");
 }
 }
 return $links;
Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php	2016年05月25日 08:49:19 UTC (rev 9846)
+++ trunk/lib/plugin/TeX2png.php	2016年05月25日 09:02:48 UTC (rev 9847)
@@ -221,7 +221,7 @@
 function run($dbi, $argstr, &$request, $basepage)
 {
 // from text2png.php
- if (ImageTypes() & IMG_PNG) {
+ if (imagetypes() & IMG_PNG) {
 // we have gd & png so go ahead.
 extract($this->getArgs($argstr, $request));
 return $this->tex2png($text);
Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php	2016年05月25日 08:49:19 UTC (rev 9846)
+++ trunk/lib/plugin/VisualWiki.php	2016年05月25日 09:02:48 UTC (rev 9847)
@@ -91,19 +91,19 @@
 function getDefaultArguments()
 {
 if (VISUALWIKI_ALLOWOPTIONS)
- return $this->defaultarguments();
+ return $this->defaultArguments();
 else
 return array();
 }
 
 /**
 * Substitutes each forbidden parameter value by the default value
- * defined in <code>defaultarguments</code>.
+ * defined in <code>defaultArguments</code>.
 */
 function checkArguments(&$arg)
 {
 extract($arg);
- $def = $this->defaultarguments();
+ $def = $this->defaultArguments();
 if (($width < 3) || ($width > 15))
 $arg['width'] = $def['width'];
 if (($height < 3) || ($height > 20))
@@ -147,7 +147,7 @@
 protected function getMap($dbi, $argarray, $request)
 {
 if (!VISUALWIKI_ALLOWOPTIONS)
- $argarray = $this->defaultarguments();
+ $argarray = $this->defaultArguments();
 $this->checkArguments($argarray);
 $request->setArg('debug', $argarray['debug']);
 //extract($argarray);
@@ -171,7 +171,7 @@
 */
 function helpImage()
 {
- $def = $this->defaultarguments();
+ $def = $this->defaultArguments();
 $other_imgtypes = $GLOBALS['PLUGIN_CACHED_IMGTYPES'];
 unset ($other_imgtypes[$def['imgtype']]);
 $helparr = array(
@@ -535,7 +535,7 @@
 private function embedImg($url, &$dbi, $argarray, &$request)
 {
 if (!VISUALWIKI_ALLOWOPTIONS)
- $argarray = $this->defaultarguments();
+ $argarray = $this->defaultArguments();
 $this->checkArguments($argarray);
 //extract($argarray);
 if ($argarray['help'])
Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2016年05月25日 08:49:19 UTC (rev 9846)
+++ trunk/lib/plugin/text2png.php	2016年05月25日 09:02:48 UTC (rev 9847)
@@ -75,7 +75,7 @@
 */
 function run($dbi, $argstr, &$request, $basepage)
 {
- if (ImageTypes() & IMG_PNG) {
+ if (imagetypes() & IMG_PNG) {
 // we have gd & png so go ahead.
 $args = $this->getArgs($argstr, $request);
 return $this->text2png($args);
Modified: trunk/themes/Hawaiian/themeinfo.php
===================================================================
--- trunk/themes/Hawaiian/themeinfo.php	2016年05月25日 08:49:19 UTC (rev 9846)
+++ trunk/themes/Hawaiian/themeinfo.php	2016年05月25日 09:02:48 UTC (rev 9847)
@@ -19,7 +19,7 @@
 // FIXME: this is a hack which will not be needed once
 // we have dynamic CSS.
 $css = WikiTheme::getCSS();
- $css->pushcontent(HTML::style(array('type' => 'text/css'),
+ $css->pushContent(HTML::style(array('type' => 'text/css'),
 new RawXml(sprintf("<!--\nbody {background-image: url(%s);}\n-->",
 $this->getImageURL('uhhbackground.jpg')))));
 return $css;
Modified: trunk/themes/MacOSX/themeinfo.php
===================================================================
--- trunk/themes/MacOSX/themeinfo.php	2016年05月25日 08:49:19 UTC (rev 9846)
+++ trunk/themes/MacOSX/themeinfo.php	2016年05月25日 09:02:48 UTC (rev 9847)
@@ -38,7 +38,7 @@
 // FIXME: this is a hack which will not be needed once
 // we have dynamic CSS.
 $css = WikiTheme::getCSS();
- $css->pushcontent(HTML::style(array('type' => 'text/css'),
+ $css->pushContent(HTML::style(array('type' => 'text/css'),
 new RawXml(sprintf("<!--\nbody {background-image: url(%s);}\n-->\n",
 $this->getImageURL('bgpaper8')))));
 //for non-browse pages, like former editpage, message etc.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9846
 http://sourceforge.net/p/phpwiki/code/9846
Author: vargenau
Date: 2016年05月25日 08:49:19 +0000 (2016年5月25日)
Log Message:
-----------
PageList: be case consistent
Modified Paths:
--------------
 trunk/lib/stdlib.php
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2016年05月25日 08:47:34 UTC (rev 9845)
+++ trunk/lib/stdlib.php	2016年05月25日 08:49:19 UTC (rev 9846)
@@ -1377,7 +1377,7 @@
 
 if ($sortby) {
 require_once 'lib/PageList.php';
- switch (Pagelist::sortby($sortby, 'db')) {
+ switch (PageList::sortby($sortby, 'db')) {
 case 'pagename ASC':
 break;
 case 'pagename DESC':
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9845
 http://sourceforge.net/p/phpwiki/code/9845
Author: vargenau
Date: 2016年05月25日 08:47:34 +0000 (2016年5月25日)
Log Message:
-----------
FileSet: be case consistent
Modified Paths:
--------------
 trunk/SOAP.php
 trunk/lib/XmlRpcServer.php
 trunk/lib/editpage.php
 trunk/lib/plugin/PhotoAlbum.php
 trunk/lib/plugin/PluginManager.php
 trunk/lib/plugin/WikiAdminSelect.php
 trunk/lib/plugin/WikiTranslation.php
 trunk/lib/stdlib.php
 trunk/lib/upgrade.php
 trunk/themes/Hawaiian/lib/random.php
Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php	2016年05月25日 08:34:43 UTC (rev 9844)
+++ trunk/SOAP.php	2016年05月25日 08:47:34 UTC (rev 9845)
@@ -245,7 +245,7 @@
 $plugin_dir = 'lib/plugin';
 if (defined('PHPWIKI_DIR'))
 $plugin_dir = PHPWIKI_DIR . "/$plugin_dir";
- $pd = new fileSet($plugin_dir, '*.php');
+ $pd = new FileSet($plugin_dir, '*.php');
 $plugins = $pd->getFiles();
 unset($pd);
 sort($plugins);
Modified: trunk/lib/XmlRpcServer.php
===================================================================
--- trunk/lib/XmlRpcServer.php	2016年05月25日 08:34:43 UTC (rev 9844)
+++ trunk/lib/XmlRpcServer.php	2016年05月25日 08:47:34 UTC (rev 9845)
@@ -696,7 +696,7 @@
 $plugin_dir = 'lib/plugin';
 if (defined('PHPWIKI_DIR'))
 $plugin_dir = PHPWIKI_DIR . "/$plugin_dir";
- $pd = new fileSet($plugin_dir, '*.php');
+ $pd = new FileSet($plugin_dir, '*.php');
 $plugins = $pd->getFiles();
 unset($pd);
 sort($plugins);
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2016年05月25日 08:34:43 UTC (rev 9844)
+++ trunk/lib/editpage.php	2016年05月25日 08:47:34 UTC (rev 9845)
@@ -833,7 +833,7 @@
 $plugin_dir = 'lib/plugin';
 if (defined('PHPWIKI_DIR'))
 $plugin_dir = PHPWIKI_DIR . "/$plugin_dir";
- $pd = new fileSet($plugin_dir, '*.php');
+ $pd = new FileSet($plugin_dir, '*.php');
 $plugins = $pd->getFiles();
 unset($pd);
 sort($plugins);
@@ -942,12 +942,12 @@
 global $WikiTheme, $request;
 
 $image_dir = getUploadFilePath();
- $pd = new imageOrVideoSet($image_dir, '*');
+ $pd = new ImageOrVideoSet($image_dir, '*');
 $images = $pd->getFiles();
 unset($pd);
 if (defined('UPLOAD_USERDIR') and UPLOAD_USERDIR) {
 $image_dir .= "/" . $request->_user->_userid;
- $pd = new imageOrVideoSet($image_dir, '*');
+ $pd = new ImageOrVideoSet($image_dir, '*');
 $images = array_merge($images, $pd->getFiles());
 unset($pd);
 }
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2016年05月25日 08:34:43 UTC (rev 9844)
+++ trunk/lib/plugin/PhotoAlbum.php	2016年05月25日 08:47:34 UTC (rev 9845)
@@ -590,7 +590,7 @@
 //all images
 $list = array();
 foreach (array('jpeg', 'jpg', 'png', 'gif') as $ext) {
- $fileset = new fileSet($src, "*.$ext");
+ $fileset = new FileSet($src, "*.$ext");
 $list = array_merge($list, $fileset->getFiles());
 }
 // convert dirname($src) (local fs path) to web path
Modified: trunk/lib/plugin/PluginManager.php
===================================================================
--- trunk/lib/plugin/PluginManager.php	2016年05月25日 08:34:43 UTC (rev 9844)
+++ trunk/lib/plugin/PluginManager.php	2016年05月25日 08:47:34 UTC (rev 9845)
@@ -90,7 +90,7 @@
 $plugin_dir = 'lib/plugin';
 if (defined('PHPWIKI_DIR'))
 $plugin_dir = PHPWIKI_DIR . "/$plugin_dir";
- $pd = new fileSet($plugin_dir, '*.php');
+ $pd = new FileSet($plugin_dir, '*.php');
 $plugins = $pd->getFiles();
 unset($pd);
 sort($plugins);
Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php	2016年05月25日 08:34:43 UTC (rev 9844)
+++ trunk/lib/plugin/WikiAdminSelect.php	2016年05月25日 08:47:34 UTC (rev 9845)
@@ -173,7 +173,7 @@
 $plugin_dir = 'lib/plugin';
 if (defined('PHPWIKI_DIR'))
 $plugin_dir = PHPWIKI_DIR . "/$plugin_dir";
- $fs = new fileSet($plugin_dir, 'WikiAdmin*.php');
+ $fs = new FileSet($plugin_dir, 'WikiAdmin*.php');
 $actions = $fs->getFiles();
 sort($actions);
 foreach ($actions as $f) {
Modified: trunk/lib/plugin/WikiTranslation.php
===================================================================
--- trunk/lib/plugin/WikiTranslation.php	2016年05月25日 08:34:43 UTC (rev 9844)
+++ trunk/lib/plugin/WikiTranslation.php	2016年05月25日 08:47:34 UTC (rev 9845)
@@ -438,7 +438,7 @@
 $exclude = $pagelist->explodePageList($exclude, false, $sortby,
 $limit, $exclude);
 $path = FindLocalizedFile(WIKI_PGSRC);
- $pgsrc = new fileSet($path);
+ $pgsrc = new FileSet($path);
 foreach ($pgsrc->getFiles($exclude, $sortby, $limit) as $pagename) {
 $pagename = urldecode($pagename);
 if (substr($pagename, -1, 1) == '~') continue;
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2016年05月25日 08:34:43 UTC (rev 9844)
+++ trunk/lib/stdlib.php	2016年05月25日 08:47:34 UTC (rev 9845)
@@ -54,10 +54,10 @@
 
 file_mtime ($filename)
 sort_file_mtime ($a, $b)
- class fileSet {fileSet($directory, $filepattern = false),
+ class FileSet {FileSet($directory, $filepattern = false),
 getFiles($exclude='', $sortby='', $limit='') }
- class imageSet extends fileSet
- class imageOrVideoSet extends fileSet
+ class ImageSet extends FileSet
+ class ImageOrVideoSet extends FileSet
 
 glob_to_pcre ($glob)
 glob_match ($glob, $against, $case_sensitive = true)
@@ -1333,7 +1333,7 @@
 return ($ma > $mb) ? -1 : 1;
 }
 
-class fileSet
+class FileSet
 {
 function __construct($directory, $filepattern = false)
 {
@@ -1410,7 +1410,7 @@
 }
 }
 
-class imageSet extends fileSet
+class ImageSet extends FileSet
 {
 /**
 * A file is considered an image when the suffix matches one from
@@ -1422,7 +1422,7 @@
 }
 }
 
-class imageOrVideoSet extends fileSet
+class ImageOrVideoSet extends FileSet
 {
 protected function _filenameSelector($filename)
 {
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2016年05月25日 08:34:43 UTC (rev 9844)
+++ trunk/lib/upgrade.php	2016年05月25日 08:47:34 UTC (rev 9845)
@@ -135,7 +135,7 @@
 $this->_rename_page_helper("InterWikiKarte", "InterWikiListe"); // german only
 
 $path = FindFile('pgsrc');
- $pgsrc = new fileSet($path);
+ $pgsrc = new FileSet($path);
 // most actionpages have the same name as the plugin
 $loc_path = FindLocalizedFile('pgsrc');
 foreach ($pgsrc->getFiles() as $filename) {
@@ -161,10 +161,10 @@
 // theme specific and global pgsrc
 global $WikiTheme;
 $path = $WikiTheme->file("pgsrc");
- // TBD: the call to fileSet prints a warning:
+ // TBD: the call to FileSet prints a warning:
 // Notice: Unable to open directory 'themes/MonoBook/pgsrc' for reading
 $themepgsrc = array();
- $pgsrc = new fileSet($path);
+ $pgsrc = new FileSet($path);
 if ($pgsrc->getFiles()) {
 echo "<h2>", sprintf(_("Check for necessary theme %s updates"),
 "pgsrc"), "</h2>\n";
@@ -188,7 +188,7 @@
 } else {
 $path = FindLocalizedFile(WIKI_PGSRC);
 }
- $pgsrc = new fileSet($path);
+ $pgsrc = new FileSet($path);
 // fixme: verification, ...
 foreach ($pgsrc->getFiles() as $filename) {
 if (substr($filename, -1, 1) == '~') continue;
Modified: trunk/themes/Hawaiian/lib/random.php
===================================================================
--- trunk/themes/Hawaiian/lib/random.php	2016年05月25日 08:34:43 UTC (rev 9844)
+++ trunk/themes/Hawaiian/lib/random.php	2016年05月25日 08:47:34 UTC (rev 9845)
@@ -12,7 +12,7 @@
 
 $this->filename = ""; // Pick up your filename here.
 
- $_imageSet = new imageSet($dirname);
+ $_imageSet = new ImageSet($dirname);
 $this->imageList = $_imageSet->getFiles();
 unset($_imageSet);
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9844
 http://sourceforge.net/p/phpwiki/code/9844
Author: vargenau
Date: 2016年05月25日 08:34:43 +0000 (2016年5月25日)
Log Message:
-----------
RssWriter: be case consistent
Modified Paths:
--------------
 trunk/lib/plugin/RecentChanges.php
 trunk/lib/plugin/RelatedChanges.php
Added Paths:
-----------
 trunk/lib/RssWriter091.php
Removed Paths:
-------------
 trunk/lib/RSSWriter091.php
Deleted: trunk/lib/RSSWriter091.php
===================================================================
--- trunk/lib/RSSWriter091.php	2016年05月25日 08:12:23 UTC (rev 9843)
+++ trunk/lib/RSSWriter091.php	2016年05月25日 08:34:43 UTC (rev 9844)
@@ -1,134 +0,0 @@
-<?php
-// ----------------------------------------------------------------------
-// phpWiki
-// ----------------------------------------------------------------------
-// LICENSE
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License (GPL)
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// To read the license please visit http://www.gnu.org/copyleft/gpl.html
-// ----------------------------------------------------------------------
-// Original Author of file: Lawrence Akka
-// Purpose of file: Plugin and associated classes
-// for outputting RecentChanges in RSS 0.91 format
-// ----------------------------------------------------------------------
-
-include_once 'lib/RssWriter.php';
-class RSSWriter091 extends RSSWriter
-{
- function __construct()
- {
- $this->XmlElement('rss', array('version' => "0.91"));
- $this->_items = array();
- }
-
- /**
- * Finish construction of RSS.
- */
- function finish()
- {
- if (isset($this->_finished))
- return;
-
- $channel = &$this->_channel;
- $items = &$this->_items;
-
- if ($items) {
- foreach ($items as $i)
- $channel->pushContent($i);
- }
- $this->pushContent($channel);
- $this->__spew();
- $this->_finished = true;
- }
-
- /**
- * Create a new RDF <em>typedNode</em>.
- */
- function __node($type, $properties, $uri = false)
- {
- return new XmlElement($type, '',
- $this->__elementize($properties));
- }
-
- /**
- * Write output to HTTP client.
- */
- function __spew()
- {
- header("Content-Type: application/xml; charset=UTF-8");
- print("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
- print("<!DOCTYPE rss PUBLIC \"-//Netscape Communications//DTD RSS 0.91//EN\"\n");
- print("\"http://my.netscape.com/publish/formats/rss-0.91.dtd\">\n\n");
- $this->printXML();
- }
-
-}
-
-class _RecentChanges_RssFormatter091
- extends _RecentChanges_RSSFormatter
-// This class should probably go at then of RecentChanges.php
-{
- function format($changes)
- {
- // include_once('lib/RssWriter.php');
- $rss = new RssWriter091;
-
- $rss->channel($this->channel_properties());
-
- if (($props = $this->image_properties()))
- $rss->image($props);
- if (($props = $this->textinput_properties()))
- $rss->textinput($props);
-
- while ($rev = $changes->next()) {
- $rss->addItem($this->item_properties($rev),
- $this->pageURI($rev));
- }
-
- global $request;
- $request->discardOutput();
- $rss->finish();
- $request->finish(); // NORETURN!!!!
- }
-
- function channel_properties()
- {
- global $request;
-
- $rc_url = WikiURL($request->getArg('pagename'), array(), 'absurl');
-
- return array('title' => WIKI_NAME,
- 'description' => _("RecentChanges"),
- 'link' => $rc_url,
- 'language' => 'en-US');
-
- /* FIXME: language should come from $LANG (or other config variable). */
-
- /* FIXME: other things one might like in <channel>:
- * managingEditor
- * webmaster
- * lastBuildDate
- * copyright
- */
- }
-
- function item_properties($rev)
- {
- $page = $rev->getPage();
- $pagename = $page->getName();
-
- return array('title' => SplitPagename($pagename),
- 'description' => $this->summary($rev),
- 'link' => $this->pageURL($rev)
- );
- }
-}
Copied: trunk/lib/RssWriter091.php (from rev 9843, trunk/lib/RSSWriter091.php)
===================================================================
--- trunk/lib/RssWriter091.php	 (rev 0)
+++ trunk/lib/RssWriter091.php	2016年05月25日 08:34:43 UTC (rev 9844)
@@ -0,0 +1,134 @@
+<?php
+// ----------------------------------------------------------------------
+// phpWiki
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+// Original Author of file: Lawrence Akka
+// Purpose of file: Plugin and associated classes
+// for outputting RecentChanges in RSS 0.91 format
+// ----------------------------------------------------------------------
+
+include_once 'lib/RssWriter.php';
+class RssWriter091 extends RssWriter
+{
+ function __construct()
+ {
+ $this->XmlElement('rss', array('version' => "0.91"));
+ $this->_items = array();
+ }
+
+ /**
+ * Finish construction of RSS.
+ */
+ function finish()
+ {
+ if (isset($this->_finished))
+ return;
+
+ $channel = &$this->_channel;
+ $items = &$this->_items;
+
+ if ($items) {
+ foreach ($items as $i)
+ $channel->pushContent($i);
+ }
+ $this->pushContent($channel);
+ $this->__spew();
+ $this->_finished = true;
+ }
+
+ /**
+ * Create a new RDF <em>typedNode</em>.
+ */
+ function __node($type, $properties, $uri = false)
+ {
+ return new XmlElement($type, '',
+ $this->__elementize($properties));
+ }
+
+ /**
+ * Write output to HTTP client.
+ */
+ function __spew()
+ {
+ header("Content-Type: application/xml; charset=UTF-8");
+ print("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
+ print("<!DOCTYPE rss PUBLIC \"-//Netscape Communications//DTD RSS 0.91//EN\"\n");
+ print("\"http://my.netscape.com/publish/formats/rss-0.91.dtd\">\n\n");
+ $this->printXML();
+ }
+
+}
+
+class _RecentChanges_RssFormatter091
+ extends _RecentChanges_RSSFormatter
+// This class should probably go at then of RecentChanges.php
+{
+ function format($changes)
+ {
+ // include_once('lib/RssWriter.php');
+ $rss = new RssWriter091;
+
+ $rss->channel($this->channel_properties());
+
+ if (($props = $this->image_properties()))
+ $rss->image($props);
+ if (($props = $this->textinput_properties()))
+ $rss->textinput($props);
+
+ while ($rev = $changes->next()) {
+ $rss->addItem($this->item_properties($rev),
+ $this->pageURI($rev));
+ }
+
+ global $request;
+ $request->discardOutput();
+ $rss->finish();
+ $request->finish(); // NORETURN!!!!
+ }
+
+ function channel_properties()
+ {
+ global $request;
+
+ $rc_url = WikiURL($request->getArg('pagename'), array(), 'absurl');
+
+ return array('title' => WIKI_NAME,
+ 'description' => _("RecentChanges"),
+ 'link' => $rc_url,
+ 'language' => 'en-US');
+
+ /* FIXME: language should come from $LANG (or other config variable). */
+
+ /* FIXME: other things one might like in <channel>:
+ * managingEditor
+ * webmaster
+ * lastBuildDate
+ * copyright
+ */
+ }
+
+ function item_properties($rev)
+ {
+ $page = $rev->getPage();
+ $pagename = $page->getName();
+
+ return array('title' => SplitPagename($pagename),
+ 'description' => $this->summary($rev),
+ 'link' => $this->pageURL($rev)
+ );
+ }
+}
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2016年05月25日 08:12:23 UTC (rev 9843)
+++ trunk/lib/plugin/RecentChanges.php	2016年05月25日 08:34:43 UTC (rev 9844)
@@ -1417,7 +1417,7 @@
 elseif ($format == 'atom')
 $fmt_class = '_RecentChanges_AtomFormatter';
 elseif ($format == 'rss091') {
- include_once 'lib/RSSWriter091.php';
+ include_once 'lib/RssWriter091.php';
 $fmt_class = '_RecentChanges_RssFormatter091';
 } elseif ($format == 'sidebar')
 $fmt_class = '_RecentChanges_SideBarFormatter';
Modified: trunk/lib/plugin/RelatedChanges.php
===================================================================
--- trunk/lib/plugin/RelatedChanges.php	2016年05月25日 08:12:23 UTC (rev 9843)
+++ trunk/lib/plugin/RelatedChanges.php	2016年05月25日 08:34:43 UTC (rev 9844)
@@ -105,7 +105,7 @@
 $fmt_class = '_RecentChanges_RssFormatter';
 elseif ($format == 'rss2')
 $fmt_class = '_RecentChanges_Rss2Formatter'; elseif ($format == 'rss091') {
- include_once 'lib/RSSWriter091.php';
+ include_once 'lib/RssWriter091.php';
 $fmt_class = '_RecentChanges_RssFormatter091';
 } elseif ($format == 'sidebar')
 $fmt_class = '_RecentChanges_SideBarFormatter'; elseif ($format == 'box')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9843
 http://sourceforge.net/p/phpwiki/code/9843
Author: vargenau
Date: 2016年05月25日 08:12:23 +0000 (2016年5月25日)
Log Message:
-----------
Add warning comment
Modified Paths:
--------------
 trunk/lib/WikiTheme.php
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2016年05月23日 19:16:31 UTC (rev 9842)
+++ trunk/lib/WikiTheme.php	2016年05月25日 08:12:23 UTC (rev 9843)
@@ -1724,6 +1724,8 @@
 * @param string $url The url (href) for the button.
 * @param string $class The CSS class for the button.
 * @param array $options Additional attributes for the <input> tag.
+ *
+ * Do NOT replace with __construct: will break RSS icons links in RecentChanges
 */
 function Button($text, $url, $class = '', $options = array())
 {
@@ -1755,12 +1757,13 @@
 class ImageButton extends Button
 {
 /**
- *
 * @param $text string The text for the button.
 * @param $url string The url (href) for the button.
 * @param $class string The CSS class for the button.
 * @param $img_url string URL for button's image.
 * @param $img_attr array Additional attributes for the <img> tag.
+ *
+ * Do NOT replace with __construct: will break RSS icons links in RecentChanges
 */
 function ImageButton($text, $url, $class, $img_url, $img_attr = array())
 {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9842
 http://sourceforge.net/p/phpwiki/code/9842
Author: vargenau
Date: 2016年05月23日 19:16:31 +0000 (2016年5月23日)
Log Message:
-----------
Use __construct
Modified Paths:
--------------
 trunk/lib/WikiTheme.php
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2016年05月23日 18:56:36 UTC (rev 9841)
+++ trunk/lib/WikiTheme.php	2016年05月23日 19:16:31 UTC (rev 9842)
@@ -1857,7 +1857,7 @@
 */
 class SidebarBox
 {
- function SidebarBox($title, $body)
+ function __construct($title, $body)
 {
 require_once 'lib/WikiPlugin.php';
 $this->title = $title;
@@ -1880,7 +1880,7 @@
 
 public $_plugin, $_args = false, $_basepage = false;
 
- function PluginSidebarBox($name, $args = false, $basepage = false)
+ function __construct($name, $args = false, $basepage = false)
 {
 require_once 'lib/WikiPlugin.php';
 
@@ -1911,7 +1911,7 @@
 // Various boxes which are no plugins
 class RelatedLinksBox extends SidebarBox
 {
- function RelatedLinksBox($title = false, $body = '', $limit = 20)
+ function __construct($title = false, $body = '', $limit = 20)
 {
 /**
 * @var WikiRequest $request
@@ -1938,7 +1938,7 @@
 
 class RelatedExternalLinksBox extends SidebarBox
 {
- function RelatedExternalLinksBox($title = false, $body = '', $limit = 20)
+ function __construct($title = false, $body = '', $limit = 20)
 {
 /**
 * @var WikiRequest $request
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9841
 http://sourceforge.net/p/phpwiki/code/9841
Author: vargenau
Date: 2016年05月23日 18:56:36 +0000 (2016年5月23日)
Log Message:
-----------
Use __construct
Modified Paths:
--------------
 trunk/lib/WikiTheme.php
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2016年05月23日 18:52:48 UTC (rev 9840)
+++ trunk/lib/WikiTheme.php	2016年05月23日 18:56:36 UTC (rev 9841)
@@ -1825,11 +1825,11 @@
 * @param $img_url string URL for button's image.
 * @param $img_attr array Additional attributes for the <img> tag.
 */
- function SubmitImageButton($text, $name = '', $class = '', $img_url, $img_attr = array())
+ function __construct($text, $name = '', $class = '', $img_url, $img_attr = array())
 {
- $this->__construct('input', array('type' => 'image',
- 'src' => $img_url,
- 'alt' => $text));
+ parent::__construct('input', array('type' => 'image',
+ 'src' => $img_url,
+ 'alt' => $text));
 if ($name)
 $this->setAttr('name', $name);
 if ($class)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9840
 http://sourceforge.net/p/phpwiki/code/9840
Author: vargenau
Date: 2016年05月23日 18:52:48 +0000 (2016年5月23日)
Log Message:
-----------
Use __construct
Modified Paths:
--------------
 trunk/lib/WikiTheme.php
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2016年05月23日 18:45:55 UTC (rev 9839)
+++ trunk/lib/WikiTheme.php	2016年05月23日 18:52:48 UTC (rev 9840)
@@ -1798,9 +1798,9 @@
 * @param $class string The CSS class for the button.
 * @param $options array Additional attributes for the <input> tag.
 */
- function SubmitButton($text, $name = '', $class = '', $options = array())
+ function __construct($text, $name = '', $class = '', $options = array())
 {
- $this->__construct('input', array('type' => 'submit', 'value' => $text));
+ parent::__construct('input', array('type' => 'submit', 'value' => $text));
 if ($name)
 $this->setAttr('name', $name);
 if ($class)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9839
 http://sourceforge.net/p/phpwiki/code/9839
Author: vargenau
Date: 2016年05月23日 18:45:55 +0000 (2016年5月23日)
Log Message:
-----------
Use __construct
Modified Paths:
--------------
 trunk/lib/WikiTheme.php
 trunk/themes/Sidebar/themeinfo.php
 trunk/themes/blog/themeinfo.php
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2016年05月23日 11:43:47 UTC (rev 9838)
+++ trunk/lib/WikiTheme.php	2016年05月23日 18:45:55 UTC (rev 9839)
@@ -219,7 +219,7 @@
 * @param string $theme_name
 * @param bool $noinit
 */
- function WikiTheme($theme_name = 'default', $noinit = false)
+ function __construct($theme_name = 'default', $noinit = false)
 {
 /**
 * @var WikiRequest $request
Modified: trunk/themes/Sidebar/themeinfo.php
===================================================================
--- trunk/themes/Sidebar/themeinfo.php	2016年05月23日 11:43:47 UTC (rev 9838)
+++ trunk/themes/Sidebar/themeinfo.php	2016年05月23日 18:45:55 UTC (rev 9839)
@@ -35,7 +35,7 @@
 
 function __construct($theme_name = 'Sidebar')
 {
- $this->WikiTheme($theme_name);
+ parent::__construct($theme_name);
 }
 
 /* Display up/down button with persistent state */
Modified: trunk/themes/blog/themeinfo.php
===================================================================
--- trunk/themes/blog/themeinfo.php	2016年05月23日 11:43:47 UTC (rev 9838)
+++ trunk/themes/blog/themeinfo.php	2016年05月23日 18:45:55 UTC (rev 9839)
@@ -38,7 +38,7 @@
 {
 function __construct($theme_name = 'blog')
 {
- $this->WikiTheme($theme_name);
+ parent::__construct($theme_name);
 $this->calendarInit();
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9838
 http://sourceforge.net/p/phpwiki/code/9838
Author: vargenau
Date: 2016年05月23日 11:43:47 +0000 (2016年5月23日)
Log Message:
-----------
Remove & in __construct for WikiDB_backend_iterator derived classes
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/dbaBase.php
 trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
 trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
 trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
 trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
 trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
 trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
 trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
 trunk/lib/WikiDB/backend/file.php
Modified: trunk/lib/WikiDB/backend/dbaBase.php
===================================================================
--- trunk/lib/WikiDB/backend/dbaBase.php	2016年05月23日 11:38:54 UTC (rev 9837)
+++ trunk/lib/WikiDB/backend/dbaBase.php	2016年05月23日 11:43:47 UTC (rev 9838)
@@ -696,7 +696,7 @@
 extends WikiDB_backend_iterator
 {
 // fixed for linkrelations
- function __construct(&$backend, &$pages, $options = array())
+ function __construct($backend, $pages, $options = array())
 {
 $this->_backend = $backend;
 $this->_options = $options;
Modified: trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php	2016年05月23日 11:38:54 UTC (rev 9837)
+++ trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php	2016年05月23日 11:43:47 UTC (rev 9838)
@@ -13,7 +13,7 @@
 * @param $backend object A WikiDB_backend.
 * @param $pagename string Page whose revisions to get.
 */
- function __construct(&$backend, $pagename)
+ function __construct($backend, $pagename)
 {
 $this->_backend = &$backend;
 $this->_pagename = $pagename;
Modified: trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/BackLinkIter.php	2016年05月23日 11:38:54 UTC (rev 9837)
+++ trunk/lib/WikiDB/backend/dumb/BackLinkIter.php	2016年05月23日 11:43:47 UTC (rev 9838)
@@ -11,7 +11,7 @@
 class WikiDB_backend_dumb_BackLinkIter
 extends WikiDB_backend_iterator
 {
- function __construct(&$backend, &$all_pages, $pagename)
+ function __construct($backend, $all_pages, $pagename)
 {
 $this->_pages = $all_pages;
 $this->_backend = &$backend;
Modified: trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php	2016年05月23日 11:38:54 UTC (rev 9837)
+++ trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php	2016年05月23日 11:43:47 UTC (rev 9838)
@@ -38,7 +38,7 @@
 class WikiDB_backend_dumb_LinkSearchIter
 extends WikiDB_backend_iterator
 {
- function __construct(&$backend, &$pageiter, $search, $linktype,
+ function __construct($backend, $pageiter, $search, $linktype,
 $relation = false, $options = array())
 {
 /**
Modified: trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostPopularIter.php	2016年05月23日 11:38:54 UTC (rev 9837)
+++ trunk/lib/WikiDB/backend/dumb/MostPopularIter.php	2016年05月23日 11:43:47 UTC (rev 9838)
@@ -11,7 +11,7 @@
 class WikiDB_backend_dumb_MostPopularIter
 extends WikiDB_backend_iterator
 {
- function __construct($backend, &$all_pages, $limit)
+ function __construct($backend, $all_pages, $limit)
 {
 $this->_pages = array();
 $pages = &$this->_pages;
Modified: trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostRecentIter.php	2016年05月23日 11:38:54 UTC (rev 9837)
+++ trunk/lib/WikiDB/backend/dumb/MostRecentIter.php	2016年05月23日 11:43:47 UTC (rev 9838)
@@ -9,7 +9,7 @@
 class WikiDB_backend_dumb_MostRecentIter
 extends WikiDB_backend_iterator
 {
- function __construct(&$backend, &$pages, $params)
+ function __construct($backend, $pages, $params)
 {
 $limit = false;
 extract($params);
Modified: trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/TextSearchIter.php	2016年05月23日 11:38:54 UTC (rev 9837)
+++ trunk/lib/WikiDB/backend/dumb/TextSearchIter.php	2016年05月23日 11:43:47 UTC (rev 9838)
@@ -2,7 +2,7 @@
 class WikiDB_backend_dumb_TextSearchIter
 extends WikiDB_backend_iterator
 {
- function __construct(&$backend, &$pages, $search, $fulltext = false,
+ function __construct($backend, $pages, $search, $fulltext = false,
 $options = array())
 {
 $this->_backend = &$backend;
Modified: trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php	2016年05月23日 11:38:54 UTC (rev 9837)
+++ trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php	2016年05月23日 11:43:47 UTC (rev 9838)
@@ -8,7 +8,7 @@
 class WikiDB_backend_dumb_WantedPagesIter
 extends WikiDB_backend_iterator
 {
- function __construct(&$backend, &$all_pages, $exclude = '', $sortby = '', $limit = '')
+ function __construct($backend, $all_pages, $exclude = '', $sortby = '', $limit = '')
 {
 $this->_allpages = $all_pages;
 $this->_allpages_array = $all_pages->asArray();
Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2016年05月23日 11:38:54 UTC (rev 9837)
+++ trunk/lib/WikiDB/backend/file.php	2016年05月23日 11:43:47 UTC (rev 9838)
@@ -719,7 +719,7 @@
 
 class WikiDB_backend_file_iter extends WikiDB_backend_iterator
 {
- function __construct(&$backend, &$query_result, $options = array())
+ function __construct($backend, $query_result, $options = array())
 {
 $this->_backend = &$backend;
 $this->_result = $query_result;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9837
 http://sourceforge.net/p/phpwiki/code/9837
Author: vargenau
Date: 2016年05月23日 11:38:54 +0000 (2016年5月23日)
Log Message:
-----------
Use consistent case
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PDO.php
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2016年05月23日 10:13:16 UTC (rev 9836)
+++ trunk/lib/WikiDB/backend/PDO.php	2016年05月23日 11:38:54 UTC (rev 9837)
@@ -175,10 +175,10 @@
 $this->_dbh->commit();
 }
 
- function rollback()
+ function rollBack()
 {
 if ($this->_hasTransactions)
- $this->_dbh->rollback();
+ $this->_dbh->rollBack();
 }
 
 /* no result */
@@ -633,7 +633,7 @@
 $this->beginTransaction();
 //$dbh->CommitLock($recent_tbl);
 if (($id = $this->_get_pageid($pagename, false)) === false) {
- $this->rollback();
+ $this->rollBack();
 return false;
 }
 $mtime = time();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9836
 http://sourceforge.net/p/phpwiki/code/9836
Author: vargenau
Date: 2016年05月23日 10:13:16 +0000 (2016年5月23日)
Log Message:
-----------
Use same signature as base class for functions check and rebuild
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/file.php
Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2016年05月23日 09:25:13 UTC (rev 9835)
+++ trunk/lib/WikiDB/backend/file.php	2016年05月23日 10:13:16 UTC (rev 9836)
@@ -679,7 +679,7 @@
 *
 * @return boolean True iff database is in a consistent state.
 */
- function check()
+ function check($args = false)
 {
 //trigger_error("check: Not Implemented", E_USER_WARNING);
 }
@@ -692,7 +692,7 @@
 *
 * @return boolean True iff successful.
 */
- function rebuild()
+ function rebuild($args = false)
 {
 //trigger_error("rebuild: Not Implemented", E_USER_WARNING);
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9835
 http://sourceforge.net/p/phpwiki/code/9835
Author: vargenau
Date: 2016年05月23日 09:25:13 +0000 (2016年5月23日)
Log Message:
-----------
Update jQuery to 2.2.4
Modified Paths:
--------------
 trunk/lib/WikiTheme.php
 trunk/pgsrc/ReleaseNotes
Added Paths:
-----------
 trunk/themes/default/jquery-2.2.4.min.js
Removed Paths:
-------------
 trunk/themes/default/jquery-2.2.3.min.js
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2016年05月20日 09:42:24 UTC (rev 9834)
+++ trunk/lib/WikiTheme.php	2016年05月23日 09:25:13 UTC (rev 9835)
@@ -259,7 +259,7 @@
 $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("wikicommon.js"))));
 if (!(defined('FUSIONFORGE') && FUSIONFORGE)) {
 // FusionForge already loads this
- $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("jquery-2.2.3.min.js"))));
+ $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("jquery-2.2.4.min.js"))));
 $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("jquery.tablesorter.min.js"))));
 }
 // by pixels
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2016年05月20日 09:42:24 UTC (rev 9834)
+++ trunk/pgsrc/ReleaseNotes	2016年05月23日 09:25:13 UTC (rev 9835)
@@ -1,4 +1,4 @@
-Date: 2016年5月20日 11:39:47 +0000
+Date: 2016年5月23日 11:22:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
@@ -10,7 +10,7 @@
 
 == 1.5.6 2016-XX-XX Marc-Etienne Vargenau ==
 
-* Update jQuery to 2.2.3: Internet Explorer <= 8 no longer supported
+* Update jQuery to 2.2.4: Internet Explorer <= 8 no longer supported
 * Remove wrong calls to setTightness in lib/InlineParser.php (bug reported by Harold Hallikainen)
 * Pear: use ##mysqli## instead of ##mysql##
 * Replace ##ereg## functions
Deleted: trunk/themes/default/jquery-2.2.3.min.js
===================================================================
--- trunk/themes/default/jquery-2.2.3.min.js	2016年05月20日 09:42:24 UTC (rev 9834)
+++ trunk/themes/default/jquery-2.2.3.min.js	2016年05月23日 09:25:13 UTC (rev 9835)
@@ -1,4 +0,0 @@
-/*! jQuery v2.2.3 | (c) jQuery Foundation | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="2.2.3",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isPlainObject:function(a){var b;if("object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype||{},"isPrototypeOf"))return!1;for(b in a);return void 0===b||k.call(a,b)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=d.createElement("script"),b.text=a,d.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:h.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(d=e.call(arguments,2),f=function(){return a.apply(b||this,d.concat(e.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"1ドル"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='1ドル']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"1ドル"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=la(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=ma(b);function pa(){}pa.prototype=d.filters=d.pseudos,d.setFilters=new pa,g=fa.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){c&&!(e=R.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=S.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(Q," ")}),h=h.slice(c.length));for(g in d.filter)!(e=W[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fa.error(a):z(a,i).slice(0)};function qa(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"1ドル"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/1円>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return h.call(b,a)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&f.parentNode&&(this.length=1,this[0]=f),this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?void 0!==c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?h.call(n(a),this[0]):h.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||n.uniqueSort(e),D.test(a)&&e.reverse()),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){n.each(b,function(b,c){n.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==n.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return n.each(arguments,function(a,b){var c;while((c=n.inArray(b,f,c))>-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.removeEventListener("DOMContentLoaded",J),a.removeEventListener("load",J),n.ready()}n.ready.promise=function(b){return I||(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(n.ready):(d.addEventListener("DOMContentLoaded",J),a.addEventListener("load",J))),I.promise(b)},n.ready.promise();var K=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)K(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},L=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function M(){this.expando=n.expando+M.uid++}M.uid=1,M.prototype={register:function(a,b){var c=b||{};return a.nodeType?a[this.expando]=c:Object.defineProperty(a,this.expando,{value:c,writable:!0,configurable:!0}),a[this.expando]},cache:function(a){if(!L(a))return{};var b=a[this.expando];return b||(b={},L(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[b]=c;else for(d in b)e[d]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=a[this.expando];if(void 0!==f){if(void 0===b)this.register(a);else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in f?d=[b,e]:(d=e,d=d in f?[d]:d.match(G)||[])),c=d.length;while(c--)delete f[d[c]]}(void 0===b||n.isEmptyObject(f))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!n.isEmptyObject(b)}};var N=new M,O=new M,P=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Q=/[A-Z]/g;function R(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Q,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:P.test(c)?n.parseJSON(c):c;
-}catch(e){}O.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return O.hasData(a)||N.hasData(a)},data:function(a,b,c){return O.access(a,b,c)},removeData:function(a,b){O.remove(a,b)},_data:function(a,b,c){return N.access(a,b,c)},_removeData:function(a,b){N.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=O.get(f),1===f.nodeType&&!N.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),R(f,d,e[d])));N.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){O.set(this,a)}):K(this,function(b){var c,d;if(f&&void 0===b){if(c=O.get(f,a)||O.get(f,a.replace(Q,"-$&").toLowerCase()),void 0!==c)return c;if(d=n.camelCase(a),c=O.get(f,d),void 0!==c)return c;if(c=R(f,d,void 0),void 0!==c)return c}else d=n.camelCase(a),this.each(function(){var c=O.get(this,d);O.set(this,d,b),a.indexOf("-")>-1&&void 0!==c&&O.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){O.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=N.get(a,b),c&&(!d||n.isArray(c)?d=N.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return N.get(a,c)||N.access(a,c,{empty:n.Callbacks("once memory").add(function(){N.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=N.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)};function W(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return n.css(a,b,"")},i=h(),j=c&&c[3]||(n.cssNumber[b]?"":"px"),k=(n.cssNumber[b]||"px"!==j&&+i)&&T.exec(n.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,n.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var X=/^(?:checkbox|radio)$/i,Y=/<([\w:-]+)/,Z=/^$|\/(?:java|ecma)script/i,$={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};$.optgroup=$.option,$.tbody=$.tfoot=$.colgroup=$.caption=$.thead,$.th=$.td;function _(a,b){var c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function aa(a,b){for(var c=0,d=a.length;d>c;c++)N.set(a[c],"globalEval",!b||N.get(b[c],"globalEval"))}var ba=/<|&#?\w+;/;function ca(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],o=0,p=a.length;p>o;o++)if(f=a[o],f||0===f)if("object"===n.type(f))n.merge(m,f.nodeType?[f]:f);else if(ba.test(f)){g=g||l.appendChild(b.createElement("div")),h=(Y.exec(f)||["",""])[1].toLowerCase(),i=$[h]||$._default,g.innerHTML=i[1]+n.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;n.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",o=0;while(f=m[o++])if(d&&n.inArray(f,d)>-1)e&&e.push(f);else if(j=n.contains(f.ownerDocument,f),g=_(l.appendChild(f),"script"),j&&aa(g),c){k=0;while(f=g[k++])Z.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var da=/^key/,ea=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,fa=/^([^.]*)(?:\.(.+)|)/;function ga(){return!0}function ha(){return!1}function ia(){try{return d.activeElement}catch(a){}}function ja(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)ja(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=ha;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=N.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return"undefined"!=typeof n&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(G)||[""],j=b.length;while(j--)h=fa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=N.hasData(a)&&N.get(a);if(r&&(i=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=fa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&N.remove(a,"handle events")}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(N.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())a.rnamespace&&!a.rnamespace.test(g.namespace)||(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!==this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget detail eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,e,f,g=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||d,e=c.documentElement,f=c.body,a.pageX=b.clientX+(e&&e.scrollLeft||f&&f.scrollLeft||0)-(e&&e.clientLeft||f&&f.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||f&&f.scrollTop||0)-(e&&e.clientTop||f&&f.clientTop||0)),a.which||void 0===g||(a.which=1&g?1:2&g?3:4&g?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,e,f=a.type,g=a,h=this.fixHooks[f];h||(this.fixHooks[f]=h=ea.test(f)?this.mouseHooks:da.test(f)?this.keyHooks:{}),e=h.props?this.props.concat(h.props):this.props,a=new n.Event(g),b=e.length;while(b--)c=e[b],a[c]=g[c];return a.target||(a.target=d),3===a.target.nodeType&&(a.target=a.target.parentNode),h.filter?h.filter(a,g):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==ia()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===ia()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&n.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ga:ha):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={constructor:n.Event,isDefaultPrevented:ha,isPropagationStopped:ha,isImmediatePropagationStopped:ha,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ga,a&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ga,a&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ga,a&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||n.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),n.fn.extend({on:function(a,b,c,d){return ja(this,a,b,c,d)},one:function(a,b,c,d){return ja(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return b!==!1&&"function"!=typeof b||(c=b,b=void 0),c===!1&&(c=ha),this.each(function(){n.event.remove(this,a,c,b)})}});var ka=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,la=/<script|<style|<link/i,ma=/checked\s*(?:[^=]|=\s*.checked.)/i,na=/^true\/(.*)/,oa=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function pa(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function qa(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function ra(a){var b=na.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function sa(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(N.hasData(a)&&(f=N.access(a),g=N.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}O.hasData(a)&&(h=O.access(a),i=n.extend({},h),O.set(b,i))}}function ta(a,b){var c=b.nodeName.toLowerCase();"input"===c&&X.test(a.type)?b.checked=a.checked:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}function ua(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&ma.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),ua(f,b,c,d)});if(o&&(e=ca(b,a[0].ownerDocument,!1,a,d),g=e.firstChild,1===e.childNodes.length&&(e=g),g||d)){for(h=n.map(_(e,"script"),qa),i=h.length;o>m;m++)j=e,m!==p&&(j=n.clone(j,!0,!0),i&&n.merge(h,_(j,"script"))),c.call(a[m],j,m);if(i)for(k=h[h.length-1].ownerDocument,n.map(h,ra),m=0;i>m;m++)j=h[m],Z.test(j.type||"")&&!N.access(j,"globalEval")&&n.contains(k,j)&&(j.src?n._evalUrl&&n._evalUrl(j.src):n.globalEval(j.textContent.replace(oa,"")))}return a}function va(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(_(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&aa(_(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(ka,"<1ドル></2ドル>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=_(h),f=_(a),d=0,e=f.length;e>d;d++)ta(f[d],g[d]);if(b)if(c)for(f=f||_(a),g=g||_(h),d=0,e=f.length;e>d;d++)sa(f[d],g[d]);else sa(a,h);return g=_(h,"script"),g.length>0&&aa(g,!i&&_(a,"script")),h},cleanData:function(a){for(var b,c,d,e=n.event.special,f=0;void 0!==(c=a[f]);f++)if(L(c)){if(b=c[N.expando]){if(b.events)for(d in b.events)e[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);c[N.expando]=void 0}c[O.expando]&&(c[O.expando]=void 0)}}}),n.fn.extend({domManip:ua,detach:function(a){return va(this,a,!0)},remove:function(a){return va(this,a)},text:function(a){return K(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=a)})},null,a,arguments.length)},append:function(){return ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.appendChild(a)}})},prepend:function(){return ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(_(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return K(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!la.test(a)&&!$[(Y.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(_(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return ua(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(_(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),f=e.length-1,h=0;f>=h;h++)c=h===f?this:this.clone(!0),n(e[h])[b](c),g.apply(d,c.get());return this.pushStack(d)}});var wa,xa={HTML:"block",BODY:"block"};function ya(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function za(a){var b=d,c=xa[a];return c||(c=ya(a,b),"none"!==c&&c||(wa=(wa||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=wa[0].contentDocument,b.write(),b.close(),c=ya(a,b),wa.detach()),xa[a]=c),c}var Aa=/^margin/,Ba=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ca=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)},Da=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e},Ea=d.documentElement;!function(){var b,c,e,f,g=d.createElement("div"),h=d.createElement("div");if(h.style){h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,g.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",g.appendChild(h);function i(){h.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",h.innerHTML="",Ea.appendChild(g);var d=a.getComputedStyle(h);b="1%"!==d.top,f="2px"===d.marginLeft,c="4px"===d.width,h.style.marginRight="50%",e="4px"===d.marginRight,Ea.removeChild(g)}n.extend(l,{pixelPosition:function(){return i(),b},boxSizingReliable:function(){return null==c&&i(),c},pixelMarginRight:function(){return null==c&&i(),e},reliableMarginLeft:function(){return null==c&&i(),f},reliableMarginRight:function(){var b,c=h.appendChild(d.createElement("div"));return c.style.cssText=h.style.cssText="-webkit-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",h.style.width="1px",Ea.appendChild(g),b=!parseFloat(a.getComputedStyle(c).marginRight),Ea.removeChild(g),h.removeChild(c),b}})}}();function Fa(a,b,c){var d,e,f,g,h=a.style;return c=c||Ca(a),g=c?c.getPropertyValue(b)||c[b]:void 0,""!==g&&void 0!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),c&&!l.pixelMarginRight()&&Ba.test(g)&&Aa.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f),void 0!==g?g+"":g}function Ga(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Ha=/^(none|table(?!-c[ea]).+)/,Ia={position:"absolute",visibility:"hidden",display:"block"},Ja={letterSpacing:"0",fontWeight:"400"},Ka=["Webkit","O","Moz","ms"],La=d.createElement("div").style;function Ma(a){if(a in La)return a;var b=a[0].toUpperCase()+a.slice(1),c=Ka.length;while(c--)if(a=Ka[c]+b,a in La)return a}function Na(a,b,c){var d=T.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Oa(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Pa(b,c,e){var f=!0,g="width"===c?b.offsetWidth:b.offsetHeight,h=Ca(b),i="border-box"===n.css(b,"boxSizing",!1,h);if(d.msFullscreenElement&&a.top!==a&&b.getClientRects().length&&(g=Math.round(100*b.getBoundingClientRect()[c])),0>=g||null==g){if(g=Fa(b,c,h),(0>g||null==g)&&(g=b.style[c]),Ba.test(g))return g;f=i&&(l.boxSizingReliable()||g===b.style[c]),g=parseFloat(g)||0}return g+Oa(b,c,e||(i?"border":"content"),f,h)+"px"}function Qa(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=N.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=N.access(d,"olddisplay",za(d.nodeName)))):(e=V(d),"none"===c&&e||N.set(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Fa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Ma(h)||h),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=T.exec(c))&&e[1]&&(c=W(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(n.cssNumber[h]?"":"px")),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Ma(h)||h),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Fa(a,b,d)),"normal"===e&&b in Ja&&(e=Ja[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?Ha.test(n.css(a,"display"))&&0===a.offsetWidth?Da(a,Ia,function(){return Pa(a,b,d)}):Pa(a,b,d):void 0},set:function(a,c,d){var e,f=d&&Ca(a),g=d&&Oa(a,b,d,"border-box"===n.css(a,"boxSizing",!1,f),f);return g&&(e=T.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=n.css(a,b)),Na(a,c,g)}}}),n.cssHooks.marginLeft=Ga(l.reliableMarginLeft,function(a,b){return b?(parseFloat(Fa(a,"marginLeft"))||a.getBoundingClientRect().left-Da(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px":void 0}),n.cssHooks.marginRight=Ga(l.reliableMarginRight,function(a,b){return b?Da(a,{display:"inline-block"},Fa,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Aa.test(a)||(n.cssHooks[a+b].set=Na)}),n.fn.extend({css:function(a,b){return K(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Ca(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Qa(this,!0)},hide:function(){return Qa(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function Ra(a,b,c,d,e){return new Ra.prototype.init(a,b,c,d,e)}n.Tween=Ra,Ra.prototype={constructor:Ra,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||n.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Ra.propHooks[this.prop];return a&&a.get?a.get(this):Ra.propHooks._default.get(this)},run:function(a){var b,c=Ra.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Ra.propHooks._default.set(this),this}},Ra.prototype.init.prototype=Ra.prototype,Ra.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[n.cssProps[a.prop]]&&!n.cssHooks[a.prop]?a.elem[a.prop]=a.now:n.style(a.elem,a.prop,a.now+a.unit)}}},Ra.propHooks.scrollTop=Ra.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},n.fx=Ra.prototype.init,n.fx.step={};var Sa,Ta,Ua=/^(?:toggle|show|hide)$/,Va=/queueHooks$/;function Wa(){return a.setTimeout(function(){Sa=void 0}),Sa=n.now()}function Xa(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=U[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ya(a,b,c){for(var d,e=(_a.tweeners[b]||[]).concat(_a.tweeners["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Za(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&V(a),q=N.get(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,"display"),k="none"===j?N.get(a,"olddisplay")||za(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(o.display="inline-block")),c.overflow&&(o.overflow="hidden",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Ua.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))"inline"===("none"===j?za(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=N.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;N.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ya(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function $a(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function _a(a,b,c){var d,e,f=0,g=_a.prefilters.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Sa||Wa(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].r...
 
[truncated message content]

Revision: 9834
 http://sourceforge.net/p/phpwiki/code/9834
Author: vargenau
Date: 2016年05月20日 09:42:24 +0000 (2016年5月20日)
Log Message:
-----------
Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth.
Modified Paths:
--------------
 trunk/lib/stdlib.php
 trunk/pgsrc/ReleaseNotes
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2016年04月12日 13:46:14 UTC (rev 9833)
+++ trunk/lib/stdlib.php	2016年05月20日 09:42:24 UTC (rev 9834)
@@ -1950,7 +1950,7 @@
 
 function is_localhost()
 {
- return $_SERVER['SERVER_ADDR'] == '127.0.0.1';
+ return in_array($_SERVER['REMOTE_ADDR'], array('127.0.0.1', '::1'));
 }
 
 /**
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2016年04月12日 13:46:14 UTC (rev 9833)
+++ trunk/pgsrc/ReleaseNotes	2016年05月20日 09:42:24 UTC (rev 9834)
@@ -1,4 +1,4 @@
-Date: 2016年4月11日 13:51:27 +0000
+Date: 2016年5月20日 11:39:47 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
@@ -20,6 +20,7 @@
 * ~HtmlConverter plugin: check file is encoded in UTF-8; ~HtmlConverter plugin allowed in Fusionforge
 * Valid HTML5 and CSS3 logos (in debug mode)
 * Add HTML 5 <main> <header> <footer> <nav> in all themes
+* Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth.
 
 == 1.5.5 2015年12月11日 Marc-Etienne Vargenau ==
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

http://thematic.xn--c1abcaala7cyftar.xn--p1ai/ Ways to start a new xxx life

Keep your lady entertained this night http://snafu.xn--d1aba7amechcvb3d3e.xn--p1ai/