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

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

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

Revision: 10474
          http://sourceforge.net/p/phpwiki/code/10474
Author:   vargenau
Date:     2021-08-10 09:33:35 +0000 (Tue, 10 Aug 2021)
Log Message:
-----------
config/config-dist.ini: remove MAX_KEEP, MIN_AGE, MIN_KEEP, KEEP, MAX_AGE

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

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2021-08-10 08:51:45 UTC (rev 10473)
+++ trunk/config/config-dist.ini	2021-08-10 09:33:35 UTC (rev 10474)
@@ -489,61 +489,6 @@
 ;USECACHE = false
 
 ;========================================================================
-; Section 3a: Page revisions
-;
-; The next section controls how many old revisions of each page are
-; kept in the database.
-;========================================================================
-
-; There are two basic classes of revisions: major and minor. Which
-; class a revision belongs in is determined by whether the author
-; checked the "this is a minor revision" checkbox when they saved the
-; page.
-;
-; There is, additionally, a third class of revisions: author
-; revisions. The most recent non-mergable revision from each distinct
-; author is an author revision.
-;
-; The expiry parameters for each of those three classes of revisions
-; can be adjusted separately. For each class there are five
-; parameters (usually, only two or three of the five are actually
-; set) which control how long those revisions are kept in the
-; database.
-;
-;   MAX_KEEP: If set, this specifies an absolute maximum for the
-;             number of archived revisions of that class. This is
-;             meant to be used as a safety cap when a non-zero
-;             min_age is specified. It should be set relatively high,
-;             and its purpose is to prevent malicious or accidental
-;             database overflow due to someone causing an
-;             unreasonable number of edits in a short period of time.
-;
-;   MIN_AGE:  Revisions younger than this (based upon the supplanted
-;             date) will be kept unless max_keep is exceeded. The age
-;             should be specified in days. It should be a
-;             non-negative, real number,
-;
-;   MIN_KEEP: At least this many revisions will be kept.
-;
-;   KEEP: No more than this many revisions will be kept.
-;
-;   MAX_AGE:  No revision older than this age will be kept.
-;
-; Definitions of terms used above:
-;
-; Supplanted date: Revisions are timestamped at the instant that they
-; cease being the current revision. Revision age is computed using
-; this timestamp, not the edit time of the page.
-;
-; Merging: When a minor revision is deleted, if the preceding
-; revision is by the same author, the minor revision is merged with
-; the preceding revision before it is deleted. Essentially: this
-; replaces the content (and supplanted timestamp) of the previous
-; revision with the content after the merged minor edit, the rest of
-; the page metadata for the preceding version (summary, mtime, ...)
-; is not changed.
-
-;========================================================================
 ; Part Three: User Authentication
 ;========================================================================
 ;

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

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

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

Revision: 10473
          http://sourceforge.net/p/phpwiki/code/10473
Author:   vargenau
Date:     2021-08-10 08:51:45 +0000 (Tue, 10 Aug 2021)
Log Message:
-----------
pgsrc/Help%2FGooglePluginPlugin: remove example, there might be no license

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

Modified: trunk/pgsrc/Help%2FGooglePluginPlugin
===================================================================
--- trunk/pgsrc/Help%2FGooglePluginPlugin	2021-08-10 08:47:28 UTC (rev 10472)
+++ trunk/pgsrc/Help%2FGooglePluginPlugin	2021-08-10 08:51:45 UTC (rev 10473)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Tue, 10 Aug 2021 10:50:48 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FGooglePluginPlugin;
@@ -54,8 +54,6 @@
 <<GooglePlugin>>
 }}}
 
-<<GooglePlugin>>
-
 == 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:[10472] trunk

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

Revision: 10472
          http://sourceforge.net/p/phpwiki/code/10472
Author:   vargenau
Date:     2021-08-10 08:47:28 +0000 (Tue, 10 Aug 2021)
Log Message:
-----------
pgsrc/Help%2FGoogleMapsPlugin: remove example, GOOGLE_LICENSE_KEY might not be set

Modified Paths:
--------------
    trunk/INSTALL
    trunk/pgsrc/Help%2FGoogleMapsPlugin

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2021-08-09 16:51:06 UTC (rev 10471)
+++ trunk/INSTALL	2021-08-10 08:47:28 UTC (rev 10472)
@@ -34,8 +34,13 @@
 GraphViz plugin requires GraphViz to be installed. You might need to do:
 yum install graphviz
 or
-yum install graphviz
+apt install graphviz
 
+GooglePlugin plugin requires PHP SoapClient class. You might need to do:
+yum install php-soap
+or
+apt install php-soap
+
 QUICK START INSTRUCTIONS
 
 Copy 'config/config-dist.ini' to 'config/config.ini' and edit the

Modified: trunk/pgsrc/Help%2FGoogleMapsPlugin
===================================================================
--- trunk/pgsrc/Help%2FGoogleMapsPlugin	2021-08-09 16:51:06 UTC (rev 10471)
+++ trunk/pgsrc/Help%2FGoogleMapsPlugin	2021-08-10 08:47:28 UTC (rev 10472)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Tue, 10 Aug 2021 10:45:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FGoogleMapsPlugin;
@@ -80,16 +80,6 @@
 >>
 }}}
 
-<<GoogleMaps
-          Latitude=53.053
-          Longitude=7.803
-          ZoomFactor=10
-          Marker=true
-          MapType=Hybrid
-          width=500px
-          height=400px
->>
-
 == 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:[10471] trunk/themes

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

Revision: 10471
          http://sourceforge.net/p/phpwiki/code/10471
Author:   vargenau
Date:     2021-08-09 16:51:06 +0000 (Mon, 09 Aug 2021)
Log Message:
-----------
Do not print selection box in RecentChanges

Modified Paths:
--------------
    trunk/themes/default/phpwiki-printer.css
    trunk/themes/fusionforge/fusionforge-print.css

Modified: trunk/themes/default/phpwiki-printer.css
===================================================================
--- trunk/themes/default/phpwiki-printer.css	2021-08-09 15:48:12 UTC (rev 10470)
+++ trunk/themes/default/phpwiki-printer.css	2021-08-09 16:51:06 UTC (rev 10471)
@@ -138,8 +138,8 @@
     background: white;
 }
 
-/* Hide (diff) links and days buttons in RecentChanges */
-.wiki-rc-action {
+/* Do not print selection box in RecentChanges */
+fieldset.wiki-rc-action {
     display: none;
 }
 

Modified: trunk/themes/fusionforge/fusionforge-print.css
===================================================================
--- trunk/themes/fusionforge/fusionforge-print.css	2021-08-09 15:48:12 UTC (rev 10470)
+++ trunk/themes/fusionforge/fusionforge-print.css	2021-08-09 16:51:06 UTC (rev 10471)
@@ -78,6 +78,11 @@
     display: none;
 }
 
+/* Do not print selection box in RecentChanges */
+fieldset.wiki-rc-action {
+    display: none;
+}
+
 /* Print links in black */
 a {
     color: black;

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

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

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

Revision: 10470
          http://sourceforge.net/p/phpwiki/code/10470
Author:   vargenau
Date:     2021-08-09 15:48:12 +0000 (Mon, 09 Aug 2021)
Log Message:
-----------
Use LANG language

Modified Paths:
--------------
    trunk/themes/Crao/templates/htmldump.tmpl
    trunk/themes/Sidebar/templates/htmldump.tmpl
    trunk/themes/default/templates/htmldump.tmpl

Modified: trunk/themes/Crao/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Crao/templates/htmldump.tmpl	2021-08-09 15:34:48 UTC (rev 10469)
+++ trunk/themes/Crao/templates/htmldump.tmpl	2021-08-09 15:48:12 UTC (rev 10470)
@@ -5,7 +5,7 @@
  */
 ?>
 <!DOCTYPE html>
-<html xml:lang="en" lang="en">
+<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>">
 <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-08-09 15:34:48 UTC (rev 10469)
+++ trunk/themes/Sidebar/templates/htmldump.tmpl	2021-08-09 15:48:12 UTC (rev 10470)
@@ -5,7 +5,7 @@
  */
 ?>
 <!DOCTYPE html>
-<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>">
 <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-08-09 15:34:48 UTC (rev 10469)
+++ trunk/themes/default/templates/htmldump.tmpl	2021-08-09 15:48:12 UTC (rev 10470)
@@ -5,7 +5,7 @@
  */
 ?>
 <!DOCTYPE html>
-<html xml:lang="en" lang="en">
+<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>">
 <head>
 <meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />

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

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

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

Revision: 10469
          http://sourceforge.net/p/phpwiki/code/10469
Author:   vargenau
Date:     2021-08-09 15:34:48 +0000 (Mon, 09 Aug 2021)
Log Message:
-----------
HowToUseWiki --> Help/HowToUseWiki

Modified Paths:
--------------
    trunk/themes/Crao/templates/head.tmpl
    trunk/themes/Crao/templates/htmldump.tmpl
    trunk/themes/Sidebar/templates/htmldump.tmpl
    trunk/themes/default/templates/categorypage.tmpl
    trunk/themes/default/templates/head.tmpl
    trunk/themes/default/templates/htmldump.tmpl
    trunk/themes/wikilens/templates/categorypage.tmpl
    trunk/themes/wikilens/templates/head.tmpl

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

Modified: trunk/themes/Crao/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Crao/templates/htmldump.tmpl	2021-08-09 15:05:57 UTC (rev 10468)
+++ trunk/themes/Crao/templates/htmldump.tmpl	2021-08-09 15:34:48 UTC (rev 10469)
@@ -9,7 +9,7 @@
 <head>
 <meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
-<link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" />
+<link rel="help" title="<?php echo _("Help/HowToUseWiki")?>" href="<?php echo WikiURL(_("Help/HowToUseWiki"))?>" />
 <link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
 <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
 

Modified: trunk/themes/Sidebar/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/htmldump.tmpl	2021-08-09 15:05:57 UTC (rev 10468)
+++ trunk/themes/Sidebar/templates/htmldump.tmpl	2021-08-09 15:34:48 UTC (rev 10469)
@@ -9,7 +9,7 @@
 <head>
 <meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
-<link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" />
+<link rel="help" title="<?php echo _("Help/HowToUseWiki")?>" href="<?php echo WikiURL(_("Help/HowToUseWiki"))?>" />
 <link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
 <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
 <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>

Modified: trunk/themes/default/templates/categorypage.tmpl
===================================================================
--- trunk/themes/default/templates/categorypage.tmpl	2021-08-09 15:05:57 UTC (rev 10468)
+++ trunk/themes/default/templates/categorypage.tmpl	2021-08-09 15:34:48 UTC (rev 10469)
@@ -23,7 +23,7 @@
 <li>
 
 If it does not exist, you can create the page.  You can use this
-CreatePage button, or see <?php $link = WikiLink("HowToUseWiki"); ?> <?php echo
+CreatePage button, or see <?php $link = WikiLink("Help:HowToUseWiki"); ?> <?php echo
 $link ?> for more ways to navigate or create pages.
 
 <?php

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

Modified: trunk/themes/default/templates/htmldump.tmpl
===================================================================
--- trunk/themes/default/templates/htmldump.tmpl	2021-08-09 15:05:57 UTC (rev 10468)
+++ trunk/themes/default/templates/htmldump.tmpl	2021-08-09 15:34:48 UTC (rev 10469)
@@ -9,7 +9,7 @@
 <head>
 <meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
-<link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" />
+<link rel="help" title="<?php echo _("Help:HowToUseWiki")?>" href="<?php echo WikiURL(_("Help:HowToUseWiki"))?>" />
 <link rel="license" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
 <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
 <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>

Modified: trunk/themes/wikilens/templates/categorypage.tmpl
===================================================================
--- trunk/themes/wikilens/templates/categorypage.tmpl	2021-08-09 15:05:57 UTC (rev 10468)
+++ trunk/themes/wikilens/templates/categorypage.tmpl	2021-08-09 15:34:48 UTC (rev 10469)
@@ -48,7 +48,7 @@
 <li>
 
 If it does not exist, you can create the page.  You can use this
-CreatePage button, or see <?php $link = WikiLink("HowToUseWiki"); ?> <?php echo
+CreatePage button, or see <?php $link = WikiLink("Help/HowToUseWiki"); ?> <?php echo
 $link ?> for more ways to navigate or create pages.
 
 <?php

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

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

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

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

Revision: 10468
          http://sourceforge.net/p/phpwiki/code/10468
Author:   vargenau
Date:     2021-08-09 15:05:57 +0000 (Mon, 09 Aug 2021)
Log Message:
-----------
Add Redirected message in Portland and Wordpress themes

Modified Paths:
--------------
    trunk/themes/Portland/templates/browse.tmpl
    trunk/themes/Wordpress/templates/browse.tmpl

Modified: trunk/themes/Portland/templates/browse.tmpl
===================================================================
--- trunk/themes/Portland/templates/browse.tmpl	2021-08-09 14:46:56 UTC (rev 10467)
+++ trunk/themes/Portland/templates/browse.tmpl	2021-08-09 15:05:57 UTC (rev 10468)
@@ -9,8 +9,12 @@
      <?php echo WikiLink($page, 'existing', _("View the current version."))?></p>
   <hr class="ignore" />
 <?php } ?>
