From: <var...@us...> - 2014-06-20 13:58:43
|
Revision: 8923 http://sourceforge.net/p/phpwiki/code/8923 Author: vargenau Date: 2014-06-20 13:58:32 +0000 (Fri, 20 Jun 2014) Log Message: ----------- Valid HTML 5 Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2014-06-20 13:44:05 UTC (rev 8922) +++ trunk/lib/WikiTheme.php 2014-06-20 13:58:32 UTC (rev 8923) @@ -1787,7 +1787,6 @@ { $this->__construct('input', array('type' => 'image', 'src' => $img_url, - 'value' => $text, 'alt' => $text)); if ($name) $this->setAttr('name', $name); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-25 14:42:38
|
Revision: 8937 http://sourceforge.net/p/phpwiki/code/8937 Author: vargenau Date: 2014-06-25 14:42:34 +0000 (Wed, 25 Jun 2014) Log Message: ----------- Call-time pass-by-reference has been deprecated Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2014-06-25 14:34:36 UTC (rev 8936) +++ trunk/lib/WikiTheme.php 2014-06-25 14:42:34 UTC (rev 8937) @@ -1930,7 +1930,7 @@ } $dir->close(); } - natcasesort(&$available_themes); + natcasesort($available_themes); return $available_themes; } @@ -1948,7 +1948,7 @@ } $dir->close(); } - natcasesort(&$available_languages); + natcasesort($available_languages); return $available_languages; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-25 16:04:41
|
Revision: 8940 http://sourceforge.net/p/phpwiki/code/8940 Author: vargenau Date: 2014-06-25 16:04:39 +0000 (Wed, 25 Jun 2014) Log Message: ----------- fusionforge theme cannot be changed Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2014-06-25 15:14:12 UTC (rev 8939) +++ trunk/lib/WikiTheme.php 2014-06-25 16:04:39 UTC (rev 8940) @@ -1915,6 +1915,9 @@ function listAvailableThemes() { + if (THEME == 'fusionforge') { + return array(THEME); + } $available_themes = array(); $dir_root = 'themes'; if (defined('PHPWIKI_DIR')) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-07-18 12:48:59
|
Revision: 8989 http://sourceforge.net/p/phpwiki/code/8989 Author: vargenau Date: 2014-07-18 12:48:51 +0000 (Fri, 18 Jul 2014) Log Message: ----------- Revert parent::__construct Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2014-07-18 12:23:23 UTC (rev 8988) +++ trunk/lib/WikiTheme.php 2014-07-18 12:48:51 UTC (rev 8989) @@ -1680,13 +1680,14 @@ */ class Button extends HtmlElement { - /** + /** Constructor + * * @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 __construct($text, $url, $class = '', $options = array()) + function Button($text, $url, $class = '', $options = array()) { global $request; $this->_init('a', array('href' => $url)); @@ -1713,16 +1714,17 @@ */ class ImageButton extends Button { - /** + /** 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 $img_url string URL for button's image. * @param $img_attr array Additional attributes for the <img> tag. */ - function __construct($text, $url, $class, $img_url, $img_attr = array()) + function ImageButton($text, $url, $class, $img_url, $img_attr = array()) { - parent::__construct('a', array('href' => $url)); + $this->__construct('a', array('href' => $url)); if ($class) $this->setAttr('class', $class); // Google honors this @@ -1745,7 +1747,8 @@ */ class SubmitButton extends HtmlElement { - /** + /** Constructor + * * @param $text string The text for the button. * @param $name string The name of the form field. * @param $class string The CSS class for the button. @@ -1753,7 +1756,8 @@ */ function SubmitButton($text, $name = '', $class = '', $options = array()) { - parent::__construct('input', array('type' => 'submit', 'value' => $text)); + $this->__construct('input', array('type' => 'submit', + 'value' => $text)); if ($name) $this->setAttr('name', $name); if ($class) @@ -1771,16 +1775,17 @@ */ class SubmitImageButton extends SubmitButton { - /** + /** Constructor + * * @param $text string The text for the button. * @param $name string The name of the form field. * @param $class string The CSS class for the button. * @param $img_url string URL for button's image. * @param $img_attr array Additional attributes for the <img> tag. */ - function __construct($text, $name = '', $class = '', $img_url, $img_attr = array()) + function SubmitImageButton($text, $name = '', $class = '', $img_url, $img_attr = array()) { - parent::__construct('input', array('type' => 'image', + $this->__construct('input', array('type' => 'image', 'src' => $img_url, 'alt' => $text)); if ($name) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-11-23 20:06:31
|
Revision: 9367 http://sourceforge.net/p/phpwiki/code/9367 Author: vargenau Date: 2014-11-23 20:06:27 +0000 (Sun, 23 Nov 2014) Log Message: ----------- PHP Doc Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2014-11-23 20:00:55 UTC (rev 9366) +++ trunk/lib/WikiTheme.php 2014-11-23 20:06:27 UTC (rev 9367) @@ -188,6 +188,8 @@ /** * noinit: Do not initialize unnecessary items in default_theme fallback twice. + * @param string $theme_name + * @param bool $noinit */ function WikiTheme($theme_name = 'default', $noinit = false) { @@ -210,7 +212,11 @@ } } } - if ($noinit) return; + + if ($noinit) { + return; + } + $this->_css = array(); // on derived classes do not add headers twice @@ -329,9 +335,9 @@ /** * Set format string used for dates. * - * @param $fs string Format string for dates. + * @param string $fs Format string for dates. * - * @param $show_mod_time bool If true (default) then times + * @param bool $show_mod_time If true (default) then times * are included in the messages generated by getLastModifiedMessage(), * otherwise, only the date of last modification will be shown. */ @@ -344,7 +350,7 @@ /** * Set format string used for times. * - * @param $fs string Format string for times. + * @param string $fs Format string for times. */ function setTimeFormat($fs) { @@ -357,7 +363,7 @@ * Any time zone offset specified in the users preferences is * taken into account by this method. * - * @param $time_t integer Unix-style time. + * @param int $time_t Unix-style time. * * @return string The date. */ @@ -378,7 +384,7 @@ * Any time zone offset specified in the users preferences is * taken into account by this method. * - * @param $time_t integer Unix-style time. + * @param int $time_t Unix-style time. * * @return string The time. */ @@ -397,7 +403,7 @@ * Any time zone offset specified in the users preferences is * taken into account by this method. * - * @param $time_t integer Unix-style time. + * @param int $time_t Unix-style time. * * @return string The date and time. */ @@ -420,7 +426,7 @@ * Any time zone offset specified in the users preferences is * taken into account by this method. * - * @param $time_t integer Unix-style time. + * @param int $time_t Unix-style time. * * @return string The day. */ @@ -513,6 +519,9 @@ /** * Format the "Author" and "Owner" messages for a page revision. + * + * @param WikiDB_Page $page + * @return string */ function getOwnerMessage($page) { @@ -539,11 +548,14 @@ Prefer author (name) over internal author_id (IP) */ function getAuthorMessage($revision) { - if (!$revision) return ''; + if (!$revision) + return ''; $dbi =& $GLOBALS['request']->_dbi; $author = $revision->get('author'); - if (!$author) $author = $revision->get('author_id'); - if (!$author) return ''; + if (!$author) + $author = $revision->get('author_id'); + if (!$author) + return ''; if ($dbi->isWikiPage($author)) { return fmt("by %s", WikiLink($author)); } else { @@ -707,7 +719,7 @@ //////////////////////////////////////////////////////////////// public $_imageAliases = array(); - /** + /* * * (To disable an image, alias the image to <code>false</code>. */ @@ -986,8 +998,9 @@ return $tooltipAccessKeyPrefix; } - /** Define the accesskey in the title only, with ending [p] or [alt-p]. - * This fixes the prefix in the title and sets the accesskey. + /* + * Define the access key in the title only, with ending [p] or [alt-p]. + * This fixes the prefix in the title and sets the access key. */ function fixAccesskey($attrs) { @@ -1244,7 +1257,7 @@ } public $_headers_printed; - /** + /* * Add a random header element to head * TODO: first css, then js. Maybe separate it into addJSHeaders/addCSSHeaders * or use an optional type argument, and separate it within _MoreHeaders[] @@ -1260,7 +1273,7 @@ } } - /** + /* * Singleton. Only called once, by the head template. See the warning above. */ function getMoreHeaders() @@ -1329,11 +1342,11 @@ return $out; } - /** + /* * Common Initialisations */ - /** + /* * The ->load() method replaces the formerly global code in themeinfo.php. * This is run only once for the selected theme, and not for the parent themes. * Without this you would not be able to derive from other themes. @@ -1359,14 +1372,14 @@ $this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css'); $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); - /** + /* * The logo image appears on every page and links to the HomePage. */ $this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); $this->addImageAlias('search', 'search.png'); - /** + /* * The Signature image is shown after saving an edited page. If this * is set to false then the "Thank you for editing..." screen will * be omitted. @@ -1389,13 +1402,13 @@ $this->setButtonSeparator("\n | "); - /** + /* * WikiWords can automatically be split by inserting spaces between * the words. The default is to leave WordsSmashedTogetherLikeSo. */ $this->setAutosplitWikiWords(false); - /** + /* * Layout improvement with dangling links for mostly closed wiki's: * If false, only users with edit permissions will be presented the * special wikiunknown class with "?" and Tooltip. @@ -1428,7 +1441,7 @@ */ //$this->setDateFormat("%B %d, %Y", false); - /** + /* * Custom UserPreferences: * A list of name => _UserPreference class pairs. * Rationale: Certain themes should be able to extend the predefined list @@ -1438,7 +1451,7 @@ */ //$this->customUserPreference(); - /** + /* * Register custom PageList type and define custom PageList classes. * Rationale: Certain themes should be able to extend the predefined list * of pagelist types. E.g. certain plugins, like MostPopular might use @@ -1450,7 +1463,7 @@ } // end of load - /** + /* * Custom UserPreferences: * A list of name => _UserPreference class pairs. * Rationale: Certain themes should be able to extend the predefined list @@ -1468,7 +1481,8 @@ } } - /** addPageListColumn(array('rating' => new _PageList_Column_rating('rating', _("Rate")))) + /* + * addPageListColumn(array('rating' => new _PageList_Column_rating('rating', _("Rate")))) * Register custom PageList types for special themes, like * 'rating' for wikilens */ @@ -1638,7 +1652,8 @@ // //////////////////////////////////////////////////////////////// - /** CbUserLogin (&$request, $userid) + /* + * CbUserLogin (&$request, $userid) * Callback when a user logs in */ function CbUserLogin(&$request, $userid) @@ -1646,7 +1661,8 @@ ; // do nothing } - /** CbNewUserEdit (&$request, $userid) + /* + * CbNewUserEdit (&$request, $userid) * Callback when a new user creates or edits a page */ function CbNewUserEdit(&$request, $userid) @@ -1654,7 +1670,8 @@ ; // i.e. create homepage with Template/UserPage } - /** CbNewUserLogin (&$request, $userid) + /* + * CbNewUserLogin (&$request, $userid) * Callback when a "new user" logs in. * What is new? We only record changes, not logins. * Should we track user actions? @@ -1665,7 +1682,8 @@ ; // do nothing } - /** CbUserLogout (&$request, $userid) + /* + * CbUserLogout (&$request, $userid) * Callback when a user logs out */ function CbUserLogout(&$request, $userid) @@ -1675,16 +1693,15 @@ } -/** +/* * A class representing a clickable "button". * - * In it's simplest (default) form, a "button" is just a link associated + * In its simplest (default) form, a "button" is just a link associated * with some sort of wiki-action. */ class Button extends HtmlElement { - /** Constructor - * + /** * @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. @@ -1710,12 +1727,12 @@ } -/** +/* * A clickable image button. */ class ImageButton extends Button { - /** Constructor + /** * * @param $text string The text for the button. * @param $url string The url (href) for the button. @@ -1743,13 +1760,12 @@ } } -/** +/* * A class representing a form <samp>submit</samp> button. */ class SubmitButton extends HtmlElement { - /** Constructor - * + /** * @param $text string The text for the button. * @param $name string The name of the form field. * @param $class string The CSS class for the button. @@ -1770,13 +1786,12 @@ } -/** +/* * A class representing an image form <samp>submit</samp> button. */ class SubmitImageButton extends SubmitButton { - /** Constructor - * + /** * @param $text string The text for the button. * @param $name string The name of the form field. * @param $class string The CSS class for the button. @@ -1800,7 +1815,7 @@ } -/** +/* * A sidebar box with title and body, narrow fixed-width. * To represent abbrevated content of plugins, links or forms, * like "Getting Started", "Search", "Sarch Pagename", @@ -1815,7 +1830,6 @@ */ class SidebarBox { - function SidebarBox($title, $body) { require_once 'lib/WikiPlugin.php'; @@ -1829,7 +1843,7 @@ } } -/** +/* * A sidebar box for plugins. * Any plugin may provide a box($args=false, $request=false, $basepage=false) * method, with the help of WikiPlugin::makeBox() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-11-28 16:16:23
|
Revision: 9390 http://sourceforge.net/p/phpwiki/code/9390 Author: vargenau Date: 2014-11-28 16:16:21 +0000 (Fri, 28 Nov 2014) Log Message: ----------- global $request Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2014-11-28 14:54:59 UTC (rev 9389) +++ trunk/lib/WikiTheme.php 2014-11-28 16:16:21 UTC (rev 9390) @@ -53,7 +53,11 @@ */ function WikiLink($page_or_rev, $type = 'known', $label = false) { - global $WikiTheme, $request; + global $WikiTheme; + /** + * @var WikiRequest $request + */ + global $request; if ($type == 'button') { return $WikiTheme->makeLinkButton($page_or_rev, $label); @@ -193,6 +197,11 @@ */ function WikiTheme($theme_name = 'default', $noinit = false) { + /** + * @var WikiRequest $request + */ + global $request; + $this->_name = $theme_name; $this->_themes_dir = NormalizeLocalFileName("themes"); $this->_path = defined('PHPWIKI_DIR') ? NormalizeLocalFileName("") : ""; @@ -369,6 +378,9 @@ */ function formatDate($time_t) { + /** + * @var WikiRequest $request + */ global $request; $offset_time = $time_t + 3600 * $request->getPref('timeOffset'); @@ -391,7 +403,12 @@ function formatTime($time_t) { //FIXME: make 24-hour mode configurable? + + /** + * @var WikiRequest $request + */ global $request; + $offset_time = $time_t + 3600 * $request->getPref('timeOffset'); return preg_replace('/^0/', ' ', strtolower(strftime($this->_timeFormat, $offset_time))); @@ -432,6 +449,9 @@ */ function getDay($time_t) { + /** + * @var WikiRequest $request + */ global $request; if ($request->getPref('relativeDates') && ($date = $this->_relativeDay($time_t))) { @@ -454,9 +474,14 @@ */ function getLastModifiedMessage($revision, $show_version = 'auto') { + /** + * @var WikiRequest $request + */ global $request; - if (!$revision) return ''; + if (!$revision) + return ''; + // dates >= this are considered invalid. if (!defined('EPOCH')) define('EPOCH', 0); // seconds since ~ January 1 1970 @@ -492,6 +517,9 @@ function _relativeDay($time_t) { + /** + * @var WikiRequest $request + */ global $request; if (is_numeric($request->getPref('timeOffset'))) @@ -647,6 +675,9 @@ function linkUnknownWikiWord($wikiword, $linktext = '') { + /** + * @var WikiRequest $request + */ global $request; // Get rid of anchors on unknown wikiwords @@ -1062,6 +1093,9 @@ $version = false; if (empty($page_or_rev)) { + /** + * @var WikiRequest $request + */ global $request; $pagename = $request->getArg("pagename"); $version = $request->getArg("version"); @@ -1292,7 +1326,11 @@ */ function getMoreHeaders() { + /** + * @var WikiRequest $request + */ global $request; + // actionpages cannot add headers, because recursive template expansion // already expanded the head template before. $this->_headers_printed = 1; @@ -1342,7 +1380,11 @@ function getMoreAttr($tag) { + /** + * @var WikiRequest $request + */ global $request; + if (empty($request->_MoreAttr[$tag])) return ''; $out = ''; @@ -1510,7 +1552,11 @@ function initGlobals() { + /** + * @var WikiRequest $request + */ global $request; + static $already = 0; if (!$already) { $script_url = deduce_script_name(); @@ -1583,6 +1629,9 @@ function calendarBase() { static $UserCalPageTitle = false; + /** + * @var WikiRequest $request + */ global $request; if (!$UserCalPageTitle) @@ -1727,7 +1776,11 @@ */ function Button($text, $url, $class = '', $options = array()) { + /** + * @var WikiRequest $request + */ global $request; + $this->_init('a', array('href' => $url)); if ($class) $this->setAttr('class', $class); @@ -1760,6 +1813,11 @@ */ function ImageButton($text, $url, $class, $img_url, $img_attr = array()) { + /** + * @var WikiRequest $request + */ + global $request; + $this->__construct('a', array('href' => $url)); if ($class) $this->setAttr('class', $class); @@ -1904,7 +1962,11 @@ { function RelatedLinksBox($title = false, $body = '', $limit = 20) { + /** + * @var WikiRequest $request + */ global $request; + $this->title = $title ? $title : _("Related Links"); $this->body = HTML($body); $page = $request->getPage($request->getArg('pagename')); @@ -1927,7 +1989,11 @@ { function RelatedExternalLinksBox($title = false, $body = '', $limit = 20) { + /** + * @var WikiRequest $request + */ global $request; + $this->title = $title ? $title : _("External Links"); $this->body = HTML($body); $page = $request->getPage($request->getArg('pagename')); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-01-28 16:05:36
|
Revision: 9496 http://sourceforge.net/p/phpwiki/code/9496 Author: vargenau Date: 2015-01-28 16:05:33 +0000 (Wed, 28 Jan 2015) Log Message: ----------- Check user Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2015-01-28 16:04:43 UTC (rev 9495) +++ trunk/lib/WikiTheme.php 2015-01-28 16:05:33 UTC (rev 9496) @@ -1637,12 +1637,18 @@ */ global $request; - if (!$UserCalPageTitle) - $UserCalPageTitle = $request->_user->getId() . - '/' . _("Calendar"); - if (!$UserCalPageTitle) - $UserCalPageTitle = (BLOG_EMPTY_DEFAULT_PREFIX ? '' - : ($request->_user->getId() . '/')) . "Blog"; + if (!$UserCalPageTitle) { + if (!empty($request->_user)) { + $UserCalPageTitle = $request->_user->getId().'/'._("Calendar"); + } + } + if (!$UserCalPageTitle) { + if (BLOG_EMPTY_DEFAULT_PREFIX) { + $UserCalPageTitle = "Blog"; + } else { + $UserCalPageTitle = $request->_user->getId() . '/' . "Blog"; + } + } return $UserCalPageTitle; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-12 10:35:33
|
Revision: 9533 http://sourceforge.net/p/phpwiki/code/9533 Author: vargenau Date: 2015-02-12 10:35:25 +0000 (Thu, 12 Feb 2015) Log Message: ----------- Use real list instead of middot Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2015-02-12 10:05:45 UTC (rev 9532) +++ trunk/lib/WikiTheme.php 2015-02-12 10:35:25 UTC (rev 9533) @@ -1977,19 +1977,19 @@ global $request; $this->title = $title ? $title : _("Related Links"); - $this->body = HTML($body); + $this->body = HTML::ul($body); $page = $request->getPage($request->getArg('pagename')); $revision = $page->getCurrentRevision(); $page_content = $revision->getTransformedContent(); - //$cache = &$page->_wikidb->_cache; $counter = 0; - $sp = HTML::raw('· '); foreach ($page_content->getWikiPageLinks() as $link) { $linkto = $link['linkto']; - if (!$request->_dbi->isWikiPage($linkto)) continue; - $this->body->pushContent($sp, WikiLink($linkto), HTML::br()); + if (!$request->_dbi->isWikiPage($linkto)) + continue; + $this->body->pushContent(HTML::li(WikiLink($linkto))); $counter++; - if ($limit and $counter > $limit) continue; + if ($limit and $counter > $limit) + continue; } } } @@ -2004,17 +2004,17 @@ global $request; $this->title = $title ? $title : _("External Links"); - $this->body = HTML($body); + $this->body = HTML::ul($body); $page = $request->getPage($request->getArg('pagename')); $cache = &$page->_wikidb->_cache; $counter = 0; - $sp = HTML::raw('· '); foreach ($cache->getWikiPageLinks() as $link) { $linkto = $link['linkto']; if ($linkto) { - $this->body->pushContent($sp, WikiLink($linkto), HTML::br()); + $this->body->pushContent(HTML::li(WikiLink($linkto))); $counter++; - if ($limit and $counter > $limit) continue; + if ($limit and $counter > $limit) + continue; } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-16 09:33:13
|
Revision: 9540 http://sourceforge.net/p/phpwiki/code/9540 Author: vargenau Date: 2015-02-16 09:33:10 +0000 (Mon, 16 Feb 2015) Log Message: ----------- Use parent::__construct Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2015-02-13 09:31:11 UTC (rev 9539) +++ trunk/lib/WikiTheme.php 2015-02-16 09:33:10 UTC (rev 9540) @@ -1858,7 +1858,7 @@ */ function __construct($text, $name = '', $class = '', $options = array()) { - $this->__construct('input', array('type' => 'submit', 'value' => $text)); + parent::__construct('input', array('type' => 'submit', 'value' => $text)); if ($name) $this->setAttr('name', $name); if ($class) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-17 10:03:06
|
Revision: 9541 http://sourceforge.net/p/phpwiki/code/9541 Author: vargenau Date: 2015-02-17 10:02:59 +0000 (Tue, 17 Feb 2015) Log Message: ----------- Check it is really a _WikiUser Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2015-02-16 09:33:10 UTC (rev 9540) +++ trunk/lib/WikiTheme.php 2015-02-17 10:02:59 UTC (rev 9541) @@ -1638,7 +1638,7 @@ global $request; if (!$UserCalPageTitle) { - if (!empty($request->_user)) { + if (is_a($request->_user, "_WikiUser")) { $UserCalPageTitle = $request->_user->getId().'/'._("Calendar"); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-26 13:45:21
|
Revision: 9566 http://sourceforge.net/p/phpwiki/code/9566 Author: vargenau Date: 2015-02-26 13:45:20 +0000 (Thu, 26 Feb 2015) Log Message: ----------- Make some class variables private Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2015-02-26 13:44:03 UTC (rev 9565) +++ trunk/lib/WikiTheme.php 2015-02-26 13:45:20 UTC (rev 9566) @@ -116,11 +116,11 @@ foreach ($parts as $part) { $path[] = $part; $parent = join('/', $path); - if ($WikiTheme->_autosplitWikiWords) + if ($WikiTheme->autosplitWikiWords) $part = " " . $part; if ($part) $link->pushContent($WikiTheme->linkExistingWikiWord($parent, $sep . $part)); - $sep = $WikiTheme->_autosplitWikiWords + $sep = $WikiTheme->autosplitWikiWords ? ' ' . '/' : '/'; } if ($exists) @@ -360,11 +360,10 @@ // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_crt_strftime.2c_.wcsftime.asp // As a result, we have to use %d, and strip out leading zeros ourselves. - public $_dateFormat = "%B %d, %Y"; - public $_timeFormat = "%I:%M %p"; + private $dateFormat = "%B %d, %Y"; + private $timeFormat = "%I:%M %p"; + private $showModTime = true; - public $_showModTime = true; - /** * Set format string used for dates. * @@ -376,8 +375,8 @@ */ function setDateFormat($fs, $show_mod_time = true) { - $this->_dateFormat = $fs; - $this->_showModTime = $show_mod_time; + $this->dateFormat = $fs; + $this->showModTime = $show_mod_time; } /** @@ -387,7 +386,7 @@ */ function setTimeFormat($fs) { - $this->_timeFormat = $fs; + $this->timeFormat = $fs; } /** @@ -411,7 +410,7 @@ // strip leading zeros from date elements (ie space followed by zero // or leading 0 as in French "09 mai 2009") return preg_replace('/ 0/', ' ', preg_replace('/^0/', ' ', - strftime($this->_dateFormat, $offset_time))); + strftime($this->dateFormat, $offset_time))); } /** @@ -435,7 +434,7 @@ $offset_time = $time_t + 3600 * $request->getPref('timeOffset'); return preg_replace('/^0/', ' ', - strtolower(strftime($this->_timeFormat, $offset_time))); + strtolower(strftime($this->timeFormat, $offset_time))); } /** @@ -518,7 +517,7 @@ $show_version = !$revision->isCurrent(); if ($request->getPref('relativeDates') && ($date = $this->_relativeDay($mtime))) { - if ($this->_showModTime) + if ($this->showModTime) $date = sprintf(_("%s at %s"), $date, $this->formatTime($mtime)); @@ -528,7 +527,7 @@ return fmt("Last edited on %s", $date); } - if ($this->_showModTime) + if ($this->showModTime) $date = $this->formatDateTime($mtime); else $date = $this->formatDate($mtime); @@ -645,26 +644,26 @@ // //////////////////////////////////////////////////////////////// - public $_autosplitWikiWords = false; + private $autosplitWikiWords = false; function setAutosplitWikiWords($autosplit = true) { - $this->_autosplitWikiWords = $autosplit ? true : false; + $this->autosplitWikiWords = $autosplit ? true : false; } function maybeSplitWikiWord($wikiword) { - if ($this->_autosplitWikiWords) + if ($this->autosplitWikiWords) return SplitPagename($wikiword); else return $wikiword; } - public $_anonEditUnknownLinks = true; + private $anonEditUnknownLinks = true; function setAnonEditUnknownLinks($anonedit = true) { - $this->_anonEditUnknownLinks = $anonedit ? true : false; + $this->anonEditUnknownLinks = $anonedit ? true : false; } function linkExistingWikiWord($wikiword, $linktext = '', $version = false) @@ -720,7 +719,7 @@ return $link; } else { // if AnonEditUnknownLinks show "?" only users which are allowed to edit this page - if (!$this->_anonEditUnknownLinks and + if (!$this->anonEditUnknownLinks and (!$request->_user->isSignedIn() or !mayAccessPage('edit', $request->getArg('pagename'))) ) { @@ -782,7 +781,7 @@ // Images and Icons // //////////////////////////////////////////////////////////////// - public $_imageAliases = array(); + private $imageAliases = array(); /* * @@ -791,16 +790,16 @@ function addImageAlias($alias, $image_name) { // fall back to the PhpWiki-supplied image if not found - if ((empty($this->_imageAliases[$alias]) + if ((empty($this->imageAliases[$alias]) and $this->_findFile("images/$image_name", true)) or $image_name === false ) - $this->_imageAliases[$alias] = $image_name; + $this->imageAliases[$alias] = $image_name; } function getImageURL($image) { - $aliases = &$this->_imageAliases; + $aliases = &$this->imageAliases; if (isset($aliases[$image])) { $image = $aliases[$image]; @@ -829,19 +828,19 @@ return $path; } - public $_linkIcons; + private $linkIcons; function setLinkIcon($proto, $image = false) { if (!$image) $image = $proto; - $this->_linkIcons[$proto] = $image; + $this->linkIcons[$proto] = $image; } function getLinkIconURL($proto) { - $icons = &$this->_linkIcons; + $icons = &$this->linkIcons; if (!empty($icons[$proto])) return $this->getImageURL($icons[$proto]); elseif (!empty($icons['*'])) @@ -849,25 +848,25 @@ return false; } - public $_linkIcon = 'front'; // or 'after' or 'no'. + private $linkIcon = 'front'; // or 'after' or 'no'. // maybe also 'spanall': there is a scheme currently in effect with front, which // spans the icon only to the first, to let the next words wrap on line breaks // see stdlib.php:PossiblyGlueIconToText() function getLinkIconAttr() { - return $this->_linkIcon; + return $this->linkIcon; } function setLinkIconAttr($where) { - $this->_linkIcon = $where; + $this->linkIcon = $where; } - public $_buttonAliases; + private $buttonAliases; function addButtonAlias($text, $alias = false) { - $aliases = &$this->_buttonAliases; + $aliases = &$this->buttonAliases; if (is_array($text)) $aliases = array_merge($aliases, $text); @@ -880,7 +879,7 @@ function getButtonURL($text) { - $aliases = &$this->_buttonAliases; + $aliases = &$this->buttonAliases; if (isset($aliases[$text])) $text = $aliases[$text]; @@ -908,14 +907,14 @@ return $url; } - public $_button_path; + private $button_path; function _findButton($button_file) { - if (empty($this->_button_path)) - $this->_button_path = $this->_getButtonPath(); + if (empty($this->button_path)) + $this->button_path = $this->_getButtonPath(); - foreach ($this->_button_path as $dir) { + foreach ($this->button_path as $dir) { if ($path = $this->_findData("$dir/$button_file", 1)) return $path; } @@ -1169,16 +1168,16 @@ } //---------------------------------------------------------------- - public $_buttonSeparator = "\n | "; + private $_buttonSeparator = "\n | "; function setButtonSeparator($separator) { - $this->_buttonSeparator = $separator; + $this->buttonSeparator = $separator; } function getButtonSeparator() { - return $this->_buttonSeparator; + return $this->buttonSeparator; } //////////////////////////////////////////////////////////////// This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-26 13:58:48
|
Revision: 9567 http://sourceforge.net/p/phpwiki/code/9567 Author: vargenau Date: 2015-02-26 13:58:41 +0000 (Thu, 26 Feb 2015) Log Message: ----------- Add function getAutosplitWikiWords Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2015-02-26 13:45:20 UTC (rev 9566) +++ trunk/lib/WikiTheme.php 2015-02-26 13:58:41 UTC (rev 9567) @@ -116,11 +116,11 @@ foreach ($parts as $part) { $path[] = $part; $parent = join('/', $path); - if ($WikiTheme->autosplitWikiWords) + if ($WikiTheme->getAutosplitWikiWords()) $part = " " . $part; if ($part) $link->pushContent($WikiTheme->linkExistingWikiWord($parent, $sep . $part)); - $sep = $WikiTheme->autosplitWikiWords + $sep = $WikiTheme->getAutosplitWikiWords() ? ' ' . '/' : '/'; } if ($exists) @@ -651,6 +651,11 @@ $this->autosplitWikiWords = $autosplit ? true : false; } + function getAutosplitWikiWords() + { + return $this->autosplitWikiWords; + } + function maybeSplitWikiWord($wikiword) { if ($this->autosplitWikiWords) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-03-03 15:37:05
|
Revision: 9590 http://sourceforge.net/p/phpwiki/code/9590 Author: vargenau Date: 2015-03-03 15:37:03 +0000 (Tue, 03 Mar 2015) Log Message: ----------- Revert __construct par ImageButton Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2015-03-03 15:35:23 UTC (rev 9589) +++ trunk/lib/WikiTheme.php 2015-03-03 15:37:03 UTC (rev 9590) @@ -1797,7 +1797,7 @@ * @param $img_url string URL for button's image. * @param $img_attr array Additional attributes for the <img> tag. */ - function __construct($text, $url, $class, $img_url, $img_attr = array()) + function ImageButton($text, $url, $class, $img_url, $img_attr = array()) { /** * @var WikiRequest $request This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-04-01 13:44:47
|
Revision: 9636 http://sourceforge.net/p/phpwiki/code/9636 Author: vargenau Date: 2015-04-01 13:44:45 +0000 (Wed, 01 Apr 2015) Log Message: ----------- Fix test Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2015-04-01 13:31:30 UTC (rev 9635) +++ trunk/lib/WikiTheme.php 2015-04-01 13:44:45 UTC (rev 9636) @@ -1638,35 +1638,33 @@ $dbi = $request->getDbh(); // display flat calender dhtml in the sidebar - if ($dbi->isWikiPage($this->calendarBase())) { - $jslang = @$GLOBALS['LANG']; - $this->addMoreHeaders - ( + $jslang = @$GLOBALS['LANG']; + $this->addMoreHeaders( $this->_CSSlink(0, $this->_findFile('jscalendar/calendar-phpwiki.css'), 'all')); - $this->addMoreHeaders + $this->addMoreHeaders (JavaScript('', array('src' => $this->_findData('jscalendar/calendar' . (DEBUG ? '' : '_stripped') . '.js')))); - if (!($langfile = $this->_findData("jscalendar/lang/calendar-$jslang.js"))) + if (!($langfile = $this->_findData("jscalendar/lang/calendar-$jslang.js"))) $langfile = $this->_findData("jscalendar/lang/calendar-en.js"); - $this->addMoreHeaders(JavaScript('', array('src' => $langfile))); - $this->addMoreHeaders + $this->addMoreHeaders(JavaScript('', array('src' => $langfile))); + $this->addMoreHeaders (JavaScript('', array('src' => $this->_findData('jscalendar/calendar-setup' . (DEBUG ? '' : '_stripped') . '.js')))); - // Get existing date entries for the current user - require_once 'lib/TextSearchQuery.php'; - $iter = $dbi->titleSearch(new TextSearchQuery("^" . $this->calendarBase() . '/', true, "auto")); - $existing = array(); - while ($page = $iter->next()) { - if ($page->exists()) - $existing[] = basename($page->_pagename); - } - if (!empty($existing)) { - $js_exist = '{"' . join('":1,"', $existing) . '":1}'; - //var SPECIAL_DAYS = {"2004-05-11":1,"2004-05-12":1,"2004-06-01":1} - $this->addMoreHeaders(JavaScript(' + // Get existing date entries for the current user + require_once 'lib/TextSearchQuery.php'; + $iter = $dbi->titleSearch(new TextSearchQuery("^" . $this->calendarBase() . '/', true, "auto")); + $existing = array(); + while ($page = $iter->next()) { + if ($page->exists()) + $existing[] = basename($page->_pagename); + } + if (!empty($existing)) { + $js_exist = '{"' . join('":1,"', $existing) . '":1}'; + //var SPECIAL_DAYS = {"2004-05-11":1,"2004-05-12":1,"2004-06-01":1} + $this->addMoreHeaders(JavaScript(' /* This table holds the existing calender entries for the current user * calculated from the database */ @@ -1692,10 +1690,9 @@ else return false; } ')); - } else { - $this->addMoreHeaders(JavaScript(' + } else { + $this->addMoreHeaders(JavaScript(' function dateStatusFunc(date, y, m, d) { return false;}')); - } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-04-17 09:14:31
|
Revision: 9685 http://sourceforge.net/p/phpwiki/code/9685 Author: vargenau Date: 2015-04-17 09:14:23 +0000 (Fri, 17 Apr 2015) Log Message: ----------- BLOG_EMPTY_DEFAULT_PREFIX --> BLOG_DEFAULT_EMPTY_PREFIX Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2015-04-16 16:38:54 UTC (rev 9684) +++ trunk/lib/WikiTheme.php 2015-04-17 09:14:23 UTC (rev 9685) @@ -1620,7 +1620,7 @@ } } if (!$UserCalPageTitle) { - if (BLOG_EMPTY_DEFAULT_PREFIX) { + if (defined('BLOG_DEFAULT_EMPTY_PREFIX') and BLOG_DEFAULT_EMPTY_PREFIX) { $UserCalPageTitle = "Blog"; } else { $UserCalPageTitle = $request->_user->getId() . '/' . "Blog"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-04-17 09:21:21
|
Revision: 9686 http://sourceforge.net/p/phpwiki/code/9686 Author: vargenau Date: 2015-04-17 09:21:14 +0000 (Fri, 17 Apr 2015) Log Message: ----------- Check request->_user is set Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2015-04-17 09:14:23 UTC (rev 9685) +++ trunk/lib/WikiTheme.php 2015-04-17 09:21:14 UTC (rev 9686) @@ -1615,7 +1615,7 @@ global $request; if (!$UserCalPageTitle) { - if (is_a($request->_user, "_WikiUser")) { + if (isset($request->_user) && is_a($request->_user, "_WikiUser")) { $UserCalPageTitle = $request->_user->getId().'/'._("Calendar"); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-06-29 09:50:10
|
Revision: 9700 http://sourceforge.net/p/phpwiki/code/9700 Author: vargenau Date: 2015-06-29 09:50:07 +0000 (Mon, 29 Jun 2015) Log Message: ----------- Update jquery to 1.11.3 Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2015-06-29 09:49:03 UTC (rev 9699) +++ trunk/lib/WikiTheme.php 2015-06-29 09:50:07 UTC (rev 9700) @@ -259,7 +259,7 @@ $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("wikicommon.js")))); if (!(defined('FUSIONFORGE') && FUSIONFORGE)) { // FusionForge already loads this - $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("jquery-1.11.2.min.js")))); + $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("jquery-1.11.3.min.js")))); $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("jquery.tablesorter.min.js")))); } // by pixels This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-03-10 17:11:18
|
Revision: 9808 http://sourceforge.net/p/phpwiki/code/9808 Author: vargenau Date: 2016-03-10 17:11:15 +0000 (Thu, 10 Mar 2016) Log Message: ----------- Use <button> tag Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2016-03-10 16:36:57 UTC (rev 9807) +++ trunk/lib/WikiTheme.php 2016-03-10 17:11:15 UTC (rev 9808) @@ -1796,11 +1796,11 @@ * @param $text string The text for the button. * @param $name string The name of the form field. * @param $class string The CSS class for the button. - * @param $options array Additional attributes for the <input> tag. + * @param $options array Additional attributes for the <button> tag. */ function SubmitButton($text, $name = '', $class = '', $options = array()) { - $this->__construct('input', array('type' => 'submit', 'value' => $text)); + $this->__construct('button', array('type' => 'submit'), $text); if ($name) $this->setAttr('name', $name); if ($class) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-03-17 18:04:40
|
Revision: 9813 http://sourceforge.net/p/phpwiki/code/9813 Author: vargenau Date: 2016-03-17 18:04:37 +0000 (Thu, 17 Mar 2016) Log Message: ----------- Revert r9808: Use <button> tag Revision Links: -------------- http://sourceforge.net/p/phpwiki/code/9808 Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2016-03-17 09:41:08 UTC (rev 9812) +++ trunk/lib/WikiTheme.php 2016-03-17 18:04:37 UTC (rev 9813) @@ -1796,11 +1796,11 @@ * @param $text string The text for the button. * @param $name string The name of the form field. * @param $class string The CSS class for the button. - * @param $options array Additional attributes for the <button> tag. + * @param $options array Additional attributes for the <input> tag. */ function SubmitButton($text, $name = '', $class = '', $options = array()) { - $this->__construct('button', array('type' => 'submit'), $text); + $this->__construct('input', array('type' => 'submit', 'value' => $text)); if ($name) $this->setAttr('name', $name); if ($class) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-05-23 18:52:50
|
Revision: 9840 http://sourceforge.net/p/phpwiki/code/9840 Author: vargenau Date: 2016-05-23 18:52:48 +0000 (Mon, 23 May 2016) Log Message: ----------- Use __construct Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2016-05-23 18:45:55 UTC (rev 9839) +++ trunk/lib/WikiTheme.php 2016-05-23 18:52:48 UTC (rev 9840) @@ -1798,9 +1798,9 @@ * @param $class string The CSS class for the button. * @param $options array Additional attributes for the <input> tag. */ - function SubmitButton($text, $name = '', $class = '', $options = array()) + function __construct($text, $name = '', $class = '', $options = array()) { - $this->__construct('input', array('type' => 'submit', 'value' => $text)); + parent::__construct('input', array('type' => 'submit', 'value' => $text)); if ($name) $this->setAttr('name', $name); if ($class) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-05-23 18:56:38
|
Revision: 9841 http://sourceforge.net/p/phpwiki/code/9841 Author: vargenau Date: 2016-05-23 18:56:36 +0000 (Mon, 23 May 2016) Log Message: ----------- Use __construct Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2016-05-23 18:52:48 UTC (rev 9840) +++ trunk/lib/WikiTheme.php 2016-05-23 18:56:36 UTC (rev 9841) @@ -1825,11 +1825,11 @@ * @param $img_url string URL for button's image. * @param $img_attr array Additional attributes for the <img> tag. */ - function SubmitImageButton($text, $name = '', $class = '', $img_url, $img_attr = array()) + function __construct($text, $name = '', $class = '', $img_url, $img_attr = array()) { - $this->__construct('input', array('type' => 'image', - 'src' => $img_url, - 'alt' => $text)); + parent::__construct('input', array('type' => 'image', + 'src' => $img_url, + 'alt' => $text)); if ($name) $this->setAttr('name', $name); if ($class) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-05-23 19:16:34
|
Revision: 9842 http://sourceforge.net/p/phpwiki/code/9842 Author: vargenau Date: 2016-05-23 19:16:31 +0000 (Mon, 23 May 2016) Log Message: ----------- Use __construct Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2016-05-23 18:56:36 UTC (rev 9841) +++ trunk/lib/WikiTheme.php 2016-05-23 19:16:31 UTC (rev 9842) @@ -1857,7 +1857,7 @@ */ class SidebarBox { - function SidebarBox($title, $body) + function __construct($title, $body) { require_once 'lib/WikiPlugin.php'; $this->title = $title; @@ -1880,7 +1880,7 @@ public $_plugin, $_args = false, $_basepage = false; - function PluginSidebarBox($name, $args = false, $basepage = false) + function __construct($name, $args = false, $basepage = false) { require_once 'lib/WikiPlugin.php'; @@ -1911,7 +1911,7 @@ // Various boxes which are no plugins class RelatedLinksBox extends SidebarBox { - function RelatedLinksBox($title = false, $body = '', $limit = 20) + function __construct($title = false, $body = '', $limit = 20) { /** * @var WikiRequest $request @@ -1938,7 +1938,7 @@ class RelatedExternalLinksBox extends SidebarBox { - function RelatedExternalLinksBox($title = false, $body = '', $limit = 20) + function __construct($title = false, $body = '', $limit = 20) { /** * @var WikiRequest $request This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-05-25 08:12:25
|
Revision: 9843 http://sourceforge.net/p/phpwiki/code/9843 Author: vargenau Date: 2016-05-25 08:12:23 +0000 (Wed, 25 May 2016) Log Message: ----------- Add warning comment Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2016-05-23 19:16:31 UTC (rev 9842) +++ trunk/lib/WikiTheme.php 2016-05-25 08:12:23 UTC (rev 9843) @@ -1724,6 +1724,8 @@ * @param string $url The url (href) for the button. * @param string $class The CSS class for the button. * @param array $options Additional attributes for the <input> tag. + * + * Do NOT replace with __construct: will break RSS icons links in RecentChanges */ function Button($text, $url, $class = '', $options = array()) { @@ -1755,12 +1757,13 @@ class ImageButton extends Button { /** - * * @param $text string The text for the button. * @param $url string The url (href) for the button. * @param $class string The CSS class for the button. * @param $img_url string URL for button's image. * @param $img_attr array Additional attributes for the <img> tag. + * + * Do NOT replace with __construct: will break RSS icons links in RecentChanges */ function ImageButton($text, $url, $class, $img_url, $img_attr = array()) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-07-11 14:50:18
|
Revision: 9873 http://sourceforge.net/p/phpwiki/code/9873 Author: vargenau Date: 2016-07-11 14:50:15 +0000 (Mon, 11 Jul 2016) Log Message: ----------- Consistent PHP Doc syntax Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2016-07-11 12:55:52 UTC (rev 9872) +++ trunk/lib/WikiTheme.php 2016-07-11 14:50:15 UTC (rev 9873) @@ -1724,7 +1724,7 @@ * @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. + * @param array $options Additional attributes for the <input> tag. * * Do NOT replace with __construct: will break RSS icons links in RecentChanges */ @@ -1758,11 +1758,11 @@ class ImageButton extends Button { /** - * @param $text string The text for the button. - * @param $url string The url (href) for the button. - * @param $class string The CSS class for the button. - * @param $img_url string URL for button's image. - * @param $img_attr array Additional attributes for the <img> tag. + * @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 string $img_url URL for button's image. + * @param array $img_attr array Additional attributes for the <img> tag. * * Do NOT replace with __construct: will break RSS icons links in RecentChanges */ @@ -1797,10 +1797,10 @@ class SubmitButton extends HtmlElement { /** - * @param $text string The text for the button. - * @param $name string The name of the form field. - * @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 $name The name of the form field. + * @param string $class The CSS class for the button. + * @param array $options Additional attributes for the <input> tag. */ function __construct($text, $name = '', $class = '', $options = array()) { @@ -1823,11 +1823,11 @@ class SubmitImageButton extends SubmitButton { /** - * @param $text string The text for the button. - * @param $name string The name of the form field. - * @param $class string The CSS class for the button. - * @param $img_url string URL for button's image. - * @param $img_attr array Additional attributes for the <img> tag. + * @param string $text The text for the button. + * @param string $name The name of the form field. + * @param string $class The CSS class for the button. + * @param string $img_url URL for button's image. + * @param array $img_attr Additional attributes for the <img> tag. */ function __construct($text, $name = '', $class = '', $img_url, $img_attr = array()) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-07-11 15:18:24
|
Revision: 9874 http://sourceforge.net/p/phpwiki/code/9874 Author: vargenau Date: 2016-07-11 15:18:21 +0000 (Mon, 11 Jul 2016) Log Message: ----------- Fix Crao Sign In buttons Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2016-07-11 14:50:15 UTC (rev 9873) +++ trunk/lib/WikiTheme.php 2016-07-11 15:18:21 UTC (rev 9874) @@ -1820,7 +1820,7 @@ /* * A class representing an image form <samp>submit</samp> button. */ -class SubmitImageButton extends SubmitButton +class SubmitImageButton extends HtmlElement { /** * @param string $text The text for the button. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |