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

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

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

Revision: 10525
          http://sourceforge.net/p/phpwiki/code/10525
Author:   vargenau
Date:     2021-08-17 16:43:43 +0000 (Tue, 17 Aug 2021)
Log Message:
-----------
fetchAll cannot have mode PDO::FETCH_NUM

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

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2021-08-16 16:32:48 UTC (rev 10524)
+++ trunk/lib/WikiDB/backend/PDO.php	2021-08-17 16:43:43 UTC (rev 10525)
@@ -235,7 +235,7 @@
             . " FROM $nonempty_tbl, $page_tbl"
             . " WHERE $nonempty_tbl.id=$page_tbl.id"
             . " LIMIT 1");
-        return $sth->fetchAll(PDO::FETCH_NUM);
+        return $sth->fetchAll(); // which mode??
     }
 
     /*

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10524] trunk/locale

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

Revision: 10524
          http://sourceforge.net/p/phpwiki/code/10524
Author:   vargenau
Date:     2021-08-16 16:32:48 +0000 (Mon, 16 Aug 2021)
Log Message:
-----------
search results have an Edit link: translations

Modified Paths:
--------------
    trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten
    trunk/locale/es/pgsrc/Ayuda%2FEditarElTexto
    trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu
    trunk/locale/it/pgsrc/Aiuto%2FModificaIlTesto
    trunk/locale/nl/pgsrc/Help%2FVeranderTekst
    trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FRedigeraText
    trunk/locale/zh/pgsrc/Help%2FEditText

Modified: trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten	2021-08-16 14:50:55 UTC (rev 10523)
+++ trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten	2021-08-16 16:32:48 UTC (rev 10524)
@@ -1,4 +1,4 @@
-Date: Wed, 10 Apr 2019 18:24:49 +0000
+Date: Mon, 16 Aug 2021 18:28:17 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FTextBearbeiten;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Alle Seiten (mit Ausnahme von Suchergebnissen) haben unten einen Link //Bearbeiten//.
+Alle Seiten haben unten einen Link //Bearbeiten//.
 Man kann die aktuelle Seite edieren, indem man diesen Link anklickt.
 
 <noinclude>

Modified: trunk/locale/es/pgsrc/Ayuda%2FEditarElTexto
===================================================================
--- trunk/locale/es/pgsrc/Ayuda%2FEditarElTexto	2021-08-16 14:50:55 UTC (rev 10523)
+++ trunk/locale/es/pgsrc/Ayuda%2FEditarElTexto	2021-08-16 16:32:48 UTC (rev 10524)
@@ -1,4 +1,4 @@
-Date: Mon,  8 Apr 2019 18:49:20 +0000
+Date: Mon, 16 Aug 2021 18:28:17 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Ayuda%2FEditarElTexto;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Todas las páginas (excepto los resultados de búsquedas) tienen una enlace hacia //Editar//.
+Todas las páginas tienen una enlace hacia //Editar//.
 Al hacer click sobre este enlace se puede editar el texto que se está leyendo.
 
 <noinclude>

Modified: trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu	2021-08-16 14:50:55 UTC (rev 10523)
+++ trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu	2021-08-16 16:32:48 UTC (rev 10524)
@@ -1,4 +1,4 @@
-Date: Thu, 11 Apr 2019 16:07:57 +0000
+Date: Mon, 16 Aug 2021 18:28:17 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Aide%2F%C3%89diterLeContenu;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Toute les pages (sauf les résultats de recherche) ont un lien //Modifier//.
+Toute les pages ont un lien //Modifier//.
 Vous pouvez modifier la page que vous lisez en cliquant sur ce lien.
 
 <noinclude>

Modified: trunk/locale/it/pgsrc/Aiuto%2FModificaIlTesto
===================================================================
--- trunk/locale/it/pgsrc/Aiuto%2FModificaIlTesto	2021-08-16 14:50:55 UTC (rev 10523)
+++ trunk/locale/it/pgsrc/Aiuto%2FModificaIlTesto	2021-08-16 16:32:48 UTC (rev 10524)
@@ -1,4 +1,4 @@
-Date: Thu, 11 Apr 2019 16:07:57 +0000
+Date: Mon, 16 Aug 2021 18:28:17 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Aiuto%2FModificaIlTesto;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Tutte le pagine (eccetto i risultati della ricerca) hanno un collegamento //Modifica//.
+Tutte le pagine hanno un collegamento //Modifica//.
 Puoi modificare la pagina che stai leggendo cliccando su quel link.
 
 <noinclude>

Modified: trunk/locale/nl/pgsrc/Help%2FVeranderTekst
===================================================================
--- trunk/locale/nl/pgsrc/Help%2FVeranderTekst	2021-08-16 14:50:55 UTC (rev 10523)
+++ trunk/locale/nl/pgsrc/Help%2FVeranderTekst	2021-08-16 16:32:48 UTC (rev 10524)
@@ -1,4 +1,4 @@
-Date: Fri, 12 Apr 2019 10:36:59 +0000
+Date: Mon, 16 Aug 2021 18:28:17 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FVeranderTekst;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Onderaan alle pagina's (behalve zoekresultaten) staat eeen //Verander// koppeling.
+Onderaan alle pagina's staat eeen //Verander// koppeling.
 Je kunt de pagina die je leest, veranderen door op die koppeling te klikken.
 
 <noinclude>

Modified: trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FRedigeraText
===================================================================
--- trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FRedigeraText	2021-08-16 14:50:55 UTC (rev 10523)
+++ trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FRedigeraText	2021-08-16 16:32:48 UTC (rev 10524)
@@ -1,4 +1,4 @@
-Date: Mon,  8 Apr 2019 18:49:20 +0000
+Date: Mon, 16 Aug 2021 18:28:17 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Hj%C3%A4lp%2FRedigeraText;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Alla sidor (utom sökresultatsidan) har en //Redigera//-länk längst
+Alla sidor har en //Redigera//-länk längst
 ned. Du kan ändra sidan du läser genom att klicka på den länken.
 
 <noinclude>

Modified: trunk/locale/zh/pgsrc/Help%2FEditText
===================================================================
--- trunk/locale/zh/pgsrc/Help%2FEditText	2021-08-16 14:50:55 UTC (rev 10523)
+++ trunk/locale/zh/pgsrc/Help%2FEditText	2021-08-16 16:32:48 UTC (rev 10524)
@@ -1,4 +1,4 @@
-Date: Mon,  8 Apr 2019 18:49:20 +0000
+Date: Mon, 16 Aug 2021 18:28:17 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FEditText;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-所有頁面 (除了搜尋結果以外) 的最底部都有一個 //編輯// 連結.
+所有頁面的最底部都有一個 //編輯// 連結.
 如果準備好要編輯這個頁面時,你可以點擊這個連結.
 
 <noinclude>

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

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

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

Revision: 10523
          http://sourceforge.net/p/phpwiki/code/10523
Author:   vargenau
Date:     2021-08-16 14:50:55 +0000 (Mon, 16 Aug 2021)
Log Message:
-----------
pgsrc/Help%2FEditText: search results have an Edit link

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

Modified: trunk/pgsrc/Help%2FEditText
===================================================================
--- trunk/pgsrc/Help%2FEditText	2021-08-16 09:56:12 UTC (rev 10522)
+++ trunk/pgsrc/Help%2FEditText	2021-08-16 14:50:55 UTC (rev 10523)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Mon, 16 Aug 2021 16:48:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FEditText;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-All pages (except search results) have an //Edit// link.
+All pages have an //Edit// link.
 You can edit the page you are reading by clicking that link.
 
 <noinclude>

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

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

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

Revision: 10522
          http://sourceforge.net/p/phpwiki/code/10522
Author:   vargenau
Date:     2021-08-16 09:56:12 +0000 (Mon, 16 Aug 2021)
Log Message:
-----------
Fix SQL quoting for PDO in search

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

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2021-08-16 08:06:55 UTC (rev 10521)
+++ trunk/lib/WikiDB/backend/PDO.php	2021-08-16 09:56:12 UTC (rev 10522)
@@ -1422,7 +1422,36 @@
 
 class WikiDB_backend_PDO_search extends WikiDB_backend_search_sql
 {
-    // no surrounding quotes because we know it's a string
+    function _pagename_match_clause($node)
+    {
+        $word = $node->sql();
+        if ($word == '%') { // ALL shortcut
+            return "1=1";
+        } else {
+            $dbh = &$this->_dbh;
+            $word = $dbh->quote($word);
+            return ($this->_case_exact
+                ? "pagename LIKE $word"
+                : "LOWER(pagename) LIKE $word");
+        }
+    }
+
+    function _fulltext_match_clause($node)
+    {
+        // force word-style %word% for fulltext search
+        $dbh = &$this->_dbh;
+        $word = strtolower($node->word);
+        $word = $dbh->quote('%' . $word . '%');
+        // eliminate stoplist words
+        if ($this->isStoplisted($node)) {
+            return "1=1"; // and (pagename or 1) => and 1
+        } else {
+            return $this->_pagename_match_clause($node)
+                // probably convert this MATCH AGAINST or SUBSTR/POSITION without wildcards
+                . ($this->_case_exact ? " OR content LIKE $word"
+                    : " OR LOWER(content) LIKE $word");
+        }
+    }
 }
 
 // Following function taken from Pear::DB (prev. from adodb-pear.inc.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:[10521] trunk/lib/WikiDB/backend

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

Revision: 10521
          http://sourceforge.net/p/phpwiki/code/10521
Author:   vargenau
Date:     2021-08-16 08:06:55 +0000 (Mon, 16 Aug 2021)
Log Message:
-----------
Merge lib/WikiDB/backend/PearDB.php lib/WikiDB/backend/ADODB.php lib/WikiDB/backend/PDO.php

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

Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php	2021-08-14 19:35:00 UTC (rev 10520)
+++ trunk/lib/WikiDB/backend/ADODB.php	2021-08-16 08:06:55 UTC (rev 10521)
@@ -136,8 +136,9 @@
      */
     function close()
     {
-        if (!$this->_dbh)
+        if (!$this->_dbh) {
             return;
+        }
         if ($this->_lock_count) {
             trigger_error("WARNING: database still locked " .
                     '(lock_count = $this->_lock_count)' . "\n<br />",
@@ -212,12 +213,13 @@
         return $row ? $this->_extract_page_data($row[3], $row[2]) : false;
     }
 
-    public function  _extract_page_data($data, $hits)
+    public function _extract_page_data($data, $hits)
     {
-        if (empty($data))
+        if (empty($data)) {
             return array('hits' => $hits);
-        else
+        } else {
             return array_merge(array('hits' => $hits), $this->_unserialize($data));
+        }
     }
 
     function update_pagedata($pagename, $newdata)
@@ -298,6 +300,7 @@
                 return $cache[$pagename];
             }
         }
