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

[phpwiki-checkins] SF.net SVN: phpwiki:[9775] trunk/lib/WikiDB/backend/PearDB_mysqli.php

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

Revision: 9775
          http://sourceforge.net/p/phpwiki/code/9775
Author:   vargenau
Date:     2016-02-08 09:01:28 +0000 (Mon, 08 Feb 2016)
Log Message:
-----------
mysql --> mysqli

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/PearDB_mysqli.php

Modified: trunk/lib/WikiDB/backend/PearDB_mysqli.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysqli.php	2016-02-04 20:50:31 UTC (rev 9774)
+++ trunk/lib/WikiDB/backend/PearDB_mysqli.php	2016-02-08 09:01:28 UTC (rev 9775)
@@ -2,10 +2,6 @@
 
 require_once 'lib/WikiDB/backend/PearDB.php';
 
-// See http://sql-info.de/mysql/gotchas.html for mysql specific quirks.
-
-// The slowest function overall is mysql_connect with [680ms]
-// 2nd is db_mysql::simpleQuery with [257ms]
 class WikiDB_backend_PearDB_mysqli
     extends WikiDB_backend_PearDB
 {
@@ -26,7 +22,7 @@
             }
             // esp. needed for utf databases
             if ($this->_serverinfo['version'] > 401.0) {
-                mysql_query("SET NAMES 'UTF-8'");
+                mysqli_set_charset($this->_dbh->connection, 'UTF-8');
             }
         }
     }
@@ -37,15 +33,15 @@
     function _timeout()
     {
         if (empty($this->_dbparams['timeout'])) return;
-        $result = mysql_query("SHOW processlist");
-        while ($row = mysql_fetch_array($result)) {
+        $result = mysqli_query($this->_dbh->connection, "SHOW processlist");
+        while ($row = mysqli_fetch_array($result)) {
             if ($row["db"] == $this->_dbh->dsn['database']
                 and $row["User"] == $this->_dbh->dsn['username']
                     and $row["Time"] > $this->_dbparams['timeout']
                         and $row["Command"] == "Sleep"
             ) {
                 $process_id = $row["Id"];
-                mysql_query("KILL $process_id");
+                mysqli_query($this->_dbh->connection, "KILL $process_id");
             }
         }
     }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9774] trunk

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

Revision: 9774
          http://sourceforge.net/p/phpwiki/code/9774
Author:   vargenau
Date:     2016-02-04 20:50:31 +0000 (Thu, 04 Feb 2016)
Log Message:
-----------
Use mysqli instead of mysql

Modified Paths:
--------------
    trunk/lib/WikiDB/SQL.php
    trunk/pgsrc/ReleaseNotes

Added Paths:
-----------
    trunk/lib/WikiDB/backend/PearDB_mysqli.php

Removed Paths:
-------------
    trunk/lib/WikiDB/backend/PearDB_mysql.php

Modified: trunk/lib/WikiDB/SQL.php
===================================================================
--- trunk/lib/WikiDB/SQL.php	2016-02-04 16:54:35 UTC (rev 9773)
+++ trunk/lib/WikiDB/SQL.php	2016-02-04 20:50:31 UTC (rev 9774)
@@ -16,6 +16,10 @@
             if (is_string($dbparams['dsn']))
                 $dbparams['dsn'] = $backend . ':' . substr($dbparams['dsn'], 10);
         }
+        if ($backend == 'mysql') {
+            $backend = 'mysqli';
+        }
+
         include_once 'lib/WikiDB/backend/PearDB_' . $backend . '.php';
         $backend_class = "WikiDB_backend_PearDB_" . $backend;
         $backend = new $backend_class($dbparams);

Deleted: trunk/lib/WikiDB/backend/PearDB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysql.php	2016-02-04 16:54:35 UTC (rev 9773)
+++ trunk/lib/WikiDB/backend/PearDB_mysql.php	2016-02-04 20:50:31 UTC (rev 9774)
@@ -1,228 +0,0 @@
-<?php
-
-require_once 'lib/WikiDB/backend/PearDB.php';
-
-// See http://sql-info.de/mysql/gotchas.html for mysql specific quirks.
-
-// The slowest function overall is mysql_connect with [680ms]
-// 2nd is db_mysql::simpleQuery with [257ms]
-class WikiDB_backend_PearDB_mysql
-    extends WikiDB_backend_PearDB
-{
-    function __construct($dbparams)
-    {
-        parent::__construct($dbparams);
-        if (DB::isError($this->_dbh)) return;
-        //$this->_serverinfo = $this->_dbh->ServerInfo();
-        $row = $this->_dbh->GetOne("SELECT version()");
-        if (!DB::isError($row) and !empty($row)) {
-            $arr = explode('.', $row);
-            $this->_serverinfo['version'] = (string)(($arr[0] * 100) + $arr[1]) .
-                "." . (integer)$arr[2];
-            if ($this->_serverinfo['version'] < 323.0) {
-                // Older MySQL's don't have CASE WHEN ... END
-                $this->_expressions['maxmajor'] = "MAX(IF(minor_edit=0,version,0))";
-                $this->_expressions['maxminor'] = "MAX(IF(minor_edit<>0,version,0))";
-            }
-            // esp. needed for utf databases
-            if ($this->_serverinfo['version'] > 401.0) {
-                mysql_query("SET NAMES 'UTF-8'");
-            }
-        }
-    }
-
-    /**
-     * Kill timed out processes. ( so far only called on about every 50-th save. )
-     */
-    function _timeout()
-    {
-        if (empty($this->_dbparams['timeout'])) return;
-        $result = mysql_query("SHOW processlist");
-        while ($row = mysql_fetch_array($result)) {
-            if ($row["db"] == $this->_dbh->dsn['database']
-                and $row["User"] == $this->_dbh->dsn['username']
-                    and $row["Time"] > $this->_dbparams['timeout']
-                        and $row["Command"] == "Sleep"
-            ) {
-                $process_id = $row["Id"];
-                mysql_query("KILL $process_id");
-            }
-        }
-    }
-
-    /*
-     * Create a new revision of a page.
-     */
-    function set_versiondata($pagename, $version, $data)
-    {
-        $dbh = &$this->_dbh;
-        $version_tbl = $this->_table_names['version_tbl'];
-
-        $minor_edit = (int)!empty($data['is_minor_edit']);
-        unset($data['is_minor_edit']);
-
-        $mtime = (int)$data['mtime'];
-        unset($data['mtime']);
-        assert(!empty($mtime));
-
-        @$content = (string)$data['%content'];
-        unset($data['%content']);
-        unset($data['%pagedata']);
-
-        $this->lock();
-        $id = $this->_get_pageid($pagename, true);
-        // requires PRIMARY KEY (id,version)!
-        // VALUES supported since mysql-3.22.5
-        $dbh->query(sprintf("REPLACE INTO $version_tbl"
-                . " (id,version,mtime,minor_edit,content,versiondata)"
-                . " VALUES(%d,%d,%d,%d,'%s','%s')",
-            $id, $version, $mtime, $minor_edit,
-            $dbh->escapeSimple($content),
-            $dbh->escapeSimple($this->_serialize($data))
-        ));
-        // real binding (prepare,execute) only since mysqli + PHP5
-        $this->_update_recent_table($id);
-        $this->_update_nonempty_table($id);
-        $this->unlock();
-    }
-
-    function _update_recent_table($pageid = false)
-    {
-        $dbh = &$this->_dbh;
-        extract($this->_table_names);
-        extract($this->_expressions);
-
-        $pageid = (int)$pageid;
-
-        // optimized: mysql can do this with one REPLACE INTO.
-        // supported in every (?) mysql version
-        // requires PRIMARY KEY (id)!
-        $dbh->query("REPLACE INTO $recent_tbl"
-            . " (id, latestversion, latestmajor, latestminor)"
-            . " SELECT id, $maxversion, $maxmajor, $maxminor"
-            . " FROM $version_tbl"
-            . ($pageid ? " WHERE id=$pageid" : "")
-            . " GROUP BY id");
-    }
-
-    /*
-     * Find referenced empty pages.
-     */
-    function wanted_pages($exclude_from = '', $exclude = '', $sortby = '', $limit = '')
-    {
-        $dbh = &$this->_dbh;
-        extract($this->_table_names);
-        if ($orderby = $this->sortby($sortby, 'db', array('pagename', 'wantedfrom')))
-            $orderby = 'ORDER BY ' . $orderby;
-
-        if ($exclude_from) // array of pagenames
-            $exclude_from = " AND pp.pagename NOT IN " . $this->_sql_set($exclude_from);
-        if ($exclude) // array of pagenames
-            $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
-
-    /* ISNULL is mysql specific */
-        $sql = "SELECT p.pagename, pp.pagename AS wantedfrom"
-            . " FROM $page_tbl p, $link_tbl linked"
-            . " LEFT JOIN $page_tbl pp ON (linked.linkto = pp.id)"
-            . " LEFT JOIN $nonempty_tbl ne ON (linked.linkto = ne.id)"
-            . " WHERE ISNULL(ne.id)"
-            . " AND p.id = linked.linkfrom"
-            . $exclude_from
-            . $exclude
-            . $orderby;
-        if ($limit) {
-            list($from, $count) = $this->limit($limit);
-            $result = $dbh->limitQuery($sql, $from, $count * 3);
-        } else {
-            $result = $dbh->query($sql);
-        }
-        return new WikiDB_backend_PearDB_generic_iter($this, $result);
-    }
-
-    /* // REPLACE will not delete empy pages, so it was removed --ru
-    function _update_nonempty_table($pageid = false) {
-        $dbh = &$this->_dbh;
-        extract($this->_table_names);
-
-        $pageid = (int)$pageid;
-
-        // Optimized: mysql can do this with one REPLACE INTO.
-        // supported in every (?) mysql version
-        // requires PRIMARY KEY (id)
-        $dbh->query("REPLACE INTO $nonempty_tbl (id)"
-                    . " SELECT $recent_tbl.id"
-                    . " FROM $recent_tbl, $version_tbl"
-                    . " WHERE $recent_tbl.id=$version_tbl.id"
-                    . "       AND version=latestversion"
-                    . "  AND content<>''"
-                    . ( $pageid ? " AND $recent_tbl.id=$pageid" : ""));
-    }
-    */
-
-    /**
-     * Pack tables.
-     */
-    function optimize()
-    {
-        $dbh = &$this->_dbh;
-        $this->_timeout();
-        foreach ($this->_table_names as $table) {
-            $dbh->query("OPTIMIZE TABLE $table");
-        }
-        return true;
-    }
-
-    /*
-     * Lock tables.
-     */
-    protected function _lock_tables($write_lock = true)
-    {
-        $lock_type = $write_lock ? "WRITE" : "READ";
-        $tables = array();
-        foreach ($this->_table_names as $table) {
-            $tables[] = "$table $lock_type";
-        }
-        $this->_dbh->query("LOCK TABLES " . join(",", $tables));
-    }
-
-    /*
-     * Release all locks.
-     */
-    protected function _unlock_tables()
-    {
-        $this->_dbh->query("UNLOCK TABLES");
-    }
-
-    function increaseHitCount($pagename)
-    {
-        $dbh = &$this->_dbh;
-        // Hits is the only thing we can update in a fast manner.
-        // Note that this will fail silently if the page does not
-        // have a record in the page table.  Since it's just the
-        // hit count, who cares?
-        // LIMIT since 3.23
-        $dbh->query(sprintf("UPDATE LOW_PRIORITY %s SET hits=hits+1 WHERE pagename='%s' %s",
-            $this->_table_names['page_tbl'],
-            $dbh->escapeSimple($pagename),
-            ($this->_serverinfo['version'] >= 323.0) ? "LIMIT 1" : ""));
-    }
-
-}
-
-class WikiDB_backend_PearDB_mysql_search
-    extends WikiDB_backend_PearDB_search
-{
-    function _pagename_match_clause($node)
-    {
-        $word = $node->sql();
-        $dbh = &$this->_dbh;
-        $word = $dbh->escapeSimple($word);
-        if ($node->op == 'REGEX') { // posix regex extensions
-            return "pagename REGEXP '$word'";
-        } else {
-            return ($this->_case_exact
-                ? "pagename LIKE '$word'"
-                : "LOWER(pagename) LIKE '$word'");
-        }
-    }
-}

