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

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

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

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

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

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

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

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

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

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

Revision: 10449
          http://sourceforge.net/p/phpwiki/code/10449
Author:   vargenau
Date:     2021-08-06 10:24:32 +0000 (Fri, 06 Aug 2021)
Log Message:
-----------
lib/plugin/WikiAdminUtils.php: If needed, clean URL of previous message, remove "?" and after

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

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2021-08-06 09:58:24 UTC (rev 10448)
+++ trunk/lib/plugin/WikiAdminUtils.php	2021-08-06 10:24:32 UTC (rev 10449)
@@ -107,7 +107,12 @@
 
         $message = call_user_func(array(&$this, $method), $request, $args);
 
-        $url = WikiURL($args['return_url'],
+        // If needed, clean URL of previous message, remove '?' and after
+        $return_url = $args['return_url'];
+        if (strpos($return_url, '?')) {
+            $return_url = substr($return_url, 0, strpos($return_url, '?'));
+        }
+        $url = WikiURL($return_url,
                 array('warningmsg' => $message),
                 'abs_path');
 

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

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

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

Revision: 10448
          http://sourceforge.net/p/phpwiki/code/10448
Author:   vargenau
Date:     2021-08-06 09:58:24 +0000 (Fri, 06 Aug 2021)
Log Message:
-----------
lib/plugin/WikiAdminUtils.php: do not use Alert, use warningmsg

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

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2021-08-06 08:20:47 UTC (rev 10447)
+++ trunk/lib/plugin/WikiAdminUtils.php	2021-08-06 09:58:24 UTC (rev 10448)
@@ -107,12 +107,11 @@
 
         $message = call_user_func(array(&$this, $method), $request, $args);
 
-        // display as separate page or as alert?
-        $alert = new Alert(fmt("WikiAdminUtils %s returned:", $args['action']),
-            $message,
-            array(_("Back") => $args['return_url']));
-        $alert->show(); // noreturn
-        return '';
+        $url = WikiURL($args['return_url'],
+                array('warningmsg' => $message),
+                'abs_path');
+
+        return $request->redirect($url);
     }
 
     private function _getLabel($action)

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

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

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

Revision: 10447
          http://sourceforge.net/p/phpwiki/code/10447
Author:   vargenau
Date:     2021-08-06 08:20:47 +0000 (Fri, 06 Aug 2021)
Log Message:
-----------
Remove DISABLE_HTTP_REDIRECT

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

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2021-08-06 08:01:30 UTC (rev 10446)
+++ trunk/config/config-default.ini	2021-08-06 08:20:47 UTC (rev 10447)
@@ -147,7 +147,6 @@
 ; TEMP_DIR = /tmp
 ; ALLOWED_LOAD = /tmp
 
-DISABLE_HTTP_REDIRECT = false
 DISABLE_GETIMAGESIZE = true
 ; FORTUNE_DIR = /usr/share/fortune
 ; GOOGLE_LICENSE_KEY = "..."

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2021-08-06 08:01:30 UTC (rev 10446)
+++ trunk/config/config-dist.ini	2021-08-06 08:20:47 UTC (rev 10447)
@@ -1126,19 +1126,6 @@
 ; Page name of RecentChanges page. Used for RSS Auto-discovery
 ;RECENT_CHANGES = RecentChange
 
-; Disable HTTP redirects.
-; (You probably don't need to touch this.)
-;
-; PhpWiki uses HTTP redirects for some of its functionality.
-; (e.g. after saving changes, PhpWiki redirects your browser to
-; view the page you just saved.)
-; Some web service providers (notably free European Lycos) don't seem to
-; allow these redirects.  (On Lycos the result in an "Internal Server Error"
-; report.)  In that case you can set DISABLE_HTTP_REDIRECT to true.
-; (In which case, PhpWiki will revert to sneakier tricks to try to
-; redirect the browser...)
-;DISABLE_HTTP_REDIRECT = true
-
 ; If you get a crash at loading LinkIcons you might want to disable
 ; the getimagesize() function, which crashes on certain php versions and
 ; and some external images (png's, ..).

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-06 08:01:30 UTC (rev 10446)
+++ trunk/configurator.php	2021-08-06 08:20:47 UTC (rev 10447)
@@ -1441,9 +1441,6 @@
     new _define_optional('RECENT_CHANGES',
         "RecentChanges");
 
-$properties["Disable HTTP Redirects"] =
-    new boolean_define_commented_optional('DISABLE_HTTP_REDIRECT');
-
 $properties["Disable GETIMAGESIZE"] =
     new boolean_define_commented_optional('DISABLE_GETIMAGESIZE');
 

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2021-08-06 08:01:30 UTC (rev 10446)
+++ trunk/lib/IniConfig.php	2021-08-06 08:20:47 UTC (rev 10447)
@@ -200,7 +200,6 @@
         'AUTH_USER_FILE_STORABLE', 'ALLOW_HTTP_AUTH_LOGIN',
         'ALLOW_USER_LOGIN', 'ALLOW_LDAP_LOGIN', 'ALLOW_IMAP_LOGIN',
         'WARN_NONPUBLIC_INTERWIKIMAP', 'USE_PATH_INFO',
-        'DISABLE_HTTP_REDIRECT',
         'PLUGIN_CACHED_USECACHE', 'PLUGIN_CACHED_FORCE_SYNCMAP',
         'BLOG_DEFAULT_EMPTY_PREFIX', 'DATABASE_PERSISTENT',
         'FUSIONFORGE',

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2021-08-06 08:01:30 UTC (rev 10446)
+++ trunk/lib/Request.php	2021-08-06 08:20:47 UTC (rev 10447)
@@ -169,36 +169,32 @@
     }
 
     /* Redirects after edit may fail if no theme signature image is defined.
-     * Set DISABLE_HTTP_REDIRECT = true then.
      */
     function redirect($url, $noreturn = true)
     {
-        $bogus = defined('DISABLE_HTTP_REDIRECT') && DISABLE_HTTP_REDIRECT;
 
-        if (!$bogus) {
-            header("Location: $url");
-            /*
-             * "302 Found" is not really meant to be sent in response
-             * to a POST.  Worse still, according to (both HTTP 1.0
-             * and 1.1) spec, the user, if it is sent, the user agent
-             * is supposed to use the same method to fetch the
-             * redirected URI as the original.
-             *
-             * That means if we redirect from a POST, the user-agent
-             * supposed to generate another POST.  Not what we want.
-             * (We do this after a page save after all.)
-             *
-             * Fortunately, most/all browsers don't do that.
-             *
-             * "303 See Other" is what we really want.  But it only
-             * exists in HTTP/1.1
-             *
-             * FIXME: this is still not spec compliant for HTTP
-             * version < 1.1.
-             */
-            $status = $this->httpVersion() >= 1.1 ? 303 : 302;
-            $this->setStatus($status);
-        }
+        header("Location: $url");
+        /*
+         * "302 Found" is not really meant to be sent in response
+         * to a POST.  Worse still, according to (both HTTP 1.0
+         * and 1.1) spec, the user, if it is sent, the user agent
+         * is supposed to use the same method to fetch the
+         * redirected URI as the original.
+         *
+         * That means if we redirect from a POST, the user-agent
+         * supposed to generate another POST.  Not what we want.
+         * (We do this after a page save after all.)
+         *
+         * Fortunately, most/all browsers don't do that.
+         *
+         * "303 See Other" is what we really want.  But it only
+         * exists in HTTP/1.1
+         *
+         * FIXME: this is still not spec compliant for HTTP
+         * version < 1.1.
+         */
+        $status = $this->httpVersion() >= 1.1 ? 303 : 302;
+        $this->setStatus($status);
 
         if ($noreturn) {
             $this->discardOutput(); // This might print the gzip headers. Not good.
@@ -208,20 +204,6 @@
             $tmpl = new Template('redirect', $this, array('REDIRECT_URL' => $url));
             $tmpl->printXML();
             $this->finish();
-        } elseif ($bogus) {
-            // Safari needs window.location.href = targeturl
-            return JavaScript("
-              function redirect(url) {
-                if (typeof location.replace == 'function')
-                  location.replace(url);
-                else if (typeof location.assign == 'function')
-                  location.assign(url);
-                else if (self.location.href)
-                  self.location.href = url;
-                else
-                  window.location = url;
-              }
-              redirect('" . addslashes($url) . "')");
         }
     }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10446] trunk/INSTALL

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

Revision: 10446
          http://sourceforge.net/p/phpwiki/code/10446
Author:   vargenau
Date:     2021-08-06 08:01:30 +0000 (Fri, 06 Aug 2021)
Log Message:
-----------
INSTALL: GraphViz plugin requires GraphViz to be installed

Modified Paths:
--------------
    trunk/INSTALL

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2021-08-06 08:01:00 UTC (rev 10445)
+++ trunk/INSTALL	2021-08-06 08:01:30 UTC (rev 10446)
@@ -24,7 +24,7 @@
 or
 apt install php-ldap
 
-TeX2pngPlugin requires LaTeX to be installed. You might need to do:
+TeX2png plugin requires LaTeX to be installed. You might need to do:
 yum install texlive
 yum install latex2html
 or
@@ -31,6 +31,11 @@
 apt install texlive
 apt install latex2html
 
+GraphViz plugin requires GraphViz to be installed. You might need to do:
+yum install graphviz
+or
+yum install graphviz
+
 QUICK START INSTRUCTIONS
 
 Copy 'config/config-dist.ini' to 'config/config.ini' and edit the

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10445] trunk/lib/FileFinder.php

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

Revision: 10445
          http://sourceforge.net/p/phpwiki/code/10445
Author:   vargenau
Date:     2021-08-06 08:01:00 +0000 (Fri, 06 Aug 2021)
Log Message:
-----------
lib/FileFinder.php: remove unused class PearFileFinder, remove unused function includeOnce

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

Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php	2021-08-06 07:59:01 UTC (rev 10444)
+++ trunk/lib/FileFinder.php	2021-08-06 08:01:00 UTC (rev 10445)
@@ -74,7 +74,7 @@
      * This might not work on Windows95 or FAT volumes. (not tested)
      *
      * @param string $path
-     * @return mixed|string
+     * @return array|string
      */
     public function slashifyPath($path)
     {
@@ -86,7 +86,7 @@
      *
      * @param string $path
      * @param string $sep
-     * @return mixed|string
+     * @return array|string
      */
     public function forcePathSlashes($path, $sep = '/')
     {
@@ -113,30 +113,6 @@
         }
     }
 
