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

[phpwiki-checkins] SF.net SVN: phpwiki:[10774] trunk/themes/blog/images/pictures/ raton laveur.jpg

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

Revision: 10774
          http://sourceforge.net/p/phpwiki/code/10774
Author:   vargenau
Date:     2021-12-10 21:28:11 +0000 (Fri, 10 Dec 2021)
Log Message:
-----------
Et un raton laveur...

Added Paths:
-----------
    trunk/themes/blog/images/pictures/raton laveur.jpg

Added: trunk/themes/blog/images/pictures/raton laveur.jpg
===================================================================
(Binary files differ)

Index: trunk/themes/blog/images/pictures/raton laveur.jpg
===================================================================
--- trunk/themes/blog/images/pictures/raton laveur.jpg	2021-12-10 20:50:49 UTC (rev 10773)
+++ trunk/themes/blog/images/pictures/raton laveur.jpg	2021-12-10 21:28:11 UTC (rev 10774)

Property changes on: trunk/themes/blog/images/pictures/raton laveur.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/jpeg
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10773] trunk/lib/plugin/PhotoAlbum.php

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

Revision: 10773
          http://sourceforge.net/p/phpwiki/code/10773
Author:   vargenau
Date:     2021-12-10 20:50:49 +0000 (Fri, 10 Dec 2021)
Log Message:
-----------
PhotoAlbum plugin: rawurlencode anchor in URL

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

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2021-12-10 19:59:05 UTC (rev 10772)
+++ trunk/lib/plugin/PhotoAlbum.php	2021-12-10 20:50:49 UTC (rev 10773)
@@ -304,12 +304,12 @@
             $url = WikiURL($request->getPage(),
                 array("p" => basename($value["name"])))
                 . "#"
-                . basename($value["name"]);
+                . rawurlencode(basename($value["name"]));
 
             $b_url = WikiURL($request->getPage(),
                 array("h" => basename($value["name"])))
                 . "#"
-                . basename($value["name"]);
+                . rawurlencode(basename($value["name"]));
             $url_text = $link
                 ? HTML::a(array("href" => "$url"), basename($value["desc"]))
                 : basename($value["name"]);

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

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

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

Revision: 10772
          http://sourceforge.net/p/phpwiki/code/10772
Author:   vargenau
Date:     2021-12-10 19:59:05 +0000 (Fri, 10 Dec 2021)
Log Message:
-----------
Replace strftime by date when possible

Modified Paths:
--------------
    trunk/lib/WikiTheme.php
    trunk/themes/Crao/templates/head.tmpl
    trunk/themes/Crao/templates/navbar.tmpl
    trunk/themes/Wordpress/templates/actionbar.tmpl
    trunk/themes/default/templates/head.tmpl
    trunk/themes/default/templates/navbar.tmpl
    trunk/themes/wikilens/templates/head.tmpl
    trunk/themes/wikilens/templates/navbar.tmpl

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/lib/WikiTheme.php	2021-12-10 19:59:05 UTC (rev 10772)
@@ -1582,8 +1582,7 @@
 
     function calendarLink($date = false)
     {
-        return $this->calendarBase() . '/' .
-            strftime("%Y-%m-%d", $date ? $date : time());
+        return $this->calendarBase() . '/' . date("Y-m-d", $date ? $date : time());
     }
 
     function calendarBase()

Modified: trunk/themes/Crao/templates/head.tmpl
===================================================================
--- trunk/themes/Crao/templates/head.tmpl	2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/Crao/templates/head.tmpl	2021-12-10 19:59:05 UTC (rev 10772)
@@ -67,7 +67,7 @@
       ?>
 <?php /* Today's calendar page for the user if it exists
        */
-      $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time()); //FIXME
+      $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
       $dbi = $request->getDbh();
       if ($dbi->isWikiPage($UserCalPageTodayTitle)) {
           $UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);

Modified: trunk/themes/Crao/templates/navbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/navbar.tmpl	2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/Crao/templates/navbar.tmpl	2021-12-10 19:59:05 UTC (rev 10772)
@@ -28,7 +28,7 @@
     $UserCalPageTitle = $user->getId() . '/' . _("Calendar");
     $dbi = $request->getDbh();
     if ($dbi->isWikiPage($UserCalPageTitle)) {
-        $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
+        $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
         //$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
 ?>
 <?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>

Modified: trunk/themes/Wordpress/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/actionbar.tmpl	2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/Wordpress/templates/actionbar.tmpl	2021-12-10 19:59:05 UTC (rev 10772)
@@ -31,7 +31,7 @@
         $UserCalPageTitle = $user->getId() . '/' . _("Calendar");
         $dbi = $request->getDbh();
         if ($dbi->isWikiPage($UserCalPageTitle)) {
-          $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
+          $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
          ?>
          <li>
          <?php echo $SEP?><?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>

Modified: trunk/themes/default/templates/head.tmpl
===================================================================
--- trunk/themes/default/templates/head.tmpl	2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/default/templates/head.tmpl	2021-12-10 19:59:05 UTC (rev 10772)
@@ -73,7 +73,7 @@
       ?>
 <?php /* Today's calendar page for the user if it exists
        */
-      $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time()); //FIXME
+      $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
       $dbi = $request->getDbh();
       if ($dbi->isWikiPage($UserCalPageTodayTitle)) {
           $UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);

Modified: trunk/themes/default/templates/navbar.tmpl
===================================================================
--- trunk/themes/default/templates/navbar.tmpl	2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/default/templates/navbar.tmpl	2021-12-10 19:59:05 UTC (rev 10772)
@@ -29,7 +29,7 @@
     $UserCalPageTitle = $user->getId() . '/' . _("Calendar");
     $dbi = $request->getDbh();
     if ($dbi->isWikiPage($UserCalPageTitle)) {
-        $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
+        $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
         //$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
 ?>
 <?php echo $SEP?>

Modified: trunk/themes/wikilens/templates/head.tmpl
===================================================================
--- trunk/themes/wikilens/templates/head.tmpl	2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/wikilens/templates/head.tmpl	2021-12-10 19:59:05 UTC (rev 10772)
@@ -66,7 +66,7 @@
       ?>
 <?php /* Today's calendar page for the user if it exists
        */
-      $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time()); //FIXME
+      $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
       $dbi = $request->getDbh();
       if ($dbi->isWikiPage($UserCalPageTodayTitle)) {
           $UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);

Modified: trunk/themes/wikilens/templates/navbar.tmpl
===================================================================
--- trunk/themes/wikilens/templates/navbar.tmpl	2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/wikilens/templates/navbar.tmpl	2021-12-10 19:59:05 UTC (rev 10772)
@@ -25,7 +25,7 @@
     $UserCalPageTitle = $user->getId() . '/' . _("Calendar");
     $dbi = $request->getDbh();
     if ($dbi->isWikiPage($UserCalPageTitle)) {
-        $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
+        $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
         //$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
 ?><?php echo $NSEP?><?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>
 <?php }} ?><?php if (!empty($user) && $user->isAdmin()) { ?>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10771] trunk/lib/plugin/PhotoAlbum.php

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

Revision: 10771
          http://sourceforge.net/p/phpwiki/code/10771
Author:   vargenau
Date:     2021-12-10 10:02:15 +0000 (Fri, 10 Dec 2021)
Log Message:
-----------
PhotoAlbum plugin: fix width with px

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

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2021-12-10 09:59:39 UTC (rev 10770)
+++ trunk/lib/plugin/PhotoAlbum.php	2021-12-10 10:02:15 UTC (rev 10771)
@@ -256,9 +256,11 @@
             $newwidth = $this->newSize($size[0], $width);
             if ($width != 'auto' && $newwidth > 0) {
                 if (is_numeric($newwidth)) {
-                    $newwidth = $newwidth.'px';
+                    $newwidthpx = $newwidth.'px';
+                } else {
+                    $newwidthpx = $newwidth;
                 }
-                $params = array_merge($params, array("style" => 'width: '.$newwidth));
+                $params = array_merge($params, array("style" => 'width: '.$newwidthpx));
             }
             if (($mode == 'thumbs' || $mode == 'tiles' || $mode == 'list')) {
                 if (!empty($size[0])) {
@@ -642,9 +644,13 @@
         } else {
             $src = '/'.$params['src'];
         }
+        $width = $params['width'];
+        if (is_numeric($width)) {
+            $width = $width.'px';
+        }
         if (array_key_exists('width', $params)) {
             return HTML::img(array('src' => $src,
-                                   'style' => 'width: '.$params['width'],
+                                   'style' => 'width: '.$width,
                                    'alt' => $params['alt']));
         } else {
             return HTML::img(array('src' => $src,

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

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

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

Revision: 10770
          http://sourceforge.net/p/phpwiki/code/10770
Author:   vargenau
Date:     2021-12-10 09:59:39 +0000 (Fri, 10 Dec 2021)
Log Message:
-----------
pgsrc/Help%2FPhotoAlbumPlugin: there are no arguments desc and sort

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

Modified: trunk/pgsrc/Help%2FPhotoAlbumPlugin
===================================================================
--- trunk/pgsrc/Help%2FPhotoAlbumPlugin	2021-12-09 18:28:38 UTC (rev 10769)
+++ trunk/pgsrc/Help%2FPhotoAlbumPlugin	2021-12-10 09:59:39 UTC (rev 10770)
@@ -1,4 +1,4 @@
-Date: Wed,  8 Dec 2021 10:26:58 +0000
+Date: Fri, 10 Dec 2021 10:54:25 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPhotoAlbumPlugin;
@@ -11,15 +11,7 @@
 == Usage ==
 
 {{{
-<<PhotoAlbum
-         src=http://server/textfile
-         mode=[column|row]
-         align=[center|left|right]
-         desc=true
-         sort=false
-         height=100%
-         width=100%
->>
+<<PhotoAlbum arguments>>
 }}}
 
 == Arguments ==
@@ -34,7 +26,7 @@
 |-
 | **src**
 |
-Url or local path to a CSV textfile which separates filename and
+URL or local path to a CSV textfile which separates filename and
 description of each photo. Photos listed in the text file have to be in same
 directory as the file. Descriptions are optional.
 
@@ -44,8 +36,8 @@
 |
 |-
 | **url**
-| Defines the webpath to the srcdir directory
-|
+| Defines the webpath to the srcdir directory.
+| //empty//
 |-
 | **mode**
 |
@@ -88,20 +80,12 @@
 | center, right or left
 | center
 |-
-| **desc**
-| Boolean. If true, display any descriptions given in the text file
-| true
-|-
-| **sort**
-| Sort images by file name
-| By default the order in the text file is followed
-|-
 | **bgcolor**
-| cell bgcolor
+| Cell background color
 | #eae8e8 (lightgrey)
 |-
 | **hlcolor**
-| highlight color
+| Highlight color
 | #c0c0ff (lightblue)
 |-
 | **height**, **width**

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

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

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

Revision: 10769
          http://sourceforge.net/p/phpwiki/code/10769
Author:   vargenau
Date:     2021-12-09 18:28:38 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
Update pgsrc

Modified Paths:
--------------
    trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin
    trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
    trunk/pgsrc/Help%2FAllPagesPlugin
    trunk/pgsrc/Help%2FAllUsersPlugin
    trunk/pgsrc/Help%2FAtomFeedPlugin
    trunk/pgsrc/Help%2FAuthorHistoryPlugin
    trunk/pgsrc/Help%2FBackLinksPlugin
    trunk/pgsrc/Help%2FChartPlugin
    trunk/pgsrc/Help%2FCreateBibPlugin
    trunk/pgsrc/Help%2FCreateTocPlugin
    trunk/pgsrc/Help%2FFileInfoPlugin
    trunk/pgsrc/Help%2FFullTextSearchPlugin
    trunk/pgsrc/Help%2FGoogleMapsPlugin
    trunk/pgsrc/Help%2FIncludePagePlugin
    trunk/pgsrc/Help%2FInterWikiSearchPlugin
    trunk/pgsrc/Help%2FMostPopularPlugin
    trunk/pgsrc/Help%2FNewPagesPerUserPlugin
    trunk/pgsrc/Help%2FOrphanedPagesPlugin
    trunk/pgsrc/Help%2FPageGroupPlugin
    trunk/pgsrc/Help%2FPasswordResetPlugin
    trunk/pgsrc/Help%2FRssFeedPlugin
    trunk/pgsrc/Help%2FSiteMapPlugin
    trunk/pgsrc/Help%2FSyntaxHighlighterPlugin
    trunk/pgsrc/Help%2FTemplatePlugin
    trunk/pgsrc/Help%2FTranscludePlugin
    trunk/pgsrc/Help%2FUnfoldSubpagesPlugin
    trunk/pgsrc/Help%2FUserRatingsPlugin
    trunk/pgsrc/Help%2FWikiAdminChownPlugin
    trunk/pgsrc/Help%2FWikiAdminDeleteAclPlugin
    trunk/pgsrc/Help%2FWikiAdminPurgePlugin
    trunk/pgsrc/Help%2FWikiAdminRemovePlugin
    trunk/pgsrc/Help%2FWikiAdminRenamePlugin
    trunk/pgsrc/Help%2FWikiAdminSearchReplacePlugin
    trunk/pgsrc/Help%2FWikiAdminSetAclPlugin
    trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin
    trunk/pgsrc/Help%2FWikiAdminSetExternalPlugin
    trunk/pgsrc/Help%2FWikiAdminUtilsPlugin

Modified: trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Tue, 30 Nov 2021 13:29:00 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FInhaltsVerzeichnisPlugin;
@@ -99,9 +99,9 @@
 |-
 | 3 || ~! || ~=~=~=~= || h4
 |-
-| 4 || //None// || ~=~=~=~=~= || h5
+| 4 || //none// || ~=~=~=~=~= || h5
 |-
-| 5 || //None// || ~=~=~=~=~=~= || h6
+| 5 || //none// || ~=~=~=~=~=~= || h6
 |}
 
 == Beispiele ==

Modified: trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 26 Dec 2020 12:40:06 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FVorlagePlugin;
@@ -61,11 +61,11 @@
 |-
 | **page**
 | pagename to be included as template
-| //None// (required argument)
+| //none// (required argument)
 |-
 | **vars**
 | optional parameters to be expanded inside the template
-| (empty)
+| //empty//
 |-
 | **rev**
 | page revision
@@ -73,11 +73,11 @@
 |-
 | **section**
 | just include a named section
-| (empty)
+| //empty//
 |-
 | **sectionhead**
 | when including a named section show the heading
-| (empty)
+| //empty//
 |}
 
 === Page to include ===

Modified: trunk/pgsrc/Help%2FAllPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FAllPagesPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FAllPagesPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAllPagesPlugin;
@@ -33,7 +33,7 @@
 |-
 | **info**
 | Allows multiple columns: info=mtime,hits,summary,version,author,locked,minor or all
-| none
+| //empty//
 |-
 | **userpages**
 | Boolean. If true, display only pages created by users (not the ones created at initialisation of the wiki).

Modified: trunk/pgsrc/Help%2FAllUsersPlugin
===================================================================
--- trunk/pgsrc/Help%2FAllUsersPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FAllUsersPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAllUsersPlugin;
@@ -25,7 +25,7 @@
 ! Default value
 |-
 | **noheader**
-| Boolean. If true, do not display the header.
+| Boolean. If true, header should be omitted.
 | false
 |-
 | **include_empty**

Modified: trunk/pgsrc/Help%2FAtomFeedPlugin
===================================================================
--- trunk/pgsrc/Help%2FAtomFeedPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FAtomFeedPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAtomFeedPlugin;
@@ -24,15 +24,15 @@
 |-
 | **url**
 | Atom feed URL
-| (empty)
+| //empty//
 |-
 | **feed**
 | Name of the Atom feed
-| (empty)
+| //empty//
 |-
 | **description**
 | Description of the feed.
-| (empty)
+| //empty//
 |-
 | **maxitem**
 | Max. number of entries (0 = unlimited)

Modified: trunk/pgsrc/Help%2FAuthorHistoryPlugin
===================================================================
--- trunk/pgsrc/Help%2FAuthorHistoryPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FAuthorHistoryPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAuthorHistoryPlugin;
@@ -24,10 +24,10 @@
 |-
 | **exclude**
 | Comma-separated list of pages to exclude
-| none
+| //empty//
 |-
 | **noheader**
-| Boolean. If true, do not display page header.
+| Boolean. If true, page header should be omitted.
 | false
 |-
 | **includeminor**

Modified: trunk/pgsrc/Help%2FBackLinksPlugin
===================================================================
--- trunk/pgsrc/Help%2FBackLinksPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FBackLinksPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Tue, 30 Nov 2021 12:51:19 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FBackLinksPlugin;
@@ -41,7 +41,7 @@
 | false
 |-
 | **noheader**
-| Boolean. If true, do not display header.
+| Boolean. If true, header should be omitted.
 | false
 |-
 | **linkmore**

Modified: trunk/pgsrc/Help%2FChartPlugin
===================================================================
--- trunk/pgsrc/Help%2FChartPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FChartPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Tue, 28 Sep 2021 17:38:55 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FChartPlugin;
@@ -37,7 +37,7 @@
 |-
 | **legend**
 | Legend of the chart
-| //None//
+| //none//
 |-
 | **type**
 | line, bar or pie
@@ -45,7 +45,7 @@
 |-
 | **data**
 | Graph data: a list of numbers separated by comma
-| //None// (required argument)
+| //none// (required argument)
 |}
 
 == Examples ==

Modified: trunk/pgsrc/Help%2FCreateBibPlugin
===================================================================
--- trunk/pgsrc/Help%2FCreateBibPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FCreateBibPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FCreateBibPlugin;
@@ -26,7 +26,7 @@
 |-
 | **pagename**
 | The page from which the ~BibTex file is generated
-| //None// (required argument)
+| //none// (required argument)
 |}
 
 == Example ==

Modified: trunk/pgsrc/Help%2FCreateTocPlugin
===================================================================
--- trunk/pgsrc/Help%2FCreateTocPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FCreateTocPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FCreateTocPlugin;
@@ -99,9 +99,9 @@
 |-
 | 3 || ~! || ~=~=~=~= || h4
 |-
-| 4 || //None// || ~=~=~=~=~= || h5
+| 4 || //none// || ~=~=~=~=~= || h5
 |-
-| 5 || //None// || ~=~=~=~=~=~= || h6
+| 5 || //none// || ~=~=~=~=~=~= || h6
 |}
 
 == Examples ==

Modified: trunk/pgsrc/Help%2FFileInfoPlugin
===================================================================
--- trunk/pgsrc/Help%2FFileInfoPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FFileInfoPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Tue, 30 Nov 2021 18:48:42 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FFileInfoPlugin;
@@ -27,11 +27,11 @@
 |-
 | **file**
 | Relative path from PHPWIKI_DIR.
-| //None// (required argument)
+| //none// (required argument)
 |-
 | **display**
 | Comma-separated string of size, phonysize, date, mtime, owner, group, name, path, dirname, mime, link
-| //None// (required argument)
+| //none// (required argument)
 |-
 | **format**
 | printf format string with %s only, all display modes from above vars return strings

Modified: trunk/pgsrc/Help%2FFullTextSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FFullTextSearchPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FFullTextSearchPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu,  9 Dec 2021 18:08:50 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FFullTextSearchPlugin;
@@ -45,7 +45,7 @@
 | ~-hi_content
 |-
 | **noheader**
-| Boolean. If true, do not display header.
+| Boolean. If true, header should be omitted.
 | false
 |-
 | **exclude**

Modified: trunk/pgsrc/Help%2FGoogleMapsPlugin
===================================================================
--- trunk/pgsrc/Help%2FGoogleMapsPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FGoogleMapsPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Tue, 10 Aug 2021 10:45:37 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FGoogleMapsPlugin;
@@ -31,11 +31,11 @@
 |-
 | **Longitude**
 | Longitude
-| //None// (required argument)
+| //none// (required argument)
 |-
 | **Latitude**
 | Latitude
-| //None// (required argument)
+| //none// (required argument)
 |-
 | **~ZoomFactor**
 | Zoom factor
@@ -47,7 +47,7 @@
 |-
 | **~InfoText**
 |
-| //None//
+| //none//
 |-
 | **~MapType**
 | Map or Satellite or Hybrid

Modified: trunk/pgsrc/Help%2FIncludePagePlugin
===================================================================
--- trunk/pgsrc/Help%2FIncludePagePlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FIncludePagePlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FIncludePagePlugin;
@@ -25,7 +25,7 @@
 |-
 | **page**
 | The page to include
-| //None// (required argument)
+| //none// (required argument)
 |-
 | **rev**
 | The revision
@@ -37,23 +37,23 @@
 |-
 | **bytes**
 | Maximum number of bytes to include
-| //None// (include whole page)
+| //none// (include whole page)
 |-
 | **words**
 | Maximum number of words to include
-| //None// (include whole page)
+| //none// (include whole page)
 |-
 | **lines**
 | Maximum number of lines to include
-| //None// (include whole page)
+| //none// (include whole page)
 |-
 | **sections**
 | Maximum number of sections to include
-| //None// (include all sections)
+| //none// (include all sections)
 |-
 | **section**
 | Include a named section
-| //None//
+| //none//
 |-
 | **sectionhead**
 | Boolean. If true, when including a named section show the heading

Modified: trunk/pgsrc/Help%2FInterWikiSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FInterWikiSearchPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FInterWikiSearchPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FInterWikiSearchPlugin;
@@ -23,7 +23,7 @@
 |-
 | **s**
 | The search term
-| //none//
+| //none// (mandatory argument)
 |-
 | **formsize**
 |

Modified: trunk/pgsrc/Help%2FMostPopularPlugin
===================================================================
--- trunk/pgsrc/Help%2FMostPopularPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FMostPopularPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FMostPopularPlugin;
@@ -33,7 +33,7 @@
 | ~-hits
 |-
 | **noheader**
-| Boolean. If true, do not display header.
+| Boolean. If true, header should be omitted.
 | false
 |-
 | **info**

Modified: trunk/pgsrc/Help%2FNewPagesPerUserPlugin
===================================================================
--- trunk/pgsrc/Help%2FNewPagesPerUserPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FNewPagesPerUserPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2021 11:53:01 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FNewPagesPerUserPlugin;
@@ -24,19 +24,19 @@
 |-
 | **userid**
 | Limit to the pages created by a specific user.
-| //none//
+| //empty//
 |-
 | **month**
 | Limit to the pages created during a specific month.
-| //none//
+| //empty//
 |-
 | **since**
 | Limit to the pages created after a specific date.
-| //none//
+| //empty//
 |-
 | **until**
 | Limit to the pages created before a specific date.
-| //none//
+| //empty//
 |-
 | **comments**
 | Boolean. If true, pages that are comments are included (page names that include "/Comment").

Modified: trunk/pgsrc/Help%2FOrphanedPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FOrphanedPagesPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FOrphanedPagesPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Mon, 22 Feb 2021 21:27:53 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FOrphanedPagesPlugin;
@@ -31,11 +31,11 @@
 |-
 | **exclude**
 | Comma-separated list of pages to exclude
-| empty
+| //empty//
 |-
 | **info**
 | List of columns to display
-| empty
+| //empty//
 |-
 | **sortby**
 |

Modified: trunk/pgsrc/Help%2FPageGroupPlugin
===================================================================
--- trunk/pgsrc/Help%2FPageGroupPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FPageGroupPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPageGroupPlugin;
@@ -23,7 +23,7 @@
 |-
 | **parent**
 |
-| //None// (required argument)
+| //none// (required argument)
 |-
 | **rev**
 |

Modified: trunk/pgsrc/Help%2FPasswordResetPlugin
===================================================================
--- trunk/pgsrc/Help%2FPasswordResetPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FPasswordResetPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPasswordResetPlugin;
@@ -32,8 +32,8 @@
 ! Default value
 |-
 | user
-| username to reset the password. (optional)
-| none
+| Username to reset the password (optional)
+| //empty//
 |}
 
 <noinclude>

Modified: trunk/pgsrc/Help%2FRssFeedPlugin
===================================================================
--- trunk/pgsrc/Help%2FRssFeedPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FRssFeedPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FRssFeedPlugin;
@@ -24,15 +24,15 @@
 |-
 | **url**
 | RSS Feed URL
-| (empty)
+| //empty//
 |-
 | **feed**
 | RSS Feed Name
-| (empty)
+| //empty//
 |-
 | **description**
 | Description of the RSS Feed
-| (empty)
+| //empty//
 |-
 | **maxitem**
 | Max. number of entries (0 = unlimited)

Modified: trunk/pgsrc/Help%2FSiteMapPlugin
===================================================================
--- trunk/pgsrc/Help%2FSiteMapPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FSiteMapPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Mon, 22 Feb 2021 19:16:32 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FSiteMapPlugin;
@@ -41,7 +41,7 @@
 |-
 | **exclude**
 | List of pagenames to exclude, separated by comma
-| (empty)
+| //empty//
 |-
 | **include_self**
 | Boolean. If true, include yourself in the results.

Modified: trunk/pgsrc/Help%2FSyntaxHighlighterPlugin
===================================================================
--- trunk/pgsrc/Help%2FSyntaxHighlighterPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FSyntaxHighlighterPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 18 Apr 2019 15:07:59 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FSyntaxHighlighterPlugin;
@@ -64,7 +64,7 @@
 |-
 | **syntax**
 |
-| //None// (required argument), see http://www.andre-simon.de/doku/highlight/highlight.html
+| //none// (required argument), see http://www.andre-simon.de/doku/highlight/highlight.html
 |-
 | **style**
 |

Modified: trunk/pgsrc/Help%2FTemplatePlugin
===================================================================
--- trunk/pgsrc/Help%2FTemplatePlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FTemplatePlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTemplatePlugin;
@@ -61,11 +61,11 @@
 |-
 | **page**
 | pagename to be included as template
-| //None// (required argument)
+| //none// (required argument)
 |-
 | **vars**
 | optional parameters to be expanded inside the template
-| (empty)
+| //empty//
 |-
 | **rev**
 | page revision
@@ -73,11 +73,11 @@
 |-
 | **section**
 | just include a named section
-| (empty)
+| //empty//
 |-
 | **sectionhead**
 | when including a named section show the heading
-| (empty)
+| //empty//
 |}
 
 === Page to include ===

Modified: trunk/pgsrc/Help%2FTranscludePlugin
===================================================================
--- trunk/pgsrc/Help%2FTranscludePlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FTranscludePlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu,  2 Dec 2021 12:30:31 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTranscludePlugin;
@@ -20,7 +20,7 @@
 |-
 | **src**
 | The URL of the page to transclude
-| //none//
+| //none// (mandatory argument)
 |-
 | **title**
 | The title of the page to transclude

Modified: trunk/pgsrc/Help%2FUnfoldSubpagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FUnfoldSubpagesPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FUnfoldSubpagesPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Tue, 30 Nov 2021 13:09:40 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FUnfoldSubpagesPlugin;
@@ -40,7 +40,7 @@
 | empty
 |-
 | **quiet**
-| Boolean. If true, print no header.
+| Boolean. If true, header should be omitted.
 | false
 |-
 | **sortby**

Modified: trunk/pgsrc/Help%2FUserRatingsPlugin
===================================================================
--- trunk/pgsrc/Help%2FUserRatingsPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FUserRatingsPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Tue, 23 Feb 2021 18:51:32 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FUserRatingsPlugin;
@@ -44,7 +44,7 @@
 |-
 | **exclude**
 | Pages to exclude (allows multiple pagenames exclude=HomePage,RecentChanges)
-| none
+| //empty//
 |-
 | **limit**
 | limit of <=0 is show-all

Modified: trunk/pgsrc/Help%2FWikiAdminChownPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminChownPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminChownPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiAdminChownPlugin;
@@ -23,11 +23,11 @@
 |-
 | **s**
 | Pages to select
-| //None//
+| //none// (if argument "s" is not provided, the list of pages with checkboxes will be displayed)
 |-
 | **user**
 | User name
-| //None//
+| //empty//
 |}
 
 

Modified: trunk/pgsrc/Help%2FWikiAdminDeleteAclPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminDeleteAclPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminDeleteAclPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiAdminDeleteAclPlugin;
@@ -23,7 +23,7 @@
 |-
 | **s**
 | Pages to select
-| //None//
+| //none// (if argument "s" is not provided, the list of pages with checkboxes will be displayed)
 |-
 | **info**
 | Columns to include in listing

Modified: trunk/pgsrc/Help%2FWikiAdminPurgePlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminPurgePlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminPurgePlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiAdminPurgePlugin;
@@ -23,7 +23,7 @@
 |-
 | **s**
 | Pages to select
-| //None//
+| //none// (if argument "s" is not provided, the list of pages with checkboxes will be displayed)
 |}
 
 == Example ==

Modified: trunk/pgsrc/Help%2FWikiAdminRemovePlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminRemovePlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminRemovePlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiAdminRemovePlugin;
@@ -23,7 +23,7 @@
 |-
 | **s**
 | Pages to select
-| //None//
+| //none// (if argument "s" is not provided, the list of pages with checkboxes will be displayed)
 |}
 
 == Example ==

Modified: trunk/pgsrc/Help%2FWikiAdminRenamePlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminRenamePlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminRenamePlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiAdminRenamePlugin;
@@ -23,14 +23,13 @@
 |-
 | **s**
 | Pages to select
-| //None//
+| //none// (if argument "s" is not provided, the list of pages with checkboxes will be displayed)
 |-
 | **updatelinks**
-| Change pagename in all linked pages also?
+| Boolean. If true, change pagename in all linked pages also
 | false
 |}
 
-
 == Example ==
 
 {{{

Modified: trunk/pgsrc/Help%2FWikiAdminSearchReplacePlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminSearchReplacePlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminSearchReplacePlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiAdminSearchReplacePlugin;
@@ -23,7 +23,7 @@
 |-
 | **s**
 | Pages to select
-| //None//
+| //none// (if argument "s" is not provided, the list of pages with checkboxes will be displayed)
 |}
 
 == Example ==

Modified: trunk/pgsrc/Help%2FWikiAdminSetAclPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminSetAclPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminSetAclPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiAdminSetAclPlugin;
@@ -23,7 +23,7 @@
 |-
 | **s**
 | Pages to select
-| //None//
+| //none// (if argument "s" is not provided, the list of pages with checkboxes will be displayed)
 |-
 | **info**
 | Columns to include in listing

Modified: trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiAdminSetAclSimplePlugin;
@@ -23,7 +23,7 @@
 |-
 | **s**
 | Pages to select
-| //None//
+| //none// (if argument "s" is not provided, the list of pages with checkboxes will be displayed)
 |-
 | **info**
 | Columns to include in listing

Modified: trunk/pgsrc/Help%2FWikiAdminSetExternalPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminSetExternalPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminSetExternalPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiAdminSetExternalPlugin;
@@ -27,7 +27,7 @@
 |-
 | **s**
 | Pages to select
-| //None//
+| //none// (if argument "s" is not provided, the list of pages with checkboxes will be displayed)
 |-
 | **info**
 | Columns to include in listing

Modified: trunk/pgsrc/Help%2FWikiAdminUtilsPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminUtilsPlugin	2021-12-09 18:26:58 UTC (rev 10768)
+++ trunk/pgsrc/Help%2FWikiAdminUtilsPlugin	2021-12-09 18:28:38 UTC (rev 10769)
@@ -1,4 +1,4 @@
-Date: Fri,  6 Aug 2021 16:19:21 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiAdminUtilsPlugin;
@@ -28,7 +28,7 @@
 |-
 | **action**
 | Valid action are: "purge-cache", "purge-bad-pagenames", "purge-empty-pages", "email-verification", "db-check" and "db-rebuild"
-| //None//
+| //none// (mandatory argument)
 |-
 | **label**
 | Custom button text

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

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

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

Revision: 10768
          http://sourceforge.net/p/phpwiki/code/10768
Author:   vargenau
Date:     2021-12-09 18:26:58 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
WikiAdminUtils plugin: avoid warning

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

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2021-12-09 17:49:44 UTC (rev 10767)
+++ trunk/lib/plugin/WikiAdminUtils.php	2021-12-09 18:26:58 UTC (rev 10768)
@@ -58,13 +58,14 @@
     function run($dbi, $argstr, &$request, $basepage)
     {
         $args = $this->getArgs($argstr, $request);
-        $args['action'] = strtolower($args['action']);
         extract($args);
 
-        if (!$action) {
+        if (empty($action)) {
             $this->error("No action specified");
         }
-        if (!($default_label = $this->_getLabel($action))) {
+        $action = strtolower($action);
+
+        if (!($default_label = $this->getLabel($action))) {
             return HTML::div(array('class' => "error"), fmt("Bad action requested: %s", $action));
         }
         if ($request->getArg('action') != 'browse') {
@@ -115,16 +116,24 @@
         return '';
     }
 
-    private function _getLabel($action)
+    private function getLabel($action)
     {
-        $labels = array('purge-cache' => _("Purge HTML Cache"),
-            'purge-bad-pagenames' => _("Purge all Pages With Invalid Names"),
-            'purge-empty-pages' => _("Purge all empty, unreferenced Pages"),
-            'email-verification' => _("E-mail Verification"),
-            'db-check' => _("Check Wiki Database"),
-            'db-rebuild' => _("Rebuild Wiki Database")
-        );
-        return @$labels[$action];
+        switch ($action) {
+            case 'purge-cache':
+                return _("Purge HTML Cache");
+            case 'purge-bad-pagenames':
+                return _("Purge all Pages With Invalid Names");
+            case 'purge-empty-pages':
+                return _("Purge all empty, unreferenced Pages");
+            case 'email-verification':
+                return _("E-mail Verification");
+            case 'db-check':
+                return _("Check Wiki Database");
+            case 'db-rebuild':
+                return _("Rebuild Wiki Database");
+            default:
+                return '';
+        }
     }
 
     private function _do_purge_cache($request)

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

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

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

Revision: 10767
          http://sourceforge.net/p/phpwiki/code/10767
Author:   vargenau
Date:     2021-12-09 17:49:44 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
IncludePages plugin: pages and exclude arguments are strings

Modified Paths:
--------------
    trunk/lib/plugin/IncludePages.php
    trunk/pgsrc/Help%2FIncludePagesPlugin

Modified: trunk/lib/plugin/IncludePages.php
===================================================================
--- trunk/lib/plugin/IncludePages.php	2021-12-09 17:45:40 UTC (rev 10766)
+++ trunk/lib/plugin/IncludePages.php	2021-12-09 17:49:44 UTC (rev 10767)
@@ -40,8 +40,8 @@
 
     function getDefaultArguments()
     {
-        return array_merge(array('pages' => false, // the pages to include
-                'exclude' => false), // the pages to exclude
+        return array_merge(array('pages' => '', // the pages to include
+                                 'exclude' => ''), // the pages to exclude
             WikiPlugin_IncludePage::getDefaultArguments()
         );
     }

Modified: trunk/pgsrc/Help%2FIncludePagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FIncludePagesPlugin	2021-12-09 17:45:40 UTC (rev 10766)
+++ trunk/pgsrc/Help%2FIncludePagesPlugin	2021-12-09 17:49:44 UTC (rev 10767)
@@ -1,4 +1,4 @@
-Date: Mon, 22 Feb 2021 19:16:32 +0000
+Date: Thu,  9 Dec 2021 18:48:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FIncludePagesPlugin;
@@ -24,12 +24,12 @@
 ! Default value
 |-
 | **pages**
-| The pages to include
-| //none//
+| The pages to include.
+| //empty//
 |-
 | **exclude**
-| Comma-separated list of pages to exclude
-| false
+| Comma-separated list of pages to exclude.
+| //empty//
 |}
 
 == Example ==

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

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

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

Revision: 10766
          http://sourceforge.net/p/phpwiki/code/10766
Author:   vargenau
Date:     2021-12-09 17:45:40 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
ListSubpages plugin: add exclude argument in Help page, maxpages is a number

Modified Paths:
--------------
    trunk/lib/plugin/ListSubpages.php
    trunk/pgsrc/Help%2FListSubpagesPlugin

Modified: trunk/lib/plugin/ListSubpages.php
===================================================================
--- trunk/lib/plugin/ListSubpages.php	2021-12-09 17:41:41 UTC (rev 10765)
+++ trunk/lib/plugin/ListSubpages.php	2021-12-09 17:45:40 UTC (rev 10766)
@@ -45,9 +45,8 @@
             PageList::supportedArgs(),
             array('noheader' => false, // no header
                 'basepage' => false, // subpages of which page, default: current
-                'maxpages' => '', // maximum number of pages to include, change that to limit
-                //'exclude'  => '',
-                /*'relative' => false, */
+                'maxpages' => 0, // maximum number of pages to include, change that to limit
+                'exclude'  => '',
                 'info' => ''
             ));
     }
@@ -123,9 +122,6 @@
                 continue;
             }
             array_push($included_pages, $page);
-            //if ($relative) {
-            // TODO: add relative subpage name display to PageList class
-            //}
             $pagelist->addPage($page);
 
             array_pop($included_pages);

Modified: trunk/pgsrc/Help%2FListSubpagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FListSubpagesPlugin	2021-12-09 17:41:41 UTC (rev 10765)
+++ trunk/pgsrc/Help%2FListSubpagesPlugin	2021-12-09 17:45:40 UTC (rev 10766)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu,  9 Dec 2021 18:39:25 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FListSubpagesPlugin;
@@ -31,15 +31,19 @@
 |-
 | **maxpages**
 | Maximum number of pages to include
-| none
+| 0
 |-
 | **noheader**
-| Boolean. If true, do not display header.
+| Boolean. If true, header should be omitted.
 | false
 |-
 | **info**
 | List of columns to display
-| none
+| //empty//
+|-
+| **exclude**
+| Comma-separated list of pages to exclude
+| //empty//
 |}
 
 == Example ==

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

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

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

Revision: 10765
          http://sourceforge.net/p/phpwiki/code/10765
Author:   vargenau
Date:     2021-12-09 17:41:41 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
SearchHighlight plugin: add noheader and hits arguments in Help page, test they are booleans

Modified Paths:
--------------
    trunk/lib/plugin/SearchHighlight.php
    trunk/pgsrc/Help%2FSearchHighlightPlugin

Modified: trunk/lib/plugin/SearchHighlight.php
===================================================================
--- trunk/lib/plugin/SearchHighlight.php	2021-12-09 17:15:52 UTC (rev 10764)
+++ trunk/lib/plugin/SearchHighlight.php	2021-12-09 17:41:41 UTC (rev 10765)
@@ -46,11 +46,12 @@
     function getDefaultArguments()
     {
         // s, engine and engine_url are picked from the request
-        return array('noheader' => false, //don't print the header
-            'hits' => false, //print the list of lines with lines terms additionally
-            's' => false,
-            'case_exact' => false, //not yet supported
-            'regex' => false, //not yet supported
+        return array(
+            's' => '',             // search term
+            'noheader' => false,   // don't print the header
+            'hits' => false,       // print the list of lines with lines terms additionally
+            'case_exact' => false, // not yet supported
+            'regex' => '',         // not yet supported
         );
     }
 
@@ -72,6 +73,24 @@
         }
         extract($args);
 
+        if (!is_bool($noheader)) {
+            if (($noheader == '0') || ($noheader == 'false')) {
+                $noheader = false;
+            } elseif (($noheader == '1') || ($noheader == 'true')) {
+                $noheader = true;
+            } else {
+                return $this->error(sprintf(_("Argument '%s' must be a boolean"), "noheader"));
+            }
+        }
+        if (!is_bool($hits)) {
+            if (($hits == '0') || ($hits == 'false')) {
+                $hits = false;
+            } elseif (($hits == '1') || ($hits == 'true')) {
+                $hits = true;
+            } else {
+                return $this->error(sprintf(_("Argument '%s' must be a boolean"), "hits"));
+            }
+        }
         if (!is_bool($case_exact)) {
             if (($case_exact == '0') || ($case_exact == 'false')) {
                 $case_exact = false;

Modified: trunk/pgsrc/Help%2FSearchHighlightPlugin
===================================================================
--- trunk/pgsrc/Help%2FSearchHighlightPlugin	2021-12-09 17:15:52 UTC (rev 10764)
+++ trunk/pgsrc/Help%2FSearchHighlightPlugin	2021-12-09 17:41:41 UTC (rev 10765)
@@ -1,4 +1,4 @@
-Date: Tue, 23 Feb 2021 09:05:00 +0000
+Date: Thu,  9 Dec 2021 18:39:25 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FSearchHighlightPlugin;
@@ -10,8 +10,7 @@
 which is only used internally.
 
 When someone is referred from a search engine like Google, Yahoo
-or our own fulltextsearch, the terms the user searched for are highlighted.
-See also [[http://wordpress.org/about/shots/1.2/plugins.png]].
+or our own FullTextSearch, the terms the user searched for are highlighted.
 
 == Arguments ==
 
@@ -23,15 +22,23 @@
 |-
 | **s**
 | The search term
-| //none//
+| //empty//
 |-
+| **noheader**
+| Boolean. If true, header should be omitted.
+| false
+|-
+| **hits**
+| Boolean. If true, print the list of lines with lines terms additionally.
+| false
+|-
 | **case_exact**
-| Boolean. If true, highlight only case exact searches.
+| Boolean. If true, highlight only case exact searches. Not yet supported.
 | false
 |-
 | **regex**
-| not yet supported
-| false
+| Not yet supported.
+| //empty//
 |}
 
 <noinclude>

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

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

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

Revision: 10764
          http://sourceforge.net/p/phpwiki/code/10764
Author:   vargenau
Date:     2021-12-09 17:15:52 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
FuzzyPages: argument "s" is mandatory

Modified Paths:
--------------
    trunk/lib/plugin/FuzzyPages.php
    trunk/pgsrc/Help%2FFuzzyPagesPlugin

Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php	2021-12-09 17:14:09 UTC (rev 10763)
+++ trunk/lib/plugin/FuzzyPages.php	2021-12-09 17:15:52 UTC (rev 10764)
@@ -198,7 +198,7 @@
         }
 
         if (empty($s)) {
-            return HTML::p(array('class' => 'warning'),
+            return HTML::p(array('class' => 'error'),
                            _("You must enter a search term."));
         }
 

Modified: trunk/pgsrc/Help%2FFuzzyPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FFuzzyPagesPlugin	2021-12-09 17:14:09 UTC (rev 10763)
+++ trunk/pgsrc/Help%2FFuzzyPagesPlugin	2021-12-09 17:15:52 UTC (rev 10764)
@@ -1,4 +1,4 @@
-Date: Wed,  6 Oct 2021 17:59:01 +0000
+Date: Thu,  9 Dec 2021 18:08:50 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FFuzzyPagesPlugin;
@@ -31,7 +31,7 @@
 |-
 | **s**
 | Pagename to look for
-| //None// (mandatory argument)
+| //none// (mandatory argument)
 |}
 
 == Example ==

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

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

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

Revision: 10763
          http://sourceforge.net/p/phpwiki/code/10763
Author:   vargenau
Date:     2021-12-09 17:14:09 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
FullTextSearch: argument "s" is mandatory, it is a string

Modified Paths:
--------------
    trunk/lib/plugin/FullTextSearch.php
    trunk/pgsrc/Help%2FFullTextSearchPlugin

Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2021-12-09 17:11:59 UTC (rev 10762)
+++ trunk/lib/plugin/FullTextSearch.php	2021-12-09 17:14:09 UTC (rev 10763)
@@ -49,13 +49,13 @@
         // All PageList::supportedArgs, except 'pagename'
         $args = array_merge(
             PageList::supportedArgs(), // paging and more.
-            array('s' => false,
+            array('s' => '',
                 'hilight' => true,
                 'case_exact' => false,
                 'regex' => 'auto',
                 'sortby' => '-hi_content',
                 'noheader' => false,
-                'exclude' => false, // comma-separated list of glob
+                'exclude' => '', // comma-separated list of glob
                 'quiet' => true)); // be less verbose
          unset($args['pagename']);
          return $args;
@@ -73,7 +73,7 @@
         $args = $this->getArgs($argstr, $request);
 
         if (empty($args['s'])) {
-            return HTML::p(array('class' => 'warning'),
+            return HTML::p(array('class' => 'error'),
                            _("You must enter a search term."));
         }
         extract($args);

Modified: trunk/pgsrc/Help%2FFullTextSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FFullTextSearchPlugin	2021-12-09 17:11:59 UTC (rev 10762)
+++ trunk/pgsrc/Help%2FFullTextSearchPlugin	2021-12-09 17:14:09 UTC (rev 10763)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Thu,  9 Dec 2021 18:08:50 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FFullTextSearchPlugin;
@@ -26,7 +26,7 @@
 |-
 | **s**
 | The search term
-| //none//
+| //none// (mandatory argument)
 |-
 | **hilight**
 | Boolean. If true, highlight results.

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

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

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

Revision: 10762
          http://sourceforge.net/p/phpwiki/code/10762
Author:   vargenau
Date:     2021-12-09 17:11:59 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
TitleSearch: argument "s" is mandatory, it is a string

Modified Paths:
--------------
    trunk/lib/plugin/TitleSearch.php
    trunk/pgsrc/Help%2FTitleSearchPlugin

Modified: trunk/lib/plugin/TitleSearch.php
===================================================================
--- trunk/lib/plugin/TitleSearch.php	2021-12-09 17:08:08 UTC (rev 10761)
+++ trunk/lib/plugin/TitleSearch.php	2021-12-09 17:11:59 UTC (rev 10762)
@@ -53,7 +53,7 @@
         // All PageList::supportedArgs, except 'pagename'
         $args = array_merge(
             PageList::supportedArgs(), // paging and more.
-            array('s' => false,
+            array('s' => '',
                 'auto_redirect' => false,
                 'noheader' => false,
                 'exclude' => false,
@@ -115,12 +115,12 @@
         }
 
         if (isset($args['limit']) && !is_limit($args['limit'])) {
-            return HTML::p(array('class' => "error"),
+            return HTML::p(array('class' => 'error'),
                            _("Illegal “limit” argument: must be an integer or two integers separated by comma"));
         }
 
         if (empty($args['s'])) {
-            return HTML::p(array('class' => 'warning'),
+            return HTML::p(array('class' => 'error'),
                            _("You must enter a search term."));
         }
 

Modified: trunk/pgsrc/Help%2FTitleSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FTitleSearchPlugin	2021-12-09 17:08:08 UTC (rev 10761)
+++ trunk/pgsrc/Help%2FTitleSearchPlugin	2021-12-09 17:11:59 UTC (rev 10762)
@@ -1,4 +1,4 @@
-Date: Tue, 23 Feb 2021 14:45:30 +0000
+Date: Thu,  9 Dec 2021 18:08:50 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTitleSearchPlugin;
@@ -29,7 +29,7 @@
 |-
 | **s**
 | String to search
-| //none//
+| //none// (mandatory argument)
 |-
 | **auto_redirect**
 | Boolean. If true and only one page is found, this page is displayed immediately

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10761] trunk/lib/plugin/WikiAdminSearchReplace.php

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

Revision: 10761
          http://sourceforge.net/p/phpwiki/code/10761
Author:   vargenau
Date:     2021-12-09 17:08:08 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
WikiAdminSearchReplace plugin: avoid warning, remove &

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

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2021-12-09 16:53:56 UTC (rev 10760)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2021-12-09 17:08:08 UTC (rev 10761)
@@ -133,13 +133,12 @@
             $header->pushContent(
                 HTML::p(HTML::strong(
                     _("Are you sure you want to replace text in the selected pages?"))));
-            $this->replaceForm($header, $post_args);
         } else {
             $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $columns);
             $pagelist->addPageList($pages);
             $button_label = _("Search");
-            $this->replaceForm($header, $post_args);
         }
+        $this->replaceForm($header, $post_args);
 
         $buttons = HTML::p(Button('submit:admin_replace[replace]', $button_label, 'wikiadmin'),
                            HTML::raw("  "),
@@ -160,7 +159,7 @@
         return $result;
     }
 
-    public static function replaceHelper(&$dbi, &$request, $pagename, $from, $to, $case_exact = true, $regex = false)
+    public static function replaceHelper($dbi, $request, $pagename, $from, $to, $case_exact = true, $regex = false)
     {
         $page = $dbi->getPage($pagename);
         if ($page->exists()) { // don't replace default contents
@@ -188,7 +187,7 @@
         return false;
     }
 
-    private function searchReplacePages(&$dbi, &$request, $pages, $from, $to)
+    private function searchReplacePages($dbi, $request, $pages, $from, $to)
     {
         $result = HTML::div();
         $ul = HTML::ul();
@@ -221,7 +220,7 @@
         return $result;
     }
 
-    private function checkBox(&$post_args, $name, $msg)
+    private function checkBox($post_args, $name, $msg)
     {
         $id = 'admin_replace-' . $name;
         $checkbox = HTML::input(array('type' => 'checkbox',
@@ -234,8 +233,11 @@
         return HTML::div($checkbox, ' ', HTML::label(array('for' => $id), $msg));
     }
 
-    private function replaceForm(&$header, $post_args)
+    private function replaceForm($header, $post_args)
     {
+        if ($post_args === false) {
+            $post_args = array('from' => '', 'to' => '');
+        }
         $header->pushContent(HTML::p(array('class' => 'hint'),
                 _("Replace all occurences of the given string in the content of all selected pages.")));
         $table = HTML::table();
@@ -250,6 +252,5 @@
         $this->tablePush($table, '', $this->checkBox($post_args, 'case_exact', _("Case exact?")));
         $this->tablePush($table, '', $this->checkBox($post_args, 'regex', _("Regex?")));
         $header->pushContent($table);
-        return $header;
     }
 }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10760] trunk/lib/plugin/WikiAdminSelect.php

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

Revision: 10760
          http://sourceforge.net/p/phpwiki/code/10760
Author:   vargenau
Date:     2021-12-09 16:53:56 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
WikiAdminSelect plugin: remove &

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

Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php	2021-12-09 16:52:08 UTC (rev 10759)
+++ trunk/lib/plugin/WikiAdminSelect.php	2021-12-09 16:53:56 UTC (rev 10760)
@@ -97,7 +97,7 @@
      * @param WikiRequest $request
      * @return array
      */
-    protected function preSelectS(&$args, &$request)
+    protected function preSelectS($args, $request)
     {
         // override plugin argument by GET: probably not needed if s||="" is used
         // anyway, we force it for unique interface.
@@ -250,13 +250,11 @@
         }
         if (!$request->getArg('select')) {
             return $form;
-        } else {
-            ; //return $action_result;
         }
         return '';
     }
 
-    protected function tablePush(&$table, $first, $second)
+    protected function tablePush($table, $first, $second)
     {
         $table->pushContent(
             HTML::tr(

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10759] trunk/lib/plugin/WikiAdminSetExternal.php

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

Revision: 10759
          http://sourceforge.net/p/phpwiki/code/10759
Author:   vargenau
Date:     2021-12-09 16:52:08 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
WikiAdminSetExternal plugin: avoid warning

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

Modified: trunk/lib/plugin/WikiAdminSetExternal.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetExternal.php	2021-12-09 14:34:19 UTC (rev 10758)
+++ trunk/lib/plugin/WikiAdminSetExternal.php	2021-12-09 16:52:08 UTC (rev 10759)
@@ -51,7 +51,7 @@
             ));
     }
 
-    private function setExternalPages(&$dbi, &$request, $pages)
+    private function setExternalPages($dbi, $pages)
     {
         $result = HTML::div();
         $ul = HTML::ul();
@@ -68,7 +68,7 @@
                     $result->pushContent(HTML::p(fmt("Access denied to change page “%s”.",
                         WikiLink($name))));
                 } else {
-                    $page->set('external', (bool)1);
+                    $page->set('external', true);
                     $ul->pushContent(HTML::li(fmt("change page “%s” to external.", WikiLink($name))));
                     $count++;
                 }
@@ -83,12 +83,11 @@
                 $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count)));
             }
             $result->pushContent($ul);
-            return $result;
         } else {
             $result->setAttr('class', 'error');
             $result->pushContent(HTML::p(_("No pages changed.")));
-            return $result;
         }
