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

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

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

Revision: 10224
          http://sourceforge.net/p/phpwiki/code/10224
Author:   vargenau
Date:     2021-01-04 17:15:08 +0000 (Mon, 04 Jan 2021)
Log Message:
-----------
Update locale/po/fr.po

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

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2021-01-04 14:10:59 UTC (rev 10223)
+++ trunk/locale/po/fr.po	2021-01-04 17:15:08 UTC (rev 10224)
@@ -1353,7 +1353,7 @@
 "PageHistory-like list of a single page for only one user."
 msgstr ""
 "Affiche la liste de toutes les versions faites par un auteur, ou montre une "
-"liste du type HistoriquePage pour une simple page uniquement pour un auteur."
+"liste du type HistoriqueDeLaPage pour une simple page uniquement pour un auteur."
 
 msgid "Minor"
 msgstr "Mineur"
@@ -1650,7 +1650,7 @@
 msgid ""
 "Output suppressed. FileInfoPlugin with local files require a locked page."
 msgstr ""
-"Sortie supprimée. Le greffon FileInfo avec des fichiers locaux nécessite une "
+"Sortie supprimée. Le greffon InfosSurLeFichier avec des fichiers locaux nécessite une "
 "page verrouillée."
 
 msgid "page not locked"
@@ -2464,7 +2464,7 @@
 msgstr ""
 
 msgid "RecentNewPages"
-msgstr ""
+msgstr "NouvellesPagesRécentes"
 
 msgid "RecentEdits"
 msgstr "ÉditionsRécentes"

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

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

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

Revision: 10223
          http://sourceforge.net/p/phpwiki/code/10223
Author:   vargenau
Date:     2021-01-04 14:10:59 +0000 (Mon, 04 Jan 2021)
Log Message:
-----------
Remove code for reading old PhpWiki cookie formats

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

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2021-01-04 08:55:25 UTC (rev 10222)
+++ trunk/lib/Request.php	2021-01-04 14:10:59 UTC (rev 10223)
@@ -639,29 +639,6 @@
         return false;
     }
 
-    function get_old($key)
-    {
-        if (defined('FUSIONFORGE') && FUSIONFORGE) {
-            return false;
-        }
-        $vars = &$GLOBALS['HTTP_COOKIE_VARS'];
-        if (isset($vars[$key])) {
-            @$decode = base64_decode($vars[$key]);
-            if (strlen($decode) > 3 and substr($decode, 1, 1) == ':') {
-                @$val = unserialize($decode);
-                if (!empty($val))
-                    return $val;
-            }
-            @$val = unserialize($vars[$key]);
-            if (!empty($val))
-                return $val;
-            @$val = $vars[$key];
-            if (!empty($val))
-                return $val;
-        }
-        return false;
-    }
-
     function set($key, $val, $persist_days = false, $path = false)
     {
         // if already defined, ignore

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2021-01-04 08:55:25 UTC (rev 10222)
+++ trunk/lib/WikiUser.php	2021-01-04 14:10:59 UTC (rev 10223)
@@ -719,68 +719,12 @@
             $this->_prefs = new UserPreferences();
         $UserName = $this->UserName();
 
-        // Try to read deprecated 1.3.x style cookies
-        if ($cookie = $request->cookies->get_old(WIKI_NAME)) {
-            if (!$unboxedcookie = $this->_prefs->retrieve($cookie)) {
-                trigger_error(_("Empty Preferences or format of UserPreferences cookie not recognised.")
-                        . "\n"
-                        . sprintf("%s='%s'", WIKI_NAME, $cookie)
-                        . "\n"
-                        . _("Default preferences will be used."),
-                    E_USER_NOTICE);
-            }
-            /**
-             * Only set if it matches the UserName who is
-             * signing in or if this really is an Anon login (no
-             * username). (Remember, _BogoUser and higher inherit this
-             * function too!).
-             */
-            if (!$UserName || $UserName == @$unboxedcookie['userid']) {
-                $this->_prefs->updatePrefs($unboxedcookie);
-                $UserName = @$unboxedcookie['userid'];
-                if (is_string($UserName) and (substr($UserName, 0, 2) != 's:'))
-                    $this->_userid = $UserName;
-                else
-                    $UserName = false;
-            }
-            // v1.3.8 policy: don't set PhpWiki cookies, only plaintext WIKI_ID cookies
-            if (!headers_sent())
-                $request->deleteCookieVar(WIKI_NAME);
-        }
-        // Try to read deprecated 1.3.4 style cookies
-        if (!$UserName and ($cookie = $request->cookies->get_old("WIKI_PREF2"))) {
-            if (!$unboxedcookie = $this->_prefs->retrieve($cookie)) {
-                if (!$UserName || $UserName == $unboxedcookie['userid']) {
-                    $this->_prefs->updatePrefs($unboxedcookie);
-                    $UserName = $unboxedcookie['userid'];
-                    if (is_string($UserName) and (substr($UserName, 0, 2) != 's:'))
-                        $this->_userid = $UserName;
-                    else
-                        $UserName = false;
-                }
-                if (!headers_sent())
-                    $request->deleteCookieVar("WIKI_PREF2");
-            }
-        }
         if (!$UserName) {
-            // Try reading userid from old PhpWiki cookie formats:
-            if ($cookie = $request->cookies->get_old(getCookieName())) {
-                if (is_string($cookie) and (substr($cookie, 0, 2) != 's:'))
-                    $UserName = $cookie;
-                elseif (is_array($cookie) and !empty($cookie['userid']))
-                    $UserName = $cookie['userid'];
-            }
             if (!$UserName and !headers_sent())
                 $request->deleteCookieVar(getCookieName());
             else
                 $this->_userid = $UserName;
         }
-
-        // initializeTheme() needs at least an empty object
-        /*
-         if (empty($this->_prefs))
-            $this->_prefs = new UserPreferences();
-        */
         return $this->_prefs;
     }
 

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

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

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

Revision: 10222
          http://sourceforge.net/p/phpwiki/code/10222
Author:   vargenau
Date:     2021-01-04 08:55:25 +0000 (Mon, 04 Jan 2021)
Log Message:
-----------
Better time and date formats: 24-hour time, day month year

Modified Paths:
--------------
    trunk/lib/WikiTheme.php
    trunk/themes/Crao/themeinfo.php
    trunk/themes/Hawaiian/themeinfo.php
    trunk/themes/MacOSX/themeinfo.php
    trunk/themes/MonoBook/themeinfo.php
    trunk/themes/Portland/themeinfo.php
    trunk/themes/Sidebar/themeinfo.php
    trunk/themes/Wordpress/themeinfo.php
    trunk/themes/blog/themeinfo.php
    trunk/themes/shamino_com/themeinfo.php
    trunk/themes/wikilens/themeinfo.php

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/lib/WikiTheme.php	2021-01-04 08:55:25 UTC (rev 10222)
@@ -353,8 +353,8 @@
     // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_crt_strftime.2c_.wcsftime.asp
     // As a result, we have to use %d, and strip out leading zeros ourselves.
 
-    private $dateFormat = "%B %d, %Y";
-    private $timeFormat = "%I:%M %p";
+    private $dateFormat = "%d %B %Y";
+    private $timeFormat = "%H:%M";
     private $showModTime = true;
 
     /**
@@ -407,7 +407,7 @@
     }
 
     /**
-     * Format a date.
+     * Format a time.
      *
      * Any time zone offset specified in the users preferences is
      * taken into account by this method.
@@ -1485,14 +1485,14 @@
          *   $this->setDateFormat("%x");
          *   $this->setTimeFormat("%X");
          */
-        //$this->setDateFormat("%B %d, %Y");
-        //$this->setTimeFormat("%I:%M %p");
+        //$this->setDateFormat("%d %B %Y");
+        //$this->setTimeFormat("%H:%M");
 
         /*
          * To suppress times in the "Last edited on" messages, give a
          * give a second argument of false:
          */
-        //$this->setDateFormat("%B %d, %Y", false);
+        //$this->setDateFormat("%d %B %Y", false);
 
         /*
          * Custom UserPreferences:

Modified: trunk/themes/Crao/themeinfo.php
===================================================================
--- trunk/themes/Crao/themeinfo.php	2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/Crao/themeinfo.php	2021-01-04 08:55:25 UTC (rev 10222)
@@ -85,14 +85,14 @@
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */
-        //$this->setDateFormat("%B %d, %Y");
-        //$this->setTimeFormat("%I:%M %p");
+        //$this->setDateFormat("%d %B %Y");
+        //$this->setTimeFormat("%H:%M");
 
         /*
          * To suppress times in the "Last edited on" messages, give a
          * give a second argument of false:
          */
-        //$this->setDateFormat("%B %d, %Y", false);
+        //$this->setDateFormat("%d %B %Y", false);
         $this->setDateFormat("%A %e %B %Y"); // must not contain time
         //$this->setDateFormat("%x"); // must not contain time
         $this->setTimeFormat("%H:%M:%S");

Modified: trunk/themes/Hawaiian/themeinfo.php
===================================================================
--- trunk/themes/Hawaiian/themeinfo.php	2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/Hawaiian/themeinfo.php	2021-01-04 08:55:25 UTC (rev 10222)
@@ -110,7 +110,7 @@
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */
-        //$this->setDateFormat("%B %d, %Y");       // must not contain time
+        //$this->setDateFormat("%d %B %Y");       // must not contain time
 
     }
 }

Modified: trunk/themes/MacOSX/themeinfo.php
===================================================================
--- trunk/themes/MacOSX/themeinfo.php	2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/MacOSX/themeinfo.php	2021-01-04 08:55:25 UTC (rev 10222)
@@ -176,8 +176,8 @@
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */
-        $this->setDateFormat("%A, %B %d, %Y"); // must not contain time
-        $this->setTimeFormat("%I:%M:%S %p");
+        $this->setDateFormat("%A, %d %B %Y"); // must not contain time
+        $this->setTimeFormat("%H:%M:%S");
     }
 }
 

Modified: trunk/themes/MonoBook/themeinfo.php
===================================================================
--- trunk/themes/MonoBook/themeinfo.php	2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/MonoBook/themeinfo.php	2021-01-04 08:55:25 UTC (rev 10222)
@@ -138,7 +138,7 @@
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */
-        $this->setDateFormat("%B %d, %Y");
+        $this->setDateFormat("%d %B %Y");
         $this->setTimeFormat("%H:%M");
 
         /*
@@ -145,7 +145,7 @@
          * To suppress times in the "Last edited on" messages, give a
          * give a second argument of false:
          */
-        //$this->setDateFormat("%B %d, %Y", false);
+        //$this->setDateFormat("%d %B %Y", false);
     }
 }
 

Modified: trunk/themes/Portland/themeinfo.php
===================================================================
--- trunk/themes/Portland/themeinfo.php	2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/Portland/themeinfo.php	2021-01-04 08:55:25 UTC (rev 10222)
@@ -124,7 +124,7 @@
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */
-        $this->setDateFormat("%B %d, %Y", false);
+        $this->setDateFormat("%d %B %Y", false);
 
     }
 }

Modified: trunk/themes/Sidebar/themeinfo.php
===================================================================
--- trunk/themes/Sidebar/themeinfo.php	2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/Sidebar/themeinfo.php	2021-01-04 08:55:25 UTC (rev 10222)
@@ -197,7 +197,7 @@
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */
-        //$this->setDateFormat("%B %d, %Y");
+        //$this->setDateFormat("%d %B %Y");
 
         /**
          * Custom UserPreferences:

Modified: trunk/themes/Wordpress/themeinfo.php
===================================================================
--- trunk/themes/Wordpress/themeinfo.php	2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/Wordpress/themeinfo.php	2021-01-04 08:55:25 UTC (rev 10222)
@@ -123,7 +123,7 @@
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */
-        $this->setDateFormat("%B %d, %Y", false);
+        $this->setDateFormat("%d %B %Y", false);
     }
 }
 

Modified: trunk/themes/blog/themeinfo.php
===================================================================
--- trunk/themes/blog/themeinfo.php	2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/blog/themeinfo.php	2021-01-04 08:55:25 UTC (rev 10222)
@@ -183,8 +183,8 @@
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */
-        //$this->setDateFormat("%B %d, %Y");
-        $this->setDateFormat("%A, %B %e, %Y"); // must not contain time
+        //$this->setDateFormat("%d %B %Y");
+        $this->setDateFormat("%A, %e %B %Y"); // must not contain time
         $this->setTimeFormat("%H:%M:%S");
     }
 }

Modified: trunk/themes/shamino_com/themeinfo.php
===================================================================
--- trunk/themes/shamino_com/themeinfo.php	2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/shamino_com/themeinfo.php	2021-01-04 08:55:25 UTC (rev 10222)
@@ -122,7 +122,7 @@
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */
-        $this->setDateFormat("%B %d, %Y");
+        $this->setDateFormat("%d %B %Y");
         $this->setTimeFormat("%H:%M");
 
         /*
@@ -129,7 +129,7 @@
          * To suppress times in the "Last edited on" messages, give a
          * give a second argument of false:
          */
-        //$this->setDateFormat("%B %d, %Y", false);
+        //$this->setDateFormat("%d %B %Y", false);
     }
 }
 

Modified: trunk/themes/wikilens/themeinfo.php
===================================================================
--- trunk/themes/wikilens/themeinfo.php	2021-01-03 15:23:36 UTC (rev 10221)
+++ trunk/themes/wikilens/themeinfo.php	2021-01-04 08:55:25 UTC (rev 10222)
@@ -105,7 +105,7 @@
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */
-        $this->setDateFormat("%B %d, %Y");
+        $this->setDateFormat("%d %B %Y");
         $this->setTimeFormat("%H:%M");
 
         /*
@@ -112,7 +112,7 @@
          * To suppress times in the "Last edited on" messages, give a
          * give a second argument of false:
          */
-        //$this->setDateFormat("%B %d, %Y", false);
+        //$this->setDateFormat("%d %B %Y", false);
 
     }
 }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10221] trunk/lib/config.php

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

Revision: 10221
          http://sourceforge.net/p/phpwiki/code/10221
Author:   vargenau
Date:     2021-01-03 15:23:36 +0000 (Sun, 03 Jan 2021)
Log Message:
-----------
function guessing_lang needs no parameter

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

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2021-01-03 09:46:24 UTC (rev 10220)
+++ trunk/lib/config.php	2021-01-03 15:23:36 UTC (rev 10221)
@@ -65,15 +65,11 @@
  * We should really check additionally if the i18n HomePage version is defined.
  * So must defer this to the request loop.
  *
- * @param array $languages
  * @return string
  */
-function guessing_lang($languages = array())
+function guessing_lang()
 {
-    if (!$languages) {
-        // make this faster
-        $languages = array("en", "de", "es", "fr", "it", "ja", "zh", "nl", "sv");
-    }
+    $languages = array("en", "de", "es", "fr", "it", "ja", "zh", "nl", "sv");
 
     $accept = false;
     if (isset($GLOBALS['request'])) // in fixup-dynamic-config there's no request yet

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

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

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

Revision: 10220
          http://sourceforge.net/p/phpwiki/code/10220
Author:   vargenau
Date:     2021-01-03 09:46:24 +0000 (Sun, 03 Jan 2021)
Log Message:
-----------
Revert r10209 for lib/WikiDB/backend.php (userless test $limit > 2147483647)

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

Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2021-01-02 20:28:05 UTC (rev 10219)
+++ trunk/lib/WikiDB/backend.php	2021-01-03 09:46:24 UTC (rev 10220)
@@ -566,7 +566,7 @@
             }
             return array($from, $limit);
         } else {
-            if (!empty($limit) && (!is_numeric($limit) || $limit > 2147483647)) {
+            if (!empty($limit) && !is_numeric($limit)) {
                 trigger_error(_("Illegal “limit” argument: must be an integer or two integers separated by comma"));
                 return array(0, 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:[10219] trunk

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

Revision: 10219
          http://sourceforge.net/p/phpwiki/code/10219
Author:   vargenau
Date:     2021-01-02 20:28:05 +0000 (Sat, 02 Jan 2021)
Log Message:
-----------
Internet Explorer is dead

Modified Paths:
--------------
    trunk/README
    trunk/lib/config.php
    trunk/locale/it/pgsrc/NoteDiRilascio
    trunk/pgsrc/ReleaseNotes
    trunk/themes/Crao/crao.css
    trunk/themes/Crao/templates/actionbar.tmpl
    trunk/themes/MonoBook/themeinfo.php
    trunk/themes/blog/Kubrick.css
    trunk/themes/blog/templates/sidebar.tmpl

Modified: trunk/README
===================================================================
--- trunk/README	2020-12-31 18:03:53 UTC (rev 10218)
+++ trunk/README	2021-01-02 20:28:05 UTC (rev 10219)
@@ -13,7 +13,7 @@
 * Opera >= 8
 * Chrome >= 6
 * Konqueror >= 3.5
-* Internet Explorer >= 9
+* Edge
 
 Additional docs:
 

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2020-12-31 18:03:53 UTC (rev 10218)
+++ trunk/lib/config.php	2021-01-02 20:28:05 UTC (rev 10219)
@@ -58,34 +58,6 @@
 }
 
 /**
- * Browser Detection Functions
- *
- * @author: Reini Urban
- */
-function browserAgent()
-{
-    static $HTTP_USER_AGENT = false;
-    if ($HTTP_USER_AGENT !== false) return $HTTP_USER_AGENT;
-    if (!$HTTP_USER_AGENT)
-        $HTTP_USER_AGENT = @$GLOBALS['HTTP_SERVER_VARS']['HTTP_USER_AGENT'];
-    if (!$HTTP_USER_AGENT) // CGI
-        $HTTP_USER_AGENT = @$GLOBALS['HTTP_ENV_VARS']['HTTP_USER_AGENT'];
-    if (!$HTTP_USER_AGENT) // local CGI testing
-        $HTTP_USER_AGENT = 'none';
-    return $HTTP_USER_AGENT;
-}
-
-function browserDetect($match)
-{
-    return (strpos(strtolower(browserAgent()), strtolower($match)) !== false);
-}
-
-function isBrowserIE()
-{
-    return (browserDetect('Mozilla/') and browserDetect('MSIE'));
-}
-
-/**
  * If $LANG is undefined:
  * Smart client language detection, based on our supported languages
  * HTTP_ACCEPT_LANGUAGE="de-at,en;q=0.5"

Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio	2020-12-31 18:03:53 UTC (rev 10218)
+++ trunk/locale/it/pgsrc/NoteDiRilascio	2021-01-02 20:28:05 UTC (rev 10219)
@@ -1,4 +1,4 @@
-Date: Mon, 28 Dec 2020 19:46:14 +0000
+Date: Sat,  2 Jan 2021 19:46:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=NoteDiRilascio;
@@ -14,10 +14,11 @@
 * PHP 7 compatible
 * Full HTML 5: Add HTML 5 <main> <header> <footer> <nav> in all themes. Add ARIA roles.
 * Flash is dead
+* Internet Explorer is dead
 
 === Changes ===
 * Add new button in Edit Toolbar: convert Tab Separated Values to Wikicreole table
-* Update jQuery to 2.2.4: Internet Explorer <= 8 no longer supported
+* Update jQuery to 2.2.4
 * Pear: use ##mysqli## instead of ##mysql##
 * Update PEAR.php to release 1.10.12
 * Update Pear DB library to 1.10.0

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2020-12-31 18:03:53 UTC (rev 10218)
+++ trunk/pgsrc/ReleaseNotes	2021-01-02 20:28:05 UTC (rev 10219)
@@ -1,4 +1,4 @@
-Date: Mon, 28 Dec 2020 19:46:14 +0000
+Date: Sat,  2 Jan 2021 19:46:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -14,10 +14,11 @@
 * PHP 7 compatible
 * Full HTML 5: Add HTML 5 <main> <header> <footer> <nav> in all themes. Add ARIA roles.
 * Flash is dead
+* Internet Explorer is dead
 
 === Changes ===
 * Add new button in Edit Toolbar: convert Tab Separated Values to Wikicreole table
-* Update jQuery to 2.2.4: Internet Explorer <= 8 no longer supported
+* Update jQuery to 2.2.4
 * Pear: use ##mysqli## instead of ##mysql##
 * Update PEAR.php to release 1.10.12
 * Update Pear DB library to 1.10.0

Modified: trunk/themes/Crao/crao.css
===================================================================
--- trunk/themes/Crao/crao.css	2020-12-31 18:03:53 UTC (rev 10218)
+++ trunk/themes/Crao/crao.css	2021-01-02 20:28:05 UTC (rev 10219)
@@ -186,28 +186,8 @@
  ******************************
  *****ACTION-BUTTONS
  ******************************
- with special IE fix
  */
 
-div.ie-actionbuttons {
-    position: relative;
-    height: 22px;
-    right: 0;
-    bottom: 0;
-    margin: 0;
-    background-color: transparent;
-    background-image: url(images/BG.png);
-    background-repeat: no-repeat;
-    background-position: top right;
-    text-align: right;
-    vertical-align: bottom;
-    padding-left: 2em;
-    padding-right: 1em;
-    padding-top: 0.5ex;
-    padding-bottom: 0.5ex;
-    border: 0 none;
-}
-
 #actionbuttons {
     position: fixed;
     max-width: 30%;

Modified: trunk/themes/Crao/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/actionbar.tmpl	2020-12-31 18:03:53 UTC (rev 10218)
+++ trunk/themes/Crao/templates/actionbar.tmpl	2021-01-02 20:28:05 UTC (rev 10219)
@@ -6,11 +6,7 @@
       $EditB = Button("viewsource", _("View Source"));
   if (empty($revision)) $revision = $page->getCurrentRevision(false);
 ?>
-<?php if (isBrowserIE()) { ?>
-<div class="ie-actionbuttons">
-<?php } else { ?>
 <div id="actionbuttons">
-<?php } ?>
 <?php echo $EditB ?>
 <?php if ($user->isAdmin() or mayAccessPage('change',$page->getName())) { ?>
 <?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock') ?>

Modified: trunk/themes/MonoBook/themeinfo.php
===================================================================
--- trunk/themes/MonoBook/themeinfo.php	2020-12-31 18:03:53 UTC (rev 10218)
+++ trunk/themes/MonoBook/themeinfo.php	2021-01-02 20:28:05 UTC (rev 10219)
@@ -34,9 +34,6 @@
  * Mediawiki 'monobook' style sheet for CSS2-capable browsers.
  * Copyright Gabriel Wicke - http://www.aulinx.de/
  * See main.css for more.
- *
- * Problems with IE: signin is at the left.
- *
  */
 require_once 'lib/WikiTheme.php';
 require_once 'themes/wikilens/themeinfo.php';

Modified: trunk/themes/blog/Kubrick.css
===================================================================
--- trunk/themes/blog/Kubrick.css	2020-12-31 18:03:53 UTC (rev 10218)
+++ trunk/themes/blog/Kubrick.css	2021-01-02 20:28:05 UTC (rev 10219)
@@ -289,24 +289,6 @@
     color: black;
 }
 
-#moz-sidebar {
-    font: 1em 'Lucida Grande', Verdana, Arial, sans-serif;
-    margin-left: 560px;
-    position: absolute;
-    z-index: 2;
-    top: 270px;
-    /* top, right, bottom, left */
-    padding: 0 10px 10px 0;
-    width: 155px;
-    background: white;
-}
-
-#moz-sidebar ul li {
-    list-style-type: square;
-    padding-left: 0;
-    text-indent: 0;
-}
-
 #sidebar form {
     margin: 0;
 }
@@ -527,11 +509,8 @@
 
 /* End Images */
 
