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

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

Revision: 8789
          http://sourceforge.net/p/phpwiki/code/8789
Author:   vargenau
Date:     2013-05-29 07:32:07 +0000 (Wed, 29 May 2013)
Log Message:
-----------
var --> public

Modified Paths:
--------------
    trunk/lib/AtomParser.php
    trunk/lib/BlockParser.php
    trunk/lib/DbSession/ADODB.php
    trunk/lib/DbSession/PDO.php
    trunk/lib/DbSession/SQL.php
    trunk/lib/DbSession/dba.php
    trunk/lib/ErrorManager.php
    trunk/lib/ExternalReferrer.php
    trunk/lib/FileFinder.php
    trunk/lib/Google.php
    trunk/lib/HtmlParser.php
    trunk/lib/HttpClient.php
    trunk/lib/InlineParser.php
    trunk/lib/PageList.php
    trunk/lib/PagePerm.php
    trunk/lib/PageType.php
    trunk/lib/Request.php
    trunk/lib/RssParser.php
    trunk/lib/SemanticWeb.php
    trunk/lib/TextSearchQuery.php
    trunk/lib/WikiDB/backend/ADODB_oci8po.php
    trunk/lib/WikiDB/backend/PearDB.php
    trunk/lib/WikiDB/backend/cvs.php
    trunk/lib/WikiDB/backend/file.php
    trunk/lib/WikiDB/cvs.php
    trunk/lib/WikiDB.php
    trunk/lib/WikiGroup.php
    trunk/lib/WikiPlugin.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/WikiTheme.php
    trunk/lib/WikiUser/AdoDb.php
    trunk/lib/WikiUser/BogoLogin.php
    trunk/lib/WikiUser/Db.php
    trunk/lib/WikiUser/File.php
    trunk/lib/WikiUser/FusionForge.php
    trunk/lib/WikiUser/PdoDb.php
    trunk/lib/WikiUser/PearDb.php
    trunk/lib/WikiUser/PersonalPage.php
    trunk/lib/WikiUser.php
    trunk/lib/WikiUserNew.php
    trunk/lib/WysiwygEdit.php
    trunk/lib/XmlParser.php
    trunk/lib/diff3.php
    trunk/lib/difflib.php
    trunk/lib/main.php
    trunk/lib/plugin/PageDump.php
    trunk/lib/plugin/PageTrail.php
    trunk/lib/plugin/RateIt.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/plugin/SiteMap.php
    trunk/lib/plugin/SqlResult.php
    trunk/lib/plugin/TeX2png.php
    trunk/lib/plugin/UpLoad.php
    trunk/lib/plugin/UserPreferences.php
    trunk/lib/plugin/WikiPoll.php
    trunk/lib/stdlib.php
    trunk/lib/upgrade.php
    trunk/lib/wikilens/CustomPrefs.php
    trunk/lib/wikilens/PageListColumns.php
    trunk/lib/wikilens/RatingsUser.php

Modified: trunk/lib/AtomParser.php
===================================================================
--- trunk/lib/AtomParser.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/AtomParser.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -31,41 +31,41 @@
     extends XmlParser
 {
     // Feed
-    var $feed = array();
-    var $feed_title = '';
-    var $feed_links = array();
-    var $feed_subtitle = '';
-    var $feed_id = '';
-    var $feed_updated = '';
-    var $feed_authors = array();
-    var $feed_contributors = array();
-    var $generator = '';
-    var $icon = '';
-    var $rights = '';
-    var $logo = '';
+    public $feed = array();
+    public $feed_title = '';
+    public $feed_links = array();
+    public $feed_subtitle = '';
+    public $feed_id = '';
+    public $feed_updated = '';
+    public $feed_authors = array();
+    public $feed_contributors = array();
+    public $generator = '';
+    public $icon = '';
+    public $rights = '';
+    public $logo = '';
 
-    var $categories = array();
+    public $categories = array();
 
-    var $authors = array();
-    var $contributors = array();
+    public $authors = array();
+    public $contributors = array();
 
     // Author, Contributor
-    var $name = '';
-    var $email = '';
-    var $uri = '';
+    public $name = '';
+    public $email = '';
+    public $uri = '';
 
     // Entries
-    var $entries = array();
-    var $inside_entry = false;
-    var $title = '';
-    var $updated = '';
-    var $published = '';
-    var $id = '';
-    var $links = array();
-    var $summary = '';
+    public $entries = array();
+    public $inside_entry = false;
+    public $title = '';
+    public $updated = '';
+    public $published = '';
+    public $id = '';
+    public $links = array();
+    public $summary = '';
 
-    var $inside_content = false;
-    var $content = '';
+    public $inside_content = false;
+    public $content = '';
 
     function tag_open($parser, $name, $attrs = '')
     {

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/BlockParser.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -54,17 +54,17 @@
     /**
      * The matched text.
      */
-    var $match;
+    public $match;
 
     /**
      * The text following the matched text.
      */
-    var $postmatch;
+    public $postmatch;
 
     /**
      * Index of the regular expression which matched.
      */
-    var $regexp_ind;
+    public $regexp_ind;
 }
 
 /**
@@ -504,7 +504,7 @@
 
 class BlockMarkup
 {
-    var $_re;
+    public $_re;
 
     function _match(&$input, $match)
     {
@@ -528,8 +528,8 @@
 
 class Block_blockquote extends BlockMarkup
 {
-    var $_depth;
-    var $_re = '\ +(?=\S)';
+    public $_depth;
+    public $_re = '\ +(?=\S)';
 
     function _match(&$input, $m)
     {
@@ -555,15 +555,15 @@
 
 class Block_list extends BlockMarkup
 {
-    //var $_tag = 'ol' or 'ul';
-    var $_re = '\ {0,4}
+    //public $_tag = 'ol' or 'ul';
+    public $_re = '\ {0,4}
                 (?: \+
                   | \\#\ (?!\[.*\])
                   | -(?!-)
                   | [o](?=\ )
                   | [*]\ (?!(?=\S)[^*]*(?<=\S)[*](?:\\s|[-)}>"\'\\/:.,;!?_*=]) )
                 )\ *(?=\S)';
-    var $_content = array();
+    public $_content = array();
 
     function _match(&$input, $m)
     {
@@ -610,7 +610,7 @@
 
 class Block_dl extends Block_list
 {
-    var $_tag = 'dl';
+    public $_tag = 'dl';
 
     function Block_dl()
     {
@@ -663,8 +663,8 @@
 
 class Block_table_dl_defn extends XmlContent
 {
-    var $nrows;
-    var $ncols;
+    public $nrows;
+    public $ncols;
 
     function Block_table_dl_defn($term, $defn)
     {
@@ -816,7 +816,7 @@
 
 class Block_table_dl extends Block_dl
 {
-    var $_tag = 'dl-table'; // phony.
+    public $_tag = 'dl-table'; // phony.
 
     function Block_table_dl()
     {
@@ -860,8 +860,8 @@
 
 class Block_oldlists extends Block_list
 {
-    //var $_tag = 'ol', 'ul', or 'dl';
-    var $_re = '(?: [*]\ (?!(?=\S)[^*]*(?<=\S)[*](?:\\s|[-)}>"\'\\/:.,;!?_*=]))
+    //public $_tag = 'ol', 'ul', or 'dl';
+    public $_re = '(?: [*]\ (?!(?=\S)[^*]*(?<=\S)[*](?:\\s|[-)}>"\'\\/:.,;!?_*=]))
                   | [#]\ (?! \[ .*? \] )
                   | ; .*? :
                 ) .*? (?=\S)';
@@ -915,7 +915,7 @@
 
 class Block_pre extends BlockMarkup
 {
-    var $_re = '<(?:pre|verbatim|nowiki|noinclude)>';
+    public $_re = '<(?:pre|verbatim|nowiki|noinclude)>';
 
     function _match(&$input, $m)
     {
@@ -960,7 +960,7 @@
 // <<<placeholder>>>
 class Block_placeholder extends BlockMarkup
 {
-    var $_re = '<<<';
+    public $_re = '<<<';
 
     function _match(&$input, $m)
     {
@@ -987,7 +987,7 @@
 
 class Block_nowiki_wikicreole extends BlockMarkup
 {
-    var $_re = '{{{';
+    public $_re = '{{{';
 
     function _match(&$input, $m)
     {
@@ -1013,7 +1013,7 @@
 
 class Block_plugin extends Block_pre
 {
-    var $_re = '<\?plugin(?:-form)?(?!\S)';
+    public $_re = '<\?plugin(?:-form)?(?!\S)';
 
     // FIXME:
     /* <?plugin Backlinks
@@ -1043,8 +1043,8 @@
 
 class Block_plugin_wikicreole extends Block_pre
 {
-    // var $_re = '<<(?!\S)';
-    var $_re = '<<';
+    // public $_re = '<<(?!\S)';
+    public $_re = '<<';
 
     function _match(&$input, $m)
     {
@@ -1072,7 +1072,7 @@
 
 class Block_table_wikicreole extends Block_pre
 {
-    var $_re = '\s*\|';
+    public $_re = '\s*\|';
 
     function _match(&$input, $m)
     {
@@ -1113,7 +1113,7 @@
  */
 class Block_table_mediawiki extends Block_pre
 {
-    var $_re = '{\|';
+    public $_re = '{\|';
 
     function _match(&$input, $m)
     {
@@ -1148,7 +1148,7 @@
  */
 class Block_template_plugin extends Block_pre
 {
-    var $_re = '{{';
+    public $_re = '{{';
 
     function _match(&$input, $m)
     {
@@ -1226,8 +1226,8 @@
 
 class Block_email_blockquote extends BlockMarkup
 {
-    var $_attr = array('class' => 'mail-style-quote');
-    var $_re = '>\ ?';
+    public $_attr = array('class' => 'mail-style-quote');
+    public $_re = '>\ ?';
 
     function _match(&$input, $m)
     {
@@ -1241,8 +1241,8 @@
 
 class Block_wikicreole_indented extends BlockMarkup
 {
-    var $_attr = array('style' => 'margin-left:2em');
-    var $_re = ':\ ?';
+    public $_attr = array('style' => 'margin-left:2em');
+    public $_re = ':\ ?';
 
     function _match(&$input, $m)
     {
@@ -1255,7 +1255,7 @@
 
 class Block_hr extends BlockMarkup
 {
-    var $_re = '-{4,}\s*$';
+    public $_re = '-{4,}\s*$';
 
     function _match(&$input, $m)
     {
@@ -1267,7 +1267,7 @@
 
 class Block_heading extends BlockMarkup
 {
-    var $_re = '!{1,3}';
+    public $_re = '!{1,3}';
 
     function _match(&$input, $m)
     {
@@ -1283,7 +1283,7 @@
 
 class Block_heading_wikicreole extends BlockMarkup
 {
-    var $_re = '={2,6}';
+    public $_re = '={2,6}';
 
     function _match(&$input, $m)
     {
@@ -1303,9 +1303,9 @@
 
 class Block_p extends BlockMarkup
 {
-    var $_tag = 'p';
-    var $_re = '\S.*';
-    var $_text = '';
+    public $_tag = 'p';
+    public $_re = '\S.*';
+    public $_text = '';
 
     function _match(&$input, $m)
     {
@@ -1342,7 +1342,7 @@
 
 class Block_divspan extends BlockMarkup
 {
-    var $_re = '<(?im)(?: div|span)(?:[^>]*)?>';
+    public $_re = '<(?im)(?: div|span)(?:[^>]*)?>';
 
     function _match(&$input, $m)
     {

Modified: trunk/lib/DbSession/ADODB.php
===================================================================
--- trunk/lib/DbSession/ADODB.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/DbSession/ADODB.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -27,7 +27,7 @@
 class DbSession_ADODB
     extends DbSession
 {
-    var $_backend_type = "ADODB";
+    public $_backend_type = "ADODB";
 
     function DbSession_ADODB($dbh, $table)
     {

Modified: trunk/lib/DbSession/PDO.php
===================================================================
--- trunk/lib/DbSession/PDO.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/DbSession/PDO.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -8,7 +8,7 @@
 class DbSession_PDO
     extends DbSession
 {
-    var $_backend_type = "PDO";
+    public $_backend_type = "PDO";
 
     function DbSession_PDO($dbh, $table)
     {

Modified: trunk/lib/DbSession/SQL.php
===================================================================
--- trunk/lib/DbSession/SQL.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/DbSession/SQL.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -13,7 +13,7 @@
 class DbSession_SQL
     extends DbSession
 {
-    var $_backend_type = "SQL";
+    public $_backend_type = "SQL";
 
     function DbSession_SQL(&$dbh, $table)
     {

Modified: trunk/lib/DbSession/dba.php
===================================================================
--- trunk/lib/DbSession/dba.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/DbSession/dba.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -13,7 +13,7 @@
 class DbSession_dba
     extends DbSession
 {
-    var $_backend_type = "dba";
+    public $_backend_type = "dba";
 
     function DbSession_dba(&$dbh, $table)
     {

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/ErrorManager.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -412,22 +412,22 @@
     /**
      * The PHP errno
      */
-    //var $errno;
+    public $errno;
 
     /**
      * The PHP error message.
      */
-    //var $errstr;
+    public $errstr;
 
     /**
      * The source file where the error occurred.
      */
-    //var $errfile;
+    public $errfile;
 
     /**
      * The line number (in $this->errfile) where the error occured.
      */
-    //var $errline;
+    public $errline;
 
     /**
      * Construct a new PhpError.

Modified: trunk/lib/ExternalReferrer.php
===================================================================
--- trunk/lib/ExternalReferrer.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/ExternalReferrer.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -24,7 +24,7 @@
 class SearchEngines
 {
 
-    var $searchEngines =
+    public $searchEngines =
         array(
             "search.sli.sympatico.ca/" => array("engine" => "Sympatico", "query1" => "query=", "query2" => "", "url" => "http://www1.sympatico.ca/"),
             "www.search123.com/cgi-bin/" => array("engine" => "Search123", "query1" => "query=", "query2" => "", "url" => "http://www.search123.com/"),

Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/FileFinder.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -13,7 +13,7 @@
  */
 class FileFinder
 {
-    //var $_pathsep, $_path;
+    public $_pathsep, $_path;
 
     /**
      * Constructor.

Modified: trunk/lib/Google.php
===================================================================
--- trunk/lib/Google.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/Google.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -86,8 +86,8 @@
 
 class GoogleSearchResults
 {
-    var $_fields = "documentFiltering,searchComments,estimatedTotalResultsCount,estimateIsExact,searchQuery,startIndex,endIndex,searchTips,directoryCategories,searchTime,resultElements";
-    var $resultElements, $results;
+    public $_fields = "documentFiltering,searchComments,estimatedTotalResultsCount,estimateIsExact,searchQuery,startIndex,endIndex,searchTips,directoryCategories,searchTime,resultElements";
+    public $resultElements, $results;
 
     function GoogleSearchResults($result)
     {
@@ -145,7 +145,7 @@
  */
 class GoogleSearchResult
 {
-    var $_fields = "summary,URL,snippet,title,cachedSize,relatedInformationPresent,hostName,directoryCategory,directoryTitle";
+    public $_fields = "summary,URL,snippet,title,cachedSize,relatedInformationPresent,hostName,directoryCategory,directoryTitle";
 
     function GoogleSearchResult($result)
     {

Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/HtmlParser.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -43,7 +43,7 @@
 class HtmlParser
     extends XmlParser
 {
-    var $dialect, $_handlers, $root;
+    public $dialect, $_handlers, $root;
 
     /**
      *  dialect: "PhpWiki2", "PhpWiki"

Modified: trunk/lib/HttpClient.php
===================================================================
--- trunk/lib/HttpClient.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/HttpClient.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -14,40 +14,40 @@
 class HttpClient
 {
     // Request vars
-    var $host;
-    var $port;
-    var $path;
-    var $method;
-    var $postdata = '';
-    var $cookies = array();
-    var $referer;
-    var $accept = 'text/xml,application/xml,application/xhtml+xml,text/html,text/plain,image/png,image/jpeg,image/gif,*/*';
-    var $accept_encoding = 'gzip';
-    var $accept_language = 'en-us';
-    var $user_agent = 'Incutio HttpClient v1.0';
-    var $boundary = "xYzZY"; // FIXME: check if this string doesn't occur in the data
+    public $host;
+    public $port;
+    public $path;
+    public $method;
+    public $postdata = '';
+    public $cookies = array();
+    public $referer;
+    public $accept = 'text/xml,application/xml,application/xhtml+xml,text/html,text/plain,image/png,image/jpeg,image/gif,*/*';
+    public $accept_encoding = 'gzip';
+    public $accept_language = 'en-us';
+    public $user_agent = 'Incutio HttpClient v1.0';
+    public $boundary = "xYzZY"; // FIXME: check if this string doesn't occur in the data
     // Options
-    var $timeout = 10;
-    var $use_gzip = true;
-    var $persist_cookies = true; // If true, received cookies are placed in the $this->cookies array ready for the next request
+    public $timeout = 10;
+    public $use_gzip = true;
+    public $persist_cookies = true; // If true, received cookies are placed in the $this->cookies array ready for the next request
     // Note: This currently ignores the cookie path (and time) completely. Time is not important,
     //       but path could possibly lead to security problems.
-    var $persist_referers = true; // For each request, sends path of last request as referer
-    var $debug = false;
-    var $handle_redirects = true; // Auaomtically redirect if Location or URI header is found
-    var $max_redirects = 5;
-    var $headers_only = false; // If true, stops receiving once headers have been read.
+    public $persist_referers = true; // For each request, sends path of last request as referer
+    public $debug = false;
+    public $handle_redirects = true; // Auaomtically redirect if Location or URI header is found
+    public $max_redirects = 5;
+    public $headers_only = false; // If true, stops receiving once headers have been read.
     // Basic authorization variables
-    var $username;
-    var $password;
+    public $username;
+    public $password;
     // Response vars
-    var $status;
-    var $headers = array();
-    var $content = '';
-    var $errormsg;
+    public $status;
+    public $headers = array();
+    public $content = '';
+    public $errormsg;
     // Tracker variables
-    var $redirect_count = 0;
-    var $cookie_host = '';
+    public $redirect_count = 0;
+    public $cookie_host = '';
 
     function HttpClient($host = 'localhost', $port = 80)
     {

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/InlineParser.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -57,19 +57,19 @@
     /**
      * The text leading up the the next match.
      */
-    var $prematch;
+    public $prematch;
     /**
      * The matched text.
      */
-    var $match;
+    public $match;
     /**
      * The text following the matched text.
      */
-    var $postmatch;
+    public $postmatch;
     /**
      * Index of the regular expression which matched.
      */
-    var $regexp_ind;
+    public $regexp_ind;
 }
 
 /**
@@ -237,7 +237,7 @@
  */
 class SimpleMarkup
 {
-    var $_match_regexp;
+    public $_match_regexp;
 
     /** Get regexp.
      *
@@ -268,7 +268,7 @@
  */
 class BalancedMarkup
 {
-    var $_start_regexp;
+    public $_start_regexp;
 
     /** Get the starting regexp for this rule.
      *
@@ -521,7 +521,7 @@
 
 class Markup_wikicreolebracketlink extends SimpleMarkup
 {
-    var $_match_regexp = "\\#? \\[\\[ .*? [^]\\s] .*? \\]\\]";
+    public $_match_regexp = "\\#? \\[\\[ .*? [^]\\s] .*? \\]\\]";
 
     function markup($match)
     {
@@ -533,7 +533,7 @@
 
 class Markup_bracketlink extends SimpleMarkup
 {
-    var $_match_regexp = "\\#? \\[ .*? [^]\\s] .*? \\]";
+    public $_match_regexp = "\\#? \\[ .*? [^]\\s] .*? \\]";
 
     function markup($match)
     {
@@ -621,7 +621,7 @@
     // For :: (relations) only words, no comma,
     // but for := (attributes) comma and dots are allowed. Units with groupsep.
     // Ending dots or comma are not part of the link.
-    var $_match_regexp = "(?: \w+:=\S+(?<![\.,]))|(?: \w+::[\w\.]+(?<!\.))";
+    public $_match_regexp = "(?: \w+:=\S+(?<![\.,]))|(?: \w+::[\w\.]+(?<!\.))";
 
     function markup($match)
     {
@@ -670,7 +670,7 @@
 
 class Markup_linebreak extends SimpleMarkup
 {
-    var $_match_regexp = "(?: (?<! %) %%% (?! %) | \\\\\\\\ | <\s*(?:br|BR)\s*> | <\s*(?:br|BR)\s*\/\s*> )";
+    public $_match_regexp = "(?: (?<! %) %%% (?! %) | \\\\\\\\ | <\s*(?:br|BR)\s*> | <\s*(?:br|BR)\s*\/\s*> )";
 
     function markup($match)
     {
@@ -680,7 +680,7 @@
 
 class Markup_wikicreole_italics extends BalancedMarkup
 {
-    var $_start_regexp = "\\/\\/";
+    public $_start_regexp = "\\/\\/";
 
     function getEndRegexp($match)
     {
@@ -696,7 +696,7 @@
 
 class Markup_wikicreole_bold extends BalancedMarkup
 {
-    var $_start_regexp = "\\*\\*";
+    public $_start_regexp = "\\*\\*";
 
     function getEndRegexp($match)
     {
@@ -712,7 +712,7 @@
 
 class Markup_wikicreole_monospace extends BalancedMarkup
 {
-    var $_start_regexp = "\\#\\#";
+    public $_start_regexp = "\\#\\#";
 
     function getEndRegexp($match)
     {
@@ -727,7 +727,7 @@
 
 class Markup_wikicreole_underline extends BalancedMarkup
 {
-    var $_start_regexp = "\\_\\_";
+    public $_start_regexp = "\\_\\_";
 
     function getEndRegexp($match)
     {
@@ -743,7 +743,7 @@
 
 class Markup_wikicreole_superscript extends BalancedMarkup
 {
-    var $_start_regexp = "\\^\\^";
+    public $_start_regexp = "\\^\\^";
 
     function getEndRegexp($match)
     {
@@ -759,7 +759,7 @@
 
 class Markup_wikicreole_subscript extends BalancedMarkup
 {
-    var $_start_regexp = ",,";
+    public $_start_regexp = ",,";
 
     function getEndRegexp($match)
     {
@@ -775,7 +775,7 @@
 
 class Markup_old_emphasis extends BalancedMarkup
 {
-    var $_start_regexp = "''";
+    public $_start_regexp = "''";
 
     function getEndRegexp($match)
     {
@@ -850,7 +850,7 @@
 
 class Markup_html_emphasis extends BalancedMarkup
 {
-    var $_start_regexp =
+    public $_start_regexp =
         "<(?: b|big|i|small|tt|em|strong|cite|code|dfn|kbd|samp|s|strike|del|var|sup|sub )>";
 
     function getEndRegexp($match)
@@ -867,7 +867,7 @@
 
 class Markup_html_divspan extends BalancedMarkup
 {
-    var $_start_regexp =
+    public $_start_regexp =
         "<(?: div|span )(?: \s[^>]*)?>";
 
     function getEndRegexp($match)
@@ -899,7 +899,7 @@
 {
     //rurban: abbr|acronym need an optional title tag.
     //sf.net bug #728595
-    var $_start_regexp = "<(?: abbr|acronym )(?: [^>]*)?>";
+    public $_start_regexp = "<(?: abbr|acronym )(?: [^>]*)?>";
 
     function getEndRegexp($match)
     {
@@ -936,8 +936,8 @@
 class Markup_color extends BalancedMarkup
 {
     // %color=blue% blue text %% and back to normal
-    var $_start_regexp = "%color=(?: [^%]*)%";
-    var $_end_regexp = "%%";
+    public $_start_regexp = "%color=(?: [^%]*)%";
+    public $_end_regexp = "%%";
 
     function markup($match, $body)
     {
@@ -984,7 +984,7 @@
 // <<<placeholder>>>
 class Markup_placeholder extends SimpleMarkup
 {
-    var $_match_regexp = '<<<.*?>>>';
+    public $_match_regexp = '<<<.*?>>>';
 
     function markup($match)
     {
@@ -996,7 +996,7 @@
 // <!-- This is a comment -->
 class Markup_html_comment extends SimpleMarkup
 {
-    var $_match_regexp = '<!--.*?-->';
+    public $_match_regexp = '<!--.*?-->';
 
     function markup($match)
     {
@@ -1008,7 +1008,7 @@
 //  like: '<small>< ?plugin PopularNearby ? ></small>'
 class Markup_plugin extends SimpleMarkup
 {
-    var $_match_regexp = '<\?plugin(?:-form)?\s[^\n]+?\?>';
+    public $_match_regexp = '<\?plugin(?:-form)?\s[^\n]+?\?>';
 
     function markup($match)
     {
@@ -1019,7 +1019,7 @@
 // Special version for single-line Wikicreole plugins formatting.
 class Markup_plugin_wikicreole extends SimpleMarkup
 {
-    var $_match_regexp = '<<[^\n]+?>>';
+    public $_match_regexp = '<<[^\n]+?>>';
 
     function markup($match)
     {
@@ -1034,7 +1034,7 @@
 // PLUGIN_MARKUP_MAP = "html:RawHtml dot:GraphViz toc:CreateToc amath:AsciiMath richtable:RichTable include:IncludePage tex:TexToPng"
 class Markup_xml_plugin extends BalancedMarkup
 {
-    //var $_start_regexp = "<(?: ".join('|',PLUGIN_MARKUP_MAP)." )(?: \s[^>]*)>";
+    //public $_start_regexp = "<(?: ".join('|',PLUGIN_MARKUP_MAP)." )(?: \s[^>]*)>";
 
     function getStartRegexp()
     {
@@ -1076,7 +1076,7 @@
  */
 class Markup_nowiki extends SimpleMarkup
 {
-    var $_match_regexp = '<nowiki>.*?<\/nowiki>';
+    public $_match_regexp = '<nowiki>.*?<\/nowiki>';
 
     function markup($match)
     {
@@ -1092,7 +1092,7 @@
  */
 class Markup_wikicreole_preformatted extends SimpleMarkup
 {
-    var $_match_regexp = '\{\{\{.*?\}\}\}';
+    public $_match_regexp = '\{\{\{.*?\}\}\}';
 
     function markup($match)
     {
@@ -1116,7 +1116,7 @@
 class Markup_template_plugin extends SimpleMarkup
 {
     // patch #1732793: allow \n, mult. {{ }} in one line, and single letters
-    var $_match_regexp = '\{\{.*?\}\}';
+    public $_match_regexp = '\{\{.*?\}\}';
 
     function markup($match)
     {
@@ -1213,7 +1213,7 @@
 
 class Markup_html_entities extends SimpleMarkup
 {
-    //var $_match_regexp = '(: \.\.\.|\-\-|\-\-\-|\(C\) )';
+    //public $_match_regexp = '(: \.\.\.|\-\-|\-\-\-|\(C\) )';
 
     function Markup_html_entities()
     {
@@ -1238,7 +1238,7 @@
 
 class Markup_isonumchars extends SimpleMarkup
 {
-    var $_match_regexp = '\&\#\d{2,5};';
+    public $_match_regexp = '\&\#\d{2,5};';
 
     function markup($match)
     {
@@ -1249,7 +1249,7 @@
 class Markup_isohexchars extends SimpleMarkup
 {
     // hexnums, like &#x00A4; <=> &curren;
-    var $_match_regexp = '\&\#x[0-9a-fA-F]{2,4};';
+    public $_match_regexp = '\&\#x[0-9a-fA-F]{2,4};';
 
     function markup($match)
     {
@@ -1261,8 +1261,8 @@
 
 class InlineTransformer
 {
-    var $_regexps = array();
-    var $_markup = array();
+    public $_regexps = array();
+    public $_markup = array();
 
     function InlineTransformer($markup_types = false)
     {

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/PageList.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -50,7 +50,7 @@
  */
 class _PageList_Column_base
 {
-    var $_tdattr = array();
+    public $_tdattr = array();
 
     function _PageList_Column_base($default_heading, $align = false)
     {
@@ -532,7 +532,7 @@
 
 class _PageList_Column_pagename extends _PageList_Column_base
 {
-    var $_field = 'pagename';
+    public $_field = 'pagename';
 
     function _PageList_Column_pagename()
     {
@@ -598,18 +598,18 @@
 
 class PageList
 {
-    var $_group_rows = 3;
-    var $_columns = array();
-    var $_columnsMap = array(); // Maps column name to column number.
-    var $_excluded_pages = array();
-    var $_pages = array();
-    var $_caption = "";
-    var $_pagename_seen = false;
-    var $_types = array();
-    var $_options = array();
-    var $_selected = array();
-    var $_sortby = array();
-    var $_maxlen = 0;
+    public $_group_rows = 3;
+    public $_columns = array();
+    public $_columnsMap = array(); // Maps column name to column number.
+    public $_excluded_pages = array();
+    public $_pages = array();
+    public $_caption = "";
+    public $_pagename_seen = false;
+    public $_types = array();
+    public $_options = array();
+    public $_selected = array();
+    public $_sortby = array();
+    public $_maxlen = 0;
 
     function PageList($columns = false, $exclude = false, $options = false)
     {

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/PagePerm.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -353,7 +353,7 @@
  */
 class PagePermission
 {
-    var $perm;
+    public $perm;
 
     function PagePermission($hash = array())
     {

Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/PageType.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -465,7 +465,7 @@
 // abstract base class
 class PageFormatter_attach extends PageFormatter
 {
-    var $type, $prefix;
+    public $type, $prefix;
 
     // Display templated contents for wikiblog, comment and wikiforum
     function format($text)
@@ -491,17 +491,17 @@
 
 class PageFormatter_wikiblog extends PageFormatter_attach
 {
-    var $type = 'wikiblog', $prefix = "BLOG";
+    public $type = 'wikiblog', $prefix = "BLOG";
 }
 
 class PageFormatter_comment extends PageFormatter_attach
 {
-    var $type = 'comment', $prefix = "COMMENT";
+    public $type = 'comment', $prefix = "COMMENT";
 }
 
 class PageFormatter_wikiforum extends PageFormatter_attach
 {
-    var $type = 'wikiforum', $prefix = "FORUM";
+    public $type = 'wikiforum', $prefix = "FORUM";
 }
 
 /** wikiabuse for htmlarea editing. not yet used.

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/Request.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -22,7 +22,7 @@
 
 class Request
 {
-	var $args = array();
+	public $args = array();
 
     function Request()
     {

Modified: trunk/lib/RssParser.php
===================================================================
--- trunk/lib/RssParser.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/RssParser.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -45,18 +45,18 @@
     extends XmlParser
 {
 
-    var $title = "";
-    var $author = "";
-    var $pubDate = "";
-    var $link = "";
-    var $description = "";
-    var $inside_item = false;
-    var $list_items = false;
-    var $item = array();
-    var $items;
-    var $channel;
-    var $divers = "";
-    var $date = "";
+    public $title = "";
+    public $author = "";
+    public $pubDate = "";
+    public $link = "";
+    public $description = "";
+    public $inside_item = false;
+    public $list_items = false;
+    public $item = array();
+    public $items;
+    public $channel;
+    public $divers = "";
+    public $date = "";
 
     function tag_open($parser, $name, $attrs = '')
     {

Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/SemanticWeb.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -286,7 +286,7 @@
     extends NumericSearchQuery
 {
     /*
-    var $base_units = array('m'   => explode(',','km,miles,cm,dm,mm,ft,inch,inches,meter'),
+    public $base_units = array('m'   => explode(',','km,miles,cm,dm,mm,ft,inch,inches,meter'),
                 'm^2' => explode(',','km^2,ha,cm^2,mi^2'),
                 'm^3' => explode(',','km^3,lit,cm^3,dm^3,gallons'),
                 );

Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/TextSearchQuery.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -670,8 +670,8 @@
  */
 class TextSearchQuery_node
 {
-    var $op = 'VOID';
-    var $_op = 0;
+    public $op = 'VOID';
+    public $_op = 0;
 
     /**
      * Optimize this node.
@@ -718,8 +718,8 @@
 class TextSearchQuery_node_word
     extends TextSearchQuery_node
 {
-    var $op = "WORD";
-    var $_op = TSQ_TOK_WORD;
+    public $op = "WORD";
+    public $_op = TSQ_TOK_WORD;
 
     function TextSearchQuery_node_word($word)
     {
@@ -745,8 +745,8 @@
 class TextSearchQuery_node_all
     extends TextSearchQuery_node
 {
-    var $op = "ALL";
-    var $_op = TSQ_TOK_ALL;
+    public $op = "ALL";
+    public $_op = TSQ_TOK_ALL;
 
     function regexp()
     {
@@ -762,8 +762,8 @@
 class TextSearchQuery_node_starts_with
     extends TextSearchQuery_node_word
 {
-    var $op = "STARTS_WITH";
-    var $_op = TSQ_TOK_STARTS_WITH;
+    public $op = "STARTS_WITH";
+    public $_op = TSQ_TOK_STARTS_WITH;
 
     function regexp()
     {
@@ -789,8 +789,8 @@
 class TextSearchQuery_node_ends_with
     extends TextSearchQuery_node_word
 {
-    var $op = "ENDS_WITH";
-    var $_op = TSQ_TOK_ENDS_WITH;
+    public $op = "ENDS_WITH";
+    public $_op = TSQ_TOK_ENDS_WITH;
 
     function regexp()
     {
@@ -816,8 +816,8 @@
 class TextSearchQuery_node_exact
     extends TextSearchQuery_node_word
 {
-    var $op = "EXACT";
-    var $_op = TSQ_TOK_EXACT;
+    public $op = "EXACT";
+    public $_op = TSQ_TOK_EXACT;
 
     function regexp()
     {
@@ -833,8 +833,8 @@
 class TextSearchQuery_node_regex // posix regex. FIXME!
     extends TextSearchQuery_node_word
 {
-    var $op = "REGEX"; // using REGEXP or ~ extension
-    var $_op = TSQ_TOK_REGEX;
+    public $op = "REGEX"; // using REGEXP or ~ extension
+    public $_op = TSQ_TOK_REGEX;
 
     function regexp()
     {
@@ -850,8 +850,8 @@
 class TextSearchQuery_node_regex_glob
     extends TextSearchQuery_node_regex
 {
-    var $op = "REGEX_GLOB";
-    var $_op = TSQ_TOK_REGEX_GLOB;
+    public $op = "REGEX_GLOB";
+    public $_op = TSQ_TOK_REGEX_GLOB;
 
     function regexp()
     {
@@ -862,8 +862,8 @@
 class TextSearchQuery_node_regex_pcre // how to handle pcre modifiers? /i
     extends TextSearchQuery_node_regex
 {
-    var $op = "REGEX_PCRE";
-    var $_op = TSQ_TOK_REGEX_PCRE;
+    public $op = "REGEX_PCRE";
+    public $_op = TSQ_TOK_REGEX_PCRE;
 
     function regexp()
     {
@@ -874,8 +874,8 @@
 class TextSearchQuery_node_regex_sql
     extends TextSearchQuery_node_regex
 {
-    var $op = "REGEX_SQL"; // using LIKE
-    var $_op = TSQ_TOK_REGEX_SQL;
+    public $op = "REGEX_SQL"; // using LIKE
+    public $_op = TSQ_TOK_REGEX_SQL;
 
     function regexp()
     {
@@ -894,8 +894,8 @@
 class TextSearchQuery_node_not
     extends TextSearchQuery_node
 {
-    var $op = "NOT";
-    var $_op = TSQ_TOK_NOT;
+    public $op = "NOT";
+    public $_op = TSQ_TOK_NOT;
 
     function TextSearchQuery_node_not($leaf)
     {
@@ -929,7 +929,7 @@
 class TextSearchQuery_node_binop
     extends TextSearchQuery_node
 {
-    var $_op = TSQ_TOK_BINOP;
+    public $_op = TSQ_TOK_BINOP;
 
     function TextSearchQuery_node_binop($leaves)
     {
@@ -976,7 +976,7 @@
 class TextSearchQuery_node_and
     extends TextSearchQuery_node_binop
 {
-    var $op = "AND";
+    public $op = "AND";
 
     function optimize()
     {
@@ -1028,7 +1028,7 @@
 class TextSearchQuery_node_or
     extends TextSearchQuery_node_binop
 {
-    var $op = "OR";
+    public $op = "OR";
 
     function regexp()
     {

Modified: trunk/lib/WikiDB/backend/ADODB_oci8po.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_oci8po.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiDB/backend/ADODB_oci8po.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -10,7 +10,7 @@
 class WikiDB_backend_ADODB_oci8po
     extends WikiDB_backend_ADODB
 {
-    var $_prefix;
+    public $_prefix;
 
     /**
      * Constructor.

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiDB/backend/PearDB.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -5,7 +5,7 @@
 class WikiDB_backend_PearDB
     extends WikiDB_backend
 {
-    var $_dbh;
+    public $_dbh;
 
     function WikiDB_backend_PearDB($dbparams)
     {

Modified: trunk/lib/WikiDB/backend/cvs.php
===================================================================
--- trunk/lib/WikiDB/backend/cvs.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiDB/backend/cvs.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -39,10 +39,10 @@
 class WikiDB_backend_cvs
     extends WikiDB_backend
 {
-    var $_docDir;
-    var $_repository;
-    var $_module_name;
-    var $_debug_file;
+    public $_docDir;
+    public $_repository;
+    public $_module_name;
+    public $_debug_file;
 
     /**
      * In the following parameters should be defined in dbparam:
@@ -924,7 +924,7 @@
 class Cvs_Backend_Array_Iterator
     extends WikiDB_backend_iterator
 {
-    var $_array;
+    public $_array;
 
     function Cvs_Backend_Iterator($arrayValue = Array())
     {
@@ -953,8 +953,8 @@
 class Cvs_Backend_Full_Search_Iterator
     extends Cvs_Backend_Array_Iterator
 {
-    var $_searchString = '';
-    var $_docDir = "";
+    public $_searchString = '';
+    public $_docDir = "";
 
     function Cvs_Backend_Title_Search_Iterator($arrayValue = Array(),
                                                $searchString = "",
@@ -1000,7 +1000,7 @@
 class Cvs_Backend_Title_Search_Iterator
     extends Cvs_Backend_Array_Iterator
 {
-    var $_searchString = '';
+    public $_searchString = '';
 
     function Cvs_Backend_Title_Search_Iterator($arrayValue = Array(),
                                                $searchString = "")

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiDB/backend/file.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -46,12 +46,12 @@
 class WikiDB_backend_file
     extends WikiDB_backend
 {
-    var $data_dir;
-    var $_dir_names;
+    public $data_dir;
+    public $_dir_names;
 
-    var $_page_data; // temporarily stores the pagedata (via _loadPageData)
-    var $_page_version_data; // temporarily stores the versiondata (via _loadVersionData)
-    var $_latest_versions; // temporarily stores the latest version-numbers (for every pagename)
+    public $_page_data; // temporarily stores the pagedata (via _loadPageData)
+    public $_page_version_data; // temporarily stores the versiondata (via _loadVersionData)
+    public $_latest_versions; // temporarily stores the latest version-numbers (for every pagename)
 
     function WikiDB_backend_file($dbparam)
     {

Modified: trunk/lib/WikiDB/cvs.php
===================================================================
--- trunk/lib/WikiDB/cvs.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiDB/cvs.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -15,7 +15,7 @@
 class WikiDB_cvs
     extends WikiDB
 {
-    var $_backend;
+    public $_backend;
 
     /**
      * Constructor requires the DB parameters.

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiDB.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -1548,7 +1548,7 @@
  */
 class WikiDB_PageRevision
 {
-    //var $_transformedContent = false; // set by WikiDB_Page::save()
+    public $_transformedContent = false; // set by WikiDB_Page::save()
 
     function WikiDB_PageRevision(&$wikidb, $pagename, $version,
                                  $versiondata = false)

Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiGroup.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -59,15 +59,15 @@
 class WikiGroup
 {
     /** User name */
-    var $username = '';
+    public $username = '';
     /** User object if different from current user */
-    var $user;
+    public $user;
     /** The global WikiRequest object */
-    //var $request;
+    //public $request;
     /** Array of groups $username is confirmed to belong to */
-    var $membership;
+    public $membership;
     /** boolean if not the current user */
-    var $not_current = false;
+    public $not_current = false;
 
     /**
      * Initializes a WikiGroup object which should never happen.  Use:
@@ -629,7 +629,7 @@
 class GroupDb extends WikiGroup
 {
 
-    var $_is_member, $_group_members, $_user_groups;
+    public $_is_member, $_group_members, $_user_groups;
 
     /**
      * Constructor

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiPlugin.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -433,7 +433,7 @@
 
 class WikiPluginLoader
 {
-    var $_errors;
+    public $_errors;
 
     function expandPI($pi, &$request, &$markup, $basepage = false)
     {

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiPluginCached.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -58,7 +58,7 @@
  */
 class WikiPluginCached extends WikiPlugin
 {
-    var $_static;
+    public $_static;
 
     /**
      * Produces URL and id number from plugin arguments which later on,

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiTheme.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -179,8 +179,8 @@
 
 class WikiTheme
 {
-    var $HTML_DUMP_SUFFIX = '';
-    var $DUMP_MODE = false, $dumped_images, $dumped_css;
+    public $HTML_DUMP_SUFFIX = '';
+    public $DUMP_MODE = false, $dumped_images, $dumped_css;
 
     /**
      * noinit: Do not initialize unnecessary items in default_theme fallback twice.
@@ -316,10 +316,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.
 
-    var $_dateFormat = "%B %d, %Y";
-    var $_timeFormat = "%I:%M %p";
+    public $_dateFormat = "%B %d, %Y";
+    public $_timeFormat = "%I:%M %p";
 
-    var $_showModTime = true;
+    public $_showModTime = true;
 
     /**
      * Set format string used for dates.
@@ -566,7 +566,7 @@
     //
     ////////////////////////////////////////////////////////////////
 
-    var $_autosplitWikiWords = false;
+    public $_autosplitWikiWords = false;
 
     function setAutosplitWikiWords($autosplit = true)
     {
@@ -581,7 +581,7 @@
             return $wikiword;
     }
 
-    var $_anonEditUnknownLinks = true;
+    public $_anonEditUnknownLinks = true;
 
     function setAnonEditUnknownLinks($anonedit = true)
     {
@@ -707,7 +707,7 @@
     // Images and Icons
     //
     ////////////////////////////////////////////////////////////////
-    var $_imageAliases = array();
+    public $_imageAliases = array();
 
     /**
      *
@@ -772,7 +772,7 @@
         return false;
     }
 
-    var $_linkIcon = 'front'; // or 'after' or 'no'.
+    public $_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()
@@ -1076,7 +1076,7 @@
     }
 
     //----------------------------------------------------------------
-    var $_buttonSeparator = "\n | ";
+    public $_buttonSeparator = "\n | ";
 
     function setButtonSeparator($separator)
     {
@@ -1834,7 +1834,7 @@
 class PluginSidebarBox extends SidebarBox
 {
 
-    var $_plugin, $_args = false, $_basepage = false;
+    public $_plugin, $_args = false, $_basepage = false;
 
     function PluginSidebarBox($name, $args = false, $basepage = false)
     {

Modified: trunk/lib/WikiUser/AdoDb.php
===================================================================
--- trunk/lib/WikiUser/AdoDb.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUser/AdoDb.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -36,7 +36,7 @@
      * @tables: user
      */
 {
-    var $_authmethod = 'AdoDb';
+    public $_authmethod = 'AdoDb';
 
     function _AdoDbPassUser($UserName = '', $prefs = false)
     {

Modified: trunk/lib/WikiUser/BogoLogin.php
===================================================================
--- trunk/lib/WikiUser/BogoLogin.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUser/BogoLogin.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -26,7 +26,7 @@
 class _BogoLoginPassUser extends _PassUser
 {
 
-    var $_authmethod = 'BogoLogin';
+    public $_authmethod = 'BogoLogin';
 
     function userExists()
     {

Modified: trunk/lib/WikiUser/Db.php
===================================================================
--- trunk/lib/WikiUser/Db.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUser/Db.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -45,7 +45,7 @@
 class _DbPassUser
     extends _PassUser
 {
-    var $_authselect, $_authupdate, $_authcreate;
+    public $_authselect, $_authupdate, $_authcreate;
 
     // This can only be called from _PassUser, because the parent class
     // sets the auth_dbi and pref methods, before this class is initialized.

Modified: trunk/lib/WikiUser/File.php
===================================================================
--- trunk/lib/WikiUser/File.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUser/File.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -29,7 +29,7 @@
      * Preferences are handled in _PassUser
      */
 {
-    var $_file, $_may_change;
+    public $_file, $_may_change;
 
     // This can only be called from _PassUser, because the parent class
     // sets the pref methods, before this class is initialized.

Modified: trunk/lib/WikiUser/FusionForge.php
===================================================================
--- trunk/lib/WikiUser/FusionForge.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUser/FusionForge.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -26,7 +26,7 @@
 class _FusionForgePassUser extends _PassUser
 {
 
-    var $_is_external = 0;
+    public $_is_external = 0;
 
     function _FusionForgePassUser($UserName = '', $prefs = false)
     {

Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUser/PdoDb.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -33,7 +33,7 @@
      * @tables: pref
      */
 {
-    var $_authmethod = 'PDODb';
+    public $_authmethod = 'PDODb';
 
     function _PdoDbPassUser($UserName = '', $prefs = false)
     {

Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUser/PearDb.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -31,7 +31,7 @@
      * @tables: pref
      */
 {
-    var $_authmethod = 'PearDb';
+    public $_authmethod = 'PearDb';
 
     function _PearDbPassUser($UserName = '', $prefs = false)
     {

Modified: trunk/lib/WikiUser/PersonalPage.php
===================================================================
--- trunk/lib/WikiUser/PersonalPage.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUser/PersonalPage.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -27,7 +27,7 @@
 class _PersonalPagePassUser
     extends _PassUser
 {
-    var $_authmethod = 'PersonalPage';
+    public $_authmethod = 'PersonalPage';
 
     /* Very loose checking, since we properly quote the PageName.
        Just trim spaces, ... See lib/stdlib.php

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUser.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -66,10 +66,10 @@
  */
 class WikiUser
 {
-    var $_userid = false;
-    var $_level = false;
-    var $_request, $_dbi, $_authdbi, $_homepage;
-    var $_authmethod = '', $_authhow = '';
+    public $_userid = false;
+    public $_level = false;
+    public $_request, $_dbi, $_authdbi, $_homepage;
+    public $_authmethod = '', $_authhow = '';
 
     /**
      * Constructor.

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WikiUserNew.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -367,10 +367,10 @@
  */
 class _WikiUser
 {
-    var $_userid = '';
-    var $_level = WIKIAUTH_ANON;
-    var $_prefs = false;
-    var $_HomePagehandle = false;
+    public $_userid = '';
+    public $_level = WIKIAUTH_ANON;
+    public $_prefs = false;
+    public $_HomePagehandle = false;
 
     // constructor
     function _WikiUser($UserName = '', $prefs = false)
@@ -721,7 +721,7 @@
 class _AnonUser
     extends _WikiUser
 {
-    var $_level = WIKIAUTH_ANON; // var in php-5.0.0RC1 deprecated
+    public $_level = WIKIAUTH_ANON;
 
     /** Anon only gets to load and save prefs in a cookie, that's it.
      */
@@ -870,7 +870,7 @@
 class _ForbiddenUser
     extends _AnonUser
 {
-    var $_level = WIKIAUTH_FORBIDDEN;
+    public $_level = WIKIAUTH_FORBIDDEN;
 
     function checkPass($submitted_password)
     {
@@ -931,8 +931,8 @@
      * @tables: pref
      */
 {
-    var $_auth_dbi, $_prefs;
-    var $_current_method, $_current_index;
+    public $_auth_dbi, $_prefs;
+    public $_current_method, $_current_index;
 
     // check and prepare the auth and pref methods only once
     function _PassUser($UserName = '', $prefs = false)
@@ -1483,7 +1483,7 @@
 
 class _UserPreference
 {
-    var $default_value;
+    public $default_value;
 
     function _UserPreference($default_value)
     {
@@ -1928,7 +1928,7 @@
  */
 class UserPreferences
 {
-    var $notifyPagesAll;
+    public $notifyPagesAll;
 
     function UserPreferences($saved_prefs = false)
     {

Modified: trunk/lib/WysiwygEdit.php
===================================================================
--- trunk/lib/WysiwygEdit.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/WysiwygEdit.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -102,7 +102,7 @@
 
 class Markup_html_p extends BalancedMarkup
 {
-    var $_start_regexp = "<(?:p|P)( class=\".*\")?>";
+    public $_start_regexp = "<(?:p|P)( class=\".*\")?>";
 
     function getEndRegexp($match)
     {
@@ -118,7 +118,7 @@
 //'<SPAN style="FONT-WEIGHT: bold">text</SPAN>' => '*text*'
 class Markup_html_spanbold extends BalancedMarkup
 {
-    var $_start_regexp = "<(?:span|SPAN) style=\"FONT-WEIGHT: bold\">";
+    public $_start_regexp = "<(?:span|SPAN) style=\"FONT-WEIGHT: bold\">";
 
     function getEndRegexp($match)
     {

Modified: trunk/lib/XmlParser.php
===================================================================
--- trunk/lib/XmlParser.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/XmlParser.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -50,7 +50,7 @@
 class XmlParser
 {
 
-    var $_parser, $root, $current, $previous, $parent;
+    public $_parser, $root, $current, $previous, $parent;
 
     function XmlParser($encoding = '')
     { //  "ISO-8859-1"

Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/diff3.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -12,7 +12,7 @@
 
 class _Diff3_Block
 {
-    var $type = 'diff3';
+    public $type = 'diff3';
 
     function _Diff3_Block($orig = false, $final1 = false, $final2 = false)
     {
@@ -42,7 +42,7 @@
 
 class _Diff3_CopyBlock extends _Diff3_Block
 {
-    var $type = 'copy';
+    public $type = 'copy';
 
     function _Diff3_CopyBlock($lines = false)
     {

Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/difflib.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -10,9 +10,9 @@
 
 class _DiffOp
 {
-    var $type;
-    var $orig;
-    var $final;
+    public $type;
+    public $orig;
+    public $final;
 
     function reverse()
     {
@@ -32,7 +32,7 @@
 
 class _DiffOp_Copy extends _DiffOp
 {
-    var $type = 'copy';
+    public $type = 'copy';
 
     function _DiffOp_Copy($orig, $final = false)
     {
@@ -50,7 +50,7 @@
 
 class _DiffOp_Delete extends _DiffOp
 {
-    var $type = 'delete';
+    public $type = 'delete';
 
     function _DiffOp_Delete($lines)
     {
@@ -66,7 +66,7 @@
 
 class _DiffOp_Add extends _DiffOp
 {
-    var $type = 'add';
+    public $type = 'add';
 
     function _DiffOp_Add($lines)
     {
@@ -82,7 +82,7 @@
 
 class _DiffOp_Change extends _DiffOp
 {
-    var $type = 'change';
+    public $type = 'change';
 
     function _DiffOp_Change($orig, $final)
     {
@@ -505,7 +505,7 @@
  */
 class Diff
 {
-    var $edits;
+    public $edits;
 
     /**
      * Constructor.
@@ -713,7 +713,7 @@
      * This should be left at zero for this class, but subclasses
      * may want to set this to other values.
      */
-    var $leading_context_lines = 0;
+    public $leading_context_lines = 0;
 
     /**
      * Number of trailing context "lines" to preserve.
@@ -721,7 +721,7 @@
      * This should be left at zero for this class, but subclasses
      * may want to set this to other values.
      */
-    var $trailing_context_lines = 0;
+    public $trailing_context_lines = 0;
 
     /**
      * Format a diff.

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/main.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -50,7 +50,7 @@
 
 class WikiRequest extends Request
 {
-    var $_dbi;
+    public $_dbi;
 
     function WikiRequest()
     {

Modified: trunk/lib/plugin/PageDump.php
===================================================================
--- trunk/lib/plugin/PageDump.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/PageDump.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -50,7 +50,7 @@
 class WikiPlugin_PageDump
     extends WikiPlugin
 {
-    var $MessageId;
+    public $MessageId;
 
     function getName()
     {

Modified: trunk/lib/plugin/PageTrail.php
===================================================================
--- trunk/lib/plugin/PageTrail.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/PageTrail.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -38,7 +38,7 @@
 class WikiPlugin_PageTrail
     extends WikiPlugin
 {
-    var $def_numberlinks = 5;
+    public $def_numberlinks = 5;
 
     function getName()
     {

Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/RateIt.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -85,7 +85,7 @@
     extends WikiPlugin
 {
     static $toBeUniq = 1;
-    var $idTop = '';
+    public $idTop = '';
 
     function getName()
     {

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/RecentChanges.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -25,8 +25,8 @@
 
 class _RecentChanges_Formatter
 {
-    var $_absurls = false;
-    var $action = "RecentChanges";
+    public $_absurls = false;
+    public $action = "RecentChanges";
 
     function _RecentChanges_Formatter($rc_args)
     {
@@ -817,7 +817,7 @@
 class _RecentChanges_RssFormatter
     extends _RecentChanges_Formatter
 {
-    var $_absurls = true;
+    public $_absurls = true;
 
     function time($rev)
     {

Modified: trunk/lib/plugin/SiteMap.php
===================================================================
--- trunk/lib/plugin/SiteMap.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/SiteMap.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -45,7 +45,7 @@
 class WikiPlugin_SiteMap
     extends WikiPlugin
 {
-    var $_pagename;
+    public $_pagename;
 
     function getName()
     {

Modified: trunk/lib/plugin/SqlResult.php
===================================================================
--- trunk/lib/plugin/SqlResult.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/SqlResult.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -61,7 +61,7 @@
 class WikiPlugin_SqlResult
     extends WikiPlugin
 {
-    var $_args;
+    public $_args;
 
     function getName()
     {

Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/TeX2png.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -36,10 +36,10 @@
 class WikiPlugin_TeX2png
     extends WikiPlugin
 {
-    var $imagepath = 'images/tex';
-    var $latexbin = '/usr/bin/latex';
-    var $dvipsbin = '/usr/bin/dvips';
-    var $pstoimgbin = '/usr/bin/pstoimg';
+    public $imagepath = 'images/tex';
+    public $latexbin = '/usr/bin/latex';
+    public $dvipsbin = '/usr/bin/dvips';
+    public $pstoimgbin = '/usr/bin/pstoimg';
 
     function getName()
     {

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/UpLoad.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -36,9 +36,9 @@
 class WikiPlugin_UpLoad
     extends WikiPlugin
 {
-    var $disallowed_extensions;
+    public $disallowed_extensions;
     // TODO: use PagePerms instead
-    var $only_authenticated = true; // allow only authenticated users may upload.
+    public $only_authenticated = true; // allow only authenticated users may upload.
 
     function getName()
     {

Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/UserPreferences.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -33,7 +33,7 @@
 class WikiPlugin_UserPreferences
     extends WikiPlugin
 {
-    var $bool_args;
+    public $bool_args;
 
     function getName()
     {

Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/plugin/WikiPoll.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -54,7 +54,7 @@
 class WikiPlugin_WikiPoll
     extends WikiPlugin
 {
-    var $_args;
+    public $_args;
 
     function getName()
     {

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/stdlib.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -682,8 +682,6 @@
 
 class Stack
 {
-
-    // var in php5 deprecated
     function Stack()
     {
         $this->items = array();
@@ -808,19 +806,19 @@
      * This is the value of $name passed to the constructor.
      * (For use, e.g. as a default label for links to the page.)
      */
-    //var $shortName;
+    public $shortName;
 
     /** The full page name.
      *
      * This is the full name of the page (without anchor).
      */
-    //var $name;
+    public $name;
 
     /** The anchor.
      *
      * This is the referenced anchor within the page, or the empty string.
      */
-    //var $anchor;
+    public $anchor;
 
     /** Constructor
      *
@@ -1667,7 +1665,7 @@
 // expands a list containing regex's to its matching entries
 class ListRegexExpand
 {
-    //var $match, $list, $index, $case_sensitive;
+    public $match, $list, $index, $case_sensitive;
     function ListRegexExpand(&$list, $match, $case_sensitive = true)
     {
         $this->match = $match;

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/upgrade.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -1200,7 +1200,7 @@
     /**
      * check all pages for a plugin match
      */
-    var $silent_skip = 1;
+    public $silent_skip = 1;
 
     function default_method(&$args)
     {

Modified: trunk/lib/wikilens/CustomPrefs.php
===================================================================
--- trunk/lib/wikilens/CustomPrefs.php	2013-05-29 07:28:23 UTC (rev 8788)
+++ trunk/lib/wikilens/CustomPrefs.php	2013-05-29 07:32:07 UTC (rev 8789)
@@ -13,8 +13,8 @@
 class _UserPreference_recengine // recommendation engine method
     extends _UserPreference
 {
-    var $valid_values = array('php', 'mysuggest', 'mymovielens', 'mycluto');
-    var $default_value = 'php';
+    public $valid_values = array('php', 'mysuggest', 'mymovielens', 'mycluto');
+    public $default_value = 'php';
 
     function sanify($value)
     {
@@ -26,14 +26,14 @@
 class _UserPreference_recalgo // recommendation engine algorithm
     extends _UserPreference
 {
-    var $valid_values = array
+    public $valid_values = array
     (
         'itemCos', // Item-based Top-N recommendation algorithm with cosine-based similarity function
         'itemProb', // Item-based Top-N recommendation algorithm with probability-based similarity function.
         // This algorithms tends to outperform the rest.
         'userCos', // User-based Top-N recommendation algorithm with cosine-based similarity function.
         'bayes'); // Naïve Bayesian Classifier
-    var $default_value = 'itemProb';
+    public $default_value = 'itemProb';
 
     function sanify($value)
     {

Modified: trunk/lib/wikilens/PageListColumns.php
===================================================================
---...
 
[truncated message content]