+<?php if (!empty($redirected)) { ?>
+  <p><?php echo $redirected ?></p>
+<?php } ?>
 
 <?php echo $CONTENT?>
+
 <hr />
 <?php echo Template('actionbar') ?>
 <?php // The bottom navigation/search bar ?>

Modified: trunk/themes/Wordpress/templates/browse.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/browse.tmpl	2021-08-09 14:46:56 UTC (rev 10467)
+++ trunk/themes/Wordpress/templates/browse.tmpl	2021-08-09 15:05:57 UTC (rev 10468)
@@ -9,8 +9,12 @@
      <?php echo WikiLink($page, 'existing', _("View the current version."))?>.</p>
   <hr class="ignore" />
 <?php } ?>
+<?php if (!empty($redirected)) { ?>
+  <p><?php echo $redirected ?></p>
+<?php } ?>
 
 <?php echo $CONTENT?>
+
 <hr />
 <?php echo Template('actionbar') ?>
 <?php // The bottom navigation/search bar ?>

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

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

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

Revision: 10467
          http://sourceforge.net/p/phpwiki/code/10467
Author:   vargenau
Date:     2021-08-09 14:46:56 +0000 (Mon, 09 Aug 2021)
Log Message:
-----------
CSS: factor span.redirectfrom from RedirectTo plugin

Modified Paths:
--------------
    trunk/themes/MacOSX/MacOSX.css
    trunk/themes/MonoBook/monobook.css
    trunk/themes/Sidebar/sidebar.css
    trunk/themes/Wordpress/Wordpress.css
    trunk/themes/default/phpwiki-common.css
    trunk/themes/default/phpwiki.css
    trunk/themes/fusionforge/fusionforge.css

Modified: trunk/themes/MacOSX/MacOSX.css
===================================================================
--- trunk/themes/MacOSX/MacOSX.css	2021-08-09 14:17:22 UTC (rev 10466)
+++ trunk/themes/MacOSX/MacOSX.css	2021-08-09 14:46:56 UTC (rev 10467)
@@ -674,14 +674,6 @@
     padding: 0.3ex 0.5em;
 }
 
-/* "(Redirected from ...)" message. */
-span.redirectfrom {
-    font-size: small;
-    font-style: oblique;
-    font-weight: normal;
-    padding-left: 1em;
-}
-
 /*
  * "E-mail" style blockquote
  */

Modified: trunk/themes/MonoBook/monobook.css
===================================================================
--- trunk/themes/MonoBook/monobook.css	2021-08-09 14:17:22 UTC (rev 10466)
+++ trunk/themes/MonoBook/monobook.css	2021-08-09 14:46:56 UTC (rev 10467)
@@ -1681,14 +1681,6 @@
     padding: 0.3ex 0.5em;
 }
 
-/* "(Redirected from ...)" message. */
-span.redirectfrom {
-    font-size: small;
-    font-style: oblique;
-    font-weight: normal;
-    padding-left: 1em;
-}
-
 .search-context {
     background-color: white;
     font-style: oblique;

Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2021-08-09 14:17:22 UTC (rev 10466)
+++ trunk/themes/Sidebar/sidebar.css	2021-08-09 14:46:56 UTC (rev 10467)
@@ -1685,14 +1685,6 @@
     padding: 0.3ex 0.5em;
 }
 
-/* "(Redirected from ...)" message. */
-span.redirectfrom {
-    font-size: small;
-    font-style: oblique;
-    font-weight: normal;
-    padding-left: 1em;
-}
-
 .search-context {
     background-color: white;
     font-style: oblique;

Modified: trunk/themes/Wordpress/Wordpress.css
===================================================================
--- trunk/themes/Wordpress/Wordpress.css	2021-08-09 14:17:22 UTC (rev 10466)
+++ trunk/themes/Wordpress/Wordpress.css	2021-08-09 14:46:56 UTC (rev 10467)
@@ -594,14 +594,6 @@
     padding: 0.3ex 0.5em;
 }
 
-/* "(Redirected from ...)" message. */
-span.redirectfrom {
-    font-size: small;
-    font-style: oblique;
-    font-weight: normal;
-    padding-left: 1em;
-}
-
 /*
  * "DL tables"
  */

Modified: trunk/themes/default/phpwiki-common.css
===================================================================
--- trunk/themes/default/phpwiki-common.css	2021-08-09 14:17:22 UTC (rev 10466)
+++ trunk/themes/default/phpwiki-common.css	2021-08-09 14:46:56 UTC (rev 10467)
@@ -97,6 +97,16 @@
     width: 100%;
 }
 
+/* RedirectTo plugin ================================================== */
+
+/* "(Redirected from ...)" message. */
+span.redirectfrom {
+    font-size: small;
+    font-style: oblique;
+    font-weight: normal;
+    padding-left: 1em;
+}
+
 /* WikicreoleTable, MediawikiTable and RichTable plugins ============== */
 
 /*

Modified: trunk/themes/default/phpwiki.css
===================================================================
--- trunk/themes/default/phpwiki.css	2021-08-09 14:17:22 UTC (rev 10466)
+++ trunk/themes/default/phpwiki.css	2021-08-09 14:46:56 UTC (rev 10467)
@@ -637,14 +637,6 @@
     padding: 0.3ex 0.5em;
 }
 
-/* "(Redirected from ...)" message. */
-span.redirectfrom {
-    font-size: small;
-    font-style: oblique;
-    font-weight: normal;
-    padding-left: 1em;
-}
-
 /*
  * "DL tables"
  */

Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2021-08-09 14:17:22 UTC (rev 10466)
+++ trunk/themes/fusionforge/fusionforge.css	2021-08-09 14:46:56 UTC (rev 10467)
@@ -842,16 +842,6 @@
     padding: 0.3ex 0.5em;
 }
 
-/* RedirectTo plugin ================================================== */
-
-/* "(Redirected from ...)" message. */
-span.redirectfrom {
-    font-size: small;
-    font-style: oblique;
-    font-weight: normal;
-    padding-left: 1em;
-}
-
 /*
  * "DL tables"
  */

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

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

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

Revision: 10466
          http://sourceforge.net/p/phpwiki/code/10466
Author:   vargenau
Date:     2021-08-09 14:17:22 +0000 (Mon, 09 Aug 2021)
Log Message:
-----------
lib/plugin/PasswordReset.php: user name is mandatory

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

Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php	2021-08-09 13:59:49 UTC (rev 10465)
+++ trunk/lib/plugin/PasswordReset.php	2021-08-09 14:17:22 UTC (rev 10466)
@@ -107,7 +107,8 @@
             $header = HTML::p(_("Reset password of user: "),
                 HTML::raw(' '),
                 HTML::input(array('type' => 'text',
-                    'name' => "user",
+                    'required' => 'required',
+                    'name' => 'user',
                     'value' => $userid))
             );
         }
@@ -117,7 +118,7 @@
                     $isadmin ? _("Yes") : _("Send e-mail"),
                     $isadmin ? 'wikiadmin' : 'button'),
                 HTML::raw(' '),
