From: <var...@us...> - 2014-07-02 14:25:06
|
Revision: 8950 http://sourceforge.net/p/phpwiki/code/8950 Author: vargenau Date: 2014-07-02 14:24:57 +0000 (Wed, 02 Jul 2014) Log Message: ----------- Remove commented trigger_error Modified Paths: -------------- trunk/lib/plugin/AuthorHistory.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/PhpHighlight.php trunk/lib/plugin/SiteMap.php Modified: trunk/lib/plugin/AuthorHistory.php =================================================================== --- trunk/lib/plugin/AuthorHistory.php 2014-07-02 09:51:35 UTC (rev 8949) +++ trunk/lib/plugin/AuthorHistory.php 2014-07-02 14:24:57 UTC (rev 8950) @@ -85,14 +85,11 @@ { $this->_args = $this->getArgs($argstr, $request); extract($this->_args); - //trigger_error("1 p= $page a= $author"); if ($page && $page == 'username') //FIXME: use [username]!!!!! $page = $author; - //trigger_error("2 p= $page a= $author"); if (!$page || !$author) //user not signed in or no author specified return ''; //$pagelist = new PageList($info, $exclude); - /////////////////////////// $nbsp = HTML::raw(' '); Modified: trunk/lib/plugin/CreateToc.php =================================================================== --- trunk/lib/plugin/CreateToc.php 2014-07-02 09:51:35 UTC (rev 8949) +++ trunk/lib/plugin/CreateToc.php 2014-07-02 14:24:57 UTC (rev 8950) @@ -219,9 +219,6 @@ } } } - // Do not trigger error, it happens e.g. for "<<CreateToc pagename=AnotherPage>>" - // trigger_error("Heading <$h> $heading </$h> not found\n", E_USER_NOTICE); - return 0; } Modified: trunk/lib/plugin/PageDump.php =================================================================== --- trunk/lib/plugin/PageDump.php 2014-07-02 09:51:35 UTC (rev 8949) +++ trunk/lib/plugin/PageDump.php 2014-07-02 14:24:57 UTC (rev 8950) @@ -290,7 +290,6 @@ // remove deleted values from array for ($i = 0; $i < count($array); $i++) { if (trim($array[$i]) != "zzzjunk") { //nasty, fixme - //trigger_error("'$array[$i]'");//debugging $return[] = $array[$i]; } } Modified: trunk/lib/plugin/PhpHighlight.php =================================================================== --- trunk/lib/plugin/PhpHighlight.php 2014-07-02 09:51:35 UTC (rev 8949) +++ trunk/lib/plugin/PhpHighlight.php 2014-07-02 14:24:57 UTC (rev 8950) @@ -107,14 +107,11 @@ static $MAXLEN = 7; foreach (array($string, $comment, $keyword, $bg, $default, $html) as $color) { $length = strlen($color); - //trigger_error(sprintf(_("DEBUG: color “%s” is length %d."), $color, $length), E_USER_NOTICE); if (($length == 7 || $length == 4) && substr($color, 0, 1) == "#" && "#" == preg_replace("/[a-fA-F0-9]/", "", $color) ) { - //trigger_error(sprintf(_("DEBUG: color “%s” appears to be hex."), $color), E_USER_NOTICE); // stop checking, ok to go } elseif (($length < $MAXLEN + 1) && in_array($color, $html4colors)) { - //trigger_error(sprintf(_("DEBUG color “%s” appears to be an HTML 4 color."), $color), E_USER_NOTICE); // stop checking, ok to go } else { trigger_error(sprintf(_("Invalid color: %s"), Modified: trunk/lib/plugin/SiteMap.php =================================================================== --- trunk/lib/plugin/SiteMap.php 2014-07-02 09:51:35 UTC (rev 8949) +++ trunk/lib/plugin/SiteMap.php 2014-07-02 14:24:57 UTC (rev 8950) @@ -83,7 +83,6 @@ static $VisitedPages = array(); $startpagename = $startpage->getName(); - //trigger_error("DEBUG: recursivelyGetBackLinks( $startpagename , $level )"); if ($level == $reclimit) return $pagearr; if (in_array($startpagename, $VisitedPages)) @@ -110,7 +109,6 @@ static $VisitedPages = array(); $startpagename = $startpage->getName(); - //trigger_error("DEBUG: recursivelyGetLinks( $startpagename , $level )"); if ($level == $reclimit) return $pagearr; if (in_array($startpagename, $VisitedPages)) @@ -118,7 +116,6 @@ array_push($VisitedPages, $startpagename); $reversed = (($this->firstreversed) && ($startpagename == $this->initialpage)); - //trigger_error("DEBUG: \$reversed = $reversed"); $pagelinks = $startpage->getLinks($reversed); while ($link = $pagelinks->next()) { $linkpagename = $link->getName(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-07-04 11:53:26
|
Revision: 8953 http://sourceforge.net/p/phpwiki/code/8953 Author: vargenau Date: 2014-07-04 11:53:19 +0000 (Fri, 04 Jul 2014) Log Message: ----------- wiki: use correct headers hierarchy Modified Paths: -------------- trunk/lib/plugin/DebugAuthInfo.php trunk/lib/plugin/DebugBackendInfo.php trunk/lib/plugin/DebugGroupInfo.php Modified: trunk/lib/plugin/DebugAuthInfo.php =================================================================== --- trunk/lib/plugin/DebugAuthInfo.php 2014-07-03 09:11:04 UTC (rev 8952) +++ trunk/lib/plugin/DebugAuthInfo.php 2014-07-04 11:53:19 UTC (rev 8953) @@ -56,7 +56,7 @@ $this->disabled("! user->isAdmin"); } - $html = HTML(HTML::h3(fmt("General Auth Settings"))); + $html = HTML(HTML::h2(fmt("General Auth Settings"))); $table = HTML::table(array('class' => 'bordered')); $table->pushContent($this->show_hash("AUTH DEFINES", $this->buildConstHash( @@ -89,7 +89,7 @@ unset($DBAuthParams['dummy']); $table->pushContent($this->show_hash("\$DBAuthParams[]", $DBAuthParams)); $html->pushContent($table); - $html->pushContent(HTML(HTML::h3(fmt("Personal Auth Settings for “%s”", $userid)))); + $html->pushContent(HTML(HTML::h2(fmt("Personal Auth Settings for “%s”", $userid)))); if (!$user) { $html->pushContent(HTML::p(fmt("No userid"))); } else { @@ -131,9 +131,9 @@ if ($heading) $rows[] = HTML::tr(array( - 'style' => 'color:#000;background-color:#ffcccc'), + 'style' => 'color:black; background-color:#ffcccc'), HTML::td(array('colspan' => 2, - 'style' => 'color:#000'), + 'style' => 'color:black'), $heading)); if (is_object($hash)) $hash = obj2hash($hash); @@ -162,12 +162,11 @@ } } $rows[] = HTML::tr(HTML::td(array('class' => 'align-right', - 'bgcolor' => '#ccc', - 'style' => 'color:#000000'), + 'style' => 'color:black; background-color:#ccc'), HTML(HTML::raw(' '), $key, HTML::raw(' '))), - HTML::td(array('bgcolor' => '#fff', - 'style' => 'color:#000000'), + HTML::td(array( + 'style' => 'color:black; background-color:white'), $val ? $val : HTML::raw(' ')) ); //if (empty($seen[$key])) $seen[$key] = 1; Modified: trunk/lib/plugin/DebugBackendInfo.php =================================================================== --- trunk/lib/plugin/DebugBackendInfo.php 2014-07-03 09:11:04 UTC (rev 8952) +++ trunk/lib/plugin/DebugBackendInfo.php 2014-07-04 11:53:19 UTC (rev 8953) @@ -41,6 +41,16 @@ { $args = $this->getArgs($argstr, $request); extract($args); + if (empty($userid) or $userid == $request->_user->UserName()) { + $user = $request->_user; + $userid = $user->UserName(); + } else { + $user = WikiUser($userid); + } + if (!$user->isAdmin() and !(DEBUG && _DEBUG_LOGIN)) { + $request->_notAuthorized(WIKIAUTH_ADMIN); + $this->disabled("! user->isAdmin"); + } if (empty($page)) return $this->error("page missing"); @@ -49,7 +59,7 @@ $this->readonly_pagemeta = array(); $this->hidden_pagemeta = array('_cached_html'); - $html = HTML(HTML::h3(fmt("Querying backend directly for “%s”", + $html = HTML(HTML::h2(fmt("Querying backend directly for “%s”", $page))); $table = HTML::table(array('class' => 'bordered')); @@ -159,20 +169,20 @@ $rows = array(); if ($heading) $rows[] = HTML::tr(array( - 'style' => 'color:#000;background-color:#ffcccc'), + 'style' => 'color:black; background-color:#ffcccc'), HTML::td(array('colspan' => 2, - 'style' => 'color:#000'), + 'style' => 'color:black'), $heading)); if (!is_array($hash)) return array(); ksort($hash); foreach ($hash as $key => $val) { if ($this->chunk_split and is_string($val)) $val = chunk_split($val); $rows[] = HTML::tr(HTML::td(array('class' => 'align-right', - 'style' => 'color:#000;background-color:#ccc'), + 'style' => 'color:black; background-color:#ccc'), HTML(HTML::raw(' '), $key, HTML::raw(' '))), HTML::td(array( - 'style' => 'color:#000;background-color:#fff'), + 'style' => 'color:black; background-color:white'), $this->_showvalue($key, $val, $prefix)) ); } Modified: trunk/lib/plugin/DebugGroupInfo.php =================================================================== --- trunk/lib/plugin/DebugGroupInfo.php 2014-07-03 09:11:04 UTC (rev 8952) +++ trunk/lib/plugin/DebugGroupInfo.php 2014-07-04 11:53:19 UTC (rev 8953) @@ -48,7 +48,7 @@ foreach ($allGroups as $g) { $members = $group->getMembersOf($g); - $output->pushContent(HTML::h3($g . " - members: " . + $output->pushContent(HTML::h2($g . " - members: " . sizeof($members) . " - isMember: " . ($group->isMember($g) ? "yes" : "no") )); foreach ($members as $m) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-10 14:12:04
|
Revision: 9063 http://sourceforge.net/p/phpwiki/code/9063 Author: vargenau Date: 2014-09-10 14:11:56 +0000 (Wed, 10 Sep 2014) Log Message: ----------- Same signature for all functions handle_plugin_args_cruft Modified Paths: -------------- trunk/lib/plugin/AsciiMath.php trunk/lib/plugin/AsciiSVG.php trunk/lib/plugin/Chart.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/PhpHighlight.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/Processing.php trunk/lib/plugin/SqlResult.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/WikiPoll.php Modified: trunk/lib/plugin/AsciiMath.php =================================================================== --- trunk/lib/plugin/AsciiMath.php 2014-09-04 16:17:25 UTC (rev 9062) +++ trunk/lib/plugin/AsciiMath.php 2014-09-10 14:11:56 UTC (rev 9063) @@ -51,7 +51,7 @@ return array(); } - function handle_plugin_args_cruft(&$argstr, &$args) + function handle_plugin_args_cruft($argstr, $args) { $this->source = $argstr; } Modified: trunk/lib/plugin/AsciiSVG.php =================================================================== --- trunk/lib/plugin/AsciiSVG.php 2014-09-04 16:17:25 UTC (rev 9062) +++ trunk/lib/plugin/AsciiSVG.php 2014-09-10 14:11:56 UTC (rev 9063) @@ -42,7 +42,7 @@ ); } - function handle_plugin_args_cruft(&$argstr, &$args) + function handle_plugin_args_cruft($argstr, $args) { $this->source = $argstr; } Modified: trunk/lib/plugin/Chart.php =================================================================== --- trunk/lib/plugin/Chart.php 2014-09-04 16:17:25 UTC (rev 9062) +++ trunk/lib/plugin/Chart.php 2014-09-10 14:11:56 UTC (rev 9063) @@ -64,7 +64,7 @@ ); } - function handle_plugin_args_cruft(&$argstr, &$args) + function handle_plugin_args_cruft($argstr, $args) { $this->source = $argstr; } Modified: trunk/lib/plugin/GraphViz.php =================================================================== --- trunk/lib/plugin/GraphViz.php 2014-09-04 16:17:25 UTC (rev 9062) +++ trunk/lib/plugin/GraphViz.php 2014-09-10 14:11:56 UTC (rev 9063) @@ -127,7 +127,7 @@ ); } - function handle_plugin_args_cruft(&$argstr, &$args) + function handle_plugin_args_cruft($argstr, $args) { $this->source = $argstr; } Modified: trunk/lib/plugin/PageDump.php =================================================================== --- trunk/lib/plugin/PageDump.php 2014-09-04 16:17:25 UTC (rev 9062) +++ trunk/lib/plugin/PageDump.php 2014-09-10 14:11:56 UTC (rev 9063) @@ -221,9 +221,6 @@ ); } - // function handle_plugin_args_cruft(&$argstr, &$args) { - // } - function generateMessageId($mailified) { $array = explode("\n", $mailified); Modified: trunk/lib/plugin/PhpHighlight.php =================================================================== --- trunk/lib/plugin/PhpHighlight.php 2014-09-04 16:17:25 UTC (rev 9062) +++ trunk/lib/plugin/PhpHighlight.php 2014-09-10 14:11:56 UTC (rev 9063) @@ -88,7 +88,7 @@ return new RawXml($str); } - function handle_plugin_args_cruft(&$argstr, &$args) + function handle_plugin_args_cruft($argstr, $args) { $this->source = $argstr; } Modified: trunk/lib/plugin/Ploticus.php =================================================================== --- trunk/lib/plugin/Ploticus.php 2014-09-04 16:17:25 UTC (rev 9062) +++ trunk/lib/plugin/Ploticus.php 2014-09-10 14:11:56 UTC (rev 9063) @@ -112,7 +112,7 @@ ); } - function handle_plugin_args_cruft(&$argstr, &$args) + function handle_plugin_args_cruft($argstr, $args) { $this->source = $argstr; } Modified: trunk/lib/plugin/Processing.php =================================================================== --- trunk/lib/plugin/Processing.php 2014-09-04 16:17:25 UTC (rev 9062) +++ trunk/lib/plugin/Processing.php 2014-09-10 14:11:56 UTC (rev 9063) @@ -41,7 +41,7 @@ ); } - function handle_plugin_args_cruft(&$argstr, &$args) + function handle_plugin_args_cruft($argstr, $args) { $this->source = $argstr; } Modified: trunk/lib/plugin/SqlResult.php =================================================================== --- trunk/lib/plugin/SqlResult.php 2014-09-04 16:17:25 UTC (rev 9062) +++ trunk/lib/plugin/SqlResult.php 2014-09-10 14:11:56 UTC (rev 9063) @@ -91,7 +91,6 @@ function handle_plugin_args_cruft($argstr, $args) { $this->_sql = str_replace("\n", " ", $argstr); - return; } function run($dbi, $argstr, &$request, $basepage) Modified: trunk/lib/plugin/SyntaxHighlighter.php =================================================================== --- trunk/lib/plugin/SyntaxHighlighter.php 2014-09-04 16:17:25 UTC (rev 9062) +++ trunk/lib/plugin/SyntaxHighlighter.php 2014-09-10 14:11:56 UTC (rev 9063) @@ -44,7 +44,7 @@ ); } - function handle_plugin_args_cruft(&$argstr, &$args) + function handle_plugin_args_cruft($argstr, $args) { $this->source = $argstr; } Modified: trunk/lib/plugin/WikiPoll.php =================================================================== --- trunk/lib/plugin/WikiPoll.php 2014-09-04 16:17:25 UTC (rev 9062) +++ trunk/lib/plugin/WikiPoll.php 2014-09-10 14:11:56 UTC (rev 9063) @@ -117,7 +117,6 @@ $argstr = str_replace("\n", " ", $argstr); $argstr = str_replace(array("[", "]"), array("_", ""), $argstr); $this->_args = $this->getArgs($argstr, $GLOBALS['request']); - return; } private function str2array($var, $obarray = false) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-10 14:42:10
|
Revision: 9065 http://sourceforge.net/p/phpwiki/code/9065 Author: vargenau Date: 2014-09-10 14:42:07 +0000 (Wed, 10 Sep 2014) Log Message: ----------- Same signature for all functions run Modified Paths: -------------- trunk/lib/plugin/AllPages.php trunk/lib/plugin/CategoryPage.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/JabberPresence.php trunk/lib/plugin/LdapSearch.php trunk/lib/plugin/LinkDatabase.php Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2014-09-10 14:21:54 UTC (rev 9064) +++ trunk/lib/plugin/AllPages.php 2014-09-10 14:42:07 UTC (rev 9065) @@ -54,8 +54,7 @@ // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges // sortby: [+|-] pagename|mtime|hits - // 2004-07-08 22:05:35 rurban: turned off &$request to prevent from strange bug below - function run($dbi, $argstr, $request, $basepage) + function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/CategoryPage.php =================================================================== --- trunk/lib/plugin/CategoryPage.php 2014-09-10 14:21:54 UTC (rev 9064) +++ trunk/lib/plugin/CategoryPage.php 2014-09-10 14:42:07 UTC (rev 9065) @@ -56,7 +56,7 @@ 'showbuds' => false); } - function run($dbi, $argstr, &$request) + function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/CreateBib.php =================================================================== --- trunk/lib/plugin/CreateBib.php 2014-09-10 14:21:54 UTC (rev 9064) +++ trunk/lib/plugin/CreateBib.php 2014-09-10 14:42:07 UTC (rev 9065) @@ -96,7 +96,7 @@ } - function run($dbi, $argstr, $request, $basepage) + function run($dbi, $argstr, &$request, $basepage) { extract($this->getArgs($argstr, $request)); if ($pagename) { Modified: trunk/lib/plugin/JabberPresence.php =================================================================== --- trunk/lib/plugin/JabberPresence.php 2014-09-10 14:21:54 UTC (rev 9064) +++ trunk/lib/plugin/JabberPresence.php 2014-09-10 14:42:07 UTC (rev 9065) @@ -52,7 +52,7 @@ 'iconset' => "gabber"); } - function run($dbi, $argstr, $request) + function run($dbi, $argstr, &$request, $basepage) { extract($this->getArgs($argstr, $request)); // Any text that is returned will not be further transformed, Modified: trunk/lib/plugin/LdapSearch.php =================================================================== --- trunk/lib/plugin/LdapSearch.php 2014-09-10 14:21:54 UTC (rev 9064) +++ trunk/lib/plugin/LdapSearch.php 2014-09-10 14:42:07 UTC (rev 9065) @@ -69,7 +69,7 @@ // I ought to require the ldap extension, but fail sanely, if I cant get it. // - however at the moment this seems to work as is - function run($dbi, $argstr, $request) + function run($dbi, $argstr, &$request, $basepage) { if (!function_exists('ldap_connect')) { if (!loadPhpExtension('ldap')) Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2014-09-10 14:21:54 UTC (rev 9064) +++ trunk/lib/plugin/LinkDatabase.php 2014-09-10 14:42:07 UTC (rev 9065) @@ -72,7 +72,7 @@ $this->run($dbi, WikiPluginCached::glueArgs($argarray), $request, $basepage); } - function run($dbi, $argstr, $request, $basepage) + function run($dbi, $argstr, &$request, $basepage) { global $WikiTheme; $args = $this->getArgs($argstr, $request); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-12 09:48:13
|
Revision: 9070 http://sourceforge.net/p/phpwiki/code/9070 Author: vargenau Date: 2014-09-12 09:48:10 +0000 (Fri, 12 Sep 2014) Log Message: ----------- Trap recursive includes Modified Paths: -------------- trunk/lib/plugin/IncludePage.php trunk/lib/plugin/Template.php Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2014-09-11 14:08:59 UTC (rev 9069) +++ trunk/lib/plugin/IncludePage.php 2014-09-12 09:48:10 UTC (rev 9070) @@ -87,8 +87,12 @@ // A page can include itself once (this is needed, e.g., when editing // TextFormattingRules). - static $included_pages = array(); - if (in_array($page, $included_pages)) { + // Protect from recursive inclusion. + static $rootpage = ''; + if ($rootpage == '') { + $rootpage = $basepage; + } + if ($page == $rootpage) { return $this->error(sprintf(_("Recursive inclusion of page %s ignored"), $page)); } @@ -132,7 +136,7 @@ $m[1] = substr($m[1], 1, -1); } // trap recursive redirects - if (in_array($m[1], $included_pages)) { + if ($m[1] == $rootpage) { return $this->error(sprintf(_("Recursive inclusion of page %s ignored"), $page . ' => ' . $m[1])); } @@ -151,13 +155,9 @@ // only in expansion $ct = preg_replace("/<includeonly>(.+)<\/includeonly>/s", "\\1", $ct); - array_push($included_pages, $page); - include_once 'lib/BlockParser.php'; $content = TransformText($ct, $page); - array_pop($included_pages); - if ($quiet) return $content; Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2014-09-11 14:08:59 UTC (rev 9069) +++ trunk/lib/plugin/Template.php 2014-09-12 09:48:10 UTC (rev 9070) @@ -119,10 +119,13 @@ $page = "Template/" . $page; } - // Protect from recursive inclusion. A page can include itself once - static $included_pages = array(); - if (in_array($page, $included_pages)) { - return $this->error(sprintf(_("Recursive inclusion of page %s"), + // Protect from recursive inclusion. + static $rootpage = ''; + if ($rootpage == '') { + $rootpage = $basepage; + } + if ($page == $rootpage) { + return $this->error(sprintf(_("Recursive inclusion of page %s ignored"), $page)); } @@ -166,7 +169,7 @@ $m[1] = substr($m[1], 1, -1); } // trap recursive redirects - if (in_array($m[1], $included_pages)) { + if ($m[1] == $rootpage) { return $this->error(sprintf(_("Recursive inclusion of page %s ignored"), $page . ' => ' . $m[1])); } @@ -191,8 +194,6 @@ $initial_content); $this->doVariableExpansion($initial_content, $vars, $basepage, $request); - array_push($included_pages, $page); - // If content is single-line, call TransformInline, else call TransformText $initial_content = trim($initial_content, "\n"); if (preg_match("/\n/", $initial_content)) { @@ -203,8 +204,6 @@ $content = TransformInline($initial_content, $page); } - array_pop($included_pages); - return $content; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-12 11:53:28
|
Revision: 9071 http://sourceforge.net/p/phpwiki/code/9071 Author: vargenau Date: 2014-09-12 11:53:25 +0000 (Fri, 12 Sep 2014) Log Message: ----------- Make recursive include trap work between Template and IncludePage Modified Paths: -------------- trunk/lib/plugin/IncludePage.php trunk/lib/plugin/Template.php Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2014-09-12 09:48:10 UTC (rev 9070) +++ trunk/lib/plugin/IncludePage.php 2014-09-12 11:53:25 UTC (rev 9071) @@ -88,7 +88,7 @@ // A page can include itself once (this is needed, e.g., when editing // TextFormattingRules). // Protect from recursive inclusion. - static $rootpage = ''; + global $rootpage; if ($rootpage == '') { $rootpage = $basepage; } Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2014-09-12 09:48:10 UTC (rev 9070) +++ trunk/lib/plugin/Template.php 2014-09-12 11:53:25 UTC (rev 9071) @@ -120,7 +120,7 @@ } // Protect from recursive inclusion. - static $rootpage = ''; + global $rootpage; if ($rootpage == '') { $rootpage = $basepage; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-12 12:42:04
|
Revision: 9073 http://sourceforge.net/p/phpwiki/code/9073 Author: vargenau Date: 2014-09-12 12:41:57 +0000 (Fri, 12 Sep 2014) Log Message: ----------- A warning is enough; better message Modified Paths: -------------- trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/UnfoldSubpages.php Modified: trunk/lib/plugin/ListSubpages.php =================================================================== --- trunk/lib/plugin/ListSubpages.php 2014-09-12 12:21:21 UTC (rev 9072) +++ trunk/lib/plugin/ListSubpages.php 2014-09-12 12:41:57 UTC (rev 9073) @@ -66,7 +66,8 @@ // UnfoldSubPages plugin) $subpages = explodePageList($pagename . SUBPAGE_SEPARATOR . '*'); if (!$subpages) { - return $this->error(_("The current page has no subpages defined.")); + return HTML::p(array('class' => 'warning'), + sprintf(_("%s has no subpages defined."), $pagename)); } extract($args); Modified: trunk/lib/plugin/UnfoldSubpages.php =================================================================== --- trunk/lib/plugin/UnfoldSubpages.php 2014-09-12 12:21:21 UTC (rev 9072) +++ trunk/lib/plugin/UnfoldSubpages.php 2014-09-12 12:41:57 UTC (rev 9073) @@ -168,7 +168,8 @@ } } if (!isset($cpagename)) { - return $this->error(sprintf(_("%s has no subpages defined."), $pagename)); + return HTML::p(array('class' => 'warning'), + sprintf(_("%s has no subpages defined."), $pagename)); } return $content; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-12 14:22:05
|
Revision: 9076 http://sourceforge.net/p/phpwiki/code/9076 Author: vargenau Date: 2014-09-12 14:22:01 +0000 (Fri, 12 Sep 2014) Log Message: ----------- WikiAdmin: no checkboxes in confirmation step Modified Paths: -------------- trunk/lib/plugin/WikiAdminPurge.php trunk/lib/plugin/WikiAdminRemove.php trunk/lib/plugin/WikiAdminSearchReplace.php trunk/lib/plugin/WikiAdminSetAcl.php Modified: trunk/lib/plugin/WikiAdminPurge.php =================================================================== --- trunk/lib/plugin/WikiAdminPurge.php 2014-09-12 14:18:12 UTC (rev 9075) +++ trunk/lib/plugin/WikiAdminPurge.php 2014-09-12 14:22:01 UTC (rev 9076) @@ -138,16 +138,18 @@ // List all pages to select from. $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], $args['exclude']); } - $pagelist = new PageList_Selectable($args['info'], $args['exclude'], array()); - $pagelist->addPageList($pages); $header = HTML::fieldset(); if ($next_action == 'verify') { + $pagelist = new PageList_Unselectable($args['info'], $args['exclude'], array()); + $pagelist->addPageList($pages); $button_label = _("Yes"); $header->pushContent(HTML::legend(_("Confirm purge"))); $header->pushContent(HTML::p(HTML::strong( _("Are you sure you want to permanently purge the following files?")))); } else { + $pagelist = new PageList_Selectable($args['info'], $args['exclude'], array()); + $pagelist->addPageList($pages); $button_label = _("Permanently purge selected pages"); $header->pushContent(HTML::legend(_("Select the files to purge"))); } Modified: trunk/lib/plugin/WikiAdminRemove.php =================================================================== --- trunk/lib/plugin/WikiAdminRemove.php 2014-09-12 14:18:12 UTC (rev 9075) +++ trunk/lib/plugin/WikiAdminRemove.php 2014-09-12 14:22:01 UTC (rev 9076) @@ -188,19 +188,24 @@ // List all pages to select from. $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], $args['exclude']); } - $pagelist = new PageList_Selectable($args['info'], $args['exclude'], - array('types' => - array('remove' - => new _PageList_Column_remove('remove', _("Remove"))))); - $pagelist->addPageList($pages); $header = HTML::fieldset(); if ($next_action == 'verify') { + $pagelist = new PageList_Unselectable($args['info'], $args['exclude'], + array('types' => + array('remove' + => new _PageList_Column_remove('remove', _("Remove"))))); + $pagelist->addPageList($pages); $button_label = _("Yes"); $header->pushContent(HTML::legend(_("Confirm removal"))); $header->pushContent(HTML::p(HTML::strong( _("Are you sure you want to remove the selected files?")))); } else { + $pagelist = new PageList_Selectable($args['info'], $args['exclude'], + array('types' => + array('remove' + => new _PageList_Column_remove('remove', _("Remove"))))); + $pagelist->addPageList($pages); $button_label = _("Remove selected pages"); $header->pushContent(HTML::legend(_("Select the files to remove"))); if ($args['min_age'] > 0) { Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2014-09-12 14:18:12 UTC (rev 9075) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2014-09-12 14:22:01 UTC (rev 9076) @@ -112,18 +112,21 @@ array('types' => array('hi_content' => new _PageList_Column_content('rev:hi_content', _("Content"))))); } - $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $columns); - $pagelist->addPageList($pages); $header = HTML::fieldset(); $header->pushContent(HTML::legend(_("Select the pages to search and replace"))); if ($next_action == 'verify') { + $args['info'] = "pagename,mtime,author"; + $pagelist = new PageList_Unselectable($args['info'], $args['exclude'], $columns); + $pagelist->addPageList($pages); $button_label = _("Replace"); $header->pushContent( HTML::p(HTML::strong( _("Are you sure you want to replace text in the selected files?")))); $this->replaceForm($header, $post_args); } else { + $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $columns); + $pagelist->addPageList($pages); $button_label = _("Search"); $this->replaceForm($header, $post_args); } Modified: trunk/lib/plugin/WikiAdminSetAcl.php =================================================================== --- trunk/lib/plugin/WikiAdminSetAcl.php 2014-09-12 14:18:12 UTC (rev 9075) +++ trunk/lib/plugin/WikiAdminSetAcl.php 2014-09-12 14:22:01 UTC (rev 9076) @@ -183,25 +183,30 @@ // List all pages to select from. $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], $args['exclude']); } - if ($next_action == 'verify') { - $args['info'] = "checkbox,pagename,perm,mtime,owner,author"; - } - $pagelist = new PageList_Selectable($args['info'], - $args['exclude'], - array('types' => array( - 'perm' - => new _PageList_Column_perm('perm', _("Permission")), - 'acl' - => new _PageList_Column_acl('acl', _("ACL"))))); - $pagelist->addPageList($pages); if ($next_action == 'verify') { + $pagelist = new PageList_Unselectable($args['info'], + $args['exclude'], + array('types' => array( + 'perm' + => new _PageList_Column_perm('perm', _("Permission")), + 'acl' + => new _PageList_Column_acl('acl', _("ACL"))))); + $pagelist->addPageList($pages); $button_label = _("Yes"); $header = $this->setaclForm($header, $post_args, $pages); $header->pushContent( HTML::p(HTML::strong( _("Are you sure you want to permanently change access rights to the selected files?")))); } else { + $pagelist = new PageList_Selectable($args['info'], + $args['exclude'], + array('types' => array( + 'perm' + => new _PageList_Column_perm('perm', _("Permission")), + 'acl' + => new _PageList_Column_acl('acl', _("ACL"))))); + $pagelist->addPageList($pages); $button_label = _("Change Access Rights"); $header = $this->setaclForm($header, $post_args, $pages); $header->pushContent(HTML::legend(_("Select the pages where to change access rights"))); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-16 08:14:37
|
Revision: 9080 http://sourceforge.net/p/phpwiki/code/9080 Author: vargenau Date: 2014-09-16 08:14:33 +0000 (Tue, 16 Sep 2014) Log Message: ----------- Add private, remove commented code Modified Paths: -------------- trunk/lib/plugin/WikiAdminChown.php trunk/lib/plugin/WikiAdminDeleteAcl.php trunk/lib/plugin/WikiAdminPurge.php trunk/lib/plugin/WikiAdminRemove.php trunk/lib/plugin/WikiAdminRename.php trunk/lib/plugin/WikiAdminSearchReplace.php trunk/lib/plugin/WikiAdminSetAcl.php trunk/lib/plugin/WikiAdminSetAclSimple.php trunk/lib/plugin/WikiAdminSetExternal.php Modified: trunk/lib/plugin/WikiAdminChown.php =================================================================== --- trunk/lib/plugin/WikiAdminChown.php 2014-09-16 08:10:25 UTC (rev 9079) +++ trunk/lib/plugin/WikiAdminChown.php 2014-09-16 08:14:33 UTC (rev 9080) @@ -41,7 +41,7 @@ { return array_merge ( - WikiPlugin_WikiAdminSelect::getDefaultArguments(), + parent::getDefaultArguments(), array( 'user' => false, /* Columns to include in listing */ @@ -49,7 +49,7 @@ )); } - function chownPages(&$dbi, &$request, $pages, $newowner) + private function chownPages(&$dbi, &$request, $pages, $newowner) { $result = HTML::div(); $ul = HTML::ul(); @@ -92,19 +92,18 @@ } else { $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count))); } - $result->pushContent($ul); - return $result; } else { $result->setAttr('class', 'error'); $result->pushContent(HTML::p(_("No pages changed."))); - return $result; } + $result->pushContent($ul); + return $result; } function run($dbi, $argstr, &$request, $basepage) { if ($request->getArg('action') != 'browse') { - if (!$request->getArg('action') == __("PhpWikiAdministration")."/".__("Chown")) { + if ($request->getArg('action') != __("PhpWikiAdministration")."/".__("Chown")) { return $this->disabled(_("Plugin not run: not in browse mode")); } } @@ -113,10 +112,6 @@ $this->_args = $args; if (empty($args['user'])) $args['user'] = $request->_user->UserName(); - /*if (!empty($args['exclude'])) - $exclude = explodePageList($args['exclude']); - else - $exclude = false;*/ $this->preSelectS($args, $request); $p = $request->getArg('p'); @@ -136,7 +131,6 @@ $request->_notAuthorized(WIKIAUTH_ADMIN); $this->disabled("! user->isAdmin"); } - // DONE: error message if not allowed. if ($post_args['action'] == 'verify') { // Real action return $this->chownPages($dbi, $request, array_keys($p), @@ -152,35 +146,29 @@ } if ($next_action == 'select' and empty($pages)) { // List all pages to select from. - $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], - $args['exclude']); + $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], $args['exclude']); } - /* // let the user decide which info - if ($next_action == 'verify') { - $args['info'] = "checkbox,pagename,owner,mtime"; - } - */ - if ($next_action == 'select') { - $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $args); - } else { - $pagelist = new PageList_Unselectable($args['info'], $args['exclude'], $args); - } - $pagelist->addPageList($pages); $header = HTML::fieldset(); if ($next_action == 'verify') { + $pagelist = new PageList_Unselectable($args['info'], $args['exclude'], $args); + $pagelist->addPageList($pages); $button_label = _("Yes"); $header->pushContent(HTML::legend(_("Confirm ownership change"))); - $header->pushContent( - HTML::p(HTML::strong( + $header->pushContent(HTML::p(HTML::strong( _("Are you sure you want to change the owner of the selected pages?")))); - $header = $this->chownForm($header, $post_args); } else { + $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $args); + $pagelist->addPageList($pages); $button_label = _("Change owner of selected pages."); $header->pushContent(HTML::legend(_("Select the pages to change the owner"))); - $header = $this->chownForm($header, $post_args); } + $header->pushContent(_("Change owner to: ")); + $header->pushContent(HTML::input(array('name' => 'admin_chown[user]', + 'value' => $post_args['user'], + 'size' => 40))); + $buttons = HTML::p(Button('submit:admin_chown[chown]', $button_label, 'wikiadmin'), Button('submit:admin_chown[cancel]', _("Cancel"), 'button')); $header->pushContent($buttons); @@ -197,15 +185,6 @@ ? '' : HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN))); } - - function chownForm(&$header, $post_args) - { - $header->pushContent(_("Change owner to: ")); - $header->pushContent(HTML::input(array('name' => 'admin_chown[user]', - 'value' => $post_args['user'], - 'size' => 40))); - return $header; - } } // Local Variables: Modified: trunk/lib/plugin/WikiAdminDeleteAcl.php =================================================================== --- trunk/lib/plugin/WikiAdminDeleteAcl.php 2014-09-16 08:10:25 UTC (rev 9079) +++ trunk/lib/plugin/WikiAdminDeleteAcl.php 2014-09-16 08:14:33 UTC (rev 9080) @@ -40,7 +40,7 @@ return _("Delete page permissions."); } - function deleteaclPages(&$request, $pages) + private function deleteaclPages(&$request, $pages) { $result = HTML::div(); $count = 0; Modified: trunk/lib/plugin/WikiAdminPurge.php =================================================================== --- trunk/lib/plugin/WikiAdminPurge.php 2014-09-16 08:10:25 UTC (rev 9079) +++ trunk/lib/plugin/WikiAdminPurge.php 2014-09-16 08:14:33 UTC (rev 9080) @@ -37,7 +37,7 @@ /* getDefaultArguments() is inherited from WikiAdminSelect class */ - function collectPages(&$list, &$dbi, $sortby, $limit = 0) + protected function collectPages(&$list, &$dbi, $sortby, $limit = 0) { $allPages = $dbi->getAllPages('include_empty', $sortby, $limit); @@ -54,7 +54,7 @@ return $list; } - function purgePages(&$request, $pages) + private function purgePages(&$request, $pages) { $result = HTML::div(); $ul = HTML::ul(); @@ -78,13 +78,12 @@ } else { $result->pushContent(HTML::p(fmt("%d pages have been permanently purged:", $count))); } - $result->pushContent($ul); - return $result; } else { $result->setAttr('class', 'error'); $result->pushContent(HTML::p(_("No pages purged."))); - return $result; } + $result->pushContent($ul); + return $result; } function run($dbi, $argstr, &$request, $basepage) @@ -96,7 +95,7 @@ } $args = $this->getArgs($argstr, $request); - $this->_args =& $args; + $this->_args = $args; $this->preSelectS($args, $request); $p = $request->getArg('p'); @@ -108,8 +107,7 @@ if ($p && $request->isPost() && !empty($post_args['purge']) && empty($post_args['cancel']) ) { - - // check individual PagePermissions + // without individual PagePermissions: if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) { $request->_notAuthorized(WIKIAUTH_ADMIN); $this->disabled("! user->isAdmin"); @@ -118,7 +116,6 @@ // Real purge. return $this->purgePages($request, array_keys($p)); } - if ($post_args['action'] == 'select') { $next_action = 'verify'; foreach ($p as $name => $c) { @@ -141,12 +138,12 @@ $header = HTML::fieldset(); if ($next_action == 'verify') { - $pagelist = new PageList_Unselectable($args['info'], $args['exclude'], array()); + $pagelist = new PageList_Selectable($args['info'], $args['exclude'], array()); $pagelist->addPageList($pages); $button_label = _("Yes"); $header->pushContent(HTML::legend(_("Confirm purge"))); $header->pushContent(HTML::p(HTML::strong( - _("Are you sure you want to permanently purge the following files?")))); + _("Are you sure you want to permanently purge the following files?")))); } else { $pagelist = new PageList_Selectable($args['info'], $args['exclude'], array()); $pagelist->addPageList($pages); @@ -158,7 +155,6 @@ Button('submit:admin_purge[cancel]', _("Cancel"), 'button')); $header->pushContent($buttons); - // TODO: quick select by regex javascript? return HTML::form(array('action' => $request->getPostURL(), 'method' => 'post'), $header, Modified: trunk/lib/plugin/WikiAdminRemove.php =================================================================== --- trunk/lib/plugin/WikiAdminRemove.php 2014-09-16 08:10:25 UTC (rev 9079) +++ trunk/lib/plugin/WikiAdminRemove.php 2014-09-16 08:14:33 UTC (rev 9080) @@ -45,7 +45,7 @@ { return array_merge ( - WikiPlugin_WikiAdminSelect::getDefaultArguments(), + parent::getDefaultArguments(), array( /* * Show only pages which have been 'deleted' this @@ -68,7 +68,7 @@ )); } - function collectPages(&$list, &$dbi, $sortby, $limit = 0) + protected function collectPages(&$list, &$dbi, $sortby, $limit = 0) { extract($this->_args); @@ -98,7 +98,7 @@ return $list; } - function removePages(&$request, $pages) + private function removePages(&$request, $pages) { $result = HTML::div(); $ul = HTML::ul(); @@ -122,13 +122,12 @@ } else { $result->pushContent(HTML::p(fmt("%d pages have been removed:", $count))); } - $result->pushContent($ul); - return $result; } else { $result->setAttr('class', 'error'); $result->pushContent(HTML::p(_("No pages removed."))); - return $result; } + $result->pushContent($ul); + return $result; } function run($dbi, $argstr, &$request, $basepage) @@ -191,7 +190,7 @@ $header = HTML::fieldset(); if ($next_action == 'verify') { - $pagelist = new PageList_Unselectable($args['info'], $args['exclude'], + $pagelist = new PageList_Selectable($args['info'], $args['exclude'], array('types' => array('remove' => new _PageList_Column_remove('remove', _("Remove"))))); Modified: trunk/lib/plugin/WikiAdminRename.php =================================================================== --- trunk/lib/plugin/WikiAdminRename.php 2014-09-16 08:10:25 UTC (rev 9079) +++ trunk/lib/plugin/WikiAdminRename.php 2014-09-16 08:14:33 UTC (rev 9080) @@ -41,7 +41,7 @@ { return array_merge ( - WikiPlugin_WikiAdminSelect::getDefaultArguments(), + parent::getDefaultArguments(), array( /* Columns to include in listing */ 'info' => 'pagename,mtime', Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2014-09-16 08:10:25 UTC (rev 9079) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2014-09-16 08:14:33 UTC (rev 9080) @@ -41,7 +41,7 @@ { return array_merge ( - WikiPlugin_WikiAdminSelect::getDefaultArguments(), + parent::getDefaultArguments(), array( /* Columns to include in listing */ 'info' => 'some', @@ -117,7 +117,7 @@ $header->pushContent(HTML::legend(_("Select the pages to search and replace"))); if ($next_action == 'verify') { $args['info'] = "pagename,mtime,author"; - $pagelist = new PageList_Unselectable($args['info'], $args['exclude'], $columns); + $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $columns); $pagelist->addPageList($pages); $button_label = _("Replace"); $header->pushContent( Modified: trunk/lib/plugin/WikiAdminSetAcl.php =================================================================== --- trunk/lib/plugin/WikiAdminSetAcl.php 2014-09-16 08:10:25 UTC (rev 9079) +++ trunk/lib/plugin/WikiAdminSetAcl.php 2014-09-16 08:14:33 UTC (rev 9080) @@ -46,7 +46,7 @@ { return array_merge ( - WikiPlugin_WikiAdminSelect::getDefaultArguments(), + parent::getDefaultArguments(), array( 'p' => "[]", // list of pages /* Columns to include in listing */ @@ -54,7 +54,7 @@ )); } - function setaclPages(&$request, $pages, $acl) + protected function setaclPages(&$request, $pages, $acl) { $result = HTML::div(); $count = 0; @@ -185,7 +185,7 @@ } if ($next_action == 'verify') { - $pagelist = new PageList_Unselectable($args['info'], + $pagelist = new PageList_Selectable($args['info'], $args['exclude'], array('types' => array( 'perm' Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php =================================================================== --- trunk/lib/plugin/WikiAdminSetAclSimple.php 2014-09-16 08:10:25 UTC (rev 9079) +++ trunk/lib/plugin/WikiAdminSetAclSimple.php 2014-09-16 08:14:33 UTC (rev 9080) @@ -115,7 +115,7 @@ * _OWNER: remove purge dump change; */ - function liberalPerms() + private function liberalPerms() { $perm = array('view' => array(ACL_EVERY => true), @@ -141,7 +141,7 @@ * _EVERY: -view -edit -list -create; */ - function restrictedPerms() + private function restrictedPerms() { $perm = array('view' => array(ACL_AUTHENTICATED => true, Modified: trunk/lib/plugin/WikiAdminSetExternal.php =================================================================== --- trunk/lib/plugin/WikiAdminSetExternal.php 2014-09-16 08:10:25 UTC (rev 9079) +++ trunk/lib/plugin/WikiAdminSetExternal.php 2014-09-16 08:14:33 UTC (rev 9080) @@ -40,7 +40,7 @@ { return array_merge ( - WikiPlugin_WikiAdminSelect::getDefaultArguments(), + parent::getDefaultArguments(), array( 'external' => 1, /* Columns to include in listing */ @@ -48,7 +48,7 @@ )); } - function setExternalPages(&$dbi, &$request, $pages) + private function setExternalPages(&$dbi, &$request, $pages) { $result = HTML::div(); $ul = HTML::ul(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-25 10:39:06
|
Revision: 9115 http://sourceforge.net/p/phpwiki/code/9115 Author: vargenau Date: 2014-09-25 10:38:58 +0000 (Thu, 25 Sep 2014) Log Message: ----------- Translate more strings Modified Paths: -------------- trunk/lib/plugin/AppendText.php trunk/lib/plugin/AsciiMath.php trunk/lib/plugin/FoafViewer.php trunk/lib/plugin/PasswordReset.php trunk/lib/plugin/PreferenceApp.php trunk/lib/plugin/RecentReferrers.php trunk/lib/plugin/SemanticSearch.php Modified: trunk/lib/plugin/AppendText.php =================================================================== --- trunk/lib/plugin/AppendText.php 2014-09-25 10:38:07 UTC (rev 9114) +++ trunk/lib/plugin/AppendText.php 2014-09-25 10:38:58 UTC (rev 9115) @@ -65,7 +65,7 @@ } else { $html = HTML(); if ($args['page'] != $basepage) - $html->pushContent("pages argument overrides page argument. ignored.", HTML::br()); + $html->pushContent(_("pages argument overrides page argument. ignored."), HTML::br()); foreach ($args['pages'] as $pagename) { $html->pushContent($this->work($pagename, $args, $dbi, $request)); } Modified: trunk/lib/plugin/AsciiMath.php =================================================================== --- trunk/lib/plugin/AsciiMath.php 2014-09-25 10:38:07 UTC (rev 9114) +++ trunk/lib/plugin/AsciiMath.php 2014-09-25 10:38:58 UTC (rev 9115) @@ -60,7 +60,7 @@ { $args = $this->getArgs($argstr, $request); if (empty($this->source)) { - return HTML::div(array('class' => "error"), "Please provide a formula to AsciiMath plugin"); + return HTML::div(array('class' => "error"), _("Please provide a formula to AsciiMath plugin")); } include 'lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php'; Modified: trunk/lib/plugin/FoafViewer.php =================================================================== --- trunk/lib/plugin/FoafViewer.php 2014-09-25 10:38:07 UTC (rev 9114) +++ trunk/lib/plugin/FoafViewer.php 2014-09-25 10:38:58 UTC (rev 9115) @@ -124,7 +124,7 @@ $foaffile = url_get_contents($foaf); if (!$foaffile) { //TODO: get errormsg - return HTML(HTML::p("Resource isn't available: Something went wrong, probably a 404!")); + return HTML(HTML::p(_("Resource isn't available: Something went wrong, probably a 404!"))); } // Create new Parser object $parser = new XML_FOAF_Parser; Modified: trunk/lib/plugin/PasswordReset.php =================================================================== --- trunk/lib/plugin/PasswordReset.php 2014-09-25 10:38:07 UTC (rev 9114) +++ trunk/lib/plugin/PasswordReset.php 2014-09-25 10:38:58 UTC (rev 9115) @@ -150,7 +150,7 @@ $isadmin ? 'wikiadmin' : 'button'), HTML::raw(' '), Button('submit:admin_reset[cancel]', _("Cancel"), 'button')); - $header = HTML::strong("Verify"); + $header = HTML::strong(_("Verify")); if (!$user->isAdmin()) { // check for email if ($userid == $user->UserName() and $user->isAuthenticated()) { @@ -173,7 +173,7 @@ } $verified = $thisuser->_prefs->_prefs['email']->getraw('emailVerified'); if (!$verified) - $header->pushContent(HTML::br(), "Warning: This users email address is unverified!"); + $header->pushContent(HTML::br(), _("Warning: This users email address is unverified!")); } return $this->doForm($request, $userid, $header, Modified: trunk/lib/plugin/PreferenceApp.php =================================================================== --- trunk/lib/plugin/PreferenceApp.php 2014-09-25 10:38:07 UTC (rev 9114) +++ trunk/lib/plugin/PreferenceApp.php 2014-09-25 10:38:58 UTC (rev 9115) @@ -77,7 +77,7 @@ $group = $category; } if ($category == null || $pageTextLabel == null) { - return HTML::div(array('class' => "error"), "PreferencesApp Error: You must declare at least parameters category and pageTextLabel."); + return HTML::div(array('class' => "error"), _("PreferencesApp Error: You must declare at least parameters category and pageTextLabel.")); } $dbi = $request->getDbh(); Modified: trunk/lib/plugin/RecentReferrers.php =================================================================== --- trunk/lib/plugin/RecentReferrers.php 2014-09-25 10:38:07 UTC (rev 9114) +++ trunk/lib/plugin/RecentReferrers.php 2014-09-25 10:38:58 UTC (rev 9115) @@ -48,7 +48,7 @@ function run($dbi, $argstr, &$request, $basepage) { if (!ACCESS_LOG) { - return HTML::div(array('class' => "error"), "Error: no ACCESS_LOG"); + return HTML::div(array('class' => "error"), _("Error: no ACCESS_LOG")); } $args = $this->getArgs($argstr, $request); $table = HTML::table(array('class' => 'pagelist')); @@ -59,8 +59,8 @@ if ($logiter = $accesslog->get_referer($limit, "external_only") and $logiter->count() ) { - $table->pushContent(HTML::tr(HTML::th("Target"), HTML::th("Referrer"), - HTML::th("Host"), HTML::th("Date"))); + $table->pushContent(HTML::tr(HTML::th(_("Target")), HTML::th(_("Referrer")), + HTML::th(_("Host")), HTML::th(_("Date")))); while ($logentry = $logiter->next()) { $table->pushContent(HTML::tr(HTML::td($logentry['request']), HTML::td($logentry['referer']), Modified: trunk/lib/plugin/SemanticSearch.php =================================================================== --- trunk/lib/plugin/SemanticSearch.php 2014-09-25 10:38:07 UTC (rev 9114) +++ trunk/lib/plugin/SemanticSearch.php 2014-09-25 10:38:58 UTC (rev 9115) @@ -145,10 +145,10 @@ HTML::colgroup(array('span' => 6)), HTML::thead (HTML::tr( - HTML::th('Pagefilter'), - HTML::th('Relation'), + HTML::th(_('Pagefilter')), + HTML::th(_('Relation')), HTML::th(), - HTML::th('Links'), + HTML::th(_('Links')), HTML::th() )), HTML::tbody @@ -228,10 +228,10 @@ HTML::colgroup(array('span' => 6)), HTML::thead (HTML::tr( - HTML::th('Pagefilter'), - HTML::th('Attribute'), - HTML::th('Op'), - HTML::th('Value'), + HTML::th(_('Pagefilter')), + HTML::th(_('Attribute')), + HTML::th(_('Op')), + HTML::th(_('Value')), HTML::th() )), HTML::tbody This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-10-01 15:26:09
|
Revision: 9148 http://sourceforge.net/p/phpwiki/code/9148 Author: vargenau Date: 2014-10-01 15:25:56 +0000 (Wed, 01 Oct 2014) Log Message: ----------- Massive PHP Doc update Modified Paths: -------------- trunk/lib/plugin/AddComment.php trunk/lib/plugin/AllPages.php trunk/lib/plugin/AllUsers.php trunk/lib/plugin/AnalyseAccessLogSql.php trunk/lib/plugin/AppendText.php trunk/lib/plugin/AsciiMath.php trunk/lib/plugin/AsciiSVG.php trunk/lib/plugin/AtomFeed.php trunk/lib/plugin/AuthorHistory.php trunk/lib/plugin/BackLinks.php trunk/lib/plugin/BlogArchives.php trunk/lib/plugin/BlogJournal.php trunk/lib/plugin/BoxRight.php trunk/lib/plugin/Calendar.php trunk/lib/plugin/CalendarList.php trunk/lib/plugin/CategoryPage.php trunk/lib/plugin/Chart.php trunk/lib/plugin/Comment.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/CreatePage.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/CurrentTime.php trunk/lib/plugin/DebugAuthInfo.php trunk/lib/plugin/DebugBackendInfo.php trunk/lib/plugin/DebugGroupInfo.php trunk/lib/plugin/DebugRetransform.php trunk/lib/plugin/Diff.php trunk/lib/plugin/DynamicIncludePage.php trunk/lib/plugin/EditMetaData.php trunk/lib/plugin/ExternalSearch.php trunk/lib/plugin/FacebookLike.php trunk/lib/plugin/FileInfo.php trunk/lib/plugin/FoafViewer.php trunk/lib/plugin/FuzzyPages.php trunk/lib/plugin/GoTo.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/GooglePlugin.php trunk/lib/plugin/HelloWorld.php trunk/lib/plugin/HtmlConverter.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/IncludePages.php trunk/lib/plugin/IncludeSiteMap.php trunk/lib/plugin/IncludeTree.php trunk/lib/plugin/InterWikiSearch.php trunk/lib/plugin/JabberPresence.php trunk/lib/plugin/LdapSearch.php trunk/lib/plugin/LikePages.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/ListPages.php trunk/lib/plugin/ListRelations.php trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/MediawikiTable.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/MostPopular.php trunk/lib/plugin/NewPagesPerUser.php trunk/lib/plugin/NoCache.php trunk/lib/plugin/OldStyleTable.php trunk/lib/plugin/OrphanedPages.php trunk/lib/plugin/PageGroup.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PageInfo.php trunk/lib/plugin/PageTrail.php trunk/lib/plugin/PasswordReset.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/PhpHighlight.php trunk/lib/plugin/PhpWeather.php trunk/lib/plugin/PluginManager.php trunk/lib/plugin/PopUp.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/PopularTags.php trunk/lib/plugin/PreferenceApp.php trunk/lib/plugin/PreferencesInfo.php trunk/lib/plugin/PrevNext.php trunk/lib/plugin/Processing.php trunk/lib/plugin/RandomPage.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RawHtml.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/RecentComments.php trunk/lib/plugin/RecentReferrers.php trunk/lib/plugin/RedirectTo.php trunk/lib/plugin/RichTable.php trunk/lib/plugin/RssFeed.php trunk/lib/plugin/SearchHighlight.php trunk/lib/plugin/SemanticRelations.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/SiteMap.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/SqlResult.php trunk/lib/plugin/SyncWiki.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/TeX2png.php trunk/lib/plugin/Template.php trunk/lib/plugin/TitleSearch.php trunk/lib/plugin/Transclude.php trunk/lib/plugin/TranslateText.php trunk/lib/plugin/UnfoldSubpages.php trunk/lib/plugin/UpLoad.php trunk/lib/plugin/UriResolver.php trunk/lib/plugin/UserPreferences.php trunk/lib/plugin/UserRatings.php trunk/lib/plugin/Video.php trunk/lib/plugin/WantedPages.php trunk/lib/plugin/WantedPagesOld.php trunk/lib/plugin/WatchPage.php trunk/lib/plugin/WhoIsOnline.php trunk/lib/plugin/WikiAdminChown.php trunk/lib/plugin/WikiAdminDeleteAcl.php trunk/lib/plugin/WikiAdminPurge.php trunk/lib/plugin/WikiAdminRemove.php trunk/lib/plugin/WikiAdminRename.php trunk/lib/plugin/WikiAdminSearchReplace.php trunk/lib/plugin/WikiAdminSelect.php trunk/lib/plugin/WikiAdminSetAcl.php trunk/lib/plugin/WikiAdminSetAclSimple.php trunk/lib/plugin/WikiAdminSetExternal.php trunk/lib/plugin/WikiAdminUtils.php trunk/lib/plugin/WikiBlog.php trunk/lib/plugin/WikiForm.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiForum.php trunk/lib/plugin/WikiPoll.php trunk/lib/plugin/WikiTranslation.php trunk/lib/plugin/WikicreoleTable.php trunk/lib/plugin/YouTube.php trunk/lib/plugin/text2png.php Modified: trunk/lib/plugin/AddComment.php =================================================================== --- trunk/lib/plugin/AddComment.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/AddComment.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -65,6 +65,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/AllPages.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -53,6 +53,13 @@ // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges // sortby: [+|-] pagename|mtime|hits + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/AllUsers.php =================================================================== --- trunk/lib/plugin/AllUsers.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/AllUsers.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -57,6 +57,13 @@ // // sortby: [+|-] pagename|mtime|hits + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/AnalyseAccessLogSql.php =================================================================== --- trunk/lib/plugin/AnalyseAccessLogSql.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/AnalyseAccessLogSql.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -263,6 +263,13 @@ return _("Show summary information from the access log table."); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { // flag that the output may not be cached - i.e. it is dynamic Modified: trunk/lib/plugin/AppendText.php =================================================================== --- trunk/lib/plugin/AppendText.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/AppendText.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -56,6 +56,13 @@ return $oldtext . "\n" . $addtext; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/AsciiMath.php =================================================================== --- trunk/lib/plugin/AsciiMath.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/AsciiMath.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -56,6 +56,13 @@ $this->source = $argstr; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/AsciiSVG.php =================================================================== --- trunk/lib/plugin/AsciiSVG.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/AsciiSVG.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -47,6 +47,13 @@ $this->source = $argstr; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { global $WikiTheme; Modified: trunk/lib/plugin/AtomFeed.php =================================================================== --- trunk/lib/plugin/AtomFeed.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/AtomFeed.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -44,6 +44,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { extract($this->getArgs($argstr, $request)); Modified: trunk/lib/plugin/AuthorHistory.php =================================================================== --- trunk/lib/plugin/AuthorHistory.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/AuthorHistory.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -81,6 +81,13 @@ // info=mtime,hits,summary,version,author,locked,minor // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $this->_args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/BackLinks.php =================================================================== --- trunk/lib/plugin/BackLinks.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/BackLinks.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -48,6 +48,13 @@ // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges // NEW: info=count : number of links // page=foo,bar : backlinks to both pages + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/BlogArchives.php =================================================================== --- trunk/lib/plugin/BlogArchives.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/BlogArchives.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -53,6 +53,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { if (is_array($argstr)) { // can do with array also. Modified: trunk/lib/plugin/BlogJournal.php =================================================================== --- trunk/lib/plugin/BlogJournal.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/BlogJournal.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -49,6 +49,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { if (is_array($argstr)) { // can do with array also. Modified: trunk/lib/plugin/BoxRight.php =================================================================== --- trunk/lib/plugin/BoxRight.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/BoxRight.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -44,6 +44,13 @@ return true; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { if (!$basepage) { Modified: trunk/lib/plugin/Calendar.php =================================================================== --- trunk/lib/plugin/Calendar.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/Calendar.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -165,6 +165,13 @@ return $td; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $this->args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/CalendarList.php =================================================================== --- trunk/lib/plugin/CalendarList.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/CalendarList.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -142,6 +142,13 @@ return $a; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $this->args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/CategoryPage.php =================================================================== --- trunk/lib/plugin/CategoryPage.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/CategoryPage.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -56,6 +56,13 @@ 'showbuds' => false); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/Chart.php =================================================================== --- trunk/lib/plugin/Chart.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/Chart.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -69,6 +69,13 @@ $this->source = $argstr; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/Comment.php =================================================================== --- trunk/lib/plugin/Comment.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/Comment.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -49,6 +49,13 @@ return array(); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { return HTML::raw(''); Modified: trunk/lib/plugin/CreateBib.php =================================================================== --- trunk/lib/plugin/CreateBib.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/CreateBib.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -96,6 +96,13 @@ } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { extract($this->getArgs($argstr, $request)); Modified: trunk/lib/plugin/CreatePage.php =================================================================== --- trunk/lib/plugin/CreatePage.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/CreatePage.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -56,6 +56,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { extract($this->getArgs($argstr, $request)); Modified: trunk/lib/plugin/CreateToc.php =================================================================== --- trunk/lib/plugin/CreateToc.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/CreateToc.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -377,6 +377,13 @@ return $headers; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { global $WikiTheme; Modified: trunk/lib/plugin/CurrentTime.php =================================================================== --- trunk/lib/plugin/CurrentTime.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/CurrentTime.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -69,6 +69,13 @@ return; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { extract($this->getArgs($argstr, $request)); Modified: trunk/lib/plugin/DebugAuthInfo.php =================================================================== --- trunk/lib/plugin/DebugAuthInfo.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/DebugAuthInfo.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -41,6 +41,13 @@ return array('userid' => ''); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/DebugBackendInfo.php =================================================================== --- trunk/lib/plugin/DebugBackendInfo.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/DebugBackendInfo.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -37,6 +37,13 @@ 'notallversions' => 0); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/DebugGroupInfo.php =================================================================== --- trunk/lib/plugin/DebugGroupInfo.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/DebugGroupInfo.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -36,6 +36,13 @@ return array(); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/DebugRetransform.php =================================================================== --- trunk/lib/plugin/DebugRetransform.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/DebugRetransform.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -36,6 +36,13 @@ return array('page' => '[pagename]'); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/Diff.php =================================================================== --- trunk/lib/plugin/Diff.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/Diff.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -73,6 +73,13 @@ return $row; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { extract($this->getArgs($argstr, $request)); Modified: trunk/lib/plugin/DynamicIncludePage.php =================================================================== --- trunk/lib/plugin/DynamicIncludePage.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/DynamicIncludePage.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -45,6 +45,13 @@ )); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { global $WikiTheme; Modified: trunk/lib/plugin/EditMetaData.php =================================================================== --- trunk/lib/plugin/EditMetaData.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/EditMetaData.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -54,6 +54,13 @@ return array('page' => '[pagename]'); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $this->_args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/ExternalSearch.php =================================================================== --- trunk/lib/plugin/ExternalSearch.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/ExternalSearch.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -71,6 +71,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/FacebookLike.php =================================================================== --- trunk/lib/plugin/FacebookLike.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/FacebookLike.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -48,6 +48,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/FileInfo.php =================================================================== --- trunk/lib/plugin/FileInfo.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/FileInfo.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -52,6 +52,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/FoafViewer.php =================================================================== --- trunk/lib/plugin/FoafViewer.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/FoafViewer.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -79,6 +79,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/FuzzyPages.php =================================================================== --- trunk/lib/plugin/FuzzyPages.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/FuzzyPages.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -148,6 +148,13 @@ return $table; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/GoTo.php =================================================================== --- trunk/lib/plugin/GoTo.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/GoTo.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -43,6 +43,13 @@ return array('size' => 32); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $request->setArg('action', false); Modified: trunk/lib/plugin/GoogleMaps.php =================================================================== --- trunk/lib/plugin/GoogleMaps.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/GoogleMaps.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -78,6 +78,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/GooglePlugin.php =================================================================== --- trunk/lib/plugin/GooglePlugin.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/GooglePlugin.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -56,6 +56,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/HelloWorld.php =================================================================== --- trunk/lib/plugin/HelloWorld.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/HelloWorld.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -52,6 +52,13 @@ 'name' => "World"); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { extract($this->getArgs($argstr, $request)); Modified: trunk/lib/plugin/HtmlConverter.php =================================================================== --- trunk/lib/plugin/HtmlConverter.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/HtmlConverter.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -42,6 +42,13 @@ return array(); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $form = HTML::form(array('action' => $request->getPostURL(), Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/IncludePage.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -79,6 +79,13 @@ return; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/IncludePages.php =================================================================== --- trunk/lib/plugin/IncludePages.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/IncludePages.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -44,6 +44,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/IncludeSiteMap.php =================================================================== --- trunk/lib/plugin/IncludeSiteMap.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/IncludeSiteMap.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -69,6 +69,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { return WikiPlugin_SiteMap::run($dbi, $argstr, $request, $basepage); Modified: trunk/lib/plugin/IncludeTree.php =================================================================== --- trunk/lib/plugin/IncludeTree.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/IncludeTree.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -58,6 +58,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { return WikiPlugin_SiteMap::run($dbi, $argstr, $request, $basepage); Modified: trunk/lib/plugin/InterWikiSearch.php =================================================================== --- trunk/lib/plugin/InterWikiSearch.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/InterWikiSearch.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -39,6 +39,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/JabberPresence.php =================================================================== --- trunk/lib/plugin/JabberPresence.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/JabberPresence.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -52,6 +52,13 @@ 'iconset' => "gabber"); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { extract($this->getArgs($argstr, $request)); Modified: trunk/lib/plugin/LdapSearch.php =================================================================== --- trunk/lib/plugin/LdapSearch.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/LdapSearch.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -69,6 +69,13 @@ // I ought to require the ldap extension, but fail sanely, if I cant get it. // - however at the moment this seems to work as is + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { if (!function_exists('ldap_connect')) { Modified: trunk/lib/plugin/LikePages.php =================================================================== --- trunk/lib/plugin/LikePages.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/LikePages.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -48,6 +48,13 @@ // info=mtime,hits,summary,version,author,locked,minor // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/LinkDatabase.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -72,6 +72,13 @@ $this->run($dbi, WikiPluginCached::glueArgs($argarray), $request, $basepage); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { global $WikiTheme; Modified: trunk/lib/plugin/LinkSearch.php =================================================================== --- trunk/lib/plugin/LinkSearch.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/LinkSearch.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -123,6 +123,13 @@ return $form; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/ListPages.php =================================================================== --- trunk/lib/plugin/ListPages.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/ListPages.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -58,6 +58,13 @@ // numbacklinks : number of backlinks (links to the given page) // numpagelinks : number of forward links (links at the given page) + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/ListRelations.php =================================================================== --- trunk/lib/plugin/ListRelations.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/ListRelations.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -45,6 +45,13 @@ )); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/ListSubpages.php =================================================================== --- trunk/lib/plugin/ListSubpages.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/ListSubpages.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -53,6 +53,13 @@ // info=mtime,hits,summary,version,author,locked,minor,count // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/MediawikiTable.php =================================================================== --- trunk/lib/plugin/MediawikiTable.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/MediawikiTable.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -72,6 +72,13 @@ return $backlinks; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { global $backlinks; Modified: trunk/lib/plugin/ModeratedPage.php =================================================================== --- trunk/lib/plugin/ModeratedPage.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/ModeratedPage.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -54,6 +54,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/MostPopular.php =================================================================== --- trunk/lib/plugin/MostPopular.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/MostPopular.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -51,6 +51,13 @@ // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges // sortby: only pagename or hits. mtime not! + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/NewPagesPerUser.php =================================================================== --- trunk/lib/plugin/NewPagesPerUser.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/NewPagesPerUser.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -54,6 +54,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { global $WikiTheme; Modified: trunk/lib/plugin/NoCache.php =================================================================== --- trunk/lib/plugin/NoCache.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/NoCache.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -46,6 +46,13 @@ return array('nocache' => 1); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/OldStyleTable.php =================================================================== --- trunk/lib/plugin/OldStyleTable.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/OldStyleTable.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -76,6 +76,13 @@ return $backlinks; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { global $backlinks; Modified: trunk/lib/plugin/OrphanedPages.php =================================================================== --- trunk/lib/plugin/OrphanedPages.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/OrphanedPages.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -51,6 +51,13 @@ // info=mtime,hits,summary,version,author,locked,minor,markup or all // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/PageGroup.php =================================================================== --- trunk/lib/plugin/PageGroup.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/PageGroup.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -87,6 +87,13 @@ return array(sprintf(_("<%s: no such section>"), $page . " " . $section)); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/PageHistory.php =================================================================== --- trunk/lib/plugin/PageHistory.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/PageHistory.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -329,6 +329,13 @@ return $fmt->format($changes); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/PageInfo.php =================================================================== --- trunk/lib/plugin/PageInfo.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/PageInfo.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -40,6 +40,13 @@ 'version' => '[version]'); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/PageTrail.php =================================================================== --- trunk/lib/plugin/PageTrail.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/PageTrail.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -54,6 +54,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { extract($this->getArgs($argstr, $request)); Modified: trunk/lib/plugin/PasswordReset.php =================================================================== --- trunk/lib/plugin/PasswordReset.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/PasswordReset.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -113,6 +113,13 @@ $footer); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/PhotoAlbum.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -154,6 +154,13 @@ // descriptions (instead of filenames) for image alt-tags + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/PhpHighlight.php =================================================================== --- trunk/lib/plugin/PhpHighlight.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/PhpHighlight.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -49,6 +49,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/PhpWeather.php =================================================================== --- trunk/lib/plugin/PhpWeather.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/PhpWeather.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -73,6 +73,13 @@ 'units' => 'both_metric'); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { // When 'phpweather/phpweather.php' is not installed then Modified: trunk/lib/plugin/PluginManager.php =================================================================== --- trunk/lib/plugin/PluginManager.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/PluginManager.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -38,6 +38,13 @@ return array('info' => 'args'); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { extract($this->getArgs($argstr, $request)); Modified: trunk/lib/plugin/PopUp.php =================================================================== --- trunk/lib/plugin/PopUp.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/PopUp.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -70,6 +70,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { extract($this->getArgs($argstr, $request)); Modified: trunk/lib/plugin/PopularNearby.php =================================================================== --- trunk/lib/plugin/PopularNearby.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/PopularNearby.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -54,6 +54,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/PopularTags.php =================================================================== --- trunk/lib/plugin/PopularTags.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/PopularTags.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -50,6 +50,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/PreferenceApp.php =================================================================== --- trunk/lib/plugin/PreferenceApp.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/PreferenceApp.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -69,6 +69,13 @@ // info=mtime,hits,summary,version,author,locked,minor // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/PreferencesInfo.php =================================================================== --- trunk/lib/plugin/PreferencesInfo.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/PreferencesInfo.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -38,6 +38,13 @@ 'userid' => '[userid]'); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/PrevNext.php =================================================================== --- trunk/lib/plugin/PrevNext.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/PrevNext.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -51,6 +51,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/Processing.php =================================================================== --- trunk/lib/plugin/Processing.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/Processing.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -46,6 +46,13 @@ $this->source = $argstr; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { global $WikiTheme; Modified: trunk/lib/plugin/RandomPage.php =================================================================== --- trunk/lib/plugin/RandomPage.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/RandomPage.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -47,6 +47,13 @@ 'info' => '')); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/RateIt.php =================================================================== --- trunk/lib/plugin/RateIt.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/RateIt.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -190,6 +190,13 @@ } // Only for signed users done in template only yet. + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { global $WikiTheme; Modified: trunk/lib/plugin/RawHtml.php =================================================================== --- trunk/lib/plugin/RawHtml.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/RawHtml.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -67,6 +67,13 @@ return true; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { if (!defined('ENABLE_RAW_HTML') || !ENABLE_RAW_HTML) { Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/RecentChanges.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -1300,6 +1300,12 @@ ); } + /** + * @param string $argstr + * @param WikiRequest $request + * @param array $defaults + * @return array + */ function getArgs($argstr, $request = false, $defaults = array()) { if (empty($defaults)) { @@ -1412,6 +1418,13 @@ return $fmt->format($changes); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/RecentComments.php =================================================================== --- trunk/lib/plugin/RecentComments.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/RecentComments.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -53,6 +53,13 @@ return $fmt->format($changes); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/RecentReferrers.php =================================================================== --- trunk/lib/plugin/RecentReferrers.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/RecentReferrers.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -45,6 +45,13 @@ )); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { if (!ACCESS_LOG) { Modified: trunk/lib/plugin/RedirectTo.php =================================================================== --- trunk/lib/plugin/RedirectTo.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/RedirectTo.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -51,6 +51,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/RichTable.php =================================================================== --- trunk/lib/plugin/RichTable.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/RichTable.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -50,6 +50,13 @@ return $backlinks; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { global $backlinks; Modified: trunk/lib/plugin/RssFeed.php =================================================================== --- trunk/lib/plugin/RssFeed.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/RssFeed.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -44,6 +44,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { extract($this->getArgs($argstr, $request)); Modified: trunk/lib/plugin/SearchHighlight.php =================================================================== --- trunk/lib/plugin/SearchHighlight.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/SearchHighlight.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -51,6 +51,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/SemanticRelations.php =================================================================== --- trunk/lib/plugin/SemanticRelations.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/SemanticRelations.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -48,6 +48,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { global $WikiTheme; Modified: trunk/lib/plugin/SemanticSearch.php =================================================================== --- trunk/lib/plugin/SemanticSearch.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/SemanticSearch.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -266,6 +266,13 @@ return new TextSearchQuery($string, $case_exact, $regex); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $this->_supported_operators = array(':=', '<', '<=', '>', '>=', '!=', '==', '=~'); Modified: trunk/lib/plugin/SemanticSearchAdvanced.php =================================================================== --- trunk/lib/plugin/SemanticSearchAdvanced.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/SemanticSearchAdvanced.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -124,6 +124,13 @@ return $form; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $this->_supported_operators = array(':=', '<', '<=', '>', '>=', '!=', '==', '=~'); Modified: trunk/lib/plugin/SiteMap.php =================================================================== --- trunk/lib/plugin/SiteMap.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/SiteMap.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -133,6 +133,13 @@ return $pagearr; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { include_once 'lib/BlockParser.php'; Modified: trunk/lib/plugin/SpellCheck.php =================================================================== --- trunk/lib/plugin/SpellCheck.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/SpellCheck.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -112,6 +112,13 @@ ; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { extract($this->getArgs($argstr, $request)); Modified: trunk/lib/plugin/SqlResult.php =================================================================== --- trunk/lib/plugin/SqlResult.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/SqlResult.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -93,6 +93,13 @@ $this->_sql = str_replace("\n", " ", $argstr); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { global $DBParams; Modified: trunk/lib/plugin/SyncWiki.php =================================================================== --- trunk/lib/plugin/SyncWiki.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/SyncWiki.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -60,6 +60,13 @@ ); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/SyntaxHighlighter.php =================================================================== --- trunk/lib/plugin/SyntaxHighlighter.php 2014-10-01 14:18:44 UTC (rev 9147) +++ trunk/lib/plugin/SyntaxHighlighter.php 2014-10-01 15:25:56 UTC (rev 9148) @@ -49,6 +49,13 @@ $this->source = $argstr; } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return bool + */ function run($dbi, $argstr, &$request, $basepage) { extract($this->getArgs($argstr, $request)); Modified: trunk/lib/plugin/SystemInfo.php ======================================================... [truncated message content] |
From: <var...@us...> - 2014-10-01 16:45:14
|
Revision: 9154 http://sourceforge.net/p/phpwiki/code/9154 Author: vargenau Date: 2014-10-01 16:45:10 +0000 (Wed, 01 Oct 2014) Log Message: ----------- Extract arguments by hand Modified Paths: -------------- trunk/lib/plugin/BackLinks.php trunk/lib/plugin/CurrentTime.php trunk/lib/plugin/IncludePage.php Modified: trunk/lib/plugin/BackLinks.php =================================================================== --- trunk/lib/plugin/BackLinks.php 2014-10-01 16:44:17 UTC (rev 9153) +++ trunk/lib/plugin/BackLinks.php 2014-10-01 16:45:10 UTC (rev 9154) @@ -58,22 +58,33 @@ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); + $page = $args['page']; + $sortby = $args['sortby']; + $info = $args['info']; + $noheader = $args['noheader']; + $include_self = $args['include_self']; + $limit = $args['limit']; + $exclude = $args['exclude']; - extract($args); - if (empty($page) and $page != '0') + if (empty($page) and $page != '0') { return ''; - // exclude is now already expanded in WikiPlugin::getArgs() - if (empty($exclude)) $exclude = array(); - if (!$include_self) + } + if (empty($exclude)) { + $exclude = array(); + } + if (!$include_self) { $exclude[] = $page; + } if ($info) { $info = explode(",", $info); - if (in_array('count', $info)) + if (in_array('count', $info)) { $args['types']['count'] = new _PageList_Column_BackLinks_count('count', _("#"), 'center'); + } } - if (!empty($limit)) + if (!empty($limit)) { $args['limit'] = $limit; + } // $args['dosort'] = !empty($args['sortby']); // override DB sort (??) $pagelist = new PageList($info, $exclude, $args); Modified: trunk/lib/plugin/CurrentTime.php =================================================================== --- trunk/lib/plugin/CurrentTime.php 2014-10-01 16:44:17 UTC (rev 9153) +++ trunk/lib/plugin/CurrentTime.php 2014-10-01 16:45:10 UTC (rev 9154) @@ -78,7 +78,8 @@ */ function run($dbi, $argstr, &$request, $basepage) { - extract($this->getArgs($argstr, $request)); + $args = $this->getArgs($argstr, $request); + $format = $args['format']; if ($format == 'date') { $format = '%Y-%m-%d'; Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2014-10-01 16:44:17 UTC (rev 9153) +++ trunk/lib/plugin/IncludePage.php 2014-10-01 16:45:10 UTC (rev 9154) @@ -51,10 +51,9 @@ function getWikiPageLinks($argstr, $basepage) { - extract($this->getArgs($argstr)); + $args = $this->getArgs($argstr)); + $page = $args['page']; - if (!isset($page)) - return false; if ($page) { // Expand relative page names. $page = new WikiPageName($page, $basepage); @@ -89,7 +88,9 @@ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); - extract($args); + $page = $args['page']; + $rev = $args['rev']; + $quiet = $args['quiet']; if ($page) { // Expand relative page names. @@ -191,7 +192,13 @@ */ protected function extractParts($c, $pagename, $args) { - extract($args); + $section = $args['section']; + $sections = $args['sections']; + $lines = $args['lines']; + $words = $args['words']; + $bytes = $args['bytes']; + $quiet = $args['quiet']; + $sectionhead = $args['sectionhead']; if ($section) { if ($sections) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-10-02 13:43:25
|
Revision: 9159 http://sourceforge.net/p/phpwiki/code/9159 Author: vargenau Date: 2014-10-02 13:43:22 +0000 (Thu, 02 Oct 2014) Log Message: ----------- Put explicit warning message Modified Paths: -------------- trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/FuzzyPages.php trunk/lib/plugin/TitleSearch.php Modified: trunk/lib/plugin/FullTextSearch.php =================================================================== --- trunk/lib/plugin/FullTextSearch.php 2014-10-02 13:42:18 UTC (rev 9158) +++ trunk/lib/plugin/FullTextSearch.php 2014-10-02 13:43:22 UTC (rev 9159) @@ -86,7 +86,8 @@ $limit = $args['limit']; if (empty($s)) { - return HTML(); + return HTML::p(array('class' => 'warning'), + _("You must enter a search term.")); } $query = new TextSearchQuery($s, $case_exact, $regex); Modified: trunk/lib/plugin/FuzzyPages.php =================================================================== --- trunk/lib/plugin/FuzzyPages.php 2014-10-02 13:42:18 UTC (rev 9158) +++ trunk/lib/plugin/FuzzyPages.php 2014-10-02 13:43:22 UTC (rev 9159) @@ -159,8 +159,10 @@ { $args = $this->getArgs($argstr, $request); extract($args); + if (empty($s)) { - return HTML(); + return HTML::p(array('class' => 'warning'), + _("You must enter a search term.")); } if (defined('DEBUG') && DEBUG) { Modified: trunk/lib/plugin/TitleSearch.php =================================================================== --- trunk/lib/plugin/TitleSearch.php 2014-10-02 13:42:18 UTC (rev 9158) +++ trunk/lib/plugin/TitleSearch.php 2014-10-02 13:43:22 UTC (rev 9159) @@ -77,8 +77,10 @@ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); + if (empty($args['s'])) { - return HTML(); + return HTML::p(array('class' => 'warning'), + _("You must enter a search term.")); } if (empty($args['sortby'])) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-10-06 09:40:16
|
Revision: 9191 http://sourceforge.net/p/phpwiki/code/9191 Author: vargenau Date: 2014-10-06 09:40:08 +0000 (Mon, 06 Oct 2014) Log Message: ----------- function run: @return mixed Modified Paths: -------------- trunk/lib/plugin/AddComment.php trunk/lib/plugin/AllPages.php trunk/lib/plugin/AllUsers.php trunk/lib/plugin/AnalyseAccessLogSql.php trunk/lib/plugin/AppendText.php trunk/lib/plugin/AsciiMath.php trunk/lib/plugin/AsciiSVG.php trunk/lib/plugin/AtomFeed.php trunk/lib/plugin/AuthorHistory.php trunk/lib/plugin/BackLinks.php trunk/lib/plugin/BlogArchives.php trunk/lib/plugin/BlogJournal.php trunk/lib/plugin/BoxRight.php trunk/lib/plugin/Calendar.php trunk/lib/plugin/CalendarList.php trunk/lib/plugin/CategoryPage.php trunk/lib/plugin/Chart.php trunk/lib/plugin/Comment.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/CreatePage.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/CurrentTime.php trunk/lib/plugin/DebugAuthInfo.php trunk/lib/plugin/DebugBackendInfo.php trunk/lib/plugin/DebugGroupInfo.php trunk/lib/plugin/DebugRetransform.php trunk/lib/plugin/Diff.php trunk/lib/plugin/DynamicIncludePage.php trunk/lib/plugin/EditMetaData.php trunk/lib/plugin/ExternalSearch.php trunk/lib/plugin/FacebookLike.php trunk/lib/plugin/FileInfo.php trunk/lib/plugin/FoafViewer.php trunk/lib/plugin/FuzzyPages.php trunk/lib/plugin/GoTo.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/GooglePlugin.php trunk/lib/plugin/HelloWorld.php trunk/lib/plugin/HtmlConverter.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/IncludePages.php trunk/lib/plugin/IncludeSiteMap.php trunk/lib/plugin/IncludeTree.php trunk/lib/plugin/InterWikiSearch.php trunk/lib/plugin/JabberPresence.php trunk/lib/plugin/LdapSearch.php trunk/lib/plugin/LikePages.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/ListPages.php trunk/lib/plugin/ListRelations.php trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/MediawikiTable.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/MostPopular.php trunk/lib/plugin/NewPagesPerUser.php trunk/lib/plugin/NoCache.php trunk/lib/plugin/OldStyleTable.php trunk/lib/plugin/OrphanedPages.php trunk/lib/plugin/PageGroup.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PageInfo.php trunk/lib/plugin/PageTrail.php trunk/lib/plugin/PasswordReset.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/PhpHighlight.php trunk/lib/plugin/PhpWeather.php trunk/lib/plugin/PluginManager.php trunk/lib/plugin/PopUp.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/PopularTags.php trunk/lib/plugin/PreferenceApp.php trunk/lib/plugin/PreferencesInfo.php trunk/lib/plugin/PrevNext.php trunk/lib/plugin/Processing.php trunk/lib/plugin/RandomPage.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RawHtml.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/RecentComments.php trunk/lib/plugin/RecentReferrers.php trunk/lib/plugin/RedirectTo.php trunk/lib/plugin/RichTable.php trunk/lib/plugin/RssFeed.php trunk/lib/plugin/SearchHighlight.php trunk/lib/plugin/SemanticRelations.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/SiteMap.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/SqlResult.php trunk/lib/plugin/SyncWiki.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/TeX2png.php trunk/lib/plugin/Template.php trunk/lib/plugin/TitleSearch.php trunk/lib/plugin/Transclude.php trunk/lib/plugin/TranslateText.php trunk/lib/plugin/UnfoldSubpages.php trunk/lib/plugin/UpLoad.php trunk/lib/plugin/UriResolver.php trunk/lib/plugin/UserPreferences.php trunk/lib/plugin/UserRatings.php trunk/lib/plugin/Video.php trunk/lib/plugin/WantedPages.php trunk/lib/plugin/WantedPagesOld.php trunk/lib/plugin/WatchPage.php trunk/lib/plugin/WhoIsOnline.php trunk/lib/plugin/WikiAdminChown.php trunk/lib/plugin/WikiAdminDeleteAcl.php trunk/lib/plugin/WikiAdminPurge.php trunk/lib/plugin/WikiAdminRemove.php trunk/lib/plugin/WikiAdminRename.php trunk/lib/plugin/WikiAdminSearchReplace.php trunk/lib/plugin/WikiAdminSelect.php trunk/lib/plugin/WikiAdminSetAcl.php trunk/lib/plugin/WikiAdminSetAclSimple.php trunk/lib/plugin/WikiAdminSetExternal.php trunk/lib/plugin/WikiAdminUtils.php trunk/lib/plugin/WikiBlog.php trunk/lib/plugin/WikiForm.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiForum.php trunk/lib/plugin/WikiPoll.php trunk/lib/plugin/WikiTranslation.php trunk/lib/plugin/WikicreoleTable.php trunk/lib/plugin/YouTube.php trunk/lib/plugin/text2png.php Modified: trunk/lib/plugin/AddComment.php =================================================================== --- trunk/lib/plugin/AddComment.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/AddComment.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -70,7 +70,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/AllPages.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -58,7 +58,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/AllUsers.php =================================================================== --- trunk/lib/plugin/AllUsers.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/AllUsers.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -62,7 +62,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/AnalyseAccessLogSql.php =================================================================== --- trunk/lib/plugin/AnalyseAccessLogSql.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/AnalyseAccessLogSql.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -268,7 +268,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/AppendText.php =================================================================== --- trunk/lib/plugin/AppendText.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/AppendText.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -61,7 +61,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/AsciiMath.php =================================================================== --- trunk/lib/plugin/AsciiMath.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/AsciiMath.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -61,7 +61,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/AsciiSVG.php =================================================================== --- trunk/lib/plugin/AsciiSVG.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/AsciiSVG.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -52,7 +52,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/AtomFeed.php =================================================================== --- trunk/lib/plugin/AtomFeed.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/AtomFeed.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -49,7 +49,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/AuthorHistory.php =================================================================== --- trunk/lib/plugin/AuthorHistory.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/AuthorHistory.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -86,7 +86,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/BackLinks.php =================================================================== --- trunk/lib/plugin/BackLinks.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/BackLinks.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -53,7 +53,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/BlogArchives.php =================================================================== --- trunk/lib/plugin/BlogArchives.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/BlogArchives.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -58,7 +58,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/BlogJournal.php =================================================================== --- trunk/lib/plugin/BlogJournal.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/BlogJournal.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -54,7 +54,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/BoxRight.php =================================================================== --- trunk/lib/plugin/BoxRight.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/BoxRight.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -49,7 +49,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/Calendar.php =================================================================== --- trunk/lib/plugin/Calendar.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/Calendar.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -170,7 +170,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/CalendarList.php =================================================================== --- trunk/lib/plugin/CalendarList.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/CalendarList.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -147,7 +147,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/CategoryPage.php =================================================================== --- trunk/lib/plugin/CategoryPage.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/CategoryPage.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -61,7 +61,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/Chart.php =================================================================== --- trunk/lib/plugin/Chart.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/Chart.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -74,7 +74,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/Comment.php =================================================================== --- trunk/lib/plugin/Comment.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/Comment.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -54,7 +54,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/CreateBib.php =================================================================== --- trunk/lib/plugin/CreateBib.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/CreateBib.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -101,7 +101,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/CreatePage.php =================================================================== --- trunk/lib/plugin/CreatePage.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/CreatePage.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -61,7 +61,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/CreateToc.php =================================================================== --- trunk/lib/plugin/CreateToc.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/CreateToc.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -382,7 +382,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/CurrentTime.php =================================================================== --- trunk/lib/plugin/CurrentTime.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/CurrentTime.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -74,7 +74,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/DebugAuthInfo.php =================================================================== --- trunk/lib/plugin/DebugAuthInfo.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/DebugAuthInfo.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -46,7 +46,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/DebugBackendInfo.php =================================================================== --- trunk/lib/plugin/DebugBackendInfo.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/DebugBackendInfo.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -42,7 +42,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/DebugGroupInfo.php =================================================================== --- trunk/lib/plugin/DebugGroupInfo.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/DebugGroupInfo.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -41,7 +41,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/DebugRetransform.php =================================================================== --- trunk/lib/plugin/DebugRetransform.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/DebugRetransform.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -41,7 +41,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/Diff.php =================================================================== --- trunk/lib/plugin/Diff.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/Diff.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -78,7 +78,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/DynamicIncludePage.php =================================================================== --- trunk/lib/plugin/DynamicIncludePage.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/DynamicIncludePage.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -50,7 +50,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/EditMetaData.php =================================================================== --- trunk/lib/plugin/EditMetaData.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/EditMetaData.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -59,7 +59,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/ExternalSearch.php =================================================================== --- trunk/lib/plugin/ExternalSearch.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/ExternalSearch.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -76,7 +76,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/FacebookLike.php =================================================================== --- trunk/lib/plugin/FacebookLike.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/FacebookLike.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -53,7 +53,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/FileInfo.php =================================================================== --- trunk/lib/plugin/FileInfo.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/FileInfo.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -57,7 +57,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/FoafViewer.php =================================================================== --- trunk/lib/plugin/FoafViewer.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/FoafViewer.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -84,7 +84,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/FuzzyPages.php =================================================================== --- trunk/lib/plugin/FuzzyPages.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/FuzzyPages.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -153,7 +153,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/GoTo.php =================================================================== --- trunk/lib/plugin/GoTo.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/GoTo.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -48,7 +48,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/GoogleMaps.php =================================================================== --- trunk/lib/plugin/GoogleMaps.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/GoogleMaps.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -83,7 +83,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/GooglePlugin.php =================================================================== --- trunk/lib/plugin/GooglePlugin.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/GooglePlugin.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -61,7 +61,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/HelloWorld.php =================================================================== --- trunk/lib/plugin/HelloWorld.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/HelloWorld.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -57,7 +57,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/HtmlConverter.php =================================================================== --- trunk/lib/plugin/HtmlConverter.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/HtmlConverter.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -47,7 +47,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/IncludePage.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -83,7 +83,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/IncludePages.php =================================================================== --- trunk/lib/plugin/IncludePages.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/IncludePages.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -49,7 +49,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/IncludeSiteMap.php =================================================================== --- trunk/lib/plugin/IncludeSiteMap.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/IncludeSiteMap.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -74,7 +74,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/IncludeTree.php =================================================================== --- trunk/lib/plugin/IncludeTree.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/IncludeTree.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -63,7 +63,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/InterWikiSearch.php =================================================================== --- trunk/lib/plugin/InterWikiSearch.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/InterWikiSearch.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -44,7 +44,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/JabberPresence.php =================================================================== --- trunk/lib/plugin/JabberPresence.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/JabberPresence.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -57,7 +57,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/LdapSearch.php =================================================================== --- trunk/lib/plugin/LdapSearch.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/LdapSearch.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -72,7 +72,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/LikePages.php =================================================================== --- trunk/lib/plugin/LikePages.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/LikePages.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -53,7 +53,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/LinkDatabase.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -77,7 +77,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/LinkSearch.php =================================================================== --- trunk/lib/plugin/LinkSearch.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/LinkSearch.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -128,7 +128,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/ListPages.php =================================================================== --- trunk/lib/plugin/ListPages.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/ListPages.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -63,7 +63,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/ListRelations.php =================================================================== --- trunk/lib/plugin/ListRelations.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/ListRelations.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -50,7 +50,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/ListSubpages.php =================================================================== --- trunk/lib/plugin/ListSubpages.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/ListSubpages.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -58,7 +58,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/MediawikiTable.php =================================================================== --- trunk/lib/plugin/MediawikiTable.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/MediawikiTable.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -77,7 +77,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/ModeratedPage.php =================================================================== --- trunk/lib/plugin/ModeratedPage.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/ModeratedPage.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -59,7 +59,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/MostPopular.php =================================================================== --- trunk/lib/plugin/MostPopular.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/MostPopular.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -56,7 +56,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/NewPagesPerUser.php =================================================================== --- trunk/lib/plugin/NewPagesPerUser.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/NewPagesPerUser.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -59,7 +59,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/NoCache.php =================================================================== --- trunk/lib/plugin/NoCache.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/NoCache.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -51,7 +51,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/OldStyleTable.php =================================================================== --- trunk/lib/plugin/OldStyleTable.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/OldStyleTable.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -81,7 +81,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/OrphanedPages.php =================================================================== --- trunk/lib/plugin/OrphanedPages.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/OrphanedPages.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -56,7 +56,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/PageGroup.php =================================================================== --- trunk/lib/plugin/PageGroup.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/PageGroup.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -92,7 +92,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/PageHistory.php =================================================================== --- trunk/lib/plugin/PageHistory.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/PageHistory.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -334,7 +334,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/PageInfo.php =================================================================== --- trunk/lib/plugin/PageInfo.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/PageInfo.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -45,7 +45,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/PageTrail.php =================================================================== --- trunk/lib/plugin/PageTrail.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/PageTrail.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -59,7 +59,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/PasswordReset.php =================================================================== --- trunk/lib/plugin/PasswordReset.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/PasswordReset.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -118,7 +118,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/PhotoAlbum.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -159,7 +159,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/PhpHighlight.php =================================================================== --- trunk/lib/plugin/PhpHighlight.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/PhpHighlight.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -54,7 +54,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/PhpWeather.php =================================================================== --- trunk/lib/plugin/PhpWeather.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/PhpWeather.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -78,7 +78,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/PluginManager.php =================================================================== --- trunk/lib/plugin/PluginManager.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/PluginManager.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -43,7 +43,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/PopUp.php =================================================================== --- trunk/lib/plugin/PopUp.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/PopUp.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -75,7 +75,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/PopularNearby.php =================================================================== --- trunk/lib/plugin/PopularNearby.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/PopularNearby.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -59,7 +59,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/PopularTags.php =================================================================== --- trunk/lib/plugin/PopularTags.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/PopularTags.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -55,7 +55,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/PreferenceApp.php =================================================================== --- trunk/lib/plugin/PreferenceApp.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/PreferenceApp.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -74,7 +74,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/PreferencesInfo.php =================================================================== --- trunk/lib/plugin/PreferencesInfo.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/PreferencesInfo.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -43,7 +43,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/PrevNext.php =================================================================== --- trunk/lib/plugin/PrevNext.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/PrevNext.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -56,7 +56,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/Processing.php =================================================================== --- trunk/lib/plugin/Processing.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/Processing.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -51,7 +51,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/RandomPage.php =================================================================== --- trunk/lib/plugin/RandomPage.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/RandomPage.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -52,7 +52,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/RateIt.php =================================================================== --- trunk/lib/plugin/RateIt.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/RateIt.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -195,7 +195,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/RawHtml.php =================================================================== --- trunk/lib/plugin/RawHtml.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/RawHtml.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -72,7 +72,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/RecentChanges.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -1423,7 +1423,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/RecentComments.php =================================================================== --- trunk/lib/plugin/RecentComments.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/RecentComments.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -58,7 +58,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/RecentReferrers.php =================================================================== --- trunk/lib/plugin/RecentReferrers.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/RecentReferrers.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -50,7 +50,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/RedirectTo.php =================================================================== --- trunk/lib/plugin/RedirectTo.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/RedirectTo.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -56,7 +56,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/RichTable.php =================================================================== --- trunk/lib/plugin/RichTable.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/RichTable.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -55,7 +55,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/RssFeed.php =================================================================== --- trunk/lib/plugin/RssFeed.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/RssFeed.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -49,7 +49,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/SearchHighlight.php =================================================================== --- trunk/lib/plugin/SearchHighlight.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/SearchHighlight.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -56,7 +56,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/SemanticRelations.php =================================================================== --- trunk/lib/plugin/SemanticRelations.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/SemanticRelations.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -53,7 +53,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/SemanticSearch.php =================================================================== --- trunk/lib/plugin/SemanticSearch.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/SemanticSearch.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -271,7 +271,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/SemanticSearchAdvanced.php =================================================================== --- trunk/lib/plugin/SemanticSearchAdvanced.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/SemanticSearchAdvanced.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -129,7 +129,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/SiteMap.php =================================================================== --- trunk/lib/plugin/SiteMap.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/SiteMap.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -138,7 +138,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/SpellCheck.php =================================================================== --- trunk/lib/plugin/SpellCheck.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/SpellCheck.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -117,7 +117,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/SqlResult.php =================================================================== --- trunk/lib/plugin/SqlResult.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/SqlResult.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -98,7 +98,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/SyncWiki.php =================================================================== --- trunk/lib/plugin/SyncWiki.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/SyncWiki.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -65,7 +65,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/SyntaxHighlighter.php =================================================================== --- trunk/lib/plugin/SyntaxHighlighter.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/SyntaxHighlighter.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -54,7 +54,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/SystemInfo.php =================================================================== --- trunk/lib/plugin/SystemInfo.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/SystemInfo.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -491,7 +491,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/TeX2png.php =================================================================== --- trunk/lib/plugin/TeX2png.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/TeX2png.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -216,7 +216,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/Template.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -107,7 +107,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/TitleSearch.php =================================================================== --- trunk/lib/plugin/TitleSearch.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/TitleSearch.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -72,7 +72,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/Transclude.php =================================================================== --- trunk/lib/plugin/Transclude.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/Transclude.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -66,7 +66,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/TranslateText.php =================================================================== --- trunk/lib/plugin/TranslateText.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/TranslateText.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -59,7 +59,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/UnfoldSubpages.php =================================================================== --- trunk/lib/plugin/UnfoldSubpages.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/UnfoldSubpages.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -73,7 +73,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/UpLoad.php =================================================================== --- trunk/lib/plugin/UpLoad.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/UpLoad.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -62,7 +62,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/UriResolver.php =================================================================== --- trunk/lib/plugin/UriResolver.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/UriResolver.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -52,7 +52,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/UserPreferences.php =================================================================== --- trunk/lib/plugin/UserPreferences.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/UserPreferences.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -65,7 +65,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/UserRatings.php =================================================================== --- trunk/lib/plugin/UserRatings.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/UserRatings.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -74,7 +74,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/Video.php =================================================================== --- trunk/lib/plugin/Video.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/Video.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -65,7 +65,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/WantedPages.php =================================================================== --- trunk/lib/plugin/WantedPages.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/WantedPages.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -61,7 +61,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/WantedPagesOld.php =================================================================== --- trunk/lib/plugin/WantedPagesOld.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/WantedPagesOld.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -50,7 +50,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/WatchPage.php =================================================================== --- trunk/lib/plugin/WatchPage.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/WatchPage.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -100,7 +100,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/WhoIsOnline.php =================================================================== --- trunk/lib/plugin/WhoIsOnline.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/WhoIsOnline.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -55,7 +55,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/WikiAdminChown.php =================================================================== --- trunk/lib/plugin/WikiAdminChown.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/WikiAdminChown.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -105,7 +105,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/WikiAdminDeleteAcl.php =================================================================== --- trunk/lib/plugin/WikiAdminDeleteAcl.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/WikiAdminDeleteAcl.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -82,7 +82,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/WikiAdminPurge.php =================================================================== --- trunk/lib/plugin/WikiAdminPurge.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/WikiAdminPurge.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -91,7 +91,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/WikiAdminRemove.php =================================================================== --- trunk/lib/plugin/WikiAdminRemove.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/WikiAdminRemove.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -135,7 +135,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/WikiAdminRename.php =================================================================== --- trunk/lib/plugin/WikiAdminRename.php 2014-10-06 09:25:36 UTC (rev 9190) +++ trunk/lib/plugin/WikiAdminRename.php 2014-10-06 09:40:08 UTC (rev 9191) @@ -66,7 +66,7 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return bool + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace... [truncated message content] |
From: <var...@us...> - 2014-10-06 09:42:32
|
Revision: 9192 http://sourceforge.net/p/phpwiki/code/9192 Author: vargenau Date: 2014-10-06 09:42:22 +0000 (Mon, 06 Oct 2014) Log Message: ----------- boolean --> bool Modified Paths: -------------- trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/VisualWiki.php Modified: trunk/lib/plugin/PopularNearby.php =================================================================== --- trunk/lib/plugin/PopularNearby.php 2014-10-06 09:40:08 UTC (rev 9191) +++ trunk/lib/plugin/PopularNearby.php 2014-10-06 09:42:22 UTC (rev 9192) @@ -102,8 +102,8 @@ * mode=incoming: $pages iter and $direction=true * mode=outgoing: $pages iter and $direction=false * - * @param $pages array of WikiDB_Page's or a Page_iterator - * @param $direction boolean: true if incoming links + * @param array $pages array of WikiDB_Page's or a Page_iterator + * @param bool $direction true if incoming links * * @param int $limit * @return Array of sorted links Modified: trunk/lib/plugin/VisualWiki.php =================================================================== --- trunk/lib/plugin/VisualWiki.php 2014-10-06 09:40:08 UTC (rev 9191) +++ trunk/lib/plugin/VisualWiki.php 2014-10-06 09:42:22 UTC (rev 9192) @@ -406,7 +406,7 @@ * @internal param string $shape node shape; 'ellipse', 'box', 'circle', 'point' * @internal param string $label 'name': label by name, * 'number': label by unique number - * @return boolean error status; true=ok; false=error + * @return bool error status; true=ok; false=error */ function createDotFile($filename, $argarray) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-10-06 10:04:24
|
Revision: 9194 http://sourceforge.net/p/phpwiki/code/9194 Author: vargenau Date: 2014-10-06 10:04:20 +0000 (Mon, 06 Oct 2014) Log Message: ----------- Update PHP Doc; type compatibility Modified Paths: -------------- trunk/lib/plugin/BlogArchives.php trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/RecentChangesCached.php trunk/lib/plugin/RecentEdits.php trunk/lib/plugin/RelatedChanges.php trunk/lib/plugin/RssFeed.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/WhoIsOnline.php trunk/lib/plugin/WikiAdminUtils.php Modified: trunk/lib/plugin/BlogArchives.php =================================================================== --- trunk/lib/plugin/BlogArchives.php 2014-10-06 10:01:53 UTC (rev 9193) +++ trunk/lib/plugin/BlogArchives.php 2014-10-06 10:04:20 UTC (rev 9194) @@ -142,7 +142,13 @@ } // box is used to display a fixed-width, narrow version with common header - function box($args = false, $request = false, $basepage = false) + /** + * @param string $args + * @param WikiRequest $request + * @param string $basepage + * @return $this|HtmlElement + */ + function box($args = '', $request = null, $basepage = '') { if (!$request) $request =& $GLOBALS['request']; if (!$args or empty($args['limit'])) $args['limit'] = 10; Modified: trunk/lib/plugin/FullTextSearch.php =================================================================== --- trunk/lib/plugin/FullTextSearch.php 2014-10-06 10:01:53 UTC (rev 9193) +++ trunk/lib/plugin/FullTextSearch.php 2014-10-06 10:04:20 UTC (rev 9194) @@ -100,7 +100,7 @@ $args['listtype'] = 'dl'; $args['types'] = array(new _PageList_Column_content ('rev:hi_content', _("Content"), "left", $s, $hilight_re)); - $list = new PageList(false, $exclude, $args); + $list = new PageList(array(), $exclude, $args); $list->setCaption(fmt("Full text search results for “%s”", $s)); while ($page = $pages->next()) { $list->addPage($page); Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2014-10-06 10:01:53 UTC (rev 9193) +++ trunk/lib/plugin/LinkDatabase.php 2014-10-06 10:04:20 UTC (rev 9194) @@ -67,6 +67,13 @@ )); } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return mixed + */ function getHtml($dbi, $argarray, $request, $basepage) { $this->run($dbi, WikiPluginCached::glueArgs($argarray), $request, $basepage); Modified: trunk/lib/plugin/RateIt.php =================================================================== --- trunk/lib/plugin/RateIt.php 2014-10-06 10:01:53 UTC (rev 9193) +++ trunk/lib/plugin/RateIt.php 2014-10-06 10:04:20 UTC (rev 9194) @@ -102,7 +102,7 @@ if ($imgPrefix and !$WikiTheme->_findData("images/RateIt" . $imgPrefix . "Nk0.png", 1)) $imgPrefix = ''; $img = substr($WikiTheme->_findData("images/RateIt" . $imgPrefix . "Nk0.png"), 0, -7); - $urlprefix = WikiURL("", 0, 1); // TODO: check actions USE_PATH_INFO=false + $urlprefix = WikiURL("", array(), 1); // TODO: check actions USE_PATH_INFO=false $js_globals = "var rateit_imgsrc = '" . $img . "'; var rateit_action = '" . urlencode("RateIt") . "'; "; @@ -294,7 +294,13 @@ } // box is used to display a fixed-width, narrow version with common header - function box($args = false, $request = false, $basepage = false) + /** + * @param string $args + * @param WikiRequest $request + * @param string $basepage + * @return $this|HtmlElement + */ + function box($args = '', $request = null, $basepage = '') { if (!$request) $request =& $GLOBALS['request']; if (!$request->_user->isSignedIn()) { Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2014-10-06 10:01:53 UTC (rev 9193) +++ trunk/lib/plugin/RecentChanges.php 2014-10-06 10:04:20 UTC (rev 9194) @@ -1446,7 +1446,13 @@ // box is used to display a fixed-width, narrow version with common header. // just a numbered list of limit pagenames, without date. - function box($args = false, $request = false, $basepage = false) + /** + * @param string $args + * @param WikiRequest $request + * @param string $basepage + * @return $this|HtmlElement + */ + function box($args = '', $request = null, $basepage = '') { if (!$request) $request =& $GLOBALS['request']; if (!isset($args['limit'])) $args['limit'] = 15; Modified: trunk/lib/plugin/RecentChangesCached.php =================================================================== --- trunk/lib/plugin/RecentChangesCached.php 2014-10-06 10:01:53 UTC (rev 9193) +++ trunk/lib/plugin/RecentChangesCached.php 2014-10-06 10:04:20 UTC (rev 9194) @@ -56,6 +56,13 @@ // We don't go through pi parsing, instead we go directly to the // better plugin methods. + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return mixed + */ function getHtml($dbi, $args, $request, $basepage) { $plugin = new WikiPlugin_RecentChanges(); Modified: trunk/lib/plugin/RecentEdits.php =================================================================== --- trunk/lib/plugin/RecentEdits.php 2014-10-06 10:01:53 UTC (rev 9193) +++ trunk/lib/plugin/RecentEdits.php 2014-10-06 10:04:20 UTC (rev 9194) @@ -40,7 +40,13 @@ // box is used to display a fixed-width, narrow version with common header. // just a numbered list of limit pagenames, without date. - function box($args = false, $request = false, $basepage = false) + /** + * @param string $args + * @param WikiRequest $request + * @param string $basepage + * @return $this|HtmlElement + */ + function box($args = '', $request = null, $basepage = '') { if (!$request) $request =& $GLOBALS['request']; if (!isset($args['limit'])) $args['limit'] = 15; Modified: trunk/lib/plugin/RelatedChanges.php =================================================================== --- trunk/lib/plugin/RelatedChanges.php 2014-10-06 10:01:53 UTC (rev 9193) +++ trunk/lib/plugin/RelatedChanges.php 2014-10-06 10:04:20 UTC (rev 9194) @@ -74,7 +74,13 @@ // box is used to display a fixed-width, narrow version with common header. // just a numbered list of limit pagenames, without date. - function box($args = false, $request = false, $basepage = false) + /** + * @param string $args + * @param WikiRequest $request + * @param string $basepage + * @return $this|HtmlElement + */ + function box($args = '', $request = null, $basepage = '') { if (!$request) $request =& $GLOBALS['request']; if (!isset($args['limit'])) $args['limit'] = 15; Modified: trunk/lib/plugin/RssFeed.php =================================================================== --- trunk/lib/plugin/RssFeed.php 2014-10-06 10:01:53 UTC (rev 9193) +++ trunk/lib/plugin/RssFeed.php 2014-10-06 10:04:20 UTC (rev 9194) @@ -111,7 +111,13 @@ return $html; } - function box($args = false, $request = false, $basepage = false) + /** + * @param string $args + * @param WikiRequest $request + * @param string $basepage + * @return mixed + */ + function box($args = '', $request = null, $basepage = '') { if (!$request) $request =& $GLOBALS['request']; extract($args); Modified: trunk/lib/plugin/SystemInfo.php =================================================================== --- trunk/lib/plugin/SystemInfo.php 2014-10-06 10:01:53 UTC (rev 9193) +++ trunk/lib/plugin/SystemInfo.php 2014-10-06 10:04:20 UTC (rev 9194) @@ -71,6 +71,13 @@ return '+1800'; // 30 minutes } + /** + * @param WikiDB $dbi + * @param string $argstr + * @param WikiRequest $request + * @param string $basepage + * @return mixed + */ function getHtml($dbi, $argarray, $request, $basepage) { $loader = new WikiPluginLoader(); Modified: trunk/lib/plugin/WhoIsOnline.php =================================================================== --- trunk/lib/plugin/WhoIsOnline.php 2014-10-06 10:01:53 UTC (rev 9193) +++ trunk/lib/plugin/WhoIsOnline.php 2014-10-06 10:04:20 UTC (rev 9194) @@ -75,7 +75,13 @@ // box is used to display a fixed-width, narrow version with common header // just the number of online users. - function box($args = false, $request = false, $basepage = false) + /** + * @param string $args + * @param WikiRequest $request + * @param string $basepage + * @return $this|HtmlElement + */ + function box($args = '', $request = null, $basepage = '') { if (!$request) $request =& $GLOBALS['request']; $stats = $this->getStats($request->_dbi, $request, 'summary'); Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2014-10-06 10:01:53 UTC (rev 9193) +++ trunk/lib/plugin/WikiAdminUtils.php 2014-10-06 10:04:20 UTC (rev 9194) @@ -236,7 +236,7 @@ private function _do_email_verification(&$request, &$args) { $dbi = $request->getDbh(); - $pagelist = new PageList('pagename', 0, $args); + $pagelist = new PageList('pagename', array(), $args); //$args['return_url'] = 'action=email-verification-verified'; $email = new _PageList_Column_email('email', _("E-mail"), 'left'); $emailVerified = new _PageList_Column_emailVerified('emailVerified', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-10-06 17:15:34
|
Revision: 9203 http://sourceforge.net/p/phpwiki/code/9203 Author: vargenau Date: 2014-10-06 17:15:30 +0000 (Mon, 06 Oct 2014) Log Message: ----------- Revert extract arguments by hand Modified Paths: -------------- trunk/lib/plugin/BackLinks.php trunk/lib/plugin/CurrentTime.php trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/IncludePage.php Modified: trunk/lib/plugin/BackLinks.php =================================================================== --- trunk/lib/plugin/BackLinks.php 2014-10-06 17:12:32 UTC (rev 9202) +++ trunk/lib/plugin/BackLinks.php 2014-10-06 17:15:30 UTC (rev 9203) @@ -58,17 +58,12 @@ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); - $page = $args['page']; - $sortby = $args['sortby']; - $info = $args['info']; - $noheader = $args['noheader']; - $include_self = $args['include_self']; - $limit = $args['limit']; - $exclude = $args['exclude']; + extract($args); if (empty($page) and $page != '0') { return ''; } + // exclude is now already expanded in WikiPlugin::getArgs() if (empty($exclude)) { $exclude = array(); } Modified: trunk/lib/plugin/CurrentTime.php =================================================================== --- trunk/lib/plugin/CurrentTime.php 2014-10-06 17:12:32 UTC (rev 9202) +++ trunk/lib/plugin/CurrentTime.php 2014-10-06 17:15:30 UTC (rev 9203) @@ -78,8 +78,7 @@ */ function run($dbi, $argstr, &$request, $basepage) { - $args = $this->getArgs($argstr, $request); - $format = $args['format']; + extract($this->getArgs($argstr, $request)); if ($format == 'date') { $format = '%Y-%m-%d'; Modified: trunk/lib/plugin/FullTextSearch.php =================================================================== --- trunk/lib/plugin/FullTextSearch.php 2014-10-06 17:12:32 UTC (rev 9202) +++ trunk/lib/plugin/FullTextSearch.php 2014-10-06 17:15:30 UTC (rev 9203) @@ -69,26 +69,17 @@ * @param string $argstr * @param WikiRequest $request * @param string $basepage - * @return $this|bool|HtmlElement|PageList|XmlContent + * @return mixed */ function run($dbi, $argstr, &$request, $basepage) { - // Extract arguments $args = $this->getArgs($argstr, $request); - $s = $args['s']; - $hilight = $args['hilight']; - $case_exact = $args['case_exact']; - $regex = $args['regex']; - $sortby = $args['sortby']; - $noheader = $args['noheader']; - $exclude = $args['exclude']; - $quiet = $args['quiet']; - $limit = $args['limit']; - if (empty($s)) { + if (empty($args['s'])) { return HTML::p(array('class' => 'warning'), _("You must enter a search term.")); } + extract($args); $query = new TextSearchQuery($s, $case_exact, $regex); $pages = $dbi->fullSearch($query, $sortby, $limit, $exclude); Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2014-10-06 17:12:32 UTC (rev 9202) +++ trunk/lib/plugin/IncludePage.php 2014-10-06 17:15:30 UTC (rev 9203) @@ -51,9 +51,10 @@ function getWikiPageLinks($argstr, $basepage) { - $args = $this->getArgs($argstr); - $page = $args['page']; + extract($this->getArgs($argstr)); + if (!isset($page)) + return false; if ($page) { // Expand relative page names. $page = new WikiPageName($page, $basepage); @@ -88,9 +89,7 @@ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); - $page = $args['page']; - $rev = $args['rev']; - $quiet = $args['quiet']; + extract($args); if ($page) { // Expand relative page names. @@ -192,13 +191,7 @@ */ protected function extractParts($c, $pagename, $args) { - $section = $args['section']; - $sections = $args['sections']; - $lines = $args['lines']; - $words = $args['words']; - $bytes = $args['bytes']; - $quiet = $args['quiet']; - $sectionhead = $args['sectionhead']; + extract($args); if ($section) { if ($sections) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-10-07 12:17:01
|
Revision: 9212 http://sourceforge.net/p/phpwiki/code/9212 Author: vargenau Date: 2014-10-07 12:16:54 +0000 (Tue, 07 Oct 2014) Log Message: ----------- Add protected function getMap, getHtml Modified Paths: -------------- trunk/lib/plugin/CacheTest.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/TexToPng.php Modified: trunk/lib/plugin/CacheTest.php =================================================================== --- trunk/lib/plugin/CacheTest.php 2014-10-07 11:43:50 UTC (rev 9211) +++ trunk/lib/plugin/CacheTest.php 2014-10-07 12:16:54 UTC (rev 9212) @@ -89,6 +89,16 @@ // return $this->lazy_produceGraphics($text,$font); } // getImage + protected function getMap($dbi, $argarray, $request) + { + trigger_error('pure virtual', E_USER_ERROR); + } + + protected function getHtml($dbi, $argarray, $request, $basepage) + { + trigger_error('pure virtual', E_USER_ERROR); + } + function getImageType($dbi, $argarray, $request) { extract($argarray); Modified: trunk/lib/plugin/GraphViz.php =================================================================== --- trunk/lib/plugin/GraphViz.php 2014-10-07 11:43:50 UTC (rev 9211) +++ trunk/lib/plugin/GraphViz.php 2014-10-07 12:16:54 UTC (rev 9212) @@ -319,6 +319,11 @@ return $outfile; } + protected function getHtml($dbi, $argarray, $request, $basepage) + { + trigger_error('pure virtual', E_USER_ERROR); + } + /** * Which argument must be set to 'png', for the fallback image when svg * will fail on the client. Modified: trunk/lib/plugin/Ploticus.php =================================================================== --- trunk/lib/plugin/Ploticus.php 2014-10-07 11:43:50 UTC (rev 9211) +++ trunk/lib/plugin/Ploticus.php 2014-10-07 12:16:54 UTC (rev 9212) @@ -147,6 +147,11 @@ return $argarray['device']; } + protected function getHtml($dbi, $argarray, $request, $basepage) + { + trigger_error('pure virtual', E_USER_ERROR); + } + /** * This gives an alternative text description of * the image. Modified: trunk/lib/plugin/TexToPng.php =================================================================== --- trunk/lib/plugin/TexToPng.php 2014-10-07 11:43:50 UTC (rev 9211) +++ trunk/lib/plugin/TexToPng.php 2014-10-07 12:16:54 UTC (rev 9212) @@ -124,8 +124,14 @@ protected function getMap($dbi, $argarray, $request) { + trigger_error('pure virtual', E_USER_ERROR); } + protected function getHtml($dbi, $argarray, $request, $basepage) + { + trigger_error('pure virtual', E_USER_ERROR); + } + function getExpire($dbi, $argarray, $request) { return '0'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-11-09 18:14:59
|
Revision: 9297 http://sourceforge.net/p/phpwiki/code/9297 Author: vargenau Date: 2014-11-09 18:14:51 +0000 (Sun, 09 Nov 2014) Log Message: ----------- PHP Doc Modified Paths: -------------- trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/WikiAdminUtils.php Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2014-11-09 18:13:45 UTC (rev 9296) +++ trunk/lib/plugin/LinkDatabase.php 2014-11-09 18:14:51 UTC (rev 9297) @@ -69,7 +69,7 @@ /** * @param WikiDB $dbi - * @param string $argstr + * @param array $argarray * @param WikiRequest $request * @param string $basepage * @return mixed Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2014-11-09 18:13:45 UTC (rev 9296) +++ trunk/lib/plugin/WikiAdminUtils.php 2014-11-09 18:14:51 UTC (rev 9297) @@ -163,6 +163,10 @@ /** * Purge all non-referenced empty pages. Mainly those created by bad link extraction. + * + * @param WikiRequest $request + * @param array $args + * @return string|XmlContent */ private function _do_purge_empty_pages(&$request, $args) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-11-09 18:15:51
|
Revision: 9298 http://sourceforge.net/p/phpwiki/code/9298 Author: vargenau Date: 2014-11-09 18:15:48 +0000 (Sun, 09 Nov 2014) Log Message: ----------- Add class variables Modified Paths: -------------- trunk/lib/plugin/AnalyseAccessLogSql.php trunk/lib/plugin/AsciiMath.php trunk/lib/plugin/AsciiSVG.php trunk/lib/plugin/AuthorHistory.php trunk/lib/plugin/Calendar.php trunk/lib/plugin/CalendarList.php trunk/lib/plugin/Chart.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/DebugBackendInfo.php trunk/lib/plugin/EditMetaData.php trunk/lib/plugin/ExternalSearch.php trunk/lib/plugin/FuzzyPages.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PhpHighlight.php trunk/lib/plugin/Processing.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RecentChangesCached.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/SiteMap.php trunk/lib/plugin/SqlResult.php trunk/lib/plugin/SyncWiki.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/Template.php trunk/lib/plugin/TexToPng.php trunk/lib/plugin/TranslateText.php trunk/lib/plugin/UpLoad.php trunk/lib/plugin/UserPreferences.php trunk/lib/plugin/VisualWiki.php trunk/lib/plugin/WantedPages.php trunk/lib/plugin/WantedPagesOld.php trunk/lib/plugin/WikiAdminSearchReplace.php trunk/lib/plugin/WikiAdminSelect.php trunk/lib/plugin/WikiAdminSetAclSimple.php trunk/lib/plugin/WikiBlog.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiTranslation.php trunk/lib/plugin/YouTube.php Modified: trunk/lib/plugin/AnalyseAccessLogSql.php =================================================================== --- trunk/lib/plugin/AnalyseAccessLogSql.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/AnalyseAccessLogSql.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -29,6 +29,9 @@ class WikiPlugin_AnalyseAccessLogSql extends WikiPlugin { + public $_theadrow; + public $_headerSet; + /** * Build the query string * @@ -52,6 +55,8 @@ * ."FROM $accesslog " * ."WHERE referer IS NOT NULL " * .$where_conditions + * @param array $args + * @return string */ private function getQueryString(&$args) { Modified: trunk/lib/plugin/AsciiMath.php =================================================================== --- trunk/lib/plugin/AsciiMath.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/AsciiMath.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -41,6 +41,8 @@ class WikiPlugin_AsciiMath extends WikiPlugin { + public $source; + function getDescription() { return _("Render ASCII Math as MathML."); Modified: trunk/lib/plugin/AsciiSVG.php =================================================================== --- trunk/lib/plugin/AsciiSVG.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/AsciiSVG.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -28,6 +28,8 @@ class WikiPlugin_AsciiSVG extends WikiPlugin { + public $source; + function getDescription() { return _("Render inline ASCII SVG."); Modified: trunk/lib/plugin/AuthorHistory.php =================================================================== --- trunk/lib/plugin/AuthorHistory.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/AuthorHistory.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -59,6 +59,8 @@ class WikiPlugin_AuthorHistory extends WikiPlugin { + public $_args; + function getDescription() { return sprintf(_("List all page revisions edited by one user with diff links, or show a PageHistory-like list of a single page for only one user.")); Modified: trunk/lib/plugin/Calendar.php =================================================================== --- trunk/lib/plugin/Calendar.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/Calendar.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -35,6 +35,10 @@ class WikiPlugin_Calendar extends WikiPlugin { + public $args; + private $_today; + public $_links; + function getDescription() { return _("Calendar"); Modified: trunk/lib/plugin/CalendarList.php =================================================================== --- trunk/lib/plugin/CalendarList.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/CalendarList.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -49,6 +49,9 @@ class WikiPlugin_CalendarList extends WikiPlugin { + public $args; + public $_links; + function getDescription() { return _("CalendarList"); Modified: trunk/lib/plugin/Chart.php =================================================================== --- trunk/lib/plugin/Chart.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/Chart.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -46,6 +46,8 @@ class WikiPlugin_Chart extends WikiPlugin { + public $source; + function getDescription() { return _("Render SVG charts."); Modified: trunk/lib/plugin/CreateToc.php =================================================================== --- trunk/lib/plugin/CreateToc.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/CreateToc.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -40,6 +40,8 @@ class WikiPlugin_CreateToc extends WikiPlugin { + public $_markup; + function getDescription() { return _("Create a Table of Contents and automatically link to headers."); Modified: trunk/lib/plugin/DebugBackendInfo.php =================================================================== --- trunk/lib/plugin/DebugBackendInfo.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/DebugBackendInfo.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -26,6 +26,10 @@ class WikiPlugin_DebugBackendInfo extends WikiPlugin { + public $chunk_split; + public $readonly_pagemeta; + public $hidden_pagemeta; + function getDescription() { return sprintf(_("Get debugging information for %s."), '[pagename]'); Modified: trunk/lib/plugin/EditMetaData.php =================================================================== --- trunk/lib/plugin/EditMetaData.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/EditMetaData.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -44,6 +44,8 @@ class WikiPlugin_EditMetaData extends WikiPlugin_DebugBackendInfo { + public $_args; + function getDescription() { return sprintf(_("Edit metadata for %s."), '[pagename]'); Modified: trunk/lib/plugin/ExternalSearch.php =================================================================== --- trunk/lib/plugin/ExternalSearch.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/ExternalSearch.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -36,6 +36,10 @@ class WikiPlugin_ExternalSearch extends WikiPlugin { + public $_url; + public $_name; + public $_s; + function getDescription() { return _("Redirect to an external web site based on form input."); Modified: trunk/lib/plugin/FuzzyPages.php =================================================================== --- trunk/lib/plugin/FuzzyPages.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/FuzzyPages.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -35,6 +35,11 @@ class WikiPlugin_FuzzyPages extends WikiPlugin { + public $_searchterm; + public $_searchterm_metaphone; + public $debug; + public $_list; + function getDescription() { return sprintf(_("Search for page titles similar to %s."), Modified: trunk/lib/plugin/LinkSearch.php =================================================================== --- trunk/lib/plugin/LinkSearch.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/LinkSearch.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -31,6 +31,8 @@ class WikiPlugin_LinkSearch extends WikiPlugin { + public $current_row; + function getDescription() { return _("Search page and link names."); Modified: trunk/lib/plugin/ModeratedPage.php =================================================================== --- trunk/lib/plugin/ModeratedPage.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/ModeratedPage.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -38,6 +38,8 @@ class WikiPlugin_ModeratedPage extends WikiPlugin { + public $_tokens; + function getDescription() { return _("Support moderated pages."); Modified: trunk/lib/plugin/PageDump.php =================================================================== --- trunk/lib/plugin/PageDump.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/PageDump.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -51,6 +51,7 @@ extends WikiPlugin { public $MessageId; + public $pagename; function getDescription() { Modified: trunk/lib/plugin/PageHistory.php =================================================================== --- trunk/lib/plugin/PageHistory.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/PageHistory.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -25,9 +25,10 @@ class _PageHistory_PageRevisionIter extends WikiDB_PageRevisionIterator { + public $_itemcount; + function _PageHistory_PageRevisionIter($rev_iter, $params) { - $this->_iter = $rev_iter; extract($params); Modified: trunk/lib/plugin/PhpHighlight.php =================================================================== --- trunk/lib/plugin/PhpHighlight.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/PhpHighlight.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -29,6 +29,14 @@ class WikiPlugin_PhpHighlight extends WikiPlugin { + public $source; + public $oldstring; + public $oldcomment; + public $oldkeyword; + public $oldbg; + public $oldhtml; + public $olddefault; + function getDescription() { return _("PHP syntax highlighting."); @@ -58,7 +66,6 @@ */ function run($dbi, $argstr, &$request, $basepage) { - extract($this->getArgs($argstr, $request)); $source =& $this->source; if (empty($source)) { Modified: trunk/lib/plugin/Processing.php =================================================================== --- trunk/lib/plugin/Processing.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/Processing.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -27,6 +27,8 @@ class WikiPlugin_Processing extends WikiPlugin { + public $source; + function getDescription() { return _("Render inline Processing."); Modified: trunk/lib/plugin/RateIt.php =================================================================== --- trunk/lib/plugin/RateIt.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/RateIt.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -86,7 +86,15 @@ { static $toBeUniq = 1; public $idTop = ''; + public $imgPrefix; + public $dimension; + public $rating; + public $avg; + public $userid; + public $pagename; + public $numusers; + function getDescription() { return _("Rating system. Store user ratings per page."); Modified: trunk/lib/plugin/RecentChangesCached.php =================================================================== --- trunk/lib/plugin/RecentChangesCached.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/RecentChangesCached.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -34,6 +34,11 @@ class WikiPlugin_RecentChangesCached extends WikiPluginCached { + public $_args; + public $_type; + public $_static; + public $_dbi; + function getPluginType() { return PLUGIN_CACHED_HTML; @@ -54,11 +59,12 @@ return '+900'; // 15 minutes } - // We don't go through pi parsing, instead we go directly to the - // better plugin methods. /** + * We don't go through pi parsing, instead we go directly to the + * better plugin methods. + * * @param WikiDB $dbi - * @param string $argstr + * @param string $args * @param WikiRequest $request * @param string $basepage * @return mixed @@ -86,9 +92,17 @@ trigger_error('pure virtual', E_USER_ERROR); } - // ->box is used to display a fixed-width, narrow version with common header. - // Just a limited list of pagenames, without date. - // This does not use ->run, to avoid pi construction and deconstruction + /** + * ->box is used to display a fixed-width, narrow version with common header. + * Just a limited list of pagenames, without date. + * This does not use ->run, to avoid pi construction and deconstruction + * + * @param string $args + * @param WikiRequest $request + * @param string $basepage + * @param bool $do_save + * @return $this|HtmlElement|XmlContent + */ function box($args = '', $request = null, $basepage = '', $do_save = false) { if (!$request) $request =& $GLOBALS['request']; Modified: trunk/lib/plugin/SemanticSearch.php =================================================================== --- trunk/lib/plugin/SemanticSearch.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/SemanticSearch.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -54,6 +54,12 @@ class WikiPlugin_SemanticSearch extends WikiPlugin { + public $_norelations_warning; + public $_supported_operators; + public $_text_operators; + public $_links; + public $current_row; + function getDescription() { return _("Search relations and attributes."); Modified: trunk/lib/plugin/SemanticSearchAdvanced.php =================================================================== --- trunk/lib/plugin/SemanticSearchAdvanced.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/SemanticSearchAdvanced.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -58,6 +58,8 @@ class WikiPlugin_SemanticSearchAdvanced extends WikiPlugin_SemanticSearch { + public $_supported_operators; + function getDescription() { return _("Parse and execute a full query expression."); Modified: trunk/lib/plugin/SiteMap.php =================================================================== --- trunk/lib/plugin/SiteMap.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/SiteMap.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -46,6 +46,12 @@ extends WikiPlugin { public $_pagename; + public $ExcludedPages; + public $firstreversed; + public $initialpage; + public $excludeunknown; + public $dbi; + public $_default_limit; function getDescription() { Modified: trunk/lib/plugin/SqlResult.php =================================================================== --- trunk/lib/plugin/SqlResult.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/SqlResult.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -62,6 +62,7 @@ extends WikiPlugin { public $_args; + public $_sql; function getDescription() { Modified: trunk/lib/plugin/SyncWiki.php =================================================================== --- trunk/lib/plugin/SyncWiki.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/SyncWiki.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -42,6 +42,8 @@ class WikiPlugin_SyncWiki extends WikiPlugin_WikiAdminUtils { + public $_fileList; + function getDescription() { return _("Synchronize pages with external PhpWiki."); Modified: trunk/lib/plugin/SyntaxHighlighter.php =================================================================== --- trunk/lib/plugin/SyntaxHighlighter.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/SyntaxHighlighter.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -23,6 +23,8 @@ class WikiPlugin_SyntaxHighlighter extends WikiPlugin { + public $source; + function getDescription() { return _("Source code syntax highlighter (via http://highlightjs.org/)."); Modified: trunk/lib/plugin/SystemInfo.php =================================================================== --- trunk/lib/plugin/SystemInfo.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/SystemInfo.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -42,9 +42,12 @@ */ require_once 'lib/WikiPluginCached.php'; + class WikiPlugin_SystemInfo extends WikiPluginCached { + public $_dbi; + function getPluginType() { return PLUGIN_CACHED_HTML; @@ -73,7 +76,7 @@ /** * @param WikiDB $dbi - * @param string $argstr + * @param array $argarray * @param WikiRequest $request * @param string $basepage * @return mixed Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/Template.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -57,6 +57,8 @@ class WikiPlugin_Template extends WikiPlugin { + public $vars; + function getDescription() { return _("Parametrized page inclusion."); Modified: trunk/lib/plugin/TexToPng.php =================================================================== --- trunk/lib/plugin/TexToPng.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/TexToPng.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -94,6 +94,8 @@ class WikiPlugin_TexToPng extends WikiPluginCached { + public $_errortext; + function getPluginType() { return PLUGIN_CACHED_IMG_ONDEMAND; @@ -170,7 +172,7 @@ } else { if (!$this->_errortext) { // yeah, I've been told to be quiet, but obviously - // an error occured. So at least complain silently. + // an error occurred. So at least complain silently. $this->complain(' '); } } Modified: trunk/lib/plugin/TranslateText.php =================================================================== --- trunk/lib/plugin/TranslateText.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/TranslateText.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -40,6 +40,8 @@ class WikiPlugin_TranslateText extends WikiPlugin_WikiTranslation { + public $lang; + function getDescription() { return _("Define a translation for a specified text."); Modified: trunk/lib/plugin/UpLoad.php =================================================================== --- trunk/lib/plugin/UpLoad.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/UpLoad.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -36,6 +36,7 @@ class WikiPlugin_UpLoad extends WikiPlugin { + public $allowed_extensions; public $disallowed_extensions; // TODO: use PagePerms instead public $only_authenticated = true; // allow only authenticated users may upload. Modified: trunk/lib/plugin/UserPreferences.php =================================================================== --- trunk/lib/plugin/UserPreferences.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/UserPreferences.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -34,6 +34,7 @@ extends WikiPlugin { public $bool_args; + public $_request; function getDescription() { Modified: trunk/lib/plugin/VisualWiki.php =================================================================== --- trunk/lib/plugin/VisualWiki.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/VisualWiki.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -34,6 +34,11 @@ class WikiPlugin_VisualWiki extends WikiPlugin_GraphViz { + public $pages; + public $names; + public $ColorTab; + public $oldest; + /** * Sets plugin type to map production */ Modified: trunk/lib/plugin/WantedPages.php =================================================================== --- trunk/lib/plugin/WantedPages.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/WantedPages.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -35,6 +35,8 @@ class WikiPlugin_WantedPages extends WikiPlugin { + public $_wpagelist; + function getDescription() { return _("List referenced page names which do not exist yet."); Modified: trunk/lib/plugin/WantedPagesOld.php =================================================================== --- trunk/lib/plugin/WantedPagesOld.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/WantedPagesOld.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -26,6 +26,11 @@ class WikiPlugin_WantedPagesOld extends WikiPlugin { + public $pagelist; + public $_rows; + public $_messageIfEmpty; + public $_columns; + function getDescription() { return _("List referenced page names which do not exist yet."); Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -156,7 +156,7 @@ return $result; } - public function replaceHelper(&$dbi, &$request, $pagename, $from, $to, $case_exact = true, $regex = false) + public static function replaceHelper(&$dbi, &$request, $pagename, $from, $to, $case_exact = true, $regex = false) { $page = $dbi->getPage($pagename); if ($page->exists()) { // don't replace default contents Modified: trunk/lib/plugin/WikiAdminSelect.php =================================================================== --- trunk/lib/plugin/WikiAdminSelect.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/WikiAdminSelect.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -37,6 +37,9 @@ class WikiPlugin_WikiAdminSelect extends WikiPlugin { + public $_list; + public $_args; + function getDescription() { return _("Allows selection of multiple pages which get passed to other WikiAdmin plugins."); @@ -61,6 +64,13 @@ /** * Default collector for all WikiAdmin* plugins. * preSelectS() is similar, but fills $this->_list + * + * @param array $list + * @param WikiDB $dbi + * @param string $sortby + * @param int $limit + * @param string $exclude + * @return array */ protected function collectPages(&$list, &$dbi, $sortby, $limit = 0, $exclude = '') { @@ -79,6 +89,10 @@ * 'author', 'owner', 'creator': from WikiDB_Page * 'only: forgot what the difference to 's' was. * Sets $this->_list, which is picked up by collectPages() and is a default for p[] + * + * @param array $args + * @param WikiRequest $request + * @return array */ protected function preSelectS(&$args, &$request) { Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php =================================================================== --- trunk/lib/plugin/WikiAdminSetAclSimple.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/WikiAdminSetAclSimple.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -34,6 +34,8 @@ class WikiPlugin_WikiAdminSetAclSimple extends WikiPlugin_WikiAdminSetAcl { + public $_args; + function getDescription() { return _("Set simple individual page permissions."); Modified: trunk/lib/plugin/WikiBlog.php =================================================================== --- trunk/lib/plugin/WikiBlog.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/WikiBlog.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -132,6 +132,10 @@ /** * posted: required: pagename, content. optional: summary + * + * @param WikiRequest $request + * @param array $posted + * @param string $type */ function add(&$request, $posted, $type = 'wikiblog') { Modified: trunk/lib/plugin/WikiFormRich.php =================================================================== --- trunk/lib/plugin/WikiFormRich.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/WikiFormRich.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -97,6 +97,8 @@ class WikiPlugin_WikiFormRich extends WikiPlugin { + public $inputbox; + function getDescription() { return _("Provide generic WikiForm input buttons."); Modified: trunk/lib/plugin/WikiTranslation.php =================================================================== --- trunk/lib/plugin/WikiTranslation.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/WikiTranslation.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -244,6 +244,10 @@ class WikiPlugin_WikiTranslation extends WikiPlugin { + public $lang; + public $_locales; + public $_reverse_locales; + public $args; function getDescription() { Modified: trunk/lib/plugin/YouTube.php =================================================================== --- trunk/lib/plugin/YouTube.php 2014-11-09 18:14:51 UTC (rev 9297) +++ trunk/lib/plugin/YouTube.php 2014-11-09 18:15:48 UTC (rev 9298) @@ -37,6 +37,14 @@ class WikiPlugin_YouTube extends WikiPlugin { + public $_browse; + public $browse; + public $_time; + public $_category; + public $_language; + public $category; + public $language; + function getDescription() { return _("Embed YouTube videos."); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-02 15:51:32
|
Revision: 9406 http://sourceforge.net/p/phpwiki/code/9406 Author: vargenau Date: 2014-12-02 15:51:24 +0000 (Tue, 02 Dec 2014) Log Message: ----------- Test limit argument is numeric Modified Paths: -------------- trunk/lib/plugin/AllPages.php trunk/lib/plugin/AllUsers.php trunk/lib/plugin/BackLinks.php trunk/lib/plugin/IncludePages.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/MostPopular.php trunk/lib/plugin/OrphanedPages.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/TitleSearch.php trunk/lib/plugin/WantedPages.php trunk/lib/plugin/WantedPagesOld.php Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2014-12-02 15:09:06 UTC (rev 9405) +++ trunk/lib/plugin/AllPages.php 2014-12-02 15:51:24 UTC (rev 9406) @@ -64,6 +64,11 @@ { $args = $this->getArgs($argstr, $request); + if (isset($args['limit']) && !is_numeric($args['limit'])) { + return HTML::p(array('class' => "error"), + _("Illegal 'limit' argument: must be numeric")); + } + if (empty($args['sortby'])) { $args['sortby'] = 'pagename'; } Modified: trunk/lib/plugin/AllUsers.php =================================================================== --- trunk/lib/plugin/AllUsers.php 2014-12-02 15:09:06 UTC (rev 9405) +++ trunk/lib/plugin/AllUsers.php 2014-12-02 15:51:24 UTC (rev 9406) @@ -68,6 +68,11 @@ { $args = $this->getArgs($argstr, $request); + if (isset($args['limit']) && !is_numeric($args['limit'])) { + return HTML::p(array('class' => "error"), + _("Illegal 'limit' argument: must be numeric")); + } + extract($args); $group = $request->getGroup(); Modified: trunk/lib/plugin/BackLinks.php =================================================================== --- trunk/lib/plugin/BackLinks.php 2014-12-02 15:09:06 UTC (rev 9405) +++ trunk/lib/plugin/BackLinks.php 2014-12-02 15:51:24 UTC (rev 9406) @@ -59,6 +59,11 @@ { $args = $this->getArgs($argstr, $request); + if (isset($args['limit']) && !is_numeric($args['limit'])) { + return HTML::p(array('class' => "error"), + _("Illegal 'limit' argument: must be numeric")); + } + extract($args); if (empty($page) and $page != '0') { return ''; Modified: trunk/lib/plugin/IncludePages.php =================================================================== --- trunk/lib/plugin/IncludePages.php 2014-12-02 15:09:06 UTC (rev 9405) +++ trunk/lib/plugin/IncludePages.php 2014-12-02 15:51:24 UTC (rev 9406) @@ -54,6 +54,12 @@ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); + + if (isset($args['limit']) && !is_numeric($args['limit'])) { + return HTML::p(array('class' => "error"), + _("Illegal 'limit' argument: must be numeric")); + } + $html = HTML(); if (empty($args['pages'])) { return $html; Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2014-12-02 15:09:06 UTC (rev 9405) +++ trunk/lib/plugin/LinkDatabase.php 2014-12-02 15:51:24 UTC (rev 9406) @@ -101,6 +101,11 @@ global $WikiTheme; $args = $this->getArgs($argstr, $request); + if (isset($args['limit']) && !is_numeric($args['limit'])) { + return HTML::p(array('class' => "error"), + _("Illegal 'limit' argument: must be numeric")); + } + $caption = _("All pages with all links in this wiki (%d total):"); if (!empty($args['owner'])) { Modified: trunk/lib/plugin/ListSubpages.php =================================================================== --- trunk/lib/plugin/ListSubpages.php 2014-12-02 15:09:06 UTC (rev 9405) +++ trunk/lib/plugin/ListSubpages.php 2014-12-02 15:51:24 UTC (rev 9406) @@ -63,6 +63,12 @@ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); + + if (isset($args['limit']) && !is_numeric($args['limit'])) { + return HTML::p(array('class' => "error"), + _("Illegal 'limit' argument: must be numeric")); + } + if ($args['basepage']) $pagename = $args['basepage']; else Modified: trunk/lib/plugin/MostPopular.php =================================================================== --- trunk/lib/plugin/MostPopular.php 2014-12-02 15:09:06 UTC (rev 9405) +++ trunk/lib/plugin/MostPopular.php 2014-12-02 15:51:24 UTC (rev 9406) @@ -61,12 +61,18 @@ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); + extract($args); + + if (isset($limit) && !is_numeric($limit)) { + return HTML::p(array('class' => "error"), + _("Illegal 'limit' argument: must be numeric")); + } if (strstr($sortby, 'mtime')) { - trigger_error(_("sortby=mtime not supported with MostPopular"), - E_USER_WARNING); - $sortby = ''; + return HTML::p(array('class' => "error"), + _("sortby=mtime not supported with MostPopular")); } + $columns = $info ? explode(",", $info) : array(); array_unshift($columns, 'hits'); @@ -77,7 +83,6 @@ } else { $args['count'] = $request->getArg('count'); } - //$dbi->touch(); $pages = $dbi->mostPopular($limit, $sortby); $pagelist = new PageList($columns, $exclude, $args); while ($page = $pages->next()) { Modified: trunk/lib/plugin/OrphanedPages.php =================================================================== --- trunk/lib/plugin/OrphanedPages.php 2014-12-02 15:09:06 UTC (rev 9405) +++ trunk/lib/plugin/OrphanedPages.php 2014-12-02 15:51:24 UTC (rev 9406) @@ -61,6 +61,12 @@ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); + + if (isset($args['limit']) && !is_numeric($args['limit'])) { + return HTML::p(array('class' => "error"), + _("Illegal 'limit' argument: must be numeric")); + } + extract($args); // There's probably a more efficient way to do this (eg a Modified: trunk/lib/plugin/PageHistory.php =================================================================== --- trunk/lib/plugin/PageHistory.php 2014-12-02 15:09:06 UTC (rev 9405) +++ trunk/lib/plugin/PageHistory.php 2014-12-02 15:51:24 UTC (rev 9406) @@ -340,6 +340,12 @@ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); + + if (isset($args['limit']) && !is_numeric($args['limit'])) { + return HTML::div(array('class' => "error"), + _("Illegal 'limit' argument: must be numeric")); + } + $pagename = $args['page']; if (empty($pagename)) return $this->makeForm("", $request); Modified: trunk/lib/plugin/PopularNearby.php =================================================================== --- trunk/lib/plugin/PopularNearby.php 2014-12-02 15:09:06 UTC (rev 9405) +++ trunk/lib/plugin/PopularNearby.php 2014-12-02 15:51:24 UTC (rev 9406) @@ -64,6 +64,12 @@ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); + + if (isset($args['limit']) && !is_numeric($args['limit'])) { + return HTML::div(array('class' => "error"), + _("Illegal 'limit' argument: must be numeric")); + } + extract($args); $header = ''; $page = $dbi->getPage($pagename); Modified: trunk/lib/plugin/TitleSearch.php =================================================================== --- trunk/lib/plugin/TitleSearch.php 2014-12-02 15:09:06 UTC (rev 9405) +++ trunk/lib/plugin/TitleSearch.php 2014-12-02 15:51:24 UTC (rev 9406) @@ -78,6 +78,11 @@ { $args = $this->getArgs($argstr, $request); + if (isset($args['limit']) && !is_numeric($args['limit'])) { + return HTML::p(array('class' => "error"), + _("Illegal 'limit' argument: must be numeric")); + } + if (empty($args['s'])) { return HTML::p(array('class' => 'warning'), _("You must enter a search term.")); Modified: trunk/lib/plugin/WantedPages.php =================================================================== --- trunk/lib/plugin/WantedPages.php 2014-12-02 15:09:06 UTC (rev 9405) +++ trunk/lib/plugin/WantedPages.php 2014-12-02 15:51:24 UTC (rev 9406) @@ -68,10 +68,17 @@ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); + + if (isset($args['limit']) && !is_numeric($args['limit'])) { + return HTML::p(array('class' => "error"), + _("Illegal 'limit' argument: must be numeric")); + } + if (!empty($args['exclude_from'])) $args['exclude_from'] = is_string($args['exclude_from']) ? explodePageList($args['exclude_from']) : $args['exclude_from']; // <! plugin-list !> + extract($args); if ($page == _("WantedPages")) $page = ""; Modified: trunk/lib/plugin/WantedPagesOld.php =================================================================== --- trunk/lib/plugin/WantedPagesOld.php 2014-12-02 15:09:06 UTC (rev 9405) +++ trunk/lib/plugin/WantedPagesOld.php 2014-12-02 15:51:24 UTC (rev 9406) @@ -61,6 +61,11 @@ { extract($this->getArgs($argstr, $request)); + if (isset($limit) && !is_numeric($limit)) { + return HTML::p(array('class' => "error"), + _("Illegal 'limit' argument: must be numeric")); + } + if ($exclude) { if (!is_array($exclude)) $exclude = explode(',', $exclude); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-10-06 16:50:32
|
Revision: 9937 http://sourceforge.net/p/phpwiki/code/9937 Author: vargenau Date: 2016-10-06 16:50:28 +0000 (Thu, 06 Oct 2016) Log Message: ----------- Add SPDX-License-Identifier Modified Paths: -------------- trunk/lib/plugin/AddComment.php trunk/lib/plugin/AllPages.php trunk/lib/plugin/AllUsers.php trunk/lib/plugin/AnalyseAccessLogSql.php trunk/lib/plugin/AppendText.php trunk/lib/plugin/AsciiMath.php trunk/lib/plugin/AsciiSVG.php trunk/lib/plugin/AtomFeed.php trunk/lib/plugin/AuthorHistory.php trunk/lib/plugin/BackLinks.php trunk/lib/plugin/BlogArchives.php trunk/lib/plugin/BlogJournal.php trunk/lib/plugin/BoxRight.php trunk/lib/plugin/CacheTest.php trunk/lib/plugin/Calendar.php trunk/lib/plugin/CalendarList.php trunk/lib/plugin/CategoryPage.php trunk/lib/plugin/Chart.php trunk/lib/plugin/Comment.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/CreatePage.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/CurrentTime.php trunk/lib/plugin/DeadEndPages.php trunk/lib/plugin/DebugAuthInfo.php trunk/lib/plugin/DebugBackendInfo.php trunk/lib/plugin/DebugGroupInfo.php trunk/lib/plugin/DebugRetransform.php trunk/lib/plugin/Diff.php trunk/lib/plugin/DynamicIncludePage.php trunk/lib/plugin/EditMetaData.php trunk/lib/plugin/ExternalSearch.php trunk/lib/plugin/FacebookLike.php trunk/lib/plugin/FileInfo.php trunk/lib/plugin/FoafViewer.php trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/FuzzyPages.php trunk/lib/plugin/GoTo.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/GooglePlugin.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/HelloWorld.php trunk/lib/plugin/HtmlConverter.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/IncludePages.php trunk/lib/plugin/IncludeSiteMap.php trunk/lib/plugin/IncludeTree.php trunk/lib/plugin/InterWikiSearch.php trunk/lib/plugin/JabberPresence.php trunk/lib/plugin/LdapSearch.php trunk/lib/plugin/LikePages.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/ListPages.php trunk/lib/plugin/ListRelations.php trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/MediawikiTable.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/MostPopular.php trunk/lib/plugin/NewPagesPerUser.php trunk/lib/plugin/NoCache.php trunk/lib/plugin/OldStyleTable.php trunk/lib/plugin/OrphanedPages.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/PageGroup.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PageInfo.php trunk/lib/plugin/PageTrail.php trunk/lib/plugin/PasswordReset.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/PhpHighlight.php trunk/lib/plugin/PhpWeather.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/PluginManager.php trunk/lib/plugin/PopUp.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/PopularTags.php trunk/lib/plugin/PreferenceApp.php trunk/lib/plugin/PreferencesInfo.php trunk/lib/plugin/PrevNext.php trunk/lib/plugin/Processing.php trunk/lib/plugin/RandomPage.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RawHtml.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/RecentChangesCached.php trunk/lib/plugin/RecentComments.php trunk/lib/plugin/RecentEdits.php trunk/lib/plugin/RecentReferrers.php trunk/lib/plugin/RedirectTo.php trunk/lib/plugin/RelatedChanges.php trunk/lib/plugin/RichTable.php trunk/lib/plugin/RssFeed.php trunk/lib/plugin/SearchHighlight.php trunk/lib/plugin/SemanticRelations.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/SiteMap.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/SqlResult.php trunk/lib/plugin/SyncWiki.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/TeX2png.php trunk/lib/plugin/Template.php trunk/lib/plugin/TexToPng.php trunk/lib/plugin/TitleSearch.php trunk/lib/plugin/Transclude.php trunk/lib/plugin/TranslateText.php trunk/lib/plugin/UnfoldSubpages.php trunk/lib/plugin/UpLoad.php trunk/lib/plugin/UriResolver.php trunk/lib/plugin/UserPreferences.php trunk/lib/plugin/UserRatings.php trunk/lib/plugin/Video.php trunk/lib/plugin/VisualWiki.php trunk/lib/plugin/WantedPages.php trunk/lib/plugin/WatchPage.php trunk/lib/plugin/WhoIsOnline.php trunk/lib/plugin/WikiAdminChown.php trunk/lib/plugin/WikiAdminDeleteAcl.php trunk/lib/plugin/WikiAdminPurge.php trunk/lib/plugin/WikiAdminRemove.php trunk/lib/plugin/WikiAdminSearchReplace.php trunk/lib/plugin/WikiAdminSelect.php trunk/lib/plugin/WikiAdminSetAcl.php trunk/lib/plugin/WikiAdminSetAclSimple.php trunk/lib/plugin/WikiAdminSetExternal.php trunk/lib/plugin/WikiAdminUtils.php trunk/lib/plugin/WikiBlog.php trunk/lib/plugin/WikiForm.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiForum.php trunk/lib/plugin/WikiPoll.php trunk/lib/plugin/WikiTranslation.php trunk/lib/plugin/WikicreoleTable.php trunk/lib/plugin/YouTube.php trunk/lib/plugin/text2png.php Modified: trunk/lib/plugin/AddComment.php =================================================================== --- trunk/lib/plugin/AddComment.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/AddComment.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright (C) 2004 $ThePhpWikiProgrammingTeam +/** + * Copyright © 2004 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/AllPages.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 1999,2000,2001,2002,2004,2005 $ThePhpWikiProgrammingTeam + * Copyright © 1999,2000,2001,2002,2004,2005 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ require_once 'lib/PageList.php'; @@ -27,6 +29,7 @@ * to be able to have the action pages: * AllPagesCreatedByMe, AllPagesOwnedByMe, AllPagesLastAuthoredByMe */ + class WikiPlugin_AllPages extends WikiPlugin { Modified: trunk/lib/plugin/AllUsers.php =================================================================== --- trunk/lib/plugin/AllUsers.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/AllUsers.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright 2002,2004 $ThePhpWikiProgrammingTeam +/** + * Copyright © 2002,2004 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ require_once 'lib/PageList.php'; @@ -30,6 +32,7 @@ * users with db prefs and * externally authenticated users with a db users table, if auth_user_exists is defined. */ + class WikiPlugin_AllUsers extends WikiPlugin { Modified: trunk/lib/plugin/AnalyseAccessLogSql.php =================================================================== --- trunk/lib/plugin/AnalyseAccessLogSql.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/AnalyseAccessLogSql.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,6 +1,6 @@ <?php -/* - * Copyright 2005 Charles Corrigan and $ThePhpWikiProgrammingTeam +/** + * Copyright © 2005 Charles Corrigan and $ThePhpWikiProgrammingTeam * * This file is (not yet) part of PhpWiki. * @@ -17,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** @@ -26,6 +29,7 @@ * * To add a new query, see getQueryString() */ + class WikiPlugin_AnalyseAccessLogSql extends WikiPlugin { Modified: trunk/lib/plugin/AppendText.php =================================================================== --- trunk/lib/plugin/AppendText.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/AppendText.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright 2004,2007 $ThePhpWikiProgrammingTeam +/** + * Copyright © 2004,2007 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** @@ -30,6 +32,7 @@ * * Todo: multiple pages. e.g. AppendText s=~[CategoryINtime~] page=<!plugin TitleSearch intime !> */ + class WikiPlugin_AppendText extends WikiPlugin { Modified: trunk/lib/plugin/AsciiMath.php =================================================================== --- trunk/lib/plugin/AsciiMath.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/AsciiMath.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,8 +1,7 @@ <?php - -/* - * Copyright 2005 $ThePhpWikiProgrammingTeam - * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent +/** + * Copyright © 2005 $ThePhpWikiProgrammingTeam + * Copyright © 2009 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -19,6 +18,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ require_once 'lib/ASCIIMathPHP/ASCIIMathPHP.class.php'; @@ -38,6 +40,7 @@ <mfrac><mi>π</mi><mo>2</mo></mfrac> </math> */ + class WikiPlugin_AsciiMath extends WikiPlugin { Modified: trunk/lib/plugin/AsciiSVG.php =================================================================== --- trunk/lib/plugin/AsciiSVG.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/AsciiSVG.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright 2007 $ThePhpWikiProgrammingTeam +/** + * Copyright © 2007 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** @@ -25,6 +27,7 @@ * Requires ENABLE_XHTML_XML = true * Syntax: http://www1.chapman.edu/~jipsen/svg/asciisvgcommands.html */ + class WikiPlugin_AsciiSVG extends WikiPlugin { Modified: trunk/lib/plugin/AtomFeed.php =================================================================== --- trunk/lib/plugin/AtomFeed.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/AtomFeed.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright 2010 Sébastien Le Callonnec +/** + * Copyright © 2010 Sébastien Le Callonnec * * This file is part of PhpWiki. * @@ -18,10 +17,15 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ + /** * @author: Sébastien Le Callonnec */ + require_once 'lib/WikiPlugin.php'; require_once 'lib/AtomParser.php'; Modified: trunk/lib/plugin/AuthorHistory.php =================================================================== --- trunk/lib/plugin/AuthorHistory.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/AuthorHistory.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,8 +1,7 @@ <?php - /** - * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam - * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent + * Copyright © 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam + * Copyright © 2009 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -19,6 +18,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /* Modified: trunk/lib/plugin/BackLinks.php =================================================================== --- trunk/lib/plugin/BackLinks.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/BackLinks.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 1999,2000,2001,2002,2006 $ThePhpWikiProgrammingTeam + * Copyright © 1999,2000,2001,2002,2006 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ require_once 'lib/PageList.php'; Modified: trunk/lib/plugin/BlogArchives.php =================================================================== --- trunk/lib/plugin/BlogArchives.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/BlogArchives.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright (C) 2004 $ThePhpWikiProgrammingTeam +/** + * Copyright © 2004 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ require_once 'lib/plugin/WikiBlog.php'; @@ -32,6 +34,7 @@ * leave off time subpage? Blogs just per day with one summary title only? * @author: Reini Urban */ + class WikiPlugin_BlogArchives extends WikiPlugin_WikiBlog { Modified: trunk/lib/plugin/BlogJournal.php =================================================================== --- trunk/lib/plugin/BlogJournal.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/BlogJournal.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright (C) 2005 $ThePhpWikiProgrammingTeam +/** + * Copyright © 2005 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ require_once 'lib/plugin/WikiBlog.php'; @@ -31,6 +33,7 @@ * * @author: Reini Urban */ + class WikiPlugin_BlogJournal extends WikiPlugin_WikiBlog { Modified: trunk/lib/plugin/BoxRight.php =================================================================== --- trunk/lib/plugin/BoxRight.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/BoxRight.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 2006 $ThePhpWikiProgrammingTeam + * Copyright © 2006 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,11 +17,15 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** * A simple plugin for <div class="boxright"> with wikimarkup */ + class WikiPlugin_BoxRight extends WikiPlugin { Modified: trunk/lib/plugin/CacheTest.php =================================================================== --- trunk/lib/plugin/CacheTest.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/CacheTest.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright (C) 2002 Johannes Große +/** + * Copyright © 2002 Johannes Große * * This file is part of PhpWiki. * @@ -18,37 +17,25 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ // +---------------------------------------------------------------------+ -// | CacheTest.php | -// +---------------------------------------------------------------------+ // | simple test of the WikiPluginCached class which provides a | // | text to image conversion. | // | This is a usage example of WikiPluginCached. | -// | | -// | You may copy this code freely under the conditions of the GPL | // +---------------------------------------------------------------------+ /*------------------------------------------------------------------------ - | CacheTest - *------------------------------------------------------------------------ | | You may call this plugin as follows: | | <<CacheTest text="What a wonderful test!" >> | - -/*----------------------------------------------------------------------- - | - | Source - | *----------------------------------------------------------------------*/ -/*----------------------------------------------------------------------- - | WikiPlugin_CacheTest - *----------------------------------------------------------------------*/ - require_once 'lib/WikiPluginCached.php'; class WikiPlugin_CacheTest Modified: trunk/lib/plugin/Calendar.php =================================================================== --- trunk/lib/plugin/Calendar.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/Calendar.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam + * Copyright © 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ if (!defined('SECONDS_PER_DAY')) Modified: trunk/lib/plugin/CalendarList.php =================================================================== --- trunk/lib/plugin/CalendarList.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/CalendarList.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * * Copyright 1999-2002,2005-2007 $ThePhpWikiProgrammingTeam + * Copyright © 1999-2002,2005-2007 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ // if not defined in config.ini @@ -46,6 +48,7 @@ * The behaviour before 2007 with last/next_n_days was to start now. * */ + class WikiPlugin_CalendarList extends WikiPlugin { Modified: trunk/lib/plugin/CategoryPage.php =================================================================== --- trunk/lib/plugin/CategoryPage.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/CategoryPage.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam + * Copyright © 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,9 +17,11 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ -//require_once('lib/InlineParser.php'); require_once 'lib/BlockParser.php'; /** @@ -37,6 +38,7 @@ * * This has only been used in wikilens.org. */ + class WikiPlugin_CategoryPage extends WikiPlugin { Modified: trunk/lib/plugin/Chart.php =================================================================== --- trunk/lib/plugin/Chart.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/Chart.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,8 +1,7 @@ <?php - -/* - * Copyright 2007 $ThePhpWikiProgrammingTeam - * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent +/** + * Copyright © 2007 $ThePhpWikiProgrammingTeam + * Copyright © 2009 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -19,6 +18,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /* Modified: trunk/lib/plugin/Comment.php =================================================================== --- trunk/lib/plugin/Comment.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/Comment.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,9 +1,8 @@ <?php - -/* - * Copyright (C) 2003 Martin Geisler - * Copyright (C) 2003-2004 $ThePhpWikiProgrammingTeam - * Copyright (C) 2009 Marc-Etienne Vargenau, Alcatel-Lucent +/** + * Copyright © 2003 Martin Geisler + * Copyright © 2003-2004 $ThePhpWikiProgrammingTeam + * Copyright © 2009 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -20,7 +19,10 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ + * + * SPDX-License-Identifier: GPL-2.0+ + * + */ /** * A WikiPlugin for putting comments in WikiPages Modified: trunk/lib/plugin/CreateBib.php =================================================================== --- trunk/lib/plugin/CreateBib.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/CreateBib.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright 2004 $ThePhpWikiProgrammingTeam +/** + * Copyright © 2004 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/CreatePage.php =================================================================== --- trunk/lib/plugin/CreatePage.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/CreatePage.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 2004,2007 $ThePhpWikiProgrammingTeam + * Copyright © 2004,2007 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/CreateToc.php =================================================================== --- trunk/lib/plugin/CreateToc.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/CreateToc.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,8 +1,7 @@ <?php - -/* - * Copyright 2004,2005 $ThePhpWikiProgrammingTeam - * Copyright 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent +/** + * Copyright © 2004,2005 $ThePhpWikiProgrammingTeam + * Copyright © 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -19,6 +18,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/CurrentTime.php =================================================================== --- trunk/lib/plugin/CurrentTime.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/CurrentTime.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent +/** + * Copyright © 2008 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /* Modified: trunk/lib/plugin/DeadEndPages.php =================================================================== --- trunk/lib/plugin/DeadEndPages.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/DeadEndPages.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,5 +1,4 @@ <?php - /** * This file is part of PhpWiki. * @@ -16,6 +15,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/DebugAuthInfo.php =================================================================== --- trunk/lib/plugin/DebugAuthInfo.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/DebugAuthInfo.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 2004 $ThePhpWikiProgrammingTeam + * Copyright © 2004 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,9 +17,13 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ require_once 'lib/Template.php'; + /** * Used to debug auth problems and settings. * This plugin is only testing purposes. @@ -28,6 +31,7 @@ * * Warning! This may display db and user passwords in cleartext. */ + class WikiPlugin_DebugAuthInfo extends WikiPlugin { Modified: trunk/lib/plugin/DebugBackendInfo.php =================================================================== --- trunk/lib/plugin/DebugBackendInfo.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/DebugBackendInfo.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 1999,2000,2001,2002,2006,2007 $ThePhpWikiProgrammingTeam + * Copyright © 1999,2000,2001,2002,2006,2007 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,11 +17,13 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ require_once 'lib/Template.php'; -/** - */ + class WikiPlugin_DebugBackendInfo extends WikiPlugin { Modified: trunk/lib/plugin/DebugGroupInfo.php =================================================================== --- trunk/lib/plugin/DebugGroupInfo.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/DebugGroupInfo.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright 2004 $ThePhpWikiProgrammingTeam +/** + * Copyright © 2004 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,11 +17,15 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** * @author: Charles Corrigan */ + class WikiPlugin_DebugGroupInfo extends WikiPlugin { Modified: trunk/lib/plugin/DebugRetransform.php =================================================================== --- trunk/lib/plugin/DebugRetransform.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/DebugRetransform.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 2007 $ThePhpWikiProgrammingTeam + * Copyright © 2007 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,11 +17,15 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** * Only useful for link and parser debugging purposes. */ + class WikiPlugin_DebugRetransform extends WikiPlugin { Modified: trunk/lib/plugin/Diff.php =================================================================== --- trunk/lib/plugin/Diff.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/Diff.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 1999, 2000, 2001, 2002, 2004 $ThePhpWikiProgrammingTeam + * Copyright © 1999, 2000, 2001, 2002, 2004 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,7 +17,11 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ + /** * lib/diff.php converted to a plugin by electrawn, * plugin cleaned up by rurban, Modified: trunk/lib/plugin/DynamicIncludePage.php =================================================================== --- trunk/lib/plugin/DynamicIncludePage.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/DynamicIncludePage.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright 2009 $ThePhpWikiProgrammingTeam +/** + * Copyright © 2009 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/EditMetaData.php =================================================================== --- trunk/lib/plugin/EditMetaData.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/EditMetaData.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam + * Copyright © 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/ExternalSearch.php =================================================================== --- trunk/lib/plugin/ExternalSearch.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/ExternalSearch.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 1999,2000,2001,2002,2006 $ThePhpWikiProgrammingTeam + * Copyright © 1999,2000,2001,2002,2006 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** @@ -29,6 +31,7 @@ useimage="http://www.geourl.org/maps/au.png" name="Go Godzilla All Over It" */ + if (!defined("EXTERNALSEARCH_DEFAULT_BUTTON_POSITION")) define("EXTERNALSEARCH_DEFAULT_BUTTON_POSITION", "right"); Modified: trunk/lib/plugin/FacebookLike.php =================================================================== --- trunk/lib/plugin/FacebookLike.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/FacebookLike.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /* - * Copyright 2010 Reini Urban + * Copyright © 2010 Reini Urban * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/FileInfo.php =================================================================== --- trunk/lib/plugin/FileInfo.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/FileInfo.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,8 +1,7 @@ <?php - /* - * Copyright 2005,2007 $ThePhpWikiProgrammingTeam - * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent + * Copyright © 2005,2007 $ThePhpWikiProgrammingTeam + * Copyright © 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -19,6 +18,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/FoafViewer.php =================================================================== --- trunk/lib/plugin/FoafViewer.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/FoafViewer.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /* - * Copyright (C) 2004 $ThePhpWikiProgrammingTeam + * Copyright © 2004 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/FullTextSearch.php =================================================================== --- trunk/lib/plugin/FullTextSearch.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/FullTextSearch.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright 1999-2002,2004,2005,2007,2009 $ThePhpWikiProgrammingTeam +/** + * Copyright © 1999-2002,2004,2005,2007,2009 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ require_once 'lib/TextSearchQuery.php'; Modified: trunk/lib/plugin/FuzzyPages.php =================================================================== --- trunk/lib/plugin/FuzzyPages.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/FuzzyPages.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,8 +1,7 @@ <?php - -/* - * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam - * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent +/** + * Copyright © 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam + * Copyright © 2009 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -19,6 +18,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/GoTo.php =================================================================== --- trunk/lib/plugin/GoTo.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/GoTo.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /* - * Copyright (C) 2004 $ThePhpWikiProgrammingTeam + * Copyright © 2004 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** @@ -26,7 +28,7 @@ * that page; if not, edit (create) that page. * Note: pagenames are absolute, not relative to the actual subpage. * - * Usage: <<GoTo >> + * Usage: <<GoTo size=32>> * @author: Michael van Dam */ Modified: trunk/lib/plugin/GoogleMaps.php =================================================================== --- trunk/lib/plugin/GoogleMaps.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/GoogleMaps.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 2005 $ThePhpWikiProgrammingTeam + * Copyright © 2005 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** @@ -55,6 +57,7 @@ * drawing polygons * Automatic route following */ + class WikiPlugin_GoogleMaps extends WikiPlugin { Modified: trunk/lib/plugin/GooglePlugin.php =================================================================== --- trunk/lib/plugin/GooglePlugin.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/GooglePlugin.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 2004 $ThePhpWikiProgrammingTeam + * Copyright © 2004 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ require_once 'lib/Google.php'; @@ -36,6 +38,7 @@ * Create a novel UI for searching * Add Google's spell-checking to an application */ + class WikiPlugin_GooglePlugin extends WikiPlugin { Modified: trunk/lib/plugin/GraphViz.php =================================================================== --- trunk/lib/plugin/GraphViz.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/GraphViz.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright 2004 $ThePhpWikiProgrammingTeam +/** + * Copyright © 2004 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/HelloWorld.php =================================================================== --- trunk/lib/plugin/HelloWorld.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/HelloWorld.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam + * Copyright © 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/HtmlConverter.php =================================================================== --- trunk/lib/plugin/HtmlConverter.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/HtmlConverter.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright 2005 Wincor Nixdorf International GmbH +/** + * Copyright © 2005 Wincor Nixdorf International GmbH * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** @@ -26,7 +28,7 @@ * copied and pasted into a wiki page. * Credit to an unknown programmer, who has provided the first * version 0.01 on http://www.gpgstudy.com/striphtml.phps - * Usage: <<HtmlConverter >> + * Usage: <<HtmlConverter>> * Author: HendrikScheider <hen...@wi...> */ Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/IncludePage.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,8 +1,7 @@ <?php - -/* - * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam - * Copyright 2008-2011 Marc-Etienne Vargenau, Alcatel-Lucent +/** + * Copyright © 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam + * Copyright © 2008-2011 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -19,6 +18,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/IncludePages.php =================================================================== --- trunk/lib/plugin/IncludePages.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/IncludePages.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright 2004 $ThePhpWikiProgrammingTeam +/** + * Copyright © 2004 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/IncludeSiteMap.php =================================================================== --- trunk/lib/plugin/IncludeSiteMap.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/IncludeSiteMap.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 2003,2004 $ThePhpWikiProgrammingTeam + * Copyright © 2003,2004 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/IncludeTree.php =================================================================== --- trunk/lib/plugin/IncludeTree.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/IncludeTree.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 2003,2004,2009 $ThePhpWikiProgrammingTeam + * Copyright © 2003,2004,2009 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/InterWikiSearch.php =================================================================== --- trunk/lib/plugin/InterWikiSearch.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/InterWikiSearch.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam + * Copyright © 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ require_once 'lib/PageType.php'; Modified: trunk/lib/plugin/JabberPresence.php =================================================================== --- trunk/lib/plugin/JabberPresence.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/JabberPresence.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright (C) 2004 $ThePhpWikiProgrammingTeam +/** + * Copyright © 2004 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/LdapSearch.php =================================================================== --- trunk/lib/plugin/LdapSearch.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/LdapSearch.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,7 @@ <?php /** - * Copyright 2004 John Lines - * Copyright 2007 $ThePhpWikiProgrammingTeam + * Copyright © 2004 John Lines + * Copyright © 2007 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +18,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/LikePages.php =================================================================== --- trunk/lib/plugin/LikePages.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/LikePages.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam + * Copyright © 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ require_once 'lib/TextSearchQuery.php'; Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/LinkDatabase.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /** - * Copyright 2004,2007 $ThePhpWikiProgrammingTeam + * Copyright © 2004,2007 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ require_once 'lib/PageList.php'; Modified: trunk/lib/plugin/LinkSearch.php =================================================================== --- trunk/lib/plugin/LinkSearch.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/LinkSearch.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright 2007 Reini Urban +/** + * Copyright © 2007 Reini Urban * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ require_once 'lib/TextSearchQuery.php'; @@ -28,6 +30,7 @@ * * @author: Reini Urban */ + class WikiPlugin_LinkSearch extends WikiPlugin { Modified: trunk/lib/plugin/ListPages.php =================================================================== --- trunk/lib/plugin/ListPages.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/ListPages.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright 2004 $ThePhpWikiProgrammingTeam +/** + * Copyright © 2004 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ require_once 'lib/PageList.php'; @@ -31,6 +33,7 @@ * * @author: Dan Frankowski */ + class WikiPlugin_ListPages extends WikiPlugin { Modified: trunk/lib/plugin/ListRelations.php =================================================================== --- trunk/lib/plugin/ListRelations.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/ListRelations.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright 2006 Reini Urban +/** + * Copyright © 2006 Reini Urban * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ require_once 'lib/PageList.php'; @@ -27,6 +29,7 @@ * * @author: Reini Urban */ + class WikiPlugin_ListRelations extends WikiPlugin { Modified: trunk/lib/plugin/ListSubpages.php =================================================================== --- trunk/lib/plugin/ListSubpages.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/ListSubpages.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - /* - * Copyright 2002 $ThePhpWikiProgrammingTeam + * Copyright © 2002 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** @@ -25,6 +27,7 @@ * Based on UnfoldSubpages. * Usage: <<ListSubpages noheader=1 info=pagename,hits,mtime >> */ + require_once 'lib/PageList.php'; class WikiPlugin_ListSubpages Modified: trunk/lib/plugin/MediawikiTable.php =================================================================== --- trunk/lib/plugin/MediawikiTable.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/MediawikiTable.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,9 +1,8 @@ <?php - -/* - * Copyright (C) 2003 Sameer D. Sahasrabuddhe - * Copyright (C) 2005 $ThePhpWikiProgrammingTeam - * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent +/** + * Copyright © 2003 Sameer D. Sahasrabuddhe + * Copyright © 2005 $ThePhpWikiProgrammingTeam + * Copyright © 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -20,7 +19,10 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ + * + * SPDX-License-Identifier: GPL-2.0+ + * + */ /* * Standard Alcatel-Lucent disclaimer for contributing to open source @@ -49,6 +51,7 @@ * A PhpWiki plugin that allows insertion of tables using a Mediawiki-like * syntax. */ + class WikiPlugin_MediawikiTable extends WikiPlugin { Modified: trunk/lib/plugin/ModeratedPage.php =================================================================== --- trunk/lib/plugin/ModeratedPage.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/ModeratedPage.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,8 +1,7 @@ <?php - -/* - * Copyright 2004,2005 $ThePhpWikiProgrammingTeam - * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent +/** + * Copyright © 2004,2005 $ThePhpWikiProgrammingTeam + * Copyright © 2009 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -19,6 +18,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/MostPopular.php =================================================================== --- trunk/lib/plugin/MostPopular.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/MostPopular.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,8 +1,7 @@ <?php - -/* - * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam - * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent +/** + * Copyright © 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam + * Copyright © 2009 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -19,6 +18,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ require_once 'lib/PageList.php'; Modified: trunk/lib/plugin/NewPagesPerUser.php =================================================================== --- trunk/lib/plugin/NewPagesPerUser.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/NewPagesPerUser.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright (C) 2007 AVL +/** + * Copyright © 2007 AVL * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/NoCache.php =================================================================== --- trunk/lib/plugin/NoCache.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/NoCache.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,8 +1,7 @@ <?php - -/* - * Copyright 2004 $ThePhpWikiProgrammingTeam - * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent +/** + * Copyright © 2004 $ThePhpWikiProgrammingTeam + * Copyright © 2009 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -19,6 +18,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** @@ -33,6 +35,7 @@ * Author: Reini Urban <ru...@x-...> * */ + class WikiPlugin_NoCache extends WikiPlugin { Modified: trunk/lib/plugin/OldStyleTable.php =================================================================== --- trunk/lib/plugin/OldStyleTable.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/OldStyleTable.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,8 +1,7 @@ <?php - /** - * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam - * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent + * Copyright © 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam + * Copyright © 2009 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -19,6 +18,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/OrphanedPages.php =================================================================== --- trunk/lib/plugin/OrphanedPages.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/OrphanedPages.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,5 +1,4 @@ <?php - /** * This file is part of PhpWiki. * @@ -16,6 +15,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** @@ -24,7 +26,8 @@ * * Initial version by Lawrence Akka * - **/ + */ + require_once 'lib/PageList.php'; class WikiPlugin_OrphanedPages Modified: trunk/lib/plugin/PageDump.php =================================================================== --- trunk/lib/plugin/PageDump.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/PageDump.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,7 +1,6 @@ <?php - -/* - * Copyright (C) 2003 $ThePhpWikiProgrammingTeam +/** + * Copyright © 2003 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -18,6 +17,9 @@ * You should have received a copy of the GNU General Public License along * with PhpWiki; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * SPDX-License-Identifier: GPL-2.0+ + * */ /** Modified: trunk/lib/plugin/PageGroup.php =================================================================== --- trunk/lib/plugin/PageGroup.php 2016-10-06 15:52:28 UTC (rev 9936) +++ trunk/lib/plugin/PageGroup.php 2016-10-06 16:50:28 UTC (rev 9937) @@ -1,8 +1,7 @@ <?php - /** - * Copyright 1999,2000,2001,2002,2004 $ThePhpWikiProgrammingTeam - * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent + * Copyright © 1999,2000,2001,2002,2004 $ThePhpWikiProgrammingTeam + * Copyright © 2009 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -19,6 +18,9 @@ * You should have received a copy of the GNU General Public License along * wi... [truncated message content] |
From: <var...@us...> - 2017-07-06 10:23:11
|
Revision: 10019 http://sourceforge.net/p/phpwiki/code/10019 Author: vargenau Date: 2017-07-06 10:23:09 +0000 (Thu, 06 Jul 2017) Log Message: ----------- It's pages, not files Modified Paths: -------------- trunk/lib/plugin/WikiAdminPurge.php trunk/lib/plugin/WikiAdminRemove.php trunk/lib/plugin/WikiAdminSearchReplace.php trunk/lib/plugin/WikiAdminSetAcl.php Modified: trunk/lib/plugin/WikiAdminPurge.php =================================================================== --- trunk/lib/plugin/WikiAdminPurge.php 2017-05-30 15:41:35 UTC (rev 10018) +++ trunk/lib/plugin/WikiAdminPurge.php 2017-07-06 10:23:09 UTC (rev 10019) @@ -153,12 +153,12 @@ $button_label = _("Yes"); $header->pushContent(HTML::legend(_("Confirm purge"))); $header->pushContent(HTML::p(HTML::strong( - _("Are you sure you want to permanently purge the following files?")))); + _("Are you sure you want to permanently purge the following pages?")))); } else { $pagelist = new PageList_Selectable($args['info'], $args['exclude'], array()); $pagelist->addPageList($pages); $button_label = _("Permanently purge selected pages"); - $header->pushContent(HTML::legend(_("Select the files to purge"))); + $header->pushContent(HTML::legend(_("Select the pages to purge"))); } $buttons = HTML::p(Button('submit:admin_purge[purge]', $button_label, 'wikiadmin'), Modified: trunk/lib/plugin/WikiAdminRemove.php =================================================================== --- trunk/lib/plugin/WikiAdminRemove.php 2017-05-30 15:41:35 UTC (rev 10018) +++ trunk/lib/plugin/WikiAdminRemove.php 2017-07-06 10:23:09 UTC (rev 10019) @@ -207,7 +207,7 @@ $button_label = _("Yes"); $header->pushContent(HTML::legend(_("Confirm removal"))); $header->pushContent(HTML::p(HTML::strong( - _("Are you sure you want to remove the selected files?")))); + _("Are you sure you want to remove the selected pages?")))); } else { $pagelist = new PageList_Selectable($args['info'], $args['exclude'], array('types' => @@ -215,7 +215,7 @@ => new _PageList_Column_remove('remove', _("Remove"))))); $pagelist->addPageList($pages); $button_label = _("Remove selected pages"); - $header->pushContent(HTML::legend(_("Select the files to remove"))); + $header->pushContent(HTML::legend(_("Select the pages to remove"))); if ($args['min_age'] > 0) { $header->pushContent( fmt("Also pages which have been deleted at least %s days.", Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2017-05-30 15:41:35 UTC (rev 10018) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2017-07-06 10:23:09 UTC (rev 10019) @@ -132,7 +132,7 @@ $button_label = _("Replace"); $header->pushContent( HTML::p(HTML::strong( - _("Are you sure you want to replace text in the selected files?")))); + _("Are you sure you want to replace text in the selected pages?")))); $this->replaceForm($header, $post_args); } else { $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $columns); Modified: trunk/lib/plugin/WikiAdminSetAcl.php =================================================================== --- trunk/lib/plugin/WikiAdminSetAcl.php 2017-05-30 15:41:35 UTC (rev 10018) +++ trunk/lib/plugin/WikiAdminSetAcl.php 2017-07-06 10:23:09 UTC (rev 10019) @@ -207,7 +207,7 @@ $header = $this->setaclForm($header, $post_args, $pages); $header->pushContent( HTML::p(HTML::strong( - _("Are you sure you want to permanently change access rights to the selected files?")))); + _("Are you sure you want to permanently change access rights to the selected pages?")))); } else { $pagelist = new PageList_Selectable($args['info'], $args['exclude'], @@ -269,9 +269,9 @@ $header->pushContent(HTML::strong(_("ACL") . _(": ")), HTML::samp($perm->asAclLines()), HTML::br()); $header->pushContent(HTML::p(HTML::strong(_("Description") . _(": ")), - _("Selected Grant checkboxes allow access, unselected checkboxes deny access."), - _("To ignore delete the line."), - _("To add check 'Add' near the dropdown list.") + _("Selected Grant checkboxes allow access, unselected checkboxes deny access.") + .' '._("To ignore delete the line.") + .' '._("To add check 'Add' near the dropdown list.") )); $header->pushContent($table); // This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-02-20 11:23:39
|
Revision: 10245 http://sourceforge.net/p/phpwiki/code/10245 Author: vargenau Date: 2021-02-20 11:23:33 +0000 (Sat, 20 Feb 2021) Log Message: ----------- Better test boolean arguments Modified Paths: -------------- trunk/lib/plugin/AddComment.php trunk/lib/plugin/AllPages.php trunk/lib/plugin/CreatePage.php trunk/lib/plugin/WikiAdminSetExternal.php Modified: trunk/lib/plugin/AddComment.php =================================================================== --- trunk/lib/plugin/AddComment.php 2021-02-20 11:10:02 UTC (rev 10244) +++ trunk/lib/plugin/AddComment.php 2021-02-20 11:23:33 UTC (rev 10245) @@ -61,7 +61,7 @@ return array('pagename' => '[pagename]', 'order' => 'normal', 'mode' => 'add,show', - 'jshide' => '0', + 'jshide' => false, 'noheader' => false, //'sortby' => '-pagename' // oldest first. reverse by order=reverse ); @@ -81,6 +81,24 @@ return $this->error(sprintf(_("A required argument “%s” is missing."), 'pagename')); } + $jshide = $args['jshide']; + if (($jshide == '0') || ($jshide == 'false')) { + $jshide = false; + } elseif (($jshide == '1') || ($jshide == 'true')) { + $jshide = true; + } else { + return $this->error(sprintf(_("Argument '%s' must be a boolean"), "jshide")); + } + + $noheader = $args['noheader']; + if (($noheader == '0') || ($noheader == 'false')) { + $noheader = false; + } elseif (($noheader == '1') || ($noheader == 'true')) { + $noheader = true; + } else { + return $this->error(sprintf(_("Argument '%s' must be a boolean"), "noheader")); + } + // Get our form args. $comment = $request->getArg("comment"); $request->setArg('comment', false); @@ -92,7 +110,7 @@ // Now we display previous comments and/or provide entry box // for new comments $html = HTML(); - if ($args['jshide']) { + if ($jshide) { $div = HTML::div(array('id' => 'comments', 'style' => 'display:none;')); //$list->setAttr('style','display:none;'); $div->pushContent(JavaScript(" Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2021-02-20 11:10:02 UTC (rev 10244) +++ trunk/lib/plugin/AllPages.php 2021-02-20 11:23:33 UTC (rev 10245) @@ -52,7 +52,7 @@ } // info arg allows multiple columns - // info=mtime,hits,summary,version,author,locked,minor,markup or all + // info=mtime,hits,summary,version,author,locked,minor or all // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges // sortby: [+|-] pagename|mtime|hits @@ -67,6 +67,33 @@ { $args = $this->getArgs($argstr, $request); + $include_empty = $args['include_empty']; + if (($include_empty == '0') || ($include_empty == 'false')) { + $include_empty = false; + } elseif (($include_empty == '1') || ($include_empty == 'true')) { + $include_empty = true; + } else { + return $this->error(sprintf(_("Argument '%s' must be a boolean"), "include_empty")); + } + + $noheader = $args['noheader']; + if (($noheader == '0') || ($noheader == 'false')) { + $noheader = false; + } elseif (($noheader == '1') || ($noheader == 'true')) { + $noheader = true; + } else { + return $this->error(sprintf(_("Argument '%s' must be a boolean"), "noheader")); + } + + $userpages = $args['userpages']; + if (($userpages == '0') || ($userpages == 'false')) { + $userpages = false; + } elseif (($userpages == '1') || ($userpages == 'true')) { + $userpages = true; + } else { + return $this->error(sprintf(_("Argument '%s' must be a boolean"), "userpages")); + } + if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::p(array('class' => "error"), _("Illegal “limit” argument: must be an integer or two integers separated by comma")); @@ -80,12 +107,12 @@ // Todo: extend given _GET args $caption = _("All pages in this wiki (%d total):"); - if (!empty($args['userpages'])) { - $pages = PageList::allUserPages($args['include_empty'], $args['sortby'], ''); + if ($userpages) { + $pages = PageList::allUserPages($include_empty, $args['sortby'], ''); $caption = _("List of user-created pages (%d total):"); $args['count'] = count($pages); } elseif (!empty($args['owner'])) { - $pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'], $args['sortby'], ''); + $pages = PageList::allPagesByOwner($args['owner'], $include_empty, $args['sortby'], ''); $args['count'] = count($pages); $caption = fmt("List of pages owned by %s (%d total):", WikiLink($args['owner'] == '[]' @@ -93,7 +120,7 @@ : $args['owner'], 'if_known'), $args['count']); } elseif (!empty($args['author'])) { - $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'], $args['sortby'], ''); + $pages = PageList::allPagesByAuthor($args['author'], $include_empty, $args['sortby'], ''); $args['count'] = count($pages); $caption = fmt("List of pages last edited by %s (%d total):", WikiLink($args['author'] == '[]' @@ -101,7 +128,7 @@ : $args['author'], 'if_known'), $args['count']); } elseif (!empty($args['creator'])) { - $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'], $args['sortby'], ''); + $pages = PageList::allPagesByCreator($args['creator'], $include_empty, $args['sortby'], ''); $args['count'] = count($pages); $caption = fmt("List of pages created by %s (%d total):", WikiLink($args['creator'] == '[]' @@ -111,24 +138,25 @@ } elseif ($pages) { $args['count'] = count($pages); } else { - if (!$request->getArg('count')) - $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']); - else + if (!$request->getArg('count')) { + $args['count'] = $dbi->numPages($include_empty, $args['exclude']); + } else { $args['count'] = $request->getArg('count'); + } } if (empty($args['count']) and !empty($pages)) { $args['count'] = count($pages); } $pagelist = new PageList($args['info'], $args['exclude'], $args); - if (!$args['noheader']) { + if (!$noheader) { $pagelist->setCaption($caption); } - if ($pages !== false) + if ($pages !== false) { $pagelist->addPageList($pages); - else - $pagelist->addPages($dbi->getAllPages($args['include_empty'], $args['sortby'], - $args['limit'])); + } else { + $pagelist->addPages($dbi->getAllPages($include_empty, $args['sortby'], $args['limit'])); + } return $pagelist; } } Modified: trunk/lib/plugin/CreatePage.php =================================================================== --- trunk/lib/plugin/CreatePage.php 2021-02-20 11:10:02 UTC (rev 10244) +++ trunk/lib/plugin/CreatePage.php 2021-02-20 11:23:33 UTC (rev 10245) @@ -53,8 +53,6 @@ 'vars' => false, 'overwrite' => false, 'verify' => false, // true or a pagename - //'buttontext' => false, - //'method' => 'POST' ); } @@ -68,6 +66,15 @@ function run($dbi, $argstr, &$request, $basepage) { extract($this->getArgs($argstr, $request)); + + if (($overwrite == '0') || ($overwrite == 'false')) { + $overwrite = false; + } elseif (($overwrite == '1') || ($overwrite == 'true')) { + $overwrite = true; + } else { + return $this->error(sprintf(_("Argument '%s' must be a boolean"), "overwrite")); + } + // Prevent spaces at the start and end of a page name $s = trim($s); if (!$s) { Modified: trunk/lib/plugin/WikiAdminSetExternal.php =================================================================== --- trunk/lib/plugin/WikiAdminSetExternal.php 2021-02-20 11:10:02 UTC (rev 10244) +++ trunk/lib/plugin/WikiAdminSetExternal.php 2021-02-20 11:23:33 UTC (rev 10245) @@ -45,7 +45,7 @@ ( parent::getDefaultArguments(), array( - 'external' => 1, + 'external' => true, /* Columns to include in listing */ 'info' => 'pagename,external,mtime', )); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-02-21 18:15:39
|
Revision: 10246 http://sourceforge.net/p/phpwiki/code/10246 Author: vargenau Date: 2021-02-21 18:15:37 +0000 (Sun, 21 Feb 2021) Log Message: ----------- Better test boolean argument "include_empty" Modified Paths: -------------- trunk/lib/plugin/AllUsers.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/OrphanedPages.php Modified: trunk/lib/plugin/AllUsers.php =================================================================== --- trunk/lib/plugin/AllUsers.php 2021-02-20 11:23:33 UTC (rev 10245) +++ trunk/lib/plugin/AllUsers.php 2021-02-21 18:15:37 UTC (rev 10246) @@ -78,6 +78,14 @@ extract($args); + if (($include_empty == '0') || ($include_empty == 'false')) { + $include_empty = false; + } elseif (($include_empty == '1') || ($include_empty == 'true')) { + $include_empty = true; + } else { + return $this->error(sprintf(_("Argument '%s' must be a boolean"), "include_empty")); + } + $group = $request->getGroup(); if (method_exists($group, '_allUsers')) { $allusers = $group->_allUsers(); Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2021-02-20 11:23:33 UTC (rev 10245) +++ trunk/lib/plugin/LinkDatabase.php 2021-02-21 18:15:37 UTC (rev 10246) @@ -103,6 +103,15 @@ global $WikiTheme; $args = $this->getArgs($argstr, $request); + $include_empty = $args['include_empty']; + if (($include_empty == '0') || ($include_empty == 'false')) { + $include_empty = false; + } elseif (($include_empty == '1') || ($include_empty == 'true')) { + $include_empty = true; + } else { + return $this->error(sprintf(_("Argument '%s' must be a boolean"), "include_empty")); + } + if (isset($args['limit']) && !is_limit($args['limit'])) { return HTML::p(array('class' => "error"), _("Illegal “limit” argument: must be an integer or two integers separated by comma")); @@ -111,7 +120,7 @@ $caption = _("All pages with all links in this wiki (%d total):"); if (!empty($args['owner'])) { - $pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'], + $pages = PageList::allPagesByOwner($args['owner'], $include_empty, $args['sortby'], $args['limit']); if ($args['owner']) $caption = fmt("List of pages owned by %s (%d total):", @@ -118,7 +127,7 @@ WikiLink($args['owner'], 'if_known'), count($pages)); } elseif (!empty($args['author'])) { - $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'], + $pages = PageList::allPagesByAuthor($args['author'], $include_empty, $args['sortby'], $args['limit']); if ($args['author']) $caption = fmt("List of pages last edited by %s (%d total):", @@ -125,7 +134,7 @@ WikiLink($args['author'], 'if_known'), count($pages)); } elseif (!empty($args['creator'])) { - $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'], + $pages = PageList::allPagesByCreator($args['creator'], $include_empty, $args['sortby'], $args['limit']); if ($args['creator']) $caption = fmt("List of pages created by %s (%d total):", @@ -133,10 +142,10 @@ count($pages)); } else { if (!$request->getArg('count')) - $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude_from']); + $args['count'] = $dbi->numPages($include_empty, $args['exclude_from']); else $args['count'] = $request->getArg('count'); - $pages = $dbi->getAllPages($args['include_empty'], $args['sortby'], + $pages = $dbi->getAllPages($include_empty, $args['sortby'], $args['limit'], $args['exclude_from']); } if ($args['format'] == 'html') { Modified: trunk/lib/plugin/OrphanedPages.php =================================================================== --- trunk/lib/plugin/OrphanedPages.php 2021-02-20 11:23:33 UTC (rev 10245) +++ trunk/lib/plugin/OrphanedPages.php 2021-02-21 18:15:37 UTC (rev 10246) @@ -72,6 +72,14 @@ extract($args); + if (($include_empty == '0') || ($include_empty == 'false')) { + $include_empty = false; + } elseif (($include_empty == '1') || ($include_empty == 'true')) { + $include_empty = true; + } else { + return $this->error(sprintf(_("Argument '%s' must be a boolean"), "include_empty")); + } + // There's probably a more efficient way to do this (eg a // tailored SQL query via the backend, but this does the job This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |