You can subscribe to this list here.
2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(43) |
Nov
(73) |
Dec
(10) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2001 |
Jan
(34) |
Feb
(110) |
Mar
(24) |
Apr
(44) |
May
(37) |
Jun
(22) |
Jul
(20) |
Aug
(28) |
Sep
(50) |
Oct
(11) |
Nov
(132) |
Dec
(595) |
2002 |
Jan
(1099) |
Feb
(579) |
Mar
(63) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(125) |
Sep
(101) |
Oct
(25) |
Nov
(34) |
Dec
(47) |
2003 |
Jan
(82) |
Feb
(182) |
Mar
(71) |
Apr
(3) |
May
(1) |
Jun
(3) |
Jul
|
Aug
|
Sep
(14) |
Oct
(6) |
Nov
(124) |
Dec
(68) |
2004 |
Jan
(64) |
Feb
(191) |
Mar
(199) |
Apr
(298) |
May
(252) |
Jun
(426) |
Jul
(134) |
Aug
(13) |
Sep
(96) |
Oct
(75) |
Nov
(232) |
Dec
(171) |
2005 |
Jan
(205) |
Feb
(165) |
Mar
(8) |
Apr
(74) |
May
(21) |
Jun
(19) |
Jul
(37) |
Aug
(69) |
Sep
(141) |
Oct
(118) |
Nov
(31) |
Dec
(7) |
2006 |
Jan
(5) |
Feb
(10) |
Mar
(35) |
Apr
(24) |
May
(34) |
Jun
(29) |
Jul
(5) |
Aug
(38) |
Sep
(30) |
Oct
(37) |
Nov
(30) |
Dec
(86) |
2007 |
Jan
(414) |
Feb
(40) |
Mar
(18) |
Apr
(10) |
May
(66) |
Jun
(60) |
Jul
(105) |
Aug
(55) |
Sep
(64) |
Oct
(7) |
Nov
(11) |
Dec
(5) |
2008 |
Jan
(26) |
Feb
(28) |
Mar
(79) |
Apr
(34) |
May
(61) |
Jun
(24) |
Jul
(29) |
Aug
(160) |
Sep
(62) |
Oct
(70) |
Nov
(32) |
Dec
(14) |
2009 |
Jan
(140) |
Feb
(135) |
Mar
(153) |
Apr
(53) |
May
(24) |
Jun
(138) |
Jul
(90) |
Aug
(46) |
Sep
(72) |
Oct
(84) |
Nov
(32) |
Dec
(4) |
2010 |
Jan
(13) |
Feb
(7) |
Mar
(14) |
Apr
(55) |
May
(89) |
Jun
(131) |
Jul
(41) |
Aug
(38) |
Sep
(42) |
Oct
(11) |
Nov
(27) |
Dec
(54) |
2011 |
Jan
(127) |
Feb
(16) |
Mar
(71) |
Apr
(52) |
May
(32) |
Jun
(31) |
Jul
(4) |
Aug
|
Sep
(45) |
Oct
(26) |
Nov
(36) |
Dec
(10) |
2012 |
Jan
(23) |
Feb
(6) |
Mar
(13) |
Apr
(18) |
May
(1) |
Jun
(4) |
Jul
(3) |
Aug
(12) |
Sep
(57) |
Oct
(96) |
Nov
(163) |
Dec
(124) |
2013 |
Jan
(11) |
Feb
(17) |
Mar
(7) |
Apr
(48) |
May
(15) |
Jun
(29) |
Jul
(12) |
Aug
|
Sep
(9) |
Oct
|
Nov
|
Dec
(3) |
2014 |
Jan
(4) |
Feb
(1) |
Mar
(2) |
Apr
(1) |
May
(8) |
Jun
(90) |
Jul
(104) |
Aug
(12) |
Sep
(81) |
Oct
(139) |
Nov
(111) |
Dec
(64) |
2015 |
Jan
(46) |
Feb
(74) |
Mar
(56) |
Apr
(61) |
May
(3) |
Jun
(7) |
Jul
(11) |
Aug
(5) |
Sep
(15) |
Oct
(1) |
Nov
(1) |
Dec
(15) |
2016 |
Jan
(25) |
Feb
(33) |
Mar
(24) |
Apr
(4) |
May
(24) |
Jun
(3) |
Jul
(75) |
Aug
|
Sep
(2) |
Oct
(38) |
Nov
(4) |
Dec
(18) |
2017 |
Jan
(8) |
Feb
(1) |
Mar
(1) |
Apr
|
May
(14) |
Jun
|
Jul
(5) |
Aug
(9) |
Sep
|
Oct
(23) |
Nov
|
Dec
|
2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2019 |
Jan
|
Feb
|
Mar
(9) |
Apr
(60) |
May
(1) |
Jun
|
Jul
(13) |
Aug
|
Sep
(11) |
Oct
|
Nov
|
Dec
|
2020 |
Jan
|
Feb
|
Mar
(15) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
2021 |
Jan
(24) |
Feb
(33) |
Mar
(1) |
Apr
|
May
(1) |
Jun
(64) |
Jul
(71) |
Aug
(114) |
Sep
(82) |
Oct
(32) |
Nov
(76) |
Dec
(86) |
2022 |
Jan
(162) |
Feb
(41) |
Mar
(11) |
Apr
(9) |
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(7) |
2023 |
Jan
|
Feb
(1) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(25) |
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
|
2024 |
Jan
(7) |
Feb
(3) |
Mar
(3) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2025 |
Jan
|
Feb
(90) |
Mar
(19) |
Apr
|
May
(6) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <var...@us...> - 2014-06-11 16:04:33
|
Revision: 8888 http://sourceforge.net/p/phpwiki/code/8888 Author: vargenau Date: 2014-06-11 16:04:26 +0000 (Wed, 11 Jun 2014) Log Message: ----------- Fix French Modified Paths: -------------- trunk/lib/plugin/RecentChanges.php Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2014-06-11 16:02:40 UTC (rev 8887) +++ trunk/lib/plugin/RecentChanges.php 2014-06-11 16:04:26 UTC (rev 8888) @@ -365,7 +365,7 @@ * de: %s days "Die %d jüngste %s [innerhalb (von] %s Tagen) sind unten aufgelistet." * * en: day/days "The %d most recent %s during [the past] (day) are listed below." - * fr: 1 jour "Les %d %s les plus récentes pendant [le dernier (d'une] jour) sont énumérées ci-dessous." + * fr: 1 jour "Les %d %s les plus récentes pendant [le dernier jour) sont énumérées ci-dessous." * fr: %s jours "Les %d %s les plus récentes pendant [les derniers (%s] jours) sont énumérées ci-dessous." */ if ($limit > 0) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-11 16:02:44
|
Revision: 8887 http://sourceforge.net/p/phpwiki/code/8887 Author: vargenau Date: 2014-06-11 16:02:40 +0000 (Wed, 11 Jun 2014) Log Message: ----------- Avoid backslash Modified Paths: -------------- trunk/lib/plugin/PhpHighlight.php Modified: trunk/lib/plugin/PhpHighlight.php =================================================================== --- trunk/lib/plugin/PhpHighlight.php 2014-06-11 16:01:40 UTC (rev 8886) +++ trunk/lib/plugin/PhpHighlight.php 2014-06-11 16:02:40 UTC (rev 8887) @@ -79,7 +79,7 @@ /* Remove empty span tags. */ foreach (array($string, $comment, $keyword, $bg, $default, $html) as $color) { - $search = "<span style=\"color: $color\"></span>"; + $search = '<span style="color: '.$color.'></span>'; $str = str_replace($search, '', $str); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-11 16:01:48
|
Revision: 8886 http://sourceforge.net/p/phpwiki/code/8886 Author: vargenau Date: 2014-06-11 16:01:40 +0000 (Wed, 11 Jun 2014) Log Message: ----------- private function _makeButton --> protected function _makeButton Modified Paths: -------------- trunk/lib/plugin/WikiAdminUtils.php Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2014-06-10 16:43:50 UTC (rev 8885) +++ trunk/lib/plugin/WikiAdminUtils.php 2014-06-11 16:01:40 UTC (rev 8886) @@ -78,7 +78,7 @@ return $this->_makeButton($request, $args, $label); } - private function _makeButton(&$request, $args, $label) + protected function _makeButton(&$request, $args, $label) { $args['return_url'] = $request->getURLtoSelf(); return HTML::form(array('action' => $request->getPostURL(), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-10 16:43:54
|
Revision: 8885 http://sourceforge.net/p/phpwiki/code/8885 Author: vargenau Date: 2014-06-10 16:43:50 +0000 (Tue, 10 Jun 2014) Log Message: ----------- _("Help")."/"._("TextFormattingRules") --> _("Help/TextFormattingRules") Modified Paths: -------------- trunk/themes/blog/templates/blogform.tmpl trunk/themes/default/templates/blogform.tmpl Modified: trunk/themes/blog/templates/blogform.tmpl =================================================================== --- trunk/themes/blog/templates/blogform.tmpl 2014-06-10 16:41:59 UTC (rev 8884) +++ trunk/themes/blog/templates/blogform.tmpl 2014-06-10 16:43:50 UTC (rev 8885) @@ -19,7 +19,7 @@ <hr /> <div class="wiki-edithelp"> <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p> - <?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?> + <?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?> </div> <?php echo $HIDDEN_INPUTS?> </form> Modified: trunk/themes/default/templates/blogform.tmpl =================================================================== --- trunk/themes/default/templates/blogform.tmpl 2014-06-10 16:41:59 UTC (rev 8884) +++ trunk/themes/default/templates/blogform.tmpl 2014-06-10 16:43:50 UTC (rev 8885) @@ -19,7 +19,7 @@ <hr /> <div class="wiki-edithelp"> <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p> - <?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?> + <?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?> </div> <?php echo $HIDDEN_INPUTS?> </form> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-10 16:42:03
|
Revision: 8884 http://sourceforge.net/p/phpwiki/code/8884 Author: vargenau Date: 2014-06-10 16:41:59 +0000 (Tue, 10 Jun 2014) Log Message: ----------- Remove comments about old browsers Modified Paths: -------------- trunk/themes/default/templates/actionbar.tmpl Modified: trunk/themes/default/templates/actionbar.tmpl =================================================================== --- trunk/themes/default/templates/actionbar.tmpl 2014-06-10 16:39:05 UTC (rev 8883) +++ trunk/themes/default/templates/actionbar.tmpl 2014-06-10 16:41:59 UTC (rev 8884) @@ -1,9 +1,4 @@ <?php if (!$WikiTheme->DUMP_MODE) { ?> -<?php /* I would like not to have to use these tables, and managed to - * get this stuff to work more or less correctly using - * CSSs float:left; and float:right;. However float:right; seems - * to cause MSIE4.01/NT to hang. - * So, we use tables... */ ?> <table class="fullwidth"> <tr class="baseline"> <td> @@ -50,10 +45,6 @@ </div> </td> <?php if (empty($NOSIGNIN)) { ?> -<?php -/* class="top" is not ideal here but required to get reasonable alignment - with the other action buttons in some browsers, like OmniWeb and Safari - (therefore probably Konquorer too) */ ?> <td class="align-right top"> <div id="signin"><?php echo Template('signin') ?></div> </td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-10 16:39:09
|
Revision: 8883 http://sourceforge.net/p/phpwiki/code/8883 Author: vargenau Date: 2014-06-10 16:39:05 +0000 (Tue, 10 Jun 2014) Log Message: ----------- Remove $Id$ Modified Paths: -------------- trunk/themes/default/templates/README Modified: trunk/themes/default/templates/README =================================================================== --- trunk/themes/default/templates/README 2014-06-10 16:38:14 UTC (rev 8882) +++ trunk/themes/default/templates/README 2014-06-10 16:39:05 UTC (rev 8883) @@ -1,5 +1,3 @@ -$Id$ - The template structure and syntax has completely changed with 1.3.3. See lib/Template.php for more, esp. the defined global php variables. ($request, $user, $page, $Theme and some action specific local vars.) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-10 16:38:19
|
Revision: 8882 http://sourceforge.net/p/phpwiki/code/8882 Author: vargenau Date: 2014-06-10 16:38:14 +0000 (Tue, 10 Jun 2014) Log Message: ----------- Update PHP Doc Modified Paths: -------------- trunk/lib/AccessLog.php trunk/lib/DbSession.php trunk/lib/ErrorManager.php trunk/lib/ExternalReferrer.php trunk/lib/FileFinder.php trunk/lib/Google.php trunk/lib/HtmlElement.php trunk/lib/PageType.php trunk/lib/RSSWriter091.php trunk/lib/Request.php trunk/lib/SemanticWeb.php trunk/lib/WikiDB.php trunk/lib/WikiGroup.php trunk/lib/WikiPluginCached.php trunk/lib/WikiTheme.php trunk/lib/WikiUser.php trunk/lib/loadsave.php trunk/lib/prepend.php trunk/lib/stdlib.php trunk/lib/upgrade.php Modified: trunk/lib/AccessLog.php =================================================================== --- trunk/lib/AccessLog.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/AccessLog.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -35,7 +35,8 @@ class Request_AccessLog { /** - * @param $logfile string Log file name. + * @param string $logfile Log file name. + * @param bool $do_sql */ function Request_AccessLog($logfile, $do_sql = false) { @@ -297,7 +298,7 @@ * * This is a static member function. * - * @param $time integer Unix timestamp (defaults to current time). + * @param int|bool $time Unix timestamp (defaults to current time). * @return string Zone offset, e.g. "-0800" for PST. */ function _zone_offset($time = false) @@ -320,7 +321,7 @@ * * This is a static member function. * - * @param $time integer Unix timestamp (defaults to current time). + * @param int|bool $time Unix timestamp (defaults to current time). * @return string Formatted date & time. */ function _ncsa_time($time = false) Modified: trunk/lib/DbSession.php =================================================================== --- trunk/lib/DbSession.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/DbSession.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -22,6 +22,7 @@ * be extracted. * * @param string $table + * @return bool|DbSession * Name of SQL table containing session data. */ function DbSession(&$dbh, $table = 'session') Modified: trunk/lib/ErrorManager.php =================================================================== --- trunk/lib/ErrorManager.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/ErrorManager.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -431,10 +431,10 @@ /** * Construct a new PhpError. - * @param $errno int - * @param $errstr string - * @param $errfile string - * @param $errline int + * @param int $errno + * @param string $errstr + * @param string $errfile + * @param int $errline */ function PhpError($errno, $errstr, $errfile, $errline) { @@ -587,8 +587,10 @@ { /** * Construct a new PhpError. - * @param $errno int - * @param $errstr string + * @param int $errno + * @param string $errstr + * @param string $errfile + * @param int $errline */ function PhpWikiError($errno, $errstr, $errfile, $errline) { Modified: trunk/lib/ExternalReferrer.php =================================================================== --- trunk/lib/ExternalReferrer.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/ExternalReferrer.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -74,6 +74,7 @@ * the method determines the name of the search engine, it's URL, and the search keywords * used in the search. This information is returned in an associative array with the following * keys: + * @param string $url * @returns array engine, engine_url, query * @public */ Modified: trunk/lib/FileFinder.php =================================================================== --- trunk/lib/FileFinder.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/FileFinder.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -20,7 +20,7 @@ * * @param $path array A list of directories in which to search for files. */ - function FileFinder($path = false) + function FileFinder($path = array()) { $this->_pathsep = $this->_get_syspath_separator(); if (!isset($this->_path) and $path === false) @@ -32,6 +32,7 @@ * Find file. * * @param $file string File to search for. + * @param bool $missing_okay * @return string The filename (including path), if found, otherwise false. */ function findFile($file, $missing_okay = false) @@ -139,6 +140,7 @@ * So if there's any '\' in the path, either fix them to '/' (not in Win95 or FAT?) * or use '\' for ours. * + * @param string $path * @access private * @return string path_separator. */ Modified: trunk/lib/Google.php =================================================================== --- trunk/lib/Google.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/Google.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -254,7 +254,7 @@ * * The return type for cached pages is base64 encoded text. * - * @params string url - full URL to the page to retrieve + * @param string $url - full URL to the page to retrieve * @return string full text of the cached page */ function doGetCachedPage($url) Modified: trunk/lib/HtmlElement.php =================================================================== --- trunk/lib/HtmlElement.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/HtmlElement.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -68,9 +68,10 @@ /** Add a "tooltip" to an element. * - * @param $tooltip_text string The tooltip text. + * @param string $tooltip_text The tooltip text. + * @param string $accesskey. */ - function addTooltip($tooltip_text, $accesskey = null) + function addTooltip($tooltip_text, $accesskey = '') { $this->setAttr('title', $tooltip_text); if ($accesskey) $this->setAccesskey($accesskey); @@ -580,7 +581,7 @@ /** * Generate hidden form input fields. * - * @param $query_args hash A hash mapping names to values for the hidden inputs. + * @param array $query_args A hash mapping names to values for the hidden inputs. * Values in the hash can themselves be hashes. The will result in hidden inputs * which will reconstruct the nested structure in the resulting query args as * processed by PHP. @@ -597,6 +598,8 @@ * <input type="hidden" name="y[a]" value = "aval" /> * <input type="hidden" name="y[b]" value = "bval" /> * + * @param bool $pfx + * @param array $exclude * @return object An XmlContent object containing the inputs. */ function HiddenInputs($query_args, $pfx = false, $exclude = array()) @@ -619,11 +622,11 @@ /** Generate a <script> tag containing javascript. * * @param string $js The javascript. - * @param string $script_args (optional) hash of script tags options + * @param array $script_args (optional) hash of script tags options * e.g. to provide another version or the defer attr * @return HtmlElement A <script> element. */ -function JavaScript($js, $script_args = false) +function JavaScript($js, $script_args = array()) { $default_script_args = array( //'version' => 'JavaScript', // not xhtml conformant 'type' => 'text/javascript'); Modified: trunk/lib/PageType.php =================================================================== --- trunk/lib/PageType.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/PageType.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -30,11 +30,11 @@ * * @param WikiDB_Page $page * @param string $text The packed page revision content. - * @param hash $meta The version meta-data. + * @param array $meta The version meta-data. * @param string $type_override For markup of page using a different * pagetype than that specified in its version meta-data. */ - function TransformedText($page, $text, $meta, $type_override = false) + function TransformedText($page, $text, $meta, $type_override = '') { $pagetype = false; if ($type_override) @@ -74,10 +74,10 @@ * * This is a static member function. * - * @param string $pagetype Name of the page type. + * @param string $name Name of the page type. * @return PageType An object which is a subclass of PageType. */ - function GetPageType($name = false) + function GetPageType($name = '') { if (!$name) $name = 'wikitext'; @@ -106,7 +106,7 @@ * * @param WikiDB_Page $page * @param string $text - * @param hash $meta Version meta-data + * @param array $meta Version meta-data * @return XmlContent The transformed page text. */ function transform(&$page, &$text, $meta) Modified: trunk/lib/RSSWriter091.php =================================================================== --- trunk/lib/RSSWriter091.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/RSSWriter091.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -104,7 +104,7 @@ { global $request; - $rc_url = WikiURL($request->getArg('pagename'), false, 'absurl'); + $rc_url = WikiURL($request->getArg('pagename'), array(), 'absurl'); return array('title' => WIKI_NAME, 'description' => _("RecentChanges"), Modified: trunk/lib/Request.php =================================================================== --- trunk/lib/Request.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/Request.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -22,7 +22,7 @@ class Request { - public $args = array(); + public $args = array(); function Request() { @@ -866,6 +866,7 @@ { /** * @param $logfile string Log file name. + * @param bool $do_sql */ function Request_AccessLog($logfile, $do_sql = false) { @@ -1123,10 +1124,10 @@ * * This is a static member function. * - * @param $time integer Unix timestamp (defaults to current time). + * @param int $time Unix timestamp (defaults to current time). * @return string Zone offset, e.g. "-0800" for PST. */ - function _zone_offset($time = false) + function _zone_offset($time = 0) { if (!$time) $time = time(); @@ -1146,10 +1147,10 @@ * * This is a static member function. * - * @param $time integer Unix timestamp (defaults to current time). + * @param int $time Unix timestamp (defaults to current time). * @return string Formatted date & time. */ - function _ncsa_time($time = false) + function _ncsa_time($time = 0) { if (!$time) $time = time(); Modified: trunk/lib/SemanticWeb.php =================================================================== --- trunk/lib/SemanticWeb.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/SemanticWeb.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -132,7 +132,7 @@ $this->_uris_seen = array(); $this->_items = array(); - $this->wiki_xmlns_xml = WikiURL(_("UriResolver") . "?", false, true); + $this->wiki_xmlns_xml = WikiURL(_("UriResolver") . "?", array(), true); $this->wiki_xmlns_url = PHPWIKI_BASE_URL; $this->pre_ns_buffer = Modified: trunk/lib/WikiDB.php =================================================================== --- trunk/lib/WikiDB.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/WikiDB.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -217,6 +217,7 @@ * @access public * @param string $pagename Name of page to delete. * @see purgePage + * @return mixed */ function deletePage($pagename) { @@ -410,7 +411,7 @@ * * @access public * - * @param hash $params This hash is used to specify various optional + * @param array $params This hash is used to specify various optional * parameters: * <dl> * <dt> limit @@ -432,7 +433,7 @@ * @return WikiDB_PageRevisionIterator A WikiDB_PageRevisionIterator * containing the matching revisions. */ - function mostRecent($params = false) + function mostRecent($params = array()) { $result = $this->_backend->most_recent($params); return new WikiDB_PageRevisionIterator($this, $result); @@ -441,6 +442,8 @@ /** * @access public * + * @param string $exclude_from + * @param string $exclude * @param string $sortby Optional. "+-column,+-column2". * If false the result is faster in natural order. * @param string $limit Optional. Encoded as "$offset,$count". @@ -451,7 +454,6 @@ function wantedPages($exclude_from = '', $exclude = '', $sortby = '', $limit = '') { return $this->_backend->wanted_pages($exclude_from, $exclude, $sortby, $limit); - //return new WikiDB_PageIterator($this, $result); } /** @@ -460,8 +462,8 @@ * * @access public * - * @param $pages object A TextSearchQuery object. - * @param $search object A TextSearchQuery object. + * @param object $pages A TextSearchQuery object. + * @param object $search A TextSearchQuery object. * @param string $linktype One of "linkto", "linkfrom", "relation", "attribute". * linktype parameter: * <dl> @@ -474,7 +476,7 @@ * <dt> "attribute" * <dd> the first part in a <>:=<> link * </dl> - * @param $relation object An optional TextSearchQuery to match the + * @param mixed $relation An optional TextSearchQuery to match the * relation name. Ignored on simple in-out links. * * @return Iterator A generic iterator containing links to pages or values. @@ -490,7 +492,9 @@ * for the SemanticSearch autocompletion. * * @access public - * + * @param bool $also_attributes + * @param bool $only_attributes + * @param bool $sorted * @return array of strings */ function listRelations($also_attributes = false, $only_attributes = false, $sorted = true) @@ -1027,7 +1031,11 @@ * (You can defeat this check by setting $version to * {@link WIKIDB_FORCE_CREATE} --- not usually recommended.) * - * @param hash $meta Meta-data for new revision. + * @param array $meta Meta-data for new revision. + * + * @param mixed $formatted + * + * @return mixed */ function save($wikitext, $version, $meta, $formatted = null) { @@ -1100,7 +1108,7 @@ * Get the most recent revision of a page. * * @access public - * + * @param bool $need_content * @return WikiDB_PageRevision The current WikiDB_PageRevision object. */ function getCurrentRevision($need_content = true) @@ -1129,8 +1137,8 @@ * * @access public * - * @param integer $version Which revision to get. - * + * @param int $version Which revision to get. + * @param bool $need_content * @return WikiDB_PageRevision The requested WikiDB_PageRevision object, or * false if the requested revision does not exist in the {@link WikiDB}. * Note that version zero of any page always exists. @@ -1161,9 +1169,11 @@ * * @access public * - * @param integer $version Find most recent revision before this version. + * @param bool|int $version Find most recent revision before this version. * You can also use a WikiDB_PageRevision object to specify the $version. * + * @param bool $need_content + * * @return WikiDB_PageRevision The requested WikiDB_PageRevision object, or false if the * requested revision does not exist in the {@link WikiDB}. Note that * unless $version is greater than zero, a revision (perhaps version zero, @@ -1213,8 +1223,13 @@ * * @access public * - * @param boolean $reversed Which links to find: true for backlinks (default). - * + * @param bool $reversed Which links to find: true for backlinks (default). + * @param bool $include_empty + * @param string $sortby + * @param string $limit + * @param string $sortby + * @param string $exclude + * @param bool $want_relations * @return WikiDB_PageIterator A WikiDB_PageIterator containing * all matching pages. */ @@ -1656,8 +1671,7 @@ /** * Get the transformed content of a page. * - * @param string $pagetype Override the page-type of the revision. - * + * @param bool $pagetype_override * @return object An XmlContent-like object containing the page transformed * contents. */ Modified: trunk/lib/WikiGroup.php =================================================================== --- trunk/lib/WikiGroup.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/WikiGroup.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -72,7 +72,7 @@ /** * Initializes a WikiGroup object which should never happen. Use: * $group = &WikiGroup::getGroup(); - * @param object $request The global WikiRequest object -- ignored. + * @param bool $not_current */ function WikiGroup($not_current = false) { @@ -103,7 +103,7 @@ /** * Static method to return the WikiGroup subclass used in this wiki. Controlled * by the constant GROUP_METHOD. - * @param object $request The global WikiRequest object. + * @param bool $not_current The global WikiRequest object. * @return object Subclass of WikiGroup selected via GROUP_METHOD. */ function getGroup($not_current = false) @@ -387,7 +387,7 @@ * @param string $user Username to add to the group (default = current user). * @return bool On true user was added, false if not. */ - function setMemberOf($group, $user = false) + function setMemberOf($group, $user = '') { trigger_error(__sprintf("Method “%s” not implemented in this GROUP_METHOD %s", 'setMemberOf', GROUP_METHOD), @@ -404,7 +404,7 @@ * @param string $user Username to remove from the group (default = current user). * @return bool On true user was removed, false if not. */ - function removeMemberOf($group, $user = false) + function removeMemberOf($group, $user = '') { trigger_error(__sprintf("Method “%s” not implemented in this GROUP_METHOD %s", 'removeMemberOf', GROUP_METHOD), @@ -425,13 +425,9 @@ /** * Constructor - * - * Ignores the parameter provided. - * @param object $request The global WikiRequest object - ignored. */ function GroupNone() { - //$this->request = &$GLOBALS['request']; return; } @@ -455,7 +451,6 @@ * Determines all of the groups of which the current user is a member. * * The group is ignored and an empty array (a member of no groups) is returned. - * @param string $group Name of the group to check for membership (ignored). * @return array Array of groups to which the user belongs (always empty). */ function getAllGroupsIn() @@ -492,7 +487,6 @@ * Constructor * * Initializes the three superclass instance variables - * @param object $request The global WikiRequest object. */ function GroupWikiPage() { @@ -535,6 +529,7 @@ * Private method to take a WikiDB_Page and parse to determine if the * current_user is a member of the group. * @param object $group_page WikiDB_Page object for the group's page + * @param bool $strict * @return boolean True if user is a member, else false. * @access private */ @@ -562,7 +557,6 @@ * * Checks the root Group page ('CategoryGroup') for the list of all groups, * then checks each group to see if the current user is a member. - * @param string $group Name of the group to check for membership. * @return array Array of groups to which the user belongs. */ function getAllGroupsIn() @@ -633,8 +627,6 @@ /** * Constructor - * - * @param object $request The global WikiRequest object. ignored */ function GroupDb() { @@ -711,7 +703,6 @@ * Determines all of the groups of which the current user is a member. * * then checks each group to see if the current user is a member. - * @param string $group Name of the group to check for membership. * @return array Array of groups to which the user belongs. */ function getAllGroupsIn() @@ -804,7 +795,6 @@ * Determines all of the groups of which the current user is a member. * then checks each group to see if the current user is a member. * - * @param string $group Name of the group to check for membership. * @return array Array of groups to which the user belongs. */ function getAllGroupsIn() @@ -868,8 +858,6 @@ /** * Constructor - * - * @param object $request The global WikiRequest object. */ function GroupFile() { @@ -929,7 +917,6 @@ * Determines all of the groups of which the current user is a member. * * then checks each group to see if the current user is a member. - * @param string $group Name of the group to check for membership. * @return array Array of groups to which the user belongs. */ function getAllGroupsIn() @@ -987,8 +974,6 @@ /** * Constructor - * - * @param object $request The global WikiRequest object. */ function GroupLdap() { @@ -999,7 +984,7 @@ if (!defined("LDAP_AUTH_HOST")) { trigger_error(sprintf(_("%s not defined"), "LDAP_AUTH_HOST"), E_USER_WARNING); - return false; + return; } // We should ignore multithreaded environments, not generally windows. // CGI does work. @@ -1008,7 +993,7 @@ dl("ldap" . defined('PHP_SHLIB_SUFFIX') ? PHP_SHLIB_SUFFIX : DLL_EXT); if (!function_exists('ldap_connect')) { trigger_error(_("No LDAP in this PHP version"), E_USER_WARNING); - return false; + return; } } if (!defined("LDAP_BASE_DN")) @@ -1051,13 +1036,10 @@ /** * Determines all of the groups of which the current user is a member. * - * @param string $group Name of the group to check for membership. * @return array Array of groups to which the user belongs. */ function getAllGroupsIn() { - //$request = &$this->request; - //$username = $this->_getUserName(); $membership = array(); $specialgroups = $this->specialGroups(); Modified: trunk/lib/WikiPluginCached.php =================================================================== --- trunk/lib/WikiPluginCached.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/WikiPluginCached.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -65,8 +65,8 @@ * will allow to find a cached image or to reconstruct the complete * plugin call to recreate the image. * - * @param cache object the cache object used to store the images - * @param argarray array all parameters (including those set to + * @param object $cache the cache object used to store the images + * @param array $argarray all parameters (including those set to * default values) of the plugin call to be * prepared * @access private @@ -285,12 +285,12 @@ * PLUGIN_CACHED_IMG_INLINE or PLUGIN_CACHED_IMG_ONDEMAND. * * @access protected pure virtual - * @param dbi WikiDB database abstraction class - * @param argarray array complete (!) arguments to produce + * @param WikiDB $dbi database abstraction class + * @param array $argarray complete (!) arguments to produce * image. It is not necessary to call * WikiPlugin->getArgs anymore. - * @param request Request ??? - * @return imagehandle image handle if successful + * @param Request $request + * @return mixed imagehandle image handle if successful * false if an error occured */ function getImage($dbi, $argarray, $request) @@ -309,11 +309,11 @@ * is determined by the last "touch" of the entry. * * @access protected virtual - * @param dbi WikiDB database abstraction class - * @param argarray array complete (!) arguments. It is + * @param WikiDB $dbi database abstraction class + * @param array $argarray complete (!) arguments. It is * not necessary to call * WikiPlugin->getArgs anymore. - * @param request Request ??? + * @param Request $request * @return string format: '+seconds' * '0' never expires */ @@ -327,11 +327,11 @@ * Always used unless plugin type is PLUGIN_CACHED_HTML. * * @access protected virtual - * @param dbi WikiDB database abstraction class - * @param argarray array complete (!) arguments. It is + * @param WikiDB $dbi database abstraction class + * @param array $argarray complete (!) arguments. It is * not necessary to call * WikiPlugin->getArgs anymore. - * @param request Request ??? + * @param Request $request * @return string 'png', 'jpeg' or 'gif' */ function getImageType(&$dbi, $argarray, &$request) @@ -347,11 +347,11 @@ * <code> <img src=... alt="getAlt(...)"> </code> * * @access protected virtual - * @param dbi WikiDB database abstraction class - * @param argarray array complete (!) arguments. It is + * @param WikiDB $dbi database abstraction class + * @param array $argarray complete (!) arguments. It is * not necessary to call * WikiPlugin->getArgs anymore. - * @param request Request ??? + * @param Request $request * @return string "alt" description of the image */ function getAlt($dbi, $argarray, $request) @@ -365,11 +365,11 @@ * PLUGIN_CACHED_HTML. * * @access protected pure virtual - * @param dbi WikiDB database abstraction class - * @param argarray array complete (!) arguments to produce + * @param WikiDB $dbi database abstraction class + * @param array $argarray complete (!) arguments to produce * image. It is not necessary to call * WikiPlugin->getArgs anymore. - * @param request Request ??? + * @param Request $request * @param string $basepage Pagename to use to interpret links [/relative] page names. * @return string html to be printed in place of the plugin command * false if an error occured @@ -386,11 +386,11 @@ * PLUGIN_CACHED_HTML. * * @access protected pure virtual - * @param dbi WikiDB database abstraction class - * @param argarray array complete (!) arguments to produce + * @param WikiDB $dbi database abstraction class + * @param array $argarray complete (!) arguments to produce * image. It is not necessary to call * WikiPlugin->getArgs anymore. - * @param request Request ??? + * @param Request $request * @return array(html,handle) html for the map interior (to be specific, * only <area;> tags defining hot spots) * handle is an imagehandle to the corresponding @@ -410,15 +410,15 @@ * by url and containing the hotspots given by map. * * @access private - * @param id string unique id for the plugin call - * @param url string url pointing to the image part of the map - * @param map string <area> tags defining active + * @param $id string unique id for the plugin call + * @param $url string url pointing to the image part of the map + * @param $map string <area> tags defining active * regions in the map - * @param dbi WikiDB database abstraction class - * @param argarray array complete (!) arguments to produce + * @param $dbi WikiDB database abstraction class + * @param $argarray array complete (!) arguments to produce * image. It is not necessary to call * WikiPlugin->getArgs anymore. - * @param request Request ??? + * @param $request Request * @return string html output */ function embedMap($id, $url, $map, &$dbi, $argarray, &$request) @@ -439,14 +439,12 @@ * browsers. * * @access private - * @param url string url pointing to the image part of the map - * @param map string <area> tags defining active - * regions in the map - * @param dbi WikiDB database abstraction class - * @param argarray array complete (!) arguments to produce - * image. It is not necessary to call - * WikiPlugin->getArgs anymore. - * @param request Request ??? + * @param string $url url pointing to the image part of the map + * @param WikiDB $dbi database abstraction class + * @param array $argarray complete (!) arguments to produce + * image. It is not necessary to call + * WikiPlugin->getArgs anymore. + * @param Request $request * @return string html output */ function embedImg($url, $dbi, $argarray, $request) @@ -527,8 +525,8 @@ * Determines whether a needed image type may is available * from the GD library and gives an alternative otherwise. * - * @access public static - * @param wish string one of 'png', 'gif', 'jpeg', 'jpg' + * @access public static + * @param string $wish one of 'png', 'gif', 'jpeg', 'jpg' * @return string the image type to be used ('png', 'gif', 'jpeg') * 'html' in case of an error */ @@ -578,13 +576,13 @@ * be written. * * @access public static - * @param imgtype string 'png', 'gif' or 'jpeg' - * @param imghandle string image handle containing the image - * @param imgfile string file name of the image to be produced + * @param string $imgtype 'png', 'gif' or 'jpeg' + * @param string $imghandle image handle containing the image + * @param string $imgfile file name of the image to be produced * @return void * @see decideImageType */ - function writeImage($imgtype, $imghandle, $imgfile = false) + function writeImage($imgtype, $imghandle, $imgfile = '') { if ($imgtype != 'html') { $func = "Image" . strtoupper($imgtype); @@ -601,7 +599,7 @@ * There is no parameter check. * * @access public static - * @param doctype string 'gif', 'png', 'jpeg', 'html' + * @param string $doctype 'gif', 'png', 'jpeg', 'html' * @return void */ function writeHeader($doctype) @@ -626,7 +624,7 @@ * the quoting of arguments is not safe, yet. * * @access public static - * @param argarray array contains all arguments to be converted + * @param array $argarray contains all arguments to be converted * @return string concated arguments */ function glueArgs($argarray) @@ -650,15 +648,15 @@ * parameters if available. * * @access private static - * @param id string return value. Image is stored under this id. - * @param plugincall string return value. Only returned if present in url. + * @param string $id return value. Image is stored under this id. + * @param string $plugincall return value. Only returned if present in url. * Contains all parameters to reconstruct * plugin call. - * @param cache Cache PEAR Cache object - * @param request Request ??? - * @param errorformat string format which should be used to + * @param Cache $cache PEAR Cache object + * @param Request $request + * @param string $errorformat format which should be used to * output errors ('html', 'png', 'gif', 'jpeg') - * @return boolean false if an error occurs, true otherwise. + * @return bool false if an error occurs, true otherwise. * Param id and param plugincall are * also return values. */ @@ -685,10 +683,10 @@ * call needed to produce the requested image. * * @access static private - * @param plugincall string reference to serialized array containing both + * @param $plugincall string reference to serialized array containing both * name and parameters of the plugin call - * @param request Request ??? - * @return boolean false if an error occurs, true otherwise. + * @param $request Request ??? + * @return bool false if an error occurs, true otherwise. * */ function checkCall2(&$plugincall, $request) @@ -713,14 +711,14 @@ /** * Creates an image or image map depending on the plugin type. * @access static private - * @param content array reference to created array which overwrite the keys + * @param $content array reference to created array which overwrite the keys * 'image', 'imagetype' and possibly 'html' - * @param plugin WikiPluginCached plugin which is called to create image or map - * @param dbi WikiDB handle to database - * @param argarray array Contains all arguments needed by plugin - * @param request Request ???? - * @param errorformat string outputs errors in 'png', 'gif', 'jpg' or 'html' - * @return boolean error status; true=ok; false=error + * @param $plugin WikiPluginCached plugin which is called to create image or map + * @param $dbi WikiDB handle to database + * @param $argarray array Contains all arguments needed by plugin + * @param $request Request ???? + * @param $errorformat string outputs errors in 'png', 'gif', 'jpg' or 'html' + * @return bool error status; true=ok; false=error */ function produceImage(&$content, $plugin, $dbi, $argarray, $request, $errorformat) { @@ -824,9 +822,10 @@ * from parameters sent by url or session vars. * * @access static public - * @param dbi WikiDB handle to database - * @param request Request ??? - * @param errorformat string outputs errors in 'png', 'gif', 'jpeg' or 'html' + * @param WikiDB $dbi handle to database + * @param Request $request ??? + * @param string $errorformat outputs errors in 'png', 'gif', 'jpeg' or 'html' + * @return bool */ function fetchImageFromCache($dbi, $request, $errorformat = 'png') { @@ -922,8 +921,8 @@ * that occur during data (html,image,map) creation. * * @access protected - * @param addtext string errormessage to be printed (separate - * multiple lines with '\n') + * @param string $addtext errormessage to be printed (separate + * multiple lines with '\n') * @return void */ function complain($addtext) @@ -936,8 +935,8 @@ * if wished or html header has already been sent. * * @access static protected - * @param imgtype string 'png', 'gif', 'jpeg' or 'html' - * @param errortext string guess what? + * @param string $imgtype 'png', 'gif', 'jpeg' or 'html' + * @param string $errortext guess what? * @return void */ function printError($imgtype, $errortext) @@ -973,11 +972,11 @@ * is further restriction to 600 pixel in width and 350 in height. * * @access static public - * @param txt string multi line text to be converted - * @param fontnr integer number (1-5) telling gd which internal font to use; + * @param $txt string multi line text to be converted + * @param $fontnr integer number (1-5) telling gd which internal font to use; * I recommend font 2 for errors and 4 for help texts. - * @param textcol array text color as a list of the rgb components; array(red,green,blue) - * @param bgcol array background color; array(red,green,blue) + * @param $textcol array text color as a list of the rgb components; array(red,green,blue) + * @param $bgcol array background color; array(red,green,blue) * @return string image handle for gd routines */ function text2img($txt, $fontnr, $textcol, $bgcol) @@ -1106,11 +1105,11 @@ /** * Execute system command and wait until the outfile $until exists. * - * @param cmd string command to be invoked - * @param until string expected output filename - * @return boolean error status; true=ok; false=error + * @param string $cmd command to be invoked + * @param string $until expected output filename + * @return bool error status; true=ok; false=error */ - function execute($cmd, $until = false) + function execute($cmd, $until = '') { // cmd must redirect stderr to stdout though! $errstr = exec($cmd); //, $outarr, $returnval); // normally 127 Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/WikiTheme.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -143,7 +143,7 @@ * * This is a convenience function. * - * @param $action string + * @param string $action * One of <dl> * <dt>[action]</dt><dd>Perform action (e.g. 'edit') on the selected page.</dd> * <dt>[ActionPage]</dt><dd>Run the actionpage (e.g. 'BackLinks') on the selected page.</dd> @@ -154,11 +154,11 @@ * </pre></dd> * </dl> * - * @param $label string + * @param string $label * A label for the button. If ommited, a suitable default (based on the valued of $action) * will be picked. * - * @param $page_or_rev mixed + * @param mixed $page_or_rev * Which page (& version) to perform the action on. * Can be one of:<dl> * <dt>A string</dt><dd>The pagename.</dd> @@ -166,8 +166,12 @@ * <dt>A WikiDB_PageRevision object</dt><dd>A specific version of the page.</dd> * </dl> * ($Page_or_rev is ignored for submit buttons.) + * + * @param array $options + * + * @return object */ -function Button($action, $label = false, $page_or_rev = false, $options = false) +function Button($action, $label = '', $page_or_rev = false, $options = array()) { global $WikiTheme; @@ -432,9 +436,9 @@ /** * Format the "last modified" message for a page revision. * - * @param $revision object A WikiDB_PageRevision object. + * @param object $revision A WikiDB_PageRevision object. * - * @param $show_version bool Should the page version number + * @param string $show_version Should the page version number * be included in the message. (If this argument is omitted, * then the version number will be shown only iff the revision * is not the current one. @@ -934,10 +938,12 @@ * designated page, otherwise the button links to the most recent * version of the page. * + * @param array $options + * * @return object A Button object. */ - function makeActionButton($action, $label = false, - $page_or_rev = false, $options = false) + function makeActionButton($action, $label = '', + $page_or_rev = false, $options = array()) { extract($this->_get_name_and_rev($page_or_rev)); @@ -1002,16 +1008,20 @@ * * Use linkExistingWikiWord, or LinkWikiWord for normal links. * - * @param $page_or_rev mixed The page to link to. This can be + * @param mixed $page_or_rev The page to link to. This can be * given as a string (the page name), a WikiDB_Page object, or as * WikiDB_PageRevision object. If given as a WikiDB_PageRevision * object, the button will link to a specific version of the * designated page, otherwise the button links to the most recent * version of the page. * + * @param string $label + * + * @param string $action + * * @return object A Button object. */ - function makeLinkButton($page_or_rev, $label = false, $action = false) + function makeLinkButton($page_or_rev, $label = '', $action = '') { extract($this->_get_name_and_rev($page_or_rev)); @@ -1516,7 +1526,7 @@ $this->addMoreAttr('body', 'LiveSearch', HTML::Raw(" onload=\"liveSearchInit()")); $this->addMoreHeaders(JavaScript('var liveSearchURI="' - . WikiURL(_("TitleSearch"), false, true) . '";')); + . WikiURL(_("TitleSearch"), array(), true) . '";')); $this->addMoreHeaders(JavaScript('', array ('src' => $this->_findData('livesearch.js')))); $already = 1; @@ -1678,12 +1688,12 @@ { /** Constructor * - * @param $text string The text for the button. - * @param $url string The url (href) for the button. - * @param $class string The CSS class for the button. - * @param $options array Additional attributes for the <input> tag. + * @param string $text The text for the button. + * @param string $url The url (href) for the button. + * @param string $class The CSS class for the button. + * @param array $options Additional attributes for the <input> tag. */ - function Button($text, $url, $class = false, $options = false) + function Button($text, $url, $class = '', $options = array()) { global $request; $this->_init('a', array('href' => $url)); @@ -1718,7 +1728,7 @@ * @param $img_url string URL for button's image. * @param $img_attr array Additional attributes for the <img> tag. */ - function ImageButton($text, $url, $class, $img_url, $img_attr = false) + function ImageButton($text, $url, $class, $img_url, $img_attr = array()) { $this->__construct('a', array('href' => $url)); if ($class) @@ -1750,7 +1760,7 @@ * @param $class string The CSS class for the button. * @param $options array Additional attributes for the <input> tag. */ - function SubmitButton($text, $name = false, $class = false, $options = false) + function SubmitButton($text, $name = '', $class = '', $options = array()) { $this->__construct('input', array('type' => 'submit', 'value' => $text)); @@ -1779,7 +1789,7 @@ * @param $img_url string URL for button's image. * @param $img_attr array Additional attributes for the <img> tag. */ - function SubmitImageButton($text, $name = false, $class = false, $img_url, $img_attr = false) + function SubmitImageButton($text, $name = '', $class = '', $img_url, $img_attr = array()) { $this->__construct('input', array('type' => 'image', 'src' => $img_url, Modified: trunk/lib/WikiUser.php =================================================================== --- trunk/lib/WikiUser.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/WikiUser.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -76,8 +76,9 @@ * * Populates the instance variables and calls $this->_ok() * to ensure that the parameters are valid. + * @param Request $request * @param mixed $userid String of username or WikiUser object. - * @param integer $authlevel Authorization level. + * @param int|bool $authlevel Authorization level. */ function WikiUser(&$request, $userid = false, $authlevel = false) { Modified: trunk/lib/loadsave.php =================================================================== --- trunk/lib/loadsave.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/loadsave.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -217,10 +217,11 @@ * dirs are allowed for zipdump and htmldump, not for dumpserial * * - * @param $pagename string Pagename. + * @param string $pagename Pagename. + * @param string $action. * @return string Filename for page. */ -function FilenameForPage($pagename, $action = false) +function FilenameForPage($pagename, $action = '') { $enc = rawurlencode($pagename); if (!$action) { Modified: trunk/lib/prepend.php =================================================================== --- trunk/lib/prepend.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/prepend.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -87,6 +87,7 @@ /** * @param string $which One of 'real', 'utime', 'stime', 'cutime', 'sutime' + * @param bool $now * @return float Seconds. */ function getTime($which = 'real', $now = false) Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/stdlib.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -163,10 +163,10 @@ * If a WikiDB_Page object function will extract the name to link to. * If a WikiDB_PageRevision object function will extract the name to link to. * @param array $args - * @param boolean $get_abs_url Default value is false. + * @param bool $get_abs_url Default value is false. * @return string The absolute URL to the page passed as $pagename. */ -function WikiURL($pagename, $args = '', $get_abs_url = false) +function WikiURL($pagename, $args = array(), $get_abs_url = false) { global $request, $WikiTheme; $anchor = false; @@ -308,7 +308,7 @@ * - 'front' display at left * - 'after' display at right * - * @param string $protocol_or_url Protocol or URL. Used to determine the + * @param string $proto_or_url Protocol or URL. Used to determine the * proper icon. * @param string $text The text. * @return XmlContent. @@ -819,10 +819,10 @@ * This can be a relative subpage name (like '/SubPage'), * or can be the empty string to refer to the $basename. * - * @param string $anchor For links to anchors in page. - * * @param mixed $basename Page name from which to interpret * relative or other non-fully-specified page names. + * + * @param mixed $anchor For links to anchors in page. */ function WikiPageName($name, $basename = false, $anchor = false) { @@ -1091,13 +1091,13 @@ /** * Get time offset for local time zone. * - * @param $time time_t Get offset for this time. Default: now. - * @param $no_colon boolean Don't put colon between hours and minutes. + * @param int $time Get offset for this time. Default: now. + * @param bool $no_colon Don't put colon between hours and minutes. * @return string Offset as a string in the format +HH:MM. */ -function TimezoneOffset($time = false, $no_colon = false) +function TimezoneOffset($time = 0, $no_colon = false) { - if ($time === false) + if ($time == 0) $time = time(); $secs = date('Z', $time); @@ -1116,12 +1116,12 @@ /** * Format time in ISO-8601 format. * - * @param $time time_t Time. Default: now. + * @param int $time Time. Default: now. * @return string Date and time in ISO-8601 format. */ -function Iso8601DateTime($time = false) +function Iso8601DateTime($time = 0) { - if ($time === false) + if ($time == 0) $time = time(); $tzoff = TimezoneOffset($time); $date = date('Y-m-d', $time); @@ -1132,12 +1132,12 @@ /** * Format time in RFC-2822 format. * - * @param $time time_t Time. Default: now. + * @param int $time Time. Default: now. * @return string Date and time in RFC-2822 format. */ -function Rfc2822DateTime($time = false) +function Rfc2822DateTime($time = 0) { - if ($time === false) + if ($time == 0) $time = time(); return date('D, j M Y H:i:s ', $time) . TimezoneOffset($time, 'no colon'); } @@ -1145,12 +1145,12 @@ /** * Format time in RFC-1123 format. * - * @param $time time_t Time. Default: now. + * @param int $time Time. Default: now. * @return string Date and time in RFC-1123 format. */ -function Rfc1123DateTime($time = false) +function Rfc1123DateTime($time = 0) { - if ($time === false) + if ($time == 0) $time = time(); return gmdate('D, d M Y H:i:s \G\M\T', $time); } @@ -1200,12 +1200,12 @@ /** * Format time to standard 'ctime' format. * - * @param $time time_t Time. Default: now. + * @param int $time Time. Default: now. * @return string Date and time. */ -function CTime($time = false) +function CTime($time = 0) { - if ($time === false) + if ($time == 0) $time = time(); return date("D M j H:i:s Y", $time); } @@ -1217,7 +1217,7 @@ * * @param $bytes int. Default: 0. * @param $longformat bool. Default: false. - * @return class FormattedText (XmlElement.php). + * @return FormattedText (XmlElement.php). */ function ByteFormatter($bytes = 0, $longformat = false) { @@ -1726,17 +1726,13 @@ { /** Constructor * - * @param object $request * @param mixed $head Header ("title") for alert box. * @param mixed $body The text in the alert box. - * @param hash $buttons An array mapping button labels to URLs. + * @param array $buttons An array mapping button labels to URLs. * The default is a single "Okay" button pointing to $request->getURLtoSelf(). */ - function Alert($head, $body, $buttons = false) + function Alert($head, $body, $buttons = array()) { - if ($buttons === false) - $buttons = array(); - if (is_array($body)) { $html = HTML::ol(); foreach ($body as $li) { Modified: trunk/lib/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2014-06-06 16:02:08 UTC (rev 8881) +++ trunk/lib/upgrade.php 2014-06-10 16:38:14 UTC (rev 8882) @@ -1052,14 +1052,8 @@ /** * Add an upgrade item to be checked. * - * @param $parent object The parent Upgrade class to inherit the version properties - * @param $key string A short unique key to store success in the WikiDB - * @param $fixed_with double @see phpwiki_version() number - * @param $header string Optional header to be printed always even if not applicable - * @param $applicable WikiCallback Optional callback boolean applicable() - * @param $notice string Description of the check - * @param $method WikiCallback Optional callback array method(array) - * //param All other args are passed to $method + * @param object $parent The parent Upgrade class to inherit the version properties + * @param array $params */ function UpgradeEntry(&$parent, $params) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-06 16:02:13
|
Revision: 8881 http://sourceforge.net/p/phpwiki/code/8881 Author: vargenau Date: 2014-06-06 16:02:08 +0000 (Fri, 06 Jun 2014) Log Message: ----------- Correct headers hierarchy Modified Paths: -------------- trunk/themes/Sidebar/sidebar.css trunk/themes/Sidebar/templates/actionbar.tmpl trunk/themes/Sidebar/templates/navbar.tmpl trunk/themes/Sidebar/templates/rc.tmpl trunk/themes/Sidebar/templates/tags.tmpl Modified: trunk/themes/Sidebar/sidebar.css =================================================================== --- trunk/themes/Sidebar/sidebar.css 2014-06-06 15:54:54 UTC (rev 8880) +++ trunk/themes/Sidebar/sidebar.css 2014-06-06 16:02:08 UTC (rev 8881) @@ -993,10 +993,9 @@ white-space: nowrap; } -.portlet h5 { +.portlet h2 { background-color: transparent; padding: 0 1em 0 0.5em; - /*text-transform: lowercase;*/ display: inline; font-size: 91%; height: 16px; @@ -1005,7 +1004,7 @@ white-space: nowrap; } -.portlet h5 img { +.portlet h2 img { padding: 0; margin: 0; top: 0; Modified: trunk/themes/Sidebar/templates/actionbar.tmpl =================================================================== --- trunk/themes/Sidebar/templates/actionbar.tmpl 2014-06-06 15:54:54 UTC (rev 8880) +++ trunk/themes/Sidebar/templates/actionbar.tmpl 2014-06-06 16:02:08 UTC (rev 8881) @@ -8,7 +8,7 @@ $mayChange = mayAccessPage('change', $pagename); ?> <div class="portlet" id="p-cactions"> - <h5><?php echo _("Views") ?></h5> + <h2><?php echo _("Views") ?></h2> <ul> <?php if ($request->getArg('action') != "") { ?> <?php echo ActionButton("browse", _("View Page"), false, array('title' => _("View Page")." [alt-c]")) ?> @@ -34,7 +34,7 @@ <?php if ($user->isSignedIn()) { ?> <div class="portlet" id="p-tbx"> - <h5><?php echo _("Special Actions") ?> <?php echo $WikiTheme->folderArrow('p-tbx', 'Closed') ?></h5> + <h2><?php echo _("Special Actions") ?> <?php echo $WikiTheme->folderArrow('p-tbx', 'Closed') ?></h2> <div class="pBody" id="p-tbx-body" style="display:none;"> <ul> <?php if ($isAdmin or $mayEdit) { ?> Modified: trunk/themes/Sidebar/templates/navbar.tmpl =================================================================== --- trunk/themes/Sidebar/templates/navbar.tmpl 2014-06-06 15:54:54 UTC (rev 8880) +++ trunk/themes/Sidebar/templates/navbar.tmpl 2014-06-06 16:02:08 UTC (rev 8881) @@ -17,7 +17,7 @@ </div> <div class="portlet" id="p-nav1"> - <h5><?php echo _("Main Categories")?></h5> + <h2><?php echo _("Main Categories")?></h2> <div class="pBody"> <ul> <li><?php echo WikiLink("CategoryWikiPlugin") ?></li> @@ -27,16 +27,16 @@ </div> <div class="portlet" id="p-search"> - <h5><?php echo _("Search")?></h5> + <h2><?php echo _("Search")?></h2> <div class="pBody"> <?php echo Template("search", - array('SEARCH_BEFORE' => ''/*HTML::h5(WikiLink(_("FindPage")))*/, + array('SEARCH_BEFORE' => ''/*HTML::h2(WikiLink(_("FindPage")))*/, 'SEARCH_AFTER' => HTML::Raw('<br /><input type="submit" name="searchtype" value="title" class="searchButton" title="Press to perform a wiki title search" /> <input type="submit" name="searchtype" value="fulltext" class="searchButton" title="Wiki fulltext search" />'))) ?> </div> </div> <div class="portlet" id="p-tb"> - <h5><?php echo _("Toolbox") ?><?php echo $WikiTheme->folderArrow('p-tb', 'Open') ?></h5> + <h2><?php echo _("Toolbox") ?><?php echo $WikiTheme->folderArrow('p-tb', 'Open') ?></h2> <div class="pBody" id="p-tb-body"> <ul> <li><?php $link = WikiLink(_("RecentChanges"), "",_("RecentChanges")); $link->setAttr("accesskey","r"); $link->addTooltip(_("The list of recent changes in the wiki.")." [$p-r]"); ?><?php echo $link ?> </li> Modified: trunk/themes/Sidebar/templates/rc.tmpl =================================================================== --- trunk/themes/Sidebar/templates/rc.tmpl 2014-06-06 15:54:54 UTC (rev 8880) +++ trunk/themes/Sidebar/templates/rc.tmpl 2014-06-06 16:02:08 UTC (rev 8881) @@ -1,6 +1,6 @@ <!-- RecentChangesCached Box --> <div class="portlet" id="p-rc"> - <h5><?php echo _("Recent Changes") ?> <?php echo $WikiTheme->folderArrow('p-rc', 'Closed') ?></h5> + <h2><?php echo _("Recent Changes") ?> <?php echo $WikiTheme->folderArrow('p-rc', 'Closed') ?></h2> <div class="pBody" id="p-rc-body" style="display:none;"> <?php require_once("lib/WikiTheme.php"); Modified: trunk/themes/Sidebar/templates/tags.tmpl =================================================================== --- trunk/themes/Sidebar/templates/tags.tmpl 2014-06-06 15:54:54 UTC (rev 8880) +++ trunk/themes/Sidebar/templates/tags.tmpl 2014-06-06 16:02:08 UTC (rev 8881) @@ -1,6 +1,6 @@ <!-- list of most popular categories --> <div class="portlet" id="p-tags"> - <h5><?php echo _("Favorite Categories") ?> <?php echo $WikiTheme->folderArrow('p-tags', 'Open') ?></h5> + <h2><?php echo _("Favorite Categories") ?> <?php echo $WikiTheme->folderArrow('p-tags', 'Open') ?></h2> <div class="pBody" id="p-tags-body"> <?plugin PopularTags ?> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-06 15:56:29
|
Revision: 8880 http://sourceforge.net/p/phpwiki/code/8880 Author: vargenau Date: 2014-06-06 15:54:54 +0000 (Fri, 06 Jun 2014) Log Message: ----------- Correct headers hierarchy Modified Paths: -------------- trunk/themes/MonoBook/main.css trunk/themes/MonoBook/templates/actionbar.tmpl trunk/themes/MonoBook/templates/navbar.tmpl trunk/themes/MonoBook/templates/tags.tmpl Modified: trunk/themes/MonoBook/main.css =================================================================== --- trunk/themes/MonoBook/main.css 2014-06-06 15:25:15 UTC (rev 8879) +++ trunk/themes/MonoBook/main.css 2014-06-06 15:54:54 UTC (rev 8880) @@ -1006,7 +1006,7 @@ white-space: nowrap; } -.portlet h5 { +.portlet h2 { background-color: transparent; padding: 0 1em 0 0.5em; text-transform: lowercase; Modified: trunk/themes/MonoBook/templates/actionbar.tmpl =================================================================== --- trunk/themes/MonoBook/templates/actionbar.tmpl 2014-06-06 15:25:15 UTC (rev 8879) +++ trunk/themes/MonoBook/templates/actionbar.tmpl 2014-06-06 15:54:54 UTC (rev 8880) @@ -7,7 +7,7 @@ $isBrowse = $request->getArg('action') == 'browse'; ?> <div class="portlet" id="p-cactions"> - <h5><?php echo _("Views") ?></h5> + <h2><?php echo _("Views") ?></h2> <ul> <?php if (!string_ends_with($pagename, SUBPAGE_SEPARATOR._("Discussion"))) { ?> <?php $talk = new WikiPageName('Talk:'.$pagename); ?> @@ -57,7 +57,7 @@ </ul> </div> <div class="portlet" id="p-tbx"> - <h5><?php echo _("Special Actions") ?></h5> + <h2><?php echo _("Special Actions") ?></h2> <div class="pBody"> <ul> <?php if ( $user->isSignedIn() ) { ?> Modified: trunk/themes/MonoBook/templates/navbar.tmpl =================================================================== --- trunk/themes/MonoBook/templates/navbar.tmpl 2014-06-06 15:25:15 UTC (rev 8879) +++ trunk/themes/MonoBook/templates/navbar.tmpl 2014-06-06 15:54:54 UTC (rev 8880) @@ -6,7 +6,7 @@ <!-- The left navigation/search bar --> <!-- Here you should add favorite Links and Categories --> <div class="portlet" id="p-navigation"> - <h5><?php echo _("Navigation") ?></h5> + <h2><?php echo _("Navigation") ?></h2> <div class="pBody"> <ul> <li id="n-mainpage"><?php echo WikiLink(HOME_PAGE, "",_("Home Page")) ?></li> @@ -21,7 +21,7 @@ </div> <div class="portlet" id="p-search"> - <h5><?php echo _("Search") ?></h5> + <h2><?php echo _("Search") ?></h2> <div class="pBody"> <?php echo Template("search", array('SEARCH_BEFORE' => WikiLink(_("FindPage"), "",_("Find page")), @@ -42,7 +42,7 @@ </div> <div class="portlet" id="p-tb"> - <h5><?php echo _("Toolbox") ?></h5> + <h2><?php echo _("Toolbox") ?></h2> <div class="pBody"> <ul> <?php if ($revision) { ?> Modified: trunk/themes/MonoBook/templates/tags.tmpl =================================================================== --- trunk/themes/MonoBook/templates/tags.tmpl 2014-06-06 15:25:15 UTC (rev 8879) +++ trunk/themes/MonoBook/templates/tags.tmpl 2014-06-06 15:54:54 UTC (rev 8880) @@ -1,6 +1,6 @@ <!-- list of most popular categories --> <div class="portlet" id="p-tags"> - <h5><?php echo _("Favorite Categories") ?></h5> + <h2><?php echo _("Favorite Categories") ?></h2> <div class="pBody"> <?plugin PopularTags ?> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-06 15:25:19
|
Revision: 8879 http://sourceforge.net/p/phpwiki/code/8879 Author: vargenau Date: 2014-06-06 15:25:15 +0000 (Fri, 06 Jun 2014) Log Message: ----------- _("Help")."/"._("TextFormattingRules") --> _("Help/TextFormattingRules") Modified Paths: -------------- trunk/themes/Crao/templates/editpage.tmpl trunk/themes/Portland/templates/editpage.tmpl trunk/themes/Wordpress/templates/editpage.tmpl trunk/themes/default/templates/editpage.tmpl Modified: trunk/themes/Crao/templates/editpage.tmpl =================================================================== --- trunk/themes/Crao/templates/editpage.tmpl 2014-06-06 15:08:35 UTC (rev 8878) +++ trunk/themes/Crao/templates/editpage.tmpl 2014-06-06 15:25:15 UTC (rev 8879) @@ -72,7 +72,7 @@ <div class="wiki-edithelp"> <!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules --> <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p> -<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?> +<?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?> </div> <?php echo $HIDDEN_INPUTS?> </form> Modified: trunk/themes/Portland/templates/editpage.tmpl =================================================================== --- trunk/themes/Portland/templates/editpage.tmpl 2014-06-06 15:08:35 UTC (rev 8878) +++ trunk/themes/Portland/templates/editpage.tmpl 2014-06-06 15:25:15 UTC (rev 8879) @@ -54,7 +54,7 @@ <div class="wiki-edithelp"> <!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules --> <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p> -<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?> +<?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?> </div> <?php echo $HIDDEN_INPUTS?> </form> Modified: trunk/themes/Wordpress/templates/editpage.tmpl =================================================================== --- trunk/themes/Wordpress/templates/editpage.tmpl 2014-06-06 15:08:35 UTC (rev 8878) +++ trunk/themes/Wordpress/templates/editpage.tmpl 2014-06-06 15:25:15 UTC (rev 8879) @@ -70,7 +70,7 @@ <div class="wiki-edithelp"> <!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules --> <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p> -<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?> +<?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?> </div> <?php echo $HIDDEN_INPUTS?> </form> Modified: trunk/themes/default/templates/editpage.tmpl =================================================================== --- trunk/themes/default/templates/editpage.tmpl 2014-06-06 15:08:35 UTC (rev 8878) +++ trunk/themes/default/templates/editpage.tmpl 2014-06-06 15:25:15 UTC (rev 8879) @@ -94,5 +94,5 @@ <div class="wiki-edithelp"> <!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules --> <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p> -<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?> +<?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-06 15:08:37
|
Revision: 8878 http://sourceforge.net/p/phpwiki/code/8878 Author: vargenau Date: 2014-06-06 15:08:35 +0000 (Fri, 06 Jun 2014) Log Message: ----------- _errorHandler is public :-( Modified Paths: -------------- trunk/lib/Template.php Modified: trunk/lib/Template.php =================================================================== --- trunk/lib/Template.php 2014-06-05 16:33:24 UTC (rev 8877) +++ trunk/lib/Template.php 2014-06-06 15:08:35 UTC (rev 8878) @@ -188,7 +188,7 @@ $pre->printXML(); } - private function _errorHandler($error) + public function _errorHandler($error) { //if (!preg_match('/: eval\(\)\'d code$/', $error->errfile)) // return false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-05 16:33:27
|
Revision: 8877 http://sourceforge.net/p/phpwiki/code/8877 Author: vargenau Date: 2014-06-05 16:33:24 +0000 (Thu, 05 Jun 2014) Log Message: ----------- Add methods visibility Modified Paths: -------------- trunk/lib/Template.php Modified: trunk/lib/Template.php =================================================================== --- trunk/lib/Template.php 2014-06-05 16:23:23 UTC (rev 8876) +++ trunk/lib/Template.php 2014-06-05 16:33:24 UTC (rev 8877) @@ -49,7 +49,7 @@ $this->_locals = array(); } - function _munge_input($template) + private function _munge_input($template) { // Convert < ?plugin expr ? > to < ?php $this->_printPluginPI("expr"); ? > @@ -67,7 +67,7 @@ return preg_replace($orig, $repl, $template); } - function _mungePlugin($pi) + private function _mungePlugin($pi) { // HACK ALERT: PHP's preg_replace, with the /e option seems to // escape both single and double quotes with backslashes. @@ -78,7 +78,7 @@ "'" . str_replace("'", "\'", $pi) . "'"); } - function _printPlugin($pi) + private function _printPlugin($pi) { include_once 'lib/WikiPlugin.php'; static $loader; @@ -89,7 +89,7 @@ $this->_print($loader->expandPI($pi, $this->_request, $this, $this->_basepage)); } - function _print($val) + private function _print($val) { if (isa($val, 'Template')) { $this->_expandSubtemplate($val); @@ -98,7 +98,7 @@ } } - function _expandSubtemplate(&$template) + private function _expandSubtemplate(&$template) { // FIXME: big hack! //if (!$template->_request) @@ -126,7 +126,7 @@ $this->_locals[$varname] = $value; } - function printExpansion($defaults = false) + public function printExpansion($defaults = false) { if (!is_array($defaults)) // HTML object or template object $defaults = array('CONTENT' => $defaults); @@ -158,7 +158,7 @@ // Find a way to do template expansion less memory intensive and faster. // 1.3.4 needed no memory at all for dumphtml, now it needs +15MB. // Smarty? As before? - function getExpansion($defaults = false) + public function getExpansion($defaults = false) { ob_start(); $this->printExpansion($defaults); @@ -167,18 +167,18 @@ return $xml; } - function printXML() + public function printXML() { $this->printExpansion(); } - function asXML() + public function asXML() { return $this->getExpansion(); } // Debugging: - function _dump_template() + private function _dump_template() { $lines = explode("\n", $this->_munge_input($this->_tmpl)); $pre = HTML::pre(); @@ -188,7 +188,7 @@ $pre->printXML(); } - function _errorHandler($error) + private function _errorHandler($error) { //if (!preg_match('/: eval\(\)\'d code$/', $error->errfile)) // return false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-05 16:23:30
|
Revision: 8876 http://sourceforge.net/p/phpwiki/code/8876 Author: vargenau Date: 2014-06-05 16:23:23 +0000 (Thu, 05 Jun 2014) Log Message: ----------- Fix types Modified Paths: -------------- trunk/lib/Template.php Modified: trunk/lib/Template.php =================================================================== --- trunk/lib/Template.php 2014-06-05 16:02:24 UTC (rev 8875) +++ trunk/lib/Template.php 2014-06-05 16:23:23 UTC (rev 8876) @@ -9,7 +9,7 @@ /** * name optionally of form "theme/template" to include parent templates in children */ - function Template($name, &$request, $args = false) + function Template($name, &$request, $args = array()) { global $WikiTheme; @@ -227,7 +227,7 @@ * new Template(...) * </pre> */ -function Template($name, $args = false) +function Template($name, $args = array()) { global $request; return new Template($name, $request, $args); @@ -271,7 +271,7 @@ * For dumping pages as html to a file. * Used for action=dumphtml,action=ziphtml,format=pdf,format=xml */ -function GeneratePageasXML($content, $title, $page_revision = false, $args = false) +function GeneratePageasXML($content, $title, $page_revision = false, $args = array()) { global $request; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-05 16:02:32
|
Revision: 8875 http://sourceforge.net/p/phpwiki/code/8875 Author: vargenau Date: 2014-06-05 16:02:24 +0000 (Thu, 05 Jun 2014) Log Message: ----------- Update PHP Doc Modified Paths: -------------- trunk/lib/Template.php Modified: trunk/lib/Template.php =================================================================== --- trunk/lib/Template.php 2014-06-04 16:39:11 UTC (rev 8874) +++ trunk/lib/Template.php 2014-06-05 16:02:24 UTC (rev 8875) @@ -117,14 +117,11 @@ * Substitute HTML replacement text for tokens in template. * * Constructs a new WikiTemplate based upon the named template. - * * @access public - * - * @param $token string Name of token to substitute for. - * - * @param $replacement string Replacement HTML text. + * @param string $varname Name of token to substitute for. + * @param string $value Replacement HTML text. */ - function replace($varname, $value) + public function replace($varname, $value) { $this->_locals[$varname] = $value; } @@ -246,14 +243,14 @@ * Make and expand the top-level template. * * - * @param $content mixed html content to put into the page - * @param $title string page title - * @param $page_revision object A WikiDB_PageRevision object or false - * @param $args hash Extract args for top-level template + * @param mixed $content html content to put into the page + * @param string $title page title + * @param object|bool $page_revision A WikiDB_PageRevision object or false + * @param array $args hash Extract args for top-level template * * @return string HTML expansion of template. */ -function GeneratePage($content, $title, $page_revision = false, $args = false) +function GeneratePage($content, $title, $page_revision = false, $args = array()) { global $request; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: bwy <gez...@so...> - 2014-06-05 15:46:34
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <HTML><HEAD> <META content="text/html; charset=utf-8" http-equiv=Content-Type> <META name=GENERATOR content="MSHTML 8.00.6001.19403"></HEAD> <BODY bgColor=#ffffff> <DIV><FONT color=#000000 size=2 face=宋体></FONT><FONT color=#000000 size=2 face=宋体></FONT><BR></DIV> <DIV class=qm> <DIV class="nui-fClear pm"><BR><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://4m4FCx1.s67K4jjj.4J1r903.Ce6wXv0J/2hx1juFi.61jzV"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://mKM10S11N.nIvL9m6X56.13d37o2.P5cO7ka2B/1tt952Z.vzK34M7"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://LgJ53.BM6612p.EaTdvr21YY.GOf55TO/u2UhHz.oVZg2iDL"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://HfaDePi.jQ77P.G69DOJ.S4DXn6/a781N4.Qr3TLW"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://2xk5Komb.6rfA1IJWk.F8RpH.gyH4g/0nHieN.QdG5dJCis"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://0JXekb1z3y.wP6wi31y.M01ohDs.046Fgv5/75YvRqOJYF.1P78dCd"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://c3BF969cH.04558.E66171hv3u.0o136J/ku654b2L4.ABgi3"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://CpSNtNKjVG.FDMR6Iw8.tYBr3V36.nKfQ6Ek7B4/G3Z7b0.INczNTkjkf"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://F32NMFpCa9.R10Zl4z.z33LK.lTWB6V0T/yU4qI6445.ZAZ1GF6m"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://1P2beIP7j7.BFX1eEKF.1l83co2W.hr1xb0j/jFZBZ68u8.lTt6wdi"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://3PaFtqp.Q1iCS.GK5XH.Sl0ub93s1l/1s83zw5Q0.V0770RLfT"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://d2h39n3.Tdy585g49.YWK6h.Kx5O5n/9ENi3C.zapTpqNs"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://UY419Wd.I9zK3Cc5y.UEdJOksen.sBsEL9M2g/I5rWKF13.UbEL97a2q"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://Z6yiHuxd97.iiH1F5r.0xO5e0.wvit2TO1c2/yJuXZ80A7.j9F85"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://8y53jp11h8.DHyR8uA.JJ46wVrx7.a3e03g9/233e5X7b.4QwQo5O"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://7Bb4b55.0y4K56.eep24SPxzf.RyBRAMms6/D50O95IN.egEb8w"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://KChMh.0z9M3jMSjL.Bvql8.NgUKPxa/C9sfLHVlO.83iWKz2l"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://qqZOJ.GWQGH.9695Gt7sr.n147F94/rK8E8Y9.0dNTCsV"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://NKvoAIP78.hYdez3W.9OcryH.f6Tjx/V1Ksv5q.9HJku0QG60"></LNLZKQQ><A style="DISPLAY: block; WIDTH: 792px; HEIGHT: 3152px" > <DIV style="BACKGROUND: url(http://bN1CtK7fu4.d594QNCeF9.f1fto2243.39U2d1NY/6W47xE8); WIDTH: 792px; CURSOR: pointer" alt="gFrhwgv"></DIV><IMG src="http://h4agZ59i7.X8r4y3z.vxb5regfdsdf23xzfwea243sd.eu/Y6mK34b7Cz"> </A><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://V80621G7s.Hc8r1wr.pstw18nS9M.FzkoFKM/9FjgEc3.53740W"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://2HO5Z50oB.WD926E9.IOa78N77w.3172498m/8RXwEK8H.0125dOD0V"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://M9e4C5obU.4YZG0.988va.eycqyEx/8N6oW1.ODBtwVZ61C"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://832luN9Dv.u77Ctfy02.y7DsF6N7.lkY5qmj/UYgCp.o5OAn9"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://87NE0BF.mj229TF2.Cq748d25B4.8wt56/4kFKGx8P.0YzO0sd"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://LMGo4fkk9.FX2Nnore6q.UBIICQL7.8IHzAi9o/a09RZ2.Q44IYKC"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://8972Wc36.wheSD219l.jaQH5H.vUlWAbMK/X2T3ZRG07.rwBhX8M"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://9n4uwQ.Pt7lvi9aD.9Zidurh4k.59CI3u52e/1BnmhP.F3CLec1L7"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://SIhLQlu.20I6AK.MDeu4Ab494.fwzGYp2MeJ/O0dWjZd.Pg161"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://3CWPG89Ibe.ENMnR15o.2w8415n.up4U1lpz/3ZDPpe3M.82y3B"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://pi8lACeFp.bG6W1.y9bhlh.4krrwfzZ7Q/r0C1T.6x3U2gruC"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://e4RrP.MX8P8o2bTS.h64Y44Kb.Qzmy17/PKOKkuF.0U9UwX"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://hm7l9.vriX40iO.L1r3T4.jfsK6/veAW55m0y.P7vvs49z1y"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://9ulUcq.vdeWMSunu.AT7mm5.nJJmueA4np/9Ki5wpen.Hc7GHe"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://6STFgWH25Y.AigX6qP38.Jjnk37.ePlT0fd3nW/JFUsW.hSrzkM"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://QGz2j94k.7Z5eUBb8.md30r6.K76zPEu82S/nctJsY197O.4A4N1C"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://6f43OsWL.YTqjMU.gJpolq.jx5T3LSK/l5VXh2fj7.VU9u4Ebs"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://e819QhNY1.QkQ5Z.89Csl78676.Ba3LjVXun/NyjWi8IV.348wYjQ07I"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://9kPA4Dl.Xg0atrk7H.Srjzf.kAKwpZw/6mG0B0yYE.F9bcMDau"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://oqF1858.7PvB8h23.B9Dr6j1B6u.j1UDV792Zg/Z5TNUPA5.M72k7Kx"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://YUAaR7T.7448PuF76.T544OXUG.bfh9nl76q/Rlg1m3pbYf.B70t7GB"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://ENM2hAo6.SJ3xWO9.EufwQWc.1E1TS2/ZxU1ELb.s2xz2A93"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://7C5icC5.C2SQbe9.W2R4z.64R12c6f7X/IQ9QK1IA.VRyg8kX7g"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://eX2a6.64o444x8.Gcfd42b.6iev2QSDSQ/2W8ZO7nk.8KJ283Zq0"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://OGYD23YW.JrdC51N.2BW9f.DuAl4yN/x2vYc1P7.5Z3OOp3uZk"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://61p0NR.S1P4M8.a4ozlHX.QaF3kZ3H4/SOzV9UJno9.Vc32f77u"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://55V12Ns7b.orwcO.0AoCQDW.CPw04/Os25a0if8.7QZNz6O70J"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://75H3y3Y.F7Z961uUQ3.PttqV0.R9eu9eTz/f6t8psa17.r8Ytc"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://SxzQEAMX.m9508P.fKQ0JwjoK2.Ovu13gq/Pl2v33.jA2L10vdcf"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://5Q5y08R.h48P9.uyvf2ln95.Yr9uOY3nG/hxx9M3.5MF5Lq4"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://JCWsK8f0ks.LqqwiPS.N8cBXJeJ.cAraU/wLVZHF.Pu9817q"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://Q820CU.khNc8J6zx1.4sr1aT29.L6IBzm643I/fx93xp2N52.5N1Exl2"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://e3g1v1c4V8.ghS0TyO.i5lE1BaN.83A07g/2C9dappe5e.r8YSC8u9J"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://HsxKA.B9S28vnGc3.Y24S7i5y7l.g5wbxk09n/LgR9JiTUz1.6MhGIGN0y"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://a595Fl6Pa.UGWr7S7A.iCL8Af4G.vNp35Gl2/01RewOq98U.m5Iwv"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://5XDIHV.4V62GZ.4tkqF8A4.EjKuE/4qBmDm1Zs.99Vb25Su"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://5Ki5ACOO.u98Ly3A9X.479Jx8pCM.1DS55/7rmoTVs.9nS5hJ7Z"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://189mcr.mhzbE9d.COxtCJd.e3tNoyf/Bn4b3c6W.NM2m2J"></LNLZKQQ><LNLZKQQ><LNLZKQQ bnb="" zmpr="http://vC4R1f4TJ.LIrj05qt.NW85hSCr.P0Ws3186EM/l8L38I644.y1q80J"></LNLZKQQ></DIV></DIV></BODY></HTML> |
From: <var...@us...> - 2014-06-04 16:39:23
|
Revision: 8874 http://sourceforge.net/p/phpwiki/code/8874 Author: vargenau Date: 2014-06-04 16:39:11 +0000 (Wed, 04 Jun 2014) Log Message: ----------- Use CSS Modified Paths: -------------- trunk/themes/default/templates/userprefs.tmpl trunk/themes/wikilens/templates/body.tmpl Modified: trunk/themes/default/templates/userprefs.tmpl =================================================================== --- trunk/themes/default/templates/userprefs.tmpl 2014-06-04 16:30:37 UTC (rev 8873) +++ trunk/themes/default/templates/userprefs.tmpl 2014-06-04 16:39:11 UTC (rev 8874) @@ -134,7 +134,7 @@ ) ?> <?php } ?> -<table border="0"> +<table> <?php if ($isForm and $user->mayChangePass()) { ?> <tr><td colspan="2"><h2><?php echo ($request->getPref('passwd') ? _("Change Password") : _("Set Password")) ?></h2></td></tr> Modified: trunk/themes/wikilens/templates/body.tmpl =================================================================== --- trunk/themes/wikilens/templates/body.tmpl 2014-06-04 16:30:37 UTC (rev 8873) +++ trunk/themes/wikilens/templates/body.tmpl 2014-06-04 16:39:11 UTC (rev 8874) @@ -5,7 +5,7 @@ <?php echo Template('top') ?> </div> </td></tr> -<tr class="top"><td class="leftnav" width="120"> +<tr class="top"><td class="leftnav" style="width:120px"> <div class="toolbar"> <?php echo Template('navbar') ?> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-04 16:30:41
|
Revision: 8873 http://sourceforge.net/p/phpwiki/code/8873 Author: vargenau Date: 2014-06-04 16:30:37 +0000 (Wed, 04 Jun 2014) Log Message: ----------- Valid HTML: removing noshade Modified Paths: -------------- trunk/themes/Crao/templates/editpage.tmpl trunk/themes/MonoBook/templates/browse-footer.tmpl trunk/themes/Sidebar/templates/dump-footer.tmpl trunk/themes/blog/templates/blogform.tmpl trunk/themes/blog/templates/browse.tmpl trunk/themes/fusionforge/templates/blogform.tmpl trunk/themes/fusionforge/templates/editpage.tmpl Modified: trunk/themes/Crao/templates/editpage.tmpl =================================================================== --- trunk/themes/Crao/templates/editpage.tmpl 2014-06-04 16:22:20 UTC (rev 8872) +++ trunk/themes/Crao/templates/editpage.tmpl 2014-06-04 16:30:37 UTC (rev 8873) @@ -6,9 +6,9 @@ <?php echo fmt("Please continue editing. (You'll find your %s at the bottom of the page.)", /* HTML::a(array("href" => "#editarea"), */ _("edit area") /*) */) ?> </p> - <hr class="printer" noshade="noshade" /> + <hr class="printer" /> <?php echo $PREVIEW_CONTENT ?> - <hr class="printer" noshade="noshade" /> + <hr class="printer" /> <?php } ?> <?php echo $PAGE_LOCKED_MESSAGE ?> <?php echo $CONCURRENT_UPDATE_MESSAGE ?> @@ -68,7 +68,7 @@ <?php echo $AUTHOR_MESSAGE?> <label><?php echo Template('signin', array('FORMNAME' => 'editpage')) ?></label> </fieldset> -<hr noshade="noshade" /> +<hr /> <div class="wiki-edithelp"> <!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules --> <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p> Modified: trunk/themes/MonoBook/templates/browse-footer.tmpl =================================================================== --- trunk/themes/MonoBook/templates/browse-footer.tmpl 2014-06-04 16:22:20 UTC (rev 8872) +++ trunk/themes/MonoBook/templates/browse-footer.tmpl 2014-06-04 16:30:37 UTC (rev 8873) @@ -1,4 +1,4 @@ -<?php // <hr class="printer" noshade="noshade" /> ?> +<?php // <hr class="printer" /> ?> <div class="visualClear"></div> <div id="f-poweredbyico"><a href="http://www.phpwiki.org/"><img src="<?php echo $WikiTheme->getImageURL("poweredby_phpwiki_51x31.png") ?>" alt="Powered by PhpWiki" /></a></div> <ul id="f-list"> Modified: trunk/themes/Sidebar/templates/dump-footer.tmpl =================================================================== --- trunk/themes/Sidebar/templates/dump-footer.tmpl 2014-06-04 16:22:20 UTC (rev 8872) +++ trunk/themes/Sidebar/templates/dump-footer.tmpl 2014-06-04 16:30:37 UTC (rev 8873) @@ -1,7 +1,7 @@ <?php if (empty($revision)) $revision = $page->getCurrentRevision(); ?> -<hr class="printer" noshade="noshade" /> +<hr class="printer" /> <div class="visualClear"></div> <div><?php echo $WikiTheme->getOwnerMessage($page) ?> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?><br /> This page was accessed <?php echo $page->get('hits') ?> times, and edited <?php echo $revision->getVersion() ?> times.</div> Modified: trunk/themes/blog/templates/blogform.tmpl =================================================================== --- trunk/themes/blog/templates/blogform.tmpl 2014-06-04 16:22:20 UTC (rev 8872) +++ trunk/themes/blog/templates/blogform.tmpl 2014-06-04 16:30:37 UTC (rev 8873) @@ -16,7 +16,7 @@ name="edit[save]" class="wikiaction" /> </div> -<hr noshade="noshade" /> +<hr /> <div class="wiki-edithelp"> <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p> <?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?> Modified: trunk/themes/blog/templates/browse.tmpl =================================================================== --- trunk/themes/blog/templates/browse.tmpl 2014-06-04 16:22:20 UTC (rev 8872) +++ trunk/themes/blog/templates/browse.tmpl 2014-06-04 16:30:37 UTC (rev 8873) @@ -21,7 +21,7 @@ </div> <!--}}} Comments--> -<hr class="printer" noshade="noshade" /> +<hr class="printer" /> <!--}}} Content--> </div> Modified: trunk/themes/fusionforge/templates/blogform.tmpl =================================================================== --- trunk/themes/fusionforge/templates/blogform.tmpl 2014-06-04 16:22:20 UTC (rev 8872) +++ trunk/themes/fusionforge/templates/blogform.tmpl 2014-06-04 16:30:37 UTC (rev 8873) @@ -16,7 +16,7 @@ name="edit[save]" class="wikiaction" /> </div> -<hr noshade="noshade" /> +<hr /> <div class="wiki-edithelp"> <?plugin IncludePage page="TextFormattingRules" section="Synopsis" quiet=1?> </div> Modified: trunk/themes/fusionforge/templates/editpage.tmpl =================================================================== --- trunk/themes/fusionforge/templates/editpage.tmpl 2014-06-04 16:22:20 UTC (rev 8872) +++ trunk/themes/fusionforge/templates/editpage.tmpl 2014-06-04 16:30:37 UTC (rev 8873) @@ -107,7 +107,7 @@ <?php echo $HIDDEN_INPUTS?> </form> -<hr noshade="noshade" /> +<hr /> <div class="wiki-edithelp"> <?php if (WIKI_NAME == "help") { ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-04 16:22:24
|
Revision: 8872 http://sourceforge.net/p/phpwiki/code/8872 Author: vargenau Date: 2014-06-04 16:22:20 +0000 (Wed, 04 Jun 2014) Log Message: ----------- Use CSS Modified Paths: -------------- trunk/themes/Crao/templates/navbar.tmpl trunk/themes/Sidebar/templates/debug.tmpl Modified: trunk/themes/Crao/templates/navbar.tmpl =================================================================== --- trunk/themes/Crao/templates/navbar.tmpl 2014-06-04 16:11:00 UTC (rev 8871) +++ trunk/themes/Crao/templates/navbar.tmpl 2014-06-04 16:22:20 UTC (rev 8872) @@ -6,7 +6,7 @@ <input type="hidden" name="pagename" value="<?php echo _("TitleSearch")?>" /> <?php } ?> <div id="navbuttons"> -<table width="fullwidth"> +<table class="fullwidth"> <tr class="middle"><td class="align-left"> <?php echo WikiLink(_("RecentChanges"), "button") ?> <?php if (!empty($revision)) { ?> @@ -15,7 +15,7 @@ <?php echo $SEP?><?php echo Button(_("BackLinks"), _("BackLinks")) ?> <?php } ?> </td> -<td class="align-right" width="150"> +<td class="align-right; width:150px"> <div id="search"> <?php if (!empty($user) && $user->isSignedIn()) { ?> <?php echo WikiLink(_("UserPreferences"),'button',_("Preferences")) ?><?php echo $SEP?> Modified: trunk/themes/Sidebar/templates/debug.tmpl =================================================================== --- trunk/themes/Sidebar/templates/debug.tmpl 2014-06-04 16:11:00 UTC (rev 8871) +++ trunk/themes/Sidebar/templates/debug.tmpl 2014-06-04 16:22:20 UTC (rev 8872) @@ -1,5 +1,5 @@ <?php global $RUNTIMER; ?> -<table width="%100"> +<table class="fullwidth"> <tr><td> <div id="xhtml-validator"><a href="http://validator.w3.org/check/referer"><img id="xhtml" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-04 16:11:03
|
Revision: 8871 http://sourceforge.net/p/phpwiki/code/8871 Author: vargenau Date: 2014-06-04 16:11:00 +0000 (Wed, 04 Jun 2014) Log Message: ----------- Remove border Modified Paths: -------------- trunk/themes/Wordpress/templates/body.tmpl trunk/themes/shamino_com/templates/top.tmpl Modified: trunk/themes/Wordpress/templates/body.tmpl =================================================================== --- trunk/themes/Wordpress/templates/body.tmpl 2014-06-04 16:07:46 UTC (rev 8870) +++ trunk/themes/Wordpress/templates/body.tmpl 2014-06-04 16:11:00 UTC (rev 8871) @@ -8,7 +8,7 @@ <h1><a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>" ><img src="<?php echo $WikiTheme->getImageURL('logo')?>" - border="0" alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" + alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" align="bottom" /></a> <?php echo $HEADER?></h1> --> <?php echo $CONTENT ?> Modified: trunk/themes/shamino_com/templates/top.tmpl =================================================================== --- trunk/themes/shamino_com/templates/top.tmpl 2014-06-04 16:07:46 UTC (rev 8870) +++ trunk/themes/shamino_com/templates/top.tmpl 2014-06-04 16:11:00 UTC (rev 8871) @@ -2,8 +2,8 @@ <div id="logo"><a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>" ><img src="<?php echo $WikiTheme->getImageURL('logo')?>" id="logo-img" - border="0" alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" - class="align-right" /></a></div> + alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" + class="align-right" /></a></div> <!-- The top navigation/search bar --> <div class="wikinavbar"> <a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-04 16:07:50
|
Revision: 8870 http://sourceforge.net/p/phpwiki/code/8870 Author: vargenau Date: 2014-06-04 16:07:46 +0000 (Wed, 04 Jun 2014) Log Message: ----------- Remove img-logo-right for MonoBook Modified Paths: -------------- trunk/themes/MonoBook/templates/logo.tmpl Modified: trunk/themes/MonoBook/templates/logo.tmpl =================================================================== --- trunk/themes/MonoBook/templates/logo.tmpl 2014-06-04 15:57:21 UTC (rev 8869) +++ trunk/themes/MonoBook/templates/logo.tmpl 2014-06-04 16:07:46 UTC (rev 8870) @@ -1,3 +1,2 @@ <div class="portlet" id="p-logo"><a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>"><img src="<?php echo $WikiTheme->getImageURL('logo') ?>" id="logo-img" alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" /></a></div> -<div id="img-logo-right" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-04 15:57:32
|
Revision: 8869 http://sourceforge.net/p/phpwiki/code/8869 Author: vargenau Date: 2014-06-04 15:57:21 +0000 (Wed, 04 Jun 2014) Log Message: ----------- urlencode to get valid HTML Modified Paths: -------------- trunk/themes/MonoBook/templates/signin.tmpl trunk/themes/Sidebar/templates/signin.tmpl Modified: trunk/themes/MonoBook/templates/signin.tmpl =================================================================== --- trunk/themes/MonoBook/templates/signin.tmpl 2014-06-04 13:46:26 UTC (rev 8868) +++ trunk/themes/MonoBook/templates/signin.tmpl 2014-06-04 15:57:21 UTC (rev 8869) @@ -8,13 +8,13 @@ <li><?php echo WikiLink($id . "/Discussion", 'auto' ,_("My Discussion")) ?></li> <li><?php echo WikiLink(_("UserPreferences"), "",_("My Preferences")) ?></li> <li><?php echo WikiLink(_("MyRecentChanges"), "",_("My Changes")) ?></li> - <li><?php echo HTML::a(array('href'=>'?auth[logout]=1'),$sp,_("Logout"),$sp) ?></li> + <li><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'),$sp,_("Logout"),$sp) ?></li> <?php } else { ?> <!-- Login or Register --> <?php if ($id) { ?> <li id="pt-userpage"><?php echo WikiLink($id, 'auto', HTML($sp,$id,$sp)) ?></li> <?php } ?> - <li id="pt-login"><?php echo HTML::a(array('href'=>'?auth[login]=1'),$sp,_("Sign In"),$sp) ?></li> + <li id="pt-login"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[login]').'=1'),$sp,_("Sign In"),$sp) ?></li> <?php } ?> </ul> </div></div> Modified: trunk/themes/Sidebar/templates/signin.tmpl =================================================================== --- trunk/themes/Sidebar/templates/signin.tmpl 2014-06-04 13:46:26 UTC (rev 8868) +++ trunk/themes/Sidebar/templates/signin.tmpl 2014-06-04 15:57:21 UTC (rev 8869) @@ -4,14 +4,14 @@ <li id="pt-mypages"><?php echo WikiLink("RecentChangesMyPages", 'auto', HTML($sp,"MyPages",$sp)) ?></li> <li id="pt-mychanges"><?php echo WikiLink("MyRecentChanges", 'auto', HTML($sp,"MyChanges",$sp)) ?></li> <li id="pt-userpage"><?php echo WikiLink($id, 'auto', HTML($sp,$id,$sp)) ?></li> - <li id="pt-logout"><?php echo HTML::a(array('href'=>'?auth[logout]=1'), $sp,_("Logout"),$sp) ?></li> + <li id="pt-logout"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'), $sp,_("Logout"),$sp) ?></li> <?php } elseif (ALLOW_ANON_USER) { $sp = HTML::Raw(" "); $id = $user->getAuthenticatedId(); if ($id) { ?> <li id="pt-userpage"><?php echo WikiLink($id, 'auto', HTML($sp,$id,$sp)) ?></li> <?php } ?> <!-- Login --> - <li id="pt-login"><?php echo HTML::a(array('href'=>'?auth[login]=1'),$sp,_("Sign In"),$sp) ?></li> + <li id="pt-login"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[login]').'=1'),$sp,_("Sign In"),$sp) ?></li> <?php } else { ?> <li id="pt-login"><a id="login"><?php echo _("Login required...") ?></a></li> <?php } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-04 13:46:30
|
Revision: 8868 http://sourceforge.net/p/phpwiki/code/8868 Author: vargenau Date: 2014-06-04 13:46:26 +0000 (Wed, 04 Jun 2014) Log Message: ----------- Use CSS Modified Paths: -------------- trunk/lib/plugin/AuthorHistory.php Modified: trunk/lib/plugin/AuthorHistory.php =================================================================== --- trunk/lib/plugin/AuthorHistory.php 2014-06-04 13:41:05 UTC (rev 8867) +++ trunk/lib/plugin/AuthorHistory.php 2014-06-04 13:46:26 UTC (rev 8868) @@ -105,7 +105,7 @@ if (!($page == 'all')) { $p = $dbi->getPage($page); - $thead->pushContent(HTML::tr(HTML::th(array('align' => 'right'), + $thead->pushContent(HTML::tr(HTML::th(array('class' => 'align-right'), _("Version")), $includeminor ? HTML::th(_("Minor")) : "", HTML::th(_("Author")), @@ -123,13 +123,13 @@ $difflink = Button(array('action' => 'diff', 'previous' => 'minor'), $rev->getversion(), $rev); - $tr = HTML::tr(HTML::td(array('align' => 'right'), + $tr = HTML::tr(HTML::td(array('class' => 'align-right'), $difflink, $nbsp), $includeminor ? (HTML::td($nbsp, ($isminor ? "minor" : "major"), $nbsp)) : "", HTML::td($nbsp, WikiLink($rev->get('author'), 'if_known'), $nbsp), HTML::td($nbsp, $rev->get('summary')), - HTML::td(array('align' => 'right'), + HTML::td(array('class' => 'align-right'), $WikiTheme->formatdatetime($rev->get('mtime'))) ); @@ -147,7 +147,7 @@ //search all pages for all edits by this author $thead->pushContent(HTML::tr(HTML::th(_("Page Name")), - HTML::th(array('align' => 'right'), + HTML::th(array('class' => 'align-right'), _("Version")), $includeminor ? HTML::th(_("Minor")) : "", HTML::th(_("Summary")), @@ -169,11 +169,11 @@ HTML::td($nbsp, ($isminor ? $rev->_pagename : WikiLink($rev->_pagename, 'auto')) ), - HTML::td(array('align' => 'right'), + HTML::td(array('class' => 'align-right'), $difflink, $nbsp), $includeminor ? (HTML::td($nbsp, ($isminor ? "minor" : "major"), $nbsp)) : "", HTML::td($nbsp, $rev->get('summary')), - HTML::td(array('align' => 'right'), + HTML::td(array('class' => 'align-right'), $WikiTheme->formatdatetime($rev->get('mtime')), $nbsp) ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-04 13:41:10
|
Revision: 8867 http://sourceforge.net/p/phpwiki/code/8867 Author: vargenau Date: 2014-06-04 13:41:05 +0000 (Wed, 04 Jun 2014) Log Message: ----------- Use CSS Modified Paths: -------------- trunk/themes/Wordpress/templates/editpage.tmpl trunk/themes/shamino_com/templates/top.tmpl trunk/themes/wikilens/templates/top.tmpl Modified: trunk/themes/Wordpress/templates/editpage.tmpl =================================================================== --- trunk/themes/Wordpress/templates/editpage.tmpl 2014-06-04 13:24:17 UTC (rev 8866) +++ trunk/themes/Wordpress/templates/editpage.tmpl 2014-06-04 13:41:05 UTC (rev 8867) @@ -14,7 +14,7 @@ accept-charset="UTF-8"> <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1">'; ?> <table class="toolbar fullwidth"> -<tr align="bottom"> +<tr class="bottom"> <td> <?php echo $PAGE_LOCKED_MESSAGE ?> <?php echo $CONCURRENT_UPDATE_MESSAGE ?> @@ -33,7 +33,7 @@ </table> <table class="fullwidth"> <tr><td><?php echo $EDIT_TOOLBAR ?></td> - <td align="right"><div id="editarea-size"> + <td class="align-right"><div id="editarea-size"> <?php echo _("Size").':'?> <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?> <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?> Modified: trunk/themes/shamino_com/templates/top.tmpl =================================================================== --- trunk/themes/shamino_com/templates/top.tmpl 2014-06-04 13:24:17 UTC (rev 8866) +++ trunk/themes/shamino_com/templates/top.tmpl 2014-06-04 13:41:05 UTC (rev 8867) @@ -3,7 +3,7 @@ href="<?php echo WikiURL(HOME_PAGE)?>" ><img src="<?php echo $WikiTheme->getImageURL('logo')?>" id="logo-img" border="0" alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" - align="right" /></a></div> + class="align-right" /></a></div> <!-- The top navigation/search bar --> <div class="wikinavbar"> <a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>"> Modified: trunk/themes/wikilens/templates/top.tmpl =================================================================== --- trunk/themes/wikilens/templates/top.tmpl 2014-06-04 13:24:17 UTC (rev 8866) +++ trunk/themes/wikilens/templates/top.tmpl 2014-06-04 13:41:05 UTC (rev 8867) @@ -7,6 +7,6 @@ ><a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>" ><img src="<?php echo $WikiTheme->getImageURL('logo')?>" id="logo-img" - border="0" alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" align="right" /></a> + alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" class="align-right" /></a> </div> <?php } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-04 13:24:21
|
Revision: 8866 http://sourceforge.net/p/phpwiki/code/8866 Author: vargenau Date: 2014-06-04 13:24:17 +0000 (Wed, 04 Jun 2014) Log Message: ----------- Internet Explorer 6 is dead Modified Paths: -------------- trunk/pgsrc/Help%2FAsciiSVGPlugin trunk/pgsrc/Help%2FChartPlugin Modified: trunk/pgsrc/Help%2FAsciiSVGPlugin =================================================================== --- trunk/pgsrc/Help%2FAsciiSVGPlugin 2014-06-04 13:11:28 UTC (rev 8865) +++ trunk/pgsrc/Help%2FAsciiSVGPlugin 2014-06-04 13:24:17 UTC (rev 8866) @@ -1,4 +1,4 @@ -Date: Fri, 7 Dec 2012 14:58:45 +0000 +Date: Wed, 4 Jun 2014 15:23:23 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Help%2FAsciiSVGPlugin; @@ -13,8 +13,8 @@ Syntax: [[http://www1.chapman.edu/~jipsen/svg/asciisvgcommands.html]] -If you are using Internet Explorer 6 + Adobe SVGviewer (often included -by default with Windows XP) or SVG-enabled Firefox (2.0 or above) +The browser must support SVG in order graphs to be displayed. +If you are using a recent browser (Firefox, Opera, Chrome, Safari) then you should see the examples. == Usage == Modified: trunk/pgsrc/Help%2FChartPlugin =================================================================== --- trunk/pgsrc/Help%2FChartPlugin 2014-06-04 13:11:28 UTC (rev 8865) +++ trunk/pgsrc/Help%2FChartPlugin 2014-06-04 13:24:17 UTC (rev 8866) @@ -1,4 +1,4 @@ -Date: Fri, 16 Dec 2011 12:42:36 +0000 +Date: Wed, 4 Jun 2014 15:23:23 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Help%2FChartPlugin; @@ -11,8 +11,7 @@ Three graph formats are possible: line, bar and pie. In pie mode, negative values are ignored. The browser must support SVG in order graphs to be displayed. -If you are using Internet Explorer 6 + Adobe SVGviewer (often included -by default with Windows XP) or SVG-enabled Firefox (2.0 or above) +If you are using a recent browser (Firefox, Opera, Chrome, Safari) then you should see the examples. == Usage == This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-04 13:11:32
|
Revision: 8865 http://sourceforge.net/p/phpwiki/code/8865 Author: vargenau Date: 2014-06-04 13:11:28 +0000 (Wed, 04 Jun 2014) Log Message: ----------- Avoid 2 class attributes Modified Paths: -------------- trunk/themes/default/templates/pagelink.tmpl Modified: trunk/themes/default/templates/pagelink.tmpl =================================================================== --- trunk/themes/default/templates/pagelink.tmpl 2014-06-04 13:08:43 UTC (rev 8864) +++ trunk/themes/default/templates/pagelink.tmpl 2014-06-04 13:11:28 UTC (rev 8865) @@ -12,7 +12,7 @@ } ?> <tr><td style="width:100%" colspan="<?php echo $COLS ?>"><table class="fullwidth wikipaging"><tr class="wikipaging"> - <td class="wikipaging<?php echo $PREV ? "-enabled" : "-disabled" ?>" class="align-left"> + <td class="align-left wikipaging<?php echo $PREV ? "-enabled" : "-disabled" ?>"> <?php echo $PREV ? HTML::a(array('href'=>$FIRST_LINK), "|<<") : "|<<" ?> <?php echo $PREV ? HTML::a(array('href'=>$PREV_LINK), "<< " . _("Prev")) : "<<" ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |