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

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

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

Revision: 10500
          http://sourceforge.net/p/phpwiki/code/10500
Author:   vargenau
Date:     2021-08-12 10:22:07 +0000 (Thu, 12 Aug 2021)
Log Message:
-----------
Remove unnecessary local variables, spelling

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

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2021-08-12 10:03:18 UTC (rev 10499)
+++ trunk/lib/CachedMarkup.php	2021-08-12 10:22:07 UTC (rev 10500)
@@ -60,7 +60,7 @@
             return false;
 
         // ZLIB format has a five bit checksum in its header.
-        // Lets check for sanity.
+        // Let's check for sanity.
         if (((ord($packed[0]) * 256 + ord($packed[1])) % 31 == 0)
             and (substr($packed, 0, 2) == "\037\213")
             or (substr($packed, 0, 2) == "x\332")
@@ -82,7 +82,7 @@
         return false;
     }
 
-    /** Get names of wikipages linked to.
+    /** Get names of wiki pages linked to.
      *
      * @return array of hashes { linkto=>pagename, relation=>pagename }
      */
@@ -450,19 +450,18 @@
 
 class Cached_SpellCheck extends Cached_WikiLink
 {
-    function __construct($word, $suggs)
+    function __construct($word, $suggestions)
     {
         $this->_page = $word;
-        $this->suggestions = $suggs;
+        $this->suggestions = $suggestions;
     }
 
     function expand($basepage, &$markup)
     {
-        $link = HTML::a(array('class' => 'spell-wrong',
+        return HTML::a(array('class' => 'spell-wrong',
                 'title' => 'SpellCheck: ' . join(', ', $this->suggestions),
                 'name' => $this->_page),
             $this->_page);
-        return $link;
     }
 }
 
@@ -853,8 +852,7 @@
         global $request;
 
         $loader = $this->_getLoader();
-        $xml = $loader->expandPI($this->_pi, $request, $markup, $basepage);
-        return $xml;
+        return $loader->expandPI($this->_pi, $request, $markup, $basepage);
     }
 
     function asString()

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

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

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

Revision: 10499
          http://sourceforge.net/p/phpwiki/code/10499
Author:   vargenau
Date:     2021-08-12 10:03:18 +0000 (Thu, 12 Aug 2021)
Log Message:
-----------
lib/CachedMarkup.php: function expand is public

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

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2021-08-11 19:08:06 UTC (rev 10498)
+++ trunk/lib/CachedMarkup.php	2021-08-12 10:03:18 UTC (rev 10499)
@@ -249,7 +249,7 @@
         $cache[] = $this;
     }
 
-    abstract protected function expand($basepage, &$obj);
+    abstract function expand($basepage, &$markup);
 
     function getWikiPageLinks($basepage)
     {
@@ -390,7 +390,6 @@
     function _getURL($basepage)
     {
         return WikiURL($this->getPagename($basepage));
-        //return WikiURL($this->getPagename($basepage), false, 'abs_url');
     }
 
     function expand($basepage, &$markup)

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

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

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

Revision: 10498
          http://sourceforge.net/p/phpwiki/code/10498
Author:   vargenau
Date:     2021-08-11 19:08:06 +0000 (Wed, 11 Aug 2021)
Log Message:
-----------
PHP Doc

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

Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php	2021-08-11 17:32:07 UTC (rev 10497)
+++ trunk/lib/WikiDB/backend/ADODB.php	2021-08-11 19:08:06 UTC (rev 10498)
@@ -373,7 +373,8 @@
      * @param int $version Which version to get
      * @param bool $want_content Do we need content?
      *
-     * @return array|false
+     * @return array|false The version data, or false if specified version does not exist.
+
      */
     function get_versiondata($pagename, $version, $want_content = 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:[10497] trunk

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

Revision: 10497
          http://sourceforge.net/p/phpwiki/code/10497
Author:   vargenau
Date:     2021-08-11 17:32:07 +0000 (Wed, 11 Aug 2021)
Log Message:
-----------
1.6.0 2021-08-12

Modified Paths:
--------------
    trunk/locale/it/pgsrc/NoteDiRilascio
    trunk/pgsrc/ReleaseNotes

Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio	2021-08-11 17:22:25 UTC (rev 10496)
+++ trunk/locale/it/pgsrc/NoteDiRilascio	2021-08-11 17:32:07 UTC (rev 10497)
@@ -8,7 +8,7 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
 
-== 1.6.0 2021-08-XX Marc-Etienne Vargenau ==
+== 1.6.0 2021-08-12 Marc-Etienne Vargenau ==
 
 Major release:
 * PHP 7 and 8 compatible (works from PHP 5.3.3 to PHP 8.0)
@@ -35,7 +35,6 @@
 * Update PEAR.php to release 1.10.12
 * Update Pear DB library to 1.10.0
 * Update Pear Cache library to 1.5.6
-* Replace ##ereg## functions
 * Update Adodb to version 5.20.19
 * Update ASCIIMathPHP to version 2.1 (from Zefling/ASCIIMathPHP on github.com)
 * Update highlight.js to version 9.15.6
@@ -43,7 +42,7 @@
 * Valid HTML5 and CSS3 logos (in debug mode)
 * Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth.
 * Remove Fusionforge-specific files (g view.php wikiadmin.php wikilist.php)
-* Remove USE_SAFE_DBSESSION (always true)
+* Remove USE_SAFE_DBSESSION (always true), DISABLE_HTTP_REDIRECT
 * PDO patch by Sébastien Le Callonnec
 * Updated pgsrc pages in all languages
 * Adding SPDX-License-Identifier in PHP source files

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2021-08-11 17:22:25 UTC (rev 10496)
+++ trunk/pgsrc/ReleaseNotes	2021-08-11 17:32:07 UTC (rev 10497)
@@ -8,7 +8,7 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
 
-== 1.6.0 2021-08-XX Marc-Etienne Vargenau ==
+== 1.6.0 2021-08-12 Marc-Etienne Vargenau ==
 
 Major release:
 * PHP 7 and 8 compatible (works from PHP 5.3.3 to PHP 8.0)
@@ -35,7 +35,6 @@
 * Update PEAR.php to release 1.10.12
 * Update Pear DB library to 1.10.0
 * Update Pear Cache library to 1.5.6
-* Replace ##ereg## functions
 * Update Adodb to version 5.20.19
 * Update ASCIIMathPHP to version 2.1 (from Zefling/ASCIIMathPHP on github.com)
 * Update highlight.js to version 9.15.6
@@ -43,7 +42,7 @@
 * Valid HTML5 and CSS3 logos (in debug mode)
 * Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth.
 * Remove Fusionforge-specific files (g view.php wikiadmin.php wikilist.php)
-* Remove USE_SAFE_DBSESSION (always true)
+* Remove USE_SAFE_DBSESSION (always true), DISABLE_HTTP_REDIRECT
 * PDO patch by Sébastien Le Callonnec
 * Updated pgsrc pages in all languages
 * Adding SPDX-License-Identifier in PHP source files

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10496] trunk/lib/plugin/RssFeed.php

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

Revision: 10496
          http://sourceforge.net/p/phpwiki/code/10496
Author:   vargenau
Date:     2021-08-11 17:22:25 +0000 (Wed, 11 Aug 2021)
Log Message:
-----------
Fix http://phpwiki.demo.free.fr URL

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

Modified: trunk/lib/plugin/RssFeed.php
===================================================================
--- trunk/lib/plugin/RssFeed.php	2021-08-11 17:21:38 UTC (rev 10495)
+++ trunk/lib/plugin/RssFeed.php	2021-08-11 17:22:25 UTC (rev 10496)
@@ -41,7 +41,7 @@
     {
         return array('feed' => "",
             'description' => "",
-            'url' => "", //"http://phpwiki.demo.free.fr/RecentChanges?format=rss",
+            'url' => "", // "http://phpwiki.demo.free.fr/index.php/RecentChanges?format=rss",
             'maxitem' => 0,
             'titleonly' => false,
             'debug' => 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:[10495] trunk

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

Revision: 10495
          http://sourceforge.net/p/phpwiki/code/10495
Author:   vargenau
Date:     2021-08-11 17:21:38 +0000 (Wed, 11 Aug 2021)
Log Message:
-----------
Rename class XmlParser as PhpWikiXmlParser due to PHP 8 final class XMLParser

Modified Paths:
--------------
    trunk/lib/AtomParser.php
    trunk/lib/HtmlParser.php
    trunk/lib/RssParser.php
    trunk/lib/XmlElement.php
    trunk/lib/plugin/FoafViewer.php
    trunk/lib/stdlib.php
    trunk/locale/Makefile

Added Paths:
-----------
    trunk/lib/PhpWikiXmlParser.php

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

Modified: trunk/lib/AtomParser.php
===================================================================
--- trunk/lib/AtomParser.php	2021-08-11 16:37:58 UTC (rev 10494)
+++ trunk/lib/AtomParser.php	2021-08-11 17:21:38 UTC (rev 10495)
@@ -28,10 +28,10 @@
  *
  * @author: Sébastien Le Callonnec
  */
-require_once 'lib/XmlParser.php';
+require_once 'lib/PhpWikiXmlParser.php';
 
 class AtomParser
-    extends XmlParser
+    extends PhpWikiXmlParser
 {
     // Feed
     public $feed = array();

Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php	2021-08-11 16:37:58 UTC (rev 10494)
+++ trunk/lib/HtmlParser.php	2021-08-11 17:21:38 UTC (rev 10495)
@@ -24,7 +24,7 @@
 
 /**
  * HtmlParser Class: Conversion HTML => wikimarkup
- * Requires XmlParser, XmlElement and the expat (or now the libxml) library. This is all in core.
+ * Requires PhpWikiXmlParser, XmlElement and the expat (or now the libxml) library. This is all in core.
  */
 
 /**
@@ -40,10 +40,10 @@
  */
 
 // RssParser contains the XML (expat) and url-grabber methods
-require_once 'lib/XmlParser.php';
+require_once 'lib/PhpWikiXmlParser.php';
 
 class HtmlParser
-    extends XmlParser
+    extends PhpWikiXmlParser
 {
     public $dialect, $_handlers, $root;
 
@@ -51,13 +51,13 @@
     {
         $this->dialect = new HtmlParser_PhpWiki();
         $this->_handlers =& $this->dialect->_handlers;
-        $this->XmlParser($encoding);
+        $this->PhpWikiXmlParser($encoding);
         xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, 0);
         xml_parser_set_option($this->_parser, XML_OPTION_SKIP_WHITE, 1);
     }
 
     // The three callbacks, called on walking through the HTML tree.
-    // No extensions needed from XmlParser.
+    // No extensions needed from PhpWikiXmlParser.
     /*
     function tag_open($parser, $name, $attrs='') {
     }

Copied: trunk/lib/PhpWikiXmlParser.php (from rev 10494, trunk/lib/XmlParser.php)
===================================================================
--- trunk/lib/PhpWikiXmlParser.php	                        (rev 0)
+++ trunk/lib/PhpWikiXmlParser.php	2021-08-11 17:21:38 UTC (rev 10495)
@@ -0,0 +1,181 @@
+<?php
+/**
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ */
+
+/**
+ * Base PhpWikiXmlParser Class.
+ * Requires the expat.so/.dll, usually enabled by default.
+ * Used by HtmlParser and RssParser.
+ *
+ * @author: Reini Urban
+ *
+ * TODO: Convert more perl Html::Element style to our XmlElement style
+ * Needed additions to XmlElement:
+ *   Html::Element::parent() <=> XmlElement::parent
+ *   Html::Element::attr()   <=> XmlElement::getAttr()
+ *   Html::Element::tag      <=> XmlElement::_tag
+ *   Html::Element::content_list() <=> ->getContent() ??? or ->_children[]
+ *   all_external_attr_names() <=>
+ *
+ * Problems:
+ * The HtmlParser object set by xml_parse() doesn't keep its parameters,
+ * esp. $this->root is lost. So we have to this into a global.
+ */
+
+/**
+ * class PhpWikiXmlParser - Parse into a tree of XmlElement nodes.
+ *
+ * PHP Problems:
+ *   inside the handlers no globals are transported, only class vars.
+ *   when leaving the handler class all class vars are destroyed, so we
+ *   have to copy the root to a global.
+ *
+ */
+class PhpWikiXmlParser
+{
+    public $_parser, $root, $current, $previous, $parent;
+
+    function __construct($encoding = '')
+    {
+        if ($encoding)
+            $this->_parser = xml_parser_create($encoding);
+        else
+            $this->_parser = xml_parser_create();
+
+        xml_parser_set_option($this->_parser, XML_OPTION_TARGET_ENCODING, 'UTF-8');
+
+        //This unfortunately does not work
+        //xml_set_object($this->_parser, &$this);
+
+        xml_set_element_handler($this->_parser,
+            array(&$this, 'tag_open'),
+            array(&$this, 'tag_close'));
+        xml_set_character_data_handler($this->_parser,
+            array(&$this, 'cdata'));
+        //xml_set_element_handler($this->_parser, "tag_open", "tag_close");
+        //xml_set_character_data_handler($this->_parser, "cdata");
+
+        // Hack: workaround php OO bug
+        unset($GLOBALS['xml_parser_root']);
+    }
+
+    function __destruct()
+    {
+        global $xml_parser_root, $xml_parser_current;
+
+        if (!empty($this->_parser)) xml_parser_free($this->_parser);
+        unset($this->_parser);
+
+        if (isset($xml_parser_root)) {
+            $xml_parser_root->_destruct();
+            unset($xml_parser_root); // nested parsing forbidden!
+        }
+        unset($xml_parser_current);
+    }
+
+    function tag_open($parser, $name, $attrs = '')
+    {
+        $this->_tag = strtolower($name);
+        $node = new XmlElement($this->_tag);
+        if (is_string($attrs) and !empty($attrs)) {
+            // lowercase attr names
+            foreach (explode(' ', $attrs) as $pair) {
+                if (strstr($pair, "=")) {
+                    list($key, $val) = explode('=', $pair);
+                    $key = strtolower(trim($key));
+                    $val = str_replace(array('"', "'"), '', trim($val));
+                    $node->_attr[$key] = $val;
+                } else {
+                    $key = str_replace(array('"', "'"), '', strtolower(trim($pair)));
+                    $node->_attr[$key] = $key;
+                }
+            }
+        } elseif (!empty($attrs) and is_array($attrs)) {
+            foreach ($attrs as $key => $val) {
+                $key = strtolower(trim($key));
+                $val = str_replace(array('"', "'"), '', trim($val));
+                $node->_attr[$key] = $val;
+            }
+        }
+        if (!is_null($this->current)) {
+            $this->current->_content[] =& $node; // copy or ref?
+            $node->previous =& $this->current; // ref to parallel prev
+        }
+        $this->current =& $node; // ref
+        if (empty($this->root)) {
+            $this->root =& $node; // ref for === test below
+            $GLOBALS['xml_parser_root'] =& $this->root; // copy
+        }
+    }
+
+    function tag_close($parser, $name, $attrs = '')
+    {
+        $this->current->parent = $this->current; // copy!
+        $this->current =& $this->current->parent; // ref!
+        //unset($this->current);
+    }
+
+    function cdata($parser, $data)
+    {
+        if (isset($this->current)) {
+            $this->current->_content[] = $data;
+        } else {
+            trigger_error(sprintf("unparsed content outside tags: %s", $data), E_USER_WARNING);
+        }
+        if ($this->current === $this->root) { // workaround php OO bug: ref => copy
+            $GLOBALS['xml_parser_root'] =& $this->root; // copy!
+            //$this->root = $this->current;       // copy?
+        }
+    }
+
+    function parse($content, $is_final = true)
+    {
+        xml_parse($this->_parser, $content, $is_final) or
+            trigger_error(sprintf("XML error: %s at line %d",
+                    xml_error_string(xml_get_error_code($this->_parser)),
+                    xml_get_current_line_number($this->_parser)),
+                E_USER_WARNING);
+    }
+
+    function parse_url($file, $debug = false)
+    {
+        if (get_cfg_var('allow_url_fopen')) {
+            if (!($fp = fopen("$file", "r"))) {
+                trigger_error("Error parse url $file");
+                return;
+            }
+            $content = "";
+            while ($data = fread($fp, 4096)) {
+                $content .= $data;
+            }
+            fclose($fp);
+            $this->parse($content);
+        } else {
+            // other url_fopen workarounds: curl, socket (http 80 only)
+            $data = url_get_contents($file);
+            if (empty($data)) {
+                trigger_error("Error parse url $file");
+                return;
+            }
+            $this->parse($data);
+        }
+    }
+}

Modified: trunk/lib/RssParser.php
===================================================================
--- trunk/lib/RssParser.php	2021-08-11 16:37:58 UTC (rev 10494)
+++ trunk/lib/RssParser.php	2021-08-11 17:21:38 UTC (rev 10495)
@@ -25,7 +25,7 @@
  * Based on Duncan Gough RSSParser class
  * Copyleft Arnaud Fontaine
  * Licence : GPL
- * See lib/plugin/RssFeed.php and lib/XmlParser.php
+ * See lib/plugin/RssFeed.php and lib/PhpWikiXmlParser.php
  *
  * The myth of RSS compatibility:
  *   http://diveintomark.org/archives/2004/02/04/incompatible-rss
@@ -41,10 +41,10 @@
  *     http://ws.audioscrobbler.com/rdf/ for example
  */
 
-require_once 'lib/XmlParser.php';
+require_once 'lib/PhpWikiXmlParser.php';
 
 class RSSParser
-    extends XmlParser
+    extends PhpWikiXmlParser
 {
 
     public $title = "";

Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php	2021-08-11 16:37:58 UTC (rev 10494)
+++ trunk/lib/XmlElement.php	2021-08-11 17:21:38 UTC (rev 10495)
@@ -263,7 +263,7 @@
         $this->setContent($args);
     }
 
-    /** Methods only needed for XmlParser,
+    /** Methods only needed for PhpWikiXmlParser,
      *  to be fully compatible to perl Html::Element
      */
     // doesn't yet work with php5 as __destruct()
@@ -289,7 +289,7 @@
         return !empty($this->_children);
     }
 
-    /* End XmlParser Methods
+    /* End PhpWikiXmlParser Methods
      */
 
     function getTag()

Deleted: trunk/lib/XmlParser.php
===================================================================
--- trunk/lib/XmlParser.php	2021-08-11 16:37:58 UTC (rev 10494)
+++ trunk/lib/XmlParser.php	2021-08-11 17:21:38 UTC (rev 10495)
@@ -1,181 +0,0 @@
-<?php
-/**
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- */
-
-/**
- * Base XmlParser Class.
- * Requires the expat.so/.dll, usually enabled by default.
- * Used by HtmlParser and RssParser.
- *
- * @author: Reini Urban
- *
- * TODO: Convert more perl Html::Element style to our XmlElement style
- * Needed additions to XmlElement:
- *   Html::Element::parent() <=> XmlElement::parent
- *   Html::Element::attr()   <=> XmlElement::getAttr()
- *   Html::Element::tag      <=> XmlElement::_tag
- *   Html::Element::content_list() <=> ->getContent() ??? or ->_children[]
- *   all_external_attr_names() <=>
- *
- * Problems:
- * The HtmlParser object set by xml_parse() doesn't keep its parameters,
- * esp. $this->root is lost. So we have to this into a global.
- */
-
-/**
- * class XmlParser - Parse into a tree of XmlElement nodes.
- *
- * PHP Problems:
- *   inside the handlers no globals are transported, only class vars.
- *   when leaving the handler class all class vars are destroyed, so we
- *   have to copy the root to a global.
- *
- */
-class XmlParser
-{
-    public $_parser, $root, $current, $previous, $parent;
-
-    function __construct($encoding = '')
-    {
-        if ($encoding)
-            $this->_parser = xml_parser_create($encoding);
-        else
-            $this->_parser = xml_parser_create();
-
-        xml_parser_set_option($this->_parser, XML_OPTION_TARGET_ENCODING, 'UTF-8');
-
-        //This unfortunately does not work
-        //xml_set_object($this->_parser, &$this);
-
-        xml_set_element_handler($this->_parser,
-            array(&$this, 'tag_open'),
-            array(&$this, 'tag_close'));
-        xml_set_character_data_handler($this->_parser,
-            array(&$this, 'cdata'));
-        //xml_set_element_handler($this->_parser, "tag_open", "tag_close");
-        //xml_set_character_data_handler($this->_parser, "cdata");
-
-        // Hack: workaround php OO bug
-        unset($GLOBALS['xml_parser_root']);
-    }
-
-    function __destruct()
-    {
-        global $xml_parser_root, $xml_parser_current;
-
-        if (!empty($this->_parser)) xml_parser_free($this->_parser);
-        unset($this->_parser);
-
-        if (isset($xml_parser_root)) {
-            $xml_parser_root->_destruct();
-            unset($xml_parser_root); // nested parsing forbidden!
-        }
-        unset($xml_parser_current);
-    }
-
-    function tag_open($parser, $name, $attrs = '')
-    {
-        $this->_tag = strtolower($name);
-        $node = new XmlElement($this->_tag);
-        if (is_string($attrs) and !empty($attrs)) {
-            // lowercase attr names
-            foreach (explode(' ', $attrs) as $pair) {
-                if (strstr($pair, "=")) {
-                    list($key, $val) = explode('=', $pair);
-                    $key = strtolower(trim($key));
-                    $val = str_replace(array('"', "'"), '', trim($val));
-                    $node->_attr[$key] = $val;
-                } else {
-                    $key = str_replace(array('"', "'"), '', strtolower(trim($pair)));
-                    $node->_attr[$key] = $key;
-                }
-            }
-        } elseif (!empty($attrs) and is_array($attrs)) {
-            foreach ($attrs as $key => $val) {
-                $key = strtolower(trim($key));
-                $val = str_replace(array('"', "'"), '', trim($val));
-                $node->_attr[$key] = $val;
-            }
-        }
-        if (!is_null($this->current)) {
-            $this->current->_content[] =& $node; // copy or ref?
-            $node->previous =& $this->current; // ref to parallel prev
-        }
-        $this->current =& $node; // ref
-        if (empty($this->root)) {
-            $this->root =& $node; // ref for === test below
-            $GLOBALS['xml_parser_root'] =& $this->root; // copy
-        }
-    }
-
-    function tag_close($parser, $name, $attrs = '')
-    {
-        $this->current->parent = $this->current; // copy!
-        $this->current =& $this->current->parent; // ref!
-        //unset($this->current);
-    }
-
-    function cdata($parser, $data)
-    {
-        if (isset($this->current)) {
-            $this->current->_content[] = $data;
-        } else {
-            trigger_error(sprintf("unparsed content outside tags: %s", $data), E_USER_WARNING);
-        }
-        if ($this->current === $this->root) { // workaround php OO bug: ref => copy
-            $GLOBALS['xml_parser_root'] =& $this->root; // copy!
-            //$this->root = $this->current;       // copy?
-        }
-    }
-
-    function parse($content, $is_final = true)
-    {
-        xml_parse($this->_parser, $content, $is_final) or
-            trigger_error(sprintf("XML error: %s at line %d",
-                    xml_error_string(xml_get_error_code($this->_parser)),
-                    xml_get_current_line_number($this->_parser)),
-                E_USER_WARNING);
-    }
-
-    function parse_url($file, $debug = false)
-    {
-        if (get_cfg_var('allow_url_fopen')) {
-            if (!($fp = fopen("$file", "r"))) {
-                trigger_error("Error parse url $file");
-                return;
-            }
-            $content = "";
-            while ($data = fread($fp, 4096)) {
-                $content .= $data;
-            }
-            fclose($fp);
-            $this->parse($content);
-        } else {
-            // other url_fopen workarounds: curl, socket (http 80 only)
-            $data = url_get_contents($file);
-            if (empty($data)) {
-                trigger_error("Error parse url $file");
-                return;
-            }
-            $this->parse($data);
-        }
-    }
-}

Modified: trunk/lib/plugin/FoafViewer.php
===================================================================
--- trunk/lib/plugin/FoafViewer.php	2021-08-11 16:37:58 UTC (rev 10494)
+++ trunk/lib/plugin/FoafViewer.php	2021-08-11 17:21:38 UTC (rev 10495)
@@ -52,7 +52,7 @@
  * TODO:
  *  - use a template.
  *  - use the phpwiki internal user foaf data (stored by a UserPreferences extension)
- *  - fix the pear FOAF Parser or we'll write our own (based on our XmlParser)
+ *  - fix the pear FOAF Parser or we'll write our own (based on our PhpWikiXmlParser)
  */
 class WikiPlugin_FoafViewer
     extends WikiPlugin

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2021-08-11 16:37:58 UTC (rev 10494)
+++ trunk/lib/stdlib.php	2021-08-11 17:21:38 UTC (rev 10495)
@@ -1710,7 +1710,7 @@
 /**
  * Workaround for allow_url_fopen, to get the content of an external URI.
  * It returns the contents in one slurp. Parsers might want to check for allow_url_fopen
- * and use fopen, fread chunkwise. (see lib/XmlParser.php)
+ * and use fopen, fread chunkwise. (see lib/PhpWikiXmlParser.php)
  */
 function url_get_contents($uri)
 {

Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2021-08-11 16:37:58 UTC (rev 10494)
+++ trunk/locale/Makefile	2021-08-11 17:21:38 UTC (rev 10495)
@@ -379,7 +379,7 @@
 ${POT_FILE}: .././lib/WysiwygEdit/tinymce.php
 ${POT_FILE}: .././lib/WysiwygEdit/Wikiwyg.php
 ${POT_FILE}: .././lib/XmlElement.php
-${POT_FILE}: .././lib/XmlParser.php
+${POT_FILE}: .././lib/PhpWikiXmlParser.php
 ${POT_FILE}: .././lib/XmlRpcClient.php
 ${POT_FILE}: .././lib/XmlRpcServer.php
 ${POT_FILE}: .././lib/XMLRPC/utils.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:[10494] trunk

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

Revision: 10494
          http://sourceforge.net/p/phpwiki/code/10494
Author:   vargenau
Date:     2021-08-11 16:37:58 +0000 (Wed, 11 Aug 2021)
Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo
    trunk/themes/Crao/templates/head.tmpl
    trunk/themes/Crao/templates/htmldump.tmpl
    trunk/themes/Sidebar/templates/htmldump.tmpl
    trunk/themes/default/templates/head.tmpl
    trunk/themes/default/templates/htmldump.tmpl
    trunk/themes/wikilens/templates/head.tmpl

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2021-08-11 16:12:17 UTC (rev 10493)
+++ trunk/locale/po/de.po	2021-08-11 16:37:58 UTC (rev 10494)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-06 17:14+0200\n"
+"POT-Creation-Date: 2021-08-11 18:36+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -2917,30 +2917,6 @@
 msgstr "Versionendaten in den Cachespeicher aufgenommen:"
 
 #, php-format
-msgid "Keep up to %d major edits, but keep them no longer than %d days."
-msgstr ""
-"Aufbewahrung größerer Änderungen für %d, aber nicht länger als %d Tage."
-
-#, php-format
-msgid " Keep up to %d minor edits, but keep them no longer than %d days."
-msgstr ""
-"Aufbewahrung kleinerer Änderungen für %d, aber nicht länger als %d Tage."
-
-#, php-format
-msgid " Keep the latest contributions of the last %d authors up to %d days."
-msgstr "Aufbewahrung der neueren Beiträge der letzten %d Autoren für %d Tage."
-
-#, php-format
-msgid ""
-" Additionally, try to keep the latest contributions of all authors in the "
-"last %d days (even if there are more than %d of them,) but in no case keep "
-"more than %d unique author revisions."
-msgstr ""
-"Versuche zusätzlich die neuesten Beiträge aller Autoren der letzten %d Tage "
-"aufzubewahren (auch wenn es mehr als %d sind), keinesfalls jedoch mehr als "
-"%d einzelne Autoren Revisionen."
-
-#, php-format
 msgid "%d pages"
 msgstr "%d Seiten"
 
@@ -3044,9 +3020,6 @@
 msgid "Harddisc usage"
 msgstr ""
 
-msgid "Expiry parameters"
-msgstr ""
-
 msgid "Wikiname regexp"
 msgstr "Wikiname regexp"
 
@@ -3807,6 +3780,13 @@
 msgid "Bad action requested: %s"
 msgstr ""
 
+#, php-format
+msgid "WikiAdminUtils %s returned:"
+msgstr "WikiAdminUtils %s gibt zurück:"
+
+msgid "Back"
+msgstr "Zurück"
+
 msgid "Purge Markup Cache"
 msgstr "HTML-Cachedatei Säubern"
 
@@ -5894,12 +5874,30 @@
 msgstr "Diese Seite bearbeiten"
 
 #, php-format
-#~ msgid "WikiAdminUtils %s returned:"
-#~ msgstr "WikiAdminUtils %s gibt zurück:"
+#~ msgid "Keep up to %d major edits, but keep them no longer than %d days."
+#~ msgstr ""
+#~ "Aufbewahrung größerer Änderungen für %d, aber nicht länger als %d Tage."
 
-#~ msgid "Back"
-#~ msgstr "Zurück"
+#, php-format
+#~ msgid " Keep up to %d minor edits, but keep them no longer than %d days."
+#~ msgstr ""
+#~ "Aufbewahrung kleinerer Änderungen für %d, aber nicht länger als %d Tage."
 
+#, php-format
+#~ msgid " Keep the latest contributions of the last %d authors up to %d days."
+#~ msgstr ""
+#~ "Aufbewahrung der neueren Beiträge der letzten %d Autoren für %d Tage."
+
+#, php-format
+#~ msgid ""
+#~ " Additionally, try to keep the latest contributions of all authors in the "
+#~ "last %d days (even if there are more than %d of them,) but in no case "
+#~ "keep more than %d unique author revisions."
+#~ msgstr ""
+#~ "Versuche zusätzlich die neuesten Beiträge aller Autoren der letzten %d "
+#~ "Tage aufzubewahren (auch wenn es mehr als %d sind), keinesfalls jedoch "
+#~ "mehr als %d einzelne Autoren Revisionen."
+
 #~ msgid "fixed with"
 #~ msgstr "Geändert mit"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2021-08-11 16:12:17 UTC (rev 10493)
+++ trunk/locale/po/es.po	2021-08-11 16:37:58 UTC (rev 10494)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-06 17:14+0200\n"
+"POT-Creation-Date: 2021-08-11 18:36+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -2839,25 +2839,6 @@
 msgstr ""
 
 #, php-format
-msgid "Keep up to %d major edits, but keep them no longer than %d days."
-msgstr ""
-
-#, php-format
-msgid " Keep up to %d minor edits, but keep them no longer than %d days."
-msgstr ""
-
-#, php-format
-msgid " Keep the latest contributions of the last %d authors up to %d days."
-msgstr ""
-
-#, php-format
-msgid ""
-" Additionally, try to keep the latest contributions of all authors in the "
-"last %d days (even if there are more than %d of them,) but in no case keep "
-"more than %d unique author revisions."
-msgstr ""
-
-#, php-format
 msgid "%d pages"
 msgstr "%d páginas"
 
@@ -2960,9 +2941,6 @@
 msgid "Harddisc usage"
 msgstr ""
 
-msgid "Expiry parameters"
-msgstr ""
-
 msgid "Wikiname regexp"
 msgstr ""
 
@@ -3697,6 +3675,13 @@
 msgid "Bad action requested: %s"
 msgstr ""
 
+#, php-format
+msgid "WikiAdminUtils %s returned:"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
 msgid "Purge Markup Cache"
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2021-08-11 16:12:17 UTC (rev 10493)
+++ trunk/locale/po/fr.po	2021-08-11 16:37:58 UTC (rev 10494)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-06 17:14+0200\n"
+"POT-Creation-Date: 2021-08-11 18:36+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -2889,29 +2889,6 @@
 msgstr "version bufferisée :"
 
 #, php-format
-msgid "Keep up to %d major edits, but keep them no longer than %d days."
-msgstr "Garder jusqu'à %d édition majeures, mais pas plus que %d jours."
-
-#, php-format
-msgid " Keep up to %d minor edits, but keep them no longer than %d days."
-msgstr "Garder jusqu'à %d édition mineures, mais pas plus que %d jours."
-
-#, php-format
-msgid " Keep the latest contributions of the last %d authors up to %d days."
-msgstr ""
-"Garder les dernières contributions des derniers %d auteurs jusqu'à %d jours."
-
-#, php-format
-msgid ""
-" Additionally, try to keep the latest contributions of all authors in the "
-"last %d days (even if there are more than %d of them,) but in no case keep "
-"more than %d unique author revisions."
-msgstr ""
-"De plus, essayez de conserver les dernières contributions de tous les "
-"auteurs depuis les %d derniers jours (même s'il y en a plus que %d), mais ne "
-"conservez en aucun cas plus que %d versions par auteur."
-
-#, php-format
 msgid "%d pages"
 msgstr "%d pages"
 
@@ -3014,9 +2991,6 @@
 msgid "Harddisc usage"
 msgstr "Utilisation du disque"
 
-msgid "Expiry parameters"
-msgstr "Paramètres d'expiration"
-
 msgid "Wikiname regexp"
 msgstr "Expression rationnelle du WikiNom"
 
@@ -3788,6 +3762,13 @@
 msgid "Bad action requested: %s"
 msgstr ""
 
+#, php-format
+msgid "WikiAdminUtils %s returned:"
+msgstr ""
+
+msgid "Back"
+msgstr "Retour"
+
 msgid "Purge Markup Cache"
 msgstr "Purger le cache"
 
@@ -5841,9 +5822,33 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
-#~ msgid "Back"
-#~ msgstr "Retour"
+#, php-format
+#~ msgid "Keep up to %d major edits, but keep them no longer than %d days."
+#~ msgstr "Garder jusqu'à %d édition majeures, mais pas plus que %d jours."
 
+#, php-format
+#~ msgid " Keep up to %d minor edits, but keep them no longer than %d days."
+#~ msgstr "Garder jusqu'à %d édition mineures, mais pas plus que %d jours."
+
+#, php-format
+#~ msgid " Keep the latest contributions of the last %d authors up to %d days."
+#~ msgstr ""
+#~ "Garder les dernières contributions des derniers %d auteurs jusqu'à %d "
+#~ "jours."
+
+#, php-format
+#~ msgid ""
+#~ " Additionally, try to keep the latest contributions of all authors in the "
+#~ "last %d days (even if there are more than %d of them,) but in no case "
+#~ "keep more than %d unique author revisions."
+#~ msgstr ""
+#~ "De plus, essayez de conserver les dernières contributions de tous les "
+#~ "auteurs depuis les %d derniers jours (même s'il y en a plus que %d), mais "
+#~ "ne conservez en aucun cas plus que %d versions par auteur."
+
+#~ msgid "Expiry parameters"
+#~ msgstr "Paramètres d'expiration"
+
 #~ msgid "DB Check"
 #~ msgstr "Vérification de la base de données"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2021-08-11 16:12:17 UTC (rev 10493)
+++ trunk/locale/po/it.po	2021-08-11 16:37:58 UTC (rev 10494)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-06 17:14+0200\n"
+"POT-Creation-Date: 2021-08-11 18:36+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -2816,25 +2816,6 @@
 msgstr ""
 
 #, php-format
-msgid "Keep up to %d major edits, but keep them no longer than %d days."
-msgstr ""
-
-#, php-format
-msgid " Keep up to %d minor edits, but keep them no longer than %d days."
-msgstr ""
-
-#, php-format
-msgid " Keep the latest contributions of the last %d authors up to %d days."
-msgstr ""
-
-#, php-format
-msgid ""
-" Additionally, try to keep the latest contributions of all authors in the "
-"last %d days (even if there are more than %d of them,) but in no case keep "
-"more than %d unique author revisions."
-msgstr ""
-
-#, php-format
 msgid "%d pages"
 msgstr ""
 
@@ -2937,9 +2918,6 @@
 msgid "Harddisc usage"
 msgstr ""
 
-msgid "Expiry parameters"
-msgstr ""
-
 msgid "Wikiname regexp"
 msgstr ""
 
@@ -3674,6 +3652,13 @@
 msgid "Bad action requested: %s"
 msgstr ""
 
+#, php-format
+msgid "WikiAdminUtils %s returned:"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
 msgid "Purge Markup Cache"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2021-08-11 16:12:17 UTC (rev 10493)
+++ trunk/locale/po/ja.po	2021-08-11 16:37:58 UTC (rev 10494)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-06 17:14+0200\n"
+"POT-Creation-Date: 2021-08-11 18:36+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -2802,25 +2802,6 @@
 msgstr "バージョンデータをキャッシュ:"
 
 #, php-format
-msgid "Keep up to %d major edits, but keep them no longer than %d days."
-msgstr ""
-
-#, php-format
-msgid " Keep up to %d minor edits, but keep them no longer than %d days."
-msgstr ""
-
-#, php-format
-msgid " Keep the latest contributions of the last %d authors up to %d days."
-msgstr ""
-
-#, php-format
-msgid ""
-" Additionally, try to keep the latest contributions of all authors in the "
-"last %d days (even if there are more than %d of them,) but in no case keep "
-"more than %d unique author revisions."
-msgstr ""
-
-#, php-format
 msgid "%d pages"
 msgstr ""
 
@@ -2923,9 +2904,6 @@
 msgid "Harddisc usage"
 msgstr ""
 
-msgid "Expiry parameters"
-msgstr ""
-
 msgid "Wikiname regexp"
 msgstr ""
 
@@ -3660,6 +3638,13 @@
 msgid "Bad action requested: %s"
 msgstr ""
 
+#, php-format
+msgid "WikiAdminUtils %s returned:"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
 msgid "Purge Markup Cache"
 msgstr "マークアップキャッシュの破棄"
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2021-08-11 16:12:17 UTC (rev 10493)
+++ trunk/locale/po/nl.po	2021-08-11 16:37:58 UTC (rev 10494)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-06 17:14+0200\n"
+"POT-Creation-Date: 2021-08-11 18:36+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -2808,25 +2808,6 @@
 msgstr ""
 
 #, php-format
-msgid "Keep up to %d major edits, but keep them no longer than %d days."
-msgstr ""
-
-#, php-format
-msgid " Keep up to %d minor edits, but keep them no longer than %d days."
-msgstr ""
-
-#, php-format
-msgid " Keep the latest contributions of the last %d authors up to %d days."
-msgstr ""
-
-#, php-format
-msgid ""
-" Additionally, try to keep the latest contributions of all authors in the "
-"last %d days (even if there are more than %d of them,) but in no case keep "
-"more than %d unique author revisions."
-msgstr ""
-
-#, php-format
 msgid "%d pages"
 msgstr ""
 
@@ -2929,9 +2910,6 @@
 msgid "Harddisc usage"
 msgstr ""
 
-msgid "Expiry parameters"
-msgstr ""
-
 msgid "Wikiname regexp"
 msgstr ""
 
@@ -3666,6 +3644,13 @@
 msgid "Bad action requested: %s"
 msgstr ""
 
+#, php-format
+msgid "WikiAdminUtils %s returned:"
+msgstr ""
+
+msgid "Back"
+msgstr "Terug"
+
 msgid "Purge Markup Cache"
 msgstr ""
 
@@ -5665,9 +5650,6 @@
 msgid "Edit this page"
 msgstr ""
 
-#~ msgid "Back"
-#~ msgstr "Terug"
-
 #~ msgid "version <em>%s</em>"
 #~ msgstr "versie <em>%s</em>"
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2021-08-11 16:12:17 UTC (rev 10493)
+++ trunk/locale/po/phpwiki.pot	2021-08-11 16:37:58 UTC (rev 10494)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-06 17:14+0200\n"
+"POT-Creation-Date: 2021-08-11 18:36+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -2802,25 +2802,6 @@
 msgstr ""
 
 #, php-format
-msgid "Keep up to %d major edits, but keep them no longer than %d days."
-msgstr ""
-
-#, php-format
-msgid " Keep up to %d minor edits, but keep them no longer than %d days."
-msgstr ""
-
-#, php-format
-msgid " Keep the latest contributions of the last %d authors up to %d days."
-msgstr ""
-
-#, php-format
-msgid ""
-" Additionally, try to keep the latest contributions of all authors in the "
-"last %d days (even if there are more than %d of them,) but in no case keep "
-"more than %d unique author revisions."
-msgstr ""
-
-#, php-format
 msgid "%d pages"
 msgstr ""
 
@@ -2923,9 +2904,6 @@
 msgid "Harddisc usage"
 msgstr ""
 
-msgid "Expiry parameters"
-msgstr ""
-
 msgid "Wikiname regexp"
 msgstr ""
 
@@ -3660,6 +3638,13 @@
 msgid "Bad action requested: %s"
 msgstr ""
 
+#, php-format
+msgid "WikiAdminUtils %s returned:"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
 msgid "Purge Markup Cache"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2021-08-11 16:12:17 UTC (rev 10493)
+++ trunk/locale/po/sv.po	2021-08-11 16:37:58 UTC (rev 10494)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-06 17:14+0200\n"
+"POT-Creation-Date: 2021-08-11 18:36+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -2803,25 +2803,6 @@
 msgstr ""
 
 #, php-format
-msgid "Keep up to %d major edits, but keep them no longer than %d days."
-msgstr ""
-
-#, php-format
-msgid " Keep up to %d minor edits, but keep them no longer than %d days."
-msgstr ""
-
-#, php-format
-msgid " Keep the latest contributions of the last %d authors up to %d days."
-msgstr ""
-
-#, php-format
-msgid ""
-" Additionally, try to keep the latest contributions of all authors in the "
-"last %d days (even if there are more than %d of them,) but in no case keep "
-"more than %d unique author revisions."
-msgstr ""
-
-#, php-format
 msgid "%d pages"
 msgstr ""
 
@@ -2924,9 +2905,6 @@
 msgid "Harddisc usage"
 msgstr ""
 
-msgid "Expiry parameters"
-msgstr ""
-
 msgid "Wikiname regexp"
 msgstr ""
 
@@ -3661,6 +3639,13 @@
 msgid "Bad action requested: %s"
 msgstr ""
 
+#, php-format
+msgid "WikiAdminUtils %s returned:"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
 msgid "Purge Markup Cache"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2021-08-11 16:12:17 UTC (rev 10493)
+++ trunk/locale/po/zh.po	2021-08-11 16:37:58 UTC (rev 10494)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-06 17:14+0200\n"
+"POT-Creation-Date: 2021-08-11 18:36+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -2811,27 +2811,6 @@
 msgstr "已快取的版本資料:"
 
 #, php-format
-msgid "Keep up to %d major edits, but keep them no longer than %d days."
-msgstr "保持 %d 份主要編輯,但不超過 %d 天."
-
-#, php-format
-msgid " Keep up to %d minor edits, but keep them no longer than %d days."
-msgstr "保持 %d 份次要編輯,但不超過 %d 天."
-
-#, php-format
-msgid " Keep the latest contributions of the last %d authors up to %d days."
-msgstr "保存最後 %d 位作者的最新貢獻直到 %d 天."
-
-#, php-format
-msgid ""
-" Additionally, try to keep the latest contributions of all authors in the "
-"last %d days (even if there are more than %d of them,) but in no case keep "
-"more than %d unique author revisions."
-msgstr ""
-" 除此之外, 試著保存最近 %d 天之內所有作者的最新貢獻 (即使超過他們的 %d ,) 但"
-"是沒保存超過 %d 份單一作者修訂."
-
-#, php-format
 msgid "%d pages"
 msgstr "%d 個頁面"
 
@@ -2934,9 +2913,6 @@
 msgid "Harddisc usage"
 msgstr ""
 
-msgid "Expiry parameters"
-msgstr "過期參數"
-
 msgid "Wikiname regexp"
 msgstr ""
 
@@ -3673,6 +3649,13 @@
 msgid "Bad action requested: %s"
 msgstr ""
 
+#, php-format
+msgid "WikiAdminUtils %s returned:"
+msgstr "WikiAdminUtils %s 說:"
+
+msgid "Back"
+msgstr ""
+
 msgid "Purge Markup Cache"
 msgstr "清除標記快取"
 
@@ -5690,9 +5673,29 @@
 msgstr "編輯此頁面"
 
 #, php-format
-#~ msgid "WikiAdminUtils %s returned:"
-#~ msgstr "WikiAdminUtils %s 說:"
+#~ msgid "Keep up to %d major edits, but keep them no longer than %d days."
+#~ msgstr "保持 %d 份主要編輯,但不超過 %d 天."
 
+#, php-format
+#~ msgid " Keep up to %d minor edits, but keep them no longer than %d days."
+#~ msgstr "保持 %d 份次要編輯,但不超過 %d 天."
+
+#, php-format
+#~ msgid " Keep the latest contributions of the last %d authors up to %d days."
+#~ msgstr "保存最後 %d 位作者的最新貢獻直到 %d 天."
+
+#, php-format
+#~ msgid ""
+#~ " Additionally, try to keep the latest contributions of all authors in the "
+#~ "last %d days (even if there are more than %d of them,) but in no case "
+#~ "keep more than %d unique author revisions."
+#~ msgstr ""
+#~ " 除此之外, 試著保存最近 %d 天之內所有作者的最新貢獻 (即使超過他們的 %d ,) "
+#~ "但是沒保存超過 %d 份單一作者修訂."
+
+#~ msgid "Expiry parameters"
+#~ msgstr "過期參數"
+
 #~ msgid "Provide weather reports from the Internet."
 #~ msgstr "PhpWeather plugin 由網路取得資訊並提供天氣報告."
 

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/themes/Crao/templates/head.tmpl
===================================================================
--- trunk/themes/Crao/templates/head.tmpl	2021-08-11 16:12:17 UTC (rev 10493)
+++ trunk/themes/Crao/templates/head.tmpl	2021-08-11 16:37:58 UTC (rev 10494)
@@ -15,8 +15,8 @@
 <?php /* The next few lines are wrapped in an odd manner to allow gettext string extraction: cd locale;make */ ?>
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
 <link rel="help" title="<?php echo
-_("Help/HowToUseWiki")?>" href="<?php echo WikiURL(
-_("Help/HowToUseWiki"))?>" />
+_("Help")."/"._("HowToUseWiki")?>" href="<?php echo WikiURL(
+_("Help")."/"._("HowToUseWiki"))?>" />
 <link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
 <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
 <link rel="search" title="<?php echo

Modified: trunk/themes/Crao/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Crao/templates/htmldump.tmpl	2021-08-11 16:12:17 UTC (rev 10493)
+++ trunk/themes/Crao/templates/htmldump.tmpl	2021-08-11 16:37:58 UTC (rev 10494)
@@ -9,7 +9,7 @@
 <head>
 <meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
-<link rel="help" title="<?php echo _("Help/HowToUseWiki")?>" href="<?php echo WikiURL(_("Help/HowToUseWiki"))?>" />
+<link rel="help" title="<?php echo _("Help")."/"._("HowToUseWiki")?>" href="<?php echo WikiURL(_("Help")."/"._("HowToUseWiki"))?>" />
 <link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
 <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
 

Modified: trunk/themes/Sidebar/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/htmldump.tmpl	2021-08-11 16:12:17 UTC (rev 10493)
+++ trunk/themes/Sidebar/templates/htmldump.tmpl	2021-08-11 16:37:58 UTC (rev 10494)
@@ -9,7 +9,7 @@
 <head>
 <meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
-<link rel="help" title="<?php echo _("Help/HowToUseWiki")?>" href="<?php echo WikiURL(_("Help/HowToUseWiki"))?>" />
+<link rel="help" title="<?php echo _("Help")."/"._("HowToUseWiki")?>" href="<?php echo WikiURL(_("Help")."/"._("HowToUseWiki"))?>" />
 <link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
 <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
 <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>

Modified: trunk/themes/default/templates/head.tmpl
===================================================================
--- trunk/themes/default/templates/head.tmpl	2021-08-11 16:12:17 UTC (rev 10493)
+++ trunk/themes/default/templates/head.tmpl	2021-08-11 16:37:58 UTC (rev 10494)
@@ -19,8 +19,8 @@
 <?php /* The next few lines are wrapped in an odd manner to allow gettext string extraction: cd locale;make */ ?>
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
 <link rel="help" title="<?php echo
-_("Help/HowToUseWiki")?>" href="<?php echo WikiURL(
-_("Help/HowToUseWiki"))?>" />
+_("Help")."/"._("HowToUseWiki")?>" href="<?php echo WikiURL(
+_("Help")."/"._("HowToUseWiki"))?>" />
 <link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
 <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
 <link rel="search" title="<?php echo

Modified: trunk/themes/default/templates/htmldump.tmpl
===================================================================
--- trunk/themes/default/templates/htmldump.tmpl	2021-08-11 16:12:17 UTC (rev 10493)
+++ trunk/themes/default/templates/htmldump.tmpl	2021-08-11 16:37:58 UTC (rev 10494)
@@ -9,7 +9,7 @@
 <head>
 <meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
-<link rel="help" title="<?php echo _("Help:HowToUseWiki")?>" href="<?php echo WikiURL(_("Help:HowToUseWiki"))?>" />
+<link rel="help" title="<?php echo _("Help").":"._("HowToUseWiki")?>" href="<?php echo WikiURL(_("Help").":"._("HowToUseWiki"))?>" />
 <link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
 <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
 <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>

Modified: trunk/themes/wikilens/templates/head.tmpl
===================================================================
--- trunk/themes/wikilens/templates/head.tmpl	2021-08-11 16:12:17 UTC (rev 10493)
+++ trunk/themes/wikilens/templates/head.tmpl	2021-08-11 16:37:58 UTC (rev 10494)
@@ -14,8 +14,8 @@
 <link rel="stylesheet" type="text/css" href="<?php echo DATA_PATH ?>/themes/default/highlight.js/styles/github.css"/>
 <?php /* The next few lines are wrapped in an odd manner to allow gettext string extraction: cd locale;make */ ?>
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
-<link rel="help" title="<?php echo _("Help/HowToUseWiki")?>" href="<?php echo WikiURL(
-_("Help/HowToUseWiki"))?>" />
+<link rel="help" title="<?php echo _("Help")."/"._("HowToUseWiki")?>" href="<?php echo WikiURL(
+_("Help")."/"._("HowToUseWiki"))?>" />
 <link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
 <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
 <link rel="search" title="<?php echo _("FindPage")?>" href="<?php echo WikiURL(

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

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

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

Revision: 10493
          http://sourceforge.net/p/phpwiki/code/10493
Author:   vargenau
Date:     2021-08-11 16:12:17 +0000 (Wed, 11 Aug 2021)
Log Message:
-----------
Remove http://drhuang.com/wiki/ and https://forxa.mancomun.org/

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

Modified: trunk/pgsrc/Help%2FWikisUsingPhpWiki
===================================================================
--- trunk/pgsrc/Help%2FWikisUsingPhpWiki	2021-08-11 15:57:09 UTC (rev 10492)
+++ trunk/pgsrc/Help%2FWikisUsingPhpWiki	2021-08-11 16:12:17 UTC (rev 10493)
@@ -1,4 +1,4 @@
-Date: Sat, 26 Dec 2020 13:33:20 +0000
+Date: Wed, 11 Aug 2021 18:09:44 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikisUsingPhpWiki
@@ -17,13 +17,11 @@
 | http://www.dairiki.org/HammondWiki/                              | 1.3.5pre          | default
 | http://dev.cmeerw.org                                            | 1.6.0             | Sidebar
 | http://dkbush.com/zphpwiki/                                      | 1.3.14
-| http://drhuang.com/wiki/                                         | 1.4.0RC1          | Sidebar
 | http://drtedwilliams.net/kb/                                     | 1.3.14            | MacOSX
 | http://e38.org/phpwiki/                                          | 1.3.14
 | http://echolalie.org/wiki/index.php?EcholaListes
 | http://forge.cesga.es/wiki/g/optimiza/                           |                   | Fusionforge
 | http://forkedcedarandscuppermongfarm.com/phpwiki/                | 1.2.10
-| https://forxa.mancomun.org/plugins/wiki/index.php?id=386&type=g  |                   | Fusionforge
 | https://garage.maemo.org/plugins/wiki/index.php?id=290&type=g    |                   | Gforge
 | https://www.gidley.co.uk/wiki/
 | http://glhrn.org/NoPlaceToGo/                                    | 1.4.0RC1          | Sidebar

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

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

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

Revision: 10492
          http://sourceforge.net/p/phpwiki/code/10492
Author:   vargenau
Date:     2021-08-11 15:57:09 +0000 (Wed, 11 Aug 2021)
Log Message:
-----------
config/config-dist.ini: add explanations for AUTH_USER_FILE, thanks to Harold Hallikainen

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

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2021-08-11 14:17:09 UTC (rev 10491)
+++ trunk/config/config-dist.ini	2021-08-11 15:57:09 UTC (rev 10492)
@@ -647,7 +647,12 @@
 ; File authentication options:
 ;
 ; File to read for authentication information.
-; Popular choices are /etc/shadow and /etc/httpd/.htpasswd
+; Popular choices are /etc/shadow and /etc/httpd/.htpasswd-users
+; To add a user, run the command
+; htpasswd -c /var/www/html/phpwiki/.htpasswd-users UserName
+; where UserName is the user to be added. You will be prompted twice for the password.
+; Option "-c" is needed only the first time to create the file.
+; File must be readable and writable for webserver
 ;AUTH_USER_FILE = /etc/shadow
 
 ; Defines whether the user is able to change their own password via PHPWiki.

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

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

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

Revision: 10491
          http://sourceforge.net/p/phpwiki/code/10491
Author:   vargenau
Date:     2021-08-11 14:17:09 +0000 (Wed, 11 Aug 2021)
Log Message:
-----------
INSTALL: RssFeed plugin requires the PHP xml_parser_create() function.

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

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2021-08-11 13:50:24 UTC (rev 10490)
+++ trunk/INSTALL	2021-08-11 14:17:09 UTC (rev 10491)
@@ -12,60 +12,72 @@
 installation and configure options.
 <https://www.php.net/manual/en/installation.php>
 
+Use yum under Red Hat RHEL 7, CentOS 7
+Use dnf under Red Hat RHEL 8, CentOS 8, Fedora 18 and later
+Use apt under Ubuntu and other Debian-based Linux
+
 If you have DATABASE_TYPE = dba, you might need to do:
-yum install php-dba (Red Hat, CentOS)
+yum install php-dba
 or
-dnf install php-dba (Fedora)
+dnf install php-dba
 or
-apt install php-dba (Debian, Ubuntu)
+apt install php-dba
 
 To be able to export the wiki in ZIP format (in PhpWikiAdministration),
 ZipArchive class must be available. You might need to do:
-yum install php-pecl-zip (Red Hat, CentOS)
+yum install php-pecl-zip
 or
-dnf install php-zip (Fedora)
+dnf install php-zip
 or
-apt install php-zip (Debian, Ubuntu)
+apt install php-zip
 
+RssFeed plugin requires the PHP xml_parser_create() function. You might
+need to do:
+yum install php-xml
+or
+dnf install php-xml
+or
+apt install php-xml
+
 TeX2png and text2png plugins need the PHP imagetypes() function. You might
 need to do:
-yum install php-gd (Red Hat, CentOS)
+yum install php-gd
 or
-dnf install php-gd (Fedora)
+dnf install php-gd
 or
-apt install php-gd (Debian, Ubuntu)
+apt install php-gd
 
 LdapSearch plugin requires the PHP ldap_connect() function. You might
 need to do:
-yum install php-ldap (Red Hat, CentOS)
+yum install php-ldap
 or
-dnf install php-ldap (Fedora)
+dnf install php-ldap
 or
-apt install php-ldap (Debian, Ubuntu)
+apt install php-ldap
 
 TeX2png plugin requires LaTeX to be installed. You might need to do:
-yum install texlive (Red Hat, CentOS)
+yum install texlive
 yum install latex2html
 or
-dnf install texlive (Fedora)
+dnf install texlive
 dnf install latex2html
 or
-apt install texlive (Debian, Ubuntu)
+apt install texlive
 apt install latex2html
 
 GraphViz plugin requires GraphViz to be installed. You might need to do:
-yum install graphviz (Red Hat, CentOS)
+yum install graphviz
 or
-dnf install graphviz (Fedora)
+dnf install graphviz
 or
-apt install graphviz (Debian, Ubuntu)
+apt install graphviz
 
 GooglePlugin plugin requires PHP SoapClient class. You might need to do:
-yum install php-soap (Red Hat, CentOS)
+yum install php-soap
 or
-dnf install php-soap (Fedora)
+dnf install php-soap
 or
-apt install php-soap (Debian, Ubuntu)
+apt install php-soap
 
 QUICK START INSTRUCTIONS
 

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

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

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

Revision: 10490
          http://sourceforge.net/p/phpwiki/code/10490
Author:   vargenau
Date:     2021-08-11 13:50:24 +0000 (Wed, 11 Aug 2021)
Log Message:
-----------
function _parse_searchwords is public; add braces

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

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2021-08-11 12:19:00 UTC (rev 10489)
+++ trunk/lib/WikiDB/backend/file.php	2021-08-11 13:50:24 UTC (rev 10490)
@@ -58,8 +58,9 @@
     function __construct($dbparam)
     {
         $this->data_dir = $dbparam['directory'];
-        if (file_exists($this->data_dir) and is_file($this->data_dir))
+        if (file_exists($this->data_dir) and is_file($this->data_dir)) {
             unlink($this->data_dir);
+        }
         if (is_dir($this->data_dir) == false) {
             mkdir($this->data_dir, 0755);
         }
@@ -87,10 +88,11 @@
     // common file load / save functions:
     protected function _pagename2filename($type, $pagename, $version)
     {
-        if ($version == 0)
+        if ($version == 0) {
             return $this->_dir_names[$type] . '/' . urlencode($pagename);
-        else
+        } else {
             return $this->_dir_names[$type] . '/' . urlencode($pagename) . '--' . $version;
+        }
     }
 
     protected function _loadPage($type, $pagename, $version, $set_pagename = true)
@@ -391,8 +393,9 @@
     function get_versiondata($pagename, $version, $want_content = false)
     {
         $vd = $this->_loadVersionData($pagename, $version);
-        if ($vd == NULL)
+        if ($vd == NULL) {
             return false;
+        }
         return $vd;
     }
 
@@ -723,7 +726,7 @@
         return true;
     }
 
-    protected function _parse_searchwords($search)
+    function _parse_searchwords($search)
     {
         $search = strtolower(trim($search));
         if (!$search)

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

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

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

Revision: 10489
          http://sourceforge.net/p/phpwiki/code/10489
Author:   vargenau
Date:     2021-08-11 12:19:00 +0000 (Wed, 11 Aug 2021)
Log Message:
-----------
lib/WikiDB/backend/file.php & lib/WikiDB/backend/flatfile.php: add protected

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

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2021-08-11 10:44:37 UTC (rev 10488)
+++ trunk/lib/WikiDB/backend/file.php	2021-08-11 12:19:00 UTC (rev 10489)
@@ -85,7 +85,7 @@
 
     // *********************************************************************
     // common file load / save functions:
-    function _pagename2filename($type, $pagename, $version)
+    protected function _pagename2filename($type, $pagename, $version)
     {
         if ($version == 0)
             return $this->_dir_names[$type] . '/' . urlencode($pagename);
@@ -93,7 +93,7 @@
             return $this->_dir_names[$type] . '/' . urlencode($pagename) . '--' . $version;
     }
 
-    function _loadPage($type, $pagename, $version, $set_pagename = true)
+    protected function _loadPage($type, $pagename, $version, $set_pagename = true)
     {
         $filename = $this->_pagename2filename($type, $pagename, $version);
         if (!file_exists($filename)) return NULL;
@@ -120,7 +120,7 @@
         return NULL;
     }
 
-    function _savePage($type, $pagename, $version, $data)
+    protected function _savePage($type, $pagename, $version, $data)
     {
         $filename = $this->_pagename2filename($type, $pagename, $version);
         if ($fd = fopen($filename, 'a+b')) {
@@ -141,7 +141,7 @@
         }
     }
 
-    function _removePage($type, $pagename, $version)
+    protected function _removePage($type, $pagename, $version)
     {
         $filename = $this->_pagename2filename($type, $pagename, $version);
         if (!file_exists($filename)) return NULL;
@@ -151,10 +151,8 @@
     }
 
     // *********************************************************************
-
-    // *********************************************************************
     // Load/Save Version-Data
-    function _loadVersionData($pagename, $version)
+    protected function _loadVersionData($pagename, $version)
     {
         if ($this->_page_version_data != NULL) {
             if (($this->_page_version_data['pagename'] == $pagename) &&
@@ -175,7 +173,7 @@
         return NULL;
     }
 
-    function _saveVersionData($pagename, $version, $data)
+    protected function _saveVersionData($pagename, $version, $data)
     {
         $this->_savePage('ver_data', $pagename, $version, $data);
 
@@ -188,7 +186,7 @@
 
     // *********************************************************************
     // Load/Save Page-Data
-    function _loadPageData($pagename)
+    protected function _loadPageData($pagename)
     {
         if (isset($this->_page_data)) {
             if ($this->_page_data['pagename'] == $pagename) {
@@ -206,7 +204,7 @@
         return array(); // no values found
     }
 
-    function _savePageData($pagename, $data)
+    protected function _savePageData($pagename, $data)
     {
         $this->_savePage('page_data', $pagename, 0, $data);
     }
@@ -213,7 +211,7 @@
 
     // *********************************************************************
     // Load/Save Latest-Version
-    function _saveLatestVersions()
+    protected function _saveLatestVersions()
     {
         $data = $this->_latest_versions;
         if ($data == NULL)
@@ -221,7 +219,7 @@
         $this->_savePage('latest_ver', 'latest_versions', 0, $data);
     }
 
-    function _setLatestVersion($pagename, $version)
+    protected function _setLatestVersion($pagename, $version)
     {
         // make sure the page version list is loaded:
         $this->_getLatestVersion($pagename);
@@ -235,7 +233,7 @@
         $this->_saveLatestVersions();
     }
 
-    function _loadLatestVersions()
+    protected function _loadLatestVersions()
     {
         if ($this->_latest_versions != NULL)
             return;
@@ -247,7 +245,7 @@
             $this->_latest_versions = array(); // empty array
     }
 
-    function _getLatestVersion($pagename)
+    protected function _getLatestVersion($pagename)
     {
         $this->_loadLatestVersions();
         if (array_key_exists($pagename, $this->_latest_versions) == false)
@@ -257,7 +255,7 @@
 
     // *********************************************************************
     // Load/Save Page-Links
-    function _loadPageLinks($pagename)
+    protected function _loadPageLinks($pagename)
     {
         $pd = $this->_loadPage('links', $pagename, 0, false);
         if ($pd != NULL) {
@@ -267,7 +265,7 @@
         }
     }
 
-    function _savePageLinks($pagename, $links)
+    protected function _savePageLinks($pagename, $links)
     {
         $this->_savePage('links', $pagename, 0, $links);
     }
@@ -725,7 +723,7 @@
         return true;
     }
 
-    function _parse_searchwords($search)
+    protected function _parse_searchwords($search)
     {
         $search = strtolower(trim($search));
         if (!$search)

Modified: trunk/lib/WikiDB/backend/flatfile.php
===================================================================
--- trunk/lib/WikiDB/backend/flatfile.php	2021-08-11 10:44:37 UTC (rev 10488)
+++ trunk/lib/WikiDB/backend/flatfile.php	2021-08-11 12:19:00 UTC (rev 10489)
@@ -42,7 +42,7 @@
     // *********************************************************************
     // common file load / save functions:
     // FilenameForPage is from loadsave.php
-    function _pagename2filename($type, $pagename, $version)
+    protected function _pagename2filename($type, $pagename, $version)
     {
         $fpagename = FilenameForPage($pagename);
         if (strstr($fpagename, "/")) {
@@ -52,7 +52,7 @@
     }
 
     // Load/Save Page-Data
-    function _loadPageData($pagename)
+    protected function _loadPageData($pagename)
     {
         if ($this->_page_data != NULL) {
             if ($this->_page_data['pagename'] == $pagename) {
@@ -97,7 +97,7 @@
      * If the given ($pagename,$version) is already in the database,
      * this method completely overwrites any stored data for that version.
      */
-    function _saveVersionData($pagename, $version, $data)
+    protected function _saveVersionData($pagename, $version, $data)
     {
         // check if this is a newer version:
         if ($this->_getLatestVersion($pagename) < $version) {
@@ -116,7 +116,7 @@
     // Store as full page_data flatfile
     //   pagedata: date, pagename, hits
     //   versiondata: _cached_html and the rest
-    function _savePageData($pagename, $data)
+    protected function _savePageData($pagename, $data)
     {
         $type = 'page_data';
         $version = 1;

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

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

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

Revision: 10488
          http://sourceforge.net/p/phpwiki/code/10488
Author:   vargenau
Date:     2021-08-11 10:44:37 +0000 (Wed, 11 Aug 2021)
Log Message:
-----------
Use same parameter name as parent, PHP Doc

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

Modified: trunk/lib/WikiDB/backend/dbaBase.php
===================================================================
--- trunk/lib/WikiDB/backend/dbaBase.php	2021-08-11 10:42:06 UTC (rev 10487)
+++ trunk/lib/WikiDB/backend/dbaBase.php	2021-08-11 10:44:37 UTC (rev 10488)
@@ -214,7 +214,7 @@
      * @param int $version Which version to get
      * @param bool $want_content Do we need content?
      *
-     * @return array The version data, or false if specified version does not exist.
+     * @return array|false The version data, or false if specified version does not exist
      */
     function get_versiondata($pagename, $version, $want_content = false)
     {
@@ -525,7 +525,7 @@
      * linkdb and check the pagematch there.
      *
      * @param object$pages      A TextSearchQuery object for the pagename filter.
-     * @param object $query     A SearchQuery object (Text or Numeric) for the linkvalues,
+     * @param object $linkvalue     A SearchQuery object (Text or Numeric) for the linkvalues,
      *                          linkto, linkfrom (=backlink), relation or attribute values.
      * @param string $linktype  One of the 4 linktypes "linkto",
      *                          "linkfrom" (=backlink), "relation" or "attribute".
@@ -535,7 +535,7 @@
      * @return object A WikiDB_backend_iterator.
      * @see WikiDB::linkSearch
      */
-    function link_search($pages, $query, $linktype,
+    function link_search($pages, $linkvalue, $linktype,
                          $relation = false, $options = array())
     {
         /**
@@ -575,14 +575,14 @@
                        Just take the defined placeholders from the query(ies)
                        if there are more attributes than query variables.
                     */
-                    if ($query->getType() != 'text'
+                    if ($linkvalue->getType() != 'text'
                         and !$relation
-                            and ((count($vars = $query->getVars()) > 1)
+                            and ((count($vars = $linkvalue->getVars()) > 1)
                                 or (count($attribs) > count($vars)))
                     ) {
                         // names must strictly match. no * allowed
-                        if (!$query->can_match($attribs)) continue;
-                        if (!($result = $query->match($attribs))) continue;
+                        if (!$linkvalue->can_match($attribs)) continue;
+                        if (!($result = $linkvalue->match($attribs))) continue;
                         foreach ($result as $r) {
                             $r['pagename'] = $pagename;
                             $links[] = $r;
@@ -591,7 +591,7 @@
                         // textsearch or simple value. no strict bind by name needed
                         foreach ($attribs as $attribute => $value) {
                             if ($relation and !$relation->match($attribute)) continue;
-                            if (!$query->match($value)) continue;
+                            if (!$linkvalue->match($value)) continue;
                             $links[] = array('pagename' => $pagename,
                                 'linkname' => $attribute,
                                 'linkvalue' => $value);
@@ -606,7 +606,7 @@
                     foreach ($_links as $link) { // linkto => page, linkrelation => page
                         if (!isset($link['relation']) or !$link['relation']) continue;
                         if ($relation and !$relation->match($link['relation'])) continue;
-                        if (!$query->match($link['linkto'])) continue;
+                        if (!$linkvalue->match($link['linkto'])) continue;
                         $links[] = array('pagename' => $pagename,
                             'linkname' => $link['relation'],
                             'linkvalue' => $link['linkto']);
@@ -616,7 +616,7 @@
                     foreach ($_links as $link) { // linkto => page
                         if (is_array($link))
                             $link = $link['linkto'];
-                        if (!$query->match($link)) continue;
+                        if (!$linkvalue->match($link)) continue;
                         $links[] = array('pagename' => $pagename,
                             'linkname' => '',
                             'linkvalue' => $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:[10487] trunk/lib/WikiDB/backend/ADODB.php

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

Revision: 10487
          http://sourceforge.net/p/phpwiki/code/10487
Author:   vargenau
Date:     2021-08-11 10:42:06 +0000 (Wed, 11 Aug 2021)
Log Message:
-----------
PHP Doc, remove dead code, no &

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

Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php	2021-08-11 10:40:09 UTC (rev 10486)
+++ trunk/lib/WikiDB/backend/ADODB.php	2021-08-11 10:42:06 UTC (rev 10487)
@@ -78,7 +78,7 @@
         $parsed = parseDSN($dbparams['dsn']);
         $this->_dbparams = $dbparams;
         $this->_parsedDSN =& $parsed;
-        $this->_dbh = &ADONewConnection($parsed['phptype']);
+        $this->_dbh = ADONewConnection($parsed['phptype']);
         if (DEBUG & _DEBUG_SQL) {
             $this->_dbh->debug = true;
             $GLOBALS['ADODB_OUTP'] = '_sql_debuglog';
@@ -373,7 +373,7 @@
      * @param int $version Which version to get
      * @param bool $want_content Do we need content?
      *
-     * @return array The version data, or false if specified version does not exist.
+     * @return array|false
      */
     function get_versiondata($pagename, $version, $want_content = false)
     {
@@ -720,8 +720,6 @@
                     }
                 }
                 if (!$skip) {
-                    if ($update) {
-                    }
                     if ($relation) {
                         $dbh->Execute("INSERT INTO $link_tbl (linkfrom, linkto, relation)"
                             . " VALUES ($pageid, $linkid, $relation)");

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

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

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

Revision: 10486
          http://sourceforge.net/p/phpwiki/code/10486
Author:   vargenau
Date:     2021-08-11 10:40:09 +0000 (Wed, 11 Aug 2021)
Log Message:
-----------
Use same parameter name as parent

Modified Paths:
--------------
    trunk/lib/WikiDB/ADODB.php
    trunk/lib/WikiDB/PDO.php

Modified: trunk/lib/WikiDB/ADODB.php
===================================================================
--- trunk/lib/WikiDB/ADODB.php	2021-08-11 10:38:12 UTC (rev 10485)
+++ trunk/lib/WikiDB/ADODB.php	2021-08-11 10:40:09 UTC (rev 10486)
@@ -80,16 +80,16 @@
     }
 
     // add surrounding quotes '' if string
-    public function quote($in)
+    public function quote($s)
     {
-        if (is_int($in) || is_double($in)) {
-            return $in;
-        } elseif (is_bool($in)) {
-            return $in ? 1 : 0;
-        } elseif (is_null($in)) {
+        if (is_int($s) || is_double($s)) {
+            return $s;
+        } elseif (is_bool($s)) {
+            return $s ? 1 : 0;
+        } elseif (is_null($s)) {
             return 'NULL';
         } else {
-            return $this->_backend->_dbh->qstr($in);
+            return $this->_backend->_dbh->qstr($s);
         }
     }
 

Modified: trunk/lib/WikiDB/PDO.php
===================================================================
--- trunk/lib/WikiDB/PDO.php	2021-08-11 10:38:12 UTC (rev 10485)
+++ trunk/lib/WikiDB/PDO.php	2021-08-11 10:40:09 UTC (rev 10486)
@@ -77,16 +77,16 @@
 
     // With PDO we should really use native quoting using prepared statements with ?
     // Add surrounding quotes '' if string
-    public function quote($in)
+    public function quote($s)
     {
-        if (is_int($in) || is_double($in)) {
-            return $in;
-        } elseif (is_bool($in)) {
-            return $in ? 1 : 0;
-        } elseif (is_null($in)) {
+        if (is_int($s) || is_double($s)) {
+            return $s;
+        } elseif (is_bool($s)) {
+            return $s ? 1 : 0;
+        } elseif (is_null($s)) {
             return 'NULL';
         } else {
-            return $this->qstr($in);
+            return $this->qstr($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:[10485] trunk/lib/WikiDB/backend/ADODB_mssqlnative.php

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

Revision: 10485
          http://sourceforge.net/p/phpwiki/code/10485
Author:   vargenau
Date:     2021-08-11 10:38:12 +0000 (Wed, 11 Aug 2021)
Log Message:
-----------
Remove dead code

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

Modified: trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mssqlnative.php	2021-08-11 10:37:20 UTC (rev 10484)
+++ trunk/lib/WikiDB/backend/ADODB_mssqlnative.php	2021-08-11 10:38:12 UTC (rev 10485)
@@ -225,8 +225,6 @@
                     }
                 }
                 if (!$skip) {
-                    if ($update) {
-                    }
                     if ($relation) {
                         $dbh->Execute("INSERT INTO $link_tbl (linkfrom, linkto, relation)"
                             . " VALUES ($pageid, $linkid, $relation)");

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

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

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

Revision: 10484
          http://sourceforge.net/p/phpwiki/code/10484
Author:   vargenau
Date:     2021-08-11 10:37:20 +0000 (Wed, 11 Aug 2021)
Log Message:
-----------
Add missing parameter to be compatible with parent

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

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2021-08-11 10:35:39 UTC (rev 10483)
+++ trunk/lib/WikiDB/backend/PDO.php	2021-08-11 10:37:20 UTC (rev 10484)
@@ -790,8 +790,9 @@
      * existing links.
      */
     function get_links($pagename, $reversed = true, $include_empty = false,
-                       $sortby = '', $limit = '', $exclude = '')
-    {
+                       $sortby = '', $limit = '', $exclude = '',
+                       $want_relations = false)
+{
         $dbh = &$this->_dbh;
         extract($this->_table_names);
 

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

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

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

Revision: 10483
          http://sourceforge.net/p/phpwiki/code/10483
Author:   vargenau
Date:     2021-08-11 10:35:39 +0000 (Wed, 11 Aug 2021)
Log Message:
-----------
Use PHP 5.3 syntax

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

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2021-08-11 10:16:00 UTC (rev 10482)
+++ trunk/lib/WikiDB/backend/file.php	2021-08-11 10:35:39 UTC (rev 10483)
@@ -768,7 +768,7 @@
         if ($key === null) {
             return false;
         }
-        $e = [$key, current($this->_result), 'key' => $key, 'value' => current($this->_result)];
+        $e = array($key, current($this->_result), 'key' => $key, 'value' => current($this->_result));
         next($this->_result);
 
         $pn = $e[1];

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

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

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

Revision: 10482
          http://sourceforge.net/p/phpwiki/code/10482
Author:   vargenau
Date:     2021-08-11 10:16:00 +0000 (Wed, 11 Aug 2021)
Log Message:
-----------
PHP Doc

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/ADODB.php
    trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
    trunk/lib/WikiDB/backend/PDO.php
    trunk/lib/WikiDB/backend/PearDB.php
    trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
    trunk/lib/WikiDB/backend/dbaBase.php
    trunk/lib/WikiDB/backend/file.php
    trunk/lib/WikiDB/backend.php
    trunk/lib/plugin/AnalyseAccessLogSql.php

Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php	2021-08-11 08:05:47 UTC (rev 10481)
+++ trunk/lib/WikiDB/backend/ADODB.php	2021-08-11 10:16:00 UTC (rev 10482)
@@ -373,8 +373,7 @@
      * @param int $version Which version to get
      * @param bool $want_content Do we need content?
      *
-     * @return array hash The version data, or false if specified version does not
-     *              exist.
+     * @return array The version data, or false if specified version does not exist.
      */
     function get_versiondata($pagename, $version, $want_content = false)
     {
@@ -592,8 +591,12 @@
         return $result;
     }
 
-    /*
-     * Update link table.
+    /**
+     * Set links for page.
+     *
+     * @param string $pagename Page name
+     * @param array  $links    List of page(names) which page links to.
+     *
      * on DEBUG: delete old, deleted links from page
      */
     function set_links($pagename, $links)
@@ -757,9 +760,20 @@
         return true;
     }
 
-    /*
+    /**
      * Find pages which link to or are linked from a page.
      *
+     * @param string    $pagename       Page name
+     * @param bool      $reversed       True to get backlinks
+     * @param bool      $include_empty  True to get empty pages
+     * @param string    $sortby
+     * @param string    $limit
+     * @param string    $exclude        Pages to exclude
+     * @param bool      $want_relations
+     *
+     * FIXME: array or iterator?
+     * @return object A WikiDB_backend_iterator.
+     *
      * Optimization: save request->_dbi->_iwpcache[] to avoid further iswikipage checks
      * (linkExistingWikiWord or linkUnknownWikiWord)
      * This is called on every page header GleanDescription, so we can store all the
@@ -1113,9 +1127,13 @@
         return new WikiDB_backend_ADODB_iter($this, $result, array('pagename', 'wantedfrom'));
     }
 
-    /*
+    /**
      * Rename page in the database.
+     *
+     * @param string $pagename Current page name
+     * @param string $to       Future page name
      */
+
     function rename_page($pagename, $to)
     {
         $dbh = &$this->_dbh;

Modified: trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mssqlnative.php	2021-08-11 08:05:47 UTC (rev 10481)
+++ trunk/lib/WikiDB/backend/ADODB_mssqlnative.php	2021-08-11 10:16:00 UTC (rev 10482)
@@ -95,8 +95,12 @@
         return empty($data) ? array() : unserialize(stripslashes($data));
     }
 
-    /*
-     * Update link table.
+    /**
+     * Set links for page.
+     *
+     * @param string $pagename Page name
+     * @param array  $links    List of page(names) which page links to.
+     *
      * on DEBUG: delete old, deleted links from page
      */
     function set_links($pagename, $links)

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2021-08-11 08:05:47 UTC (rev 10481)
+++ trunk/lib/WikiDB/backend/PDO.php	2021-08-11 10:16:00 UTC (rev 10482)
@@ -456,8 +456,7 @@
      * @param int $version Which version to get
      * @param bool $want_content Do we need content?
      *
-     * @return array hash The version data, or false if specified version does not
-     *              exist.
+     * @return array The version data, or false if specified version does not exist.
      */
     function get_versiondata($pagename, $version, $want_content = false)
     {
@@ -716,8 +715,12 @@
         return $result;
     }
 
-    /*
-     * Update link table.
+    /**
+     * Set links for page.
+     *
+     * @param string $pagename Page name
+     * @param array  $links    List of page(names) which page links to.
+     *
      * on DEBUG: delete old, deleted links from page
      */
     function set_links($pagename, $links)
@@ -767,9 +770,20 @@
         return true;
     }
 
-    /*
+    /**
      * Find pages which link to or are linked from a page.
      *
+     * @param string    $pagename       Page name
+     * @param bool      $reversed       True to get backlinks
+     * @param bool      $include_empty  True to get empty pages
+     * @param string    $sortby
+     * @param string    $limit
+     * @param string    $exclude        Pages to exclude
+     * @param bool      $want_relations
+     *
+     * FIXME: array or iterator?
+     * @return object A WikiDB_backend_iterator.
+     *
      * Optimization: save request->_dbi->_iwpcache[] to avoid further iswikipage checks
      * (linkExistingWikiWord or linkUnknownWikiWord)
      * This is called on every page header GleanDescription, so we can store all the
@@ -1107,9 +1121,13 @@
         return new WikiDB_backend_PDO_iter($this, $result, array('pagename', 'wantedfrom'));
     }
 
-    /*
+    /**
      * Rename page in the database.
+     *
+     * @param string $pagename Current page name
+     * @param string $to       Future page name
      */
+
     function rename_page($pagename, $to)
     {
         $dbh = &$this->_dbh;

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2021-08-11 08:05:47 UTC (rev 10481)
+++ trunk/lib/WikiDB/backend/PearDB.php	2021-08-11 10:16:00 UTC (rev 10482)
@@ -323,8 +323,7 @@
      * @param int $version Which version to get
      * @param bool $want_content Do we need content?
      *
-     * @return array hash The version data, or false if specified version does not
-     *              exist.
+     * @return array The version data, or false if specified version does not exist.
      */
     function get_versiondata($pagename, $version, $want_content = false)
     {
@@ -482,8 +481,11 @@
         return $result;
     }
 
-    /*
-     * Update link table.
+    /**
+     * Set links for page.
+     *
+     * @param string $pagename Page name
+     * @param array  $links    List of page(names) which page links to.
      */
     function set_links($pagename, $links)
     {
@@ -529,9 +531,20 @@
         $this->unlock();
     }
 
-    /*
+    /**
      * Find pages which link to or are linked from a page.
      *
+     * @param string    $pagename       Page name
+     * @param bool      $reversed       True to get backlinks
+     * @param bool      $include_empty  True to get empty pages
+     * @param string    $sortby
+     * @param string    $limit
+     * @param string    $exclude        Pages to exclude
+     * @param bool      $want_relations
+     *
+     * FIXME: array or iterator?
+     * @return object A WikiDB_backend_iterator.
+     *
      * TESTME relations: get_links is responsible to add the relation to the pagehash
      * as 'linkrelation' key as pagename. See WikiDB_PageIterator::next
      *   if (isset($next['linkrelation']))
@@ -901,9 +914,13 @@
         return substr($s, 0, -1) . ")";
     }
 
-    /*
+    /**
      * Rename page in the database.
+     *
+     * @param string $pagename Current page name
+     * @param string $to       Future page name
      */
+
     function rename_page($pagename, $to)
     {
         $dbh = &$this->_dbh;

Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2021-08-11 08:05:47 UTC (rev 10481)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2021-08-11 10:16:00 UTC (rev 10482)
@@ -178,8 +178,7 @@
      * @param int $version Which version to get
      * @param bool $want_content Do we need content?
      *
-     * @return array hash The version data, or false if specified version does not
-     *              exist.
+     * @return array The version data, or false if specified version does not exist.
      */
     function get_versiondata($pagename, $version, $want_content = false)
     {
@@ -299,9 +298,20 @@
         return $result;
     }
 
-    /*
+    /**
      * Find pages which link to or are linked from a page.
      *
+     * @param string    $pagename       Page name
+     * @param bool      $reversed       True to get backlinks
+     * @param bool      $include_empty  True to get empty pages
+     * @param string    $sortby
+     * @param string    $limit
+     * @param string    $exclude        Pages to exclude
+     * @param bool      $want_relations
+     *
+     * FIXME: array or iterator?
+     * @return object A WikiDB_backend_iterator.
+     *
      * TESTME relations: get_links is responsible to add the relation to the pagehash
      * as 'linkrelation' key as pagename. See WikiDB_PageIterator::next
      *   if (isset($next['linkrelation']))
@@ -574,9 +584,13 @@
         return new WikiDB_backend_PearDB_generic_iter($this, $result);
     }
 
-    /*
+    /**
      * Rename page in the database.
+     *
+     * @param string $pagename Current page name
+     * @param string $to       Future page name
      */
+
     function rename_page($pagename, $to)
     {
         $dbh = &$this->_dbh;

Modified: trunk/lib/WikiDB/backend/dbaBase.php
===================================================================
--- trunk/lib/WikiDB/backend/dbaBase.php	2021-08-11 08:05:47 UTC (rev 10481)
+++ trunk/lib/WikiDB/backend/dbaBase.php	2021-08-11 10:16:00 UTC (rev 10482)
@@ -214,8 +214,7 @@
      * @param int $version Which version to get
      * @param bool $want_content Do we need content?
      *
-     * @return array hash The version data, or false if specified version does not
-     *              exist.
+     * @return array The version data, or false if specified version does not exist.
      */
     function get_versiondata($pagename, $version, $want_content = false)
     {
@@ -279,6 +278,13 @@
         $this->set_links($pagename, array());
     }
 
+    /**
+     * Rename page in the database.
+     *
+     * @param string $pagename Current page name
+     * @param string $to       Future page name
+     */
+
     function rename_page($pagename, $to)
     {
         /**
@@ -430,11 +436,32 @@
             array('sortby' => $sortby)); // already limited
     }
 
+    /**
+     * Set links for page.
+     *
+     * @param string $pagename Page name
+     * @param array  $links    List of page(names) which page links to.
+     */
     function set_links($pagename, $links)
     {
         $this->_linkdb->set_links($pagename, $links);
     }
 
+    /**
+     * Find pages which link to or are linked from a page.
+     *
+     * @param string    $pagename       Page name
+     * @param bool      $reversed       True to get backlinks
+     * @param bool      $include_empty  True to get empty pages
+     * @param string    $sortby
+     * @param string    $limit
+     * @param string    $exclude        Pages to exclude
+     * @param bool      $want_relations
+     *
+     * FIXME: array or iterator?
+     * @return object A WikiDB_backend_iterator.
+     */
+
     function get_links($pagename, $reversed = true, $include_empty = false,
                        $sortby = '', $limit = '', $exclude = '',
                        $want_relations = false)

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2021-08-11 08:05:47 UTC (rev 10481)
+++ trunk/lib/WikiDB/backend/file.php	2021-08-11 10:16:00 UTC (rev 10482)
@@ -307,7 +307,7 @@
      * will not affect the value of 'hits' (or whatever other meta-data
      * may have been stored for the page.)
      *
-     * To delete a particular piece of meta-data, set it's value to false.
+     * To delete a particular piece of meta-data, set its value to false.
      * <pre>
      *   $backend->update_pagedata($pagename, array('locked' => false));
      * </pre>
@@ -338,7 +338,7 @@
     /**
      * Get the current version number for a page.
      *
-     * @param $pagename string Page name.
+     * @param string $pagename Page name.
      * @return int The latest version number for the page.  Returns zero if
      *  no versions of a page exist.
      */
@@ -350,10 +350,10 @@
     /**
      * Get preceding version number.
      *
-     * @param $pagename string Page name.
-     * @param $version int Find version before this one.
+     * @param string $pagename Page name.
+     * @param int $version Find version before this one.
      * @return int The version number of the version in the database which
-     *  immediately preceeds $version.
+     *  immediately precedes $version.
      *
      * FIXED: Check if this version really exists!
      */
@@ -369,9 +369,9 @@
     /**
      * Get revision meta-data and content.
      *
-     * @param $pagename string Page name.
-     * @param $version integer Which version to get.
-     * @param $want_content boolean
+     * @param string $pagename Page name.
+     * @param int $version Which version to get.
+     * @param bool $want_content
      *  Indicates the caller really wants the page content.  If this
      *  flag is not set, the backend is free to skip fetching of the
      *  page content (as that may be expensive).  If the backend omits
@@ -378,8 +378,7 @@
      *  the content, the backend might still want to set the value of
      *  '%content' to the empty string if it knows there's no content.
      *
-     * @return array hash The version data, or false if specified version does not
-     *    exist.
+     * @return array|bool The version data, or false if specified version does not exist.
      *
      * Some keys which might be present in the $versiondata hash are:
      * <dl>
@@ -399,10 +398,14 @@
         return $vd;
     }
 
-    /*
-     * Rename all files for this page
+    /**
+     * Rename page in the database.
+     *
+     * @param string $pagename Current page name
+     * @param string $to       Future page name
      */
-    public function rename_page($pagename, $to)
+
+    function rename_page($pagename, $to)
     {
         $version = $this->_getLatestVersion($pagename);
         foreach ($this->_dir_names as $type => $path) {
@@ -425,11 +428,9 @@
     }
 
     /**
-     * Delete page from the database.
+     * Delete page (and all its revisions) from the database.
      *
-     * Delete page (and all it's revisions) from the database.
-     *
-     * @param $pagename string Page name.
+     * @param string $pagename Page name.
      */
     function purge_page($pagename)
     {
@@ -453,8 +454,8 @@
      * In fact, to be safe, backends should probably allow the deletion of
      * the most recent version.
      *
-     * @param $pagename string Page name.
-     * @param $version integer Version to delete.
+     * @param string $pagename Page name.
+     * @param int $version int Version to delete.
      */
     function delete_versiondata($pagename, $version)
     {
@@ -480,7 +481,7 @@
      * If the given ($pagename,$version) is already in the database,
      * this method completely overwrites any stored data for that version.
      *
-     * @param string $pagename Page name.
+     * @param string $pagename string Page name.
      * @param int $version New revisions content.
      * @param array $data hash New revision metadata.
      *
@@ -522,9 +523,8 @@
     /**
      * Set links for page.
      *
-     * @param $pagename string Page name.
-     *
-     * @param $links array List of page(names) which page links to.
+     * @param string $pagename Page name
+     * @param array  $links    List of page(names) which page links to.
      */
     function set_links($pagename, $links)
     {
@@ -534,13 +534,13 @@
     /**
      * Find pages which link to or are linked from a page.
      *
-     * @param string $pagename Page name.
-     * @param bool $reversed True to get backlinks.
-     * @param bool $include_empty True to get empty pages
-     * @param string $sortby
-     * @param string $limit
-     * @param string $exclude Pages to exclude.
-     * @param bool $want_relations True to get relations.
+     * @param string    $pagename       Page name
+     * @param bool      $reversed       True to get backlinks
+     * @param bool      $include_empty  True to get empty pages
+     * @param string    $sortby
+     * @param string    $limit
+     * @param string    $exclude        Pages to exclude
+     * @param bool      $want_relations True to get relations
      *
      * FIXME: array or iterator?
      * @return object A WikiDB_backend_iterator.
@@ -571,7 +571,7 @@
     /**
      * Get all revisions of a page.
      *
-     * @param $pagename string The page name.
+     * @param string $pagename The page name.
      * @return object A WikiDB_backend_iterator.
      */
     /*
@@ -585,7 +585,7 @@
      * Get all pages in the database.
      *
      * Pages should be returned in alphabetical order if that is
-     * feasable.
+     * feasible.
      *
      * @param bool $include_empty
      * If set, even pages with no content will be returned
@@ -602,7 +602,8 @@
      *
      * @return object A WikiDB_backend_iterator.
      */
-    public function get_all_pages($include_empty = false, $sortby = '', $limit = '', $exclude = '')
+    public function get_all_pages($include_empty = false,
+                    $sortby = '', $limit = '', $exclude = '')
     {
         require_once 'lib/PageList.php';
         $this->_loadLatestVersions();
@@ -634,21 +635,36 @@
         return count($this->_latest_versions);
     }
 
-    /*
+    /**
      * Lock backend database.
+     *
+     * Calls may be nested.
+     *
+     * @param array $tables
+     * @param bool $write_lock Unless this is set to false, a write lock
+     *     is acquired, otherwise a read lock.  If the backend doesn't support
+     *     read locking, then it should make a write lock no matter which type
+     *     of lock was requested.
+     *
+     *     All backends <em>should</em> support write locking.
      */
     function lock($tables = array(), $write_lock = true)
     {
     }
 
-    /*
+    /**
      * Unlock backend database.
+     *
+     * @param array $tables
+     * @param bool $force Normally, the database is not unlocked until
+     *  unlock() is called as many times as lock() has been.  If $force is
+     *  set to true, the the database is unconditionally unlocked.
      */
     function unlock($tables = array(), $force = false)
     {
     }
 
-    /*
+    /**
      * Close database.
      */
     function close()
@@ -655,7 +671,7 @@
     {
     }
 
-    /*
+    /**
      * Synchronize with filesystem.
      *
      * This should flush all unwritten data to the filesystem.
@@ -664,12 +680,15 @@
     {
     }
 
-    /*
+    /**
      * Optimize the database.
+     *
+     * @return bool
      */
     function optimize()
     {
-        return true; //trigger_error("optimize: Not Implemented", E_USER_WARNING);
+        //trigger_error("optimize: Not Implemented", E_USER_WARNING);
+        return true;
     }
 
     /**
@@ -681,7 +700,8 @@
      *   trigger_error("Message goes here.", E_USER_WARNING);
      * </pre>
      *
-     * @return boolean True iff database is in a consistent state.
+     * @param bool $args
+     * @return bool True iff database is in a consistent state.
      */
     function check($args = false)
     {
@@ -690,12 +710,14 @@
     }
 
     /**
-     * Put the database into a consistent state.
+     * Put the database into a consistent state
+     * by reparsing and restoring all pages.
      *
      * This should put the database into a consistent state.
      * (I.e. rebuild indexes, etc...)
      *
-     * @return boolean True iff successful.
+     * @param bool $args
+     * @return bool True iff successful.
      */
     function rebuild($args = false)
     {

Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2021-08-11 08:05:47 UTC (rev 10481)
+++ trunk/lib/WikiDB/backend.php	2021-08-11 10:16:00 UTC (rev 10482)
@@ -11,7 +11,7 @@
  *
  * 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
+ * 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
@@ -31,7 +31,7 @@
  *  //:pagename (*)
  *
  *  hits
- *  is_locked
+ *  locked
  *
  * Versiondata
  *
@@ -150,8 +150,7 @@
      *  the content, the backend might still want to set the value of
      *  '%content' to the empty string if it knows there's no content.
      *
-     * @return array|bool hash The version data, or false if specified version does not
-     *    exist.
+     * @return array|bool The version data, or false if specified version does not exist.
      *
      * Some keys which might be present in the $versiondata hash are:
      * <dl>
@@ -166,6 +165,15 @@
     abstract function get_versiondata($pagename, $version, $want_content = false);
 
     /**
+     * Rename page in the database.
+     *
+     * @param string $pagename Current page name
+     * @param string $to       Future page name
+     */
+
+    abstract function rename_page($pagename, $to);
+
+    /**
      * Delete page from the database with backup possibility.
      * This should remove all links (from the named page) from
      * the link database.
@@ -268,9 +276,10 @@
     /**
      * Set links for page.
      *
-     * @param string $pagename Page name.
+     * @param string $pagename Page name
+     * @param array  $links    List of page(names) which page links to.
      *
-     * @param array $links List of page(names) which page links to.
+     * on DEBUG: delete old, deleted links from page
      */
     abstract function set_links($pagename, $links);
 
@@ -277,12 +286,13 @@
     /**
      * Find pages which link to or are linked from a page.
      *
-     * @param string    $pagename  Page name.
-     * @param bool      $reversed True to get backlinks.
-     * @param bool      $include_empty
+     * @param string    $pagename       Page name
+     * @param bool      $reversed       True to get backlinks
+     * @param bool      $include_empty  True to get empty pages
      * @param string    $sortby
      * @param string    $limit
-     * @param string    $exclude
+     * @param string    $exclude        Pages to exclude
+     * @param bool      $want_relations
      *
      * FIXME: array or iterator?
      * @return object A WikiDB_backend_iterator.
@@ -290,7 +300,8 @@
 
     // FIXME: implement simple (but slow) link finder.
     abstract function get_links($pagename, $reversed = true, $include_empty = false,
-                                $sortby = '', $limit = '', $exclude = '');
+                                $sortby = '', $limit = '', $exclude = '',
+                                $want_relations = false);
 
     /**
      * Get all revisions of a page.
@@ -324,8 +335,8 @@
      * @param string $exclude
      * @return object A WikiDB_backend_iterator.
      */
-    abstract public function get_all_pages($include_empty,
-                                           $sortby = '', $limit = '', $exclude = '');
+    abstract function get_all_pages($include_empty,
+                                    $sortby = '', $limit = '', $exclude = '');
 
     /**
      * Title or full text search.

Modified: trunk/lib/plugin/AnalyseAccessLogSql.php
===================================================================
--- trunk/lib/plugin/AnalyseAccessLogSql.php	2021-08-11 08:05:47 UTC (rev 10481)
+++ trunk/lib/plugin/AnalyseAccessLogSql.php	2021-08-11 10:16:00 UTC (rev 10482)
@@ -11,7 +11,7 @@
  *
  * 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
+ * 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

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

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

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

Revision: 10481
          http://sourceforge.net/p/phpwiki/code/10481
Author:   vargenau
Date:     2021-08-11 08:05:47 +0000 (Wed, 11 Aug 2021)
Log Message:
-----------
We keep all revisions: remove ArchiveCleaner and $ExpireParams

Modified Paths:
--------------
    trunk/lib/IniConfig.php
    trunk/lib/WikiDB.php
    trunk/lib/editpage.php
    trunk/lib/plugin/SystemInfo.php
    trunk/locale/Makefile
    trunk/locale/it/pgsrc/NoteDiRilascio
    trunk/pgsrc/ReleaseNotes

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

Deleted: trunk/lib/ArchiveCleaner.php
===================================================================
--- trunk/lib/ArchiveCleaner.php	2021-08-10 16:29:05 UTC (rev 10480)
+++ trunk/lib/ArchiveCleaner.php	2021-08-11 08:05:47 UTC (rev 10481)
@@ -1,185 +0,0 @@
-<?php
-/**
- * Copyright © 2002 Geoffrey T. Dairiki <da...@da...>
- *
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- */
-
-class ArchiveCleaner
-{
-    function __construct($expire_params)
-    {
-        $this->expire_params = $expire_params;
-    }
-
-    /**
-     * @param WikiDB_PageRevision $revision
-     * @return bool
-     */
-    private function isMergeable($revision)
-    {
-        if (!$revision->get('is_minor_edit'))
-            return false;
-
-        $page = $revision->getPage();
-        $author_id = $revision->get('author_id');
-
-        $previous = $page->getRevisionBefore($revision, false);
-
-        return !empty($author_id)
-            && $author_id == $previous->get('author_id');
-    }
-
-    /**
-     * @param WikiDB_Page $page
-     */
-    public function cleanPageRevisions($page)
-    {
-        $INFINITY = 0x7fffffff;
-
-        $expire = &$this->expire_params;
-        $counter = array();
-        $counter['major'] = new ArchiveCleaner_Counter($expire['major']);
-        $counter['minor'] = new ArchiveCleaner_Counter($expire['minor']);
-        $counter['author'] = new ArchiveCleaner_Counter($expire['author']);
-        // shortcut to keep all
-        if (($counter['minor']->min_keep == $INFINITY)
-            and ($counter['major']->min_keep == $INFINITY)
-        )
-            return;
-
-        $authors_seen = array();
-
-        $current = $page->getCurrentRevision(false);
-
-        for ($revision = $page->getRevisionBefore($current, false);
-             $revision->getVersion() > 0;
-             $revision = $page->getRevisionBefore($revision, false)) {
-
-            if ($revision->get('is_minor_edit'))
-                $keep = $counter['minor']->keep($revision);
-            else
-                $keep = $counter['major']->keep($revision);
-
-            if ($this->isMergeable($revision)) {
-                if (!$keep) {
-                    $page->mergeRevision($revision);
-                }
-            } else {
-                $author_id = $revision->get('author_id');
-                if (empty($authors_seen[$author_id])) {
-                    if ($counter['author']->keep($revision))
-                        $keep = true;
-                    $authors_seen[$author_id] = true;
-                }
-                if (!$keep) {
-                    $page->deleteRevision($revision);
-                }
-            }
-        }
-    }
-}
-
-/**
- * @access private
- */
-class ArchiveCleaner_Counter
-{
-    function __construct($params)
-    {
-
-        if (!empty($params))
-            extract($params);
-        $INFINITY = 0x7fffffff;
-
-        $this->max_keep = isset($max_keep) ? $max_keep : $INFINITY;
-
-        $this->min_age = isset($min_age) ? $min_age : 0;
-        $this->min_keep = isset($min_keep) ? $min_keep : 0;
-
-        $this->max_age = isset($max_age) ? $max_age : $INFINITY;
-        $this->keep = isset($keep) ? $keep : $INFINITY;
-
-        if ($this->keep > $this->max_keep)
-            $this->keep = $this->max_keep;
-        if ($this->min_keep == $INFINITY) { // shortcut to keep all
-            $this->max_keep = $this->keep = $this->min_age = $this->max_age = $INFINITY;
-        }
-        if ($this->min_keep > $this->keep)
-            $this->min_keep = $this->keep;
-
-        if ($this->min_age > $this->max_age)
-            $this->min_age = $this->max_age;
-
-        $this->now = time();
-        $this->count = 0;
-        $this->previous_supplanted = false;
-
-    }
-
-    /**
-     * @param WikiDB_PageRevision $revision
-     * @return float|int
-     */
-    private function computeAge($revision)
-    {
-        $supplanted = $revision->get('_supplanted');
-
-        if (!$supplanted) {
-            // Every revision but the most recent should have a supplanted time.
-            // However, if it doesn't...
-            trigger_error(sprintf("Warning: Page “%s”, version '%d' has no '_supplanted' timestamp",
-                    $revision->getPageName(),
-                    $revision->getVersion()),
-                E_USER_NOTICE);
-            // Assuming revisions are chronologically ordered, the previous
-            // supplanted time is a good value to use...
-            if ($this->previous_supplanted > 0)
-                $supplanted = $this->previous_supplanted;
-            else {
-                // no supplanted timestamp.
-                // don't delete this revision based on age.
-                return 0;
-            }
-        }
-
-        $this->previous_supplanted = $supplanted;
-        return ($this->now - $supplanted) / (24 * 3600);
-    }
-
-    /**
-     * @param WikiDB_PageRevision $revision
-     * @return bool
-     */
-    function keep($revision)
-    {
-        $INFINITY = 0x7fffffff;
-        if ($this->min_keep == $INFINITY)
-            return true;
-        $count = ++$this->count;
-        $age = $this->computeAge($revision);
-
-        if ($count > $this->max_keep)
-            return false;
-        if ($age <= $this->min_age || $count <= $this->min_keep)
-            return true;
-        return $age <= $this->max_age && $count <= $this->keep;
-    }
-}

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2021-08-10 16:29:05 UTC (rev 10480)
+++ trunk/lib/IniConfig.php	2021-08-11 08:05:47 UTC (rev 10481)
@@ -343,27 +343,6 @@
     unset($item);
     unset($k);
 
-    // Expiry stuff
-    global $ExpireParams;
-    foreach (array('major', 'minor', 'author') as $major) {
-        foreach (array('max_age', 'min_age', 'min_keep', 'keep', 'max_keep') as $max) {
-            $item = strtoupper($major) . '_' . strtoupper($max);
-            if (defined($item))
-                $val = constant($item);
-            elseif (array_key_exists($item, $rs))
-                $val = $rs[$item];
-            elseif (array_key_exists($item, $rsdef))
-                $val = $rsdef[$item];
-            if (!isset($ExpireParams[$major]))
-                $ExpireParams[$major] = array();
-            $ExpireParams[$major][$max] = $val;
-            unset($rs[$item]);
-        }
-    }
-    unset($item);
-    unset($major);
-    unset($max);
-
     // User authentication
     if (!isset($GLOBALS['USER_AUTH_ORDER'])) {
         if (isset($rs['USER_AUTH_ORDER']))

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2021-08-10 16:29:05 UTC (rev 10480)
+++ trunk/lib/WikiDB.php	2021-08-11 08:05:47 UTC (rev 10481)
@@ -2310,9 +2310,6 @@
         $readdata = false;
         if (USECACHE) { //temporary - for debugging
             assert(is_string($pagename) && $pagename != '');
-            // There is a bug here somewhere which results in an assertion failure at line 105
-            // of ArchiveCleaner.php  It goes away if we use the next line.
-            //$need_content = true;
             $nc = $need_content ? '1' : '0';
             $cache = &$this->_versiondata_cache;
             if (!isset($cache[$pagename][$version][$nc])

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2021-08-10 16:29:05 UTC (rev 10480)
+++ trunk/lib/editpage.php	2021-08-11 08:05:47 UTC (rev 10481)
@@ -356,11 +356,6 @@
         // New contents successfully saved...
         $this->updateLock();
 
-        // Clean out archived versions of this page.
-        require_once 'lib/ArchiveCleaner.php';
-        $cleaner = new ArchiveCleaner($GLOBALS['ExpireParams']);
-        $cleaner->cleanPageRevisions($page);
-
         /* generate notification emails done in WikiDB::save to catch
          all direct calls (admin plugins) */
 

Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2021-08-10 16:29:05 UTC (rev 10480)
+++ trunk/lib/plugin/SystemInfo.php	2021-08-11 08:05:47 UTC (rev 10481)
@@ -151,24 +151,6 @@
         return $s;
     }
 
-    function ExpireParams()
-    {
-        global $ExpireParams;
-        $s = sprintf(_("Keep up to %d major edits, but keep them no longer than %d days."),
-            $ExpireParams['major']['keep'],
-            $ExpireParams['major']['max_age']);
-        $s .= sprintf(_(" Keep up to %d minor edits, but keep them no longer than %d days."),
-            $ExpireParams['minor']['keep'],
-            $ExpireParams['minor']['max_age']);
-        $s .= sprintf(_(" Keep the latest contributions of the last %d authors up to %d days."),
-            $ExpireParams['author']['keep'], $ExpireParams['author']['max_age']);
-        $s .= sprintf(_(" Additionally, try to keep the latest contributions of all authors in the last %d days (even if there are more than %d of them,) but in no case keep more than %d unique author revisions."),
-            $ExpireParams['author']['min_age'],
-            $ExpireParams['author']['keep'],
-            $ExpireParams['author']['max_keep']);
-        return $s;
-    }
-
     function pagestats()
     {
         global $request;
@@ -555,7 +537,6 @@
                 //'accessstats'      => _("Access statistics"),
                 'hitstats' => _("Hit statistics"),
                 'discspace' => _("Harddisc usage"),
-                'expireparams' => _("Expiry parameters"),
                 'wikinameregexp' => _("Wikiname regexp"),
                 'allowedprotocols' => _("Allowed protocols"),
                 'inlineimages' => _("Inline images"),

Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2021-08-10 16:29:05 UTC (rev 10480)
+++ trunk/locale/Makefile	2021-08-11 08:05:47 UTC (rev 10481)
@@ -74,7 +74,6 @@
 ${POT_FILE}: .././getimg.php
 ${POT_FILE}: .././ImageTile.php
 ${POT_FILE}: .././index.php
-${POT_FILE}: .././lib/ArchiveCleaner.php
 ${POT_FILE}: .././lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
 ${POT_FILE}: .././lib/ASCIIMathPHP/ASCIIMathPHP.class.php
 ${POT_FILE}: .././lib/AtomParser.php

Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio	2021-08-10 16:29:05 UTC (rev 10480)
+++ trunk/locale/it/pgsrc/NoteDiRilascio	2021-08-11 08:05:47 UTC (rev 10481)
@@ -1,4 +1,4 @@
-Date: Thu, 29 Jul 2021 21:08:02 +0000
+Date: Wed, 11 Aug 2021 10:03:04 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=NoteDiRilascio;
@@ -8,10 +8,10 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
 
-== 1.6.0 2020-12-XX Marc-Etienne Vargenau ==
+== 1.6.0 2021-08-XX Marc-Etienne Vargenau ==
 
 Major release:
-* PHP 7 compatible (works from PHP 5.3.3 to PHP 7)
+* PHP 7 and 8 compatible (works from PHP 5.3.3 to PHP 8.0)
 * Full HTML 5: Add HTML 5 <main> <header> <footer> <nav> in all themes. Add ARIA roles.
 * Flash is dead
 * Internet Explorer is dead
@@ -28,6 +28,7 @@
 * Security fixes
 
 === Changes ===
+* All revisions are kept.
 * Add new button in Edit Toolbar: convert Tab Separated Values to Wikicreole table
 * Update jQuery to 2.2.4
 * Pear: use ##mysqli## instead of ##mysql##

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2021-08-10 16:29:05 UTC (rev 10480)
+++ trunk/pgsrc/ReleaseNotes	2021-08-11 08:05:47 UTC (rev 10481)
@@ -1,4 +1,4 @@
-Date: Fri, 30 Jul 2021 12:55:59 +0000
+Date: Wed, 11 Aug 2021 10:03:04 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -11,7 +11,7 @@
 == 1.6.0 2021-08-XX Marc-Etienne Vargenau ==
 
 Major release:
-* PHP 7 and 8 compatible (works from PHP 5.3.3 to PHP 8)
+* PHP 7 and 8 compatible (works from PHP 5.3.3 to PHP 8.0)
 * Full HTML 5: Add HTML 5 <main> <header> <footer> <nav> in all themes. Add ARIA roles.
 * Flash is dead
 * Internet Explorer is dead
@@ -28,6 +28,7 @@
 * Security fixes
 
 === Changes ===
+* All revisions are kept.
 * Add new button in Edit Toolbar: convert Tab Separated Values to Wikicreole table
 * Update jQuery to 2.2.4
 * Pear: use ##mysqli## instead of ##mysql##

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

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

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

Revision: 10480
          http://sourceforge.net/p/phpwiki/code/10480
Author:   vargenau
Date:     2021-08-10 16:29:05 +0000 (Tue, 10 Aug 2021)
Log Message:
-----------
Upgrade no longer changes the database schema

Modified Paths:
--------------
    trunk/locale/de/pgsrc/PhpWikiSystemverwalten
    trunk/locale/fr/pgsrc/AdministrationDePhpWiki
    trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki
    trunk/locale/nl/pgsrc/PhpWikiBeheer
    trunk/locale/sv/pgsrc/PhpWikiAdministration
    trunk/locale/zh/pgsrc/PhpWikiAdministration
    trunk/pgsrc/PhpWikiAdministration
    trunk/themes/fusionforge/pgsrc/PhpWikiAdministration

Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten	2021-08-10 16:04:18 UTC (rev 10479)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten	2021-08-10 16:29:05 UTC (rev 10480)
@@ -1,4 +1,4 @@
-Date: Fri,  6 Aug 2021 16:19:21 +0000
+Date: Tue, 10 Aug 2021 18:24:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiSystemverwalten;
@@ -103,8 +103,7 @@
 
 Führe einige Systemchecks aus und bringe geänderte Seiten auf den letzten Stand,
 nachdem Sie die PhpWiki Version auf den letzten Stand gebracht haben:
-* Upgrade neue oder geänderte Seiten von pgsrc,
-* Upgrade das Datenbank Schema (mysql //page.id auto_increment//, ADD //session.sess_ip//),
+* Upgrade neue oder geänderte Seiten von pgsrc
 
 You can force overwrite or not:
 * **[[phpwiki:HomePage?action=upgrade|Upgrade]]**

Modified: trunk/locale/fr/pgsrc/AdministrationDePhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/AdministrationDePhpWiki	2021-08-10 16:04:18 UTC (rev 10479)
+++ trunk/locale/fr/pgsrc/AdministrationDePhpWiki	2021-08-10 16:29:05 UTC (rev 10480)
@@ -1,4 +1,4 @@
-Date: Fri,  6 Aug 2021 16:19:21 +0000
+Date: Tue, 10 Aug 2021 18:24:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=AdministrationDePhpWiki;
@@ -100,9 +100,8 @@
 === Mise à jour ===
 
 Fait quelques vérifications et mises à jours automatiquement après avoir installé
-un nouveau moteur phpwiki de mise à jour
-* Met à jour les nouvelles pages ou les pages révisées depuis pgsrc,
-* Met à jour la base de données (mysql //page.id auto_increment//, ADD //session.sess_ip//),
+un nouveau moteur phpwiki :
+* Met à jour les nouvelles pages ou les pages révisées depuis pgsrc
 
 Vous pouvez forcer le remplacement ou non :
 * **[[phpwiki:HomePage?action=upgrade|Mettre à jour]]**

Modified: trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki
===================================================================
--- trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki	2021-08-10 16:04:18 UTC (rev 10479)
+++ trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki	2021-08-10 16:29:05 UTC (rev 10480)
@@ -1,4 +1,4 @@
-Date: Fri,  6 Aug 2021 17:30:51 +0000
+Date: Tue, 10 Aug 2021 18:24:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=AmministrazioneDiPhpWiki;
@@ -101,8 +101,7 @@
 
 Do some verification checks and upgrade changes automatically, after having installed a
 new phpwiki engine update:
-* Upgrade new or changed page revisions from pgsrc,
-* Upgrade the database schema (mysql //page.id auto_increment//, ADD //session.sess_ip//),
+* Upgrade new or changed page revisions from pgsrc
 
 You can force overwrite or not:
 * **[[phpwiki:HomePage?action=upgrade|Upgrade]]**

Modified: trunk/locale/nl/pgsrc/PhpWikiBeheer
===================================================================
--- trunk/locale/nl/pgsrc/PhpWikiBeheer	2021-08-10 16:04:18 UTC (rev 10479)
+++ trunk/locale/nl/pgsrc/PhpWikiBeheer	2021-08-10 16:29:05 UTC (rev 10480)
@@ -1,4 +1,4 @@
-Date: Fri,  6 Aug 2021 16:19:21 +0000
+Date: Tue, 10 Aug 2021 18:24:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiBeheer;
@@ -101,8 +101,7 @@
 
 Do some verification checks and upgrade changes automatically, after having installed a
 new phpwiki engine update:
-* Upgrade new or changed page revisions from pgsrc,
-* Upgrade the database schema (mysql //page.id auto_increment//, ADD //session.sess_ip//),
+* Upgrade new or changed page revisions from pgsrc
 
 You can force overwrite or not:
 * **[[phpwiki:HomePage?action=upgrade|Upgrade]]**

Modified: trunk/locale/sv/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/locale/sv/pgsrc/PhpWikiAdministration	2021-08-10 16:04:18 UTC (rev 10479)
+++ trunk/locale/sv/pgsrc/PhpWikiAdministration	2021-08-10 16:29:05 UTC (rev 10480)
@@ -1,4 +1,4 @@
-Date: Fri,  6 Aug 2021 17:30:51 +0000
+Date: Tue, 10 Aug 2021 18:24:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration;
@@ -100,8 +100,7 @@
 
 Do some verification checks and upgrade changes automatically, after having installed a
 new phpwiki engine update:
-* Upgrade new or changed page revisions from pgsrc,
-* Upgrade the database schema (mysql //page.id auto_increment//, ADD //session.sess_ip//),
+* Upgrade new or changed page revisions from pgsrc
 
 You can force overwrite or not:
 * **[[phpwiki:HomePage?action=upgrade|Upgrade]]**

Modified: trunk/locale/zh/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/locale/zh/pgsrc/PhpWikiAdministration	2021-08-10 16:04:18 UTC (rev 10479)
+++ trunk/locale/zh/pgsrc/PhpWikiAdministration	2021-08-10 16:29:05 UTC (rev 10480)
@@ -1,4 +1,4 @@
-Date: Fri,  6 Aug 2021 17:30:51 +0000
+Date: Tue, 10 Aug 2021 18:24:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration;
@@ -96,8 +96,7 @@
 
 Do some verification checks and upgrade changes automatically, after having installed a
 new phpwiki engine update:
-* Upgrade new or changed page revisions from pgsrc,
-* Upgrade the database schema (mysql //page.id auto_increment//, ADD //session.sess_ip//),
+* Upgrade new or changed page revisions from pgsrc
 
 You can force overwrite or not:
 * **[[phpwiki:HomePage?action=upgrade|Upgrade]]**

Modified: trunk/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/pgsrc/PhpWikiAdministration	2021-08-10 16:04:18 UTC (rev 10479)
+++ trunk/pgsrc/PhpWikiAdministration	2021-08-10 16:29:05 UTC (rev 10480)
@@ -1,4 +1,4 @@
-Date: Fri,  6 Aug 2021 16:19:21 +0000
+Date: Mon,  9 Aug 2021 18:24:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration;
@@ -101,8 +101,7 @@
 
 Do some verification checks and upgrade changes automatically, after having installed a
 new phpwiki engine update:
-* Upgrade new or changed page revisions from pgsrc,
-* Upgrade the database schema (mysql //page.id auto_increment//, ADD //session.sess_ip//),
+* Upgrade new or changed page revisions from pgsrc
 
 You can force overwrite or not:
 * **[[phpwiki:HomePage?action=upgrade|Upgrade]]**

Modified: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/themes/fusionforge/pgsrc/PhpWikiAdministration	2021-08-10 16:04:18 UTC (rev 10479)
+++ trunk/themes/fusionforge/pgsrc/PhpWikiAdministration	2021-08-10 16:29:05 UTC (rev 10480)
@@ -1,4 +1,4 @@
-Date: Wed,  4 Aug 2021 09:27:34 +0000
+Date: Tue, 10 Aug 2021 18:24:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration;
@@ -86,8 +86,7 @@
 
 Do some verification checks and upgrade changes automatically, after having installed a
 new phpwiki engine update:
-* Upgrade new or changed page revisions from pgsrc,
-* Upgrade the database schema (mysql //page.id auto_increment//, ADD //session.sess_ip//),
+* Upgrade new or changed page revisions from pgsrc
 
 You can force overwrite or not:
 * **[[phpwiki:HomePage?action=upgrade|Upgrade]]**

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

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

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

Revision: 10479
          http://sourceforge.net/p/phpwiki/code/10479
Author:   vargenau
Date:     2021-08-10 16:04:18 +0000 (Tue, 10 Aug 2021)
Log Message:
-----------
INSTALL: DATABASE_TYPE = dba

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

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2021-08-10 15:39:47 UTC (rev 10478)
+++ trunk/INSTALL	2021-08-10 16:04:18 UTC (rev 10479)
@@ -12,6 +12,13 @@
 installation and configure options.
 <https://www.php.net/manual/en/installation.php>
 
+If you have DATABASE_TYPE = dba, you might need to do:
+yum install php-dba (Red Hat, CentOS)
+or
+dnf install php-dba (Fedora)
+or
+apt install php-dba (Debian, Ubuntu)
+
 To be able to export the wiki in ZIP format (in PhpWikiAdministration),
 ZipArchive class must be available. You might need to do:
 yum install php-pecl-zip (Red Hat, CentOS)

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

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

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

Revision: 10478
          http://sourceforge.net/p/phpwiki/code/10478
Author:   vargenau
Date:     2021-08-10 15:39:47 +0000 (Tue, 10 Aug 2021)
Log Message:
-----------
INSTALL: add dnf install

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

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2021-08-10 15:11:36 UTC (rev 10477)
+++ trunk/INSTALL	2021-08-10 15:39:47 UTC (rev 10478)
@@ -14,38 +14,51 @@
 
 To be able to export the wiki in ZIP format (in PhpWikiAdministration),
 ZipArchive class must be available. You might need to do:
-yum install php-pecl-zip
+yum install php-pecl-zip (Red Hat, CentOS)
 or
-apt install php-zip
+dnf install php-zip (Fedora)
+or
+apt install php-zip (Debian, Ubuntu)
 
 TeX2png and text2png plugins need the PHP imagetypes() function. You might
 need to do:
-yum install php-gd
+yum install php-gd (Red Hat, CentOS)
 or
-apt install php-gd
+dnf install php-gd (Fedora)
+or
+apt install php-gd (Debian, Ubuntu)
 
 LdapSearch plugin requires the PHP ldap_connect() function. You might
 need to do:
-yum install php-ldap
+yum install php-ldap (Red Hat, CentOS)
 or
-apt install php-ldap
+dnf install php-ldap (Fedora)
+or
+apt install php-ldap (Debian, Ubuntu)
 
 TeX2png plugin requires LaTeX to be installed. You might need to do:
-yum install texlive
+yum install texlive (Red Hat, CentOS)
 yum install latex2html
 or
-apt install texlive
+dnf install texlive (Fedora)
+dnf install latex2html
+or
+apt install texlive (Debian, Ubuntu)
 apt install latex2html
 
 GraphViz plugin requires GraphViz to be installed. You might need to do:
-yum install graphviz
+yum install graphviz (Red Hat, CentOS)
 or
-apt install graphviz
+dnf install graphviz (Fedora)
+or
+apt install graphviz (Debian, Ubuntu)
 
 GooglePlugin plugin requires PHP SoapClient class. You might need to do:
-yum install php-soap
+yum install php-soap (Red Hat, CentOS)
 or
-apt install php-soap
+dnf install php-soap (Fedora)
+or
+apt install php-soap (Debian, Ubuntu)
 
 QUICK START INSTRUCTIONS
 

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

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

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

Revision: 10477
          http://sourceforge.net/p/phpwiki/code/10477
Author:   vargenau
Date:     2021-08-10 15:11:36 +0000 (Tue, 10 Aug 2021)
Log Message:
-----------
INSTALL: TeX2png and text2png plugins need the PHP imagetypes() function

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

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2021-08-10 12:35:26 UTC (rev 10476)
+++ trunk/INSTALL	2021-08-10 15:11:36 UTC (rev 10477)
@@ -18,6 +18,12 @@
 or
 apt install php-zip
 
+TeX2png and text2png plugins need the PHP imagetypes() function. You might
+need to do:
+yum install php-gd
+or
+apt install php-gd
+
 LdapSearch plugin requires the PHP ldap_connect() function. You might
 need to do:
 yum install php-ldap

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10476] trunk/lib/plugin/PasswordReset.php

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

Revision: 10476
          http://sourceforge.net/p/phpwiki/code/10476
Author:   vargenau
Date:     2021-08-10 12:35:26 +0000 (Tue, 10 Aug 2021)
Log Message:
-----------
lib/plugin/PasswordReset.php: avoid warning

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

Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php	2021-08-10 10:04:30 UTC (rev 10475)
+++ trunk/lib/plugin/PasswordReset.php	2021-08-10 12:35:26 UTC (rev 10476)
@@ -144,6 +144,9 @@
         if (!$userid) $userid = $request->getArg('user');
         $isadmin = $user->isAdmin();
         if ($request->isPost()) {
+            if ($post_args === false) {
+                return $this->doForm($request, $userid);
+            }
             if (!array_key_exists('reset', $post_args)) {
                 return $this->doForm($request, $userid);
             }
@@ -162,7 +165,7 @@
                     return '';
                 }
             } elseif (empty($post_args['verify'])) {
-                //TODO: verify should check if the user exists, his prefs can be read/safed
+                //TODO: verify should check if the user exists, his prefs can be read/saved
                 //      and the email is verified, even if admin.
                 $buttons = HTML::p(Button('submit:admin_reset[reset]',
                         $isadmin ? _("Yes") : _("Send e-mail"),

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