phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] SF.net SVN: phpwiki:[9312] trunk/lib/Units.php

[<var...@us...>]

Revision: 9312
          http://sourceforge.net/p/phpwiki/code/9312
Author:   vargenau
Date:     2014-11-15 17:44:51 +0000 (Sat, 15 Nov 2014)
Log Message:
-----------
PHP Doc

Modified Paths:
--------------
    trunk/lib/Units.php

Modified: trunk/lib/Units.php
===================================================================
--- trunk/lib/Units.php	2014-11-15 17:38:49 UTC (rev 9311)
+++ trunk/lib/Units.php	2014-11-15 17:44:51 UTC (rev 9312)
@@ -35,6 +35,9 @@
 
     /**
      * $this->_attribute_base = $units->Definition($this->_attribute);
+     *
+     * @param string $query
+     * @return string
      */
     function Definition($query)
     {
@@ -67,10 +70,15 @@
      * We must ensure that the same baseunits are matched against.
      * We cannot compare m^2 to m or ''
      * $val_base = $this->_units->basevalue($value); // SemanticAttributeSearchQuery
+     *
+     * @param string $query
+     * @param bool $def
+     * @return bool|string
      */
     function basevalue($query, $def = false)
     {
-        if (!$def) $def = $this->Definition($query);
+        if (!$def)
+            $def = $this->Definition($query);
         if ($def) {
             if (is_numeric($def)) // e.g. "1 million"
                 return $def;
@@ -83,10 +91,15 @@
     /**
      * $this->_unit = $units->baseunit($this->_attribute);  // SemanticAttributeSearchQuery
      * and Cached_SemanticLink::_expandurl()
+     *
+     * @param string $query
+     * @param bool $def
+     * @return string
      */
     function baseunit($query, $def = false)
     {
-        if (!$def) $def = $this->Definition($query);
+        if (!$def)
+            $def = $this->Definition($query);
         if ($def) {
             if (preg_match("/ (.+)$/", $def, $m))
                 return $m[1];
@@ -96,7 +109,8 @@
 
     function _cmd($args)
     {
-        if ($this->errcode) return $args;
+        if ($this->errcode)
+            return $args;
         if (defined("UNITS_EXE")) {
             $s = UNITS_EXE . " $args";
             $result = `$s`;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9311] trunk/lib/SpamBlocklist.php

[<var...@us...>]

Revision: 9311
          http://sourceforge.net/p/phpwiki/code/9311
Author:   vargenau
Date:     2014-11-15 17:38:49 +0000 (Sat, 15 Nov 2014)
Log Message:
-----------
PHP Doc; remove debug

Modified Paths:
--------------
    trunk/lib/SpamBlocklist.php

Modified: trunk/lib/SpamBlocklist.php
===================================================================
--- trunk/lib/SpamBlocklist.php	2014-11-13 20:10:04 UTC (rev 9310)
+++ trunk/lib/SpamBlocklist.php	2014-11-15 17:38:49 UTC (rev 9311)
@@ -20,7 +20,7 @@
  *
  */
 
-/**
+/*
  * See http://www.surbl.org/
  *
  * Perform a name lookup (A) for any link tld against multi.surbl.org and bl.spamcop.net,
@@ -29,9 +29,12 @@
  * This is the same, but a bit lighter than PEAR::Net_DNSBL_SURBL
  */
 
-/*
+/**
  * Strip domain prefixes so that either the last two name parts are returned,
  * or if it's a known tld (like "co.uk") the last three.
+ *
+ * @param string $host
+ * @return string
  */
 function stripDomainPrefixes($host)
 {
@@ -58,6 +61,11 @@
     return $host;
 }
 
+/**
+ * @param string $uri
+ * @return int
+ */
+
 function IsBlackListed($uri)
 {
     static $blacklists = array("multi.surbl.org", "bl.spamcop.net");
@@ -98,28 +106,6 @@
     return 0;
 }
 
-/*
-if (defined('SPAMBLOCKLIST_TEST') and SPAMBLOCKLIST_TEST) {
-    BlackListDebug("10.20.30.40");
-    BlackListDebug("spammer.org");
-    BlackListDebug("www.ricoruca.com");
-    BlackListDebug("ricoruca.com");
-    BlackListDebug("soft-sky.org");
-    BlackListDebug("lovers.lv");
-    BlackListDebug("wumort.net");
-    BlackListDebug("bibleinayear.org");
-    BlackListDebug("p50927464.dip.t-dialin.net");
-}
-function BlackListDebug($host) {
-    $res = IsBlackListed($host);
-    echo sprintf("%12s", $host), "\tis";
-    if ($res)
-    echo " listed at $res[0] - $res[1]\n";
-    else
-    echo " not blacklisted.\n";
-}
-*/
-
 // Local Variables:
 // mode: php
 // tab-width: 8

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9310] trunk/lib/WikiUser.php

[<var...@us...>]

Revision: 9310
          http://sourceforge.net/p/phpwiki/code/9310
Author:   vargenau
Date:     2014-11-13 20:10:04 +0000 (Thu, 13 Nov 2014)
Log Message:
-----------
GeneratePage is void

Modified Paths:
--------------
    trunk/lib/WikiUser.php

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2014-11-12 17:14:28 UTC (rev 9309)
+++ trunk/lib/WikiUser.php	2014-11-13 20:10:04 UTC (rev 9310)
@@ -500,8 +500,7 @@
     }
 
     //Fixme: for _HttpAuthPassUser
-    function PrintLoginForm(&$request, $args, $fail_message = false,
-                            $separate_page = false)
+    function PrintLoginForm(&$request, $args, $fail_message = '', $separate_page = false)
     {
         include_once 'lib/Template.php';
         // Call update_locale in case the system's default language is not 'en'.
@@ -524,9 +523,9 @@
         if ($separate_page) {
             $page = $request->getPage($pagename);
             $revision = $page->getCurrentRevision();
-            return GeneratePage($login, _("Sign In"), $revision);
+            GeneratePage($login, _("Sign In"), $revision);
         } else {
-            return $login->printExpansion();
+            $login->printExpansion();
         }
     }
 
@@ -1035,10 +1034,10 @@
 
     function getAuthDbh()
     {
-        global $request; //, $DBParams, $DBAuthParams;
+        global $request;
 
         $dbh = $request->getDbh();
-        // session restauration doesn't re-connect to the database automatically,
+        // session restoration doesn't re-connect to the database automatically,
         // so dirty it here, to force a reconnect.
         if (isset($this->_auth_dbi)) {
             if (($dbh->getParam('dbtype') == 'SQL') and empty($this->_auth_dbi->connection))
@@ -1082,10 +1081,10 @@
     }
 
     // TODO: use it again for the auth and member tables
-    // sprintfstyle vs prepare style: %s or ?
+    // sprintf style vs prepare style: %s or ?
     //   multiple vars should be executed via prepare(?,?)+execute,
     //   single vars with execute(sprintf(quote(var)))
-    // help with position independency
+    // help with position independence
     function prepare($stmt, $variables, $oldstyle = false, $sprintfstyle = true)
     {
         global $request;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9309] trunk/lib/BlockParser.php

[<var...@us...>]

Revision: 9309
          http://sourceforge.net/p/phpwiki/code/9309
Author:   vargenau
Date:     2014-11-12 17:14:28 +0000 (Wed, 12 Nov 2014)
Log Message:
-----------
Use __construct

Modified Paths:
--------------
    trunk/lib/BlockParser.php

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2014-11-12 17:13:27 UTC (rev 9308)
+++ trunk/lib/BlockParser.php	2014-11-12 17:14:28 UTC (rev 9309)
@@ -664,7 +664,7 @@
 
     function __construct($term, $defn)
     {
-        $this->XmlContent();
+        parent::__construct();
         if (!is_array($defn))
             $defn = $defn->getContent();
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9308] trunk/lib/plugin/PageTrail.php

[<var...@us...>]

Revision: 9308
          http://sourceforge.net/p/phpwiki/code/9308
Author:   vargenau
Date:     2014-11-12 17:13:27 +0000 (Wed, 12 Nov 2014)
Log Message:
-----------
Add braces

Modified Paths:
--------------
    trunk/lib/plugin/PageTrail.php

Modified: trunk/lib/plugin/PageTrail.php
===================================================================
--- trunk/lib/plugin/PageTrail.php	2014-11-12 09:50:30 UTC (rev 9307)
+++ trunk/lib/plugin/PageTrail.php	2014-11-12 17:13:27 UTC (rev 9308)
@@ -72,7 +72,9 @@
         // Get name of the current page we are on
         $thispage = $request->getArg('pagename');
         $Pages = $request->session->get("PageTrail");
-        if (!is_array($Pages)) $Pages = array();
+        if (!is_array($Pages)) {
+            $Pages = array();
+        }
 
         if (!isset($Pages[0]) or ($duplicates || ($thispage != $Pages[0]))) {
             array_unshift($Pages, $thispage);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9307] trunk/lib/plugin/PageTrail.php

[<var...@us...>]

Revision: 9307
          http://sourceforge.net/p/phpwiki/code/9307
Author:   vargenau
Date:     2014-11-12 09:50:30 +0000 (Wed, 12 Nov 2014)
Log Message:
-----------
Add braces

Modified Paths:
--------------
    trunk/lib/plugin/PageTrail.php

Modified: trunk/lib/plugin/PageTrail.php
===================================================================
--- trunk/lib/plugin/PageTrail.php	2014-11-11 19:56:43 UTC (rev 9306)
+++ trunk/lib/plugin/PageTrail.php	2014-11-12 09:50:30 UTC (rev 9307)
@@ -89,8 +89,9 @@
                         WikiLink($Pages[$i], 'auto'));
             }
             return $html;
-        } else
+        } else {
             return HTML();
+        }
     }
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9306] trunk/lib/WysiwygEdit/Wikiwyg.php

[<var...@us...>]

Revision: 9306
          http://sourceforge.net/p/phpwiki/code/9306
Author:   vargenau
Date:     2014-11-11 19:56:43 +0000 (Tue, 11 Nov 2014)
Log Message:
-----------
Use __construct; PHP Doc

Modified Paths:
--------------
    trunk/lib/WysiwygEdit/Wikiwyg.php

Modified: trunk/lib/WysiwygEdit/Wikiwyg.php
===================================================================
--- trunk/lib/WysiwygEdit/Wikiwyg.php	2014-11-11 14:14:55 UTC (rev 9305)
+++ trunk/lib/WysiwygEdit/Wikiwyg.php	2014-11-11 19:56:43 UTC (rev 9306)
@@ -20,7 +20,6 @@
 
     function __construct()
     {
-        global $request, $LANG;
         $this->_transformer_tags = false;
         $this->BasePath = DATA_PATH . '/themes/default/Wikiwyg';
         $this->_htmltextid = "edit-content";
@@ -96,6 +95,7 @@
             wikiwyg.editMode();}"
             );
         }
+        return '';
     }
 
     function Textarea($textarea, $wikitext, $name = 'edit[content]')
@@ -121,15 +121,21 @@
      * Handler to convert the Wiki Markup to HTML before editing.
      * This will be converted back by WysiwygEdit_ConvertAfter if required.
      *  *text* => '<b>text<b>'
+     *
+     * @param string $text
+     * @return string
      */
     function ConvertBefore($text)
     {
         return $text;
     }
 
-    /*
+    /**
      * No special PHP HTML->Wikitext conversion needed. This is done in js thanksfully.
      * Avoided in editpage.php: PageEditor->getContent
+     *
+     * @param string $text
+     * @return string
      */
     function ConvertAfter($text)
     {
@@ -139,7 +145,7 @@
 
 class WikiToHtml
 {
-    function WikiToHtml($wikitext, &$request)
+    function __construct($wikitext, &$request)
     {
         $this->_wikitext = $wikitext;
         $this->_request =& $request;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9305] trunk/lib/WysiwygEdit.php

[<var...@us...>]

Revision: 9305
          http://sourceforge.net/p/phpwiki/code/9305
Author:   vargenau
Date:     2014-11-11 14:14:55 +0000 (Tue, 11 Nov 2014)
Log Message:
-----------
Use __construct

Modified Paths:
--------------
    trunk/lib/WysiwygEdit.php

Modified: trunk/lib/WysiwygEdit.php
===================================================================
--- trunk/lib/WysiwygEdit.php	2014-11-10 21:08:06 UTC (rev 9304)
+++ trunk/lib/WysiwygEdit.php	2014-11-11 14:14:55 UTC (rev 9305)
@@ -40,6 +40,8 @@
      * Handler to convert the Wiki Markup to HTML before editing.
      * This will be converted back by WysiwygEdit_ConvertAfter if required.
      *  *text* => '<b>text<b>'
+     *
+     * @param $text
      */
     function ConvertBefore($text)
     {
@@ -54,6 +56,8 @@
      * '<b>text<b>' => '<span style="font-weight: bold">text</span>' => '*text*'
      *
      * TODO: Switch over to HtmlParser
+     *
+     * @param $text
      */
     function ConvertAfter($text)
     {
@@ -128,18 +132,17 @@
 
 class HtmlTransformer extends InlineTransformer
 {
-    function HtmlTransformer($tags = false)
+    function __construct($tags = false)
     {
-        if (!$tags) $tags =
-            array('escape', 'html_br', 'html_spanbold', 'html_simple_tag',
-                'html_p',);
+        if (!$tags)
+            $tags = array('escape', 'html_br', 'html_spanbold', 'html_simple_tag', 'html_p',);
         /*
          'html_a','html_span','html_div',
          'html_table','html_hr','html_pre',
          'html_blockquote',
          'html_indent','html_ol','html_li','html_ul','html_img'
         */
-        return $this->InlineTransformer($tags);
+        parent::__construct($tags);
     }
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9304] trunk/lib/XMLRPC/utils.php

[<var...@us...>]

Revision: 9304
          http://sourceforge.net/p/phpwiki/code/9304
Author:   vargenau
Date:     2014-11-10 21:08:06 +0000 (Mon, 10 Nov 2014)
Log Message:
-----------
Init retval

Modified Paths:
--------------
    trunk/lib/XMLRPC/utils.php

Modified: trunk/lib/XMLRPC/utils.php
===================================================================
--- trunk/lib/XMLRPC/utils.php	2014-11-10 19:57:33 UTC (rev 9303)
+++ trunk/lib/XMLRPC/utils.php	2014-11-10 21:08:06 UTC (rev 9304)
@@ -206,7 +206,7 @@
         $output = array('version' => 'xmlrpc');
     }
 
-    $response_buf = "";
+    $retval = "";
     if ($host && $uri && $port) {
         $request_xml = xmlrpc_encode_request($method, $args, $output);
         $response_buf = xu_query_http_post($request_xml, $host, $uri, $port, $debug,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9303] trunk/lib/XmlElement.php

[<var...@us...>]

Revision: 9303
          http://sourceforge.net/p/phpwiki/code/9303
Author:   vargenau
Date:     2014-11-10 19:57:33 +0000 (Mon, 10 Nov 2014)
Log Message:
-----------
Add class variables; PHP Doc

Modified Paths:
--------------
    trunk/lib/XmlElement.php

Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php	2014-11-10 19:46:50 UTC (rev 9302)
+++ trunk/lib/XmlElement.php	2014-11-10 19:57:33 UTC (rev 9303)
@@ -16,7 +16,7 @@
  */
 class XmlContent
 {
-    function XmlContent( /* ... */)
+    function __construct( /* ... */)
     {
         $this->_content = array();
         $this->_pushContent_array(func_get_args());
@@ -192,7 +192,7 @@
         return true;
     }
 
-    function _quote($string)
+    static function _quote($string)
     {
         if (!$string) return $string;
         return htmlspecialchars($string, ENT_COMPAT, 'UTF-8');
@@ -206,6 +206,11 @@
  */
 class XmlElement extends XmlContent
 {
+    public $_children;
+    public $_attr;
+    public $_tag;
+    public $_classes;
+
     function __construct($tagname /* , $attr_or_content , ...*/)
     {
         parent::__construct();
@@ -490,6 +495,9 @@
 
 class FormattedText
 {
+    public $_fs;
+    public $_args;
+
     function FormattedText($fs /* , ... */)
     {
         if ($fs !== false) {
@@ -561,10 +569,10 @@
 }
 
 /**
- * PHP5 compatibility
- * Error[2048]: Non-static method XmlContent::_quote() should not be called statically
  * Note: There's lot of room for performance increase if the right charset variant can
  * be created on load-time.
+ * @param string $string
+ * @return string
  */
 function XmlContent_quote($string)
 {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9302] trunk/lib

[<var...@us...>]

Revision: 9302
          http://sourceforge.net/p/phpwiki/code/9302
Author:   vargenau
Date:     2014-11-10 19:46:50 +0000 (Mon, 10 Nov 2014)
Log Message:
-----------
Type compatibility

Modified Paths:
--------------
    trunk/lib/config.php
    trunk/lib/display.php

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2014-11-10 19:35:50 UTC (rev 9301)
+++ trunk/lib/config.php	2014-11-10 19:46:50 UTC (rev 9302)
@@ -107,8 +107,10 @@
  *   => "de"
  * We should really check additionally if the i18n HomePage version is defined.
  * So must defer this to the request loop.
+ *
+ * @param array $languages
  */
-function guessing_lang($languages = false)
+function guessing_lang($languages = array())
 {
     if (!$languages) {
         // make this faster

Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2014-11-10 19:35:50 UTC (rev 9301)
+++ trunk/lib/display.php	2014-11-10 19:46:50 UTC (rev 9302)
@@ -219,10 +219,10 @@
 
 /**
  * @param WikiRequest $request
- * @param bool $template
+ * @param Template $template
  * @return string
  */
-function displayPage(&$request, $template = false)
+function displayPage(&$request, $template = null)
 {
     global $WikiTheme;
     global $robots;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9301] trunk/lib/prepend.php

[<var...@us...>]

Revision: 9301
          http://sourceforge.net/p/phpwiki/code/9301
Author:   vargenau
Date:     2014-11-10 19:35:50 +0000 (Mon, 10 Nov 2014)
Log Message:
-----------
Type compatibility

Modified Paths:
--------------
    trunk/lib/prepend.php

Modified: trunk/lib/prepend.php
===================================================================
--- trunk/lib/prepend.php	2014-11-09 20:00:47 UTC (rev 9300)
+++ trunk/lib/prepend.php	2014-11-10 19:35:50 UTC (rev 9301)
@@ -74,16 +74,19 @@
 
     /**
      * @param  string $which One of 'real', 'utime', 'stime', 'cutime', 'sutime'
-     * @param bool $now
+     * @param array $now
      * @return float  Seconds.
      */
-    function getTime($which = 'real', $now = false)
+    function getTime($which = 'real', $now = array())
     {
-        if ($which == 'real')
+        if ($which == 'real') {
             return $this->microtime() - $this->_start;
+        }
 
         if (isset($this->_times)) {
-            if (!$now) $now = posix_times();
+            if (empty($now)) {
+                $now = posix_times();
+            }
             $ticks = $now[$which] - $this->_times[$which];
             return $ticks / $this->_CLK_TCK();
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9300] trunk/lib

[<var...@us...>]

Revision: 9300
          http://sourceforge.net/p/phpwiki/code/9300
Author:   vargenau
Date:     2014-11-09 20:00:47 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
PHP Doc

Modified Paths:
--------------
    trunk/lib/AccessLog.php
    trunk/lib/FileFinder.php
    trunk/lib/HtmlElement.php
    trunk/lib/IniConfig.php
    trunk/lib/Template.php

Modified: trunk/lib/AccessLog.php
===================================================================
--- trunk/lib/AccessLog.php	2014-11-09 19:54:52 UTC (rev 9299)
+++ trunk/lib/AccessLog.php	2014-11-09 20:00:47 UTC (rev 9300)
@@ -107,7 +107,11 @@
     }
 
     /**
-     * Return iterator of referer items reverse sorted (latest first).
+     * Return iterator of referrer items reverse sorted (latest first).
+     *
+     * @param int $limit
+     * @param bool $external_only
+     * @return WikiDB_Array_generic_iter
      */
     function get_referer($limit = 15, $external_only = false)
     {

Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php	2014-11-09 19:54:52 UTC (rev 9299)
+++ trunk/lib/FileFinder.php	2014-11-09 20:00:47 UTC (rev 9300)
@@ -48,6 +48,9 @@
      * Unify used pathsep character.
      * Accepts array of paths also.
      * This might not work on Windows95 or FAT volumes. (not tested)
+     *
+     * @param string $path
+     * @return mixed|string
      */
     function slashifyPath($path)
     {
@@ -56,6 +59,10 @@
 
     /**
      * Force using '/' as path seperator.
+     *
+     * @param string $path
+     * @param string $sep
+     * @return mixed|string
      */
     function forcePathSlashes($path, $sep = '/')
     {
@@ -89,7 +96,7 @@
      * to PHP's include_path (if it's not already there.) Then the
      * file is include_once()'d.
      *
-     * @param $file string File to include.
+     * @param string $file File to include.
      * @return bool True if file was successfully included.
      */
     function includeOnce($file)

Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php	2014-11-09 19:54:52 UTC (rev 9299)
+++ trunk/lib/HtmlElement.php	2014-11-09 20:00:47 UTC (rev 9300)
@@ -48,6 +48,9 @@
 
     /**
      * This is used by the static factory methods is class HTML.
+     *
+     * @param array $args
+     * @return $this
      */
     protected function _init2($args)
     {

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2014-11-09 19:54:52 UTC (rev 9299)
+++ trunk/lib/IniConfig.php	2014-11-09 20:00:47 UTC (rev 9300)
@@ -68,6 +68,8 @@
  * Dump the static parts of the parsed config/config.ini settings to a fast-loadable config.php file.
  * The dynamic parts are then evaluated as before.
  * Requires write-permissions to config/config.php
+ *
+ * @param string $file
  */
 function save_dump($file)
 {

Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2014-11-09 19:54:52 UTC (rev 9299)
+++ trunk/lib/Template.php	2014-11-09 20:00:47 UTC (rev 9300)
@@ -8,6 +8,10 @@
 {
     /**
      * name optionally of form "theme/template" to include parent templates in children
+     *
+     * @param string $name
+     * @param WikiRequest $request
+     * @param array $args
      */
     function Template($name, &$request, $args = array())
     {
@@ -247,8 +251,6 @@
  * @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 = array())
 {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9299] trunk/lib/pear/DB.php

[<var...@us...>]

Revision: 9299
          http://sourceforge.net/p/phpwiki/code/9299
Author:   vargenau
Date:     2014-11-09 19:54:52 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
Add static

Modified Paths:
--------------
    trunk/lib/pear/DB.php

Modified: trunk/lib/pear/DB.php
===================================================================
--- trunk/lib/pear/DB.php	2014-11-09 18:15:48 UTC (rev 9298)
+++ trunk/lib/pear/DB.php	2014-11-09 19:54:52 UTC (rev 9299)
@@ -515,7 +515,7 @@
      *
      * @uses DB::parseDSN(), DB_common::setOption(), PEAR::isError()
      */
-    function &connect($dsn, $options = array())
+    static function &connect($dsn, $options = array())
     {
         $dsninfo = DB::parseDSN($dsn);
         $type = $dsninfo['phptype'];
@@ -589,7 +589,7 @@
      *
      * @return bool  whether $value is DB_Error object
      */
-    function isError($value)
+    static function isError($value)
     {
         return is_object($value) && is_a($value, 'DB_Error');		
     }
@@ -625,7 +625,7 @@
      *
      * @return boolean  whether $query is a data manipulation query
      */
-    function isManip($query)
+    static function isManip($query)
     {
         $manips = 'INSERT|UPDATE|DELETE|REPLACE|'
                 . 'CREATE|DROP|'
@@ -730,7 +730,7 @@
      *  + username: User name for login
      *  + password: Password for login
      */
-    function parseDSN($dsn)
+    static function parseDSN($dsn)
     {
         $parsed = array(
             'phptype'  => false,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9298] trunk/lib/plugin

[<var...@us...>]

Revision: 9298
          http://sourceforge.net/p/phpwiki/code/9298
Author:   vargenau
Date:     2014-11-09 18:15:48 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
Add class variables

Modified Paths:
--------------
    trunk/lib/plugin/AnalyseAccessLogSql.php
    trunk/lib/plugin/AsciiMath.php
    trunk/lib/plugin/AsciiSVG.php
    trunk/lib/plugin/AuthorHistory.php
    trunk/lib/plugin/Calendar.php
    trunk/lib/plugin/CalendarList.php
    trunk/lib/plugin/Chart.php
    trunk/lib/plugin/CreateToc.php
    trunk/lib/plugin/DebugBackendInfo.php
    trunk/lib/plugin/EditMetaData.php
    trunk/lib/plugin/ExternalSearch.php
    trunk/lib/plugin/FuzzyPages.php
    trunk/lib/plugin/LinkSearch.php
    trunk/lib/plugin/ModeratedPage.php
    trunk/lib/plugin/PageDump.php
    trunk/lib/plugin/PageHistory.php
    trunk/lib/plugin/PhpHighlight.php
    trunk/lib/plugin/Processing.php
    trunk/lib/plugin/RateIt.php
    trunk/lib/plugin/RecentChangesCached.php
    trunk/lib/plugin/SemanticSearch.php
    trunk/lib/plugin/SemanticSearchAdvanced.php
    trunk/lib/plugin/SiteMap.php
    trunk/lib/plugin/SqlResult.php
    trunk/lib/plugin/SyncWiki.php
    trunk/lib/plugin/SyntaxHighlighter.php
    trunk/lib/plugin/SystemInfo.php
    trunk/lib/plugin/Template.php
    trunk/lib/plugin/TexToPng.php
    trunk/lib/plugin/TranslateText.php
    trunk/lib/plugin/UpLoad.php
    trunk/lib/plugin/UserPreferences.php
    trunk/lib/plugin/VisualWiki.php
    trunk/lib/plugin/WantedPages.php
    trunk/lib/plugin/WantedPagesOld.php
    trunk/lib/plugin/WikiAdminSearchReplace.php
    trunk/lib/plugin/WikiAdminSelect.php
    trunk/lib/plugin/WikiAdminSetAclSimple.php
    trunk/lib/plugin/WikiBlog.php
    trunk/lib/plugin/WikiFormRich.php
    trunk/lib/plugin/WikiTranslation.php
    trunk/lib/plugin/YouTube.php

Modified: trunk/lib/plugin/AnalyseAccessLogSql.php
===================================================================
--- trunk/lib/plugin/AnalyseAccessLogSql.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/AnalyseAccessLogSql.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -29,6 +29,9 @@
 class WikiPlugin_AnalyseAccessLogSql
     extends WikiPlugin
 {
+    public $_theadrow;
+    public $_headerSet;
+
     /**
      * Build the query string
      *
@@ -52,6 +55,8 @@
      *          ."FROM $accesslog "
      *          ."WHERE referer IS NOT NULL "
      *          .$where_conditions
+     * @param array $args
+     * @return string
      */
     private function getQueryString(&$args)
     {

Modified: trunk/lib/plugin/AsciiMath.php
===================================================================
--- trunk/lib/plugin/AsciiMath.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/AsciiMath.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -41,6 +41,8 @@
 class WikiPlugin_AsciiMath
     extends WikiPlugin
 {
+    public $source;
+
     function getDescription()
     {
         return _("Render ASCII Math as MathML.");

Modified: trunk/lib/plugin/AsciiSVG.php
===================================================================
--- trunk/lib/plugin/AsciiSVG.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/AsciiSVG.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -28,6 +28,8 @@
 class WikiPlugin_AsciiSVG
     extends WikiPlugin
 {
+    public $source;
+
     function getDescription()
     {
         return _("Render inline ASCII SVG.");

Modified: trunk/lib/plugin/AuthorHistory.php
===================================================================
--- trunk/lib/plugin/AuthorHistory.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/AuthorHistory.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -59,6 +59,8 @@
 class WikiPlugin_AuthorHistory
     extends WikiPlugin
 {
+    public $_args;
+
     function getDescription()
     {
         return sprintf(_("List all page revisions edited by one user with diff links, or show a PageHistory-like list of a single page for only one user."));

Modified: trunk/lib/plugin/Calendar.php
===================================================================
--- trunk/lib/plugin/Calendar.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/Calendar.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -35,6 +35,10 @@
 class WikiPlugin_Calendar
     extends WikiPlugin
 {
+    public $args;
+    private $_today;
+    public $_links;
+
     function getDescription()
     {
         return _("Calendar");

Modified: trunk/lib/plugin/CalendarList.php
===================================================================
--- trunk/lib/plugin/CalendarList.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/CalendarList.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -49,6 +49,9 @@
 class WikiPlugin_CalendarList
     extends WikiPlugin
 {
+    public $args;
+    public $_links;
+
     function getDescription()
     {
         return _("CalendarList");

Modified: trunk/lib/plugin/Chart.php
===================================================================
--- trunk/lib/plugin/Chart.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/Chart.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -46,6 +46,8 @@
 class WikiPlugin_Chart
     extends WikiPlugin
 {
+    public $source;
+
     function getDescription()
     {
         return _("Render SVG charts.");

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/CreateToc.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -40,6 +40,8 @@
 class WikiPlugin_CreateToc
     extends WikiPlugin
 {
+    public $_markup;
+
     function getDescription()
     {
         return _("Create a Table of Contents and automatically link to headers.");

Modified: trunk/lib/plugin/DebugBackendInfo.php
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/DebugBackendInfo.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -26,6 +26,10 @@
 class WikiPlugin_DebugBackendInfo
     extends WikiPlugin
 {
+    public $chunk_split;
+    public $readonly_pagemeta;
+    public $hidden_pagemeta;
+
     function getDescription()
     {
         return sprintf(_("Get debugging information for %s."), '[pagename]');

Modified: trunk/lib/plugin/EditMetaData.php
===================================================================
--- trunk/lib/plugin/EditMetaData.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/EditMetaData.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -44,6 +44,8 @@
 class WikiPlugin_EditMetaData
     extends WikiPlugin_DebugBackendInfo
 {
+    public $_args;
+
     function getDescription()
     {
         return sprintf(_("Edit metadata for %s."), '[pagename]');

Modified: trunk/lib/plugin/ExternalSearch.php
===================================================================
--- trunk/lib/plugin/ExternalSearch.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/ExternalSearch.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -36,6 +36,10 @@
 class WikiPlugin_ExternalSearch
     extends WikiPlugin
 {
+    public $_url;
+    public $_name;
+    public $_s;
+
     function getDescription()
     {
         return _("Redirect to an external web site based on form input.");

Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/FuzzyPages.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -35,6 +35,11 @@
 class WikiPlugin_FuzzyPages
     extends WikiPlugin
 {
+    public $_searchterm;
+    public $_searchterm_metaphone;
+    public $debug;
+    public $_list;
+
     function getDescription()
     {
         return sprintf(_("Search for page titles similar to %s."),

Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/LinkSearch.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -31,6 +31,8 @@
 class WikiPlugin_LinkSearch
     extends WikiPlugin
 {
+    public $current_row;
+
     function getDescription()
     {
         return _("Search page and link names.");

Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/ModeratedPage.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -38,6 +38,8 @@
 class WikiPlugin_ModeratedPage
     extends WikiPlugin
 {
+    public $_tokens;
+
     function getDescription()
     {
         return _("Support moderated pages.");

Modified: trunk/lib/plugin/PageDump.php
===================================================================
--- trunk/lib/plugin/PageDump.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/PageDump.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -51,6 +51,7 @@
     extends WikiPlugin
 {
     public $MessageId;
+    public $pagename;
 
     function getDescription()
     {

Modified: trunk/lib/plugin/PageHistory.php
===================================================================
--- trunk/lib/plugin/PageHistory.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/PageHistory.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -25,9 +25,10 @@
 class _PageHistory_PageRevisionIter
     extends WikiDB_PageRevisionIterator
 {
+    public $_itemcount;
+
     function _PageHistory_PageRevisionIter($rev_iter, $params)
     {
-
         $this->_iter = $rev_iter;
 
         extract($params);

Modified: trunk/lib/plugin/PhpHighlight.php
===================================================================
--- trunk/lib/plugin/PhpHighlight.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/PhpHighlight.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -29,6 +29,14 @@
 class WikiPlugin_PhpHighlight
     extends WikiPlugin
 {
+    public $source;
+    public $oldstring;
+    public $oldcomment;
+    public $oldkeyword;
+    public $oldbg;
+    public $oldhtml;
+    public $olddefault;
+
     function getDescription()
     {
         return _("PHP syntax highlighting.");
@@ -58,7 +66,6 @@
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
-
         extract($this->getArgs($argstr, $request));
         $source =& $this->source;
         if (empty($source)) {

Modified: trunk/lib/plugin/Processing.php
===================================================================
--- trunk/lib/plugin/Processing.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/Processing.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -27,6 +27,8 @@
 class WikiPlugin_Processing
     extends WikiPlugin
 {
+    public $source;
+
     function getDescription()
     {
         return _("Render inline Processing.");

Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/RateIt.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -86,7 +86,15 @@
 {
     static $toBeUniq = 1;
     public $idTop = '';
+    public $imgPrefix;
+    public $dimension;
+    public $rating;
+    public $avg;
+    public $userid;
+    public $pagename;
+    public $numusers;
 
+
     function getDescription()
     {
         return _("Rating system. Store user ratings per page.");

Modified: trunk/lib/plugin/RecentChangesCached.php
===================================================================
--- trunk/lib/plugin/RecentChangesCached.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/RecentChangesCached.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -34,6 +34,11 @@
 class WikiPlugin_RecentChangesCached
     extends WikiPluginCached
 {
+    public $_args;
+    public $_type;
+    public $_static;
+    public $_dbi;
+
     function getPluginType()
     {
         return PLUGIN_CACHED_HTML;
@@ -54,11 +59,12 @@
         return '+900'; // 15 minutes
     }
 
-    // We don't go through pi parsing, instead we go directly to the
-    // better plugin methods.
     /**
+     * We don't go through pi parsing, instead we go directly to the
+     * better plugin methods.
+     *
      * @param WikiDB $dbi
-     * @param string $argstr
+     * @param string $args
      * @param WikiRequest $request
      * @param string $basepage
      * @return mixed
@@ -86,9 +92,17 @@
         trigger_error('pure virtual', E_USER_ERROR);
     }
 
-    // ->box is used to display a fixed-width, narrow version with common header.
-    // Just a limited list of pagenames, without date.
-    // This does not use ->run, to avoid pi construction and deconstruction
+    /**
+     * ->box is used to display a fixed-width, narrow version with common header.
+     * Just a limited list of pagenames, without date.
+     * This does not use ->run, to avoid pi construction and deconstruction
+     *
+     * @param string $args
+     * @param WikiRequest $request
+     * @param string $basepage
+     * @param bool $do_save
+     * @return $this|HtmlElement|XmlContent
+     */
     function box($args = '', $request = null, $basepage = '', $do_save = false)
     {
         if (!$request) $request =& $GLOBALS['request'];

Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/SemanticSearch.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -54,6 +54,12 @@
 class WikiPlugin_SemanticSearch
     extends WikiPlugin
 {
+    public $_norelations_warning;
+    public $_supported_operators;
+    public $_text_operators;
+    public $_links;
+    public $current_row;
+
     function getDescription()
     {
         return _("Search relations and attributes.");

Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -58,6 +58,8 @@
 class WikiPlugin_SemanticSearchAdvanced
     extends WikiPlugin_SemanticSearch
 {
+    public $_supported_operators;
+
     function getDescription()
     {
         return _("Parse and execute a full query expression.");

Modified: trunk/lib/plugin/SiteMap.php
===================================================================
--- trunk/lib/plugin/SiteMap.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/SiteMap.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -46,6 +46,12 @@
     extends WikiPlugin
 {
     public $_pagename;
+    public $ExcludedPages;
+    public $firstreversed;
+    public $initialpage;
+    public $excludeunknown;
+    public $dbi;
+    public $_default_limit;
 
     function getDescription()
     {

Modified: trunk/lib/plugin/SqlResult.php
===================================================================
--- trunk/lib/plugin/SqlResult.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/SqlResult.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -62,6 +62,7 @@
     extends WikiPlugin
 {
     public $_args;
+    public $_sql;
 
     function getDescription()
     {

Modified: trunk/lib/plugin/SyncWiki.php
===================================================================
--- trunk/lib/plugin/SyncWiki.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/SyncWiki.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -42,6 +42,8 @@
 class WikiPlugin_SyncWiki
     extends WikiPlugin_WikiAdminUtils
 {
+    public $_fileList;
+
     function getDescription()
     {
         return _("Synchronize pages with external PhpWiki.");

Modified: trunk/lib/plugin/SyntaxHighlighter.php
===================================================================
--- trunk/lib/plugin/SyntaxHighlighter.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/SyntaxHighlighter.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -23,6 +23,8 @@
 class WikiPlugin_SyntaxHighlighter
     extends WikiPlugin
 {
+    public $source;
+
     function getDescription()
     {
         return _("Source code syntax highlighter (via http://highlightjs.org/).");

Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/SystemInfo.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -42,9 +42,12 @@
  */
 
 require_once 'lib/WikiPluginCached.php';
+
 class WikiPlugin_SystemInfo
     extends WikiPluginCached
 {
+    public $_dbi;
+
     function getPluginType()
     {
         return PLUGIN_CACHED_HTML;
@@ -73,7 +76,7 @@
 
     /**
      * @param WikiDB $dbi
-     * @param string $argstr
+     * @param array $argarray
      * @param WikiRequest $request
      * @param string $basepage
      * @return mixed

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/Template.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -57,6 +57,8 @@
 class WikiPlugin_Template
     extends WikiPlugin
 {
+    public $vars;
+
     function getDescription()
     {
         return _("Parametrized page inclusion.");

Modified: trunk/lib/plugin/TexToPng.php
===================================================================
--- trunk/lib/plugin/TexToPng.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/TexToPng.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -94,6 +94,8 @@
 
 class WikiPlugin_TexToPng extends WikiPluginCached
 {
+    public $_errortext;
+
     function getPluginType()
     {
         return PLUGIN_CACHED_IMG_ONDEMAND;
@@ -170,7 +172,7 @@
         } else {
             if (!$this->_errortext) {
                 // yeah, I've been told to be quiet, but obviously
-                // an error occured. So at least complain silently.
+                // an error occurred. So at least complain silently.
                 $this->complain(' ');
             }
         }

Modified: trunk/lib/plugin/TranslateText.php
===================================================================
--- trunk/lib/plugin/TranslateText.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/TranslateText.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -40,6 +40,8 @@
 class WikiPlugin_TranslateText
     extends WikiPlugin_WikiTranslation
 {
+    public $lang;
+
     function getDescription()
     {
         return _("Define a translation for a specified text.");

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/UpLoad.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -36,6 +36,7 @@
 class WikiPlugin_UpLoad
     extends WikiPlugin
 {
+    public $allowed_extensions;
     public $disallowed_extensions;
     // TODO: use PagePerms instead
     public $only_authenticated = true; // allow only authenticated users may upload.

Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/UserPreferences.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -34,6 +34,7 @@
     extends WikiPlugin
 {
     public $bool_args;
+    public $_request;
 
     function getDescription()
     {

Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/VisualWiki.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -34,6 +34,11 @@
 class WikiPlugin_VisualWiki
     extends WikiPlugin_GraphViz
 {
+    public $pages;
+    public $names;
+    public $ColorTab;
+    public $oldest;
+
     /**
      * Sets plugin type to map production
      */

Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/WantedPages.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -35,6 +35,8 @@
 class WikiPlugin_WantedPages
     extends WikiPlugin
 {
+    public $_wpagelist;
+
     function getDescription()
     {
         return _("List referenced page names which do not exist yet.");

Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/WantedPagesOld.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -26,6 +26,11 @@
 class WikiPlugin_WantedPagesOld
     extends WikiPlugin
 {
+    public $pagelist;
+    public $_rows;
+    public $_messageIfEmpty;
+    public $_columns;
+
     function getDescription()
     {
         return _("List referenced page names which do not exist yet.");

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -156,7 +156,7 @@
         return $result;
     }
 
-    public function replaceHelper(&$dbi, &$request, $pagename, $from, $to, $case_exact = true, $regex = false)
+    public static function replaceHelper(&$dbi, &$request, $pagename, $from, $to, $case_exact = true, $regex = false)
     {
         $page = $dbi->getPage($pagename);
         if ($page->exists()) { // don't replace default contents

Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/WikiAdminSelect.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -37,6 +37,9 @@
 class WikiPlugin_WikiAdminSelect
     extends WikiPlugin
 {
+    public $_list;
+    public $_args;
+
     function getDescription()
     {
         return _("Allows selection of multiple pages which get passed to other WikiAdmin plugins.");
@@ -61,6 +64,13 @@
     /**
      * Default collector for all WikiAdmin* plugins.
      * preSelectS() is similar, but fills $this->_list
+     *
+     * @param array $list
+     * @param WikiDB $dbi
+     * @param string $sortby
+     * @param int $limit
+     * @param string $exclude
+     * @return array
      */
     protected function collectPages(&$list, &$dbi, $sortby, $limit = 0, $exclude = '')
     {
@@ -79,6 +89,10 @@
      * 'author', 'owner', 'creator': from WikiDB_Page
      * 'only: forgot what the difference to 's' was.
      * Sets $this->_list, which is picked up by collectPages() and is a default for p[]
+     *
+     * @param array $args
+     * @param WikiRequest $request
+     * @return array
      */
     protected function preSelectS(&$args, &$request)
     {

Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -34,6 +34,8 @@
 class WikiPlugin_WikiAdminSetAclSimple
     extends WikiPlugin_WikiAdminSetAcl
 {
+    public $_args;
+
     function getDescription()
     {
         return _("Set simple individual page permissions.");

Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/WikiBlog.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -132,6 +132,10 @@
 
     /**
      * posted: required: pagename, content. optional: summary
+     *
+     * @param WikiRequest $request
+     * @param array $posted
+     * @param string $type
      */
     function add(&$request, $posted, $type = 'wikiblog')
     {

Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/WikiFormRich.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -97,6 +97,8 @@
 class WikiPlugin_WikiFormRich
     extends WikiPlugin
 {
+    public $inputbox;
+
     function getDescription()
     {
         return _("Provide generic WikiForm input buttons.");

Modified: trunk/lib/plugin/WikiTranslation.php
===================================================================
--- trunk/lib/plugin/WikiTranslation.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/WikiTranslation.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -244,6 +244,10 @@
 class WikiPlugin_WikiTranslation
     extends WikiPlugin
 {
+    public $lang;
+    public $_locales;
+    public $_reverse_locales;
+    public $args;
 
     function getDescription()
     {

Modified: trunk/lib/plugin/YouTube.php
===================================================================
--- trunk/lib/plugin/YouTube.php	2014-11-09 18:14:51 UTC (rev 9297)
+++ trunk/lib/plugin/YouTube.php	2014-11-09 18:15:48 UTC (rev 9298)
@@ -37,6 +37,14 @@
 class WikiPlugin_YouTube
     extends WikiPlugin
 {
+    public $_browse;
+    public $browse;
+    public $_time;
+    public $_category;
+    public $_language;
+    public $category;
+    public $language;
+
     function getDescription()
     {
         return _("Embed YouTube videos.");

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9297] trunk/lib/plugin

[<var...@us...>]

Revision: 9297
          http://sourceforge.net/p/phpwiki/code/9297
Author:   vargenau
Date:     2014-11-09 18:14:51 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
PHP Doc

Modified Paths:
--------------
    trunk/lib/plugin/LinkDatabase.php
    trunk/lib/plugin/WikiAdminUtils.php

Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php	2014-11-09 18:13:45 UTC (rev 9296)
+++ trunk/lib/plugin/LinkDatabase.php	2014-11-09 18:14:51 UTC (rev 9297)
@@ -69,7 +69,7 @@
 
     /**
      * @param WikiDB $dbi
-     * @param string $argstr
+     * @param array $argarray
      * @param WikiRequest $request
      * @param string $basepage
      * @return mixed

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2014-11-09 18:13:45 UTC (rev 9296)
+++ trunk/lib/plugin/WikiAdminUtils.php	2014-11-09 18:14:51 UTC (rev 9297)
@@ -163,6 +163,10 @@
 
     /**
      * Purge all non-referenced empty pages. Mainly those created by bad link extraction.
+     *
+     * @param WikiRequest $request
+     * @param array $args
+     * @return string|XmlContent
      */
     private function _do_purge_empty_pages(&$request, $args)
     {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9296] trunk/lib/plugin/WikiForum.php

[<var...@us...>]

Revision: 9296
          http://sourceforge.net/p/phpwiki/code/9296
Author:   vargenau
Date:     2014-11-09 18:13:45 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
function add is void

Modified Paths:
--------------
    trunk/lib/plugin/WikiForum.php

Modified: trunk/lib/plugin/WikiForum.php
===================================================================
--- trunk/lib/plugin/WikiForum.php	2014-11-09 18:12:06 UTC (rev 9295)
+++ trunk/lib/plugin/WikiForum.php	2014-11-09 18:13:45 UTC (rev 9296)
@@ -82,7 +82,8 @@
         $request->setArg('forum', false);
 
         if ($request->isPost() and !empty($forum['add'])) {
-            return $this->add($request, $forum, 'wikiforum');
+            $this->add($request, $forum, 'wikiforum');
+            return;
         }
 
         // Now we display previous comments and/or provide entry box

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9295] trunk/lib/plugin/WikiAdminRename.php

[<var...@us...>]

Revision: 9295
          http://sourceforge.net/p/phpwiki/code/9295
Author:   vargenau
Date:     2014-11-09 18:12:06 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
function renameHelper is static

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminRename.php

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2014-11-09 18:10:01 UTC (rev 9294)
+++ trunk/lib/plugin/WikiAdminRename.php	2014-11-09 18:12:06 UTC (rev 9295)
@@ -50,7 +50,7 @@
             ));
     }
 
-    public function renameHelper($name, $from, $to, $options = false)
+    public static function renameHelper($name, $from, $to, $options = array())
     {
         if (isset($options['regex'])) {
             return preg_replace('/' . $from . '/' . (isset($options['icase']) ? 'i' : ''), $to, $name);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9294] trunk/lib/plugin/FullTextSearch.php

[<var...@us...>]

Revision: 9294
          http://sourceforge.net/p/phpwiki/code/9294
Author:   vargenau
Date:     2014-11-09 18:10:01 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
function highlight_line is static

Modified Paths:
--------------
    trunk/lib/plugin/FullTextSearch.php

Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2014-11-09 17:39:41 UTC (rev 9293)
+++ trunk/lib/plugin/FullTextSearch.php	2014-11-09 18:10:01 UTC (rev 9294)
@@ -151,7 +151,7 @@
         return $html;
     }
 
-    function highlight_line($line, $hilight_re)
+    static function highlight_line($line, $hilight_re)
     {
         while (preg_match("/^(.*?)($hilight_re)/i", $line, $m)) {
             $line = substr($line, strlen($m[0]));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9293] trunk/lib/plugin/WikiPoll.php

[<var...@us...>]

Revision: 9293
          http://sourceforge.net/p/phpwiki/code/9293
Author:   vargenau
Date:     2014-11-09 17:39:41 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
Type compatibility

Modified Paths:
--------------
    trunk/lib/plugin/WikiPoll.php

Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php	2014-11-09 17:36:49 UTC (rev 9292)
+++ trunk/lib/plugin/WikiPoll.php	2014-11-09 17:39:41 UTC (rev 9293)
@@ -76,7 +76,7 @@
      * @param array $defaults
      * @return array
      */
-    function getArgs($argstr, $request = false, $defaults = array())
+    function getArgs($argstr, $request = null, $defaults = array())
     {
         if (empty($defaults)) {
             $defaults = $this->getDefaultArguments();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9292] trunk/lib/plugin/Ploticus.php

[<var...@us...>]

Revision: 9292
          http://sourceforge.net/p/phpwiki/code/9292
Author:   vargenau
Date:     2014-11-09 17:36:49 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
filterThroughCmd is void

Modified Paths:
--------------
    trunk/lib/plugin/Ploticus.php

Modified: trunk/lib/plugin/Ploticus.php
===================================================================
--- trunk/lib/plugin/Ploticus.php	2014-11-09 17:24:37 UTC (rev 9291)
+++ trunk/lib/plugin/Ploticus.php	2014-11-09 17:36:49 UTC (rev 9292)
@@ -31,7 +31,7 @@
  *
  * Note:
  * - For windows you need either a gd library with GIF support or
- *   a ploticus with PNG support. This comes e.g. with the cygwin build.
+ *   a Ploticus with PNG support. This comes e.g. with the Cygwin build.
  * - We support only images supported by GD so far (PNG most likely).
  *   No EPS, PS, SWF, SVG or SVGZ support yet, due to limitations in WikiPluginCached.
  *   This will be fixed soon.
@@ -60,6 +60,11 @@
 class WikiPlugin_Ploticus
     extends WikiPluginCached
 {
+    public $_args;
+    public $source;
+    public $_mapfile;
+    public $_errortext;
+
     /**
      * Sets plugin type to MAP if -csmap (-map or -mapdemo or -csmapdemo not supported)
      * or HTML if the imagetype is not supported by GD (EPS, SVG, SVGZ) (not yet)
@@ -259,9 +264,9 @@
             $fp = fopen("$tempfile.plo", "w");
             fwrite($fp, $source);
             fclose($fp);
-            $code = $this->execute(PLOTICUS_EXE . " $tempfile.plo $args", $tempfile . ".$device");
+            $this->execute(PLOTICUS_EXE . " $tempfile.plo $args", $tempfile . ".$device");
         } else {
-            $code = $this->filterThroughCmd($source, PLOTICUS_EXE . " -stdin $args");
+            $this->filterThroughCmd($source, PLOTICUS_EXE . " -stdin $args");
             sleep(1);
         }
         if (!file_exists($tempfile . ".$device")) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9291] trunk/lib/WikiUser/PearDb.php

[<var...@us...>]

Revision: 9291
          http://sourceforge.net/p/phpwiki/code/9291
Author:   vargenau
Date:     2014-11-09 17:24:37 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
Add braces

Modified Paths:
--------------
    trunk/lib/WikiUser/PearDb.php

Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php	2014-11-09 17:21:10 UTC (rev 9290)
+++ trunk/lib/WikiUser/PearDb.php	2014-11-09 17:24:37 UTC (rev 9291)
@@ -37,11 +37,13 @@
     {
         //global $DBAuthParams;
         if (!$this->_prefs and is_a($this, "_PearDbPassUser")) {
-            if ($prefs) $this->_prefs = $prefs;
+            if ($prefs) {
+                $this->_prefs = $prefs;
+            }
         }
-        if (!isset($this->_prefs->_method))
+        if (!isset($this->_prefs->_method)) {
             _PassUser::_PassUser($UserName);
-        elseif (!$this->isValidName($UserName)) {
+        } elseif (!$this->isValidName($UserName)) {
             trigger_error(_("Invalid username."), E_USER_WARNING);
             return false;
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9290] trunk/lib

[<var...@us...>]

Revision: 9290
          http://sourceforge.net/p/phpwiki/code/9290
Author:   vargenau
Date:     2014-11-09 17:21:10 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
Type compatibility

Modified Paths:
--------------
    trunk/lib/WikiPlugin.php
    trunk/lib/WikiPluginCached.php

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2014-11-08 16:21:41 UTC (rev 9289)
+++ trunk/lib/WikiPlugin.php	2014-11-09 17:21:10 UTC (rev 9290)
@@ -106,7 +106,7 @@
      * @param array $defaults
      * @return array
      */
-    function getArgs($argstr, $request = false, $defaults = array())
+    function getArgs($argstr, $request = null, $defaults = array())
     {
         if (empty($defaults)) {
             $defaults = $this->getDefaultArguments();

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2014-11-08 16:21:41 UTC (rev 9289)
+++ trunk/lib/WikiPluginCached.php	2014-11-09 17:21:10 UTC (rev 9290)
@@ -454,9 +454,10 @@
     </object>
      */
     // how to handle alternate images? always provide alternate static images?
-    function embedObject($url, $type, $args = false, $params = false)
+    function embedObject($url, $type, $args = array(), $params = false)
     {
-        if (!$args) $args = array();
+        if (empty($args))
+            $args = array();
         $object = HTML::object(array_merge($args, array('src' => $url, 'type' => $type)));
         if ($params)
             $object->pushContent($params);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9289] trunk/lib/HttpClient.php

[<var...@us...>]

Revision: 9289
          http://sourceforge.net/p/phpwiki/code/9289
Author:   vargenau
Date:     2014-11-08 16:21:41 +0000 (Sat, 08 Nov 2014)
Log Message:
-----------
Add break; add static

Modified Paths:
--------------
    trunk/lib/HttpClient.php

Modified: trunk/lib/HttpClient.php
===================================================================
--- trunk/lib/HttpClient.php	2014-11-08 16:20:04 UTC (rev 9288)
+++ trunk/lib/HttpClient.php	2014-11-08 16:21:41 UTC (rev 9289)
@@ -120,10 +120,13 @@
             switch ($errno) {
                 case -3:
                     $this->errormsg = 'Socket creation failed (-3)';
+                    break;
                 case -4:
                     $this->errormsg = 'DNS lookup failure (-4)';
+                    break;
                 case -5:
                     $this->errormsg = 'Connection refused or timed out (-5)';
+                    break;
                 default:
                     $this->errormsg = 'Connection failed (' . $errno . ')';
                     $this->errormsg .= ' ' . $errstr;
@@ -166,9 +169,9 @@
                     $this->debug($this->errormsg);
                     return false;
                 }
-                $http_version = $m[1]; // not used
+                // $http_version = $m[1]; // not used
                 $this->status = $m[2];
-                $status_string = $m[3]; // not used
+                $status_string = $m[3];
                 $this->debug(trim($line));
                 continue;
             }
@@ -390,7 +393,7 @@
     }
 
     // "Quick" static methods
-    function quickGet($url)
+    static function quickGet($url)
     {
         $bits = parse_url($url);
         $host = $bits['host'];
@@ -407,7 +410,7 @@
         }
     }
 
-    function quickPost($url, $data)
+    static function quickPost($url, $data)
     {
         $bits = parse_url($url);
         $host = $bits['host'];
@@ -421,7 +424,7 @@
         }
     }
 
-    function debug($msg, $object = false)
+    function debug($msg, $object = null)
     {
         if ($this->debug) {
             print '<div style="border: 1px solid red; padding: 0.5em; margin: 0.5em;"><strong>HttpClient Debug:</strong> ' . $msg;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9288] trunk/lib/HtmlParser.php

[<var...@us...>]

Revision: 9288
          http://sourceforge.net/p/phpwiki/code/9288
Author:   vargenau
Date:     2014-11-08 16:20:04 +0000 (Sat, 08 Nov 2014)
Log Message:
-----------
Only one dialect: Phpwiki; PHP Doc

Modified Paths:
--------------
    trunk/lib/HtmlParser.php

Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php	2014-11-08 16:15:14 UTC (rev 9287)
+++ trunk/lib/HtmlParser.php	2014-11-08 16:20:04 UTC (rev 9288)
@@ -45,18 +45,9 @@
 {
     public $dialect, $_handlers, $root;
 
-    /**
-     *  dialect: "PhpWiki2", "PhpWiki"
-     *  possible more dialects: MediaWiki, kwiki, c2
-     */
-    function __construct($dialect = "PhpWiki2", $encoding = '')
+    function __construct($dialect, $encoding = '')
     {
-        $classname = "HtmlParser_" . $dialect;
-        if (class_exists($classname))
-            $this->dialect = new $classname;
-        else {
-            trigger_error(sprintf("unknown HtmlParser dialect %s", $dialect), E_USER_ERROR);
-        }
+        $this->dialect = new HtmlParser_PhpWiki();
         $this->_handlers =& $this->dialect->_handlers;
         $this->XmlParser($encoding);
         xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, 0);
@@ -83,6 +74,11 @@
         return $output;
     }
 
+    /**
+     * @param HtmlElement $node
+     * @param HtmlElement $parent
+     * @return string
+     */
     function wikify($node, $parent = null)
     {
         $output = '';
@@ -116,12 +112,15 @@
         return $output;
     }
 
-    /** elem_contents()
+    /**
      *  $output = $parser->elem_contents( $elem );
      * Returns a wikified version of the contents of the specified
      * HTML element. This is done by passing each element of this
      * element's content list through the C<wikify()> method, and
      * returning the concatenated result.
+     *
+     * @param HtmlElement $node
+     * @return string
      */
     function elem_contents($node)
     {
@@ -185,6 +184,10 @@
     // contained within a sole A tag (not counting child elements with
     // whitespace text only).
     //
+    /**
+     * @param HtmlElement $node
+     * @return bool
+     */
     function _elem_is_image_div($node)
     {
         // Return false if node is undefined or isn't a DIV at all
@@ -203,14 +206,22 @@
         return false;
     }
 
-    /** preserves tags and content
+    /**
+     * preserves tags and content
+     *
+     * @param HtmlElement $node
+     * @return mixed
      */
     function wikify_default($node)
     {
         return $this->wikify_preserve($node);
     }
 
-    /** preserves tags and content
+    /*
+     * preserves tags and content
+     *
+     * @param HtmlElement $node
+     * @return mixed
      */
     function wikify_preserve($node)
     {
@@ -222,9 +233,11 @@
     }
 }
 
-class HtmlParser_PhpWiki2
+class HtmlParser_PhpWiki
     extends HtmlParser
 {
+    public $ident;
+
     function __construct()
     {
         $this->_handlers =
@@ -281,17 +294,29 @@
             );
     }
 
+    /**
+     * @param HtmlElement $node
+     * @return string
+     */
     function wikify_table($node)
     {
         $this->ident = '';
         return "| \n" . $this->elem_contents($node) . "|\n\n";
     }
 
+    /**
+     * @param HtmlElement $node
+     * @return string
+     */
     function wikify_tr($node)
     {
         return "\n| " . $this->elem_contents($node);
     }
 
+    /**
+     * @param HtmlElement $node
+     * @return string
+     */
     function wikify_th($node)
     {
         $ident = empty($this->ident) ? '' : $this->ident;
@@ -303,11 +328,19 @@
         return "$output |\n";
     }
 
+    /**
+     * @param HtmlElement $node
+     * @return string
+     */
     function wikify_list_item($node)
     {
         return ($this->_elem_has_ancestor($node, 'ol') ? '*' : '#') . " " . trim($this->elem_contents($node)) . "\n";
     }
 
+    /**
+     * @param HtmlElement $node
+     * @return string
+     */
     function wikify_link($node)
     {
         $url = $this->absolute_url($node->getAttr('href'));
@@ -331,6 +364,10 @@
         return "[ $url | $title ]";
     }
 
+    /**
+     * @param HtmlElement $node
+     * @return string
+     */
     function wikify_h($node)
     {
         $level = substr($node->_tag, 1);
@@ -342,17 +379,29 @@
         return $markup . ' ' . trim($this->elem_contents($node)) . "\n\n";
     }
 
+    /**
+     * @param HtmlElement $node
+     * @return string
+     */
     function wikify_verbatim($node)
     {
         $contents = $this->elem_contents($node);
-        return "\n<verbatim>\n$contents\n</verbatim>";
+        return "\n<".'verbatim'.">\n$contents\n</"."verbatim>";
     }
 
+    /**
+     * @param HtmlElement $node
+     * @return string
+     */
     function wikify_noinclude($node)
     {
         return $this->elem_contents($node);
     }
 
+    /**
+     * @param HtmlElement $node
+     * @return string
+     */
     function wikify_img($node)
     {
         $image_url = $this->absolute_url($node->getAttr('src'));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.