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

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

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

Revision: 10974
          http://sourceforge.net/p/phpwiki/code/10974
Author:   vargenau
Date:     2022-02-03 15:57:14 +0000 (Thu, 03 Feb 2022)
Log Message:
-----------
Remove PgsrcTranslation, does not exist

Modified Paths:
--------------
    trunk/TODO
    trunk/lib/IniConfig.php
    trunk/lib/plugin/WantedPages.php
    trunk/locale/de/pgsrc/PhpWikiDokumentation
    trunk/locale/fr/pgsrc/DocumentationDePhpWiki
    trunk/locale/nl/pgsrc/PhpWikiDocumentatie
    trunk/pgsrc/Help%2FWantedPagesPlugin
    trunk/pgsrc/PhpWikiDocumentation

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2022-02-03 15:35:12 UTC (rev 10973)
+++ trunk/TODO	2022-02-03 15:57:14 UTC (rev 10974)
@@ -68,7 +68,6 @@
 * SpamAssassinIntegration
 
 already done lately:
-* PgsrcTranslation slowness (update_locale?)
 * overlarge session data
 * handle empty DEFAULT_LANGUAGE: proper client detection
 * fix glob errors

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2022-02-03 15:35:12 UTC (rev 10973)
+++ trunk/lib/IniConfig.php	2022-02-03 15:57:14 UTC (rev 10974)
@@ -928,7 +928,6 @@
     _("GoodStyle"),
     _("HowTo"),
     _("MyRecentChanges"),
-    _("PgsrcTranslation"),
     _("RecentChangesMyPages"),
     _("SemanticSearchAdvancedPlugin"),
     _("SetAclSimple"),

Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php	2022-02-03 15:35:12 UTC (rev 10973)
+++ trunk/lib/plugin/WantedPages.php	2022-02-03 15:57:14 UTC (rev 10974)
@@ -53,7 +53,7 @@
             array('page' => '[pagename]', // just for a single page.
                 'withlinks' => 0,
                 'noheader' => false,
-                'exclude_from' => __("PgsrcTranslation") . ',' . __("InterWikiMap"),
+                'exclude_from' => __("InterWikiMap"),
                 'limit' => '100',
                 'paging' => 'auto'));
     }

Modified: trunk/locale/de/pgsrc/PhpWikiDokumentation
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiDokumentation	2022-02-03 15:35:12 UTC (rev 10973)
+++ trunk/locale/de/pgsrc/PhpWikiDokumentation	2022-02-03 15:57:14 UTC (rev 10974)
@@ -1,4 +1,4 @@
-Date: Wed, 10 Apr 2019 16:39:09 +0000
+Date: Thu,  3 Feb 2022 16:54:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiDokumentation;
@@ -10,7 +10,7 @@
 
 <<SiteMap
          noheader=true
-         exclude=HomePage,PgsrcTranslation
+         exclude=HomePage
          reclimit=1
          direction=forward
          firstreversed=1

Modified: trunk/locale/fr/pgsrc/DocumentationDePhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/DocumentationDePhpWiki	2022-02-03 15:35:12 UTC (rev 10973)
+++ trunk/locale/fr/pgsrc/DocumentationDePhpWiki	2022-02-03 15:57:14 UTC (rev 10974)
@@ -1,4 +1,4 @@
-Date: Fri, 12 Apr 2019 15:36:06 +0000
+Date: Thu,  3 Feb 2022 16:54:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=DocumentationDePhpWiki;
@@ -10,7 +10,7 @@
 
 <<SiteMap
          noheader=true
-         exclude=PageAccueil,PgsrcTranslation
+         exclude=PageAccueil
          reclimit=1
          direction=forward
          firstreversed=1

Modified: trunk/locale/nl/pgsrc/PhpWikiDocumentatie
===================================================================
--- trunk/locale/nl/pgsrc/PhpWikiDocumentatie	2022-02-03 15:35:12 UTC (rev 10973)
+++ trunk/locale/nl/pgsrc/PhpWikiDocumentatie	2022-02-03 15:57:14 UTC (rev 10974)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu,  3 Feb 2022 16:54:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiDocumentatie;
@@ -10,7 +10,7 @@
 
 <<SiteMap
          noheader=true
-         exclude=HomePage,PgsrcTranslation
+         exclude=HomePage
          reclimit=1
          direction=forward
          firstreversed=1

Modified: trunk/pgsrc/Help%2FWantedPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FWantedPagesPlugin	2022-02-03 15:35:12 UTC (rev 10973)
+++ trunk/pgsrc/Help%2FWantedPagesPlugin	2022-02-03 15:57:14 UTC (rev 10974)
@@ -1,4 +1,4 @@
-Date: Mon, 22 Feb 2021 19:16:32 +0000
+Date: Thu,  3 Feb 2022 16:54:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWantedPagesPlugin;
@@ -40,7 +40,7 @@
 |-
 | **exclude_from**
 | Comma-separated list of pages to exclude
-| PgsrcTranslation, InterWikiMap
+| InterWikiMap
 |-
 | **limit**
 | maximum number of wanted pages to display

Modified: trunk/pgsrc/PhpWikiDocumentation
===================================================================
--- trunk/pgsrc/PhpWikiDocumentation	2022-02-03 15:35:12 UTC (rev 10973)
+++ trunk/pgsrc/PhpWikiDocumentation	2022-02-03 15:57:14 UTC (rev 10974)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu,  3 Feb 2022 16:54:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiDocumentation;
@@ -10,7 +10,7 @@
 
 <<SiteMap
          noheader=true
-         exclude=HomePage,PgsrcTranslation
+         exclude=HomePage
          reclimit=1
          direction=forward
          firstreversed=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:[10973] trunk/lib/PageList.php

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

Revision: 10973
          http://sourceforge.net/p/phpwiki/code/10973
Author:   vargenau
Date:     2022-02-03 15:35:12 +0000 (Thu, 03 Feb 2022)
Log Message:
-----------
Indent

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

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2022-02-02 18:07:25 UTC (rev 10972)
+++ trunk/lib/PageList.php	2022-02-03 15:35:12 UTC (rev 10973)
@@ -115,8 +115,7 @@
             $src = false;
             $noimg_src = $WikiTheme->getButtonURL('sort_none');
             if ($noimg_src)
-                $noimg = HTML::img(array('src' => $noimg_src,
-                    'alt' => '.'));
+                $noimg = HTML::img(array('src' => $noimg_src, 'alt' => '.'));
             else
                 $noimg = HTML::raw('');
             $reverse = false;
@@ -224,7 +223,8 @@
         if ($this->_field == 'hits')
             return (int)$val;
         elseif (is_object($val) && method_exists($val, 'asString'))
-            return $val->asString(); else
+            return $val->asString();
+        else
             return (string)$val;
     }
 }
@@ -477,7 +477,8 @@
         if (is_object($page_handle) and !empty($page_handle->score))
             return $page_handle->score;
         elseif (is_array($page_handle) and !empty($page_handle['score']))
-            return $page_handle['score']; else
+            return $page_handle['score'];
+        else
             return substr(parent::_getValue($page_handle, $revision_handle), 0, 50);
     }
 }
@@ -983,8 +984,10 @@
         if (is_a($dbi, 'WikiDB_SQL')) {
             extract($dbi->_backend->_table_names);
             $res = $dbi->_backend->_dbh->getOne("SELECT max(length(pagename)) FROM $page_tbl");
-            if (DB::isError($res) || empty($res)) return false;
-            else return $res;
+            if (DB::isError($res) || empty($res))
+                return false;
+            else
+                return $res;
         } else
             return false;
     }
@@ -1008,10 +1011,11 @@
         if ($this->isEmpty())
             return $this->_emptyList($caption);
         elseif (isset($this->_options['listtype'])
-            and in_array($this->_options['listtype'], array('ol', 'ul', 'comma', 'dl'))
-        )
-            return $this->generateList($caption); elseif (count($this->_columns) == 1)
-            return $this->generateList($caption); else
+            and in_array($this->_options['listtype'], array('ol', 'ul', 'comma', 'dl')))
+            return $this->generateList($caption);
+        elseif (count($this->_columns) == 1)
+            return $this->generateList($caption);
+        else
             return $this->_generateTable($caption);
     }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10972] trunk/lib/plugin/MostPopular.php

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

Revision: 10972
          http://sourceforge.net/p/phpwiki/code/10972
Author:   vargenau
Date:     2022-02-02 18:07:25 +0000 (Wed, 02 Feb 2022)
Log Message:
-----------
lib/plugin/MostPopular.php: cleanup

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

Modified: trunk/lib/plugin/MostPopular.php
===================================================================
--- trunk/lib/plugin/MostPopular.php	2022-02-02 11:48:24 UTC (rev 10971)
+++ trunk/lib/plugin/MostPopular.php	2022-02-02 18:07:25 UTC (rev 10972)
@@ -39,20 +39,14 @@
         (
             PageList::supportedArgs(),
             array('pagename' => '[pagename]', // hackish
-                //'exclude'  => '',
                 'limit' => 20, // limit <0 returns least popular pages
                 'noheader' => false,
-                'sortby' => '-hits',
-                'info' => false,
-                //'paging'   => 'auto'
+                'sortby' => '-hits', // only pagename or hits. mtime not!
+                'info' => false // allows multiple columns:
+                                // info=mtime,hits,summary,version,author,locked,minor
             ));
     }
 
-    // info arg allows multiple columns
-    // info=mtime,hits,summary,version,author,locked,minor
-    // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges
-    // sortby: only pagename or hits. mtime not!
-
     /**
      * @param WikiDB $dbi
      * @param string $argstr
@@ -89,7 +83,6 @@
         array_unshift($columns, 'hits');
 
         if (!$request->getArg('count')) {
-            //$args['count'] = $dbi->numPages(false,$exclude);
             $allpages = $dbi->mostPopular(0, $sortby);
             $args['count'] = $allpages->count();
         } 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:[10971] trunk

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

Revision: 10971
          http://sourceforge.net/p/phpwiki/code/10971
Author:   vargenau
Date:     2022-02-02 11:48:24 +0000 (Wed, 02 Feb 2022)
Log Message:
-----------
Align config/config-dist.ini and configurator.php

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

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2022-02-02 11:44:23 UTC (rev 10970)
+++ trunk/config/config-dist.ini	2022-02-02 11:48:24 UTC (rev 10971)
@@ -1,12 +1,12 @@
 ; This is the main configuration file for PhpWiki.
 ; Note that certain characters are used as comment char and therefore
 ; these entries must be in double-quotes. Such as ":", ";", "," and "|"
+; Take special care for DBAUTH_ sql statements. (Part 3a)
 ;
 ; <?php die(); ?> for security
 ;
-; This file is divided into eight parts.
-; Each one has different configuration settings you can
-; change; in all cases the default should work on your system,
+; This file is divided into several parts. Each one has different configuration
+; settings you can change; in all cases the default should work on your system,
 ; however, we recommend you tailor things to your particular setting.
 ; Here undefined definitions get defined by config-default.ini settings.
 

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2022-02-02 11:44:23 UTC (rev 10970)
+++ trunk/configurator.php	2022-02-02 11:48:24 UTC (rev 10971)
@@ -379,12 +379,12 @@
 $SEPARATOR = ";=========================================================================";
 
 $preamble = "
-; This is the main configuration file for PhpWiki in INI-style format.
+; This is the main configuration file for PhpWiki.
 ; Note that certain characters are used as comment char and therefore
 ; these entries must be in double-quotes. Such as \":\", \";\", \",\" and \"|\"
 ; Take special care for DBAUTH_ sql statements. (Part 3a)
 ;
-; This file is divided into several parts: Each one has different configuration
+; This file is divided into several parts. Each one has different configuration
 ; settings you can change; in all cases the default should work on your system,
 ; however, we recommend you tailor things to your particular setting.
 ; Here undefined definitions get defined by config-default.ini settings.

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

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

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

Revision: 10970
          http://sourceforge.net/p/phpwiki/code/10970
Author:   vargenau
Date:     2022-02-02 11:44:23 +0000 (Wed, 02 Feb 2022)
Log Message:
-----------
Use private when possible

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

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2022-02-02 11:41:35 UTC (rev 10969)
+++ trunk/lib/WikiDB/backend/PDO.php	2022-02-02 11:44:23 UTC (rev 10970)
@@ -34,10 +34,10 @@
     public $_dbparams;
     public $_dsn;
     public $_table_names;
-    public $page_tbl_field_list;
-    public $version_tbl_field_list;
-    public $_lock_count;
-    public $_current_lock;
+    private $page_tbl_field_list;
+    private $version_tbl_field_list;
+    private $_lock_count;
+    private $_current_lock;
 
     function __construct($dbparams)
     {

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

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

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

Revision: 10969
          http://sourceforge.net/p/phpwiki/code/10969
Author:   vargenau
Date:     2022-02-02 11:41:35 +0000 (Wed, 02 Feb 2022)
Log Message:
-----------
Add smiley

Modified Paths:
--------------
    trunk/locale/de/pgsrc/Hilfe%2FPhpWiki
    trunk/locale/es/pgsrc/Ayuda%2FPhpWiki
    trunk/locale/fr/pgsrc/Aide%2FPhpWiki
    trunk/locale/it/pgsrc/Aiuto%2FPhpWiki
    trunk/locale/nl/pgsrc/Help%2FPhpWiki
    trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FPhpWiki
    trunk/locale/zh/pgsrc/Help%2FPhpWiki

Modified: trunk/locale/de/pgsrc/Hilfe%2FPhpWiki
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FPhpWiki	2022-02-02 11:27:45 UTC (rev 10968)
+++ trunk/locale/de/pgsrc/Hilfe%2FPhpWiki	2022-02-02 11:41:35 UTC (rev 10969)
@@ -1,4 +1,4 @@
-Date: Thu, 20 Jun 2019 16:47:21 +0000
+Date: Wed,  2 Feb 2022 12:40:35 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FPhpWiki;
@@ -9,7 +9,7 @@
 Sie verwenden jetzt gerade ~PhpWiki. Faszinierend, oder?
 
 Besuchen Sie die Website von PhpWiki unter [[https://sourceforge.net/projects/phpwiki/]] und schauen Sie PhpWiki in Aktion an
-unter [[http://phpwiki.demo.free.fr]] (und natürlich auch hier :-)).
+unter [[http://phpwiki.demo.free.fr]] (und natürlich auch hier {{:)}}).
 
 <noinclude>
 ----

Modified: trunk/locale/es/pgsrc/Ayuda%2FPhpWiki
===================================================================
--- trunk/locale/es/pgsrc/Ayuda%2FPhpWiki	2022-02-02 11:27:45 UTC (rev 10968)
+++ trunk/locale/es/pgsrc/Ayuda%2FPhpWiki	2022-02-02 11:41:35 UTC (rev 10969)
@@ -1,4 +1,4 @@
-Date: Mon, 18 Dec 2020 18:49:20 +0000
+Date: Wed,  2 Feb 2022 12:40:35 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=Ayuda%2FPhpWiki;
@@ -9,7 +9,7 @@
 Esta usando PhpWiki en este momento. ¿No es increible?
 
 Visite nuestra web en [[https://sourceforge.net/projects/phpwiki/]] y vea ~PhpWiki
-en acción en [[http://phpwiki.demo.free.fr]] (y por supuesto aquí también :-)).
+en acción en [[http://phpwiki.demo.free.fr]] (y por supuesto aquí también {{:)}}).
 
 <noinclude>
 ----

Modified: trunk/locale/fr/pgsrc/Aide%2FPhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FPhpWiki	2022-02-02 11:27:45 UTC (rev 10968)
+++ trunk/locale/fr/pgsrc/Aide%2FPhpWiki	2022-02-02 11:41:35 UTC (rev 10969)
@@ -1,4 +1,4 @@
-Date: Thu, 11 Apr 2019 16:07:57 +0000
+Date: Wed,  2 Feb 2022 12:40:35 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPhpWiki;
@@ -9,7 +9,7 @@
 Vous utilisez ~PhpWiki en ce moment même. Incroyable, n'est-ce pas ?
 
 Visitez notre page d'accueil (en anglais) sur [[http://phpwiki.sourceforge.net/]]
-et voyez ~PhpWiki en action sur [[http://phpwiki.demo.free.fr]] (et bien sûr, ici aussi :-)).
+et voyez ~PhpWiki en action sur [[http://phpwiki.demo.free.fr]] (et bien sûr, ici aussi {{:)}}).
 
 <noinclude>
 ----

Modified: trunk/locale/it/pgsrc/Aiuto%2FPhpWiki
===================================================================
--- trunk/locale/it/pgsrc/Aiuto%2FPhpWiki	2022-02-02 11:27:45 UTC (rev 10968)
+++ trunk/locale/it/pgsrc/Aiuto%2FPhpWiki	2022-02-02 11:41:35 UTC (rev 10969)
@@ -1,4 +1,4 @@
-Date: Thu, 26 Mar 2020 12:01:56 +0000
+Date: Wed,  2 Feb 2022 12:40:35 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=Aiuto%2FPhpWiki;
@@ -9,7 +9,7 @@
 Stai usando ~PhpWiki in questo momento. Incredibile, vero?
 
 Visita la nostra home page su [[https://sourceforge.net/projects/phpwiki/]] e guarda ~PhpWiki
-in azione su [[http://phpwiki.demo.free.fr]] (and of course here too :-)).
+in azione su [[http://phpwiki.demo.free.fr]] (and of course here too {{:)}}).
 
 <noinclude>
 ----

Modified: trunk/locale/nl/pgsrc/Help%2FPhpWiki
===================================================================
--- trunk/locale/nl/pgsrc/Help%2FPhpWiki	2022-02-02 11:27:45 UTC (rev 10968)
+++ trunk/locale/nl/pgsrc/Help%2FPhpWiki	2022-02-02 11:41:35 UTC (rev 10969)
@@ -1,4 +1,4 @@
-Date: Thu, 24 Dec 2020 17:40:03 +0000
+Date: Wed,  2 Feb 2022 12:40:35 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPhpWiki;
@@ -9,7 +9,7 @@
 Je gebruikt ~PhpWiki nu, op dit moment.  Ongelooflijk, nietwaar?
 
 Bezoek onze thuispagina op [[https://sourceforge.net/projects/phpwiki/]] en zie ~PhpWiki
-in actie op [[http://phpwiki.demo.free.fr]] (en natuurlijk ook hier :-)).
+in actie op [[http://phpwiki.demo.free.fr]] (en natuurlijk ook hier {{:)}}).
 
 <noinclude>
 ----

Modified: trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FPhpWiki
===================================================================
--- trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FPhpWiki	2022-02-02 11:27:45 UTC (rev 10968)
+++ trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FPhpWiki	2022-02-02 11:41:35 UTC (rev 10969)
@@ -1,4 +1,4 @@
-Date: Mon,  8 Apr 2019 18:49:20 +0000
+Date: Wed,  2 Feb 2022 12:40:35 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=Hj%C3%A4lp%2FPhpWiki;
@@ -9,7 +9,7 @@
 Du använder ~PhpWiki just nu. Otroligt eller hur?
 
 Besök vår hemsida på [[https://sourceforge.net/projects/phpwiki/]] och se hur
-~PhpWiki fungerar på [[http://phpwiki.demo.free.fr]] (and of course here too :-)).
+~PhpWiki fungerar på [[http://phpwiki.demo.free.fr]] (and of course here too {{:)}}).
 
 <noinclude>
 ----

Modified: trunk/locale/zh/pgsrc/Help%2FPhpWiki
===================================================================
--- trunk/locale/zh/pgsrc/Help%2FPhpWiki	2022-02-02 11:27:45 UTC (rev 10968)
+++ trunk/locale/zh/pgsrc/Help%2FPhpWiki	2022-02-02 11:41:35 UTC (rev 10969)
@@ -1,4 +1,4 @@
-Date: Thu, 24 Dec 2020 18:13:17 +0000
+Date: Wed,  2 Feb 2022 12:40:35 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPhpWiki;
@@ -9,7 +9,7 @@
 你現在正在使用 ~PhpWiki. 很難以置信,不是嗎?
 
 參訪我們位於 [[https://sourceforge.net/projects/phpwiki/]] 的首頁並參閱這兒的 ~PhpWiki
-[[http://phpwiki.demo.free.fr]] (and of course here too :-)).
+[[http://phpwiki.demo.free.fr]] (and of course here too {{:)}}).
 
 <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:[10968] trunk/lib/WikiDB/backend/PDO_mysql.php

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

Revision: 10968
          http://sourceforge.net/p/phpwiki/code/10968
Author:   vargenau
Date:     2022-02-02 11:27:45 +0000 (Wed, 02 Feb 2022)
Log Message:
-----------
Fix dsn

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

Modified: trunk/lib/WikiDB/backend/PDO_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_mysql.php	2022-02-01 09:10:03 UTC (rev 10967)
+++ trunk/lib/WikiDB/backend/PDO_mysql.php	2022-02-02 11:27:45 UTC (rev 10968)
@@ -50,8 +50,8 @@
         $sth = $this->_dbh->prepare("SHOW processlist");
         if ($sth->execute())
             while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
-                if ($row["db"] == $this->_dsn['database']
-                    and $row["User"] == $this->_dsn['username']
+                if ($row["db"] == $this->_dbh->dsn['database']
+                    and $row["User"] == $this->_dbh->dsn['username']
                         and $row["Time"] > $this->_dbparams['timeout']
                             and $row["Command"] == "Sleep"
                 ) {

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

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

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

Revision: 10967
          http://sourceforge.net/p/phpwiki/code/10967
Author:   vargenau
Date:     2022-02-01 09:10:03 +0000 (Tue, 01 Feb 2022)
Log Message:
-----------
Use MAX_PAGENAME_LENGTH in bindParam

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

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2022-02-01 08:54:54 UTC (rev 10966)
+++ trunk/lib/WikiDB/backend/PDO.php	2022-02-01 09:10:03 UTC (rev 10967)
@@ -225,7 +225,7 @@
                 . " FROM $nonempty_tbl, $page_tbl"
                 . " WHERE $nonempty_tbl.id=$page_tbl.id"
                 . "   AND pagename=?");
-        $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
+        $sth->bindParam(1, $pagename, PDO::PARAM_STR, MAX_PAGENAME_LENGTH);
         if ($sth->execute())
             return $sth->fetchColumn();
         else
@@ -263,7 +263,7 @@
         $sth = $dbh->prepare("UPDATE $page_tbl SET hits=hits+1"
             . " WHERE pagename=?"
             . " LIMIT 1");
-        $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
+        $sth->bindParam(1, $pagename, PDO::PARAM_STR, MAX_PAGENAME_LENGTH);
         $sth->execute();
     }
 
@@ -276,7 +276,7 @@
         $page_tbl = $this->_table_names['page_tbl'];
         $sth = $dbh->prepare("SELECT id,pagename,hits,pagedata FROM $page_tbl"
             . " WHERE pagename=? LIMIT 1");
-        $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
+        $sth->bindParam(1, $pagename, PDO::PARAM_STR, MAX_PAGENAME_LENGTH);
         $sth->execute();
         $row = $sth->fetch(PDO::FETCH_NUM);
         return $row ? $this->_extract_page_data($row[3], $row[2]) : false;
@@ -303,7 +303,7 @@
             // hit count, who cares?
             $sth = $dbh->prepare("UPDATE $page_tbl SET hits=? WHERE pagename=? LIMIT 1");
             $sth->bindParam(1, $newdata['hits'], PDO::PARAM_INT);
-            $sth->bindParam(2, $pagename, PDO::PARAM_STR, 100);
+            $sth->bindParam(2, $pagename, PDO::PARAM_STR, MAX_PAGENAME_LENGTH);
             $sth->execute();
             return true;
         }
@@ -332,7 +332,7 @@
         $sth->bindParam(1, $hits, PDO::PARAM_INT);
         $serialized_data = $this->_serialize($data);
         $sth->bindParam(2, $serialized_data, PDO::PARAM_LOB);
-        $sth->bindParam(3, $pagename, PDO::PARAM_STR, 100);
+        $sth->bindParam(3, $pagename, PDO::PARAM_STR, MAX_PAGENAME_LENGTH);
         if ($sth->execute()) {
             $this->commit();
             return true;
@@ -347,7 +347,7 @@
         $dbh = &$this->_dbh;
         $page_tbl = $this->_table_names['page_tbl'];
         $sth = $dbh->prepare("SELECT cached_html FROM $page_tbl WHERE pagename=? LIMIT 1");
-        $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
+        $sth->bindParam(1, $pagename, PDO::PARAM_STR, MAX_PAGENAME_LENGTH);
         $sth->execute();
         return $sth->fetchColumn(0);
     }
@@ -362,7 +362,7 @@
                 . " WHERE pagename=?"
                 . " LIMIT 1");
         $sth->bindParam(1, $data, PDO::PARAM_STR);
-        $sth->bindParam(2, $pagename, PDO::PARAM_STR, 100);
+        $sth->bindParam(2, $pagename, PDO::PARAM_STR, MAX_PAGENAME_LENGTH);
         $sth->execute();
     }
 
@@ -383,7 +383,7 @@
         $dbh = &$this->_dbh;
         $page_tbl = $this->_table_names['page_tbl'];
         $sth = $dbh->prepare("SELECT id FROM $page_tbl WHERE pagename=? LIMIT 1");
-        $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
+        $sth->bindParam(1, $pagename, PDO::PARAM_STR, MAX_PAGENAME_LENGTH);
         $sth->execute();
         $id = $sth->fetchColumn();
         if (!$create_if_missing) {
@@ -396,7 +396,7 @@
                 $sth = $dbh->prepare("INSERT INTO $page_tbl"
                     . " (id,pagename)"
                     . " VALUES (NULL,?)");
-                $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
+                $sth->bindParam(1, $pagename, PDO::PARAM_STR, MAX_PAGENAME_LENGTH);
                 $sth->execute();
                 $id = $dbh->lastInsertId();
             } else {
@@ -409,7 +409,7 @@
                     . " VALUES (?,?,0)");
                 $id++;
                 $sth->bindParam(1, $id, PDO::PARAM_INT);
-                $sth->bindParam(2, $pagename, PDO::PARAM_STR, 100);
+                $sth->bindParam(2, $pagename, PDO::PARAM_STR, MAX_PAGENAME_LENGTH);
                 if ($sth->execute())
                     $this->commit();
                 else
@@ -429,7 +429,7 @@
                     . " WHERE $page_tbl.id=$recent_tbl.id"
                     . "  AND pagename=?"
                     . " LIMIT 1");
-        $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
+        $sth->bindParam(1, $pagename, PDO::PARAM_STR, MAX_PAGENAME_LENGTH);
         $sth->execute();
         return $sth->fetchColumn();
     }
@@ -445,7 +445,7 @@
                     . "  AND version < ?"
                     . " ORDER BY version DESC"
                     . " LIMIT 1");
-        $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
+        $sth->bindParam(1, $pagename, PDO::PARAM_STR, MAX_PAGENAME_LENGTH);
         $sth->bindParam(2, $version, PDO::PARAM_INT);
         $sth->execute();
         return $sth->fetchColumn();
@@ -486,7 +486,7 @@
                     . "  AND pagename=?"
                     . "  AND version=?"
                     . " LIMIT 1");
-        $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
+        $sth->bindParam(1, $pagename, PDO::PARAM_STR, MAX_PAGENAME_LENGTH);
         $sth->bindParam(2, $version, PDO::PARAM_INT);
         $sth->execute();
         $row = $sth->fetch(PDO::FETCH_NUM);
@@ -813,7 +813,7 @@
             . $exclude
             . $orderby
             . $limit);
-        $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
+        $sth->bindParam(1, $pagename, PDO::PARAM_STR, MAX_PAGENAME_LENGTH);
         $sth->execute();
         return new WikiDB_backend_PDO_iter($this, $sth, $this->page_tbl_field_list);
     }
@@ -835,8 +835,8 @@
             . " WHERE linkfrom=linker.id AND linkto=linkee.id"
             . " AND $have.pagename=?"
             . " AND $want.pagename=?");
-        $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
-        $sth->bindParam(2, $link, PDO::PARAM_STR, 100);
+        $sth->bindParam(1, $pagename, PDO::PARAM_STR, MAX_PAGENAME_LENGTH);
+        $sth->bindParam(2, $link, PDO::PARAM_STR, MAX_PAGENAME_LENGTH);
         $sth->execute();
         return $sth->fetchColumn();
     }
@@ -1126,7 +1126,7 @@
         $this->lock(array('page', 'version', 'recent', 'nonempty', 'link'));
         $id = $this->_get_pageid($pagename);
         $sth = $dbh->prepare("UPDATE $page_tbl SET pagename=? WHERE id=?");
-        $sth->bindParam(1, $to, PDO::PARAM_STR, 100);
+        $sth->bindParam(1, $to, PDO::PARAM_STR, MAX_PAGENAME_LENGTH);
         $sth->bindParam(2, $id, PDO::PARAM_INT);
         $sth->execute();
         $this->unlock(array('page', 'version', 'recent', 'nonempty', '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:[10966] trunk

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

Revision: 10966
          http://sourceforge.net/p/phpwiki/code/10966
Author:   vargenau
Date:     2022-02-01 08:54:54 +0000 (Tue, 01 Feb 2022)
Log Message:
-----------
Put MAX_PAGENAME_LENGTH in configurator.php, config/config-dist.ini and config/config-default.ini

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

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2022-02-01 08:45:44 UTC (rev 10965)
+++ trunk/config/config-default.ini	2022-02-01 08:54:54 UTC (rev 10966)
@@ -26,6 +26,7 @@
 ISREADONLY = false
 WIKI_NAME = PhpWiki
 ENCRYPTED_PASSWD = true
+MAX_PAGENAME_LENGTH = 100
 ENABLE_REVERSE_DNS = true
 ZIPDUMP_AUTH = false
 ENABLE_RAW_HTML = true

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2022-02-01 08:45:44 UTC (rev 10965)
+++ trunk/config/config-dist.ini	2022-02-01 08:54:54 UTC (rev 10966)
@@ -233,6 +233,10 @@
 ; Default: true
 ;ENCRYPTED_PASSWD = false
 
+; Maximum length of page names.
+; Default: 100
+;MAX_PAGENAME_LENGTH = 100
+
 ; Visitor Hostname Lookup
 ;
 ; If set, reverse dns lookups will be performed to attempt to convert

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2022-02-01 08:45:44 UTC (rev 10965)
+++ trunk/configurator.php	2022-02-01 08:54:54 UTC (rev 10966)
@@ -531,6 +531,9 @@
         array('true' => "true.  use crypt for all passwords",
             'false' => "false. use plaintest passwords (not recommended)"));
 
+$properties["MAX_PAGENAME_LENGTH"] =
+    new numeric_define_optional('MAX_PAGENAME_LENGTH');
+
 $properties["Reverse DNS"] =
     new boolean_define_optional
     ('ENABLE_REVERSE_DNS',

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2022-02-01 08:45:44 UTC (rev 10965)
+++ trunk/lib/stdlib.php	2022-02-01 08:54:54 UTC (rev 10966)
@@ -99,10 +99,6 @@
 if (defined('_PHPWIKI_STDLIB_LOADED')) return;
 else define('_PHPWIKI_STDLIB_LOADED', true);
 
-if (!defined('MAX_PAGENAME_LENGTH')) {
-    define('MAX_PAGENAME_LENGTH', 100);
-}
-
 /**
  * Convert string to a valid XML identifier.
  *

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10965] trunk/lib/Template.php

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

Revision: 10965
          http://sourceforge.net/p/phpwiki/code/10965
Author:   vargenau
Date:     2022-02-01 08:45:44 +0000 (Tue, 01 Feb 2022)
Log Message:
-----------
Avoid fatal error when errline=?

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

Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2022-01-31 18:50:36 UTC (rev 10964)
+++ trunk/lib/Template.php	2022-02-01 08:45:44 UTC (rev 10965)
@@ -212,18 +212,12 @@
         } else {
             $error->errfile .= " (In template '$this->_name')";
         }
-
-        if (!empty($this->_tmpl)) {
-            $lines = explode("\n", $this->_tmpl);
-            if (isset($lines[$error->errline - 1]))
-                $error->errstr .= ":\n\t" . $lines[$error->errline - 1];
-        }
         return $error;
     }
 }
 
 /**
- * Get a templates
+ * Get a template
  *
  * This is a convenience function and is equivalent to:
  * <pre>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10964] trunk/themes/Sidebar/templates/actionbar.tmpl

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

Revision: 10964
          http://sourceforge.net/p/phpwiki/code/10964
Author:   vargenau
Date:     2022-01-31 18:50:36 +0000 (Mon, 31 Jan 2022)
Log Message:
-----------
Use ActionButton for Wysiwyg Editor

Modified Paths:
--------------
    trunk/themes/Sidebar/templates/actionbar.tmpl

Modified: trunk/themes/Sidebar/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/actionbar.tmpl	2022-01-31 18:38:46 UTC (rev 10963)
+++ trunk/themes/Sidebar/templates/actionbar.tmpl	2022-01-31 18:50:36 UTC (rev 10964)
@@ -19,7 +19,7 @@
     <?php echo ActionButton("edit", $dbh->isWikiPage($page->getName()) ? ($revision->isCurrent() || $revision->hasDefaultContents() ? _("Edit") : _("Edit Old Version")) : _("Create Page"), false,
              array('id' => 'btn-edit', 'title' => "You can edit this page. Please use the preview button before saving.")) ?>
       <?php if (ENABLE_WYSIWYG) { ?>
-        <?php echo Button(array("action" => "edit", "mode"=> "wysiwyg"), _("Wysiwyg Editor"), false, array('id' => 'btn-wysiwyg-edit')) ?>
+        <?php echo ActionButton(array("action" => "edit", "mode"=> "wysiwyg"), _("Wysiwyg Editor"), false, array('id' => 'btn-wysiwyg-edit')) ?>
       <?php } ?>
     <?php } elseif ($page->exists()) { ?>
       <?php echo ActionButton("viewsource", _("View Source")) ?>

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

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

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

Revision: 10963
          http://sourceforge.net/p/phpwiki/code/10963
Author:   vargenau
Date:     2022-01-31 18:38:46 +0000 (Mon, 31 Jan 2022)
Log Message:
-----------
Update translations of PhpWikiDebug

Modified Paths:
--------------
    trunk/locale/fr/pgsrc/D%C3%A9bogageDePhpWiki
    trunk/locale/zh/pgsrc/PhpWikiDebug

Modified: trunk/locale/fr/pgsrc/D%C3%A9bogageDePhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/D%C3%A9bogageDePhpWiki	2022-01-31 15:36:34 UTC (rev 10962)
+++ trunk/locale/fr/pgsrc/D%C3%A9bogageDePhpWiki	2022-01-31 18:38:46 UTC (rev 10963)
@@ -1,4 +1,4 @@
-Date: Fri,  6 Aug 2021 17:30:51 +0000
+Date: Mon, 31 Jan 2022 19:37:53 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=D%C3%A9bogageDePhpWiki;
@@ -30,8 +30,8 @@
 
 == Suppression des pages au nom illégal dans la base de données du wiki ==
 
-Les pages dont le nom commence avec un séparateur de sous-page (habituellement
-un slash ##/##) ne sont pas autorisées. Elles sont parfois créées par un greffon
+Les pages dont le nom commence avec un séparateur de sous-page, un slash ##/##,
+ne sont pas autorisées. Elles sont parfois créées par un greffon
 mal écrit...
 
 Ce bouton effacera toutes les pages dont le nom est illégal, sans possibilité de récupération.

Modified: trunk/locale/zh/pgsrc/PhpWikiDebug
===================================================================
--- trunk/locale/zh/pgsrc/PhpWikiDebug	2022-01-31 15:36:34 UTC (rev 10962)
+++ trunk/locale/zh/pgsrc/PhpWikiDebug	2022-01-31 18:38:46 UTC (rev 10963)
@@ -1,4 +1,4 @@
-Date: Wed, 15 Dec 2021 16:41:34 +0000
+Date: Mon, 31 Jan 2022 19:37:53 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiDebug;
@@ -50,7 +50,7 @@
 == Rebuild Wiki Database ==
 
 This will retransform all pages and rebuild the Wiki database on consistency errors or parser updates.
-This can last several minutes, eat a lot of memory and possibly times out!!
+This can last several minutes, eat a lot of memory and possibly times out!
 
 <<WikiAdminUtils action=db-rebuild>>
 

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

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

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

Revision: 10962
          http://sourceforge.net/p/phpwiki/code/10962
Author:   vargenau
Date:     2022-01-31 15:36:34 +0000 (Mon, 31 Jan 2022)
Log Message:
-----------
subpage-separator *is* a slash

Modified Paths:
--------------
    trunk/pgsrc/PhpWikiDebug

Modified: trunk/pgsrc/PhpWikiDebug
===================================================================
--- trunk/pgsrc/PhpWikiDebug	2022-01-31 14:54:45 UTC (rev 10961)
+++ trunk/pgsrc/PhpWikiDebug	2022-01-31 15:36:34 UTC (rev 10962)
@@ -1,4 +1,4 @@
-Date: Wed, 15 Dec 2021 16:26:27 +0000
+Date: Mon, 31 Jan 2022 16:35:31 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiDebug;
@@ -23,7 +23,7 @@
 rendering since parsing of the wiki-text takes a fair amount of juice.
 
 Hitting this button will delete all cached transformed
-content. (Each pages content will be transformed and re-cached next
+content. (Each page content will be transformed and re-cached next
 time someone views it.)
 
 <<WikiAdminUtils action=purge-cache>>
@@ -30,9 +30,9 @@
 
 == Clean Wiki Database of Illegal Filenames ==
 
-Page names beginning with the subpage-separator, usually a slash
-(##/##), are not allowed. Sometimes though an errant plugin or something
-might create one....
+Page names beginning with the subpage-separator, a slash (##/##),
+are not allowed. Sometimes though an errant plugin or something
+might create one...
 
 This button will delete any pages with illegal page names, without possibility to restore.
 
@@ -54,7 +54,7 @@
 == Rebuild Wiki Database ==
 
 This will retransform all pages and rebuild the Wiki database on consistency errors or parser updates.
-This can last several minutes, eat a lot of memory and possibly times out!!
+This can last several minutes, eat a lot of memory and possibly times out!
 
 <<WikiAdminUtils action=db-rebuild>>
 

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

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

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

Revision: 10961
          http://sourceforge.net/p/phpwiki/code/10961
Author:   vargenau
Date:     2022-01-31 14:54:45 +0000 (Mon, 31 Jan 2022)
Log Message:
-----------
Removing http://joomlacode.org/gf/user/mat978/userwiki/

Modified Paths:
--------------
    trunk/locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki
    trunk/pgsrc/Help%2FWikisUsingPhpWiki

Modified: trunk/locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki	2022-01-31 14:51:43 UTC (rev 10960)
+++ trunk/locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki	2022-01-31 14:54:45 UTC (rev 10961)
@@ -1,4 +1,4 @@
-Date: Mon, 31 Jan 2022 15:49:43 +0000
+Date: Mon, 31 Jan 2022 15:54:19 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FWikisUtilisantPhpWiki
@@ -29,7 +29,6 @@
 | 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
 | https://kcpralumni.org/wiki/                                     | 1.6.0             | Sidebar
 | http://kqlives.sourceforge.net/                                  | 1.3.14            | kq (custom)
 | http://math.drhuang.com/wiki/Index.php/HomePage                  | 1.4.0RC1          | Sidebar

Modified: trunk/pgsrc/Help%2FWikisUsingPhpWiki
===================================================================
--- trunk/pgsrc/Help%2FWikisUsingPhpWiki	2022-01-31 14:51:43 UTC (rev 10960)
+++ trunk/pgsrc/Help%2FWikisUsingPhpWiki	2022-01-31 14:54:45 UTC (rev 10961)
@@ -1,4 +1,4 @@
-Date: Mon, 31 Jan 2022 15:49:43 +0000
+Date: Mon, 31 Jan 2022 15:54:19 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikisUsingPhpWiki
@@ -29,7 +29,6 @@
 | 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
 | https://kcpralumni.org/wiki/                                     | 1.6.0             | Sidebar
 | http://kqlives.sourceforge.net/                                  | 1.3.14            | kq (custom)
 | http://math.drhuang.com/wiki/Index.php/HomePage                  | 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:[10960] trunk

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

Revision: 10960
          http://sourceforge.net/p/phpwiki/code/10960
Author:   vargenau
Date:     2022-01-31 14:51:43 +0000 (Mon, 31 Jan 2022)
Log Message:
-----------
bh.hallikainen.org and kcpralumni.org/wiki/ are in https

Modified Paths:
--------------
    trunk/locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki
    trunk/pgsrc/Help%2FWikisUsingPhpWiki

Modified: trunk/locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki	2022-01-31 14:28:39 UTC (rev 10959)
+++ trunk/locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki	2022-01-31 14:51:43 UTC (rev 10960)
@@ -1,4 +1,4 @@
-Date: Mon, 31 Jan 2022 15:27:45 +0000
+Date: Mon, 31 Jan 2022 15:49:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FWikisUtilisantPhpWiki
@@ -10,7 +10,7 @@
 
 |= URL                                                             |= Version de ~PhpWiki |= Thème
 | http://alsach.at/phpwiki/                                        | 1.4.0RC1          | default
-| http://bh.hallikainen.org                                        | 1.6.0             | Sidebar
+| https://bh.hallikainen.org                                       | 1.6.0             | Sidebar
 | http://www.carnatic.com/karmasaya/
 | http://churchofvirus.org/wiki/                                   | 1.3.2-jeffs-hacks | Virus (custom)
 | http://crossfamily.me.uk/wiki/                                   | 1.2.7
@@ -30,7 +30,7 @@
 | 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.6.0             | Sidebar
+| https://kcpralumni.org/wiki/                                     | 1.6.0             | Sidebar
 | http://kqlives.sourceforge.net/                                  | 1.3.14            | kq (custom)
 | http://math.drhuang.com/wiki/Index.php/HomePage                  | 1.4.0RC1          | Sidebar
 | http://matthieuachard.free.fr/wiki/                              | 1.2.10

Modified: trunk/pgsrc/Help%2FWikisUsingPhpWiki
===================================================================
--- trunk/pgsrc/Help%2FWikisUsingPhpWiki	2022-01-31 14:28:39 UTC (rev 10959)
+++ trunk/pgsrc/Help%2FWikisUsingPhpWiki	2022-01-31 14:51:43 UTC (rev 10960)
@@ -1,4 +1,4 @@
-Date: Mon, 31 Jan 2022 15:27:45 +0000
+Date: Mon, 31 Jan 2022 15:49:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikisUsingPhpWiki
@@ -10,7 +10,7 @@
 
 |= URL                                                             |= ~PhpWiki release |= Theme
 | http://alsach.at/phpwiki/                                        | 1.4.0RC1          | default
-| http://bh.hallikainen.org                                        | 1.6.0             | Sidebar
+| https://bh.hallikainen.org                                       | 1.6.0             | Sidebar
 | http://www.carnatic.com/karmasaya/
 | http://churchofvirus.org/wiki/                                   | 1.3.2-jeffs-hacks | Virus (custom)
 | http://crossfamily.me.uk/wiki/                                   | 1.2.7
@@ -30,7 +30,7 @@
 | 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.6.0             | Sidebar
+| https://kcpralumni.org/wiki/                                     | 1.6.0             | Sidebar
 | http://kqlives.sourceforge.net/                                  | 1.3.14            | kq (custom)
 | http://math.drhuang.com/wiki/Index.php/HomePage                  | 1.4.0RC1          | Sidebar
 | http://matthieuachard.free.fr/wiki/                              | 1.2.10

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

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

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

Revision: 10959
          http://sourceforge.net/p/phpwiki/code/10959
Author:   vargenau
Date:     2022-01-31 14:28:39 +0000 (Mon, 31 Jan 2022)
Log Message:
-----------
https://dev.cmeerw.org has upgraded to 1.6.1

Modified Paths:
--------------
    trunk/locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki
    trunk/pgsrc/Help%2FWikisUsingPhpWiki

Modified: trunk/locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki	2022-01-28 11:33:19 UTC (rev 10958)
+++ trunk/locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki	2022-01-31 14:28:39 UTC (rev 10959)
@@ -1,4 +1,4 @@
-Date: Tue, 30 Nov 2021 13:29:00 +0000
+Date: Mon, 31 Jan 2022 15:27:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FWikisUtilisantPhpWiki
@@ -15,7 +15,7 @@
 | http://churchofvirus.org/wiki/                                   | 1.3.2-jeffs-hacks | Virus (custom)
 | http://crossfamily.me.uk/wiki/                                   | 1.2.7
 | http://www.dairiki.org/HammondWiki/                              | 1.3.5pre          | default
-| http://dev.cmeerw.org                                            | 1.6.0             | Sidebar
+| https://dev.cmeerw.org                                           | 1.6.1             | Sidebar
 | http://dkbush.com/zphpwiki/                                      | 1.3.14
 | http://drtedwilliams.net/kb/                                     | 1.3.14            | MacOSX
 | http://e38.org/phpwiki/                                          | 1.3.14
@@ -48,6 +48,7 @@
 | https://senseis.xmp.net
 | http://squibbett.vacationhomesonnantucket.com/wiki/              | 1.2.11
 | http://swimuu.org/cu2c2-board/
+| https://tdwg.napier.ac.uk                                        | 1.3.10            | default
 | 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

Modified: trunk/pgsrc/Help%2FWikisUsingPhpWiki
===================================================================
--- trunk/pgsrc/Help%2FWikisUsingPhpWiki	2022-01-28 11:33:19 UTC (rev 10958)
+++ trunk/pgsrc/Help%2FWikisUsingPhpWiki	2022-01-31 14:28:39 UTC (rev 10959)
@@ -1,4 +1,4 @@
-Date: Wed,  1 Dec 2021 11:53:21 +0000
+Date: Mon, 31 Jan 2022 15:27:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikisUsingPhpWiki
@@ -15,7 +15,7 @@
 | http://churchofvirus.org/wiki/                                   | 1.3.2-jeffs-hacks | Virus (custom)
 | http://crossfamily.me.uk/wiki/                                   | 1.2.7
 | http://www.dairiki.org/HammondWiki/                              | 1.3.5pre          | default
-| http://dev.cmeerw.org                                            | 1.6.0             | Sidebar
+| https://dev.cmeerw.org                                           | 1.6.1             | Sidebar
 | http://dkbush.com/zphpwiki/                                      | 1.3.14
 | http://drtedwilliams.net/kb/                                     | 1.3.14            | MacOSX
 | http://e38.org/phpwiki/                                          | 1.3.14

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

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

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

Revision: 10958
          http://sourceforge.net/p/phpwiki/code/10958
Author:   vargenau
Date:     2022-01-28 11:33:19 +0000 (Fri, 28 Jan 2022)
Log Message:
-----------
Do not display the message "Create it." at initialisation of wiki

Modified Paths:
--------------
    trunk/themes/Crao/templates/body.tmpl
    trunk/themes/MonoBook/templates/body.tmpl
    trunk/themes/Portland/templates/body.tmpl
    trunk/themes/Sidebar/templates/body.tmpl
    trunk/themes/Wordpress/templates/body.tmpl
    trunk/themes/blog/templates/body.tmpl
    trunk/themes/default/templates/body.tmpl
    trunk/themes/wikilens/templates/body.tmpl

Modified: trunk/themes/Crao/templates/body.tmpl
===================================================================
--- trunk/themes/Crao/templates/body.tmpl	2022-01-28 11:20:35 UTC (rev 10957)
+++ trunk/themes/Crao/templates/body.tmpl	2022-01-28 11:33:19 UTC (rev 10958)
@@ -39,7 +39,7 @@
             <?php if (!empty($redirected)) { ?>
               <p><?php echo $redirected ?></p>
             <?php } ?>
-      <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
+      <?php } elseif (($action != "loadfile") && ($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
            <p class="warning_msg">
            <?php echo _("This page does not exist.") ?>
            <?php echo Button('create', _("Create it."), $page)?>

Modified: trunk/themes/MonoBook/templates/body.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/body.tmpl	2022-01-28 11:20:35 UTC (rev 10957)
+++ trunk/themes/MonoBook/templates/body.tmpl	2022-01-28 11:33:19 UTC (rev 10958)
@@ -33,7 +33,7 @@
             <?php if (!empty($redirected)) { ?>
               <p><?php echo $redirected ?></p>
             <?php } ?>
-      <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
+      <?php } elseif (($action != "loadfile") && ($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
            <p class="warning_msg">
            <?php echo _("This page does not exist.") ?>
            <?php echo Button('create', _("Create it."), $page)?>

Modified: trunk/themes/Portland/templates/body.tmpl
===================================================================
--- trunk/themes/Portland/templates/body.tmpl	2022-01-28 11:20:35 UTC (rev 10957)
+++ trunk/themes/Portland/templates/body.tmpl	2022-01-28 11:33:19 UTC (rev 10958)
@@ -34,7 +34,7 @@
             <?php if (!empty($redirected)) { ?>
               <p><?php echo $redirected ?></p>
             <?php } ?>
-      <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
+      <?php } elseif (($action != "loadfile") && ($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
            <p class="warning_msg">
            <?php echo _("This page does not exist.") ?>
            <?php echo Button('create', _("Create it."), $page)?>

Modified: trunk/themes/Sidebar/templates/body.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/body.tmpl	2022-01-28 11:20:35 UTC (rev 10957)
+++ trunk/themes/Sidebar/templates/body.tmpl	2022-01-28 11:33:19 UTC (rev 10958)
@@ -31,7 +31,7 @@
             <?php if (!empty($redirected)) { ?>
               <p><?php echo $redirected ?></p>
             <?php } ?>
-      <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
+      <?php } elseif (($action != "loadfile") && ($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
            <p class="warning_msg">
            <?php echo _("This page does not exist.") ?>
            <?php echo Button('create', _("Create it."), $page)?>

Modified: trunk/themes/Wordpress/templates/body.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/body.tmpl	2022-01-28 11:20:35 UTC (rev 10957)
+++ trunk/themes/Wordpress/templates/body.tmpl	2022-01-28 11:33:19 UTC (rev 10958)
@@ -30,7 +30,7 @@
             <?php if (!empty($redirected)) { ?>
               <p><?php echo $redirected ?></p>
             <?php } ?>
-      <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
+      <?php } elseif (($action != "loadfile") && ($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
            <p class="warning_msg">
            <?php echo _("This page does not exist.") ?>
            <?php echo Button('create', _("Create it."), $page)?>

Modified: trunk/themes/blog/templates/body.tmpl
===================================================================
--- trunk/themes/blog/templates/body.tmpl	2022-01-28 11:20:35 UTC (rev 10957)
+++ trunk/themes/blog/templates/body.tmpl	2022-01-28 11:33:19 UTC (rev 10958)
@@ -31,7 +31,7 @@
             <?php if (!empty($redirected)) { ?>
               <p><?php echo $redirected ?></p>
             <?php } ?>
-      <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
+      <?php } elseif (($action != "loadfile") && ($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
            <p class="warning_msg">
            <?php echo _("This page does not exist.") ?>
            <?php echo Button('create', _("Create it."), $page)?>

Modified: trunk/themes/default/templates/body.tmpl
===================================================================
--- trunk/themes/default/templates/body.tmpl	2022-01-28 11:20:35 UTC (rev 10957)
+++ trunk/themes/default/templates/body.tmpl	2022-01-28 11:33:19 UTC (rev 10958)
@@ -32,7 +32,7 @@
             <?php if (!empty($redirected)) { ?>
               <p><?php echo $redirected ?></p>
             <?php } ?>
-      <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
+      <?php } elseif (($action != "loadfile") && ($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
            <p class="warning_msg">
            <?php echo _("This page does not exist.") ?>
            <?php echo Button('create', _("Create it."), $page)?>

Modified: trunk/themes/wikilens/templates/body.tmpl
===================================================================
--- trunk/themes/wikilens/templates/body.tmpl	2022-01-28 11:20:35 UTC (rev 10957)
+++ trunk/themes/wikilens/templates/body.tmpl	2022-01-28 11:33:19 UTC (rev 10958)
@@ -55,7 +55,7 @@
             <?php if (!empty($redirected)) { ?>
               <p><?php echo $redirected ?></p>
             <?php } ?>
-      <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
+      <?php } elseif (($action != "loadfile") && ($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
            <p class="warning_msg">
            <?php echo _("This page does not exist.") ?>
            <?php echo Button('create', _("Create it."), $page)?>

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

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

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

Revision: 10957
          http://sourceforge.net/p/phpwiki/code/10957
Author:   vargenau
Date:     2022-01-28 11:20:35 +0000 (Fri, 28 Jan 2022)
Log Message:
-----------
Do not display the message "Create it." after purge or remove

Modified Paths:
--------------
    trunk/themes/Crao/templates/body.tmpl
    trunk/themes/MonoBook/templates/body.tmpl
    trunk/themes/Portland/templates/body.tmpl
    trunk/themes/Sidebar/templates/body.tmpl
    trunk/themes/Wordpress/templates/body.tmpl
    trunk/themes/blog/templates/body.tmpl
    trunk/themes/default/templates/body.tmpl
    trunk/themes/wikilens/templates/body.tmpl

Modified: trunk/themes/Crao/templates/body.tmpl
===================================================================
--- trunk/themes/Crao/templates/body.tmpl	2022-01-27 18:37:46 UTC (rev 10956)
+++ trunk/themes/Crao/templates/body.tmpl	2022-01-28 11:20:35 UTC (rev 10957)
@@ -39,7 +39,7 @@
             <?php if (!empty($redirected)) { ?>
               <p><?php echo $redirected ?></p>
             <?php } ?>
-      <?php } elseif (($action != "create") && ($action != "edit")) { ?>
+      <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
            <p class="warning_msg">
            <?php echo _("This page does not exist.") ?>
            <?php echo Button('create', _("Create it."), $page)?>

Modified: trunk/themes/MonoBook/templates/body.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/body.tmpl	2022-01-27 18:37:46 UTC (rev 10956)
+++ trunk/themes/MonoBook/templates/body.tmpl	2022-01-28 11:20:35 UTC (rev 10957)
@@ -33,7 +33,7 @@
             <?php if (!empty($redirected)) { ?>
               <p><?php echo $redirected ?></p>
             <?php } ?>
-      <?php } elseif (($action != "create") && ($action != "edit")) { ?>
+      <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
            <p class="warning_msg">
            <?php echo _("This page does not exist.") ?>
            <?php echo Button('create', _("Create it."), $page)?>

Modified: trunk/themes/Portland/templates/body.tmpl
===================================================================
--- trunk/themes/Portland/templates/body.tmpl	2022-01-27 18:37:46 UTC (rev 10956)
+++ trunk/themes/Portland/templates/body.tmpl	2022-01-28 11:20:35 UTC (rev 10957)
@@ -34,7 +34,7 @@
             <?php if (!empty($redirected)) { ?>
               <p><?php echo $redirected ?></p>
             <?php } ?>
-      <?php } elseif (($action != "create") && ($action != "edit")) { ?>
+      <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
            <p class="warning_msg">
            <?php echo _("This page does not exist.") ?>
            <?php echo Button('create', _("Create it."), $page)?>

Modified: trunk/themes/Sidebar/templates/body.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/body.tmpl	2022-01-27 18:37:46 UTC (rev 10956)
+++ trunk/themes/Sidebar/templates/body.tmpl	2022-01-28 11:20:35 UTC (rev 10957)
@@ -31,7 +31,7 @@
             <?php if (!empty($redirected)) { ?>
               <p><?php echo $redirected ?></p>
             <?php } ?>
-      <?php } elseif (($action != "create") && ($action != "edit")) { ?>
+      <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
            <p class="warning_msg">
            <?php echo _("This page does not exist.") ?>
            <?php echo Button('create', _("Create it."), $page)?>

Modified: trunk/themes/Wordpress/templates/body.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/body.tmpl	2022-01-27 18:37:46 UTC (rev 10956)
+++ trunk/themes/Wordpress/templates/body.tmpl	2022-01-28 11:20:35 UTC (rev 10957)
@@ -30,7 +30,7 @@
             <?php if (!empty($redirected)) { ?>
               <p><?php echo $redirected ?></p>
             <?php } ?>
-      <?php } elseif (($action != "create") && ($action != "edit")) { ?>
+      <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
            <p class="warning_msg">
            <?php echo _("This page does not exist.") ?>
            <?php echo Button('create', _("Create it."), $page)?>

Modified: trunk/themes/blog/templates/body.tmpl
===================================================================
--- trunk/themes/blog/templates/body.tmpl	2022-01-27 18:37:46 UTC (rev 10956)
+++ trunk/themes/blog/templates/body.tmpl	2022-01-28 11:20:35 UTC (rev 10957)
@@ -31,7 +31,7 @@
             <?php if (!empty($redirected)) { ?>
               <p><?php echo $redirected ?></p>
             <?php } ?>
-      <?php } elseif (($action != "create") && ($action != "edit")) { ?>
+      <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
            <p class="warning_msg">
            <?php echo _("This page does not exist.") ?>
            <?php echo Button('create', _("Create it."), $page)?>

Modified: trunk/themes/default/templates/body.tmpl
===================================================================
--- trunk/themes/default/templates/body.tmpl	2022-01-27 18:37:46 UTC (rev 10956)
+++ trunk/themes/default/templates/body.tmpl	2022-01-28 11:20:35 UTC (rev 10957)
@@ -32,7 +32,7 @@
             <?php if (!empty($redirected)) { ?>
               <p><?php echo $redirected ?></p>
             <?php } ?>
-      <?php } elseif (($action != "create") && ($action != "edit")) { ?>
+      <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
            <p class="warning_msg">
            <?php echo _("This page does not exist.") ?>
            <?php echo Button('create', _("Create it."), $page)?>

Modified: trunk/themes/wikilens/templates/body.tmpl
===================================================================
--- trunk/themes/wikilens/templates/body.tmpl	2022-01-27 18:37:46 UTC (rev 10956)
+++ trunk/themes/wikilens/templates/body.tmpl	2022-01-28 11:20:35 UTC (rev 10957)
@@ -55,7 +55,7 @@
             <?php if (!empty($redirected)) { ?>
               <p><?php echo $redirected ?></p>
             <?php } ?>
-      <?php } elseif (($action != "create") && ($action != "edit")) { ?>
+      <?php } elseif (($action != "create") && ($action != "edit") && ($action != "purge") && ($action != "remove")) { ?>
            <p class="warning_msg">
            <?php echo _("This page does not exist.") ?>
            <?php echo Button('create', _("Create it."), $page)?>

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

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

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

Revision: 10956
          http://sourceforge.net/p/phpwiki/code/10956
Author:   vargenau
Date:     2022-01-27 18:37:46 +0000 (Thu, 27 Jan 2022)
Log Message:
-----------
pgsrc/ReleaseNotes: prepare for PhpWiki 1.6.2

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

Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio	2022-01-27 18:35:16 UTC (rev 10955)
+++ trunk/locale/it/pgsrc/NoteDiRilascio	2022-01-27 18:37:46 UTC (rev 10956)
@@ -1,4 +1,4 @@
-Date: Mon, 24 Jan 2022 18:48:13 +0000
+Date: Thu, 27 Jan 2022 19:37:10 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=NoteDiRilascio;
@@ -8,6 +8,11 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
 
+== 1.6.2 2022-XX-XX Marc-Etienne Vargenau ==
+
+=== Fixes ===
+* Make renaming of pages work in PDO and file.
+
 == 1.6.1 2022-01-24 Marc-Etienne Vargenau ==
 
 This release makes ~PhpWiki compatible with PHP 8.1.

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2022-01-27 18:35:16 UTC (rev 10955)
+++ trunk/pgsrc/ReleaseNotes	2022-01-27 18:37:46 UTC (rev 10956)
@@ -1,4 +1,4 @@
-Date: Mon, 24 Jan 2022 18:48:13 +0000
+Date: Thu, 27 Jan 2022 19:37:10 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.1)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -8,6 +8,11 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
 
+== 1.6.2 2022-XX-XX Marc-Etienne Vargenau ==
+
+=== Fixes ===
+* Make renaming of pages work in PDO and file.
+
 == 1.6.1 2022-01-24 Marc-Etienne Vargenau ==
 
 This release makes ~PhpWiki compatible with PHP 8.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:[10955] trunk/lib/WikiDB/backend/file.php

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

Revision: 10955
          http://sourceforge.net/p/phpwiki/code/10955
Author:   vargenau
Date:     2022-01-27 18:35:16 +0000 (Thu, 27 Jan 2022)
Log Message:
-----------
Put renaming in history with "file"

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

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2022-01-27 15:12:17 UTC (rev 10954)
+++ trunk/lib/WikiDB/backend/file.php	2022-01-27 18:35:16 UTC (rev 10955)
@@ -416,6 +416,7 @@
 
     function rename_page($pagename, $to)
     {
+        global $request;
         $version = $this->_getLatestVersion($pagename);
         // rename page_data
         $filename = $this->_pagename2filename('page_data', $pagename);
@@ -433,6 +434,8 @@
         }
         $this->_setLatestVersion($pagename, 0);
         $this->_setLatestVersion($to, $version);
+        $this->update_pagedata($pagename, array('pagename' => $to));
+        $request->_dbi->_cache->invalidate_cache($to);
         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:[10954] trunk/lib/WikiDB/backend

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

Revision: 10954
          http://sourceforge.net/p/phpwiki/code/10954
Author:   vargenau
Date:     2022-01-27 15:12:17 +0000 (Thu, 27 Jan 2022)
Log Message:
-----------
Make renaming a page work with "file"

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	2022-01-27 15:05:43 UTC (rev 10953)
+++ trunk/lib/WikiDB/backend/file.php	2022-01-27 15:12:17 UTC (rev 10954)
@@ -50,7 +50,6 @@
 {
     public $data_dir;
     public $_dir_names;
-
     public $_page_data; // temporarily stores the pagedata (via _loadPageData)
     public $_page_version_data; // temporarily stores the versiondata (via _loadVersionData)
     public $_latest_versions; // temporarily stores the latest version-numbers (for every pagename)
@@ -86,7 +85,7 @@
 
     // *********************************************************************
     // common file load / save functions:
-    protected function _pagename2filename($type, $pagename, $version)
+    protected function _pagename2filename($type, $pagename, $version = 0)
     {
         if ($version == 0) {
             return $this->_dir_names[$type] . '/' . urlencode($pagename);
@@ -418,14 +417,22 @@
     function rename_page($pagename, $to)
     {
         $version = $this->_getLatestVersion($pagename);
-        foreach ($this->_dir_names as $type => $path) {
-            if (is_dir($path)) {
-                $filename = $this->_pagename2filename($type, $pagename, $version);
-                $new = $this->_pagename2filename($type, $to, $version);
-                @rename($filename, $new);
-            }
+        // rename page_data
+        $filename = $this->_pagename2filename('page_data', $pagename);
+        $new = $this->_pagename2filename('page_data', $to);
+        rename($filename, $new);
+        // rename links
+        $filename = $this->_pagename2filename('links', $pagename);
+        $new = $this->_pagename2filename('links', $to);
+        rename($filename, $new);
+        // rename ver_data
+        for ($i = 1; $i <= $version; $i++) {
+            $filename = $this->_pagename2filename('ver_data', $pagename, $i);
+            $new = $this->_pagename2filename('ver_data', $to, $i);
+            rename($filename, $new);
         }
-        $this->update_pagedata($pagename, array('pagename' => $to));
+        $this->_setLatestVersion($pagename, 0);
+        $this->_setLatestVersion($to, $version);
         return true;
     }
 
@@ -517,7 +524,6 @@
     {
         $data = $this->get_versiondata($pagename, $version, true);
         if (!$data) {
-            assert($data);
             return;
         }
         foreach ($newdata as $key => $val) {
@@ -570,7 +576,7 @@
             $links = $this->_loadPageLinks($key);
             foreach ($links as $key2 => $val2) {
                 if (is_array($val2) and isset($val2['linkto']) and ($val2['linkto'] == $pagename)) {
-                    array_push($out, $key);
+                    $out[] = $key;
                 }
             }
         }

Modified: trunk/lib/WikiDB/backend/flatfile.php
===================================================================
--- trunk/lib/WikiDB/backend/flatfile.php	2022-01-27 15:05:43 UTC (rev 10953)
+++ trunk/lib/WikiDB/backend/flatfile.php	2022-01-27 15:12:17 UTC (rev 10954)
@@ -42,7 +42,7 @@
     // *********************************************************************
     // common file load / save functions:
     // FilenameForPage is from loadsave.php
-    protected function _pagename2filename($type, $pagename, $version)
+    protected function _pagename2filename($type, $pagename, $version = 0)
     {
         $fpagename = FilenameForPage($pagename);
         if (strstr($fpagename, "/")) {
@@ -60,7 +60,7 @@
             }
         }
 
-        $filename = $this->_pagename2filename('page_data', $pagename, 0);
+        $filename = $this->_pagename2filename('page_data', $pagename);
         if (!file_exists($filename)) return NULL;
         if (!filesize($filename)) return array();
         if ($fd = @fopen($filename, "rb")) {

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

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

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

Revision: 10953
          http://sourceforge.net/p/phpwiki/code/10953
Author:   vargenau
Date:     2022-01-27 15:05:43 +0000 (Thu, 27 Jan 2022)
Log Message:
-----------
Add class properties

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

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2022-01-27 15:01:46 UTC (rev 10952)
+++ trunk/lib/WikiDB/backend/PDO.php	2022-01-27 15:05:43 UTC (rev 10953)
@@ -31,6 +31,14 @@
 class WikiDB_backend_PDO
     extends WikiDB_backend
 {
+    public $_dbparams;
+    public $_dsn;
+    public $_table_names;
+    public $page_tbl_field_list;
+    public $version_tbl_field_list;
+    public $_lock_count;
+    public $_current_lock;
+
     function __construct($dbparams)
     {
         $this->_dbparams = $dbparams;
@@ -941,7 +949,7 @@
      * This is only for already resolved wildcards:
      * " WHERE $page_tbl.pagename NOT IN ".$this->_sql_set(array('page1','page2'));
      */
-    function _sql_set(&$pagenames)
+    function _sql_set($pagenames)
     {
         $s = '(';
         foreach ($pagenames as $p) {
@@ -1313,11 +1321,9 @@
     {
         if ($limit) {
             list($offset, $count) = $this->limit($limit);
+            $limit = " LIMIT $count";
             if ($offset) {
-                $limit = " LIMIT $count";
                 trigger_error("unsupported OFFSET in SQL ignored", E_USER_WARNING);
-            } else {
-                $limit = " LIMIT $count";
             }
         } else {
             $limit = '';
@@ -1395,6 +1401,8 @@
 class WikiDB_backend_PDO_iter
     extends WikiDB_backend_PDO_generic_iter
 {
+    public $_backend;
+
     function next()
     {
         $result = &$this->_result;

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

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

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

Revision: 10952
          http://sourceforge.net/p/phpwiki/code/10952
Author:   vargenau
Date:     2022-01-27 15:01:46 +0000 (Thu, 27 Jan 2022)
Log Message:
-----------
Add class properties

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

Modified: trunk/lib/WikiDB/backend/dbaBase.php
===================================================================
--- trunk/lib/WikiDB/backend/dbaBase.php	2022-01-27 14:41:25 UTC (rev 10951)
+++ trunk/lib/WikiDB/backend/dbaBase.php	2022-01-27 15:01:46 UTC (rev 10952)
@@ -65,6 +65,11 @@
 class WikiDB_backend_dbaBase
     extends WikiDB_backend
 {
+    public $_db;
+    public $_linkdb;
+    public $_pagedb;
+    public $_dbdb;
+
     function __construct(&$dba)
     {
         $this->_db = &$dba;
@@ -380,7 +385,6 @@
         $count = 0;
         for ($page = $pagedb->firstkey(); $page !== false; $page = $pagedb->nextkey()) {
             if (!$page) {
-                assert(!empty($page));
                 continue;
             }
             if ($exclude and in_array($page, $exclude)) continue;
@@ -408,7 +412,6 @@
         }
         for ($page = $pagedb->firstkey(); $page !== false; $page = $pagedb->nextkey()) {
             if (!$page) {
-                assert(!empty($page));
                 continue;
             }
             if ($exclude and in_array($page, $exclude)) continue;
@@ -746,6 +749,8 @@
     extends WikiDB_backend_iterator
 {
     // fixed for linkrelations
+    public $_backend;
+
     function __construct($backend, $pages, $options = array())
     {
         $this->_backend = $backend;
@@ -803,6 +808,9 @@
 
 class WikiDB_backend_dbaBase_linktable
 {
+    public $found_relations;
+    public $_db;
+
     function __construct(&$dba)
     {
         $this->_db = &$dba;
@@ -826,7 +834,6 @@
                     $linksonly[] = array('pagename' => $link['linkto']);
                 }
             }
-            return $linksonly;
         } else {
             $links = $this->_get_links($reversed ? 'i' : 'o', $page);
             $linksonly = array();
@@ -836,8 +843,8 @@
                 } else
                     $linksonly[] = $link;
             }
-            return $linksonly;
         }
+        return $linksonly;
     }
 
     // fixed: relations ready
@@ -999,7 +1006,7 @@
         return $data ? unserialize($data) : array();
     }
 
-    function _set_links($which, $page, &$links)
+    function _set_links($which, $page, $links)
     {
         $key = $which . $page;
         if ($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:[10951] trunk/lib/WikiDB/backend/PDO_oci8.php

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

Revision: 10951
          http://sourceforge.net/p/phpwiki/code/10951
Author:   vargenau
Date:     2022-01-27 14:41:25 +0000 (Thu, 27 Jan 2022)
Log Message:
-----------
PDO::PARAM_FLOAT does not exist

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

Modified: trunk/lib/WikiDB/backend/PDO_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_oci8.php	2022-01-27 14:41:03 UTC (rev 10950)
+++ trunk/lib/WikiDB/backend/PDO_oci8.php	2022-01-27 14:41:25 UTC (rev 10951)
@@ -88,7 +88,7 @@
         $sth->bindParam(11, $entry->size, PDO::PARAM_INT);
         $sth->bindParam(12, $entry->referer, PDO::PARAM_STR, 255);
         $sth->bindParam(13, $entry->user_agent, PDO::PARAM_STR, 255);
-        $sth->bindParam(14, $entry->duration, PDO::PARAM_FLOAT);
+        $sth->bindParam(14, $entry->duration, PDO::PARAM_STR, 20);
         $sth->execute();
     }
 }

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

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

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

Revision: 10950
          http://sourceforge.net/p/phpwiki/code/10950
Author:   vargenau
Date:     2022-01-27 14:41:03 +0000 (Thu, 27 Jan 2022)
Log Message:
-----------
Add size for PDO::PARAM_STR

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

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2022-01-27 13:58:39 UTC (rev 10949)
+++ trunk/lib/WikiDB/backend/PDO.php	2022-01-27 14:41:03 UTC (rev 10950)
@@ -1348,7 +1348,7 @@
         $sth->bindParam(11, $entry->size, PDO::PARAM_INT);
         $sth->bindParam(12, $entry->referer, PDO::PARAM_STR, 255);
         $sth->bindParam(13, $entry->user_agent, PDO::PARAM_STR, 255);
-        $sth->bindParam(14, $entry->duration, PDO::PARAM_STR);
+        $sth->bindParam(14, $entry->duration, PDO::PARAM_STR, 20);
         $sth->execute();
     }
 }

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