-/* Begin Lists
+/* Begin Lists */
 
-  Special stylized non-IE bullets
-  Do not work in Internet Explorer, which merely default to normal bullets. */
-
 html>body ul {
     margin-left: 0;
     padding: 0 0 0 30px;

Modified: trunk/themes/blog/templates/sidebar.tmpl
===================================================================
--- trunk/themes/blog/templates/sidebar.tmpl	2020-12-31 18:03:53 UTC (rev 10218)
+++ trunk/themes/blog/templates/sidebar.tmpl	2021-01-02 20:28:05 UTC (rev 10219)
@@ -1,8 +1,5 @@
+<div id="sidebar">
 <?php
-$id = isBrowserIE() ? 'sidebar' : 'moz-sidebar';
-?>
-<div id="<?php echo $id?>">
-<?php
   /* Today's Blogs page for the current or admin user, if the subpage is defined. */
   $UserCalPageTitle = $user->getId() . '/' . _("Blog");
   $dbi = $request->getDbh();

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10218] trunk/lib/config.php

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

Revision: 10218
          http://sourceforge.net/p/phpwiki/code/10218
Author:   vargenau
Date:     2020-12-31 18:03:53 +0000 (Thu, 31 Dec 2020)
Log Message:
-----------
We are in UTF-8; try UTF-8 and utf8

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

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2020-12-31 17:52:38 UTC (rev 10217)
+++ trunk/lib/config.php	2020-12-31 18:03:53 UTC (rev 10218)
@@ -164,17 +164,15 @@
  */
 function guessing_setlocale($category, $locale)
 {
-    $alt = array('en' => array('C', 'en_US', 'en_GB', 'en_AU', 'en_CA', 'english'),
-        'de' => array('de_DE', 'de_DE', 'de_DE@euro',
-            'de_AT@euro', 'de_AT', 'German_Austria.1252', 'deutsch',
-            'german', 'ge'),
+    $alt = array(
+        'de' => array('de_DE', 'de_AT', 'de_CH', 'deutsch', 'german'),
+        'en' => array('en_US', 'en_GB', 'en_AU', 'en_CA', 'en_IE', 'english', 'C'),
         'es' => array('es_ES', 'es_MX', 'es_AR', 'spanish'),
-        'nl' => array('nl_NL', 'dutch'),
-        'fr' => array('fr_FR', 'français', 'french'),
-        'it' => array('it_IT'),
-        'sv' => array('sv_SE'),
-        'ja.utf-8' => array('ja_JP', 'ja_JP.utf-8', 'japanese'),
-        'ja.euc-jp' => array('ja_JP', 'ja_JP.eucJP', 'japanese.euc'),
+        'fr' => array('fr_FR', 'fr_BE', 'fr_CA', 'fr_CH', 'fr_LU', 'français', 'french'),
+        'it' => array('it_IT', 'it_CH', 'italian'),
+        'ja' => array('ja_JP', 'japanese'),
+        'nl' => array('nl_NL', 'nl_BE', 'dutch'),
+        'sv' => array('sv_SE', 'sv_FI', 'swedish'),
         'zh' => array('zh_TW', 'zh_CN'),
     );
     if (!$locale or $locale == 'C') {
@@ -206,9 +204,12 @@
         if ($res = setlocale($category, $try))
             return $res;
         // Try with charset appended...
-        $try = $try . '.' . 'UTF-8';
-        if ($res = setlocale($category, $try))
+        $tryutf8 = $try . '.' . 'UTF-8';
+        if ($res = setlocale($category, $tryutf8))
             return $res;
+        $tryutf8 = $try . '.' . 'utf8';
+        if ($res = setlocale($category, $tryutf8))
+            return $res;
         foreach (array(".", '@', '_') as $sep) {
             if ($i = strpos($try, $sep)) {
                 $try = substr($try, 0, $i);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10217] trunk/lib/WikiUser.php

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

Revision: 10217
          http://sourceforge.net/p/phpwiki/code/10217
Author:   vargenau
Date:     2020-12-31 17:52:38 +0000 (Thu, 31 Dec 2020)
Log Message:
-----------
Fix "Automatically created user homepage to be able to store UserPreferences."

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

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2020-12-31 16:53:59 UTC (rev 10216)
+++ trunk/lib/WikiUser.php	2020-12-31 17:52:38 UTC (rev 10217)
@@ -416,10 +416,12 @@
         global $request;
 
         $versiondata = array('author' => ADMIN_USER);
-        $request->_dbi->save(_("Automatically created user homepage to be able to store UserPreferences.") .
+        $dbi =& $request->_dbi;
+        $page = $dbi->getPage(ADMIN_USER);
+        $page->save(_("Automatically created user homepage to be able to store UserPreferences.") .
                 "\n{{Template/UserPage}}",
             1, $versiondata);
-        $request->_dbi->touch();
+        $dbi->touch();
         $this->_HomePagehandle = $request->getPage($this->_userid);
     }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10216] trunk/lib/plugin/UserPreferences.php

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

Revision: 10216
          http://sourceforge.net/p/phpwiki/code/10216
Author:   vargenau
Date:     2020-12-31 16:53:59 +0000 (Thu, 31 Dec 2020)
Log Message:
-----------
UserPreferences: update locale in case user has changed language

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

Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2020-12-31 16:35:40 UTC (rev 10215)
+++ trunk/lib/plugin/UserPreferences.php	2020-12-31 16:53:59 UTC (rev 10216)
@@ -58,7 +58,7 @@
         }
         $prefs = array();
         if ($pref) {
-            //we need a hash of pref => default_value
+            // We need a hash of pref => default_value
             foreach ($pref->_prefs as $name => $obj) {
                 $prefs[$name] = $obj->default_value;
             }
@@ -159,6 +159,7 @@
                         } else {
                             $request->_setUser($user);
                             $pref = $user->_prefs;
+                            update_locale($rp['lang']); // Update locale in case user has changed language
                             if ($num == 1) {
                                 $errmsg .= _("One UserPreferences field successfully updated.");
                             } else {

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

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

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

Revision: 10215
          http://sourceforge.net/p/phpwiki/code/10215
Author:   vargenau
Date:     2020-12-31 16:35:40 +0000 (Thu, 31 Dec 2020)
Log Message:
-----------
po/de.po: Eined --> Eines

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

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2020-12-30 08:46:50 UTC (rev 10214)
+++ trunk/locale/po/de.po	2020-12-31 16:35:40 UTC (rev 10215)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 22:06+0100\n"
+"POT-Creation-Date: 2020-12-31 17:34+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."
@@ -3328,7 +3328,7 @@
 msgstr "Keine Änderungen."
 
 msgid "One UserPreferences field successfully updated."
-msgstr "Eined BenutzerEinstellung erfolgreich auf neuesten Stand gebracht."
+msgstr "Eines BenutzerEinstellung erfolgreich auf neuesten Stand gebracht."
 
 #, php-format
 msgid "%d UserPreferences fields successfully updated."

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10214] trunk/lib/WikiUser.php

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

Revision: 10214
          http://sourceforge.net/p/phpwiki/code/10214
Author:   vargenau
Date:     2020-12-30 08:46:50 +0000 (Wed, 30 Dec 2020)
Log Message:
-----------
Use same parameter name as parent

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

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2020-12-30 08:42:48 UTC (rev 10213)
+++ trunk/lib/WikiUser.php	2020-12-30 08:46:50 UTC (rev 10214)
@@ -1624,7 +1624,7 @@
         return (string)$value;
     }
 
-    function update($newvalue)
+    function update($value)
     {
         /**
          * @var WikiRequest $request
@@ -1634,7 +1634,7 @@
         if (!$this->_init) {
             // invalidate etag to force fresh output
             $request->setValidators(array('%mtime' => false));
-            update_locale($newvalue ? $newvalue : $GLOBALS['LANG']);
+            update_locale($value ? $value : $GLOBALS['LANG']);
         }
     }
 }
@@ -1654,7 +1654,7 @@
         return $this->default_value;
     }
 
-    function update($newvalue)
+    function update($value)
     {
         global $WikiTheme;
         /**
@@ -1665,8 +1665,8 @@
         // invalidate etag to force fresh output
         if (!$this->_init)
             $request->setValidators(array('%mtime' => false));
-        if ($newvalue)
-            include_once($this->_themefile($newvalue));
+        if ($value)
+            include_once($this->_themefile($value));
         if (empty($WikiTheme))
             include_once($this->_themefile(THEME));
     }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10213] trunk/lib/WikiUser.php

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

Revision: 10213
          http://sourceforge.net/p/phpwiki/code/10213
Author:   vargenau
Date:     2020-12-30 08:42:48 +0000 (Wed, 30 Dec 2020)
Log Message:
-----------
Remove redundant ;

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

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2020-12-30 08:40:36 UTC (rev 10212)
+++ trunk/lib/WikiUser.php	2020-12-30 08:42:48 UTC (rev 10213)
@@ -628,7 +628,6 @@
 
         if (!$this->isValidName($userid))
             return _("Invalid username.");
-        ;
 
         $authlevel = $this->checkPass($passwd === false ? '' : $passwd);
 
@@ -1538,7 +1537,6 @@
     // default: no side-effects
     function update($value)
     {
-        ;
     }
 }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10212] trunk/lib/WikiUser.php

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

Revision: 10212
          http://sourceforge.net/p/phpwiki/code/10212
Author:   vargenau
Date:     2020-12-30 08:40:36 +0000 (Wed, 30 Dec 2020)
Log Message:
-----------
Fix typo: $this->_prefs

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

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2020-12-28 21:15:19 UTC (rev 10211)
+++ trunk/lib/WikiUser.php	2020-12-30 08:40:36 UTC (rev 10212)
@@ -1452,7 +1452,7 @@
             // Should not happen! Only ADMIN_USER should use this class.
             // return $this->_tryNextPass($submitted_password); // ???
             // TODO: safety check if really member of the ADMIN group?
-            $stored_password = $this->_pref->get('passwd');
+            $stored_password = $this->_prefs->get('passwd');
         }
         if ($this->_checkPass($submitted_password, $stored_password)) {
             $this->_level = WIKIAUTH_ADMIN;

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

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

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

Revision: 10211
          http://sourceforge.net/p/phpwiki/code/10211
Author:   vargenau
Date:     2020-12-28 21:15:19 +0000 (Mon, 28 Dec 2020)
Log Message:
-----------
Update translations

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

Modified: trunk/lib/plugin/Video.php
===================================================================
--- trunk/lib/plugin/Video.php	2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/lib/plugin/Video.php	2020-12-28 21:15:19 UTC (rev 10211)
@@ -102,7 +102,7 @@
             }
             return $video;
         }
-        return HTML::span(array('class' => 'error'), 
+        return HTML::span(array('class' => 'error'),
                           _("Unknown video format"));
     }
 }

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

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/locale/po/de.po	2020-12-28 21:15:19 UTC (rev 10211)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 19:06+0100\n"
+"POT-Creation-Date: 2020-12-28 22:06+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."
@@ -3372,6 +3372,9 @@
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 
+msgid "Unknown video format"
+msgstr ""
+
 msgid ""
 "Visualizes the Wiki structure in a graph using the 'dot' commandline tool "
 "from graphviz."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/locale/po/es.po	2020-12-28 21:15:19 UTC (rev 10211)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 19:06+0100\n"
+"POT-Creation-Date: 2020-12-28 22:06+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -3275,6 +3275,9 @@
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 
+msgid "Unknown video format"
+msgstr ""
+
 msgid ""
 "Visualizes the Wiki structure in a graph using the 'dot' commandline tool "
 "from graphviz."

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/locale/po/fr.po	2020-12-28 21:15:19 UTC (rev 10211)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 19:06+0100\n"
+"POT-Creation-Date: 2020-12-28 22:06+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."
@@ -3346,6 +3346,9 @@
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr "Votre navigateur ne reconnaît pas la balise video du HTML 5."
 
+msgid "Unknown video format"
+msgstr "Format vidéo inconnu"
+
 msgid ""
 "Visualizes the Wiki structure in a graph using the 'dot' commandline tool "
 "from graphviz."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/locale/po/it.po	2020-12-28 21:15:19 UTC (rev 10211)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 19:06+0100\n"
+"POT-Creation-Date: 2020-12-28 22:06+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"
@@ -3252,6 +3252,9 @@
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 
+msgid "Unknown video format"
+msgstr ""
+
 msgid ""
 "Visualizes the Wiki structure in a graph using the 'dot' commandline tool "
 "from graphviz."

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/locale/po/ja.po	2020-12-28 21:15:19 UTC (rev 10211)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 19:06+0100\n"
+"POT-Creation-Date: 2020-12-28 22:06+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"
@@ -3238,6 +3238,9 @@
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 
+msgid "Unknown video format"
+msgstr ""
+
 msgid ""
 "Visualizes the Wiki structure in a graph using the 'dot' commandline tool "
 "from graphviz."

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/locale/po/nl.po	2020-12-28 21:15:19 UTC (rev 10211)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 19:06+0100\n"
+"POT-Creation-Date: 2020-12-28 22:06+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"
@@ -3244,6 +3244,9 @@
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 
+msgid "Unknown video format"
+msgstr ""
+
 msgid ""
 "Visualizes the Wiki structure in a graph using the 'dot' commandline tool "
 "from graphviz."

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/locale/po/phpwiki.pot	2020-12-28 21:15:19 UTC (rev 10211)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 19:06+0100\n"
+"POT-Creation-Date: 2020-12-28 22:06+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"
@@ -3238,6 +3238,9 @@
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 
+msgid "Unknown video format"
+msgstr ""
+
 msgid ""
 "Visualizes the Wiki structure in a graph using the 'dot' commandline tool "
 "from graphviz."

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/locale/po/sv.po	2020-12-28 21:15:19 UTC (rev 10211)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 19:06+0100\n"
+"POT-Creation-Date: 2020-12-28 22:06+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -3239,6 +3239,9 @@
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 
+msgid "Unknown video format"
+msgstr ""
+
 msgid ""
 "Visualizes the Wiki structure in a graph using the 'dot' commandline tool "
 "from graphviz."

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2020-12-28 21:02:13 UTC (rev 10210)
+++ trunk/locale/po/zh.po	2020-12-28 21:15:19 UTC (rev 10211)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-28 19:06+0100\n"
+"POT-Creation-Date: 2020-12-28 22:06+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -3251,6 +3251,9 @@
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 
+msgid "Unknown video format"
+msgstr ""
+
 msgid ""
 "Visualizes the Wiki structure in a graph using the 'dot' commandline tool "
 "from graphviz."

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10210] trunk/lib/plugin/Video.php

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

Revision: 10210
          http://sourceforge.net/p/phpwiki/code/10210
Author:   vargenau
Date:     2020-12-28 21:02:13 +0000 (Mon, 28 Dec 2020)
Log Message:
-----------
Video plugin: return error message in case of unknown video format

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

Modified: trunk/lib/plugin/Video.php
===================================================================
--- trunk/lib/plugin/Video.php	2020-12-28 18:58:08 UTC (rev 10209)
+++ trunk/lib/plugin/Video.php	2020-12-28 21:02:13 UTC (rev 10210)
@@ -102,6 +102,7 @@
             }
             return $video;
         }
-        return HTML();
+        return HTML::span(array('class' => 'error'), 
+                          _("Unknown video format"));
     }
 }

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

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

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

Revision: 10209
          http://sourceforge.net/p/phpwiki/code/10209
Author:   vargenau
Date:     2020-12-28 18:58:08 +0000 (Mon, 28 Dec 2020)
Log Message:
-----------
Flash is dead

Modified Paths:
--------------
    trunk/TODO
    trunk/config/config-default.ini
    trunk/config/config-dist.ini
    trunk/configurator.php
    trunk/lib/WikiDB/backend.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/plugin/GraphViz.php
    trunk/lib/plugin/Ploticus.php
    trunk/lib/plugin/UpLoad.php
    trunk/lib/plugin/Video.php
    trunk/lib/stdlib.php
    trunk/locale/Makefile
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/pgsrc/NoteDiRilascio
    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/pgsrc/Help%2FCalendarListPlugin
    trunk/pgsrc/Help%2FImages
    trunk/pgsrc/Help%2FPloticusPlugin
    trunk/pgsrc/Help%2FTeX2pngPlugin
    trunk/pgsrc/Help%2FVideoPlugin
    trunk/pgsrc/Help%2FWikiPlugin
    trunk/pgsrc/PhpWikiManual
    trunk/pgsrc/ReleaseNotes
    trunk/themes/blog/templates/top.tmpl

Removed Paths:
-------------
    trunk/pgsrc/Help%2FAdobe%20Flash
    trunk/themes/Sidebar/clock.php
    trunk/themes/Sidebar/ora.swf
    trunk/themes/default/flowplayer-3.2.4.swf
    trunk/themes/default/flowplayer.controls-3.2.2.swf

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/TODO	2020-12-28 18:58:08 UTC (rev 10209)
@@ -84,7 +84,7 @@
 * display login page on "$action is disallowed on this wiki for user ..."
 * remove "Invalid username" warning on "sign in as" button click
 * themes/blog, BlogArchivesPlugin
-* test WikiPluginCached support for image maps and svg, swf, eps, ...
+* test WikiPluginCached support for image maps and svg, eps, ...
   defer header logic
 * don't print php notices and warnings as red errors.
   just green or grey

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/config/config-default.ini	2020-12-28 18:58:08 UTC (rev 10209)
@@ -130,7 +130,7 @@
 DEFAULT_WIKI_PAGES = "ReleaseNotes"
 
 ALLOWED_PROTOCOLS = "http|https|mailto|ftp|news|nntp|ssh|gopher"
-INLINE_IMAGES = "png|jpg|jpeg|gif|swf"
+INLINE_IMAGES = "png|jpg|jpeg|gif"
 WIKI_NAME_REGEXP = "(?<![[:alnum:]])(?:[[:upper:]][[:lower:][:digit:]]+){2,}(?![[:alnum:]])"
 INTERWIKI_MAP_FILE = lib/interwiki.map
 WARN_NONPUBLIC_INTERWIKIMAP = false

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/config/config-dist.ini	2020-12-28 18:58:08 UTC (rev 10209)
@@ -932,11 +932,11 @@
 
 ; URLs ending with the following extension should be inlined as images.
 ; Specify as per ALLOWED_PROTOCOLS.
-; Note that you can now also allow class|svg|svgz|vrml|swf ...,
+; Note that you can now also allow class|svg|svgz|vrml...,
 ; which will create embedded object instead of img.
 ; Typical CGI extensions as pl or cgi maybe allowed too,
 ; but those two will be enforced to img.
-;INLINE_IMAGES = "png|jpg|jpeg|gif|swf"
+;INLINE_IMAGES = "png|jpg|jpeg|gif"
 
 ; Perl regexp for WikiNames ("bumpy words"):
 ;   (?<!..) & (?!...) used instead of '\b' because \b matches '_' as well

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/configurator.php	2020-12-28 18:58:08 UTC (rev 10209)
@@ -1330,7 +1330,7 @@
 within a named link [name|uri] one more protocol is defined: phpwiki");
 
 $properties["Inline Images"] =
-    new list_define('INLINE_IMAGES', 'png|jpg|jpeg|gif|swf');
+    new list_define('INLINE_IMAGES', 'png|jpg|jpeg|gif');
 
 $properties["WikiName Regexp"] =
     new _define('WIKI_NAME_REGEXP', "(?<![[:alnum:]])(?:[[:upper:]][[:lower:]]+){2,}(?![[:alnum:]])", "

Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/lib/WikiDB/backend.php	2020-12-28 18:58:08 UTC (rev 10209)
@@ -566,7 +566,7 @@
             }
             return array($from, $limit);
         } else {
-            if (!empty($limit) && !is_numeric($limit)) {
+            if (!empty($limit) && (!is_numeric($limit) || $limit > 2147483647)) {
                 trigger_error(_("Illegal “limit” argument: must be an integer or two integers separated by comma"));
                 return array(0, 0);
             }

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/lib/WikiPluginCached.php	2020-12-28 18:58:08 UTC (rev 10209)
@@ -37,7 +37,6 @@
 define('PLUGIN_CACHED_MAP', 2); // area maps
 define('PLUGIN_CACHED_SVG', 3); // special SVG/SVGZ object
 define('PLUGIN_CACHED_SVG_PNG', 4); // special SVG/SVGZ object with PNG fallback
-define('PLUGIN_CACHED_SWF', 5); // special SWF (flash) object
 define('PLUGIN_CACHED_PDF', 6); // special PDF object (inlinable?)
 define('PLUGIN_CACHED_PS', 7); // special PS object (inlinable?)
 // boolean tests:
@@ -441,7 +440,7 @@
     }
 
     /**
-     * svg?, swf, ...
+     * svg?, ...
     <object type="audio/x-wav" standby="Loading Audio" data="example.wav">
     <param name="src" value="example.wav" valuetype="data"></param>
     <param name="autostart" value="false" valuetype="data"></param>
@@ -524,7 +523,7 @@
         }
 
         $supportedtypes = array();
-        // Todo: swf, pdf, ...
+        // Todo: pdf, ...
         $imagetypes = array(
             'png' => IMG_PNG,
             'gif' => IMG_GIF,
@@ -591,7 +590,7 @@
             'gd2' => 'Content-type: image/gd2',
             'wbmp' => 'Content-type: image/vnd.wap.wbmp', // wireless bitmaps for PDA's and such.
             'html' => 'Content-type: text/html');
-        // Todo: swf, pdf, svg, svgz
+        // Todo: pdf, svg, svgz
         header($IMAGEHEADER[$doctype]);
     }
 

Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/lib/plugin/GraphViz.php	2020-12-28 18:58:08 UTC (rev 10209)
@@ -30,7 +30,7 @@
  *
  * Note:
  * - We support only images supported by GD so far (PNG most likely).
- *   EPS, PS, SWF, SVG or SVGZ and imagemaps need to be tested.
+ *   EPS, PS, SVG or SVGZ and imagemaps need to be tested.
  *
  * TODO:
  * - neato binary ?
@@ -97,13 +97,11 @@
         $device = strtolower($this->_args['imgtype']);
         if (in_array($device, $this->mapTypes()))
             return PLUGIN_CACHED_MAP;
-        if (in_array($device, array('svg', 'swf', 'svgz', 'eps', 'ps'))) {
+        if (in_array($device, array('svg', 'svgz', 'eps', 'ps'))) {
             switch ($this->_args['imgtype']) {
                 case 'svg':
                 case 'svgz':
                     return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_SVG_PNG;
-                case 'swf':
-                    return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_SWF;
                 default:
                     return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_HTML;
             }

Modified: trunk/lib/plugin/Ploticus.php
===================================================================
--- trunk/lib/plugin/Ploticus.php	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/lib/plugin/Ploticus.php	2020-12-28 18:58:08 UTC (rev 10209)
@@ -24,7 +24,7 @@
 
 /**
  * The Ploticus plugin passes all its arguments to the ploticus
- * binary and displays the result as PNG, GIF, EPS, SVG or SWF.
+ * binary and displays the result as PNG, GIF, EPS or SVG.
  * Ploticus is a free, GPL, non-interactive software package
  * for producing plots, charts, and graphics from data.
  * See http://ploticus.sourceforge.net/doc/welcome.html
@@ -35,7 +35,7 @@
  * - For windows you need either a gd library with GIF support or
  *   a Ploticus with PNG support. This comes e.g. with the Cygwin build.
  * - We support only images supported by GD so far (PNG most likely).
- *   No EPS, PS, SWF, SVG or SVGZ support yet, due to limitations in WikiPluginCached.
+ *   No EPS, PS, SVG or SVGZ support yet, due to limitations in WikiPluginCached.
  *   This will be fixed soon.
  *
  * Usage:
@@ -83,13 +83,11 @@
         if ($type == $this->_args['device'])
             return PLUGIN_CACHED_IMG_INLINE;
         $device = strtolower($this->_args['device']);
-        if (in_array($device, array('svg', 'swf', 'svgz', 'eps', 'ps', 'pdf', 'html'))) {
+        if (in_array($device, array('svg', 'svgz', 'eps', 'ps', 'pdf', 'html'))) {
             switch ($this->_args['device']) {
                 case 'svg':
                 case 'svgz':
                     return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_SVG_PNG;
-                case 'swf':
-                    return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_SWF;
                 default:
                     return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_HTML;
             }
@@ -218,7 +216,7 @@
     {
         // Check device
         $device = strtolower($argarray['device']);
-        if (!in_array($device, array('gif', 'png', 'jpeg', 'svg', 'svgz', 'eps', 'swf', 'ps', 'pdf', 'html'))) {
+        if (!in_array($device, array('gif', 'png', 'jpeg', 'svg', 'svgz', 'eps', 'ps', 'pdf', 'html'))) {
             $this->_errortext = _("wrong device");
             return false;
         }

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/lib/plugin/UpLoad.php	2020-12-28 18:58:08 UTC (rev 10209)
@@ -67,7 +67,7 @@
     function run($dbi, $argstr, &$request, $basepage)
     {
         $this->allowed_extensions = explode(",",
-            "7z,avi,bmp,bz2,c,cfg,diff,doc,docx,flv,gif,h,ics,ini,".
+            "7z,avi,bmp,bz2,c,cfg,diff,doc,docx,gif,h,ics,ini,".
             "jpeg,jpg,kmz,mp3,odg,odp,ods,odt,ogg,patch,pdf,png,ppt,".
             "pptx,rar,svg,tar,tar.gz,txt,xls,xlsx,xml,xsd,zip");
         $this->disallowed_extensions = explode(",",

Modified: trunk/lib/plugin/Video.php
===================================================================
--- trunk/lib/plugin/Video.php	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/lib/plugin/Video.php	2020-12-28 18:58:08 UTC (rev 10209)
@@ -49,7 +49,7 @@
 {
     function getDescription()
     {
-        return _("Display video in Flash or HTML5.");
+        return _("Display video in HTML5.");
     }
 
     function getDefaultArguments()
@@ -102,63 +102,6 @@
             }
             return $video;
         }
-
-        $html = HTML();
-
-        if (isBrowserIE()) {
-            $object = HTML::object(array('id' => 'flowplayer',
-                'classid' => 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000',
-                'width' => $width,
-                'height' => $height));
-
-            $param = HTML::param(array('name' => 'movie',
-                'value' => SERVER_URL . $WikiTheme->_findData('flowplayer-3.2.4.swf')));
-            $object->pushContent($param);
-
-            $param = HTML::param(array('name' => "allowfullscreen",
-                'value' => "true"));
-            $object->pushContent($param);
-
-            $param = HTML::param(array('name' => "allowscriptaccess",
-                'value' => "false"));
-            $object->pushContent($param);
-
-            $flashvars = "config={'clip':{'url':'" . $url . "','autoPlay':" . $autoplay . "}}";
-
-            $param = HTML::param(array('name' => 'flashvars',
-                'value' => $flashvars));
-            $object->pushContent($param);
-
-            $embed = HTML::embed(array('type' => 'application/x-shockwave-flash',
-                'width' => $width,
-                'height' => $height,
-                'src' => SERVER_URL . $WikiTheme->_findData('flowplayer-3.2.4.swf'),
-                'flashvars' => $flashvars));
-            $object->pushContent($embed);
-
-            $html->pushContent($object);
-
-        } else {
-            $object = HTML::object(array('data' => SERVER_URL . $WikiTheme->_findData('flowplayer-3.2.4.swf'),
-                'type' => "application/x-shockwave-flash",
-                'width' => $width,
-                'height' => $height));
-
-            $param = HTML::param(array('name' => "allowfullscreen",
-                'value' => "true"));
-            $object->pushContent($param);
-
-            $param = HTML::param(array('name' => "allowscriptaccess",
-                'value' => "false"));
-            $object->pushContent($param);
-
-            $value = "config={'clip':{'url':'" . $url . "','autoPlay':" . $autoplay . "}}";
-            $param = HTML::param(array('name' => "flashvars",
-                'value' => $value));
-            $object->pushContent($param);
-
-            $html->pushContent($object);
-        }
-        return $html;
+        return HTML();
     }
 }

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/lib/stdlib.php	2020-12-28 18:58:08 UTC (rev 10209)
@@ -272,7 +272,7 @@
         // display apache style icon for file type instead of protocol icon
         // - archive: unix:gz,bz2,tgz,tar,z; mac:dmg,dmgz,bin,img,cpt,sit; pc:zip;
         // - document: html, htm, text, txt, rtf, pdf, doc
-        // - non-inlined image: jpg,jpeg,png,gif,tiff,tif,swf,pict,psd,eps,ps
+        // - non-inlined image: jpg,jpeg,png,gif,tiff,tif,pict,psd,eps,ps
         // - audio: mp3,mp2,aiff,aif,au
         // - multimedia: mpeg,mpg,mov,qt
     } else {
@@ -403,7 +403,7 @@
  * Disallows sizes which are too small.
  * Spammers may use such (typically invisible) image attributes to raise their GoogleRank.
  *
- * Handle embeddable objects, like svg, class, vrml, swf, svgz, pdf, avi, wmv especially.
+ * Handle embeddable objects, like svg, class, vrml, svgz, pdf, avi, wmv especially.
  */
 function LinkImage($url, $alt = "")
 {
@@ -2080,7 +2080,7 @@
 
 /**
  * Returns true if the filename ends with an image suffix.
- * Uses INLINE_IMAGES if defined, else "png|jpg|jpeg|gif|swf"
+ * Uses INLINE_IMAGES if defined, else "png|jpg|jpeg|gif"
  */
 function is_image($filename)
 {
@@ -2088,7 +2088,7 @@
     if (defined('INLINE_IMAGES')) {
         $inline_images = INLINE_IMAGES;
     } else {
-        $inline_images = "png|jpg|jpeg|gif|swf";
+        $inline_images = "png|jpg|jpeg|gif";
     }
 
     foreach (explode("|", $inline_images) as $suffix) {
@@ -2101,13 +2101,12 @@
 
 /**
  * Returns true if the filename ends with an video suffix.
- * Currently FLV, OGG, MP4 and WebM.
+ * Currently OGG, MP4 and WebM.
  */
 function is_video($filename)
 {
 
-    return string_ends_with(strtolower($filename), ".flv")
-        or string_ends_with(strtolower($filename), ".ogg")
+    return string_ends_with(strtolower($filename), ".ogg")
         or string_ends_with(strtolower($filename), ".mp4")
         or string_ends_with(strtolower($filename), ".webm");
 }

Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/Makefile	2020-12-28 18:58:08 UTC (rev 10209)
@@ -773,7 +773,6 @@
 ${POT_FILE}: .././themes/shamino_com/templates/signin.tmpl
 ${POT_FILE}: .././themes/shamino_com/templates/top.tmpl
 ${POT_FILE}: .././themes/shamino_com/themeinfo.php
-${POT_FILE}: .././themes/Sidebar/clock.php
 ${POT_FILE}: .././themes/Sidebar/hyperapplet.php
 ${POT_FILE}: .././themes/Sidebar/hyperwiki.php
 ${POT_FILE}: .././themes/Sidebar/templates/actionbar.tmpl

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

Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/it/pgsrc/NoteDiRilascio	2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,4 +1,4 @@
-Date: Thu, 16 Dec 2020 12:01:56 +0000
+Date: Mon, 28 Dec 2020 19:46:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=NoteDiRilascio;
@@ -13,14 +13,17 @@
 Major release:
 * PHP 7 compatible
 * Full HTML 5: Add HTML 5 <main> <header> <footer> <nav> in all themes. Add ARIA roles.
+* Flash is dead
 
 === Changes ===
 * Add new button in Edit Toolbar: convert Tab Separated Values to Wikicreole table
 * Update jQuery to 2.2.4: Internet Explorer <= 8 no longer supported
 * Pear: use ##mysqli## instead of ##mysql##
-* Update Pear DB library to 1.9.3
+* Update PEAR.php to release 1.10.12
+* Update Pear DB library to 1.10.0
+* Update Pear Cache library to 1.5.6
 * Replace ##ereg## functions
-* Update Adodb to version 5.20.14
+* Update Adodb to version 5.20.19
 * Update ASCIIMathPHP to version 2.1 (from Zefling/ASCIIMathPHP on github.com)
 * Update highlight.js to version 9.15.6
 * Allow Wikicreole syntax for plugins in theme templates
@@ -31,7 +34,6 @@
 * Updated pgsrc pages in all languages
 * Security fixes
 * Adding SPDX-License-Identifier in PHP source files
-* More documentation translation
 
 ===  Bugs ===
 * Make function IsSafeURL more strict

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/po/de.po	2020-12-28 18:58:08 UTC (rev 10209)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-15 17:58+0100\n"
+"POT-Creation-Date: 2020-12-28 19:06+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."
@@ -3359,7 +3359,7 @@
 msgid "Rate"
 msgstr "Bewerte"
 
-msgid "Display video in Flash or HTML5."
+msgid "Display video in HTML5."
 msgstr ""
 
 # (??? Parameter = Hilfsgröße!!!Bezugseinheit!!! Bezugsgröße!!!)

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/po/es.po	2020-12-28 18:58:08 UTC (rev 10209)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-15 17:58+0100\n"
+"POT-Creation-Date: 2020-12-28 19:06+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -3263,7 +3263,7 @@
 msgid "Rate"
 msgstr ""
 
-msgid "Display video in Flash or HTML5."
+msgid "Display video in HTML5."
 msgstr ""
 
 msgid "Both 'url' or 'file' parameters missing."

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/po/fr.po	2020-12-28 18:58:08 UTC (rev 10209)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-15 17:58+0100\n"
+"POT-Creation-Date: 2020-12-28 19:06+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."
@@ -3334,8 +3334,8 @@
 msgid "Rate"
 msgstr "Évaluer"
 
-msgid "Display video in Flash or HTML5."
-msgstr "Afficher une vidéo en Flash ou HTML5."
+msgid "Display video in HTML5."
+msgstr "Afficher une vidéo en HTML5."
 
 msgid "Both 'url' or 'file' parameters missing."
 msgstr "Les paramètres « url » et « file » manquent tous les deux."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/po/it.po	2020-12-28 18:58:08 UTC (rev 10209)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-15 17:58+0100\n"
+"POT-Creation-Date: 2020-12-28 19:06+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"
@@ -3240,7 +3240,7 @@
 msgid "Rate"
 msgstr ""
 
-msgid "Display video in Flash or HTML5."
+msgid "Display video in HTML5."
 msgstr ""
 
 msgid "Both 'url' or 'file' parameters missing."

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/po/ja.po	2020-12-28 18:58:08 UTC (rev 10209)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-15 17:58+0100\n"
+"POT-Creation-Date: 2020-12-28 19:06+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"
@@ -3226,7 +3226,7 @@
 msgid "Rate"
 msgstr ""
 
-msgid "Display video in Flash or HTML5."
+msgid "Display video in HTML5."
 msgstr ""
 
 msgid "Both 'url' or 'file' parameters missing."

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/po/nl.po	2020-12-28 18:58:08 UTC (rev 10209)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-15 17:58+0100\n"
+"POT-Creation-Date: 2020-12-28 19:06+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"
@@ -3232,7 +3232,7 @@
 msgid "Rate"
 msgstr ""
 
-msgid "Display video in Flash or HTML5."
+msgid "Display video in HTML5."
 msgstr ""
 
 msgid "Both 'url' or 'file' parameters missing."

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/po/phpwiki.pot	2020-12-28 18:58:08 UTC (rev 10209)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-15 17:58+0100\n"
+"POT-Creation-Date: 2020-12-28 19:06+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"
@@ -3226,7 +3226,7 @@
 msgid "Rate"
 msgstr ""
 
-msgid "Display video in Flash or HTML5."
+msgid "Display video in HTML5."
 msgstr ""
 
 msgid "Both 'url' or 'file' parameters missing."

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/po/sv.po	2020-12-28 18:58:08 UTC (rev 10209)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-15 17:58+0100\n"
+"POT-Creation-Date: 2020-12-28 19:06+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -3227,7 +3227,7 @@
 msgid "Rate"
 msgstr ""
 
-msgid "Display video in Flash or HTML5."
+msgid "Display video in HTML5."
 msgstr ""
 
 msgid "Both 'url' or 'file' parameters missing."

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/locale/po/zh.po	2020-12-28 18:58:08 UTC (rev 10209)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-15 17:58+0100\n"
+"POT-Creation-Date: 2020-12-28 19:06+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -3239,7 +3239,7 @@
 msgid "Rate"
 msgstr ""
 
-msgid "Display video in Flash or HTML5."
+msgid "Display video in HTML5."
 msgstr ""
 
 msgid "Both 'url' or 'file' parameters missing."

Deleted: trunk/pgsrc/Help%2FAdobe%20Flash
===================================================================
--- trunk/pgsrc/Help%2FAdobe%20Flash	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/pgsrc/Help%2FAdobe%20Flash	2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,76 +0,0 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
-Content-Type: application/x-phpwiki;
-  pagename=Help%2FAdobe%20Flash;
-  flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
-  charset=UTF-8
-Content-Transfer-Encoding: binary
-
-You can easily insert **Adobe Flash** (.swf) files in the wiki.
-
-== Uploading Flash files ==
-
-First, Flash files need to be uploaded in the wiki. For that purpose, you will use the
-[[Help:UpLoadPlugin|UpLoad]] plugin.
-
-=== Syntax ===
-
-You give access to the uploaded Flash files with the following syntax.
-
-{{{
-{{myflash.swf}}
-}}}
-or
-{{{
-[[Upload:myflash.swf]]
-}}}
-will inline the image.
-
-=== Options ===
-
-Using the {{{Upload:}}} syntax, options are allowed to change the appearance:
-{{{
-[[Upload:myflash.png size=40x25 align=center]]
-}}}
-
-Separate options by spaces. The allowed options are the following:
-* size: //width "x" height// or //num + "%"//
-* align: //string//
-* border: //number//
-* hspace: //number//
-* vspace: //number//
-
-== Examples ==
-
-=== Wikicreole syntax ===
-
-{{{
-{{ora.swf}}
-}}}
-
-{{/themes/Sidebar/ora.swf}}
-
-=== Upload syntax ===
-
-{{{
-[[Upload:ora.swf]]
-[[Upload:ora.swf size=50x50]]
-}}}
-
-=== URL syntax ===
-
-{{{
-[[http://www.freemahjong.org/mahjong.swf size=1000x600]]
-}}}
-
-[[http://www.freemahjong.org/mahjong.swf size=1000x600]]
-
-== See Also ==
-* [[Help:Images]]
-* [[Help:VideoPlugin]]
-* [[Help:Wikicreole]]
-
-<noinclude>
-----
-[[PhpWikiDocumentation]]
-</noinclude>

Modified: trunk/pgsrc/Help%2FCalendarListPlugin
===================================================================
--- trunk/pgsrc/Help%2FCalendarListPlugin	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/pgsrc/Help%2FCalendarListPlugin	2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,4 +1,4 @@
-Date: Sun, 29 Mar 2020 22:43:23 +0000
+Date: Sun, 29 Mar 2020 18:53:38 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FCalendarListPlugin;

Modified: trunk/pgsrc/Help%2FImages
===================================================================
--- trunk/pgsrc/Help%2FImages	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/pgsrc/Help%2FImages	2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,4 +1,4 @@
-Date: Sun, 27 Dec 2020 16:52:02 +0000
+Date: Mon, 28 Dec 2020 19:46:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FImages;
@@ -103,7 +103,6 @@
 [[http://phpwiki.demo.free.fr/themes/default/images/poweredby_phpwiki_51x31.png]]
 
 == See Also ==
-* [[Help:Adobe Flash]]
 * [[Help:VideoPlugin]]
 * [[Help:Wikicreole]]
 

Modified: trunk/pgsrc/Help%2FPloticusPlugin
===================================================================
--- trunk/pgsrc/Help%2FPloticusPlugin	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/pgsrc/Help%2FPloticusPlugin	2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Mon, 28 Dec 2020 19:46:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPloticusPlugin;
@@ -7,7 +7,7 @@
 Content-Transfer-Encoding: binary
 
 The **Ploticus** [[Help:WikiPlugin|plugin]] passes all its arguments to the Ploticus
-binary and displays the result as PNG, GIF, EPS, SVG, SVGZ or SWF.
+binary and displays the result as PNG, GIF, EPS, SVG or SVGZ.
 Ploticus is a free, GPL, non-interactive software package
 for producing plots, charts, and graphics from data.
 See http://ploticus.sourceforge.net/doc/welcome.html
@@ -45,7 +45,7 @@
 ! Default value
 |-
 | **device**
-| gif, png, jpeg, svg, svgz, eps, swf. Any -T parameter supported by Ploticus.
+| gif, png, jpeg, svg, svgz, eps. Any -T parameter supported by Ploticus.
 | png
 |-
 | **data**

Modified: trunk/pgsrc/Help%2FTeX2pngPlugin
===================================================================
--- trunk/pgsrc/Help%2FTeX2pngPlugin	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/pgsrc/Help%2FTeX2pngPlugin	2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,4 +1,4 @@
-Date: Sun, 29 Mar 2020 22:43:23 +0000
+Date: Thu, 13 Oct 2016 15:09:28 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTeX2pngPlugin;

Modified: trunk/pgsrc/Help%2FVideoPlugin
===================================================================
--- trunk/pgsrc/Help%2FVideoPlugin	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/pgsrc/Help%2FVideoPlugin	2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Mon, 28 Dec 2020 19:46:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FVideoPlugin;
@@ -7,12 +7,12 @@
 Content-Transfer-Encoding: binary
 
 The **~Video** [[Help:WikiPlugin|plugin]] allows to include video in a wiki page.
-Video file must be encoded in FLV format ([[WikiPedia:Flash Video|Flash Video]]) or in an HTML 5 format:
+Video file must be an HTML 5 format:
 * [[WikiPedia:Ogg|Ogg]] (##.ogg## suffix),
 * [[WikiPedia:MP4|MP4]] (##.mp4## suffix),
 * [[WikiPedia:WebM|WebM]] (##.webm## suffix).
 
-The Video plugin can also be called with the ~{~{video.flv~}~} syntax.
+The Video plugin can also be called with the ~{~{video.ogg~}~} syntax.
 
 == Arguments ==
 
@@ -49,17 +49,17 @@
 
 A video:
 {{{
-<<Video url=http://a.video.server/a_video.flv>>
+<<Video url=http://a.video.server/a_video.ogg>>
 }}}
 
 Another video:
 {{{
-<<Video file=another_video.flv>>
+<<Video file=another_video.ogg>>
 }}}
 
 This is equivalent to:
 {{{
-{{another_video.flv}}
+{{another_video.ogg}}
 }}}
 
 === Big Buck Bunny ===
@@ -76,7 +76,6 @@
 
 == See Also ==
 * [[Help:Images]]
-* [[Help:Adobe Flash]]
 * [[Help:Wikicreole]]
 * [[http://tools.google.com/dlpage/webmmf/|WebM Video for Internet Explorer 9+]]
 

Modified: trunk/pgsrc/Help%2FWikiPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiPlugin	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/pgsrc/Help%2FWikiPlugin	2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,4 +1,4 @@
-Date: Sun, 29 Mar 2020 22:43:23 +0000
+Date: Sun, 29 Mar 2020 19:52:27 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiPlugin;

Modified: trunk/pgsrc/PhpWikiManual
===================================================================
--- trunk/pgsrc/PhpWikiManual	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/pgsrc/PhpWikiManual	2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Mon, 28 Dec 2020 19:46:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiManual;
@@ -18,7 +18,6 @@
 <<IncludePage page="Help/HowToUseWiki">>
 <<IncludePage page="FindPage">>
 <<IncludePage page="Help/Images">>
-<<IncludePage page="Help/Adobe Flash">>
 <<IncludePage page="Help/Categories">>
 <<IncludePage page="Help/InterWiki">>
 <<IncludePage page="Help/LinkIcons">>

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/pgsrc/ReleaseNotes	2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,4 +1,4 @@
-Date: Sat, 26 Dec 2020 16:56:04 +0000
+Date: Mon, 28 Dec 2020 19:46:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -13,12 +13,15 @@
 Major release:
 * PHP 7 compatible
 * Full HTML 5: Add HTML 5 <main> <header> <footer> <nav> in all themes. Add ARIA roles.
+* Flash is dead
 
 === Changes ===
 * Add new button in Edit Toolbar: convert Tab Separated Values to Wikicreole table
 * Update jQuery to 2.2.4: Internet Explorer <= 8 no longer supported
 * Pear: use ##mysqli## instead of ##mysql##
+* Update PEAR.php to release 1.10.12
 * Update Pear DB library to 1.10.0
+* Update Pear Cache library to 1.5.6
 * Replace ##ereg## functions
 * Update Adodb to version 5.20.19
 * Update ASCIIMathPHP to version 2.1 (from Zefling/ASCIIMathPHP on github.com)

Deleted: trunk/themes/Sidebar/clock.php
===================================================================
--- trunk/themes/Sidebar/clock.php	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/themes/Sidebar/clock.php	2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,34 +0,0 @@
-<?php
-/**
- * Copyright © 2004 Reini Urban
- *
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- */
-
-$ora = isset($GLOBALS['WikiTheme']) ? DATA_PATH . '/' . $GLOBALS['WikiTheme']->_findFile("ora.swf") : "ora.swf";
-?>
-<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-        codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,29,0" width="160"
-        height="160" align="middle">
-    <param name="movie" value="<?php echo $ora ?>">
-    <param name="quality" value="high">
-    <embed src="<?php echo $ora ?>" quality="high" type="application/x-shockwave-flash" width="160"
-           height="160"></embed>
-</object>

Deleted: trunk/themes/Sidebar/ora.swf
===================================================================
--- trunk/themes/Sidebar/ora.swf	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/themes/Sidebar/ora.swf	2020-12-28 18:58:08 UTC (rev 10209)
@@ -1,6 +0,0 @@
-FWS\xB6-V\xB9P\xA1-\ No newline at end of file

Modified: trunk/themes/blog/templates/top.tmpl
===================================================================
--- trunk/themes/blog/templates/top.tmpl	2020-12-27 15:54:58 UTC (rev 10208)
+++ trunk/themes/blog/templates/top.tmpl	2020-12-28 18:58:08 UTC (rev 10209)
@@ -2,7 +2,7 @@
 <div id="header">
 <?php if ( $request->getArg('action') == 'browse' ) { ?>
 <div id="yoursiteheader">
-<?php // Insert Flash or Logo here ?>
+<?php // Insert Logo here ?>
 <a href=""><?php echo WIKI_NAME ?></a>
 </div>
 <?php } ?>

Deleted: trunk/themes/default/flowplayer-3.2.4.swf
===================================================================
(Binary files differ)

Deleted: trunk/themes/default/flowplayer.controls-3.2.2.swf
===================================================================
(Binary files differ)

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

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

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

Revision: 10208
          http://sourceforge.net/p/phpwiki/code/10208
Author:   vargenau
Date:     2020-12-27 15:54:58 +0000 (Sun, 27 Dec 2020)
Log Message:
-----------
Alternate text for icons

Modified Paths:
--------------
    trunk/pgsrc/Help%2FCategories
    trunk/pgsrc/Help%2FImages

Modified: trunk/pgsrc/Help%2FCategories
===================================================================
--- trunk/pgsrc/Help%2FCategories	2020-12-26 17:42:28 UTC (rev 10207)
+++ trunk/pgsrc/Help%2FCategories	2020-12-27 15:54:58 UTC (rev 10208)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Sun, 27 Dec 2020 16:52:02 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FCategories;
@@ -47,7 +47,7 @@
 The ~CategoryFruit page will then display your text describing the
 purpose of the category, then the list of pages in the category.
 
-The can be done very easily by using the {{/themes/default/images/ed_category.png|[C]}}
+The can be done very easily by using the {{/themes/default/images/ed_category.png|Insert Categories}}
 button of the edit toolbar when editing the page.
 
 == Category hierarchies ==

Modified: trunk/pgsrc/Help%2FImages
===================================================================
--- trunk/pgsrc/Help%2FImages	2020-12-26 17:42:28 UTC (rev 10207)
+++ trunk/pgsrc/Help%2FImages	2020-12-27 15:54:58 UTC (rev 10208)
@@ -1,4 +1,4 @@
-Date: Thu,  4 Apr 2019 15:43:02 +0000
+Date: Sun, 27 Dec 2020 16:52:02 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FImages;
@@ -17,7 +17,7 @@
 
 Once the image is uploaded, the easiest way to insert it is to use the toolbar.
 
-Click on the {{/themes/default/images/ed_image.png}} icon and you will be shown a list
+Click on the {{/themes/default/images/ed_image.png|Insert Image or Video}} icon and you will be shown a list
 of available images.
 
 Select an image and click //Insert//. The image will be inserted without options or alternative 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:[10207] trunk/lib/InlineParser.php

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

Revision: 10207
          http://sourceforge.net/p/phpwiki/code/10207
Author:   vargenau
Date:     2020-12-26 17:42:28 +0000 (Sat, 26 Dec 2020)
Log Message:
-----------
Fix image display in Help/Images (no double slash)

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

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2020-12-26 16:01:39 UTC (rev 10206)
+++ trunk/lib/InlineParser.php	2020-12-26 17:42:28 UTC (rev 10207)
@@ -1102,7 +1102,7 @@
             if ((strpos($imagename, "http://") === 0) || (strpos($imagename, "https://") === 0)) {
                 return LinkImage($imagename, $alt);
             } elseif ($imagename[0] == '/') {
-                return LinkImage(DATA_PATH . '/' . $imagename, $alt);
+                return LinkImage(DATA_PATH . $imagename, $alt);
             } else {
                 return LinkImage(getUploadDataPath() . $imagename, $alt);
             }

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

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

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

Revision: 10206
          http://sourceforge.net/p/phpwiki/code/10206
Author:   vargenau
Date:     2020-12-26 16:01:39 +0000 (Sat, 26 Dec 2020)
Log Message:
-----------
Update Adodb to version 5.20.19

Modified Paths:
--------------
    trunk/config/phpwiki.spec
    trunk/lib/WikiDB/adodb/LICENSE.md
    trunk/lib/WikiDB/adodb/README.md
    trunk/lib/WikiDB/adodb/adodb-active-record.inc.php
    trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php
    trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
    trunk/lib/WikiDB/adodb/adodb-datadict.inc.php
    trunk/lib/WikiDB/adodb/adodb-error.inc.php
    trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
    trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
    trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
    trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
    trunk/lib/WikiDB/adodb/adodb-lib.inc.php
    trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php
    trunk/lib/WikiDB/adodb/adodb-pager.inc.php
    trunk/lib/WikiDB/adodb/adodb-pear.inc.php
    trunk/lib/WikiDB/adodb/adodb-perf.inc.php
    trunk/lib/WikiDB/adodb/adodb-php4.inc.php
    trunk/lib/WikiDB/adodb/adodb-time.inc.php
    trunk/lib/WikiDB/adodb/adodb-xmlschema.inc.php
    trunk/lib/WikiDB/adodb/adodb-xmlschema03.inc.php
    trunk/lib/WikiDB/adodb/adodb.inc.php
    trunk/lib/WikiDB/adodb/composer.json
    trunk/lib/WikiDB/adodb/datadict/datadict-access.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-db2.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-generic.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-informix.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php
    trunk/lib/WikiDB/adodb/docs/changelog.md
    trunk/lib/WikiDB/adodb/docs/changelog_v2.x.md
    trunk/lib/WikiDB/adodb/docs/changelog_v3.x.md
    trunk/lib/WikiDB/adodb/docs/changelog_v4+5.md
    trunk/lib/WikiDB/adodb/docs/changelog_v4.x.md
    trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ads.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mssql_n.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysqlpo.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oci8quercus.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbc_db2.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_mysql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_oci.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_pgsql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_sqlite.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres8.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres9.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sqlite3.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sqlitepo.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sybase_ase.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
    trunk/lib/WikiDB/adodb/pear/Auth/Container/ADOdb.php
    trunk/lib/WikiDB/adodb/perf/perf-db2.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-informix.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-mssql.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-mssqlnative.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-mysql.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-oci8.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-postgres.inc.php
    trunk/lib/WikiDB/adodb/pivottable.inc.php
    trunk/lib/WikiDB/adodb/rsfilter.inc.php
    trunk/lib/WikiDB/adodb/server.php
    trunk/lib/WikiDB/adodb/session/adodb-compress-bzip2.php
    trunk/lib/WikiDB/adodb/session/adodb-compress-gzip.php
    trunk/lib/WikiDB/adodb/session/adodb-cryptsession.php
    trunk/lib/WikiDB/adodb/session/adodb-cryptsession2.php
    trunk/lib/WikiDB/adodb/session/adodb-encrypt-mcrypt.php
    trunk/lib/WikiDB/adodb/session/adodb-encrypt-md5.php
    trunk/lib/WikiDB/adodb/session/adodb-encrypt-secret.php
    trunk/lib/WikiDB/adodb/session/adodb-session-clob.php
    trunk/lib/WikiDB/adodb/session/adodb-session-clob2.php
    trunk/lib/WikiDB/adodb/session/adodb-session.php
    trunk/lib/WikiDB/adodb/session/adodb-session2.php
    trunk/lib/WikiDB/adodb/session/crypt.inc.php
    trunk/lib/WikiDB/adodb/session/old/adodb-cryptsession.php
    trunk/lib/WikiDB/adodb/session/old/adodb-session-clob.php
    trunk/lib/WikiDB/adodb/session/old/adodb-session.php
    trunk/lib/WikiDB/adodb/session/old/crypt.inc.php
    trunk/lib/WikiDB/adodb/toexport.inc.php
    trunk/lib/WikiDB/adodb/tohtml.inc.php
    trunk/pgsrc/ReleaseNotes

Modified: trunk/config/phpwiki.spec
===================================================================
--- trunk/config/phpwiki.spec	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/config/phpwiki.spec	2020-12-26 16:01:39 UTC (rev 10206)
@@ -40,7 +40,7 @@
 # RPM spec preamble
 Summary: PHP-based Wiki webapplication
 Name: phpwiki
-Version: 1.6.0
+Version: @@VERSION@@
 Release: 1
 BuildArch: noarch
 License: GPL
@@ -53,7 +53,7 @@
 #Relocation!
 Prefix: /var/www
 
-Requires: httpd, php, php-pear, units, graphviz, php-mysql
+Requires: httpd, php, php-pear, units, graphviz
 
 Autoreq: 0
 
@@ -104,18 +104,6 @@
 
 %post
 
-cd %{prefix}/%{name}
-mysqladmin create %{DB_NAME}
-
-echo 'GRANT select, insert, update, delete, lock tables 
-ON %{DB_NAME}.* 
-TO %{DB_USER}@localhost 
-IDENTIFIED BY "%{DB_PASSWD}"' | mysql
-
-mysqladmin reload
-
-cat schemas/mysql-initialize.sql | mysql %{DB_NAME}
-
 %files
 %defattr(-, root, root)
 %doc README UPGRADING LICENSE INSTALL doc Makefile

Modified: trunk/lib/WikiDB/adodb/LICENSE.md
===================================================================
--- trunk/lib/WikiDB/adodb/LICENSE.md	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/LICENSE.md	2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,19 +1,22 @@
 ADOdb License
 =============
 
-ADOdb is dual licensed under BSD and LGPL.
+The ADOdb Library is dual-licensed, released under both the
+[BSD 3-clause](#bsd-3-clause-license) and the
+[GNU Lesser General Public License (LGPL) v2.1](#gnu-lesser-general-public-license)
+or, at your option, any later version.
 
 In plain English, you do not need to distribute your application in source code form,
 nor do you need to distribute ADOdb source code, provided you follow the rest of
 terms of the BSD license.
 
-For more info about ADOdb, visit http://adodb.sourceforge.net/
+For more information about ADOdb, visit http://adodb.org/
 
 BSD 3-Clause License
 --------------------
 
-(c) 2000-2013 John Lim (jl...@na...)
-(c) 2014      Damien Regad, Mark Newnham and the ADOdb community
+(c) 2000-2013 John Lim (jl...@na...)  
+(c) 2014      Damien Regad, Mark Newnham and the ADOdb community  
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

Modified: trunk/lib/WikiDB/adodb/README.md
===================================================================
--- trunk/lib/WikiDB/adodb/README.md	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/README.md	2020-12-26 16:01:39 UTC (rev 10206)
@@ -5,26 +5,20 @@
 [![Download ADOdb](https://img.shields.io/sourceforge/dm/adodb.svg)](https://sourceforge.net/projects/adodb/files/latest/download)
 
 (c) 2000-2013 John Lim (jl...@na...)  
-(c) 2014      Damien Regad, Mark Newnham and the ADOdb community
+(c) 2014      Damien Regad, Mark Newnham and the
+              [ADOdb community](https://github.com/ADOdb/ADOdb/graphs/contributors)
 
-Released under both [BSD 3-Clause](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md#bsd-3-clause-license) 
-and [GNU Lesser GPL library 2.1](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md#gnu-lesser-general-public-license) 
-licenses.  
-This means you can use it in proprietary products; 
+The ADOdb Library is dual-licensed, released under both the
+[BSD 3-Clause](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md#bsd-3-clause-license) 
+and the
+[GNU Lesser General Public Licence (LGPL) v2.1](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md#gnu-lesser-general-public-license)
+or, at your option, any later version. 
+This means you can use it in proprietary products;
 see [License](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md) for details.
 
 Home page: http://adodb.org/
 
-> **WARNING: known issue with Associative Fetch Mode in ADOdb v5.19
--- PLEASE UPGRADE TO v5.20 !**  
-> When fetching data in Associative mode (i.e. when `$ADODB_FETCH_MODE` is
-> set to *ADODB_FETCH_ASSOC*), recordsets do not return any data (empty strings)
-> when using some database drivers. The problem has been reported on MSSQL,
-> Interbase and Foxpro, but possibly affects other drivers as well; all drivers
-> derived from the above are also impacted.
-> For further details, please refer to [Issue #20](https://github.com/ADOdb/ADOdb/issues/20).
 
-
 Introduction
 ============
 
@@ -102,7 +96,6 @@
 
 You may also find legacy issues in
 
-- the old [ADOdb forums](http://phplens.com/lens/lensforum/topics.php?id=4) on phplens.com
 - the [SourceForge tickets section](http://sourceforge.net/p/adodb/_list/tickets)
 
 However, please note that they are not actively monitored and should

Modified: trunk/lib/WikiDB/adodb/adodb-active-record.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-active-record.inc.php	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-active-record.inc.php	2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,10 +1,10 @@
 <?php
 /*
 
-@version   v5.20.9  21-Dec-2016
+@version   v5.20.19  13-Dec-2020
 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
 @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
@@ -46,7 +46,7 @@
 
 // $db = database connection
 // $index = name of index - can be associative, for an example see
-//    http://phplens.com/lens/lensforum/msgs.php?id=17790
+//    PHPLens Issue No: 17790
 // returns index into $_ADODB_ACTIVE_DBS
 function ADODB_SetDatabaseAdapter(&$db, $index=false)
 {
@@ -120,7 +120,7 @@
 	// php5 constructor
 	function __construct($table = false, $pkeyarr=false, $db=false)
 	{
-	global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS;
+	global $_ADODB_ACTIVE_DBS;
 
 		if ($db == false && is_object($pkeyarr)) {
 			$db = $pkeyarr;
@@ -374,7 +374,7 @@
 	// update metadata
 	function UpdateActiveTable($pkeys=false,$forceUpdate=false)
 	{
-	global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS;
+	global $_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS;
 	global $ADODB_ACTIVE_DEFVALS,$ADODB_FETCH_MODE;
 
 		$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
@@ -463,8 +463,8 @@
 		$attr = array();
 		$keys = array();
 
-		switch($ADODB_ASSOC_CASE) {
-		case 0:
+		switch (ADODB_ASSOC_CASE) {
+		case ADODB_ASSOC_CASE_LOWER:
 			foreach($cols as $name => $fldobj) {
 				$name = strtolower($name);
 				if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) {
@@ -480,7 +480,7 @@
 			}
 			break;
 
-		case 1:
+		case ADODB_ASSOC_CASE_UPPER:
 			foreach($cols as $name => $fldobj) {
 				$name = strtoupper($name);
 
@@ -510,7 +510,7 @@
 				$attr[$name] = $fldobj;
 			}
 			foreach($pkeys as $k => $name) {
-				$keys[$name] = $cols[$name]->name;
+				$keys[$name] = $cols[strtoupper($name)]->name;
 			}
 			break;
 		}
@@ -813,7 +813,7 @@
 	}
 
 	# useful for multiple record inserts
-	# see http://phplens.com/lens/lensforum/msgs.php?id=17795
+	# see PHPLens Issue No: 17795
 	function Reset()
 	{
 		$this->_where=null;
@@ -927,8 +927,6 @@
 	// returns 0 on error, 1 on update, 2 on insert
 	function Replace()
 	{
-	global $ADODB_ASSOC_CASE;
-
 		$db = $this->DB();
 		if (!$db) {
 			return false;
@@ -968,15 +966,18 @@
 			$pkey = array($pkey);
 		}
 
-		if ($ADODB_ASSOC_CASE == 0) {
-			foreach($pkey as $k => $v)
-				$pkey[$k] = strtolower($v);
+		switch (ADODB_ASSOC_CASE) {
+			case ADODB_ASSOC_CASE_LOWER:
+				foreach ($pkey as $k => $v) {
+					$pkey[$k] = strtolower($v);
+				}
+				break;
+			case ADODB_ASSOC_CASE_UPPER:
+				foreach ($pkey as $k => $v) {
+					$pkey[$k] = strtoupper($v);
+				}
+				break;
 		}
-		elseif ($ADODB_ASSOC_CASE == 1) {
-			foreach($pkey as $k => $v) {
-				$pkey[$k] = strtoupper($v);
-			}
-		}
 
 		$ok = $db->Replace($this->_table,$arr,$pkey);
 		if ($ok) {

Modified: trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php	2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,10 +1,10 @@
 <?php
 /*
 
-@version   v5.20.9  21-Dec-2016
+@version   v5.20.19  13-Dec-2020
 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
 @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
@@ -137,7 +137,7 @@
 	// if $options['new'] is true, we forget all relations
 	function __construct($table = false, $pkeyarr=false, $db=false, $options=array())
 	{
-	global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS;
+	global $_ADODB_ACTIVE_DBS;
 
 		if ($db == false && is_object($pkeyarr)) {
 			$db = $pkeyarr;
@@ -410,7 +410,7 @@
 	// update metadata
 	function UpdateActiveTable($pkeys=false,$forceUpdate=false)
 	{
-	global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS;
+	global $_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS;
 	global $ADODB_ACTIVE_DEFVALS, $ADODB_FETCH_MODE;
 
 		$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
@@ -491,8 +491,8 @@
 		$attr = array();
 		$keys = array();
 
-		switch($ADODB_ASSOC_CASE) {
-		case 0:
+		switch (ADODB_ASSOC_CASE) {
+		case ADODB_ASSOC_CASE_LOWER:
 			foreach($cols as $name => $fldobj) {
 				$name = strtolower($name);
 				if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) {
@@ -508,7 +508,7 @@
 			}
 			break;
 
-		case 1:
+		case ADODB_ASSOC_CASE_UPPER:
 			foreach($cols as $name => $fldobj) {
 				$name = strtoupper($name);
 
@@ -1060,8 +1060,6 @@
 	// returns 0 on error, 1 on update, 2 on insert
 	function Replace()
 	{
-	global $ADODB_ASSOC_CASE;
-
 		$db = $this->DB();
 		if (!$db) {
 			return false;
@@ -1097,7 +1095,7 @@
 		}
 
 
-		switch ($ADODB_ASSOC_CASE == 0) {
+		switch (ADODB_ASSOC_CASE) {
 			case ADODB_ASSOC_CASE_LOWER:
 				foreach($pkey as $k => $v) {
 					$pkey[$k] = strtolower($v);

Modified: trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php	2020-12-26 16:01:39 UTC (rev 10206)
@@ -8,7 +8,7 @@
 
 /*
 
-  @version   v5.20.9  21-Dec-2016
+  @version   v5.20.19  13-Dec-2020
   @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
   @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
   Released under both BSD license and Lesser GPL library license.
@@ -16,14 +16,10 @@
   the BSD license will take precedence. See License.txt.
   Set tabs to 4 for best viewing.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
   Library for CSV serialization. This is used by the csv/proxy driver and is the
   CacheExecute() serialization format.
-
-  ==== NOTE ====
-  Format documented at http://php.weblogs.com/ADODB_CSV
-  ==============
 */
 
 	/**

Modified: trunk/lib/WikiDB/adodb/adodb-datadict.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-datadict.inc.php	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-datadict.inc.php	2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  @version   v5.20.9  21-Dec-2016
+  @version   v5.20.19  13-Dec-2020
   @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
   @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
   Released under both BSD license and Lesser GPL library license.
@@ -520,7 +520,7 @@
 			list($lines,$pkey,$idxs) = $this->_GenFields($flds);
 			// genfields can return FALSE at times
 			if ($lines == null) $lines = array();
-			list(,$first) = each($lines);
+			$first  = current($lines);
 			list(,$column_def) = preg_split("/[\t ]+/",$first,2);
 		}
 		return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));

Modified: trunk/lib/WikiDB/adodb/adodb-error.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-error.inc.php	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-error.inc.php	2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version   v5.20.9  21-Dec-2016
+ * @version   v5.20.19  13-Dec-2020
  * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
  * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
  * Released under both BSD license and Lesser GPL library license.
@@ -111,7 +111,7 @@
 			'could not serialize access due to'   => DB_ERROR_SERIALIZATION_FAILURE
 		);
 	reset($error_regexps);
-	while (list($regexp,$code) = each($error_regexps)) {
+	foreach ($error_regexps as $regexp => $code) {
 		if (preg_match("/$regexp/mi", $errormsg)) {
 			return $code;
 		}

Modified: trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php	2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version   v5.20.9  21-Dec-2016
+ * @version   v5.20.19  13-Dec-2020
  * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
  * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
  * Released under both BSD license and Lesser GPL library license.
@@ -9,7 +9,7 @@
  *
  * Set tabs to 4 for best viewing.
  *
- * Latest version is available at http://php.weblogs.com
+ * Latest version is available at http://adodb.org/
  *
 */
 

Modified: trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php	2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version   v5.20.9  21-Dec-2016
+ * @version   v5.20.19  13-Dec-2020
  * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
  * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
  * Released under both BSD license and Lesser GPL library license.
@@ -9,7 +9,7 @@
  *
  * Set tabs to 4 for best viewing.
  *
- * Latest version is available at http://php.weblogs.com
+ * Latest version is available at http://adodb.org/
  *
 */
 include_once('PEAR.php');

Modified: trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php	2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @version   v5.20.9  21-Dec-2016
+ * @version   v5.20.19  13-Dec-2020
  * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
  * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
  * Released under both BSD license and Lesser GPL library license.
@@ -10,7 +10,7 @@
  *
  * Set tabs to 4 for best viewing.
  *
- * Latest version is available at http://php.weblogs.com
+ * Latest version is available at http://adodb.org/
  *
  * Exception-handling code using PHP5 exceptions (try-catch-throw).
  */

Modified: trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-iterator.inc.php	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-iterator.inc.php	2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,7 +1,7 @@
 <?php
 
 /*
-  @version   v5.20.9  21-Dec-2016
+  @version   v5.20.19  13-Dec-2020
   @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
   @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
   Released under both BSD license and Lesser GPL library license.

Modified: trunk/lib/WikiDB/adodb/adodb-lib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-lib.inc.php	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-lib.inc.php	2020-12-26 16:01:39 UTC (rev 10206)
@@ -6,7 +6,7 @@
 $ADODB_INCLUDED_LIB = 1;
 
 /*
-  @version   v5.20.9  21-Dec-2016
+  @version   v5.20.19  13-Dec-2020
   @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
   @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
   Released under both BSD license and Lesser GPL library license.
@@ -177,7 +177,7 @@
 				if ($zthis->poorAffectedRows) {
 				/*
 				 The Select count(*) wipes out any errors that the update would have returned.
-				http://phplens.com/lens/lensforum/msgs.php?id=5696
+				PHPLens Issue No: 5696
 				*/
 					if ($zthis->ErrorNo()<>0) return 0;
 
@@ -212,122 +212,66 @@
 		return ($rs) ? 2 : 0;
 }
 
-// Requires $ADODB_FETCH_MODE = ADODB_FETCH_NUM
 function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=false,
 			$size=0, $selectAttr='',$compareFields0=true)
 {
-	$hasvalue = false;
+	global $ADODB_FETCH_MODE;
 
-	if ($multiple or is_array($defstr)) {
-		if ($size==0) $size=5;
-		$attr = ' multiple size="'.$size.'"';
-		if (!strpos($name,'[]')) $name .= '[]';
-	} else if ($size) $attr = ' size="'.$size.'"';
-	else $attr ='';
+	$s = _adodb_getmenu_select($name, $defstr, $blank1stItem, $multiple, $size, $selectAttr);
 
-	$s = '<select name="'.$name.'"'.$attr.' '.$selectAttr.'>';
-	if ($blank1stItem)
-		if (is_string($blank1stItem))  {
-			$barr = explode(':',$blank1stItem);
-			if (sizeof($barr) == 1) $barr[] = '';
-			$s .= "\n<option value=\"".$barr[0]."\">".$barr[1]."</option>";
-		} else $s .= "\n<option></option>";
+	$hasvalue = $zthis->FieldCount() > 1;
+	if (!$hasvalue) {
+		$compareFields0 = true;
+	}
 
-	if ($zthis->FieldCount() > 1) $hasvalue=true;
-	else $compareFields0 = true;
-
 	$value = '';
-    $optgroup = null;
-    $firstgroup = true;
-    $fieldsize = $zthis->FieldCount();
 	while(!$zthis->EOF) {
 		$zval = rtrim(reset($zthis->fields));
 
-		if ($blank1stItem && $zval=="") {
+		if ($blank1stItem && $zval == "") {
 			$zthis->MoveNext();
 			continue;
 		}
 
-        if ($fieldsize > 1) {
-			if (isset($zthis->fields[1]))
-				$zval2 = rtrim($zthis->fields[1]);
-			else
-				$zval2 = rtrim(next($zthis->fields));
+		if ($hasvalue) {
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC) {
+				// Get 2nd field's value regardless of its name
+				$zval2 = current(array_slice($zthis->fields, 1, 1));
+			} else {
+				// With NUM or BOTH fetch modes, we have a numeric index
+				$zval2 = $zthis->fields[1];
+			}
+			$zval2 = trim($zval2);
+			$value = 'value="' . htmlspecialchars($zval2) . '"';
 		}
-		$selected = ($compareFields0) ? $zval : $zval2;
 
-        $group = '';
-		if ($fieldsize > 2) {
-            $group = rtrim($zthis->fields[2]);
-        }
-/*
-        if ($optgroup != $group) {
-            $optgroup = $group;
-            if ($firstgroup) {
-                $firstgroup = false;
-                $s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
-            } else {
-                $s .="\n</optgroup>";
-                $s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
-            }
-		}
-*/
-		if ($hasvalue)
-			$value = " value='".htmlspecialchars($zval2)."'";
+		$s .= _adodb_getmenu_option($defstr, $compareFields0 ? $zval : $zval2, $value, $zval);
 
-		if (is_array($defstr))  {
-
-			if (in_array($selected,$defstr))
-				$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
-			else
-				$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
-		}
-		else {
-			if (strcasecmp($selected,$defstr)==0)
-				$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
-			else
-				$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
-		}
 		$zthis->MoveNext();
 	} // while
 
-    // closing last optgroup
-    if($optgroup != null) {
-        $s .= "\n</optgroup>";
-	}
 	return $s ."\n</select>\n";
 }
 
-// Requires $ADODB_FETCH_MODE = ADODB_FETCH_NUM
 function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=false,
 			$size=0, $selectAttr='',$compareFields0=true)
 {
-	$hasvalue = false;
+	global $ADODB_FETCH_MODE;
 
-	if ($multiple or is_array($defstr)) {
-		if ($size==0) $size=5;
-		$attr = ' multiple size="'.$size.'"';
-		if (!strpos($name,'[]')) $name .= '[]';
-	} else if ($size) $attr = ' size="'.$size.'"';
-	else $attr ='';
+	$s = _adodb_getmenu_select($name, $defstr, $blank1stItem, $multiple, $size, $selectAttr);
 
-	$s = '<select name="'.$name.'"'.$attr.' '.$selectAttr.'>';
-	if ($blank1stItem)
-		if (is_string($blank1stItem))  {
-			$barr = explode(':',$blank1stItem);
-			if (sizeof($barr) == 1) $barr[] = '';
-			$s .= "\n<option value=\"".$barr[0]."\">".$barr[1]."</option>";
-		} else $s .= "\n<option></option>";
+	$hasvalue = $zthis->FieldCount() > 1;
+	$hasgroup = $zthis->FieldCount() > 2;
+	if (!$hasvalue) {
+		$compareFields0 = true;
+	}
 
-	if ($zthis->FieldCount() > 1) $hasvalue=true;
-	else $compareFields0 = true;
-
 	$value = '';
-    $optgroup = null;
-    $firstgroup = true;
-    $fieldsize = sizeof($zthis->fields);
+	$optgroup = null;
+	$firstgroup = true;
 	while(!$zthis->EOF) {
 		$zval = rtrim(reset($zthis->fields));
+		$group = '';
 
 		if ($blank1stItem && $zval=="") {
 			$zthis->MoveNext();
@@ -334,57 +278,119 @@
 			continue;
 		}
 
-        if ($fieldsize > 1) {
-			if (isset($zthis->fields[1]))
-				$zval2 = rtrim($zthis->fields[1]);
-			else
-				$zval2 = rtrim(next($zthis->fields));
+		if ($hasvalue) {
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC) {
+				// Get 2nd field's value regardless of its name
+				$fields = array_slice($zthis->fields, 1);
+				$zval2 = current($fields);
+				if ($hasgroup) {
+					$group = trim(next($fields));
+				}
+			} else {
+				// With NUM or BOTH fetch modes, we have a numeric index
+				$zval2 = $zthis->fields[1];
+				if ($hasgroup) {
+					$group = trim($zthis->fields[2]);
+				}
+			}
+			$zval2 = trim($zval2);
+			$value = "value='".htmlspecialchars($zval2)."'";
 		}
-		$selected = ($compareFields0) ? $zval : $zval2;
 
-        $group = '';
-		if (isset($zthis->fields[2])) {
-            $group = rtrim($zthis->fields[2]);
-        }
-
-        if ($optgroup != $group) {
-            $optgroup = $group;
-            if ($firstgroup) {
-                $firstgroup = false;
-                $s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
-            } else {
-                $s .="\n</optgroup>";
-                $s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
-            }
+		if ($optgroup != $group) {
+			$optgroup = $group;
+			if ($firstgroup) {
+				$firstgroup = false;
+			} else {
+				$s .="\n</optgroup>";
+			}
+			$s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
 		}
 
-		if ($hasvalue)
-			$value = " value='".htmlspecialchars($zval2)."'";
+		$s .= _adodb_getmenu_option($defstr, $compareFields0 ? $zval : $zval2, $value, $zval);
 
-		if (is_array($defstr))  {
-
-			if (in_array($selected,$defstr))
-				$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
-			else
-				$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
-		}
-		else {
-			if (strcasecmp($selected,$defstr)==0)
-				$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
-			else
-				$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
-		}
 		$zthis->MoveNext();
 	} // while
 
-    // closing last optgroup
-    if($optgroup != null) {
-        $s .= "\n</optgroup>";
+	// closing last optgroup
+	if($optgroup != null) {
+		$s .= "\n</optgroup>";
 	}
 	return $s ."\n</select>\n";
 }
 
+/**
+ * Generate the opening SELECT tag for getmenu functions.
+ *
+ * ADOdb internal function, used by _adodb_getmenu() and _adodb_getmenu_gp().
+ *
+ * @param string $name
+ * @param string $defstr
+ * @param bool   $blank1stItem
+ * @param bool   $multiple
+ * @param int    $size
+ * @param string $selectAttr
+ *
+ * @return string HTML
+ */
+function _adodb_getmenu_select($name, $defstr = '', $blank1stItem = true,
+							   $multiple = false, $size = 0, $selectAttr = '')
+{
+	if ($multiple || is_array($defstr)) {
+		if ($size == 0 ) {
+			$size = 5;
+		}
+		$attr = ' multiple size="' . $size . '"';
+		if (!strpos($name,'[]')) {
+			$name .= '[]';
+		}
+	} elseif ($size) {
+		$attr = ' size="' . $size . '"';
+	} else {
+		$attr = '';
+	}
 
+	$html = '<select name="' . $name . '"' . $attr . ' ' . $selectAttr . '>';
+	if ($blank1stItem) {
+		if (is_string($blank1stItem))  {
+			$barr = explode(':',$blank1stItem);
+			if (sizeof($barr) == 1) {
+				$barr[] = '';
+			}
+			$html .= "\n<option value=\"" . $barr[0] . "\">" . $barr[1] . "</option>";
+		} else {
+			$html .= "\n<option></option>";
+		}
+	}
+
+	return $html;
+}
+
+/**
+ * Print the OPTION tags for getmenu functions.
+ *
+ * ADOdb internal function, used by _adodb_getmenu() and _adodb_getmenu_gp().
+ *
+ * @param string $defstr  Default values
+ * @param string $compare Value to compare against defaults
+ * @param string $value   Ready-to-print `value="xxx"` (or empty) string
+ * @param string $display Display value
+ *
+ * @return string HTML
+ */
+function _adodb_getmenu_option($defstr, $compare, $value, $display)
+{
+	if (   is_array($defstr) && in_array($compare, $defstr)
+		|| !is_array($defstr) && strcasecmp($compare, $defstr) == 0
+	) {
+		$selected = ' selected="selected"';
+	} else {
+		$selected = '';
+	}
+
+	return "\n<option $value$selected>" . htmlspecialchars($display) . '</option>';
+}
+
 /*
 	Count the number of records this sql statement will return by using
 	query rewriting heuristics...
@@ -416,7 +422,12 @@
 			} else
 				$rewritesql = "SELECT COUNT(*) FROM (".$rewritesql.")";
 
-		} else if (strncmp($zthis->databaseType,'postgres',8) == 0 || strncmp($zthis->databaseType,'mysql',5) == 0)  {
+		} else if (strncmp($zthis->databaseType,'postgres',8) == 0
+			|| strncmp($zthis->databaseType,'mysql',5) == 0
+		|| strncmp($zthis->databaseType,'mssql',5) == 0
+			|| strncmp($zthis->dsnType,'sqlsrv',5) == 0
+			|| strncmp($zthis->dsnType,'mssql',5) == 0
+		){
 			$rewritesql = "SELECT COUNT(*) FROM ($rewritesql) _ADODB_ALIAS_";
 		} else {
 			$rewritesql = "SELECT COUNT(*) FROM ($rewritesql)";
@@ -430,7 +441,7 @@
 		}
 		// fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails
 		// with mssql, access and postgresql. Also a good speedup optimization - skips sorting!
-		// also see http://phplens.com/lens/lensforum/msgs.php?id=12752
+		// also see PHPLens Issue No: 12752
 		$rewritesql = adodb_strip_order_by($rewritesql);
 	}
 
@@ -766,7 +777,7 @@
 				if (preg_match('/\s(ORDER\s.*)/is', $whereClause[1], $discard));
 				else if (preg_match('/\s(LIMIT\s.*)/is', $whereClause[1], $discard));
 				else if (preg_match('/\s(FOR UPDATE.*)/is', $whereClause[1], $discard));
-				else preg_match('/\s.*(\) WHERE .*)/is', $whereClause[1], $discard); # see http://sourceforge.net/tracker/index.php?func=detail&aid=1379638&group_id=42718&atid=433976
+				else preg_match('/\s.*(\) WHERE .*)/is', $whereClause[1], $discard); # see https://sourceforge.net/p/adodb/bugs/37/
 			} else
 				$whereClause = array(false,false);
 

Modified: trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php	2020-12-26 16:01:39 UTC (rev 10206)
@@ -11,7 +11,7 @@
 
 /*
 
-  @version   v5.20.9  21-Dec-2016
+  @version   v5.20.19  13-Dec-2020
   @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
   @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
   Released under both BSD license and Lesser GPL library license.
@@ -19,7 +19,7 @@
   the BSD license will take precedence. See License.txt.
   Set tabs to 4 for best viewing.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
 Usage:
 

Modified: trunk/lib/WikiDB/adodb/adodb-pager.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-pager.inc.php	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-pager.inc.php	2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,7 +1,7 @@
 <?php
 
 /*
-	@version   v5.20.9  21-Dec-2016
+	@version   v5.20.19  13-Dec-2020
 	@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
 	@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
 	  Released under both BSD license and Lesser GPL library license.

Modified: trunk/lib/WikiDB/adodb/adodb-pear.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-pear.inc.php	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-pear.inc.php	2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version   v5.20.9  21-Dec-2016
+ * @version   v5.20.19  13-Dec-2020
  * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
  * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
  * Released under both BSD license and Lesser GPL library license.
@@ -358,7 +358,7 @@
 	 */
 	function assertExtension($name)
 	{
-		if (!extension_loaded($name)) {
+		if (function_exists('dl') && !extension_loaded($name)) {
 			$dlext = (strncmp(PHP_OS,'WIN',3) === 0) ? '.dll' : '.so';
 			@dl($name . $dlext);
 		}

Modified: trunk/lib/WikiDB/adodb/adodb-perf.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-perf.inc.php	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-perf.inc.php	2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,6 +1,6 @@
 <?php
 /*
-@version   v5.20.9  21-Dec-2016
+@version   v5.20.19  13-Dec-2020
 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
 @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
   Released under both BSD license and Lesser GPL library license.
@@ -8,7 +8,7 @@
   the BSD license will take precedence. See License.txt.
   Set tabs to 4 for best viewing.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
   Library for basic performance monitoring and tuning.
 
@@ -147,7 +147,7 @@
 		if (empty($d)) $d = date("'Y-m-d H:i:s'");
 		if ($conn->dataProvider == 'oci8' && $dbT != 'oci8po') {
 			$isql = "insert into $perf_table values($d,:b,:c,:d,:e,:f)";
-		} else if ($dbT == 'odbc_mssql' || $dbT == 'informix' || strncmp($dbT,'odbtp',4)==0) {
+		} else if ($dbT == 'mssqlnative' || $dbT == 'odbc_mssql' || $dbT == 'informix' || strncmp($dbT,'odbtp',4)==0) {
 			$timer = $arr['f'];
 			if ($dbT == 'informix') $sql2 = substr($sql2,0,230);
 
@@ -166,6 +166,9 @@
 
 		global $ADODB_PERF_MIN;
 		if ($errN != 0 || $time >= $ADODB_PERF_MIN) {
+			if($conn instanceof ADODB_mysqli && $conn->_queryID) {
+				mysqli_free_result($conn->_queryID);
+			}
 			$ok = $conn->Execute($isql,$arr);
 		} else
 			$ok = true;
@@ -226,7 +229,7 @@
 	var $cliFormat = "%32s => %s \r\n";
 	var $sql1 = 'sql1';  // used for casting sql1 to text for mssql
 	var $explain = true;
-	var $helpurl = '<a href="http://adodb.sourceforge.net/docs-adodb.htm#logsql">LogSQL help</a>';
+	var $helpurl = '<a href="http://adodb.org/dokuwiki/doku.php?id=v5:performance:logsql">LogSQL help</a>';
 	var $createTableSQL = false;
 	var $maxLength = 2000;
 
@@ -721,7 +724,7 @@
 
 	if  (empty($_GET['hidem']))
 	echo "<table border=1 width=100% bgcolor=lightyellow><tr><td colspan=2>
-	<b><a href=http://adodb.sourceforge.net/?perf=1>ADOdb</a> Performance Monitor</b> <font size=1>for $app</font></tr><tr><td>
+	<b><a href=http://adodb.org/dokuwiki/doku.php?id=v5:performance:performance_index>ADOdb</a> Performance Monitor</b> <font size=1>for $app</font></tr><tr><td>
 	<a href=?do=stats><b>Performance Stats</b></a> &nbsp; <a href=?do=viewsql><b>View SQL</b></a>
 	 &nbsp; <a href=?do=tables><b>View Tables</b></a> &nbsp; <a href=?do=poll><b>Poll Stats</b></a>",
 	 $allowsql ? ' &nbsp; <a href=?do=dosql><b>Run SQL</b></a>' : '',
@@ -764,7 +767,6 @@
 			echo $this->Tables(); break;
 		}
 		global $ADODB_vers;
-		echo "<p><div align=center><font size=1>$ADODB_vers Sponsored by <a href=http://phplens.com/>phpLens</a></font></div>";
 	}
 
 	/*

Modified: trunk/lib/WikiDB/adodb/adodb-php4.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-php4.inc.php	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-php4.inc.php	2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,7 +1,7 @@
 <?php
 
 /*
-  @version   v5.20.9  21-Dec-2016
+  @version   v5.20.19  13-Dec-2020
   @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
   @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
   Released under both BSD license and Lesser GPL library license.

Modified: trunk/lib/WikiDB/adodb/adodb-time.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-time.inc.php	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-time.inc.php	2020-12-26 16:01:39 UTC (rev 10206)
@@ -1,9 +1,10 @@
 <?php
 /*
 ADOdb Date Library, part of the ADOdb abstraction library
-Download: http://adodb.sourceforge.net/#download
 
-@version   v5.20.9  21-Dec-2016
+Latest version is available at http://adodb.org/
+
+@version   v5.20.19  13-Dec-2020
 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
 @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
 
@@ -65,14 +66,7 @@
 jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year
 and originally found at http://www.php.net/manual/en/function.mktime.php
 
-=============================================================================
 
-BUG REPORTS
-
-These should be posted to the ADOdb forums at
-
-	http://phplens.com/lens/lensforum/topics.php?id=4
-
 =============================================================================
 
 FUNCTION DESCRIPTIONS
@@ -347,7 +341,7 @@
 
 - 9 Aug 2003 0.10
 Fixed bug with dates after 2038.
-See http://phplens.com/lens/lensforum/msgs.php?id=6980
+See PHPLens Issue No: 6980
 
 - 1 July 2003 0.09
 Added support for Q (Quarter).
@@ -420,6 +414,9 @@
 
 if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
 
+if (!DEFINED('ADODB_FUTURE_DATE_CUTOFF_YEARS'))
+	DEFINE('ADODB_FUTURE_DATE_CUTOFF_YEARS',200);
+
 function adodb_date_test_date($y1,$m,$d=13)
 {
 	$h = round(rand()% 24);
@@ -816,7 +813,7 @@
 
 	if ($marr[$m] < $d) return false;
 
-	if ($y < 1000 && $y > 3000) return false;
+	if ($y < 1000 || $y > 3000) return false;
 
 	return true;
 }
@@ -829,13 +826,23 @@
 function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
 {
 static $YRS;
-global $_month_table_normal,$_month_table_leaf;
+global $_month_table_normal,$_month_table_leaf, $_adodb_last_date_call_failed;
 
+	$_adodb_last_date_call_failed = false;
+
 	$d =  $origd - ($is_gmt ? 0 : adodb_get_gmt_diff_ts($origd));
 	$_day_power = 86400;
 	$_hour_power = 3600;
 	$_min_power = 60;
 
+	$cutoffDate = time() + (60 * 60 * 24 * 365 * ADODB_FUTURE_DATE_CUTOFF_YEARS);
+
+	if ($d > $cutoffDate)
+	{
+		$d = $cutoffDate;
+		$_adodb_last_date_call_failed = true;
+	}
+
 	if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, gregorian correction
 
 	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
@@ -1375,7 +1382,7 @@
 		$sep = substr($tstr,2,1);
 		$hasAM = strrpos($tstr,'M') !== false;
 	*/
-		# see http://phplens.com/lens/lensforum/msgs.php?id=14865 for reasoning, and changelog for version 0.24
+		# see PHPLens Issue No: 14865 for reasoning, and changelog for version 0.24
 		$dstr = gmstrftime('%x',31366800); // 30 Dec 1970, 1 am
 		$sep = substr($dstr,2,1);
 		$tstr = strtoupper(gmstrftime('%X',31366800)); // 30 Dec 1970, 1 am
@@ -1460,3 +1467,16 @@
 	$ret = adodb_date($fmtdate, $ts, $is_gmt);
 	return $ret;
 }
+
+/**
+* Returns the status of the last date calculation and whether it exceeds
+* the limit of ADODB_FUTURE_DATE_CUTOFF_YEARS
+*
+* @return boolean
+*/
+function adodb_last_date_status()
+{
+	global $_adodb_last_date_call_failed;
+
+	return $_adodb_last_date_call_failed;
+}

Modified: trunk/lib/WikiDB/adodb/adodb-xmlschema.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-xmlschema.inc.php	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-xmlschema.inc.php	2020-12-26 16:01:39 UTC (rev 10206)
@@ -1305,8 +1305,9 @@
 	function __construct( $db ) {
 		// Initialize the environment
 		$this->mgq = get_magic_quotes_runtime();
-		ini_set("magic_quotes_runtime", 0);
-		#set_magic_quotes_runtime(0);
+		if ($this->mgq !== false) {
+			ini_set('magic_quotes_runtime', 0);
+		}
 
 		$this->db = $db;
 		$this->debug = $this->db->debug;
@@ -2195,8 +2196,9 @@
 	* @deprecated adoSchema now cleans up automatically.
 	*/
 	function Destroy() {
-		ini_set("magic_quotes_runtime", $this->mgq );
-		#set_magic_quotes_runtime( $this->mgq );
+		if ($this->mgq !== false) {
+			ini_set('magic_quotes_runtime', $this->mgq );
+		}
 	}
 }
 

Modified: trunk/lib/WikiDB/adodb/adodb-xmlschema03.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-xmlschema03.inc.php	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb-xmlschema03.inc.php	2020-12-26 16:01:39 UTC (rev 10206)
@@ -1409,8 +1409,9 @@
 	function __construct( $db ) {
 		// Initialize the environment
 		$this->mgq = get_magic_quotes_runtime();
-		#set_magic_quotes_runtime(0);
-		ini_set("magic_quotes_runtime", 0);
+		if ($this->mgq !== false) {
+			ini_set('magic_quotes_runtime', 0 );
+		}
 
 		$this->db = $db;
 		$this->debug = $this->db->debug;
@@ -2377,8 +2378,9 @@
 	* @deprecated adoSchema now cleans up automatically.
 	*/
 	function Destroy() {
-		ini_set("magic_quotes_runtime", $this->mgq );
-		#set_magic_quotes_runtime( $this->mgq );
+		if ($this->mgq !== false) {
+			ini_set('magic_quotes_runtime', $this->mgq );
+		}
 	}
 }
 

Modified: trunk/lib/WikiDB/adodb/adodb.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb.inc.php	2020-12-26 12:48:06 UTC (rev 10205)
+++ trunk/lib/WikiDB/adodb/adodb.inc.php	2020-12-26 16:01:39 UTC (rev 10206)
@@ -2,7 +2,7 @@
 /*
  * Set tabs to 4 for best viewing.
  *
- * Latest version is available at http://adodb.sourceforge.net
+ * Latest version is available at http://adodb.org/
  *
  * This is the main include file for ADOdb.
  * Database specific drivers are stored in the adodb/drivers/adodb-*.inc.php
@@ -14,7 +14,7 @@
 /**
 	\mainpage
 
-	@version   v5.20.9  21-Dec-2016
+	@version   v5.20.19  13-Dec-2020
 	@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
 	@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
 
@@ -29,9 +29,6 @@
 	Informix, PostgreSQL, FrontBase, Interbase (Firebird and Borland variants), Foxpro, Access,
 	ADO, SAP DB, SQLite and ODBC. We have had successful reports of connecting to Progress and
 	other databases via ODBC.
-
-	Latest Download at http://adodb.sourceforge.net/
-
  */
 
 if (!defined('_ADODB_LAYER')) {
@@ -224,15 +221,10 @@
 			}
 		}
 
-
-		// Initialize random number generator for randomizing cache flushes
-		// -- note Since PHP 4.2.0, the seed  becomes optional and defaults to a random value if omitted.
-		srand(((double)microtime())*1000000);
-
 		/**
 		 * ADODB version as a string.
 		 */
-		$ADODB_vers = 'v5.20.9  21-Dec-2016';
+		$ADODB_vers = 'v5.20.17  31-Mar-2020';
 
 		/**
 		 * Determines whether recordset->RecordCount() is used.
@@ -310,8 +302,8 @@
 		//print "Errorno ($fn errno=$errno m=$errmsg) ";
 		$thisConnection->_transOK = false;
 		if ($thisConnection->_oldRaiseFn) {
-			$fn = $thisConnection->_oldRaiseFn;
-			$fn($dbms, $fn, $errno, $errmsg, $p1, $p2,$thisConnection);
+			$errfn = $thisConnection->_oldRaiseFn;
+			$errfn($dbms, $fn, $errno, $errmsg, $p1, $p2,$thisConnection);
 		}
 	}
 
@@ -431,6 +423,7 @@
 	var $databaseType = '';		/// RDBMS currently in use, eg. odbc, mysql, mssql
 	var $database = '';			/// Name of database to be used.
 	var $host = '';				/// The hostname of the database server
+	var $port = '';				/// The port of the database server
 	var $user = '';				/// The username which is used to connect to the database server.
 	var $password = '';			/// Password for the username. For security, we no longer store it.
 	var $debug = false;			/// if set to true will output sql statements
@@ -633,6 +626,26 @@
 	}
 
 	/**
+	 * Parses the hostname to extract the port.
+	 * Overwrites $this->host and $this->port, only if a port is specified.
+	 * The Hostname can be fully or partially qualified,
+	 * ie: "db.mydomain.com:5432" or "ldaps://ldap.mydomain.com:636"
+	 * Any specified scheme such as ldap:// or ldaps:// is maintained.
+	 */
+	protected function parseHostNameAndPort() {
+		$parsed_url = parse_url($this->host);
+		if (is_array($parsed_url) && isset($parsed_url['host']) && isset($parsed_url['port'])) {
+			if ( isset($parsed_url['scheme']) ) {
+				// If scheme is specified (ie: ldap:// or ldaps://, make sure we retain that.
+				$this->host = $parsed_url['scheme'] . "://" . $parsed_url['host'];
+			} else {
+				$this->host = $parsed_url['host'];
+			}
+			$this->port = $parsed_url['port'];
+		}
+	}
+
+	/**
 	 * Connect to database
 	 *
 	 * @param [argHostname]		Host to connect to
@@ -647,9 +660,9 @@
 		if ($argHostname != "") {
 			$this->host = $argHostname;
 		}
-		if ( strpos($this->host, ':') > 0 && isset($this->port) ) {
-			list($this->host, $this->port) = explode(":", $this->host, 2);
-        	}
+		// Overwrites $this->host and $this->port if a port is specified.
+		$this->parseHostNameAndPort();
+
 		if ($argUsername != "") {
 			$this->user = $argUsername;
 		}
@@ -730,9 +743,9 @@
 		if ($argHostname != "") {
 			$this->host = $argHostname;
 		}
-		if ( strpos($this->host, ':') > 0 && isset($this->port) ) {
-			list($this->host, $this->port) = explode(":", $this->host, 2);
-	        }
+		// Overwrites $this->host and $this->port if a port is specified.
+		$this->parseHostNameAndPort();
+
 		if ($argUsername != "") {
 			$this->user = $argUsername;
 		}
@@ -1163,8 +1176,7 @@
 
 				foreach($inputarr as $arr) {
 					$sql = ''; $i = 0;
-					//Use each() instead of foreach to reduce memory usage -mikefedyk
-					while(list(, $v) = each($arr)) {
+					foreach ($arr as $v) {
 						$sql .= $sqlarr[$i];
 						// from Ron Baldwin <ron.baldwin#sourceprose.com>
 						// Only quote string types
@@ -1497,6 +1509,9 @@
 	 * @return		the recordset ($rs->databaseType == 'array')
 	 */
 	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0) {
+		$nrows = (int)$nrows;
+		$offset = (int)$offset;
+
 		if ($this->hasTop && $nrows > 0) {
 			// suggested by Reinhard Balling. Access requires top after distinct
 			// Informix requires first before distinct - F Riosa
@@ -1511,7 +1526,7 @@
 					// access includes ties in result
 					if ($isaccess) {
 						$sql = preg_replace(
-						'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.((integer)$nrows).' ',$sql);
+						'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nrows.' ',$sql);
 
 						if ($secs2cache != 0) {
 							$ret = $this->CacheExecute($secs2cache, $sql,$inputarr);
@@ -1521,10 +1536,10 @@
 						return $ret; // PHP5 fix
 					} else if ($ismssql){
 						$sql = preg_replace(
-						'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.((integer)$nrows).' ',$sql);
+						'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nrows.' ',$sql);
 					} else {
 						$sql = preg_replace(
-						'/(^\s*select\s)/i','\\1 '.$this->hasTop.' '.((integer)$nrows).' ',$sql);
+						'/(^\s*select\s)/i','\\1 '.$this->hasTop.' '.$nrows.' ',$sql);
 					}
 			} else {
 				$nn = $nrows + $offset;
@@ -2392,6 +2407,7 @@
 	 */
 	function Close() {
 		$rez = $this->_close();
+		$this->_queryID = false;
 		$this->_connectionID = false;
 		return $rez;
 	}
@@ -3039,6 +3055,61 @@
 		return $rs;
 	}
 
+	/**
+	 * Get the last error recorded by PHP and clear the message.
+	 *
+	 * By clearing the message, it becomes possible to detect whether a new error
+	 * has occurred, even when it is the same error as before being repeated.
+	 *
+	 * @return array|null Array if an error has previously occurred. Null otherwise.
+	 */
+	protected function resetLastError() {
+		$error = error_get_last();
+
+		if (is_array($error)) {
+			$error['message'] = '';
+		}
+
+		return $error;
+	}
+
+	/**
+	 * Compare a previously stored error message with the last error recorded by PHP
+	 * to determine whether a new error has occured.
+	 *
+	 * @param array|null $old Optional. Previously stored return value of error_get_last().
+	 *
+	 * @return string The error message if a new error has occured
+	 *                or an empty string if no (new) errors have occured..
+	 */
+	protected function getChangedErrorMsg($old = null) {
+		$new = error_get_last();
+
+		if (is_null($new)) {
+			// No error has occured yet at all.
+			return '';
+		}
+
+		if (is_null($old)) {
+			// First error recorded.
+			return $new['message'];
+		}
+
+		$changed = false;
+		foreach($new as $key => $value) {
+			if ($new[$key] !== $old[$key]) {
+				$changed = true;
+				break;
+			}
+		}
+
+		if ($changed === true) {
+			return $new['message'];
+		}
+
+		return '';
+	}
+
 } // end class ADOConnection
 
 
@@ -3315,65 +3386,121 @@
 
 
 	/**
-	 * Generate a SELECT tag string from a recordset, and return the string.
-	 * If the recordset has 2 cols, we treat the 1st col as the containing
-	 * the text to display to the user, and 2nd col as the return value. Default
-	 * strings are compared with the FIRST column.
+	 * Generate a SELECT tag from a recordset, and return the HTML markup.
 	 *
-	 * @param name			name of SELECT tag
-	 * @param [defstr]		the value to hilite. Use an array for multiple hilites for listbox.
-	 * @param [blank1stItem]	true to leave the 1st item in list empty
-	 * @param [multiple]		true for listbox, false for popup
-	 * @param [size]		#rows to show for listbox. not used by popup
-	 * @param [selectAttr]		additional attributes to defined for SELECT tag.
-	 *				useful for holding javascript onChange='...' handlers.
-	 & @param [compareFields0]	when we have 2 cols in recordset, we compare the defstr with
-	 *				column 0 (1st col) if this is true. This is not documented.
+	 * If the recordset has 2 columns, we treat the first one as the text to
+	 * display to the user, and the second as the return value. Extra columns
+	 * are discarded.
 	 *
-	 * @return HTML
+	 * @param string       $name            Name of SELECT tag
+	 * @param string|array $defstr          The value to highlight. Use an array for multiple highlight values.
+	 * @param bool|string $blank1stItem     True to create an empty item (default), False not to add one;
+	 *                                      'string' to set its label and 'value:string' to assign a value to it.
+	 * @param bool         $multiple        True for multi-select list
+	 * @param int          $size            Number of rows to show (applies to multi-select box only)
+	 * @param string       $selectAttr      Additional attributes to defined for SELECT tag,
+	 *                                      useful for holding javascript onChange='...' handlers, CSS class, etc.
+	 * @param bool         $compareFirstCol When true (default), $defstr is compared against the value (column 2),
+	 *                                      while false will compare against the description (column 1).
 	 *
-	 * changes by gle...@cc... to support multiple hilited items
+	 * @return string HTML
 	 */
-	function GetMenu($name,$defstr='',$blank1stItem=true,$multiple=false,
-			$size=0, $selectAttr='',$compareFields0=true)
+	function getMenu($name, $defstr = '', $blank1stItem = true, $multiple = false,
+					 $size = 0, $selectAttr = '', $compareFirstCol = true)
 	{
 		global $ADODB_INCLUDED_LIB;
 		if (empty($ADODB_INCLUDED_LIB)) {
 			include(ADODB_DIR.'/adodb-lib.inc.php');
 		}
-		return _adodb_getmenu($this, $name,$defstr,$blank1stItem,$multiple,
-			$size, $selectAttr,$compareFields0);
+		return _adodb_getmenu($this, $name, $defstr, $blank1stItem, $multiple,
+			$size, $selectAttr, $compareFirstCol);
 	}
 
-
-
 	/**
-	 * Generate a SELECT tag string from a recordset, and return the string.
-	 * If the recordset has 2 cols, we treat the 1st col as the containing
-	 * the text to display to the user, and 2nd col as the return value. Default
-	 * strings are compared with the SECOND column.
+	 * Generate a SELECT tag with groups from a recordset, and return the HTML markup.
 	 *
+	 * The recordset must have 3 columns and be ordered by the 3rd column. The
+	 * first column contains the text to display to the user, the second is the
+	 * return value and the third is the option group. Extra columns are discarded.
+	 * Default strings are compared with the SECOND column.
+	 *
+	 * @param string       $name            Name of SELECT tag
+	 * @param string|array $defstr          The value to highlight. Use an array for multiple highlight values.
+	 * @param bool|string $blank1stItem     True to create an empty item (default), False not to add one;
+	 *                                      'string' to set its label and 'value:string' to assign a value to it.
+	 * @param bool         $multiple        True for multi-select list
+	 * @param int          $size            Number of rows to show (applies to multi-select box only)
+	 * @param string       $selectAttr      Additional attributes to defined for SELECT tag,
+	 *                                      useful for holding javascript onChange='...' handlers, CSS class, etc.
+	 * @param bool         $compareFirstCol When true (default), $defstr is compared against the value (column 2),
+	 *                                      while false will compare against the description (column 1).
+	 *
+	 * @return string HTML
 	 */
-	function GetMenu2($name,$defstr='',$blank1stItem=true,$multiple=false,$size=0, $selectAttr='') {
-		return $this->GetMenu($name,$defstr,$blank1stItem,$multiple,
-			$size, $selectAttr,false);
-	}
-
-	/*
-		Grouped Menu
-	*/
-	function GetMenu3($name,$defstr='',$blank1stItem=true,$multiple=false,
-			$size=0, $selectAttr='')
+	function getMenuGrouped($name, $defstr = '', $blank1stItem = true, $multiple = false,
+							$size = 0, $selectAttr = '', $compareFirstCol = true)
 	{
 		global $ADODB_INCLUDED_LIB;
 		if (empty($ADODB_INCLUDED_LIB)) {
 			include(ADODB_DIR.'/adodb-lib.inc.php');
 		}
-		return _adodb_getmenu_gp($this, $name,$defstr,$blank1stItem,$multiple,
+		return _adodb_getmenu_gp($this, $name, $defstr, $blank1stItem, $multiple,
+			$size, $selectAttr, $compareFirstCol);
+	}
+
+	/**
+	 * Generate a SELECT tag from a recordset, and return the HTML markup.
+	 *
+	 * Same as GetMenu(), except that default strings are compared with the
+	 * FIRST column (the description).
+	 *
+	 * @param string       $name            Name of SELECT tag
+	 * @param string|array $defstr          The value to highlight. Use an array for multiple highlight values.
+	 * @param bool|string $blank1stItem     True to create an empty item (default), False not to add one;
+	 *                                      'string' to set its label and 'value:string' to assign a value to it.
+	 * @param bool         $multiple        True for multi-select list
+	 * @param int          $size            Number of rows to show (applies to multi-select box only)
+	 * @param string       $selectAttr      Additional attributes to defined for SELECT tag,
+	 *                                      useful for holding javascript onChange='...' handlers, CSS class, etc.
+	 *
+	 * @return string HTML
+	 *
+	 * @deprecated 5.21.0 Use getMenu() with $compareFirstCol = false instead.
+	 */
+	function getMenu2($name, $defstr = '', $blank1stItem = true, $multiple = false,
+					  $size = 0, $selectAttr = '')
+	{
+		return $this->getMenu($name, $defstr, $blank1stItem, $multiple,
 			$size, $selectAttr,false);
 	}
 
 	/**
+	 * Generate a SELECT tag with groups from a recordset, and return the HTML ma...
 
[truncated message content]

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

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

Revision: 10205
          http://sourceforge.net/p/phpwiki/code/10205
Author:   vargenau
Date:     2020-12-26 12:48:06 +0000 (Sat, 26 Dec 2020)
Log Message:
-----------
Update pgsrc/Help%2FWikisUsingPhpWiki, locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki

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

Modified: trunk/locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki	2020-12-26 12:11:24 UTC (rev 10204)
+++ trunk/locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki	2020-12-26 12:48:06 UTC (rev 10205)
@@ -1,4 +1,4 @@
-Date: Fri,  5 Apr 2019 11:26:06 +0000
+Date: Sat, 26 Dec 2020 13:33:20 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FWikisUtilisantPhpWiki
@@ -32,11 +32,9 @@
 | http://kcpralumni.org/wiki/                                      | 1.5.4             | Sidebar
 | http://matthieuachard.free.fr/wiki/                              | 1.2.10
 | http://meanwhile.sourceforge.net/wiki/                           | 1.4.0RC1          | ~MonoBook
-| http://mtjezreel.com/phpwiki/                                    | 1.3.14            | Crao
 | http://mtswiki.westwood-tech.com/mtswiki-index.php/HomePage      | 1.4.0RC1          | default
 | http://mupad-combinat.sourceforge.net/Wiki/AboutWiki.html        |                   | default
 | http://muthanna.com/looperng/tutorial/HelpPages.html             | ?? (wikidump)
-| http://neckbeard.us                                              | 1.5.4             | Sidebar
 | http://netfrag.org/rrr/wiki/                                     | 1.5.5             | Sidebar
 | http://nukemclan.free.fr                                         | 1.2.10
 | http://ohg82er.de/wiki/                                          | 1.3.2-jeffs-hacks | ~DigiLog (spécifique)
@@ -48,12 +46,10 @@
 | http://squibbett.vacationhomesonnantucket.com/wiki/              | 1.2.11
 | http://swimuu.org/cu2c2-board/
 | http://the-bees-knees.info/phpwiki/                              | 1.5.4             | default
-| http://tuleap.net/wiki/index.php?pagename=HomePage&group_id=101  |                   | Tuleap
 | http://utenmelk.no/wiki2/                                        | 1.6.0             | Wordpress
 | http://wac-tk.drni.de                                            | 1.3.11p1          | Crao
 | https://wiki.cyberleo.net                                        | 1.4.0RC1          | MacOSX
 | http://wiki.elaboratedsolutions.com
-| http://wikiwiki.winak.be                                         | 1.5.5             | Sidebar
 | http://wiki.wlug.org.nz                                          | 1.3.11p1          | WLUG05 (spécifique)
 | http://wikiworld.com/wiki/                                       |                   | ~MonoBook
 | http://www.allpsych.uni-giessen.de/wikidump/HomePage.html        | ?? (wikidump)

Modified: trunk/pgsrc/Help%2FWikisUsingPhpWiki
===================================================================
--- trunk/pgsrc/Help%2FWikisUsingPhpWiki	2020-12-26 12:11:24 UTC (rev 10204)
+++ trunk/pgsrc/Help%2FWikisUsingPhpWiki	2020-12-26 12:48:06 UTC (rev 10205)
@@ -1,4 +1,4 @@
-Date: Tue,  2 Apr 2019 13:26:06 +0000
+Date: Sat, 26 Dec 2020 13:33:20 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikisUsingPhpWiki
@@ -32,11 +32,9 @@
 | http://kcpralumni.org/wiki/                                      | 1.5.4             | Sidebar
 | http://matthieuachard.free.fr/wiki/                              | 1.2.10
 | http://meanwhile.sourceforge.net/wiki/                           | 1.4.0RC1          | ~MonoBook
-| http://mtjezreel.com/phpwiki/                                    | 1.3.14            | Crao
 | http://mtswiki.westwood-tech.com/mtswiki-index.php/HomePage      | 1.4.0RC1          | default
 | http://mupad-combinat.sourceforge.net/Wiki/AboutWiki.html        |                   | default
 | http://muthanna.com/looperng/tutorial/HelpPages.html             | ?? (wikidump)
-| http://neckbeard.us                                              | 1.5.4             | Sidebar
 | http://netfrag.org/rrr/wiki/                                     | 1.5.5             | Sidebar
 | http://nukemclan.free.fr                                         | 1.2.10
 | http://ohg82er.de/wiki/                                          | 1.3.2-jeffs-hacks | ~DigiLog (custom)
@@ -48,12 +46,10 @@
 | http://squibbett.vacationhomesonnantucket.com/wiki/              | 1.2.11
 | http://swimuu.org/cu2c2-board/
 | http://the-bees-knees.info/phpwiki/                              | 1.5.4             | default
-| http://tuleap.net/wiki/index.php?pagename=HomePage&group_id=101  |                   | Tuleap
 | http://utenmelk.no/wiki2/                                        | 1.6.0             | Wordpress
 | http://wac-tk.drni.de                                            | 1.3.11p1          | Crao
 | https://wiki.cyberleo.net                                        | 1.4.0RC1          | MacOSX
 | http://wiki.elaboratedsolutions.com
-| http://wikiwiki.winak.be                                         | 1.5.5             | Sidebar
 | http://wiki.wlug.org.nz                                          | 1.3.11p1          | WLUG05 (custom)
 | http://wikiworld.com/wiki/                                       |                   | ~MonoBook
 | http://www.allpsych.uni-giessen.de/wikidump/HomePage.html        | ?? (wikidump)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10204] trunk/locale/fr/pgsrc

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

Revision: 10204
          http://sourceforge.net/p/phpwiki/code/10204
Author:   vargenau
Date:     2020-12-26 12:11:24 +0000 (Sat, 26 Dec 2020)
Log Message:
-----------
Update locale/fr/pgsrc/

Modified Paths:
--------------
    trunk/locale/fr/pgsrc/AdministrationDePhpWiki
    trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages
    trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien

Modified: trunk/locale/fr/pgsrc/AdministrationDePhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/AdministrationDePhpWiki	2020-12-26 11:52:22 UTC (rev 10203)
+++ trunk/locale/fr/pgsrc/AdministrationDePhpWiki	2020-12-26 12:11:24 UTC (rev 10204)
@@ -1,4 +1,4 @@
-Date: Mon,  2 Sep 2019 14:11:56 +0000
+Date: Sat, 26 Dec 2020 13:01:53 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=AdministrationDePhpWiki;
@@ -21,16 +21,16 @@
 
 | [[/Chown]] | [[/Purger]] | [[/Supprimer]] | [[/Renommer]] | [[/RechercherRemplacer]] | [[/DéfinirAcl]] | [[/DéfinirAclSimple]] | [[/SupprimerAcl]]
 
-== Global Access Rights ==
+== Droits d'accès globaux ==
 
-These action pages will allow you to set the default access rights for wiki pages.
-Pages without individual access rights will use these default access rights.
+Ces pages d'action permettent de définir les droits d'accès par défaut pour les pages wiki.
+Les pages sans droits d'accès individuels utiliseront ces droits d'accès par défaut.
 * [[SetGlobalAccessRightsSimple]]
 * [[SetGlobalAccessRights]]
 
-== User Management ==
+== Gestion des utilisateurs ==
 
-=== Reset a users password ===
+=== Réinitialiser le mot de passe d'un utilisateur ===
 
 <?plugin-form PasswordReset textinput=user method=post ?>
 

Modified: trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages	2020-12-26 11:52:22 UTC (rev 10203)
+++ trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages	2020-12-26 12:11:24 UTC (rev 10204)
@@ -1,4 +1,4 @@
-Date: Mon,  2 Sep 2019 13:34:37 +0000
+Date: Sat, 26 Dec 2020 13:01:53 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FAjouterDesPages;
@@ -24,9 +24,9 @@
 probablement mieux en fournissant son URL plutôt qu'en essayant
 d'ajouter ici le texte du document, comme ceci :
 {{{
-[[http://phpwiki.sourceforge.net/|PhpWiki project homepage]]
+[[http://phpwiki.sourceforge.net/|Page d'accueil du projet PhpWiki]]
 }}}
-[[http://phpwiki.sourceforge.net/|PhpWiki project homepage]]
+[[http://phpwiki.sourceforge.net/|Page d'accueil du projet PhpWiki]]
 
 Le Wiki ne gère pas les balises HTML (voir [[Aide:RèglesDeFormatageDesTextes|RèglesDeFormatageDesTextes]]).
 <tags>Ils sortiront juste sous forme de texte.</tags> Le wiki est conçu pour être aussi

Modified: trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien	2020-12-26 11:52:22 UTC (rev 10203)
+++ trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien	2020-12-26 12:11:24 UTC (rev 10204)
@@ -1,4 +1,4 @@
-Date: Tue,  3 Sep 2019 18:01:13 +0000
+Date: Sat, 26 Dec 2020 13:01:53 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FIc%C3%B4nesDeLien;
@@ -12,7 +12,7 @@
 
 | {{/themes/default/images/http.png}}      | lien http
 | {{/themes/default/images/url.png}}       | lien internet générique
-| {{/themes/default/images/interwiki.png}} | lien interWiki
+| {{/themes/default/images/interwiki.png}} | lien interwiki
 | {{/themes/default/images/https.png}}     | lien https
 | {{/themes/default/images/mailto.png}}    | lien mailto
 | {{/themes/default/images/ftp.png}}       | lien ftp

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10203] trunk/locale/de/pgsrc

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

Revision: 10203
          http://sourceforge.net/p/phpwiki/code/10203
Author:   vargenau
Date:     2020-12-26 11:52:22 +0000 (Sat, 26 Dec 2020)
Log Message:
-----------
Update locale/de/pgsrc/

Modified Paths:
--------------
    trunk/locale/de/pgsrc/AlleSeiten
    trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin
    trunk/locale/de/pgsrc/Hilfe%2FBackLinksPlugin
    trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin
    trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin
    trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin
    trunk/locale/de/pgsrc/Hilfe%2FSeitenErzeugen
    trunk/locale/de/pgsrc/Hilfe%2FSteve%20Wainstead
    trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln
    trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
    trunk/locale/de/pgsrc/Hilfe%2FWabiSabi
    trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt
    trunk/locale/de/pgsrc/HochLaden
    trunk/locale/de/pgsrc/KategorieKategorie
    trunk/locale/de/pgsrc/ModerierteSeite
    trunk/locale/de/pgsrc/PhpWikiSystemverwalten
    trunk/locale/de/pgsrc/PhpWikiUmfrage
    trunk/locale/de/pgsrc/StartSeite
    trunk/locale/de/pgsrc/TitelSuche

Modified: trunk/locale/de/pgsrc/AlleSeiten
===================================================================
--- trunk/locale/de/pgsrc/AlleSeiten	2020-12-26 11:08:08 UTC (rev 10202)
+++ trunk/locale/de/pgsrc/AlleSeiten	2020-12-26 11:52:22 UTC (rev 10203)
@@ -1,4 +1,4 @@
-Date: Thu, 20 Jun 2019 16:47:21 +0000
+Date: Sat, 26 Dec 2020 12:40:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=AlleSeiten;
@@ -8,6 +8,7 @@
 
 Hier befindet sich **alle Seiten** dieses Wikis, auch [[VerwaisteSeiten]]
 (//~OrphanedPages//) die ansonsten nicht erreichbar sind.
+[[AllUserPages|Show only user pages]].
 
 <<AllPages info||=mtime,author,hits sortby||=pagename>>
 

Modified: trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin	2020-12-26 11:08:08 UTC (rev 10202)
+++ trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin	2020-12-26 11:52:22 UTC (rev 10203)
@@ -1,4 +1,4 @@
-Date: Thu, 20 Jun 2019 16:47:21 +0000
+Date: Sat, 26 Dec 2020 12:40:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FAutorenProtokollPlugin;
@@ -6,7 +6,8 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Das **~AutorenProtokoll** (//AuthorHistory//) [[Hilfe:WikiPlugin|WikiPlugin]] listet aller Versionen eines Autors mit Diff-Links, oder eine SeitenProtokoll-ähnliche Liste einer oder aller (page=all) Seiten nur für einen Autor.
+Das **~AutorenProtokoll** (//AuthorHistory//) [[Hilfe:WikiPlugin|WikiPlugin]] listet aller Versionen eines Autors mit Diff-Links,
+oder eine SeitenProtokoll-ähnliche Liste einer oder aller (page=all) Seiten nur für einen Autor.
 
 == Benutzung ==
 {{{

Modified: trunk/locale/de/pgsrc/Hilfe%2FBackLinksPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FBackLinksPlugin	2020-12-26 11:08:08 UTC (rev 10202)
+++ trunk/locale/de/pgsrc/Hilfe%2FBackLinksPlugin	2020-12-26 11:52:22 UTC (rev 10203)
@@ -1,4 +1,4 @@
-Date: Fri, 19 Apr 2019 17:28:11 +0000
+Date: Sat, 26 Dec 2020 12:40:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FBackLinksPlugin;
@@ -9,7 +9,7 @@
 The **~BackLinks** [[Help:WikiPlugin|plugin]] lists all pages which link to a given page.
 
 Der Titel der aktuellen Seite ist mit einem Suchbefehl nach allen Seiten verbunden,
-die einen Link auf die aktuelle Seite enthalten. Die BackLinks Funktion beantwortet also die Frage: »Wo wird
+die einen Link auf die aktuelle Seite enthalten. Die ~BackLinks Funktion beantwortet also die Frage: »Wo wird
 der Name dieser Seite verwendet?«
 
 To display the list of pages which all contain multiple links use a pagelist as page argument.

Modified: trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin	2020-12-26 11:08:08 UTC (rev 10202)
+++ trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin	2020-12-26 11:52:22 UTC (rev 10203)
@@ -1,4 +1,4 @@
-Date: Thu, 20 Jun 2019 16:47:21 +0000
+Date: Sat, 26 Dec 2020 12:40:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FInhaltsVerzeichnisPlugin;
@@ -132,13 +132,13 @@
 }}}
 
 == Siehe auch ==
-* [[Help:TextFormattingRules]]
+* [[Hilfe:TextFormatierungsRegeln]]
 
 == Known Problems ==
 
-* If you include pages via [[Help:TemplatePlugin|Template]] or [[Help:IncludePagePlugin|IncludePage]] plugins, the Table of Contents will not contain the headers of the included pages.
+* If you include pages via [[Hilfe:VorlagePlugin|Vorlage]] or [[Help:IncludePagePlugin|IncludePage]] plugins, the Table of Contents will not contain the headers of the included pages.
 * The Table of Contents will be incorrect if a header contains:
-** a [[Help:TemplatePlugin|Template]] plugin call via ~{~{ ~}~},
+** a [[Hilfe:VorlagePlugin|Vorlage]] plugin call via ~{~{ ~}~},
 ** an image,
 ** or a ~~.
 * If you preview the page, the Table of Contents will not be correct if you modified headers. The Table of Contents will be taken from the last saved revision.

Modified: trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin	2020-12-26 11:08:08 UTC (rev 10202)
+++ trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin	2020-12-26 11:52:22 UTC (rev 10203)
@@ -1,4 +1,4 @@
-Date: Thu, 20 Jun 2019 16:47:21 +0000
+Date: Sat, 26 Dec 2020 12:40:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FNeueSeitePlugin;
@@ -6,7 +6,8 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Der **~NeueSeite** (//CreatePage//) [[Hilfe:WikiPlugin|WikiPlugin]] um leicht neue Seiten zu erzeugen, optional mit vorgegebenem Inhalt.
+Der **~NeueSeite** (//CreatePage//) [[Hilfe:WikiPlugin|WikiPlugin]] um leicht neue Seiten zu erzeugen,
+optional mit vorgegebenem Inhalt.
 
 Sie können den neuen Seitennamen von einer Eingabebox bekommen, optional mit
 neuem Inhalt von einer bestehenden Vorgabe oder Kategorieseite.

Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin	2020-12-26 11:08:08 UTC (rev 10202)
+++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin	2020-12-26 11:52:22 UTC (rev 10203)
@@ -1,4 +1,4 @@
-Date: Thu, 20 Jun 2019 16:47:21 +0000
+Date: Sat, 26 Dec 2020 12:40:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FPhotoAlbumPlugin;
@@ -170,17 +170,17 @@
 <<PhotoAlbum src="themes/Hawaiian/images/pictures/" >>
 }}}
 oder via externe URL:
-{{{{
+{{{
 <<PhotoAlbum src="http://phpwiki.sourceforge.net/demo/themes/Hawaiian/images/pictures/PhotoAlbum.csv" >>
 }}}
 
 [[/Diashow]]
 
-== Plugin Autoren ==
+== Autoren ==
 
 * [[mailto:te...@jo...|Ted Vinke]]: Originaler Autor
 * [[Help:Reini Urban|Reini Urban]]: Lokales Dateisystem
-* Thomas Harding: Diashow und thumbs
+* Thomas Harding: Diashow und Thumbs
 
 <noinclude>
 ----

Modified: trunk/locale/de/pgsrc/Hilfe%2FSeitenErzeugen
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FSeitenErzeugen	2020-12-26 11:08:08 UTC (rev 10202)
+++ trunk/locale/de/pgsrc/Hilfe%2FSeitenErzeugen	2020-12-26 11:52:22 UTC (rev 10203)
@@ -1,4 +1,4 @@
-Date: Fri, 12 Apr 2019 10:36:59 +0000
+Date: Sat, 26 Dec 2020 12:40:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FSeitenErzeugen;
@@ -6,9 +6,11 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Um dem Wiki eine neue Seite hinzuzufügen mußt du dir nur einen sinnvollen Titel einfallen lassen, alle Wörter im Titel großschreiben und sie AufDieseArtZusammenfuegen. Wiki erkennt dies automatisch als einen Hyperlink. **Umlaute kannst du in Titeln auch verwenden: [[den Namen in eckige Klammern so einschließen].**
+Um dem Wiki eine neue Seite hinzuzufügen mußt du dir nur einen sinnvollen Titel
+und zwischen {{{[[doppelte Klammern]]}}} setzen.
 
-Dann kannst du das Fragezeichen am Ende des neuen Hyperlinks anklicken, und Wiki öffnet einen Editor zum Erstellen der neuen Seite.
+Dann kannst du das Fragezeichen am Ende des neuen Hyperlinks anklicken,
+und Wiki öffnet einen Editor zum Erstellen der neuen Seite.
 
 The page name can contain any character, except:
 * angle brackets (<>),
@@ -18,15 +20,20 @@
 * pipe (|),
 * and hash sign (#) that is used for anchors.
 
-Wenn du ein Dokument mit aufwendigen Formatierungen zum Wiki hinzufügen willst, ist es vielleicht einfacher, einen Link zu diesem Dokument ins Wiki einzufügen statt das Dokument selbst. Zum Beispiel:
+Wenn du ein Dokument mit aufwendigen Formatierungen zum Wiki hinzufügen willst,
+ist es vielleicht einfacher, einen Link zu diesem Dokument ins Wiki einzufügen
+statt das Dokument selbst. Zum Beispiel:
 {{{
 [[http://phpwiki.sourceforge.net/|Homepage des PhpWiki Projektes]]
 }}}
 [[http://phpwiki.sourceforge.net/|Homepage des PhpWiki Projektes]]
 
-Wiki unterstüzt keine HTML-Tags (siehe TextFormatierungsRegeln). <tags>werden einfach wie normaler Text angezeigt.</tags> Wiki soll so einfach wie möglich sein, damit es jeder benutzen kann.
+Wiki unterstüzt keine HTML-Tags (siehe [[Hilfe:TextFormatierungsRegeln|TextFormatierungsRegeln]]).
+<tags>werden einfach wie normaler Text angezeigt.</tags> Wiki soll so einfach
+wie möglich sein, damit es jeder benutzen kann.
 
-Es gibt eine Funktion, durch die der Systemverwalter HTML in Dokumenten erlauben kann, das führt aber zu Sicherheitsrisiken.
+Es gibt eine Funktion, durch die der Systemverwalter HTML in Dokumenten erlauben
+kann, das führt aber zu Sicherheitsrisiken.
 
 <noinclude>
 ----

Modified: trunk/locale/de/pgsrc/Hilfe%2FSteve%20Wainstead
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FSteve%20Wainstead	2020-12-26 11:08:08 UTC (rev 10202)
+++ trunk/locale/de/pgsrc/Hilfe%2FSteve%20Wainstead	2020-12-26 11:52:22 UTC (rev 10203)
@@ -1,4 +1,4 @@
-Date: Wed, 10 Apr 2019 16:39:09 +0000
+Date: Sat, 26 Dec 2020 12:40:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FSteve%20Wainstead;
@@ -9,7 +9,7 @@
 Hi. I started building this [[Hilfe:WikiWikiWeb|WikiWikiWeb]] but many others help me
 now. I'm at [[http://www.panix.com/~swain/]].
 
-Please report bugs to [[mailto:php...@li...]]
+Please report bugs to [[mailto:php...@li...]].
 
 <noinclude>
 ----

Modified: trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln	2020-12-26 11:08:08 UTC (rev 10202)
+++ trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln	2020-12-26 11:52:22 UTC (rev 10203)
@@ -1,4 +1,4 @@
-Date: Mon,  2 Sep 2019 17:46:19 +0000
+Date: Sat, 26 Dec 2020 12:40:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FTextFormatierungsRegeln;
@@ -10,15 +10,15 @@
 
 == Übersicht ==
 
-**Hervorhebung:** ##~/~/## für //italics//, ##~*~*## für **bold**, ##~*~*~/~/...~/~/~*~*## für **//both//**, ##~#~### for ##fixed width##. \\
+**Hervorhebung:** ##~/~/## für //italics//, ##~*~*## für **bold**, ##~*~*~/~/...~/~/~*~*## für **//beide//**, ##~#~### für ##feste Breite##. \\
 **Lists:** ##~*## for bullet lists, ##~### for numbered lists; use multiple ##~*## or ##~### for nested lists. \\
 **Headings:** "##~=~=##", "##~=~=~=##", "##~=~=~=~=##", etc. make headings. \\
-**Unformatiert:** Enclose text in ##~<pre>~</pre>## or##~<verbatim>~</verbatim>##.%%%
+**Unformatiert:** Enclose text in ##~{~{~{...~}~}~}## or ##~<pre>~</pre>##. \\
 **Text einrücken:** Indent the paragraph with whitespaces. \\
-**Querverweise:** ~JoinCapitalizedWords or use square brackets for a##~[page link]## or URL ##~[~http://cool.wiki.int/]##.%%%
-
-**Links verhindern:** Prefix with "##~~##":##~~~DoNotHyperlink##, name links like ##~[text | URL]##.%%%
-**Verschiedenes:** "##!##", "##!!##", "##!!!##" make headings,"##~%%%##" or "##~<br>##" makes a linebreak,"##~----##" makes a horizontal rule.%%%
+**Querverweise:** use double square brackets for a ##~[~[page link~]~]## or URL ##~[~[~http:~//cool.wiki.int/~]~]##. \\
+**References:** use pipe ##~|## to name the links: ##~[~[page link~|some text~]~]## or ##~[~[~http:~//cool.wiki.int/~|some text~]~]##. \\
+**Links verhindern:** Prefix with "##~~##": ##~~~DoNotHyperlink##. \\
+**Verschiedenes:** "##~\~\##" makes a linebreak, "##~----##" makes a horizontal rule. \\
 **Erlaubte HTML Tags:** <b>b</b> <big>big</big> <i>i</i>
 <small>small</small> <tt>tt</tt> <em>em</em> <strong>strong</strong>
 <s>s</s> <strike>strike</strike>
@@ -25,29 +25,20 @@
 <abbr>abbr</abbr> <acronym>acronym</acronym> <cite>cite</cite>
 <code>code</code> <dfn>dfn</dfn> <kbd>kbd</kbd> <samp>samp</samp>
 <var>var</var> <sup>sup</sup> <sub>sub</sub> \\
-**More:** [[Help:TextFormattingRules#Tables|tables]], [[Help:TextFormattingRules#Images|images]],
-[[Help:CreateTocPlugin|table of contents]], [[Help:TextFormattingRules#Inserting_plugins|plugins]]
+**Mehr:** [[Hilfe:TextFormatierungsRegeln#Tabellen|Tabellen]], [[Hilfe:TextFormatierungsRegeln#Bilder|Bilder]],
+[[Hilfe:Hilfe%2FInhaltsVerzeichnisPlugin|Inhaltsverzeichnis]], [[Hilfe:TextFormatierungsRegeln#Inserting_plugins|Plugins]]
 
 More explanations: [[Hilfe:TextFormatierungsRegeln]]
 
-== Tip ==
-Schau dir am besten auch den »Quelltext« dieser Seite an, indem du unten auf den Link zum Editieren klickst. Dann verstehst du die Beispiele besser.
+== Character Formatting ==
 
-== Absätze ==
+=== Hervorhebung ===
 
-* Rücke Absätze nicht ein
-* Zeilenumbrüche werden automatisch erstellt
-* Absätze werden durch Leerzeilen getrennt
-* Vier oder mehr Minuszeichen am Zeilenanfang erzeugen eine horizontale Linie
-* =~%%%= oder =~<br>= erstellt einen Zeilenumbruch (auch in Überschriften und Listen)
+* Verwende doppelter Schrägstrich (##~/~/##) für Betonung (wird normalerweise //kursiv// dargestellt)
+* Verwende zwei Sternchen (##~*~*##) für starke Betonung (wird normalerweise **fett** dargestellt)
+* Du kannst sie auch zusammen verwenden: **//fett & kursiv//**
+* //Betonungen// können //mehrfach// in einer Zeile verwendet werden, aber sie können **nicht** über das Zeilenende hinausgehen:
 
-== Hervorhebung ==
-
-* Verwende einen Unterstrich (##~_##) für _Betonung_ (wird normalerweise _kursiv_ dargestellt)
-* Verwende Sternchen (##~*##) für *starke Betonung* (wird normalerweise *fett* dargestellt)
-* Du kannst sie auch zusammen verwenden: *_fett & kursiv_*
-* _Betonungen_ können _mehrfach_ in einer Zeile verwendet werden, aber sie können _nicht_ über das Zeilenende hinausgehen:
-
 // So etwas
 
 funktioniert nicht//
@@ -88,7 +79,7 @@
 
 === Color Text ===
 
-Is it possible to write text in color.
+It is possible to write text in color.
 
 {{{
 %color=green% green text %% and back to normal
@@ -155,13 +146,13 @@
 
 All special non-whitespace HTML characters are displayed as-is. Exceptions below.
 
-== Paragraphs ==
+== Absätze ==
 
-* Don't indent paragraphs
-* Words wrap and fill as needed
-* Use blank lines as separators
-* Four or more minus signs make a horizontal rule
-* "##~\~\##", "##~%%%##" or "##~<br>##" makes a linebreak (in headings and lists too)
+* Rücke Absätze nicht ein
+* Zeilenumbrüche werden automatisch erstellt
+* Absätze werden durch Leerzeilen getrennt
+* Vier oder mehr Minuszeichen am Zeilenanfang erzeugen eine horizontale Linie
+* "##~\~\##", "##~%%%##" oder "##~<br>##" erstellt einen Zeilenumbruch (auch in Überschriften und Listen)
 
 == Listen ==
 
@@ -265,26 +256,33 @@
 
 == Querverweise (Links) ==
 
-* Hyperlinks zu anderen Seiten im Wiki werden erstellt, indem man den Namen in eckige Klammern
-  einschließt [das ist ein Link] oder besser WikiWörterVerwendet.
-* Hyperlinks zu externen Seiten werden so erstellt: [http://www.wcsb.org/]
+* Hyperlinks zu anderen Seiten im Wiki werden erstellt, indem man den
+  Namen in zwei eckige Klammern einschließt: [[das ist ein Link]]
+  Einzelne Klammern oder WikiWörter funktionieren ebenfalls.
+* Hyperlinks zu externen Seiten werden so erstellt: [[http://www.wcsb.org/]]
 * Du kannst Links zu externen Seiten einen Namen geben, indem du in der eckigen Klammer erst
-  den Namen und dann, getrennt durch einen senkrechten Strich (|), die Adresse angibst:
-  [PhpWiki Homepage | http://phpwiki.sourceforge.net/] ---
-  [Die Start Seite | StartSeite]
+  die Adresse und dann, getrennt durch einen senkrechten Strich (##|##), den Namen angibst:
+  [[http://phpwiki.sourceforge.net/|PhpWiki Start Seite]], [[StartSeite|Die Start Seite]]
 * Du kannst das Erstellen eines Links verhindern, indem du vor das Wort eine
-  Tilde '##~~##' setzt, zum Beispiel ~DasIstKeinLink.
-  ~http://not.linked.to/
+  Tilde '##~~##' setzt, zum Beispiel ~DasIstKeinLink, ~http://not.linked.to/
+* Wenn du im Text Adressen eingibst, die mit ##~http:##, ##~ftp:## oder ##mailto:## beginnen,
+  werden diese auch automatisch in Links umgewandelt, zum Beispiel http://c2.com/
+* Adressen, die mit ##.png##, ##.gif## oder ##.jpg## enden (d.h. Bilder) werden in die Seite eingefügt, wenn sie in zwei eckige Klammern gesetzt werden, z. B.:
+  [[http://phpwiki.demo.free.fr/themes/default/images/png.png]]
 * You can create footnotes by using ~[1], ~[2], ~[3], ... like this here #[|ftnt
 _ref_1]<sup>~[[1|#ftnt_1]~]</sup>. See footnote for counterpart.  (If the ~[ is
 in the first column, it is a footnote <em>definition</em> rather than a footnote
  <em>reference</em> #[|ftnt_ref_1]<sup>~[[1|#ftnt_1]~]</sup>.)
-* Wenn du im Text Adressen eingibst, die mit **http:**, **ftp:** oder **mailto:** beginnen,
-  werden diese auch automatisch in Links umgewandelt, zum Beispiel http://c2.com/
-* Adressen, die mit **.png** oder **.jpg** enden (d.h. Bilder) werden in die Seite
-  eingefügt, wenn sie in eckige Klammern gesetzt werden, z. B.: [[http://phpwiki.demo.free.fr/themes/default/images/png.png]]
+* In-page #[[hyperlinks]] are made by placing a named anchor and referring to the anchor in a hyperlink:
+** Named anchors:
+*** ##~#~[~[foo]]##: An anchor around the text "foo" with id "foo".
+*** ##~#~[~[|foo]]##: An empty anchor with id "foo".
+*** ##~#~[~[howdy|foo]]##: An anchor around the text "howdy" with id "foo".
+** References to name anchors are made thusly:\\##~[~[~#hyperlinks]]##, ##~[~[~OtherPage#foo]]##, ##~[~[~OtherPage#foo|named]]##.
+* Semantic links are named links like: {{{is_a::WikiPage}}} and attributes like {{{size:-4000}}}.
+* A pagelink within square brackets starting with ":" is not backlinked.
 
-== Images ==
+== Bilder ==
 
 An inline image is created with curly brackets.
 An alternate text can be put after a pipe. If there is none, an empty alternate text will be created.
@@ -385,7 +383,7 @@
 ergibt
 <<BackLinks page=StartSeite info=hits>>
 
-Für weitere Informationen zu plugins, siehe WikiPlugin.
+Für weitere Informationen zu plugins, siehe [[Hilfe:WikiPlugin]], und [[PluginManager]] für eine Liste aller Plugins.
 
 <noinclude>
 ----

Modified: trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin	2020-12-26 11:08:08 UTC (rev 10202)
+++ trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin	2020-12-26 11:52:22 UTC (rev 10203)
@@ -1,4 +1,4 @@
-Date: Mon,  2 Sep 2019 14:57:07 +0000
+Date: Sat, 26 Dec 2020 12:40:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FVorlagePlugin;
@@ -6,9 +6,9 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Der **Vorlage** (//Template//) [[Hilfe:WikiPlugin|WikiPlugin]]...
+Mit der **Vorlage** (//Template//) [[Hilfe:WikiPlugin|WikiPlugin]] können Sie Text von einer Wiki-Seite einfügen und bestimmte Platzhalter durch Parameter ersetzen.
 
-Parametrische Blöcke...
+A template can be seen as a parametrized block. It is similiar to [[CreatePage]] with the template argument, but at run-time.
 
 There are two syntaxes to call a template, the usual Phpwiki syntax for plugins, and a more
 concise syntax similar to Mediawiki templates.

Modified: trunk/locale/de/pgsrc/Hilfe%2FWabiSabi
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWabiSabi	2020-12-26 11:08:08 UTC (rev 10202)
+++ trunk/locale/de/pgsrc/Hilfe%2FWabiSabi	2020-12-26 11:52:22 UTC (rev 10203)
@@ -1,4 +1,4 @@
-Date: Fri, 19 Apr 2019 17:28:11 +0000
+Date: Sat, 26 Dec 2020 12:40:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FWabiSabi;
@@ -10,25 +10,25 @@
 aesthetic system, it is difficult to explain precisely in western
 terms.  According to Leonard Koren, wabi-sabi is the most conspicuous
 and characteristic feature of what we think of as traditional Japanese
-beauty and it //»occupies roughly the same position in the Japanese
+beauty and it //“occupies roughly the same position in the Japanese
 pantheon of aesthetic values as do the Greek ideals of beauty and
-perfection in the West.«//
+perfection in the West.”//
 
-//»Wabi-sabi is a beauty of things imperfect, impermanent, and incomplete.«//
+//“Wabi-sabi is a beauty of things imperfect, impermanent, and incomplete.”//
 
-//»It is the beauty of things modest and humble.«//
+//“It is the beauty of things modest and humble.”//
 
-//»It is the beauty of things unconventional.«//
+//“It is the beauty of things unconventional.”//
 
-(quoted from »[[http://www.amazon.com/exec/obidos/tg/detail/-/1880656124/qid=1054098290/sr=1-1/ref=sr_1_1/104-9834820-5562358?v=glance&s=books|WABI-SABI: FOR ARTISTS,DESIGNERS, POETS & PHILOSOPHERS]],« 1994, Leonard Koren)
+(quoted from “[[http://www.amazon.com/exec/obidos/tg/detail/-/1880656124/qid=1054098290/sr=1-1/ref=sr_1_1/104-9834820-5562358?v=glance&s=books|WABI-SABI: FOR ARTISTS,DESIGNERS, POETS & PHILOSOPHERS]],” 1994, Leonard Koren)
 
 The concepts of wabi-sabi correlate with the concepts of Zen Buddhism,
 as the first Japanese involved with wabi-sabi were tea masters,
 priests, and monks who practiced Zen. Zen Buddhism originated in
 India, traveled to China in the 6th century, and was first introduced
-in Japan around the 12th century. Zen emphasizes //»direct, intuitive
+in Japan around the 12th century. Zen emphasizes //“direct, intuitive
 insight into transcendental truth beyond all intellectual
-conception.«// At the core of wabi-sabi is the importance of
+conception.”// At the core of wabi-sabi is the importance of
 transcending ways of looking and thinking about things/existence.
 
 * All things are impermanent

Modified: trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt	2020-12-26 11:08:08 UTC (rev 10202)
+++ trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt	2020-12-26 11:52:22 UTC (rev 10203)
@@ -1,4 +1,4 @@
-Date: Mon,  2 Sep 2019 14:11:56 +0000
+Date: Sat, 26 Dec 2020 12:40:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FWieManWikiBenutzt;
@@ -10,12 +10,12 @@
 
 **Alles was du wissen mußt ist:**
 * Klicke auf //Editieren// am unteren Ende der Seite, um sie zu bearbeiten. Du solltest das gleich jetzt tun und den Quelltext dieser Seite lesen - es ergibt dann mehr Sinn.
-* Kursiven Text bekommt man, indem man Wörter in jeweils zwei Apostrophen ' einschließt, ''wie in diesem Beispiel''.
-* Fette Schrift bekommt man, indem man Wörter in jeweils zwei untergesetzten Strichen einschließt, **wie in diesem Beispiel**
+* Kursiven Text bekommt man, indem man Wörter in jeweils zwei Schrägstrichen einschließt, //wie in diesem Beispiel//.
+* **Fette Schrift** bekommt man, indem man Wörter in jeweils zwei Sternchen einschließt, **wie in diesem Beispiel**.
 * Und beides, indem man **//beides verwendet//**.
 * You get ##monospaced text## by using two hash signs on either side.
 * Eine Liste erhält man, indem man eine Zeile mit einem Sternchen »*« startet.
-* Vorformatierten Text rückt man mit mindestens einem Leerzeichen ein:
+* Vorformatierten Text rückt man mit ~{~{~{ am Anfang und  ~}~}~} am Ende:
 {{{
   Das ist ein Gedicht
   über vorformatierten Text
@@ -32,10 +32,19 @@
 
 ---------
 
-* Links kann man erzeugen, indem man einzelne Wörter, deren Anfangsbuchstabe groß geschrieben wird, zusammenfügt. Wenn du also etwa eine Seite darüber  schreiben willst, dass Arno Ratten mag, schreibst du: ArnoMagRatten. Falls die Seite noch nicht existiert erscheint dahinter ein Fragezeichen, das dir die Möglichkeit gibt die Seite zu erzeugen: DieseSeiteSollteNichtExistieren. (Und bitte verdirb das Beispiel nicht, indem du diese Seite erzeugst).
-* Um externe Links zu setzen, kannst du einfach die Adresse eintippen und PhpWiki erzeugt einen passenden Link, z.B. http://www.diezeit.de/
-* Um Bilder einzufügen, schließt man deren Adresse in eckigen Klammern ein, wie hier: ~[~[~http://www.deinhost.de/bilder/bild.png]]. Falls die Adresse des Bildes nicht in eckigen Klammern steht, wird einfach nur die Adresse (nicht aber das Bild) angezeigt.
-* Jetzt kann es eigentlich schon mit dem SeitenErzeugen losgehen!
+* Links kann man erzeugen, indem man einzelne Wörter, deren Anfangsbuchstabe
+  groß geschrieben wird, zusammenfügt. Wenn du also etwa eine Seite darüber
+  schreiben willst, dass Arno Ratten mag, schreibst du: ArnoMagRatten. Falls die
+  Seite noch nicht existiert erscheint dahinter ein Fragezeichen, das dir
+  die Möglichkeit gibt die Seite zu erzeugen: DieseSeiteSollteNichtExistieren. (Und bitte
+  verdirb das Beispiel nicht, indem du diese Seite erzeugst).
+* Um externe Links zu setzen, kannst du einfach die Adresse eintippen und
+  PhpWiki erzeugt einen passenden Link, z.B. http://www.diezeit.de/
+* Um Bilder einzufügen, schließt man deren Adresse in eckigen Klammern ein,
+  wie hier: ~[~[~http://www.deinhost.de/bilder/bild.png]]. Falls die Adresse
+  des Bildes nicht in eckigen Klammern steht, wird einfach nur die Adresse
+  (nicht aber das Bild) angezeigt.
+* Jetzt kann es eigentlich schon mit dem [[Hilfe:SeitenErzeugen|Seiten erzeugen]] losgehen!
 
 ----
 

Modified: trunk/locale/de/pgsrc/HochLaden
===================================================================
--- trunk/locale/de/pgsrc/HochLaden	2020-12-26 11:08:08 UTC (rev 10202)
+++ trunk/locale/de/pgsrc/HochLaden	2020-12-26 11:52:22 UTC (rev 10203)
@@ -1,4 +1,4 @@
-Date: Fri, 19 Apr 2019 17:28:11 +0000
+Date: Sat, 26 Dec 2020 12:40:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=HochLaden;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-**Upload a file which will be accessible by prefixing the filename with »Upload~:«.**
+**Upload a file which will be accessible by prefixing the filename with “Upload~:”.**
 ----
 <<UpLoad>>
 

Modified: trunk/locale/de/pgsrc/KategorieKategorie
===================================================================
--- trunk/locale/de/pgsrc/KategorieKategorie	2020-12-26 11:08:08 UTC (rev 10202)
+++ trunk/locale/de/pgsrc/KategorieKategorie	2020-12-26 11:52:22 UTC (rev 10203)
@@ -1,4 +1,4 @@
-Date: Thu, 25 Jul 2019 15:34:07 +0000
+Date: Sat, 26 Dec 2020 12:40:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=KategorieKategorie;
@@ -17,7 +17,7 @@
 == Kategorie ==
 
 This is a Category. Adding a link to this page puts the page under this Category.
-When [[Help:EditText|editing]] a page, use the {{/themes/default/images/ed_category.png|[C]}}
+When [[Hilfe:TextBearbeiten|editing]] a page, use the {{/themes/default/images/ed_category.png|[C]}}
 button of the edit toolbar to insert a category into your page.
 
 == Create a new Category ==

Modified: trunk/locale/de/pgsrc/ModerierteSeite
===================================================================
--- trunk/locale/de/pgsrc/ModerierteSeite	2020-12-26 11:08:08 UTC (rev 10202)
+++ trunk/locale/de/pgsrc/ModerierteSeite	2020-12-26 11:52:22 UTC (rev 10203)
@@ -1,4 +1,4 @@
-Date: Wed, 10 Apr 2019 18:35:55 +0000
+Date: Sat, 26 Dec 2020 12:40:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ModerierteSeite;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Please check [[Help:ModerierteSeitePlugin]] to see how to use moderated pages.
+Please check [[Hilfe:ModerierteSeitePlugin]] to see how to use moderated pages.
 
 <<ModeratedPage>>
 

Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten	2020-12-26 11:08:08 UTC (rev 10202)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten	2020-12-26 11:52:22 UTC (rev 10203)
@@ -1,4 +1,4 @@
-Date: Mon,  2 Sep 2019 17:16:31 +0000
+Date: Sat, 26 Dec 2020 12:40:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiSystemverwalten;
@@ -126,7 +126,9 @@
 <<WikiForm action=dumphtml>>
 
 Erzeugt ein Verzeichnis aller Wiki Dateien als statische XHTML Dateien, die
-auch ohne Webserver und Datenbank betrachtbar sind.
+auch ohne Webserver und Datenbank betrachtbar sind.  The various
+links for page editing functions and navigation are removed from the
+pages.
 
 Das XHTML-Verzeichnis kann auch heruntergeladen werden als eine **[[phpwiki:?action=ziphtml|XHTML ZIP Datei]]**.
 

Modified: trunk/locale/de/pgsrc/PhpWikiUmfrage
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiUmfrage	2020-12-26 11:08:08 UTC (rev 10202)
+++ trunk/locale/de/pgsrc/PhpWikiUmfrage	2020-12-26 11:52:22 UTC (rev 10203)
@@ -1,4 +1,4 @@
-Date: Wed, 10 Apr 2019 18:24:49 +0000
+Date: Sat, 26 Dec 2020 12:40:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiUmfrage;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Please answer our poll about [[Help:PhpWiki|PhpWiki]]:
+Please answer our poll about [[Hilfe:PhpWiki|PhpWiki]]:
 
 <<WikiPoll require_all=0 require_least=2
            question[1]="Gefällt Dir PhpWiki?"

Modified: trunk/locale/de/pgsrc/StartSeite
===================================================================
--- trunk/locale/de/pgsrc/StartSeite	2020-12-26 11:08:08 UTC (rev 10202)
+++ trunk/locale/de/pgsrc/StartSeite	2020-12-26 11:52:22 UTC (rev 10203)
@@ -1,4 +1,4 @@
-Date: Wed, 10 Apr 2019 18:24:49 +0000
+Date: Sat, 26 Dec 2020 12:40:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=StartSeite;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-* Was ist ein [[Help:WikiWikiWeb|WikiWikiWeb]]? Eine kurze Beschreibung dieser Anwendung.
+* Was ist ein [[Hilfe:WikiWikiWeb|WikiWikiWeb]]? Eine kurze Beschreibung dieser Anwendung.
 * Lerne [[Hilfe:WieManWikiBenutzt|WieManWikiBenutzt]] und wie mann SeitenErzeugen kann.
 * Die [[SandKiste]] ist zum Spielen und zum Experimentieren.
 * Bitte trage dich im GästeBuch ein.
@@ -14,4 +14,4 @@
 * Eine Liste der [[MeistBesucht]]en Seiten.
 * [[ReleaseNotes]] (in Englisch) und [[RecentReleases]].
 * Dieses Wiki wird verwaltet unter [[PhpWikiSystemverwalten]].
-* See more [[:PhpWikiDokumentation]].
+* Mehr [[:PhpWikiDokumentation]] sehen.

Modified: trunk/locale/de/pgsrc/TitelSuche
===================================================================
--- trunk/locale/de/pgsrc/TitelSuche	2020-12-26 11:08:08 UTC (rev 10202)
+++ trunk/locale/de/pgsrc/TitelSuche	2020-12-26 11:52:22 UTC (rev 10203)
@@ -1,4 +1,4 @@
-Date: Tue, 16 Apr 2019 15:27:59 +0000
+Date: Sat, 26 Dec 2020 12:40:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=TitelSuche;
@@ -10,7 +10,7 @@
 
 ----
 
-Wieder Suchen::
+Wieder Suchen:
 
 <<WikiFormRich action=TitleSearch method=GET nobr=1 class=wikiaction
   editbox[] name=s 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:[10202] trunk/locale

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

Revision: 10202
          http://sourceforge.net/p/phpwiki/code/10202
Author:   vargenau
Date:     2020-12-26 11:08:08 +0000 (Sat, 26 Dec 2020)
Log Message:
-----------
Update translations of pgsrc/Help%2FTextFormattingRules

Modified Paths:
--------------
    trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto
    trunk/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes
    trunk/locale/it/pgsrc/Aiuto%2FRegoleFormattazioneTesto
    trunk/locale/nl/pgsrc/Help%2FTekstFormatteringsRegels
    trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FTextformateringsregler

Modified: trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto
===================================================================
--- trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto	2020-12-25 18:47:27 UTC (rev 10201)
+++ trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto	2020-12-26 11:08:08 UTC (rev 10202)
@@ -1,4 +1,4 @@
-Date: Fri, 22 Dec 2020 10:36:59 +0000
+Date: Sat, 26 Dec 2020 11:48:23 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Ayuda%2FReglasDeFormatoDeTexto;
@@ -260,7 +260,7 @@
   nombre entre corchetes: [[esto es un vinculo de página]].
   Los corchetes simples o PalabarasWiki también funcionarán.
 * Los enlaces a páginas externas son realizados como este: [[http://www.wcsb.org/]]
-* Puede nombrar los enlaces a páginas externas poniendo un nombre, una barra (##|##) y el enlace:
+* Puede nombrar los enlaces poniendo el hipervínculo o el nombre de la página, una barra (##|##) y el nombre:
   [[http://phpwiki.sourceforge.net/|Página principal de PhpWiki]], [[PáginaPrincipal|la pagina principal]]
 * Puede suprimir enlace a viejas referencias, precediendo la palabra con un '##~~##', e.j. ~NotLinkedAsWikiName, ~http~://not.linked.to/
 * También, el sistema antiguo de enlazar los URL's sigue siendo soportado: preceda los URLs

Modified: trunk/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes	2020-12-25 18:47:27 UTC (rev 10201)
+++ trunk/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes	2020-12-26 11:08:08 UTC (rev 10202)
@@ -1,4 +1,4 @@
-Date: Sun, 16 Dec 2020 12:17:32 +0000
+Date: Sat, 26 Dec 2020 11:48:23 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FR%C3%A8glesDeFormatageDesTextes;
@@ -260,7 +260,7 @@
   page entre doubles crochets : [[ceci est un hyperlien]].
   Des crochets simples ou des MotsWiki fonctionneront également.
 * Les hyperliens vers des pages externes sont créés de cette façon : [[http://www.wcsb.org/]]
-* Vous pouvez nommer les liens en leur donnant un nom, une barre verticale (|) puis l'hyperlien ou le nom de la page :
+* Vous pouvez nommer les liens en donnant l'hyperlien ou le nom de la page, une barre verticale (|) puis le nom :
   [[http://phpwiki.sourceforge.net/|Page d'accueil de PhpWiki]], [[PageAccueil|la page d'accueil]]
 * Vous pouvez supprimer les liens vers les URI en faisant précéder le mot d'un '##~~##', par exemple ~NonLiéEnModeWiki, ~http~://pas.de.lien.ici/
 * L'ancienne manière de lier les URL est aussi toujours supportée : précédez les URL de

Modified: trunk/locale/it/pgsrc/Aiuto%2FRegoleFormattazioneTesto
===================================================================
--- trunk/locale/it/pgsrc/Aiuto%2FRegoleFormattazioneTesto	2020-12-25 18:47:27 UTC (rev 10201)
+++ trunk/locale/it/pgsrc/Aiuto%2FRegoleFormattazioneTesto	2020-12-26 11:08:08 UTC (rev 10202)
@@ -1,4 +1,4 @@
-Date: Tue, 18 Dec 2020 11:21:37 +0000
+Date: Sat, 26 Dec 2020 11:48:23 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Aiuto%2FRegoleFormattazioneTesto;
@@ -260,7 +260,7 @@
   un nome circondato da parentesi quadre: [[questo è un link]].
   Single brackets or WikiWords will also work.
 * I collegamento alle pagine esterne sono fatti in questo modo: [[http://www.wcsb.org/]]
-* Puoi anche dare un nome al collegamento fornendo un nome, una barra verticale o pipe (##|##) e quindi il collegamento o il nome della pagina:
+* Puoi anche dare un nome al collegamento fornendo il collegamento ipertestuale o il nome della pagina, una barra verticale o pipe (##|##) e quindi il nome:
   [[http://phpwiki.sourceforge.net/|La pagina princiale di Phpwiki]], [[PaginaPrincipale|La pagina princiale]]
 * Puoi eliminare i link in vecchi stile facendo precedere un URI da un '##~~##', come ad esempio ~NotEUnWikiName, ~http~://non.e.linkato/
 * n ogni caso il vecchio modo di fare collegamenti è ancora supportato, quindi si potranno usare

Modified: trunk/locale/nl/pgsrc/Help%2FTekstFormatteringsRegels
===================================================================
--- trunk/locale/nl/pgsrc/Help%2FTekstFormatteringsRegels	2020-12-25 18:47:27 UTC (rev 10201)
+++ trunk/locale/nl/pgsrc/Help%2FTekstFormatteringsRegels	2020-12-26 11:08:08 UTC (rev 10202)
@@ -1,4 +1,4 @@
-Date: Fri, 22 Dec 2020 10:36:59 +0000
+Date: Sat, 26 Dec 2020 11:48:23 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTekstFormatteringsRegels;
@@ -260,8 +260,8 @@
   naam van de pagina in dubbele vierkante haken te zetten: [[dit is een paginakoppeling]].
   Single brackets or WikiWords will also work.
 * Koppelingen naar externe pagina's gaan zo: [[http://www.lilypond.org]].
-* Je kunt de koppelingen naar externe pagina's een naam geven, door het tiepen van naam,
-  een staaf (##|##) en dan de koppeling: [[http://www.xs4all.nl/~~jantien|Jan's thuispagina]].
+* Je kunt de koppelingen een naam geven, door de hyperlink of paginanaam, een staaf (##|##) en dan de naam:
+ [[http://phpwiki.sourceforge.net/|de startpagina van Phpwiki]], [[ThuisPagina|de startpagina]].
 * You can suppress linking to URIs by preceding the word with a '##~~##', e.g. ~NotLinkedAsWikiName, ~http~://not.linked.to/
 * De oude manier van URL koppeling wordt nog steeds ondersteund: tiep voor de URLs
   "##~http:##", "##~ftp:##" of "##~mailto:##" ome een

Modified: trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FTextformateringsregler
===================================================================
--- trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FTextformateringsregler	2020-12-25 18:47:27 UTC (rev 10201)
+++ trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FTextformateringsregler	2020-12-26 11:08:08 UTC (rev 10202)
@@ -1,4 +1,4 @@
-Date: Tue,  9 Dec 2020 17:57:35 +0000
+Date: Sat, 26 Dec 2020 11:48:23 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Hj%C3%A4lp%2FTextformateringsregler;
@@ -260,8 +260,8 @@
   innanför dubbla hakparenteser: [[detta är en länk]].
   Enstaka hakparenteser eller AnvändaWikiOrd fungerar också.
 * Hyperlänkar till externa sidor görs så här: [[http://www.wcsb.org/]]
-* Du kan namnge länkarna genom att skriva ett namn, ett lodrätt streck (##|##) och
-  sedan hyperlänken eller sidnamnet: [[http://phpwiki.sourceforge.net/|PhpWiki-hemsida]], [[Framsida|framsidan]]
+* Du kan namnge länkarna genom att ange hyperlänken eller sidnamnet, ett lodrätt streck (##|##) och sedan namnet:
+  [[http://phpwiki.sourceforge.net/|PhpWiki-hemsida]], [[Framsida|framsidan]]
 * Du kan undvika att länkar skapas genom att sätta '##~~##' framför ordet som du
   inte vill vara en länk, t.ex. ~InteEnWikilänk, ~http://inte.heller.en.länk/
 * Det gamla sättet att skapa länkar av URL:er stöds fortfarande: Föregå varje URL med "##http:##", "##ftp:##" eller "##mailto:##" för

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

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

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

Revision: 10201
          http://sourceforge.net/p/phpwiki/code/10201
Author:   vargenau
Date:     2020-12-25 18:47:27 +0000 (Fri, 25 Dec 2020)
Log Message:
-----------
Update pgsrc/Help%2FTextFormattingRules

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

Modified: trunk/pgsrc/Help%2FTextFormattingRules
===================================================================
--- trunk/pgsrc/Help%2FTextFormattingRules	2020-12-24 17:37:03 UTC (rev 10200)
+++ trunk/pgsrc/Help%2FTextFormattingRules	2020-12-25 18:47:27 UTC (rev 10201)
@@ -1,4 +1,4 @@
-Date: Sun, 29 Mar 2020 22:43:23 +0000
+Date: Fri, 25 Dec 2020 12:26:36 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTextFormattingRules;
@@ -260,9 +260,10 @@
   page name in double square brackets: [[this is a page link]].
   Single brackets or WikiWords will also work.
 * Hyperlinks to external pages are done like this: [[http://www.wcsb.org/]]
-* You can name the links by providing a name, a pipe (##|##) and then the hyperlink or pagename:
+* You can name the links by providing the hyperlink or pagename, a pipe (##|##) and then the name:
   [[http://phpwiki.sourceforge.net/|PhpWiki home page]], [[HomePage|the front page]]
-* You can suppress linking to URIs by preceding the word with a '##~~##', e.g. ~NotLinkedAsWikiName, ~http~://not.linked.to/
+* You can suppress linking to URIs by preceding the word with a '##~~##',
+  e.g. ~NotLinkedAsWikiName, ~http~://not.linked.to/
 * Also, the old way of linking URL's is still supported: precede URLs
   with "##~http:##", "##~ftp:##" or "##~mailto:##" to
   create links automatically as in: http://c2.com/

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

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

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

Revision: 10200
          http://sourceforge.net/p/phpwiki/code/10200
Author:   vargenau
Date:     2020-12-24 17:37:03 +0000 (Thu, 24 Dec 2020)
Log Message:
-----------
pgsrc: use double square brackets

Modified Paths:
--------------
    trunk/locale/fr/pgsrc/Aide%2FURLMagiquesPhpWiki
    trunk/locale/it/pgsrc/Aiuto%2FMagicPhpWikiURLs
    trunk/locale/nl/pgsrc/Help%2FToverPhpWikiURLs

Modified: trunk/locale/fr/pgsrc/Aide%2FURLMagiquesPhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FURLMagiquesPhpWiki	2020-12-24 17:27:39 UTC (rev 10199)
+++ trunk/locale/fr/pgsrc/Aide%2FURLMagiquesPhpWiki	2020-12-24 17:37:03 UTC (rev 10200)
@@ -1,4 +1,4 @@
-Date: Tue,  3 Sep 2019 18:01:13 +0000
+Date: Thu, 24 Dec 2020 18:24:26 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FURLMagiquesPhpWiki;
@@ -39,7 +39,7 @@
 
 Un lien magique a cette allure :
 
-**~[** //texte// **|** //url-phpwiki// **]**
+**~[~[** //text// **|** //url-phpwiki// **]]**
 
 Le //texte// est optionnel mais est habituellement recommandé.
 S'il est donné, il fournira le label du lien.

Modified: trunk/locale/it/pgsrc/Aiuto%2FMagicPhpWikiURLs
===================================================================
--- trunk/locale/it/pgsrc/Aiuto%2FMagicPhpWikiURLs	2020-12-24 17:27:39 UTC (rev 10199)
+++ trunk/locale/it/pgsrc/Aiuto%2FMagicPhpWikiURLs	2020-12-24 17:37:03 UTC (rev 10200)
@@ -1,4 +1,4 @@
-Date: Thu, 16 Dec 2020 12:01:56 +0000
+Date: Thu, 24 Dec 2020 18:24:26 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Aiuto%2FMagicPhpWikiURLs;
@@ -39,7 +39,7 @@
 
 A magic link looks like:
 
-**~[** //text// **|** //phpwiki-url// **]**
+**~[~[** //text// **|** //phpwiki-url// **]]**
 
 The "//text// **|**" is optional but usually recommended.  If given it
 will provide the label for the link.

Modified: trunk/locale/nl/pgsrc/Help%2FToverPhpWikiURLs
===================================================================
--- trunk/locale/nl/pgsrc/Help%2FToverPhpWikiURLs	2020-12-24 17:27:39 UTC (rev 10199)
+++ trunk/locale/nl/pgsrc/Help%2FToverPhpWikiURLs	2020-12-24 17:37:03 UTC (rev 10200)
@@ -1,4 +1,4 @@
-Date: Thu, 24 Dec 2020 17:40:03 +0000
+Date: Thu, 24 Dec 2020 18:24:26 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FToverPhpWikiURLs;
@@ -39,7 +39,7 @@
 
 Een toverkoppeling ziet eruit als:
 
-**~[~[** //tekst// **|** //phpwiki-url// **]]]**
+**~[~[** //tekst// **|** //phpwiki-url// **]]**
 
 Het "//tekst// **|**" deel is optioneel maar meestal wel aan te raden.
 Als dit is opgegeven wordt dit het etiket voor de koppeling.

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