-    /**
-     * Try to include file.
-     *
-     * If file is found in the path, then the files directory is added
-     * to PHP's include_path (if it's not already there.) Then the
-     * file is include_once()'d.
-     *
-     * @param string $file File to include.
-     * @return bool True if file was successfully included.
-     */
-    public function includeOnce($file)
-    {
-        if (($ret = @include_once($file)))
-            return $ret;
-
-        if (!$this->_is_abs($file)) {
-            if (($dir = $this->_search_path($file)) && is_file($dir . $this->_pathsep . $file)) {
-                $this->_append_to_include_path($dir);
-                return include_once($file);
-            }
-        }
-        return $this->_not_found($file);
-    }
-
     private function _isOtherPathsep()
     {
         return $this->_pathsep != '/';
@@ -366,46 +342,6 @@
 }
 
 /**
- * A class for finding PEAR code.
- *
- * This is a subclass of FileFinder which searches a standard list of
- * directories where PEAR code is likely to be installed.
- *
- * Example usage:
- *
- * <pre>
- *   $pearFinder = new PearFileFinder();
- *   $pearFinder->includeOnce('DB.php');
- * </pre>
- *
- * The above code will look for 'DB.php', if found, the directory in
- * which it was found will be added to PHP's include_path, and the
- * file will be included. (If the file is not found, and E_USER_ERROR
- * will be thrown.)
- */
-class PearFileFinder
-    extends FileFinder
-{
-    /**
-     * @param $path array Where to look for PEAR library code.
-     * A good set of defaults is provided, so you can probably leave
-     * this parameter blank.
-     */
-    function __construct($path = array())
-    {
-        parent::__construct(array_merge(
-            $path,
-            array('/usr/share/php',
-                '/usr/lib/php',
-                '/usr/local/share/php',
-                '/usr/local/lib/php',
-                '/System/Library/PHP',
-                '/Apache/pear' // Windows
-            )));
-    }
-}
-
-/**
  * Find PhpWiki localized files.
  *
  * This is a subclass of FileFinder which searches PHP's include_path
@@ -571,9 +507,7 @@
 {
     static $win;
     if (isset($win)) return $win;
-    //return preg_match('/^Windows/', php_uname());
-    $win = (substr(PHP_OS, 0, 3) == 'WIN');
-    return $win;
+    return (substr(PHP_OS, 0, 3) == 'WIN');
 }
 
 function isWindows95()

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10444] trunk/lib/WikiGroup.php

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

Revision: 10444
          http://sourceforge.net/p/phpwiki/code/10444
Author:   vargenau
Date:     2021-08-06 07:59:01 +0000 (Fri, 06 Aug 2021)
Log Message:
-----------
lib/WikiGroup.php: remove unused functions setMemberOf and removeMemberOf

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

Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2021-08-06 07:55:40 UTC (rev 10443)
+++ trunk/lib/WikiGroup.php	2021-08-06 07:59:01 UTC (rev 10444)
@@ -23,6 +23,8 @@
  *
  */
 
+require_once 'lib/pear/File_Passwd.php';
+
 if (!defined('GROUP_METHOD') or
     !in_array(GROUP_METHOD,
         array('NONE', 'WIKIPAGE', 'DB', 'FILE', 'LDAP'))
@@ -237,7 +239,7 @@
     }
 
     /**
-     * Determines all of the groups of which the current user is a member.
+     * Determines all groups of which the current user is a member.
      *
      * This method is an abstraction.  An error is sent and an empty
      * array is returned.
@@ -376,39 +378,6 @@
         }
     }
 
-    /**
-     * Add the current or specified user to a group.
-     *
-     * This method is an abstraction.  The group and user are ignored, an error
-     * is sent, and false (not added) is always returned.
-     * @param  string $group User added to this group.
-     * @param  string $user  Username to add to the group (default = current user).
-     * @return bool   On true user was added, false if not.
-     */
-    function setMemberOf($group, $user = '')
-    {
-        trigger_error(__sprintf("Method “%s” not implemented in this GROUP_METHOD %s",
-                'setMemberOf', GROUP_METHOD),
-            E_USER_WARNING);
-        return false;
-    }
-
-    /**
-     * Remove the current or specified user to a group.
-     *
-     * This method is an abstraction.  The group and user are ignored, and error
-     * is sent, and false (not removed) is always returned.
-     * @param  string $group User removed from this group.
-     * @param  string $user  Username to remove from the group (default = current user).
-     * @return bool   On true user was removed, false if not.
-     */
-    function removeMemberOf($group, $user = '')
-    {
-        trigger_error(__sprintf("Method “%s” not implemented in this GROUP_METHOD %s",
-                'removeMemberOf', GROUP_METHOD),
-            E_USER_WARNING);
-        return false;
-    }
 }
 
 /**
@@ -422,7 +391,6 @@
 {
     function __construct()
     {
-        return;
     }
 
     /**
@@ -856,7 +824,6 @@
             trigger_error(sprintf(_("Cannot open AUTH_GROUP_FILE %s"), AUTH_GROUP_FILE), E_USER_WARNING);
             return;
         }
-        require_once 'lib/pear/File_Passwd.php';
         $this->_file = new File_Passwd(AUTH_GROUP_FILE, false, AUTH_GROUP_FILE . ".lock");
     }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10443] trunk/lib/WikiPluginCached.php

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

Revision: 10443
          http://sourceforge.net/p/phpwiki/code/10443
Author:   vargenau
Date:     2021-08-06 07:55:40 +0000 (Fri, 06 Aug 2021)
Log Message:
-----------
Always use local pear/Cache.php

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

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2021-08-06 07:54:22 UTC (rev 10442)
+++ trunk/lib/WikiPluginCached.php	2021-08-06 07:55:40 UTC (rev 10443)
@@ -24,12 +24,11 @@
  */
 
 /**
- * You should set up the options in config/config.ini at Part seven:
- * $ pear install http://pear.php.net/get/Cache
- * This file belongs to WikiPluginCached.
+ * You should set up the options in config/config.ini at Part seven.
  */
 
 require_once 'lib/WikiPlugin.php';
+require_once 'lib/pear/Cache.php';
 
 // types:
 define('PLUGIN_CACHED_HTML', 0); // cached html (extensive calculation)
@@ -499,15 +498,6 @@
         static $staticcache;
 
         if (!is_object($staticcache)) {
-            if (!class_exists('Cache')) {
-                // uuh, pear not in include_path! should print a warning.
-                // search some possible pear paths.
-                $pearFinder = new PearFileFinder();
-                if ($lib = $pearFinder->findFile('Cache.php', 'missing_ok'))
-                    require_once($lib);
-                else // fall back to our own copy
-                    require_once 'lib/pear/Cache.php';
-            }
             $cacheparams = array();
             foreach (explode(':', 'database:cache_dir:filename_prefix:highwater:lowwater'
                 . ':maxlifetime:maxarglen:usecache:force_syncmap') as $key) {

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

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

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

Revision: 10442
          http://sourceforge.net/p/phpwiki/code/10442
Author:   vargenau
Date:     2021-08-06 07:54:22 +0000 (Fri, 06 Aug 2021)
Log Message:
-----------
Simplify include_once

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

Modified: trunk/lib/WikiUser/File.php
===================================================================
--- trunk/lib/WikiUser/File.php	2021-08-05 14:06:23 UTC (rev 10441)
+++ trunk/lib/WikiUser/File.php	2021-08-06 07:54:22 UTC (rev 10442)
@@ -22,6 +22,8 @@
  *
  */
 
+include_once 'lib/pear/File_Passwd.php';
+
 class _FilePassUser
     extends _PassUser
     /**
@@ -43,13 +45,10 @@
                 parent::__construct($UserName);
         }
         $this->_userid = $UserName;
-        // read the .htaccess style file. We use our own copy of the standard pear class.
+        // read the .htaccess style file.
         $this->_may_change = defined('AUTH_USER_FILE_STORABLE') && AUTH_USER_FILE_STORABLE;
         if (empty($file) and defined('AUTH_USER_FILE'))
             $file = AUTH_USER_FILE;
-        // same style as in main.php
-        include_once(dirname(__FILE__) . "/../pear/File_Passwd.php");
-        // "__PHP_Incomplete_Class"
         if (empty($file)) {
             return;
         }
@@ -84,7 +83,6 @@
         if (!$this->_checkPassLength($submitted_password)) {
             return WIKIAUTH_FORBIDDEN;
         }
-        //include_once 'lib/pear/File_Passwd.php';
         if ($this->_file->verifyPassword($this->_userid, $submitted_password)) {
             $this->_authmethod = 'File';
             $this->_level = WIKIAUTH_USER;

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2021-08-05 14:06:23 UTC (rev 10441)
+++ trunk/lib/main.php	2021-08-06 07:54:22 UTC (rev 10442)
@@ -57,8 +57,7 @@
         // first mysql request costs [958ms]! [670ms] is mysql_connect()
 
         if (in_array('File', $this->_dbi->getAuthParam('USER_AUTH_ORDER'))) {
-            // force our local copy, until the pear version is fixed.
-            include_once(dirname(__FILE__) . "/pear/File_Passwd.php");
+            include_once 'lib/pear/File_Passwd.php';
         }
         // Preload all necessary userclasses. Otherwise session => __PHP_Incomplete_Class_Name
         // There's no way to demand-load it later. This way it's much slower, but needs slightly

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

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

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

Revision: 10441
          http://sourceforge.net/p/phpwiki/code/10441
Author:   vargenau
Date:     2021-08-05 14:06:23 +0000 (Thu, 05 Aug 2021)
Log Message:
-----------
Remove functions get_db_version, set_db_version, phpwiki_version; simplify upgrade

Modified Paths:
--------------
    trunk/lib/WikiDB.php
    trunk/lib/main.php
    trunk/lib/prepend.php
    trunk/lib/stdlib.php
    trunk/lib/upgrade.php

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2021-08-05 10:43:36 UTC (rev 10440)
+++ trunk/lib/WikiDB.php	2021-08-05 14:06:23 UTC (rev 10441)
@@ -634,19 +634,6 @@
     }
 
     /**
-     * Roughly similar to the float in phpwiki_version(). Set by action=upgrade.
-     */
-    public function get_db_version()
-    {
-        return (float)$this->get('_db_version');
-    }
-
-    public function set_db_version($ver)
-    {
-        $this->set('_db_version', (float)$ver);
-    }
-
-    /**
      * Access WikiDB global meta-data.
      *
      * NOTE: this is currently implemented in a hackish and

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2021-08-05 10:43:36 UTC (rev 10440)
+++ trunk/lib/main.php	2021-08-05 14:06:23 UTC (rev 10441)
@@ -93,7 +93,6 @@
 // Fixme: Does pear reset the error mask to 1? We have to find the culprit
 //$x = error_reporting();
 
-        $this->version = phpwiki_version();
         parent::__construct(); // [90ms]
 
         // Normalize args...

Modified: trunk/lib/prepend.php
===================================================================
--- trunk/lib/prepend.php	2021-08-05 10:43:36 UTC (rev 10440)
+++ trunk/lib/prepend.php	2021-08-05 14:06:23 UTC (rev 10441)
@@ -29,7 +29,6 @@
  * Things which must be done and defined before anything else.
  */
 
-// see lib/stdlib.php: phpwiki_version()
 define('PHPWIKI_VERSION', '1.6.0');
 
 // A new php-5.1.x feature: Turn off php-5.1.x auto_globals_jit = On, or use this mess below.

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2021-08-05 10:43:36 UTC (rev 10440)
+++ trunk/lib/stdlib.php	2021-08-05 14:06:23 UTC (rev 10441)
@@ -72,7 +72,6 @@
     subPageSlice ($pagename, $pos)
     isActionPage ($filename)
 
-    phpwiki_version ()
     isWikiWord ($word)
     url_get_contents ($uri)
     GenerateId ($name)
@@ -1677,24 +1676,6 @@
     }
 }
 
