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

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

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

Revision: 9898
          http://sourceforge.net/p/phpwiki/code/9898
Author:   vargenau
Date:     2016-07-21 12:15:07 +0000 (Thu, 21 Jul 2016)
Log Message:
-----------
_PageList_Column: use __construct

Modified Paths:
--------------
    trunk/lib/plugin/FullTextSearch.php
    trunk/lib/plugin/LinkSearch.php
    trunk/lib/plugin/ListPages.php
    trunk/lib/plugin/SemanticSearch.php
    trunk/lib/plugin/WantedPages.php
    trunk/lib/plugin/WikiTranslation.php
    trunk/lib/wikilens/PageListColumns.php

Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2016-07-21 10:16:06 UTC (rev 9897)
+++ trunk/lib/plugin/FullTextSearch.php	2016-07-21 12:15:07 UTC (rev 9898)
@@ -168,10 +168,10 @@
 {
     private $parentobj;
 
-    function _PageList_Column_WantedPages_links(&$params)
+    function __construct(&$params)
     {
         $this->parentobj =& $params[3];
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        parent::__construct($params[0], $params[1], $params[2]);
     }
 
     function _getValue($page, $revision_handle)

Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php	2016-07-21 10:16:06 UTC (rev 9897)
+++ trunk/lib/plugin/LinkSearch.php	2016-07-21 12:15:07 UTC (rev 9898)
@@ -170,7 +170,7 @@
 class _PageList_Column_LinkSearch_link
     extends _PageList_Column
 {
-    function _PageList_Column_LinkSearch_link($field, $heading, &$pagelist)
+    function __construct($field, $heading, &$pagelist)
     {
         $this->_field = $field;
         $this->_heading = $heading;

Modified: trunk/lib/plugin/ListPages.php
===================================================================
--- trunk/lib/plugin/ListPages.php	2016-07-21 10:16:06 UTC (rev 9897)
+++ trunk/lib/plugin/ListPages.php	2016-07-21 12:15:07 UTC (rev 9898)
@@ -137,10 +137,10 @@
 // how many back-/forwardlinks for this page
 class _PageList_Column_ListPages_count extends _PageList_Column
 {
-    function _PageList_Column_ListPages_count($field, $display, $backwards = false)
+    function __construct($field, $display, $backwards = false)
     {
         $this->_direction = $backwards;
-        return $this->_PageList_Column($field, $display, 'center');
+        parent::__construct($field, $display, 'center');
     }
 
     function _getValue($page, $revision_handle)

Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php	2016-07-21 10:16:06 UTC (rev 9897)
+++ trunk/lib/plugin/SemanticSearch.php	2016-07-21 12:15:07 UTC (rev 9898)
@@ -436,7 +436,7 @@
 class _PageList_Column_SemanticSearch_relation
     extends _PageList_Column
 {
-    function _PageList_Column_SemanticSearch_relation($field, $heading, &$pagelist)
+    function __construct($field, $heading, &$pagelist)
     {
         $this->_field = $field;
         $this->_heading = $heading;

Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php	2016-07-21 10:16:06 UTC (rev 9897)
+++ trunk/lib/plugin/WantedPages.php	2016-07-21 12:15:07 UTC (rev 9898)
@@ -158,10 +158,10 @@
 // which links to the missing page
 class _PageList_Column_WantedPages_wanted extends _PageList_Column
 {
-    function _PageList_Column_WantedPages_wanted(&$params)
+    function __construct(&$params)
     {
         $this->parentobj =& $params[3];
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        parent::__construct($params[0], $params[1], $params[2]);
     }
 
     function _getValue($page, $revision_handle)
@@ -183,10 +183,10 @@
  */
 class _PageList_Column_WantedPages_links extends _PageList_Column
 {
-    function _PageList_Column_WantedPages_links(&$params)
+    function __construct(&$params)
     {
         $this->parentobj =& $params[3];
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        parent::__construct($params[0], $params[1], $params[2]);
     }
 
     function _getValue($page, $revision_handle)

Modified: trunk/lib/plugin/WikiTranslation.php
===================================================================
--- trunk/lib/plugin/WikiTranslation.php	2016-07-21 10:16:06 UTC (rev 9897)
+++ trunk/lib/plugin/WikiTranslation.php	2016-07-21 12:15:07 UTC (rev 9898)
@@ -494,7 +494,7 @@
 
 class _PageList_Column_customlang extends _PageList_Column
 {
-    function _PageList_Column_customlang($field, $from_lang, $plugin)
+    function __construct($field, $from_lang, $plugin)
     {
         /**
          * @var WikiRequest $request
@@ -512,7 +512,7 @@
             $this->_field = substr($field, 7);
         //$heading = $field;
         $this->dbi = &$request->getDbh();
-        $this->_PageList_Column_base($this->_field);
+        _PageList_Column_base::__construct($this->_field);
     }
 
     function _getValue($page, $revision_handle)

Modified: trunk/lib/wikilens/PageListColumns.php
===================================================================
--- trunk/lib/wikilens/PageListColumns.php	2016-07-21 10:16:06 UTC (rev 9897)
+++ trunk/lib/wikilens/PageListColumns.php	2016-07-21 12:15:07 UTC (rev 9898)
@@ -60,7 +60,7 @@
     function __construct($params)
     {
         $this->_pagelist =& $params[3];
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        _PageList_Column::__construct($params[0], $params[1], $params[2]);
         $this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies');
     }
 
@@ -93,7 +93,7 @@
     function __construct($params)
     {
         $this->_pagelist =& $params[3];
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        _PageList_Column::__construct($params[0], $params[1], $params[2]);
         $this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies');
     }
 
@@ -117,7 +117,7 @@
     function __construct($params)
     {
         $this->_pagelist =& $params[3];
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        _PageList_Column::__construct($params[0], $params[1], $params[2]);
         $this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies');
     }
 
@@ -159,7 +159,7 @@
                 $this->_user =& RatingsUserFactory::getUser($GLOBALS['request']->_user->_userid);
             }
         }
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        parent::__construct($params[0], $params[1], $params[2]);
         $this->_dimension = $this->_pagelist->getOption('dimension');
         if (!$this->_dimension) $this->_dimension = 0;
     }
@@ -230,7 +230,7 @@
     function __construct($params)
     {
         $this->_pagelist =& $params[3];
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        _PageList_Column::__construct($params[0], $params[1], $params[2]);
         $this->_dimension = $this->_pagelist->getOption('dimension');
         if (!$this->_dimension) $this->_dimension = 0;
     }
@@ -287,9 +287,8 @@
         $this->_active_ratings_user =& RatingsUserFactory::getUser($active_user->getId());
 
         $this->_pagelist =& $params[3];
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        parent::__construct($params[0], $params[1], $params[2]);
         $this->_dimension = $this->_pagelist->getOption('dimension');
-        ;
         if (!$this->_dimension) $this->_dimension = 0;
         $this->_users = $this->_pagelist->getOption('users');
     }
@@ -342,7 +341,7 @@
         // No, I don't know exactly why, but this needs to be a reference for
         // the memoization in pearson_similarity and mean_rating to work
         $this->_active_ratings_user = new RatingsUser($active_user->getId());
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        _PageList_Column::__construct($params[0], $params[1], $params[2]);
 
         if (!empty($params[3])) {
             $this->_pagelist =& $params[3];

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

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

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

Revision: 9897
          http://sourceforge.net/p/phpwiki/code/9897
Author:   vargenau
Date:     2016-07-21 10:16:06 +0000 (Thu, 21 Jul 2016)
Log Message:
-----------
Use __construct

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

Modified: trunk/lib/HttpClient.php
===================================================================
--- trunk/lib/HttpClient.php	2016-07-21 09:56:45 UTC (rev 9896)
+++ trunk/lib/HttpClient.php	2016-07-21 10:16:06 UTC (rev 9897)
@@ -49,7 +49,7 @@
     public $redirect_count = 0;
     public $cookie_host = '';
 
-    function HttpClient($host = 'localhost', $port = 80)
+    function __construct($host = 'localhost', $port = 80)
     {
         $this->host = $host;
         $this->port = $port;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9896] trunk/lib/DbaListSet.php

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

Revision: 9896
          http://sourceforge.net/p/phpwiki/code/9896
Author:   vargenau
Date:     2016-07-21 09:56:45 +0000 (Thu, 21 Jul 2016)
Log Message:
-----------
Remove unused lib/DbaListSet.php -- previous comment was wrong

Removed Paths:
-------------
    trunk/lib/DbaListSet.php

Deleted: trunk/lib/DbaListSet.php
===================================================================
--- trunk/lib/DbaListSet.php	2016-07-21 09:51:17 UTC (rev 9895)
+++ trunk/lib/DbaListSet.php	2016-07-21 09:56:45 UTC (rev 9896)
@@ -1,155 +0,0 @@
-<?php
-
-class DbaListSet
-{
-    function DbaListSet(&$dbh)
-    {
-        $this->_dbh = &$dbh;
-    }
-
-    function create_sequence($seq)
-    {
-        $dbh = &$this->_dbh;
-
-        if (!$dbh->exists('max_key')) {
-            // echo "initializing DbaListSet";
-            // FIXME: check to see if it's really empty?
-            $dbh->insert('max_key', 0);
-        }
-
-        $key = "s" . urlencode($seq);
-        assert(intval($key) == 0 && !strstr($key, ':'));
-        if (!$dbh->exists($key))
-            $dbh->insert($key, "$key:$key:");
-    }
-
-    function delete_sequence($seq)
-    {
-        $key = "s" . urlencode($seq);
-        for ($i = $this->firstkey($seq); $i; $i = $next) {
-            $next = $this->next($i);
-            $this->delete($i);
-        }
-        $this->_dbh->delete($key);
-    }
-
-    function firstkey($seq)
-    {
-        $key = "s" . urlencode($seq);
-        list(, $next) = explode(':', $this->_dbh->fetch($key), 3);
-        return intval($next);
-    }
-
-    function lastkey($seq)
-    {
-        $key = "s" . urlencode($seq);
-        list($prev) = explode(':', $this->_dbh->fetch($key), 3);
-        return intval($prev);
-    }
-
-    function next($i)
-    {
-        list(, $next,) = explode(':', $this->_dbh->fetch(intval($i)), 3);
-        return intval($next);
-    }
-
-    function prev(&$i)
-    {
-        list($prev, ,) = explode(':', $this->_dbh->fetch(intval($i)), 3);
-        return intval($prev);
-    }
-
-    function exists($i)
-    {
-        $i = intval($i);
-        return $i && $this->_dbh->exists($i);
-    }
-
-    function fetch($i)
-    {
-        list(, , $data) = explode(':', $this->_dbh->fetch(intval($i)), 3);
-        return $data;
-    }
-
-    function replace($i, $data)
-    {
-        $dbh = &$this->_dbh;
-        list($prev, $next,) = explode(':', $dbh->fetch(intval($i)), 3);
-        $dbh->replace($i, "$prev:$next:$data");
-    }
-
-    function insert_before($i, $data)
-    {
-        assert(intval($i));
-        return $this->_insert_before_nc($i, $data);
-    }
-
-    function insert_after($i, $data)
-    {
-        assert(intval($i));
-        return $this->_insert_after_nc($i, $data);
-    }
-
-    function append($seq, $data)
-    {
-        $key = "s" . urlencode($seq);
-        $this->_insert_before_nc($key, $data);
-    }
-
-    function prepend($seq, $data)
-    {
-        $key = "s" . urlencode($seq);
-        $this->_insert_after_nc($key, $data);
-    }
-
-    function _insert_before_nc($i, &$data)
-    {
-        $newkey = $this->_new_key();
-        $old_prev = $this->_setprev($i, $newkey);
-        $this->_setnext($old_prev, $newkey);
-        $this->_dbh->insert($newkey, "$old_prev:$i:$data");
-        return $newkey;
-    }
-
-    function _insert_after_nc($i, &$data)
-    {
-        $newkey = $this->_new_key();
-        $old_next = $this->_setnext($i, $newkey);
-        $this->_setprev($old_next, $newkey);
-        $this->_dbh->insert($newkey, "$i:$old_next:$data");
-        return $newkey;
-    }
-
-    function delete($i)
-    {
-        $dbh = &$this->_dbh;
-        list($prev, $next) = explode(':', $dbh->fetch(intval($i)), 3);
-        $this->_setnext($prev, $next);
-        $this->_setprev($next, $prev);
-        $dbh->delete(intval($i));
-    }
-
-    function _new_key()
-    {
-        $dbh = &$this->_dbh;
-        $new_key = $dbh->fetch('max_key') + 1;
-        $dbh->replace('max_key', $new_key);
-        return $new_key;
-    }
-
-    function _setprev($i, $new_prev)
-    {
-        $dbh = &$this->_dbh;
-        list($old_prev, $next, $data) = explode(':', $dbh->fetch($i), 3);
-        $dbh->replace($i, "$new_prev:$next:$data");
-        return $old_prev;
-    }
-
-    function _setnext($i, $new_next)
-    {
-        $dbh = &$this->_dbh;
-        list($prev, $old_next, $data) = explode(':', $dbh->fetch($i), 3);
-        $dbh->replace($i, "$prev:$new_next:$data");
-        return $old_next;
-    }
-}

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

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

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

Revision: 9895
          http://sourceforge.net/p/phpwiki/code/9895
Author:   vargenau
Date:     2016-07-21 09:51:17 +0000 (Thu, 21 Jul 2016)
Log Message:
-----------
Remove unused lib/PageList.php

Modified Paths:
--------------
    trunk/lib/PageList.php
    trunk/locale/Makefile

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2016-07-21 09:43:11 UTC (rev 9894)
+++ trunk/lib/PageList.php	2016-07-21 09:51:17 UTC (rev 9895)
@@ -178,7 +178,7 @@
 
 class _PageList_Column extends _PageList_Column_base
 {
-    function _PageList_Column($field, $default_heading, $align = false)
+    function __construct($field, $default_heading, $align = false)
     {
         parent::__construct($default_heading, $align);
 

Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2016-07-21 09:43:11 UTC (rev 9894)
+++ trunk/locale/Makefile	2016-07-21 09:51:17 UTC (rev 9895)
@@ -83,7 +83,6 @@
 ${POT_FILE}: .././lib/Captcha.php
 ${POT_FILE}: .././lib/config.php
 ${POT_FILE}: .././lib/DbaDatabase.php
-${POT_FILE}: .././lib/DbaListSet.php
 ${POT_FILE}: .././lib/DbaPartition.php
 ${POT_FILE}: .././lib/DbSession/ADODB.php
 ${POT_FILE}: .././lib/DbSession/dba.php
@@ -568,7 +567,7 @@
 ${POT_FILE}: .././lib/removepage.php
 ${POT_FILE}: .././lib/Request.php
 ${POT_FILE}: .././lib/RssParser.php
-${POT_FILE}: .././lib/RSSWriter091.php
+${POT_FILE}: .././lib/RssWriter091.php
 ${POT_FILE}: .././lib/RssWriter2.php
 ${POT_FILE}: .././lib/RssWriter.php
 ${POT_FILE}: .././lib/SemanticWeb.php
@@ -819,5 +818,3 @@
 ${POT_FILE}: .././themes/Wordpress/themeinfo.php
 ${POT_FILE}: .././uploads/index.php
 ${POT_FILE}: .././view.php
-${POT_FILE}: .././wikiadmin.php
-${POT_FILE}: .././wikilist.php

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

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

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

Revision: 9894
          http://sourceforge.net/p/phpwiki/code/9894
Author:   vargenau
Date:     2016-07-21 09:43:11 +0000 (Thu, 21 Jul 2016)
Log Message:
-----------
Use __construct

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

Modified: trunk/lib/WysiwygEdit.php
===================================================================
--- trunk/lib/WysiwygEdit.php	2016-07-21 09:17:56 UTC (rev 9893)
+++ trunk/lib/WysiwygEdit.php	2016-07-21 09:43:11 UTC (rev 9894)
@@ -26,7 +26,7 @@
 abstract class WysiwygEdit
 {
 
-    function WysiwygEdit()
+    function __construct()
     {
         $this->_transformer_tags = false;
     }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9893] trunk/pgsrc/Help%2FAdobe%20Flash

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

Revision: 9893
          http://sourceforge.net/p/phpwiki/code/9893
Author:   vargenau
Date:     2016-07-21 09:17:56 +0000 (Thu, 21 Jul 2016)
Log Message:
-----------
Update Mahjong example in Flash

Modified Paths:
--------------
    trunk/pgsrc/Help%2FAdobe%20Flash

Modified: trunk/pgsrc/Help%2FAdobe%20Flash
===================================================================
--- trunk/pgsrc/Help%2FAdobe%20Flash	2016-07-21 09:00:37 UTC (rev 9892)
+++ trunk/pgsrc/Help%2FAdobe%20Flash	2016-07-21 09:17:56 UTC (rev 9893)
@@ -1,4 +1,4 @@
-Date: Thu, 10 Dec 2015 18:48:03 +0000
+Date: Thu, 21 Jul 2016 11:16:19 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAdobe%20Flash;
@@ -60,10 +60,10 @@
 === URL syntax ===
 
 {{{
-[[http://www.qasia.com/games/mahjong.swf]]
+[[http://www.freemahjong.org/mahjong.swf size=1000x600]]
 }}}
 
-[[http://www.qasia.com/games/mahjong.swf]]
+[[http://www.freemahjong.org/mahjong.swf size=1000x600]]
 
 == See Also ==
 * [[Help:Images]]

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9892] trunk/config/config-dist.ini

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

Revision: 9892
          http://sourceforge.net/p/phpwiki/code/9892
Author:   vargenau
Date:     2016-07-21 09:00:37 +0000 (Thu, 21 Jul 2016)
Log Message:
-----------
Add instructions for UNITS_EXE on Mac OS X

Modified Paths:
--------------
    trunk/config/config-dist.ini

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2016-07-20 12:47:23 UTC (rev 9891)
+++ trunk/config/config-dist.ini	2016-07-21 09:00:37 UTC (rev 9892)
@@ -80,6 +80,10 @@
 
 ; For a non-standard path
 ;UNITS_EXE = /usr/bin/units
+; For Mac OS X, you need to install GNU Units http://www.gnu.org/software/units/
+; The units command shipped with Mac OS X will not work.
+; Install e.g. with Homebrew: brew install gnu-units
+;UNITS_EXE = /usr/local/bin/gunits
 
 ; Needed for inlined SVG and MathM, but conflicts with document.write().
 ; Experimental. Default: false.

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9891] trunk/lib/Request.php

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

Revision: 9891
          http://sourceforge.net/p/phpwiki/code/9891
Author:   vargenau
Date:     2016-07-20 12:47:23 +0000 (Wed, 20 Jul 2016)
Log Message:
-----------
Fix buffer conflict with Fusionforge

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

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2016-07-20 12:36:47 UTC (rev 9890)
+++ trunk/lib/Request.php	2016-07-20 12:47:23 UTC (rev 9891)
@@ -26,6 +26,7 @@
     private $_is_compressing_output;
     public $_is_buffering_output;
     public $_ob_get_length;
+    private $_ob_initial_level;
     private $_do_chunked_output;
     public $_finishing;
 
@@ -33,6 +34,8 @@
     {
         global $request;
 
+        $this->_ob_initial_level = ob_get_level();
+
         $this->_fix_multipart_form_data();
 
         switch ($this->get('REQUEST_METHOD')) {
@@ -440,15 +443,15 @@
     function chunkOutput()
     {
         if (!empty($this->_is_buffering_output)
-            or (@ob_get_level())
+            or (@ob_get_level() > $this->_ob_initial_level)
         ) {
             $this->_do_chunked_output = true;
             if (empty($this->_ob_get_length)) $this->_ob_get_length = 0;
             $this->_ob_get_length += ob_get_length();
-            while (ob_get_level() > 0) {
+            while (ob_get_level() > $this->_ob_initial_level) {
                 ob_end_flush();
             }
-            if (ob_get_level() > 0) {
+            if (ob_get_level() > $this->_ob_initial_level) {
                 ob_end_clean();
             }
             ob_start();
@@ -484,7 +487,7 @@
             }
             $this->_is_buffering_output = false;
             ob_end_flush();
-        } elseif (@ob_get_level()) {
+        } elseif (@ob_get_level() > $this->_ob_initial_level) {
             ob_end_flush();
         }
         session_write_close();

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9890] trunk/themes/Portland/templates/editpage.tmpl

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

Revision: 9890
          http://sourceforge.net/p/phpwiki/code/9890
Author:   vargenau
Date:     2016-07-20 12:36:47 +0000 (Wed, 20 Jul 2016)
Log Message:
-----------
Portland edit page: valid HTML, better layout

Modified Paths:
--------------
    trunk/themes/Portland/templates/editpage.tmpl

Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl	2016-07-20 12:21:18 UTC (rev 9889)
+++ trunk/themes/Portland/templates/editpage.tmpl	2016-07-20 12:36:47 UTC (rev 9890)
@@ -11,18 +11,17 @@
             <?php echo _("Saving this page will overwrite the current version.")?></strong></p>
     <?php } ?>
   </td>
-  <td class="align-right">
+</tr>
+</table>
+<div id="editarea"><?php echo $EDIT_TEXTAREA?></div>
+<br />
+<?php echo _("Summary")._(":") ?> <?php echo $SUMMARY_INPUT ?>
+<br />
     <?php echo $PREVIEW_B ?>
     <?php if ($SAVE_B) { ?>
       <?php echo $SEP?><?php echo $SAVE_B ?>
     <?php } ?>
-  </td>
-</tr>
-</table>
-<a id="editarea"><?php echo $EDIT_TEXTAREA?></a>
 <br />
-<?php echo _("Summary")._(":") ?> <?php echo $SUMMARY_INPUT ?>
-<br />
 <?php echo fmt("Author will be logged as %s.", HTML::em($user->getId())) ?>
 <br />
 <?php echo $MINOR_EDIT_CB ?>

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

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

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

Revision: 9889
          http://sourceforge.net/p/phpwiki/code/9889
Author:   vargenau
Date:     2016-07-20 12:21:18 +0000 (Wed, 20 Jul 2016)
Log Message:
-----------
Translate ":"

Modified Paths:
--------------
    trunk/themes/default/templates/forumadd.tmpl
    trunk/themes/default/templates/login.tmpl
    trunk/themes/shamino_com/templates/top.tmpl
    trunk/themes/wikilens/templates/newuserwelcomepage.tmpl

Modified: trunk/themes/default/templates/forumadd.tmpl
===================================================================
--- trunk/themes/default/templates/forumadd.tmpl	2016-07-20 12:15:57 UTC (rev 9888)
+++ trunk/themes/default/templates/forumadd.tmpl	2016-07-20 12:21:18 UTC (rev 9889)
@@ -13,7 +13,7 @@
          <td><input class="wikitext" type="text" size="60"
                     maxlength="256" name="forum[summary]" value="<?php echo isset($forum['summary']) ? $forum['summary'] : '' ?>" /></td>
      </tr>
-    <tr><th class="align-right"><?php echo _("Reply")?>:</th>
+    <tr><th class="align-right"><?php echo _("Reply")._(':')?></th>
          <td><textarea class="forumedit" rows="5" cols="60"
                        name="forum[body]"><?php echo isset($forum['body']) ? $forum['body'] : ''?></textarea></td>
      </tr>

Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl	2016-07-20 12:15:57 UTC (rev 9888)
+++ trunk/themes/default/templates/login.tmpl	2016-07-20 12:21:18 UTC (rev 9889)
@@ -71,7 +71,7 @@
   <td class="align-right"><label for="userid"><?php echo _("UserId:") ?></label></td>
   <td><input id="userid" type="text" name="auth[userid]" size="12" maxlength="256" value="<?php echo $userid?>" tabindex="1" />
     <?php if (ENABLE_AUTH_OPENID) { ?>
-    &nbsp;&nbsp;<?php echo _("or")?> <a href="http://openid.net/"><?php echo _("OpenID") ?></a>:&nbsp;<input type="text" id="inp-openid" name="openid_url" size="32" maxlength="256" value="" tabindex="3" />
+    &nbsp;&nbsp;<?php echo _("or")?> <a href="http://openid.net/"><?php echo _("OpenID")._(':') ?></a>&nbsp;<input type="text" id="inp-openid" name="openid_url" size="32" maxlength="256" value="" tabindex="3" />
     <?php } ?>
 </td>
 </tr>

Modified: trunk/themes/shamino_com/templates/top.tmpl
===================================================================
--- trunk/themes/shamino_com/templates/top.tmpl	2016-07-20 12:15:57 UTC (rev 9888)
+++ trunk/themes/shamino_com/templates/top.tmpl	2016-07-20 12:21:18 UTC (rev 9889)
@@ -16,14 +16,14 @@
  - <form action="<?php echo WikiURL(_("TitleSearch"))?>"
       method="get" accept-charset="UTF-8" style="display: inline">
    <a class="wikilink" href="<?php echo WikiURL(_("RecentChanges"))?>"><?php echo _("RecentChanges")?></a>
-   - <a class="wikilink" href="<?php echo WikiURL(_("FindPage"))?>"><?php echo _("FindPage")?>:</a>
+   - <a class="wikilink" href="<?php echo WikiURL(_("FindPage"))?>"><?php echo _("FindPage")._(':')?></a>
    <input type="hidden" name="auto_redirect" value="1" />
       <input type="text"  name="s" size="12" maxlength="256"
              title='<?php echo _("Quick Search")?>'
              onmouseover="window.status='<?php echo _("Quick Search")?>'; return true;"
              onmouseout="window.status=''; return true;" />
     <?php if (!empty($user) && $user->isSignedIn()) { ?>
-     - <a class="wikilink" href="<?php echo WikiURL(_("UserPreferences"))?>"><?php echo _("Preferences")?>:</a>
+     - <a class="wikilink" href="<?php echo WikiURL(_("UserPreferences"))?>"><?php echo _("Preferences")._(':')?></a>
     <?php } // isSignedIn ?>
   </form>
   <?php if (empty($NOSIGNIN)) { ?>

Modified: trunk/themes/wikilens/templates/newuserwelcomepage.tmpl
===================================================================
--- trunk/themes/wikilens/templates/newuserwelcomepage.tmpl	2016-07-20 12:15:57 UTC (rev 9888)
+++ trunk/themes/wikilens/templates/newuserwelcomepage.tmpl	2016-07-20 12:21:18 UTC (rev 9889)
@@ -20,7 +20,7 @@
 ?>
 <br />
 <?php if ($dbi->isWikiPage($SENDERUSERNAME)) { ?>
-<p>Also, <?php echo $SENDER; ?> has his own homepage at <?php echo WIKI_NAME ?>: <a href="<?php echo WikiURL($SENDERUSERNAME, '', true); ?>"><?php echo $SENDER ?>'s page</a></p>
+<p>Also, <?php echo $SENDER; ?> has his own homepage at <?php echo WIKI_NAME._(': ') ?><a href="<?php echo WikiURL($SENDERUSERNAME, '', true); ?>"><?php echo $SENDER ?>'s page</a></p>
 <?php } ?>
 <br>
 <p>To create your own login on <?php echo WIKI_NAME ?>, you can <a href="<?php echo WikiURL('NewUserRegister', '', true) ?>">Register</a></p>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9888] trunk/themes/blog/templates/top.tmpl

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

Revision: 9888
          http://sourceforge.net/p/phpwiki/code/9888
Author:   vargenau
Date:     2016-07-20 12:15:57 +0000 (Wed, 20 Jul 2016)
Log Message:
-----------
Translate ":"

Modified Paths:
--------------
    trunk/themes/blog/templates/top.tmpl

Modified: trunk/themes/blog/templates/top.tmpl
===================================================================
--- trunk/themes/blog/templates/top.tmpl	2016-07-20 12:15:11 UTC (rev 9887)
+++ trunk/themes/blog/templates/top.tmpl	2016-07-20 12:15:57 UTC (rev 9888)
@@ -12,6 +12,6 @@
 <div id="actionbar">
 <?php echo Template('actionbar') ?>
 </div>
-<div id="pagetrail"><?php echo _("Page Trail")?>: <<PageTrail numberlinks=7 >></div>
+<div id="pagetrail"><?php echo _('Page Trail')._(': ') ?><<PageTrail numberlinks=7 >></div>
 <?php } ?>
 

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

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

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

Revision: 9887
          http://sourceforge.net/p/phpwiki/code/9887
Author:   vargenau
Date:     2016-07-20 12:15:11 +0000 (Wed, 20 Jul 2016)
Log Message:
-----------
PageTrail: use <span> instead if <div> so that the pagetrail is on the same line

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

Modified: trunk/lib/plugin/PageTrail.php
===================================================================
--- trunk/lib/plugin/PageTrail.php	2016-07-19 14:29:46 UTC (rev 9886)
+++ trunk/lib/plugin/PageTrail.php	2016-07-20 12:15:11 UTC (rev 9887)
@@ -83,7 +83,7 @@
 
         $numberlinks = min(count($Pages), $numberlinks);
         if (!$invisible and $numberlinks) {
-            $html = HTML::div(array('class' => 'pagetrail'));
+            $html = HTML::span(array('class' => 'pagetrail'));
             $html->pushContent(WikiLink($Pages[$numberlinks - 1], 'auto'));
             for ($i = $numberlinks - 2; $i >= 0; $i--) {
                 if (!empty($Pages[$i]))

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

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

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

Revision: 9886
          http://sourceforge.net/p/phpwiki/code/9886
Author:   vargenau
Date:     2016-07-19 14:29:46 +0000 (Tue, 19 Jul 2016)
Log Message:
-----------
Add () in class instantiation

Modified Paths:
--------------
    trunk/RPC2.php
    trunk/doc/README.foaf
    trunk/lib/BlockParser.php
    trunk/lib/ErrorManager.php
    trunk/lib/FileFinder.php
    trunk/lib/InlineParser.php
    trunk/lib/Request.php
    trunk/lib/RssWriter091.php
    trunk/lib/TextSearchQuery.php
    trunk/lib/WikiDB/backend/PearDB.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/WikiTheme.php
    trunk/lib/WikiUser.php
    trunk/lib/editpage.php
    trunk/lib/imagecache.php
    trunk/lib/loadsave.php
    trunk/lib/pdf.php
    trunk/lib/plugin/Diff.php
    trunk/lib/plugin/FoafViewer.php
    trunk/lib/plugin/LikePages.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/plugin/SpellCheck.php
    trunk/lib/plugin/WikiAdminRename.php
    trunk/lib/prepend.php
    trunk/lib/upgrade.php
    trunk/themes/Sidebar/themeinfo.php
    trunk/themes/wikilens/templates/head.tmpl

Modified: trunk/RPC2.php
===================================================================
--- trunk/RPC2.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/RPC2.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -25,5 +25,5 @@
 
 include_once 'lib/XmlRpcServer.php';
 
-$server = new XmlRpcServer;
+$server = new XmlRpcServer();
 $server->service();

Modified: trunk/doc/README.foaf
===================================================================
--- trunk/doc/README.foaf	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/doc/README.foaf	2016-07-19 14:29:46 UTC (rev 9886)
@@ -157,7 +157,7 @@
 require_once 'XML/FOAF/Parser.php';
 
 // Create new Parser object
-$parser = new XML_FOAF_Parser;
+$parser = new XML_FOAF_Parser();
 
 // Start of output
 echo '<h1>XML_FOAF_Parser Example</h1>';

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/BlockParser.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -100,7 +100,7 @@
             return false;
         }
 
-        $match = new AnchoredRegexpSet_match;
+        $match = new AnchoredRegexpSet_match();
         $match->postmatch = substr($text, strlen($m[0]));
         $match->match = $m[1];
         $match->regexp_ind = count($m) - 3;
@@ -139,7 +139,7 @@
             return false;
         }
 
-        $match = new AnchoredRegexpSet_match;
+        $match = new AnchoredRegexpSet_match();
         $match->postmatch = substr($text, strlen($m[0]));
         $match->match = $m[1];
         $match->regexp_ind = count($m) - 3 + $prevMatch->regexp_ind + 1;

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/ErrorManager.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -355,7 +355,7 @@
     }
 
     if (!isset($GLOBALS['ErrorManager'])) {
-        $GLOBALS['ErrorManager'] = new ErrorManager;
+        $GLOBALS['ErrorManager'] = new ErrorManager();
     }
 
     if (defined('DEBUG') and DEBUG) {
@@ -647,5 +647,5 @@
 require_once(dirname(__FILE__) . '/HtmlElement.php');
 
 if (!isset($GLOBALS['ErrorManager'])) {
-    $GLOBALS['ErrorManager'] = new ErrorManager;
+    $GLOBALS['ErrorManager'] = new ErrorManager();
 }

Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/FileFinder.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -350,7 +350,7 @@
  * Example usage:
  *
  * <pre>
- *   $pearFinder = new PearFileFinder;
+ *   $pearFinder = new PearFileFinder();
  *   $pearFinder->includeOnce('DB.php');
  * </pre>
  *
@@ -460,7 +460,7 @@
 {
     static $finder;
     if (!isset($finder)) {
-        $finder = new FileFinder;
+        $finder = new FileFinder();
         // remove "/lib" from dirname(__FILE__)
         $wikidir = preg_replace('/.lib$/', '', dirname(__FILE__));
         // let the system favor its local pear?
@@ -482,7 +482,7 @@
 {
     static $finder;
     if ($re_init or !isset($finder))
-        $finder = new LocalizedFileFinder;
+        $finder = new LocalizedFileFinder();
     return $finder->findFile($file, $missing_okay);
 }
 
@@ -490,7 +490,7 @@
 {
     static $buttonfinder;
     if ($re_init or !isset($buttonfinder))
-        $buttonfinder = new LocalizedButtonFinder;
+        $buttonfinder = new LocalizedButtonFinder();
     return $buttonfinder->findFile($file, $missing_okay);
 }
 
@@ -507,7 +507,7 @@
 {
     static $finder;
     if (!isset($finder)) {
-        $finder = new FileFinder;
+        $finder = new FileFinder();
     }
     // remove "/lib" from dirname(__FILE__)
     if ($finder->_is_abs($file))
@@ -529,7 +529,7 @@
 {
     static $finder;
     if (!isset($finder)) {
-        $finder = new FileFinder;
+        $finder = new FileFinder();
     }
     if (defined("DATA_PATH")) {
         $wikipath = DATA_PATH;

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/InlineParser.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -147,7 +147,7 @@
     //   S - STUDY
     private function _match($text, $regexps, $repeat)
     {
-        $match = new RegexpSet_match;
+        $match = new RegexpSet_match();
 
         // Optimization: if the matches are only "$" and another, then omit "$"
         assert(!empty($repeat));
@@ -1244,7 +1244,7 @@
         $regexps = new RegexpSet($regexps);
 
         $input = $text;
-        $output = new XmlContent;
+        $output = new XmlContent();
 
         $match = $regexps->match($input);
 
@@ -1343,7 +1343,7 @@
     static $trfm;
     $action = $request->getArg('action');
     if (empty($trfm) or $action == 'SpellCheck') {
-        $trfm = new InlineTransformer;
+        $trfm = new InlineTransformer();
     }
 
     if ($basepage) {
@@ -1357,7 +1357,7 @@
     static $trfm;
 
     if (empty($trfm)) {
-        $trfm = new LinkTransformer;
+        $trfm = new LinkTransformer();
     }
 
     if ($basepage) {
@@ -1374,7 +1374,7 @@
     static $trfm;
 
     if (empty($trfm)) {
-        $trfm = new NowikiTransformer;
+        $trfm = new NowikiTransformer();
     }
     if ($basepage) {
         return new CacheableMarkup($trfm->parse($text), $basepage);

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/Request.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -48,8 +48,8 @@
                 break;
         }
 
-        $this->session = new Request_SessionVars;
-        $this->cookies = new Request_CookieVars;
+        $this->session = new Request_SessionVars();
+        $this->cookies = new Request_CookieVars();
 
         if (ACCESS_LOG or ACCESS_LOG_SQL) {
             $this->_accesslog = new Request_AccessLog(ACCESS_LOG, ACCESS_LOG_SQL);

Modified: trunk/lib/RssWriter091.php
===================================================================
--- trunk/lib/RssWriter091.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/RssWriter091.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -80,7 +80,7 @@
     function format($changes)
     {
         //    include_once('lib/RssWriter.php');
-        $rss = new RssWriter091;
+        $rss = new RssWriter091();
 
         $rss->channel($this->channel_properties());
 

Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/TextSearchQuery.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -107,7 +107,7 @@
         $this->_regex_modifier = ($case_exact ? '' : 'i') . 'sS';
         $this->_case_exact = $case_exact;
         if ($regex != 'pcre') {
-            $parser = new TextSearchQuery_Parser;
+            $parser = new TextSearchQuery_Parser();
             $this->_tree = $parser->parse($search_query, $case_exact, $this->_regex);
             $this->optimize(); // broken under certain circumstances: "word -word -word"
             if (defined("FULLTEXTSEARCH_STOPLIST"))

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/WikiDB/backend/PearDB.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -36,7 +36,7 @@
         // TODO: apparently some Pear::Db version adds LIMIT 1,0 to getOne(),
         // which is invalid for "select version()"
         if (!in_array($name, get_class_methods("DB_common"))) {
-            $finder = new FileFinder;
+            $finder = new FileFinder();
             $dir = dirname(__FILE__) . "/../../pear";
             $finder->_prepend_to_include_path($dir);
             include_once("$dir/DB/common.php"); // use our version instead.

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/WikiPluginCached.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -482,7 +482,7 @@
             if (!class_exists('Cache')) {
                 // uuh, pear not in include_path! should print a warning.
                 // search some possible pear paths.
-                $pearFinder = new PearFileFinder;
+                $pearFinder = new PearFileFinder();
                 if ($lib = $pearFinder->findFile('Cache.php', 'missing_ok'))
                     require_once($lib);
                 else // fall back to our own copy

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/WikiTheme.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -240,8 +240,8 @@
                     $this->_default_theme = new WikiTheme('default', true);
                     $this->_parents[] = $this->_default_theme;
                 } elseif ($parent) {
-                    $this->_parents[] = new WikiTheme
-                    (preg_replace("/^WikiTheme_/i", "", $parent), true);
+                    $this->_parents[] = new WikiTheme(
+                        preg_replace("/^WikiTheme_/i", "", $parent), true);
                 }
             }
         }

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/WikiUser.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -711,7 +711,7 @@
         global $request;
 
         if (empty($this->_prefs))
-            $this->_prefs = new UserPreferences;
+            $this->_prefs = new UserPreferences();
         $UserName = $this->UserName();
 
         // Try to read deprecated 1.3.x style cookies
@@ -774,7 +774,7 @@
         // initializeTheme() needs at least an empty object
         /*
          if (empty($this->_prefs))
-            $this->_prefs = new UserPreferences;
+            $this->_prefs = new UserPreferences();
         */
         return $this->_prefs;
     }

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/editpage.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -215,7 +215,7 @@
             $pagelink = WikiLink($this->page);
         }
 
-        $title = new FormattedText ($title_fs, $pagelink);
+        $title = new FormattedText($title_fs, $pagelink);
         // not for dumphtml or viewsource
         if (defined('ENABLE_WYSIWYG') and ENABLE_WYSIWYG and $template == 'editpage') {
             $WikiTheme->addMoreHeaders($this->WysiwygEdit->Head());
@@ -519,7 +519,7 @@
                                        _("Versions are identical")));
         } else {
             // New CSS formatted unified diffs
-            $fmt = new HtmlUnifiedDiffFormatter;
+            $fmt = new HtmlUnifiedDiffFormatter();
             $html->pushContent($fmt->format($diff));
         }
         return $html;

Modified: trunk/lib/imagecache.php
===================================================================
--- trunk/lib/imagecache.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/imagecache.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -93,7 +93,7 @@
  */
 function mainImageCache()
 {
-    $request = new Request;
+    $request = new Request();
     // normalize pagename
     $request->setArg('pagename', deducePagename($request));
     $pagename = $request->getArg('pagename');
@@ -111,7 +111,7 @@
     $id = $request->getArg('id');
     $args = $request->getArg('args');
     $request->setArg('action', 'imagecache');
-    $cache = new WikiPluginCached;
+    $cache = new WikiPluginCached();
 
     if ($id) {
         // this indicates a direct call (script wasn't called as

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/loadsave.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -1516,7 +1516,7 @@
     $dbi =& $request->_dbi;
 
     // Ensure that all mandatory pages are loaded
-    $finder = new FileFinder;
+    $finder = new FileFinder();
 
     $mandatory = array('SandBox',
                        'Template/Category',

Modified: trunk/lib/pdf.php
===================================================================
--- trunk/lib/pdf.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/pdf.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -40,7 +40,7 @@
 
     array_unshift($pagelist->_pages, $request->_dbi->getPage($pagename));
     require_once 'lib/WikiPluginCached.php';
-    $cache = new WikiPluginCached;
+    $cache = new WikiPluginCached();
     $cache->newCache();
     $tmpfile = $cache->tempnam();
     $tmpdir = dirname($tmpfile);
@@ -83,7 +83,7 @@
         $request->discardOutput();
         $request->buffer_output(false /*'nocompress'*/);
         require_once 'lib/WikiPluginCached.php';
-        $cache = new WikiPluginCached;
+        $cache = new WikiPluginCached();
         $cache->newCache();
         $tmpfile = $cache->tempnam('pdf.html');
         $fp = fopen($tmpfile, "wb");

Modified: trunk/lib/plugin/Diff.php
===================================================================
--- trunk/lib/plugin/Diff.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/plugin/Diff.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -193,7 +193,7 @@
                         _(" was created because: "), $new->get('summary')));
                 }
             } else {
-                $fmt = new HtmlUnifiedDiffFormatter;
+                $fmt = new HtmlUnifiedDiffFormatter();
                 $html->pushContent($fmt->format($diff));
             }
         }

Modified: trunk/lib/plugin/FoafViewer.php
===================================================================
--- trunk/lib/plugin/FoafViewer.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/plugin/FoafViewer.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -134,7 +134,7 @@
                     return HTML(HTML::p(_("Resource isn't available: Something went wrong, probably a 404!")));
                 }
                 // Create new Parser object
-                $parser = new XML_FOAF_Parser;
+                $parser = new XML_FOAF_Parser();
                 // Parser FOAF into $foaffile
                 $parser->parseFromMem($foaffile);
                 $a = $parser->toArray();

Modified: trunk/lib/plugin/LikePages.php
===================================================================
--- trunk/lib/plugin/LikePages.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/plugin/LikePages.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -94,7 +94,7 @@
         if ($search)
             $query = new TextSearchQuery(join(' OR ', $search));
         else
-            $query = new NullTextSearchQuery; // matches nothing
+            $query = new NullTextSearchQuery(); // matches nothing
 
         $match_re = '/' . join('|', $match) . '/';
 

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/plugin/RecentChanges.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -841,7 +841,7 @@
     {
 
         include_once 'lib/RssWriter.php';
-        $rss = new RssWriter;
+        $rss = new RssWriter();
         $rss->channel($this->channel_properties());
 
         if (($props = $this->image_properties()))
@@ -959,7 +959,7 @@
     function format($changes)
     {
         include_once 'lib/RssWriter2.php';
-        $rss = new RssWriter2;
+        $rss = new RssWriter2();
 
         $rss->channel($this->channel_properties());
         if (($props = $this->cloud_properties()))
@@ -1031,7 +1031,7 @@
     {
         global $request;
         include_once 'lib/RssWriter.php';
-        $rss = new AtomFeed;
+        $rss = new AtomFeed();
 
         // "channel" is called "feed" in atom
         $rc_url = WikiURL($request->getArg('pagename'), array(), 'absurl');

Modified: trunk/lib/plugin/SpellCheck.php
===================================================================
--- trunk/lib/plugin/SpellCheck.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/plugin/SpellCheck.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -143,7 +143,7 @@
             $args .= " --lang=" . $lang;
             // use -C or autosplit wikiwords in the text
             $commandLine = ASPELL_EXE . " -a -C $args ";
-            $cache = new WikiPluginCached;
+            $cache = new WikiPluginCached();
             $code = $cache->filterThroughCmd($source, $commandLine);
             if (empty($code))
                 return $this->error(fmt("Couldn't start commandline “%s”", $commandLine));

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/plugin/WikiAdminRename.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -129,13 +129,12 @@
         /*if ($next_action == 'verify') {
             $args['info'] = "checkbox,pagename,renamed_pagename";
         }*/
-        $pagelist = new PageList_Selectable
-        (
+        $pagelist = new PageList_Selectable(
             $args['info'], $args['exclude'],
             array('types' =>
             array('renamed_pagename'
             => new _PageList_Column_renamed_pagename('rename', _("Rename to")),
-            )));
+        )));
         $pagelist->addPageList($pages);
 
         $header = HTML::div();

Modified: trunk/lib/prepend.php
===================================================================
--- trunk/lib/prepend.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/prepend.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -104,7 +104,7 @@
     }
 }
 
-$RUNTIMER = new DebugTimer;
+$RUNTIMER = new DebugTimer();
 require_once(dirname(__FILE__) . '/ErrorManager.php');
 require_once(dirname(__FILE__) . '/WikiCallback.php');
 

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/lib/upgrade.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -990,8 +990,8 @@
     {
         echo "<h2>", sprintf(_("Check for necessary %s updates"),
             "config.ini"), "</h2>\n";
-        $entry = new UpgradeConfigEntry
-        ($this, array('key' => 'cache_control_none',
+        $entry = new UpgradeConfigEntry($this,
+             array('key' => 'cache_control_none',
             'fixed_with' => 1012.0,
             'header' => sprintf(_("Check for %s"), "CACHE_CONTROL = NONE"),
             'applicable_args' => 'CACHE_CONTROL',
@@ -1000,8 +1000,8 @@
         $entry->setApplicableCb(new WikiMethodCb($entry, '_applicable_defined_and_empty'));
         $this->_configUpdates[] = $entry;
 
-        $entry = new UpgradeConfigEntry
-        ($this, array('key' => 'group_method_none',
+        $entry = new UpgradeConfigEntry($this,
+             array('key' => 'group_method_none',
             'fixed_with' => 1012.0,
             'header' => sprintf(_("Check for %s"), "GROUP_METHOD = NONE"),
             'applicable_args' => 'GROUP_METHOD',
@@ -1010,8 +1010,8 @@
         $entry->setApplicableCb(new WikiMethodCb($entry, '_applicable_defined_and_empty'));
         $this->_configUpdates[] = $entry;
 
-        $entry = new UpgradeConfigEntry
-        ($this, array('key' => 'blog_empty_default_prefix',
+        $entry = new UpgradeConfigEntry($this,
+             array('key' => 'blog_empty_default_prefix',
             'fixed_with' => 1013.0,
             'header' => sprintf(_("Check for %s"), "BLOG_EMPTY_DEFAULT_PREFIX"),
             'applicable_args' => 'BLOG_EMPTY_DEFAULT_PREFIX',

Modified: trunk/themes/Sidebar/themeinfo.php
===================================================================
--- trunk/themes/Sidebar/themeinfo.php	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/themes/Sidebar/themeinfo.php	2016-07-19 14:29:46 UTC (rev 9886)
@@ -204,7 +204,7 @@
     require_once 'lib/wikilens/CustomPrefs.php';
     require_once 'lib/wikilens/PageListColumns.php';
     //require_once("lib/plugin/RateIt.php");
-    $plugin = new WikiPlugin_RateIt;
+    $plugin = new WikiPlugin_RateIt();
     // add parent to current theme to find the RateIt images
     // $WikiTheme->addParent('wikilens', 'noinit');
     $WikiTheme->_parents[] = new WikiTheme('wikilens', 'noinit');

Modified: trunk/themes/wikilens/templates/head.tmpl
===================================================================
--- trunk/themes/wikilens/templates/head.tmpl	2016-07-19 14:28:36 UTC (rev 9885)
+++ trunk/themes/wikilens/templates/head.tmpl	2016-07-19 14:29:46 UTC (rev 9886)
@@ -89,7 +89,7 @@
 <?php } ?>
 <?php
   require_once("lib/plugin/RateIt.php");
-  $plugin = new WikiPlugin_RateIt;
+  $plugin = new WikiPlugin_RateIt();
   $plugin->head();
 ?>
 <?php echo $WikiTheme->getMoreHeaders() ?>

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

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

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

Revision: 9885
          http://sourceforge.net/p/phpwiki/code/9885
Author:   vargenau
Date:     2016-07-19 14:28:36 +0000 (Tue, 19 Jul 2016)
Log Message:
-----------
Refactor: rename identifiers starting with underscore

Modified Paths:
--------------
    trunk/lib/diff.php
    trunk/lib/diff3.php
    trunk/lib/difflib.php

Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php	2016-07-19 14:27:10 UTC (rev 9884)
+++ trunk/lib/diff.php	2016-07-19 14:28:36 UTC (rev 9885)
@@ -26,61 +26,61 @@
 
 require_once 'lib/difflib.php';
 
-class _HWLDF_WordAccumulator
+class HWLDF_WordAccumulator
 {
     function __construct()
     {
-        $this->_lines = array();
-        $this->_line = false;
-        $this->_group = false;
-        $this->_tag = '~begin';
+        $this->lines = array();
+        $this->line = false;
+        $this->group = false;
+        $this->tag = '~begin';
     }
 
-    private function _flushGroup($new_tag)
+    private function flushGroup($new_tag)
     {
-        if ($this->_group !== false) {
-            if (!$this->_line)
-                $this->_line = HTML();
-            $this->_line->pushContent($this->_tag
-                ? new HtmlElement($this->_tag,
-                    $this->_group)
-                : $this->_group);
+        if ($this->group !== false) {
+            if (!$this->line)
+                $this->line = HTML();
+            $this->line->pushContent($this->tag
+                ? new HtmlElement($this->tag,
+                    $this->group)
+                : $this->group);
         }
-        $this->_group = '';
-        $this->_tag = $new_tag;
+        $this->group = '';
+        $this->tag = $new_tag;
     }
 
-    private function _flushLine($new_tag)
+    private function flushLine($new_tag)
     {
-        $this->_flushGroup($new_tag);
-        if ($this->_line)
-            $this->_lines[] = $this->_line;
-        $this->_line = HTML();
+        $this->flushGroup($new_tag);
+        if ($this->line)
+            $this->lines[] = $this->line;
+        $this->line = HTML();
     }
 
     public function addWords($words, $tag = '')
     {
-        if ($tag != $this->_tag)
-            $this->_flushGroup($tag);
+        if ($tag != $this->tag)
+            $this->flushGroup($tag);
 
         foreach ($words as $word) {
             // new-line should only come as first char of word.
             if ($word === "")
                 continue;
             if ($word[0] == "\n") {
-                $this->_group .= " ";
-                $this->_flushLine($tag);
+                $this->group .= " ";
+                $this->flushLine($tag);
                 $word = substr($word, 1);
             }
             assert(!strstr($word, "\n"));
-            $this->_group .= $word;
+            $this->group .= $word;
         }
     }
 
     public function getLines()
     {
-        $this->_flushLine('~done');
-        return $this->_lines;
+        $this->flushLine('~done');
+        return $this->lines;
     }
 }
 
@@ -88,13 +88,13 @@
 {
     function __construct($orig_lines, $final_lines)
     {
-        list ($orig_words, $orig_stripped) = $this->_split($orig_lines);
-        list ($final_words, $final_stripped) = $this->_split($final_lines);
+        list ($orig_words, $orig_stripped) = $this->split_lines($orig_lines);
+        list ($final_words, $final_stripped) = $this->split_lines($final_lines);
 
         parent::__construct($orig_words, $final_words, $orig_stripped, $final_stripped);
     }
 
-    private function _split($lines)
+    private function split_lines($lines)
     {
         // FIXME: fix POSIX char class.
         if (!preg_match_all('/ ( [^\S\n]+ | [[:alnum:]]+ | . ) (?: (?!< \n) [^\S\n])? /xs',
@@ -108,7 +108,7 @@
 
     public function orig()
     {
-        $orig = new _HWLDF_WordAccumulator;
+        $orig = new HWLDF_WordAccumulator();
 
         foreach ($this->edits as $edit) {
             if ($edit->type == 'copy')
@@ -119,9 +119,9 @@
         return $orig->getLines();
     }
 
-    public function _final()
+    public function finalize()
     {
-        $final = new _HWLDF_WordAccumulator;
+        $final = new HWLDF_WordAccumulator();
 
         foreach ($this->edits as $edit) {
             if ($edit->type == 'copy')
@@ -145,44 +145,44 @@
 class HtmlUnifiedDiffFormatter extends UnifiedDiffFormatter
 {
     /**
-     * @var HtmlElement $_top
+     * @var HtmlElement $top
      */
-    public $_top;
+    public $top;
     /**
-     * @var HtmlElement $_block
+     * @var HtmlElement $block
      */
-    public $_block;
+    public $block;
 
     function __construct($context_lines = 4)
     {
         parent::__construct($context_lines);
     }
 
-    protected function _start_diff()
+    protected function start_diff()
     {
-        $this->_top = HTML::div(array('class' => 'diff'));
+        $this->top = HTML::div(array('class' => 'diff'));
     }
 
-    protected function _end_diff()
+    protected function end_diff()
     {
-        $val = $this->_top;
-        unset($this->_top);
+        $val = $this->top;
+        unset($this->top);
         return $val;
     }
 
-    protected function _start_block($header)
+    protected function start_block($header)
     {
-        $this->_block = HTML::div(array('class' => 'block'),
+        $this->block = HTML::div(array('class' => 'block'),
             HTML::samp($header));
     }
 
-    protected function _end_block()
+    protected function end_block()
     {
-        $this->_top->pushContent($this->_block);
-        unset($this->_block);
+        $this->top->pushContent($this->block);
+        unset($this->block);
     }
 
-    protected function _lines($lines, $class, $prefix = false, $elem = false)
+    protected function lines($lines, $class, $prefix = false, $elem = false)
     {
         if (!$prefix)
             $prefix = HTML::raw('&nbsp;');
@@ -195,29 +195,29 @@
                     $prefix),
                 $line, HTML::raw('&nbsp;')));
         }
-        $this->_block->pushContent($div);
+        $this->block->pushContent($div);
     }
 
-    protected function _context($lines)
+    protected function context($lines)
     {
-        $this->_lines($lines, 'context');
+        $this->lines($lines, 'context');
     }
 
-    protected function _deleted($lines)
+    protected function deleted($lines)
     {
-        $this->_lines($lines, 'deleted', '-', 'del');
+        $this->lines($lines, 'deleted', '-', 'del');
     }
 
-    protected function _added($lines)
+    protected function added($lines)
     {
-        $this->_lines($lines, 'added', '+', 'ins');
+        $this->lines($lines, 'added', '+', 'ins');
     }
 
-    protected function _changed($orig, $final)
+    protected function changed($orig, $final)
     {
         $diff = new WordLevelDiff($orig, $final);
-        $this->_lines($diff->orig(), 'original', '-');
-        $this->_lines($diff->_final(), 'final', '+');
+        $this->lines($diff->orig(), 'original', '-');
+        $this->lines($diff->finalize(), 'final', '+');
     }
 }
 
@@ -378,7 +378,7 @@
                     $new->get('summary'))));
             }
         } else {
-            $fmt = new HtmlUnifiedDiffFormatter;
+            $fmt = new HtmlUnifiedDiffFormatter();
             $html->pushContent($fmt->format($diff));
         }
 

Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php	2016-07-19 14:27:10 UTC (rev 9884)
+++ trunk/lib/diff3.php	2016-07-19 14:28:36 UTC (rev 9885)
@@ -25,7 +25,7 @@
 
 require_once 'lib/difflib.php';
 
-class _Diff3_Block
+class Diff3_Block
 {
     public $type = 'diff3';
 
@@ -38,17 +38,17 @@
 
     public function merged()
     {
-        if (!isset($this->_merged)) {
+        if (!isset($this->merged)) {
             if ($this->final1 === $this->final2)
-                $this->_merged = &$this->final1;
+                $this->merged = &$this->final1;
             elseif ($this->final1 === $this->orig)
-                $this->_merged = &$this->final2;
+                $this->merged = &$this->final2;
             elseif ($this->final2 === $this->orig)
-                $this->_merged = &$this->final1;
+                $this->merged = &$this->final1;
             else
-                $this->_merged = false;
+                $this->merged = false;
         }
-        return $this->_merged;
+        return $this->merged;
     }
 
     public function is_conflict()
@@ -57,7 +57,7 @@
     }
 }
 
-class _Diff3_CopyBlock extends _Diff3_Block
+class Diff3_CopyBlock extends Diff3_Block
 {
     public $type = 'copy';
 
@@ -79,7 +79,7 @@
     }
 }
 
-class _Diff3_BlockBuilder
+class Diff3_BlockBuilder
 {
     public $orig;
     public $final1;
@@ -87,17 +87,17 @@
 
     function __construct()
     {
-        $this->_init();
+        $this->init();
     }
 
-    private function _init()
+    private function init()
     {
         $this->orig = array();
         $this->final1 = array();
         $this->final2 = array();
     }
 
-    private function _append(&$array, $lines)
+    private function append(&$array, $lines)
     {
         array_splice($array, sizeof($array), 0, $lines);
     }
@@ -105,19 +105,19 @@
     public function input($lines)
     {
         if ($lines)
-            $this->_append($this->orig, $lines);
+            $this->append($this->orig, $lines);
     }
 
     public function out1($lines)
     {
         if ($lines)
-            $this->_append($this->final1, $lines);
+            $this->append($this->final1, $lines);
     }
 
     public function out2($lines)
     {
         if ($lines)
-            $this->_append($this->final2, $lines);
+            $this->append($this->final2, $lines);
     }
 
     private function is_empty()
@@ -130,8 +130,8 @@
         if ($this->is_empty())
             return false;
         else {
-            $block = new _Diff3_Block($this->orig, $this->final1, $this->final2);
-            $this->_init();
+            $block = new Diff3_Block($this->orig, $this->final1, $this->final2);
+            $this->init();
             return $block;
         }
     }
@@ -141,16 +141,16 @@
 {
     function __construct($orig, $final1, $final2)
     {
-        $eng = new _DiffEngine;
+        $eng = new DiffEngine();
         $this->ConflictingBlocks = 0; //Conflict counter
-        $this->blocks = $this->__diff3($eng->diff($orig, $final1),
+        $this->blocks = $this->diff3blocks($eng->diff($orig, $final1),
             $eng->diff($orig, $final2));
     }
 
-    private function __diff3($edits1, $edits2)
+    private function diff3blocks($edits1, $edits2)
     {
         $blocks = array();
-        $bb = new _Diff3_BlockBuilder;
+        $bb = new Diff3_BlockBuilder();
 
         $e1 = current($edits1);
         $e2 = current($edits2);
@@ -164,7 +164,7 @@
 
                 $ncopy = min($e1->norig(), $e2->norig());
                 assert($ncopy > 0);
-                $blocks[] = new _Diff3_CopyBlock(array_slice($e1->orig, 0, $ncopy));
+                $blocks[] = new Diff3_CopyBlock(array_slice($e1->orig, 0, $ncopy));
 
                 if ($e1->norig() > $ncopy) {
                     array_splice($e1->orig, 0, $ncopy);

Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php	2016-07-19 14:27:10 UTC (rev 9884)
+++ trunk/lib/difflib.php	2016-07-19 14:28:36 UTC (rev 9885)
@@ -23,7 +23,7 @@
 //
 // A PHP diff engine for phpwiki.
 
-abstract class _DiffOp
+abstract class DiffOp
 {
     public $type;
     public $orig;
@@ -42,7 +42,7 @@
     }
 }
 
-class _DiffOp_Copy extends _DiffOp
+class DiffOp_Copy extends DiffOp
 {
     public $type = 'copy';
 
@@ -56,11 +56,11 @@
 
     public function reverse()
     {
-        return new _DiffOp_Copy($this->final, $this->orig);
+        return new DiffOp_Copy($this->final, $this->orig);
     }
 }
 
-class _DiffOp_Delete extends _DiffOp
+class DiffOp_Delete extends DiffOp
 {
     public $type = 'delete';
 
@@ -72,11 +72,11 @@
 
     public function reverse()
     {
-        return new _DiffOp_Add($this->orig);
+        return new DiffOp_Add($this->orig);
     }
 }
 
-class _DiffOp_Add extends _DiffOp
+class DiffOp_Add extends DiffOp
 {
     public $type = 'add';
 
@@ -88,11 +88,11 @@
 
     public function reverse()
     {
-        return new _DiffOp_Delete($this->final);
+        return new DiffOp_Delete($this->final);
     }
 }
 
-class _DiffOp_Change extends _DiffOp
+class DiffOp_Change extends DiffOp
 {
     public $type = 'change';
 
@@ -104,7 +104,7 @@
 
     public function reverse()
     {
-        return new _DiffOp_Change($this->final, $this->orig);
+        return new DiffOp_Change($this->final, $this->orig);
     }
 }
 
@@ -128,7 +128,7 @@
  * @author Geoffrey T. Dairiki
  * @access private
  */
-class _DiffEngine
+class DiffEngine
 {
     public $xchanged;
     public $ychanged;
@@ -187,11 +187,11 @@
         }
 
         // Find the LCS.
-        $this->_compareseq(0, sizeof($this->xv), 0, sizeof($this->yv));
+        $this->compareseq(0, sizeof($this->xv), 0, sizeof($this->yv));
 
         // Merge edits when possible
-        $this->_shift_boundaries($from_lines, $this->xchanged, $this->ychanged);
-        $this->_shift_boundaries($to_lines, $this->ychanged, $this->xchanged);
+        $this->shift_boundaries($from_lines, $this->xchanged, $this->ychanged);
+        $this->shift_boundaries($to_lines, $this->ychanged, $this->xchanged);
 
         // Compute the edit operations.
         $edits = array();
@@ -208,7 +208,7 @@
                 ++$yi;
             }
             if ($copy)
-                $edits[] = new _DiffOp_Copy($copy);
+                $edits[] = new DiffOp_Copy($copy);
 
             // Find deletes & adds.
             $delete = array();
@@ -220,10 +220,11 @@
                 $add[] = $to_lines[$yi++];
 
             if ($delete && $add)
-                $edits[] = new _DiffOp_Change($delete, $add);
+                $edits[] = new DiffOp_Change($delete, $add);
             elseif ($delete)
-                $edits[] = new _DiffOp_Delete($delete); elseif ($add)
-                $edits[] = new _DiffOp_Add($add);
+                $edits[] = new DiffOp_Delete($delete);
+            elseif ($add)
+                $edits[] = new DiffOp_Add($add);
         }
         return $edits;
     }
@@ -244,7 +245,7 @@
      * match.  The caller must trim matching lines from the beginning and end
      * of the portions it is going to specify.
      */
-    private function _diag($xoff, $xlim, $yoff, $ylim, $nchunks)
+    private function diag($xoff, $xlim, $yoff, $ylim, $nchunks)
     {
         $flip = false;
 
@@ -284,7 +285,7 @@
                 reset($matches);
                 while (list ($junk, $y) = each($matches))
                     if (empty($this->in_seq[$y])) {
-                        $k = $this->_lcs_pos($y);
+                        $k = $this->lcs_pos($y);
                         assert($k > 0);
                         $ymids[$k] = $ymids[$k - 1];
                         break;
@@ -298,7 +299,7 @@
                         $this->seq[$k] = $y;
                         $this->in_seq[$y] = 1;
                     } elseif (empty($this->in_seq[$y])) {
-                        $k = $this->_lcs_pos($y);
+                        $k = $this->lcs_pos($y);
                         assert($k > 0);
                         $ymids[$k] = $ymids[$k - 1];
                     }
@@ -318,7 +319,7 @@
         return array($this->lcs, $seps);
     }
 
-    private function _lcs_pos($ypos)
+    private function lcs_pos($ypos)
     {
         $end = $this->lcs;
         if ($end == 0 || $ypos > $this->seq[$end]) {
@@ -355,7 +356,7 @@
      * Note that XLIM, YLIM are exclusive bounds.
      * All line numbers are origin-0 and discarded lines are not counted.
      */
-    private function _compareseq($xoff, $xlim, $yoff, $ylim)
+    private function compareseq($xoff, $xlim, $yoff, $ylim)
     {
         // Slide down the bottom initial diagonal.
         while ($xoff < $xlim && $yoff < $ylim
@@ -379,7 +380,7 @@
             //$nchunks = max(2,min(8,(int)$nchunks));
             $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;
             list ($lcs, $seps)
-                = $this->_diag($xoff, $xlim, $yoff, $ylim, $nchunks);
+                = $this->diag($xoff, $xlim, $yoff, $ylim, $nchunks);
         }
 
         if ($lcs == 0) {
@@ -394,7 +395,7 @@
             reset($seps);
             $pt1 = $seps[0];
             while ($pt2 = next($seps)) {
-                $this->_compareseq($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
+                $this->compareseq($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
                 $pt1 = $pt2;
             }
         }
@@ -412,7 +413,7 @@
      *
      * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
      */
-    private function _shift_boundaries($lines, &$changed, $other_changed)
+    private function shift_boundaries($lines, &$changed, $other_changed)
     {
         $i = 0;
         $j = 0;
@@ -538,7 +539,7 @@
      */
     function __construct($from_lines, $to_lines)
     {
-        $eng = new _DiffEngine;
+        $eng = new DiffEngine();
         $this->edits = $eng->diff($from_lines, $to_lines);
     }
 
@@ -583,7 +584,7 @@
      *
      * @return array The sequence of strings.
      */
-    public function _final()
+    public function finalize()
     {
         $lines = array();
 
@@ -691,7 +692,7 @@
         $nlead = $this->leading_context_lines;
         $ntrail = $this->trailing_context_lines;
 
-        $this->_start_diff();
+        $this->start_diff();
         $x0 = 0;
         $y0 = 0;
 
@@ -703,9 +704,9 @@
                     } else {
                         if ($ntrail) {
                             $context = array_slice($edit->orig, 0, $ntrail);
-                            $block[] = new _DiffOp_Copy($context);
+                            $block[] = new DiffOp_Copy($context);
                         }
-                        $this->_block($x0, $ntrail + $xi - $x0,
+                        $this->block($x0, $ntrail + $xi - $x0,
                             $y0, $ntrail + $yi - $y0,
                             $block);
                         $block = false;
@@ -719,7 +720,7 @@
                     $y0 = $yi - sizeof($context);
                     $block = array();
                     if ($context)
-                        $block[] = new _DiffOp_Copy($context);
+                        $block[] = new DiffOp_Copy($context);
                 }
                 $block[] = $edit;
             }
@@ -731,41 +732,44 @@
         }
 
         if (is_array($block))
-            $this->_block($x0, $xi - $x0,
+            $this->block($x0, $xi - $x0,
                 $y0, $yi - $y0,
                 $block);
 
-        return $this->_end_diff();
+        return $this->end_diff();
     }
 
-    private function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
+    private function block($xbeg, $xlen, $ybeg, $ylen, &$edits)
     {
-        $this->_start_block($this->_block_header($xbeg, $xlen, $ybeg, $ylen));
+        $this->start_block($this->block_header($xbeg, $xlen, $ybeg, $ylen));
         foreach ($edits as $edit) {
             if ($edit->type == 'copy')
-                $this->_context($edit->orig);
+                $this->context($edit->orig);
             elseif ($edit->type == 'add')
-                $this->_added($edit->final); elseif ($edit->type == 'delete')
-                $this->_deleted($edit->orig); elseif ($edit->type == 'change')
-                $this->_changed($edit->orig, $edit->final); else
+                $this->added($edit->final);
+            elseif ($edit->type == 'delete')
+                $this->deleted($edit->orig);
+            elseif ($edit->type == 'change')
+                $this->changed($edit->orig, $edit->final);
+            else
                 trigger_error("Unknown edit type", E_USER_ERROR);
         }
-        $this->_end_block();
+        $this->end_block();
     }
 
-    protected function _start_diff()
+    protected function start_diff()
     {
         ob_start();
     }
 
-    protected function _end_diff()
+    protected function end_diff()
     {
         $val = ob_get_contents();
         ob_end_clean();
         return $val;
     }
 
-    protected function _block_header($xbeg, $xlen, $ybeg, $ylen)
+    protected function block_header($xbeg, $xlen, $ybeg, $ylen)
     {
         if ($xlen > 1)
             $xbeg .= "," . ($xbeg + $xlen - 1);
@@ -775,41 +779,41 @@
         return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
     }
 
-    protected function _start_block($header)
+    protected function start_block($header)
     {
         echo $header;
     }
 
-    protected function _end_block()
+    protected function end_block()
     {
     }
 
-    protected function _lines($lines, $prefix = ' ')
+    protected function lines($lines, $prefix = ' ')
     {
         foreach ($lines as $line)
             echo "$prefix $line\n";
     }
 
-    protected function _context($lines)
+    protected function context($lines)
     {
-        $this->_lines($lines);
+        $this->lines($lines);
     }
 
-    protected function _added($lines)
+    protected function added($lines)
     {
-        $this->_lines($lines, ">");
+        $this->lines($lines, ">");
     }
 
-    protected function _deleted($lines)
+    protected function deleted($lines)
     {
-        $this->_lines($lines, "<");
+        $this->lines($lines, "<");
     }
 
-    protected function _changed($orig, $final)
+    protected function changed($orig, $final)
     {
-        $this->_deleted($orig);
+        $this->deleted($orig);
         echo "---\n";
-        $this->_added($final);
+        $this->added($final);
     }
 }
 
@@ -826,7 +830,7 @@
         $this->trailing_context_lines = $context_lines;
     }
 
-    protected function _block_header($xbeg, $xlen, $ybeg, $ylen)
+    protected function block_header($xbeg, $xlen, $ybeg, $ylen)
     {
         if ($xlen != 1)
             $xbeg .= "," . $xlen;
@@ -835,20 +839,20 @@
         return "@@ -$xbeg +$ybeg @@\n";
     }
 
-    protected function _added($lines)
+    protected function added($lines)
     {
-        $this->_lines($lines, "+");
+        $this->lines($lines, "+");
     }
 
-    protected function _deleted($lines)
+    protected function deleted($lines)
     {
-        $this->_lines($lines, "-");
+        $this->lines($lines, "-");
     }
 
-    protected function _changed($orig, $final)
+    protected function changed($orig, $final)
     {
-        $this->_deleted($orig);
-        $this->_added($final);
+        $this->deleted($orig);
+        $this->added($final);
     }
 }
 
@@ -871,7 +875,7 @@
         $this->trailing_context_lines = $context_lines;
     }
 
-    protected function _lines($lines, $prefix = '')
+    protected function lines($lines, $prefix = '')
     {
         if (!$prefix == '')
             echo "$prefix\n";
@@ -881,24 +885,24 @@
             echo "$prefix\n";
     }
 
-    protected function _added($lines)
+    protected function added($lines)
     {
-        $this->_lines($lines, ">>>>>>>");
+        $this->lines($lines, ">>>>>>>");
     }
 
-    protected function _deleted($lines)
+    protected function deleted($lines)
     {
-        $this->_lines($lines, "<<<<<<<");
+        $this->lines($lines, "<<<<<<<");
     }
 
-    protected function _block_header($xbeg, $xlen, $ybeg, $ylen)
+    protected function block_header($xbeg, $xlen, $ybeg, $ylen)
     {
         return "";
     }
 
-    protected function _changed($orig, $final)
+    protected function changed($orig, $final)
     {
-        $this->_deleted($orig);
-        $this->_added($final);
+        $this->deleted($orig);
+        $this->added($final);
     }
 }

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

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

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

Revision: 9884
          http://sourceforge.net/p/phpwiki/code/9884
Author:   vargenau
Date:     2016-07-19 14:27:10 +0000 (Tue, 19 Jul 2016)
Log Message:
-----------
Update Help%2FWikisUsingPhpWiki

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

Modified: trunk/pgsrc/Help%2FWikisUsingPhpWiki
===================================================================
--- trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016-07-19 14:26:32 UTC (rev 9883)
+++ trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016-07-19 14:27:10 UTC (rev 9884)
@@ -1,4 +1,4 @@
-Date: Sat, 25 Jun 2016 17:55:45 +0000
+Date: Wed, 13 Jul 2016 09:30:00 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikisUsingPhpWiki
@@ -8,7 +8,7 @@
 
 Here are some wikis using ~PhpWiki:
 
-|= URL                                                             |= ~PhpWiki release | Theme
+|= URL                                                             |= ~PhpWiki release |= Theme
 | http://adammoore.me.uk                                           | 1.3.12p2          | Crao
 | http://alsach.at/phpwiki/                                        | 1.4.0RC1          | default
 | http://astro.milantiev.com/                                      | 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:[9883] trunk/themes/default/templates/pagelink.tmpl

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

Revision: 9883
          http://sourceforge.net/p/phpwiki/code/9883
Author:   vargenau
Date:     2016-07-19 14:26:32 +0000 (Tue, 19 Jul 2016)
Log Message:
-----------
Avoid "<<" in templates when not a plugin

Modified Paths:
--------------
    trunk/themes/default/templates/pagelink.tmpl

Modified: trunk/themes/default/templates/pagelink.tmpl
===================================================================
--- trunk/themes/default/templates/pagelink.tmpl	2016-07-17 10:57:56 UTC (rev 9882)
+++ trunk/themes/default/templates/pagelink.tmpl	2016-07-19 14:26:32 UTC (rev 9883)
@@ -13,16 +13,16 @@
 ?>
 <tr><td style="width:100%" colspan="<?php echo $COLS ?>"><table class="fullwidth wikipaging"><tr class="wikipaging">
   <td class="align-left wikipaging<?php echo $PREV ? "-enabled" : "-disabled" ?>">
-      <?php echo $PREV ? HTML::a(array('href'=>$FIRST_LINK), "|<<") : "|<<" ?>
+      <?php echo $PREV ? HTML::a(array('href'=>$FIRST_LINK), '|<'.'<') : '|<'.'<' ?>
       &nbsp;
-      <?php echo $PREV ? HTML::a(array('href'=>$PREV_LINK), "<< " . _("Prev")) : "<<" ?>
+      <?php echo $PREV ? HTML::a(array('href'=>$PREV_LINK), '<'.'< ' . _('Prev')) : '<'.'<' ?>
   </td>
   <td class="wikipaging-enabled align-center">
       <?php echo fmt(" - %d / %d - ", $ACTPAGE, $NUMPAGES) ?>
   </td>
   <td class="align-right wikipaging<?php echo $NEXT ? "-enabled" : "-disabled" ?>">
-      <?php echo $NEXT ? HTML::a(array('href'=>$NEXT_LINK), _("Next") . " >>") : ">>" ?>
+      <?php echo $NEXT ? HTML::a(array('href'=>$NEXT_LINK), _('Next') . ' >>') : '>>' ?>
       &nbsp;
-      <?php echo $NEXT ? HTML::a(array('href'=>$LAST_LINK), ">>|") : ">>|" ?>
+      <?php echo $NEXT ? HTML::a(array('href'=>$LAST_LINK), '>>|') : '>>|' ?>
   </td>
 </tr></table></td></tr>

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

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

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

Revision: 9882
          http://sourceforge.net/p/phpwiki/code/9882
Author:   vargenau
Date:     2016-07-17 10:57:56 +0000 (Sun, 17 Jul 2016)
Log Message:
-----------
Revert lib/Units.php; GNU units needed

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

Modified: trunk/lib/Units.php
===================================================================
--- trunk/lib/Units.php	2016-07-17 09:47:19 UTC (rev 9881)
+++ trunk/lib/Units.php	2016-07-17 10:57:56 UTC (rev 9882)
@@ -30,7 +30,7 @@
         elseif (defined("UNITS_EXE")) // ignore dynamic check
             $this->errcode = 0;
         else
-            exec("units m2 ft2", $o, $this->errcode);
+            exec("units m2", $o, $this->errcode);
     }
 
     /**

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9881] trunk/robots.txt

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

Revision: 9881
          http://sourceforge.net/p/phpwiki/code/9881
Author:   vargenau
Date:     2016-07-17 09:47:19 +0000 (Sun, 17 Jul 2016)
Log Message:
-----------
Add robots.txt

Added Paths:
-----------
    trunk/robots.txt

Added: trunk/robots.txt
===================================================================
--- trunk/robots.txt	                        (rev 0)
+++ trunk/robots.txt	2016-07-17 09:47:19 UTC (rev 9881)
@@ -0,0 +1,4 @@
+User-agent: *
+Disallow: /admin/
+Disallow: /config/
+Disallow: /themes/

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

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

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

Revision: 9880
          http://sourceforge.net/p/phpwiki/code/9880
Author:   vargenau
Date:     2016-07-17 09:34:04 +0000 (Sun, 17 Jul 2016)
Log Message:
-----------
Avoid "usage: units [-f unitsfile] [-q] [-v] [from-unit to-unit]" message in log

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

Modified: trunk/lib/Units.php
===================================================================
--- trunk/lib/Units.php	2016-07-12 16:38:59 UTC (rev 9879)
+++ trunk/lib/Units.php	2016-07-17 09:34:04 UTC (rev 9880)
@@ -30,7 +30,7 @@
         elseif (defined("UNITS_EXE")) // ignore dynamic check
             $this->errcode = 0;
         else
-            exec("units m2", $o, $this->errcode);
+            exec("units m2 ft2", $o, $this->errcode);
     }
 
     /**

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

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

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

Revision: 9879
          http://sourceforge.net/p/phpwiki/code/9879
Author:   vargenau
Date:     2016-07-12 16:38:59 +0000 (Tue, 12 Jul 2016)
Log Message:
-----------
Use __construct

Modified Paths:
--------------
    trunk/lib/diff.php
    trunk/lib/diff3.php
    trunk/lib/difflib.php

Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php	2016-07-12 16:15:03 UTC (rev 9878)
+++ trunk/lib/diff.php	2016-07-12 16:38:59 UTC (rev 9879)
@@ -91,8 +91,7 @@
         list ($orig_words, $orig_stripped) = $this->_split($orig_lines);
         list ($final_words, $final_stripped) = $this->_split($final_lines);
 
-        $this->MappedDiff($orig_words, $final_words,
-            $orig_stripped, $final_stripped);
+        parent::__construct($orig_words, $final_words, $orig_stripped, $final_stripped);
     }
 
     private function _split($lines)

Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php	2016-07-12 16:15:03 UTC (rev 9878)
+++ trunk/lib/diff3.php	2016-07-12 16:38:59 UTC (rev 9879)
@@ -29,7 +29,7 @@
 {
     public $type = 'diff3';
 
-    function _Diff3_Block($orig = false, $final1 = false, $final2 = false)
+    function __construct($orig = false, $final1 = false, $final2 = false)
     {
         $this->orig = $orig ? $orig : array();
         $this->final1 = $final1 ? $final1 : array();

Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php	2016-07-12 16:15:03 UTC (rev 9878)
+++ trunk/lib/difflib.php	2016-07-12 16:38:59 UTC (rev 9879)
@@ -46,7 +46,7 @@
 {
     public $type = 'copy';
 
-    function _DiffOp_Copy($orig, $final = false)
+    function __construct($orig, $final = false)
     {
         if (!is_array($final))
             $final = $orig;
@@ -64,7 +64,7 @@
 {
     public $type = 'delete';
 
-    function _DiffOp_Delete($lines)
+    function __construct($lines)
     {
         $this->orig = $lines;
         $this->final = false;
@@ -80,7 +80,7 @@
 {
     public $type = 'add';
 
-    function _DiffOp_Add($lines)
+    function __construct($lines)
     {
         $this->final = $lines;
         $this->orig = false;
@@ -96,7 +96,7 @@
 {
     public $type = 'change';
 
-    function _DiffOp_Change($orig, $final)
+    function __construct($orig, $final)
     {
         $this->orig = $orig;
         $this->final = $final;
@@ -530,14 +530,13 @@
     public $edits;
 
     /**
-     * Constructor.
      * Computes diff between sequences of strings.
      *
      * @param $from_lines array An array of strings.
      *        (Typically these are lines from a file.)
      * @param $to_lines array An array of strings.
      */
-    function Diff($from_lines, $to_lines)
+    function __construct($from_lines, $to_lines)
     {
         $eng = new _DiffEngine;
         $this->edits = $eng->diff($from_lines, $to_lines);
@@ -603,8 +602,6 @@
     extends Diff
 {
     /**
-     * Constructor.
-     *
      * Computes diff between sequences of strings.
      *
      * This can be used to compute things like
@@ -625,14 +622,14 @@
      * @param $mapped_to_lines array This array should
      *  have the same number of elements as $to_lines.
      */
-    function MappedDiff($from_lines, $to_lines,
-                        $mapped_from_lines, $mapped_to_lines)
+    function __construct($from_lines, $to_lines,
+                         $mapped_from_lines, $mapped_to_lines)
     {
 
         assert(sizeof($from_lines) == sizeof($mapped_from_lines));
         assert(sizeof($to_lines) == sizeof($mapped_to_lines));
 
-        $this->Diff($mapped_from_lines, $mapped_to_lines);
+        parent::__construct($mapped_from_lines, $mapped_to_lines);
 
         $xi = $yi = 0;
         // Optimizing loop invariants:
@@ -868,7 +865,7 @@
  */
 class BlockDiffFormatter extends DiffFormatter
 {
-    function BlockDiffFormatter($context_lines = 4)
+    function __construct($context_lines = 4)
     {
         $this->leading_context_lines = $context_lines;
         $this->trailing_context_lines = $context_lines;

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

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

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

Revision: 9878
          http://sourceforge.net/p/phpwiki/code/9878
Author:   vargenau
Date:     2016-07-12 16:15:03 +0000 (Tue, 12 Jul 2016)
Log Message:
-----------
Standard PhpWiki header

Modified Paths:
--------------
    trunk/lib/ArchiveCleaner.php
    trunk/lib/CachedMarkup.php
    trunk/lib/Captcha.php
    trunk/lib/ExternalReferrer.php
    trunk/lib/HtmlParser.php
    trunk/lib/IniConfig.php
    trunk/lib/InlineParser.php
    trunk/lib/MailNotify.php
    trunk/lib/PagePerm.php
    trunk/lib/PageType.php
    trunk/lib/Request.php
    trunk/lib/RssParser.php
    trunk/lib/SemanticWeb.php
    trunk/lib/SpamBlocklist.php
    trunk/lib/WikiGroup.php
    trunk/lib/XmlParser.php
    trunk/lib/XmlRpcServer.php
    trunk/lib/config.php
    trunk/lib/diff.php
    trunk/lib/diff3.php
    trunk/lib/difflib.php
    trunk/lib/display.php
    trunk/lib/install.php
    trunk/lib/main.php
    trunk/lib/pdf.php
    trunk/lib/upgrade.php

Modified: trunk/lib/ArchiveCleaner.php
===================================================================
--- trunk/lib/ArchiveCleaner.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/ArchiveCleaner.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
  *
  * This file is part of PhpWiki.

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/CachedMarkup.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
  * Copyright (C) 2004-2010 $ThePhpWikiProgrammingTeam
  * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent

Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/Captcha.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Session Captcha v1.0
  *   by Gavin M. Roy <gm...@bt...>

Modified: trunk/lib/ExternalReferrer.php
===================================================================
--- trunk/lib/ExternalReferrer.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/ExternalReferrer.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Detect external referrers
  * Currently only search engines, and highlight the searched item.

Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/HtmlParser.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,10 +1,4 @@
 <?php
-
-/**
- * HtmlParser Class: Conversion HTML => wikimarkup
- * Requires XmlParser, XmlElement and the expat (or now the libxml) library. This is all in core.
- */
-
 /*
  * Copyright (C) 2004 Reini Urban
  *
@@ -26,6 +20,11 @@
  */
 
 /**
+ * HtmlParser Class: Conversion HTML => wikimarkup
+ * Requires XmlParser, XmlElement and the expat (or now the libxml) library. This is all in core.
+ */
+
+/**
  * Base class to implement html => wikitext converters,
  * extendable for various wiki syntax versions.
  * This is needed to be able to use htmlarea-alike editors,

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/IniConfig.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,17 +1,4 @@
 <?php
-
-/**
- * A configurator intended to read its config from a PHP-style INI file,
- * instead of a PHP file.
- *
- * Pass a filename to the IniConfig() function and it will read all its
- * definitions from there, all by itself, and proceed to do a mass-define
- * of all valid PHPWiki config items.  In this way, we can hopefully be
- * totally backwards-compatible with the old index.php method, while still
- * providing a much tastier on-going experience.
- *
- * @author: Joby Walker, Reini Urban, Matthew Palmer
- */
 /*
  * Copyright 2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -34,6 +21,19 @@
  */
 
 /**
+ * A configurator intended to read its config from a PHP-style INI file,
+ * instead of a PHP file.
+ *
+ * Pass a filename to the IniConfig() function and it will read all its
+ * definitions from there, all by itself, and proceed to do a mass-define
+ * of all valid PHPWiki config items.  In this way, we can hopefully be
+ * totally backwards-compatible with the old index.php method, while still
+ * providing a much tastier on-going experience.
+ *
+ * @author: Joby Walker, Reini Urban, Matthew Palmer
+ */
+
+/**
  * DONE:
  * - Convert the value lists to provide defaults, so that every "if
  *      (defined())" and "if (!defined())" can fuck off to the dismal hole

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/InlineParser.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
  * Copyright (C) 2004-2010 Reini Urban
  * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -20,6 +19,7 @@
  * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
 /**
  * This is the code which deals with the inline part of the
  * wiki-markup.

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/MailNotify.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2006-2007,2009 Reini Urban
  * Copyright (C) 2009 Marc-Etienne Vargenau, Alcatel-Lucent
  *

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/PagePerm.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * Copyright 2004,2007 $ThePhpWikiProgrammingTeam
  * Copyright 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent

Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/PageType.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * Copyright 1999,2000,2001,2002,2003,2004,2005,2006 $ThePhpWikiProgrammingTeam
  *

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/Request.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * Copyright (C) 2002,2004,2005,2006,2009 $ThePhpWikiProgrammingTeam
  *

Modified: trunk/lib/RssParser.php
===================================================================
--- trunk/lib/RssParser.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/RssParser.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,16 +1,4 @@
 <?php
-
-/**
- * Simple RSSParser Class
- * Based on Duncan Gough RSSParser class
- * Copyleft Arnaud Fontaine
- * Licence : GPL
- * See lib/plugin/RssFeed.php and lib/XmlParser.php
- *
- * The myth of RSS compatibility:
- *   http://diveintomark.org/archives/2004/02/04/incompatible-rss
- */
-
 /*
  * This file is part of PhpWiki.
  *
@@ -30,6 +18,17 @@
  */
 
 /**
+ * Simple RSSParser Class
+ * Based on Duncan Gough RSSParser class
+ * Copyleft Arnaud Fontaine
+ * Licence : GPL
+ * See lib/plugin/RssFeed.php and lib/XmlParser.php
+ *
+ * The myth of RSS compatibility:
+ *   http://diveintomark.org/archives/2004/02/04/incompatible-rss
+ */
+
+/**
  * 2004-04-09 16:30:50 rurban:
  *   added fsockopen allow_url_fopen = Off workaround
  * 2004-04-12 20:04:12 rurban:

Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/SemanticWeb.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,4 +1,24 @@
 <?php
+/*
+ * Copyright 2004,2007 Reini Urban
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 /**
  * What to do on ?format=rdf  What to do on ?format=owl
  *
@@ -77,29 +97,8 @@
  *   http://www.ontoweb.org/
  *   http://www.semwebcentral.org/ (OWL on top of FusionForge)
  *
- *
  * Author: Reini Urban <ru...@x-...>
  */
-/*============================================================================*/
-/*
- * Copyright 2004,2007 Reini Urban
- *
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
 
 require_once 'lib/RssWriter.php';
 require_once 'lib/TextSearchQuery.php';

Modified: trunk/lib/SpamBlocklist.php
===================================================================
--- trunk/lib/SpamBlocklist.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/SpamBlocklist.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2005 Reini Urban
  *
  * This file is part of PhpWiki.

Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/WikiGroup.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * Copyright (C) 2003, 2004 $ThePhpWikiProgrammingTeam
  * Copyright (C) 2010 Marc-Etienne Vargenau, Alcatel-Lucent

Modified: trunk/lib/XmlParser.php
===================================================================
--- trunk/lib/XmlParser.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/XmlParser.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,4 +1,21 @@
 <?php
+/*
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 /**
  * Base XmlParser Class.
@@ -20,24 +37,6 @@
  * esp. $this->root is lost. So we have to this into a global.
  */
 
-/*
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
 /**
  * class XmlParser - Parse into a tree of XmlElement nodes.
  *
@@ -49,7 +48,6 @@
  */
 class XmlParser
 {
-
     public $_parser, $root, $current, $previous, $parent;
 
     function XmlParser($encoding = '')

Modified: trunk/lib/XmlRpcServer.php
===================================================================
--- trunk/lib/XmlRpcServer.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/XmlRpcServer.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,10 +1,8 @@
 <?php
-
-/* Copyright (C) 2002, Lawrence Akka <la...@us...>
+/*
+ * Copyright (C) 2002, Lawrence Akka <la...@us...>
  * Copyright (C) 2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
  *
- * LICENCE
- * =======
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -20,7 +18,9 @@
  * You should have received a copy of the GNU General Public License along
  * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ */
+
+/*
  * LIBRARY USED - POSSIBLE PROBLEMS
  * ================================
  *

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/config.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * NOTE: The settings here should probably not need to be changed.
  * The user-configurable settings have been moved to IniConfig.php

Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/diff.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,12 +1,28 @@
 <?php
+/*
+ * Copyright (C) 2000, 2001 Geoffrey T. Dairiki <da...@da...>
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 // diff.php
 //
 // PhpWiki diff output code.
 //
-// Copyright (C) 2000, 2001 Geoffrey T. Dairiki <da...@da...>
-// You may copy this code freely under the conditions of the GPL.
-//
 
 require_once 'lib/difflib.php';
 

Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/diff3.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,12 +1,27 @@
 <?php
+/*
+ * Copyright (C) 2001 Geoffrey T. Dairiki <da...@da...>
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 // diff3.php
 //
 // A class for computing three way diffs
-//
-// Copyright (C) 2001 Geoffrey T. Dairiki <da...@da...>
-// You may copy this code freely under the conditions of the GPL.
-//
 
 require_once 'lib/difflib.php';
 

Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/difflib.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,12 +1,27 @@
 <?php
+/*
+ * Copyright (C) 2000, 2001 Geoffrey T. Dairiki <da...@da...>
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 // difflib.php
 //
 // A PHP diff engine for phpwiki.
-//
-// Copyright (C) 2000, 2001 Geoffrey T. Dairiki <da...@da...>
-// You may copy this code freely under the conditions of the GPL.
-//
 
 abstract class _DiffOp
 {

Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/display.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2004-2011 $ThePhpWikiProgrammingTeam
  *
  * This file is part of PhpWiki.

Modified: trunk/lib/install.php
===================================================================
--- trunk/lib/install.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/install.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  *

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/main.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * Copyright 1999-2008 $ThePhpWikiProgrammingTeam
  * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent

Modified: trunk/lib/pdf.php
===================================================================
--- trunk/lib/pdf.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/pdf.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * Copyright (C) 2003 Olivier PLATHEY
  * Copyright (C) 200? Don Sebà

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2016-07-12 08:17:25 UTC (rev 9877)
+++ trunk/lib/upgrade.php	2016-07-12 16:15:03 UTC (rev 9878)
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * Copyright 2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
  * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9877] trunk/lib/plugin/PhotoAlbum.php

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

Revision: 9877
          http://sourceforge.net/p/phpwiki/code/9877
Author:   vargenau
Date:     2016-07-12 08:17:25 +0000 (Tue, 12 Jul 2016)
Log Message:
-----------
array_merge needs an array

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

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2016-07-12 07:20:17 UTC (rev 9876)
+++ trunk/lib/plugin/PhotoAlbum.php	2016-07-12 08:17:25 UTC (rev 9877)
@@ -205,8 +205,8 @@
 
         // set some fixed properties for each $mode
         if ($mode == 'thumbs' || $mode == 'tiles') {
-            $attributes = array_merge($attributes, "alt");
-            $attributes = array_merge($attributes, "nowrap");
+            $attributes = array_merge($attributes, array('alt' => ''));
+            $attributes = array_merge($attributes, array('nowrap' => 'nowrap'));
             $cellwidth = 'auto'; // else cell won't nowrap
             if ($width == 'auto') $width = 70;
         } elseif ($mode == 'list') {

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

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

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

Revision: 9876
          http://sourceforge.net/p/phpwiki/code/9876
Author:   vargenau
Date:     2016-07-12 07:20:17 +0000 (Tue, 12 Jul 2016)
Log Message:
-----------
Use __construct

Modified Paths:
--------------
    trunk/lib/wikilens/RatingsDb.php
    trunk/lib/wikilens/RatingsUser.php

Modified: trunk/lib/wikilens/RatingsDb.php
===================================================================
--- trunk/lib/wikilens/RatingsDb.php	2016-07-11 15:54:50 UTC (rev 9875)
+++ trunk/lib/wikilens/RatingsDb.php	2016-07-12 07:20:17 UTC (rev 9876)
@@ -53,7 +53,7 @@
 class RatingsDb extends WikiDB
 {
 
-    function RatingsDb()
+    function __construct()
     {
         global $request;
         $this->_dbi = &$request->_dbi;

Modified: trunk/lib/wikilens/RatingsUser.php
===================================================================
--- trunk/lib/wikilens/RatingsUser.php	2016-07-11 15:54:50 UTC (rev 9875)
+++ trunk/lib/wikilens/RatingsUser.php	2016-07-12 07:20:17 UTC (rev 9876)
@@ -56,7 +56,7 @@
     public $_mean_ratings;
     public $_pearson_sims;
 
-    function RatingsUser($userid)
+    function __construct($userid)
     {
         $this->_userid = $userid;
         $this->_ratings_loaded = false;
@@ -360,7 +360,7 @@
 /** Represent a rating. */
 class _UserRating
 {
-    function _UserRating($rater, $ratee, $dimension, $rating)
+    function __construct($rater, $ratee, $dimension, $rating)
     {
         $this->rater = (string)$rater;
         $this->ratee = (string)$ratee;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9875] trunk/lib/WikiTheme.php

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

Revision: 9875
          http://sourceforge.net/p/phpwiki/code/9875
Author:   vargenau
Date:     2016-07-11 15:54:50 +0000 (Mon, 11 Jul 2016)
Log Message:
-----------
Derive ImageButton from HtmlElement instead of Button; use __construct

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

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2016-07-11 15:18:21 UTC (rev 9874)
+++ trunk/lib/WikiTheme.php	2016-07-11 15:54:50 UTC (rev 9875)
@@ -1725,17 +1725,15 @@
      * @param string $url The url (href) for the button.
      * @param string $class The CSS class for the button.
      * @param array $options  Additional attributes for the <input> tag.
-     *
-     * Do NOT replace with __construct: will break RSS icons links in RecentChanges
      */
-    function Button($text, $url, $class = '', $options = array())
+    function __construct($text, $url, $class = '', $options = array())
     {
         /**
          * @var WikiRequest $request
          */
         global $request;
 
-        $this->_init('a', array('href' => $url));
+        parent::_init('a', array('href' => $url));
         if ($class)
             $this->setAttr('class', $class);
         if (!empty($options) and is_array($options)) {
@@ -1749,13 +1747,12 @@
             $this->setAttr('rel', 'nofollow');
         $this->pushContent($GLOBALS['WikiTheme']->maybeSplitWikiWord($text));
     }
-
 }
 
 /*
  * A clickable image button.
  */
-class ImageButton extends Button
+class ImageButton extends HtmlElement
 {
     /**
      * @param string $text The text for the button.
@@ -1763,17 +1760,15 @@
      * @param string $class The CSS class for the button.
      * @param string $img_url URL for button's image.
      * @param array $img_attr array Additional attributes for the <img> tag.
-     *
-     * Do NOT replace with __construct: will break RSS icons links in RecentChanges
      */
-    function ImageButton($text, $url, $class, $img_url, $img_attr = array())
+    function __construct($text, $url, $class, $img_url, $img_attr = array())
     {
         /**
          * @var WikiRequest $request
          */
         global $request;
 
-        $this->__construct('a', array('href' => $url));
+        parent::__construct('a', array('href' => $url));
         if ($class)
             $this->setAttr('class', $class);
         // Google honors this

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9874] trunk/lib/WikiTheme.php

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

Revision: 9874
          http://sourceforge.net/p/phpwiki/code/9874
Author:   vargenau
Date:     2016-07-11 15:18:21 +0000 (Mon, 11 Jul 2016)
Log Message:
-----------
Fix Crao Sign In buttons

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

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2016-07-11 14:50:15 UTC (rev 9873)
+++ trunk/lib/WikiTheme.php	2016-07-11 15:18:21 UTC (rev 9874)
@@ -1820,7 +1820,7 @@
 /*
  * A class representing an image form <samp>submit</samp> button.
  */
-class SubmitImageButton extends SubmitButton
+class SubmitImageButton extends HtmlElement
 {
     /**
      * @param string $text The text for the button.

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