-                Button('submit:admin_reset[cancel]', _("Cancel"), 'button'));
+                Button('submit:admin_reset[cancel]', _("Cancel"), 'button', array('formnovalidate' => 'formnovalidate')));
         }
         return HTML::form(array('action' => $request->getPostURL(),
                 'method' => 'post'),

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

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

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

Revision: 10465
          http://sourceforge.net/p/phpwiki/code/10465
Author:   vargenau
Date:     2021-08-09 13:59:49 +0000 (Mon, 09 Aug 2021)
Log Message:
-----------
Avoid warning

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

Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php	2021-08-09 13:47:12 UTC (rev 10464)
+++ trunk/lib/plugin/PasswordReset.php	2021-08-09 13:59:49 UTC (rev 10465)
@@ -143,9 +143,9 @@
         if (!$userid) $userid = $request->getArg('user');
         $isadmin = $user->isAdmin();
         if ($request->isPost()) {
-            @$reset = $post_args['reset'];
-            if (empty($reset))
+            if (!array_key_exists('reset', $post_args)) {
                 return $this->doForm($request, $userid);
+            }
             if (!$userid) {
                 $alert = new Alert(_("Warning:"),
                     _("You need to specify the userid!"));

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10464] trunk/lib/plugin/WikiAdminUtils.php

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

Revision: 10464
          http://sourceforge.net/p/phpwiki/code/10464
Author:   vargenau
Date:     2021-08-09 13:47:12 +0000 (Mon, 09 Aug 2021)
Log Message:
-----------
lib/plugin/WikiAdminUtils.php: revert, use Alert again

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

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2021-08-09 13:43:43 UTC (rev 10463)
+++ trunk/lib/plugin/WikiAdminUtils.php	2021-08-09 13:47:12 UTC (rev 10464)
@@ -107,14 +107,12 @@
 
         $message = call_user_func(array(&$this, $method), $request, $args);
 
-        // If needed, clean URL of previous message, remove '?' and after
-        $return_url = $args['return_url'];
-        if (strpos($return_url, '?')) {
-            $return_url = substr($return_url, 0, strpos($return_url, '?'));
-        }
-        $url = WikiURL($return_url, array('warningmsg' => $message));
-
-        return $request->redirect($url);
+        // display as separate page or as alert?
+        $alert = new Alert(fmt("WikiAdminUtils %s returned:", $args['action']),
+            $message,
+            array(_("Back") => $args['return_url']));
+        $alert->show(); // noreturn
+        return '';
     }
 
     private function _getLabel($action)
@@ -143,7 +141,7 @@
     {
         $dbi = $request->getDbh();
         $count = 0;
-        $list = '';
+        $list = HTML::ol(array('class' => 'align-left'));
         $pages = $dbi->getAllPages('include_empty'); // Do we really want the empty ones too?
         while (($page = $pages->next())) {
             $pagename = $page->getName();
@@ -150,7 +148,7 @@
             $wpn = new WikiPageName($pagename);
             if (!$wpn->isValid()) {
                 $dbi->purgePage($pagename);
-                $list .= "\n" . $pagename;
+                $list->pushContent(HTML::li($pagename));
                 $count++;
             }
         }
@@ -158,7 +156,8 @@
         if (!$count) {
             return _("No pages with bad names had to be deleted.");
         } else {
-            return fmt("Deleted %d pages with invalid names:", $count) . $list;
+            return HTML(fmt("Deleted %d pages with invalid names:", $count),
+                HTML::div(array('class' => 'align-left'), $list));
         }
     }
 
@@ -174,7 +173,7 @@
         $dbi = $request->getDbh();
         $count = 0;
         $notpurgable = 0;
-        $list = '';
+        $list = HTML::ol(array('class' => 'align-left'));
         $pages = $dbi->getAllPages('include_empty');
         while (($page = $pages->next())) {
             if (!$page->exists()
@@ -183,10 +182,10 @@
             ) {
                 $pagename = $page->getName();
                 if ($pagename == 'global_data' or $pagename == '.') continue;
-                if ($dbi->purgePage($pagename)) {
-                    $list .= "\n" . $pagename . ' ' . _("[purged]");
-                } else {
-                    $list .= "\n" . $pagename . ' ' . _("[not purgable]");
+                if ($dbi->purgePage($pagename))
+                    $list->pushContent(HTML::li($pagename . ' ' . _("[purged]")));
+                else {
+                    $list->pushContent(HTML::li($pagename . ' ' . _("[not purgable]")));
                     $notpurgable++;
                 }
                 $count++;
@@ -196,11 +195,12 @@
         if (!$count) {
             return _("No empty, unreferenced pages were found.");
         } else {
-            return fmt("Deleted %d unreferenced pages:", $count) . $list
-                   . ($notpurgable ?
+            return HTML(fmt("Deleted %d unreferenced pages:", $count),
+                HTML::div(array('class' => 'align-left'), $list),
+                ($notpurgable ?
                     fmt("The %d not-purgable pages/links are links in some page(s). You might want to edit them.",
                         $notpurgable)
-                    : '');
+                    : ''));
         }
     }
 
@@ -229,7 +229,7 @@
     }
 
     // pagelist with enable/disable button
-    private function _do_email_verification($request, &$args)
+    private function _do_email_verification($request, $args)
     {
         $dbi = $request->getDbh();
         $pagelist = new PageList('pagename', array(), $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:[10463] trunk/themes/default/templates/redirect.tmpl

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

Revision: 10463
          http://sourceforge.net/p/phpwiki/code/10463
Author:   vargenau
Date:     2021-08-09 13:43:43 +0000 (Mon, 09 Aug 2021)
Log Message:
-----------
Use LANG language

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

Modified: trunk/themes/default/templates/redirect.tmpl
===================================================================
--- trunk/themes/default/templates/redirect.tmpl	2021-08-09 13:42:22 UTC (rev 10462)
+++ trunk/themes/default/templates/redirect.tmpl	2021-08-09 13:43:43 UTC (rev 10463)
@@ -4,7 +4,7 @@
  */
 ?>
 <!DOCTYPE html>
-<html xml:lang="en" lang="en">
+<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <meta name="robots" content="noindex, nofollow" />

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10462] trunk/themes/default/templates/dialog.tmpl

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

Revision: 10462
          http://sourceforge.net/p/phpwiki/code/10462
Author:   vargenau
Date:     2021-08-09 13:42:22 +0000 (Mon, 09 Aug 2021)
Log Message:
-----------
Add missing <html> tag

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

Modified: trunk/themes/default/templates/dialog.tmpl
===================================================================
--- trunk/themes/default/templates/dialog.tmpl	2021-08-09 13:23:52 UTC (rev 10461)
+++ trunk/themes/default/templates/dialog.tmpl	2021-08-09 13:42:22 UTC (rev 10462)
@@ -4,6 +4,7 @@
  */
 ?>
 <!DOCTYPE html>
+<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>">
 <head>
 <meta charset="UTF-8" />
 <meta name="robots" content="noindex, nofollow" />

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

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

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

Revision: 10461
          http://sourceforge.net/p/phpwiki/code/10461
Author:   vargenau
Date:     2021-08-09 13:23:52 +0000 (Mon, 09 Aug 2021)
Log Message:
-----------
CSS: factor Alert dialog code in themes/default/phpwiki-common.css

Modified Paths:
--------------
    trunk/themes/MacOSX/MacOSX.css
    trunk/themes/Wordpress/Wordpress.css
    trunk/themes/default/phpwiki-common.css
    trunk/themes/default/phpwiki.css
    trunk/themes/fusionforge/fusionforge.css

Modified: trunk/themes/MacOSX/MacOSX.css
===================================================================
--- trunk/themes/MacOSX/MacOSX.css	2021-08-09 13:07:52 UTC (rev 10460)
+++ trunk/themes/MacOSX/MacOSX.css	2021-08-09 13:23:52 UTC (rev 10461)
@@ -778,34 +778,6 @@
     padding-left: 3em;
 }
 
-.dialog {
-    background-color: #cdf;
-    color: black;
-    margin: 2em auto 2em auto;
-    border: thin black solid;
-    width: 50%;
-}
-
-.dialog h1, .dialog p, .dialog div {
-    text-align: center;
-}
-
-.dialog h1 {
-    font-size: large;
-    margin: 0.5em 0 1em 0;
-}
-
-.dialog div.message {
-    background-color: white;
-    color: black;
-    margin: 0 1em;
-    padding: 0.5em 0.5em;
-}
-
-.dialog p.buttons {
-    margin: 1em 0 0.5em 0;
-}
-
 /* postnuke css:*/
 .gensmall {
     font-size: 10px

Modified: trunk/themes/Wordpress/Wordpress.css
===================================================================
--- trunk/themes/Wordpress/Wordpress.css	2021-08-09 13:07:52 UTC (rev 10460)
+++ trunk/themes/Wordpress/Wordpress.css	2021-08-09 13:23:52 UTC (rev 10461)
@@ -731,34 +731,6 @@
     padding-left: 3em;
 }
 
-.dialog {
-    background-color: #cdf;
-    color: black;
-    margin: 2em auto 2em auto;
-    border: thin black solid;
-    width: 50%;
-}
-
-.dialog h1, .dialog p, .dialog div {
-    text-align: center;
-}
-
-.dialog h1 {
-    font-size: large;
-    margin: 0.5em 0 1em 0;
-}
-
-.dialog div.message {
-    background-color: white;
-    color: black;
-    margin: 0 1em;
-    padding: 0.5em 0.5em;
-}
-
-.dialog p.buttons {
-    margin: 1em 0 0.5em 0;
-}
-
 /* postnuke css:*/
 .gensmall {
     font-size: 10px

Modified: trunk/themes/default/phpwiki-common.css
===================================================================
--- trunk/themes/default/phpwiki-common.css	2021-08-09 13:07:52 UTC (rev 10460)
+++ trunk/themes/default/phpwiki-common.css	2021-08-09 13:23:52 UTC (rev 10461)
@@ -60,6 +60,36 @@
     clear: both;
 }
 
+/* Alert class ======================================================== */
+
+.dialog {
+    background-color: #cdf;
+    color: black;
+    margin: 2em auto 2em auto;
+    border: thin black solid;
+    width: 50%;
+}
+
+.dialog h1, .dialog p, .dialog div {
+    text-align: center;
+}
+
+.dialog h1 {
+    font-size: large;
+    margin: 0.5em 0 1em 0;
+}
+
+.dialog div.message {
+    background-color: white;
+    color: black;
+    margin: 0 1em;
+    padding: 0.5em 0.5em;
+}
+
+.dialog p.buttons {
+    margin: 1em 0 0.5em 0;
+}
+
 /* Transclude plugin ================================================== */
 
 .transclude {

Modified: trunk/themes/default/phpwiki.css
===================================================================
--- trunk/themes/default/phpwiki.css	2021-08-09 13:07:52 UTC (rev 10460)
+++ trunk/themes/default/phpwiki.css	2021-08-09 13:23:52 UTC (rev 10461)
@@ -775,34 +775,6 @@
     padding-left: 3em;
 }
 
-.dialog {
-    background-color: #cdf;
-    color: black;
-    margin: 2em auto 2em auto;
-    border: thin black solid;
-    width: 50%;
-}
-
-.dialog h1, .dialog p, .dialog div {
-    text-align: center;
-}
-
-.dialog h1 {
-    font-size: large;
-    margin: 0.5em 0 1em 0;
-}
-
-.dialog div.message {
-    background-color: white;
-    color: black;
-    margin: 0 1em;
-    padding: 0.5em 0.5em;
-}
-
-.dialog p.buttons {
-    margin: 1em 0 0.5em 0;
-}
-
 /* postnuke css:*/
 .gensmall {
     font-size: 10px

Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2021-08-09 13:07:52 UTC (rev 10460)
+++ trunk/themes/fusionforge/fusionforge.css	2021-08-09 13:23:52 UTC (rev 10461)
@@ -983,34 +983,6 @@
     padding-left: 3em;
 }
 
-.dialog {
-    background-color: #cdf;
-    color: black;
-    margin: 2em auto 2em auto;
-    border: thin black solid;
-    width: 50%;
-}
-
-.dialog h1, .dialog p, .dialog div {
-    text-align: center;
-}
-
-.dialog h1 {
-    font-size: large;
-    margin: 0.5em 0 1em 0;
-}
-
-.dialog div.message {
-    background-color: white;
-    color: black;
-    margin: 0 1em;
-    padding: 0.5em 0.5em;
-}
-
-.dialog p.buttons {
-    margin: 1em 0 0.5em 0;
-}
-
 /* postnuke css:*/
 .gensmall {
     font-size: 10px

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

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

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

Revision: 10460
          http://sourceforge.net/p/phpwiki/code/10460
Author:   vargenau
Date:     2021-08-09 13:07:52 +0000 (Mon, 09 Aug 2021)
Log Message:
-----------
Update French translation

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

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2021-08-09 10:45:03 UTC (rev 10459)
+++ trunk/locale/po/fr.po	2021-08-09 13:07:52 UTC (rev 10460)
@@ -3810,7 +3810,7 @@
 msgstr "Cache de marques purgé !"
 
 msgid "No pages with bad names had to be deleted."
-msgstr "Aucune page supprimées avec un nom invalide."
+msgstr "Aucune page avec un nom invalide n'a dû être supprimée."
 
 #, php-format
 msgid "Deleted %d pages with invalid names:"
@@ -3820,7 +3820,7 @@
 msgstr "[purgé]"
 
 msgid "[not purgable]"
-msgstr ""
+msgstr "[impossible à purger]"
 
 msgid "No empty, unreferenced pages were found."
 msgstr ""
@@ -3836,16 +3836,16 @@
 msgstr ""
 
 msgid "Database check was successful."
-msgstr ""
+msgstr "La base de données a été vérifiée avec succès."
 
 msgid "Database check failed."
-msgstr ""
+msgstr "La vérification de la base de données a échoué."
 
 msgid "Database rebuild was successful."
-msgstr ""
+msgstr "La base de données a été reconstruite avec succès."
 
 msgid "Database rebuild failed."
-msgstr ""
+msgstr "La reconstruction de la base de données a échoué."
 
 msgid "E-mail"
 msgstr "Adresse électronique"
@@ -3854,7 +3854,7 @@
 msgstr "Vérification du statut"
 
 msgid "Username"
-msgstr "utilisateur"
+msgstr "Utilisateur"
 
 msgid "Change Verification Status"
 msgstr "Changer la vérification du statut"
@@ -3868,7 +3868,7 @@
 
 #, php-format
 msgid "%s on %s:"
-msgstr "%s on %s :"
+msgstr "%s sur %s :"
 
 msgid "You must be logged in to add blog entries."
 msgstr "Vous devez vous identifier pour ajouter des messages de blog."

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10459] trunk/lib/plugin/WikiAdminUtils.php

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

Revision: 10459
          http://sourceforge.net/p/phpwiki/code/10459
Author:   vargenau
Date:     2021-08-09 10:45:03 +0000 (Mon, 09 Aug 2021)
Log Message:
-----------
lib/plugin/WikiAdminUtils.php: actions return a string

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

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2021-08-09 08:25:48 UTC (rev 10458)
+++ trunk/lib/plugin/WikiAdminUtils.php	2021-08-09 10:45:03 UTC (rev 10459)
@@ -141,10 +141,9 @@
 
     private function _do_purge_bad_pagenames($request, $args)
     {
-        // FIXME: this should be moved into WikiDB::normalize() or something...
         $dbi = $request->getDbh();
         $count = 0;
-        $list = HTML::ol(array('class' => 'align-left'));
+        $list = '';
         $pages = $dbi->getAllPages('include_empty'); // Do we really want the empty ones too?
         while (($page = $pages->next())) {
             $pagename = $page->getName();
@@ -151,7 +150,7 @@
             $wpn = new WikiPageName($pagename);
             if (!$wpn->isValid()) {
                 $dbi->purgePage($pagename);
-                $list->pushContent(HTML::li($pagename));
+                $list .= "\n" . $pagename;
                 $count++;
             }
         }
@@ -159,8 +158,7 @@
         if (!$count) {
             return _("No pages with bad names had to be deleted.");
         } else {
-            return HTML(fmt("Deleted %d pages with invalid names:", $count),
-                HTML::div(array('class' => 'align-left'), $list));
+            return fmt("Deleted %d pages with invalid names:", $count) . $list;
         }
     }
 
@@ -176,7 +174,7 @@
         $dbi = $request->getDbh();
         $count = 0;
         $notpurgable = 0;
-        $list = HTML::ol(array('class' => 'align-left'));
+        $list = '';
         $pages = $dbi->getAllPages('include_empty');
         while (($page = $pages->next())) {
             if (!$page->exists()
@@ -185,10 +183,10 @@
             ) {
                 $pagename = $page->getName();
                 if ($pagename == 'global_data' or $pagename == '.') continue;
-                if ($dbi->purgePage($pagename))
-                    $list->pushContent(HTML::li($pagename . ' ' . _("[purged]")));
-                else {
-                    $list->pushContent(HTML::li($pagename . ' ' . _("[not purgable]")));
+                if ($dbi->purgePage($pagename)) {
+                    $list .= "\n" . $pagename . ' ' . _("[purged]");
+                } else {
+                    $list .= "\n" . $pagename . ' ' . _("[not purgable]");
                     $notpurgable++;
                 }
                 $count++;
@@ -195,15 +193,15 @@
             }
         }
         $pages->free();
-        if (!$count)
+        if (!$count) {
             return _("No empty, unreferenced pages were found.");
-        else
-            return HTML(fmt("Deleted %d unreferenced pages:", $count),
-                HTML::div(array('class' => 'align-left'), $list),
-                ($notpurgable ?
+        } else {
+            return fmt("Deleted %d unreferenced pages:", $count) . $list
+                   . ($notpurgable ?
                     fmt("The %d not-purgable pages/links are links in some page(s). You might want to edit them.",
                         $notpurgable)
-                    : ''));
+                    : '');
+        }
     }
 
     private function _do_db_check($request, $args)
@@ -296,7 +294,7 @@
                         Button('cancel', _("Cancel")))
             );
         }
-    return HTML::raw('');
+        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:[10458] trunk/configurator.php

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

Revision: 10458
          http://sourceforge.net/p/phpwiki/code/10458
Author:   vargenau
Date:     2021-08-09 08:25:48 +0000 (Mon, 09 Aug 2021)
Log Message:
-----------
configurator.php: avoid backslashes

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

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-06 15:32:38 UTC (rev 10457)
+++ trunk/configurator.php	2021-08-09 08:25:48 UTC (rev 10458)
@@ -1658,7 +1658,7 @@
         $size = strlen($this->default_value) > 45 ? 90 : 50;
         return $this->get_config_item_header() .
             "<input type=\"text\" size=\"$size\" name=\"" . $this->get_config_item_name()
-            . "\" value=\"" . htmlspecialchars($this->default_value) . "\" " . $this->jscheck . " />"
+            . '" value="' . htmlspecialchars($this->default_value) . '" ' . $this->jscheck . " />"
             . "<p id=\"" . $this->get_config_item_id() . "\" class=\"green\">Input accepted.</p>";
     }
 }
@@ -1779,7 +1779,7 @@
         $size = strlen($this->default_value) > 45 ? 90 : 50;
         return $this->get_config_item_header()
             . "<input type=\"text\" size=\"$size\" name=\"" . htmlentities($this->get_config_item_name())
-            . "\" value=\"" . htmlentities($this->default_value) . "\" $this->jscheck />"
+            . '" value="' . htmlentities($this->default_value) . '" ' . $this->jscheck . " />"
             . "<p id=\"" . $this->get_config_item_id() . "\" class=\"green\">Input accepted.</p>";
     }
 }
@@ -1823,7 +1823,7 @@
     {
         $s = $this->get_config_item_header()
             . "<input type=\"text\" size=\"50\" name=\"" . $this->get_config_item_name()
-            . "\" value=\"" . $this->default_value . "\" $this->jscheck />";
+            . '" value="' . $this->default_value . '" ' . $this->jscheck . " />";
         if (empty($this->default_value))
             return $s . "<p id=\"" . $this->get_config_item_id() . "\" class=\"red\">Cannot be empty.</p>";
         else
@@ -1983,8 +1983,8 @@
             $GLOBALS['properties']["Encrypted Passwords"]->value();
         if (empty($value))
             $encrypted = false;
-        $s .= "<input type=\"" . ($encrypted ? "text" : "password") . "\" name=\"" . $this->get_config_item_name()
-            . "\" value=\"" . $value . "\" $this->jscheck />";
+        $s .= '<input type="' . ($encrypted ? "text" : "password") . '" name="' . $this->get_config_item_name()
+            . '" value="' . $value . '" ' . $this->jscheck . " />";
         return $s;
     }
 }
@@ -2015,8 +2015,8 @@
             $GLOBALS['properties']["Encrypted Passwords"]->value();
         if (empty($value))
             $encrypted = false;
-        $s .= "<input type=\"" . ($encrypted ? "text" : "password") . "\" name=\"" . $this->get_config_item_name()
-            . "\" value=\"" . $value . "\" $this->jscheck />"
+        $s .= '<input type="' . ($encrypted ? "text" : "password") . '" name="' . $this->get_config_item_name()
+            . '" value="' . $value . '" ' . $this->jscheck . " />"
             . "&nbsp;&nbsp;<input type=\"submit\" name=\"create\" value=\"Create Random Password\" />";
         if (empty($value))
             $s .= "<p id=\"" . $this->get_config_item_id() . "\" class=\"red\">Cannot be empty.</p>";
@@ -2046,7 +2046,8 @@
         if ($list_values)
             $list_values = join("\n", $list_values);
         $ta = $this->get_config_item_header();
-        $ta .= "<textarea cols=\"18\" rows=\"" . $rows . "\" name=\"" . $this->get_config_item_name() . "\" $this->jscheck>";
+        $ta .= '<textarea cols="18" rows="' . $rows . '" name="';
+        $ta .= $this->get_config_item_name() . '" ' . $this->jscheck . '>';
         $ta .= $list_values . "</textarea>";
         $ta .= "<p id=\"" . $this->get_config_item_id() . "\" class=\"green\">Input accepted.</p>";
         return $ta;
@@ -2085,7 +2086,8 @@
         }
         $rows = max(3, $count + 1);
         $ta = $this->get_config_item_header();
-        $ta .= "<textarea cols=\"18\" rows=\"" . $rows . "\" name=\"" . $this->get_config_item_name() . "\" $this->jscheck>";
+        $ta .= '<textarea cols="18" rows="' . $rows . '" name="';
+        $ta .= $this->get_config_item_name() . '" ' . $this->jscheck . '>';
         $ta .= $list_values . "</textarea>";
         $ta .= "<p id=\"" . $this->get_config_item_id() . "\" class=\"green\">Input accepted.</p>";
         return $ta;
@@ -2122,7 +2124,8 @@
         $list_values = join(" : \n", $this->default_value);
         $rows = max(3, count($this->default_value) + 1);
         $ta = $this->get_config_item_header();
-        $ta .= "<textarea cols=\"18\" rows=\"" . $rows . "\" name=\"" . $this->get_config_item_name() . "\" $this->jscheck>";
+        $ta .= '<textarea cols="18" rows="' . $rows . '" name="';
+        $ta .= $this->get_config_item_name() . '" ' . $this->jscheck . '>';
         $ta .= $list_values . "</textarea>";
         $ta .= "<p id=\"" . $this->get_config_item_id() . "\" class=\"green\">Input accepted.</p>";
         return $ta;