-// 1.3.8     => 1030.08
-// 1.3.9-p1  => 1030.091
-// 1.3.10pre => 1030.099
-// 1.3.11pre-20041120 => 1030.1120041120
-// 1.3.12-rc1 => 1030.119
-function phpwiki_version()
-{
-    static $PHPWIKI_VERSION;
-    if (!isset($PHPWIKI_VERSION)) {
-        $arr = explode('.', preg_replace('/\D+$/', '', PHPWIKI_VERSION)); // remove the pre
-        $arr[2] = preg_replace('/\.+/', '.', preg_replace('/\D/', '.', $arr[2]));
-        $PHPWIKI_VERSION = $arr[0] * 1000 + $arr[1] * 10 + 0.01 * $arr[2];
-        if (strstr(PHPWIKI_VERSION, 'pre') or strstr(PHPWIKI_VERSION, 'rc'))
-            $PHPWIKI_VERSION -= 0.01;
-    }
-    return $PHPWIKI_VERSION;
-}
-
 function phpwiki_gzhandler($ob)
 {
     /**

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2021-08-05 10:43:36 UTC (rev 10440)
+++ trunk/lib/upgrade.php	2021-08-05 14:06:23 UTC (rev 10441)
@@ -53,22 +53,15 @@
 
 class Upgrade
 {
-    public $current_db_version;
     public $_configUpdates;
     public $check_args;
     public $dbi;
     private $request;
-    private $phpwiki_version;
-    private $isSQL;
-    private $db_version;
 
     function __construct(&$request)
     {
         $this->request =& $request;
         $this->dbi =& $request->_dbi;
-        $this->phpwiki_version = $this->current_db_version = phpwiki_version();
-        $this->db_version = $this->dbi->get_db_version();
-        $this->isSQL = $this->dbi->_backend->isSQL();
     }
 
     private function doPgsrcUpdate($pagename, $path, $filename)
@@ -182,11 +175,7 @@
             }
         }
 
-        echo "<h2>", sprintf(_("Check for necessary %s updates"),
-            "pgsrc"), "</h2>\n";
-        if ($this->db_version < 1030.12200612) {
-            echo "<h3>", _("Rename to Help: pages"), "</h3>\n";
-        }
+        echo "<h2>", sprintf(_("Check for necessary %s updates"), "pgsrc"), "</h2>\n";
         $translation = __("HomePage");
         if ($translation == "HomePage") {
             $path = findFile(WIKI_PGSRC);
@@ -202,9 +191,7 @@
             if (!isActionPage($filename)) {
                 // There're a lot of now unneeded pages around.
                 // At first rename the BlaPlugin pages to Help/<pagename> and then to the update.
-                if ($this->db_version < 1030.12200612) {
-                    $this->_rename_to_help_page($pagename);
-                }
+                $this->_rename_to_help_page($pagename);
                 if (in_array($pagename, $themepgsrc)) {
                     echo sprintf(_('%s already checked in theme pgsrc'), $pagename).' ... '._('Skipped').'<br />';
                 } else {
@@ -216,15 +203,13 @@
 
     private function _rename_page_helper($oldname, $pagename)
     {
-        echo sprintf(_("rename %s to %s"), $oldname, $pagename), " ... ";
         if ($this->dbi->isWikiPage($oldname) and !$this->dbi->isWikiPage($pagename)) {
+            echo sprintf(_("rename %s to %s"), $oldname, $pagename), " ... ";
             if ($this->dbi->_backend->rename_page($oldname, $pagename)) {
                 echo _("OK"), " <br />\n";
             } else {
                 echo ' <span style="color: red; font-weight: bold;">' . _("FAILED") . "</span><br />\n";
             }
-        } else {
-            echo " " . _("Skipped") . "<br />\n";
         }
     }
 
@@ -278,9 +263,9 @@
                 unlink($out);
                 return array(false, $reason);
             } else {
-                @unlink("$file.bak");
-                @rename($file, "$file.bak");
-                if (!rename($tmp, $file))
+                @unlink($filename.".bak");
+                @rename($filename, $filename.".bak");
+                if (!rename($tmp, $filename))
                     return array(false, sprintf(_("couldn't move %s to %s"), $tmp, $filename));
                 return true;
             }
@@ -295,7 +280,6 @@
             "config.ini"), "</h2>\n";
         $entry = new UpgradeConfigEntry($this,
              array('key' => 'cache_control_none',
-            'fixed_with' => 1012.0,
             'header' => sprintf(_("Check for %s"), "CACHE_CONTROL = NONE"),
             'applicable_args' => array('CACHE_CONTROL'),
             'notice' => _("CACHE_CONTROL is set to 'NONE', and must be changed to 'NO_CACHE'"),
@@ -305,7 +289,6 @@
 
         $entry = new UpgradeConfigEntry($this,
              array('key' => 'group_method_none',
-            'fixed_with' => 1012.0,
             'header' => sprintf(_("Check for %s"), "GROUP_METHOD = NONE"),
             'applicable_args' => array('GROUP_METHOD'),
             'notice' => _("GROUP_METHOD is set to NONE, and must be changed to \"NONE\""),
@@ -315,7 +298,6 @@
 
         $entry = new UpgradeConfigEntry($this,
              array('key' => 'blog_empty_default_prefix',
-            'fixed_with' => 1013.0,
             'header' => sprintf(_("Check for %s"), "BLOG_EMPTY_DEFAULT_PREFIX"),
             'applicable_args' => array('BLOG_EMPTY_DEFAULT_PREFIX'),
             'notice' => _("fix BLOG_EMPTY_DEFAULT_PREFIX into BLOG_DEFAULT_EMPTY_PREFIX"),
@@ -337,7 +319,6 @@
 {
     public $applicable_cb;
     public $header;
-    public $fixed_with;
     public $method_cb;
     public $check_cb;
     public $reason;
@@ -356,10 +337,9 @@
      */
     function __construct(&$parent, $params)
     {
-        $this->parent =& $parent; // get the properties db_version
+        $this->parent =& $parent;
         foreach (array('key' => 'required',
                      // the wikidb stores the version when we actually fixed that.
-                     'fixed_with' => 'required',
                      'header' => '', // always printed
                      'applicable_cb' => null, // method to check if applicable
                      'applicable_args' => array(), // might be the config name
@@ -386,25 +366,9 @@
         $this->applicable_cb =& $object;
     }
 
-    private function _check_if_already_fixed()
-    {
-        // not yet fixed?
-        if (!isset($this->upgrade['name']))
-            return false;
-        // override with force?
-        if ($this->parent->request->getArg('force'))
-            return false;
-        // already fixed and with an ok version
-        if ($this->upgrade['name'] >= $this->fixed_with)
-            return $this->upgrade['name'];
-        // already fixed but with an older version. do it again.
-        return false;
-    }
-
     public function pass()
     {
         // store in db no to fix again
-        $this->upgrade['name'] = $this->parent->phpwiki_version;
         $this->parent->dbi->set($this->_db_key, $this->upgrade);
         echo "<b>", _("FIXED"), "</b>";
         if (isset($this->reason))
@@ -436,12 +400,6 @@
     public function check($args = null)
     {
         if ($this->header) echo $this->header, ' ... ';
-        if ($when = $this->_check_if_already_fixed()) {
-            // be totally silent if no header is defined.
-            if ($this->header) echo _("fixed with"), " ", $when, "<br />\n";
-            flush();
-            return true;
-        }
         if (is_object($this->applicable_cb)) {
             if (!$this->applicable_cb->call_array($this->applicable_args))
                 return $this->skip();

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

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

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

Revision: 10440
          http://sourceforge.net/p/phpwiki/code/10440
Author:   vargenau
Date:     2021-08-05 10:43:36 +0000 (Thu, 05 Aug 2021)
Log Message:
-----------
Update translations

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

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

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

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

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

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

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

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2021-08-05 08:41:20 UTC (rev 10439)
+++ trunk/locale/po/de.po	2021-08-05 10:43:36 UTC (rev 10440)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-29 21:10+0200\n"
+"POT-Creation-Date: 2021-08-05 12:42+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -554,6 +554,9 @@
 msgid "You must specify a directory to dump to"
 msgstr "Sie müssen zum Sichern ein Verzeichnis angeben."
 
+msgid "Dumping Pages"
+msgstr "Die Seiten werden geschrieben"
+
 #, php-format
 msgid "Cannot create directory “%s”"
 msgstr "Das Verzeichnis »%s« kann nicht erzeugt werden"
@@ -563,12 +566,13 @@
 msgstr "Ein Verzeichnis »%s« wurde erzeugt, um die Dateien abzulegen..."
 
 #, php-format
+msgid "Cannot use directory “%s”, it is not writable"
+msgstr ""
+
+#, php-format
 msgid "Using directory “%s”"
 msgstr "Das Verzeichnis »%s« wird verwendet"
 
-msgid "Dumping Pages"
-msgstr "Die Seiten werden geschrieben"
-
 msgid "Skipped"
 msgstr "Ausgelassen"
 
@@ -3818,9 +3822,6 @@
 msgid "E-mail address confirmation"
 msgstr "E-Mail Bestätigung"
 
-msgid "Convert cached_html"
-msgstr ""
-
 msgid "DB Check"
 msgstr ""
 
@@ -3856,13 +3857,6 @@
 "edit them."
 msgstr ""
 
-msgid "No old _cached_html pagedata found."
-msgstr ""
-
-#, php-format
-msgid "Converted successfully %d pages"
-msgstr "%d Seiten erfolgreich konvertiert"
-
 msgid "E-mail"
 msgstr "E-Mail"
 
@@ -4650,12 +4644,6 @@
 msgid "rename %s to %s"
 msgstr "Seite »%s« nach umbenennen »%s«"
 
-msgid "MISSING"
-msgstr "FEHLEND"
-
-msgid "CREATED"
-msgstr "ERZEUGT"
-
 #, php-format
 msgid "%s not found in %s"
 msgstr "%s nicht gefunden in %s"
@@ -5899,6 +5887,16 @@
 msgid "Edit this page"
 msgstr "Diese Seite bearbeiten"
 
+#, php-format
+#~ msgid "Converted successfully %d pages"
+#~ msgstr "%d Seiten erfolgreich konvertiert"
+
+#~ msgid "MISSING"
+#~ msgstr "FEHLEND"
+
+#~ msgid "CREATED"
+#~ msgstr "ERZEUGT"
+
 #~ msgid "Provide weather reports from the Internet."
 #~ msgstr "Der PhpWetter plugin gibt Auskunft zur Wetterlage vom Internet."
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2021-08-05 08:41:20 UTC (rev 10439)
+++ trunk/locale/po/es.po	2021-08-05 10:43:36 UTC (rev 10440)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-29 21:10+0200\n"
+"POT-Creation-Date: 2021-08-05 12:42+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -542,6 +542,9 @@
 msgid "You must specify a directory to dump to"
 msgstr "Usted debe especificar un directorio para descargar a"
 
+msgid "Dumping Pages"
+msgstr "Descargar Las Páginas"
+
 #, php-format
 msgid "Cannot create directory “%s”"
 msgstr "No puede crear el directorio “%s”"
@@ -551,12 +554,13 @@
 msgstr "Directorio creado “%s” para la descarga de la página..."
 
 #, php-format
+msgid "Cannot use directory “%s”, it is not writable"
+msgstr ""
+
+#, php-format
 msgid "Using directory “%s”"
 msgstr "Usando el directorio “%s”"
 
-msgid "Dumping Pages"
-msgstr "Descargar Las Páginas"
-
 msgid "Skipped"
 msgstr "Saltado"
 
@@ -3708,9 +3712,6 @@
 msgid "E-mail address confirmation"
 msgstr "Verificación Del Email"
 
-msgid "Convert cached_html"
-msgstr ""
-
 msgid "DB Check"
 msgstr ""
 
@@ -3746,13 +3747,6 @@
 "edit them."
 msgstr ""
 
-msgid "No old _cached_html pagedata found."
-msgstr ""
-
-#, php-format
-msgid "Converted successfully %d pages"
-msgstr ""
-
 msgid "E-mail"
 msgstr ""
 
@@ -4519,12 +4513,6 @@
 msgid "rename %s to %s"
 msgstr "retitula %s a %s"
 
-msgid "MISSING"
-msgstr ""
-
-msgid "CREATED"
-msgstr ""
-
 #, php-format
 msgid "%s not found in %s"
 msgstr ""

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2021-08-05 08:41:20 UTC (rev 10439)
+++ trunk/locale/po/fr.po	2021-08-05 10:43:36 UTC (rev 10440)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-29 21:10+0200\n"
+"POT-Creation-Date: 2021-08-05 12:42+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -554,6 +554,9 @@
 msgid "You must specify a directory to dump to"
 msgstr "Vous devez spécifier un répertoire pour l'archivage de la sauvegarde"
 
+msgid "Dumping Pages"
+msgstr "Récupération des pages"
+
 #, php-format
 msgid "Cannot create directory “%s”"
 msgstr "Impossible de créer le répertoire : « %s »"
@@ -563,12 +566,13 @@
 msgstr "Répertoire « %s » créé pour la sauvegarde..."
 
 #, php-format
+msgid "Cannot use directory “%s”, it is not writable"
+msgstr "Impossible d'utiliser le répertoire « %s », il n'est pas modifiable."
+
+#, php-format
 msgid "Using directory “%s”"
 msgstr "Utilisation du répertoire « %s »"
 
-msgid "Dumping Pages"
-msgstr "Récupération des pages"
-
 msgid "Skipped"
 msgstr "Ignoré"
 
@@ -3799,9 +3803,6 @@
 msgid "E-mail address confirmation"
 msgstr "Vérification de l'adresse électronique"
 
-msgid "Convert cached_html"
-msgstr ""
-
 msgid "DB Check"
 msgstr "Vérification de la base de données"
 
@@ -3837,13 +3838,6 @@
 "edit them."
 msgstr ""
 
-msgid "No old _cached_html pagedata found."
-msgstr ""
-
-#, php-format
-msgid "Converted successfully %d pages"
-msgstr "%d pages converties avec succès"
-
 msgid "E-mail"
 msgstr "Adresse électronique"
 
@@ -4621,12 +4615,6 @@
 msgid "rename %s to %s"
 msgstr "renommer la page de « %s » à « %s »"
 
-msgid "MISSING"
-msgstr "MANQUANT"
-
-msgid "CREATED"
-msgstr "CRÉÉ"
-
 #, php-format
 msgid "%s not found in %s"
 msgstr "%s non trouvé dans %s"
@@ -5847,6 +5835,16 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#, php-format
+#~ msgid "Converted successfully %d pages"
+#~ msgstr "%d pages converties avec succès"
+
+#~ msgid "MISSING"
+#~ msgstr "MANQUANT"
+
+#~ msgid "CREATED"
+#~ msgstr "CRÉÉ"
+
 #~ msgid "Provide weather reports from the Internet."
 #~ msgstr "Météo importée d'internet."
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2021-08-05 08:41:20 UTC (rev 10439)
+++ trunk/locale/po/it.po	2021-08-05 10:43:36 UTC (rev 10440)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-29 21:10+0200\n"
+"POT-Creation-Date: 2021-08-05 12:42+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -533,6 +533,9 @@
 msgid "You must specify a directory to dump to"
 msgstr ""
 
+msgid "Dumping Pages"
+msgstr ""
+
 #, php-format
 msgid "Cannot create directory “%s”"
 msgstr ""
@@ -542,10 +545,11 @@
 msgstr ""
 
 #, php-format
-msgid "Using directory “%s”"
+msgid "Cannot use directory “%s”, it is not writable"
 msgstr ""
 
-msgid "Dumping Pages"
+#, php-format
+msgid "Using directory “%s”"
 msgstr ""
 
 msgid "Skipped"
@@ -3685,9 +3689,6 @@
 msgid "E-mail address confirmation"
 msgstr ""
 
-msgid "Convert cached_html"
-msgstr ""
-
 msgid "DB Check"
 msgstr ""
 
@@ -3723,13 +3724,6 @@
 "edit them."
 msgstr ""
 
-msgid "No old _cached_html pagedata found."
-msgstr ""
-
-#, php-format
-msgid "Converted successfully %d pages"
-msgstr ""
-
 msgid "E-mail"
 msgstr ""
 
@@ -4496,12 +4490,6 @@
 msgid "rename %s to %s"
 msgstr "cambia titolo %s a %s"
 
-msgid "MISSING"
-msgstr ""
-
-msgid "CREATED"
-msgstr ""
-
 #, php-format
 msgid "%s not found in %s"
 msgstr "%s non trovato in %s"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2021-08-05 08:41:20 UTC (rev 10439)
+++ trunk/locale/po/ja.po	2021-08-05 10:43:36 UTC (rev 10440)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-29 21:10+0200\n"
+"POT-Creation-Date: 2021-08-05 12:42+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -519,6 +519,9 @@
 msgid "You must specify a directory to dump to"
 msgstr ""
 
+msgid "Dumping Pages"
+msgstr ""
+
 #, php-format
 msgid "Cannot create directory “%s”"
 msgstr "ディレクトリ “%s” を作成出来ません。"
@@ -528,12 +531,13 @@
 msgstr ""
 
 #, php-format
+msgid "Cannot use directory “%s”, it is not writable"
+msgstr ""
+
+#, php-format
 msgid "Using directory “%s”"
 msgstr "ディレクトリ “%s” を使用しています。"
 
-msgid "Dumping Pages"
-msgstr ""
-
 msgid "Skipped"
 msgstr ""
 
@@ -3671,9 +3675,6 @@
 msgid "E-mail address confirmation"
 msgstr ""
 
-msgid "Convert cached_html"
-msgstr ""
-
 msgid "DB Check"
 msgstr ""
 
@@ -3709,13 +3710,6 @@
 "edit them."
 msgstr ""
 
-msgid "No old _cached_html pagedata found."
-msgstr ""
-
-#, php-format
-msgid "Converted successfully %d pages"
-msgstr ""
-
 msgid "E-mail"
 msgstr "メール"
 
@@ -4482,12 +4476,6 @@
 msgid "rename %s to %s"
 msgstr ""
 
-msgid "MISSING"
-msgstr ""
-
-msgid "CREATED"
-msgstr ""
-
 #, php-format
 msgid "%s not found in %s"
 msgstr ""

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2021-08-05 08:41:20 UTC (rev 10439)
+++ trunk/locale/po/nl.po	2021-08-05 10:43:36 UTC (rev 10440)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-29 21:10+0200\n"
+"POT-Creation-Date: 2021-08-05 12:42+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -525,6 +525,9 @@
 msgid "You must specify a directory to dump to"
 msgstr "Je moet een directory specificeren om in te storten"
 
+msgid "Dumping Pages"
+msgstr ""
+
 #, php-format
 msgid "Cannot create directory “%s”"
 msgstr ""
@@ -534,10 +537,11 @@
 msgstr ""
 
 #, php-format
-msgid "Using directory “%s”"
+msgid "Cannot use directory “%s”, it is not writable"
 msgstr ""
 
-msgid "Dumping Pages"
+#, php-format
+msgid "Using directory “%s”"
 msgstr ""
 
 msgid "Skipped"
@@ -3677,9 +3681,6 @@
 msgid "E-mail address confirmation"
 msgstr ""
 
-msgid "Convert cached_html"
-msgstr ""
-
 msgid "DB Check"
 msgstr ""
 
@@ -3715,13 +3716,6 @@
 "edit them."
 msgstr ""
 
-msgid "No old _cached_html pagedata found."
-msgstr ""
-
-#, php-format
-msgid "Converted successfully %d pages"
-msgstr ""
-
 msgid "E-mail"
 msgstr ""
 
@@ -4488,12 +4482,6 @@
 msgid "rename %s to %s"
 msgstr ""
 
-msgid "MISSING"
-msgstr ""
-
-msgid "CREATED"
-msgstr ""
-
 #, php-format
 msgid "%s not found in %s"
 msgstr ""

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2021-08-05 08:41:20 UTC (rev 10439)
+++ trunk/locale/po/phpwiki.pot	2021-08-05 10:43:36 UTC (rev 10440)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-29 21:10+0200\n"
+"POT-Creation-Date: 2021-08-05 12:42+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -519,6 +519,9 @@
 msgid "You must specify a directory to dump to"
 msgstr ""
 
+msgid "Dumping Pages"
+msgstr ""
+
 #, php-format
 msgid "Cannot create directory “%s”"
 msgstr ""
@@ -528,10 +531,11 @@
 msgstr ""
 
 #, php-format
-msgid "Using directory “%s”"
+msgid "Cannot use directory “%s”, it is not writable"
 msgstr ""
 
-msgid "Dumping Pages"
+#, php-format
+msgid "Using directory “%s”"
 msgstr ""
 
 msgid "Skipped"
@@ -3671,9 +3675,6 @@
 msgid "E-mail address confirmation"
 msgstr ""
 
-msgid "Convert cached_html"
-msgstr ""
-
 msgid "DB Check"
 msgstr ""
 
@@ -3709,13 +3710,6 @@
 "edit them."
 msgstr ""
 
-msgid "No old _cached_html pagedata found."
-msgstr ""
-
-#, php-format
-msgid "Converted successfully %d pages"
-msgstr ""
-
 msgid "E-mail"
 msgstr ""
 
@@ -4482,12 +4476,6 @@
 msgid "rename %s to %s"
 msgstr ""
 
-msgid "MISSING"
-msgstr ""
-
-msgid "CREATED"
-msgstr ""
-
 #, php-format
 msgid "%s not found in %s"
 msgstr ""

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2021-08-05 08:41:20 UTC (rev 10439)
+++ trunk/locale/po/sv.po	2021-08-05 10:43:36 UTC (rev 10440)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-29 21:10+0200\n"
+"POT-Creation-Date: 2021-08-05 12:42+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -520,6 +520,9 @@
 msgid "You must specify a directory to dump to"
 msgstr ""
 
+msgid "Dumping Pages"
+msgstr ""
+
 #, php-format
 msgid "Cannot create directory “%s”"
 msgstr ""
@@ -529,10 +532,11 @@
 msgstr ""
 
 #, php-format
-msgid "Using directory “%s”"
+msgid "Cannot use directory “%s”, it is not writable"
 msgstr ""
 
-msgid "Dumping Pages"
+#, php-format
+msgid "Using directory “%s”"
 msgstr ""
 
 msgid "Skipped"
@@ -3672,9 +3676,6 @@
 msgid "E-mail address confirmation"
 msgstr ""
 
-msgid "Convert cached_html"
-msgstr ""
-
 msgid "DB Check"
 msgstr ""
 
@@ -3710,13 +3711,6 @@
 "edit them."
 msgstr ""
 
-msgid "No old _cached_html pagedata found."
-msgstr ""
-
-#, php-format
-msgid "Converted successfully %d pages"
-msgstr ""
-
 msgid "E-mail"
 msgstr ""
 
@@ -4483,12 +4477,6 @@
 msgid "rename %s to %s"
 msgstr "Kopia är [%s]"
 
-msgid "MISSING"
-msgstr ""
-
-msgid "CREATED"
-msgstr ""
-
 #, php-format
 msgid "%s not found in %s"
 msgstr ""

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2021-08-05 08:41:20 UTC (rev 10439)
+++ trunk/locale/po/zh.po	2021-08-05 10:43:36 UTC (rev 10440)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-29 21:10+0200\n"
+"POT-Creation-Date: 2021-08-05 12:42+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -522,6 +522,9 @@
 msgid "You must specify a directory to dump to"
 msgstr "你必須指定目錄以進行傾印"
 
+msgid "Dumping Pages"
+msgstr "傾印頁面中"
+
 #, php-format
 msgid "Cannot create directory “%s”"
 msgstr "無法建立目錄 “%s”"
@@ -531,12 +534,13 @@
 msgstr "為頁面傾印建立目錄 “%s”..."
 
 #, php-format
+msgid "Cannot use directory “%s”, it is not writable"
+msgstr ""
+
+#, php-format
 msgid "Using directory “%s”"
 msgstr "使用目錄 “%s”"
 
-msgid "Dumping Pages"
-msgstr "傾印頁面中"
-
 msgid "Skipped"
 msgstr "跳過"
 
@@ -3684,9 +3688,6 @@
 msgid "E-mail address confirmation"
 msgstr "Email 驗證"
 
-msgid "Convert cached_html"
-msgstr ""
-
 msgid "DB Check"
 msgstr ""
 
@@ -3722,13 +3723,6 @@
 "edit them."
 msgstr ""
 
-msgid "No old _cached_html pagedata found."
-msgstr ""
-
-#, php-format
-msgid "Converted successfully %d pages"
-msgstr ""
-
 msgid "E-mail"
 msgstr ""
 
@@ -4499,12 +4493,6 @@
 msgid "rename %s to %s"
 msgstr ""
 
-msgid "MISSING"
-msgstr ""
-
-msgid "CREATED"
-msgstr ""
-
 #, php-format
 msgid "%s not found in %s"
 msgstr ""

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

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

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

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

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

Revision: 10439
          http://sourceforge.net/p/phpwiki/code/10439
Author:   vargenau
Date:     2021-08-05 08:41:20 +0000 (Thu, 05 Aug 2021)
Log Message:
-----------
PhpWikiDebug: remove convert-cached-html action

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminUtils.php
    trunk/locale/zh/pgsrc/PhpWikiDebug
    trunk/pgsrc/PhpWikiDebug

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2021-08-04 17:26:05 UTC (rev 10438)
+++ trunk/lib/plugin/WikiAdminUtils.php	2021-08-05 08:41:20 UTC (rev 10439)
@@ -29,7 +29,6 @@
  * purge-bad-pagenames
  * purge-empty-pages
  * email-verification
- * convert-cached-html
  * db-check
  * db-rebuild
  */
@@ -122,7 +121,6 @@
             'purge-bad-pagenames' => _("Purge all Pages With Invalid Names"),
             'purge-empty-pages' => _("Purge all empty, unreferenced Pages"),
             'email-verification' => _("E-mail address confirmation"),
-            'convert-cached-html' => _("Convert cached_html"),
             'db-check' => _("DB Check"),
             'db-rebuild' => _("Db Rebuild")
         );
@@ -206,23 +204,6 @@
                     : ''));
     }
 
-    private function _do_convert_cached_html($request, $args)
-    {
-
-        require_once 'lib/upgrade.php';
-        $dbh = $request->_dbi;
-        _upgrade_db_init($dbh);
-
-        $count = _upgrade_cached_html($dbh, false);
-
-        if (!$count)
-            return _("No old _cached_html pagedata found.");
-        else {
-            return HTML(fmt("Converted successfully %d pages", $count),
-                HTML::div(array('class' => 'align-left'), $list));
-        }
-    }
-
     private function _do_db_check($request, $args)
     {
         longer_timeout(180);

Modified: trunk/locale/zh/pgsrc/PhpWikiDebug
===================================================================
--- trunk/locale/zh/pgsrc/PhpWikiDebug	2021-08-04 17:26:05 UTC (rev 10438)
+++ trunk/locale/zh/pgsrc/PhpWikiDebug	2021-08-05 08:41:20 UTC (rev 10439)
@@ -1,4 +1,4 @@
-Date: Thu, 24 Dec 2020 18:13:17 +0000
+Date: Thu,  5 Aug 2021 09:59:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiDebug;
@@ -25,7 +25,7 @@
 
 <<WikiAdminUtils action=purge-cache label="Purge Markup Cache" >>
 
-=== 清理 WikiDB 裡的非法檔案名稱 Clean WikiDB of Illegal Filenames ==
+=== 清理 WikiDB 裡的非法檔案名稱 Clean Wiki Database of Illegal Filenames ==
 
 頁面名稱以子頁面分隔子(通常是 ##/## )開始的,是不被允許的. 有時候是錯誤
 的 plugin 或某些事情而導致.
@@ -41,14 +41,6 @@
 
 <<WikiAdminUtils action=purge-empty-pages label="Purge all empty unreferenced pages" >>
 
-== Convert cached_html to new SQL column ==
-
-This is only needed on SQL or ADODB if you didn't do action=upgrade, but created the
-new page.cached_html field separately, and now you want to move this data from
-page.pagedata over to page.cached_html.
-
-<<WikiAdminUtils action=convert-cached-html label="Convert cached_html" >>
-
 == Check Wiki Database ==
 
 This button will check the Wiki page database for consistency. This can last several minutes.

Modified: trunk/pgsrc/PhpWikiDebug
===================================================================
--- trunk/pgsrc/PhpWikiDebug	2021-08-04 17:26:05 UTC (rev 10438)
+++ trunk/pgsrc/PhpWikiDebug	2021-08-05 08:41:20 UTC (rev 10439)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Thu,  5 Aug 2021 09:59:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiDebug;
@@ -45,14 +45,6 @@
 
 <<WikiAdminUtils action=purge-empty-pages label="Purge all empty unreferenced pages" >>
 
-== Convert cached_html to new SQL column ==
-
-This is only needed on SQL or ADODB if you didn't do action=upgrade, but created the
-new page.cached_html field separately, and now you want to move this data from
-page.pagedata over to page.cached_html.
-
-<<WikiAdminUtils action=convert-cached-html label="Convert cached_html" >>
-
 == Check Wiki Database ==
 
 This button will check the Wiki page database for consistency. This can last several minutes.

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10438] trunk/configurator.php

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

Revision: 10438
          http://sourceforge.net/p/phpwiki/code/10438
Author:   vargenau
Date:     2021-08-04 17:26:05 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
configurator.php: remove unnecessary braces

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

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-04 17:11:11 UTC (rev 10437)
+++ trunk/configurator.php	2021-08-04 17:26:05 UTC (rev 10438)
@@ -733,7 +733,7 @@
 $dsn_sqlpass = $properties["SQL Password"]->value();
 $dsn_sqlhostorsock = $properties["SQL Database Host"]->value();
 $dsn_sqldbname = $properties["SQL Database Name"]->value();
-$dsn_sqlstring = $dsn_sqltype . "://{$dsn_sqluser}:{$dsn_sqlpass}@{$dsn_sqlhostorsock}/{$dsn_sqldbname}";
+$dsn_sqlstring = $dsn_sqltype . "://".$dsn_sqluser.":".$dsn_sqlpass."@".$dsn_sqlhostorsock."/".$dsn_sqldbname;
 
 $properties["SQL dsn"] =
     new unchangeable_define("DATABASE_DSN",
@@ -1826,7 +1826,7 @@
     {
         $s = $this->get_config_item_header()
             . "<input type=\"text\" size=\"50\" name=\"" . $this->get_config_item_name()
-            . "\" value=\"" . $this->default_value . "\" {$this->jscheck} />";
+            . "\" value=\"" . $this->default_value . "\" $this->jscheck />";
         if (empty($this->default_value))
             return $s . "<p id=\"" . $this->get_config_item_id() . "\" class=\"red\">Cannot be empty.</p>";
         else
@@ -1987,7 +1987,7 @@
         if (empty($value))
             $encrypted = false;
         $s .= "<input type=\"" . ($encrypted ? "text" : "password") . "\" name=\"" . $this->get_config_item_name()
-            . "\" value=\"" . $value . "\" {$this->jscheck} />";
+            . "\" value=\"" . $value . "\" $this->jscheck />";
         return $s;
     }
 }
@@ -2049,7 +2049,7 @@
         if ($list_values)
             $list_values = join("\n", $list_values);
         $ta = $this->get_config_item_header();
-        $ta .= "<textarea cols=\"18\" rows=\"" . $rows . "\" name=\"" . $this->get_config_item_name() . "\" {$this->jscheck}>";
+        $ta .= "<textarea cols=\"18\" rows=\"" . $rows . "\" name=\"" . $this->get_config_item_name() . "\" $this->jscheck>";
         $ta .= $list_values . "</textarea>";
         $ta .= "<p id=\"" . $this->get_config_item_id() . "\" class=\"green\">Input accepted.</p>";
         return $ta;
@@ -2088,7 +2088,7 @@
         }
         $rows = max(3, $count + 1);
         $ta = $this->get_config_item_header();
-        $ta .= "<textarea cols=\"18\" rows=\"" . $rows . "\" name=\"" . $this->get_config_item_name() . "\" {$this->jscheck}>";
+        $ta .= "<textarea cols=\"18\" rows=\"" . $rows . "\" name=\"" . $this->get_config_item_name() . "\" $this->jscheck>";
         $ta .= $list_values . "</textarea>";
         $ta .= "<p id=\"" . $this->get_config_item_id() . "\" class=\"green\">Input accepted.</p>";
         return $ta;
@@ -2125,7 +2125,7 @@
         $list_values = join(" : \n", $this->default_value);
         $rows = max(3, count($this->default_value) + 1);
         $ta = $this->get_config_item_header();
-        $ta .= "<textarea cols=\"18\" rows=\"" . $rows . "\" name=\"" . $this->get_config_item_name() . "\" {$this->jscheck}>";
+        $ta .= "<textarea cols=\"18\" rows=\"" . $rows . "\" name=\"" . $this->get_config_item_name() . "\" $this->jscheck>";
         $ta .= $list_values . "</textarea>";
         $ta .= "<p id=\"" . $this->get_config_item_id() . "\" class=\"green\">Input accepted.</p>";
         return $ta;
@@ -2178,7 +2178,7 @@
     {
         $output = $this->get_config_item_header();
         $name = $this->get_config_item_name();
-        $output .= '<select name="' . $name . "\" {$this->jscheck}>\n";
+        $output .= '<select name="' . $name . "\" $this->jscheck>\n";
         $values = $this->values;
         $default_value = $this->default_value ? 'true' : 'false';
         /* There can usually only be two options, there can be

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10437] trunk/configurator.php

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

Revision: 10437
          http://sourceforge.net/p/phpwiki/code/10437
Author:   vargenau
Date:     2021-08-04 17:11:11 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
Use https where possible

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

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-04 17:07:44 UTC (rev 10436)
+++ trunk/configurator.php	2021-08-04 17:11:11 UTC (rev 10437)
@@ -341,7 +341,7 @@
 /**
  * The Configurator is a php script to aid in the configuration of PhpWiki.
  * Parts of this file were based on PHPWeather's configurator.php file.
- *   http://sourceforge.net/projects/phpweather/
+ *   https://sourceforge.net/projects/phpweather/
  *
  * TO CHANGE THE CONFIGURATION OF YOUR PHPWIKI, DO *NOT* MODIFY THIS FILE!
  * more instructions go here
@@ -1293,15 +1293,15 @@
 these as appropriate.");
 
 $properties["COPYRIGHTPAGE URL"] =
-    new _define_commented_optional('COPYRIGHTPAGE_URL', "http://www.gnu.org/copyleft/gpl.html#SEC1", "
+    new _define_commented_optional('COPYRIGHTPAGE_URL', "https://www.gnu.org/copyleft/gpl.html#SEC1", "
 
 Other useful alternatives to consider:
 <pre>
  COPYRIGHTPAGE_TITLE = \"GNU Free Documentation License\"
- COPYRIGHTPAGE_URL = \"http://www.gnu.org/copyleft/fdl.html\"
+ COPYRIGHTPAGE_URL = \"https://www.gnu.org/copyleft/fdl.html\"
  COPYRIGHTPAGE_TITLE = \"Creative Commons License 2.0\"
- COPYRIGHTPAGE_URL = \"http://creativecommons.org/licenses/by/2.0/\"</pre>
-See http://creativecommons.org/learn/licenses/ for variations");
+ COPYRIGHTPAGE_URL = \"https://creativecommons.org/licenses/by/2.0/\"</pre>
+See https://creativecommons.org/learn/licenses/ for variations");
 
 $properties["AUTHORPAGE_TITLE"] =
     new _define_commented_optional('AUTHORPAGE_TITLE', "The PhpWiki Programming Team", "
@@ -1368,11 +1368,8 @@
 NB:  If you are using Apache >= 2.0.30, then you may need to to use
 the directive \"AcceptPathInfo On\" in your Apache configuration file
 (or in an appropriate <.htaccess> file) for the short urls to work:
-See http://httpd.apache.org/docs-2.0/mod/core.html#acceptpathinfo
+See https://httpd.apache.org/docs-2.0/mod/core.html#acceptpathinfo
 
-See also http://phpwiki.sourceforge.net/phpwiki/PrettyWiki for more ideas
-on prettifying your urls.
-
 Default: PhpWiki will try to divine whether use of PATH_INFO
 is supported in by your webserver/PHP configuration, and will
 use PATH_INFO if it thinks that is possible.");

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10436] trunk/configurator.php

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

Revision: 10436
          http://sourceforge.net/p/phpwiki/code/10436
Author:   vargenau
Date:     2021-08-04 17:07:44 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
configurator.php: remove redundant methods, optimize code

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

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-04 16:57:05 UTC (rev 10435)
+++ trunk/configurator.php	2021-08-04 17:07:44 UTC (rev 10436)
@@ -1574,6 +1574,7 @@
     var $description;
     var $prefix;
     var $jscheck;
+    var $values;
 
     function __construct($config_item_name, $default_value = '', $description = '', $jscheck = '')
     {
@@ -1649,8 +1650,7 @@
     function get_config($posted_value)
     {
         $d = stripHtml($this->_get_description());
-        $d = str_replace("\n", "\n; ", $d) . $this->_get_config_line($posted_value) . "\n";
-        return $d;
+        return str_replace("\n", "\n; ", $d) . $this->_get_config_line($posted_value) . "\n";
     }
 
     function get_instructions($title)
@@ -1895,15 +1895,6 @@
         return sprintf("%s = %s", $this->get_config_item_name(), $value);
     }
 
-    function _get_config_line($posted_value)
-    {
-        return parent::_get_config_line($posted_value);
-    }
-
-    function get_html()
-    {
-        return parent::get_html();
-    }
 }
 
 class _define_selection_optional
@@ -1964,10 +1955,6 @@
         }
     }
 
-    function get_html()
-    {
-        return parent::get_html();
-    }
 }
 
 class _define_password_optional
@@ -2186,7 +2173,7 @@
         if (strtolower(trim($value)) == 'false')
             $value = false;
         return sprintf("%s = %s", $this->get_config_item_name(),
-            (bool)$value ? 'true' : 'false');
+            $value ? 'true' : 'false');
     }
 
     //TODO: radiobuttons, no list
@@ -2261,7 +2248,6 @@
     function get_instructions($title)
     {
         $id = preg_replace("/\W/", "", $this->config_item_name);
-        $group_name = preg_replace("/\W/", "", $title);
         $i = '<tr class="header" id="'.$id.'">'."\n";
         $i .= '<td class="part" style="width:100%;background-color:#eee;" colspan="2">'."\n";
         $i .= "<h2>" . $title . "</h2>\n    " . nl2p($this->_get_description()) . "\n";
@@ -2279,7 +2265,7 @@
 function nl2p($text)
 {
     preg_match_all("@\s*(<pre>.*?</pre>|<dl>.*?</dl>|.*?(?=\n\n|<pre>|<dl>|$))@s",
-        $text, $m, PREG_PATTERN_ORDER);
+        $text, $m);
 
     $text = '';
     foreach ($m[1] as $par) {
@@ -2340,8 +2326,7 @@
     // https://www.php.net/manual/en/function.htmlentities.php
     $trans = get_html_translation_table(HTML_ENTITIES);
     $trans = array_flip($trans);
-    $d = strtr($d, $trans);
-    return $d;
+    return strtr($d, $trans);
 }
 
 include_once(dirname(__FILE__) . "/lib/stdlib.php");
@@ -2389,7 +2374,7 @@
 
     foreach ($properties as $option_name => $a) {
         $posted_value = stripslashes($posted[$a->config_item_name]);
-        $config .= $properties[$option_name]->get_config($posted_value);
+        $config .= $a->get_config($posted_value);
     }
 
     $config .= $end;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10435] trunk/configurator.php

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

Revision: 10435
          http://sourceforge.net/p/phpwiki/code/10435
Author:   vargenau
Date:     2021-08-04 16:57:05 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
configurator.php: remove unnecessary braces; use size

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

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-04 16:36:04 UTC (rev 10434)
+++ trunk/configurator.php	2021-08-04 16:57:05 UTC (rev 10435)
@@ -1663,8 +1663,9 @@
     {
         $size = strlen($this->default_value) > 45 ? 90 : 50;
         return $this->get_config_item_header() .
-            "<input type=\"text\" size=\"50\" name=\"" . $this->get_config_item_name() . "\" value=\"" . htmlspecialchars($this->default_value) . "\" " .
-            $this->jscheck . " />" . "<p id=\"" . $this->get_config_item_id() . "\" class=\"green\">Input accepted.</p>";
+            "<input type=\"text\" size=\"$size\" name=\"" . $this->get_config_item_name()
+            . "\" value=\"" . htmlspecialchars($this->default_value) . "\" " . $this->jscheck . " />"
+            . "<p id=\"" . $this->get_config_item_id() . "\" class=\"green\">Input accepted.</p>";
     }
 }
 
@@ -1784,7 +1785,7 @@
         $size = strlen($this->default_value) > 45 ? 90 : 50;
         return $this->get_config_item_header()
             . "<input type=\"text\" size=\"$size\" name=\"" . htmlentities($this->get_config_item_name())
-            . "\" value=\"" . htmlentities($this->default_value) . "\" {$this->jscheck} />"
+            . "\" value=\"" . htmlentities($this->default_value) . "\" $this->jscheck />"
             . "<p id=\"" . $this->get_config_item_id() . "\" class=\"green\">Input accepted.</p>";
     }
 }
@@ -2027,7 +2028,7 @@
             $this->default_value = $new_password;
             $s .= "Created password: <strong>$new_password</strong><br />&nbsp;<br />";
         }
-        // dont re-encrypt already encrypted passwords
+        // do not re-encrypt already encrypted passwords
         $value = $this->value();
         $encrypted = !empty($GLOBALS['properties']["Encrypted Passwords"]) and
             $GLOBALS['properties']["Encrypted Passwords"]->value();
@@ -2034,7 +2035,7 @@
         if (empty($value))
             $encrypted = false;
         $s .= "<input type=\"" . ($encrypted ? "text" : "password") . "\" name=\"" . $this->get_config_item_name()
-            . "\" value=\"" . $value . "\" {$this->jscheck} />"
+            . "\" value=\"" . $value . "\" $this->jscheck />"
             . "&nbsp;&nbsp;<input type=\"submit\" name=\"create\" value=\"Create Random Password\" />";
         if (empty($value))
             $s .= "<p id=\"" . $this->get_config_item_id() . "\" class=\"red\">Cannot be empty.</p>";

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10434] trunk/configurator.php

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

Revision: 10434
          http://sourceforge.net/p/phpwiki/code/10434
Author:   vargenau
Date:     2021-08-04 16:36:04 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
configurator.php: use CSS for green and red color

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

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-04 16:16:58 UTC (rev 10433)
+++ trunk/configurator.php	2021-08-04 16:36:04 UTC (rev 10434)
@@ -230,6 +230,13 @@
             color: inherit;
         }
 
+        .green {
+            color: green;
+        }
+
+        .red {
+            color: red;
+        }
         -->
     </style>
     <script type="text/javascript">
@@ -238,7 +245,7 @@
                     var msg = document.getElementById(output);
                     if (accepted) {
                         if (msg && msg.innerHTML) {
-                            msg.innerHTML = "<span color=\"green\">Input accepted.</span>";
+                            msg.innerHTML = "<span class=\"green\">Input accepted.</span>";
                         }
                     } else {
                         var index;
@@ -246,7 +253,7 @@
                             error = error.substring(0, index) + value + error.substring(index + 2);
                         }
                         if (msg) {
-                            msg.innerHTML = "<span color=\"red\">" + error + "</span>";
+                            msg.innerHTML = "<span class=\"red\">" + error + "</span>";
                         }
                     }
                     var submit;
@@ -1657,7 +1664,7 @@
         $size = strlen($this->default_value) > 45 ? 90 : 50;
         return $this->get_config_item_header() .
             "<input type=\"text\" size=\"50\" name=\"" . $this->get_config_item_name() . "\" value=\"" . htmlspecialchars($this->default_value) . "\" " .
-            $this->jscheck . " />" . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+            $this->jscheck . " />" . "<p id=\"" . $this->get_config_item_id() . "\" class=\"green\">Input accepted.</p>";
     }
 }
 
@@ -1778,7 +1785,7 @@
         return $this->get_config_item_header()
             . "<input type=\"text\" size=\"$size\" name=\"" . htmlentities($this->get_config_item_name())
             . "\" value=\"" . htmlentities($this->default_value) . "\" {$this->jscheck} />"
-            . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+            . "<p id=\"" . $this->get_config_item_id() . "\" class=\"green\">Input accepted.</p>";
     }
 }
 
@@ -1823,9 +1830,9 @@
             . "<input type=\"text\" size=\"50\" name=\"" . $this->get_config_item_name()
             . "\" value=\"" . $this->default_value . "\" {$this->jscheck} />";
         if (empty($this->default_value))
-            return $s . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Cannot be empty.</p>";
+            return $s . "<p id=\"" . $this->get_config_item_id() . "\" class=\"red\">Cannot be empty.</p>";
         else
-            return $s . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+            return $s . "<p id=\"" . $this->get_config_item_id() . "\" class=\"green\">Input accepted.</p>";
     }
 }
 
@@ -2030,10 +2037,11 @@
             . "\" value=\"" . $value . "\" {$this->jscheck} />"
             . "&nbsp;&nbsp;<input type=\"submit\" name=\"create\" value=\"Create Random Password\" />";
         if (empty($value))
-            $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Cannot be empty.</p>";
+            $s .= "<p id=\"" . $this->get_config_item_id() . "\" class=\"red\">Cannot be empty.</p>";
         elseif (strlen($this->default_value) < 4)
-            $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Must be longer than 4 chars.</p>"; else
-            $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+            $s .= "<p id=\"" . $this->get_config_item_id() . "\" class=\"red\">Must be longer than 4 chars.</p>";
+        else
+            $s .= "<p id=\"" . $this->get_config_item_id() . "\" class=\"green\">Input accepted.</p>";
         return $s;
     }
 }
@@ -2058,7 +2066,7 @@
         $ta = $this->get_config_item_header();
         $ta .= "<textarea cols=\"18\" rows=\"" . $rows . "\" name=\"" . $this->get_config_item_name() . "\" {$this->jscheck}>";
         $ta .= $list_values . "</textarea>";
-        $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+        $ta .= "<p id=\"" . $this->get_config_item_id() . "\" class=\"green\">Input accepted.</p>";
         return $ta;
     }
 }
@@ -2097,7 +2105,7 @@
         $ta = $this->get_config_item_header();
         $ta .= "<textarea cols=\"18\" rows=\"" . $rows . "\" name=\"" . $this->get_config_item_name() . "\" {$this->jscheck}>";
         $ta .= $list_values . "</textarea>";
-        $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+        $ta .= "<p id=\"" . $this->get_config_item_id() . "\" class=\"green\">Input accepted.</p>";
         return $ta;
     }
 }
@@ -2134,7 +2142,7 @@
         $ta = $this->get_config_item_header();
         $ta .= "<textarea cols=\"18\" rows=\"" . $rows . "\" name=\"" . $this->get_config_item_name() . "\" {$this->jscheck}>";
         $ta .= $list_values . "</textarea>";
-        $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+        $ta .= "<p id=\"" . $this->get_config_item_id() . "\" class=\"green\">Input accepted.</p>";
         return $ta;
     }
 }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10433] trunk/configurator.php

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

Revision: 10433
          http://sourceforge.net/p/phpwiki/code/10433
Author:   vargenau
Date:     2021-08-04 16:16:58 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
configurator.php: check default_value is an array; use parent

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

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-04 14:31:19 UTC (rev 10432)
+++ trunk/configurator.php	2021-08-04 16:16:58 UTC (rev 10433)
@@ -1669,7 +1669,6 @@
         return "";
     }
 
-    // function get_html() { return false; }
     function get_html()
     {
         return $this->get_config_item_header() .
@@ -1890,12 +1889,12 @@
 
     function _get_config_line($posted_value)
     {
-        return _define::_get_config_line($posted_value);
+        return parent::_get_config_line($posted_value);
     }
 
     function get_html()
     {
-        return _variable_selection::get_html();
+        return parent::get_html();
     }
 }
 
@@ -1959,7 +1958,7 @@
 
     function get_html()
     {
-        return _variable_password::get_html();
+        return parent::get_html();
     }
 }
 
@@ -2087,11 +2086,14 @@
 
     function get_html()
     {
-        if (is_array($this->default_value))
+        if (is_array($this->default_value)) {
             $list_values = join("\n", $this->default_value);
-        else
+            $count = count($this->default_value);
+        } else {
             $list_values = $this->default_value;
-        $rows = max(3, count($this->default_value) + 1);
+            $count = 1;
+        }
+        $rows = max(3, $count + 1);
         $ta = $this->get_config_item_header();
         $ta .= "<textarea cols=\"18\" rows=\"" . $rows . "\" name=\"" . $this->get_config_item_name() . "\" {$this->jscheck}>";
         $ta .= $list_values . "</textarea>";

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10432] trunk/INSTALL

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

Revision: 10432
          http://sourceforge.net/p/phpwiki/code/10432
Author:   vargenau
Date:     2021-08-04 14:31:19 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
INSTALL: add instructions for ZipArchive, LdapSearch and TeX2pngPlugin

Modified Paths:
--------------
    trunk/INSTALL

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2021-08-04 14:25:33 UTC (rev 10431)
+++ trunk/INSTALL	2021-08-04 14:31:19 UTC (rev 10432)
@@ -12,6 +12,25 @@
 installation and configure options.
 <https://www.php.net/manual/en/installation.php>
 
+To be able to export the wiki in ZIP format (in PhpWikiAdministration),
+ZipArchive class must be available. You might need to do:
+yum install php-pecl-zip
+or
+apt install php-zip
+
+LdapSearch plugin requires the PHP ldap_connect() function. You might
+need to do:
+yum install php-ldap
+or
+apt install php-ldap
+
+TeX2pngPlugin requires LaTeX to be installed. You might need to do:
+yum install texlive
+yum install latex2html
+or
+apt install texlive
+apt install latex2html
+
 QUICK START INSTRUCTIONS
 
 Copy 'config/config-dist.ini' to 'config/config.ini' and edit the

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10431] trunk/configurator.php

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

Revision: 10431
          http://sourceforge.net/p/phpwiki/code/10431
Author:   vargenau
Date:     2021-08-04 14:25:33 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
configurator.php: check default_value is an array

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

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-04 14:23:13 UTC (rev 10430)
+++ trunk/configurator.php	2021-08-04 14:25:33 UTC (rev 10431)
@@ -2212,8 +2212,12 @@
         $n = "";
         if ($this->description)
             $n = "\n";
-        $default_value = key($this->default_value);
-        next($this->default_value);
+        if (is_array($this->default_value)) {
+            $default_value = key($this->default_value);
+            next($this->default_value);
+        } else {
+            $default_value = $this->default_value;
+        }
         if ($posted_value == $default_value)
             return "$n;" . $this->_config_format($posted_value);
         elseif ($posted_value == '')
@@ -2233,7 +2237,7 @@
 {
     function value()
     {
-        return;
+        return "";
     }
 
     function get_config($posted_value)
@@ -2365,13 +2369,10 @@
 
     $timestamp = date('dS \of F, Y H:i:s');
 
-    $config = "
-; This is a local configuration file for PhpWiki.
-; It was automatically generated by the configurator script
-; on the $timestamp.
-;
-; $preamble
-";
+    $config = "; This is a local configuration file for PhpWiki.\n"
+            . "; It was automatically generated by the configurator script\n"
+            . "; on the $timestamp.\n"
+            .  $preamble;
 
     $posted = $GLOBALS['HTTP_POST_VARS'];
 
@@ -2406,7 +2407,7 @@
         }
     } else {
         echo "<p>The configuration file could <b>not</b> be written.<br />\n",
-        " You should copy the above configuration to a file, ",
+        "You should copy the above configuration to a file, ",
         "and manually save it as <code><b>config/config.ini</b></code>.</p>\n";
     }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10430] trunk/configurator.php

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

Revision: 10430
          http://sourceforge.net/p/phpwiki/code/10430
Author:   vargenau
Date:     2021-08-04 14:23:13 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
configurator.php: remove unused code

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

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-04 14:22:06 UTC (rev 10429)
+++ trunk/configurator.php	2021-08-04 14:23:13 UTC (rev 10430)
@@ -2353,14 +2353,6 @@
     return ($newpass);
 }
 
-// debugging
-function printArray($a)
-{
-    echo "<hr />\n<pre>\n";
-    print_r($a);
-    echo "\n</pre>\n<hr />\n";
-}
-
 // end of class definitions
 /////////////////////////////
 // begin auto generation code
@@ -2411,8 +2403,6 @@
         echo "<p>The configuration was written to <code><b>$config_file</b></code>.</p>\n";
         if ($new_filename) {
             echo "<p>A backup was made to <code><b>$new_filename</b></code>.</p>\n";
-        } else {
-            ; //echo "<p><strong>You must rename or copy this</strong> <code><b>$config_file</b></code> <strong>file to</strong> <code><b>config/config.ini</b></code>.</p>\n";
         }
     } else {
         echo "<p>The configuration file could <b>not</b> be written.<br />\n",

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10429] trunk/configurator.php

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

Revision: 10429
          http://sourceforge.net/p/phpwiki/code/10429
Author:   vargenau
Date:     2021-08-04 14:22:06 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
configurator.php: we have at least PHP 5

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

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-04 14:20:52 UTC (rev 10428)
+++ trunk/configurator.php	2021-08-04 14:22:06 UTC (rev 10429)
@@ -650,12 +650,12 @@
         array('dba' => "dba",
             'SQL' => "SQL PEAR",
             'ADODB' => "SQL ADODB",
-            'PDO' => "PDO (php5 only)",
+            'PDO' => "PDO",
             'file' => "flatfile")/*, "
 Select the database backend type:
 Choose dba (default) to use one of the standard UNIX dba libraries. This is the fastest.
 Choose ADODB or SQL to use an SQL database with ADODB or PEAR.
-Choose PDO on php5 to use an SQL database. (experimental, no paging yet)
+Choose PDO to use an SQL database. (experimental, no paging yet)
 flatfile is simple and slow.
 Recommended is dba or SQL: PEAR or ADODB."*/);
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10428] trunk/configurator.php

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

Revision: 10428
          http://sourceforge.net/p/phpwiki/code/10428
Author:   vargenau
Date:     2021-08-04 14:20:52 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
configurator.php: always define variable $n

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

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-04 13:24:48 UTC (rev 10427)
+++ trunk/configurator.php	2021-08-04 14:20:52 UTC (rev 10428)
@@ -1679,9 +1679,10 @@
 
     function _get_config_line($posted_value)
     {
+        $n = "";
         if ($this->description)
             $n = "\n";
-        return "${n}" . $this->default_value;
+        return "$n" . $this->default_value;
     }
 
     function get_instructions($title)
@@ -1698,11 +1699,12 @@
 {
     function _get_config_line($posted_value)
     {
+        $n = "";
         if ($this->description)
             $n = "\n";
         if (!$posted_value)
             $posted_value = $this->default_value;
-        return "${n}" . $this->_config_format($posted_value);
+        return "$n" . $this->_config_format($posted_value);
     }
 
     function _config_format($value)
@@ -1762,12 +1764,13 @@
 
     function _get_config_line($posted_value)
     {
+        $n = "";
         if ($this->description)
             $n = "\n";
         if ($posted_value == '')
-            return "${n};" . $this->_config_format("");
+            return "$n;" . $this->_config_format("");
         else
-            return "${n}" . $this->_config_format($posted_value);
+            return "$n" . $this->_config_format($posted_value);
     }
 
     function get_html()
@@ -1785,13 +1788,15 @@
 {
     function _get_config_line($posted_value)
     {
+        $n = "";
         if ($this->description)
             $n = "\n";
         if ($posted_value == $this->default_value)
-            return "${n};" . $this->_config_format($posted_value);
+            return "$n;" . $this->_config_format($posted_value);
         elseif ($posted_value == '')
-            return "${n};" . $this->_config_format(""); else
-            return "${n}" . $this->_config_format($posted_value);
+            return "$n;" . $this->_config_format("");
+        else
+            return "$n" . $this->_config_format($posted_value);
     }
 }
 
@@ -1843,12 +1848,13 @@
 
     function _get_config_line($posted_value)
     {
+        $n = "";
         if ($this->description)
             $n = "\n";
         if ($posted_value == '')
-            return "${n};" . $this->_config_format('0');
+            return "$n;" . $this->_config_format('0');
         else
-            return "${n}" . $this->_config_format($posted_value);
+            return "$n" . $this->_config_format($posted_value);
     }
 }
 
@@ -1862,13 +1868,15 @@
 {
     function _get_config_line($posted_value)
     {
+        $n = "";
         if ($this->description)
             $n = "\n";
         if ($posted_value == $this->default_value)
-            return "${n};" . $this->_config_format($posted_value);
+            return "$n;" . $this->_config_format($posted_value);
         elseif ($posted_value == '')
-            return "${n};" . $this->_config_format('0'); else
-            return "${n}" . $this->_config_format($posted_value);
+            return "$n;" . $this->_config_format('0');
+        else
+            return "$n" . $this->_config_format($posted_value);
     }
 }
 
@@ -1901,14 +1909,15 @@
 {
     function _get_config_line($posted_value)
     {
+        $n = "";
         if ($this->description)
             $n = "\n";
         if ($posted_value == $this->default_value)
-            return "${n};" . $this->_config_format($posted_value);
+            return "$n;" . $this->_config_format($posted_value);
         elseif ($posted_value == '')
-            return "${n};" . $this->_config_format("");
+            return "$n;" . $this->_config_format("");
         else
-            return "${n}" . $this->_config_format($posted_value);
+            return "$n" . $this->_config_format($posted_value);
     }
 }
 
@@ -1926,10 +1935,11 @@
 
     function _get_config_line($posted_value)
     {
+        $n = "";
         if ($this->description)
             $n = "\n";
         if ($posted_value == '') {
-            $p = "${n};" . $this->_config_format("");
+            $p = "$n;" . $this->_config_format("");
             $p .= "\n; If you used the passencrypt.php utility to encode the password";
             $p .= "\n; then uncomment this line:";
             $p .= "\n;ENCRYPTED_PASSWD = true";
@@ -1942,7 +1952,7 @@
                 16 * CRYPT_BLOWFISH);
             // generate an encrypted password
             $crypt_pass = crypt($posted_value, rand_ascii($salt_length));
-            $p = "${n}" . $this->_config_format($crypt_pass);
+            $p = "$n" . $this->_config_format($crypt_pass);
             return $p . "\nENCRYPTED_PASSWD = true";
         }
     }
