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

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

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

Revision: 10324
          http://sourceforge.net/p/phpwiki/code/10324
Author:   vargenau
Date:     2021-06-24 17:13:14 +0000 (Thu, 24 Jun 2021)
Log Message:
-----------
WikicreoleTable.php and RichTable.php: check line lenght

Modified Paths:
--------------
    trunk/lib/plugin/RichTable.php
    trunk/lib/plugin/WikicreoleTable.php

Modified: trunk/lib/plugin/RichTable.php
===================================================================
--- trunk/lib/plugin/RichTable.php	2021-06-24 12:48:16 UTC (rev 10323)
+++ trunk/lib/plugin/RichTable.php	2021-06-24 17:13:14 UTC (rev 10324)
@@ -111,18 +111,20 @@
                     $row->pushContent($cell);
                 }
                 $cell = HTML::td();
-                $line = substr($line, 1);
-                if ($line[0] == "*") {
-                    $attrs = parse_attributes(substr($line, 1));
-                    foreach ($attrs as $key => $value) {
-                        if (in_array($key, array("id", "class", "title", "style",
-                            "colspan", "rowspan", "width", "height",
-                            "bgcolor", "align", "valign"))
-                        ) {
-                            $cell->setAttr($key, $value);
+                if (strlen($line) > 1) {
+                    $line = substr($line, 1);
+                    if ($line[0] == "*") {
+                        $attrs = parse_attributes(substr($line, 1));
+                        foreach ($attrs as $key => $value) {
+                            if (in_array($key, array("id", "class", "title", "style",
+                                "colspan", "rowspan", "width", "height",
+                                "bgcolor", "align", "valign"))
+                            ) {
+                                $cell->setAttr($key, $value);
+                            }
                         }
+                        continue;
                     }
-                    continue;
                 }
             }
             if (isset($row) and isset($cell)) {

Modified: trunk/lib/plugin/WikicreoleTable.php
===================================================================
--- trunk/lib/plugin/WikicreoleTable.php	2021-06-24 12:48:16 UTC (rev 10323)
+++ trunk/lib/plugin/WikicreoleTable.php	2021-06-24 17:13:14 UTC (rev 10324)
@@ -91,7 +91,7 @@
             if ($line[strlen($line) - 1] == '|') {
                 $line = substr($line, 0, -1);
             }
-            if ($line[0] == '|') {
+            if ((strlen($line) > 0) && ($line[0] == '|')) {
                 $table[] = $this->parse_row($line);
             }
         }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10323] trunk/lib/WikiGroup.php

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

Revision: 10323
          http://sourceforge.net/p/phpwiki/code/10323
Author:   vargenau
Date:     2021-06-24 12:48:16 +0000 (Thu, 24 Jun 2021)
Log Message:
-----------
Non-static method _PassUser::getAuthDbh() should not be called statically

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

Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2021-06-24 10:30:58 UTC (rev 10322)
+++ trunk/lib/WikiGroup.php	2021-06-24 12:48:16 UTC (rev 10323)
@@ -268,7 +268,8 @@
         }
 
         /* WikiDB users from prefs (not from users): */
-        $dbi = _PassUser::getAuthDbh();
+        $user = new _PassUser();
+        $dbi = $user->getAuthDbh();
 
         if ($dbi and $dbh->getAuthParam('pref_select')) {
             //get prefs table

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

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

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

Revision: 10322
          http://sourceforge.net/p/phpwiki/code/10322
Author:   vargenau
Date:     2021-06-24 10:30:58 +0000 (Thu, 24 Jun 2021)
Log Message:
-----------
Remove undefined variable $options

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

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2021-06-23 17:46:03 UTC (rev 10321)
+++ trunk/lib/WikiDB/backend/PearDB.php	2021-06-24 10:30:58 UTC (rev 10322)
@@ -655,7 +655,7 @@
         } else {
             $result = $dbh->query($sql);
         }
-        return new WikiDB_backend_PearDB_iter($this, $result, $options);
+        return new WikiDB_backend_PearDB_iter($this, $result);
     }
 
     /*

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10321] trunk/lib/pear/Cache/Container/file.php

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

Revision: 10321
          http://sourceforge.net/p/phpwiki/code/10321
Author:   vargenau
Date:     2021-06-23 17:46:03 +0000 (Wed, 23 Jun 2021)
Log Message:
-----------
php7:notice PHP Deprecated:  Array and string offset access syntax with curly braces is deprecated

Modified Paths:
--------------
    trunk/lib/pear/Cache/Container/file.php

Modified: trunk/lib/pear/Cache/Container/file.php
===================================================================
--- trunk/lib/pear/Cache/Container/file.php	2021-06-23 17:34:31 UTC (rev 10320)
+++ trunk/lib/pear/Cache/Container/file.php	2021-06-23 17:46:03 UTC (rev 10321)
@@ -113,7 +113,7 @@
                 $this->cache_dir = realpath( getcwd() . '/' . $this->cache_dir) . '/';
 
             // check if a trailing slash is in cache_dir
-            if ($this->cache_dir{strlen($this->cache_dir)-1} != DIRECTORY_SEPARATOR)
+            if ($this->cache_dir[strlen($this->cache_dir)-1] != DIRECTORY_SEPARATOR)
                  $this->cache_dir .= '/';
 
             if  (!file_exists($this->cache_dir) || !is_dir($this->cache_dir))

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10320] trunk/lib/pear/Cache/Container/file.php

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

Revision: 10320
          http://sourceforge.net/p/phpwiki/code/10320
Author:   vargenau
Date:     2021-06-23 17:34:31 +0000 (Wed, 23 Jun 2021)
Log Message:
-----------
php7:notice PHP Deprecated:  Array and string offset access syntax with curly braces is deprecated

Modified Paths:
--------------
    trunk/lib/pear/Cache/Container/file.php

Modified: trunk/lib/pear/Cache/Container/file.php
===================================================================
--- trunk/lib/pear/Cache/Container/file.php	2021-06-23 17:28:30 UTC (rev 10319)
+++ trunk/lib/pear/Cache/Container/file.php	2021-06-23 17:34:31 UTC (rev 10320)
@@ -109,7 +109,7 @@
         if ($this->cache_dir) {
             // make relative paths absolute for use in deconstructor.
             // it looks like the deconstructor has problems with relative paths
-            if (OS_UNIX && '/' != $this->cache_dir{0}  )
+            if (OS_UNIX && '/' != $this->cache_dir[0]  )
                 $this->cache_dir = realpath( getcwd() . '/' . $this->cache_dir) . '/';
 
             // check if a trailing slash is in cache_dir

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10319] trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php

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

Revision: 10319
          http://sourceforge.net/p/phpwiki/code/10319
Author:   vargenau
Date:     2021-06-23 17:28:30 +0000 (Wed, 23 Jun 2021)
Log Message:
-----------
php7:notice PHP Deprecated:  Array and string offset access syntax with curly braces is deprecated

Modified Paths:
--------------
    trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php

Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php	2021-06-23 17:19:25 UTC (rev 10318)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php	2021-06-23 17:28:30 UTC (rev 10319)
@@ -1106,7 +1106,7 @@
 		}
 
 		// Reading string for alphabetic constants and the minus sign
-		$char = $this->_curr_expr{0};
+		$char = $this->_curr_expr[0];
 		$len_left = $chop_flg ? $this->chopExpr(1) : strlen($this->_curr_expr)-1;
 
 		// Deals with expressions of length 1
@@ -1132,4 +1132,4 @@
 			return(strlen($this->_curr_expr));
 		}
 	}
-}
\ No newline at end of file
+}

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10318] trunk/schemas/mysql-initialize.sql

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

Revision: 10318
          http://sourceforge.net/p/phpwiki/code/10318
Author:   vargenau
Date:     2021-06-23 17:19:25 +0000 (Wed, 23 Jun 2021)
Log Message:
-----------
MySQL: remove default values

Modified Paths:
--------------
    trunk/schemas/mysql-initialize.sql

Modified: trunk/schemas/mysql-initialize.sql
===================================================================
--- trunk/schemas/mysql-initialize.sql	2021-06-22 16:31:24 UTC (rev 10317)
+++ trunk/schemas/mysql-initialize.sql	2021-06-23 17:19:25 UTC (rev 10318)
@@ -2,7 +2,7 @@
 	id              INT NOT NULL AUTO_INCREMENT,
         pagename        VARCHAR(100) BINARY NOT NULL,
 	hits            INT NOT NULL DEFAULT 0,
-        pagedata        MEDIUMTEXT NOT NULL DEFAULT '',
+        pagedata        MEDIUMTEXT NOT NULL,
 -- dont add that by hand, better let action=upgrade convert your data
 	cached_html 	MEDIUMBLOB,
         PRIMARY KEY (id),
@@ -14,8 +14,8 @@
         version         INT NOT NULL,
 	mtime           INT NOT NULL,
 	minor_edit      TINYINT DEFAULT 0,
-        content         MEDIUMTEXT NOT NULL DEFAULT '',
-        versiondata     MEDIUMTEXT NOT NULL DEFAULT '',
+        content         MEDIUMTEXT NOT NULL,
+        versiondata     MEDIUMTEXT NOT NULL,
         PRIMARY KEY (id,version),
 	INDEX (mtime)
 );
@@ -66,7 +66,7 @@
 
 CREATE TABLE pref (
   	userid 	VARCHAR(48) BINARY NOT NULL UNIQUE,
-  	prefs  	TEXT NULL DEFAULT '',
+  	prefs  	TEXT NULL,
   	passwd 	VARCHAR(48) BINARY DEFAULT '',
 	groupname VARCHAR(48) BINARY DEFAULT 'users',
   	PRIMARY KEY (userid)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10317] trunk/lib/plugin/SystemInfo.php

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

Revision: 10317
          http://sourceforge.net/p/phpwiki/code/10317
Author:   vargenau
Date:     2021-06-22 16:31:24 +0000 (Tue, 22 Jun 2021)
Log Message:
-----------
lib/plugin/SystemInfo.php: wikicreole syntax

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

Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2021-06-22 16:28:07 UTC (rev 10316)
+++ trunk/lib/plugin/SystemInfo.php	2021-06-22 16:31:24 UTC (rev 10317)
@@ -88,7 +88,7 @@
         $loader = new WikiPluginLoader();
         return $loader->expandPI('<<SystemInfo '
             . WikiPluginCached::glueArgs($argarray) // all
-            . ' ?>', $request, $this, $basepage);
+            . ' >>', $request, $this, $basepage);
     }
 
     protected function getImage($dbi, $argarray, $request)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10316] trunk/lib/imagecache.php

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

Revision: 10316
          http://sourceforge.net/p/phpwiki/code/10316
Author:   vargenau
Date:     2021-06-22 16:28:07 +0000 (Tue, 22 Jun 2021)
Log Message:
-----------
Remove commented GLOBAL

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

Modified: trunk/lib/imagecache.php
===================================================================
--- trunk/lib/imagecache.php	2021-06-22 16:26:35 UTC (rev 10315)
+++ trunk/lib/imagecache.php	2021-06-22 16:28:07 UTC (rev 10316)
@@ -137,7 +137,6 @@
                     . ' obtained.)');
             return;
         }
-        //$cacheparams = $GLOBALS['CacheParams'];
         if (!preg_match(':^(.*/)?' . PLUGIN_CACHED_FILENAME_PREFIX . '([^\?/]+)\.img(\?args=([^\?&]*))?$:', $uri, $matches)) {
             $cache->printError('png', "I do not understand this URL: $uri");
             return;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10315] trunk/lib/plugin/TexToPng.php

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

Revision: 10315
          http://sourceforge.net/p/phpwiki/code/10315
Author:   vargenau
Date:     2021-06-22 16:26:35 +0000 (Tue, 22 Jun 2021)
Log Message:
-----------
Make lib/plugin/TexToPng.php work

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

Modified: trunk/lib/plugin/TexToPng.php
===================================================================
--- trunk/lib/plugin/TexToPng.php	2021-06-22 15:27:04 UTC (rev 10314)
+++ trunk/lib/plugin/TexToPng.php	2021-06-22 16:26:35 UTC (rev 10315)
@@ -39,9 +39,6 @@
  *----------------------------------------------------------------------*/
 // needs (la)tex, dvips, gs, netpbm, libpng
 // LaTeX2HTML ftp://ftp.dante.de/tex-archive/support/latex2html
-$texbin = '/usr/bin/tex';
-$dvipsbin = '/usr/bin/dvips';
-$pstoimgbin = '/usr/bin/pstoimg';
 
 // output mere debug messages (should be set to false in a stable
 // version)
@@ -266,11 +263,14 @@
 
     function TexToImg($texstr, $scale, $aalias, $transp)
     {
-        //$cacheparams = $GLOBALS['CacheParams'];
+        $texbin = '/usr/bin/tex';
+        $dvipsbin = '/usr/bin/dvips';
+        $pstoimgbin = '/usr/bin/pstoimg';
+        $cache_dir = '/tmp/cache';
         $tempfiles = $this->tempnam('TexToPng');
         $img = 0; // $size = 0;
 
-        // procuce options for pstoimg
+        // produce options for pstoimg
         $options =
             ($aalias ? '-aaliastext -color 8 ' : '-color 1 ') .
                 ($transp ? '-transparent ' : '') .
@@ -280,7 +280,7 @@
         // rely on intelligent bool interpretation
         $ok = $tempfiles &&
             $this->createTexFile($tempfiles . '.tex', $texstr) &&
-            $this->execute('cd ' . $cacheparams['cache_dir'] . '; ' .
+            $this->execute('cd ' . $cache_dir . '; ' .
                 "$texbin " . $tempfiles . '.tex', true) &&
             $this->execute("$dvipsbin -o" . $tempfiles . '.ps ' . $tempfiles . '.dvi') &&
             $this->execute("$pstoimgbin $options"

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10314] trunk/lib/plugin/GraphViz.php

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

Revision: 10314
          http://sourceforge.net/p/phpwiki/code/10314
Author:   vargenau
Date:     2021-06-22 15:27:04 +0000 (Tue, 22 Jun 2021)
Log Message:
-----------
lib/plugin/GraphViz.php: remove phpwiki.sourceforge.net and fontpath

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

Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php	2021-06-22 13:21:55 UTC (rev 10313)
+++ trunk/lib/plugin/GraphViz.php	2021-06-22 15:27:04 UTC (rev 10314)
@@ -43,19 +43,11 @@
     // Name of the Truetypefont - at least LucidaSansRegular.ttf is always present on OS X
     if (!defined('VISUALWIKIFONT'))
         define('VISUALWIKIFONT', 'LucidaSansRegular');
-    // The default font paths do not find your fonts, set the path here:
-    $fontpath = "/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts/";
-    //$fontpath = "/usr/X11R6/lib/X11/fonts/TTF/";
 } elseif (isWindows()) {
     if (!defined("GRAPHVIZ_EXE"))
         define('GRAPHVIZ_EXE', 'dot.exe');
     if (!defined('VISUALWIKIFONT'))
         define('VISUALWIKIFONT', 'Arial');
-} elseif ($_SERVER["SERVER_NAME"] == 'phpwiki.sourceforge.net') { // sf.net hack
-    if (!defined("GRAPHVIZ_EXE"))
-        define('GRAPHVIZ_EXE', '/home/groups/p/ph/phpwiki/bin/dot');
-    if (!defined('VISUALWIKIFONT'))
-        define('VISUALWIKIFONT', 'luximr');
 } else { // other os
     if (!defined("GRAPHVIZ_EXE"))
         define('GRAPHVIZ_EXE', '/usr/bin/dot');
@@ -62,11 +54,6 @@
     // Name of the Truetypefont - Helvetica is probably easier to read
     if (!defined('VISUALWIKIFONT'))
         define('VISUALWIKIFONT', 'Helvetica');
-    //define('VISUALWIKIFONT', 'Times');
-    //define('VISUALWIKIFONT', 'Arial');
-    // The default font paths do not find your fonts, set the path here:
-    //$fontpath = "/usr/X11R6/lib/X11/fonts/TTF/";
-    //$fontpath = "/usr/share/fonts/default/TrueType/";
 }
 
 require_once 'lib/WikiPluginCached.php';
@@ -74,7 +61,6 @@
 class WikiPlugin_GraphViz
     extends WikiPluginCached
 {
-
     public $_args;
     public $source;
     public $_mapfile;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10313] trunk/lib/plugin/TeX2png.php

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

Revision: 10313
          http://sourceforge.net/p/phpwiki/code/10313
Author:   vargenau
Date:     2021-06-22 13:21:55 +0000 (Tue, 22 Jun 2021)
Log Message:
-----------
lib/plugin/TeX2png.php: Check if the needed binaries are available

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

Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php	2021-06-22 09:09:11 UTC (rev 10312)
+++ trunk/lib/plugin/TeX2png.php	2021-06-22 13:21:55 UTC (rev 10313)
@@ -221,6 +221,23 @@
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
+        // Check if the needed binaries are available
+        if (!file_exists($this->latexbin)) {
+            return HTML::span(array('class' => 'error'),
+                              fmt("Cannot run %1s plugin, “%2s” does not exist",
+                                  "TeX2png", $this->latexbin));
+        }
+        if (!file_exists($this->dvipsbin)) {
+            return HTML::span(array('class' => 'error'),
+                              fmt("Cannot run %1s plugin, “%2s” does not exist",
+                                  "TeX2png", $this->dvipsbin));
+        }
+        if (!file_exists($this->pstoimgbin)) {
+            return HTML::span(array('class' => 'error'),
+                              fmt("Cannot run %1s plugin, “%2s” does not exist",
+                                  "TeX2png", $this->pstoimgbin));
+        }
+
         // if imagepath does not exist, try to create it
         if (!file_exists($this->imagepath)) {
             if (mkdir($this->imagepath, 0777, true) === 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:[10312] trunk/lib

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

Revision: 10312
          http://sourceforge.net/p/phpwiki/code/10312
Author:   vargenau
Date:     2021-06-22 09:09:11 +0000 (Tue, 22 Jun 2021)
Log Message:
-----------
Remove specific getPreferences and setPreferences for databases so that preferences work

Modified Paths:
--------------
    trunk/lib/WikiUser/AdoDb.php
    trunk/lib/WikiUser/PdoDb.php
    trunk/lib/WikiUser/PearDb.php
    trunk/lib/WikiUser.php
    trunk/lib/plugin/UserPreferences.php

Modified: trunk/lib/WikiUser/AdoDb.php
===================================================================
--- trunk/lib/WikiUser/AdoDb.php	2021-06-21 15:24:45 UTC (rev 10311)
+++ trunk/lib/WikiUser/AdoDb.php	2021-06-22 09:09:11 UTC (rev 10312)
@@ -63,83 +63,6 @@
         return $this;
     }
 
-    function getPreferences()
-    {
-        // override the generic slow method here for efficiency
-        _AnonUser::getPreferences();
-        $this->getAuthDbh();
-        if (isset($this->_prefs->_select)) {
-            $dbh = & $this->_auth_dbi;
-            $rs = $dbh->Execute(sprintf($this->_prefs->_select, $dbh->qstr($this->_userid)));
-            if ($rs->EOF) {
-                $rs->Close();
-            } else {
-                $prefs_blob = @$rs->fields['prefs'];
-                $rs->Close();
-                if ($restored_from_db = $this->_prefs->retrieve($prefs_blob)) {
-                    $this->_prefs->updatePrefs($restored_from_db);
-                    return $this->_prefs;
-                }
-            }
-        }
-        if (!empty($this->_HomePagehandle)) {
-            if ($restored_from_page = $this->_prefs->retrieve
-            ($this->_HomePagehandle->get('pref'))
-            ) {
-                $this->_prefs->updatePrefs($restored_from_page);
-                return $this->_prefs;
-            }
-        }
-        return $this->_prefs;
-    }
-
-    function setPreferences($prefs, $id_only = false)
-    {
-        // if the prefs are changed
-        if (_AnonUser::setPreferences($prefs, 1)) {
-            global $request;
-            $packed = $this->_prefs->store();
-            //$user = $request->_user;
-            //unset($user->_auth_dbi);
-            if (!$id_only and isset($this->_prefs->_update)) {
-                $this->getAuthDbh();
-                $dbh = &$this->_auth_dbi;
-                // check if the user already exists (not needed with mysql REPLACE)
-                $rs = $dbh->Execute(sprintf($this->_prefs->_select, $dbh->qstr($this->_userid)));
-                if ($rs->EOF) {
-                    $rs->Close();
-                    $prefs_blob = false;
-                } else {
-                    $prefs_blob = @$rs->fields['prefs'];
-                    $rs->Close();
-                }
-                if ($prefs_blob) {
-                    $db_result = $dbh->Execute(sprintf($this->_prefs->_update,
-                        $dbh->qstr($packed),
-                        $dbh->qstr($this->_userid)));
-                } else {
-                    // Otherwise, insert a record for them and set it to the defaults.
-                    $dbi = $request->getDbh();
-                    $this->_prefs->_insert = $this->prepare($dbi->getAuthParam('pref_insert'),
-                        array("pref_blob", "userid"));
-                    $db_result = $dbh->Execute(sprintf($this->_prefs->_insert,
-                        $dbh->qstr($packed),
-                        $dbh->qstr($this->_userid)));
-                }
-                $db_result->Close();
-                // delete pageprefs:
-                if ($this->_HomePagehandle and $this->_HomePagehandle->get('pref'))
-                    $this->_HomePagehandle->set('pref', '');
-            } else {
-                //store prefs in homepage, not in cookie
-                if ($this->_HomePagehandle and !$id_only)
-                    $this->_HomePagehandle->set('pref', $packed);
-            }
-            return count($this->_prefs->unpack($packed));
-        }
-        return 0;
-    }
-
     function userExists()
     {
         /**

Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php	2021-06-21 15:24:45 UTC (rev 10311)
+++ trunk/lib/WikiUser/PdoDb.php	2021-06-22 09:09:11 UTC (rev 10312)
@@ -62,64 +62,6 @@
         return $this;
     }
 
-    function getPreferences()
-    {
-        // override the generic slow method here for efficiency and not to
-        // clutter the homepage metadata with prefs.
-        _AnonUser::getPreferences();
-        $this->getAuthDbh();
-        if (isset($this->_prefs->_select)) {
-            $dbh = &$this->_auth_dbi;
-            $db_result = $dbh->query(sprintf($this->_prefs->_select, $dbh->quote($this->_userid)));
-            // patched by fre...@pa...
-            $prefs = $db_result->fetch(PDO::FETCH_BOTH);
-            $prefs_blob = @$prefs["prefs"];
-            if ($restored_from_db = $this->_prefs->retrieve($prefs_blob)) {
-                $this->_prefs->updatePrefs($restored_from_db);
-                return $this->_prefs;
-            }
-        }
-        if (isset($this->_HomePagehandle) && $this->_HomePagehandle) {
-            if ($restored_from_page = $this->_prefs->retrieve
-            ($this->_HomePagehandle->get('pref'))
-            ) {
-                $this->_prefs->updatePrefs($restored_from_page);
-                return $this->_prefs;
-            }
-        }
-        return $this->_prefs;
-    }
-
-    function setPreferences($prefs, $id_only = false)
-    {
-        // if the prefs are changed
-        if ($count = _AnonUser::setPreferences($prefs, 1)) {
-            $this->getAuthDbh();
-            $packed = $this->_prefs->store();
-            if (!$id_only and isset($this->_prefs->_update)) {
-                $dbh =& $this->_auth_dbi;
-                try {
-                    $sth = $dbh->prepare($this->_prefs->_update);
-                    $sth->bindParam("prefs", $packed);
-                    $sth->bindParam("user", $this->_userid);
-                    $sth->execute();
-                } catch (PDOException $e) {
-                    trigger_error("SQL Error: " . $e->getMessage(), E_USER_WARNING);
-                    return false;
-                }
-                //delete pageprefs:
-                if (isset($this->_HomePagehandle) && $this->_HomePagehandle and $this->_HomePagehandle->get('pref'))
-                    $this->_HomePagehandle->set('pref', '');
-            } else {
-                //store prefs in homepage, not in cookie
-                if (isset($this->_HomePagehandle) && $this->_HomePagehandle and !$id_only)
-                    $this->_HomePagehandle->set('pref', $packed);
-            }
-            return $count;
-        }
-        return 0;
-    }
-
     function userExists()
     {
         /**

Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php	2021-06-21 15:24:45 UTC (rev 10311)
+++ trunk/lib/WikiUser/PearDb.php	2021-06-22 09:09:11 UTC (rev 10312)
@@ -61,79 +61,6 @@
         return $this;
     }
 
-    function getPreferences()
-    {
-        // override the generic slow method here for efficiency and not to
-        // clutter the homepage metadata with prefs.
-        _AnonUser::getPreferences();
-        $this->getAuthDbh();
-        if (isset($this->_prefs->_select)) {
-            $dbh = &$this->_auth_dbi;
-            $db_result = $dbh->query(sprintf($this->_prefs->_select, $dbh->quote($this->_userid)));
-            // patched by fre...@pa...
-            $prefs = $db_result->fetchRow();
-            $prefs_blob = @$prefs["prefs"];
-            if ($restored_from_db = $this->_prefs->retrieve($prefs_blob)) {
-                $this->_prefs->updatePrefs($restored_from_db);
-                return $this->_prefs;
-            }
-        }
-        if (isset($this->_HomePagehandle) && $this->_HomePagehandle) {
-            if ($restored_from_page = $this->_prefs->retrieve
-            ($this->_HomePagehandle->get('pref'))
-            ) {
-                $this->_prefs->updatePrefs($restored_from_page);
-                return $this->_prefs;
-            }
-        }
-        return $this->_prefs;
-    }
-
-    function setPreferences($prefs, $id_only = false)
-    {
-        /**
-         * @var WikiRequest $request
-         */
-        global $request;
-
-        // if the prefs are changed
-        if ($count = _AnonUser::setPreferences($prefs, 1)) {
-            $this->getAuthDbh();
-            $packed = $this->_prefs->store();
-            if (!$id_only and isset($this->_prefs->_update)) {
-                $dbh = &$this->_auth_dbi;
-                // check if the user already exists (not needed with mysql REPLACE)
-                $db_result = $dbh->query(sprintf($this->_prefs->_select,
-                    $dbh->quote($this->_userid)));
-                $prefs = $db_result->fetchRow();
-                $prefs_blob = @$prefs["prefs"];
-                // If there are prefs for the user, update them.
-                if ($prefs_blob != "") {
-                    $dbh->simpleQuery(sprintf($this->_prefs->_update,
-                        $dbh->quote($packed),
-                        $dbh->quote($this->_userid)));
-                } else {
-                    // Otherwise, insert a record for them and set it to the defaults.
-                    // jo...@de...
-                    $dbi = $request->getDbh();
-                    $this->_prefs->_insert = $this->prepare($dbi->getAuthParam('pref_insert'),
-                        array("pref_blob", "userid"));
-                    $dbh->simpleQuery(sprintf($this->_prefs->_insert,
-                        $dbh->quote($packed), $dbh->quote($this->_userid)));
-                }
-                //delete pageprefs:
-                if (isset($this->_HomePagehandle) && $this->_HomePagehandle and $this->_HomePagehandle->get('pref'))
-                    $this->_HomePagehandle->set('pref', '');
-            } else {
-                //store prefs in homepage, not in cookie
-                if (isset($this->_HomePagehandle) && $this->_HomePagehandle and !$id_only)
-                    $this->_HomePagehandle->set('pref', $packed);
-            }
-            return $count;
-        }
-        return 0;
-    }
-
     function userExists()
     {
         /**

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2021-06-21 15:24:45 UTC (rev 10311)
+++ trunk/lib/WikiUser.php	2021-06-22 09:09:11 UTC (rev 10312)
@@ -1099,29 +1099,6 @@
 
     function getPreferences()
     {
-        if (!empty($this->_prefs->_method)) {
-            if ($this->_prefs->_method == 'ADODB') {
-                // FIXME: strange why this should be needed...
-                include_once 'lib/WikiUser/Db.php';
-                include_once 'lib/WikiUser/AdoDb.php';
-                $user = new _AdoDbPassUser();
-                $this->_prefs = $user->getPreferences();
-                return $this->_prefs;
-            } elseif ($this->_prefs->_method == 'SQL') {
-                include_once 'lib/WikiUser/Db.php';
-                include_once 'lib/WikiUser/PearDb.php';
-                $user = new _PearDbPassUser();
-                $this->_prefs = $user->getPreferences();
-                return $this->_prefs;
-            } elseif ($this->_prefs->_method == 'PDO') {
-                include_once 'lib/WikiUser/Db.php';
-                include_once 'lib/WikiUser/PdoDb.php';
-                $user = new _PdoDbPassUser();
-                $this->_prefs = $user->getPreferences();
-                return $this->_prefs;
-            }
-        }
-
         // We don't necessarily have to read the cookie first. Since
         // the user has a password, the prefs stored in the homepage
         // cannot be arbitrarily altered by other Bogo users.
@@ -1146,28 +1123,6 @@
          */
         global $request;
 
-        if (!empty($this->_prefs->_method)) {
-            if ($this->_prefs->_method == 'ADODB') {
-                // FIXME: strange why this should be needed...
-                include_once 'lib/WikiUser/Db.php';
-                include_once 'lib/WikiUser/AdoDb.php';
-                $user = new _AdoDbPassUser();
-                $this->_prefs = $user->setPreferences($prefs, $id_only);
-                return $this->_prefs;
-            } elseif ($this->_prefs->_method == 'SQL') {
-                include_once 'lib/WikiUser/Db.php';
-                include_once 'lib/WikiUser/PearDb.php';
-                $user = new _PearDbPassUser();
-                $this->_prefs = $user->setPreferences($prefs, $id_only);
-                return $this->_prefs;
-            } elseif ($this->_prefs->_method == 'PDO') {
-                include_once 'lib/WikiUser/Db.php';
-                include_once 'lib/WikiUser/PdoDb.php';
-                $user = new _PdoDbPassUser();
-                $this->_prefs = $user->setPreferences($prefs, $id_only);
-                return $this->_prefs;
-            }
-        }
         if ($updated = _AnonUser::setPreferences($prefs, $id_only)) {
             // Encode only the _prefs array of the UserPreference object
             // If no DB method exists to store the prefs we must store it in the page, not in the cookies.

Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2021-06-21 15:24:45 UTC (rev 10311)
+++ trunk/lib/plugin/UserPreferences.php	2021-06-22 09:09:11 UTC (rev 10312)
@@ -87,9 +87,8 @@
         }
         if ((!isActionPage($request->getArg('pagename'))
             and (!isset($user->_prefs->_method)
-                or !in_array($user->_prefs->_method, array('ADODB', 'SQL', 'PDO'))))
             or (in_array($request->getArg('action'), array('zip', 'ziphtml', 'dumphtml')))
-            or (is_a($user, '_ForbiddenUser'))
+            or (is_a($user, '_ForbiddenUser'))))
         ) {
             $no_args = $this->getDefaultArguments();
             $no_args['errmsg'] = HTML::p(array('class' => 'error'),

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

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

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

Revision: 10311
          http://sourceforge.net/p/phpwiki/code/10311
Author:   vargenau
Date:     2021-06-21 15:24:45 +0000 (Mon, 21 Jun 2021)
Log Message:
-----------
Add "See Also"

Modified Paths:
--------------
    trunk/pgsrc/Help%2FTeX2pngPlugin
    trunk/pgsrc/Help%2FTexToPngPlugin

Modified: trunk/pgsrc/Help%2FTeX2pngPlugin
===================================================================
--- trunk/pgsrc/Help%2FTeX2pngPlugin	2021-06-21 15:11:16 UTC (rev 10310)
+++ trunk/pgsrc/Help%2FTeX2pngPlugin	2021-06-21 15:24:45 UTC (rev 10311)
@@ -1,4 +1,4 @@
-Date: Mon, 21 Jun 2021 17:07:49 +0000
+Date: Mon, 21 Jun 2021 17:20:55 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTeX2pngPlugin;
@@ -66,6 +66,10 @@
 # Show that for all r > 0: <<TeX2png text="$$\frac{\pi}{2}\int_0^r t  e^{-t^2}\,dt \leq \int_0^r e^{-x^2}\,dx \int_0^r e^{-y^2}\,dy \leq \frac{\pi}{2} \int_0^{\sqrt{2} r} t e^{-t^2}\,dt$$">> **Help**: you can use polar coordinates.
 # Hence find the limit of <<TeX2png text="$f(x)$">> as x tends to <<TeX2png text="$\infty$">>.
 
+== See Also ==
+* [[Help:TexToPngPlugin]]
+* [[Help:text2pngPlugin]]
+
 <noinclude>
 ----
 [[PhpWikiDocumentation]] [[CategoryWikiPlugin]]

Modified: trunk/pgsrc/Help%2FTexToPngPlugin
===================================================================
--- trunk/pgsrc/Help%2FTexToPngPlugin	2021-06-21 15:11:16 UTC (rev 10310)
+++ trunk/pgsrc/Help%2FTexToPngPlugin	2021-06-21 15:24:45 UTC (rev 10311)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Mon, 21 Jun 2021 17:20:55 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTexToPngPlugin;
@@ -77,6 +77,8 @@
 * Johannes Große
 
 == See Also ==
+* [[Help:TeX2pngPlugin]]
+* [[Help:text2pngPlugin]]
 
 <noinclude>
 ----

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

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

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

Revision: 10310
          http://sourceforge.net/p/phpwiki/code/10310
Author:   vargenau
Date:     2021-06-21 15:11:16 +0000 (Mon, 21 Jun 2021)
Log Message:
-----------
pgsrc/Help%2FTeX2pngPlugin: fix LaTeX expression

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

Modified: trunk/pgsrc/Help%2FTeX2pngPlugin
===================================================================
--- trunk/pgsrc/Help%2FTeX2pngPlugin	2021-06-21 15:07:05 UTC (rev 10309)
+++ trunk/pgsrc/Help%2FTeX2pngPlugin	2021-06-21 15:11:16 UTC (rev 10310)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Mon, 21 Jun 2021 17:07:49 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTeX2pngPlugin;
@@ -64,7 +64,7 @@
 <<TeX2png text="$$f(x) = \int_0^x e^{-t^2}\,dt, x\in\mathbb R$$">>
 
 # Show that for all r > 0: <<TeX2png text="$$\frac{\pi}{2}\int_0^r t  e^{-t^2}\,dt \leq \int_0^r e^{-x^2}\,dx \int_0^r e^{-y^2}\,dy \leq \frac{\pi}{2} \int_0^{\sqrt{2} r} t e^{-t^2}\,dt$$">> **Help**: you can use polar coordinates.
-# Hence find the limit of <<TeX2png text="$f(x)$">> as x tends <<TeX2png text="to $\infty$">>.
+# Hence find the limit of <<TeX2png text="$f(x)$">> as x tends to <<TeX2png text="$\infty$">>.
 
 <noinclude>
 ----

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10309] trunk/lib/plugin/TeX2png.php

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

Revision: 10309
          http://sourceforge.net/p/phpwiki/code/10309
Author:   vargenau
Date:     2021-06-21 15:07:05 +0000 (Mon, 21 Jun 2021)
Log Message:
-----------
lib/plugin/TeX2png.php: better error messages

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

Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php	2021-06-21 14:12:30 UTC (rev 10308)
+++ trunk/lib/plugin/TeX2png.php	2021-06-21 15:07:05 UTC (rev 10309)
@@ -191,8 +191,8 @@
         // or mathematical expression is wrong
         switch ($this->isMathExp($text)) {
             case 0: // not a mathematical expression
-                $html = HTML::samp(array('class' => 'tex',
-                    'style' => 'color:red;'), $text);
+                $html = HTML::span(array('class' => 'error'),
+                                   fmt("Not a mathematical expression: “%s”", $text));
                 break;
             case 1: // an inlined mathematical expression
                 $html = HTML::img(array('class' => 'tex',
@@ -247,9 +247,11 @@
         } else {
             // we don't have png and/or gd.
             $error_html = _("Sorry, this version of PHP cannot create PNG image files.");
-            $link = "https://www.php.net/manual/en/ref.image.php";
-            $error_html .= sprintf(_("See %s"), $link) . ".";
-            return HTML::p(array('class' => 'error'), $error_html);
+            $error_html .= " ";
+            $error_html .= _("See") . _(": ");
+            $link = HTML::a(array('href' => "https://www.php.net/manual/en/ref.image.php"),
+                            "https://www.php.net/manual/en/ref.image.php") ;
+            return HTML::span(array('class' => 'error'), $error_html, $link);
         }
     }
 }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10308] trunk/lib/plugin/TeX2png.php

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

Revision: 10308
          http://sourceforge.net/p/phpwiki/code/10308
Author:   vargenau
Date:     2021-06-21 14:12:30 +0000 (Mon, 21 Jun 2021)
Log Message:
-----------
lib/plugin/TeX2png.php: fix man page URL

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

Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php	2021-06-21 14:10:17 UTC (rev 10307)
+++ trunk/lib/plugin/TeX2png.php	2021-06-21 14:12:30 UTC (rev 10308)
@@ -247,7 +247,7 @@
         } else {
             // we don't have png and/or gd.
             $error_html = _("Sorry, this version of PHP cannot create PNG image files.");
-            $link = "http://www.php.net/manual/pl/ref.image.php";
+            $link = "https://www.php.net/manual/en/ref.image.php";
             $error_html .= sprintf(_("See %s"), $link) . ".";
             return HTML::p(array('class' => 'error'), $error_html);
         }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10307] trunk/lib/plugin/TeX2png.php

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

Revision: 10307
          http://sourceforge.net/p/phpwiki/code/10307
Author:   vargenau
Date:     2021-06-21 14:10:17 +0000 (Mon, 21 Jun 2021)
Log Message:
-----------
lib/plugin/TeX2png.php: add class "error"

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

Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php	2021-06-21 14:00:15 UTC (rev 10306)
+++ trunk/lib/plugin/TeX2png.php	2021-06-21 14:10:17 UTC (rev 10307)
@@ -224,16 +224,19 @@
         // if imagepath does not exist, try to create it
         if (!file_exists($this->imagepath)) {
             if (mkdir($this->imagepath, 0777, true) === false) {
-                return HTML::p(fmt("Cannot create directory “%s”", $this->imagepath));
+                return HTML::span(array('class' => 'error'),
+                                  fmt("Cannot create directory “%s”", $this->imagepath));
             }
         }
 
         // imagepath exists, check is a directory and is writable
         if (!is_dir($this->imagepath)) {
-            return HTML::p(fmt("“%s” must be a directory", $this->imagepath));
+            return HTML::span(array('class' => 'error'),
+                              fmt("“%s” must be a directory", $this->imagepath));
         }
         if (!is_writable($this->imagepath)) {
-            return HTML::p(fmt("“%s” must be a writable", $this->imagepath));
+            return HTML::span(array('class' => 'error'),
+                              fmt("“%s” must be a writable", $this->imagepath));
         }
 
         // from text2png.php
@@ -246,7 +249,7 @@
             $error_html = _("Sorry, this version of PHP cannot create PNG image files.");
             $link = "http://www.php.net/manual/pl/ref.image.php";
             $error_html .= sprintf(_("See %s"), $link) . ".";
-            return HTML::p($error_html);
+            return HTML::p(array('class' => 'error'), $error_html);
         }
     }
 }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10306] trunk/lib/plugin/TeX2png.php

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

Revision: 10306
          http://sourceforge.net/p/phpwiki/code/10306
Author:   vargenau
Date:     2021-06-21 14:00:15 +0000 (Mon, 21 Jun 2021)
Log Message:
-----------
Make lib/plugin/TeX2png.php work: escape \e; better test imagepath; fix image URL

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

Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php	2021-06-21 11:30:30 UTC (rev 10305)
+++ trunk/lib/plugin/TeX2png.php	2021-06-21 14:00:15 UTC (rev 10306)
@@ -118,10 +118,9 @@
         $str .= "\pagestyle{empty}\n";
         $str .= "\begin{document}\n";
         $str .= $text . "\n";
-        $str .= "\\end{document}"; // need to escape \e that is escape character
+        $str .= "\\end{document}\n"; // need to escape \e that is escape character
         fwrite($fp, $str);
         fclose($fp);
-        return 0;
     }
 
     function createPngFile($imagepath, $imagename)
@@ -141,13 +140,13 @@
             exec("cd $imagepath;$commandes");
             unlink("$imagepath/temp.dvi");
             unlink("$imagepath/temp.ps");
-        } else
+        } else {
             echo _(" (syntax error for latex) ");
+        }
         // to clean the directory
         unlink("$imagepath/temp.tex");
         unlink("$imagepath/temp.aux");
         unlink("$imagepath/temp.log");
-        return 0;
     }
 
     function isMathExp(&$text)
@@ -175,7 +174,7 @@
     {
         // the name of the png cached file
         $imagename = md5($text) . ".png";
-        $url = $this->imagepath . "/$imagename";
+        $url = '/' . $this->imagepath . "/$imagename";
 
         if (!file_exists($url)) {
             if (is_writable($this->imagepath)) {
@@ -222,6 +221,21 @@
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
+        // if imagepath does not exist, try to create it
+        if (!file_exists($this->imagepath)) {
+            if (mkdir($this->imagepath, 0777, true) === false) {
+                return HTML::p(fmt("Cannot create directory “%s”", $this->imagepath));
+            }
+        }
+
+        // imagepath exists, check is a directory and is writable
+        if (!is_dir($this->imagepath)) {
+            return HTML::p(fmt("“%s” must be a directory", $this->imagepath));
+        }
+        if (!is_writable($this->imagepath)) {
+            return HTML::p(fmt("“%s” must be a writable", $this->imagepath));
+        }
+
         // from text2png.php
         if (imagetypes() & IMG_PNG) {
             // we have gd & png so go ahead.
@@ -232,7 +246,6 @@
             $error_html = _("Sorry, this version of PHP cannot create PNG image files.");
             $link = "http://www.php.net/manual/pl/ref.image.php";
             $error_html .= sprintf(_("See %s"), $link) . ".";
-            trigger_error($error_html);
             return HTML::p($error_html);
         }
     }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10305] trunk/lib/plugin/TeX2png.php

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

Revision: 10305
          http://sourceforge.net/p/phpwiki/code/10305
Author:   vargenau
Date:     2021-06-21 11:30:30 +0000 (Mon, 21 Jun 2021)
Log Message:
-----------
lib/plugin/TeX2png.php: need to escape \e that is escape character

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

Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php	2021-06-17 17:42:17 UTC (rev 10304)
+++ trunk/lib/plugin/TeX2png.php	2021-06-21 11:30:30 UTC (rev 10305)
@@ -113,12 +113,12 @@
         $str = "\documentclass{article}\n";
         $str .= "\usepackage{amsfonts}\n";
         $str .= "\usepackage{amssymb}\n";
-        // Here tou can add some package in order
+        // Here you can add some package in order
         // to produce more sophisticated output
         $str .= "\pagestyle{empty}\n";
         $str .= "\begin{document}\n";
         $str .= $text . "\n";
-        $str .= "\end{document}";
+        $str .= "\\end{document}"; // need to escape \e that is escape character
         fwrite($fp, $str);
         fclose($fp);
         return 0;

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

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

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

Revision: 10304
          http://sourceforge.net/p/phpwiki/code/10304
Author:   vargenau
Date:     2021-06-17 17:42:17 +0000 (Thu, 17 Jun 2021)
Log Message:
-----------
default arguments not needed

Modified Paths:
--------------
    trunk/lib/plugin/CalendarList.php
    trunk/lib/plugin/CreatePage.php
    trunk/lib/plugin/DebugBackendInfo.php
    trunk/lib/plugin/FullTextSearch.php
    trunk/lib/plugin/ModeratedPage.php
    trunk/lib/plugin/VisualWiki.php
    trunk/lib/plugin/WantedPages.php
    trunk/lib/plugin/WhoIsOnline.php

Modified: trunk/lib/plugin/CalendarList.php
===================================================================
--- trunk/lib/plugin/CalendarList.php	2021-06-17 17:36:01 UTC (rev 10303)
+++ trunk/lib/plugin/CalendarList.php	2021-06-17 17:42:17 UTC (rev 10304)
@@ -199,7 +199,7 @@
             $end = $base + ($args['next_n_days'] * 24 * 3600.0);
         } elseif ($args['last_n']) {
             // get date for next nth event
-            $end = $this->_count_events($dbi, $args['next_n'], 1);
+            $end = $this->_count_events($dbi, $args['next_n']);
         } else {
             // trick to get last day of requested month
             $end = mktime(0, 0, -1, // h, m, s

Modified: trunk/lib/plugin/CreatePage.php
===================================================================
--- trunk/lib/plugin/CreatePage.php	2021-06-17 17:36:01 UTC (rev 10303)
+++ trunk/lib/plugin/CreatePage.php	2021-06-17 17:42:17 UTC (rev 10304)
@@ -157,6 +157,6 @@
                 $page->save($content, $version + 1, $meta);
             }
         }
-        return HTML($request->redirect($url, true));
+        return HTML($request->redirect($url));
     }
 }

Modified: trunk/lib/plugin/DebugBackendInfo.php
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php	2021-06-17 17:36:01 UTC (rev 10303)
+++ trunk/lib/plugin/DebugBackendInfo.php	2021-06-17 17:42:17 UTC (rev 10304)
@@ -117,7 +117,7 @@
             while ($rel = $relations->next())
                 $table->pushContent($this->_showhash(false, $rel));
         }
-        $linkdata = $backend->get_links($page, true);
+        $linkdata = $backend->get_links($page);
         if ($linkdata->count())
             $table->pushContent($this->_showhash("get_backlinks('$page')", $linkdata->asArray()));
 

Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2021-06-17 17:36:01 UTC (rev 10303)
+++ trunk/lib/plugin/FullTextSearch.php	2021-06-17 17:42:17 UTC (rev 10304)
@@ -209,7 +209,7 @@
     {
         $pagename = $page_handle->getName();
         $count = count($this->parentobj->_wpagelist[$pagename]);
-        return LinkURL(WikiURL($page_handle, array('action' => 'BackLinks'), false),
+        return LinkURL(WikiURL($page_handle, array('action' => 'BackLinks')),
             fmt("(%d Links)", $count));
     }
 }

Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php	2021-06-17 17:36:01 UTC (rev 10303)
+++ trunk/lib/plugin/ModeratedPage.php	2021-06-17 17:42:17 UTC (rev 10304)
@@ -347,7 +347,7 @@
             //                              timestamp,user(obj)+userid
             // handle $moderated['data'][$id]['args']['action']
         } else {
-            return $this->approval_form($request, $args, $moderation, 'approve');
+            return $this->approval_form($request, $args, $moderation);
         }
         return '';
     }
@@ -428,7 +428,7 @@
         if ($moderation['args']['action'] == 'edit') {
             $pagename = $moderation['args']['pagename'];
             $p = $request->_dbi->getPage($pagename);
-            $rev = $p->getCurrentRevision(true);
+            $rev = $p->getCurrentRevision();
             $curr_content = $rev->getPackedContent();
             $new_content = $moderation['args']['edit']['content'];
             include_once 'lib/difflib.php';

Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php	2021-06-17 17:36:01 UTC (rev 10303)
+++ trunk/lib/plugin/VisualWiki.php	2021-06-17 17:42:17 UTC (rev 10304)
@@ -319,7 +319,7 @@
 
             // false = get links from actual page
             // true  = get links to actual page ("backlinks")
-            $backlinks = $page->getLinks(true);
+            $backlinks = $page->getLinks();
             unset($bconnection);
             $bconnection = array();
             while ($blink = $backlinks->next()) {

Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php	2021-06-17 17:36:01 UTC (rev 10303)
+++ trunk/lib/plugin/WantedPages.php	2021-06-17 17:42:17 UTC (rev 10304)
@@ -205,7 +205,7 @@
     {
         $pagename = $page_handle->getName();
         $count = count($this->parentobj->_wpagelist[$pagename]);
-        return LinkURL(WikiURL($page, array('action' => 'BackLinks'), false),
+        return LinkURL(WikiURL($page, array('action' => 'BackLinks')),
             fmt("(%d Links)", $count));
     }
 }

Modified: trunk/lib/plugin/WhoIsOnline.php
===================================================================
--- trunk/lib/plugin/WhoIsOnline.php	2021-06-17 17:36:01 UTC (rev 10303)
+++ trunk/lib/plugin/WhoIsOnline.php	2021-06-17 17:42:17 UTC (rev 10304)
@@ -87,7 +87,7 @@
     function box($args = '', $request = null, $basepage = '')
     {
         if (!$request) $request =& $GLOBALS['request'];
-        $stats = $this->getStats($request->_dbi, $request, 'summary');
+        $stats = $this->getStats($request->_dbi, $request);
         return $this->makeBox(_("Who is Online"),
             HTML(HTML::ul(HTML::li(
                 WikiLink(_("WhoIsOnline"), 'auto',

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

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

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

Revision: 10303
          http://sourceforge.net/p/phpwiki/code/10303
Author:   vargenau
Date:     2021-06-17 17:36:01 +0000 (Thu, 17 Jun 2021)
Log Message:
-----------
getPlugin has second argument default false

Modified Paths:
--------------
    trunk/SOAP.php
    trunk/lib/WikiDB.php
    trunk/lib/XmlRpcServer.php
    trunk/lib/editpage.php
    trunk/lib/plugin/PluginManager.php
    trunk/lib/plugin/SiteMap.php
    trunk/lib/plugin/WikiFormRich.php

Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php	2021-06-17 17:24:11 UTC (rev 10302)
+++ trunk/SOAP.php	2021-06-17 17:36:01 UTC (rev 10303)
@@ -279,7 +279,7 @@
             $w = new WikiPluginLoader();
             foreach ($plugins as $plugin) {
                 $pluginName = str_replace(".php", "", $plugin);
-                $p = $w->getPlugin($pluginName, false); // second arg?
+                $p = $w->getPlugin($pluginName);
                 // trap php files which aren't WikiPlugin~s: wikiplugin + wikiplugin_cached only
                 if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
                     $RetArray[] = $pluginName;
@@ -296,7 +296,7 @@
         require_once 'lib/WikiPlugin.php';
         $w = new WikiPluginLoader();
         $synopsis = '';
-        $p = $w->getPlugin($pluginname, false); // second arg?
+        $p = $w->getPlugin($pluginname);
         // trap php files which aren't WikiPlugin~s: wikiplugin + wikiplugin_cached only
         if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
             $plugin_args = '';
@@ -320,7 +320,7 @@
         $basepage = '';
         require_once 'lib/WikiPlugin.php';
         $w = new WikiPluginLoader();
-        $p = $w->getPlugin($pluginname, false); // second arg?
+        $p = $w->getPlugin($pluginname);
         $pagelist = $p->run($dbi, $plugin_args, $request, $basepage);
         $pages = array();
         if (is_object($pagelist) and is_a($pagelist, 'PageList')) {

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2021-06-17 17:24:11 UTC (rev 10302)
+++ trunk/lib/WikiDB.php	2021-06-17 17:36:01 UTC (rev 10303)
@@ -1139,7 +1139,7 @@
         ) {
             require_once 'lib/WikiPlugin.php';
             $w = new WikiPluginLoader();
-            $p = $w->getPlugin("RecentChangesCached", false);
+            $p = $w->getPlugin("RecentChangesCached");
             $p->box_update(false, $request, $this->_pagename);
         }
         return $newrevision;

Modified: trunk/lib/XmlRpcServer.php
===================================================================
--- trunk/lib/XmlRpcServer.php	2021-06-17 17:24:11 UTC (rev 10302)
+++ trunk/lib/XmlRpcServer.php	2021-06-17 17:36:01 UTC (rev 10303)
@@ -709,7 +709,7 @@
         $w = new WikiPluginLoader();
         foreach ($plugins as $plugin) {
             $pluginName = str_replace(".php", "", $plugin);
-            $p = $w->getPlugin($pluginName, false); // second arg?
+            $p = $w->getPlugin($pluginName);
             // trap php files which aren't WikiPlugin~s: wikiplugin + wikiplugin_cached only
             if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
                 $RetArray[] = short_string($pluginName);
@@ -740,7 +740,7 @@
     require_once 'lib/WikiPlugin.php';
     $w = new WikiPluginLoader();
     $synopsis = '';
-    $p = $w->getPlugin($pluginName, false); // second arg?
+    $p = $w->getPlugin($pluginName);
     // trap php files which aren't WikiPlugin~s: wikiplugin + wikiplugin_cached only
     if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
         $plugin_args = '';
@@ -782,7 +782,7 @@
     $basepage = ''; //$pluginName;
     require_once 'lib/WikiPlugin.php';
     $w = new WikiPluginLoader();
-    $p = $w->getPlugin($pluginName, false); // second arg?
+    $p = $w->getPlugin($pluginName);
     $pagelist = $p->run($dbi, $plugin_args, $request, $basepage);
     $list = array();
     if (is_object($pagelist) and is_a($pagelist, 'PageList')) {

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2021-06-17 17:24:11 UTC (rev 10302)
+++ trunk/lib/editpage.php	2021-06-17 17:36:01 UTC (rev 10303)
@@ -880,7 +880,7 @@
             foreach ($plugins as $plugin) {
                 $pluginName = str_replace(".php", "", $plugin);
                 if (in_array($pluginName, $AllAllowedPlugins)) {
-                    $p = $w->getPlugin($pluginName, false); // second arg?
+                    $p = $w->getPlugin($pluginName);
                     // trap php files which aren't WikiPlugin~s
                     if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
                         $plugin_args = '';

Modified: trunk/lib/plugin/PluginManager.php
===================================================================
--- trunk/lib/plugin/PluginManager.php	2021-06-17 17:24:11 UTC (rev 10302)
+++ trunk/lib/plugin/PluginManager.php	2021-06-17 17:36:01 UTC (rev 10303)
@@ -109,8 +109,8 @@
                 continue;
             }
             // instantiate a plugin
-            $temppluginclass = '<' . "? plugin $pluginName ?>"; // hackish
-            $p = $w->getPlugin($pluginName, false); // second arg?
+            $temppluginclass = '<' . "? plugin $pluginName ?" . '>'; // hackish
+            $p = $w->getPlugin($pluginName);
             // trap php files which aren't WikiPlugin~s
             if (!strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
                 // Security: Hide names of extraneous files within
@@ -157,7 +157,7 @@
             }
 
             if (defined('FUSIONFORGE') && FUSIONFORGE) {
-                $pluginDocPageNamelink = WikiLink($pluginDocPageName, 'known');
+                $pluginDocPageNamelink = WikiLink($pluginDocPageName);
             }
 
             // highlight alternate rows

Modified: trunk/lib/plugin/SiteMap.php
===================================================================
--- trunk/lib/plugin/SiteMap.php	2021-06-17 17:24:11 UTC (rev 10302)
+++ trunk/lib/plugin/SiteMap.php	2021-06-17 17:36:01 UTC (rev 10303)
@@ -201,7 +201,7 @@
             if (!is_string($includepages))
                 $includepages = ' '; // avoid plugin loader problems
             $loader = new WikiPluginLoader();
-            $plugin = $loader->getPlugin(!empty($dtree) ? 'DynamicIncludePage' : 'IncludePage', false);
+            $plugin = $loader->getPlugin(!empty($dtree) ? 'DynamicIncludePage' : 'IncludePage');
             $nothing = '';
         }
 

Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php	2021-06-17 17:24:11 UTC (rev 10302)
+++ trunk/lib/plugin/WikiFormRich.php	2021-06-17 17:36:01 UTC (rev 10303)
@@ -366,7 +366,7 @@
                     $basepage = '';
                     require_once 'lib/WikiPlugin.php';
                     $w = new WikiPluginLoader();
-                    $p = $w->getPlugin($pluginName, false); // second arg?
+                    $p = $w->getPlugin($pluginName);
                     if (!is_object($p))
                         trigger_error("invalid input['method'] " . $input['method'], E_USER_WARNING);
                     $pagelist = $p->run($dbi, @$input['args'], $request, $basepage);

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

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

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

Revision: 10302
          http://sourceforge.net/p/phpwiki/code/10302
Author:   vargenau
Date:     2021-06-17 17:24:11 +0000 (Thu, 17 Jun 2021)
Log Message:
-----------
function Button has default false

Modified Paths:
--------------
    trunk/lib/plugin/EditMetaData.php
    trunk/lib/plugin/GoTo.php
    trunk/lib/plugin/LinkSearch.php
    trunk/lib/plugin/SemanticSearch.php
    trunk/lib/plugin/SemanticSearchAdvanced.php

Modified: trunk/lib/plugin/EditMetaData.php
===================================================================
--- trunk/lib/plugin/EditMetaData.php	2021-06-17 17:17:35 UTC (rev 10301)
+++ trunk/lib/plugin/EditMetaData.php	2021-06-17 17:24:11 UTC (rev 10302)
@@ -143,7 +143,7 @@
             $instructions = _("Add or change a page-level metadata 'key=>value' pair. Note that you can remove a key by leaving the value-box empty.");
             $keyfield = HTML::input(array('name' => 'metafield'), '');
             $valfield = HTML::input(array('name' => 'metavalue'), '');
-            $button = Button('submit:metaedit', _("Submit"), false);
+            $button = Button('submit:metaedit', _("Submit"));
             $form = HTML::form(array('action' => $action,
                     'method' => 'post',
                     'accept-charset' => 'UTF-8'),

Modified: trunk/lib/plugin/GoTo.php
===================================================================
--- trunk/lib/plugin/GoTo.php	2021-06-17 17:17:35 UTC (rev 10301)
+++ trunk/lib/plugin/GoTo.php	2021-06-17 17:24:11 UTC (rev 10302)
@@ -83,7 +83,7 @@
             'size' => $size,
             'name' => 'goto[target]'));
 
-        $button = Button('submit:goto[go]', _("Go"), false);
+        $button = Button('submit:goto[go]', _("Go"));
 
         $form->pushContent($textfield, $button);
 

Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php	2021-06-17 17:17:35 UTC (rev 10301)
+++ trunk/lib/plugin/LinkSearch.php	2021-06-17 17:24:11 UTC (rev 10302)
@@ -110,7 +110,7 @@
         $direction->pushContent(HTML::option($out, _("outgoing")));
         $direction->pushContent(HTML::option($in, _("incoming")));
         */
-        $submit = Button('submit:search', _("LinkSearch"), false);
+        $submit = Button('submit:search', _("LinkSearch"));
         $instructions = _("Search in pages for links with the matching name.");
         $form = HTML::form(array('action' => $action,
                 'method' => 'get',

Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php	2021-06-17 17:17:35 UTC (rev 10301)
+++ trunk/lib/plugin/SemanticSearch.php	2021-06-17 17:24:11 UTC (rev 10302)
@@ -124,7 +124,7 @@
             'autocomplete_matchsubstring' => 'true',
             'autocomplete_list' => 'xmlrpc:wiki.titleSearch ^[S] 4'
         ), '');
-        $relsubmit = Button('submit:semsearch[relations]', _("Relations"), false);
+        $relsubmit = Button('submit:semsearch[relations]', _("Relations"));
         // just testing some dhtml... not yet done
         $enhancements = HTML();
         $nbsp = HTML::raw(' ');
@@ -214,7 +214,7 @@
                 'title' => _("Add an OR query")));
         if (DEBUG)
             $enhancements = HTML::span($andbutton, $nbsp, $orbutton);
-        $attsubmit = Button('submit:semsearch[attributes]', _("Attributes"), false);
+        $attsubmit = Button('submit:semsearch[attributes]', _("Attributes"));
         $instructions = HTML::span(_("Search in pages for an attribute with that numeric value."), "\n");
         if (DEBUG)
             $instructions->pushContent

Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php	2021-06-17 17:17:35 UTC (rev 10301)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php	2021-06-17 17:24:11 UTC (rev 10302)
@@ -95,7 +95,7 @@
             'autocomplete_matchsubstring' => 'false',
             'autocomplete_list' => 'xmlrpc:wiki.titleSearch ^[S] 4'
         ), '');
-        $help = Button('submit:semsearch[help]', "?", false);
+        $help = Button('submit:semsearch[help]', "?");
         $svalues = empty($allrelations) ? "" : join("','", $allrelations);
         $reldef = JavaScript("var semsearch_relations = new Array('" . $svalues . "')");
         $querybox = HTML::textarea(array('name' => 's',

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

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

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

Revision: 10301
          http://sourceforge.net/p/phpwiki/code/10301
Author:   vargenau
Date:     2021-06-17 17:17:35 +0000 (Thu, 17 Jun 2021)
Log Message:
-----------
wikiblog is the default value

Modified Paths:
--------------
    trunk/lib/plugin/BlogArchives.php
    trunk/lib/plugin/BlogJournal.php
    trunk/lib/plugin/WikiBlog.php

Modified: trunk/lib/plugin/BlogArchives.php
===================================================================
--- trunk/lib/plugin/BlogArchives.php	2021-06-17 17:09:18 UTC (rev 10300)
+++ trunk/lib/plugin/BlogArchives.php	2021-06-17 17:17:35 UTC (rev 10301)
@@ -93,7 +93,7 @@
         //    unset($pagelist->_columns['pagename']);
 
         if (!empty($args['month'])) {
-            $prefix = $parent . $this->blogPrefix('wikiblog') . '/' . $args['month'];
+            $prefix = $parent . $this->blogPrefix() . '/' . $args['month'];
             $pages = $dbi->titleSearch(new TextSearchQuery("^" . $prefix, true, 'posix'));
             $html = HTML::ul();
             while ($page = $pages->next()) {
@@ -109,7 +109,7 @@
                 return $html;
         }
 
-        $blogs = $this->findBlogs($dbi, $args['user'], 'wikiblog');
+        $blogs = $this->findBlogs($dbi, $args['user']);
         if ($blogs) {
             if (!$basepage) $basepage = _("BlogArchives");
             $html = HTML::ul();

Modified: trunk/lib/plugin/BlogJournal.php
===================================================================
--- trunk/lib/plugin/BlogJournal.php	2021-06-17 17:09:18 UTC (rev 10300)
+++ trunk/lib/plugin/BlogJournal.php	2021-06-17 17:17:35 UTC (rev 10301)
@@ -84,7 +84,7 @@
         }
         $parent = (empty($args['user']) ? '' : $args['user'] . '/');
 
-        $prefix = $base = $parent . $this->blogPrefix('wikiblog');
+        $prefix = $base = $parent . $this->blogPrefix();
         if ($args['month'])
             $prefix .= ('/' . $args['month']);
         $pages = $dbi->titleSearch(new TextSearchQuery("^" . $prefix . '/', true, 'posix'));

Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php	2021-06-17 17:09:18 UTC (rev 10300)
+++ trunk/lib/plugin/WikiBlog.php	2021-06-17 17:17:35 UTC (rev 10301)
@@ -104,7 +104,7 @@
         $request->setArg("edit", false);
 
         if ($request->isPost() and !empty($blog['save'])) {
-            $this->add($request, $blog, 'wikiblog'); // noreturn
+            $this->add($request, $blog); // noreturn
         }
         //TODO: preview
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10300] trunk/lib/plugin/AllPages.php

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

Revision: 10300
          http://sourceforge.net/p/phpwiki/code/10300
Author:   vargenau
Date:     2021-06-17 17:09:18 +0000 (Thu, 17 Jun 2021)
Log Message:
-----------
PageList functions have empty default limit

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

Modified: trunk/lib/plugin/AllPages.php
===================================================================
--- trunk/lib/plugin/AllPages.php	2021-06-17 16:39:59 UTC (rev 10299)
+++ trunk/lib/plugin/AllPages.php	2021-06-17 17:09:18 UTC (rev 10300)
@@ -108,11 +108,11 @@
         $caption = _("All pages in this wiki (%d total):");
 
         if ($userpages) {
-            $pages = PageList::allUserPages($include_empty, $args['sortby'], '');
+            $pages = PageList::allUserPages($include_empty, $args['sortby']);
             $caption = _("List of user-created pages (%d total):");
             $args['count'] = count($pages);
         } elseif (!empty($args['owner'])) {
-            $pages = PageList::allPagesByOwner($args['owner'], $include_empty, $args['sortby'], '');
+            $pages = PageList::allPagesByOwner($args['owner'], $include_empty, $args['sortby']);
             $args['count'] = count($pages);
             $caption = fmt("List of pages owned by %s (%d total):",
                 WikiLink($args['owner'] == '[]'
@@ -120,7 +120,7 @@
                         : $args['owner'],
                     'if_known'), $args['count']);
         } elseif (!empty($args['author'])) {
-            $pages = PageList::allPagesByAuthor($args['author'], $include_empty, $args['sortby'], '');
+            $pages = PageList::allPagesByAuthor($args['author'], $include_empty, $args['sortby']);
             $args['count'] = count($pages);
             $caption = fmt("List of pages last edited by %s (%d total):",
                 WikiLink($args['author'] == '[]'
@@ -128,7 +128,7 @@
                         : $args['author'],
                     'if_known'), $args['count']);
         } elseif (!empty($args['creator'])) {
-            $pages = PageList::allPagesByCreator($args['creator'], $include_empty, $args['sortby'], '');
+            $pages = PageList::allPagesByCreator($args['creator'], $include_empty, $args['sortby']);
             $args['count'] = count($pages);
             $caption = fmt("List of pages created by %s (%d total):",
                 WikiLink($args['creator'] == '[]'

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