@@ -2175,7 +2178,7 @@
     {
         $output = $this->get_config_item_header();
         $name = $this->get_config_item_name();
-        $output .= '<select name="' . $name . "\" $this->jscheck>\n";
+        $output .= '<select name="' . $name . '" ' . $this->jscheck . ">\n";
         $values = $this->values;
         $default_value = $this->default_value ? 'true' : 'false';
         /* There can usually only be two options, there can be

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

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

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

Revision: 10457
          http://sourceforge.net/p/phpwiki/code/10457
Author:   vargenau
Date:     2021-08-06 15:32:38 +0000 (Fri, 06 Aug 2021)
Log Message:
-----------
Spelling: Email --> E-mail

Modified Paths:
--------------
    trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki
    trunk/locale/sv/pgsrc/PhpWikiAdministration
    trunk/locale/zh/pgsrc/PhpWikiAdministration

Modified: trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki
===================================================================
--- trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki	2021-08-06 15:31:47 UTC (rev 10456)
+++ trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki	2021-08-06 15:32:38 UTC (rev 10457)
@@ -1,4 +1,4 @@
-Date: Fri,  6 Aug 2021 16:19:21 +0000
+Date: Fri,  6 Aug 2021 17:30:51 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=AmministrazioneDiPhpWiki;
@@ -34,12 +34,12 @@
 
 <?plugin-form PasswordReset textinput=user method=post ?>
 
-=== Email Verification ===
+=== E-mail Verification ===
 
 This is currently non-strict, leaving some possible holes in not being able to
 connect to certain mail hosts, which can be overridden below.
 
-This button will show a list of all users with registered emails and buttons to set the verification status manually.
+This button will show a list of all users with registered e-mails and buttons to set the verification status manually.
 
 <<WikiAdminUtils action=email-verification>>
 

Modified: trunk/locale/sv/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/locale/sv/pgsrc/PhpWikiAdministration	2021-08-06 15:31:47 UTC (rev 10456)
+++ trunk/locale/sv/pgsrc/PhpWikiAdministration	2021-08-06 15:32:38 UTC (rev 10457)
@@ -1,4 +1,4 @@
-Date: Fri,  6 Aug 2021 16:19:21 +0000
+Date: Fri,  6 Aug 2021 17:30:51 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration;
@@ -34,12 +34,12 @@
 
 <?plugin-form PasswordReset textinput=user method=post ?>
 
-=== Email Verification ===
+=== E-mail Verification ===
 
 This is currently non-strict, leaving some possible holes in not being able to
 connect to certain mail hosts, which can be overridden below.
 
-This button will show a list of all users with registered emails and buttons to set the verification status manually.
+This button will show a list of all users with registered e-mails and buttons to set the verification status manually.
 
 <<WikiAdminUtils action=email-verification>>
 

Modified: trunk/locale/zh/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/locale/zh/pgsrc/PhpWikiAdministration	2021-08-06 15:31:47 UTC (rev 10456)
+++ trunk/locale/zh/pgsrc/PhpWikiAdministration	2021-08-06 15:32:38 UTC (rev 10457)
@@ -1,4 +1,4 @@
-Date: Fri,  6 Aug 2021 16:19:21 +0000
+Date: Fri,  6 Aug 2021 17:30:51 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration;
@@ -34,7 +34,7 @@
 
 <?plugin-form PasswordReset textinput=user method=post ?>
 
-=== Email Verification ===
+=== E-mail Verification ===
 
 This is currently non-strict, leaving some possible holes in not being able to
 connect to certain mail hosts, which can be overridden below.

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10456] trunk/locale/fr/pgsrc/D%C3%A9bogageDePhpWiki

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

Revision: 10456
          http://sourceforge.net/p/phpwiki/code/10456
Author:   vargenau
Date:     2021-08-06 15:31:47 +0000 (Fri, 06 Aug 2021)
Log Message:
-----------
locale/fr/pgsrc/D%C3%A9bogageDePhpWiki: niveau des titres

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

Modified: trunk/locale/fr/pgsrc/D%C3%A9bogageDePhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/D%C3%A9bogageDePhpWiki	2021-08-06 15:16:31 UTC (rev 10455)
+++ trunk/locale/fr/pgsrc/D%C3%A9bogageDePhpWiki	2021-08-06 15:31:47 UTC (rev 10456)
@@ -1,4 +1,4 @@
-Date: Fri,  6 Aug 2021 16:19:21 +0000
+Date: Fri,  6 Aug 2021 17:30:51 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=D%C3%A9bogageDePhpWiki;
@@ -16,7 +16,7 @@
 En utilisation normale, vous ne devriez par en avoir besoin mais ça ne devrait
 pas faire de mal.
 
-=== Purger le cache ===
+== Purger le cache ==
 
 Si votre wiki est configuré ainsi, le contenu transformé (presque HTML)
 de la plus récente version des pages est mis en cache. Ceci accélère la vitesse
@@ -28,10 +28,10 @@
 
 <<WikiAdminUtils action=purge-cache>>
 
-=== Suppression des pages au nom illégal dans la base de données du wiki ===
+== Suppression des pages au nom illégal dans la base de données du wiki ==
 
 Les pages dont le nom commence avec un séparateur de sous-page (habituellement
-un slash ##/##) ne sont pas autorisées. Elles sont parfois crées par un greffon
+un slash ##/##) ne sont pas autorisées. Elles sont parfois créées par un greffon
 mal écrit...
 
 Ce bouton effacera toutes les pages dont le nom est illégal, sans possibilité de récupération.
@@ -38,7 +38,7 @@
 
 <<WikiAdminUtils action=purge-bad-pagenames>>
 
-=== Suppression des pages vides et non référencées ===
+== Suppression des pages vides et non référencées ==
 
 **Attention !** en appuyant sur ce bouton toutes les pages vides et non référencées seront supprimées sans aucune possiblité de les restaurer.
 Ceci supprimera toute possibilité de retrouver les pages ainsi supprimées.

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

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

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

Revision: 10455
          http://sourceforge.net/p/phpwiki/code/10455
Author:   vargenau
Date:     2021-08-06 15:16:31 +0000 (Fri, 06 Aug 2021)
Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/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/es/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-08-06 14:42:27 UTC (rev 10454)
+++ trunk/locale/po/de.po	2021-08-06 15:16:31 UTC (rev 10455)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-05 12:42+0200\n"
+"POT-Creation-Date: 2021-08-06 17:14+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."
@@ -2656,6 +2656,10 @@
 msgid "Illegal characters in external URL."
 msgstr ""
 
+#, php-format
+msgid "Malformed URL: “%s”"
+msgstr ""
+
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 "Weiterleitung zu einer externen URL ist nur in gesperrten Seiten erlaubt."
@@ -3803,13 +3807,6 @@
 msgid "Bad action requested: %s"
 msgstr ""
 
-#, php-format
-msgid "WikiAdminUtils %s returned:"
-msgstr "WikiAdminUtils %s gibt zurück:"
-
-msgid "Back"
-msgstr "Zurück"
-
 msgid "Purge Markup Cache"
 msgstr "HTML-Cachedatei Säubern"
 
@@ -3819,13 +3816,13 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr "Alle leeren Seiten endgültig entfernen, die nicht verlinkt sind."
 
-msgid "E-mail address confirmation"
-msgstr "E-Mail Bestätigung"
+msgid "E-mail Verification"
+msgstr "E-Mail Verifizierung"
 
-msgid "DB Check"
+msgid "Check Wiki Database"
 msgstr ""
 
-msgid "Db Rebuild"
+msgid "Rebuild Wiki Database"
 msgstr ""
 
 msgid "Markup cache purged!"
@@ -3857,6 +3854,18 @@
 "edit them."
 msgstr ""
 
+msgid "Database check was successful."
+msgstr ""
+
+msgid "Database check failed."
+msgstr ""
+
+msgid "Database rebuild was successful."
+msgstr ""
+
+msgid "Database rebuild failed."
+msgstr ""
+
 msgid "E-mail"
 msgstr "E-Mail"
 
@@ -4633,9 +4642,6 @@
 msgid "Check for necessary theme %s updates"
 msgstr ""
 
-msgid "Rename to Help: pages"
-msgstr ""
-
 #, php-format
 msgid "%s already checked in theme pgsrc"
 msgstr ""
@@ -4672,9 +4678,6 @@
 msgid "FIXED"
 msgstr "AUSGEBESSERT"
 
-msgid "fixed with"
-msgstr "Geändert mit"
-
 msgid "Upgrade disabled: user != isAdmin"
 msgstr ""
 
@@ -5010,6 +5013,9 @@
 msgstr ""
 "Sie haben vergessen ENCRYPTED_PASSWD auf true in config/config.ini zu setzen."
 
+msgid "E-mail address confirmation"
+msgstr "E-Mail Bestätigung"
+
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -5888,6 +5894,16 @@
 msgstr "Diese Seite bearbeiten"
 
 #, php-format
+#~ msgid "WikiAdminUtils %s returned:"
+#~ msgstr "WikiAdminUtils %s gibt zurück:"
+
+#~ msgid "Back"
+#~ msgstr "Zurück"
+
+#~ msgid "fixed with"
+#~ msgstr "Geändert mit"
+
+#, php-format
 #~ msgid "Converted successfully %d pages"
 #~ msgstr "%d Seiten erfolgreich konvertiert"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2021-08-06 14:42:27 UTC (rev 10454)
+++ trunk/locale/po/es.po	2021-08-06 15:16:31 UTC (rev 10455)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-05 12:42+0200\n"
+"POT-Creation-Date: 2021-08-06 17:14+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -2584,6 +2584,10 @@
 msgid "Illegal characters in external URL."
 msgstr ""
 
+#, php-format
+msgid "Malformed URL: “%s”"
+msgstr ""
+
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
@@ -3693,13 +3697,6 @@
 msgid "Bad action requested: %s"
 msgstr ""
 
-#, php-format
-msgid "WikiAdminUtils %s returned:"
-msgstr ""
-
-msgid "Back"
-msgstr ""
-
 msgid "Purge Markup Cache"
 msgstr ""
 
@@ -3709,13 +3706,13 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-msgid "E-mail address confirmation"
+msgid "E-mail Verification"
 msgstr "Verificación Del Email"
 
-msgid "DB Check"
+msgid "Check Wiki Database"
 msgstr ""
 
-msgid "Db Rebuild"
+msgid "Rebuild Wiki Database"
 msgstr ""
 
 msgid "Markup cache purged!"
@@ -3747,6 +3744,18 @@
 "edit them."
 msgstr ""
 
+msgid "Database check was successful."
+msgstr ""
+
+msgid "Database check failed."
+msgstr ""
+
+msgid "Database rebuild was successful."
+msgstr ""
+
+msgid "Database rebuild failed."
+msgstr ""
+
 msgid "E-mail"
 msgstr ""
 
@@ -4502,9 +4511,6 @@
 msgid "Check for necessary theme %s updates"
 msgstr ""
 
-msgid "Rename to Help: pages"
-msgstr ""
-
 #, php-format
 msgid "%s already checked in theme pgsrc"
 msgstr ""
@@ -4541,9 +4547,6 @@
 msgid "FIXED"
 msgstr ""
 
-msgid "fixed with"
-msgstr ""
-
 msgid "Upgrade disabled: user != isAdmin"
 msgstr ""
 
@@ -4883,6 +4886,9 @@
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr "ENCRYPTED_PASSWD por favor fijado a verdad en config/config.ini."
 
+msgid "E-mail address confirmation"
+msgstr "Verificación Del Email"
+
 #, php-format
 msgid ""
 "Welcome to %s!\n"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2021-08-06 14:42:27 UTC (rev 10454)
+++ trunk/locale/po/fr.po	2021-08-06 15:16:31 UTC (rev 10455)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-05 12:42+0200\n"
+"POT-Creation-Date: 2021-08-06 17:14+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."
@@ -2633,6 +2633,10 @@
 msgid "Illegal characters in external URL."
 msgstr "Caractère interdit dans une URL externe."
 
+#, php-format
+msgid "Malformed URL: “%s”"
+msgstr "URL mal formée : « %s »"
+
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
@@ -3784,13 +3788,6 @@
 msgid "Bad action requested: %s"
 msgstr ""
 
-#, php-format
-msgid "WikiAdminUtils %s returned:"
-msgstr ""
-
-msgid "Back"
-msgstr "Retour"
-
 msgid "Purge Markup Cache"
 msgstr "Purger le cache"
 
@@ -3798,16 +3795,16 @@
 msgstr "Supprimer les pages dont le nom n'est pas valide"
 
 msgid "Purge all empty, unreferenced Pages"
-msgstr ""
+msgstr "Supprimer les pages vides et non référencées"
 
-msgid "E-mail address confirmation"
-msgstr "Vérification de l'adresse électronique"
+msgid "E-mail Verification"
+msgstr "Vérification du courriel"
 
-msgid "DB Check"
-msgstr "Vérification de la base de données"
+msgid "Check Wiki Database"
+msgstr "Vérifier la base de données du wiki"
 
-msgid "Db Rebuild"
-msgstr "Régénération de la base de données"
+msgid "Rebuild Wiki Database"
+msgstr "Reconstruire la base de données du wiki"
 
 msgid "Markup cache purged!"
 msgstr "Cache de marques purgé !"
@@ -3838,6 +3835,18 @@
 "edit them."
 msgstr ""
 
+msgid "Database check was successful."
+msgstr ""
+
+msgid "Database check failed."
+msgstr ""
+
+msgid "Database rebuild was successful."
+msgstr ""
+
+msgid "Database rebuild failed."
+msgstr ""
+
 msgid "E-mail"
 msgstr "Adresse électronique"
 
@@ -4604,9 +4613,6 @@
 msgid "Check for necessary theme %s updates"
 msgstr "Vérification des mises à jour nécessaires pour le thème %s"
 
-msgid "Rename to Help: pages"
-msgstr "Renommer les pages en Aide:"
-
 #, php-format
 msgid "%s already checked in theme pgsrc"
 msgstr "%s déjà vérifié dans le pgsrc du thème"
@@ -4643,9 +4649,6 @@
 msgid "FIXED"
 msgstr "CORRIGÉ"
 
-msgid "fixed with"
-msgstr ""
-
 msgid "Upgrade disabled: user != isAdmin"
 msgstr "Mise à jour désactivée, vous n'êtes pas administrateur"
 
@@ -4978,6 +4981,9 @@
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr "Veuillez définir ENCRYPTED_PASSWD à true dans config/config.ini."
 
+msgid "E-mail address confirmation"
+msgstr "Vérification de l'adresse électronique"
+
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -5835,6 +5841,18 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid "Back"
+#~ msgstr "Retour"
+
+#~ msgid "DB Check"
+#~ msgstr "Vérification de la base de données"
+
+#~ msgid "Db Rebuild"
+#~ msgstr "Régénération de la base de données"
+
+#~ msgid "Rename to Help: pages"
+#~ msgstr "Renommer les pages en Aide:"
+
 #, php-format
 #~ msgid "Converted successfully %d pages"
 #~ msgstr "%d pages converties avec succès"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2021-08-06 14:42:27 UTC (rev 10454)
+++ trunk/locale/po/it.po	2021-08-06 15:16:31 UTC (rev 10455)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-05 12:42+0200\n"
+"POT-Creation-Date: 2021-08-06 17:14+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"
@@ -2561,6 +2561,10 @@
 msgid "Illegal characters in external URL."
 msgstr ""
 
+#, php-format
+msgid "Malformed URL: “%s”"
+msgstr ""
+
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
@@ -3670,13 +3674,6 @@
 msgid "Bad action requested: %s"
 msgstr ""
 
-#, php-format
-msgid "WikiAdminUtils %s returned:"
-msgstr ""
-
-msgid "Back"
-msgstr ""
-
 msgid "Purge Markup Cache"
 msgstr ""
 
@@ -3686,13 +3683,13 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-msgid "E-mail address confirmation"
+msgid "E-mail Verification"
 msgstr ""
 
-msgid "DB Check"
+msgid "Check Wiki Database"
 msgstr ""
 
-msgid "Db Rebuild"
+msgid "Rebuild Wiki Database"
 msgstr ""
 
 msgid "Markup cache purged!"
@@ -3724,6 +3721,18 @@
 "edit them."
 msgstr ""
 
+msgid "Database check was successful."
+msgstr ""
+
+msgid "Database check failed."
+msgstr ""
+
+msgid "Database rebuild was successful."
+msgstr ""
+
+msgid "Database rebuild failed."
+msgstr ""
+
 msgid "E-mail"
 msgstr ""
 
@@ -4479,9 +4488,6 @@
 msgid "Check for necessary theme %s updates"
 msgstr ""
 
-msgid "Rename to Help: pages"
-msgstr ""
-
 #, php-format
 msgid "%s already checked in theme pgsrc"
 msgstr ""
@@ -4518,9 +4524,6 @@
 msgid "FIXED"
 msgstr ""
 
-msgid "fixed with"
-msgstr "Modifica"
-
 msgid "Upgrade disabled: user != isAdmin"
 msgstr ""
 
@@ -4847,6 +4850,9 @@
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 
+msgid "E-mail address confirmation"
+msgstr ""
+
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -5667,6 +5673,9 @@
 msgid "Edit this page"
 msgstr ""
 
+#~ msgid "fixed with"
+#~ msgstr "Modifica"
+
 #~ msgid "version <em>%s</em>"
 #~ msgstr "versione <em>%s</em>"
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2021-08-06 14:42:27 UTC (rev 10454)
+++ trunk/locale/po/ja.po	2021-08-06 15:16:31 UTC (rev 10455)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-05 12:42+0200\n"
+"POT-Creation-Date: 2021-08-06 17:14+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"
@@ -2547,6 +2547,10 @@
 msgid "Illegal characters in external URL."
 msgstr ""
 
+#, php-format
+msgid "Malformed URL: “%s”"
+msgstr ""
+
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
@@ -3656,13 +3660,6 @@
 msgid "Bad action requested: %s"
 msgstr ""
 
-#, php-format
-msgid "WikiAdminUtils %s returned:"
-msgstr ""
-
-msgid "Back"
-msgstr ""
-
 msgid "Purge Markup Cache"
 msgstr "マークアップキャッシュの破棄"
 
@@ -3672,13 +3669,13 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-msgid "E-mail address confirmation"
-msgstr ""
+msgid "E-mail Verification"
+msgstr "メールアドレスを確認出来ました"
 
-msgid "DB Check"
+msgid "Check Wiki Database"
 msgstr ""
 
-msgid "Db Rebuild"
+msgid "Rebuild Wiki Database"
 msgstr ""
 
 msgid "Markup cache purged!"
@@ -3710,6 +3707,18 @@
 "edit them."
 msgstr ""
 
+msgid "Database check was successful."
+msgstr ""
+
+msgid "Database check failed."
+msgstr ""
+
+msgid "Database rebuild was successful."
+msgstr ""
+
+msgid "Database rebuild failed."
+msgstr ""
+
 msgid "E-mail"
 msgstr "メール"
 
@@ -4465,9 +4474,6 @@
 msgid "Check for necessary theme %s updates"
 msgstr ""
 
-msgid "Rename to Help: pages"
-msgstr ""
-
 #, php-format
 msgid "%s already checked in theme pgsrc"
 msgstr ""
@@ -4504,9 +4510,6 @@
 msgid "FIXED"
 msgstr ""
 
-msgid "fixed with"
-msgstr ""
-
 msgid "Upgrade disabled: user != isAdmin"
 msgstr ""
 
@@ -4833,6 +4836,9 @@
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 
+msgid "E-mail address confirmation"
+msgstr ""
+
 #, php-format
 msgid ""
 "Welcome to %s!\n"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2021-08-06 14:42:27 UTC (rev 10454)
+++ trunk/locale/po/nl.po	2021-08-06 15:16:31 UTC (rev 10455)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-05 12:42+0200\n"
+"POT-Creation-Date: 2021-08-06 17:14+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"
@@ -2553,6 +2553,10 @@
 msgid "Illegal characters in external URL."
 msgstr ""
 
+#, php-format
+msgid "Malformed URL: “%s”"
+msgstr ""
+
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
@@ -3662,13 +3666,6 @@
 msgid "Bad action requested: %s"
 msgstr ""
 
-#, php-format
-msgid "WikiAdminUtils %s returned:"
-msgstr ""
-
-msgid "Back"
-msgstr "Terug"
-
 msgid "Purge Markup Cache"
 msgstr ""
 
@@ -3678,13 +3675,13 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-msgid "E-mail address confirmation"
+msgid "E-mail Verification"
 msgstr ""
 
-msgid "DB Check"
+msgid "Check Wiki Database"
 msgstr ""
 
-msgid "Db Rebuild"
+msgid "Rebuild Wiki Database"
 msgstr ""
 
 msgid "Markup cache purged!"
@@ -3716,6 +3713,18 @@
 "edit them."
 msgstr ""
 
+msgid "Database check was successful."
+msgstr ""
+
+msgid "Database check failed."
+msgstr ""
+
+msgid "Database rebuild was successful."
+msgstr ""
+
+msgid "Database rebuild failed."
+msgstr ""
+
 msgid "E-mail"
 msgstr ""
 
@@ -4471,9 +4480,6 @@
 msgid "Check for necessary theme %s updates"
 msgstr ""
 
-msgid "Rename to Help: pages"
-msgstr ""
-
 #, php-format
 msgid "%s already checked in theme pgsrc"
 msgstr ""
@@ -4510,9 +4516,6 @@
 msgid "FIXED"
 msgstr ""
 
-msgid "fixed with"
-msgstr ""
-
 msgid "Upgrade disabled: user != isAdmin"
 msgstr ""
 
@@ -4839,6 +4842,9 @@
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 
+msgid "E-mail address confirmation"
+msgstr ""
+
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -5659,6 +5665,9 @@
 msgid "Edit this page"
 msgstr ""
 
+#~ msgid "Back"
+#~ msgstr "Terug"
+
 #~ msgid "version <em>%s</em>"
 #~ msgstr "versie <em>%s</em>"
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2021-08-06 14:42:27 UTC (rev 10454)
+++ trunk/locale/po/phpwiki.pot	2021-08-06 15:16:31 UTC (rev 10455)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-05 12:42+0200\n"
+"POT-Creation-Date: 2021-08-06 17:14+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"
@@ -2547,6 +2547,10 @@
 msgid "Illegal characters in external URL."
 msgstr ""
 
+#, php-format
+msgid "Malformed URL: “%s”"
+msgstr ""
+
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
@@ -3656,13 +3660,6 @@
 msgid "Bad action requested: %s"
 msgstr ""
 
-#, php-format
-msgid "WikiAdminUtils %s returned:"
-msgstr ""
-
-msgid "Back"
-msgstr ""
-
 msgid "Purge Markup Cache"
 msgstr ""
 
@@ -3672,13 +3669,13 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-msgid "E-mail address confirmation"
+msgid "E-mail Verification"
 msgstr ""
 
-msgid "DB Check"
+msgid "Check Wiki Database"
 msgstr ""
 
-msgid "Db Rebuild"
+msgid "Rebuild Wiki Database"
 msgstr ""
 
 msgid "Markup cache purged!"
@@ -3710,6 +3707,18 @@
 "edit them."
 msgstr ""
 
+msgid "Database check was successful."
+msgstr ""
+
+msgid "Database check failed."
+msgstr ""
+
+msgid "Database rebuild was successful."
+msgstr ""
+
+msgid "Database rebuild failed."
+msgstr ""
+
 msgid "E-mail"
 msgstr ""
 
@@ -4465,9 +4474,6 @@
 msgid "Check for necessary theme %s updates"
 msgstr ""
 
-msgid "Rename to Help: pages"
-msgstr ""
-
 #, php-format
 msgid "%s already checked in theme pgsrc"
 msgstr ""
@@ -4504,9 +4510,6 @@
 msgid "FIXED"
 msgstr ""
 
-msgid "fixed with"
-msgstr ""
-
 msgid "Upgrade disabled: user != isAdmin"
 msgstr ""
 
@@ -4833,6 +4836,9 @@
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 
+msgid "E-mail address confirmation"
+msgstr ""
+
 #, php-format
 msgid ""
 "Welcome to %s!\n"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2021-08-06 14:42:27 UTC (rev 10454)
+++ trunk/locale/po/sv.po	2021-08-06 15:16:31 UTC (rev 10455)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-05 12:42+0200\n"
+"POT-Creation-Date: 2021-08-06 17:14+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -2548,6 +2548,10 @@
 msgid "Illegal characters in external URL."
 msgstr ""
 
+#, php-format
+msgid "Malformed URL: “%s”"
+msgstr ""
+
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
@@ -3657,13 +3661,6 @@
 msgid "Bad action requested: %s"
 msgstr ""
 
-#, php-format
-msgid "WikiAdminUtils %s returned:"
-msgstr ""
-
-msgid "Back"
-msgstr ""
-
 msgid "Purge Markup Cache"
 msgstr ""
 
@@ -3673,13 +3670,13 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-msgid "E-mail address confirmation"
+msgid "E-mail Verification"
 msgstr ""
 
-msgid "DB Check"
+msgid "Check Wiki Database"
 msgstr ""
 
-msgid "Db Rebuild"
+msgid "Rebuild Wiki Database"
 msgstr ""
 
 msgid "Markup cache purged!"
@@ -3711,6 +3708,18 @@
 "edit them."
 msgstr ""
 
+msgid "Database check was successful."
+msgstr ""
+
+msgid "Database check failed."
+msgstr ""
+
+msgid "Database rebuild was successful."
+msgstr ""
+
+msgid "Database rebuild failed."
+msgstr ""
+
 msgid "E-mail"
 msgstr ""
 
@@ -4466,9 +4475,6 @@
 msgid "Check for necessary theme %s updates"
 msgstr ""
 
-msgid "Rename to Help: pages"
-msgstr ""
-
 #, php-format
 msgid "%s already checked in theme pgsrc"
 msgstr ""
@@ -4505,9 +4511,6 @@
 msgid "FIXED"
 msgstr ""
 
-msgid "fixed with"
-msgstr ""
-
 msgid "Upgrade disabled: user != isAdmin"
 msgstr ""
 
@@ -4834,6 +4837,9 @@
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 
+msgid "E-mail address confirmation"
+msgstr ""
+
 #, php-format
 msgid ""
 "Welcome to %s!\n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2021-08-06 14:42:27 UTC (rev 10454)
+++ trunk/locale/po/zh.po	2021-08-06 15:16:31 UTC (rev 10455)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-05 12:42+0200\n"
+"POT-Creation-Date: 2021-08-06 17:14+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -2556,6 +2556,10 @@
 msgid "Illegal characters in external URL."
 msgstr ""
 
+#, php-format
+msgid "Malformed URL: “%s”"
+msgstr ""
+
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
@@ -3669,13 +3673,6 @@
 msgid "Bad action requested: %s"
 msgstr ""
 
-#, php-format
-msgid "WikiAdminUtils %s returned:"
-msgstr "WikiAdminUtils %s 說:"
-
-msgid "Back"
-msgstr ""
-
 msgid "Purge Markup Cache"
 msgstr "清除標記快取"
 
@@ -3685,13 +3682,13 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-msgid "E-mail address confirmation"
-msgstr "Email 驗證"
+msgid "E-mail Verification"
+msgstr "E-mail 驗證"
 
-msgid "DB Check"
+msgid "Check Wiki Database"
 msgstr ""
 
-msgid "Db Rebuild"
+msgid "Rebuild Wiki Database"
 msgstr ""
 
 msgid "Markup cache purged!"
@@ -3723,6 +3720,18 @@
 "edit them."
 msgstr ""
 
+msgid "Database check was successful."
+msgstr ""
+
+msgid "Database check failed."
+msgstr ""
+
+msgid "Database rebuild was successful."
+msgstr ""
+
+msgid "Database rebuild failed."
+msgstr ""
+
 msgid "E-mail"
 msgstr ""
 
@@ -4482,9 +4491,6 @@
 msgid "Check for necessary theme %s updates"
 msgstr ""
 
-msgid "Rename to Help: pages"
-msgstr ""
-
 #, php-format
 msgid "%s already checked in theme pgsrc"
 msgstr ""
@@ -4521,9 +4527,6 @@
 msgid "FIXED"
 msgstr ""
 
-msgid "fixed with"
-msgstr ""
-
 msgid "Upgrade disabled: user != isAdmin"
 msgstr "禁止升級: user != isAdmin"
 
@@ -4854,6 +4857,9 @@
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr "請在 config/config.ini 中設定 ENCRYPTED_PASSWD 為 true."
 
+msgid "E-mail address confirmation"
+msgstr "Email 驗證"
+
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -5683,6 +5689,10 @@
 msgid "Edit this page"
 msgstr "編輯此頁面"
 
+#, php-format
+#~ msgid "WikiAdminUtils %s returned:"
+#~ msgstr "WikiAdminUtils %s 說:"
+
 #~ msgid "Provide weather reports from the Internet."
 #~ msgstr "PhpWeather plugin 由網路取得資訊並提供天氣報告."
 

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:[10454] trunk/lib

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

Revision: 10454
          http://sourceforge.net/p/phpwiki/code/10454
Author:   vargenau
Date:     2021-08-06 14:42:27 +0000 (Fri, 06 Aug 2021)
Log Message:
-----------
functions rebuild and check: return status; display status in WikiAdminUtils

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

Modified: trunk/lib/WikiDB/backend/dbaBase.php
===================================================================
--- trunk/lib/WikiDB/backend/dbaBase.php	2021-08-06 14:40:18 UTC (rev 10453)
+++ trunk/lib/WikiDB/backend/dbaBase.php	2021-08-06 14:42:27 UTC (rev 10454)
@@ -113,11 +113,15 @@
     function rebuild($args = false)
     {
         if (!empty($args['all'])) {
-            parent::rebuild();
+            $result = parent::rebuild();
+            if ($result == false) {
+                return false;
+            }
         }
         // rebuild backlink table
         $this->_linkdb->rebuild();
         $this->optimize();
+        return true;
     }
 
     function check($args = false)

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2021-08-06 14:40:18 UTC (rev 10453)
+++ trunk/lib/WikiDB/backend/file.php	2021-08-06 14:42:27 UTC (rev 10454)
@@ -686,6 +686,7 @@
     function check($args = false)
     {
         //trigger_error("check: Not Implemented", E_USER_WARNING);
+        return true;
     }
 
     /**
@@ -699,6 +700,7 @@
     function rebuild($args = false)
     {
         //trigger_error("rebuild: Not Implemented", E_USER_WARNING);
+        return true;
     }
 
     function _parse_searchwords($search)

Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2021-08-06 14:40:18 UTC (rev 10453)
+++ trunk/lib/WikiDB/backend.php	2021-08-06 14:42:27 UTC (rev 10454)
@@ -494,6 +494,7 @@
      */
     function check($args = false)
     {
+        return true;
     }
 
     /**
@@ -530,6 +531,7 @@
             $this->set_links($pagename, $links);
             $this->unlock(array('version', 'page', 'recent', 'link', 'nonempty'));
         }
+        return true;
     }
 
     function _parse_searchwords($search)

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2021-08-06 14:40:18 UTC (rev 10453)
+++ trunk/lib/plugin/WikiAdminUtils.php	2021-08-06 14:42:27 UTC (rev 10454)
@@ -156,9 +156,9 @@
             }
         }
         $pages->free();
-        if (!$count)
+        if (!$count) {
             return _("No pages with bad names had to be deleted.");
-        else {
+        } else {
             return HTML(fmt("Deleted %d pages with invalid names:", $count),
                 HTML::div(array('class' => 'align-left'), $list));
         }
@@ -210,8 +210,12 @@
     {
         longer_timeout(180);
         $dbh = $request->getDbh();
-        //FIXME: display result.
-        return $dbh->_backend->check($args);
+        $result = $dbh->_backend->check($args);
+        if ($result) {
+            return _("Database check was successful.");
+        } else {
+            return _("Database check failed.");
+        }
     }
 
     private function _do_db_rebuild($request, $args)
@@ -218,8 +222,12 @@
     {
         longer_timeout(240);
         $dbh = $request->getDbh();
-        //FIXME: display result.
-        return $dbh->_backend->rebuild($args);
+        $result = $dbh->_backend->rebuild($args);
+        if ($result) {
+            return _("Database rebuild was successful.");
+        } else {
+            return _("Database rebuild failed.");
+        }
     }
 
     // pagelist with enable/disable button

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10453] trunk/lib/plugin/WikiAdminUtils.php

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

Revision: 10453
          http://sourceforge.net/p/phpwiki/code/10453
Author:   vargenau
Date:     2021-08-06 14:40:18 +0000 (Fri, 06 Aug 2021)
Log Message:
-----------
lib/plugin/WikiAdminUtils.php: better labels

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

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2021-08-06 14:36:35 UTC (rev 10452)
+++ trunk/lib/plugin/WikiAdminUtils.php	2021-08-06 14:40:18 UTC (rev 10453)
@@ -122,9 +122,9 @@
         $labels = array('purge-cache' => _("Purge Markup Cache"),
             'purge-bad-pagenames' => _("Purge all Pages With Invalid Names"),
             'purge-empty-pages' => _("Purge all empty, unreferenced Pages"),
-            'email-verification' => _("E-mail address confirmation"),
-            'db-check' => _("DB Check"),
-            'db-rebuild' => _("Db Rebuild")
+            'email-verification' => _("E-mail Verification"),
+            'db-check' => _("Check Wiki Database"),
+            'db-rebuild' => _("Rebuild Wiki Database")
         );
         return @$labels[$action];
     }

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

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

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

Revision: 10452
          http://sourceforge.net/p/phpwiki/code/10452
Author:   vargenau
Date:     2021-08-06 14:36:35 +0000 (Fri, 06 Aug 2021)
Log Message:
-----------
Use default label for WikiAdminUtils; convert-cached-html no longer exists

Modified Paths:
--------------
    trunk/locale/de/pgsrc/PhpWikiSystemverwalten
    trunk/locale/fr/pgsrc/AdministrationDePhpWiki
    trunk/locale/fr/pgsrc/D%C3%A9bogageDePhpWiki
    trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki
    trunk/locale/nl/pgsrc/PhpWikiBeheer
    trunk/locale/sv/pgsrc/PhpWikiAdministration
    trunk/locale/zh/pgsrc/PhpWikiAdministration
    trunk/locale/zh/pgsrc/PhpWikiDebug
    trunk/pgsrc/Help%2FWikiAdminUtilsPlugin
    trunk/pgsrc/PhpWikiAdministration
    trunk/pgsrc/PhpWikiDebug

Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten	2021-08-06 10:56:27 UTC (rev 10451)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten	2021-08-06 14:36:35 UTC (rev 10452)
@@ -1,4 +1,4 @@
-Date: Sat, 26 Dec 2020 12:40:06 +0000
+Date: Fri,  6 Aug 2021 16:19:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiSystemverwalten;
@@ -42,7 +42,7 @@
 
 Dieser Link zeigt eine Liste aller mit E-Mail registrierten Benutzer, und Checkboxes um die Verifizierung manuell zu ändern.
 
-<<WikiAdminUtils action=email-verification label="E-Mail Verifizierung">>
+<<WikiAdminUtils action=email-verification>>
 
 == Aufräumen ==
 

Modified: trunk/locale/fr/pgsrc/AdministrationDePhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/AdministrationDePhpWiki	2021-08-06 10:56:27 UTC (rev 10451)
+++ trunk/locale/fr/pgsrc/AdministrationDePhpWiki	2021-08-06 14:36:35 UTC (rev 10452)
@@ -1,4 +1,4 @@
-Date: Sat, 26 Dec 2020 13:01:53 +0000
+Date: Fri,  6 Aug 2021 16:19:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=AdministrationDePhpWiki;
@@ -41,7 +41,7 @@
 
 Ce bouton affichera la liste de tous les utilisateurs qui ont une adresse reconnue et les boutons pour effectuer une vérification manuelle.
 
-<<WikiAdminUtils action=email-verification label="Vérification du courriel">>
+<<WikiAdminUtils action=email-verification">>
 
 == Nettoyage ==
 

Modified: trunk/locale/fr/pgsrc/D%C3%A9bogageDePhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/D%C3%A9bogageDePhpWiki	2021-08-06 10:56:27 UTC (rev 10451)
+++ trunk/locale/fr/pgsrc/D%C3%A9bogageDePhpWiki	2021-08-06 14:36:35 UTC (rev 10452)
@@ -1,4 +1,4 @@
-Date: Thu, 26 Mar 2020 12:45:53 +0000
+Date: Fri,  6 Aug 2021 16:19:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=D%C3%A9bogageDePhpWiki;
@@ -26,7 +26,7 @@
 cache. (Le contenu de chaque page sera transformé et remis en cache
 la prochaine fois que quelqu'un la verra.)
 
-<<WikiAdminUtils action=purge-cache label="Purge du cache" >>
+<<WikiAdminUtils action=purge-cache>>
 
 === Suppression des pages au nom illégal dans la base de données du wiki ===
 
@@ -36,7 +36,7 @@
 
 Ce bouton effacera toutes les pages dont le nom est illégal, sans possibilité de récupération.
 
-<<WikiAdminUtils action=purge-bad-pagenames label="Nettoyage des pages mal nommées" >>
+<<WikiAdminUtils action=purge-bad-pagenames>>
 
 === Suppression des pages vides et non référencées ===
 
@@ -43,21 +43,13 @@
 **Attention !** en appuyant sur ce bouton toutes les pages vides et non référencées seront supprimées sans aucune possiblité de les restaurer.
 Ceci supprimera toute possibilité de retrouver les pages ainsi supprimées.
 
-<<WikiAdminUtils action=purge-empty-pages label="Purger les pages vides et non référencées" >>
+<<WikiAdminUtils action=purge-empty-pages>>
 
-== Conversion de cached_html vers une nouvelle colonne SQL ==
-
-Ceci n'est nécessaire pour SQL ou ADODB que si vous n'avez pas fait action=upgrade, mais avez créé
-le champ cached_html de la nouvelle page séparément, et que vous voulez maintenant
-déplacer page.pagedata vers page.cached_html.
-
-<<WikiAdminUtils action=convert-cached-html label="Convertir cached_html" >>
-
 == Vérification de la base de données du wiki ==
 
 Ce bouton vérifie la cohérence de la base de données des pages du wiki. Cela peut prendre plusieurs minutes.
 
-<<WikiAdminUtils action=db-check label="Vérifier de la base de données du wiki" >>
+<<WikiAdminUtils action=db-check>>
 
 == Reconstruction de la base de données du wiki ==
 
@@ -64,7 +56,7 @@
 Ceci va retransformer toutes les pages et reconstruire la base de données du wiki en cas d'incohérences ou de mise à jour de l'analyseur syntaxique.
 Ceci peut durer plusieurs minutes, utiliser beaucoup de mémoire et éventuellement échouer !
 
-<<WikiAdminUtils action=db-rebuild label="Reconstruire de la base de données du wiki" >>
+<<WikiAdminUtils action=db-rebuild>>
 
 ----
 [[CatégoriePageDAction]]

Modified: trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki
===================================================================
--- trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki	2021-08-06 10:56:27 UTC (rev 10451)
+++ trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki	2021-08-06 14:36:35 UTC (rev 10452)
@@ -1,4 +1,4 @@
-Date: Tue,  9 Apr 2019 17:57:35 +0000
+Date: Fri,  6 Aug 2021 16:19:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=AmministrazioneDiPhpWiki;
@@ -41,7 +41,7 @@
 
 This button will show a list of all users with registered emails and buttons to set the verification status manually.
 
-<<WikiAdminUtils action=email-verification label="Email Verification">>
+<<WikiAdminUtils action=email-verification>>
 
 == Cleanup ==
 

Modified: trunk/locale/nl/pgsrc/PhpWikiBeheer
===================================================================
--- trunk/locale/nl/pgsrc/PhpWikiBeheer	2021-08-06 10:56:27 UTC (rev 10451)
+++ trunk/locale/nl/pgsrc/PhpWikiBeheer	2021-08-06 14:36:35 UTC (rev 10452)
@@ -1,4 +1,4 @@
-Date: Thu, 24 Dec 2020 17:40:03 +0000
+Date: Fri,  6 Aug 2021 16:19:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiBeheer;
@@ -41,7 +41,7 @@
 
 This button will show a list of all users with registered emails and buttons to set the verification status manually.
 
-<<WikiAdminUtils action=email-verification label="Email Verification">>
+<<WikiAdminUtils action=email-verification>>
 
 == Cleanup ==
 

Modified: trunk/locale/sv/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/locale/sv/pgsrc/PhpWikiAdministration	2021-08-06 10:56:27 UTC (rev 10451)
+++ trunk/locale/sv/pgsrc/PhpWikiAdministration	2021-08-06 14:36:35 UTC (rev 10452)
@@ -1,4 +1,4 @@
-Date: Fri, 22 Dec 2020 10:36:59 +0000
+Date: Fri,  6 Aug 2021 16:19:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration;
@@ -41,7 +41,7 @@
 
 This button will show a list of all users with registered emails and buttons to set the verification status manually.
 
-<<WikiAdminUtils action=email-verification label="Email Verification">>
+<<WikiAdminUtils action=email-verification>>
 
 == Cleanup ==
 

Modified: trunk/locale/zh/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/locale/zh/pgsrc/PhpWikiAdministration	2021-08-06 10:56:27 UTC (rev 10451)
+++ trunk/locale/zh/pgsrc/PhpWikiAdministration	2021-08-06 14:36:35 UTC (rev 10452)
@@ -1,4 +1,4 @@
-Date: Thu, 24 Dec 2020 18:13:17 +0000
+Date: Fri,  6 Aug 2021 16:19:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration;
@@ -41,7 +41,7 @@
 
 This button will show a list of all users with registered emails and buttons to set the verification status manually.
 
-<<WikiAdminUtils action=email-verification label="Email Verification">>
+<<WikiAdminUtils action=email-verification>>
 
 == Cleanup ==
 

Modified: trunk/locale/zh/pgsrc/PhpWikiDebug
===================================================================
--- trunk/locale/zh/pgsrc/PhpWikiDebug	2021-08-06 10:56:27 UTC (rev 10451)
+++ trunk/locale/zh/pgsrc/PhpWikiDebug	2021-08-06 14:36:35 UTC (rev 10452)
@@ -1,4 +1,4 @@
-Date: Thu,  5 Aug 2021 09:59:14 +0000
+Date: Fri,  6 Aug 2021 16:19:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiDebug;
@@ -23,7 +23,7 @@
 點擊這個按鈕將會清除所有快取的轉換內容. (每個頁面內容在下次有人想看這些頁面時
 進行轉換並重新放到快取裡面去.)
 
-<<WikiAdminUtils action=purge-cache label="Purge Markup Cache" >>
+<<WikiAdminUtils action=purge-cache>>
 
 === 清理 WikiDB 裡的非法檔案名稱 Clean Wiki Database of Illegal Filenames ==
 
@@ -32,7 +32,7 @@
 
 這個按鈕將會刪除任何有非法頁面名稱的頁面.
 
-<<WikiAdminUtils action=purge-bad-pagenames label="Purge bad pagenames" >>
+<<WikiAdminUtils action=purge-bad-pagenames>>
 
 == Clean Wiki Database of empty and unreferenced pages ==
 
@@ -39,13 +39,13 @@
 **Warning!** This button will delete every empty and unreferenced page, without any possibility to restore them again.
 This will disable the possibility to revert or get back any deleted page.
 
-<<WikiAdminUtils action=purge-empty-pages label="Purge all empty unreferenced pages" >>
+<<WikiAdminUtils action=purge-empty-pages>>
 
 == Check Wiki Database ==
 
 This button will check the Wiki page database for consistency. This can last several minutes.
 
-<<WikiAdminUtils action=db-check label="Check Wiki Database" >>
+<<WikiAdminUtils action=db-check>>
 
 == Rebuild Wiki Database ==
 
@@ -52,7 +52,7 @@
 This will retransform all pages and rebuild the Wiki database on consistency errors or parser updates.
 This can last several minutes, eat a lot of memory and possibly times out!!
 
-<<WikiAdminUtils action=db-rebuild label="Rebuild Wiki Database" >>
+<<WikiAdminUtils action=db-rebuild>>
 
 ----
 [[CategoryActionPage]]

Modified: trunk/pgsrc/Help%2FWikiAdminUtilsPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminUtilsPlugin	2021-08-06 10:56:27 UTC (rev 10451)
+++ trunk/pgsrc/Help%2FWikiAdminUtilsPlugin	2021-08-06 14:36:35 UTC (rev 10452)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Fri,  6 Aug 2021 16:19:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiAdminUtilsPlugin;
@@ -10,13 +10,12 @@
 
 == Usage ==
 {{{
-<<WikiAdminUtils action="purge-cache" >>
-<<WikiAdminUtils action="purge-bad-pagenames" >>
-<<WikiAdminUtils action="purge-empty-pages" >>
-<<WikiAdminUtils action="email-verification" >>
-<<WikiAdminUtils action="convert-cached-html" >>
-<<WikiAdminUtils action="db-check" >>
-<<WikiAdminUtils action="db-rebuild" >>
+<<WikiAdminUtils action="purge-cache">>
+<<WikiAdminUtils action="purge-bad-pagenames">>
+<<WikiAdminUtils action="purge-empty-pages">>
+<<WikiAdminUtils action="email-verification">>
+<<WikiAdminUtils action="db-check">>
+<<WikiAdminUtils action="db-rebuild">>
 }}}
 
 == Arguments ==
@@ -28,7 +27,7 @@
 ! Default value
 |-
 | **action**
-| Valid action are: "purge-cache", "purge-bad-pagenames", "purge-empty-pages", "email-verification", "convert-cached-html", "db-check" and "db-rebuild"
+| Valid action are: "purge-cache", "purge-bad-pagenames", "purge-empty-pages", "email-verification", "db-check" and "db-rebuild"
 | //None//
 |-
 | **label**
@@ -39,10 +38,10 @@
 == Example ==
 
 {{{
-<<WikiAdminUtils action="purge-cache" >>
+<<WikiAdminUtils action="purge-cache">>
 }}}
 
-<<WikiAdminUtils action="purge-cache" >>
+<<WikiAdminUtils action="purge-cache">>
 
 == Authors ==
 * [[Help:Jeff Dairiki|Jeff Dairiki]]

Modified: trunk/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/pgsrc/PhpWikiAdministration	2021-08-06 10:56:27 UTC (rev 10451)
+++ trunk/pgsrc/PhpWikiAdministration	2021-08-06 14:36:35 UTC (rev 10452)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Fri,  6 Aug 2021 16:19:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration;
@@ -34,14 +34,14 @@
 
 <?plugin-form PasswordReset textinput=user method=post ?>
 
-=== Email Verification ===
+=== E-mail Verification ===
 
 This is currently non-strict, leaving some possible holes in not being able to
 connect to certain mail hosts, which can be overridden below.
 
-This button will show a list of all users with registered emails and buttons to set the verification status manually.
+This button will show a list of all users with registered e-mails and buttons to set the verification status manually.
 
-<<WikiAdminUtils action=email-verification label="Email Verification">>
+<<WikiAdminUtils action=email-verification>>
 
 == Cleanup ==
 

Modified: trunk/pgsrc/PhpWikiDebug
===================================================================
--- trunk/pgsrc/PhpWikiDebug	2021-08-06 10:56:27 UTC (rev 10451)
+++ trunk/pgsrc/PhpWikiDebug	2021-08-06 14:36:35 UTC (rev 10452)
@@ -1,4 +1,4 @@
-Date: Thu,  5 Aug 2021 09:59:14 +0000
+Date: Fri,  6 Aug 2021 16:19:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiDebug;
@@ -26,7 +26,7 @@
 content. (Each pages content will be transformed and re-cached next
 time someone views it.)
 
-<<WikiAdminUtils action=purge-cache label="Purge Markup Cache" >>
+<<WikiAdminUtils action=purge-cache>>
 
 == Clean Wiki Database of Illegal Filenames ==
 
@@ -36,7 +36,7 @@
 
 This button will delete any pages with illegal page names, without possibility to restore.
 
-<<WikiAdminUtils action=purge-bad-pagenames label="Purge bad pagenames" >>
+<<WikiAdminUtils action=purge-bad-pagenames>>
 
 == Clean Wiki Database of empty and unreferenced pages ==
 
@@ -43,13 +43,13 @@
 **Warning!** This button will delete every empty and unreferenced page, without any possibility to restore them again.
 This will disable the possibility to revert or get back any deleted page.
 
-<<WikiAdminUtils action=purge-empty-pages label="Purge all empty unreferenced pages" >>
+<<WikiAdminUtils action=purge-empty-pages>>
 
 == Check Wiki Database ==
 
 This button will check the Wiki page database for consistency. This can last several minutes.
 
-<<WikiAdminUtils action=db-check label="Check Wiki Database" >>
+<<WikiAdminUtils action=db-check>>
 
 == Rebuild Wiki Database ==
 
@@ -56,7 +56,7 @@
 This will retransform all pages and rebuild the Wiki database on consistency errors or parser updates.
 This can last several minutes, eat a lot of memory and possibly times out!!
 
-<<WikiAdminUtils action=db-rebuild label="Rebuild Wiki Database" >>
+<<WikiAdminUtils action=db-rebuild>>
 
 ----
 [[CategoryActionPage]]

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10451] trunk/lib/plugin/RedirectTo.php

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

Revision: 10451
          http://sourceforge.net/p/phpwiki/code/10451
Author:   vargenau
Date:     2021-08-06 10:56:27 +0000 (Fri, 06 Aug 2021)
Log Message:
-----------
lib/plugin/RedirectTo.php: check IsSafeURL

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

Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php	2021-08-06 10:34:32 UTC (rev 10450)
+++ trunk/lib/plugin/RedirectTo.php	2021-08-06 10:56:27 UTC (rev 10451)
@@ -75,6 +75,9 @@
             if ($url != $href) { // URL contains tags
                 return $this->disabled(_("Illegal characters in external URL."));
             }
+            if (!IsSafeURL($url, true)) { // http or https only
+                return $this->error(fmt("Malformed URL: “%s”", $url));
+            }
             $thispage = $request->getPage();
             if (!$thispage->get('locked')) {
                 return $this->disabled(_("Redirect to an external URL is only allowed in locked pages."));

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

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

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

Revision: 10450
          http://sourceforge.net/p/phpwiki/code/10450
Author:   vargenau
Date:     2021-08-06 10:34:32 +0000 (Fri, 06 Aug 2021)
Log Message:
-----------
Remove "abs_path"

Modified Paths:
--------------
    trunk/lib/plugin/RedirectTo.php
    trunk/lib/plugin/WikiAdminUtils.php

Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php	2021-08-06 10:24:32 UTC (rev 10449)
+++ trunk/lib/plugin/RedirectTo.php	2021-08-06 10:34:32 UTC (rev 10450)
@@ -80,9 +80,7 @@
                 return $this->disabled(_("Redirect to an external URL is only allowed in locked pages."));
             }
         } elseif ($page) {
-            $url = WikiURL($page,
-                array('redirectfrom' => $request->getArg('pagename')),
-                'abs_path');
+            $url = WikiURL($page, array('redirectfrom' => $request->getArg('pagename')));
         } else {
             return $this->error(_("'href' or 'page' parameter missing."));
         }
@@ -97,9 +95,9 @@
 
         $redirectfrom = $request->getArg('redirectfrom');
         if ($redirectfrom !== false) {
-            if ($redirectfrom)
+            if ($redirectfrom) {
                 return $this->disabled(_("Double redirect not allowed."));
-            else {
+            } else {
                 // Got here by following the "Redirected from ..." link
                 // on a browse page.
                 return $this->disabled(_("Viewing redirecting page."));

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2021-08-06 10:24:32 UTC (rev 10449)
+++ trunk/lib/plugin/WikiAdminUtils.php	2021-08-06 10:34:32 UTC (rev 10450)
@@ -112,9 +112,7 @@
         if (strpos($return_url, '?')) {
             $return_url = substr($return_url, 0, strpos($return_url, '?'));
         }
-        $url = WikiURL($return_url,
-                array('warningmsg' => $message),
-                'abs_path');
+        $url = WikiURL($return_url, array('warningmsg' => $message));
 
         return $request->redirect($url);
     }

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