@@ -1966,12 +1976,13 @@
 
     function _get_config_line($posted_value)
     {
+        $n = "";
         if ($this->description)
             $n = "\n";
         if ($posted_value == '') {
-            return "${n};" . $this->_config_format("");
+            return "$n;" . $this->_config_format("");
         } else {
-            return "${n}" . $this->_config_format($posted_value);
+            return "$n" . $this->_config_format($posted_value);
         }
     }
 
@@ -2153,9 +2164,10 @@
 
     function _get_config_line($posted_value)
     {
+        $n = "";
         if ($this->description)
             $n = "\n";
-        return "${n}" . $this->_config_format($posted_value);
+        return "$n" . $this->_config_format($posted_value);
     }
 
     function _config_format($value)
@@ -2197,15 +2209,17 @@
 {
     function _get_config_line($posted_value)
     {
+        $n = "";
         if ($this->description)
             $n = "\n";
         $default_value = key($this->default_value);
         next($this->default_value);
         if ($posted_value == $default_value)
-            return "${n};" . $this->_config_format($posted_value);
+            return "$n;" . $this->_config_format($posted_value);
         elseif ($posted_value == '')
-            return "${n};" . $this->_config_format('false'); else
-        return "${n}" . $this->_config_format($posted_value);
+            return "$n;" . $this->_config_format('false');
+        else
+            return "$n" . $this->_config_format($posted_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:[10427] trunk/configurator.php

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

Revision: 10427
          http://sourceforge.net/p/phpwiki/code/10427
Author:   vargenau
Date:     2021-08-04 13:24:48 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
Remove unused classes _variable_commented, _variable_selection_optional, _define_password_commented_optional, list_variable

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

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-04 13:06:49 UTC (rev 10426)
+++ trunk/configurator.php	2021-08-04 13:24:48 UTC (rev 10427)
@@ -1825,21 +1825,6 @@
     }
 }
 
-class _variable_commented
-    extends _variable
-{
-    function _get_config_line($posted_value)
-    {
-        if ($this->description)
-            $n = "\n";
-        if ($posted_value == $this->default_value)
-            return "${n};" . $this->_config_format($posted_value);
-        elseif ($posted_value == '')
-            return "${n};" . $this->_config_format(""); else
-            return "${n}" . $this->_config_format($posted_value);
-    }
-}
-
 class numeric_define
     extends _define
 {
@@ -1911,11 +1896,6 @@
 {
 }
 
-class _variable_selection_optional
-    extends _variable_selection
-{
-}
-
 class _define_selection_optional_commented
     extends _define_selection_optional
 {
@@ -2010,11 +1990,6 @@
     }
 }
 
-class _define_password_commented_optional
-    extends _define_password_optional
-{
-}
-
 class _variable_password
     extends _variable
 {
@@ -2053,32 +2028,6 @@
     }
 }
 
