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

[phpwiki-checkins] SF.net SVN: phpwiki:[10625] trunk/lib/main.php

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

Revision: 10625
          http://sourceforge.net/p/phpwiki/code/10625
Author:   vargenau
Date:     2021-10-11 13:04:06 +0000 (Mon, 11 Oct 2021)
Log Message:
-----------
Add braces

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

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2021-10-11 12:55:31 UTC (rev 10624)
+++ trunk/lib/main.php	2021-10-11 13:04:06 UTC (rev 10625)
@@ -488,8 +488,9 @@
         // check the user's language prefs too at this point; this
         // would be a situation which is not really handled with the
         // current code.
-        if (empty($GLOBALS['LANG']))
+        if (empty($GLOBALS['LANG'])) {
             update_locale(DEFAULT_LANGUAGE);
+        }
 
         // User does not have required authority.  Prompt for login.
         $action = $this->getArg('action');
@@ -529,19 +530,16 @@
         } elseif ($require_level == WIKIAUTH_USER) {
             // LoginForm should display the relevant messages...
             $msg = "";
-            /*if (!ALLOW_ANON_USER)
-                $msg = fmt("You must log in first to %s", $what);
-            else
-                $msg = fmt("You must log in to %s.", $what);
-            */
-        } elseif ($require_level == WIKIAUTH_ANON)
-            $msg = fmt("Access for you is forbidden to %s.", $what); else
+        } elseif ($require_level == WIKIAUTH_ANON) {
+            $msg = fmt("Access for you is forbidden to %s.", $what);
+        } else {
             $msg = fmt("You must be an administrator to %s.", $what);
+        }
 
-        $this->_user->PrintLoginForm($this, compact('require_level', 'pass_required'),
-            $msg);
-        if (!$GLOBALS['WikiTheme']->DUMP_MODE)
+        $this->_user->PrintLoginForm($this, compact('require_level', 'pass_required'), $msg);
+        if (!$GLOBALS['WikiTheme']->DUMP_MODE) {
             $this->finish(); // NORETURN
+        }
     }
 
     // Fixme: for PagePermissions we'll need other strings,
@@ -573,10 +571,11 @@
                 'ziphtml' => _("download a HTML ZIP dump from this wiki")
             );
         }
-        if (in_array($action, array_keys($actionDescriptions)))
+        if (in_array($action, array_keys($actionDescriptions))) {
             return $actionDescriptions[$action];
-        else
+        } else {
             return _("use") . " " . $action;
+        }
     }
 
     /**

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10624] trunk/lib/main.php

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

Revision: 10624
          http://sourceforge.net/p/phpwiki/code/10624
Author:   vargenau
Date:     2021-10-11 12:55:31 +0000 (Mon, 11 Oct 2021)
Log Message:
-----------
Improve error_reporting()

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

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2021-10-11 10:18:58 UTC (rev 10623)
+++ trunk/lib/main.php	2021-10-11 12:55:31 UTC (rev 10624)
@@ -86,9 +86,6 @@
                     . $dbi->getParam('db_session_table'));
         }
 
-// Fixme: Does pear reset the error mask to 1? We have to find the culprit
-//$x = error_reporting();
-
         parent::__construct(); // [90ms]
 
         // Normalize args...
@@ -1468,12 +1465,19 @@
     $request->finish();
 }
 
-if ((!(defined('FUSIONFORGE') && FUSIONFORGE)) || (forge_get_config('installation_environment') != 'production')) {
-    if (defined('E_STRICT') and (E_ALL & E_STRICT)) // strict php5?
-        error_reporting(E_ALL & ~E_STRICT); // exclude E_STRICT
-    else
-        error_reporting(E_ALL); // php4
-} else {
+if (defined('FUSIONFORGE') && FUSIONFORGE) {
+    if (forge_get_config('installation_environment') == 'production') {
+        // Do not display warnings
+        error_reporting(E_ERROR);
+    } else {
+        // Display warnings
+        error_reporting(E_ALL);
+   }
+} elseif (DEBUG) {
+    // Display warnings
+    error_reporting(E_ALL);
+} else  {
+    // Do not display warnings
     error_reporting(E_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:[10623] trunk/lib/plugin/LdapSearch.php

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

Revision: 10623
          http://sourceforge.net/p/phpwiki/code/10623
Author:   vargenau
Date:     2021-10-11 10:18:58 +0000 (Mon, 11 Oct 2021)
Log Message:
-----------
lib/plugin/LdapSearch.php: check function {U+201C}ldap_connect{U+201D} is installed

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

Modified: trunk/lib/plugin/LdapSearch.php
===================================================================
--- trunk/lib/plugin/LdapSearch.php	2021-10-06 17:20:43 UTC (rev 10622)
+++ trunk/lib/plugin/LdapSearch.php	2021-10-11 10:18:58 UTC (rev 10623)
@@ -79,12 +79,15 @@
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
-
         global $WikiTheme;
         if ($WikiTheme->DUMP_MODE) {
             return HTML::p();
         }
 
+        if (!function_exists('ldap_connect')) {
+            return HTML::p(array('class' => "error"), _("Error: PHP function “ldap_connect” is not installed."));
+        }
+
         $args = $this->getArgs($argstr, $request);
         extract($args);
         //include_once("lib/WikiUser/LDAP.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:[10622] trunk/lib/WikiDB/backend/dumb/ TextSearchIter.php

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

Revision: 10622
          http://sourceforge.net/p/phpwiki/code/10622
Author:   vargenau
Date:     2021-10-06 17:20:43 +0000 (Wed, 06 Oct 2021)
Log Message:
-----------
public $stoplisted

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

Modified: trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/TextSearchIter.php	2021-10-06 16:03:44 UTC (rev 10621)
+++ trunk/lib/WikiDB/backend/dumb/TextSearchIter.php	2021-10-06 17:20:43 UTC (rev 10622)
@@ -41,7 +41,7 @@
     /**
      * @var array
      */
-    private $stoplisted;
+    public $stoplisted;
 
     private $_from;
     private $_count;

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

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

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

Revision: 10621
          http://sourceforge.net/p/phpwiki/code/10621
Author:   vargenau
Date:     2021-10-06 16:03:44 +0000 (Wed, 06 Oct 2021)
Log Message:
-----------
pgsrc/Help%2FFuzzyPagesPlugin and pgsrc/Help%2FLikePagesPlugin: add See Also

Modified Paths:
--------------
    trunk/pgsrc/Help%2FFuzzyPagesPlugin
    trunk/pgsrc/Help%2FLikePagesPlugin

Modified: trunk/pgsrc/Help%2FFuzzyPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FFuzzyPagesPlugin	2021-10-06 15:49:37 UTC (rev 10620)
+++ trunk/pgsrc/Help%2FFuzzyPagesPlugin	2021-10-06 16:03:44 UTC (rev 10621)
@@ -1,4 +1,4 @@
-Date: Fri,  1 Oct 2021 15:22:19 +0000
+Date: Wed,  6 Oct 2021 17:59:01 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FFuzzyPagesPlugin;
@@ -46,6 +46,7 @@
 * [[Help:Reini Urban|Reini Urban]]
 
 == See Also ==
+* [[Help:LikePagesPlugin]]
 
 <noinclude>
 ----

Modified: trunk/pgsrc/Help%2FLikePagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FLikePagesPlugin	2021-10-06 15:49:37 UTC (rev 10620)
+++ trunk/pgsrc/Help%2FLikePagesPlugin	2021-10-06 16:03:44 UTC (rev 10621)
@@ -1,4 +1,4 @@
-Date: Fri,  1 Oct 2021 15:22:19 +0000
+Date: Wed,  6 Oct 2021 17:59:01 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FLikePagesPlugin;
@@ -55,6 +55,7 @@
 * [[Help:Reini Urban|Reini Urban]]
 
 == See Also ==
+* [[Help:FuzzyPagesPlugin]]
 
 <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:[10620] trunk/lib/WikiDB/backend/dumb

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

Revision: 10620
          http://sourceforge.net/p/phpwiki/code/10620
Author:   vargenau
Date:     2021-10-06 15:49:37 +0000 (Wed, 06 Oct 2021)
Log Message:
-----------
lib/WikiDB/backend/dumb: add fields definition

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
    trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
    trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
    trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
    trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
    trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php

Modified: trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php	2021-10-06 14:38:29 UTC (rev 10619)
+++ trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php	2021-10-06 15:49:37 UTC (rev 10620)
@@ -34,6 +34,21 @@
     extends WikiDB_backend_iterator
 {
     /**
+     * @var WikiDB_backend
+     */
+    private $_backend;
+
+    /**
+     * @var int
+     */
+    private $_lastversion;
+
+    /**
+     * @var string
+     */
+    private $_pagename;
+
+    /**
      * @param WikiDB_backend $backend
      * @param string $pagename Page whose revisions to get.
      */

Modified: trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php	2021-10-06 14:38:29 UTC (rev 10619)
+++ trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php	2021-10-06 15:49:37 UTC (rev 10620)
@@ -41,6 +41,47 @@
 class WikiDB_backend_dumb_LinkSearchIter
     extends WikiDB_backend_iterator
 {
+    private $_backend;
+    private $_pages;
+    private $search;
+    private $relation;
+    private $sortby;
+
+    /**
+     * @var mixed|string
+     */
+    private $exclude;
+
+    /**
+     * @var WikiDB
+     */
+    private $_dbi;
+
+    /**
+     * @var string
+     */
+    private $_field;
+
+    private $_page;
+
+    /**
+     * @var array
+     */
+    private $_links;
+
+    private $linktype;
+    private $limit;
+
+    /**
+     * @var bool
+     */
+    private $_want_relations;
+
+    /**
+     * @var bool
+     */
+    private $_reverse;
+
     function __construct($backend, $pageiter, $search, $linktype,
                          $relation = false, $options = array())
     {

Modified: trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostPopularIter.php	2021-10-06 14:38:29 UTC (rev 10619)
+++ trunk/lib/WikiDB/backend/dumb/MostPopularIter.php	2021-10-06 15:49:37 UTC (rev 10620)
@@ -37,6 +37,11 @@
 class WikiDB_backend_dumb_MostPopularIter
     extends WikiDB_backend_iterator
 {
+    /**
+     * @var array
+     */
+    private $_pages;
+
     function __construct($backend, $all_pages, $limit)
     {
         $this->_pages = array();

Modified: trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostRecentIter.php	2021-10-06 14:38:29 UTC (rev 10619)
+++ trunk/lib/WikiDB/backend/dumb/MostRecentIter.php	2021-10-06 15:49:37 UTC (rev 10620)
@@ -35,6 +35,11 @@
 class WikiDB_backend_dumb_MostRecentIter
     extends WikiDB_backend_iterator
 {
+    /**
+     * @var array
+     */
+    private $_revisions;
+
     function __construct($backend, $pages, $params)
     {
         $limit = false;

Modified: trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/TextSearchIter.php	2021-10-06 14:38:29 UTC (rev 10619)
+++ trunk/lib/WikiDB/backend/dumb/TextSearchIter.php	2021-10-06 15:49:37 UTC (rev 10620)
@@ -26,6 +26,27 @@
 class WikiDB_backend_dumb_TextSearchIter
     extends WikiDB_backend_iterator
 {
+    private $_backend;
+    private $_pages;
+    private $_fulltext;
+    private $_search;
+
+    /**
+     * @var int
+     */
+    private $_index;
+
+    private $_stoplist;
+
+    /**
+     * @var array
+     */
+    private $stoplisted;
+
+    private $_from;
+    private $_count;
+    private $_exclude;
+
     function __construct($backend, $pages, $search, $fulltext = false,
                          $options = array())
     {

Modified: trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php	2021-10-06 14:38:29 UTC (rev 10619)
+++ trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php	2021-10-06 15:49:37 UTC (rev 10620)
@@ -32,6 +32,38 @@
 class WikiDB_backend_dumb_WantedPagesIter
     extends WikiDB_backend_iterator
 {
+    private $_allpages;
+    private $_allpages_array;
+
+    /**
+     * @var array
+     */
+    private $exclude;
+
+    private $limit;
+
+    /**
+     * @var int
+     */
+    private $pos;
+
+    private $_backend;
+
+    /**
+     * @var string
+     */
+    private $sortby;
+
+    /**
+     * @var int
+     */
+    private $from;
+
+    /**
+     * @var array
+     */
+    private $pagelinks;
+
     function __construct($backend, $all_pages, $exclude = '', $sortby = '', $limit = '')
     {
         $this->_allpages = $all_pages;

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

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

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

Revision: 10619
          http://sourceforge.net/p/phpwiki/code/10619
Author:   vargenau
Date:     2021-10-06 14:38:29 +0000 (Wed, 06 Oct 2021)
Log Message:
-----------
class WikiDB_backend_dumb_BackLinkIter is not used

Removed Paths:
-------------
    trunk/lib/WikiDB/backend/dumb/BackLinkIter.php

Deleted: trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/BackLinkIter.php	2021-10-06 10:59:50 UTC (rev 10618)
+++ trunk/lib/WikiDB/backend/dumb/BackLinkIter.php	2021-10-06 14:38:29 UTC (rev 10619)
@@ -1,62 +0,0 @@
-<?php
-/**
- * Copyright © 2001 Jeff Dairiki
- *
- * 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.
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- */
-
-require_once 'lib/WikiDB/backend.php';
-
-/**
- * This backlink iterator will work with any WikiDB_backend
- * which has a working get_links(,'links_from') method.
- *
- * This is mostly here for testing, 'cause it's slow,slow,slow.
- */
-
-class WikiDB_backend_dumb_BackLinkIter
-    extends WikiDB_backend_iterator
-{
-    function __construct($backend, $all_pages, $pagename)
-    {
-        $this->_pages = $all_pages;
-        $this->_backend = &$backend;
-        $this->_target = $pagename;
-    }
-
-    function next()
-    {
-        while ($page = $this->_pages->next()) {
-            $pagename = $page['pagename'];
-            $links = $this->_backend->get_links($pagename, false);
-            while ($link = $links->next()) {
-                if ($link['pagename'] == $this->_target) {
-                    $links->free();
-                    return $page;
-                }
-            }
-        }
-    }
-
-    function free()
-    {
-        $this->_pages->free();
-    }
-}

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10618] trunk/lib/WikiPluginCached.php

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

Revision: 10618
          http://sourceforge.net/p/phpwiki/code/10618
Author:   vargenau
Date:     2021-10-06 10:59:50 +0000 (Wed, 06 Oct 2021)
Log Message:
-----------
lib/WikiPluginCached.php: check plugin exists

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

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2021-10-06 09:17:41 UTC (rev 10617)
+++ trunk/lib/WikiPluginCached.php	2021-10-06 10:59:50 UTC (rev 10618)
@@ -846,6 +846,9 @@
 
         $loader = new WikiPluginLoader();
         $plugin = $loader->getPlugin($pluginname);
+        if (!$plugin) {
+            return false;
+        }
 
         // cache empty, but image maps have to be created _inline_
         // so ask user to reload wiki page instead
@@ -854,10 +857,9 @@
             $this->printError($errorformat, $errortext);
         }
 
-        if (!$this->produceImage($content, $plugin, $dbi, $argarray,
-            $request, $errorformat)
-        )
+        if (!$this->produceImage($content, $plugin, $dbi, $argarray, $request, $errorformat)) {
             return false;
+        }
 
         $expire = $plugin->getExpire($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:[10617] trunk/lib/WikiDB/backend/PDO_mysql.php

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

Revision: 10617
          http://sourceforge.net/p/phpwiki/code/10617
Author:   vargenau
Date:     2021-10-06 09:17:41 +0000 (Wed, 06 Oct 2021)
Log Message:
-----------
SET NAMES 'utf8'

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

Modified: trunk/lib/WikiDB/backend/PDO_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_mysql.php	2021-10-06 08:34:18 UTC (rev 10616)
+++ trunk/lib/WikiDB/backend/PDO_mysql.php	2021-10-06 09:17:41 UTC (rev 10617)
@@ -33,7 +33,7 @@
     function __construct($dbparams)
     {
         parent::__construct($dbparams);
-        $this->_dbh->query("SET NAMES 'UTF-8'");
+        $this->_dbh->query("SET NAMES 'utf8'");
     }
 
     function backendType()

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

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

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

Revision: 10616
          http://sourceforge.net/p/phpwiki/code/10616
Author:   vargenau
Date:     2021-10-06 08:34:18 +0000 (Wed, 06 Oct 2021)
Log Message:
-----------
Assume recent MySQL

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

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2021-10-06 08:31:04 UTC (rev 10615)
+++ trunk/lib/WikiDB/backend/PDO.php	2021-10-06 08:34:18 UTC (rev 10616)
@@ -120,13 +120,10 @@
         $this->_hasTransactions = true;
         try {
             $this->_dbh->beginTransaction();
+            $this->commit();
         } catch (PDOException $e) {
             $this->_hasTransactions = false;
         }
-        $sth = $this->_dbh->prepare("SELECT version()");
-        $sth->execute();
-        $this->_serverinfo['version'] = $sth->fetchColumn();
-        $this->commit(); // required to match the try catch block above!
 
         $prefix = isset($dbparams['prefix']) ? $dbparams['prefix'] : '';
         $this->_table_names

Modified: trunk/lib/WikiDB/backend/PDO_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_mysql.php	2021-10-06 08:31:04 UTC (rev 10615)
+++ trunk/lib/WikiDB/backend/PDO_mysql.php	2021-10-06 08:34:18 UTC (rev 10616)
@@ -33,20 +33,7 @@
     function __construct($dbparams)
     {
         parent::__construct($dbparams);
-
-        if (!empty($this->_serverinfo['version'])) {
-            $arr = explode('.', $this->_serverinfo['version']);
-            $this->_serverinfo['version'] = (string)(($arr[0] * 100) + $arr[1]) . "." . (integer)$arr[2];
-        }
-        if ($this->_serverinfo['version'] < 323.0) {
-            // Older MySQL's don't have CASE WHEN ... END
-            $this->_expressions['maxmajor'] = "MAX(IF(minor_edit=0,version,0))";
-            $this->_expressions['maxminor'] = "MAX(IF(minor_edit<>0,version,0))";
-        }
-
-        if ($this->_serverinfo['version'] > 401.0) {
-            $this->_dbh->query("SET NAMES 'UTF-8'");
-        }
+        $this->_dbh->query("SET NAMES 'UTF-8'");
     }
 
     function backendType()

Modified: trunk/lib/WikiDB/backend/PearDB_mysqli.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysqli.php	2021-10-06 08:31:04 UTC (rev 10615)
+++ trunk/lib/WikiDB/backend/PearDB_mysqli.php	2021-10-06 08:34:18 UTC (rev 10616)
@@ -28,26 +28,6 @@
 class WikiDB_backend_PearDB_mysqli
     extends WikiDB_backend_PearDB
 {
-    function __construct($dbparams)
-    {
-        parent::__construct($dbparams);
-        if (DB::isError($this->_dbh)) {
-            return;
-        }
-        //$this->_serverinfo = $this->_dbh->ServerInfo();
-        $row = $this->_dbh->GetOne("SELECT version()");
-        if (!DB::isError($row) and !empty($row)) {
-            $arr = explode('.', $row);
-            $this->_serverinfo['version'] = (string)(($arr[0] * 100) + $arr[1]) .
-                "." . (integer)$arr[2];
-            if ($this->_serverinfo['version'] < 323.0) {
-                // Older MySQL's don't have CASE WHEN ... END
-                $this->_expressions['maxmajor'] = "MAX(IF(minor_edit=0,version,0))";
-                $this->_expressions['maxminor'] = "MAX(IF(minor_edit<>0,version,0))";
-            }
-        }
-    }
-
     /**
      * Kill timed out processes. ( so far only called on about every 50-th save. )
      */
@@ -217,11 +197,9 @@
         // Note that this will fail silently if the page does not
         // have a record in the page table.  Since it's just the
         // hit count, who cares?
-        // LIMIT since 3.23
-        $dbh->query(sprintf("UPDATE LOW_PRIORITY %s SET hits=hits+1 WHERE pagename='%s' %s",
+        $dbh->query(sprintf("UPDATE LOW_PRIORITY %s SET hits=hits+1 WHERE pagename='%s' LIMIT 1",
             $this->_table_names['page_tbl'],
-            $dbh->escapeSimple($pagename),
-            ($this->_serverinfo['version'] >= 323.0) ? "LIMIT 1" : ""));
+            $dbh->escapeSimple($pagename)));
     }
 
 }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10615] trunk/lib/plugin/PageInfo.php

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

Revision: 10615
          http://sourceforge.net/p/phpwiki/code/10615
Author:   vargenau
Date:     2021-10-06 08:31:04 +0000 (Wed, 06 Oct 2021)
Log Message:
-----------
Remove local variable

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

Modified: trunk/lib/plugin/PageInfo.php
===================================================================
--- trunk/lib/plugin/PageInfo.php	2021-10-06 08:29:42 UTC (rev 10614)
+++ trunk/lib/plugin/PageInfo.php	2021-10-06 08:31:04 UTC (rev 10615)
@@ -69,8 +69,6 @@
             $revision = $current;
         }
 
-        $template = new Template('info', $request,
-            array('revision' => $revision));
-        return $template;
+        return new Template('info', $request, array('revision' => $revision));
     }
 }

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

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

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

Revision: 10614
          http://sourceforge.net/p/phpwiki/code/10614
Author:   vargenau
Date:     2021-10-06 08:29:42 +0000 (Wed, 06 Oct 2021)
Log Message:
-----------
Add braces

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

Modified: trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/TextSearchIter.php	2021-10-06 08:28:47 UTC (rev 10613)
+++ trunk/lib/WikiDB/backend/dumb/TextSearchIter.php	2021-10-06 08:29:42 UTC (rev 10614)
@@ -38,12 +38,17 @@
         $this->stoplisted = array();
 
         $this->_from = 0;
-        if (isset($options['limit'])) // extract from,count from limit
+        if (isset($options['limit'])) { // extract from,count from limit
             list($this->_from, $this->_count) = WikiDB_backend::limit($options['limit']);
-        else
+        } else {
             $this->_count = 0;
-        if (isset($options['exclude'])) $this->_exclude = $options['exclude'];
-        else $this->_exclude = false;
+        }
+
+        if (isset($options['exclude'])) {
+            $this->_exclude = $options['exclude'];
+        } else {
+            $this->_exclude = false;
+        }
     }
 
     function _get_content(&$page)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10613] trunk/lib/plugin/FuzzyPages.php

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

Revision: 10613
          http://sourceforge.net/p/phpwiki/code/10613
Author:   vargenau
Date:     2021-10-06 08:28:47 +0000 (Wed, 06 Oct 2021)
Log Message:
-----------
Use local variable instead of private member

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

Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php	2021-10-01 13:58:26 UTC (rev 10612)
+++ trunk/lib/plugin/FuzzyPages.php	2021-10-06 08:28:47 UTC (rev 10613)
@@ -40,7 +40,6 @@
     private $searchterm;
     private $searchterm_metaphone;
     private $debug;
-    private $list;
 
     function getDescription()
     {
@@ -208,10 +207,10 @@
         }
 
         $this->searchterm = $s;
-        $this->list = array();
+        $list = array();
 
-        $this->collectSimilarPages($this->list, $dbi);
-        $this->sortCollectedPages($this->list);
-        return $this->formatTable($this->list, $dbi);
+        $this->collectSimilarPages($list, $dbi);
+        $this->sortCollectedPages($list);
+        return $this->formatTable($list, $dbi);
     }
 }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10612] trunk/lib/plugin/FuzzyPages.php

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

Revision: 10612
          http://sourceforge.net/p/phpwiki/code/10612
Author:   vargenau
Date:     2021-10-01 13:58:26 +0000 (Fri, 01 Oct 2021)
Log Message:
-----------
lib/plugin/FuzzyPages.php: pass by reference not needed

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

Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php	2021-10-01 13:55:18 UTC (rev 10611)
+++ trunk/lib/plugin/FuzzyPages.php	2021-10-01 13:58:26 UTC (rev 10612)
@@ -142,7 +142,7 @@
         $table->pushContent($tbody);
     }
 
-    private function formatTable(&$list, &$dbi)
+    private function formatTable($list, $dbi)
     {
 
         if (empty($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:[10611] trunk/lib/plugin/FuzzyPages.php

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

Revision: 10611
          http://sourceforge.net/p/phpwiki/code/10611
Author:   vargenau
Date:     2021-10-01 13:55:18 +0000 (Fri, 01 Oct 2021)
Log Message:
-----------
lib/plugin/FuzzyPages.php: use private

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

Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php	2021-10-01 13:54:11 UTC (rev 10610)
+++ trunk/lib/plugin/FuzzyPages.php	2021-10-01 13:55:18 UTC (rev 10611)
@@ -37,10 +37,10 @@
 class WikiPlugin_FuzzyPages
     extends WikiPlugin
 {
-    public $_searchterm;
-    public $_searchterm_metaphone;
-    public $debug;
-    public $_list;
+    private $searchterm;
+    private $searchterm_metaphone;
+    private $debug;
+    private $list;
 
     function getDescription()
     {
@@ -50,14 +50,14 @@
 
     function getDefaultArguments()
     {
-        return array('s' => false,
-            'debug' => false);
+        return array('s' => '',
+                     'debug' => false);
     }
 
     private function spelling_similarity($subject)
     {
         $spelling_similarity_score = 0;
-        similar_text($subject, $this->_searchterm,
+        similar_text($subject, $this->searchterm,
             $spelling_similarity_score);
         return $spelling_similarity_score;
     }
@@ -65,7 +65,7 @@
     private function sound_similarity($subject)
     {
         $sound_similarity_score = 0;
-        similar_text(metaphone($subject), $this->_searchterm_metaphone,
+        similar_text(metaphone($subject), $this->searchterm_metaphone,
             $sound_similarity_score);
         return $sound_similarity_score;
     }
@@ -76,12 +76,12 @@
             + $this->sound_similarity($subject)) / 2;
     }
 
-    private function collectSimilarPages(&$list, &$dbi)
+    private function collectSimilarPages(&$list, $dbi)
     {
         if (!defined('MIN_SCORE_CUTOFF'))
             define('MIN_SCORE_CUTOFF', 33);
 
-        $this->_searchterm_metaphone = metaphone($this->_searchterm);
+        $this->searchterm_metaphone = metaphone($this->searchterm);
 
         $allPages = $dbi->getAllPages();
 
@@ -98,17 +98,17 @@
         arsort($list, SORT_NUMERIC);
     }
 
-    private function addTableCaption(&$table, &$dbi)
+    private function addTableCaption($table, $dbi)
     {
-        if ($dbi->isWikiPage($this->_searchterm))
-            $link = WikiLink($this->_searchterm, 'auto');
+        if ($dbi->isWikiPage($this->searchterm))
+            $link = WikiLink($this->searchterm, 'auto');
         else
-            $link = $this->_searchterm;
+            $link = $this->searchterm;
         $caption = fmt("These page titles match fuzzy with “%s”", $link);
         $table->pushContent(HTML::caption($caption));
     }
 
-    private function addTableHead(&$table)
+    private function addTableHead($table)
     {
         $row = HTML::tr(HTML::th(_("Name")), HTML::th(_("Score")));
 
@@ -119,7 +119,7 @@
         $table->pushContent(HTML::thead($row));
     }
 
-    private function addTableBody(&$list, &$table)
+    private function addTableBody($list, $table)
     {
         if (!defined('HIGHLIGHT_ROWS_CUTOFF_SCORE'))
             define('HIGHLIGHT_ROWS_CUTOFF_SCORE', 60);
@@ -146,7 +146,7 @@
     {
 
         if (empty($list)) {
-            return HTML::p(fmt("No fuzzy matches with “%s”", $this->_searchterm));
+            return HTML::p(fmt("No fuzzy matches with “%s”", $this->searchterm));
         }
         $table = HTML::table(array('class' => 'pagelist'));
         $this->addTableCaption($table, $dbi);
@@ -155,6 +155,27 @@
         return $table;
     }
 
+    private function pushDebugHeadingTDinto($row)
+    {
+        $row->pushContent(HTML::td(_("Spelling Score")),
+            HTML::td(_("Sound Score")),
+            HTML::td('Metaphones'));
+    }
+
+    private function pushDebugTDinto($row, $pagename)
+    {
+        // This actually calculates everything a second time for each pagename
+        // so the individual scores can be displayed separately for debugging.
+        $debug_spelling = round($this->spelling_similarity($pagename), 1);
+        $debug_sound = round($this->sound_similarity($pagename), 1);
+        $debug_metaphone = sprintf("(%s, %s)", metaphone($pagename),
+            $this->searchterm_metaphone);
+
+        $row->pushContent(HTML::td(array('class' => 'align-center'), $debug_spelling),
+            HTML::td(array('class' => 'align-center'), $debug_sound),
+            HTML::td($debug_metaphone));
+    }
+
     /**
      * @param WikiDB $dbi
      * @param string $argstr
@@ -167,6 +188,16 @@
         $args = $this->getArgs($argstr, $request);
         extract($args);
 
+        if (!is_bool($debug)) {
+            if (($debug == '0') || ($debug == 'false')) {
+                $debug = false;
+            } elseif (($debug == '1') || ($debug == 'true')) {
+                $debug = true;
+            } else {
+                return $this->error(sprintf(_("Argument '%s' must be a boolean"), "debug"));
+            }
+        }
+
         if (empty($s)) {
             return HTML::p(array('class' => 'warning'),
                            _("You must enter a search term."));
@@ -176,32 +207,11 @@
             $this->debug = $debug;
         }
 
-        $this->_searchterm = $s;
-        $this->_list = array();
+        $this->searchterm = $s;
+        $this->list = array();
 
-        $this->collectSimilarPages($this->_list, $dbi);
-        $this->sortCollectedPages($this->_list);
-        return $this->formatTable($this->_list, $dbi);
+        $this->collectSimilarPages($this->list, $dbi);
+        $this->sortCollectedPages($this->list);
+        return $this->formatTable($this->list, $dbi);
     }
-
-    private function pushDebugHeadingTDinto(&$row)
-    {
-        $row->pushContent(HTML::td(_("Spelling Score")),
-            HTML::td(_("Sound Score")),
-            HTML::td('Metaphones'));
-    }
-
-    private function pushDebugTDinto(&$row, $pagename)
-    {
-        // This actually calculates everything a second time for each pagename
-        // so the individual scores can be displayed separately for debugging.
-        $debug_spelling = round($this->spelling_similarity($pagename), 1);
-        $debug_sound = round($this->sound_similarity($pagename), 1);
-        $debug_metaphone = sprintf("(%s, %s)", metaphone($pagename),
-            $this->_searchterm_metaphone);
-
-        $row->pushContent(HTML::td(array('class' => 'align-center'), $debug_spelling),
-            HTML::td(array('class' => 'align-center'), $debug_sound),
-            HTML::td($debug_metaphone));
-    }
 }

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

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

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

Revision: 10610
          http://sourceforge.net/p/phpwiki/code/10610
Author:   vargenau
Date:     2021-10-01 13:54:11 +0000 (Fri, 01 Oct 2021)
Log Message:
-----------
pgsrc/Help%2FFuzzyPagesPlugin: Pagename is mandatory

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

Modified: trunk/pgsrc/Help%2FFuzzyPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FFuzzyPagesPlugin	2021-10-01 13:38:08 UTC (rev 10609)
+++ trunk/pgsrc/Help%2FFuzzyPagesPlugin	2021-10-01 13:54:11 UTC (rev 10610)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Fri,  1 Oct 2021 15:22:19 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FFuzzyPagesPlugin;
@@ -31,7 +31,7 @@
 |-
 | **s**
 | Pagename to look for
-| empty
+| //None// (mandatory argument)
 |}
 
 == Example ==

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

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

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

Revision: 10609
          http://sourceforge.net/p/phpwiki/code/10609
Author:   vargenau
Date:     2021-10-01 13:38:08 +0000 (Fri, 01 Oct 2021)
Log Message:
-----------
lib/plugin/LikePages.php: prefix and suffix are strings; test noheader

Modified Paths:
--------------
    trunk/lib/plugin/LikePages.php
    trunk/pgsrc/Help%2FLikePagesPlugin

Modified: trunk/lib/plugin/LikePages.php
===================================================================
--- trunk/lib/plugin/LikePages.php	2021-09-30 16:00:00 UTC (rev 10608)
+++ trunk/lib/plugin/LikePages.php	2021-10-01 13:38:08 UTC (rev 10609)
@@ -40,8 +40,8 @@
         (
             PageList::supportedArgs(),
             array('page' => '[pagename]',
-                'prefix' => false,
-                'suffix' => false,
+                'prefix' => '',
+                'suffix' => '',
                 'noheader' => false,
             ));
     }
@@ -65,6 +65,16 @@
         if (empty($page) && empty($prefix) && empty($suffix))
             return '';
 
+        if (!is_bool($noheader)) {
+            if (($noheader == '0') || ($noheader == 'false')) {
+                $noheader = false;
+            } elseif (($noheader == '1') || ($noheader == 'true')) {
+                $noheader = true;
+            } else {
+                return $this->error(sprintf(_("Argument '%s' must be a boolean"), "noheader"));
+            }
+        }
+
         if ($prefix) {
             $suffix = false;
             $descrip = fmt("Page names with prefix “%s”", $prefix);
@@ -101,8 +111,9 @@
         $match_re = '/' . join('|', $match) . '/';
 
         $pagelist = new PageList($info, $exclude, $args);
-        if (!$noheader)
+        if (!$noheader) {
             $pagelist->setCaption($descrip);
+        }
         $pages = $dbi->titleSearch($query);
         while ($page = $pages->next()) {
             $name = $page->getName();

Modified: trunk/pgsrc/Help%2FLikePagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FLikePagesPlugin	2021-09-30 16:00:00 UTC (rev 10608)
+++ trunk/pgsrc/Help%2FLikePagesPlugin	2021-10-01 13:38:08 UTC (rev 10609)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Fri,  1 Oct 2021 15:22:19 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FLikePagesPlugin;
@@ -30,11 +30,11 @@
 |-
 | **prefix**
 | List only pages that share the same prefix
-| false
+| //empty string//
 |-
 | **suffix**
 | List only pages that share the same suffix
-| false
+| //empty string//
 |}
 
 == Examples ==

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10608] trunk/lib/plugin/FuzzyPages.php

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

Revision: 10608
          http://sourceforge.net/p/phpwiki/code/10608
Author:   vargenau
Date:     2021-09-30 16:00:00 +0000 (Thu, 30 Sep 2021)
Log Message:
-----------
lib/plugin/FuzzyPages.php: make functions private

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

Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php	2021-09-30 14:27:23 UTC (rev 10607)
+++ trunk/lib/plugin/FuzzyPages.php	2021-09-30 16:00:00 UTC (rev 10608)
@@ -54,7 +54,7 @@
             'debug' => false);
     }
 
-    function spelling_similarity($subject)
+    private function spelling_similarity($subject)
     {
         $spelling_similarity_score = 0;
         similar_text($subject, $this->_searchterm,
@@ -62,7 +62,7 @@
         return $spelling_similarity_score;
     }
 
-    function sound_similarity($subject)
+    private function sound_similarity($subject)
     {
         $sound_similarity_score = 0;
         similar_text(metaphone($subject), $this->_searchterm_metaphone,
@@ -70,13 +70,13 @@
         return $sound_similarity_score;
     }
 
-    function averageSimilarities($subject)
+    private function averageSimilarities($subject)
     {
         return ($this->spelling_similarity($subject)
             + $this->sound_similarity($subject)) / 2;
     }
 
-    function collectSimilarPages(&$list, &$dbi)
+    private function collectSimilarPages(&$list, &$dbi)
     {
         if (!defined('MIN_SCORE_CUTOFF'))
             define('MIN_SCORE_CUTOFF', 33);
@@ -93,12 +93,12 @@
         }
     }
 
-    function sortCollectedPages(&$list)
+    private function sortCollectedPages(&$list)
     {
         arsort($list, SORT_NUMERIC);
     }
 
-    function addTableCaption(&$table, &$dbi)
+    private function addTableCaption(&$table, &$dbi)
     {
         if ($dbi->isWikiPage($this->_searchterm))
             $link = WikiLink($this->_searchterm, 'auto');
@@ -108,7 +108,7 @@
         $table->pushContent(HTML::caption($caption));
     }
 
-    function addTableHead(&$table)
+    private function addTableHead(&$table)
     {
         $row = HTML::tr(HTML::th(_("Name")), HTML::th(_("Score")));
 
@@ -119,7 +119,7 @@
         $table->pushContent(HTML::thead($row));
     }
 
-    function addTableBody(&$list, &$table)
+    private function addTableBody(&$list, &$table)
     {
         if (!defined('HIGHLIGHT_ROWS_CUTOFF_SCORE'))
             define('HIGHLIGHT_ROWS_CUTOFF_SCORE', 60);
@@ -142,7 +142,7 @@
         $table->pushContent($tbody);
     }
 
-    function formatTable(&$list, &$dbi)
+    private function formatTable(&$list, &$dbi)
     {
 
         if (empty($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:[10607] trunk/lib/plugin/CurrentTime.php

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

Revision: 10607
          http://sourceforge.net/p/phpwiki/code/10607
Author:   vargenau
Date:     2021-09-30 14:27:23 +0000 (Thu, 30 Sep 2021)
Log Message:
-----------
lib/plugin/CurrentTime.php: do not use extract, only one argument

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

Modified: trunk/lib/plugin/CurrentTime.php
===================================================================
--- trunk/lib/plugin/CurrentTime.php	2021-09-30 13:36:50 UTC (rev 10606)
+++ trunk/lib/plugin/CurrentTime.php	2021-09-30 14:27:23 UTC (rev 10607)
@@ -79,7 +79,8 @@
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
-        extract($this->getArgs($argstr, $request));
+        $args = $this->getArgs($argstr, $request);
+        $format = $args['format'];
 
         if ($format == 'date') {
             $format = '%Y-%m-%d';

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

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

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

Revision: 10606
          http://sourceforge.net/p/phpwiki/code/10606
Author:   vargenau
Date:     2021-09-30 13:36:50 +0000 (Thu, 30 Sep 2021)
Log Message:
-----------
Get rid of old Windows backslash

Modified Paths:
--------------
    trunk/configurator.php
    trunk/lib/ErrorManager.php

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-09-30 13:32:04 UTC (rev 10605)
+++ trunk/configurator.php	2021-09-30 13:36:50 UTC (rev 10606)
@@ -74,8 +74,8 @@
         $scriptname = str_replace('configurator.php', 'index.php', $_SERVER["PHP_SELF"]);
 }
 
-$config_file = (substr(PHP_OS, 0, 3) == 'WIN') ? 'config\\config.ini' : 'config/config.ini';
-$fs_config_file = dirname(__FILE__) . (substr(PHP_OS, 0, 3) == 'WIN' ? '\\' : '/') . $config_file;
+$config_file = 'config/config.ini';
+$fs_config_file = dirname(__FILE__) . '/' . $config_file;
 if (isset($_POST['create'])) header('Location: ' . $configurator . '?show=_part1&create=1#create');
 
 if (!function_exists('dba_handlers')) {
@@ -162,8 +162,8 @@
         include_once 'lib/prepend.php';
         include_once 'lib/IniConfig.php';
     }
-    $def_file = (substr(PHP_OS, 0, 3) == 'WIN') ? 'config\\config-default.ini' : 'config/config-default.ini';
-    $fs_def_file = dirname(__FILE__) . (substr(PHP_OS, 0, 3) == 'WIN' ? '\\' : '/') . $def_file;
+    $def_file = 'config/config-default.ini';
+    $fs_def_file = dirname(__FILE__) . '/' . $def_file;
     IniConfig($fs_def_file);
 }
 
@@ -2296,8 +2296,7 @@
     static $f;
 
     if (!$distfile) {
-        $sep = (substr(PHP_OS, 0, 3) == 'WIN' ? '\\' : '/');
-        $distfile = dirname(__FILE__) . $sep . "config" . $sep . "config-dist.ini";
+        $distfile = dirname(__FILE__) . "/config/config-dist.ini";
         $f = fopen($distfile, "r");
     }
     if ($var == '_MAGIC_CLOSE_FILE') {

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2021-09-30 13:32:04 UTC (rev 10605)
+++ trunk/lib/ErrorManager.php	2021-09-30 13:36:50 UTC (rev 10606)
@@ -488,12 +488,7 @@
     function _getDetail()
     {
         $dir = defined('PHPWIKI_DIR') ? PHPWIKI_DIR : substr(dirname(__FILE__), 0, -4);
-        if (substr(PHP_OS, 0, 3) == 'WIN') {
-            $dir = str_replace('/', '\\', $dir);
-            $this->errfile = str_replace('/', '\\', $this->errfile);
-            $dir .= "\\";
-        } else
-            $dir .= '/';
+        $dir .= '/';
         $errfile = preg_replace('|^' . preg_quote($dir, '|') . '|', '', $this->errfile);
         $lines = explode("\n", $this->errstr);
         if (DEBUG & _DEBUG_VERBOSE) {
@@ -631,12 +626,7 @@
     {
         if (!$count) $count = $this->_count;
         $dir = defined('PHPWIKI_DIR') ? PHPWIKI_DIR : substr(dirname(__FILE__), 0, -4);
-        if (substr(PHP_OS, 0, 3) == 'WIN') {
-            $dir = str_replace('/', '\\', $dir);
-            $this->errfile = str_replace('/', '\\', $this->errfile);
-            $dir .= "\\";
-        } else
-            $dir .= '/';
+        $dir .= '/';
         $errfile = preg_replace('|^' . preg_quote($dir, '|') . '|', '', $this->errfile);
         if (is_string($this->errstr))
             $lines = explode("\n", $this->errstr);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10605] trunk/lib/IniConfig.php

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

Revision: 10605
          http://sourceforge.net/p/phpwiki/code/10605
Author:   vargenau
Date:     2021-09-30 13:32:04 +0000 (Thu, 30 Sep 2021)
Log Message:
-----------
lib/IniConfig.php: remove old comments

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

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2021-09-30 12:59:09 UTC (rev 10604)
+++ trunk/lib/IniConfig.php	2021-09-30 13:32:04 UTC (rev 10605)
@@ -37,12 +37,6 @@
  */
 
 /**
- * DONE:
- * - Convert the value lists to provide defaults, so that every "if
- *      (defined())" and "if (!defined())" can fuck off to the dismal hole
- *      it belongs in.
- * - config.ini => config.php dumper for faster startup. (really faster? to time)
- *
  * TODO:
  * - Don't use too much globals for easier integration into other projects
  *   (namespace pollution). (FusionForge, phpnuke, postnuke, phpBB2, carolina, ...)
@@ -330,7 +324,7 @@
     unset($rskey);
     unset($apkey);
 
-    // TODO: Currently unsupported on non-SQL. Nice to have for RhNavPlugin
+    // TODO: Currently unsupported on non-SQL.
     // CHECKME: PDO
     if (!defined('ACCESS_LOG_SQL')) {
         if (array_key_exists('ACCESS_LOG_SQL', $rs)) {
@@ -469,7 +463,6 @@
     fixup_dynamic_configs(); // [100ms]
 }
 
-// moved from lib/config.php [1ms]
 function fixup_static_configs($file)
 {
     global $AllActionPages;
@@ -664,10 +657,6 @@
         if (($temp == '/') || ($temp == '\\'))
             $temp = '';
         define('DATA_PATH', $temp);
-        /*
-        if (USE_PATH_INFO)
-            define('DATA_PATH', '..');
-        */
     }
 
     //////////////////////////////////////////////////////////////////

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10604] trunk/lib/IniConfig.php

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

Revision: 10604
          http://sourceforge.net/p/phpwiki/code/10604
Author:   vargenau
Date:     2021-09-30 12:59:09 +0000 (Thu, 30 Sep 2021)
Log Message:
-----------
lib/IniConfig.php: config/config.php no longer exists

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

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2021-09-30 12:52:20 UTC (rev 10603)
+++ trunk/lib/IniConfig.php	2021-09-30 12:59:09 UTC (rev 10604)
@@ -44,8 +44,6 @@
  * - config.ini => config.php dumper for faster startup. (really faster? to time)
  *
  * TODO:
- * - Old-style index.php => config/config.ini converter.
- *
  * - Don't use too much globals for easier integration into other projects
  *   (namespace pollution). (FusionForge, phpnuke, postnuke, phpBB2, carolina, ...)
  *   Use one global $phpwiki object instead which holds the cfg vars, constants
@@ -75,17 +73,6 @@
 
 function IniConfig($file)
 {
-
-    // Optionally check config/config.php dump for faster startup
-    $dump = substr($file, 0, -3) . "php";
-    if (file_exists($dump) and is_readable($dump) and filesize($dump) > 0 and sort_file_mtime($dump, $file) < 0) {
-        @include($dump) or die("Error including " . $dump);
-        if (function_exists('wiki_configrestore') and (wiki_configrestore() === 'noerr')) {
-            fixup_dynamic_configs();
-            return;
-        }
-    }
-
     // First-time installer detection here...
     // Similar to SetupWiki()
     if (!file_exists($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:[10603] trunk/lib/plugin/RawHtml.php

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

Revision: 10603
          http://sourceforge.net/p/phpwiki/code/10603
Author:   vargenau
Date:     2021-09-30 12:52:20 +0000 (Thu, 30 Sep 2021)
Log Message:
-----------
lib/plugin/RawHtml.php: update policy comments

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

Modified: trunk/lib/plugin/RawHtml.php
===================================================================
--- trunk/lib/plugin/RawHtml.php	2021-09-30 12:43:51 UTC (rev 10602)
+++ trunk/lib/plugin/RawHtml.php	2021-09-30 12:52:20 UTC (rev 10603)
@@ -22,26 +22,16 @@
  *
  */
 
-// Moved to IniConfig and config-default.ini
-// Define ENABLE_RAW_HTML to false (in config.ini) to disable the RawHtml
-// plugin completely
-/*
-if (!defined('ENABLE_RAW_HTML'))
-    define('ENABLE_RAW_HTML', true);
-// must be locked
-if (!defined('ENABLE_RAW_HTML_LOCKEDONLY'))
-    define('ENABLE_RAW_HTML_LOCKEDONLY', true);
-// sanitize to safe html code
-if (!defined('ENABLE_RAW_HTML_SAFE'))
-    define('ENABLE_RAW_HTML_SAFE', true);
-*/
-
-/** We defined a better policy when to allow RawHtml:
+/**
+ * We defined a better policy when to allow RawHtml:
  *   ENABLE_RAW_HTML_LOCKEDONLY:
  *  - Allowed if page is locked by ADMIN_USER.
  *   ENABLE_RAW_HTML_SAFE:
  *  - Allow some sort of "safe" html tags and attributes.
  *    Unsafe attributes are automatically stripped. (Experimental!)
+ *
+ * Define ENABLE_RAW_HTML to false (in config.ini) to disable the RawHtml
+ * plugin completely
  */
 
 /**

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10602] trunk/lib/IniConfig.php

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

Revision: 10602
          http://sourceforge.net/p/phpwiki/code/10602
Author:   vargenau
Date:     2021-09-30 12:43:51 +0000 (Thu, 30 Sep 2021)
Log Message:
-----------
Remove function save_dump

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

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2021-09-30 11:00:26 UTC (rev 10601)
+++ trunk/lib/IniConfig.php	2021-09-30 12:43:51 UTC (rev 10602)
@@ -65,48 +65,6 @@
 include_once (dirname(__FILE__) . "/config.php");
 include_once (dirname(__FILE__) . "/FileFinder.php");
 
-/**
- * Speed-up iniconfig loading.
- *
- * Dump the static parts of the parsed config/config.ini settings to a fast-loadable config.php file.
- * The dynamic parts are then evaluated as before.
- * Requires write-permissions to config/config.php
- *
- * @param string $file
- */
-function save_dump($file)
-{
-    $vars =& $GLOBALS; // copy + unset not possible
-    $ignore = array();
-    foreach (array("SERVER", "ENV", "GET", "POST", "REQUEST", "COOKIE", "FILES") as $key) {
-        $ignore["HTTP_" . $key . "_VARS"]++;
-        $ignore["_" . $key]++;
-    }
-    foreach (array("HTTP_POST_FILES", "GLOBALS", "RUNTIMER", "ErrorManager", 'LANG',
-                 'HOME_PAGE', 'request', 'SCRIPT_NAME', 'VIRTUAL_PATH', 'SCRIPT_FILENAME') as $key)
-        $ignore[$key]++;
-    $fp = fopen($file, "wb");
-    fwrite($fp, "<?php\n");
-    fwrite($fp, "function wiki_configrestore(){\n");
-    //TODO: optimize this by removing ignore, big serialized array and merge into existing GLOBALS
-    foreach ($vars as $var => $val) {
-        if (!$ignore[$var])
-            fwrite($fp, "\$GLOBALS['" . $var . "']=unserialize(\""
-                . addslashes(serialize($val)) . "\");\n");
-    }
-    // cannot be optimized, maybe leave away predefined consts somehow
-    foreach (get_defined_constants() as $var => $val) {
-        if (substr($var, 0, 4) != "PHP_" and substr($var, 0, 2) != "E_"
-            and substr($var, 0, 2) != "T_"  and substr($var, 0, 2) != "M_"
-        )
-            fwrite($fp, "if(!defined('" . $var . "')) define('" . $var . "',unserialize(\""
-                . addslashes(serialize($val)) . "\"));\n");
-    }
-    fwrite($fp, "return 'noerr';}");
-    fwrite($fp, "?>");
-    fclose($fp);
-}
-
 function _check_int_constant(&$c)
 {
     // if int value == string value, force int type
@@ -521,12 +479,6 @@
     unset($rsdef);
 
     fixup_static_configs($file); //[1ms]
-    // Dump all globals and constants
-    // The question is if reading this is faster then doing IniConfig() + fixup_static_configs()
-    if (is_writable($dump)) {
-        save_dump($dump);
-    }
-    // store locale[] in config.php? This is too problematic.
     fixup_dynamic_configs(); // [100ms]
 }
 

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

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

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

Revision: 10601
          http://sourceforge.net/p/phpwiki/code/10601
Author:   vargenau
Date:     2021-09-30 11:00:26 +0000 (Thu, 30 Sep 2021)
Log Message:
-----------
READONLY is renamed as ISREADONLY, since "readonly" is now a keyword in PHP 8.1

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini
    trunk/configurator.php
    trunk/lib/DbaDatabase.php
    trunk/lib/IniConfig.php
    trunk/lib/PagePerm.php
    trunk/lib/WikiDB.php
    trunk/lib/main.php
    trunk/locale/it/pgsrc/NoteDiRilascio
    trunk/pgsrc/ReleaseNotes
    trunk/themes/default/templates/login.tmpl

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/config/config-default.ini	2021-09-30 11:00:26 UTC (rev 10601)
@@ -9,7 +9,7 @@
 ENABLE_XHTML_XML = false
 ENABLE_OPEN_GRAPH = false
 USECACHE = true
-READONLY = false
+ISREADONLY = false
 
 ; calculated dynamically, but need a default
 WIKIDB_NOCACHE_MARKUP = false

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/config/config-dist.ini	2021-09-30 11:00:26 UTC (rev 10601)
@@ -166,7 +166,7 @@
 ; Enable this for system maintainance (e.g. read-only mount) or a general
 ; read-only database.
 ; Default: false
-;READONLY = true
+;ISREADONLY = true
 
 ;==========================================================================
 ; Part One: Authentication and security settings.

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/configurator.php	2021-09-30 11:00:26 UTC (rev 10601)
@@ -501,8 +501,8 @@
 $properties["ENABLE_PAGE_PUBLIC"] =
     new boolean_define_commented_optional('ENABLE_PAGE_PUBLIC');
 
-$properties["READONLY"] =
-    new boolean_define_commented_optional('READONLY');
+$properties["ISREADONLY"] =
+    new boolean_define_commented_optional('ISREADONLY');
 
 $properties["Part One"] =
     new part('_part1', $SEPARATOR . "\n", "

Modified: trunk/lib/DbaDatabase.php
===================================================================
--- trunk/lib/DbaDatabase.php	2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/lib/DbaDatabase.php	2021-09-30 11:00:26 UTC (rev 10601)
@@ -91,7 +91,7 @@
             echo "You don't seem to have DBA support compiled into PHP.";
         }
 
-        if (READONLY) {
+        if (ISREADONLY) {
             $mode = 'r';
         }
 
@@ -109,13 +109,13 @@
                     and (isWindows() or !is_writable($this->_file))
             ) {
                 // try to continue with read-only
-                if (!defined("READONLY"))
-                    define("READONLY", true);
+                if (!defined("ISREADONLY"))
+                    define("ISREADONLY", true);
                 $request->_dbi->readonly = true;
                 $this->readonly = true;
                 $mode = "r";
             }
-            if (substr($mode, 0, 1) == "c" and file_exists($this->_file) and !READONLY)
+            if (substr($mode, 0, 1) == "c" and file_exists($this->_file) and !ISREADONLY)
                 $mode = "w";
             // conflict: wait some random time to unlock (as with ethernet)
             $secs = 0.5 + ((double)rand(1, 32767) / 32767);
@@ -132,8 +132,8 @@
                     . "\nmode: " . $mode
                     . "\nhandler: " . $this->_handler;
                 // try to continue with read-only
-                if (!defined("READONLY"))
-                    define("READONLY", true);
+                if (!defined("ISREADONLY"))
+                    define("ISREADONLY", true);
                 $request->_dbi->readonly = true;
                 $this->readonly = true;
                 if (!file_exists($this->_file)) {

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/lib/IniConfig.php	2021-09-30 11:00:26 UTC (rev 10601)
@@ -211,7 +211,7 @@
         'ENABLE_AUTH_OPENID', 'INSECURE_ACTIONS_LOCALHOST_ONLY',
         'ENABLE_MAILNOTIFY', 'ENABLE_RECENTCHANGESBOX', 'ENABLE_PAGE_PUBLIC',
         'ENABLE_AJAX', 'ENABLE_EXTERNAL_PAGES',
-        'READONLY'
+        'ISREADONLY'
     );
 
     $rs = @parse_ini_file($file);
@@ -276,7 +276,7 @@
                 'ALLOW_IMAP_LOGIN', 'ALLOW_USER_LOGIN',
                 'REQUIRE_SIGNIN_BEFORE_EDIT',
                 'WIKIDB_NOCACHE_MARKUP',
-                'COMPRESS_OUTPUT', 'USE_BYTEA', 'READONLY',
+                'COMPRESS_OUTPUT', 'USE_BYTEA', 'ISREADONLY',
             ))
         ) {
             ;

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/lib/PagePerm.php	2021-09-30 11:00:26 UTC (rev 10601)
@@ -248,7 +248,7 @@
             return 0;
         }
     }
-    if ((READONLY or $request->_dbi->readonly)
+    if ((ISREADONLY or $request->_dbi->readonly)
         and in_array($access, array('edit', 'create', 'change'))
     ) {
         return 0;

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/lib/WikiDB.php	2021-09-30 11:00:26 UTC (rev 10601)
@@ -99,7 +99,7 @@
             $this->_backend->check();
         }
         // might be changed when opening the database fails
-        $this->readonly = defined("READONLY") ? READONLY : false;
+        $this->readonly = defined("ISREADONLY") ? ISREADONLY : false;
     }
 
     /**
@@ -146,7 +146,7 @@
      *      Which dba handler to use.
      *
      * <dt> readonly
-     * <dd> Either set by config.ini: READONLY = true or detected automatically
+     * <dd> Either set by config.ini: ISREADONLY = true or detected automatically
      *      when a database can be read but cannot be updated.
      * </dl>
      *

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/lib/main.php	2021-09-30 11:00:26 UTC (rev 10601)
@@ -81,7 +81,7 @@
         if (USE_DB_SESSION) {
             include_once 'lib/DbSession.php';
             $dbi =& $this->_dbi;
-            if (defined('READONLY') and !READONLY) // READONLY might be set later
+            if (defined('ISREADONLY') and !ISREADONLY) // ISREADONLY might be set later
                 $this->_dbsession = new DbSession($dbi, $dbi->getParam('prefix')
                     . $dbi->getParam('db_session_table'));
         }

Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio	2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/locale/it/pgsrc/NoteDiRilascio	2021-09-30 11:00:26 UTC (rev 10601)
@@ -1,4 +1,4 @@
-Date: Wed, 11 Aug 2021 10:03:04 +0000
+Date: Thu, 30 Sep 2021 12:58:41 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=NoteDiRilascio;
@@ -8,6 +8,21 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
 
+== 1.6.1 2021-XX-XX Marc-Etienne Vargenau ==
+
+This release makes PhpWiki compatable with PHP 8.1.
+READONLY is renamed as ISREADONLY, since //readonly// is now a keyword in PHP 8.1.
+
+=== Fixes ===
+* Make list of pages work with PDO (~AllPages, ~MostPopular...)
+
+=== Changes ===
+* Remove ADODB DATABASE_TYPE. Use SQL (Pear) or PDO.
+* Add "Rename" tab in Sidebar theme.
+
+=== Plugins ===
+* Chart plugin: new argument "legend"
+
 == 1.6.0 2021-08-12 Marc-Etienne Vargenau ==
 
 Major release:
@@ -47,7 +62,7 @@
 * Updated pgsrc pages in all languages
 * Adding SPDX-License-Identifier in PHP source files
 
-===  Plugins ===
+=== Plugins ===
 * ~UpLoad plugin: put date and author in history
 * ~UpLoad plugin: don't inline images
 * PhpWeather removed, uses deprecated mysql functions

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/pgsrc/ReleaseNotes	2021-09-30 11:00:26 UTC (rev 10601)
@@ -1,4 +1,4 @@
-Date: Tue, 28 Sep 2021 17:38:55 +0000
+Date: Thu, 30 Sep 2021 12:58:41 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -10,6 +10,9 @@
 
 == 1.6.1 2021-XX-XX Marc-Etienne Vargenau ==
 
+This release makes PhpWiki compatable with PHP 8.1.
+READONLY is renamed as ISREADONLY, since //readonly// is now a keyword in PHP 8.1.
+
 === Fixes ===
 * Make list of pages work with PDO (~AllPages, ~MostPopular...)
 

Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl	2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/themes/default/templates/login.tmpl	2021-09-30 11:00:26 UTC (rev 10601)
@@ -6,7 +6,7 @@
 
 <?php
 $dbh = $request->getDbh();
-if (READONLY) {
+if (ISREADONLY) {
   echo asXML(HTML::p(array('class' => 'warning_msg'), _("System is locked as read-only for maintenance")));
 } elseif ($dbh->readonly) {
   echo asXML(HTML::p(array('class' => 'warning_msg'), _("Database is locked as read-only for maintenance")));

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