Copied: trunk/lib/WikiDB/backend/PearDB_mysqli.php (from rev 9773, trunk/lib/WikiDB/backend/PearDB_mysql.php)
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysqli.php	                        (rev 0)
+++ trunk/lib/WikiDB/backend/PearDB_mysqli.php	2016-02-04 20:50:31 UTC (rev 9774)
@@ -0,0 +1,228 @@
+<?php
+
+require_once 'lib/WikiDB/backend/PearDB.php';
+
+// See http://sql-info.de/mysql/gotchas.html for mysql specific quirks.
+
+// The slowest function overall is mysql_connect with [680ms]
+// 2nd is db_mysql::simpleQuery with [257ms]
+class WikiDB_backend_PearDB_mysqli
+    extends WikiDB_backend_PearDB
+{
+    function __construct($dbparams)
+    {
+        parent::__construct($dbparams);
+        if (DB::isError($this->_dbh)) return;
+        //$this->_serverinfo = $this->_dbh->ServerInfo();
+        $row = $this->_dbh->GetOne("SELECT version()");
+        if (!DB::isError($row) and !empty($row)) {
+            $arr = explode('.', $row);
+            $this->_serverinfo['version'] = (string)(($arr[0] * 100) + $arr[1]) .
+                "." . (integer)$arr[2];
+            if ($this->_serverinfo['version'] < 323.0) {
+                // Older MySQL's don't have CASE WHEN ... END
+                $this->_expressions['maxmajor'] = "MAX(IF(minor_edit=0,version,0))";
+                $this->_expressions['maxminor'] = "MAX(IF(minor_edit<>0,version,0))";
+            }
+            // esp. needed for utf databases
+            if ($this->_serverinfo['version'] > 401.0) {
+                mysql_query("SET NAMES 'UTF-8'");
+            }
+        }
+    }
+
+    /**
+     * Kill timed out processes. ( so far only called on about every 50-th save. )
+     */
+    function _timeout()
+    {
+        if (empty($this->_dbparams['timeout'])) return;
+        $result = mysql_query("SHOW processlist");
+        while ($row = mysql_fetch_array($result)) {
+            if ($row["db"] == $this->_dbh->dsn['database']
+                and $row["User"] == $this->_dbh->dsn['username']
+                    and $row["Time"] > $this->_dbparams['timeout']
+                        and $row["Command"] == "Sleep"
+            ) {
+                $process_id = $row["Id"];
+                mysql_query("KILL $process_id");
+            }
+        }
+    }
+
+    /*
+     * Create a new revision of a page.
+     */
+    function set_versiondata($pagename, $version, $data)
+    {
+        $dbh = &$this->_dbh;
+        $version_tbl = $this->_table_names['version_tbl'];
+
+        $minor_edit = (int)!empty($data['is_minor_edit']);
+        unset($data['is_minor_edit']);
+
+        $mtime = (int)$data['mtime'];
+        unset($data['mtime']);
+        assert(!empty($mtime));
+
+        @$content = (string)$data['%content'];
+        unset($data['%content']);
+        unset($data['%pagedata']);
+
+        $this->lock();
+        $id = $this->_get_pageid($pagename, true);
+        // requires PRIMARY KEY (id,version)!
+        // VALUES supported since mysql-3.22.5
+        $dbh->query(sprintf("REPLACE INTO $version_tbl"
+                . " (id,version,mtime,minor_edit,content,versiondata)"
+                . " VALUES(%d,%d,%d,%d,'%s','%s')",
+            $id, $version, $mtime, $minor_edit,
+            $dbh->escapeSimple($content),
+            $dbh->escapeSimple($this->_serialize($data))
+        ));
+        // real binding (prepare,execute) only since mysqli + PHP5
+        $this->_update_recent_table($id);
+        $this->_update_nonempty_table($id);
+        $this->unlock();
+    }
+
+    function _update_recent_table($pageid = false)
+    {
+        $dbh = &$this->_dbh;
+        extract($this->_table_names);
+        extract($this->_expressions);
+
+        $pageid = (int)$pageid;
+
+        // optimized: mysql can do this with one REPLACE INTO.
+        // supported in every (?) mysql version
+        // requires PRIMARY KEY (id)!
+        $dbh->query("REPLACE INTO $recent_tbl"
+            . " (id, latestversion, latestmajor, latestminor)"
+            . " SELECT id, $maxversion, $maxmajor, $maxminor"
+            . " FROM $version_tbl"
+            . ($pageid ? " WHERE id=$pageid" : "")
+            . " GROUP BY id");
+    }
+
+    /*
+     * Find referenced empty pages.
+     */
+    function wanted_pages($exclude_from = '', $exclude = '', $sortby = '', $limit = '')
+    {
+        $dbh = &$this->_dbh;
+        extract($this->_table_names);
+        if ($orderby = $this->sortby($sortby, 'db', array('pagename', 'wantedfrom')))
+            $orderby = 'ORDER BY ' . $orderby;
+
+        if ($exclude_from) // array of pagenames
+            $exclude_from = " AND pp.pagename NOT IN " . $this->_sql_set($exclude_from);
+        if ($exclude) // array of pagenames
+            $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
+
+    /* ISNULL is mysql specific */
+        $sql = "SELECT p.pagename, pp.pagename AS wantedfrom"
+            . " FROM $page_tbl p, $link_tbl linked"
+            . " LEFT JOIN $page_tbl pp ON (linked.linkto = pp.id)"
+            . " LEFT JOIN $nonempty_tbl ne ON (linked.linkto = ne.id)"
+            . " WHERE ISNULL(ne.id)"
+            . " AND p.id = linked.linkfrom"
+            . $exclude_from
+            . $exclude
+            . $orderby;
+        if ($limit) {
+            list($from, $count) = $this->limit($limit);
+            $result = $dbh->limitQuery($sql, $from, $count * 3);
+        } else {
+            $result = $dbh->query($sql);
+        }
+        return new WikiDB_backend_PearDB_generic_iter($this, $result);
+    }
+
+    /* // REPLACE will not delete empy pages, so it was removed --ru
+    function _update_nonempty_table($pageid = false) {
+        $dbh = &$this->_dbh;
+        extract($this->_table_names);
+
+        $pageid = (int)$pageid;
+
+        // Optimized: mysql can do this with one REPLACE INTO.
+        // supported in every (?) mysql version
+        // requires PRIMARY KEY (id)
+        $dbh->query("REPLACE INTO $nonempty_tbl (id)"
+                    . " SELECT $recent_tbl.id"
+                    . " FROM $recent_tbl, $version_tbl"
+                    . " WHERE $recent_tbl.id=$version_tbl.id"
+                    . "       AND version=latestversion"
+                    . "  AND content<>''"
+                    . ( $pageid ? " AND $recent_tbl.id=$pageid" : ""));
+    }
+    */
+
+    /**
+     * Pack tables.
+     */
+    function optimize()
+    {
+        $dbh = &$this->_dbh;
+        $this->_timeout();
+        foreach ($this->_table_names as $table) {
+            $dbh->query("OPTIMIZE TABLE $table");
+        }
+        return true;
+    }
+
+    /*
+     * Lock tables.
+     */
+    protected function _lock_tables($write_lock = true)
+    {
+        $lock_type = $write_lock ? "WRITE" : "READ";
+        $tables = array();
+        foreach ($this->_table_names as $table) {
+            $tables[] = "$table $lock_type";
+        }
+        $this->_dbh->query("LOCK TABLES " . join(",", $tables));
+    }
+
+    /*
+     * Release all locks.
+     */
+    protected function _unlock_tables()
+    {
+        $this->_dbh->query("UNLOCK TABLES");
+    }
+
+    function increaseHitCount($pagename)
+    {
+        $dbh = &$this->_dbh;
+        // Hits is the only thing we can update in a fast manner.
+        // Note that this will fail silently if the page does not
+        // have a record in the page table.  Since it's just the
+        // hit count, who cares?
+        // LIMIT since 3.23
+        $dbh->query(sprintf("UPDATE LOW_PRIORITY %s SET hits=hits+1 WHERE pagename='%s' %s",
+            $this->_table_names['page_tbl'],
+            $dbh->escapeSimple($pagename),
+            ($this->_serverinfo['version'] >= 323.0) ? "LIMIT 1" : ""));
+    }
+
+}
+
+class WikiDB_backend_PearDB_mysqli_search
+    extends WikiDB_backend_PearDB_search
+{
+    function _pagename_match_clause($node)
+    {
+        $word = $node->sql();
+        $dbh = &$this->_dbh;
+        $word = $dbh->escapeSimple($word);
+        if ($node->op == 'REGEX') { // posix regex extensions
+            return "pagename REGEXP '$word'";
+        } else {
+            return ($this->_case_exact
+                ? "pagename LIKE '$word'"
+                : "LOWER(pagename) LIKE '$word'");
+        }
+    }
+}

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2016-02-04 16:54:35 UTC (rev 9773)
+++ trunk/pgsrc/ReleaseNotes	2016-02-04 20:50:31 UTC (rev 9774)
@@ -1,4 +1,4 @@
-Date: Mon, 18 Jan 2016 10:18:29 +0000
+Date: Thu, 4 Jan 2016 21:47:53 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -10,6 +10,7 @@
 
 == 1.5.6 2016-XX-XX Marc-Etienne Vargenau ==
 