+        return $result;
     }
 
     /**
@@ -113,6 +112,9 @@
         $p = $request->getArg('p');
         if (!$p) $p = $this->_list;
         $post_args = $request->getArg('admin_external');
+        if ($post_args === false) {
+            $post_args = array();
+        }
         if (!$request->isPost() and empty($post_args['external']))
             $post_args['external'] = $args['external'];
         $pages = array();
@@ -127,7 +129,7 @@
                 $this->disabled("! user->isAdmin");
             }
             // Real action
-            return $this->setExternalPages($dbi, $request, array_keys($p));
+            return $this->setExternalPages($dbi, array_keys($p));
         }
         $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], $args['exclude']);
         $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $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:[10758] trunk/lib/plugin/WikiAdminUtils.php

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

Revision: 10758
          http://sourceforge.net/p/phpwiki/code/10758
Author:   vargenau
Date:     2021-12-09 14:34:19 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
WikiAdminUtils plugin: remove unused argument

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

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2021-12-09 14:32:59 UTC (rev 10757)
+++ trunk/lib/plugin/WikiAdminUtils.php	2021-12-09 14:34:19 UTC (rev 10758)
@@ -127,7 +127,7 @@
         return @$labels[$action];
     }
 
-    private function _do_purge_cache($request, $args)
+    private function _do_purge_cache($request)
     {
         $dbi = $request->getDbh();
         $pages = $dbi->getAllPages('include_empty'); // Do we really want the empty ones too?
@@ -137,7 +137,7 @@
         return _("HTML cache purged!");
     }
 
-    private function _do_purge_bad_pagenames($request, $args)
+    private function _do_purge_bad_pagenames($request)
     {
         $dbi = $request->getDbh();
         $count = 0;
@@ -165,10 +165,9 @@
      * Purge all non-referenced empty pages. Mainly those created by bad link extraction.
      *
      * @param WikiRequest $request
-     * @param array $args
      * @return string|XmlContent
      */
-    private function _do_purge_empty_pages($request, $args)
+    private function _do_purge_empty_pages($request)
     {
         $dbi = $request->getDbh();
         $count = 0;

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

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

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

Revision: 10757
          http://sourceforge.net/p/phpwiki/code/10757
Author:   vargenau
Date:     2021-12-09 14:32:59 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
WikiAdminRename plugin: factor code, avoid warning, private functions

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

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2021-12-09 13:59:17 UTC (rev 10756)
+++ trunk/lib/plugin/WikiAdminRename.php	2021-12-09 14:32:59 UTC (rev 10757)
@@ -190,7 +190,7 @@
                 => WIKIAUTH_ADMIN))));
     }
 
-    private function checkBox(&$post_args, $name, $msg)
+    private function checkBox($post_args, $name, $msg)
     {
         $id = 'admin_rename-' . $name;
         $checkbox = HTML::input(array('type' => 'checkbox',
@@ -203,7 +203,7 @@
         return HTML::div($checkbox, ' ', HTML::label(array('for' => $id), $msg));
     }
 
-    private function renamePages(&$dbi, &$request, $pages, $from, $to, $updatelinks = false,
+    private function renamePages($dbi, $request, $pages, $from, $to, $updatelinks = false,
                                  $createredirect = false)
     {
         $result = HTML::div();
@@ -279,18 +279,19 @@
                 $result->pushContent(HTML::p(
                     fmt("%d pages have been renamed:", $count)));
             }
-            $result->pushContent($ul);
-            return $result;
         } else {
             $result->setAttr('class', 'error');
             $result->pushContent(HTML::p(fmt("No pages renamed.")));
-            $result->pushContent($ul);
-            return $result;
         }
+        $result->pushContent($ul);
+        return $result;
     }
 
-    private function renameForm(&$header, $post_args, $singlepage, $confirm=false)
+    private function renameForm($header, $post_args, $singlepage, $confirm=false)
     {
+        if ($post_args === false) {
+            $post_args = array('from' => '', 'to' => '');
+        }
         $table = HTML::table();
         if ($singlepage) {
             $this->tablePush($table, _("Rename") . " " . _("from") . _(": "),

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10756] trunk/lib/plugin/WikiAdminSetAclSimple.php

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

Revision: 10756
          http://sourceforge.net/p/phpwiki/code/10756
Author:   vargenau
Date:     2021-12-09 13:59:17 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
WikiAdminSetAclSimple plugin: private function setaclFormSimple

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

Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php	2021-12-09 13:58:30 UTC (rev 10755)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php	2021-12-09 13:59:17 UTC (rev 10756)
@@ -173,7 +173,7 @@
                 ACL_OWNER => true));
     }
 
