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. |