+* Use ##mysqli## instead of ##mysql##
 * Upload plugin: put date and author in history
 
 == 1.5.5 2015-12-11 Marc-Etienne Vargenau ==

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9773] trunk/INSTALL

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

Revision: 9773
          http://sourceforge.net/p/phpwiki/code/9773
Author:   vargenau
Date:     2016-02-04 16:54:35 +0000 (Thu, 04 Feb 2016)
Log Message:
-----------
INSTALL: PhpWiki 1.5.5 is not yet compatible with the PHP 7 series.

Modified Paths:
--------------
    trunk/INSTALL

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2016-01-29 13:32:57 UTC (rev 9772)
+++ trunk/INSTALL	2016-02-04 16:54:35 UTC (rev 9773)
@@ -3,15 +3,13 @@
 PhpWiki 1.5.5 requires a web server with at least PHP version 5.3.
 
 All users of PHP are strongly encouraged to upgrade to
-PHP 5.3.29 or to PHP 5.4 or 5.5.
+PHP 5.3.29, PHP 5.4.45, PHP 5.5 or PHP 5.6.
 
+PhpWiki 1.5.5 is not yet compatible with the PHP 7 series.
+
 Visit <http://www.php.net> and <http://php.net/downloads.php>
 for downloads and information.
 
-You need the Perl regular expressions package compiled in; this is the
-default for PHP, so you probably have it. If you don't you'll see an
-error like "function preg_replace() not defined."
-
 PHP must also be compiled with support for the type of database you
 want to use, i.e. --with-gdbm, --with-db2, --with-db3, --with-msql,
 --with-pgsql.  Consult the PHP installation manual for specific

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9772] trunk/pgsrc/Help%2FWikisUsingPhpWiki

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

Revision: 9772
          http://sourceforge.net/p/phpwiki/code/9772
Author:   vargenau
Date:     2016-01-29 13:32:57 +0000 (Fri, 29 Jan 2016)
Log Message:
-----------
Update Help/WikisUsingPhpWiki

Modified Paths:
--------------
    trunk/pgsrc/Help%2FWikisUsingPhpWiki

Modified: trunk/pgsrc/Help%2FWikisUsingPhpWiki
===================================================================
--- trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016-01-27 16:55:18 UTC (rev 9771)
+++ trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016-01-29 13:32:57 UTC (rev 9772)
@@ -1,4 +1,4 @@
-Date: Wed, 27 Jan 2016 17:53:58 +0000
+Date: Fri, 29 Jan 2016 14:32:30 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikisUsingPhpWiki
@@ -9,13 +9,14 @@
 Here are some wikis using ~PhpWiki:
 
 |= URL                                                             |= ~PhpWiki release
+| http://adammoore.me.uk                                           | ??
 | http://alsach.at/phpwiki/                                        | 1.4.0RC1
 | http://bayernprovider.info                                       | 1.4.0RC1
 | http://bh.hallikainen.org                                        | 1.5.4
 | http://brainyplanet.com                                          | 1.3.11p1
 | http://crdo.up.univ-aix.fr/phpwiki/                              | 1.3.14
 | http://danm.ucsc.edu/web/                                        | 1.3.14
-| http://dev.cmeerw.org/HomePage                                   | 1.5.5
+| http://dev.cmeerw.org                                            | 1.5.5
 | http://drtedwilliams.net/kb/                                     | 1.3.14
 | http://esk.uz                                                    | 1.3.14
 | http://helpdesk.razorline.com/wiki/                              | 1.4.0RC1
@@ -28,30 +29,39 @@
 | http://neckbeard.us/HomePage                                     | 1.5.4
 | http://nextdoordiscount.com/nydba/                               | 1.4.0RC1
 | http://ohg82er.de/wiki/index.php/StartSeite                      | 1.3.2-jeffs-hacks
+| http://oldwiki.mingw.org                                         | 1.3.14
+| http://open-innovation.alcatel-lucent.com/wiki/g/help/           | 1.3.14
 | http://pcsgwiki.com/wiki/                                        | 1.3.14
 | http://php-rql.dnsalias.net/wiki/                                | 1.4.0RC1
 | http://profit.colegiolasalleguaparo.edu.ve/wiki/                 | 1.3.14
 | http://rec-puzzles.org                                           | 1.3.11p1
 | http://rhythsmbox.com/wiki/index.php                             | 1.4.0RC1
 | http://sldr-test.lpl-aix.fr/phpwiki/                             | 1.3.14
-| https://open-innovation.alcatel-lucent.com/wiki/g/help/          | 1.3.14
 | http://stardrive.genesismuds.com/index.php/                      | 1.4.0RC1
-| https://tuleap.net/wiki/index.php?pagename=HomePage&group_id=101 | ??
-| https://www.geroedel.de/wiki/                                    | 1.4.0
+| https://storage.ct.infn.it/                                      | 1.3.10
+| http://tuleap.net/wiki/index.php?pagename=HomePage&group_id=101  | ??
 | http://utenmelk.no/wiki/                                         | 1.4.0RC1
-| http://wac-tk.drni.de/                                           | 1.3.11p1
-| http://wiki.cyberleo.net/                                        | 1.4.0RC1
+| http://wac-tk.drni.de                                            | 1.3.11p1
+| http://wiki.cyberleo.net                                         | 1.4.0RC1
 | http://wiki.inde-mayenne.org                                     | 1.3.14
 | http://wiki.prideindustries.com                                  | 1.4.0RC1
+| http://wiki.rheelweb.co.nz                                       | 1.3.12p3
 | http://www.allpsych.uni-giessen.de/wikidump/HomePage.html        | ??
 | http://www-bd.lip6.fr/ens/li345-2011/index.php/Accueil           | 1.4.0RC1
+| http://www.calt.insead.edu/LivingLab/AtGentive/Wiki/             | 1.3.14
 | http://www.dkbush.com/zphpwiki/                                  | 1.3.14
 | http://www.drtedwilliams.net/kb/                                 | 1.3.14
 | http://www.e38.org/phpwiki/                                      | 1.3.14
-| http://www.hollenback.net/                                       | 1.4.0RC1
+| http://www.geroedel.de/wiki/                                     | 1.4.0
+| http://www.hollenback.net                                        | 1.4.0RC1
+| http://www.kcpralumni.org/wiki/                                  | 1.5.4
+| http://www.main.org/fcc/                                         | 1.3.4pre
 | http://www.michelsystems.com/phpwiki/                            | 1.4.0RC1
-| http://www.personalwelt.org/                                     | 1.4.0RC1
+| http://www.mtjezreel.com/phpwiki/                                | 1.3.14
+| http://www.personalwelt.org                                      | 1.4.0RC1
 | http://www.the-bees-knees.info/phpwiki/                          | 1.5.4
 | http://www.toledoans.us/dart/index.php/HomePage                  | ??
-| http://www.wendellregenerative.info/index.php/HomePage           |
+| http://www.wendellregenerative.info/index.php/HomePage           | ??
+| http://www.wmsforums.com/wiki/                                   | 1.3.14
+| http://xulfr.org/wiki/                                           | ??
 | http://zombiecouncil.com/zwiki/                                  | 1.4.0RC1

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9771] trunk/pgsrc/Help%2FWikisUsingPhpWiki

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

Revision: 9771
          http://sourceforge.net/p/phpwiki/code/9771
Author:   vargenau
Date:     2016-01-27 16:55:18 +0000 (Wed, 27 Jan 2016)
Log Message:
-----------
Update Help/WikisUsingPhpWiki

Modified Paths:
--------------
    trunk/pgsrc/Help%2FWikisUsingPhpWiki

Modified: trunk/pgsrc/Help%2FWikisUsingPhpWiki
===================================================================
--- trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016-01-22 17:30:19 UTC (rev 9770)
+++ trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016-01-27 16:55:18 UTC (rev 9771)
@@ -1,4 +1,4 @@
-Date: Fri, 22 Jan 2016 18:29:43 +0000
+Date: Wed, 27 Jan 2016 17:53:58 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikisUsingPhpWiki
@@ -8,37 +8,50 @@
 
 Here are some wikis using ~PhpWiki:
 
-|= URL                                                     |= ~PhpWiki release
-| http://bayernprovider.info/                              | 1.4.0RC1
-| http://bh.hallikainen.org/                               | 1.5.4
-| http://crdo.up.univ-aix.fr/phpwiki/                      | 1.3.14
-| http://danm.ucsc.edu/web/                                | 1.3.14
-| http://dev.cmeerw.org/HomePage                           | 1.5.5
-| http://esk.uz                                            | 1.3.14
-| http://www.hollenback.net/                               | 1.4.0RC1
-| http://helpdesk.razorline.com/wiki/                      | 1.4.0RC1
-| http://ifellner.de/ingowiki/                             | 1.4.0RC1
-| http://iwant2know.net/singaporewiki/                     | 1.4.0RC1
-| http://logix.me/wiki/                                    | 1.4.0RC1
-| http://mtswiki.westwood-tech.com/mtswiki-index.php       | 1.4.0RC1
-| http://nextdoordiscount.com/nydba/                       | 1.4.0RC1
-| http://pcsgwiki.com/wiki/                                | 1.3.14
-| http://www.personalwelt.org/                             | 1.4.0RC1
-| http://php-rql.dnsalias.net/wiki/                        | 1.4.0RC1
-| http://profit.colegiolasalleguaparo.edu.ve/wiki/         | 1.3.14
-| http://rec-puzzles.org/                                  | 1.3.11p1
-| http://rhythsmbox.com/wiki/index.php                     | 1.4.0RC1
-| http://sldr-test.lpl-aix.fr/phpwiki/                     | 1.3.14
-| https://open-innovation.alcatel-lucent.com/wiki/g/help/  | 1.3.14
-| http://stardrive.genesismuds.com/index.php/              | 1.4.0RC1
-| https://www.geroedel.de/wiki/                            | 1.4.0
-| http://utenmelk.no/wiki/                                 | 1.4.0RC1
-| http://wac-tk.drni.de/                                   | 1.3.11p1
-| http://wiki.cyberleo.net/                                | 1.4.0RC1
-| http://wiki.inde-mayenne.org                             | 1.3.14
-| http://www-bd.lip6.fr/ens/li345-2011/index.php/Accueil   | 1.4.0RC1
-| http://www.dkbush.com/zphpwiki/                          | 1.3.14
-| http://www.drtedwilliams.net/kb/                         | 1.3.14
-| http://www.e38.org/phpwiki/                              | 1.3.14
-| http://www.michelsystems.com/phpwiki/                    | 1.4.0RC1
-| http://zombiecouncil.com/zwiki/                          | 1.4.0RC1
+|= URL                                                             |= ~PhpWiki release
+| http://alsach.at/phpwiki/                                        | 1.4.0RC1
+| http://bayernprovider.info                                       | 1.4.0RC1
+| http://bh.hallikainen.org                                        | 1.5.4
+| http://brainyplanet.com                                          | 1.3.11p1
+| http://crdo.up.univ-aix.fr/phpwiki/                              | 1.3.14
+| http://danm.ucsc.edu/web/                                        | 1.3.14
+| http://dev.cmeerw.org/HomePage                                   | 1.5.5
+| http://drtedwilliams.net/kb/                                     | 1.3.14
+| http://esk.uz                                                    | 1.3.14
+| http://helpdesk.razorline.com/wiki/                              | 1.4.0RC1
+| http://ifellner.de/ingowiki/                                     | 1.4.0RC1
+| http://indiainvestments.awardspace.com                           | 1.3.12p2
+| http://iwant2know.net/singaporewiki/                             | 1.4.0RC1
+| http://logix.me/wiki/                                            | 1.4.0RC1
+| http://meanwhile.sourceforge.net/wiki/                           | 1.4.0RC1
+| http://mtswiki.westwood-tech.com/mtswiki-index.php               | 1.4.0RC1
+| http://neckbeard.us/HomePage                                     | 1.5.4
+| http://nextdoordiscount.com/nydba/                               | 1.4.0RC1
+| http://ohg82er.de/wiki/index.php/StartSeite                      | 1.3.2-jeffs-hacks
+| http://pcsgwiki.com/wiki/                                        | 1.3.14
+| http://php-rql.dnsalias.net/wiki/                                | 1.4.0RC1
+| http://profit.colegiolasalleguaparo.edu.ve/wiki/                 | 1.3.14
+| http://rec-puzzles.org                                           | 1.3.11p1
+| http://rhythsmbox.com/wiki/index.php                             | 1.4.0RC1
+| http://sldr-test.lpl-aix.fr/phpwiki/                             | 1.3.14
+| https://open-innovation.alcatel-lucent.com/wiki/g/help/          | 1.3.14
+| http://stardrive.genesismuds.com/index.php/                      | 1.4.0RC1
+| https://tuleap.net/wiki/index.php?pagename=HomePage&group_id=101 | ??
+| https://www.geroedel.de/wiki/                                    | 1.4.0
+| http://utenmelk.no/wiki/                                         | 1.4.0RC1
+| http://wac-tk.drni.de/                                           | 1.3.11p1
+| http://wiki.cyberleo.net/                                        | 1.4.0RC1
+| http://wiki.inde-mayenne.org                                     | 1.3.14
+| http://wiki.prideindustries.com                                  | 1.4.0RC1
+| http://www.allpsych.uni-giessen.de/wikidump/HomePage.html        | ??
+| http://www-bd.lip6.fr/ens/li345-2011/index.php/Accueil           | 1.4.0RC1
+| http://www.dkbush.com/zphpwiki/                                  | 1.3.14
+| http://www.drtedwilliams.net/kb/                                 | 1.3.14
+| http://www.e38.org/phpwiki/                                      | 1.3.14
+| http://www.hollenback.net/                                       | 1.4.0RC1
+| http://www.michelsystems.com/phpwiki/                            | 1.4.0RC1
+| http://www.personalwelt.org/                                     | 1.4.0RC1
+| http://www.the-bees-knees.info/phpwiki/                          | 1.5.4
+| http://www.toledoans.us/dart/index.php/HomePage                  | ??
+| http://www.wendellregenerative.info/index.php/HomePage           |
+| http://zombiecouncil.com/zwiki/                                  | 1.4.0RC1

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9770] trunk/pgsrc/Help%2FWikisUsingPhpWiki

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

Revision: 9770
          http://sourceforge.net/p/phpwiki/code/9770
Author:   vargenau
Date:     2016-01-22 17:30:19 +0000 (Fri, 22 Jan 2016)
Log Message:
-----------
http://bh.hallikainen.org/ 1.5.4

Modified Paths:
--------------
    trunk/pgsrc/Help%2FWikisUsingPhpWiki

Modified: trunk/pgsrc/Help%2FWikisUsingPhpWiki
===================================================================
--- trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016-01-22 17:23:31 UTC (rev 9769)
+++ trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016-01-22 17:30:19 UTC (rev 9770)
@@ -1,4 +1,4 @@
-Date: Fri, 22 Jan 2016 18:21:46 +0000
+Date: Fri, 22 Jan 2016 18:29:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikisUsingPhpWiki
@@ -10,7 +10,7 @@
 
 |= URL                                                     |= ~PhpWiki release
 | http://bayernprovider.info/                              | 1.4.0RC1
-| http://bh.hallikainen.org/                               | 1.4.0
+| http://bh.hallikainen.org/                               | 1.5.4
 | http://crdo.up.univ-aix.fr/phpwiki/                      | 1.3.14
 | http://danm.ucsc.edu/web/                                | 1.3.14
 | http://dev.cmeerw.org/HomePage                           | 1.5.5

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9769] trunk/pgsrc/Help%2FWikisUsingPhpWiki

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

Revision: 9769
          http://sourceforge.net/p/phpwiki/code/9769
Author:   vargenau
Date:     2016-01-22 17:23:31 +0000 (Fri, 22 Jan 2016)
Log Message:
-----------
http://dev.cmeerw.org/HomePage: 1.5.5

Modified Paths:
--------------
    trunk/pgsrc/Help%2FWikisUsingPhpWiki

Modified: trunk/pgsrc/Help%2FWikisUsingPhpWiki
===================================================================
--- trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016-01-22 17:06:38 UTC (rev 9768)
+++ trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016-01-22 17:23:31 UTC (rev 9769)
@@ -1,4 +1,4 @@
-Date: Thu, 10 Dec 2015 18:48:03 +0000
+Date: Fri, 22 Jan 2016 18:21:46 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikisUsingPhpWiki
@@ -13,7 +13,7 @@
 | http://bh.hallikainen.org/                               | 1.4.0
 | http://crdo.up.univ-aix.fr/phpwiki/                      | 1.3.14
 | http://danm.ucsc.edu/web/                                | 1.3.14
-| http://dev.cmeerw.org/HomePage                           | 1.5.4
+| http://dev.cmeerw.org/HomePage                           | 1.5.5
 | http://esk.uz                                            | 1.3.14
 | http://www.hollenback.net/                               | 1.4.0RC1
 | http://helpdesk.razorline.com/wiki/                      | 1.4.0RC1

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

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

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

Revision: 9768
          http://sourceforge.net/p/phpwiki/code/9768
Author:   vargenau
Date:     2016-01-22 17:06:38 +0000 (Fri, 22 Jan 2016)
Log Message:
-----------
Remove unused arguments

Modified Paths:
--------------
    trunk/lib/plugin/IncludePage.php
    trunk/lib/stdlib.php

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2016-01-22 17:04:02 UTC (rev 9767)
+++ trunk/lib/plugin/IncludePage.php	2016-01-22 17:06:38 UTC (rev 9768)
@@ -201,7 +201,7 @@
             }
         }
         if ($sections) {
-            $c = extractSections($sections, $c, $pagename, $quiet, 1);
+            $c = extractSections($sections, $c);
         }
         if ($lines) {
             $c = array_slice($c, 0, $lines);

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2016-01-22 17:04:02 UTC (rev 9767)
+++ trunk/lib/stdlib.php	2016-01-22 17:06:38 UTC (rev 9768)
@@ -1821,7 +1821,7 @@
 }
 
 // Extract the first $sections sections of the page
-function extractSections($sections, $content, $page, $quiet = false, $sectionhead = false)
+function extractSections($sections, $content)
 {
 
     $mycontent = $content;
@@ -1839,8 +1839,7 @@
             $section = $match[2];
             // Strip trailing blanks lines and ---- <hr>s
             $text = preg_replace("/\\s*^-{4,}\\s*$/m", "", $match[3]);
-            if ($sectionhead)
-                $text = $match[1] . $section . "\n" . $text;
+            $text = $match[1] . $section . "\n" . $text;
             $result .= $text;
 
             $mycontent = explode("\n", $match[4]);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9767] trunk/lib/plugin/UnfoldSubpages.php

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

Revision: 9767
          http://sourceforge.net/p/phpwiki/code/9767
Author:   vargenau
Date:     2016-01-22 17:04:02 +0000 (Fri, 22 Jan 2016)
Log Message:
-----------
Comments only

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

Modified: trunk/lib/plugin/UnfoldSubpages.php
===================================================================
--- trunk/lib/plugin/UnfoldSubpages.php	2016-01-18 10:17:01 UTC (rev 9766)
+++ trunk/lib/plugin/UnfoldSubpages.php	2016-01-22 17:04:02 UTC (rev 9767)
@@ -48,23 +48,17 @@
             PageList::supportedArgs(),
             array(
                 'pagename' => '[pagename]', // default: current page
-                //'header'  => '',  // expandable string
                 'quiet' => false, // print no header
                 'sortby' => '', // [+|-]pagename, [+|-]mtime, [+|-]hits
                 'maxpages' => false, // maximum number of pages to include (== limit)
-                'smalltitle' => false, // if set, hide transclusion-title,
-                //  just have a small link at the start of
-                //  the page.
-                'words' => false, // maximum number of words
-                //  per page to include
-                'lines' => false, // maximum number of lines
-                //  per page to include
-                'bytes' => false, // maximum number of bytes
-                //  per page to include
+                'smalltitle' => false,  // if set, hide transclusion-title,
+                                        // just have a small link at the start of the page.
+                'words' => false, // maximum number of words per page to include
+                'lines' => false, // maximum number of lines per page to include
+                'bytes' => false, // maximum number of bytes per page to include
                 'sections' => false, // maximum number of sections per page to include
                 'section' => false, // this named section per page only
-                'sectionhead' => false // when including a named
-                //  section show the heading
+                'sectionhead' => false // when including a named section show the heading
             ));
     }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9766] trunk/themes

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

Revision: 9766
          http://sourceforge.net/p/phpwiki/code/9766
Author:   vargenau
Date:     2016-01-18 10:17:01 +0000 (Mon, 18 Jan 2016)
Log Message:
-----------
Replace Alcatel-Lucent violet by blue

Modified Paths:
--------------
    trunk/themes/MonoBook/monobook.css
    trunk/themes/Sidebar/sidebar.css
    trunk/themes/fusionforge/fusionforge.css

Modified: trunk/themes/MonoBook/monobook.css
===================================================================
--- trunk/themes/MonoBook/monobook.css	2016-01-18 10:07:54 UTC (rev 9765)
+++ trunk/themes/MonoBook/monobook.css	2016-01-18 10:17:01 UTC (rev 9766)
@@ -2179,7 +2179,7 @@
 
 td.tdselected {
     color: white;
-    background-color: #554295;
+    background-color: #124191;
 }
 
 td.tdunselected {

Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2016-01-18 10:07:54 UTC (rev 9765)
+++ trunk/themes/Sidebar/sidebar.css	2016-01-18 10:17:01 UTC (rev 9766)
@@ -2289,7 +2289,7 @@
 
 td.tdselected {
     color: white;
-    background-color: #554295;
+    background-color: #124191;
 }
 
 td.tdunselected {

Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2016-01-18 10:07:54 UTC (rev 9765)
+++ trunk/themes/fusionforge/fusionforge.css	2016-01-18 10:17:01 UTC (rev 9766)
@@ -93,7 +93,7 @@
     padding-bottom: 6px;
     vertical-align: middle;
     font-family: 'trebuchet MS', Arial, Helvetica, sans-serif;
-    color: #554295; /* Alcatel-Lucent violet */
+    color: #124191;
     font-weight: normal;
     font-size: 1.8em;
     line-height: 1.3em;
@@ -104,7 +104,7 @@
 
 /* Hack for the wiki that inserts an unneccessary </p> */
 .titlebar p {
-    color: #554295; /* Alcatel-Lucent violet */
+    color: #124191;
     font-size: 1em;
     margin-bottom: 0;
     margin-top: 0;
@@ -1293,7 +1293,7 @@
 
 td.tdselected {
     color: white;
-    background-color: #554295;
+    background-color: #124191;
 }
 
 td.tdunselected {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9765] trunk/pgsrc/ReleaseNotes

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

Revision: 9765
          http://sourceforge.net/p/phpwiki/code/9765
Author:   vargenau
Date:     2016-01-18 10:07:54 +0000 (Mon, 18 Jan 2016)
Log Message:
-----------
Update ReleaseNotes

Modified Paths:
--------------
    trunk/pgsrc/ReleaseNotes

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2016-01-18 10:06:52 UTC (rev 9764)
+++ trunk/pgsrc/ReleaseNotes	2016-01-18 10:07:54 UTC (rev 9765)
@@ -1,4 +1,4 @@
-Date: Thu,  7 Jan 2016 10:17:20 +0000
+Date: Mon, 18 Jan 2016 10:18:29 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -8,6 +8,10 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
 
+== 1.5.6 2016-XX-XX Marc-Etienne Vargenau ==
+
+* Upload plugin: put date and author in history
+
 == 1.5.5 2015-12-11 Marc-Etienne Vargenau ==
 
 * Fix tooltip translation in ~CreateToc plugin

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9764] trunk/lib/plugin/UpLoad.php

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

Revision: 9764
          http://sourceforge.net/p/phpwiki/code/9764
Author:   vargenau
Date:     2016-01-18 10:06:52 +0000 (Mon, 18 Jan 2016)
Log Message:
-----------
UpLoad plugin: remove unused parameter in function log

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

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2016-01-16 16:28:16 UTC (rev 9763)
+++ trunk/lib/plugin/UpLoad.php	2016-01-18 10:06:52 UTC (rev 9764)
@@ -206,7 +206,7 @@
                 // the upload was a success and we need to mark this event in the "upload log"
                 if ($logfile) {
                     $upload_log = $file_dir . basename($logfile);
-                    $this->log($userfile, $upload_log, $message);
+                    $this->log($userfile, $upload_log);
                 }
                 if ($autolink) {
                     require_once 'lib/loadsave.php';
@@ -241,7 +241,7 @@
         return HTML($message, $form);
     }
 
-    private function log($userfile, $upload_log, &$message)
+    private function log($userfile, $upload_log)
     {
         global $WikiTheme;
         /**

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9763] trunk/lib/plugin/UpLoad.php

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

Revision: 9763
          http://sourceforge.net/p/phpwiki/code/9763
Author:   vargenau
Date:     2016-01-16 16:28:16 +0000 (Sat, 16 Jan 2016)
Log Message:
-----------
Upload plugin: put date and author in history

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

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2016-01-11 20:10:12 UTC (rev 9762)
+++ trunk/lib/plugin/UpLoad.php	2016-01-16 16:28:16 UTC (rev 9763)
@@ -227,6 +227,8 @@
                         } else {
                             $meta['summary'] = sprintf(_("uploaded %s"), $sanified_userfile_name);
                         }
+                        $meta['mtime'] = time();
+                        $meta['author'] = $request->getUser()->getId();
                         $pagehandle->save($newtext, $version + 1, $meta);
                     }
                 }

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

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

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

Revision: 9762
          http://sourceforge.net/p/phpwiki/code/9762
Author:   vargenau
Date:     2016-01-11 20:10:12 +0000 (Mon, 11 Jan 2016)
Log Message:
-----------
Use __construct

Modified Paths:
--------------
    trunk/lib/SemanticWeb.php
    trunk/lib/TextSearchQuery.php

Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php	2016-01-07 17:53:40 UTC (rev 9761)
+++ trunk/lib/SemanticWeb.php	2016-01-11 20:10:12 UTC (rev 9762)
@@ -285,20 +285,13 @@
 class SemanticAttributeSearchQuery
     extends NumericSearchQuery
 {
-    /*
-    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'),
-                );
-    */
-
     /**
      * We need to detect units from the freetext query:
      * population > 1 million
      */
     function __construct($search_query, $placeholders, $unit = '')
     {
-        $this->NumericSearchQuery($search_query, $placeholders);
+        parent::__construct($search_query, $placeholders);
         $this->_units = new Units();
         $this->unit = $unit;
     }

Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php	2016-01-07 17:53:40 UTC (rev 9761)
+++ trunk/lib/TextSearchQuery.php	2016-01-11 20:10:12 UTC (rev 9762)
@@ -367,7 +367,7 @@
      * @param $placeholders array or string  All placeholders in the query must be defined
      *     here, and will be replaced by the matcher.
      */
-    public function NumericSearchQuery($search_query, $placeholders)
+    function __construct($search_query, $placeholders)
     {
         // added some basic security checks against user input
         $this->_query = $search_query;
@@ -802,7 +802,7 @@
     public $op = "NOT";
     public $_op = TSQ_TOK_NOT;
 
-    function TextSearchQuery_node_not($leaf)
+    function __construct($leaf)
     {
         $this->leaves = array($leaf);
     }
@@ -1141,8 +1141,7 @@
 
 class TextSearchQuery_Lexer
 {
-    function TextSearchQuery_Lexer($query_str, $case_exact = false,
-                                   $regex = TSQ_REGEX_AUTO)
+    function __construct($query_str, $case_exact = false, $regex = TSQ_REGEX_AUTO)
     {
         $this->tokens = $this->tokenize($query_str, $case_exact, $regex);
         $this->query_str = $query_str;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9761] trunk/lib/PagePerm.php

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

Revision: 9761
          http://sourceforge.net/p/phpwiki/code/9761
Author:   vargenau
Date:     2016-01-07 17:53:40 +0000 (Thu, 07 Jan 2016)
Log Message:
-----------
Use CSS

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

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2016-01-07 09:54:54 UTC (rev 9760)
+++ trunk/lib/PagePerm.php	2016-01-07 17:53:40 UTC (rev 9761)
@@ -584,7 +584,7 @@
         foreach ($this->perm as $access => $perms) {
             $td = HTML::table(array('class' => 'cal'));
             foreach ($perms as $group => $bool) {
-                $td->pushContent(HTML::tr(HTML::td(array('align' => 'right'), $group),
+                $td->pushContent(HTML::tr(HTML::td(array('class' => 'align-right'), $group),
                     HTML::td($bool ? '[X]' : '[ ]')));
             }
             $table->pushContent(HTML::tr(array('class' => 'top'),
@@ -612,9 +612,9 @@
         }
         $table = HTML::table();
         $table->pushContent(HTML::tr(
-            HTML::th(array('align' => 'left'),
+            HTML::th(array('class' => 'align-left'),
                 _("Access")),
-            HTML::th(array('align' => 'right'),
+            HTML::th(array('class' => 'align-right'),
                 _("Group/User")),
             HTML::th(_("Grant")),
             HTML::th(_("Del/+")),
@@ -681,30 +681,30 @@
                     $table->pushContent(
                         HTML::tr(
                             HTML::td(HTML::strong($access . ":")),
-                            HTML::td(array('class' => 'cal-today', 'align' => 'right'),
+                            HTML::td(array('class' => 'cal-today align-right'),
                                 HTML::strong($this->groupName($group))),
-                            HTML::td(array('align' => 'center'), $nbsp, $checkbox),
-                            HTML::td(array('align' => 'right', 'style' => 'background: #aaa url(' . $deletesrc . ') no-repeat'), $deletebutton),
+                            HTML::td(array('class' => 'align-center'), $nbsp, $checkbox),
+                            HTML::td(array('class' => 'align-right', 'style' => 'background: #aaa url(' . $deletesrc . ') no-repeat'), $deletebutton),
                             HTML::td(HTML::em(getAccessDescription($access)))));
                     $first_only = false;
                 } else {
                     $table->pushContent(
                         HTML::tr(
                             HTML::td(),
-                            HTML::td(array('class' => 'cal-today', 'align' => 'right'),
+                            HTML::td(array('class' => 'cal-today align-right'),
                                 HTML::strong($this->groupName($group))),
-                            HTML::td(array('align' => 'center'), $nbsp, $checkbox),
-                            HTML::td(array('align' => 'right', 'style' => 'background: #aaa url(' . $deletesrc . ') no-repeat'), $deletebutton),
+                            HTML::td(array('class' => 'align-center'), $nbsp, $checkbox),
+                            HTML::td(array('class' => 'align-right', 'style' => 'background: #aaa url(' . $deletesrc . ') no-repeat'), $deletebutton),
                             HTML::td()));
                 }
             }
             if (!empty($groups))
                 $table->pushContent(
                     HTML::tr(array('class' => 'top'),
-                        HTML::td(array('align' => 'right'), _("add ")),
+                        HTML::td(array('class' => 'align-right'), _("add ")),
                         HTML::td($newgroup),
-                        HTML::td(array('align' => 'center'), $nbsp, $newperm),
-                        HTML::td(array('align' => 'right', 'style' => 'background: #ccc url(' . $addsrc . ') no-repeat'), $addbutton),
+                        HTML::td(array('class' => 'align-center'), $nbsp, $newperm),
+                        HTML::td(array('class' => 'align-right', 'style' => 'background: #ccc url(' . $addsrc . ') no-repeat'), $addbutton),
                         HTML::td(HTML::small(_("Check to add this ACL")))));
         }
         if ($type == 'default')

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9760] trunk/lib/PagePerm.php

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

Revision: 9760
          http://sourceforge.net/p/phpwiki/code/9760
Author:   vargenau
Date:     2016-01-07 09:54:54 +0000 (Thu, 07 Jan 2016)
Log Message:
-----------
Use __construct

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

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2016-01-07 09:46:33 UTC (rev 9759)
+++ trunk/lib/PagePerm.php	2016-01-07 09:54:54 UTC (rev 9760)
@@ -357,7 +357,7 @@
 {
     public $perm;
 
-    function PagePermission($hash = array())
+    function __construct($hash = array())
     {
         /**
          * @var WikiRequest $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:[9759] trunk/lib/WikiGroup.php

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

Revision: 9759
          http://sourceforge.net/p/phpwiki/code/9759
Author:   vargenau
Date:     2016-01-07 09:46:33 +0000 (Thu, 07 Jan 2016)
Log Message:
-----------
Use __construct

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

Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2016-01-07 09:38:20 UTC (rev 9758)
+++ trunk/lib/WikiGroup.php	2016-01-07 09:46:33 UTC (rev 9759)
@@ -62,8 +62,6 @@
     public $username = '';
     /** User object if different from current user */
     public $user;
-    /** The global WikiRequest object */
-    //public $request;
     /** Array of groups $username is confirmed to belong to */
     public $membership;
     /** boolean if not the current user */
@@ -74,7 +72,7 @@
      * $group = &WikiGroup::getGroup();
      * @param bool $not_current
      */
-    function WikiGroup($not_current = false)
+    function __construct($not_current = false)
     {
         $this->not_current = $not_current;
     }
@@ -871,8 +869,6 @@
      */
     function isMember($group)
     {
-        //$request = $this->request;
-        //$username = $this->username;
         if (isset($this->membership[$group])) {
             return $this->membership[$group];
         }
@@ -988,8 +984,6 @@
         if (isset($this->membership[$group])) {
             return $this->membership[$group];
         }
-        //$request = $this->request;
-        //$username = $this->_getUserName();
         $this->membership[$group] = in_array($this->username, $this->getMembersOf($group));
         if ($this->membership[$group])
             return true;

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

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

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

Revision: 9758
          http://sourceforge.net/p/phpwiki/code/9758
Author:   vargenau
Date:     2016-01-07 09:38:20 +0000 (Thu, 07 Jan 2016)
Log Message:
-----------
Use __construct

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

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2016-01-07 09:32:29 UTC (rev 9757)
+++ trunk/lib/WikiUser.php	2016-01-07 09:38:20 UTC (rev 9758)
@@ -353,10 +353,8 @@
     public $_current_method;
     public $_current_index;
 
-    // constructor
-    function _WikiUser($UserName = '', $prefs = false)
+    function __construct($UserName = '', $prefs = false)
     {
-
         $this->_userid = $UserName;
         $this->_HomePagehandle = false;
         if ($UserName) {

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

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

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

Revision: 9757
          http://sourceforge.net/p/phpwiki/code/9757
Author:   vargenau
Date:     2016-01-07 09:32:29 +0000 (Thu, 07 Jan 2016)
Log Message:
-----------
Use __construct

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

Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php	2016-01-07 09:26:41 UTC (rev 9756)
+++ trunk/lib/XmlElement.php	2016-01-07 09:32:29 UTC (rev 9757)
@@ -461,7 +461,7 @@
 
 class RawXml
 {
-    function RawXml($xml_text)
+    function __construct($xml_text)
     {
         $this->_xml = $xml_text;
     }
@@ -498,7 +498,7 @@
     public $_fs;
     public $_args;
 
-    function FormattedText($fs /* , ... */)
+    function __construct($fs /* , ... */)
     {
         if ($fs !== false) {
             $this->_init(func_get_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:[9756] trunk/lib/prepend.php

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

Revision: 9756
          http://sourceforge.net/p/phpwiki/code/9756
Author:   vargenau
Date:     2016-01-07 09:26:41 +0000 (Thu, 07 Jan 2016)
Log Message:
-----------
Use __construct

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

Modified: trunk/lib/prepend.php
===================================================================
--- trunk/lib/prepend.php	2016-01-07 09:25:29 UTC (rev 9755)
+++ trunk/lib/prepend.php	2016-01-07 09:26:41 UTC (rev 9756)
@@ -46,7 +46,7 @@
 // Used for debugging purposes
 class DebugTimer
 {
-    function DebugTimer()
+    function __construct()
     {
         $this->_start = $this->microtime();
         // Function 'posix_times' does not exist on Windows

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9755] trunk/lib/WikiDB/backend.php

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

Revision: 9755
          http://sourceforge.net/p/phpwiki/code/9755
Author:   vargenau
Date:     2016-01-07 09:25:29 +0000 (Thu, 07 Jan 2016)
Log Message:
-----------
Use __construct

Modified Paths:
--------------
    trunk/lib/WikiDB/backend.php

Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2016-01-07 09:21:44 UTC (rev 9754)
+++ trunk/lib/WikiDB/backend.php	2016-01-07 09:25:29 UTC (rev 9755)
@@ -776,7 +776,7 @@
  */
 class WikiDB_backend_search
 {
-    function WikiDB_backend_search($search, &$dbh)
+    function __construct($search, &$dbh)
     {
         $this->_dbh = $dbh;
         $this->_case_exact = $search->_case_exact;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9754] trunk/lib/CachedMarkup.php

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

Revision: 9754
          http://sourceforge.net/p/phpwiki/code/9754
Author:   vargenau
Date:     2016-01-07 09:21:44 +0000 (Thu, 07 Jan 2016)
Log Message:
-----------
Use __construct

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

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2016-01-07 09:17:38 UTC (rev 9753)
+++ trunk/lib/CachedMarkup.php	2016-01-07 09:21:44 UTC (rev 9754)
@@ -256,7 +256,7 @@
 
 class XmlRpc_LinkInfo
 {
-    function XmlRpc_LinkInfo($page, $type, $href, $relation = '')
+    function __construct($page, $type, $href, $relation = '')
     {
         $this->page = $page;
         $this->type = $type;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9753] trunk/pgsrc/ReleaseNotes

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

Revision: 9753
          http://sourceforge.net/p/phpwiki/code/9753
Author:   vargenau
Date:     2016-01-07 09:17:38 +0000 (Thu, 07 Jan 2016)
Log Message:
-----------
Update ReleaseNotes

Modified Paths:
--------------
    trunk/pgsrc/ReleaseNotes

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2016-01-07 09:14:44 UTC (rev 9752)
+++ trunk/pgsrc/ReleaseNotes	2016-01-07 09:17:38 UTC (rev 9753)
@@ -1,4 +1,4 @@
-Date: Thu,  7 Jan 2016 10:11:43 +0000
+Date: Thu,  7 Jan 2016 10:17:20 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -16,7 +16,7 @@
 * Fix fatal database error with multiple comma-delimited sortby args
 * Remove forbidden characters: ~<~>~[~]~{~}~"~|~# from pagename
 * New property: ALLOWED_LOAD giving list of directories from which it is allowed to load pages.
-* Upload: replace multiple spaces by single space
+* Upload~: replace multiple spaces by single space
 * Make functions merged and is_conflict public in lib/diff3.php (support request #162)
 
 == 1.5.4 2015-06-29 Marc-Etienne Vargenau ==

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9752] trunk/pgsrc/ReleaseNotes

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

Revision: 9752
          http://sourceforge.net/p/phpwiki/code/9752
Author:   vargenau
Date:     2016-01-07 09:14:44 +0000 (Thu, 07 Jan 2016)
Log Message:
-----------
Update ReleaseNotes

Modified Paths:
--------------
    trunk/pgsrc/ReleaseNotes

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2016-01-06 17:45:14 UTC (rev 9751)
+++ trunk/pgsrc/ReleaseNotes	2016-01-07 09:14:44 UTC (rev 9752)
@@ -1,4 +1,4 @@
-Date: Fri, 11 Dec 2015 10:53:47 +0000
+Date: Thu,  7 Jan 2016 10:11:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -29,7 +29,7 @@
 * New icons in Edit Toolbar
 * Make static templates in Edit Toolbar work
 * Fix memory_limit for WIKI_SOAP
-* Remove MockRequest
+* Remove ~MockRequest
 * Update jquery to 1.11.3
 
 == 1.5.3 2015-03-04 Marc-Etienne Vargenau ==

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

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

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

Revision: 9751
          http://sourceforge.net/p/phpwiki/code/9751
Author:   vargenau
Date:     2016-01-06 17:45:14 +0000 (Wed, 06 Jan 2016)
Log Message:
-----------
Use __construct

Modified Paths:
--------------
    trunk/lib/WikiUser/AdoDb.php
    trunk/lib/WikiUser/Db.php
    trunk/lib/WikiUser/File.php
    trunk/lib/WikiUser/FusionForge.php
    trunk/lib/WikiUser/HttpAuth.php
    trunk/lib/WikiUser/HttpAuthUpper.php
    trunk/lib/WikiUser/PdoDb.php
    trunk/lib/WikiUser/PearDb.php
    trunk/lib/WikiUser/Session.php
    trunk/lib/WikiUser.php

Modified: trunk/lib/WikiUser/AdoDb.php
===================================================================
--- trunk/lib/WikiUser/AdoDb.php	2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/AdoDb.php	2016-01-06 17:45:14 UTC (rev 9751)
@@ -38,7 +38,7 @@
 {
     public $_authmethod = 'AdoDb';
 
-    function _AdoDbPassUser($UserName = '', $prefs = false)
+    function __construct($UserName = '', $prefs = false)
     {
         /**
          * @var WikiRequest $request
@@ -48,7 +48,7 @@
         if (!$this->_prefs and is_a($this, "_AdoDbPassUser")) {
             if ($prefs) $this->_prefs = $prefs;
             if (!isset($this->_prefs->_method))
-                _PassUser::_PassUser($UserName);
+                _PassUser::__construct($UserName);
         }
         if (!$this->isValidName($UserName)) {
             trigger_error(_("Invalid username."), E_USER_WARNING);

Modified: trunk/lib/WikiUser/Db.php
===================================================================
--- trunk/lib/WikiUser/Db.php	2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/Db.php	2016-01-06 17:45:14 UTC (rev 9751)
@@ -49,7 +49,7 @@
 
     // This can only be called from _PassUser, because the parent class
     // sets the auth_dbi and pref methods, before this class is initialized.
-    function _DbPassUser($UserName = '', $prefs = false)
+    function __construct($UserName = '', $prefs = false)
     {
         /**
          * @var WikiRequest $request
@@ -60,7 +60,7 @@
             if ($prefs) $this->_prefs = $prefs;
         }
         if (!isset($this->_prefs->_method))
-            _PassUser::_PassUser($UserName);
+            parent::__construct($UserName);
         elseif (!$this->isValidName($UserName)) {
             trigger_error(_("Invalid username."), E_USER_WARNING);
             return false;

Modified: trunk/lib/WikiUser/File.php
===================================================================
--- trunk/lib/WikiUser/File.php	2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/File.php	2016-01-06 17:45:14 UTC (rev 9751)
@@ -33,12 +33,12 @@
 
     // This can only be called from _PassUser, because the parent class
     // sets the pref methods, before this class is initialized.
-    function _FilePassUser($UserName = '', $prefs = false, $file = '')
+    function __construct($UserName = '', $prefs = false, $file = '')
     {
         if (!$this->_prefs and is_a($this, "_FilePassUser")) {
             if ($prefs) $this->_prefs = $prefs;
             if (!isset($this->_prefs->_method))
-                _PassUser::_PassUser($UserName);
+                parent::__construct($UserName);
         }
         $this->_userid = $UserName;
         // read the .htaccess style file. We use our own copy of the standard pear class.

Modified: trunk/lib/WikiUser/FusionForge.php
===================================================================
--- trunk/lib/WikiUser/FusionForge.php	2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/FusionForge.php	2016-01-06 17:45:14 UTC (rev 9751)
@@ -28,11 +28,11 @@
 
     public $_is_external = 0;
 
-    function _FusionForgePassUser($UserName = '', $prefs = false)
+    function __construct($UserName = '', $prefs = false)
     {
         if ($prefs) $this->_prefs = $prefs;
         if (!isset($this->_prefs->_method))
-            _PassUser::_PassUser($UserName);
+            parent::__construct($UserName);
         if ($UserName) $this->_userid = $UserName;
         $this->_authmethod = 'FusionForge';
 

Modified: trunk/lib/WikiUser/HttpAuth.php
===================================================================
--- trunk/lib/WikiUser/HttpAuth.php	2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/HttpAuth.php	2016-01-06 17:45:14 UTC (rev 9751)
@@ -35,11 +35,11 @@
 class _HttpAuthPassUser
     extends _PassUser
 {
-    function _HttpAuthPassUser($UserName = '', $prefs = false)
+    function __construct($UserName = '', $prefs = false)
     {
         if ($prefs) $this->_prefs = $prefs;
         if (!isset($this->_prefs->_method))
-            _PassUser::_PassUser($UserName);
+            parent::__construct($UserName);
         if ($UserName) $this->_userid = $UserName;
         $this->_authmethod = 'HttpAuth';
 

Modified: trunk/lib/WikiUser/HttpAuthUpper.php
===================================================================
--- trunk/lib/WikiUser/HttpAuthUpper.php	2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/HttpAuthUpper.php	2016-01-06 17:45:14 UTC (rev 9751)
@@ -36,11 +36,11 @@
 class _HttpAuthUpperPassUser
     extends _PassUser
 {
-    function _HttpAuthUpperPassUser($UserName = '', $prefs = false)
+    function __construct($UserName = '', $prefs = false)
     {
         if ($prefs) $this->_prefs = $prefs;
         if (!isset($this->_prefs->_method))
-            _PassUser::_PassUser($UserName);
+            parent::__construct($UserName);
         if ($UserName)
             $this->_userid = $UserName;
         $this->_authmethod = 'HttpAuthUpper';

Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php	2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/PdoDb.php	2016-01-06 17:45:14 UTC (rev 9751)
@@ -35,7 +35,7 @@
 {
     public $_authmethod = 'PDODb';
 
-    function _PdoDbPassUser($UserName = '', $prefs = false)
+    function __construct($UserName = '', $prefs = false)
     {
         /**
          * @var WikiRequest $request
@@ -46,7 +46,7 @@
             if ($prefs) $this->_prefs = $prefs;
         }
         if (!isset($this->_prefs->_method))
-            _PassUser::_PassUser($UserName);
+            _PassUser::__construct($UserName);
         elseif (!$this->isValidName($UserName)) {
             trigger_error(_("Invalid username."), E_USER_WARNING);
             return false;

Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php	2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/PearDb.php	2016-01-06 17:45:14 UTC (rev 9751)
@@ -33,7 +33,7 @@
 {
     public $_authmethod = 'PearDb';
 
-    function _PearDbPassUser($UserName = '', $prefs = false)
+    function __construct($UserName = '', $prefs = false)
     {
         /**
          * @var WikiRequest $request
@@ -46,7 +46,7 @@
             }
         }
         if (!isset($this->_prefs->_method)) {
-            _PassUser::_PassUser($UserName);
+            _PassUser::__construct($UserName);
         } elseif (!$this->isValidName($UserName)) {
             trigger_error(_("Invalid username."), E_USER_WARNING);
             return false;

Modified: trunk/lib/WikiUser/Session.php
===================================================================
--- trunk/lib/WikiUser/Session.php	2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/Session.php	2016-01-06 17:45:14 UTC (rev 9751)
@@ -30,7 +30,7 @@
 class _SessionPassUser
     extends _PassUser
 {
-    function _SessionPassUser($UserName = '', $prefs = false)
+    function __construct($UserName = '', $prefs = false)
     {
         if ($prefs) $this->_prefs = $prefs;
         if (!defined("AUTH_SESS_USER") or !defined("AUTH_SESS_LEVEL")) {
@@ -57,7 +57,7 @@
             $this->_userid = $sess[AUTH_SESS_USER];
         }
         if (!isset($this->_prefs->_method))
-            _PassUser::_PassUser($this->_userid);
+            parent::__construct($this->_userid);
         $this->_level = AUTH_SESS_LEVEL;
         $this->_authmethod = 'Session';
     }

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser.php	2016-01-06 17:45:14 UTC (rev 9751)
@@ -925,7 +925,7 @@
     public $_current_index;
 
     // check and prepare the auth and pref methods only once
-    function _PassUser($UserName = '', $prefs = false)
+    function __construct($UserName = '', $prefs = false)
     {
         /**
          * @var WikiRequest $request
@@ -1480,7 +1480,7 @@
 {
     public $default_value;
 
-    function _UserPreference($default_value)
+    function __construct($default_value)
     {
         $this->default_value = $default_value;
     }
@@ -1534,10 +1534,9 @@
 class _UserPreference_numeric
     extends _UserPreference
 {
-    function _UserPreference_numeric($default, $minval = false,
-                                     $maxval = false)
+    function __construct($default, $minval = false, $maxval = false)
     {
-        $this->_UserPreference((double)$default);
+        parent::__construct((double)$default);
         $this->_minval = (double)$minval;
         $this->_maxval = (double)$maxval;
     }
@@ -1556,9 +1555,9 @@
 class _UserPreference_int
     extends _UserPreference_numeric
 {
-    function _UserPreference_int($default, $minval = false, $maxval = false)
+    function __construct($default, $minval = false, $maxval = false)
     {
-        $this->_UserPreference_numeric((int)$default, (int)$minval, (int)$maxval);
+        parent::__construct((int)$default, (int)$minval, (int)$maxval);
     }
 
     function sanify($value)
@@ -1570,9 +1569,9 @@
 class _UserPreference_bool
     extends _UserPreference
 {
-    function _UserPreference_bool($default = false)
+    function __construct($default = false)
     {
-        $this->_UserPreference((bool)$default);
+        parent::__construct((bool)$default);
     }
 
     function sanify($value)
@@ -1600,9 +1599,9 @@
 class _UserPreference_language
     extends _UserPreference
 {
-    function _UserPreference_language($default = DEFAULT_LANGUAGE)
+    function __construct($default = DEFAULT_LANGUAGE)
     {
-        $this->_UserPreference($default);
+        parent::__construct($default);
     }
 
     // FIXME: check for valid locale
@@ -1634,9 +1633,9 @@
 class _UserPreference_theme
     extends _UserPreference
 {
-    function _UserPreference_theme($default = THEME)
+    function __construct($default = THEME)
     {
-        $this->_UserPreference($default);
+        parent::__construct($default);
     }
 
     function sanify($value)

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