-    function setaclFormSimple(&$header, $pagehash)
+    private function setaclFormSimple($header, $pagehash)
     {
 
         $pages = array();

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10755] trunk/lib/plugin/WikiAdminSetAcl.php

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

Revision: 10755
          http://sourceforge.net/p/phpwiki/code/10755
Author:   vargenau
Date:     2021-12-09 13:58:30 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
WikiAdminSetAcl plugin: factor code

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

Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php	2021-12-09 13:47:59 UTC (rev 10754)
+++ trunk/lib/plugin/WikiAdminSetAcl.php	2021-12-09 13:58:30 UTC (rev 10755)
@@ -57,7 +57,7 @@
             ));
     }
 
-    protected function setaclPages(&$request, $pages, $acl)
+    protected function setaclPages($request, $pages, $acl)
     {
         $result = HTML::div();
         $count = 0;
@@ -194,15 +194,15 @@
             $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], $args['exclude']);
         }
 
+        $pagelist = new PageList_Selectable($args['info'],
+            $args['exclude'],
+            array('types' => array(
+                'perm'
+                => new _PageList_Column_perm('perm', _("Permission")),
+                'acl'
+                => new _PageList_Column_acl('acl', _("ACL")))));
+        $pagelist->addPageList($pages);
         if ($next_action == 'verify') {
-            $pagelist = new PageList_Selectable($args['info'],
-                $args['exclude'],
-                array('types' => array(
-                    'perm'
-                    => new _PageList_Column_perm('perm', _("Permission")),
-                    'acl'
-                    => new _PageList_Column_acl('acl', _("ACL")))));
-            $pagelist->addPageList($pages);
             $button_label = _("Yes");
             $header = $this->setaclForm($header, $post_args, $pages);
             $header->pushContent(
@@ -209,14 +209,6 @@
                 HTML::p(HTML::strong(
                     _("Are you sure you want to permanently change access rights to the selected pages?"))));
         } else {
-            $pagelist = new PageList_Selectable($args['info'],
-                $args['exclude'],
-                array('types' => array(
-                    'perm'
-                    => new _PageList_Column_perm('perm', _("Permission")),
-                    'acl'
-                    => new _PageList_Column_acl('acl', _("ACL")))));
-            $pagelist->addPageList($pages);
             $button_label = _("Change Access Rights");
             $header = $this->setaclForm($header, $post_args, $pages);
             $header->pushContent(HTML::legend(_("Select the pages where to change access rights")));
@@ -240,7 +232,7 @@
                 : HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN)));
     }
 
-    function setaclForm(&$header, $post_args, $pagehash)
+    private function setaclForm($header, $post_args, $pagehash)
     {
         /**
          * @var WikiRequest $request
@@ -247,8 +239,6 @@
          */
         global $request;
 
-        $acl = $post_args['acl'];
-
         //FIXME: find intersection of all pages perms, not just from the last pagename
         $pages = array();
         foreach ($pagehash as $name => $checked) {
@@ -258,13 +248,12 @@
         $table = pagePermissionsAclFormat($perm_tree, !empty($pages));
         $header->pushContent(HTML::strong(_("Selected Pages: ")), HTML::samp(join(', ', $pages)), HTML::br());
         $first_page = $request->_dbi->getPage($name);
-        $owner = $first_page->getOwner();
         list($type, $perm) = pagePermissionsAcl($perm_tree[0], $perm_tree);
-        //if (DEBUG) $header->pushContent(HTML::pre("Permission tree for $name:\n",print_r($perm_tree,true)));
         if ($type == 'inherited')
             $type = sprintf(_("page permission inherited from %s"), $perm_tree[1][0]);
         elseif ($type == 'page')
-            $type = _("individual page permission"); elseif ($type == 'default')
+            $type = _("individual page permission");
+        elseif ($type == 'default')
             $type = _("default page permission");
         $header->pushContent(HTML::strong(_("Type") . _(": ")), HTML::samp($type), HTML::br());
         $header->pushContent(HTML::strong(_("ACL") . _(": ")), HTML::samp($perm->asAclLines()), HTML::br());

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10754] trunk/lib/plugin/WikiAdminRemove.php

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

Revision: 10754
          http://sourceforge.net/p/phpwiki/code/10754
Author:   vargenau
Date:     2021-12-09 13:47:59 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
WikiAdminRemove plugin: factor code

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

Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php	2021-12-09 13:44:25 UTC (rev 10753)
+++ trunk/lib/plugin/WikiAdminRemove.php	2021-12-09 13:47:59 UTC (rev 10754)
@@ -100,7 +100,7 @@
         return $list;
     }
 
-    private function removePages(&$request, $pages)
+    private function removePages($request, $pages)
     {
         $result = HTML::div();
         $ul = HTML::ul();
@@ -198,22 +198,17 @@
         }
 
         $header = HTML::fieldset();
+        $pagelist = new PageList_Selectable($args['info'], $args['exclude'],
+            array('types' =>
+            array('remove'
+            => new _PageList_Column_remove('remove', _("Remove")))));
+        $pagelist->addPageList($pages);
         if ($next_action == 'verify') {
-            $pagelist = new PageList_Selectable($args['info'], $args['exclude'],
-                array('types' =>
-                array('remove'
-                => new _PageList_Column_remove('remove', _("Remove")))));
-            $pagelist->addPageList($pages);
             $button_label = _("Yes");
             $header->pushContent(HTML::legend(_("Confirm removal")));
             $header->pushContent(HTML::p(HTML::strong(
                 _("Are you sure you want to remove the selected pages?"))));
         } else {
-            $pagelist = new PageList_Selectable($args['info'], $args['exclude'],
-                array('types' =>
-                array('remove'
-                => new _PageList_Column_remove('remove', _("Remove")))));
-            $pagelist->addPageList($pages);
             $button_label = _("Remove selected pages");
             $header->pushContent(HTML::legend(_("Select the pages to remove")));
             if ($args['min_age'] > 0) {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10753] trunk/lib/plugin/WikiAdminPurge.php

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

Revision: 10753
          http://sourceforge.net/p/phpwiki/code/10753
Author:   vargenau
Date:     2021-12-09 13:44:25 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
WikiAdminPurge plugin: factor code

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

Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php	2021-12-09 13:42:14 UTC (rev 10752)
+++ trunk/lib/plugin/WikiAdminPurge.php	2021-12-09 13:44:25 UTC (rev 10753)
@@ -57,7 +57,7 @@
         return $list;
     }
 
-    private function purgePages(&$request, $pages)
+    private function purgePages($request, $pages)
     {
         $result = HTML::div();
         $ul = HTML::ul();
@@ -147,16 +147,14 @@
         }
 
         $header = HTML::fieldset();
+        $pagelist = new PageList_Selectable($args['info'], $args['exclude'], array());
+        $pagelist->addPageList($pages);
         if ($next_action == 'verify') {
-            $pagelist = new PageList_Selectable($args['info'], $args['exclude'], array());
-            $pagelist->addPageList($pages);
             $button_label = _("Yes");
             $header->pushContent(HTML::legend(_("Confirm purge")));
             $header->pushContent(HTML::p(HTML::strong(
                     _("Are you sure you want to permanently purge the following pages?"))));
         } else {
-            $pagelist = new PageList_Selectable($args['info'], $args['exclude'], array());
-            $pagelist->addPageList($pages);
             $button_label = _("Permanently purge selected pages");
             $header->pushContent(HTML::legend(_("Select the pages to purge")));
         }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10752] trunk/lib/plugin/WikiAdminChown.php

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

Revision: 10752
          http://sourceforge.net/p/phpwiki/code/10752
Author:   vargenau
Date:     2021-12-09 13:42:14 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
WikiAdminChown plugin: avoid warning

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

Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php	2021-12-09 13:08:42 UTC (rev 10751)
+++ trunk/lib/plugin/WikiAdminChown.php	2021-12-09 13:42:14 UTC (rev 10752)
@@ -52,7 +52,7 @@
             ));
     }
 
-    private function chownPages(&$dbi, &$request, $pages, $newowner)
+    private function chownPages($dbi, $request, $pages, $newowner)
     {
         $result = HTML::div();
         $ul = HTML::ul();
@@ -127,6 +127,9 @@
         $p = $request->getArg('p');
         if (!$p) $p = $this->_list;
         $post_args = $request->getArg('admin_chown');
+        if ($post_args === false) {
+            $post_args = array();
+        }
         if (!$request->isPost() and empty($post_args['user']))
             $post_args['user'] = $args['user'];
         $next_action = 'select';

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10751] trunk/lib/plugin/WikiAdminDeleteAcl.php

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

Revision: 10751
          http://sourceforge.net/p/phpwiki/code/10751
Author:   vargenau
Date:     2021-12-09 13:08:42 +0000 (Thu, 09 Dec 2021)
Log Message:
-----------
WikiAdminDeleteAcl plugin: remove unused variable

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

Modified: trunk/lib/plugin/WikiAdminDeleteAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminDeleteAcl.php	2021-12-08 18:47:39 UTC (rev 10750)
+++ trunk/lib/plugin/WikiAdminDeleteAcl.php	2021-12-09 13:08:42 UTC (rev 10751)
@@ -42,11 +42,11 @@
         return _("Delete page permissions.");
     }
 