+
         // attributes play this game.
         if ($pagename === '') return 0;
 
@@ -342,9 +345,9 @@
         $dbh = &$this->_dbh;
         extract($this->_table_names);
         $row = $dbh->GetRow(sprintf("SELECT latestversion"
-                . " FROM $page_tbl, $recent_tbl"
-                . " WHERE $page_tbl.id=$recent_tbl.id"
-                . "  AND pagename=%s",
+                    . " FROM $page_tbl, $recent_tbl"
+                    . " WHERE $page_tbl.id=$recent_tbl.id"
+                    . "  AND pagename=%s",
             $dbh->qstr($pagename)));
         return $row ? (int)$row[0] : false;
     }
@@ -355,11 +358,11 @@
         extract($this->_table_names);
         // Use SELECTLIMIT for maximum portability
         $rs = $dbh->SelectLimit(sprintf("SELECT version"
-            . " FROM $version_tbl, $page_tbl"
-            . " WHERE $version_tbl.id=$page_tbl.id"
-            . "  AND pagename=%s"
-            . "  AND version < %d"
-            . " ORDER BY version DESC",
+                    . " FROM $version_tbl, $page_tbl"
+                    . " WHERE $version_tbl.id=$page_tbl.id"
+                    . "  AND pagename=%s"
+                    . "  AND version < %d"
+                    . " ORDER BY version DESC",
                 $dbh->qstr($pagename),
                 $version),
             1);
@@ -374,7 +377,6 @@
      * @param bool $want_content Do we need content?
      *
      * @return array|false The version data, or false if specified version does not exist.
-
      */
     function get_versiondata($pagename, $version, $want_content = false)
     {
@@ -387,8 +389,9 @@
 
         // FIXME: optimization: sometimes don't get page data?
         if ($want_content) {
-            $fields = $this->page_tbl_fields . ", $page_tbl.pagedata AS pagedata"
-                . ', ' . $this->version_tbl_fields;
+            $fields = $this->page_tbl_fields
+                . ",$page_tbl.pagedata AS pagedata,"
+                . $this->version_tbl_fields;
         } else {
             $fields = $this->page_tbl_fields . ", '' AS pagedata"
                 . ", $version_tbl.version AS version, $version_tbl.mtime AS mtime, "
@@ -396,10 +399,10 @@
                 . "$version_tbl.versiondata as versiondata";
         }
         $row = $dbh->GetRow(sprintf("SELECT $fields"
-            . " FROM $page_tbl, $version_tbl"
-            . " WHERE $page_tbl.id=$version_tbl.id"
-            . "  AND pagename=%s"
-            . "  AND version=%d",
+                    . " FROM $page_tbl, $version_tbl"
+                    . " WHERE $page_tbl.id=$version_tbl.id"
+                    . "  AND pagename=%s"
+                    . "  AND version=%d",
             $dbh->qstr($pagename), $version));
         return $row ? $this->_extract_version_data_num($row, $want_content) : false;
     }
@@ -480,8 +483,11 @@
                 $content, $this->_serialize($data)));
         $this->_update_recent_table($id);
         $this->_update_nonempty_table($id);
-        if ($rs) $dbh->CommitTrans();
-        else $dbh->RollbackTrans();
+        if ($rs) {
+            $dbh->CommitTrans();
+        } else {
+            $dbh->RollbackTrans();
+        }
         $this->unlock(array('page', 'recent', 'version', 'nonempty'));
     }
 
@@ -526,7 +532,7 @@
 
         $dbh->BeginTrans();
         $dbh->CommitLock($recent_tbl);
-        if (($id = $this->_get_pageid($pagename, false)) === false) {
+        if (($id = $this->_get_pageid($pagename)) === false) {
             $dbh->RollbackTrans();
             return false;
         }
@@ -570,7 +576,7 @@
         extract($this->_table_names);
 
         $this->lock(array('version', 'recent', 'nonempty', 'page', 'link'));
-        if (($id = $this->_get_pageid($pagename, false))) {
+        if (($id = $this->_get_pageid($pagename))) {
             $dbh->Execute("DELETE FROM $nonempty_tbl WHERE id=$id");
             $dbh->Execute("DELETE FROM $recent_tbl   WHERE id=$id");
             $dbh->Execute("DELETE FROM $version_tbl  WHERE id=$id");
@@ -618,13 +624,13 @@
         if ($links) {
             foreach ($links as $link) {
                 $linkto = $link['linkto'];
+                if ($linkto === "") { // ignore attributes
+                    continue;
+                }
                 if (isset($link['relation']))
                     $relation = $this->_get_pageid($link['relation'], true);
                 else
                     $relation = 0;
-                if ($linkto === "") { // ignore attributes
-                    continue;
-                }
                 // avoid duplicates
                 if (isset($linkseen[$linkto]) and !$relation) {
                     continue;
@@ -746,7 +752,9 @@
         $dbh = &$this->_dbh;
         extract($this->_table_names);
         $orderby = $this->sortby($sortby, 'db');
-        if ($orderby) $orderby = ' ORDER BY ' . $orderby;
+        if ($orderby) {
+            $orderby = ' ORDER BY ' . $orderby;
+        }
         $and = '';
         if ($exclude) { // array of pagenames
             $and = ' AND ';
@@ -801,7 +809,7 @@
     }
 
     /*
-     * Title and fulltext search.
+     * Text search (title or full text)
      */
     public function text_search($search, $fulltext = false,
                                 $sortby = '', $limit = '', $exclude = '')
@@ -809,7 +817,9 @@
         $dbh = &$this->_dbh;
         extract($this->_table_names);
         $orderby = $this->sortby($sortby, 'db');
-        if ($orderby) $orderby = ' ORDER BY ' . $orderby;
+        if ($orderby) {
+            $orderby = ' ORDER BY ' . $orderby;
+        }
 
         $table = "$nonempty_tbl, $page_tbl";
         $join_clause = "$nonempty_tbl.id=$page_tbl.id";
@@ -824,7 +834,7 @@
             $table .= ", $version_tbl";
             $join_clause .= " AND $page_tbl.id=$version_tbl.id AND latestversion=version";
 
-            $fields .= ",$page_tbl.pagedata as pagedata," . $this->version_tbl_fields;
+            $fields .= ", $page_tbl.pagedata as pagedata, " . $this->version_tbl_fields;
             $field_list = array_merge($field_list, array('pagedata'),
                 $this->version_tbl_field_list);
             $callback = new WikiMethodCb($searchobj, "_fulltext_match_clause");
@@ -871,17 +881,18 @@
     {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
-        $order = "DESC";
         if ($limit < 0) {
             $order = "ASC";
             $limit = -$limit;
             $where = "";
         } else {
+            $order = "DESC";
             $where = " AND hits > 0";
         }
+        $orderby = '';
         if ($sortby != '-hits') {
-            if ($order = $this->sortby($sortby, 'db')) $orderby = " ORDER BY " . $order;
-            else $orderby = "";
+            if ($order = $this->sortby($sortby, 'db'))
+                $orderby = " ORDER BY " . $order;
         } else {
             $orderby = " ORDER BY hits $order";
         }
@@ -917,8 +928,9 @@
         extract($this->_table_names);
 
         $pick = array();
-        if ($since)
+        if ($since) {
             $pick[] = "mtime >= $since";
+        }
 
         if ($include_all_revisions) {
             // Include all revisions of each page.
@@ -955,8 +967,9 @@
             $limit = -$limit;
         }
         $where_clause = $join_clause;
-        if ($pick)
+        if ($pick) {
             $where_clause .= " AND " . join(" AND ", $pick);
+        }
         $sql = "SELECT "
             . $this->page_tbl_fields . ", " . $this->version_tbl_fields
             . " FROM $table"
@@ -1030,8 +1043,8 @@
         extract($this->_table_names);
 
         $this->lock(array('page', 'version', 'recent', 'nonempty', 'link'));
-        if (($id = $this->_get_pageid($pagename, false))) {
-            if ($new = $this->_get_pageid($to, false)) {
+        if (($id = $this->_get_pageid($pagename))) {
+            if ($new = $this->_get_pageid($to)) {
                 // Cludge Alert!
                 // This page does not exist (already verified before), but exists in the page table.
                 // So we delete this page.
@@ -1164,8 +1177,9 @@
      */
     function _serialize($data)
     {
-        if (empty($data))
+        if (empty($data)) {
             return '';
+        }
         assert(is_array($data));
         return serialize($data);
     }
@@ -1348,8 +1362,8 @@
  *
  * @return array an associative array with the following keys:
  *  + phptype:  Database backend used in PHP (mysql, odbc etc.)
- *  + dbsyntax: Database used with regards to SQL syntax etc.
- *  + protocol: Communication protocol to use (tcp, unix etc.)
+ *  + dbsyntax: Database used with regards to SQL syntax etc. (ignored with PDO)
+ *  + protocol: Communication protocol to use (tcp, unix, pipe etc.)
  *  + hostspec: Host specification (hostname[:port])
  *  + database: Database to use on the DBMS server
  *  + username: User name for login
@@ -1398,7 +1412,7 @@
         $parsed['dbsyntax'] = $str;
     }
 
-    if (!count($dsn)) {
+    if ($dsn == null) {
         return $parsed;
     }
 

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2021-08-14 19:35:00 UTC (rev 10520)
+++ trunk/lib/WikiDB/backend/PDO.php	2021-08-16 08:06:55 UTC (rev 10521)
@@ -279,10 +279,11 @@
 
     public function _extract_page_data($data, $hits)
     {
-        if (empty($data))
+        if (empty($data)) {
             return array('hits' => $hits);
-        else
+        } else {
             return array_merge(array('hits' => $hits), $this->_unserialize($data));
+        }
     }
 
     function update_pagedata($pagename, $newdata)
@@ -320,9 +321,9 @@
                 $data[$key] = $val;
         }
         $sth = $dbh->prepare("UPDATE $page_tbl"
-            . " SET hits=?, pagedata=?"
-            . " WHERE pagename=?"
-            . " LIMIT 1");
+                . " SET hits=?, pagedata=?"
+                . " WHERE pagename=?"
+                . " LIMIT 1");
         $sth->bindParam(1, $hits, PDO::PARAM_INT);
         $serialized_data = $this->_serialize($data);
         $sth->bindParam(2, $serialized_data, PDO::PARAM_LOB);
@@ -352,9 +353,9 @@
         $page_tbl = $this->_table_names['page_tbl'];
         if (empty($data)) $data = '';
         $sth = $dbh->prepare("UPDATE $page_tbl"
-            . " SET cached_html=?"
-            . " WHERE pagename=?"
-            . " LIMIT 1");
+                . " SET cached_html=?"
+                . " WHERE pagename=?"
+                . " LIMIT 1");
         $sth->bindParam(1, $data, PDO::PARAM_STR);
         $sth->bindParam(2, $pagename, PDO::PARAM_STR, 100);
         $sth->execute();
@@ -433,12 +434,12 @@
         $dbh = &$this->_dbh;
         extract($this->_table_names);
         $sth = $dbh->prepare("SELECT version"
-            . " FROM $version_tbl, $page_tbl"
-            . " WHERE $version_tbl.id=$page_tbl.id"
-            . "  AND pagename=?"
-            . "  AND version < ?"
-            . " ORDER BY version DESC"
-            . " LIMIT 1");
+                    . " FROM $version_tbl, $page_tbl"
+                    . " WHERE $version_tbl.id=$page_tbl.id"
+                    . "  AND pagename=?"
+                    . "  AND version < ?"
+                    . " ORDER BY version DESC"
+                    . " LIMIT 1");
         $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
         $sth->bindParam(2, $version, PDO::PARAM_INT);
         $sth->execute();
@@ -772,6 +773,10 @@
      * (linkExistingWikiWord or linkUnknownWikiWord)
      * This is called on every page header GleanDescription, so we can store all the
      * existing links.
+     *
+     * relations: $backend->get_links is responsible to add the relation to the pagehash
+     * as 'linkrelation' key as pagename. See WikiDB_PageIterator::next
+     *   if (isset($next['linkrelation']))
      */
     function get_links($pagename, $reversed = true, $include_empty = false,
                        $sortby = '', $limit = '', $exclude = '',
@@ -917,7 +922,8 @@
             $join_clause .= " AND $page_tbl.id=$version_tbl.id AND latestversion=version";
 
             $fields .= ", $page_tbl.pagedata as pagedata, " . $this->version_tbl_fields;
-            $field_list = array_merge($field_list, array('pagedata'), $this->version_tbl_field_list);
+            $field_list = array_merge($field_list, array('pagedata'),
+                $this->version_tbl_field_list);
             $callback = new WikiMethodCb($searchobj, "_fulltext_match_clause");
         } else {
             $callback = new WikiMethodCb($searchobj, "_pagename_match_clause");
@@ -1153,11 +1159,11 @@
         $backend_type = $this->backendType();
         if (substr($backend_type, 0, 5) == 'mysql') {
             $sth = $dbh->prepare("REPLACE INTO $recent_tbl"
-            . " (id, latestversion, latestmajor, latestminor)"
-            . " SELECT id, $maxversion, $maxmajor, $maxminor"
-            . " FROM $version_tbl"
-            . ($pageid ? " WHERE id=$pageid" : "")
-            . " GROUP BY id");
+                . " (id, latestversion, latestmajor, latestminor)"
+                . " SELECT id, $maxversion, $maxmajor, $maxminor"
+                . " FROM $version_tbl"
+                . ($pageid ? " WHERE id=$pageid" : "")
+                . " GROUP BY id");
             $sth->execute();
         } else {
             $this->lock(array('recent'));
@@ -1179,7 +1185,6 @@
     {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
-        extract($this->_expressions);
 
         $pageid = (int)$pageid;
 
@@ -1417,6 +1422,7 @@
 
 class WikiDB_backend_PDO_search extends WikiDB_backend_search_sql
 {
+    // no surrounding quotes because we know it's a string
 }
 
 // Following function taken from Pear::DB (prev. from adodb-pear.inc.php).

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2021-08-14 19:35:00 UTC (rev 10520)
+++ trunk/lib/WikiDB/backend/PearDB.php	2021-08-16 08:06:55 UTC (rev 10521)
@@ -320,7 +320,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)
     {
@@ -982,7 +982,7 @@
             . "  AND version=latestversion"
             // We have some specifics here (Oracle)
             //. "  AND content<>''"
-            . "  AND content $notempty"
+            . "  AND content $notempty" // On Oracle not just "<>''"
             . ($pageid ? " AND $recent_tbl.id=$pageid" : ""));
         $this->unlock();
     }
@@ -1188,8 +1188,9 @@
 
     function next()
     {
-        if (!$this->_result)
+        if (!$this->_result) {
             return false;
+        }
 
         $record = $this->_result->fetchRow(DB_FETCHMODE_ASSOC);
         if (!$record) {

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

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

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

Revision: 10520
          http://sourceforge.net/p/phpwiki/code/10520
Author:   vargenau
Date:     2021-08-14 19:35:00 +0000 (Sat, 14 Aug 2021)
Log Message:
-----------
Remove unused function set_links1

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

Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php	2021-08-14 19:33:26 UTC (rev 10519)
+++ trunk/lib/WikiDB/backend/ADODB.php	2021-08-14 19:35:00 UTC (rev 10520)
@@ -650,91 +650,6 @@
         $this->unlock(array('link'));
     }
 
-    /* get all oldlinks in hash => id, relation
-       check for all new links
-     */
-    function set_links1($pagename, $links)
-    {
-
-        $dbh = &$this->_dbh;
-        extract($this->_table_names);
-
-        $this->lock(array('link'));
-        $pageid = $this->_get_pageid($pagename, true);
-
-        $oldlinks = $dbh->getAssoc("SELECT $link_tbl.linkto as linkto, $link_tbl.relation, page.pagename"
-            . " FROM $link_tbl"
-            . " JOIN page ON ($link_tbl.linkto = page.id)"
-            . " WHERE linkfrom=$pageid");
-        /*      old                  new
-         *      X => [1,0 2,0 1,1]   X => [1,1 3,0]
-         * => delete 1,0 2,0 + insert 3,0
-         */
-        if ($links) {
-            foreach ($links as $link) {
-                $linkto = $link['linkto'];
-                if ($link['relation'])
-                    $relation = $this->_get_pageid($link['relation'], true);
-                else
-                    $relation = 0;
-                // avoid duplicates
-                if (isset($linkseen[$linkto]) and !$relation) {
-                    continue;
-                }
-                if (!$relation) {
-                    $linkseen[$linkto] = true;
-                }
-                $linkid = $this->_get_pageid($linkto, true);
-                assert($linkid);
-                $skip = 0;
-                // find linkfrom,linkto,relation triple in oldlinks
-                foreach ($oldlinks as $l) {
-                    if ($relation) { // relation NOT NULL
-                        if ($l['linkto'] == $linkid and $l['relation'] == $relation) {
-                            // found and skip
-                            $skip = 1;
-                        }
-                    }
-                }
-                if (!$skip) {
-                    if ($relation) {
-                        $dbh->Execute("INSERT INTO $link_tbl (linkfrom, linkto, relation)"
-                            . " VALUES ($pageid, $linkid, $relation)");
-                    } else {
-                        $dbh->Execute("INSERT INTO $link_tbl (linkfrom, linkto)"
-                            . " VALUES ($pageid, $linkid)");
-                    }
-                }
-
-                if (array_key_exists($linkid, $oldlinks)) {
-                    // This was also in the previous page
-                    unset($oldlinks[$linkid]);
-                }
-            }
-        }
-        // purge page table: delete all non-referenced pages
-        // for all previously linked pages...
-        if (DEBUG and $oldlinks) {
-            // trigger_error("purge page table: delete all non-referenced pages...", E_USER_NOTICE);
-            foreach ($oldlinks as $id => $name) {
-                // ...check if the page is empty and has no version
-                if ($dbh->getRow("SELECT $page_tbl.id FROM $page_tbl"
-                    . " LEFT JOIN $nonempty_tbl USING (id) "
-                    . " LEFT JOIN $version_tbl USING (id)"
-                    . " WHERE $nonempty_tbl.id is NULL"
-                    . " AND $version_tbl.id is NULL"
-                    . " AND $page_tbl.id=$id")
-                ) {
-                    trigger_error("delete empty and non-referenced link $name ($id)", E_USER_NOTICE);
-                    $dbh->Execute("DELETE FROM $page_tbl WHERE id=$id"); // this purges the link
-                    $dbh->Execute("DELETE FROM $recent_tbl WHERE id=$id"); // may fail
-                }
-            }
-        }
-        $this->unlock(array('link'));
-        return true;
-    }
-
     /**
      * Find pages which link to or are linked from a page.
      *

Modified: trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mssqlnative.php	2021-08-14 19:33:26 UTC (rev 10519)
+++ trunk/lib/WikiDB/backend/ADODB_mssqlnative.php	2021-08-14 19:35:00 UTC (rev 10520)
@@ -151,92 +151,4 @@
         }
         $this->unlock(array('link'));
     }
-
-    /* get all oldlinks in hash => id, relation
-       check for all new links
-     */
-    function set_links1($pagename, $links)
-    {
-
-        $dbh = &$this->_dbh;
-        extract($this->_table_names);
-
-        $this->lock(array('link'));
-        $pageid = $this->_get_pageid($pagename, true);
-
-        $oldlinks = $dbh->getAssoc("SELECT $link_tbl.linkto as linkto, $link_tbl.relation, page.pagename"
-            . " FROM $link_tbl"
-            . " JOIN page ON ($link_tbl.linkto = page.id)"
-            . " WHERE linkfrom=$pageid");
-        /*      old                  new
-         *      X => [1,0 2,0 1,1]   X => [1,1 3,0]
-         * => delete 1,0 2,0 + insert 3,0
-         */
-        if ($links) {
-            foreach ($links as $link) {
-                $linkto = $link['linkto'];
-                if ($link['relation'])
-                    $relation = $this->_get_pageid($link['relation'], true);
-                else
-                    $relation = 0;
-                // avoid duplicates
-                if (isset($linkseen[$linkto]) and !$relation) {
-                    continue;
-                }
-                if (!$relation) {
-                    $linkseen[$linkto] = true;
-                }
-                $linkid = $this->_get_pageid($linkto, true);
-                assert($linkid);
-                $skip = 0;
-                // find linkfrom,linkto,relation triple in oldlinks
-                foreach ($oldlinks as $l) {
-                    if ($relation) { // relation NOT NULL
-                        if ($l['linkto'] == $linkid and $l['relation'] == $relation) {
-                            // found and skip
-                            $skip = 1;
-                        }
-                    }
-                }
-                if (!$skip) {
-                    if ($relation) {
-                        $dbh->Execute("INSERT INTO $link_tbl (linkfrom, linkto, relation)"
-                            . " VALUES ($pageid, $linkid, $relation)");
-                    } else {
-                        $dbh->Execute("INSERT INTO $link_tbl (linkfrom, linkto)"
-                            . " VALUES ($pageid, $linkid)");
-                    }
-                }
-
-                if (array_key_exists($linkid, $oldlinks)) {
-                    // This was also in the previous page
-                    unset($oldlinks[$linkid]);
-                }
-            }
-        }
-        // purge page table: delete all non-referenced pages
-        // for all previously linked pages...
-        if (DEBUG and $oldlinks) {
-            // trigger_error("purge page table: delete all non-referenced pages...", E_USER_NOTICE);
-            foreach ($oldlinks as $id => $name) {
-                // ...check if the page is empty and has no version
-                if ($id != '') {
-                    if ($dbh->getRow("SELECT $page_tbl.id FROM $page_tbl"
-                        . " LEFT JOIN $nonempty_tbl ON ($nonempty_tbl.id = $page_tbl.id)" //'"id" is not a recognized table hints option'
-                        . " LEFT JOIN $version_tbl ON ($version_tbl.id = $page_tbl.id)" //'"id" is not a recognized table hints option'
-                        . " WHERE $nonempty_tbl.id is NULL"
-                        . " AND $version_tbl.id is NULL"
-                        . " AND $page_tbl.id=$id")
-                    ) {
-                        trigger_error("delete empty and non-referenced link $name ($id)", E_USER_NOTICE);
-                        $dbh->Execute("DELETE FROM $page_tbl WHERE id=$id"); // this purges the link
-                        $dbh->Execute("DELETE FROM $recent_tbl WHERE id=$id"); // may fail
-                    }
-                }
-            }
-        }
-        $this->unlock(array('link'));
-        return true;
-    }
-
 }

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

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

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

Revision: 10519
          http://sourceforge.net/p/phpwiki/code/10519
Author:   vargenau
Date:     2021-08-14 19:33:26 +0000 (Sat, 14 Aug 2021)
Log Message:
-----------
function set_links returns no value; remove DEBUG part

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.php

Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php	2021-08-14 19:14:38 UTC (rev 10518)
+++ trunk/lib/WikiDB/backend/ADODB.php	2021-08-14 19:33:26 UTC (rev 10519)
@@ -545,12 +545,12 @@
                 array($id, $version + 1, $mtime, 0,
                     '', $this->_serialize($meta)))
                 and $dbh->Execute("DELETE FROM $nonempty_tbl WHERE id=$id")
-                    and $this->set_links($pagename, array())
             // need to keep perms and LOCKED, otherwise you can reset the perm
             // by action=remove and re-create it with default perms
             // keep hits but delete meta-data
             //and $dbh->Execute("UPDATE $page_tbl SET pagedata='' WHERE id=$id")
         ) {
+            $this->set_links($pagename, array());
             $this->unlock(array('version', 'recent', 'nonempty', 'page', 'link'));
             $dbh->CommitTrans();
             return true;
@@ -597,8 +597,6 @@
      *
      * @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)
     {
@@ -649,29 +647,7 @@
                 }
             }
         }
-        // purge page table: delete all non-referenced pages
-        // for all previously linked pages, which have no other linkto links
-        if (DEBUG and $oldlinks) {
-            // trigger_error("purge page table: delete all non-referenced pages...", E_USER_NOTICE);
-            foreach ($oldlinks as $id => $name) {
-                // ...check if the page is empty and has no version
-                $result = $dbh->getRow("SELECT $page_tbl.id FROM $page_tbl"
-                    . " LEFT JOIN $nonempty_tbl USING (id) "
-                    . " LEFT JOIN $version_tbl USING (id)"
-                    . " WHERE $nonempty_tbl.id is NULL"
-                    . " AND $version_tbl.id is NULL"
-                    . " AND $page_tbl.id=$id");
-                $linkto = $dbh->getRow("SELECT linkfrom FROM $link_tbl WHERE linkto=$id");
-                if ($result and empty($linkto)) {
-                    trigger_error("delete empty and non-referenced link $name ($id)", E_USER_NOTICE);
-                    $dbh->Execute("DELETE FROM $recent_tbl WHERE id=$id"); // may fail
-                    $dbh->Execute("DELETE FROM $link_tbl WHERE linkto=$id");
-                    $dbh->Execute("DELETE FROM $page_tbl WHERE id=$id"); // this purges the link
-                }
-            }
-        }
         $this->unlock(array('link'));
-        return true;
     }
 
     /* get all oldlinks in hash => id, relation

Modified: trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mssqlnative.php	2021-08-14 19:14:38 UTC (rev 10518)
+++ trunk/lib/WikiDB/backend/ADODB_mssqlnative.php	2021-08-14 19:33:26 UTC (rev 10519)
@@ -100,8 +100,6 @@
      *
      * @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)
     {
@@ -151,31 +149,7 @@
                 }
             }
         }
-        // purge page table: delete all non-referenced pages
-        // for all previously linked pages, which have no other linkto links
-        if (DEBUG and $oldlinks) {
-            // trigger_error("purge page table: delete all non-referenced pages...", E_USER_NOTICE);
-            foreach ($oldlinks as $id => $name) {
-                // ...check if the page is empty and has no version
-                if ($id != '') {
-                    $result = $dbh->getRow("SELECT $page_tbl.id FROM $page_tbl"
-                        . " LEFT JOIN $nonempty_tbl ON ($nonempty_tbl.id = $page_tbl.id)" //'"id" is not a recognized table hints option'
-                        . " LEFT JOIN $version_tbl ON ($version_tbl.id = $page_tbl.id)" //'"id" is not a recognized table hints option'
-                        . " WHERE $nonempty_tbl.id is NULL"
-                        . " AND $version_tbl.id is NULL"
-                        . " AND $page_tbl.id=$id");
-                    $linkto = $dbh->getRow("SELECT linkfrom FROM $link_tbl WHERE linkto=$id");
-                    if ($result and empty($linkto)) {
-                        trigger_error("delete empty and non-referenced link $name ($id)", E_USER_NOTICE);
-                        $dbh->Execute("DELETE FROM $recent_tbl WHERE id=$id"); // may fail
-                        $dbh->Execute("DELETE FROM $link_tbl WHERE linkto=$id");
-                        $dbh->Execute("DELETE FROM $page_tbl WHERE id=$id"); // this purges the link
-                    }
-                }
-            }
-        }
         $this->unlock(array('link'));
-        return true;
     }
 
     /* get all oldlinks in hash => id, relation

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2021-08-14 19:14:38 UTC (rev 10518)
+++ trunk/lib/WikiDB/backend/PDO.php	2021-08-14 19:33:26 UTC (rev 10519)
@@ -654,8 +654,8 @@
             $insert->bindParam(6, $meta_serialized, PDO::PARAM_STR, 100);
             if ($insert->execute()
                 and $dbh->query("DELETE FROM $nonempty_tbl WHERE id=$id")
-                    and $this->set_links($pagename, array())
             ) {
+                $this->set_links($pagename, array());
                 // need to keep perms and LOCKED, otherwise you can reset the perm
                 // by action=remove and re-create it with default perms
                 // keep hits but delete meta-data

Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2021-08-14 19:14:38 UTC (rev 10518)
+++ trunk/lib/WikiDB/backend.php	2021-08-14 19:33:26 UTC (rev 10519)
@@ -278,8 +278,6 @@
      *
      * @param string $pagename Page name
      * @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);
 

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

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

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

Revision: 10518
          http://sourceforge.net/p/phpwiki/code/10518
Author:   vargenau
Date:     2021-08-14 19:14:38 +0000 (Sat, 14 Aug 2021)
Log Message:
-----------
lib/WikiDB/backend/PDO.php: bindParam with a variable, factor code, use default value

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

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2021-08-14 17:59:15 UTC (rev 10517)
+++ trunk/lib/WikiDB/backend/PDO.php	2021-08-14 19:14:38 UTC (rev 10518)
@@ -452,7 +452,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)
     {
@@ -556,14 +556,6 @@
             $sth = $dbh->prepare("REPLACE INTO $version_tbl"
                 . " (id,version,mtime,minor_edit,content,versiondata)"
                 . " VALUES(?,?,?,?,?,?)");
-            $sth->bindParam(1, $id, PDO::PARAM_INT);
-            $sth->bindParam(2, $version, PDO::PARAM_INT);
-            $sth->bindParam(3, $mtime, PDO::PARAM_INT);
-            $sth->bindParam(4, $minor_edit, PDO::PARAM_INT);
-            $sth->bindParam(5, $content, PDO::PARAM_STR, 100);
-            $serialized_data = $this->_serialize($data);
-            $sth->bindParam(6, $serialized_data, PDO::PARAM_STR, 100);
-            $rs = $sth->execute();
         } else {
             $sth = $dbh->prepare("DELETE FROM $version_tbl"
                 . " WHERE id=? AND version=?");
@@ -573,15 +565,15 @@
             $sth = $dbh->prepare("INSERT INTO $version_tbl"
                 . " (id,version,mtime,minor_edit,content,versiondata)"
                 . " VALUES(?,?,?,?,?,?)");
-            $sth->bindParam(1, $id, PDO::PARAM_INT);
-            $sth->bindParam(2, $version, PDO::PARAM_INT);
-            $sth->bindParam(3, $mtime, PDO::PARAM_INT);
-            $sth->bindParam(4, $minor_edit, PDO::PARAM_INT);
-            $sth->bindParam(5, $content, PDO::PARAM_STR, 100);
-            $serialized_data = $this->_serialize($data);
-            $sth->bindParam(6, $serialized_data, PDO::PARAM_STR, 100);
-            $rs = $sth->execute();
         }
+        $sth->bindParam(1, $id, PDO::PARAM_INT);
+        $sth->bindParam(2, $version, PDO::PARAM_INT);
+        $sth->bindParam(3, $mtime, PDO::PARAM_INT);
+        $sth->bindParam(4, $minor_edit, PDO::PARAM_INT);
+        $sth->bindParam(5, $content, PDO::PARAM_STR, 100);
+        $serialized_data = $this->_serialize($data);
+        $sth->bindParam(6, $serialized_data, PDO::PARAM_STR, 100);
+        $rs = $sth->execute();
         $this->_update_recent_table($id);
         $this->_update_nonempty_table($id);
         if ($rs) {
@@ -633,7 +625,7 @@
 
         $this->beginTransaction();
         //$dbh->CommitLock($recent_tbl);
-        if (($id = $this->_get_pageid($pagename, false)) === false) {
+        if (($id = $this->_get_pageid($pagename)) === false) {
             $this->rollBack();
             return false;
         }
@@ -653,12 +645,13 @@
             $version_plus_1 = $version + 1;
             $zero = 0;
             $empty_string = '';
+            $meta_serialized = $this->_serialize($meta);
             $insert->bindParam(1, $id, PDO::PARAM_INT);
             $insert->bindParam(2, $version_plus_1, PDO::PARAM_INT);
             $insert->bindParam(3, $mtime, PDO::PARAM_INT);
             $insert->bindParam(4, $zero, PDO::PARAM_INT);
             $insert->bindParam(5, $empty_string, PDO::PARAM_STR, 100);
-            $insert->bindParam(6, $this->_serialize($meta), PDO::PARAM_STR, 100);
+            $insert->bindParam(6, $meta_serialized, PDO::PARAM_STR, 100);
             if ($insert->execute()
                 and $dbh->query("DELETE FROM $nonempty_tbl WHERE id=$id")
                     and $this->set_links($pagename, array())
@@ -688,7 +681,7 @@
         extract($this->_table_names);
 
         $this->lock(array('version', 'recent', 'nonempty', 'page', 'link'));
-        if (($id = $this->_get_pageid($pagename, false))) {
+        if (($id = $this->_get_pageid($pagename))) {
             $dbh->query("DELETE FROM $nonempty_tbl WHERE id=$id");
             $dbh->query("DELETE FROM $recent_tbl   WHERE id=$id");
             $dbh->query("DELETE FROM $version_tbl  WHERE id=$id");
@@ -1126,8 +1119,8 @@
         extract($this->_table_names);
 
         $this->lock(array('page', 'version', 'recent', 'nonempty', 'link'));
-        if (($id = $this->_get_pageid($pagename, false))) {
-            if ($new = $this->_get_pageid($to, false)) {
+        if (($id = $this->_get_pageid($pagename))) {
+            if ($new = $this->_get_pageid($to)) {
                 // Cludge Alert!
                 // This page does not exist (already verified before), but exists in the page table.
                 // So we delete this page.
@@ -1381,8 +1374,7 @@
         if (!is_object($this->_result)) {
             return false;
         }
-        $count = $this->_result->rowCount();
-        return $count;
+        return $this->_result->rowCount();
     }
 
     function next()

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10517] trunk/lib/DbSession/PDO.php

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

Revision: 10517
          http://sourceforge.net/p/phpwiki/code/10517
Author:   vargenau
Date:     2021-08-14 17:59:15 +0000 (Sat, 14 Aug 2021)
Log Message:
-----------
lib/DbSession/PDO.php: bindParam with a variable

Modified Paths:
--------------
    trunk/lib/DbSession/PDO.php

Modified: trunk/lib/DbSession/PDO.php
===================================================================
--- trunk/lib/DbSession/PDO.php	2021-08-14 14:54:57 UTC (rev 10516)
+++ trunk/lib/DbSession/PDO.php	2021-08-14 17:59:15 UTC (rev 10517)
@@ -161,6 +161,7 @@
         $dbh = $this->_connect();
         $table = $this->_table;
         $time = time();
+        $remote_addr = $request->get('REMOTE_ADDR');
 
         // postgres can't handle binary data in a TEXT field.
         if (is_a($dbh, 'ADODB_postgres64'))
@@ -176,7 +177,7 @@
         $sth->bindParam(1, $id, PDO::PARAM_STR, 32);
         $sth->bindParam(2, $sess_data, PDO::PARAM_LOB);
         $sth->bindParam(3, $time, PDO::PARAM_INT);
-        $sth->bindParam(4, $request->get('REMOTE_ADDR'), PDO::PARAM_STR, 15);
+        $sth->bindParam(4, $remote_addr, PDO::PARAM_STR, 15);
         if ($result = $sth->execute()) {
             $this->_backend->commit();
         } else {

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

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

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

Revision: 10516
          http://sourceforge.net/p/phpwiki/code/10516
Author:   vargenau
Date:     2021-08-14 14:54:57 +0000 (Sat, 14 Aug 2021)
Log Message:
-----------
PDO: function set_links merged from PearDB

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

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2021-08-14 14:04:00 UTC (rev 10515)
+++ trunk/lib/WikiDB/backend/PDO.php	2021-08-14 14:54:57 UTC (rev 10516)
@@ -716,8 +716,6 @@
      *
      * @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)
     {
@@ -730,40 +728,37 @@
         $this->lock(array('link'));
         $pageid = $this->_get_pageid($pagename, true);
 
+        $dbh->query("DELETE FROM $link_tbl WHERE linkfrom=$pageid");
         if ($links) {
-            $dbh->query("DELETE FROM $link_tbl WHERE linkfrom=$pageid");
+            $linkseen = array();
             foreach ($links as $link) {
-                if (isset($linkseen[$link]))
+                $linkto = $link['linkto'];
+                if ($linkto === "") { // ignore attributes
                     continue;
-                $linkseen[$link] = true;
-                $linkid = $this->_get_pageid($link, true);
+                }
+                if (isset($link['relation']))
+                    $relation = $this->_get_pageid($link['relation'], true);
+                else
+                    $relation = 0;
+                // avoid duplicates
+                if (isset($linkseen[$linkto]) and !$relation) {
+                    continue;
+                }
+                if (!$relation) {
+                    $linkseen[$linkto] = true;
+                }
+                $linkid = $this->_get_pageid($linkto, true);
+                if (!$linkid) {
+                    echo("No link for $linkto on page $pagename");
+                    trigger_error("No link for $linkto on page $pagename");
+                }
                 assert($linkid);
-                $dbh->query("INSERT INTO $link_tbl (linkfrom, linkto)"
-                    . " VALUES ($pageid, $linkid)");
+                $dbh->query("INSERT INTO $link_tbl (linkfrom, linkto, relation)"
+                    . " VALUES ($pageid, $linkid, $relation)");
             }
-        } elseif (DEBUG) {
-            // purge page table: delete all non-referenced pages
-            // for all previously linked pages...
-            $sth = $dbh->prepare("SELECT $link_tbl.linkto as id FROM $link_tbl" .
-                " WHERE linkfrom=$pageid");
-            $sth->execute();
-            foreach ($sth->fetchAll(PDO::FETCH_NUM) as $id) {
-                // ...check if the page is empty and has no version
-                $sth1 = $dbh->prepare("SELECT $page_tbl.id FROM $page_tbl"
-                    . " LEFT JOIN $nonempty_tbl USING (id) "
-                    . " LEFT JOIN $version_tbl USING (id)"
-                    . " WHERE ISNULL($nonempty_tbl.id) AND"
-                    . " ISNULL($version_tbl.id) AND $page_tbl.id=$id");
-                $sth1->execute();
-                if ($sth1->fetchColumn()) {
-                    $dbh->query("DELETE FROM $page_tbl WHERE id=$id"); // this purges the link
-                    $dbh->query("DELETE FROM $recent_tbl WHERE id=$id"); // may fail
-                }
-            }
-            $dbh->query("DELETE FROM $link_tbl WHERE linkfrom=$pageid");
+            unset($linkseen);
         }
         $this->unlock(array('link'));
-        return true;
     }
 
     /**
@@ -788,7 +783,7 @@
     function get_links($pagename, $reversed = true, $include_empty = false,
                        $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:[10515] trunk/themes/MacOSX/buttons

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

Revision: 10515
          http://sourceforge.net/p/phpwiki/code/10515
Author:   vargenau
Date:     2021-08-14 14:04:00 +0000 (Sat, 14 Aug 2021)
Log Message:
-----------
themes/MacOSX/buttons/README: use UTF-8

Modified Paths:
--------------
    trunk/themes/MacOSX/buttons/README

Added Paths:
-----------
    trunk/themes/MacOSX/buttons/es/Borrar+P%C3%Agina.png

Removed Paths:
-------------
    trunk/themes/MacOSX/buttons/es/Borrar%2BP%C3%A1gina.png

Modified: trunk/themes/MacOSX/buttons/README
===================================================================
--- trunk/themes/MacOSX/buttons/README	2021-08-14 13:34:08 UTC (rev 10514)
+++ trunk/themes/MacOSX/buttons/README	2021-08-14 14:04:00 UTC (rev 10515)
@@ -39,8 +39,9 @@
 Filename Urlencode Chart
 
  space .... +
-     á .... %E1
-     ö .... %F6
+     á .... %C3%A1
+     ö .... %C3%B6
+     Ä .... %C3%84
 
 
 Here's What You Get:
@@ -103,7 +104,7 @@
 GuterStil.png
 PhpWikiSystemverwalten.png
 Quell+Text.png
-Seite+L%F6schen.png
+Seite+L%C3%B6schen.png
 SeiteFinden.png
 SeitenProtokoll.png
 
@@ -110,9 +111,9 @@
 
 buttons/es/
 
-Borrar+P%E1gina.png
+Borrar+P%C3%Agina.png
 BuenEstilo.png
-BuscarP%E1gina.png
+BuscarP%C3%Agina.png
 CambiosRecientes.png
 Editar.png
 

Deleted: trunk/themes/MacOSX/buttons/es/Borrar%2BP%C3%A1gina.png
===================================================================
(Binary files differ)

Copied: trunk/themes/MacOSX/buttons/es/Borrar+P%C3%Agina.png (from rev 10514, trunk/themes/MacOSX/buttons/es/Borrar%2BP%C3%A1gina.png)
===================================================================
(Binary files differ)

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

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

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

Revision: 10514
          http://sourceforge.net/p/phpwiki/code/10514
Author:   vargenau
Date:     2021-08-14 13:34:08 +0000 (Sat, 14 Aug 2021)
Log Message:
-----------
Remove messsage after editing "Your careful attention to detail is much appreciated."

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

Removed Paths:
-------------
    trunk/themes/fusionforge/templates/savepage.tmpl

Modified: trunk/themes/default/templates/savepage.tmpl
===================================================================
--- trunk/themes/default/templates/savepage.tmpl	2021-08-14 13:16:04 UTC (rev 10513)
+++ trunk/themes/default/templates/savepage.tmpl	2021-08-14 13:34:08 UTC (rev 10514)
@@ -1,20 +1,9 @@
-<?php
-    $signatureURL = $WikiTheme->getImageURL('signature');
-?>
-<p><?php echo fmt("Thank you for editing %s.", WikiLink($page))?>
-<?php echo _("Your careful attention to detail is much appreciated.")?></p>
-
 <?php if (!empty($WARNINGS)) { ?>
   <?php echo $WARNINGS ?>
 <?php } ?>
 
-<?php if ($signatureURL) { ?>
-  <p><img src="<?php echo $signatureURL?>" id="signature" alt="signature" /></p>
-<?php } ?>
-
 <?php if (!empty($LOCK_CHANGED_MSG)) { ?>
   <p><?php echo $LOCK_CHANGED_MSG?></p>
 <?php } ?>
 
-<hr />
 <?php echo Template('browse') ?>

Deleted: trunk/themes/fusionforge/templates/savepage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/savepage.tmpl	2021-08-14 13:16:04 UTC (rev 10513)
+++ trunk/themes/fusionforge/templates/savepage.tmpl	2021-08-14 13:34:08 UTC (rev 10514)
@@ -1,9 +0,0 @@
-<?php if (!empty($WARNINGS)) { ?>
-  <?php echo $WARNINGS ?>
-<?php } ?>
-
-<?php if (!empty($LOCK_CHANGED_MSG)) { ?>
-  <p><?php echo $LOCK_CHANGED_MSG?></p>
-<?php } ?>
-
-<?php echo Template('browse') ?>

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

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

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

Revision: 10513
          http://sourceforge.net/p/phpwiki/code/10513
Author:   vargenau
Date:     2021-08-14 13:16:04 +0000 (Sat, 14 Aug 2021)
Log Message:
-----------
Remove MacOSX CSS hack

Modified Paths:
--------------
    trunk/themes/MacOSX/themeinfo.php
    trunk/themes/default/phpwiki-printer.css

Modified: trunk/themes/MacOSX/themeinfo.php
===================================================================
--- trunk/themes/MacOSX/themeinfo.php	2021-08-14 12:46:33 UTC (rev 10512)
+++ trunk/themes/MacOSX/themeinfo.php	2021-08-14 13:16:04 UTC (rev 10513)
@@ -57,19 +57,6 @@
 
 class WikiTheme_MacOSX extends WikiTheme
 {
-    function getCSS()
-    {
-        // FIXME: this is a hack which will not be needed once
-        //        we have dynamic CSS.
-        $css = WikiTheme::getCSS();
-        $css->pushContent(HTML::style(array('type' => 'text/css'),
-            new RawXml(sprintf("<!--\nbody {background-image: url(%s);}\n-->\n",
-                $this->getImageURL('bgpaper8')))));
-        //for non-browse pages, like former editpage, message etc.
-        //$this->getImageURL('bggranular')));
-        return $css;
-    }
-
     function getRecentChangesFormatter($format)
     {
         include_once($this->file('lib/RecentChanges.php'));

Modified: trunk/themes/default/phpwiki-printer.css
===================================================================
--- trunk/themes/default/phpwiki-printer.css	2021-08-14 12:46:33 UTC (rev 10512)
+++ trunk/themes/default/phpwiki-printer.css	2021-08-14 13:16:04 UTC (rev 10513)
@@ -9,16 +9,6 @@
  * General
  */
 
-/**
- * required for Mozilla with MacOSX theme, because of
- * body {background-image: url(/finkwiki/themes/MacOSX/images/bgpaper8.png);}
- * within the html itself. It still does not suppress
- * the bg image of a small strip near the top and bottom. :/
- */
-html {
-    background: white;
-}
-
 body {
     margin: 1em;
     padding: 0;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10512] trunk/themes/MacOSX/buttons/README

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

Revision: 10512
          http://sourceforge.net/p/phpwiki/code/10512
Author:   vargenau
Date:     2021-08-14 12:46:33 +0000 (Sat, 14 Aug 2021)
Log Message:
-----------
Japanese: {U+65E5}{U+672C}{U+8A9E}

Modified Paths:
--------------
    trunk/themes/MacOSX/buttons/README

Modified: trunk/themes/MacOSX/buttons/README
===================================================================
--- trunk/themes/MacOSX/buttons/README	2021-08-14 12:38:42 UTC (rev 10511)
+++ trunk/themes/MacOSX/buttons/README	2021-08-14 12:46:33 UTC (rev 10512)
@@ -14,7 +14,7 @@
 French   "fr" Français   - RecentChanges only
 Italian  "it" Italiano   - RecentChanges only
 Swedish  "sv" Svenska    - none
-Japanese "ja" ???        - some
+Japanese "ja" 日本語     - some
 
 More translations are needed in po files before the localized button
 images can be completed.

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

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

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

Revision: 10511
          http://sourceforge.net/p/phpwiki/code/10511
Author:   vargenau
Date:     2021-08-14 12:38:42 +0000 (Sat, 14 Aug 2021)
Log Message:
-----------
More WikisUsingPhpWiki

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

Modified: trunk/pgsrc/Help%2FWikisUsingPhpWiki
===================================================================
--- trunk/pgsrc/Help%2FWikisUsingPhpWiki	2021-08-13 18:06:03 UTC (rev 10510)
+++ trunk/pgsrc/Help%2FWikisUsingPhpWiki	2021-08-14 12:38:42 UTC (rev 10511)
@@ -1,4 +1,4 @@
-Date: Wed, 11 Aug 2021 18:09:44 +0000
+Date: Sat, 14 Aug 2021 13:48:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikisUsingPhpWiki
@@ -23,11 +23,15 @@
 | http://forge.cesga.es/wiki/g/optimiza/                           |                   | Fusionforge
 | http://forkedcedarandscuppermongfarm.com/phpwiki/                | 1.2.10
 | https://garage.maemo.org/plugins/wiki/index.php?id=290&type=g    |                   | Gforge
+| https://gforge.irsn.fr/gf/project/redice/wiki/                   |                   | Gforge
+| http://gforge.wits.ac.za/gf/project/vre/wiki/                    |                   | Gforge
 | https://www.gidley.co.uk/wiki/
 | http://glhrn.org/NoPlaceToGo/                                    | 1.4.0RC1          | Sidebar
 | http://gouwm.com/wiki/                                           | 1.2.11
 | http://hollenback.net                                            | 1.5.4             | Sidebar
+| http://joomlacode.org/gf/user/mat978/userwiki/                   |                   | Gforge
 | http://kcpralumni.org/wiki/                                      | 1.5.4             | Sidebar
+| http://kqlives.sourceforge.net/                                  | 1.3.14            | kq (custom)
 | http://matthieuachard.free.fr/wiki/                              | 1.2.10
 | http://meanwhile.sourceforge.net/wiki/                           | 1.4.0RC1          | ~MonoBook
 | http://mtswiki.westwood-tech.com/mtswiki-index.php/HomePage      | 1.4.0RC1          | default
@@ -46,7 +50,7 @@
 | http://the-bees-knees.info/phpwiki/                              | 1.5.4             | default
 | http://utenmelk.no/wiki2/                                        | 1.6.0             | Wordpress
 | http://wac-tk.drni.de                                            | 1.3.11p1          | Crao
-| https://wiki.cyberleo.net                                        | 1.4.0RC1          | MacOSX
+| https://wiki.cyberleo.net                                        | 1.5.5             | MacOSX
 | http://wiki.elaboratedsolutions.com
 | http://wiki.wlug.org.nz                                          | 1.3.11p1          | WLUG05 (custom)
 | http://wikiworld.com/wiki/                                       |                   | ~MonoBook

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

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

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

Revision: 10510
          http://sourceforge.net/p/phpwiki/code/10510
Author:   vargenau
Date:     2021-08-13 18:06:03 +0000 (Fri, 13 Aug 2021)
Log Message:
-----------
lib/WikiDB/backend/PDO.php: fix SQL syntax

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

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2021-08-13 16:02:02 UTC (rev 10509)
+++ trunk/lib/WikiDB/backend/PDO.php	2021-08-13 18:06:03 UTC (rev 10510)
@@ -138,7 +138,7 @@
         $page_tbl = $this->_table_names['page_tbl'];
         $version_tbl = $this->_table_names['version_tbl'];
         $this->page_tbl_fields = "$page_tbl.id AS id, $page_tbl.pagename AS pagename, "
-            . "$page_tbl.hits hits";
+            . "$page_tbl.hits AS hits";
         $this->page_tbl_field_list = array('id', 'pagename', 'hits');
         $this->version_tbl_fields = "$version_tbl.version AS version, "
             . "$version_tbl.mtime AS mtime, "

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10509] trunk/lib/DbSession/PDO.php

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

Revision: 10509
          http://sourceforge.net/p/phpwiki/code/10509
Author:   vargenau
Date:     2021-08-13 16:02:02 +0000 (Fri, 13 Aug 2021)
Log Message:
-----------
Fix PDO DB sessions

Modified Paths:
--------------
    trunk/lib/DbSession/PDO.php

Modified: trunk/lib/DbSession/PDO.php
===================================================================
--- trunk/lib/DbSession/PDO.php	2021-08-13 14:39:54 UTC (rev 10508)
+++ trunk/lib/DbSession/PDO.php	2021-08-13 16:02:02 UTC (rev 10509)
@@ -49,12 +49,10 @@
     function & _connect()
     {
         $dbh = &$this->_dbh;
-        if (!$dbh or !is_object($dbh)) {
-            global $DBParams;
-            $db = new WikiDB_backend_PDO($DBParams);
-            $this->_dbh =& $db->_dbh;
-            $this->_backend =& $db;
-        }
+        global $DBParams;
+        $db = new WikiDB_backend_PDO($DBParams);
+        $this->_dbh =& $db->_dbh;
+        $this->_backend =& $db;
         return $dbh;
     }
 
@@ -169,7 +167,7 @@
             $sess_data = base64_encode($sess_data);
 
         $this->_backend->beginTransaction();
-        $delete = $this->prepare("DELETE FROM $table WHERE sess_id=?");
+        $delete = $dbh->prepare("DELETE FROM $table WHERE sess_id=?");
         $delete->bindParam(1, $id, PDO::PARAM_STR, 32);
         $delete->execute();
         $sth = $dbh->prepare("INSERT INTO $table"

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

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

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

Revision: 10508
          http://sourceforge.net/p/phpwiki/code/10508
Author:   vargenau
Date:     2021-08-13 14:39:54 +0000 (Fri, 13 Aug 2021)
Log Message:
-----------
Rename _ncsa_time as ncsa_time, _zone_offset as zone_offset; no parameter for zone_offset

Modified Paths:
--------------
    trunk/lib/Request.php
    trunk/lib/WikiDB/backend/ADODB_oci8po.php
    trunk/lib/WikiDB/backend/PDO.php
    trunk/lib/WikiDB/backend/PDO_oci8.php
    trunk/lib/WikiDB/backend/PearDB_oci8.php
    trunk/lib/WikiDB/backend.php
    trunk/lib/WikiUser.php
    trunk/lib/stdlib.php

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2021-08-13 14:25:58 UTC (rev 10507)
+++ trunk/lib/Request.php	2021-08-13 14:39:54 UTC (rev 10508)
@@ -1080,7 +1080,7 @@
     {
         $entry = sprintf('%s %s %s [%s] "%s" %d %d "%s" "%s"',
             $this->host, $this->ident, $this->user,
-            _ncsa_time($this->time),
+            ncsa_time($this->time),
             $this->request, $this->status, $this->size,
             $this->referer, $this->user_agent);
         if (!empty($this->_accesslog->reader)) {

Modified: trunk/lib/WikiDB/backend/ADODB_oci8po.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_oci8po.php	2021-08-13 14:25:58 UTC (rev 10507)
+++ trunk/lib/WikiDB/backend/ADODB_oci8po.php	2021-08-13 14:39:54 UTC (rev 10508)
@@ -162,7 +162,7 @@
                 $entry->request,
                 $entry->request_uri,
                 $entry->request_args,
-                _ncsa_time($entry->time),
+                ncsa_time($entry->time),
                 $entry->status,
                 $entry->size,
                 $entry->referer,

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2021-08-13 14:25:58 UTC (rev 10507)
+++ trunk/lib/WikiDB/backend/PDO.php	2021-08-13 14:39:54 UTC (rev 10508)
@@ -1359,7 +1359,7 @@
         $sth->bindParam(5, $entry->request, PDO::PARAM_STR, 255);
         $sth->bindParam(6, $entry->request_args, PDO::PARAM_STR, 255);
         $sth->bindParam(7, $entry->request_uri, PDO::PARAM_STR, 255);
-        $ncsa_time = _ncsa_time($entry->time);
+        $ncsa_time = ncsa_time($entry->time);
         $sth->bindParam(8, $ncsa_time, PDO::PARAM_STR, 28);
         $sth->bindParam(9, $entry->time, PDO::PARAM_INT);
         $sth->bindParam(10, $entry->status, PDO::PARAM_INT);

Modified: trunk/lib/WikiDB/backend/PDO_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_oci8.php	2021-08-13 14:25:58 UTC (rev 10507)
+++ trunk/lib/WikiDB/backend/PDO_oci8.php	2021-08-13 14:39:54 UTC (rev 10508)
@@ -82,7 +82,7 @@
         $sth->bindParam(5, $entry->request, PDO::PARAM_STR, 255);
         $sth->bindParam(6, $entry->request_args, PDO::PARAM_STR, 255);
         $sth->bindParam(7, $entry->request_uri, PDO::PARAM_STR, 255);
-        $ncsa_time = _ncsa_time($entry->time);
+        $ncsa_time = ncsa_time($entry->time);
         $sth->bindParam(8, $ncsa_time, PDO::PARAM_STR, 28);
         $sth->bindParam(9, $entry->time, PDO::PARAM_INT);
         $sth->bindParam(10, $entry->status, PDO::PARAM_INT);

Modified: trunk/lib/WikiDB/backend/PearDB_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_oci8.php	2021-08-13 14:25:58 UTC (rev 10507)
+++ trunk/lib/WikiDB/backend/PearDB_oci8.php	2021-08-13 14:39:54 UTC (rev 10508)
@@ -115,7 +115,7 @@
                 $entry->request,
                 $entry->request_uri,
                 $entry->request_args,
-                _ncsa_time($entry->time),
+                ncsa_time($entry->time),
                 $entry->status,
                 $entry->size,
                 $entry->referer,

Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2021-08-13 14:25:58 UTC (rev 10507)
+++ trunk/lib/WikiDB/backend.php	2021-08-13 14:39:54 UTC (rev 10508)
@@ -707,7 +707,7 @@
                 $entry->request,
                 $entry->request_args,
                 $entry->request_uri,
-                $entry->_ncsa_time($entry->time),
+                $entry->ncsa_time($entry->time),
                 $entry->status,
                 (int)$entry->size,
                 $entry->referer,

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2021-08-13 14:25:58 UTC (rev 10507)
+++ trunk/lib/WikiUser.php	2021-08-13 14:39:54 UTC (rev 10508)
@@ -598,7 +598,7 @@
 
         if ($logout) { // Log out
             if (LOGIN_LOG and is_writeable(LOGIN_LOG)) {
-                $zone_offset = _zone_offset();
+                $zone_offset = zone_offset();
                 $ncsa_time = date("d/M/Y:H:i:s", time());
                 $entry = sprintf('%s - %s - [%s %s] "%s" %s - "%s" "%s"',
                     (string)$request->get('REMOTE_HOST'),
@@ -634,7 +634,7 @@
         $authlevel = $this->checkPass($passwd === false ? '' : $passwd);
 
         if (LOGIN_LOG and is_writeable(LOGIN_LOG)) {
-            $zone_offset = _zone_offset();
+            $zone_offset = zone_offset();
             $ncsa_time = date("d/M/Y:H:i:s", time());
             $manglepasswd = $passwd;
             for ($i = 0; $i < strlen($manglepasswd); $i++) {

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2021-08-13 14:25:58 UTC (rev 10507)
+++ trunk/lib/stdlib.php	2021-08-13 14:39:54 UTC (rev 10508)
@@ -1076,13 +1076,11 @@
 /**
  * Get time zone offset.
  *
- * @param int $time Unix timestamp (defaults to current time).
  * @return string Zone offset, e.g. "-0800" for PST.
  */
-function _zone_offset($time = 0)
+function zone_offset()
 {
-    if (!$time)
-        $time = time();
+    $time = time();
     $offset = date("Z", $time);
     $negoffset = "";
     if ($offset < 0) {
@@ -1100,11 +1098,11 @@
  * @param int $time Unix timestamp (defaults to current time).
  * @return string Formatted date & time.
  */
-function _ncsa_time($time = 0)
+function ncsa_time($time = 0)
 {
     if (!$time)
         $time = time();
-    return date("d/M/Y:H:i:s", $time) .  " " . _zone_offset();
+    return date("d/M/Y:H:i:s", $time) .  " " . zone_offset();
 }
 
 /**

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

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

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

Revision: 10507
          http://sourceforge.net/p/phpwiki/code/10507
Author:   vargenau
Date:     2021-08-13 14:25:58 +0000 (Fri, 13 Aug 2021)
Log Message:
-----------
Move functions _ncsa_time and _zone_offset from class Request_AccessLogEntry to stdlib

Modified Paths:
--------------
    trunk/lib/Request.php
    trunk/lib/WikiDB/backend/ADODB_oci8po.php
    trunk/lib/WikiDB/backend/PearDB_oci8.php
    trunk/lib/WikiUser.php
    trunk/lib/stdlib.php

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2021-08-13 13:33:55 UTC (rev 10506)
+++ trunk/lib/Request.php	2021-08-13 14:25:58 UTC (rev 10507)
@@ -1067,41 +1067,6 @@
         $this->duration = strtr(sprintf("%f", $seconds), ",", ".");
     }
 
-    /**
-     * Get time zone offset.
-     *
-     * @param int $time Unix timestamp (defaults to current time).
-     * @return string Zone offset, e.g. "-0800" for PST.
-     */
-    static function _zone_offset($time = 0)
-    {
-        if (!$time)
-            $time = time();
-        $offset = date("Z", $time);
-        $negoffset = "";
-        if ($offset < 0) {
-            $negoffset = "-";
-            $offset = -$offset;
-        }
-        $offhours = floor($offset / 3600);
-        $offmins = $offset / 60 - $offhours * 60;
-        return sprintf("%s%02d%02d", $negoffset, $offhours, $offmins);
-    }
-
-    /**
-     * Format time in NCSA format.
-     *
-     * @param int $time Unix timestamp (defaults to current time).
-     * @return string Formatted date & time.
-     */
-    function _ncsa_time($time = 0)
-    {
-        if (!$time)
-            $time = time();
-        return date("d/M/Y:H:i:s", $time) .
-            " " . $this->_zone_offset();
-    }
-
     function write()
     {
         if ($this->_accesslog->logfile) $this->write_file();
@@ -1115,7 +1080,7 @@
     {
         $entry = sprintf('%s %s %s [%s] "%s" %d %d "%s" "%s"',
             $this->host, $this->ident, $this->user,
-            $this->_ncsa_time($this->time),
+            _ncsa_time($this->time),
             $this->request, $this->status, $this->size,
             $this->referer, $this->user_agent);
         if (!empty($this->_accesslog->reader)) {

Modified: trunk/lib/WikiDB/backend/ADODB_oci8po.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_oci8po.php	2021-08-13 13:33:55 UTC (rev 10506)
+++ trunk/lib/WikiDB/backend/ADODB_oci8po.php	2021-08-13 14:25:58 UTC (rev 10507)
@@ -162,7 +162,7 @@
                 $entry->request,
                 $entry->request_uri,
                 $entry->request_args,
-                $entry->_ncsa_time($entry->time),
+                _ncsa_time($entry->time),
                 $entry->status,
                 $entry->size,
                 $entry->referer,

Modified: trunk/lib/WikiDB/backend/PearDB_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_oci8.php	2021-08-13 13:33:55 UTC (rev 10506)
+++ trunk/lib/WikiDB/backend/PearDB_oci8.php	2021-08-13 14:25:58 UTC (rev 10507)
@@ -115,7 +115,7 @@
                 $entry->request,
                 $entry->request_uri,
                 $entry->request_args,
-                $entry->_ncsa_time($entry->time),
+                _ncsa_time($entry->time),
                 $entry->status,
                 $entry->size,
                 $entry->referer,

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2021-08-13 13:33:55 UTC (rev 10506)
+++ trunk/lib/WikiUser.php	2021-08-13 14:25:58 UTC (rev 10507)
@@ -598,7 +598,7 @@
 
         if ($logout) { // Log out
             if (LOGIN_LOG and is_writeable(LOGIN_LOG)) {
-                $zone_offset = Request_AccessLogEntry::_zone_offset();
+                $zone_offset = _zone_offset();
                 $ncsa_time = date("d/M/Y:H:i:s", time());
                 $entry = sprintf('%s - %s - [%s %s] "%s" %s - "%s" "%s"',
                     (string)$request->get('REMOTE_HOST'),
@@ -634,7 +634,7 @@
         $authlevel = $this->checkPass($passwd === false ? '' : $passwd);
 
         if (LOGIN_LOG and is_writeable(LOGIN_LOG)) {
-            $zone_offset = Request_AccessLogEntry::_zone_offset();
+            $zone_offset = _zone_offset();
             $ncsa_time = date("d/M/Y:H:i:s", time());
             $manglepasswd = $passwd;
             for ($i = 0; $i < strlen($manglepasswd); $i++) {

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2021-08-13 13:33:55 UTC (rev 10506)
+++ trunk/lib/stdlib.php	2021-08-13 14:25:58 UTC (rev 10507)
@@ -1074,6 +1074,40 @@
 }
 
 /**
+ * Get time zone offset.
+ *
+ * @param int $time Unix timestamp (defaults to current time).
+ * @return string Zone offset, e.g. "-0800" for PST.
+ */
+function _zone_offset($time = 0)
+{
+    if (!$time)
+        $time = time();
+    $offset = date("Z", $time);
+    $negoffset = "";
+    if ($offset < 0) {
+        $negoffset = "-";
+        $offset = -$offset;
+    }
+    $offhours = floor($offset / 3600);
+    $offmins = $offset / 60 - $offhours * 60;
+    return sprintf("%s%02d%02d", $negoffset, $offhours, $offmins);
+}
+
+/**
+ * Format time in NCSA format.
+ *
+ * @param int $time Unix timestamp (defaults to current time).
+ * @return string Formatted date & time.
+ */
+function _ncsa_time($time = 0)
+{
+    if (!$time)
+        $time = time();
+    return date("d/M/Y:H:i:s", $time) .  " " . _zone_offset();
+}
+
+/**
  * Get time offset for local time zone.
  *
  * @param int $time Get offset for this time. Default: now.

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

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

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

Revision: 10506
          http://sourceforge.net/p/phpwiki/code/10506
Author:   vargenau
Date:     2021-08-13 13:33:55 +0000 (Fri, 13 Aug 2021)
Log Message:
-----------
_tryroot_from_upgrade no longer used

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

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2021-08-13 08:32:19 UTC (rev 10505)
+++ trunk/lib/WikiDB/backend/PDO.php	2021-08-13 13:33:55 UTC (rev 10506)
@@ -107,11 +107,7 @@
                 echo "<br>\n_parsedDSN: '", print_r($this->_parsedDSN), "'";
                 echo "<br>\nparsed: '", print_r($parsed), "'";
             }
-            if (isset($dbparams['_tryroot_from_upgrade']))
-                trigger_error(sprintf("Can't connect to database: %s", $e->getMessage()),
-                    E_USER_WARNING);
-            else
-                exit();
+            exit();
         }
         if (DEBUG & _DEBUG_SQL) { // not yet implemented
             $this->_dbh->debug = true;

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2021-08-13 08:32:19 UTC (rev 10505)
+++ trunk/lib/WikiDB/backend/PearDB.php	2021-08-13 13:33:55 UTC (rev 10506)
@@ -49,10 +49,7 @@
         if (DB::isError($dbh)) {
             trigger_error(sprintf("Can't connect to database: %s",
                     $this->_pear_error_message($dbh)),
-                isset($dbparams['_tryroot_from_upgrade']) // hack!
-                    ? E_USER_WARNING : E_USER_ERROR);
-            if (isset($dbparams['_tryroot_from_upgrade']))
-                return;
+                    E_USER_ERROR);
         }
         $dbh->setErrorHandling(PEAR_ERROR_CALLBACK,
             array($this, '_pear_error_callback'));

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

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

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

Revision: 10505
          http://sourceforge.net/p/phpwiki/code/10505
Author:   vargenau
Date:     2021-08-13 08:32:19 +0000 (Fri, 13 Aug 2021)
Log Message:
-----------
RECENT_CHANGES is not used

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

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2021-08-13 08:15:18 UTC (rev 10504)
+++ trunk/config/config-dist.ini	2021-08-13 08:32:19 UTC (rev 10505)
@@ -1064,9 +1064,6 @@
 ; The default, 604800, is one week (7 days): 7 * 24 * 3600
 MINOR_EDIT_TIMEOUT = 604800
 
-; Page name of RecentChanges page. Used for RSS Auto-discovery
-;RECENT_CHANGES = RecentChange
-
 ; If you get a crash at loading LinkIcons you might want to disable
 ; the getimagesize() function, which crashes on certain php versions and
 ; and some external images (png's, ..).

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-13 08:15:18 UTC (rev 10504)
+++ trunk/configurator.php	2021-08-13 08:32:19 UTC (rev 10505)
@@ -1455,10 +1455,6 @@
 $properties["HTML Dump Filename Suffix"] =
     new _define_optional('HTML_DUMP_SUFFIX');
 
-$properties["Pagename of Recent Changes"] =
-    new _define_optional('RECENT_CHANGES',
-        "RecentChanges");
-
 $properties["Disable GETIMAGESIZE"] =
     new boolean_define_commented_optional('DISABLE_GETIMAGESIZE');
 

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

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

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

Revision: 10504
          http://sourceforge.net/p/phpwiki/code/10504
Author:   vargenau
Date:     2021-08-13 08:15:18 +0000 (Fri, 13 Aug 2021)
Log Message:
-----------
DBADMIN_USER and DBADMIN_PASSWD are no longer needed for upgrade

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini
    trunk/configurator.php
    trunk/doc/INSTALL.mysql
    trunk/lib/IniConfig.php

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2021-08-12 12:53:41 UTC (rev 10503)
+++ trunk/config/config-default.ini	2021-08-13 08:15:18 UTC (rev 10504)
@@ -150,8 +150,6 @@
 DISABLE_GETIMAGESIZE = true
 ; FORTUNE_DIR = /usr/share/fortune
 ; GOOGLE_LICENSE_KEY = "..."
-; DBADMIN_USER =
-; DBADMIN_PASSWD =
 BLOG_DEFAULT_EMPTY_PREFIX = true
 ; TOOLBAR_PAGELINK_PULLDOWN = *
 ; TOOLBAR_TEMPLATE_PULLDOWN = Template*

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2021-08-12 12:53:41 UTC (rev 10503)
+++ trunk/config/config-dist.ini	2021-08-13 08:15:18 UTC (rev 10504)
@@ -473,15 +473,6 @@
 ; to set this parameter to 0 (disabled).
 ;DATABASE_OPTIMISE_FREQUENCY = 50
 
-; Optional: Administrative SQL DB access (for action=upgrade)
-; If action=upgrade detects (My)SQL problems, but has no ALTER permissions,
-; give here a database username which has the necessary ALTER or CREATE permissions.
-; Of course you can fix your database manually. See lib/upgrade.php for known issues.
-;DBADMIN_USER = root
-
-; Optional: Administrative SQL DB access (for action=upgrade)
-;DBADMIN_PASSWD = secret
-
 ; Store DB query results (esp. for page lists) in memory to avoid duplicate queries.
 ; Disable only for old php's with low memory or memory_limit=8MB.
 ; Requires at least memory_limit=16MB

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-12 12:53:41 UTC (rev 10503)
+++ trunk/configurator.php	2021-08-13 08:15:18 UTC (rev 10504)
@@ -809,12 +809,6 @@
 $properties["DATABASE_OPTIMISE_FREQUENCY"] =
     new numeric_define_optional('DATABASE_OPTIMISE_FREQUENCY', DATABASE_OPTIMISE_FREQUENCY);
 
-$properties["DBADMIN_USER"] =
-    new _define_optional('DBADMIN_USER', DBADMIN_USER);
-
-$properties["DBADMIN_PASSWD"] =
-    new _define_password_optional('DBADMIN_PASSWD', DBADMIN_PASSWD);
-
 $properties["USECACHE"] =
     new boolean_define_commented_optional('USECACHE');
 

Modified: trunk/doc/INSTALL.mysql
===================================================================
--- trunk/doc/INSTALL.mysql	2021-08-12 12:53:41 UTC (rev 10503)
+++ trunk/doc/INSTALL.mysql	2021-08-13 08:15:18 UTC (rev 10504)
@@ -62,18 +62,4 @@
 "mysql.php" gets included:
 if (!extension_loaded("mysql"))  { dl("mysql.so"); }
 
-
-Upgrading a MySQL phpwiki
--------------------------
-
-If schemas/mysql-initialize.sql has changed for your old phpwiki
-installation (or changed when compared to the old "mysql.sql" file),
-you can either create missing tables manually and ALTER the changed
-tables manually.
-Or you can run ?action=upgrade (also from "Upgrade"
-at PhpWikiAdministration), but then your database user needs the
-necessary ALTER and CREATE permissions.
-You might want to set DBADMIN_USER temporarily in your config.ini.
-?action=upgrade also brings all changed pgsrc files up-to-date.
-
 /Reini Urban and Arno aho...@ma...

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2021-08-12 12:53:41 UTC (rev 10503)
+++ trunk/lib/IniConfig.php	2021-08-13 08:15:18 UTC (rev 10504)
@@ -180,7 +180,7 @@
         'IMAP_AUTH_HOST', 'POP3_AUTH_HOST',
         'AUTH_USER_FILE', 'AUTH_GROUP_FILE', 'AUTH_SESS_USER', 'AUTH_SESS_LEVEL',
         'GOOGLE_LICENSE_KEY', 'FORTUNE_DIR',
-        'DISABLE_GETIMAGESIZE', 'DBADMIN_USER', 'DBADMIN_PASSWD',
+        'DISABLE_GETIMAGESIZE',
         'SESSION_SAVE_PATH',
         'TOOLBAR_PAGELINK_PULLDOWN', 'TOOLBAR_TEMPLATE_PULLDOWN', 'TOOLBAR_IMAGE_PULLDOWN',
         'EXTERNAL_LINK_TARGET', 'ACCESS_LOG_SQL', 'USE_EXTERNAL_HTML2PDF',

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10503] branches/release-1.6.0/

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

Revision: 10503
          http://sourceforge.net/p/phpwiki/code/10503
Author:   vargenau
Date:     2021-08-12 12:53:41 +0000 (Thu, 12 Aug 2021)
Log Message:
-----------
Create branch release-1.6.0

Added Paths:
-----------
    branches/release-1.6.0/

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10502] tags/release-1.6.0/

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

Revision: 10502
          http://sourceforge.net/p/phpwiki/code/10502
Author:   vargenau
Date:     2021-08-12 12:53:26 +0000 (Thu, 12 Aug 2021)
Log Message:
-----------
Create tag release-1.6.0

Added Paths:
-----------
    tags/release-1.6.0/

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

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

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

Revision: 10501
          http://sourceforge.net/p/phpwiki/code/10501
Author:   vargenau
Date:     2021-08-12 10:45:55 +0000 (Thu, 12 Aug 2021)
Log Message:
-----------
PHP Doc

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

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2021-08-12 10:22:07 UTC (rev 10500)
+++ trunk/lib/WikiDB.php	2021-08-12 10:45:55 UTC (rev 10501)
@@ -1234,7 +1234,6 @@
      * @param bool $include_empty
      * @param string $sortby
      * @param string $limit
-     * @param string $sortby
      * @param string $exclude
      * @param bool $want_relations
      * @return WikiDB_PageIterator A WikiDB_PageIterator containing

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