-class list_variable
-    extends _variable
-{
-    function _get_config_line($posted_value)
-    {
-        // split the phrase by any number of commas or space characters,
-        // which include " ", \r, \t, \n and \f
-        $list_values = preg_split("/[\s,]+/", $posted_value, -1, PREG_SPLIT_NO_EMPTY);
-        if ($list_values)
-            $list_values = join("|", $list_values);
-        return _variable::_get_config_line($list_values);
-    }
-
-    function get_html()
-    {
-        $list_values = explode("|", $this->default_value);
-        $rows = max(3, count($list_values) + 1);
-        $list_values = join("\n", $list_values);
-        $ta = $this->get_config_item_header();
-        $ta .= "<textarea cols=\"18\" rows=\"" . $rows . "\" name=\"" . $this->get_config_item_name() . "\" {$this->jscheck}>";
-        $ta .= $list_values . "</textarea>";
-        $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
-        return $ta;
-    }
-}
-
 class list_define
     extends _define
 {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10426] trunk/configurator.php

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

Revision: 10426
          http://sourceforge.net/p/phpwiki/code/10426
Author:   vargenau
Date:     2021-08-04 13:06:49 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
Remove unused code

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

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-04 11:19:57 UTC (rev 10425)
+++ trunk/configurator.php	2021-08-04 13:06:49 UTC (rev 10426)
@@ -1607,17 +1607,6 @@
     function _config_format($value)
     {
         return '';
-        /*
-        $v = $this->get_config_item_name();
-        // handle arrays: a|b --> a['b']
-        if (strpos($v, '|')) {
-            list($a, $b) = explode('|', $v);
-            $v = sprintf("%s['%s']", $a, $b);
-        }
-        if (preg_match("/[\"']/", $value))
-            $value = '"' . $value . '"';
-        return sprintf("%s = \"%s\"", $v, $value);
-        */
     }
 
     function get_config_item_name()
