phpwiki-checkins Mailing List for PhpWiki (Page 34)

Brought to you by: carstenklapp, dairiki, rurban, vargenau, wainstead

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

You can subscribe to this list here.

2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (43)	Nov (73)	Dec (10)
2001	Jan (34)	Feb (110)	Mar (24)	Apr (44)	May (37)	Jun (22)	Jul (20)	Aug (28)	Sep (50)	Oct (11)	Nov (132)	Dec (595)
2002	Jan (1099)	Feb (579)	Mar (63)	Apr	May	Jun	Jul	Aug (125)	Sep (101)	Oct (25)	Nov (34)	Dec (47)
2003	Jan (82)	Feb (182)	Mar (71)	Apr (3)	May (1)	Jun (3)	Jul	Aug	Sep (14)	Oct (6)	Nov (124)	Dec (68)
2004	Jan (64)	Feb (191)	Mar (199)	Apr (298)	May (252)	Jun (426)	Jul (134)	Aug (13)	Sep (96)	Oct (75)	Nov (232)	Dec (171)
2005	Jan (205)	Feb (165)	Mar (8)	Apr (74)	May (21)	Jun (19)	Jul (37)	Aug (69)	Sep (141)	Oct (118)	Nov (31)	Dec (7)
2006	Jan (5)	Feb (10)	Mar (35)	Apr (24)	May (34)	Jun (29)	Jul (5)	Aug (38)	Sep (30)	Oct (37)	Nov (30)	Dec (86)
2007	Jan (414)	Feb (40)	Mar (18)	Apr (10)	May (66)	Jun (60)	Jul (105)	Aug (55)	Sep (64)	Oct (7)	Nov (11)	Dec (5)
2008	Jan (26)	Feb (28)	Mar (79)	Apr (34)	May (61)	Jun (24)	Jul (29)	Aug (160)	Sep (62)	Oct (70)	Nov (32)	Dec (14)
2009	Jan (140)	Feb (135)	Mar (153)	Apr (53)	May (24)	Jun (138)	Jul (90)	Aug (46)	Sep (72)	Oct (84)	Nov (32)	Dec (4)
2010	Jan (13)	Feb (7)	Mar (14)	Apr (55)	May (89)	Jun (131)	Jul (41)	Aug (38)	Sep (42)	Oct (11)	Nov (27)	Dec (54)
2011	Jan (127)	Feb (16)	Mar (71)	Apr (52)	May (32)	Jun (31)	Jul (4)	Aug	Sep (45)	Oct (26)	Nov (36)	Dec (10)
2012	Jan (23)	Feb (6)	Mar (13)	Apr (18)	May (1)	Jun (4)	Jul (3)	Aug (12)	Sep (57)	Oct (96)	Nov (163)	Dec (124)
2013	Jan (11)	Feb (17)	Mar (7)	Apr (48)	May (15)	Jun (29)	Jul (12)	Aug	Sep (9)	Oct	Nov	Dec (3)
2014	Jan (4)	Feb (1)	Mar (2)	Apr (1)	May (8)	Jun (90)	Jul (104)	Aug (12)	Sep (81)	Oct (139)	Nov (111)	Dec (64)
2015	Jan (46)	Feb (74)	Mar (56)	Apr (61)	May (3)	Jun (7)	Jul (11)	Aug (5)	Sep (15)	Oct (1)	Nov (1)	Dec (15)
2016	Jan (25)	Feb (33)	Mar (24)	Apr (4)	May (24)	Jun (3)	Jul (75)	Aug	Sep (2)	Oct (38)	Nov (4)	Dec (18)
2017	Jan (8)	Feb (1)	Mar (1)	Apr	May (14)	Jun	Jul (5)	Aug (9)	Sep	Oct (23)	Nov	Dec
2018	Jan	Feb	Mar	Apr	May	Jun (2)	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar (9)	Apr (60)	May (1)	Jun	Jul (13)	Aug	Sep (11)	Oct	Nov	Dec
2020	Jan	Feb	Mar (15)	Apr (4)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (47)
2021	Jan (24)	Feb (33)	Mar (1)	Apr	May (1)	Jun (64)	Jul (71)	Aug (114)	Sep (82)	Oct (32)	Nov (76)	Dec (86)
2022	Jan (162)	Feb (41)	Mar (11)	Apr (9)	May	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov	Dec (7)
2023	Jan	Feb (1)	Mar (2)	Apr	May	Jun	Jul (25)	Aug	Sep	Oct	Nov (7)	Dec
2024	Jan (7)	Feb (3)	Mar (3)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2025	Jan	Feb (90)	Mar (19)	Apr	May (6)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 32 33 34 35 36 .. 538 > >> (Page 34 of 538)

[phpwiki-checkins] SF.net SVN: phpwiki:[10374] trunk/themes/alphatest.php

From: <var...@us...> - 2021-07-28 13:29:16

Revision: 10374
          http://sourceforge.net/p/phpwiki/code/10374
Author:   vargenau
Date:     2021-07-28 13:29:15 +0000 (Wed, 28 Jul 2021)
Log Message:
-----------
Add DOCTYPE, add language in <html>

Modified Paths:
--------------
    trunk/themes/alphatest.php

Modified: trunk/themes/alphatest.php
===================================================================
--- trunk/themes/alphatest.php	2021-07-28 13:27:43 UTC (rev 10373)
+++ trunk/themes/alphatest.php	2021-07-28 13:29:15 UTC (rev 10374)
@@ -1,5 +1,7 @@
-<html>
-<head><title>Alpha Channel Test</title>
+<!DOCTYPE html>
+<html xml:lang="en" lang="en">
+<head>
+<title>Alpha Channel Test</title>
     <script type="text/javascript"><!--
     var backgroundcolor = [];
     backgroundcolor[0] = '#ffffff';

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

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

From: <var...@us...> - 2021-07-28 13:27:45

Revision: 10373
          http://sourceforge.net/p/phpwiki/code/10373
Author:   vargenau
Date:     2021-07-28 13:27:43 +0000 (Wed, 28 Jul 2021)
Log Message:
-----------
Add language in <html>

Modified Paths:
--------------
    trunk/configurator.php
    trunk/lib/ErrorManager.php
    trunk/passencrypt.php
    trunk/themes/Crao/templates/htmldump.tmpl
    trunk/themes/Sidebar/templates/htmldump.tmpl
    trunk/themes/default/templates/htmldump.tmpl
    trunk/themes/default/templates/redirect.tmpl
    trunk/themes/default/toolbar.js

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-07-27 19:44:39 UTC (rev 10372)
+++ trunk/configurator.php	2021-07-28 13:27:43 UTC (rev 10373)
@@ -163,7 +163,7 @@
 
 ?>
 <!DOCTYPE html>
-<html>
+<html xml:lang="en" lang="en">
 <head>
     <meta charset="UTF-8" />
     <title>Configuration tool for PhpWiki <?php echo $config_file ?></title>

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2021-07-27 19:44:39 UTC (rev 10372)
+++ trunk/lib/ErrorManager.php	2021-07-28 13:27:43 UTC (rev 10373)
@@ -270,7 +270,7 @@
         if ($error->isFatal()) {
             $this->_noCacheHeaders();
             echo "<!DOCTYPE html>\n";
-            echo "<html>\n";
+            echo '<html xml:lang="en" lang="en">'."\n";
             echo "<head>\n";
             echo "<meta charset=\"UTF-8\" />\n";
             echo "<title>"._('Fatal PhpWiki Error')."</title>\n";

Modified: trunk/passencrypt.php
===================================================================
--- trunk/passencrypt.php	2021-07-27 19:44:39 UTC (rev 10372)
+++ trunk/passencrypt.php	2021-07-28 13:27:43 UTC (rev 10373)
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xml:lang="en" lang="en">
 <head>
     <meta charset="UTF-8" />
     <title>Password Encryption Tool</title>

Modified: trunk/themes/Crao/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Crao/templates/htmldump.tmpl	2021-07-27 19:44:39 UTC (rev 10372)
+++ trunk/themes/Crao/templates/htmldump.tmpl	2021-07-28 13:27:43 UTC (rev 10373)
@@ -5,6 +5,7 @@
  */
 ?>
 <!DOCTYPE html>
+<html xml:lang="en" lang="en">
 <head>
 <meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />

Modified: trunk/themes/Sidebar/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/htmldump.tmpl	2021-07-27 19:44:39 UTC (rev 10372)
+++ trunk/themes/Sidebar/templates/htmldump.tmpl	2021-07-28 13:27:43 UTC (rev 10373)
@@ -5,7 +5,7 @@
  */
 ?>
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />

Modified: trunk/themes/default/templates/htmldump.tmpl
===================================================================
--- trunk/themes/default/templates/htmldump.tmpl	2021-07-27 19:44:39 UTC (rev 10372)
+++ trunk/themes/default/templates/htmldump.tmpl	2021-07-28 13:27:43 UTC (rev 10373)
@@ -5,7 +5,7 @@
  */
 ?>
 <!DOCTYPE html>
-<html>
+<html xml:lang="en" lang="en">
 <head>
 <meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />

Modified: trunk/themes/default/templates/redirect.tmpl
===================================================================
--- trunk/themes/default/templates/redirect.tmpl	2021-07-27 19:44:39 UTC (rev 10372)
+++ trunk/themes/default/templates/redirect.tmpl	2021-07-28 13:27:43 UTC (rev 10373)
@@ -4,7 +4,7 @@
  */
 ?>
 <!DOCTYPE html>
-<html>
+<html xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <meta name="robots" content="noindex, nofollow" />

Modified: trunk/themes/default/toolbar.js
===================================================================
--- trunk/themes/default/toolbar.js	2021-07-27 19:44:39 UTC (rev 10372)
+++ trunk/themes/default/toolbar.js	2021-07-28 13:27:43 UTC (rev 10373)
@@ -25,7 +25,7 @@
        }
    };
   pullwin.window.document.writeln(doctype);
-  pullwin.window.document.writeln('<html>\n<head>\n<title>'+escapeQuotes(title)+'</title>');
+  pullwin.window.document.writeln('<html xml:lang="en" lang="en" >\n<head>\n<title>'+escapeQuotes(title)+'</title>');
   pullwin.window.document.writeln(cssfile);
   pullwin.window.document.writeln('</head>\n<body>');
   pullwin.window.document.writeln('<p>\nYou can double-click to insert.\n</p>');

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10372] trunk/lib/PageList.php

From: <var...@us...> - 2021-07-27 19:44:40

Revision: 10372
          http://sourceforge.net/p/phpwiki/code/10372
Author:   vargenau
Date:     2021-07-27 19:44:39 +0000 (Tue, 27 Jul 2021)
Log Message:
-----------
function pageCompare: do not pass arguments by reference

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

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2021-07-27 15:40:26 UTC (rev 10371)
+++ trunk/lib/PageList.php	2021-07-27 19:44:39 UTC (rev 10372)
@@ -1439,7 +1439,7 @@
     /**
      * Compare _PageList_Page objects.
      **/
-    private function pageCompare(&$a, &$b)
+    private function pageCompare($a, $b)
     {
         if (empty($this->_sortby) or count($this->_sortby) == 0) {
             // No columns to sort by

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10371] trunk/lib/plugin/WikiAdminRename.php

From: <var...@us...> - 2021-07-27 15:40:33

Revision: 10371
          http://sourceforge.net/p/phpwiki/code/10371
Author:   vargenau
Date:     2021-07-27 15:40:26 +0000 (Tue, 27 Jul 2021)
Log Message:
-----------
lib/plugin/WikiAdminRename.php: "to" field is readonly when confirming

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

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2021-07-27 14:34:44 UTC (rev 10370)
+++ trunk/lib/plugin/WikiAdminRename.php	2021-07-27 15:40:26 UTC (rev 10371)
@@ -150,7 +150,7 @@
             $header->pushContent(
                 HTML::p(HTML::strong(
                     _("Are you sure you want to rename the selected pages?"))));
-            $header = $this->renameForm($header, $post_args, $singlepage);
+            $header = $this->renameForm($header, $post_args, $singlepage, true);
         } else {
             if ($singlepage === true) {
                 $button_label = _("Rename Page");
@@ -293,7 +293,7 @@
         }
     }
 
-    private function renameForm(&$header, $post_args, $singlepage)
+    private function renameForm(&$header, $post_args, $singlepage, $confirm=false)
     {
         $table = HTML::table();
         if ($singlepage) {
@@ -310,11 +310,20 @@
                     'maxlength' => MAX_PAGENAME_LENGTH,
                     'value' => $post_args['from'])));
         }
-        $this->tablePush($table, _("to") . _(": "),
-            HTML::input(array('name' => 'admin_rename[to]',
-                'size' => MAX_PAGENAME_LENGTH,
-                'maxlength' => MAX_PAGENAME_LENGTH,
-                'value' => $post_args['to'])));
+        if ($confirm) {
+            $this->tablePush($table, _("to") . _(": "),
+                HTML::input(array('name' => 'admin_rename[to]',
+                    'size' => MAX_PAGENAME_LENGTH,
+                    'maxlength' => MAX_PAGENAME_LENGTH,
+                    'readonly' => 'readonly',
+                    'value' => $post_args['to'])));
+        } else {
+            $this->tablePush($table, _("to") . _(": "),
+                HTML::input(array('name' => 'admin_rename[to]',
+                    'size' => MAX_PAGENAME_LENGTH,
+                    'maxlength' => MAX_PAGENAME_LENGTH,
+                    'value' => $post_args['to'])));
+        }
         if ($singlepage === false) {
             $this->tablePush($table, '',
                 $this->checkBox($post_args, 'regex', _("Regex?")));

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10370] trunk/lib/plugin/WikiAdminRename.php

From: <var...@us...> - 2021-07-27 14:34:46

Revision: 10370
          http://sourceforge.net/p/phpwiki/code/10370
Author:   vargenau
Date:     2021-07-27 14:34:44 +0000 (Tue, 27 Jul 2021)
Log Message:
-----------
lib/plugin/WikiAdminRename.php: old name is readonly only when it is a single page

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

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2021-07-27 13:32:39 UTC (rev 10369)
+++ trunk/lib/plugin/WikiAdminRename.php	2021-07-27 14:34:44 UTC (rev 10370)
@@ -296,12 +296,20 @@
     private function renameForm(&$header, $post_args, $singlepage)
     {
         $table = HTML::table();
-        $this->tablePush($table, _("Rename") . " " . _("from") . _(": "),
-            HTML::input(array('name' => 'admin_rename[from]',
-                'size' => MAX_PAGENAME_LENGTH,
-                'maxlength' => MAX_PAGENAME_LENGTH,
-                'readonly' => 'readonly',
-                'value' => $post_args['from'])));
+        if ($singlepage) {
+            $this->tablePush($table, _("Rename") . " " . _("from") . _(": "),
+                HTML::input(array('name' => 'admin_rename[from]',
+                    'size' => MAX_PAGENAME_LENGTH,
+                    'maxlength' => MAX_PAGENAME_LENGTH,
+                    'readonly' => 'readonly',
+                    'value' => $post_args['from'])));
+        } else {
+            $this->tablePush($table, _("Rename") . " " . _("from") . _(": "),
+                HTML::input(array('name' => 'admin_rename[from]',
+                    'size' => MAX_PAGENAME_LENGTH,
+                    'maxlength' => MAX_PAGENAME_LENGTH,
+                    'value' => $post_args['from'])));
+        }
         $this->tablePush($table, _("to") . _(": "),
             HTML::input(array('name' => 'admin_rename[to]',
                 'size' => MAX_PAGENAME_LENGTH,

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

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

From: <var...@us...> - 2021-07-27 13:32:40

Revision: 10369
          http://sourceforge.net/p/phpwiki/code/10369
Author:   vargenau
Date:     2021-07-27 13:32:39 +0000 (Tue, 27 Jul 2021)
Log Message:
-----------
Add {}

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

Modified: trunk/lib/WikiDB/backend/flatfile.php
===================================================================
--- trunk/lib/WikiDB/backend/flatfile.php	2021-07-27 12:04:28 UTC (rev 10368)
+++ trunk/lib/WikiDB/backend/flatfile.php	2021-07-27 13:32:39 UTC (rev 10369)
@@ -118,7 +118,6 @@
     //   versiondata: _cached_html and the rest
     function _savePageData($pagename, $data)
     {
-
         $type = 'page_data';
         $version = 1;
         $filename = $this->_pagename2filename($type, $pagename, $version);
@@ -132,8 +131,9 @@
                 and is_array($cache->_pagedata_cache[$pagename])
             ) {
                 $cachedata = &$cache->_pagedata_cache[$pagename];
-                foreach ($data as $key => $val)
+                foreach ($data as $key => $val) {
                     $cachedata[$key] = $val;
+                }
             } else {
                 $cache->_pagedata_cache[$pagename] = $data;
             }
@@ -150,22 +150,26 @@
             $latestversion = $this->_getLatestVersion($pagename);
             if ($latestversion < $version) {
                 $oldversiondata = $this->_loadVersionData($pagename, $latestversion);
-                if ($oldversiondata)
+                if ($oldversiondata) {
                     $olddata['versiondata'] = array_merge($oldversiondata, $olddata['versiondata']);
+                }
             }
         }
         $data['pagedata'] = array_merge($olddata['pagedata'], $data['pagedata']);
         $data['versiondata'] = array_merge($olddata['versiondata'], $data['versiondata']);
-        if (empty($data['versiondata']['%content']))
+        if (empty($data['versiondata']['%content'])) {
             $data['versiondata']['%content'] = $olddata['content'];
+        }
         $current = new WikiDB_PageRevision($this->_wikidb, $pagename, $version, $data['versiondata']);
         unset ($data['versiondata']);
         foreach ($data as $k => $v) {
-            if ($k == 'pagedata')
+            if ($k == 'pagedata') {
                 $current->_data = array_merge($current->_data, $v);
-            elseif ($k == 'versiondata')
-                $current->_data = array_merge($current->_data, $v); else
+            } elseif ($k == 'versiondata') {
+                $current->_data = array_merge($current->_data, $v);
+            } else {
                 $current->_data[$k] = $v;
+            }
         }
         $this->_page_data = $current->_data;
         $pagedata = "Date: " . Rfc2822DateTime($current->get('mtime')) . "\r\n";

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

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

From: <var...@us...> - 2021-07-27 12:04:35

Revision: 10368
          http://sourceforge.net/p/phpwiki/code/10368
Author:   vargenau
Date:     2021-07-27 12:04:28 +0000 (Tue, 27 Jul 2021)
Log Message:
-----------
Add {}

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

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2021-07-27 12:03:13 UTC (rev 10367)
+++ trunk/lib/main.php	2021-07-27 12:04:28 UTC (rev 10368)
@@ -537,8 +537,9 @@
                 $this->finish();
                 return;
             }
-        } elseif ($require_level == WIKIAUTH_BOGO)
-            $msg = fmt("You must sign in to %s.", $what); elseif ($require_level == WIKIAUTH_USER) {
+        } elseif ($require_level == WIKIAUTH_BOGO) {
+            $msg = fmt("You must sign in to %s.", $what);
+        } elseif ($require_level == WIKIAUTH_USER) {
             // LoginForm should display the relevant messages...
             $msg = "";
             /*if (!ALLOW_ANON_USER)

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

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

From: <var...@us...> - 2021-07-27 12:03:15

Revision: 10367
          http://sourceforge.net/p/phpwiki/code/10367
Author:   vargenau
Date:     2021-07-27 12:03:13 +0000 (Tue, 27 Jul 2021)
Log Message:
-----------
Allow Help/WatchPagePlugin page to be displayed when not logged in

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

Modified: trunk/pgsrc/Help%2FWatchPagePlugin
===================================================================
--- trunk/pgsrc/Help%2FWatchPagePlugin	2021-07-27 11:03:03 UTC (rev 10366)
+++ trunk/pgsrc/Help%2FWatchPagePlugin	2021-07-27 12:03:13 UTC (rev 10367)
@@ -36,8 +36,6 @@
 <<WatchPage page=HomePage>>
 }}}
 
-<<WatchPage page=HomePage>>
-
 == Author ==
 * [[Help:Reini Urban|Reini Urban]]
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10366] trunk/lib/PageList.php

From: <var...@us...> - 2021-07-27 11:03:05

Revision: 10366
          http://sourceforge.net/p/phpwiki/code/10366
Author:   vargenau
Date:     2021-07-27 11:03:03 +0000 (Tue, 27 Jul 2021)
Log Message:
-----------
Add missing global $request

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

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2021-07-27 10:42:42 UTC (rev 10365)
+++ trunk/lib/PageList.php	2021-07-27 11:03:03 UTC (rev 10366)
@@ -1379,6 +1379,8 @@
      */
     public function _addColumn($column)
     {
+        global $request;
+
         if (isset($this->_columns_seen[$column]))
             return false; // Already have this one.
         if (!isset($this->_types[$column]))

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

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

From: <var...@us...> - 2021-07-27 10:42:44

Revision: 10365
          http://sourceforge.net/p/phpwiki/code/10365
Author:   vargenau
Date:     2021-07-27 10:42:42 +0000 (Tue, 27 Jul 2021)
Log Message:
-----------
Add spacing between buttons

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminChown.php
    trunk/lib/plugin/WikiAdminPurge.php
    trunk/lib/plugin/WikiAdminRemove.php
    trunk/lib/plugin/WikiAdminRename.php
    trunk/lib/plugin/WikiAdminSearchReplace.php
    trunk/lib/plugin/WikiAdminSelect.php
    trunk/lib/plugin/WikiAdminSetAcl.php
    trunk/lib/plugin/WikiAdminSetAclSimple.php
    trunk/lib/plugin/WikiAdminSetExternal.php
    trunk/lib/plugin/WikiAdminUtils.php

Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php	2021-07-26 09:15:12 UTC (rev 10364)
+++ trunk/lib/plugin/WikiAdminChown.php	2021-07-27 10:42:42 UTC (rev 10365)
@@ -180,7 +180,8 @@
             'size' => 40)));
 
         $buttons = HTML::p(Button('submit:admin_chown[chown]', $button_label, 'wikiadmin'),
-            Button('submit:admin_chown[cancel]', _("Cancel"), 'button'));
+                           HTML::raw("&nbsp;&nbsp;"),
+                           Button('submit:admin_chown[cancel]', _("Cancel"), 'button'));
         $header->pushContent($buttons);
 
         return HTML::form(array('action' => $request->getPostURL(),

Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php	2021-07-26 09:15:12 UTC (rev 10364)
+++ trunk/lib/plugin/WikiAdminPurge.php	2021-07-27 10:42:42 UTC (rev 10365)
@@ -162,7 +162,8 @@
         }
 
         $buttons = HTML::p(Button('submit:admin_purge[purge]', $button_label, 'wikiadmin'),
-            Button('submit:admin_purge[cancel]', _("Cancel"), 'button'));
+                           HTML::raw("&nbsp;&nbsp;"),
+                           Button('submit:admin_purge[cancel]', _("Cancel"), 'button'));
         $header->pushContent($buttons);
 
         return HTML::form(array('action' => $request->getPostURL(),

Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php	2021-07-26 09:15:12 UTC (rev 10364)
+++ trunk/lib/plugin/WikiAdminRemove.php	2021-07-27 10:42:42 UTC (rev 10365)
@@ -231,7 +231,8 @@
         }
 
         $buttons = HTML::p(Button('submit:admin_remove[remove]', $button_label, 'wikiadmin'),
-            Button('submit:admin_remove[cancel]', _("Cancel"), 'button'));
+                           HTML::raw("&nbsp;&nbsp;"),
+                           Button('submit:admin_remove[cancel]', _("Cancel"), 'button'));
         $header->pushContent($buttons);
 
         // TODO: quick select by regex javascript?

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2021-07-26 09:15:12 UTC (rev 10364)
+++ trunk/lib/plugin/WikiAdminRename.php	2021-07-27 10:42:42 UTC (rev 10365)
@@ -167,9 +167,9 @@
             }
         }
 
-        $buttons = HTML::p
-        (Button('submit:admin_rename[rename]', $button_label, 'wikiadmin'),
-            Button('submit:admin_rename[cancel]', _("Cancel"), 'button'));
+        $buttons = HTML::p(Button('submit:admin_rename[rename]', $button_label, 'wikiadmin'),
+                           HTML::raw("&nbsp;&nbsp;"),
+                           Button('submit:admin_rename[cancel]', _("Cancel"), 'button'));
 
         if ($singlepage === false) {
             $list = $pagelist->getContent();

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2021-07-26 09:15:12 UTC (rev 10364)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2021-07-27 10:42:42 UTC (rev 10365)
@@ -142,7 +142,8 @@
         }
 
         $buttons = HTML::p(Button('submit:admin_replace[replace]', $button_label, 'wikiadmin'),
-            Button('submit:admin_replace[cancel]', _("Cancel"), 'button'));
+                           HTML::raw("&nbsp;&nbsp;"),
+                           Button('submit:admin_replace[cancel]', _("Cancel"), 'button'));
         $header->pushContent($buttons);
 
         $result->pushContent(HTML::form(array('action' => $request->getPostURL(),

Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php	2021-07-26 09:15:12 UTC (rev 10364)
+++ trunk/lib/plugin/WikiAdminSelect.php	2021-07-27 10:42:42 UTC (rev 10365)
@@ -163,9 +163,9 @@
             $form->pushContent(HTML::input(array('type' => 'hidden',
                 'name' => 'action',
                 'value' => 'verify')));
-            $form->pushContent(Button('submit:verify', _("Select pages"),
-                    'wikiadmin'),
-                Button('submit:cancel', _("Cancel"), 'button'));
+            $form->pushContent(Button('submit:verify', _("Select pages"), 'wikiadmin'),
+                               HTML::raw("&nbsp;&nbsp;"),
+                               Button('submit:cancel', _("Cancel"), 'button'));
         } else {
             global $WikiTheme;
             $form->pushContent(HTML::input(array('type' => 'hidden',

Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php	2021-07-26 09:15:12 UTC (rev 10364)
+++ trunk/lib/plugin/WikiAdminSetAcl.php	2021-07-27 10:42:42 UTC (rev 10365)
@@ -223,7 +223,8 @@
         }
 
         $buttons = HTML::p(Button('submit:admin_setacl[acl]', $button_label, 'wikiadmin'),
-            Button('submit:admin_setacl[cancel]', _("Cancel"), 'button'));
+                           HTML::raw("&nbsp;&nbsp;"),
+                           Button('submit:admin_setacl[cancel]', _("Cancel"), 'button'));
         $header->pushContent($buttons);
 
         return HTML::form(array('action' => $request->getPostURL(),

Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php	2021-07-26 09:15:12 UTC (rev 10364)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php	2021-07-27 10:42:42 UTC (rev 10365)
@@ -104,7 +104,8 @@
         $header->pushContent(HTML::legend(_("Select the pages where to change access rights")));
 
         $buttons = HTML::p(Button('submit:admin_setacl[aclliberal]', $button_label_liberal, 'wikiadmin'),
-            Button('submit:admin_setacl[aclrestricted]', $button_label_restrictive, 'wikiadmin'));
+                           HTML::raw("&nbsp;&nbsp;"),
+                           Button('submit:admin_setacl[aclrestricted]', $button_label_restrictive, 'wikiadmin'));
         $header->pushContent($buttons);
 
         return HTML::form(array('action' => $request->getPostURL(),

Modified: trunk/lib/plugin/WikiAdminSetExternal.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetExternal.php	2021-07-26 09:15:12 UTC (rev 10364)
+++ trunk/lib/plugin/WikiAdminSetExternal.php	2021-07-27 10:42:42 UTC (rev 10365)
@@ -138,7 +138,8 @@
         $header->pushContent(HTML::legend(_("Select the pages to set as external")));
 
         $buttons = HTML::p(Button('submit:admin_external[button]', $button_label, 'wikiadmin'),
-            Button('submit:admin_external[cancel]', _("Cancel"), 'button'));
+                           HTML::raw("&nbsp;&nbsp;"),
+                           Button('submit:admin_external[cancel]', _("Cancel"), 'button'));
         $header->pushContent($buttons);
 
         return HTML::form(array('action' => $request->getPostURL(),

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2021-07-26 09:15:12 UTC (rev 10364)
+++ trunk/lib/plugin/WikiAdminUtils.php	2021-07-27 10:42:42 UTC (rev 10365)
@@ -300,10 +300,9 @@
                 WIKIAUTH_ADMIN)),
                 HiddenInputs($request->getArgs()),
                 $pagelist->_generateTable(),
-                HTML::p(Button('submit:', _("Change Verification Status"),
-                        'wikiadmin'),
-                    HTML::raw('&nbsp;'),
-                    Button('cancel', _("Cancel")))
+                HTML::p(Button('submit:', _("Change Verification Status"), 'wikiadmin'),
+                        HTML::raw('&nbsp;&nbsp;'),
+                        Button('cancel', _("Cancel")))
             );
         }
     return HTML::raw('');

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

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

From: <var...@us...> - 2021-07-26 09:15:16

Revision: 10364
          http://sourceforge.net/p/phpwiki/code/10364
Author:   vargenau
Date:     2021-07-26 09:15:12 +0000 (Mon, 26 Jul 2021)
Log Message:
-----------
PHP Doc

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

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2021-07-26 08:22:17 UTC (rev 10363)
+++ trunk/lib/WikiDB.php	2021-07-26 09:15:12 UTC (rev 10364)
@@ -190,20 +190,8 @@
      */
     public function getPage($pagename)
     {
-        static $error_displayed = false;
         $pagename = (string)$pagename;
-        if ((int)DEBUG) {
-            if ($pagename === '') {
-                if ($error_displayed) return false;
-                $error_displayed = true;
-                if (function_exists("xdebug_get_function_stack"))
-                    var_dump(xdebug_get_function_stack());
-                trigger_error("empty pagename", E_USER_WARNING);
-                return false;
-            }
-        } else {
-            assert($pagename != '');
-        }
+        assert($pagename != '');
         return new WikiDB_Page($this, $pagename);
     }
 
@@ -463,7 +451,7 @@
      *        If false the result is faster in natural order.
      * @param string $limit Optional. Encoded as "$offset,$count".
      *         $offset defaults to 0.
-     * @return Iterator A generic iterator containing rows of
+     * @return WikiDB_backend_dumb_WantedPagesIter A generic iterator containing rows of
      *         (duplicate) pagename, wantedfrom.
      */
     public function wantedPages($exclude_from = '', $exclude = '', $sortby = '', $limit = '')
@@ -980,7 +968,7 @@
      *
      * @param array $links List of linkto=>pagename, relation=>pagename which this page links to (hash).
      *
-     * @return WikiDB_PageRevision Returns the new WikiDB_PageRevision object. If
+     * @return false|WikiDB_PageRevision Returns the new WikiDB_PageRevision object. If
      * $version was incorrect, returns false
      */
     public function createRevision($version, &$content, $metadata, $links)
@@ -1504,9 +1492,8 @@
     }
 
     /**
-     * @param int|object $version_or_pagerevision
-     * Takes either the version number (and int) or a WikiDB_PageRevision
-     * object.
+     * @param int|WikiDB_PageRevision $version_or_pagerevision
+     * Takes either the version number (an int) or a WikiDB_PageRevision object.
      * @return integer The version number.
      */
     private function _coerce_to_version($version_or_pagerevision)
@@ -1954,7 +1941,7 @@
     /**
      * Get next WikiDB_Page in sequence.
      *
-     * @return WikiDB_Page The next WikiDB_Page in the sequence.
+     * @return false|WikiDB_Page
      */
     public function next()
     {
@@ -2049,8 +2036,9 @@
     /**
      * Get next WikiDB_PageRevision in sequence.
      *
-     * @return WikiDB_PageRevision
+     * @return false|WikiDB_PageRevision
      * The next WikiDB_PageRevision in the sequence.
+     * Return false in case of error.
      */
     public function next()
     {
@@ -2325,7 +2313,6 @@
     // FIXME: ugly and wrong. may overwrite full cache with partial cache
     public function cache_data($data)
     {
-        ;
         //if (isset($data['pagedata']))
         //    $this->_pagedata_cache[$data['pagename']] = $data['pagedata'];
     }

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

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

From: <var...@us...> - 2021-07-26 08:22:20

Revision: 10363
          http://sourceforge.net/p/phpwiki/code/10363
Author:   vargenau
Date:     2021-07-26 08:22:17 +0000 (Mon, 26 Jul 2021)
Log Message:
-----------
lib/plugin/TeX2png.php: avoid warnings

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

Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php	2021-07-23 17:32:02 UTC (rev 10362)
+++ trunk/lib/plugin/TeX2png.php	2021-07-26 08:22:17 UTC (rev 10363)
@@ -70,12 +70,17 @@
         $defaults = array();
 
         while (preg_match("/^$opt_ws $argspec_p $opt_ws/x", $argstr, $m)) {
-            @ list(, $arg, $op, $qq_val, $q_val, $gt_val, $word_val) = $m;
+            $arg = $m[1];
+            $op = $m[2];
+            $qq_val = $m[3];
+            if (array_key_exists(4, $m)) $q_val = $m[4];
+            if (array_key_exists(5, $m)) $gt_val = $m[4];
+            if (array_key_exists(6, $m)) $word_val = $m[4];
             $argstr = substr($argstr, strlen($m[0]));
 
             // Remove quotes from string values.
             if ($qq_val)
-                // we don't remove backslashes in tex formulas
+                // We don't remove backslashes in TeX formulas
                 // $val = stripslashes($qq_val);
                 $val = $qq_val;
             elseif ($q_val)

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

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

From: <var...@us...> - 2021-07-23 17:32:03

Revision: 10362
          http://sourceforge.net/p/phpwiki/code/10362
Author:   vargenau
Date:     2021-07-23 17:32:02 +0000 (Fri, 23 Jul 2021)
Log Message:
-----------
function _coerce_to_version: check first if it is an integer

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

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2021-07-23 17:31:23 UTC (rev 10361)
+++ trunk/lib/WikiDB.php	2021-07-23 17:32:02 UTC (rev 10362)
@@ -1511,6 +1511,9 @@
      */
     private function _coerce_to_version($version_or_pagerevision)
     {
+        if (is_int($version_or_pagerevision)) {
+            return $version_or_pagerevision;
+        }
         if (method_exists($version_or_pagerevision, "getContent"))
             $version = $version_or_pagerevision->getVersion();
         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:[10361] trunk/lib/WikiUser/File.php

From: <var...@us...> - 2021-07-23 17:31:24

Revision: 10361
          http://sourceforge.net/p/phpwiki/code/10361
Author:   vargenau
Date:     2021-07-23 17:31:23 +0000 (Fri, 23 Jul 2021)
Log Message:
-----------
lib/WikiUser/File.php: do not create File_Passwd with empty file, do not return from constructor

Modified Paths:
--------------
    trunk/lib/WikiUser/File.php

Modified: trunk/lib/WikiUser/File.php
===================================================================
--- trunk/lib/WikiUser/File.php	2021-07-23 16:20:12 UTC (rev 10360)
+++ trunk/lib/WikiUser/File.php	2021-07-23 17:31:23 UTC (rev 10361)
@@ -50,11 +50,12 @@
         // same style as in main.php
         include_once(dirname(__FILE__) . "/../pear/File_Passwd.php");
         // "__PHP_Incomplete_Class"
-        if (!empty($file) or empty($this->_file) or !is_a($this->_file, "File_Passwd"))
+        if (empty($file)) {
+            return;
+        }
+        if (empty($this->_file) or !is_a($this->_file, "File_Passwd")) {
             $this->_file = new File_Passwd($file, false, $file . '.lock');
-        else
-            return false;
-        return $this;
+        }
     }
 
     function mayChangePass()
@@ -110,5 +111,4 @@
         }
         return false;
     }
-
 }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10360] trunk/themes/wikilens/wikilens.js

From: <var...@us...> - 2021-07-23 16:20:13

Revision: 10360
          http://sourceforge.net/p/phpwiki/code/10360
Author:   vargenau
Date:     2021-07-23 16:20:12 +0000 (Fri, 23 Jul 2021)
Log Message:
-----------
Update wikilens.js from Fusionforge

Modified Paths:
--------------
    trunk/themes/wikilens/wikilens.js

Modified: trunk/themes/wikilens/wikilens.js
===================================================================
--- trunk/themes/wikilens/wikilens.js	2021-07-23 15:22:08 UTC (rev 10359)
+++ trunk/themes/wikilens/wikilens.js	2021-07-23 16:20:12 UTC (rev 10360)
@@ -1,12 +1,32 @@
 // Wikilens Javascript functions.
 
+// Globals:
+
+var rating = new Array; var prediction = new Array;
+var avg = new Array; var numusers = new Array;
+var canRate = new Array;
+var msg_rating_votes = "Rating: %.1f (%d votes)";
+var msg_curr_rating = "Your current rating: ";
+var msg_curr_prediction = "Your current prediction: ";
+//var msg_chg_rating = "Change your rating from ";
+var msg_to = " to ";
+var msg_add_rating = "Add your rating: ";
+var msg_thanks = "Thanks!";
+var msg_rating_deleted = "Rating deleted!";
+
+var rateit_imgsrc = '/themes/wikilens/images/RateIt';
+var rateit_action = 'RateIt';
+var idTop = '';
+//
+
 function displayRating(imgId, imgPrefix, ratingvalue, pred, init) {
   var ratings = new Array('Not Rated','Awful','Very Poor','Poor','Below Average',
-			  'Average','Above Average','Good','Very Good','Excellent','Outstanding');
+    'Average','Above Average','Good','Very Good','Excellent','Outstanding');
   var cancel = imgId + imgPrefix + 'Cancel';
   var curr_rating = rating[imgId];
   var curr_pred = prediction[imgId];
   var title = '';
+  var imgSrc = rateit_imgsrc;
   if (init) { // re-initialize titles
     title = msg_curr_rating+curr_rating+' '+ratings[curr_rating*2];
     var linebreak = '. '; //&#xD or &#13 within IE only;
@@ -13,42 +33,115 @@
     if (pred) {
       title = title+' '+msg_curr_prediction+ curr_pred+' '+ratings[curr_pred*2];
     }
+	if (canRate[imgId]) {
+      if (curr_rating) {
+        document.getElementById(cancel).style.display = 'inline';
+      }
+      else {
+        document.getElementById(cancel).style.display = 'none';
+      }
+    }
   }
   for (var i=1; i<=10; i++) {
     var imgName = imgId + i;
-    var imgSrc = rateit_imgsrc;
     if (init) {
-      if (curr_rating) document[cancel].style.display = 'inline';
-      document[imgName].title = title;
+      //document[imgName].title = title;
       var j = i/2;
       if (ratingvalue > 0) {
         if (curr_rating) {
-	  document[imgName].onmouseout = function() { displayRating(imgId,imgPrefix,curr_rating,0,0) };
+          document.getElementById(imgName).onmouseout = function() { displayRating(imgId,imgPrefix,avg[imgId],0,0) };
         } else if (curr_pred) {
-	  document[imgName].onmouseout = function() { displayRating(imgId,imgPrefix,curr_pred,1,0) };
+          document.getElementById(imgName).onmouseout = function() { displayRating(imgId,imgPrefix,curr_pred,1,0) };
         }
-        if (curr_rating != ratingvalue) {
-          document[imgName].title = msg_chg_rating+curr_rating+' '+ratings[curr_rating*2]+msg_to+j+' '+ratings[i];
-	}
+        if (curr_rating != ratingvalue && typeof(msg_chg_rating) != "undefined") {
+          document.getElementById(imgName).title = msg_chg_rating+curr_rating+' '+ratings[curr_rating*2]+msg_to+j+' '+ratings[i];
+        }
       } else {
-	document[imgName].onmouseout = function() { displayRating(imgId,imgPrefix,0,0,0) };
-        document[imgName].title = msg_add_rating+j+' '+ratings[i];
+        document.getElementById(imgName).onmouseout = function() { displayRating(imgId,imgPrefix,avg[imgId],0,0) };
+        document.getElementById(imgName).title = msg_add_rating+j+' '+ratings[i];
       }
     }
     var imgType = 'N';
     if (pred) {
       if (init)
-        document[imgName].title = title+linebreak+msg_add_rating+ratings[i];
+        document.getElementById(imgName).title = title+linebreak+msg_add_rating+ratings[i];
       imgType = 'R';
     } else if (i<=(ratingvalue*2)) {
       imgType = 'O';
     }
-    document[imgName].src = imgSrc + imgPrefix + imgType + ((i%2) ? 'k1' : 'k0') + '.png';
+    document.getElementById(imgName).src = imgSrc + imgPrefix + imgType + ((i%2) ? 'k1' : 'k0') + '.png';
   }
 }
+
+function displayRating2(imgId, imgPrefix, ratingvalue, pred, init) {
+  var ratings = new Array('Not Rated','Awful','Very Poor','Poor','Below Average',
+    'Average','Above Average','Good','Very Good','Excellent','Outstanding');
+  var cancel = imgId + imgPrefix + 'Cancel';
+  var curr_rating = rating[imgId];
+  var curr_pred = prediction[imgId];
+  var title = '';
+  var imgSrc = rateit_imgsrc;
+  if (init) { // re-initialize titles
+    title = msg_curr_rating+curr_rating+' '+ratings[curr_rating*2];
+    var linebreak = '. '; //&#xD or &#13 within IE only;
+    if (pred) {
+      title = title+' '+msg_curr_prediction+ curr_pred+' '+ratings[curr_pred*2];
+    }
+	if (curr_rating) {
+      document.getElementById(cancel).style.display = 'inline';
+	}
+	else {
+      document.getElementById(cancel).style.display = 'none';
+	}
+  }
+  for (var i=1; i<=10; i++) {
+    var imgName = imgId + i;
+    if (init) {
+      //document[imgName].title = title;
+      var j = i/2;
+      if (ratingvalue > 0) {
+        if (curr_rating) {
+          document.getElementById(imgName).onmouseout = function() { displayRating(imgId,imgPrefix,avg[imgId],0,0) };
+        } else if (curr_pred) {
+          document.getElementById(imgName).onmouseout = function() { displayRating(imgId,imgPrefix,curr_pred,1,0) };
+        }
+        if (curr_rating != ratingvalue && typeof(msg_chg_rating) != "undefined") {
+          document.getElementById(imgName).title = msg_chg_rating+curr_rating+' '+ratings[curr_rating*2]+msg_to+j+' '+ratings[i];
+        }
+      } else {
+        document.getElementById(imgName).onmouseout = function() { displayRating(imgId,imgPrefix,avg[imgId],0,0) };
+        document.getElementById(imgName).title = msg_add_rating+j+' '+ratings[i];
+      }
+    }
+    var imgType = 'N';
+    if (pred) {
+      if (init)
+        document.getElementById(imgName).title = title+linebreak+msg_add_rating+ratings[i];
+      imgType = 'R';
+    } else {
+      if (ratingvalue <= curr_rating) {
+        if (i <= (ratingvalue * 2))
+          imgType = 'Rp';
+        else
+          if (i <= (curr_rating * 2))
+            imgType = 'R';
+      }
+      else {
+        if (i <= (curr_rating * 2))
+          imgType = 'Rp';
+        else
+          if (i <= (ratingvalue * 2))
+            imgType = 'Rm';
+      }
+    }
+    document.getElementById(imgName).src = imgSrc + imgPrefix + imgType + ((i%2) ? 'k1' : 'k0') + '.png';
+  }
+}
+
 function sprintfRating(s, num, count) {
-    var num1 = num.toString().replace(/\.(\d).*/, '.$1');
-    return s.replace(/\%.1f/, num1).replace(/\%d/, count);
+  var num1 = Math.round(num * 10) / 10;
+  if (count < 2) s = s.replace(/votes/, 'vote');
+  return s.replace(/\%.1f/, num1).replace(/\%d/, count);
 }
 function clickRating(imgPrefix,pagename,version,imgId,dimension,newrating) {
   var actionImg = imgId+'Action';
@@ -55,45 +148,50 @@
   var top = document.getElementById('rateit-widget-top');
   var nusers = numusers[imgId];
   var old_rating = rating[imgId];
+  var sum1 = avg[imgId] * nusers;
+  var new_avg;
   if (newrating == 'X') {
     deleteRating(actionImg,pagename,dimension);
-    displayRating(imgId,imgPrefix,0,0,1);
     if (top && nusers) {
-        var sum1 = avg[imgId] * nusers;
-        var new_avg;
-        if (nusers > 1)
-            new_avg = (sum1 - old_rating)  / (nusers-1);
-        else
-            new_avg = 0.0;
-        if (new_avg.toString() != "NaN") {
-            top.childNodes[0].innerHTML = sprintfRating(msg_rating_votes, new_avg, nusers-1);
-            avg[imgId] = new_avg;
-            numusers[imgId]--;
+      if (old_rating && old_rating > 0) {
+        if (nusers > 1) {
+          new_avg = (sum1 - old_rating) / (nusers - 1);
+          numusers[imgId]--;
         }
+        else {
+          new_avg = 0;
+          numusers[imgId] = 0;
+        }
+      }
+      if (new_avg.toString() != "NaN" && idTop == imgId) {
+        avg[imgId] = new_avg;
+        top.childNodes[0].innerHTML = sprintfRating(msg_rating_votes, new_avg, nusers-1);
+      }
     }
     rating[imgId] = 0;
+	displayRating2(imgId,imgPrefix,0,0,1);
   } else {
     submitRating(actionImg,pagename,version,dimension,newrating);
-    displayRating(imgId,imgPrefix,newrating,0,1);
     if (top && nusers) {
-        var new_avg;
-        var sum1 = avg[imgId] * nusers;
-        if (old_rating && (old_rating > 0)) {
-            new_avg = (sum1 + newrating - old_rating)  / nusers;
-        } else {
-            new_avg = (sum1 + newrating) / (nusers + 1);
-            avg[imgId] = new_avg;
-            numusers[imgId]++;
+      if (old_rating && (old_rating > 0)) {
+        new_avg = (sum1 + newrating - old_rating)  / nusers;
+      } else {
+        new_avg = (sum1 + newrating) / (nusers + 1);
+        numusers[imgId]++;
+      }
+      if (new_avg.toString() != "NaN" && idTop == imgId) {
+        avg[imgId] = new_avg;
+        if (newrating != rating[imgId]) {
+          top.childNodes[0].innerHTML = sprintfRating(msg_rating_votes, new_avg, numusers[imgId]);
         }
-        if ((rating != rating[imgId]) && (new_avg.toString() != "NaN")) {
-            top.childNodes[0].innerHTML = sprintfRating(msg_rating_votes, new_avg, numusers[imgId]);
-        }
-    } else if (top) {
-        top.childNodes[0].innerHTML = sprintfRating(msg_rating_votes, newrating, 1);
-        avg[imgId] = newrating;
-        numusers[imgId] = 1;
+      }
+    } else if (top && idTop == imgId) {
+      top.childNodes[0].innerHTML = sprintfRating(msg_rating_votes, newrating, 1);
+      avg[imgId] = newrating;
+      numusers[imgId] = 1;
     }
     rating[imgId] = newrating;
+    displayRating2(imgId,imgPrefix,newrating,0,1);
   }
 }
 function submitRating(actionImg,page,version,dimension,newrating) {
@@ -100,10 +198,9 @@
   //TODO: GET => PUT request
   // currently ratings are changed with side-effect, but GET should be side-effect free.
   var myRand = Math.round(Math.random()*(1000000));
-  var imgSrc = WikiURL(page) + 'version=' + version + '&action=' + rateit_action + '+&mode=add&rating=' + newrating + '&dimension=' + dimension + '&nocache=1&nopurge=1&rand=' + myRand;
-  //alert('submitRating("'+actionImg+'", "'+page+'", '+version+', '+dimension+', '+newrating+') => '+imgSrc);
-  document[actionImg].title = msg_thanks;
-  document[actionImg].src = imgSrc;
+  var imgSrc = WikiURL(page) + 'version=' + version + '&action=' + rateit_action + '&mode=add&rating=' + newrating + '&dimension=' + dimension + '&nocache=1&nopurge=1&rand=' + myRand;
+  document.getElementById(actionImg).title = msg_thanks;
+  document.getElementById(actionImg).src = imgSrc;
 }
 function deleteRating(actionImg, page, dimension) {
   //TODO: GET => DELETE request
@@ -110,7 +207,6 @@
   // currently ratings are changed with side-effect, but GET should be side-effect free.
   var myRand = Math.round(Math.random()*(1000000));
   var imgSrc = WikiURL(page) + 'action=' + rateit_action + '&mode=delete&dimension=' + dimension + '&nocache=1&nopurge=1&rand=' + myRand;
-  //alert('deleteRating("'+actionImg+'", "'+page+'", '+version+', '+dimension+')');
-  document[actionImg].title = msg_rating_deleted;
-  document[actionImg].src = imgSrc;
+  document.getElementById(actionImg).title = msg_rating_deleted;
+  document.getElementById(actionImg).src = imgSrc;
 }

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

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

From: <var...@us...> - 2021-07-23 15:22:10

Revision: 10359
          http://sourceforge.net/p/phpwiki/code/10359
Author:   vargenau
Date:     2021-07-23 15:22:08 +0000 (Fri, 23 Jul 2021)
Log Message:
-----------
config/config-dist.ini: add ENABLE_RATEIT

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

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2021-07-23 15:12:35 UTC (rev 10358)
+++ trunk/config/config-dist.ini	2021-07-23 15:22:08 UTC (rev 10359)
@@ -1217,10 +1217,11 @@
 ; http://www.cynistar.net/~apthorpe/code/babycart/babycart.html
 BABYCART_PATH = /usr/local/bin/babycart
 
-; wikilens RateIt widget
+; RateIt widget. Can be enabled in Sidebar theme.
+;ENABLE_RATEIT = true
 ; style of the stars: empty = yellow, red or red
-; RATEIT_IMGPREFIX =
-; RATEIT_IMGPREFIX = Star
+;RATEIT_IMGPREFIX =
+;RATEIT_IMGPREFIX = Star
 ;RATEIT_IMGPREFIX = BStar
 
 ; GraphViz plugin executable:

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10358] trunk/lib/Units.php

From: <var...@us...> - 2021-07-23 15:12:37

Revision: 10358
          http://sourceforge.net/p/phpwiki/code/10358
Author:   vargenau
Date:     2021-07-23 15:12:35 +0000 (Fri, 23 Jul 2021)
Log Message:
-----------
lib/Units.php: function _cmd is private

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

Modified: trunk/lib/Units.php
===================================================================
--- trunk/lib/Units.php	2021-07-16 11:25:04 UTC (rev 10357)
+++ trunk/lib/Units.php	2021-07-23 15:12:35 UTC (rev 10358)
@@ -130,7 +130,7 @@
         return '';
     }
 
-    function _cmd($args)
+    private function _cmd($args)
     {
         if ($this->errcode)
             return $args;

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

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

From: <var...@us...> - 2021-07-16 11:25:12

Revision: 10357
          http://sourceforge.net/p/phpwiki/code/10357
Author:   vargenau
Date:     2021-07-16 11:25:04 +0000 (Fri, 16 Jul 2021)
Log Message:
-----------
Regenerate transalations

Modified Paths:
--------------
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po

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

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2021-07-16 11:23:09 UTC (rev 10356)
+++ trunk/locale/po/de.po	2021-07-16 11:25:04 UTC (rev 10357)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-16 12:15+0200\n"
+"POT-Creation-Date: 2021-07-16 13:23+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2021-07-16 11:23:09 UTC (rev 10356)
+++ trunk/locale/po/es.po	2021-07-16 11:25:04 UTC (rev 10357)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-16 12:15+0200\n"
+"POT-Creation-Date: 2021-07-16 13:23+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2021-07-16 11:23:09 UTC (rev 10356)
+++ trunk/locale/po/fr.po	2021-07-16 11:25:04 UTC (rev 10357)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-16 12:15+0200\n"
+"POT-Creation-Date: 2021-07-16 13:23+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2021-07-16 11:23:09 UTC (rev 10356)
+++ trunk/locale/po/it.po	2021-07-16 11:25:04 UTC (rev 10357)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-16 12:15+0200\n"
+"POT-Creation-Date: 2021-07-16 13:23+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2021-07-16 11:23:09 UTC (rev 10356)
+++ trunk/locale/po/ja.po	2021-07-16 11:25:04 UTC (rev 10357)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-16 12:15+0200\n"
+"POT-Creation-Date: 2021-07-16 13:23+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2021-07-16 11:23:09 UTC (rev 10356)
+++ trunk/locale/po/nl.po	2021-07-16 11:25:04 UTC (rev 10357)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-16 12:15+0200\n"
+"POT-Creation-Date: 2021-07-16 13:23+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2021-07-16 11:23:09 UTC (rev 10356)
+++ trunk/locale/po/phpwiki.pot	2021-07-16 11:25:04 UTC (rev 10357)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-16 12:15+0200\n"
+"POT-Creation-Date: 2021-07-16 13:23+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2021-07-16 11:23:09 UTC (rev 10356)
+++ trunk/locale/po/sv.po	2021-07-16 11:25:04 UTC (rev 10357)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-16 12:15+0200\n"
+"POT-Creation-Date: 2021-07-16 13:23+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2021-07-16 11:23:09 UTC (rev 10356)
+++ trunk/locale/po/zh.po	2021-07-16 11:25:04 UTC (rev 10357)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-16 12:15+0200\n"
+"POT-Creation-Date: 2021-07-16 13:23+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"

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

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

From: <var...@us...> - 2021-07-16 11:23:16

Revision: 10356
          http://sourceforge.net/p/phpwiki/code/10356
Author:   vargenau
Date:     2021-07-16 11:23:09 +0000 (Fri, 16 Jul 2021)
Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/locale/po/fr.po
    trunk/locale/po/it.po

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2021-07-16 10:16:58 UTC (rev 10355)
+++ trunk/locale/po/fr.po	2021-07-16 11:23:09 UTC (rev 10356)
@@ -505,7 +505,7 @@
 #, php-format
 msgid "Page name “%s” cannot end with a slash."
 msgstr ""
-"Le nom de la page « %s » ne peut pas se terminer par une berre oblique."
+"Le nom de la page « %s » ne peut pas se terminer par une barre oblique."
 
 #, php-format
 msgid "Illegal character “%s” in page name."
@@ -3600,7 +3600,7 @@
 
 #, php-format
 msgid "Page name “%s” cannot begin with a slash."
-msgstr "Le nom de la page « %s » ne peut commencer par une berre oblique."
+msgstr "Le nom de la page « %s » ne peut commencer par une barre oblique."
 
 #, php-format
 msgid "Page “%s” already exists. Ignored."
@@ -5959,12 +5959,6 @@
 #~ msgstr ""
 #~ "Les sous-pages ne peuvent être créées quand la page mère n'existe pas."
 
-#~ msgid ""
-#~ "Subpages with ending space are not allowed as directory name on Windows."
-#~ msgstr ""
-#~ "Les sous-pages terminées par un blanc ne sont pas autorisées comme nom de "
-#~ "dossier sous Windows."
-
 #~ msgid "HowTo"
 #~ msgstr "CommentFaire"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2021-07-16 10:16:58 UTC (rev 10355)
+++ trunk/locale/po/it.po	2021-07-16 11:23:09 UTC (rev 10356)
@@ -5776,9 +5776,6 @@
 msgid "Edit this page"
 msgstr ""
 
-#~ msgid "CreatePage failed"
-#~ msgstr "CategoriaPagina"
-
 #~ msgid "GoodStyle"
 #~ msgstr "BuonStile"
 
@@ -5788,9 +5785,6 @@
 #~ msgid "Synopsis"
 #~ msgstr "Sommario"
 
-#~ msgid "Columns: %s."
-#~ msgstr "Caratteri: %s."
-
 #~ msgid "LiveSearch"
 #~ msgstr "RicercaLive"
 
@@ -5808,9 +5802,6 @@
 #~ msgid "Version %s"
 #~ msgstr "Versione %s"
 
-#~ msgid "Pagename(s): "
-#~ msgstr "Nome della Pagina(s)"
-
 #~ msgid "from %s"
 #~ msgstr "dalla %s"
 

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

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

From: <var...@us...> - 2021-07-16 10:17:01

Revision: 10355
          http://sourceforge.net/p/phpwiki/code/10355
Author:   vargenau
Date:     2021-07-16 10:16:58 +0000 (Fri, 16 Jul 2021)
Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

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

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

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

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

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

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2021-07-16 09:45:27 UTC (rev 10354)
+++ trunk/locale/po/de.po	2021-07-16 10:16:58 UTC (rev 10355)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-08 18:24+0100\n"
+"POT-Creation-Date: 2021-07-16 12:15+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -497,9 +497,13 @@
 msgstr ": "
 
 msgid "Page name too long"
-msgstr "Seite Name zu lang"
+msgstr "Seitename zu lang"
 
 #, php-format
+msgid "Page name “%s” cannot end with a slash."
+msgstr "Seitename »%s« darf nicht mit einem Schrägstrich enden."
+
+#, php-format
 msgid "Illegal character “%s” in page name."
 msgstr "Ungültiges Zeichen »%s« in Seitenname."
 
@@ -1198,6 +1202,10 @@
 msgid "A required argument “%s” is missing."
 msgstr "Erforderliches Argument »%s« fehlt."
 
+#, php-format
+msgid "Argument '%s' must be a boolean"
+msgstr ""
+
 msgid "Click to hide the comments"
 msgstr "Klicken um Kommentare zu verstecken"
 
@@ -1359,7 +1367,6 @@
 msgid "Atom Aggregator Plugin."
 msgstr ""
 
-#, php-format
 msgid ""
 "List all page revisions edited by one user with diff links, or show a "
 "PageHistory-like list of a single page for only one user."
@@ -1501,24 +1508,7 @@
 msgid "Cannot create page with empty name!"
 msgstr "Kann Seite mit leerem Namen nicht erzeugen"
 
-msgid "CreatePage failed"
-msgstr ""
-
 #, php-format
-msgid "Do you really want to create the page “%s”?"
-msgstr ""
-
-msgid "The new page you want to create will be a subpage."
-msgstr ""
-
-msgid "Subpages cannot be created unless the parent page exists."
-msgstr ""
-
-msgid ""
-"Subpages with ending space are not allowed as directory name on Windows."
-msgstr ""
-
-#, php-format
 msgid "%s already exists"
 msgstr "%s existiert bereits"
 
@@ -1569,10 +1559,6 @@
 msgstr "Debug-Informationen von %s."
 
 #, php-format
-msgid "Argument '%s' must be a boolean"
-msgstr ""
-
-#, php-format
 msgid "Querying backend directly for “%s”"
 msgstr "DB Debug Informationen von der Seite »%s«"
 
@@ -1584,7 +1570,6 @@
 msgid "<not displayed>"
 msgstr "<nicht angezeigt>"
 
-#, php-format
 msgid "Show Group Information."
 msgstr ""
 
@@ -3107,10 +3092,29 @@
 msgid "TeX imagepath not writable."
 msgstr "Keine Schreibrechte für das TeX Bildpath."
 
+#, php-format
+msgid "Not a mathematical expression: “%s”"
+msgstr ""
+
+#, php-format
+msgid "Cannot run %1s plugin, “%2s” does not exist"
+msgstr ""
+
+#, php-format
+msgid "“%s” must be a directory"
+msgstr ""
+
+#, php-format
+msgid "“%s” must be a writable"
+msgstr ""
+
 msgid "Sorry, this version of PHP cannot create PNG image files."
 msgstr ""
 "Das geht leider nicht. Diese PHP Version kann keine PNG Bilder erzeugen."
 
+msgid "See"
+msgstr "Siehe"
+
 msgid "Convert text into a PNG image using GD."
 msgstr "Text mit der GD Bibliothek in ein PNG Bild konvertieren."
 
@@ -3618,6 +3622,10 @@
 msgstr "Kein Ausgewählte. Seite Name zu lang."
 
 #, php-format
+msgid "Page name “%s” cannot begin with a slash."
+msgstr "Seitename »%s« darf nicht mit einem Schrägstrich beginnen."
+
+#, php-format
 msgid "Page “%s” already exists. Ignored."
 msgstr "Seite »%s« existiert bereits. Ignoriert."
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2021-07-16 09:45:27 UTC (rev 10354)
+++ trunk/locale/po/es.po	2021-07-16 10:16:58 UTC (rev 10355)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-08 18:24+0100\n"
+"POT-Creation-Date: 2021-07-16 12:15+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -493,6 +493,10 @@
 msgstr "La nombre de página demasiado de largo"
 
 #, php-format
+msgid "Page name “%s” cannot end with a slash."
+msgstr ""
+
+#, php-format
 msgid "Illegal character “%s” in page name."
 msgstr "Los carbones ilegales “%s” en el nombre de la página."
 
@@ -1178,6 +1182,10 @@
 msgid "A required argument “%s” is missing."
 msgstr ""
 
+#, php-format
+msgid "Argument '%s' must be a boolean"
+msgstr ""
+
 msgid "Click to hide the comments"
 msgstr ""
 
@@ -1335,7 +1343,6 @@
 msgid "Atom Aggregator Plugin."
 msgstr ""
 
-#, php-format
 msgid ""
 "List all page revisions edited by one user with diff links, or show a "
 "PageHistory-like list of a single page for only one user."
@@ -1472,24 +1479,7 @@
 msgid "Cannot create page with empty name!"
 msgstr "¡No se puede crear la página con el nombre de vacío!"
 
-msgid "CreatePage failed"
-msgstr ""
-
 #, php-format
-msgid "Do you really want to create the page “%s”?"
-msgstr ""
-
-msgid "The new page you want to create will be a subpage."
-msgstr ""
-
-msgid "Subpages cannot be created unless the parent page exists."
-msgstr ""
-
-msgid ""
-"Subpages with ending space are not allowed as directory name on Windows."
-msgstr ""
-
-#, php-format
 msgid "%s already exists"
 msgstr ""
 
@@ -1540,10 +1530,6 @@
 msgstr ""
 
 #, php-format
-msgid "Argument '%s' must be a boolean"
-msgstr ""
-
-#, php-format
 msgid "Querying backend directly for “%s”"
 msgstr ""
 
@@ -1554,7 +1540,6 @@
 msgid "<not displayed>"
 msgstr ""
 
-#, php-format
 msgid "Show Group Information."
 msgstr ""
 
@@ -3022,9 +3007,28 @@
 msgid "TeX imagepath not writable."
 msgstr ""
 
+#, php-format
+msgid "Not a mathematical expression: “%s”"
+msgstr ""
+
+#, php-format
+msgid "Cannot run %1s plugin, “%2s” does not exist"
+msgstr ""
+
+#, php-format
+msgid "“%s” must be a directory"
+msgstr ""
+
+#, php-format
+msgid "“%s” must be a writable"
+msgstr ""
+
 msgid "Sorry, this version of PHP cannot create PNG image files."
 msgstr ""
 
+msgid "See"
+msgstr ""
+
 msgid "Convert text into a PNG image using GD."
 msgstr ""
 
@@ -3515,6 +3519,10 @@
 msgstr "No se puede cambiar el nombre. La nombre de página demasiado de largo."
 
 #, php-format
+msgid "Page name “%s” cannot begin with a slash."
+msgstr ""
+
+#, php-format
 msgid "Page “%s” already exists. Ignored."
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2021-07-16 09:45:27 UTC (rev 10354)
+++ trunk/locale/po/fr.po	2021-07-16 10:16:58 UTC (rev 10355)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-08 18:24+0100\n"
+"POT-Creation-Date: 2021-07-16 12:15+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -503,6 +503,11 @@
 msgstr "Le nom de la page est trop long"
 
 #, php-format
+msgid "Page name “%s” cannot end with a slash."
+msgstr ""
+"Le nom de la page « %s » ne peut pas se terminer par une berre oblique."
+
+#, php-format
 msgid "Illegal character “%s” in page name."
 msgstr "Caractère « %s » interdit dans le nom de la page."
 
@@ -1190,6 +1195,10 @@
 msgid "A required argument “%s” is missing."
 msgstr "L'argument obligatoire « %s » manque."
 
+#, php-format
+msgid "Argument '%s' must be a boolean"
+msgstr "L'argument '%s' doit être un booléen"
+
 msgid "Click to hide the comments"
 msgstr "Cliquez pour masquer les commentaires"
 
@@ -1347,7 +1356,6 @@
 msgid "Atom Aggregator Plugin."
 msgstr "Greffon Atom."
 
-#, php-format
 msgid ""
 "List all page revisions edited by one user with diff links, or show a "
 "PageHistory-like list of a single page for only one user."
@@ -1492,26 +1500,7 @@
 msgid "Cannot create page with empty name!"
 msgstr "Impossible de créer une page avec un nom vide !"
 
-msgid "CreatePage failed"
-msgstr "La création de la page a échoué"
-
 #, php-format
-msgid "Do you really want to create the page “%s”?"
-msgstr "Voulez-vous réellement créer la page « %s » ?"
-
-msgid "The new page you want to create will be a subpage."
-msgstr "La nouvelle page qui vous voulez créer sera une sous-page."
-
-msgid "Subpages cannot be created unless the parent page exists."
-msgstr "Les sous-pages ne peuvent être créées quand la page mère n'existe pas."
-
-msgid ""
-"Subpages with ending space are not allowed as directory name on Windows."
-msgstr ""
-"Les sous-pages terminées par un blanc ne sont pas autorisées comme nom de "
-"dossier sous Windows."
-
-#, php-format
 msgid "%s already exists"
 msgstr "%s existe déjà"
 
@@ -1562,10 +1551,6 @@
 msgstr "Obtenir des informations de débogage pour %s."
 
 #, php-format
-msgid "Argument '%s' must be a boolean"
-msgstr "L'argument '%s' doit être un booléen"
-
-#, php-format
 msgid "Querying backend directly for “%s”"
 msgstr "Requête directe au backend pour « %s »"
 
@@ -1576,7 +1561,6 @@
 msgid "<not displayed>"
 msgstr "<non affiché>"
 
-#, php-format
 msgid "Show Group Information."
 msgstr "Information sur le groupe."
 
@@ -3079,10 +3063,29 @@
 msgid "TeX imagepath not writable."
 msgstr "Répertoire TeX non accessible en écriture."
 
+#, php-format
+msgid "Not a mathematical expression: “%s”"
+msgstr ""
+
+#, php-format
+msgid "Cannot run %1s plugin, “%2s” does not exist"
+msgstr "Impossible d'exécuter le greffon %1s, « %2s » n'existe pas."
+
+#, php-format
+msgid "“%s” must be a directory"
+msgstr "« %s » doit être un répertoire."
+
+#, php-format
+msgid "“%s” must be a writable"
+msgstr "« %s » doit être modifiable"
+
 msgid "Sorry, this version of PHP cannot create PNG image files."
 msgstr ""
 "Désolé, cette version de PHP ne peut pas créer des fichiers d'image PNG."
 
+msgid "See"
+msgstr "Voir"
+
 msgid "Convert text into a PNG image using GD."
 msgstr "Convertir le texte en une image PNG en utilisant GD."
 
@@ -3596,6 +3599,10 @@
 msgstr "Impossible de renommer. Le nouveau nom de la page est trop long."
 
 #, php-format
+msgid "Page name “%s” cannot begin with a slash."
+msgstr "Le nom de la page « %s » ne peut commencer par une berre oblique."
+
+#, php-format
 msgid "Page “%s” already exists. Ignored."
 msgstr "La page « %s » existe déjà. Ignorée."
 
@@ -5938,6 +5945,26 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid "CreatePage failed"
+#~ msgstr "La création de la page a échoué"
+
+#, php-format
+#~ msgid "Do you really want to create the page “%s”?"
+#~ msgstr "Voulez-vous réellement créer la page « %s » ?"
+
+#~ msgid "The new page you want to create will be a subpage."
+#~ msgstr "La nouvelle page qui vous voulez créer sera une sous-page."
+
+#~ msgid "Subpages cannot be created unless the parent page exists."
+#~ msgstr ""
+#~ "Les sous-pages ne peuvent être créées quand la page mère n'existe pas."
+
+#~ msgid ""
+#~ "Subpages with ending space are not allowed as directory name on Windows."
+#~ msgstr ""
+#~ "Les sous-pages terminées par un blanc ne sont pas autorisées comme nom de "
+#~ "dossier sous Windows."
+
 #~ msgid "HowTo"
 #~ msgstr "CommentFaire"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2021-07-16 09:45:27 UTC (rev 10354)
+++ trunk/locale/po/it.po	2021-07-16 10:16:58 UTC (rev 10355)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-08 18:24+0100\n"
+"POT-Creation-Date: 2021-07-16 12:15+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -483,6 +483,10 @@
 msgstr ""
 
 #, php-format
+msgid "Page name “%s” cannot end with a slash."
+msgstr ""
+
+#, php-format
 msgid "Illegal character “%s” in page name."
 msgstr ""
 
@@ -1161,6 +1165,10 @@
 msgid "A required argument “%s” is missing."
 msgstr ""
 
+#, php-format
+msgid "Argument '%s' must be a boolean"
+msgstr ""
+
 msgid "Click to hide the comments"
 msgstr ""
 
@@ -1318,7 +1326,6 @@
 msgid "Atom Aggregator Plugin."
 msgstr ""
 
-#, php-format
 msgid ""
 "List all page revisions edited by one user with diff links, or show a "
 "PageHistory-like list of a single page for only one user."
@@ -1455,24 +1462,7 @@
 msgid "Cannot create page with empty name!"
 msgstr ""
 
-msgid "CreatePage failed"
-msgstr "CategoriaPagina"
-
 #, php-format
-msgid "Do you really want to create the page “%s”?"
-msgstr ""
-
-msgid "The new page you want to create will be a subpage."
-msgstr ""
-
-msgid "Subpages cannot be created unless the parent page exists."
-msgstr ""
-
-msgid ""
-"Subpages with ending space are not allowed as directory name on Windows."
-msgstr ""
-
-#, php-format
 msgid "%s already exists"
 msgstr ""
 
@@ -1523,10 +1513,6 @@
 msgstr ""
 
 #, php-format
-msgid "Argument '%s' must be a boolean"
-msgstr ""
-
-#, php-format
 msgid "Querying backend directly for “%s”"
 msgstr ""
 
@@ -1537,7 +1523,6 @@
 msgid "<not displayed>"
 msgstr ""
 
-#, php-format
 msgid "Show Group Information."
 msgstr ""
 
@@ -2999,9 +2984,28 @@
 msgid "TeX imagepath not writable."
 msgstr ""
 
+#, php-format
+msgid "Not a mathematical expression: “%s”"
+msgstr ""
+
+#, php-format
+msgid "Cannot run %1s plugin, “%2s” does not exist"
+msgstr ""
+
+#, php-format
+msgid "“%s” must be a directory"
+msgstr ""
+
+#, php-format
+msgid "“%s” must be a writable"
+msgstr ""
+
 msgid "Sorry, this version of PHP cannot create PNG image files."
 msgstr ""
 
+msgid "See"
+msgstr ""
+
 msgid "Convert text into a PNG image using GD."
 msgstr ""
 
@@ -3492,6 +3496,10 @@
 msgstr ""
 
 #, php-format
+msgid "Page name “%s” cannot begin with a slash."
+msgstr ""
+
+#, php-format
 msgid "Page “%s” already exists. Ignored."
 msgstr ""
 
@@ -5768,6 +5776,9 @@
 msgid "Edit this page"
 msgstr ""
 
+#~ msgid "CreatePage failed"
+#~ msgstr "CategoriaPagina"
+
 #~ msgid "GoodStyle"
 #~ msgstr "BuonStile"
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2021-07-16 09:45:27 UTC (rev 10354)
+++ trunk/locale/po/ja.po	2021-07-16 10:16:58 UTC (rev 10355)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-08 18:24+0100\n"
+"POT-Creation-Date: 2021-07-16 12:15+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -471,6 +471,10 @@
 msgstr ""
 
 #, php-format
+msgid "Page name “%s” cannot end with a slash."
+msgstr ""
+
+#, php-format
 msgid "Illegal character “%s” in page name."
 msgstr ""
 
@@ -1147,6 +1151,10 @@
 msgid "A required argument “%s” is missing."
 msgstr ""
 
+#, php-format
+msgid "Argument '%s' must be a boolean"
+msgstr ""
+
 msgid "Click to hide the comments"
 msgstr ""
 
@@ -1304,7 +1312,6 @@
 msgid "Atom Aggregator Plugin."
 msgstr ""
 
-#, php-format
 msgid ""
 "List all page revisions edited by one user with diff links, or show a "
 "PageHistory-like list of a single page for only one user."
@@ -1441,24 +1448,7 @@
 msgid "Cannot create page with empty name!"
 msgstr ""
 
-msgid "CreatePage failed"
-msgstr ""
-
 #, php-format
-msgid "Do you really want to create the page “%s”?"
-msgstr ""
-
-msgid "The new page you want to create will be a subpage."
-msgstr ""
-
-msgid "Subpages cannot be created unless the parent page exists."
-msgstr ""
-
-msgid ""
-"Subpages with ending space are not allowed as directory name on Windows."
-msgstr ""
-
-#, php-format
 msgid "%s already exists"
 msgstr ""
 
@@ -1509,10 +1499,6 @@
 msgstr ""
 
 #, php-format
-msgid "Argument '%s' must be a boolean"
-msgstr ""
-
-#, php-format
 msgid "Querying backend directly for “%s”"
 msgstr ""
 
@@ -1523,7 +1509,6 @@
 msgid "<not displayed>"
 msgstr ""
 
-#, php-format
 msgid "Show Group Information."
 msgstr ""
 
@@ -2985,9 +2970,28 @@
 msgid "TeX imagepath not writable."
 msgstr ""
 
+#, php-format
+msgid "Not a mathematical expression: “%s”"
+msgstr ""
+
+#, php-format
+msgid "Cannot run %1s plugin, “%2s” does not exist"
+msgstr ""
+
+#, php-format
+msgid "“%s” must be a directory"
+msgstr ""
+
+#, php-format
+msgid "“%s” must be a writable"
+msgstr ""
+
 msgid "Sorry, this version of PHP cannot create PNG image files."
 msgstr ""
 
+msgid "See"
+msgstr "を参照"
+
 msgid "Convert text into a PNG image using GD."
 msgstr ""
 
@@ -3478,6 +3482,10 @@
 msgstr ""
 
 #, php-format
+msgid "Page name “%s” cannot begin with a slash."
+msgstr ""
+
+#, php-format
 msgid "Page “%s” already exists. Ignored."
 msgstr ""
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2021-07-16 09:45:27 UTC (rev 10354)
+++ trunk/locale/po/nl.po	2021-07-16 10:16:58 UTC (rev 10355)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-08 18:24+0100\n"
+"POT-Creation-Date: 2021-07-16 12:15+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -477,6 +477,10 @@
 msgstr ""
 
 #, php-format
+msgid "Page name “%s” cannot end with a slash."
+msgstr ""
+
+#, php-format
 msgid "Illegal character “%s” in page name."
 msgstr ""
 
@@ -1153,6 +1157,10 @@
 msgid "A required argument “%s” is missing."
 msgstr ""
 
+#, php-format
+msgid "Argument '%s' must be a boolean"
+msgstr ""
+
 msgid "Click to hide the comments"
 msgstr ""
 
@@ -1310,7 +1318,6 @@
 msgid "Atom Aggregator Plugin."
 msgstr ""
 
-#, php-format
 msgid ""
 "List all page revisions edited by one user with diff links, or show a "
 "PageHistory-like list of a single page for only one user."
@@ -1447,24 +1454,7 @@
 msgid "Cannot create page with empty name!"
 msgstr ""
 
-msgid "CreatePage failed"
-msgstr ""
-
 #, php-format
-msgid "Do you really want to create the page “%s”?"
-msgstr ""
-
-msgid "The new page you want to create will be a subpage."
-msgstr ""
-
-msgid "Subpages cannot be created unless the parent page exists."
-msgstr ""
-
-msgid ""
-"Subpages with ending space are not allowed as directory name on Windows."
-msgstr ""
-
-#, php-format
 msgid "%s already exists"
 msgstr ""
 
@@ -1515,10 +1505,6 @@
 msgstr ""
 
 #, php-format
-msgid "Argument '%s' must be a boolean"
-msgstr ""
-
-#, php-format
 msgid "Querying backend directly for “%s”"
 msgstr ""
 
@@ -1529,7 +1515,6 @@
 msgid "<not displayed>"
 msgstr ""
 
-#, php-format
 msgid "Show Group Information."
 msgstr ""
 
@@ -2991,9 +2976,28 @@
 msgid "TeX imagepath not writable."
 msgstr ""
 
+#, php-format
+msgid "Not a mathematical expression: “%s”"
+msgstr ""
+
+#, php-format
+msgid "Cannot run %1s plugin, “%2s” does not exist"
+msgstr ""
+
+#, php-format
+msgid "“%s” must be a directory"
+msgstr ""
+
+#, php-format
+msgid "“%s” must be a writable"
+msgstr ""
+
 msgid "Sorry, this version of PHP cannot create PNG image files."
 msgstr ""
 
+msgid "See"
+msgstr "Zie"
+
 msgid "Convert text into a PNG image using GD."
 msgstr ""
 
@@ -3484,6 +3488,10 @@
 msgstr ""
 
 #, php-format
+msgid "Page name “%s” cannot begin with a slash."
+msgstr ""
+
+#, php-format
 msgid "Page “%s” already exists. Ignored."
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2021-07-16 09:45:27 UTC (rev 10354)
+++ trunk/locale/po/phpwiki.pot	2021-07-16 10:16:58 UTC (rev 10355)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-08 18:24+0100\n"
+"POT-Creation-Date: 2021-07-16 12:15+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -471,6 +471,10 @@
 msgstr ""
 
 #, php-format
+msgid "Page name “%s” cannot end with a slash."
+msgstr ""
+
+#, php-format
 msgid "Illegal character “%s” in page name."
 msgstr ""
 
@@ -1147,6 +1151,10 @@
 msgid "A required argument “%s” is missing."
 msgstr ""
 
+#, php-format
+msgid "Argument '%s' must be a boolean"
+msgstr ""
+
 msgid "Click to hide the comments"
 msgstr ""
 
@@ -1304,7 +1312,6 @@
 msgid "Atom Aggregator Plugin."
 msgstr ""
 
-#, php-format
 msgid ""
 "List all page revisions edited by one user with diff links, or show a "
 "PageHistory-like list of a single page for only one user."
@@ -1441,24 +1448,7 @@
 msgid "Cannot create page with empty name!"
 msgstr ""
 
-msgid "CreatePage failed"
-msgstr ""
-
 #, php-format
-msgid "Do you really want to create the page “%s”?"
-msgstr ""
-
-msgid "The new page you want to create will be a subpage."
-msgstr ""
-
-msgid "Subpages cannot be created unless the parent page exists."
-msgstr ""
-
-msgid ""
-"Subpages with ending space are not allowed as directory name on Windows."
-msgstr ""
-
-#, php-format
 msgid "%s already exists"
 msgstr ""
 
@@ -1509,10 +1499,6 @@
 msgstr ""
 
 #, php-format
-msgid "Argument '%s' must be a boolean"
-msgstr ""
-
-#, php-format
 msgid "Querying backend directly for “%s”"
 msgstr ""
 
@@ -1523,7 +1509,6 @@
 msgid "<not displayed>"
 msgstr ""
 
-#, php-format
 msgid "Show Group Information."
 msgstr ""
 
@@ -2985,9 +2970,28 @@
 msgid "TeX imagepath not writable."
 msgstr ""
 
+#, php-format
+msgid "Not a mathematical expression: “%s”"
+msgstr ""
+
+#, php-format
+msgid "Cannot run %1s plugin, “%2s” does not exist"
+msgstr ""
+
+#, php-format
+msgid "“%s” must be a directory"
+msgstr ""
+
+#, php-format
+msgid "“%s” must be a writable"
+msgstr ""
+
 msgid "Sorry, this version of PHP cannot create PNG image files."
 msgstr ""
 
+msgid "See"
+msgstr ""
+
 msgid "Convert text into a PNG image using GD."
 msgstr ""
 
@@ -3478,6 +3482,10 @@
 msgstr ""
 
 #, php-format
+msgid "Page name “%s” cannot begin with a slash."
+msgstr ""
+
+#, php-format
 msgid "Page “%s” already exists. Ignored."
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2021-07-16 09:45:27 UTC (rev 10354)
+++ trunk/locale/po/sv.po	2021-07-16 10:16:58 UTC (rev 10355)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-08 18:24+0100\n"
+"POT-Creation-Date: 2021-07-16 12:15+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -472,6 +472,10 @@
 msgstr ""
 
 #, php-format
+msgid "Page name “%s” cannot end with a slash."
+msgstr ""
+
+#, php-format
 msgid "Illegal character “%s” in page name."
 msgstr ""
 
@@ -1148,6 +1152,10 @@
 msgid "A required argument “%s” is missing."
 msgstr ""
 
+#, php-format
+msgid "Argument '%s' must be a boolean"
+msgstr ""
+
 msgid "Click to hide the comments"
 msgstr ""
 
@@ -1305,7 +1313,6 @@
 msgid "Atom Aggregator Plugin."
 msgstr ""
 
-#, php-format
 msgid ""
 "List all page revisions edited by one user with diff links, or show a "
 "PageHistory-like list of a single page for only one user."
@@ -1442,24 +1449,7 @@
 msgid "Cannot create page with empty name!"
 msgstr ""
 
-msgid "CreatePage failed"
-msgstr ""
-
 #, php-format
-msgid "Do you really want to create the page “%s”?"
-msgstr ""
-
-msgid "The new page you want to create will be a subpage."
-msgstr ""
-
-msgid "Subpages cannot be created unless the parent page exists."
-msgstr ""
-
-msgid ""
-"Subpages with ending space are not allowed as directory name on Windows."
-msgstr ""
-
-#, php-format
 msgid "%s already exists"
 msgstr ""
 
@@ -1510,10 +1500,6 @@
 msgstr ""
 
 #, php-format
-msgid "Argument '%s' must be a boolean"
-msgstr ""
-
-#, php-format
 msgid "Querying backend directly for “%s”"
 msgstr ""
 
@@ -1524,7 +1510,6 @@
 msgid "<not displayed>"
 msgstr ""
 
-#, php-format
 msgid "Show Group Information."
 msgstr ""
 
@@ -2986,9 +2971,28 @@
 msgid "TeX imagepath not writable."
 msgstr ""
 
+#, php-format
+msgid "Not a mathematical expression: “%s”"
+msgstr ""
+
+#, php-format
+msgid "Cannot run %1s plugin, “%2s” does not exist"
+msgstr ""
+
+#, php-format
+msgid "“%s” must be a directory"
+msgstr ""
+
+#, php-format
+msgid "“%s” must be a writable"
+msgstr ""
+
 msgid "Sorry, this version of PHP cannot create PNG image files."
 msgstr ""
 
+msgid "See"
+msgstr ""
+
 msgid "Convert text into a PNG image using GD."
 msgstr ""
 
@@ -3479,6 +3483,10 @@
 msgstr ""
 
 #, php-format
+msgid "Page name “%s” cannot begin with a slash."
+msgstr ""
+
+#, php-format
 msgid "Page “%s” already exists. Ignored."
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2021-07-16 09:45:27 UTC (rev 10354)
+++ trunk/locale/po/zh.po	2021-07-16 10:16:58 UTC (rev 10355)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-08 18:24+0100\n"
+"POT-Creation-Date: 2021-07-16 12:15+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -474,6 +474,10 @@
 msgstr ""
 
 #, php-format
+msgid "Page name “%s” cannot end with a slash."
+msgstr ""
+
+#, php-format
 msgid "Illegal character “%s” in page name."
 msgstr ""
 
@@ -1150,6 +1154,10 @@
 msgid "A required argument “%s” is missing."
 msgstr "缺少引數 “%s”."
 
+#, php-format
+msgid "Argument '%s' must be a boolean"
+msgstr ""
+
 msgid "Click to hide the comments"
 msgstr ""
 
@@ -1307,7 +1315,6 @@
 msgid "Atom Aggregator Plugin."
 msgstr ""
 
-#, php-format
 msgid ""
 "List all page revisions edited by one user with diff links, or show a "
 "PageHistory-like list of a single page for only one user."
@@ -1446,24 +1453,7 @@
 msgid "Cannot create page with empty name!"
 msgstr ""
 
-msgid "CreatePage failed"
-msgstr ""
-
 #, php-format
-msgid "Do you really want to create the page “%s”?"
-msgstr ""
-
-msgid "The new page you want to create will be a subpage."
-msgstr ""
-
-msgid "Subpages cannot be created unless the parent page exists."
-msgstr ""
-
-msgid ""
-"Subpages with ending space are not allowed as directory name on Windows."
-msgstr ""
-
-#, php-format
 msgid "%s already exists"
 msgstr "%s 已經存在"
 
@@ -1514,10 +1504,6 @@
 msgstr "為 %s 取得除錯資訊."
 
 #, php-format
-msgid "Argument '%s' must be a boolean"
-msgstr ""
-
-#, php-format
 msgid "Querying backend directly for “%s”"
 msgstr "為 “%s” 直接查詢後台"
 
@@ -1528,7 +1514,6 @@
 msgid "<not displayed>"
 msgstr "<未能顯示>"
 
-#, php-format
 msgid "Show Group Information."
 msgstr ""
 
@@ -2996,9 +2981,28 @@
 msgid "TeX imagepath not writable."
 msgstr ""
 
+#, php-format
+msgid "Not a mathematical expression: “%s”"
+msgstr ""
+
+#, php-format
+msgid "Cannot run %1s plugin, “%2s” does not exist"
+msgstr ""
+
+#, php-format
+msgid "“%s” must be a directory"
+msgstr ""
+
+#, php-format
+msgid "“%s” must be a writable"
+msgstr ""
+
 msgid "Sorry, this version of PHP cannot create PNG image files."
 msgstr "抱歉, 這個版本的 PHP 無法建立 PNG 圖片檔."
 
+msgid "See"
+msgstr "參照"
+
 msgid "Convert text into a PNG image using GD."
 msgstr "使用 GD 轉換文字為 PNG 圖片."
 
@@ -3491,6 +3495,10 @@
 msgstr ""
 
 #, php-format
+msgid "Page name “%s” cannot begin with a slash."
+msgstr ""
+
+#, php-format
 msgid "Page “%s” already exists. Ignored."
 msgstr ""
 

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(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:[10354] trunk/lib/plugin/CreatePage.php

From: <var...@us...> - 2021-07-16 09:45:28

Revision: 10354
          http://sourceforge.net/p/phpwiki/code/10354
Author:   vargenau
Date:     2021-07-16 09:45:27 +0000 (Fri, 16 Jul 2021)
Log Message:
-----------
lib/plugin/CreatePage.php: remove undocumented argument verify

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

Modified: trunk/lib/plugin/CreatePage.php
===================================================================
--- trunk/lib/plugin/CreatePage.php	2021-07-16 09:21:32 UTC (rev 10353)
+++ trunk/lib/plugin/CreatePage.php	2021-07-16 09:45:27 UTC (rev 10354)
@@ -51,8 +51,7 @@
             'initial_content' => '',
             'template' => false,
             'vars' => false,
-            'overwrite' => false,
-            'verify' => false, // true or a pagename
+            'overwrite' => false
         );
     }
 
@@ -84,28 +83,6 @@
         if (strlen($s) > MAX_PAGENAME_LENGTH) {
             return $this->error(_("Page name too long"));
         }
-        // TODO: javascript warning if "/" in s
-        if ($verify) {
-            $head = _("CreatePage failed");
-            if ($dbi->isWikiPage($verify)) {
-                $msg = _("Do you really want to create the page “%s”?");
-            } else {
-                $msg = _("Do you really want to create the page “%s”?");
-            }
-            if (isSubPage($s)) {
-                if (!$dbi->isWikiPage(subPageSlice(0))) {
-                    $msg .= "\n" . _("The new page you want to create will be a subpage.")
-                        . "\n" . _("Subpages cannot be created unless the parent page exists.");
-                    return alert($head, $msg);
-                } else {
-                    $msg .= "\n" . _("The new page you want to create will be a subpage.");
-                }
-            }
-            if (strpos($s, " \/")) {
-                $msg .= "\n" . _("Subpages with ending space are not allowed as directory name on Windows.");
-                return alert($head, $msg);
-            }
-        }
 
         $param = array('action' => 'edit');
         if ($template and $dbi->isWikiPage($template)) {

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

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

From: <var...@us...> - 2021-07-16 09:21:34

Revision: 10353
          http://sourceforge.net/p/phpwiki/code/10353
Author:   vargenau
Date:     2021-07-16 09:21:32 +0000 (Fri, 16 Jul 2021)
Log Message:
-----------
pgsrc/Help%2FSemanticRelations: add brackets

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

Modified: trunk/pgsrc/Help%2FSemanticRelations
===================================================================
--- trunk/pgsrc/Help%2FSemanticRelations	2021-07-16 09:20:42 UTC (rev 10352)
+++ trunk/pgsrc/Help%2FSemanticRelations	2021-07-16 09:21:32 UTC (rev 10353)
@@ -1,4 +1,4 @@
-Date: Thu, 15 Jul 2021 21:11:02 +0000
+Date: Fri, 16 Jul 2021 11:14:49 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FSemanticRelations;
@@ -45,7 +45,7 @@
 
 == Example ==
 
-//Sample taken from http://wiki.ontoworld.org/index.php/San_Diego //
+//Sample taken from [[http://wiki.ontoworld.org/index.php/San_Diego]]//
 
 {{{
 San Diego [[is_a::city]] located in the southwestern corner of

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

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

From: <var...@us...> - 2021-07-16 09:20:45

Revision: 10352
          http://sourceforge.net/p/phpwiki/code/10352
Author:   vargenau
Date:     2021-07-16 09:20:42 +0000 (Fri, 16 Jul 2021)
Log Message:
-----------
pgsrc/ReleaseNotes: escape ":"

Modified Paths:
--------------
    trunk/pgsrc/ReleaseNotes

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2021-07-15 19:34:42 UTC (rev 10351)
+++ trunk/pgsrc/ReleaseNotes	2021-07-16 09:20:42 UTC (rev 10352)
@@ -178,7 +178,7 @@
 * fix Bug#1752172 undefined method {{{TextSearchQuery_node_or::_sql_quote()}}}
 * dba: fix sorting for empty mtime field
 * ~LdapSearch: fix layout and logic
-* ~FileInfo: fix Upload: links
+* ~FileInfo: fix ##Upload~:## links
 * XHTML validation corrections (vargenau)
 * avoid recursive modification when renaming a page like '~PageFoo to '~PageFooTwo' (vargenau)
 * fix Bug#1808002 Table of contents plugin does not nest numbering (vargenau)

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

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

From: <var...@us...> - 2021-07-15 19:34:49

Revision: 10351
          http://sourceforge.net/p/phpwiki/code/10351
Author:   vargenau
Date:     2021-07-15 19:34:42 +0000 (Thu, 15 Jul 2021)
Log Message:
-----------
pgsrc/Help%2FSemanticRelations: wikicreole syntax

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

Modified: trunk/pgsrc/Help%2FSemanticRelations
===================================================================
--- trunk/pgsrc/Help%2FSemanticRelations	2021-07-15 18:32:00 UTC (rev 10350)
+++ trunk/pgsrc/Help%2FSemanticRelations	2021-07-15 19:34:42 UTC (rev 10351)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu, 15 Jul 2021 21:11:02 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FSemanticRelations;
@@ -31,7 +31,7 @@
 == Attributes ==
 
 Attributes are defined as link to numbers (understandable by
-[GNU Units|http://www.gnu.org/software/units/units.html]) with
+[[https://www.gnu.org/software/units/units.html|GNU Units]]) with
 the following markup syntax:
 
 {{{
@@ -45,20 +45,20 @@
 
 == Example ==
 
-<em>Sample taken from http://wiki.ontoworld.org/index.php/San_Diego</em>
+//Sample taken from http://wiki.ontoworld.org/index.php/San_Diego //
 
 {{{
-San Diego [is_a::city] located in the southwestern corner of
-[California|located_in::California], the extreme southwestern corner
-of the [United States|country::United States]. It is the county seat
+San Diego [[is_a::city]] located in the southwestern corner of
+[[located_in::California|California]], the extreme southwestern corner
+of the [[country::United States|United States]]. It is the county seat
 of San Diego County. As of the 2000 census, the city had a total population of
-[1,223,400|population:=1,223,400]; as of 2005, the California Department
+[[population:=1,223,400|1,223,400]]; as of 2005, the California Department
 of Finance estimated the city to have 1,305,736 residents. The city
 is the second-largest in California and the seventh-largest in the
 United States and is noted for its temperate climate and many beaches.
 
 According to the United States Census Bureau, the city has a total
-area of [963.6 km²|area:=963.6 km^2] (372.0 mi²). 840.0 km²
+area of [[area:=963.6 km^2|963.6 km²]] (372.0 mi²). 840.0 km²
 (324.3 mi²) of it is land and 123.5 km² (47.7 mi²) of it is water.
 The total area is 12.82% water.
 

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

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

From: <var...@us...> - 2021-07-15 18:32:03

Revision: 10350
          http://sourceforge.net/p/phpwiki/code/10350
Author:   vargenau
Date:     2021-07-15 18:32:00 +0000 (Thu, 15 Jul 2021)
Log Message:
-----------
Better handling of page names with slash

Modified Paths:
--------------
    trunk/lib/InlineParser.php
    trunk/lib/main.php
    trunk/lib/plugin/CreatePage.php
    trunk/lib/plugin/WikiAdminRename.php
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2021-07-15 16:41:39 UTC (rev 10349)
+++ trunk/lib/InlineParser.php	2021-07-15 18:32:00 UTC (rev 10350)
@@ -343,6 +343,12 @@
                     _('Page name too long'));
             }
         }
+        // Page name cannot end with a slash
+        if (substr($rawlink, -1) == "/") {
+            return HTML::span(array('class' => 'error'),
+                sprintf(_("Page name “%s” cannot end with a slash."), $rawlink));
+        }
+
         // Check illegal characters in page names: <>[]{}|"
         if (preg_match("/[<\[\{\|\"\}\]>]/", $rawlink, $matches) > 0) {
             return HTML::span(array('class' => 'error'),

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2021-07-15 16:41:39 UTC (rev 10349)
+++ trunk/lib/main.php	2021-07-15 18:32:00 UTC (rev 10350)
@@ -784,6 +784,12 @@
             GeneratePage($CONTENT, $pagename);
             $this->finish();
         }
+        // Page name cannot end with a slash, redirect to page without slashes at the end
+        if (substr($pagename, -1) == "/") {
+            $pagename = rtrim($pagename, "/");
+            global $request;
+            $request->redirect(WikiURL($pagename, array(), 'absurl')); // noreturn
+        }
         if (preg_match("/[<\[\{\|\"\}\]>]/", $pagename, $matches) > 0) {
             $CONTENT = HTML::p(
                 array('class' => 'error'),

Modified: trunk/lib/plugin/CreatePage.php
===================================================================
--- trunk/lib/plugin/CreatePage.php	2021-07-15 16:41:39 UTC (rev 10349)
+++ trunk/lib/plugin/CreatePage.php	2021-07-15 18:32:00 UTC (rev 10350)
@@ -75,8 +75,9 @@
             return $this->error(sprintf(_("Argument '%s' must be a boolean"), "overwrite"));
         }
 
-        // Prevent spaces at the start and end of a page name
-        $s = trim($s);
+        // Prevent spaces and slashes at the start and end of a page name
+        $s = trim($s, " /");
+
         if (!$s) {
             return $this->error(_("Cannot create page with empty name!"));
         }

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2021-07-15 16:41:39 UTC (rev 10349)
+++ trunk/lib/plugin/WikiAdminRename.php	2021-07-15 18:32:00 UTC (rev 10350)
@@ -222,6 +222,14 @@
             ) {
                 if (strlen($newname) > MAX_PAGENAME_LENGTH) {
                     $ul->pushContent(HTML::li(_("Cannot rename. New page name too long.")));
+                // Page name cannot begin with a slash
+                } elseif ($newname[0] == "/") {
+                    $ul->pushContent(HTML::li(
+                        sprintf(_("Page name “%s” cannot begin with a slash."), $newname)));
+                // Page name cannot end with a slash
+                } elseif (substr($newname, -1) == "/") {
+                    $ul->pushContent(HTML::li(
+                        sprintf(_("Page name “%s” cannot end with a slash."), $newname)));
                 } elseif (preg_match("/[<\[\{\|\"\}\]>]/", $newname, $matches) > 0) {
                     $ul->pushContent(HTML::li(
                         sprintf(_("Illegal character “%s” in page name."), $matches[0])));

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2021-07-15 16:41:39 UTC (rev 10349)
+++ trunk/pgsrc/ReleaseNotes	2021-07-15 18:32:00 UTC (rev 10350)
@@ -1,4 +1,4 @@
-Date: Wed,  9 Jun 2021 19:50:57 +0000
+Date: Thu, 15 Jul 2021 20:27:26 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -20,6 +20,7 @@
 * Make function IsSafeURL more strict
 * Make XHTML ZIP Snapshot work again (broken since ~PhpWiki 1.5.3)
 * It was possible to rename a page to a name with illegal characters, like ~[~]
+* Better handling of page names with slash
 * Remove wrong calls to setTightness in ##lib/~InlineParser.php## (bug reported by Harold Hallikainen)
 * Importing a ZIP from an old wiki in Latin 1 (ISO 8859-1) failed. Reported by Frank Michael.
 * Better check arguments for ~GoogleMaps plugin

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

286 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 32 33 34 35 36 .. 538 > >> (Page 34 of 538)