-    private function deleteaclPages(&$request, $pages)
+    private function deleteaclPages($request, $pages)
     {
         $result = HTML::div();
         $count = 0;
-        $dbi =& $request->_dbi;
+        $dbi = $request->_dbi;
         $perm = new PagePermission('');
         $perm->sanify();
         foreach ($pages as $pagename) {
@@ -102,7 +102,6 @@
         $this->preSelectS($args, $request);
 
         $p = $request->getArg('p');
-        $post_args = $request->getArg('admin_deleteacl');
         $pages = array();
         if ($p && !$request->isPost())
             $pages = $p;

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

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

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

Revision: 10750
          http://sourceforge.net/p/phpwiki/code/10750
Author:   vargenau
Date:     2021-12-08 18:47:39 +0000 (Wed, 08 Dec 2021)
Log Message:
-----------
Generic messages with %s

Modified Paths:
--------------
    trunk/lib/plugin/RedirectTo.php
    trunk/lib/plugin/Video.php
    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/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/lib/plugin/RedirectTo.php	2021-12-08 18:47:39 UTC (rev 10750)
@@ -67,9 +67,9 @@
         $page = $args['page'];
 
         if (!$href && !$page) {
-            return $this->error(_("Both 'href' and 'page' parameters missing."));
+            return $this->error(sprintf(_("Both '%s' and '%s' parameters missing."), 'href', 'page'));
         } elseif ($href && $page) {
-            return $this->error(_("Choose only one of 'href' or 'page' parameters."));
+            return $this->error(sprintf(_("Choose only one of '%s' or '%s' parameters."), 'href', 'page'));
         } 
 
         if ($href) {
@@ -90,8 +90,6 @@
             }
         } elseif ($page) {
             $url = WikiURL($page, array('redirectfrom' => $request->getArg('pagename')));
-        } else {
-            return $this->error(_("'href' or 'page' parameter missing."));
         }
 
         if ($page == $request->getArg('pagename')) {

Modified: trunk/lib/plugin/Video.php
===================================================================
--- trunk/lib/plugin/Video.php	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/lib/plugin/Video.php	2021-12-08 18:47:39 UTC (rev 10750)
@@ -91,9 +91,9 @@
         }
 
         if (!$url && !$file) {
-            return $this->error(_("Both 'url' and 'file' parameters missing."));
+            return $this->error(sprintf(_("Both '%s' and '%s' parameters missing."), 'url', 'file'));
         } elseif ($url && $file) {
-            return $this->error(_("Choose only one of 'url' or 'file' parameters."));
+            return $this->error(sprintf(_("Choose only one of '%s' or '%s' parameters."), 'url', 'file'));
         } elseif ($file) {
             // $url = SERVER_URL . getUploadDataPath() . '/' . $file;
             $url = getUploadDataPath() . '/' . $file;

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-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/de.po	2021-12-08 18:47:39 UTC (rev 10750)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\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."
@@ -2698,10 +2698,12 @@
 msgid "Redirect to another URL or page."
 msgstr ""
 
-msgid "Both 'href' and 'page' parameters missing."
-msgstr "'href' oder 'page' Argument fehlt."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
+msgstr "'%s' oder '%s' Argument fehlt."
 
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
 msgstr ""
 
 msgid "Illegal characters in external URL."
@@ -2715,9 +2717,6 @@
 msgstr ""
 "Weiterleitung zu einer externen URL ist nur in gesperrten Seiten erlaubt."
 
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
 #, php-format
 msgid "Recursive redirect to self: “%s”"
 msgstr "Eigenbezogene Selbstrückleitung: »%s«"
@@ -3374,12 +3373,6 @@
 msgid "Display video in HTML5."
 msgstr ""
 
-msgid "Both 'url' and 'file' parameters missing."
-msgstr "'url' oder 'file' Argument fehlt."
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/es.po	2021-12-08 18:47:39 UTC (rev 10750)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -2634,10 +2634,12 @@
 msgid "Redirect to another URL or page."
 msgstr ""
 
-msgid "Both 'href' and 'page' parameters missing."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
 msgstr ""
 
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
 msgstr ""
 
 msgid "Illegal characters in external URL."
@@ -2650,9 +2652,6 @@
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
 #, php-format
 msgid "Recursive redirect to self: “%s”"
 msgstr ""
@@ -3296,12 +3295,6 @@
 msgid "Display video in HTML5."
 msgstr ""
 
-msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/fr.po	2021-12-08 18:47:39 UTC (rev 10750)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\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."
@@ -2684,11 +2684,13 @@
 msgid "Redirect to another URL or page."
 msgstr "Redirige vers une autre URL ou page."
 
-msgid "Both 'href' and 'page' parameters missing."
-msgstr "Les paramètres « href » et « page » manquent tous les deux."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
+msgstr "Les paramètres « %s » et « %s » manquent tous les deux."
 
-msgid "Choose only one of 'href' or 'page' parameters."
-msgstr "Choissez un seul des deux paramètres « href » ou « page »."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
+msgstr "Choissez un seul des deux paramètres « %s » ou « %s »."
 
 msgid "Illegal characters in external URL."
 msgstr "Caractère interdit dans une URL externe."
@@ -2700,9 +2702,6 @@
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
 #, php-format
 msgid "Recursive redirect to self: “%s”"
 msgstr "Redirection récursive vers soi-même : « %s »"
@@ -3364,12 +3363,6 @@
 msgid "Display video in HTML5."
 msgstr "Afficher une vidéo en HTML5."
 
-msgid "Both 'url' and 'file' parameters missing."
-msgstr "Les paramètres « url » et « file » manquent tous les deux."
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr "Choissez un seul des deux paramètres « url » ou «file»."
-
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr "Votre navigateur ne reconnaît pas la balise video du HTML 5."
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/it.po	2021-12-08 18:47:39 UTC (rev 10750)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\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"
@@ -2611,10 +2611,12 @@
 msgid "Redirect to another URL or page."
 msgstr ""
 
-msgid "Both 'href' and 'page' parameters missing."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
 msgstr ""
 
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
 msgstr ""
 
 msgid "Illegal characters in external URL."
@@ -2627,9 +2629,6 @@
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
 #, php-format
 msgid "Recursive redirect to self: “%s”"
 msgstr ""
@@ -3273,12 +3272,6 @@
 msgid "Display video in HTML5."
 msgstr ""
 
-msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/ja.po	2021-12-08 18:47:39 UTC (rev 10750)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -2597,10 +2597,12 @@
 msgid "Redirect to another URL or page."
 msgstr ""
 
-msgid "Both 'href' and 'page' parameters missing."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
 msgstr ""
 
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
 msgstr ""
 
 msgid "Illegal characters in external URL."
@@ -2613,9 +2615,6 @@
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
 #, php-format
 msgid "Recursive redirect to self: “%s”"
 msgstr ""
@@ -3259,12 +3258,6 @@
 msgid "Display video in HTML5."
 msgstr ""
 
-msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/nl.po	2021-12-08 18:47:39 UTC (rev 10750)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -2603,10 +2603,12 @@
 msgid "Redirect to another URL or page."
 msgstr ""
 
-msgid "Both 'href' and 'page' parameters missing."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
 msgstr ""
 
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
 msgstr ""
 
 msgid "Illegal characters in external URL."
@@ -2619,9 +2621,6 @@
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
 #, php-format
 msgid "Recursive redirect to self: “%s”"
 msgstr ""
@@ -3265,12 +3264,6 @@
 msgid "Display video in HTML5."
 msgstr ""
 
-msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/phpwiki.pot	2021-12-08 18:47:39 UTC (rev 10750)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -2597,10 +2597,12 @@
 msgid "Redirect to another URL or page."
 msgstr ""
 
-msgid "Both 'href' and 'page' parameters missing."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
 msgstr ""
 
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
 msgstr ""
 
 msgid "Illegal characters in external URL."
@@ -2613,9 +2615,6 @@
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
 #, php-format
 msgid "Recursive redirect to self: “%s”"
 msgstr ""
@@ -3259,12 +3258,6 @@
 msgid "Display video in HTML5."
 msgstr ""
 
-msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/sv.po	2021-12-08 18:47:39 UTC (rev 10750)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -2598,10 +2598,12 @@
 msgid "Redirect to another URL or page."
 msgstr ""
 
-msgid "Both 'href' and 'page' parameters missing."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
 msgstr ""
 
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
 msgstr ""
 
 msgid "Illegal characters in external URL."
@@ -2614,9 +2616,6 @@
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
 #, php-format
 msgid "Recursive redirect to self: “%s”"
 msgstr ""
@@ -3260,12 +3259,6 @@
 msgid "Display video in HTML5."
 msgstr ""
 
-msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/zh.po	2021-12-08 18:47:39 UTC (rev 10750)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -2606,10 +2606,12 @@
 msgid "Redirect to another URL or page."
 msgstr "重導向到另一個 url 或頁面."
 
-msgid "Both 'href' and 'page' parameters missing."
-msgstr "'href' 或 'page' 參數遺漏."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
+msgstr "'%s' 或 '%s' 參數遺漏."
 
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
 msgstr ""
 
 msgid "Illegal characters in external URL."
@@ -2622,9 +2624,6 @@
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
-msgid "'href' or 'page' parameter missing."
-msgstr "'href' 或 'page' 參數遺漏."
-
 #, php-format
 msgid "Recursive redirect to self: “%s”"
 msgstr "遞迴重導向到自己: “%s”"
@@ -3270,12 +3269,6 @@
 msgid "Display video in HTML5."
 msgstr ""
 
-msgid "Both 'url' and 'file' parameters missing."
-msgstr "'url' 或 'file' 參數遺漏."
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 

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

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.