@@ -1721,14 +1710,6 @@
         return sprintf("%s = \"%s\"", $this->get_config_item_name(), $value);
     }
 }
-class unchangeable_ini_set
-    extends unchangeable_variable
-{
-    function _config_format($value)
-    {
-        return "";
-    }
-}
 
 class _variable_selection
     extends _variable
@@ -1872,7 +1853,6 @@
 
     function _config_format($value)
     {
-        //return sprintf("define('%s', %s);", $this->get_config_item_name(), $value);
         return sprintf("%s = %s", $this->get_config_item_name(), $value);
     }
 
@@ -1946,7 +1926,8 @@
         if ($posted_value == $this->default_value)
             return "${n};" . $this->_config_format($posted_value);
         elseif ($posted_value == '')
-            return "${n};" . $this->_config_format(""); else
+            return "${n};" . $this->_config_format("");
+        else
             return "${n}" . $this->_config_format($posted_value);
     }
 }
@@ -2196,29 +2177,6 @@
     }
 }
 
-/*
-class _ini_set
-extends _variable {
-    function value() {
-        global $HTTP_POST_VARS;
-        if ($v = $HTTP_POST_VARS[$this->config_item_name])
-            return $v;
-        else {
-            return ini_get($this->get_config_item_name);
-        }
-    }
-    function _config_format($value) {
-        return sprintf("ini_set('%s', '%s');", $this->get_config_item_name(), $value);
-    }
-    function _get_config_line($posted_value) {
-        if ($posted_value && ! $posted_value == $this->default_value)
-            return "\n" . $this->_config_format($posted_value);
-        else
-            return "\n;" . $this->_config_format($this->default_value);
-    }
-}
-*/
-
 class boolean_define
     extends _define
 {

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