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

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

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

Revision: 9750
          http://sourceforge.net/p/phpwiki/code/9750
Author:   vargenau
Date:     2016-01-06 09:28:54 +0000 (Wed, 06 Jan 2016)
Log Message:
-----------
make depend

Modified Paths:
--------------
    trunk/locale/Makefile

Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2016-01-05 20:53:59 UTC (rev 9749)
+++ trunk/locale/Makefile	2016-01-06 09:28:54 UTC (rev 9750)
@@ -152,7 +152,6 @@
 ${POT_FILE}: .././lib/pear/DB/sybase.php
 ${POT_FILE}: .././lib/pear/File_Passwd.php
 ${POT_FILE}: .././lib/pear/JSON.php
-${POT_FILE}: .././lib/pear/PEAR5.php
 ${POT_FILE}: .././lib/pear/PEAR.php
 ${POT_FILE}: .././lib/plugin/AddComment.php
 ${POT_FILE}: .././lib/plugin/AllPages.php

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

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

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

Revision: 9749
          http://sourceforge.net/p/phpwiki/code/9749
Author:   vargenau
Date:     2016-01-05 20:53:59 +0000 (Tue, 05 Jan 2016)
Log Message:
-----------
Update PEAR.php to release 1.10.1

Modified Paths:
--------------
    trunk/lib/pear/PEAR.php

Removed Paths:
-------------
    trunk/lib/pear/PEAR5.php

Modified: trunk/lib/pear/PEAR.php
===================================================================
--- trunk/lib/pear/PEAR.php	2016-01-05 20:16:20 UTC (rev 9748)
+++ trunk/lib/pear/PEAR.php	2016-01-05 20:53:59 UTC (rev 9749)
@@ -14,7 +14,6 @@
  * @author     Greg Beaver <ce...@ph...>
  * @copyright  1997-2010 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id$
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -33,8 +32,6 @@
  */
 define('PEAR_ERROR_EXCEPTION', 32);
 /**#@-*/
-define('PEAR_ZE2', (function_exists('version_compare') &&
-                    version_compare(zend_version(), "2-dev", "ge")));
 
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     define('OS_WINDOWS', true);
@@ -78,7 +75,7 @@
  * @author     Greg Beaver <ce...@ph...>
  * @copyright  1997-2006 The PHP Group
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.5
+ * @version    Release: 1.10.1
  * @link       http://pear.php.net/package/PEAR
  * @see        PEAR_Error
  * @since      Class available since PHP 4.0.2
@@ -137,6 +134,18 @@
     var $_expected_errors = array();
 
     /**
+     * List of methods that can be called both statically and non-statically.
+     * @var array
+     */
+    protected static $bivalentMethods = array(
+        'setErrorHandling' => true,
+        'raiseError' => true,
+        'throwError' => true,
+        'pushErrorHandling' => true,
+        'popErrorHandling' => true,
+    );
+
+    /**
      * Constructor.  Registers this object in
      * $_PEAR_destructor_object_list for destructor emulation if a
      * destructor object exists.
@@ -146,7 +155,7 @@
      * @access public
      * @return void
      */
-    function PEAR($error_class = null)
+    function __construct($error_class = null)
     {
         $classname = strtolower(get_class($this));
         if ($this->_debug) {
@@ -174,6 +183,18 @@
     }
 
     /**
+     * Only here for backwards compatibility.
+     * E.g. Archive_Tar calls $this->PEAR() in its constructor.
+     *
+     * @param string $error_class Which class to use for error objects,
+     *                            defaults to PEAR_Error.
+     */
+    public function PEAR($error_class = null)
+    {
+        self::__construct($error_class);
+    }
+
+    /**
      * Destructor (the emulated type of...).  Does nothing right now,
      * but is included for forward compatibility, so subclass
      * destructors should always call it.
@@ -190,19 +211,44 @@
         }
     }
 
+    public function __call($method, $arguments)
+    {
+        if (!isset(self::$bivalentMethods[$method])) {
+            trigger_error(
+                'Call to undefined method PEAR::' . $method . '()', E_USER_ERROR
+            );
+        }
+        return call_user_func_array(
+            array(get_class(), '_' . $method),
+            array_merge(array($this), $arguments)
+        );
+    }
+
+    public static function __callStatic($method, $arguments)
+    {
+        if (!isset(self::$bivalentMethods[$method])) {
+            trigger_error(
+                'Call to undefined method PEAR::' . $method . '()', E_USER_ERROR
+            );
+        }
+        return call_user_func_array(
+            array(get_class(), '_' . $method),
+            array_merge(array(null), $arguments)
+        );
+    }
+
     /**
     * If you have a class that's mostly/entirely static, and you need static
     * properties, you can use this method to simulate them. Eg. in your method(s)
     * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
     * You MUST use a reference, or they will not persist!
     *
-    * @access public
     * @param  string $class  The calling classname, to prevent clashes
     * @param  string $var    The variable to retrieve.
     * @return mixed   A reference to the variable. If not set it will be
     *                 auto initialised to NULL.
     */
-    function &getStaticProperty($class, $var)
+    public static function &getStaticProperty($class, $var)
     {
         static $properties;
         if (!isset($properties[$class])) {
@@ -220,12 +266,12 @@
     * Use this function to register a shutdown method for static
     * classes.
     *
-    * @access public
     * @param  mixed $func  The function name (or array of class/method) to call
     * @param  mixed $args  The arguments to pass to the function
+    *
     * @return void
     */
-    function registerShutdownFunc($func, $args = array())
+    public static function registerShutdownFunc($func, $args = array())
     {
         // if we are called statically, there is a potential
         // that no shutdown func is registered.  Bug #6445
@@ -244,10 +290,10 @@
      *                        only if $code is a string and
      *                        $obj->getMessage() == $code or
      *                        $code is an integer and $obj->getCode() == $code
-     * @access  public
+     *
      * @return  bool    true if parameter is an error
      */
-    function isError($data, $code = null)
+    public static function isError($data, $code = null)
     {
         if (!is_a($data, 'PEAR_Error')) {
             return false;
@@ -269,6 +315,9 @@
      * PEAR objects.  If called in an object, setErrorHandling sets
      * the default behaviour for that object.
      *
+     * @param object $object
+     *        Object the method was called on (non-static mode)
+     *
      * @param int $mode
      *        One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
      *        PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
@@ -300,11 +349,12 @@
      *
      * @since PHP 4.0.5
      */
-    function setErrorHandling($mode = null, $options = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $setmode     = &$this->_default_error_mode;
-            $setoptions  = &$this->_default_error_options;
+    protected static function _setErrorHandling(
+        $object, $mode = null, $options = null
+    ) {
+        if ($object !== null) {
+            $setmode     = &$object->_default_error_mode;
+            $setoptions  = &$object->_default_error_options;
         } else {
             $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
             $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
@@ -464,12 +514,12 @@
      * @param bool $skipmsg If true, raiseError will only pass error codes,
      *                  the error message parameter will be dropped.
      *
-     * @access public
      * @return object   a PEAR error object
      * @see PEAR::setErrorHandling
      * @since PHP 4.0.5
      */
-    function &raiseError($message = null,
+    protected static function _raiseError($object,
+                         $message = null,
                          $code = null,
                          $mode = null,
                          $options = null,
@@ -487,10 +537,10 @@
         }
 
         if (
-            isset($this) &&
-            isset($this->_expected_errors) &&
-            count($this->_expected_errors) > 0 &&
-            count($exp = end($this->_expected_errors))
+            $object !== null &&
+            isset($object->_expected_errors) &&
+            count($object->_expected_errors) > 0 &&
+            count($exp = end($object->_expected_errors))
         ) {
             if ($exp[0] == "*" ||
                 (is_int(reset($exp)) && in_array($code, $exp)) ||
@@ -503,9 +553,9 @@
         // No mode given, try global ones
         if ($mode === null) {
             // Class error handler
-            if (isset($this) && isset($this->_default_error_mode)) {
-                $mode    = $this->_default_error_mode;
-                $options = $this->_default_error_options;
+            if ($object !== null && isset($object->_default_error_mode)) {
+                $mode    = $object->_default_error_mode;
+                $options = $object->_default_error_options;
             // Global error handler
             } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
                 $mode    = $GLOBALS['_PEAR_default_error_mode'];
@@ -515,18 +565,12 @@
 
         if ($error_class !== null) {
             $ec = $error_class;
-        } elseif (isset($this) && isset($this->_error_class)) {
-            $ec = $this->_error_class;
+        } elseif ($object !== null && isset($object->_error_class)) {
+            $ec = $object->_error_class;
         } else {
             $ec = 'PEAR_Error';
         }
 
-        if (intval(PHP_VERSION) < 5) {
-            // little non-eval hack to fix bug #12147
-            include 'PEAR/FixPHP5PEARWarnings.php';
-            return $a;
-        }
-
         if ($skipmsg) {
             $a = new $ec($code, $mode, $options, $userinfo);
         } else {
@@ -548,14 +592,13 @@
      * @param string $userinfo If you need to pass along for example debug
      *                  information, this parameter is meant for that.
      *
-     * @access public
      * @return object   a PEAR error object
      * @see PEAR::raiseError
      */
-    function &throwError($message = null, $code = null, $userinfo = null)
+    protected static function _throwError($object, $message = null, $code = null, $userinfo = null)
     {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $a = &$this->raiseError($message, $code, null, null, $userinfo);
+        if ($object !== null) {
+            $a = &$object->raiseError($message, $code, null, null, $userinfo);
             return $a;
         }
 
@@ -563,7 +606,7 @@
         return $a;
     }
 
-    function staticPushErrorHandling($mode, $options = null)
+    public static function staticPushErrorHandling($mode, $options = null)
     {
         $stack       = &$GLOBALS['_PEAR_error_handler_stack'];
         $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
@@ -598,7 +641,7 @@
         return true;
     }
 
-    function staticPopErrorHandling()
+    public static function staticPopErrorHandling()
     {
         $stack = &$GLOBALS['_PEAR_error_handler_stack'];
         $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
@@ -646,20 +689,20 @@
      *
      * @see PEAR::setErrorHandling
      */
-    function pushErrorHandling($mode, $options = null)
+    protected static function _pushErrorHandling($object, $mode, $options = null)
     {
         $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $def_mode    = &$this->_default_error_mode;
-            $def_options = &$this->_default_error_options;
+        if ($object !== null) {
+            $def_mode    = &$object->_default_error_mode;
+            $def_options = &$object->_default_error_options;
         } else {
             $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
             $def_options = &$GLOBALS['_PEAR_default_error_options'];
         }
         $stack[] = array($def_mode, $def_options);
 
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
+        if ($object !== null) {
+            $object->setErrorHandling($mode, $options);
         } else {
             PEAR::setErrorHandling($mode, $options);
         }
@@ -674,14 +717,14 @@
     *
     * @see PEAR::pushErrorHandling
     */
-    function popErrorHandling()
+    protected static function _popErrorHandling($object)
     {
         $stack = &$GLOBALS['_PEAR_error_handler_stack'];
         array_pop($stack);
         list($mode, $options) = $stack[sizeof($stack) - 1];
         array_pop($stack);
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
+        if ($object !== null) {
+            $object->setErrorHandling($mode, $options);
         } else {
             PEAR::setErrorHandling($mode, $options);
         }
@@ -695,7 +738,7 @@
     * @param string $ext The extension name
     * @return bool Success or not on the dl() call
     */
-    function loadExtension($ext)
+    public static function loadExtension($ext)
     {
         if (extension_loaded($ext)) {
             return true;
@@ -704,8 +747,7 @@
         // if either returns true dl() will produce a FATAL error, stop that
         if (
             function_exists('dl') === false ||
-            ini_get('enable_dl') != 1 ||
-            ini_get('safe_mode') == 1
+            ini_get('enable_dl') != 1
         ) {
             return false;
         }
@@ -726,10 +768,6 @@
     }
 }
 
-if (PEAR_ZE2) {
-    include_once 'PEAR5.php';
-}
-
 function _PEAR_call_destructors()
 {
     global $_PEAR_destructor_object_list;
@@ -737,12 +775,9 @@
         sizeof($_PEAR_destructor_object_list))
     {
         reset($_PEAR_destructor_object_list);
-        if (PEAR_ZE2) {
-            $destructLifoExists = PEAR5::getStaticProperty('PEAR', 'destructlifo');
-        } else {
-            $destructLifoExists = PEAR::getStaticProperty('PEAR', 'destructlifo');
-        }
 
+        $destructLifoExists = PEAR::getStaticProperty('PEAR', 'destructlifo');
+
         if ($destructLifoExists) {
             $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
         }
@@ -788,7 +823,7 @@
  * @author     Gregory Beaver <ce...@ph...>
  * @copyright  1997-2006 The PHP Group
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.5
+ * @version    Release: 1.10.1
  * @link       http://pear.php.net/manual/en/core.pear.pear-error.php
  * @see        PEAR::raiseError(), PEAR::throwError()
  * @since      Class available since PHP 4.0.2
@@ -823,7 +858,7 @@
      * @access public
      *
      */
-    function PEAR_Error($message = 'unknown error', $code = null,
+    function __construct($message = 'unknown error', $code = null,
                         $mode = null, $options = null, $userinfo = null)
     {
         if ($mode === null) {
@@ -834,11 +869,7 @@
         $this->mode      = $mode;
         $this->userinfo  = $userinfo;
 
-        if (PEAR_ZE2) {
-            $skiptrace = PEAR5::getStaticProperty('PEAR_Error', 'skiptrace');
-        } else {
-            $skiptrace = PEAR::getStaticProperty('PEAR_Error', 'skiptrace');
-        }
+        $skiptrace = PEAR::getStaticProperty('PEAR_Error', 'skiptrace');
 
         if (!$skiptrace) {
             $this->backtrace = debug_backtrace();
@@ -897,6 +928,24 @@
     }
 
     /**
+     * Only here for backwards compatibility.
+     *
+     * Class "Cache_Error" still uses it, among others.
+     *
+     * @param string $message  Message
+     * @param int    $code     Error code
+     * @param int    $mode     Error mode
+     * @param mixed  $options  See __construct()
+     * @param string $userinfo Additional user/debug info
+     */
+    public function PEAR_Error(
+        $message = 'unknown error', $code = null, $mode = null,
+        $options = null, $userinfo = null
+    ) {
+        self::__construct($message, $code, $mode, $options, $userinfo);
+    }
+
+    /**
      * Get the error mode from an error object.
      *
      * @return int error mode

Deleted: trunk/lib/pear/PEAR5.php
===================================================================
--- trunk/lib/pear/PEAR5.php	2016-01-05 20:16:20 UTC (rev 9748)
+++ trunk/lib/pear/PEAR5.php	2016-01-05 20:53:59 UTC (rev 9749)
@@ -1,33 +0,0 @@
-<?php
-/**
- * This is only meant for PHP 5 to get rid of certain strict warning
- * that doesn't get hidden since it's in the shutdown function
- */
-class PEAR5
-{
-    /**
-    * If you have a class that's mostly/entirely static, and you need static
-    * properties, you can use this method to simulate them. Eg. in your method(s)
-    * do this: $myVar = &PEAR5::getStaticProperty('myclass', 'myVar');
-    * You MUST use a reference, or they will not persist!
-    *
-    * @access public
-    * @param  string $class  The calling classname, to prevent clashes
-    * @param  string $var    The variable to retrieve.
-    * @return mixed   A reference to the variable. If not set it will be
-    *                 auto initialised to NULL.
-    */
-    static function &getStaticProperty($class, $var)
-    {
-        static $properties;
-        if (!isset($properties[$class])) {
-            $properties[$class] = array();
-        }
-
-        if (!array_key_exists($var, $properties[$class])) {
-            $properties[$class][$var] = null;
-        }
-
-        return $properties[$class][$var];
-    }
-}
\ No newline at end of file

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

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

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

Revision: 9748
          http://sourceforge.net/p/phpwiki/code/9748
Author:   vargenau
Date:     2016-01-05 20:16:20 +0000 (Tue, 05 Jan 2016)
Log Message:
-----------
Update Pear DB to release 1.9.2

Modified Paths:
--------------
    trunk/lib/pear/DB/common.php
    trunk/lib/pear/DB/dbase.php
    trunk/lib/pear/DB/fbsql.php
    trunk/lib/pear/DB/ibase.php
    trunk/lib/pear/DB/ifx.php
    trunk/lib/pear/DB/msql.php
    trunk/lib/pear/DB/mssql.php
    trunk/lib/pear/DB/mysql.php
    trunk/lib/pear/DB/mysqli.php
    trunk/lib/pear/DB/oci8.php
    trunk/lib/pear/DB/odbc.php
    trunk/lib/pear/DB/pgsql.php
    trunk/lib/pear/DB/sqlite.php
    trunk/lib/pear/DB/storage.php
    trunk/lib/pear/DB/sybase.php
    trunk/lib/pear/DB.php

Modified: trunk/lib/pear/DB/common.php
===================================================================
--- trunk/lib/pear/DB/common.php	2015-12-14 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/common.php	2016-01-05 20:16:20 UTC (rev 9748)
@@ -42,7 +42,7 @@
  * @author     Daniel Convissor <da...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.8.2
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  */
 class DB_common extends PEAR
@@ -145,7 +145,7 @@
      *
      * @return void
      */
-    function DB_common()
+    function __construct()
     {
         $this->PEAR('DB_Error');
     }

Modified: trunk/lib/pear/DB/dbase.php
===================================================================
--- trunk/lib/pear/DB/dbase.php	2015-12-14 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/dbase.php	2016-01-05 20:16:20 UTC (rev 9748)
@@ -41,7 +41,7 @@
  * @author     Daniel Convissor <da...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.8.2
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  */
 class DB_dbase extends DB_common
@@ -140,13 +140,13 @@
     // {{{ constructor
 
     /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
+     * This constructor calls <kbd>parent::__construct()</kbd>
      *
      * @return void
      */
-    function DB_dbase()
+    function __construct()
     {
-        $this->DB_common();
+        parent::__construct();
     }
 
     // }}}

Modified: trunk/lib/pear/DB/fbsql.php
===================================================================
--- trunk/lib/pear/DB/fbsql.php	2015-12-14 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/fbsql.php	2016-01-05 20:16:20 UTC (rev 9748)
@@ -41,7 +41,7 @@
  * @author     Daniel Convissor <da...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.8.2
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  * @since      Class functional since Release 1.7.0
  */
@@ -124,13 +124,13 @@
     // {{{ constructor
 
     /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
+     * This constructor calls <kbd>parent::__construct()</kbd>
      *
      * @return void
      */
-    function DB_fbsql()
+    function __construct()
     {
-        $this->DB_common();
+        parent::__construct();
     }
 
     // }}}

Modified: trunk/lib/pear/DB/ibase.php
===================================================================
--- trunk/lib/pear/DB/ibase.php	2015-12-14 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/ibase.php	2016-01-05 20:16:20 UTC (rev 9748)
@@ -49,7 +49,7 @@
  * @author     Daniel Convissor <da...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.8.2
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  * @since      Class became stable in Release 1.7.0
  */
@@ -180,13 +180,13 @@
     // {{{ constructor
 
     /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
+     * This constructor calls <kbd>parent::__construct()</kbd>
      *
      * @return void
      */
-    function DB_ibase()
+    function __construct()
     {
-        $this->DB_common();
+        parent::__construct();
     }
 
     // }}}

Modified: trunk/lib/pear/DB/ifx.php
===================================================================
--- trunk/lib/pear/DB/ifx.php	2015-12-14 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/ifx.php	2016-01-05 20:16:20 UTC (rev 9748)
@@ -48,7 +48,7 @@
  * @author     Daniel Convissor <da...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.8.2
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  */
 class DB_ifx extends DB_common
@@ -167,13 +167,13 @@
     // {{{ constructor
 
     /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
+     * This constructor calls <kbd>parent::__construct()</kbd>
      *
      * @return void
      */
-    function DB_ifx()
+    function __construct()
     {
-        $this->DB_common();
+        parent::__construct();
     }
 
     // }}}

Modified: trunk/lib/pear/DB/msql.php
===================================================================
--- trunk/lib/pear/DB/msql.php	2015-12-14 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/msql.php	2016-01-05 20:16:20 UTC (rev 9748)
@@ -47,7 +47,7 @@
  * @author     Daniel Convissor <da...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.8.2
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  * @since      Class not functional until Release 1.7.0
  */
@@ -126,13 +126,13 @@
     // {{{ constructor
 
     /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
+     * This constructor calls <kbd>parent::__construct()</kbd>
      *
      * @return void
      */
-    function DB_msql()
+    function __construct()
     {
-        $this->DB_common();
+        parent::__construct();
     }
 
     // }}}

Modified: trunk/lib/pear/DB/mssql.php
===================================================================
--- trunk/lib/pear/DB/mssql.php	2015-12-14 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/mssql.php	2016-01-05 20:16:20 UTC (rev 9748)
@@ -49,7 +49,7 @@
  * @author     Daniel Convissor <da...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.8.2
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  */
 class DB_mssql extends DB_common
@@ -179,13 +179,13 @@
     // {{{ constructor
 
     /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
+     * This constructor calls <kbd>parent::__construct()</kbd>
      *
      * @return void
      */
-    function DB_mssql()
+    function __construct()
     {
-        $this->DB_common();
+        parent::__construct();
     }
 
     // }}}

Modified: trunk/lib/pear/DB/mysql.php
===================================================================
--- trunk/lib/pear/DB/mysql.php	2015-12-14 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/mysql.php	2016-01-05 20:16:20 UTC (rev 9748)
@@ -41,7 +41,7 @@
  * @author     Daniel Convissor <da...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.8.2
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  */
 class DB_mysql extends DB_common
@@ -162,13 +162,13 @@
     // {{{ constructor
 
     /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
+     * This constructor calls <kbd>parent::__construct()</kbd>
      *
      * @return void
      */
-    function DB_mysql()
+    function __construct()
     {
-        $this->DB_common();
+        parent::__construct();
     }
 
     // }}}

Modified: trunk/lib/pear/DB/mysqli.php
===================================================================
--- trunk/lib/pear/DB/mysqli.php	2015-12-14 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/mysqli.php	2016-01-05 20:16:20 UTC (rev 9748)
@@ -43,7 +43,7 @@
  * @author     Daniel Convissor <da...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.8.2
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  * @since      Class functional since Release 1.6.3
  */
@@ -224,13 +224,13 @@
     // {{{ constructor
 
     /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
+     * This constructor calls <kbd>parent::__construct()</kbd>
      *
      * @return void
      */
-    function DB_mysqli()
+    function __construct()
     {
-        $this->DB_common();
+        parent::__construct();
     }
 
     // }}}
@@ -497,7 +497,11 @@
      */
     function freeResult($result)
     {
-        return is_resource($result) ? mysqli_free_result($result) : false;
+        if (! $result instanceof mysqli_result) {
+            return false;
+        }
+        mysqli_free_result($result);
+        return true;
     }
 
     // }}}
@@ -1031,6 +1035,10 @@
                                     ? $this->mysqli_types[$tmp->type]
                                     : 'unknown',
                 // http://bugs.php.net/?id=36579
+                //  Doc Bug #36579: mysqli_fetch_field length handling
+                // https://bugs.php.net/bug.php?id=62426
+                //  Bug #62426: mysqli_fetch_field_direct returns incorrect
+                //  length on UTF8 fields
                 'len'   => $tmp->length,
                 'flags' => $flags,
             );

Modified: trunk/lib/pear/DB/oci8.php
===================================================================
--- trunk/lib/pear/DB/oci8.php	2015-12-14 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/oci8.php	2016-01-05 20:16:20 UTC (rev 9748)
@@ -47,7 +47,7 @@
  * @author     Daniel Convissor <da...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.8.2
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  */
 class DB_oci8 extends DB_common
@@ -173,13 +173,13 @@
     // {{{ constructor
 
     /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
+     * This constructor calls <kbd>parent::__construct()</kbd>
      *
      * @return void
      */
-    function DB_oci8()
+    function __construct()
     {
-        $this->DB_common();
+        parent::__construct();
     }
 
     // }}}

Modified: trunk/lib/pear/DB/odbc.php
===================================================================
--- trunk/lib/pear/DB/odbc.php	2015-12-14 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/odbc.php	2016-01-05 20:16:20 UTC (rev 9748)
@@ -44,7 +44,7 @@
  * @author     Daniel Convissor <da...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.8.2
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  */
 class DB_odbc extends DB_common
@@ -153,13 +153,13 @@
     // {{{ constructor
 
     /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
+     * This constructor calls <kbd>parent::__construct()</kbd>
      *
      * @return void
      */
-    function DB_odbc()
+    function __construct()
     {
-        $this->DB_common();
+        parent::__construct();
     }
 
     // }}}

Modified: trunk/lib/pear/DB/pgsql.php
===================================================================
--- trunk/lib/pear/DB/pgsql.php	2015-12-14 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/pgsql.php	2016-01-05 20:16:20 UTC (rev 9748)
@@ -43,7 +43,7 @@
  * @author     Daniel Convissor <da...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.8.2
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  */
 class DB_pgsql extends DB_common
@@ -148,13 +148,13 @@
     // {{{ constructor
 
     /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
+     * This constructor calls <kbd>parent::__construct()</kbd>
      *
      * @return void
      */
-    function DB_pgsql()
+    function __construct()
     {
-        $this->DB_common();
+        parent::__construct();
     }
 
     // }}}

Modified: trunk/lib/pear/DB/sqlite.php
===================================================================
--- trunk/lib/pear/DB/sqlite.php	2015-12-14 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/sqlite.php	2016-01-05 20:16:20 UTC (rev 9748)
@@ -47,7 +47,7 @@
  * @author     Daniel Convissor <da...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0 3.0
- * @version    Release: 1.8.2
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  */
 class DB_sqlite extends DB_common
@@ -152,13 +152,13 @@
     // {{{ constructor
 
     /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
+     * This constructor calls <kbd>parent::__construct()</kbd>
      *
      * @return void
      */
-    function DB_sqlite()
+    function __construct()
     {
-        $this->DB_common();
+        parent::__construct();
     }
 
     // }}}

Modified: trunk/lib/pear/DB/storage.php
===================================================================
--- trunk/lib/pear/DB/storage.php	2015-12-14 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/storage.php	2016-01-05 20:16:20 UTC (rev 9748)
@@ -38,7 +38,7 @@
  * @author     Stig Bakken <st...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.8.2
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  */
 class DB_storage extends PEAR
@@ -94,7 +94,7 @@
      * a reference to this object
      *
      */
-    function DB_storage($table, $keycolumn, &$dbh, $validator = null)
+    function __construct($table, $keycolumn, &$dbh, $validator = null)
     {
         $this->PEAR('DB_Error');
         $this->_table = $table;

Modified: trunk/lib/pear/DB/sybase.php
===================================================================
--- trunk/lib/pear/DB/sybase.php	2015-12-14 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB/sybase.php	2016-01-05 20:16:20 UTC (rev 9748)
@@ -17,7 +17,7 @@
  * @category   Database
  * @package    DB
  * @author     Sterling Hughes <ste...@ph...>
- * @author     Antônio Carlos Venâncio Júnior <fl...@ph...>
+ * @author     Antônio Carlos Venâncio Júnior
  * @author     Daniel Convissor <da...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
@@ -42,11 +42,11 @@
  * @category   Database
  * @package    DB
  * @author     Sterling Hughes <ste...@ph...>
- * @author     Antônio Carlos Venâncio Júnior <fl...@ph...>
+ * @author     Antônio Carlos Venâncio Júnior
  * @author     Daniel Convissor <da...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.8.2
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  */
 class DB_sybase extends DB_common
@@ -141,13 +141,13 @@
     // {{{ constructor
 
     /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
+     * This constructor calls <kbd>parent::__construct()</kbd>
      *
      * @return void
      */
-    function DB_sybase()
+    function __construct()
     {
-        $this->DB_common();
+        parent::__construct();
     }
 
     // }}}

Modified: trunk/lib/pear/DB.php
===================================================================
--- trunk/lib/pear/DB.php	2015-12-14 10:03:50 UTC (rev 9747)
+++ trunk/lib/pear/DB.php	2016-01-05 20:16:20 UTC (rev 9748)
@@ -426,7 +426,7 @@
  * @author     Daniel Convissor <da...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.8.2
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  */
 class DB
@@ -577,7 +577,7 @@
      */
     function apiVersion()
     {
-        return '1.8.2';
+        return '1.9.2';
     }
 
     // }}}
@@ -941,7 +941,7 @@
  * @author     Stig Bakken <ss...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.8.2
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  */
 class DB_Error extends PEAR_Error
@@ -959,18 +959,32 @@
      *
      * @see PEAR_Error
      */
-    function DB_Error($code = DB_ERROR, $mode = PEAR_ERROR_RETURN,
+    function __construct($code = DB_ERROR, $mode = PEAR_ERROR_RETURN,
                       $level = E_USER_NOTICE, $debuginfo = null)
     {
         if (is_int($code)) {
-            $this->PEAR_Error('DB Error: ' . DB::errorMessage($code), $code,
+            parent::__construct('DB Error: ' . DB::errorMessage($code), $code,
                               $mode, $level, $debuginfo);
         } else {
-            $this->PEAR_Error("DB Error: $code", DB_ERROR,
+            parent::__construct("DB Error: $code", DB_ERROR,
                               $mode, $level, $debuginfo);
         }
     }
 
+    /**
+     * Workaround to both avoid the "Redefining already defined constructor"
+     * PHP error and provide backward compatibility in case someone is calling
+     * DB_Error() dynamically
+     */
+    public function __call($method, $arguments)
+    {
+        if ($method == 'DB_Error') {
+            return call_user_func_array(array($this, '__construct'), $arguments);
+        }
+        trigger_error(
+            'Call to undefined method DB_Error::' . $method . '()', E_USER_ERROR
+        );
+    }
     // }}}
 }
 
@@ -988,7 +1002,7 @@
  * @author     Stig Bakken <ss...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.8.2
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  */
 class DB_result
@@ -1095,7 +1109,7 @@
      *
      * @return void
      */
-    function DB_result(&$dbh, $result, $options = array())
+    function __construct(&$dbh, $result, $options = array())
     {
         $this->autofree    = $dbh->options['autofree'];
         $this->dbh         = &$dbh;
@@ -1453,7 +1467,7 @@
  * @author     Stig Bakken <ss...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.8.2
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  * @see        DB_common::setFetchMode()
  */
@@ -1468,7 +1482,7 @@
      *
      * @return void
      */
-    function DB_row(&$arr)
+    function __construct(&$arr)
     {
         foreach ($arr as $key => $value) {
             $this->$key = &$arr[$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:[9747] trunk/admin/odt2phpwiki.xsl

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

Revision: 9747
          http://sourceforge.net/p/phpwiki/code/9747
Author:   vargenau
Date:     2015-12-14 10:03:50 +0000 (Mon, 14 Dec 2015)
Log Message:
-----------
No space at end of line

Modified Paths:
--------------
    trunk/admin/odt2phpwiki.xsl

Modified: trunk/admin/odt2phpwiki.xsl
===================================================================
--- trunk/admin/odt2phpwiki.xsl	2015-12-14 09:20:05 UTC (rev 9746)
+++ trunk/admin/odt2phpwiki.xsl	2015-12-14 10:03:50 UTC (rev 9747)
@@ -17,7 +17,7 @@
 
     You should have received a copy of the GNU General Public License along
     with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.	
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
     This program is based on the OpenDocument to Mediawiki converter by
     Bernhard Haumacher.
@@ -91,22 +91,22 @@
 		match="//text:list-style"
 		use="@style:name"
 	/>
-	
+
 	<key
 		name="font-face-ref"
 		match="//style:font-face"
 		use="@style:name"
 	/>
-	
+
 	<key
 		name="reference-resolution"
 		match="//text:reference-mark | //text:reference-mark-start"
 		use="@text:name"
 	/>
-	
 
+
 	<!-- Wiki style constants. -->
-	
+
 	<!-- Bold character style. -->
 	<variable name="BOLD_BIT" select="1"/>
 
@@ -121,7 +121,7 @@
 
 	<!-- Typewriter character style. -->
 	<variable name="TYPEWRITER_BIT" select="16"/>
-	
+
 	<!-- Preformatted text paragraph style. -->
 	<variable name="CODE_BIT" select="32"/>
 
@@ -130,7 +130,7 @@
 
 	<!-- Right aligned paragraph style. -->
 	<variable name="RIGHT_BIT" select="128"/>
-	
+
 	<!-- Constant defining the empty style. -->
 	<variable name="NO_STYLE" select="0"/>
 
@@ -169,11 +169,11 @@
 			<value-of select="$NL"/>
 		</if>
 	</template>
-	
+
 	<template name="mk-list-token">
 		<param name="list-style"/>
 		<param name="level"/>
-		
+
 		<if test="$level &gt; 1">
 			<call-template name="mk-list-token">
 				<with-param name="list-style" select="$list-style"/>
@@ -223,7 +223,7 @@
 
 	<!--
 		Function generating a wiki heading prefix.
-		
+
 		@param level
 			The heading level. The value must be between 1 and 5.
 	-->
@@ -247,7 +247,7 @@
 	<!--
 		Function generating a token consisting of the given character
 		repeated 'level' times.
-		
+
 		@param level
 			The lengh of the result.
 		@param char
@@ -264,8 +264,8 @@
 			</call-template>
 		</if>
 	</template>
-	
-	
+
+
 	<!--
 		== Tables ==
 	 -->
@@ -346,7 +346,7 @@
 				<value-of select="$link-label"/>
 				<text>]</text>
 			</when>
-			
+
 			<otherwise>
 				<apply-templates/>
 			</otherwise>
@@ -373,8 +373,8 @@
 		</choose>
 		<value-of select="']]'"/>
 	</template>
-	
-	
+
+
 	<!--
 		== Paragraphs ==
 	 -->
@@ -392,7 +392,7 @@
 			select="($style mod (2 * $CENTER_BIT)) - ($style mod ($CENTER_BIT)) != 0"/>
 		<variable name="right"
 			select="($style mod (2 * $RIGHT_BIT)) - ($style mod ($RIGHT_BIT)) != 0"/>
-		
+
 		<choose>
 			<when test="$center">
 				<text>&lt;div align="center"&gt;</text>
@@ -404,7 +404,7 @@
 				<value-of select="' '"/>
 			</when>
 		</choose>
-	
+
 		<apply-templates/>
 
 		<choose>
@@ -434,10 +434,10 @@
 							<with-param name="node" select="$paragraph-right"/>
 						</call-template>
 					</variable>
-			
+
 					<variable name="code-right"
 						select="($style-right mod (2 * $CODE_BIT)) - ($style-right mod ($CODE_BIT)) != 0"/>
-				
+
 					<value-of select="$NL"/>
 					<if test="$code-right">
 						<value-of select="' '"/>
@@ -460,7 +460,7 @@
 	<!--
 		== Preformatted text ==
 	-->
-	
+
 	<template match="text:s">
 		<variable name="style">
 			<call-template name="mk-style-set">
@@ -470,7 +470,7 @@
 
 		<variable name="code"
 			select="($style mod (2 * $CODE_BIT)) - ($style mod ($CODE_BIT)) != 0"/>
-		
+
 		<if test="$code">
 			<choose>
 				<when test="@text:c">
@@ -485,7 +485,7 @@
 			</choose>
 		</if>
 	</template>
-	
+
 	<template match="text:line-break">
 		<variable name="style">
 			<call-template name="mk-style-set">
@@ -495,7 +495,7 @@
 
 		<variable name="code"
 			select="($style mod (2 * $CODE_BIT)) - ($style mod ($CODE_BIT)) != 0"/>
-		
+
 		<if test="$code">
 			<value-of select="$NL"/>
 			<value-of select="' '"/>
@@ -505,10 +505,10 @@
 	<!--
 		Footnotes
 	-->
-	
+
 	<template match="text:note-body">
 		<variable name="note" select="./parent::text:note"/>
-		
+
 		<if test="$note/@text:note-class = 'footnote'">
 			<text>&lt;ref name="</text>
 			<value-of select="$note/@text:id"/>
@@ -517,140 +517,140 @@
 			<text>&lt;/ref&gt;</text>
 		</if>
 	</template>
-	
+
 	<template match="text:note-ref[@text:note-class='footnote']">
 		<text>&lt;ref name="</text>
 		<value-of select="@text:ref-name"/>
 		<text>"/&gt;</text>
 	</template>
-	
-	
+
+
 	<!--
 		== Images ==
 	-->
-	
- 	<template match="draw:text-box[boolean(.//draw:image)]">
- 		<variable name="image" select=".//draw:image[1]"/>
- 		
- 		<variable name="image-description">
- 			<apply-templates/>
- 		</variable>
- 		
- 		<text>[[</text>
+
+	<template match="draw:text-box[boolean(.//draw:image)]">
+		<variable name="image" select=".//draw:image[1]"/>
+
+		<variable name="image-description">
+			<apply-templates/>
+		</variable>
+
+		<text>[[</text>
 		<call-template name="mk-image-name">
 			<with-param name="image" select="$image"/>
 		</call-template>
- 		<text>|thumb|</text>
+		<text>|thumb|</text>
 		<value-of select="normalize-space($image-description)"/>
- 		<text>]]</text>
- 	</template>
- 	
- 	<template match="draw:image[not(boolean(ancestor::draw:text-box))]">
- 		<text>[[</text>
+		<text>]]</text>
+	</template>
+
+	<template match="draw:image[not(boolean(ancestor::draw:text-box))]">
+		<text>[[</text>
 		<call-template name="mk-image-name">
 			<with-param name="image" select="."/>
 		</call-template>
- 		<text>]]</text>
- 	</template>
+		<text>]]</text>
+	</template>
 
 	<template name="mk-image-name">
 		<param name="image"/>
-		
- 		<variable name="base-name">
- 			<call-template name="mk-base-name">
- 				<with-param name="href" select="$image/@xlink:href"/>
- 			</call-template>
- 		</variable>
- 		
+
+		<variable name="base-name">
+			<call-template name="mk-base-name">
+				<with-param name="href" select="$image/@xlink:href"/>
+			</call-template>
+		</variable>
+
 		<if test="not(starts-with($base-name, 'Image:'))">
 			<value-of select="'Image:'"/>
 		</if>
 		<value-of select="$base-name"/>
-	</template>	
- 	
- 	<template name="mk-base-name">
- 		<param name="href"/>
- 		
- 		<variable name="result" select="substring-after($href, '/')"/>
- 		<choose>
- 			<when test="boolean($result)">
- 				<call-template name="mk-base-name">
- 					<with-param name="href" select="$result"/>
- 				</call-template>
- 			</when>
- 			<otherwise>
- 				<value-of select="$href"/>
- 			</otherwise>
- 		</choose>
- 	</template>
- 	
- 	
- 	<!--
- 		References
- 	 -->
- 	
+	</template>
+
+	<template name="mk-base-name">
+		<param name="href"/>
+
+		<variable name="result" select="substring-after($href, '/')"/>
+		<choose>
+			<when test="boolean($result)">
+				<call-template name="mk-base-name">
+					<with-param name="href" select="$result"/>
+				</call-template>
+			</when>
+			<otherwise>
+				<value-of select="$href"/>
+			</otherwise>
+		</choose>
+	</template>
+
+
+	<!--
+		References
+	 -->
+
 	<!-- TODO: text:bibliography-mark -->
 
- 	<template match="text:reference-ref">
- 		<variable name="reference-mark" select="key('reference-resolution', @text:ref-name)"/>
- 		
- 		<choose>
- 			<when test="boolean($reference-mark)">
-		 		<!--
-		 			In wiki syntax, only a local reference to a heading can be inserted.
-		 			If the link target is a descendant of a heading element, a link can be
-		 			inserted in the result. -->
-		 		<variable name="header-anchor" select="$reference-mark/ancestor::text:h[1]"/>
-		 		<if test="boolean($header-anchor)">
-		 			<text>[[#</text>
-		 			<value-of select="string($header-anchor)"/>
-		 			<text>|</text>
-		 		</if>
-		 		
-		 		<variable name="reference-text" select="string(.)"/>
-		 		
-		 		<choose>
-		 			<!-- Check, whether the reference text is cached in the document. -->
-		 			<when test="string-length($reference-text) &gt; 0">
-		 				<value-of select="$reference-text"/>
-		 			</when>
-		 			
-		 			<otherwise>
-		 				<!--
-		 					TODO: Evaluate the @text:reference-format attribute and
-		 					generate the replacement text (difficult).-->
-		 				<text>(REFERENCE TEXT UNAVAILABLE: "</text>
-		 				<value-of select="@text:ref-name"/>
-		 				<text>")</text>
-		 			</otherwise>
-		 		</choose>
-		 		
-		 		<if test="boolean($header-anchor)">
-		 			<text>]]</text>
-		 		</if>
- 			</when>
+	<template match="text:reference-ref">
+		<variable name="reference-mark" select="key('reference-resolution', @text:ref-name)"/>
 
- 			<otherwise>
- 				<text>(UNDEFINED REFERENCE: "</text>
- 				<value-of select="@text:ref-name"/>
- 				<text>")</text>
- 			</otherwise>
- 		</choose>
- 	</template>
- 	
- 	<template match="text:reference-mark">
- 		<!-- TODO: Output an anchor. -->
- 		<apply-templates/>
- 	</template>
+		<choose>
+			<when test="boolean($reference-mark)">
+				<!--
+					In wiki syntax, only a local reference to a heading can be inserted.
+					If the link target is a descendant of a heading element, a link can be
+					inserted in the result. -->
+				<variable name="header-anchor" select="$reference-mark/ancestor::text:h[1]"/>
+				<if test="boolean($header-anchor)">
+					<text>[[#</text>
+					<value-of select="string($header-anchor)"/>
+					<text>|</text>
+				</if>
 
- 	<template match="text:reference-mark-start">
- 		<!-- TODO: Output an anchor. -->
- 	</template>
+				<variable name="reference-text" select="string(.)"/>
 
+				<choose>
+					<!-- Check, whether the reference text is cached in the document. -->
+					<when test="string-length($reference-text) &gt; 0">
+						<value-of select="$reference-text"/>
+					</when>
+
+					<otherwise>
+						<!--
+							TODO: Evaluate the @text:reference-format attribute and
+							generate the replacement text (difficult).-->
+						<text>(REFERENCE TEXT UNAVAILABLE: "</text>
+						<value-of select="@text:ref-name"/>
+						<text>")</text>
+					</otherwise>
+				</choose>
+
+				<if test="boolean($header-anchor)">
+					<text>]]</text>
+				</if>
+			</when>
+
+			<otherwise>
+				<text>(UNDEFINED REFERENCE: "</text>
+				<value-of select="@text:ref-name"/>
+				<text>")</text>
+			</otherwise>
+		</choose>
+	</template>
+
+	<template match="text:reference-mark">
+		<!-- TODO: Output an anchor. -->
+		<apply-templates/>
+	</template>
+
+	<template match="text:reference-mark-start">
+		<!-- TODO: Output an anchor. -->
+	</template>
+
 	<!--
 		== Plain text ==
 	-->
-	
+
 	<template match="text:p/text() | text:h/text() | text:span/text() | text:sequence/text() | text:sequence-ref/text() | text:a/text() | text:bookmark-ref/text() | text:reference-mark/text()">
 		<choose>
 			<when test="boolean(./ancestor::table:table-header-rows | ./ancestor::text:h)">
@@ -659,14 +659,14 @@
 					because those styles are consistently declared by the Wiki engine. -->
 				<value-of select="."/>
 			</when>
-			
+
 			<when test="string-length(.) &gt; 0">
 				<variable name="style">
 					<call-template name="mk-style-set">
 						<with-param name="node" select="."/>
 					</call-template>
 				</variable>
-				
+
 				<variable name="current-paragraph"
 					select="./ancestor::text:p[1]"/>
 				<variable name="paragraph-id"
@@ -675,7 +675,7 @@
 					select="$current-paragraph/descendant::draw:frame"/>
 				<variable name="frame-count"
 					select="count($frames)"/>
-					
+
 				<!--
 					The current style context consists of all text nodes that are
 					descendants of the paragraph ancestor of this text node but not
@@ -829,7 +829,7 @@
 	<!--
 		Function for looking up the position of a node identified by the given
 		'current-id' within a node set 'context'.
-		
+
 		The search starts with the the index 'test-index'. The search is recursive
 		in the 'test-index' argument. To save recursion depth, each recursive call
 		iteratively tests a fixed number of indexes (by loop unrolling).
@@ -838,9 +838,9 @@
 		<param name="current-id"/>
 		<param name="context"/>
 		<param name="test-index"/>
-		
+
 		<variable name="context-size" select="count($context)"/>
-		
+
 		<choose>
 			<when test="context-size &lt; $test-index">
 			</when>
@@ -883,10 +883,10 @@
 			</otherwise>
 		</choose>
 	</template>
-	
+
 	<template name="render-quoted-text">
 		<param name="text"/>
-		
+
 		<choose>
 			<when test="contains($text, '&lt;') or contains($text, '[') or starts-with($text, '----') or starts-with($text, '=') or starts-with($text, '*')  or starts-with($text, ';')  or starts-with($text, '#')">
 				<text>&lt;nowiki&gt;</text>
@@ -900,7 +900,7 @@
 						<value-of select="$text"/>
 					</otherwise>
 				</choose>
-				<text>&lt;/nowiki&gt;</text>			
+				<text>&lt;/nowiki&gt;</text>
 			</when>
 			<otherwise>
 				<value-of select="$text"/>
@@ -910,7 +910,7 @@
 
 	<template name="render-escaped-text">
 		<param name="text"/>
-		
+
 		<choose>
 			<when test="contains($text, '&lt;')">
 				<value-of select="substring-before($text, '&lt;')"/>
@@ -930,12 +930,12 @@
 
 	<template name="mk-style-set">
 		<param name="node"/>
-		
+
 		<variable
 			name="context"
 			select="$node/ancestor-or-self::*[@text:style-name][1]"
 		/>
-		
+
 		<choose>
 			<when test="boolean($context)">
 				<variable
@@ -943,7 +943,7 @@
 					select="key('style-ref', $context/@text:style-name)"
 				/>
 
-				<!-- Debugging: Print inspected styles. -->				
+				<!-- Debugging: Print inspected styles. -->
 				<!--
 				<message>
 					<value-of select="'=== '"/>
@@ -951,7 +951,7 @@
 					<value-of select="' ==='"/>
 				</message>
 				 -->
-		
+
 				<call-template name="mk-style-set-internal">
 					<with-param name="node" select="$context"/>
 					<with-param name="style" select="$style"/>
@@ -964,11 +964,11 @@
 			</otherwise>
 		</choose>
 	</template>
-	
+
 	<!--
 		Compute the wiki style set that corresponds
 		to the given office style at the given context node.
-		
+
 		@param node
 			A node in which context the style is computed. If neither the given style
 			nor one of its linked styles does specify a style of the given type,
@@ -981,7 +981,7 @@
 		@style-mask
 			A bit set of styles that must not be taken from the currently inspected
 			style, because those styles are already defined by the context.
-			
+
 		@return A bit set composed of the wiki style constants.
 	-->
 	<template name="mk-style-set-internal">
@@ -989,9 +989,9 @@
 		<param name="style"/>
 		<param name="style-set"/>
 		<param name="style-mask"/>
-		
+
 		<variable name="text-properties" select="$style/style:text-properties"/>
-		
+
 		<!-- Decompose style-mask into individual bits. -->
 		<variable name="bold-requested"
 			select="($style-mask mod (2 * $BOLD_BIT)) = 0"/>
@@ -1009,7 +1009,7 @@
 			select="($style-mask mod (2 * $CENTER_BIT)) - ($style-mask mod ($CENTER_BIT)) = 0"/>
 		<variable name="right-requested"
 			select="($style-mask mod (2 * $RIGHT_BIT)) - ($style-mask mod ($RIGHT_BIT)) = 0"/>
-		
+
 		<!-- Extract styles that are not already defined by the context. -->
 		<variable name="bold-style">
 			<choose>
@@ -1036,7 +1036,7 @@
 				</otherwise>
 			</choose>
 		</variable>
-		
+
 		<variable name="italic-style">
 			<choose>
 				<when test="$italic-requested and boolean($text-properties/@fo:font-style='italic')">
@@ -1165,7 +1165,7 @@
 				</otherwise>
 			</choose>
 		</variable>
-		
+
 		<variable name="center-style">
 			<choose>
 				<when test="$center-requested and ($style/@style:family='paragraph') and boolean($style/style:paragraph-properties/@fo:text-align='center')">
@@ -1207,8 +1207,8 @@
 				</otherwise>
 			</choose>
 		</variable>
-		
 
+
 		<!-- Compute the updated styles and mask. -->
 		<!--
 			Note: The bit masks style-mask, bold-style, italic-style,... are
@@ -1232,7 +1232,7 @@
 			</when>
 			<otherwise>
 				<variable name="ancestors" select="$node/ancestor::*[@text:style-name][1]"/>
-				
+
 				<!-- Debugging: Print currently inspected style.  -->
 				<!--
 				<message>
@@ -1250,7 +1250,7 @@
 					<value-of select="'}'"/>
 				</message>
 				 -->
-				
+
 				<!--
 					If there is an ancestor that has a style, use that style,
 					otherwise, a style is not found. -->
@@ -1289,7 +1289,7 @@
 			<value-of select="$NL"/>
 		</if>
 	</template>
-	
+
 	<template match="office:document-content">
 		<apply-templates/>
 	</template>

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

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

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

Revision: 9746
          http://sourceforge.net/p/phpwiki/code/9746
Author:   vargenau
Date:     2015-12-14 09:20:05 +0000 (Mon, 14 Dec 2015)
Log Message:
-----------
No space at end of line

Modified Paths:
--------------
    trunk/GoogleSearch.wsdl
    trunk/INSTALL
    trunk/README
    trunk/TODO
    trunk/UPGRADING
    trunk/admin/README
    trunk/admin/odt2phpwiki.xsl
    trunk/config/config-default.ini
    trunk/config/config-dist.ini
    trunk/config/two-level-tlds
    trunk/doc/CREDITS
    trunk/doc/HISTORY
    trunk/doc/INSTALL.MacOSX
    trunk/doc/INSTALL.flatfile
    trunk/doc/INSTALL.mSQL
    trunk/doc/INSTALL.mssqlnative
    trunk/doc/INSTALL.mysql
    trunk/doc/INSTALL.oci8
    trunk/doc/INSTALL.pgsql
    trunk/doc/INSTALL.sqlite
    trunk/doc/README.coding
    trunk/doc/README.foaf
    trunk/doc/README.phpwiki-auth
    trunk/doc/README.phpwiki-cache
    trunk/doc/THEMES
    trunk/lib/interwiki.map
    trunk/lib/main.php
    trunk/lib/stdlib.php
    trunk/locale/Makefile
    trunk/locale/de/pgsrc/Vorlage%2FBeispiel
    trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto
    trunk/locale/fr/pgsrc/Aide%2FPluginM%C3%A9t%C3%A9oPhp
    trunk/locale/it/pgsrc/NoteDiRilascio
    trunk/locale/po/de.po
    trunk/pgsrc/GeneralDisclaimer
    trunk/pgsrc/Help%2FSyntaxHighlighterPlugin
    trunk/pgsrc/ReleaseNotes
    trunk/schemas/mssql-initialize.sql
    trunk/schemas/mysql-1_3_11.sql
    trunk/schemas/mysql-initialize.sql
    trunk/schemas/oci8-destroy.sql
    trunk/schemas/oci8-initialize.sql
    trunk/schemas/psql-1_3_12.sql
    trunk/schemas/psql-initialize.sql
    trunk/schemas/psql-tsearch2.sql
    trunk/schemas/sqlite-initialize.sql
    trunk/schemas/sqlsrv-initialize.sql
    trunk/themes/MonoBook/wikibits.js
    trunk/themes/README
    trunk/themes/default/ASCIIsvg.js
    trunk/themes/default/ajax.js
    trunk/themes/default/templates/README
    trunk/themes/wikilens/images/README
    trunk/themes/wikilens/wikilens.js
    trunk/wiki

Modified: trunk/GoogleSearch.wsdl
===================================================================
--- trunk/GoogleSearch.wsdl	2015-12-11 10:01:05 UTC (rev 9745)
+++ trunk/GoogleSearch.wsdl	2015-12-14 09:20:05 UTC (rev 9746)
@@ -17,9 +17,9 @@
   <!-- Types for search - result elements, directory categories -->
 
   <types>
-    <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" 
+    <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
                 targetNamespace="urn:GoogleSearch">
-            
+
       <xsd:complexType name="GoogleSearchResult">
         <xsd:all>
           <xsd:element name="documentFiltering"           type="xsd:boolean"/>
@@ -49,7 +49,7 @@
           <xsd:element name="directoryTitle" type="xsd:string"/>
         </xsd:all>
       </xsd:complexType>
-  
+
       <xsd:complexType name="ResultElementArray">
         <xsd:complexContent>
           <xsd:restriction base="soapenc:Array">
@@ -74,10 +74,10 @@
       </xsd:complexType>
 
     </xsd:schema>
-  </types> 
+  </types>
 
   <!-- Messages for Google Web APIs - cached page, search, spelling. -->
-             
+
   <message name="doGetCachedPage">
     <part name="key"            type="xsd:string"/>
     <part name="url"            type="xsd:string"/>
@@ -110,7 +110,7 @@
   </message>
 
   <message name="doGoogleSearchResponse">
-    <part name="return"         type="typens:GoogleSearchResult"/>           
+    <part name="return"         type="typens:GoogleSearchResult"/>
   </message>
 
   <!-- Port for Google Web APIs, "GoogleSearch" -->

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2015-12-11 10:01:05 UTC (rev 9745)
+++ trunk/INSTALL	2015-12-14 09:20:05 UTC (rev 9746)
@@ -5,7 +5,7 @@
 All users of PHP are strongly encouraged to upgrade to
 PHP 5.3.29 or to PHP 5.4 or 5.5.
 
-Visit <http://www.php.net> and <http://php.net/downloads.php> 
+Visit <http://www.php.net> and <http://php.net/downloads.php>
 for downloads and information.
 
 You need the Perl regular expressions package compiled in; this is the

Modified: trunk/README
===================================================================
--- trunk/README	2015-12-11 10:01:05 UTC (rev 9745)
+++ trunk/README	2015-12-14 09:20:05 UTC (rev 9746)
@@ -36,8 +36,8 @@
 For a list of current bugs see:
   https://sourceforge.net/bugs/?group_id=6121
 
-The fastest and out-of-the-box version uses DATABASE_TYPE=dba, 
-a dbm file in the /tmp directory; you may wish a more permanent 
+The fastest and out-of-the-box version uses DATABASE_TYPE=dba,
+a dbm file in the /tmp directory; you may wish a more permanent
 place for yours, but make sure it's read/writable by your web server!
 
 NOTE: Not all database versions are equal. The MySQL and Postgresql

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2015-12-11 10:01:05 UTC (rev 9745)
+++ trunk/TODO	2015-12-14 09:20:05 UTC (rev 9746)
@@ -24,9 +24,9 @@
 * Move serialized data from page_data / version_data to separate SQL columns.
 * WikiDB hooks. (?)
 * Content expansion hooks in transformer. (SearchHighlight)
-* Convert RecentChanges to PageList as source for format options. 
+* Convert RecentChanges to PageList as source for format options.
   Generic rss, rdf handling.
-* embedd basic RDF in XHTML (dc, foaf, ...) for GRDDL. 
+* embedd basic RDF in XHTML (dc, foaf, ...) for GRDDL.
 * Do Microformats automatically? It's a stupid hack so support it only optionally.
   ToDo: for Calendar, CalendarList, FoafPlugin
 
@@ -44,7 +44,7 @@
 * support missing REST interfaces (optional): action=remove => DELETE,
   action=editpage and minor updates (rating,...) => PUT.
   with fallbacks to POST
-* format=mm (FreeMind) for RecentChanges, SemanticWeb's and simple PageList's. 
+* format=mm (FreeMind) for RecentChanges, SemanticWeb's and simple PageList's.
   See http://wikkawiki.org/FreeMind. Maybe format=mmap for the commercial MindMap.
 * Spellcheck AJAX backend (see DokuWiki)
 * GeSHi Highlighter plugin
@@ -52,7 +52,7 @@
 fixes:
 * fix pagelist nopage unification (store just key as names?)
 * pcre textsearch with multiple words: order-independency
-* SQL textsearch with multiple words: AND 
+* SQL textsearch with multiple words: AND
   (the two new failing unit tests)
 * fix textsearch optimize with "word -word -word"
 
@@ -96,7 +96,7 @@
 * pdf button when an external html2pdf app is defined
   (enabled at PhpWikiDemo)
 * enhanced WikiPluginCached (static, ondemand)
-* added LdapSearchPlugin 
+* added LdapSearchPlugin
 * more PageList options
 
 2004-11-10 20:25:13 rurban
@@ -116,7 +116,7 @@
 2004-11-09 18:10:22 rurban
 * revert to the wikidb ref passing. there's no memory abuse there.
 * use new wikidb->_cache->_id_cache[] instead of wikidb->_iwpcache, to effectively
-  store page ids with getPageLinks (GleanDescription) of all existing pages, which 
+  store page ids with getPageLinks (GleanDescription) of all existing pages, which
   are also needed at the rendering for linkExistingWikiWord().
   pass options to pageiterator.
   use this cache also for _get_pageid()
@@ -129,12 +129,12 @@
     * fix more sf.net bugs and patches (90%)
     * fix LDAP with USER_AUTH_POLICY=old (100%)
     * ADODB lock and transaction fixes (50%)
-    * some more theme beautification, new crao and nuke theme, 
+    * some more theme beautification, new crao and nuke theme,
       cut or split long sidebar links somehow (100%)
-    * add some basic Recommender engine to enable rating recommendations, 
+    * add some basic Recommender engine to enable rating recommendations,
       fix metadata getAvg and test it. (100%)
     * fix metadata RateIt methods and RateIt usergroups, (100%)
-    * rewrite WikiGroup to be current_user independent to be able 
+    * rewrite WikiGroup to be current_user independent to be able
       to ask for group membership of any user. (100%)
     * more action=upgrade (diffs, multi-page interface) (60%)
     * finish PdfOutput plugin and button (80%)
@@ -151,7 +151,7 @@
 
     * fix WikiAdminSetAcl (least common ACL denominator) (100%)
     * enable ACL's in the mime dumps (100%)
-    * force strict PagePermissions on all plugins, which require now 
+    * force strict PagePermissions on all plugins, which require now
       admin and some more administrative actions (90%)
     * complete full paging support (limit=, prev/next buttons in PageList) (95%)
       fix paging in MostPopular

Modified: trunk/UPGRADING
===================================================================
--- trunk/UPGRADING	2015-12-11 10:01:05 UTC (rev 9745)
+++ trunk/UPGRADING	2015-12-14 09:20:05 UTC (rev 9746)
@@ -1,6 +1,6 @@
-To migrate to a new phpwiki installation you might want to backup your old pages 
-(best via a zip dump), configure your new installation, and restore the old 
-pages in PhpWikiAdministration. 
+To migrate to a new phpwiki installation you might want to backup your old pages
+(best via a zip dump), configure your new installation, and restore the old
+pages in PhpWikiAdministration.
 UPGRADING from 1.3.7 on requires just ?action=upgrade.
 
 Can't unpack bad cached markup. Probably php_zlib extension not loaded.
@@ -10,16 +10,16 @@
 
 ?action=upgrade
 ===============
-To upgrade default pages, the database and some config settings 
+To upgrade default pages, the database and some config settings
 add "?action=upgrade" to your HomePage url and press "Enter", which will
 do most of the upgrades automatically.
 
-You might need to enter the DBADMIN_USER and DBADMIN_PASSWD in 
+You might need to enter the DBADMIN_USER and DBADMIN_PASSWD in
 config/config.ini for SQL databases and default permissions.
 
-The importer looks at the Date header of the page. In your current wikidb 
+The importer looks at the Date header of the page. In your current wikidb
 against the creation date of the pgsrc, you want to import.
-If you changed your pages after I changed the pgsrc pages, 
+If you changed your pages after I changed the pgsrc pages,
 they will not be upgraded.
 
 Or just upgrade your configuration as described below.
@@ -34,38 +34,38 @@
 
 UPGRADING from 1.3.9
 ======================
-At first you have to manually create a config/config.ini based on 
+At first you have to manually create a config/config.ini based on
 config-dist.ini and your previous index.php. We don't have a script,
 to do that automatically.
 
 mysql:
   ALTER TABLE page CHANGE id id INT NOT NULL AUTO_INCREMENT;
-NOTE: ?action=upgrade does this also, if your mysql user has the 
+NOTE: ?action=upgrade does this also, if your mysql user has the
 ALTER permissions or DBADMIN_USER and DBADMIN_PASSWD are set.
 
 UPGRADING from 1.3.7
 ======================
 mysql + postgres:
   ALTER TABLE session ADD sess_ip CHAR(15) NOT NULL;
-  CREATE INDEX sess_date ON session (sess_date); 
+  CREATE INDEX sess_date ON session (sess_date);
 
 postgres:
-  New pref and session tables have been added for more 
+  New pref and session tables have been added for more
   efficiency.
 
 user and themes:
 
-WikiUser and signin.tmpl changed from $user->getId() to 
+WikiUser and signin.tmpl changed from $user->getId() to
 $user->getAuthenticatedId()
-Authenticated reflects the level (confirmed by password), 
+Authenticated reflects the level (confirmed by password),
 Signed just the username (possibly by cookie only)
 
 pgsrc:
 
-To upgrade not-existing pages add "?action=upgrade" to 
+To upgrade not-existing pages add "?action=upgrade" to
 your HomePage url and press "Enter", which will
 add all fresh pages from pgsrc to your pageset.
-If you deleted some pages on purpose, you'll have to removed 
+If you deleted some pages on purpose, you'll have to removed
 them again with PhpWikiAdministration/Remove then.
 
 There's no smart "Merge Diffs" yet to upgrade existing docs,
@@ -83,17 +83,17 @@
 
 FIXME: add more.
 
-Here's an excerpt from a note I posted on phpwiki-talk with my 
-recommendation on how to move a wiki from and older version of 
+Here's an excerpt from a note I posted on phpwiki-talk with my
+recommendation on how to move a wiki from and older version of
 PhpWiki to a 1.3.x PhpWiki:
 
 From: Jeff Dairiki <da...@da...>
 Cc: php...@li...
 Date: Fri, 9 Nov 2001 11:33:18 -0800
 
-> Now, say I want to migrate all my 1.2.1 pages. I need to do a zip dump 
+> Now, say I want to migrate all my 1.2.1 pages. I need to do a zip dump
 > (does the admin page let me do that?) and then.... what?
- 
+
 It's still a bit of a messy process at this point.  Here's my suggestion.
 
 1. Start 1.3.x with an empty database.  Browse the FrontPage.  This should
@@ -101,7 +101,7 @@
 already gotten this far.)
 
 2. Make a zip dump of your 1.2 wiki.  If the contents of
-PhpWikiAdministration are correct there should be a links 
+PhpWikiAdministration are correct there should be a links
 (near the top) which will do that for you.  You need to be
 in admin mode, though.  This means you must have set an
 admin user and passwd in admin.php, and you should be browsing
@@ -127,7 +127,7 @@
 If that works, the pages from your 1.2 wiki have now overwritten
 the 1.3 pages (though the 1.3 pages are still saved in the archive).
 This will break a bunch of 1.3 functionality until you restore
-the page contents.  Of the top of my head, some pages for which 
+the page contents.  Of the top of my head, some pages for which
 this will be an issue are:
   MostPopular, RecentChanges, PhpWikiAdministration,
   MagicPhpWikiURLs, and ReleaseNotes.
@@ -142,7 +142,7 @@
 (at the bottom of the page).  This should get you a list of all
 archived versions of the page.
 
-4c. Browse to the archive 1.3 version of the page (probably version 
+4c. Browse to the archive 1.3 version of the page (probably version
 number 1) by clicking on the version number of the desired version.
 
 4d. Click the "Edit old revision" button (bottom of page).  This should

Modified: trunk/admin/README
===================================================================
--- trunk/admin/README	2015-12-11 10:01:05 UTC (rev 9745)
+++ trunk/admin/README	2015-12-14 09:20:05 UTC (rev 9746)
@@ -2,7 +2,7 @@
 
 It is recommended to do daily backups of your database and/or your wiki pages.
 
-In this directory are some sample scripts, which could help to setup your 
+In this directory are some sample scripts, which could help to setup your
 cronjobs, on the server or even remotely (zipdump or dumpserial).
 
   # berkeley db backup
@@ -43,9 +43,9 @@
     <input name="P" size="18" maxlength="256"
       value="<?php echo $s?>"
       onfocus="if (this.value == '<?php echo _("Search")?>') {this.value = '';}"
-      onmouseout="window.status=''; return true;" 
+      onmouseout="window.status=''; return true;"
       onmouseover="window.status='<?php echo _("Quick Search")?>'; return true;"
-      type="text" id="search2" 
+      type="text" id="search2"
       title="<?php echo _("Search term(s)") ?>" />
     <div align="right" style="padding-right:10px;">
       <input type="submit" name="searchtype" value="fulltext" class="searchButton" title="External Fulltext Search">

Modified: trunk/admin/odt2phpwiki.xsl
===================================================================
--- trunk/admin/odt2phpwiki.xsl	2015-12-11 10:01:05 UTC (rev 9745)
+++ trunk/admin/odt2phpwiki.xsl	2015-12-14 09:20:05 UTC (rev 9746)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- 
+<!--
     odt2phpwiki: OpenDocument to Phpwiki transformation
     Copyright (C) 2007  Bernhard Haumacher (haui at haumacher dot de)
     Copyright (C) 2008-2009  Marc-Etienne Vargenau, Alcatel-Lucent
@@ -46,38 +46,38 @@
     ALONE BASIS."
 
 -->
-<stylesheet version="1.0" 
+<stylesheet version="1.0"
 	xmlns="http://www.w3.org/1999/XSL/Transform"
 
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
-	xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
-	xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
-	xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
-	xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
-	xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
-	xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
-	xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
-	xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
-	xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
-	xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
-	xmlns:xlink="http://www.w3.org/1999/xlink" 
-	xmlns:dc="http://purl.org/dc/elements/1.1/" 
-	xmlns:math="http://www.w3.org/1998/Math/MathML" 
-	xmlns:dom="http://www.w3.org/2001/xml-events" 
-	xmlns:xforms="http://www.w3.org/2002/xforms" 
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+	xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+	xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+	xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
+	xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
+	xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+	xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
+	xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+	xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+	xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
+	xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
+	xmlns:xlink="http://www.w3.org/1999/xlink"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:math="http://www.w3.org/1998/Math/MathML"
+	xmlns:dom="http://www.w3.org/2001/xml-events"
+	xmlns:xforms="http://www.w3.org/2002/xforms"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 >
-	<output 
-		method="text" 
-		media-type="text/plain" 
+	<output
+		method="text"
+		media-type="text/plain"
 		encoding="UTF-8"
 	/>
 
-	<!-- 
-		== Reference resolution == 
+	<!--
+		== Reference resolution ==
 	-->
 
 	<key
@@ -137,7 +137,7 @@
 	<!-- Constant defining the newline token. -->
 	<variable name="NL" select="'&#10;'"/>
 
-	<!-- 
+	<!--
 		Multiple pages (draw only)
 	-->
 
@@ -148,15 +148,15 @@
 	</template>
 
 
-	<!-- 
-		== Lists == 
+	<!--
+		== Lists ==
 	-->
 
 	<template match="text:list-item">
 		<if test="position() &gt; 1 or boolean(ancestor::text:list-item)">
 			<value-of select="$NL"/>
 		</if>
-		<variable name="list-style" 
+		<variable name="list-style"
 			select="key('list-style-ref',ancestor::text:list[boolean(@text:style-name)][1]/@text:style-name)"/>
 		<call-template name="mk-list-token">
 			<with-param name="list-style" select="$list-style"/>
@@ -201,7 +201,7 @@
 	</template>
 
 
-	<!-- 
+	<!--
 		== Headings ==
 	-->
 
@@ -221,7 +221,7 @@
 		</if>
 	</template>
 
-	<!-- 
+	<!--
 		Function generating a wiki heading prefix.
 		
 		@param level
@@ -244,8 +244,8 @@
 		</choose>
 	</template>
 
-	<!-- 
-		Function generating a token consisting of the given character 
+	<!--
+		Function generating a token consisting of the given character
 		repeated 'level' times.
 		
 		@param level
@@ -266,7 +266,7 @@
 	</template>
 	
 	
-	<!-- 
+	<!--
 		== Tables ==
 	 -->
 
@@ -320,8 +320,8 @@
 	</template>
 
 
-	<!-- 
-		== WikiMath == 
+	<!--
+		== WikiMath ==
 	 -->
 
 	<template match="text:span[@text:style-name='WikiMath']">
@@ -331,8 +331,8 @@
 	</template>
 
 
-	<!-- 
-		== Native links == 
+	<!--
+		== Native links ==
 	 -->
 
 	<template match="text:a">
@@ -354,8 +354,8 @@
 	</template>
 
 
-	<!-- 
-		== WikiLink == 
+	<!--
+		== WikiLink ==
 	 -->
 
 	<template match="text:span[@text:style-name='WikiLink']">
@@ -375,8 +375,8 @@
 	</template>
 	
 	
-	<!-- 
-		== Paragraphs == 
+	<!--
+		== Paragraphs ==
 	 -->
 
 	<template match="text:p[string-length(.) &gt; 0]">
@@ -386,11 +386,11 @@
 			</call-template>
 		</variable>
 
-		<variable name="code" 
+		<variable name="code"
 			select="($style mod (2 * $CODE_BIT)) - ($style mod ($CODE_BIT)) != 0"/>
-		<variable name="center" 
+		<variable name="center"
 			select="($style mod (2 * $CENTER_BIT)) - ($style mod ($CENTER_BIT)) != 0"/>
-		<variable name="right" 
+		<variable name="right"
 			select="($style mod (2 * $RIGHT_BIT)) - ($style mod ($RIGHT_BIT)) != 0"/>
 		
 		<choose>
@@ -416,13 +416,13 @@
 			</when>
 		</choose>
 
-		<variable name="paragraph-right" 
+		<variable name="paragraph-right"
 			select="./following-sibling::text:p[1]"/>
 
 		<if test="boolean($paragraph-right)">
-			<!-- 
-				Insert end of line only if not within a list. Within wiki lists, 
-				a line break leaves the current list item. 
+			<!--
+				Insert end of line only if not within a list. Within wiki lists,
+				a line break leaves the current list item.
 			-->
 			<choose>
 				<when test="boolean(ancestor::text:list-item)">
@@ -435,7 +435,7 @@
 						</call-template>
 					</variable>
 			
-					<variable name="code-right" 
+					<variable name="code-right"
 						select="($style-right mod (2 * $CODE_BIT)) - ($style-right mod ($CODE_BIT)) != 0"/>
 				
 					<value-of select="$NL"/>
@@ -457,8 +457,8 @@
 	</template>
 
 
-	<!-- 
-		== Preformatted text == 
+	<!--
+		== Preformatted text ==
 	-->
 	
 	<template match="text:s">
@@ -468,7 +468,7 @@
 			</call-template>
 		</variable>
 
-		<variable name="code" 
+		<variable name="code"
 			select="($style mod (2 * $CODE_BIT)) - ($style mod ($CODE_BIT)) != 0"/>
 		
 		<if test="$code">
@@ -493,7 +493,7 @@
 			</call-template>
 		</variable>
 
-		<variable name="code" 
+		<variable name="code"
 			select="($style mod (2 * $CODE_BIT)) - ($style mod ($CODE_BIT)) != 0"/>
 		
 		<if test="$code">
@@ -502,7 +502,7 @@
 		</if>
 	</template>
 
-	<!-- 
+	<!--
 		Footnotes
 	-->
 	
@@ -524,9 +524,9 @@
 		<text>"/&gt;</text>
 	</template>
 	
-	 
-	<!-- 
-		== Images == 
+	
+	<!--
+		== Images ==
 	-->
 	
  	<template match="draw:text-box[boolean(.//draw:image)]">
@@ -585,10 +585,10 @@
  	</template>
  	
  	
- 	<!-- 
+ 	<!--
  		References
  	 -->
- 	 
+ 	
 	<!-- TODO: text:bibliography-mark -->
 
  	<template match="text:reference-ref">
@@ -596,8 +596,8 @@
  		
  		<choose>
  			<when test="boolean($reference-mark)">
-		 		<!-- 
-		 			In wiki syntax, only a local reference to a heading can be inserted. 
+		 		<!--
+		 			In wiki syntax, only a local reference to a heading can be inserted.
 		 			If the link target is a descendant of a heading element, a link can be
 		 			inserted in the result. -->
 		 		<variable name="header-anchor" select="$reference-mark/ancestor::text:h[1]"/>
@@ -616,8 +616,8 @@
 		 			</when>
 		 			
 		 			<otherwise>
-		 				<!-- 
-		 					TODO: Evaluate the @text:reference-format attribute and 
+		 				<!--
+		 					TODO: Evaluate the @text:reference-format attribute and
 		 					generate the replacement text (difficult).-->
 		 				<text>(REFERENCE TEXT UNAVAILABLE: "</text>
 		 				<value-of select="@text:ref-name"/>
@@ -647,15 +647,15 @@
  		<!-- TODO: Output an anchor. -->
  	</template>
 
-	<!-- 
-		== Plain text == 
+	<!--
+		== Plain text ==
 	-->
 	
 	<template match="text:p/text() | text:h/text() | text:span/text() | text:sequence/text() | text:sequence-ref/text() | text:a/text() | text:bookmark-ref/text() | text:reference-mark/text()">
 		<choose>
 			<when test="boolean(./ancestor::table:table-header-rows | ./ancestor::text:h)">
-				<!-- 
-					No explicit styles within table headings or section headings, 
+				<!--
+					No explicit styles within table headings or section headings,
 					because those styles are consistently declared by the Wiki engine. -->
 				<value-of select="."/>
 			</when>
@@ -667,22 +667,22 @@
 					</call-template>
 				</variable>
 				
-				<variable name="current-paragraph" 
+				<variable name="current-paragraph"
 					select="./ancestor::text:p[1]"/>
-				<variable name="paragraph-id" 
+				<variable name="paragraph-id"
 					select="generate-id($current-paragraph)"/>
-				<variable name="frames" 
+				<variable name="frames"
 					select="$current-paragraph/descendant::draw:frame"/>
-				<variable name="frame-count" 
+				<variable name="frame-count"
 					select="count($frames)"/>
 					
-				<!-- 
-					The current style context consists of all text nodes that are 
-					descendants of the paragraph ancestor of this text node but not 
-					descendants of any frame nodes that are descendants of the current 
+				<!--
+					The current style context consists of all text nodes that are
+					descendants of the paragraph ancestor of this text node but not
+					descendants of any frame nodes that are descendants of the current
 					text nodes paragraph.
 				 -->
-				<variable name="context" 
+				<variable name="context"
 					select="$current-paragraph//text()[not(boolean(./ancestor::draw:frame[1]) and count(./ancestor::draw:frame[1] | $frames) = $frame-count)]"/>
 				<variable name="context-size" select="count($context)"/>
 
@@ -698,10 +698,10 @@
 					<choose>
 						<when test="$context-index &gt; 1">
 							<variable name="left" select="$context[$context-index - 1]"/>
-							<!-- 
-								The preceding text node is a child of this nodes topmost 
-								styled ancestor. This means that the result of the 
-								transformation will be directly concatenated. 
+							<!--
+								The preceding text node is a child of this nodes topmost
+								styled ancestor. This means that the result of the
+								transformation will be directly concatenated.
 								-->
 							<call-template name="mk-style-set">
 								<with-param name="node" select="$left"/>
@@ -716,10 +716,10 @@
 					<choose>
 						<when test="$context-index &lt; count($context)">
 							<variable name="right" select="$context[$context-index + 1]"/>
-							<!-- 
-								The preceding text node is a child of this nodes topmost 
-								styled ancestor. This means that the result of the 
-								transformation will be directly concatenated. 
+							<!--
+								The preceding text node is a child of this nodes topmost
+								styled ancestor. This means that the result of the
+								transformation will be directly concatenated.
 								-->
 							<call-template name="mk-style-set">
 								<with-param name="node" select="$right"/>
@@ -731,43 +731,43 @@
 					</choose>
 				</variable>
 
-				<variable name="bold" 
+				<variable name="bold"
 					select="($style mod (2 * $BOLD_BIT)) != 0"/>
-				<variable name="italic" 
+				<variable name="italic"
 					select="($style mod (2 * $ITALIC_BIT)) - ($style mod ($ITALIC_BIT)) != 0"/>
-				<variable name="superscript" 
+				<variable name="superscript"
 					select="($style mod (2 * $SUPERSCRIPT_BIT)) - ($style mod ($SUPERSCRIPT_BIT)) != 0"/>
-				<variable name="subscript" 
+				<variable name="subscript"
 					select="($style mod (2 * $SUBSCRIPT_BIT)) - ($style mod ($SUBSCRIPT_BIT)) != 0"/>
-				<variable name="code" 
+				<variable name="code"
 					select="($style mod (2 * $CODE_BIT)) - ($style mod ($CODE_BIT)) != 0"/>
-				<variable name="typewriter" 
+				<variable name="typewriter"
 					select="($style mod (2 * $TYPEWRITER_BIT)) - ($style mod ($TYPEWRITER_BIT)) != 0"/>
 
-				<variable name="bold-left" 
+				<variable name="bold-left"
 					select="($style-left mod (2 * $BOLD_BIT)) != 0"/>
-				<variable name="italic-left" 
+				<variable name="italic-left"
 					select="($style-left mod (2 * $ITALIC_BIT)) - ($style-left mod ($ITALIC_BIT)) != 0"/>
-				<variable name="superscript-left" 
+				<variable name="superscript-left"
 					select="($style-left mod (2 * $SUPERSCRIPT_BIT)) - ($style-left mod ($SUPERSCRIPT_BIT)) != 0"/>
-				<variable name="subscript-left" 
+				<variable name="subscript-left"
 					select="($style-left mod (2 * $SUBSCRIPT_BIT)) - ($style-left mod ($SUBSCRIPT_BIT)) != 0"/>
-				<variable name="typewriter-left" 
+				<variable name="typewriter-left"
 					select="($style-left mod (2 * $TYPEWRITER_BIT)) - ($style-left mod ($TYPEWRITER_BIT)) != 0"/>
 
-				<variable name="bold-right" 
+				<variable name="bold-right"
 					select="($style-right mod (2 * $BOLD_BIT)) != 0"/>
-				<variable name="italic-right" 
+				<variable name="italic-right"
 					select="($style-right mod (2 * $ITALIC_BIT)) - ($style-right mod ($ITALIC_BIT)) != 0"/>
-				<variable name="superscript-right" 
+				<variable name="superscript-right"
 					select="($style-right mod (2 * $SUPERSCRIPT_BIT)) - ($style-right mod ($SUPERSCRIPT_BIT)) != 0"/>
-				<variable name="subscript-right" 
+				<variable name="subscript-right"
 					select="($style-right mod (2 * $SUBSCRIPT_BIT)) - ($style-right mod ($SUBSCRIPT_BIT)) != 0"/>
-				<variable name="typewriter-right" 
+				<variable name="typewriter-right"
 					select="($style-right mod (2 * $TYPEWRITER_BIT)) - ($style-right mod ($TYPEWRITER_BIT)) != 0"/>
 
 				<!-- Debugging: Add style infos to the output. -->
-				<!-- 
+				<!--
 				<value-of select="'{'"/>
 				<value-of select="$style-left"/>
 				<value-of select="'-'"/>
@@ -814,7 +814,7 @@
 				</if>
 
 				<!-- Debugging: Add style details to the output. -->
-				<!-- 
+				<!--
 				<value-of select="'{'"/>
 				<value-of select="$style"/>
 				<value-of select="'-'"/>
@@ -826,12 +826,12 @@
 		</choose>
 	</template>
 
-	<!-- 
-		Function for looking up the position of a node identified by the given 
-		'current-id' within a node set 'context'. 
+	<!--
+		Function for looking up the position of a node identified by the given
+		'current-id' within a node set 'context'.
 		
-		The search starts with the the index 'test-index'. The search is recursive 
-		in the 'test-index' argument. To save recursion depth, each recursive call 
+		The search starts with the the index 'test-index'. The search is recursive
+		in the 'test-index' argument. To save recursion depth, each recursive call
 		iteratively tests a fixed number of indexes (by loop unrolling).
 	 -->
 	<template name="mk-context-index">
@@ -924,27 +924,27 @@
 		</choose>
 	</template>
 
-	<!-- 
-		== Wiki styles: bold, italics, ... == 
+	<!--
+		== Wiki styles: bold, italics, ... ==
 	 -->
 
 	<template name="mk-style-set">
 		<param name="node"/>
 		
-		<variable 
-			name="context" 
+		<variable
+			name="context"
 			select="$node/ancestor-or-self::*[@text:style-name][1]"
 		/>
 		
 		<choose>
 			<when test="boolean($context)">
-				<variable 
-					name="style" 
+				<variable
+					name="style"
 					select="key('style-ref', $context/@text:style-name)"
 				/>
 
 				<!-- Debugging: Print inspected styles. -->				
-				<!-- 
+				<!--
 				<message>
 					<value-of select="'=== '"/>
 					<value-of select="$style/@style:name"/>
@@ -965,21 +965,21 @@
 		</choose>
 	</template>
 	
-	<!-- 
-		Compute the wiki style set that corresponds 
-		to the given office style at the given context node. 
+	<!--
+		Compute the wiki style set that corresponds
+		to the given office style at the given context node.
 		
 		@param node
-			A node in which context the style is computed. If neither the given style 
-			nor one of its linked styles does specify a style of the given type, 
+			A node in which context the style is computed. If neither the given style
+			nor one of its linked styles does specify a style of the given type,
 			ancestor nodes of the given context node are considered.
 		@param style
 			A style:style element node. The style of the requested type is searched
-			in the given style and its linked styles. 
+			in the given style and its linked styles.
 		@style-set
 			A bit set of styles already defined by the context.
 		@style-mask
-			A bit set of styles that must not be taken from the currently inspected 
+			A bit set of styles that must not be taken from the currently inspected
 			style, because those styles are already defined by the context.
 			
 		@return A bit set composed of the wiki style constants.
@@ -993,21 +993,21 @@
 		<variable name="text-properties" select="$style/style:text-properties"/>
 		
 		<!-- Decompose style-mask into individual bits. -->
-		<variable name="bold-requested" 
+		<variable name="bold-requested"
 			select="($style-mask mod (2 * $BOLD_BIT)) = 0"/>
-		<variable name="italic-requested" 
+		<variable name="italic-requested"
 			select="($style-mask mod (2 * $ITALIC_BIT)) - ($style-mask mod ($ITALIC_BIT)) = 0"/>
-		<variable name="superscript-requested" 
+		<variable name="superscript-requested"
 			select="($style-mask mod (2 * $SUPERSCRIPT_BIT)) - ($style-mask mod ($SUPERSCRIPT_BIT)) = 0"/>
-		<variable name="subscript-requested" 
+		<variable name="subscript-requested"
 			select="($style-mask mod (2 * $SUBSCRIPT_BIT)) - ($style-mask mod ($SUBSCRIPT_BIT)) = 0"/>
-		<variable name="typewriter-requested" 
+		<variable name="typewriter-requested"
 			select="($style-mask mod (2 * $TYPEWRITER_BIT)) - ($style-mask mod ($TYPEWRITER_BIT)) = 0"/>
-		<variable name="code-requested" 
+		<variable name="code-requested"
 			select="($style-mask mod (2 * $CODE_BIT)) - ($style-mask mod ($CODE_BIT)) = 0"/>
-		<variable name="center-requested" 
+		<variable name="center-requested"
 			select="($style-mask mod (2 * $CENTER_BIT)) - ($style-mask mod ($CENTER_BIT)) = 0"/>
-		<variable name="right-requested" 
+		<variable name="right-requested"
 			select="($style-mask mod (2 * $RIGHT_BIT)) - ($style-mask mod ($RIGHT_BIT)) = 0"/>
 		
 		<!-- Extract styles that are not already defined by the context. -->
@@ -1025,8 +1025,8 @@
 		<variable name="bold-mask">
 			<choose>
 				<when test="$bold-requested and boolean($text-properties/@fo:font-weight)">
-					<!-- 
-						Other value than "bold" means that the character style is not 
+					<!--
+						Other value than "bold" means that the character style is not
 						bold and no parent style must be considered.
 					-->
 					<value-of select="$BOLD_BIT"/>
@@ -1051,8 +1051,8 @@
 		<variable name="italic-mask">
 			<choose>
 				<when test="$italic-requested and boolean($text-properties/@fo:font-style)">
-					<!-- 
-						Other value than "italic" means that the character style is not 
+					<!--
+						Other value than "italic" means that the character style is not
 						italic and no parent style must be considered.
 					-->
 					<value-of select="$ITALIC_BIT"/>
@@ -1108,7 +1108,7 @@
 		<variable name="typewriter-style">
 			<choose>
 				<when test="$typewriter-requested and ($style/@style:family='text') and boolean($text-properties/@style:font-name)">
-					<variable name="font-face" 
+					<variable name="font-face"
 						select="key('font-face-ref', $text-properties/@style:font-name)"/>
 					<choose>
 						<when test="$font-face/@style:font-pitch='fixed'">
@@ -1139,7 +1139,7 @@
 		<variable name="code-style">
 			<choose>
 				<when test="$code-requested and ($style/@style:family='paragraph') and boolean($text-properties/@style:font-name)">
-					<variable name="font-face" 
+					<variable name="font-face"
 						select="key('font-face-ref', $text-properties/@style:font-name)"/>
 					<choose>
 						<when test="$font-face/@style:font-pitch='fixed'">
@@ -1210,13 +1210,13 @@
 		
 
 		<!-- Compute the updated styles and mask. -->
-		<!-- 
-			Note: The bit masks style-mask, bold-style, italic-style,... are 
-			guaranteed to be disjoint, therefore, addition can be use instead 
+		<!--
+			Note: The bit masks style-mask, bold-style, italic-style,... are
+			guaranteed to be disjoint, therefore, addition can be use instead
 			of bitwise or (which is missing in XPath). -->
-		<variable name="updated-style" 
+		<variable name="updated-style"
 			select="$style-set + $bold-style + $italic-style + $superscript-style + $subscript-style + $code-style + $typewriter-style + $center-style + $right-style"/>
-		<variable name="updated-mask" 
+		<variable name="updated-mask"
 			select="$style-mask + $bold-mask + $italic-mask + $superscript-mask + $subscript-mask + $code-mask + $typewriter-mask + $center-mask + $right-mask"/>
 
 		<!-- Inspect linked and nested styles. -->
@@ -1234,7 +1234,7 @@
 				<variable name="ancestors" select="$node/ancestor::*[@text:style-name][1]"/>
 				
 				<!-- Debugging: Print currently inspected style.  -->
-				<!-- 
+				<!--
 				<message>
 					<value-of select="'{'"/>
 					<value-of select="$style/@style:name"/>
@@ -1250,9 +1250,9 @@
 					<value-of select="'}'"/>
 				</message>
 				 -->
-				 
-				<!-- 
-					If there is an ancestor that has a style, use that style, 
+				
+				<!--
+					If there is an ancestor that has a style, use that style,
 					otherwise, a style is not found. -->
 				<choose>
 					<when test="boolean($ancestors)">
@@ -1274,8 +1274,8 @@
 	</template>
 
 
-	<!-- 
-		== Descending the tree == 
+	<!--
+		== Descending the tree ==
 	-->
 
 	<template match="/">

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2015-12-11 10:01:05 UTC (rev 9745)
+++ trunk/config/config-default.ini	2015-12-14 09:20:05 UTC (rev 9746)
@@ -69,7 +69,7 @@
 ; let all revisions be stored
 MAJOR_MIN_KEEP = 2147483647
 MINOR_MIN_KEEP = 2147483647
-; older fine-tuned settings for low-storage systems. 
+; older fine-tuned settings for low-storage systems.
 ; just comment the two lines above to enable it.
 MAJOR_MAX_AGE = 32
 MAJOR_KEEP = 8
@@ -123,7 +123,7 @@
 ALLOW_IMAP_LOGIN = false
 
 THEME = Sidebar
-; DEFAULT_LANGUAGE = 
+; DEFAULT_LANGUAGE =
 WIKI_PGSRC = pgsrc
 DEFAULT_WIKI_PGSRC = pgsrc
 ; untranslated pgsrc pages to always include
@@ -152,13 +152,13 @@
 
 ; these not:
 ; DBAUTH_AUTH_DSN =
-; SERVER_NAME = 
-; SERVER_PORT = 
-; SCRIPT_NAME = 
-; DATA_PATH = 
-; PHPWIKI_DIR = 
-; VIRTUAL_PATH = 
-; USE_PATH_INFO = 
+; SERVER_NAME =
+; SERVER_PORT =
+; SCRIPT_NAME =
+; DATA_PATH =
+; PHPWIKI_DIR =
+; VIRTUAL_PATH =
+; USE_PATH_INFO =
 ; TEMP_DIR = /tmp
 ; ALLOWED_LOAD = /tmp
 
@@ -166,7 +166,7 @@
 DISABLE_GETIMAGESIZE = false
 ; FORTUNE_DIR = /usr/share/fortune
 ; GOOGLE_LICENSE_KEY = "..."
-; DBADMIN_USER = 
+; DBADMIN_USER =
 ; DBADMIN_PASSWD =
 BLOG_DEFAULT_EMPTY_PREFIX = true
 ; TOOLBAR_PAGELINK_PULLDOWN = *

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2015-12-11 10:01:05 UTC (rev 9745)
+++ trunk/config/config-dist.ini	2015-12-14 09:20:05 UTC (rev 9746)
@@ -1,10 +1,10 @@
 ; This is the main configuration file for PhpWiki.
-; Note that certain characters are used as comment char and therefore 
+; Note that certain characters are used as comment char and therefore
 ; these entries must be in double-quotes. Such as ":", ";", "," and "|"
 ;
 ; <?php die(); ?> for security
 ;
-; This file is divided into eight parts. 
+; This file is divided into eight parts.
 ; Each one has different configuration settings you can
 ; change; in all cases the default should work on your system,
 ; however, we recommend you tailor things to your particular setting.
@@ -17,10 +17,10 @@
 ; code, you can set the include_path here.
 ;
 ; Override PHP's include path so that it can find some needed additional libraries.
-; You shouldn't need to do this unless your system include_path esp. your 
-; system pear libs are broken or oudated. The PHPWIKI_DIR is automatically 
+; You shouldn't need to do this unless your system include_path esp. your
+; system pear libs are broken or oudated. The PHPWIKI_DIR is automatically
 ; put to the front and the local lib/pear path is automatically added to the end.
-; But if you define it, be sure to include either the system pear path or 
+; But if you define it, be sure to include either the system pear path or
 ; the phpwiki/lib/pear path to override your Pear_DB.
 ; Note that on Windows-based servers, you should use ; rather than :
 ; as the path separator.
@@ -28,7 +28,7 @@
 
 ; Set DEBUG to 1 to view the XHTML and CSS validator icons, page
 ; processing timer, and possibly other debugging messages at the
-; bottom of each page. 65 for a more verbose level with AUTH hints. 
+; bottom of each page. 65 for a more verbose level with AUTH hints.
 ; See lib/config.php for all supported values.
 ; Default: 0
 ;DEBUG = 1
@@ -46,7 +46,7 @@
 ; Default: false
 ;ENABLE_DOUBLECLICKEDIT = false
 
-; Enable WYSIWYG editing. Converting back HTML to wikitext does not work in most engines. 
+; Enable WYSIWYG editing. Converting back HTML to wikitext does not work in most engines.
 ; Experimental!
 ;ENABLE_WYSIWYG = true
 
@@ -54,34 +54,34 @@
 ; Recommended is only Wikiwyg.
 ;
 ;  Wikiwyg     http://openjsan.org/doc/i/in/ingy/Wikiwyg/
-;  tinymce     http://tinymce.moxiecode.com/ 
-;  CKeditor    http://ckeditor.com/ 
-;  spaw        http://sourceforge.net/projects/spaw 
-;  htmlarea3   
-;  htmlarea2   
+;  tinymce     http://tinymce.moxiecode.com/
+;  CKeditor    http://ckeditor.com/
+;  spaw        http://sourceforge.net/projects/spaw
+;  htmlarea3
+;  htmlarea2
 ;WYSIWYG_BACKEND = Wikiwyg
 
 ; Store all WYSIWYG pages as HTML? Will loose most link and plugin options.
 ; Not recommended, but presented here to test several WYSIWYG backends.
 ;WYSIWYG_DEFAULT_PAGETYPE_HTML = false
 
-; Upload into separate userdirs. If enabled (default since 1.3.13) the generated Upload: link 
-; will include the username plus "/". This will make all uploaded links longer, but we 
+; Upload into separate userdirs. If enabled (default since 1.3.13) the generated Upload: link
+; will include the username plus "/". This will make all uploaded links longer, but we
 ; avoid nameclashes and you see who uploaded what file.
 ;UPLOAD_USERDIR = false
 
 ; SemanticWeb Units require the standard units executable, available in every distribution.
 ; On Windows the cygwin version works fine if e.g. the cygwin bin is in the webserver path.
-; However if units fails, attribute comparisons will fail. Esp. getting the base unit and 
+; However if units fails, attribute comparisons will fail. Esp. getting the base unit and
 ; base values for all attributes.
-; So you might want to disable the unit strictness at all (area:=936km^2 < 1,000,000 ?). 
+; So you might want to disable the unit strictness at all (area:=936km^2 < 1,000,000 ?).
 ; Default: false
 ;DISABLE_UNITS = true
 
 ; For a non-standard path
 ;UNITS_EXE = /usr/bin/units
 
-; Needed for inlined SVG and MathM, but conflicts with document.write(). 
+; Needed for inlined SVG and MathM, but conflicts with document.write().
 ; Experimental. Default: false.
 ; See http://hixie.ch/advocacy/xhtml
 ;ENABLE_XHTML_XML = true
@@ -93,11 +93,11 @@
 ; Optionally define BABYCART_PATH. Default: /usr/local/bin/babycart
 ;ENABLE_SPAMASSASSIN = true
 
-; Check for links to blocked external tld domains in new edits, against 
+; Check for links to blocked external tld domains in new edits, against
 ; multi.surbl.org and bl.spamcop.net.
 ;ENABLE_SPAMBLOCKLIST = true
 
-; If more than this number of external links appear on non-authenticated 
+; If more than this number of external links appear on non-authenticated
 ; edits it will be rejected as spam.
 ; Setting NUM_SPAM_LINKS to 0 will disable the check.
 ;NUM_SPAM_LINKS = 20
@@ -110,16 +110,16 @@
 ; Default: false
 ;DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS = false
 
-; If GOOGLE_LINKS_NOFOLLOW is true, ref=nofollow is added to 
+; If GOOGLE_LINKS_NOFOLLOW is true, ref=nofollow is added to
 ; all external links to discourage spam. You might want to turn it off,
 ; if you want to improve pageranks on external links.
 ; TODO: Add ref=nofollow only for external links added by anonymous users.
 ; All internal action links do contain ref=nofollow
 ;GOOGLE_LINKS_NOFOLLOW = false
 
-; Aysnchronous ajax callbacks to dynamically display pages 
+; Aysnchronous ajax callbacks to dynamically display pages
 ; (as format=xml) on demand.
-; Experimental feature for plugin DynamicIncludePage, which might fail on 
+; Experimental feature for plugin DynamicIncludePage, which might fail on
 ; some strictly non-conformant entities.
 ;ENABLE_AJAX = false
 
@@ -128,25 +128,25 @@
 
 ; If set to true, add some anti-spam countermeasures based on captcha
 ; tests.  See http://www.captcha.net/ for more information on captcha.
-;ENABLE_CAPTCHA = true 
+;ENABLE_CAPTCHA = true
 
 ; If USE_CAPTCHA_RANDOM_WORD is set to true,
 ; Captcha will use a random word, otherwise a dictionary word.
 ;USE_CAPTCHA_RANDOM_WORD = false
 
-; USE_SAFE_DBSESSION should be enabled, if you encounter session problems, with 
-; duplicate INSERT sess_id warnings at the bottom of the page. Reason is a 
-; unreliable affected_rows implementation() in the sql backend. 
+; USE_SAFE_DBSESSION should be enabled, if you encounter session problems, with
+; duplicate INSERT sess_id warnings at the bottom of the page. Reason is a
+; unreliable affected_rows implementation() in the sql backend.
 ; Default is Disabled, using the fastest DbSession UPDATE method.
 ;USE_SAFE_DBSESSION = false
 
-; If true don't use UserName/Blog/day/time pagenames for the ADMIN_USER, but 
+; If true don't use UserName/Blog/day/time pagenames for the ADMIN_USER, but
 ; Blog/day/time only. Convenience for a single-user blog theme.
 ;BLOG_DEFAULT_EMPTY_PREFIX = true
 
-; External Searchengine hits are detected automatically and will be 
+; External Searchengine hits are detected automatically and will be
 ; highlighted in the displayed page if enabled.
-; Optionally the actionpage SearchHighlight is also prepended, which 
+; Optionally the actionpage SearchHighlight is also prepended, which
 ; prints a notice.
 ; Default: true
 ;ENABLE_SEARCHHIGHLIGHT = false
@@ -160,13 +160,13 @@
 ; Default: false
 ;ENABLE_RECENTCHANGESBOX = true
 
-; You can enable an admin checkbox to set a "public" page attribute, to 
+; You can enable an admin checkbox to set a "public" page attribute, to
 ; be used by external tools to generate a separate public wiki.
 ; Default: false
 ;ENABLE_PAGE_PUBLIC = true
 
 ; Enable this for system maintainance (e.g. read-only mount) or a general
-; read-only database. 
+; read-only database.
 ; Default: false
 ;READONLY = true
 
@@ -199,25 +199,25 @@
 ; password and use the passencrypt.php tool to encrypt the password from
 ; prying eyes.
 ; http://wolfram.org/writing/howto/password.html
-; 
+;
 ; Logging into the wiki with the admin user and password allows you to lock,
 ; unlock, or remove pages and to perform other PhpWikiAdministration
 ; functions. On all other occasions you should simply log in with your
 ; regular WikiName.
 ; If your password contains special chars like ";" or ":" better quote it in double-quotes.
-;ADMIN_USER = 
+;ADMIN_USER =
 
 ; You must set this! Username and password of the administrator.
 ; ADMIN_PASSWD is ignored on HttpAuth
 ;ADMIN_PASSWD =
 
-; It is recommended that you use encrypted passwords to be stored in the 
+; It is recommended that you use encrypted passwords to be stored in the
 ; config.ini and the users homepages metadata.
 ; You might want to use the passencrypt.php utility to encode the
 ; admin password, in the event that someone gains ftp or ssh access to the
-; server and directory containing phpwiki. 
+; server and directory containing phpwiki.
 ; <i>SQL access passwords cannot be encrypted, besides using external DATABASE_DSN aliases within PDO.</i>
-; 
+;
 ; If true, all user passwords will be stored encrypted.
 ; You might have to set it to false, if your PHP doesn't support crypt().
 ; To use plain text passwords, in particular for the ADMIN_PASSWD, set
@@ -240,7 +240,7 @@
 ; The RawHtml plugin allows page authors to embed real, raw HTML into Wiki
 ; pages.  This is a possible security threat, as much HTML (or, rather,
 ; JavaScript) can be very risky.  If you are in a controlled environment,
-; or you are using the two options below, however, it could be of use. 
+; or you are using the two options below, however, it could be of use.
 ENABLE_RAW_HTML = true
 
 ; If this is set, only pages locked by the Administrator may contain the
@@ -253,22 +253,22 @@
 
 ; Actions listed in this array will not be allowed.  The complete list
 ; of actions can be found in lib/main.php with the function
-; getActionDescription. 
+; getActionDescription.
 ;
-; purge, remove, revert, xmlrpc, soap, upload, browse, create, diff, dumphtml, 
+; purge, remove, revert, xmlrpc, soap, upload, browse, create, diff, dumphtml,
 ; dumpserial, edit, loadfile, lock, unlock, viewsource, zip, ziphtml, ...
 ;DISABLED_ACTIONS = "dumpserial : loadfile"
 
-; Disable insecure and performance sensitive actions for non-admin users. 
+; Disable insecure and performance sensitive actions for non-admin users.
 ;
 ; Allow for localhost only
-; If true, only the admin user or users from localhost (without password) can do: 
+; If true, only the admin user or users from localhost (without password) can do:
 ;   RPC2, SOAP, ziphtml and dumphtml
 INSECURE_ACTIONS_LOCALHOST_ONLY = true
 
 
 ; If you enable this option, every page is moderated by the ModeratedPage
-; actionpage plugin. Changing a moderated page will be delayed to be 
+; actionpage plugin. Changing a moderated page will be delayed to be
 ; granted by a moderator by email. Default: false to allow finer control.
 ;ENABLE_MODERATEDPAGE_ALL = true
 
@@ -285,7 +285,7 @@
 ; abuse detection and referer lists.
 ; See http://www.outoforder.cc/projects/apache/mod_log_sql/docs-2.0/#id2756178
 ;
-; If defined (e.g. 1) read-access is done via SQL. 
+; If defined (e.g. 1) read-access is done via SQL.
 ; If flag 2 is set, phpwiki also writes. Default on SQL database.
 ; This must use DATABASE_TYPE = SQL or ADODB or PDO.
 ;   ACCESS_LOG_SQL = 0 ; disable SQL access logging
@@ -308,13 +308,13 @@
 ;COMPRESS_OUTPUT = false
 
 ; This controls how PhpWiki sets the HTTP cache control
-; headers (Expires: and Cache-Control:) 
+; headers (Expires: and Cache-Control:)
 ;
 ; Choose one of:
 ;
 ; NO_CACHE: This is roughly the old (pre 1.3.4) behavior.  PhpWiki will
 ;       instruct proxies and browsers never to cache PhpWiki output.
-;       This was previously called 'NONE', but NONE was treated specially 
+;       This was previously called 'NONE', but NONE was treated specially
 ;       by parse_ini_config().
 ;
 ; STRICT: Cached pages will be invalidated whenever the database global
@@ -359,7 +359,7 @@
 ; caching of marked-up page content.
 ; Note that you can also disable markup caching on a per-page
 ; temporary basis by addinging a query arg of '?nocache=1'
-; to the URL to the page or by adding a NoCache plugin line. 
+; to the URL to the page or by adding a NoCache plugin line.
 ; Use '?nocache=purge' to completely discard the cached version of the page.
 ; You can also purge the cached markup globally by using the
 ; "Purge Markup Cache" button on the PhpWikiAdministration page.
@@ -384,9 +384,9 @@
 ; On USE_DB_SESSION = true you can ignore this.
 ;SESSION_SAVE_PATH = some_other_directory
 
-; On USE_DB_SESSION = true or false you can force the behaviour 
+; On USE_DB_SESSION = true or false you can force the behaviour
 ; how to transport session data.
-;USE_DB_SESSION = false 
+;USE_DB_SESSION = false
 
 ;======================================================================
 ; Part Two: Database Selection
@@ -401,7 +401,7 @@
 ;       file:  use a serialized file database. (easiest)
 ;       flatfile:  use a flat file database. (experimental, readable, slow)
 DATABASE_TYPE = dba
-   
+
 ; Prefix for filenames or table names
 ;
 ; Currently you MUST EDIT THE SQL file too (in the schemas/
@@ -431,7 +431,7 @@
 DATABASE_DSN = "mysql://guest@unix(/var/lib/mysql/mysql.sock)/test"
 
 ; Keep persistent connections: (mysql_pconnect, ...)
-; Recommended is false for bigger servers, and true for small servers 
+; Recommended is false for bigger servers, and true for small servers
 ; with not so many connections. postgresql: Please leave it false. Default: false
 ; Should really be set as database option in the DSN above.
 DATABASE_PERSISTENT = false
@@ -465,11 +465,11 @@
 ; Specified in seconds.
 DATABASE_TIMEOUT = 12
 
-; How often to try and optimise the database. Specified in seconds. 
+; How often to try and optimise the database. Specified in seconds.
 ; Set to 0 to disable optimisation completely. Default is 50 (seconds).
 ;
 ; This is a fairly crude way of doing things as it requires a page save
-; to occur during the right minute for the optimisation to be triggered. 
+; to occur during the right minute for the optimisation to be triggered.
 ;
 ; With most modern databases (eg. Postgres) and distributions (eg. Debian)
 ; the system maintenance scripts take care of this nightly, so you will want
@@ -477,7 +477,7 @@
 ;DATABASE_OPTIMISE_FREQUENCY = 50
 
 ; Optional: Administrative SQL DB access (for action=upgrade)
-; If action=upgrade detects (My)SQL problems, but has no ALTER permissions, 
+; If action=upgrade detects (My)SQL problems, but has no ALTER permissions,
 ; give here a database username which has the necessary ALTER or CREATE permissions.
 ; Of course you can fix your database manually. See lib/upgrade.php for known issues.
 ;DBADMIN_USER = root
@@ -502,7 +502,7 @@
 ; class a revision belongs in is determined by whether the author
 ; checked the "this is a minor revision" checkbox when they saved the
 ; page.
-; 
+;
 ; There is, additionally, a third class of revisions: author
 ; revisions. The most recent non-mergable revision from each distinct
 ; author is an author revision.
@@ -573,7 +573,7 @@
 ;========================================================================
 ;
 ; New user authentication configuration:
-; We support three basic authentication methods and a stacked array 
+; We support three basic authentication methods and a stacked array
 ; of advanced auth methods to get and check the passwords:
 ;
 ; ALLOW_ANON_USER         default true
@@ -587,11 +587,11 @@
 ALLOW_ANON_EDIT = true
 
 ; If ALLOW_BOGO_LOGIN is true, users are allowed to login (with
-; any/no password) using any userid which: 
+; any/no password) using any userid which:
 ;  1) is not the ADMIN_USER, and
 ;  2) is a valid WikiWord (matches $WikiNameRegexp.)
-; If true, users may be created by themselves. Otherwise we need separate auth. 
-; If such a user will create a so called HomePage with his userid, he will 
+; If true, users may be created by themselves. Otherwise we need separate auth.
+; If such a user will create a so called HomePage with his userid, he will
 ; be able to store his preferences and password there.
 ALLOW_BOGO_LOGIN = true
 
@@ -608,14 +608,14 @@
 ;   BogoLogin:     WikiWord username, with no *actual* password checking,
 ;                   although the user will still have to enter one.
 ;   PersonalPage:  Store passwords in the users homepage metadata (simple)
-;   Db:            Use DBAUTH_AUTH_* (see below) with PearDB or 
+;   Db:            Use DBAUTH_AUTH_* (see below) with PearDB or
 ;                   ADODB only.
 ;   LDAP:          Authenticate against LDAP_AUTH_HOST with LDAP_BASE_DN
 ;   IMAP:          Authenticate against IMAP_AUTH_HOST (email account)
 ;   POP3:          Authenticate against POP3_AUTH_HOST (email account)
 ;   Session:       Get username and level from a PHP session variable
 ;                  (e.g. for FusionForge)
-;   File:          Store username:crypted-passwords in .htaccess like files. 
+;   File:          Store username:crypted-passwords in .htaccess like files.
 ;                  Use Apache's htpasswd to manage this file.
 ;   HttpAuth:      Use the protection by the webserver (.htaccess/.htpasswd)
 ;                  Note that the ADMIN_USER should exist also.
@@ -636,24 +636,24 @@
 ; certain number of characters long.  This applies even to the BogoLogin
 ; method. Default: 0 (to allow immediate passwordless BogoLogin)
 ;PASSWORD_LENGTH_MINIMUM = 6
-    
+
 ; The following policies are available for user authentication:
 ;       first-only: use only the first method in USER_AUTH_ORDER
-;       old:        ignore USER_AUTH_ORDER and try to use all available 
+;       old:        ignore USER_AUTH_ORDER and try to use all available
 ;                       methods as in the previous PhpWiki releases (slow)
-;       strict:     check if the user exists for all methods: 
-;                       on the first existing user, try the password. 
-;                       dont try the other methods on failure then. 
+;       strict:     check if the user exists for all methods:
+;                       on the first existing user, try the password.
+;                       dont try the other methods on failure then.
 ;                   Note: May result in crashes on endless recursion
 ;       stacked:    check the given user - password combination for all
 ;                       methods and return true on the first success.
 ;                   Note: May result in crashes on endless recursion
 USER_AUTH_POLICY = first-only
 
-; Use access control lists (as in Solaris and Windows NTFS) per page and group, 
+; Use access control lists (as in Solaris and Windows NTFS) per page and group,
 ; not per user for the whole wiki.
-; 
-; We suspect ACL page permissions to degrade speed by 10%. 
+;
+; We suspect ACL page permissions to degrade speed by 10%.
 ; GROUP_METHOD=WIKIPAGE is slowest.
 ; Default: true
 ;ENABLE_PAGEPERM = false
@@ -676,17 +676,17 @@
 ; and their values as NAME=value pairs separated by colons.
 ;LDAP_SET_OPTION = "LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0"
 
-; DN to initially bind to the LDAP server as. This is needed if the server doesn't 
+; DN to initially bind to the LDAP server as. This is needed if the server doesn't
 ; allow anonymous queries. (Windows Active Directory Server)
 ;LDAP_AUTH_USER = "CN=ldapuser,ou=Users,o=Development,dc=mycompany.com"
 
-; Password to use to initially bind to the LDAP server, as the DN 
+; Password to use to initially bind to the LDAP server, as the DN
 ; specified in the LDAP_AUTH_USER option (above).
 ;LDAP_AUTH_PASSWORD = secret
 
 ; If you want to match usernames against an attribute other than uid,
 ; specify it here. uid is for real active users. cn for anything like test users,
-; sAMAccountName often for Windows/Samba. 
+; sAMAccountName often for Windows/Samba.
 ; Default: uid. Use also "cn" or "sAMAccountName".
 ;LDAP_SEARCH_FIELD = sAMAccountName
 
@@ -712,7 +712,7 @@
 ; The IMAP server to check usernames from.  Defaults to localhost.
 ;
 ; Some IMAP_AUTH_HOST samples:
-;   "localhost", "localhost:143/imap/notls", 
+;   "localhost", "localhost:143/imap/notls",
 ;   "localhost:993/imap/ssl/novalidate-cert" (SuSE refuses non-SSL conections)
 ;IMAP_AUTH_HOST = "localhost:143/imap/notls"
 
@@ -751,7 +751,7 @@
 ;       WIKIPAGE        Define groups as list at "CategoryGroup". (Slowest, but easiest to maintain)
 ;       DB              Stored in an SQL database. Optionally external. See USERS/GROUPS queries
 ;       FILE            Flatfile. See AUTH_GROUP_FILE below.
-;       LDAP            LDAP groups. See "LDAP authentication options" above and 
+;       LDAP            LDAP groups. See "LDAP authentication options" above and
 ;                       lib/WikiGroup.php. (experimental)
 GROUP_METHOD = WIKIPAGE
 
@@ -895,7 +895,7 @@
 ; Japanese "ja" (Japanese   - ホームページ)
 ; Chinese  "zh" (Chinese    - 首頁)
 ;
-; If you set DEFAULT_LANGUAGE to the empty string, the users 
+; If you set DEFAULT_LANGUAGE to the empty string, the users
 ; preferred language as determined by the browser setting will be used.
 DEFAULT_LANGUAGE = en
 
@@ -929,8 +929,8 @@
 ; URLs ending with the following extension should be inlined as images.
 ; Specify as per ALLOWED_PROTOCOLS.
 ; Note that you can now also allow class|svg|svgz|vrml|swf ...,
-; which will create embedded object instead of img. 
-; Typical CGI extensions as pl or cgi maybe allowed too, 
+; which will create embedded object instead of img.
+; Typical CGI extensions as pl or cgi maybe allowed too,
 ; but those two will be enforced to img.
 ;INLINE_IMAGES = "png|jpg|jpeg|gif|swf"
 
@@ -940,7 +940,7 @@
 ;   WIKI_NAME_REGEXP = "(?<![[:alnum:]])(?:[[:upper:]][[:lower:][:digit:]]+){2,}(?![[:alnum:]])"
 ; Allow lower+digits+dots: BumpyVersion1.3.2
 ;   WIKI_NAME_REGEXP = "(?<![[:alnum:]])(?:[[:upper:]][[:lower:][:digit:]\.]+){2,}(?![[:alnum:]])"
-; Default old behaviour, no digits as lowerchars. 
+; Default old behaviour, ...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[9745] branches/release-1.5.5/

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

Revision: 9745
          http://sourceforge.net/p/phpwiki/code/9745
Author:   vargenau
Date:     2015-12-11 10:01:05 +0000 (Fri, 11 Dec 2015)
Log Message:
-----------
Create branch release-1.5.5

Added Paths:
-----------
    branches/release-1.5.5/

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9744] tags/release-1.5.5/

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

Revision: 9744
          http://sourceforge.net/p/phpwiki/code/9744
Author:   vargenau
Date:     2015-12-11 10:00:51 +0000 (Fri, 11 Dec 2015)
Log Message:
-----------
Create tag release-1.5.5

Added Paths:
-----------
    tags/release-1.5.5/

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

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

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

Revision: 9743
          http://sourceforge.net/p/phpwiki/code/9743
Author:   vargenau
Date:     2015-12-11 09:54:49 +0000 (Fri, 11 Dec 2015)
Log Message:
-----------
Make functions merged and is_conflict public in lib/diff3.php (support request #162)

Modified Paths:
--------------
    trunk/lib/diff3.php
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php	2015-12-10 17:55:35 UTC (rev 9742)
+++ trunk/lib/diff3.php	2015-12-11 09:54:49 UTC (rev 9743)
@@ -36,7 +36,7 @@
         return $this->_merged;
     }
 
-    protected function is_conflict()
+    public function is_conflict()
     {
         return $this->merged() === false;
     }
@@ -53,12 +53,12 @@
         $this->final2 = &$this->orig;
     }
 
-    protected function merged()
+    public function merged()
     {
         return $this->orig;
     }
 
-    protected function is_conflict()
+    public function is_conflict()
     {
         return false;
     }

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2015-12-10 17:55:35 UTC (rev 9742)
+++ trunk/pgsrc/ReleaseNotes	2015-12-11 09:54:49 UTC (rev 9743)
@@ -1,4 +1,4 @@
-Date: Thu, 10 Dec 2015 18:48:03 +0000
+Date: Fri, 11 Dec 2015 10:53:47 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -17,7 +17,7 @@
 * Remove forbidden characters: ~<~>~[~]~{~}~"~|~# from pagename
 * New property: ALLOWED_LOAD giving list of directories from which it is allowed to load pages.
 * Upload: replace multiple spaces by single space
-* Make function merged public lib/diff3.php (support request #162)
+* Make functions merged and is_conflict public in lib/diff3.php (support request #162)
 
 == 1.5.4 2015-06-29 Marc-Etienne Vargenau ==
 

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

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

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

Revision: 9742
          http://sourceforge.net/p/phpwiki/code/9742
Author:   vargenau
Date:     2015-12-10 17:55:35 +0000 (Thu, 10 Dec 2015)
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	2015-12-10 17:54:51 UTC (rev 9741)
+++ trunk/locale/po/de.po	2015-12-10 17:55:35 UTC (rev 9742)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-23 10:31+0200\n"
+"POT-Creation-Date: 2015-12-10 18:54+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2015-12-10 17:54:51 UTC (rev 9741)
+++ trunk/locale/po/es.po	2015-12-10 17:55:35 UTC (rev 9742)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-23 10:31+0200\n"
+"POT-Creation-Date: 2015-12-10 18:54+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2015-12-10 17:54:51 UTC (rev 9741)
+++ trunk/locale/po/fr.po	2015-12-10 17:55:35 UTC (rev 9742)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-23 10:31+0200\n"
+"POT-Creation-Date: 2015-12-10 18:54+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2015-12-10 17:54:51 UTC (rev 9741)
+++ trunk/locale/po/it.po	2015-12-10 17:55:35 UTC (rev 9742)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-23 10:31+0200\n"
+"POT-Creation-Date: 2015-12-10 18:54+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2015-12-10 17:54:51 UTC (rev 9741)
+++ trunk/locale/po/ja.po	2015-12-10 17:55:35 UTC (rev 9742)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-23 10:31+0200\n"
+"POT-Creation-Date: 2015-12-10 18:54+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2015-12-10 17:54:51 UTC (rev 9741)
+++ trunk/locale/po/nl.po	2015-12-10 17:55:35 UTC (rev 9742)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-23 10:31+0200\n"
+"POT-Creation-Date: 2015-12-10 18:54+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2015-12-10 17:54:51 UTC (rev 9741)
+++ trunk/locale/po/phpwiki.pot	2015-12-10 17:55:35 UTC (rev 9742)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-23 10:31+0200\n"
+"POT-Creation-Date: 2015-12-10 18:54+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2015-12-10 17:54:51 UTC (rev 9741)
+++ trunk/locale/po/sv.po	2015-12-10 17:55:35 UTC (rev 9742)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-23 10:31+0200\n"
+"POT-Creation-Date: 2015-12-10 18:54+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2015-12-10 17:54:51 UTC (rev 9741)
+++ trunk/locale/po/zh.po	2015-12-10 17:55:35 UTC (rev 9742)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-23 10:31+0200\n"
+"POT-Creation-Date: 2015-12-10 18:54+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"

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:[9741] trunk

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

Revision: 9741
          http://sourceforge.net/p/phpwiki/code/9741
Author:   vargenau
Date:     2015-12-10 17:54:51 +0000 (Thu, 10 Dec 2015)
Log Message:
-----------
Set PhpWiki version to 1.5.5

Modified Paths:
--------------
    trunk/INSTALL
    trunk/Makefile
    trunk/config/phpwiki.spec
    trunk/lib/prepend.php
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2015-12-10 17:50:05 UTC (rev 9740)
+++ trunk/INSTALL	2015-12-10 17:54:51 UTC (rev 9741)
@@ -1,6 +1,6 @@
 REQUIREMENTS
 
-PhpWiki 1.5.4 requires a web server with at least PHP version 5.3.
+PhpWiki 1.5.5 requires a web server with at least PHP version 5.3.
 
 All users of PHP are strongly encouraged to upgrade to
 PHP 5.3.29 or to PHP 5.4 or 5.5.
@@ -61,7 +61,7 @@
 
 Unzip this file into the directory where you want it to live. That's it.
 
-bash$ unzip phpwiki-1.5.4.zip
+bash$ unzip phpwiki-1.5.5.zip
 
 In the config subdirectory copy 'config-dist.ini' to 'config.ini' and
 edit the settings in 'config.ini' to your liking.

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2015-12-10 17:50:05 UTC (rev 9740)
+++ trunk/Makefile	2015-12-10 17:54:51 UTC (rev 9741)
@@ -1,4 +1,4 @@
-VERSION=1.5.4
+VERSION=1.5.5
 RPMBUILD=rpmbuild
 
 clean:

Modified: trunk/config/phpwiki.spec
===================================================================
--- trunk/config/phpwiki.spec	2015-12-10 17:50:05 UTC (rev 9740)
+++ trunk/config/phpwiki.spec	2015-12-10 17:54:51 UTC (rev 9741)
@@ -40,7 +40,7 @@
 # RPM spec preamble
 Summary: PHP-based Wiki webapplication
 Name: phpwiki
-Version: 1.5.4
+Version: 1.5.5
 Release: 1
 BuildArch: noarch
 License: GPL

Modified: trunk/lib/prepend.php
===================================================================
--- trunk/lib/prepend.php	2015-12-10 17:50:05 UTC (rev 9740)
+++ trunk/lib/prepend.php	2015-12-10 17:54:51 UTC (rev 9741)
@@ -5,7 +5,7 @@
  */
 
 // see lib/stdlib.php: phpwiki_version()
-define('PHPWIKI_VERSION', '1.5.4');
+define('PHPWIKI_VERSION', '1.5.5');
 
 // A new php-5.1.x feature: Turn off php-5.1.x auto_globals_jit = On, or use this mess below.
 if (empty($GLOBALS['HTTP_SERVER_VARS'])) {

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2015-12-10 17:50:05 UTC (rev 9740)
+++ trunk/locale/po/de.po	2015-12-10 17:54:51 UTC (rev 9741)
@@ -4,7 +4,7 @@
 # ThePhpWikiProgrammingTeam.
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki 1.5.4\n"
+"Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-23 10:31+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2015-12-10 17:50:05 UTC (rev 9740)
+++ trunk/locale/po/es.po	2015-12-10 17:54:51 UTC (rev 9741)
@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki 1.5.4\n"
+"Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-23 10:31+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2015-12-10 17:50:05 UTC (rev 9740)
+++ trunk/locale/po/fr.po	2015-12-10 17:54:51 UTC (rev 9741)
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki 1.5.4\n"
+"Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-23 10:31+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2015-12-10 17:50:05 UTC (rev 9740)
+++ trunk/locale/po/it.po	2015-12-10 17:54:51 UTC (rev 9741)
@@ -5,7 +5,7 @@
 # Several guessed fixes by Reini Urban for 1.3.11
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki 1.5.4\n"
+"Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-23 10:31+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2015-12-10 17:50:05 UTC (rev 9740)
+++ trunk/locale/po/ja.po	2015-12-10 17:54:51 UTC (rev 9741)
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki 1.5.4\n"
+"Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-23 10:31+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2015-12-10 17:50:05 UTC (rev 9740)
+++ trunk/locale/po/nl.po	2015-12-10 17:54:51 UTC (rev 9741)
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki 1.5.4\n"
+"Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-23 10:31+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2015-12-10 17:50:05 UTC (rev 9740)
+++ trunk/locale/po/phpwiki.pot	2015-12-10 17:54:51 UTC (rev 9741)
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki-1.5.4\n"
+"Project-Id-Version: PhpWiki-1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-23 10:31+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2015-12-10 17:50:05 UTC (rev 9740)
+++ trunk/locale/po/sv.po	2015-12-10 17:54:51 UTC (rev 9741)
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki 1.5.4\n"
+"Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-23 10:31+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2015-12-10 17:50:05 UTC (rev 9740)
+++ trunk/locale/po/zh.po	2015-12-10 17:54:51 UTC (rev 9741)
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki 1.5.4\n"
+"Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-23 10:31+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\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:[9740] trunk

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

Revision: 9740
          http://sourceforge.net/p/phpwiki/code/9740
Author:   vargenau
Date:     2015-12-10 17:50:05 +0000 (Thu, 10 Dec 2015)
Log Message:
-----------
Produced by PhpWiki 1.5.5

Modified Paths:
--------------
    trunk/locale/de/pgsrc/%C3%84hnlicheSeiten
    trunk/locale/de/pgsrc/AlleBenutzer
    trunk/locale/de/pgsrc/AlleSeiten
    trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir
    trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir
    trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir
    trunk/locale/de/pgsrc/BackLinks
    trunk/locale/de/pgsrc/BenutzerEinstellungen
    trunk/locale/de/pgsrc/DebugAuthInfo
    trunk/locale/de/pgsrc/DebugGruppenInfo
    trunk/locale/de/pgsrc/DebugInfo
    trunk/locale/de/pgsrc/EditiereText
    trunk/locale/de/pgsrc/Einstellungen
    trunk/locale/de/pgsrc/FuzzySuche
    trunk/locale/de/pgsrc/G%C3%A4steBuch
    trunk/locale/de/pgsrc/GaesteBuch
    trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen
    trunk/locale/de/pgsrc/GleicheSeiten
    trunk/locale/de/pgsrc/Hilfe
    trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite
    trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin
    trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin
    trunk/locale/de/pgsrc/Hilfe%2FGuterStil
    trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin
    trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin
    trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin
    trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin
    trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin
    trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin
    trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow
    trunk/locale/de/pgsrc/Hilfe%2FPhpWiki
    trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten
    trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln
    trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
    trunk/locale/de/pgsrc/Hilfe%2FWabiSabi
    trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt
    trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik
    trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb
    trunk/locale/de/pgsrc/HochLaden
    trunk/locale/de/pgsrc/InterWikiListe
    trunk/locale/de/pgsrc/KategorieAktionSeite
    trunk/locale/de/pgsrc/KategorieKategorie
    trunk/locale/de/pgsrc/KategorieWikiPlugin
    trunk/locale/de/pgsrc/LinkSuche
    trunk/locale/de/pgsrc/ListeRelationen
    trunk/locale/de/pgsrc/ListeSeiten
    trunk/locale/de/pgsrc/MeistBesucht
    trunk/locale/de/pgsrc/ModerierteSeite
    trunk/locale/de/pgsrc/NeueSeite
    trunk/locale/de/pgsrc/Neueste%C3%84nderungen
    trunk/locale/de/pgsrc/NeuesteSeiten
    trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen
    trunk/locale/de/pgsrc/PhpWikiDokumentation
    trunk/locale/de/pgsrc/PhpWikiSystemverwalten
    trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen
    trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown
    trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen
    trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen
    trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen
    trunk/locale/de/pgsrc/PhpWikiUmfrage
    trunk/locale/de/pgsrc/SandKasten
    trunk/locale/de/pgsrc/SandKiste
    trunk/locale/de/pgsrc/SeiteBeobarten
    trunk/locale/de/pgsrc/SeiteFinden
    trunk/locale/de/pgsrc/SeiteSpeichern
    trunk/locale/de/pgsrc/SeitenErzeugen
    trunk/locale/de/pgsrc/SeitenInfo
    trunk/locale/de/pgsrc/SeitenProtokoll
    trunk/locale/de/pgsrc/SemantischeRelationen
    trunk/locale/de/pgsrc/SemantischeSuche
    trunk/locale/de/pgsrc/StartSeite
    trunk/locale/de/pgsrc/StartSeiteAlias
    trunk/locale/de/pgsrc/TitelSuche
    trunk/locale/de/pgsrc/UpLoad
    trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen
    trunk/locale/de/pgsrc/VerwaisteSeiten
    trunk/locale/de/pgsrc/VolltextSuche
    trunk/locale/de/pgsrc/Vorlage%2FBeispiel
    trunk/locale/de/pgsrc/WerIstOnline
    trunk/locale/de/pgsrc/WikiAdminAuswahl
    trunk/locale/de/pgsrc/WunschZettelSeiten
    trunk/locale/de/pgsrc/ZufallsSeite
    trunk/locale/es/pgsrc/Ayuda
    trunk/locale/es/pgsrc/Ayuda%2FAgregarPaginas
    trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo
    trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki
    trunk/locale/es/pgsrc/Ayuda%2FEditarElTexto
    trunk/locale/es/pgsrc/Ayuda%2FKBrown
    trunk/locale/es/pgsrc/Ayuda%2FMasAcercadeLaMecanica
    trunk/locale/es/pgsrc/Ayuda%2FPhpWiki
    trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto
    trunk/locale/es/pgsrc/Ayuda%2FWabiSabi
    trunk/locale/es/pgsrc/Ayuda%2FWikiWikiWeb
    trunk/locale/es/pgsrc/BuscarP%C3%A1gina
    trunk/locale/es/pgsrc/CajaDeArena
    trunk/locale/es/pgsrc/CambiosRecientes
    trunk/locale/es/pgsrc/MasPopulares
    trunk/locale/es/pgsrc/P%C3%A1ginaPrincipal
    trunk/locale/es/pgsrc/TodasLasPaginas
    trunk/locale/es/pgsrc/VisitantesRecientes
    trunk/locale/fr/pgsrc/%C3%89diterLesMetaDonn%C3%A9es
    trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes
    trunk/locale/fr/pgsrc/AdministrationDePhpWiki
    trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FChown
    trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl
    trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAclSimple
    trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FPurger
    trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FRechercherRemplacer
    trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FRenommer
    trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimer
    trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimerAcl
    trunk/locale/fr/pgsrc/Aide
    trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu
    trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages
    trunk/locale/fr/pgsrc/Aide%2FCommentUtiliserUnWiki
    trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques
    trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien
    trunk/locale/fr/pgsrc/Aide%2FInterWiki
    trunk/locale/fr/pgsrc/Aide%2FLienGoogle
    trunk/locale/fr/pgsrc/Aide%2FPhpWiki
    trunk/locale/fr/pgsrc/Aide%2FPlugin%C3%89diterMetaData
    trunk/locale/fr/pgsrc/Aide%2FPluginAjouterDesCommentaires
    trunk/locale/fr/pgsrc/Aide%2FPluginAlbumPhotos
    trunk/locale/fr/pgsrc/Aide%2FPluginBeauTableau
    trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde
    trunk/locale/fr/pgsrc/Aide%2FPluginCalendrier
    trunk/locale/fr/pgsrc/Aide%2FPluginColorationPhp
    trunk/locale/fr/pgsrc/Aide%2FPluginCommenter
    trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUnePage
    trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUneTdm
    trunk/locale/fr/pgsrc/Aide%2FPluginHistoriqueAuteur
    trunk/locale/fr/pgsrc/Aide%2FPluginHtmlPur
    trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnePage
    trunk/locale/fr/pgsrc/Aide%2FPluginInfosSyst%C3%A8me
    trunk/locale/fr/pgsrc/Aide%2FPluginIns%C3%A9rer
    trunk/locale/fr/pgsrc/Aide%2FPluginListeDePages
    trunk/locale/fr/pgsrc/Aide%2FPluginListeDesSousPages
    trunk/locale/fr/pgsrc/Aide%2FPluginListeDuCalendrier
    trunk/locale/fr/pgsrc/Aide%2FPluginM%C3%A9t%C3%A9oPhp
    trunk/locale/fr/pgsrc/Aide%2FPluginRechercheExterne
    trunk/locale/fr/pgsrc/Aide%2FPluginRedirection
    trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss
    trunk/locale/fr/pgsrc/Aide%2FPluginTableauAncienStyle
    trunk/locale/fr/pgsrc/Aide%2FPluginTeX2png
    trunk/locale/fr/pgsrc/Aide%2FPluginTestDeCache
    trunk/locale/fr/pgsrc/Aide%2FPluginWiki
    trunk/locale/fr/pgsrc/Aide%2FPluginWikiBlog
    trunk/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes
    trunk/locale/fr/pgsrc/Aide%2FSteve%20Wainstead
    trunk/locale/fr/pgsrc/Aide%2FStyleCorrect
    trunk/locale/fr/pgsrc/Aide%2FURLMagiquesPhpWiki
    trunk/locale/fr/pgsrc/Aide%2FWabiSabi
    trunk/locale/fr/pgsrc/Aide%2FWikiWikiWeb
    trunk/locale/fr/pgsrc/AliasAccueil
    trunk/locale/fr/pgsrc/Bac%C3%80Sable
    trunk/locale/fr/pgsrc/CarteInterWiki
    trunk/locale/fr/pgsrc/Cat%C3%A9gorieCat%C3%A9gorie
    trunk/locale/fr/pgsrc/Cat%C3%A9gorieGroupes
    trunk/locale/fr/pgsrc/Cat%C3%A9goriePageDAction
    trunk/locale/fr/pgsrc/Cat%C3%A9goriePagesAccueil
    trunk/locale/fr/pgsrc/Cat%C3%A9goriePluginWiki
    trunk/locale/fr/pgsrc/ChangementsLi%C3%A9s
    trunk/locale/fr/pgsrc/ChercherUnePage
    trunk/locale/fr/pgsrc/ClassezLa
    trunk/locale/fr/pgsrc/CommentairesR%C3%A9cents
    trunk/locale/fr/pgsrc/Cr%C3%A9erUnePage
    trunk/locale/fr/pgsrc/D%C3%A9bogageDePhpWiki
    trunk/locale/fr/pgsrc/D%C3%A9poserUnFichier
    trunk/locale/fr/pgsrc/Derni%C3%A8resModifs
    trunk/locale/fr/pgsrc/Derni%C3%A8resModifsCompl%C3%A8tes
    trunk/locale/fr/pgsrc/DocumentationDePhpWiki
    trunk/locale/fr/pgsrc/GestionDesPlugins
    trunk/locale/fr/pgsrc/HistoriqueDeLaPage
    trunk/locale/fr/pgsrc/InfosAuthentification
    trunk/locale/fr/pgsrc/InfosDeD%C3%A9bogage
    trunk/locale/fr/pgsrc/InfosSurLaPage
    trunk/locale/fr/pgsrc/LesPlusVisit%C3%A9es
    trunk/locale/fr/pgsrc/ManuelPhpWiki
    trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki
    trunk/locale/fr/pgsrc/NotesDeVersion
    trunk/locale/fr/pgsrc/PageAccueil
    trunk/locale/fr/pgsrc/PageAl%C3%A9atoire
    trunk/locale/fr/pgsrc/PagesFloues
    trunk/locale/fr/pgsrc/PagesOrphelines
    trunk/locale/fr/pgsrc/PagesRecherch%C3%A9es
    trunk/locale/fr/pgsrc/PagesSemblables
    trunk/locale/fr/pgsrc/PierrickMeignen
    trunk/locale/fr/pgsrc/Pr%C3%A9f%C3%A9rencesUtilisateurs
    trunk/locale/fr/pgsrc/QuiEstEnLigne
    trunk/locale/fr/pgsrc/R%C3%A9cup%C3%A9rationDeLaPage
    trunk/locale/fr/pgsrc/R%C3%A9troLiens
    trunk/locale/fr/pgsrc/RechercheEnTexteInt%C3%A9gral
    trunk/locale/fr/pgsrc/RechercheInterWiki
    trunk/locale/fr/pgsrc/RechercheParTitre
    trunk/locale/fr/pgsrc/SommaireDuProjet
    trunk/locale/fr/pgsrc/SondagePhpWiki
    trunk/locale/fr/pgsrc/Suivre
    trunk/locale/fr/pgsrc/TousLesUtilisateurs
    trunk/locale/fr/pgsrc/ToutesLesPages
    trunk/locale/fr/pgsrc/TraduireUnTexte
    trunk/locale/fr/pgsrc/VersionsR%C3%A9centes
    trunk/locale/fr/pgsrc/VisiteursR%C3%A9cents
    trunk/locale/it/pgsrc/Aiuto
    trunk/locale/it/pgsrc/Aiuto%2FAggiungerePagine
    trunk/locale/it/pgsrc/Aiuto%2FBuonStile
    trunk/locale/it/pgsrc/Aiuto%2FComeUsareWiki
    trunk/locale/it/pgsrc/Aiuto%2FMagicPhpWikiURLs
    trunk/locale/it/pgsrc/Aiuto%2FModificaIlTesto
    trunk/locale/it/pgsrc/Aiuto%2FPhpWiki
    trunk/locale/it/pgsrc/Aiuto%2FRegoleFormattazioneTesto
    trunk/locale/it/pgsrc/Aiuto%2FVarieSulFunzionamento
    trunk/locale/it/pgsrc/Aiuto%2FWabiSabi
    trunk/locale/it/pgsrc/Aiuto%2FWikiWikiWeb
    trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki
    trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki%2FRimuovi
    trunk/locale/it/pgsrc/CambiamentiRecenti
    trunk/locale/it/pgsrc/FuzzyPages
    trunk/locale/it/pgsrc/NoteDiRilascio
    trunk/locale/it/pgsrc/PaginaDiProva
    trunk/locale/it/pgsrc/PaginaPrincipale
    trunk/locale/it/pgsrc/PiuPopolari
    trunk/locale/it/pgsrc/RicercaDelTesto
    trunk/locale/it/pgsrc/RicercaSuTutto
    trunk/locale/it/pgsrc/ScatolaDiSabbia
    trunk/locale/it/pgsrc/SteveWainstead
    trunk/locale/it/pgsrc/TrovaPagina
    trunk/locale/it/pgsrc/TutteLePagine
    trunk/locale/it/pgsrc/VisitatoriRecenti
    trunk/locale/ja/pgsrc/%E3%83%9A%E3%83%BC%E3%82%B8%E6%A4%9C%E7%B4%A2
    trunk/locale/ja/pgsrc/%E3%83%9B%E3%83%BC%E3%83%A0%E3%83%9A%E3%83%BC%E3%82%B8
    trunk/locale/nl/pgsrc/Help
    trunk/locale/nl/pgsrc/Help%2FGebruikersVoorkeuren
    trunk/locale/nl/pgsrc/Help%2FGoedeStijl
    trunk/locale/nl/pgsrc/Help%2FHoeWikiTeGebruiken
    trunk/locale/nl/pgsrc/Help%2FJanNieuwenhuizen
    trunk/locale/nl/pgsrc/Help%2FMeerOverTechnieken
    trunk/locale/nl/pgsrc/Help%2FPaginasToevoegen
    trunk/locale/nl/pgsrc/Help%2FPhpWiki
    trunk/locale/nl/pgsrc/Help%2FRecenteBezoekers
    trunk/locale/nl/pgsrc/Help%2FTekstFormatteringsRegels
    trunk/locale/nl/pgsrc/Help%2FToverPhpWikiURLs
    trunk/locale/nl/pgsrc/Help%2FVeranderTekst
    trunk/locale/nl/pgsrc/Help%2FWabiSabi
    trunk/locale/nl/pgsrc/Help%2FWikiWikiWeb
    trunk/locale/nl/pgsrc/MeestBezocht
    trunk/locale/nl/pgsrc/PhpWikiBeheer
    trunk/locale/nl/pgsrc/PhpWikiBeheer%2FVervangt
    trunk/locale/nl/pgsrc/PhpWikiBeheer%2FVerwijder
    trunk/locale/nl/pgsrc/RecenteVeranderingen
    trunk/locale/nl/pgsrc/ThuisPagina
    trunk/locale/nl/pgsrc/UitgaveNoten
    trunk/locale/nl/pgsrc/ZandBak
    trunk/locale/nl/pgsrc/ZoekPagina
    trunk/locale/sv/pgsrc/Framsida
    trunk/locale/sv/pgsrc/Hj%C3%A4lp
    trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FG%C3%A4stboken
    trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FHurManAnv%C3%A4nderWiki
    trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FL%C3%A4ggaTillSidor
    trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FMerOmMekanismerna
    trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FPhpWiki
    trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FRedigeraText
    trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FTextformateringsregler
    trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FWikiWikiWeb
    trunk/locale/sv/pgsrc/MestPopul%C3%A4r
    trunk/locale/sv/pgsrc/PhpWikiAdministration
    trunk/locale/sv/pgsrc/S%C3%B6kEfterSida
    trunk/locale/sv/pgsrc/Sandl%C3%A5dan
    trunk/locale/sv/pgsrc/Senaste%C3%84ndringar
    trunk/locale/zh/pgsrc/%E9%A6%96%E9%A0%81
    trunk/locale/zh/pgsrc/AllPages
    trunk/locale/zh/pgsrc/AllUsers
    trunk/locale/zh/pgsrc/BackLinks
    trunk/locale/zh/pgsrc/DebugInfo
    trunk/locale/zh/pgsrc/FindPage
    trunk/locale/zh/pgsrc/FullRecentChanges
    trunk/locale/zh/pgsrc/FullTextSearch
    trunk/locale/zh/pgsrc/FuzzyPages
    trunk/locale/zh/pgsrc/Help
    trunk/locale/zh/pgsrc/Help%2FAddingPages
    trunk/locale/zh/pgsrc/Help%2FCalendarPlugin
    trunk/locale/zh/pgsrc/Help%2FCommentPlugin
    trunk/locale/zh/pgsrc/Help%2FEditText
    trunk/locale/zh/pgsrc/Help%2FExternalSearchPlugin
    trunk/locale/zh/pgsrc/Help%2FHelloWorldPlugin
    trunk/locale/zh/pgsrc/Help%2FHowToUseWiki
    trunk/locale/zh/pgsrc/Help%2FInterWiki
    trunk/locale/zh/pgsrc/Help%2FLinkIcons
    trunk/locale/zh/pgsrc/Help%2FMagicPhpWikiURLs
    trunk/locale/zh/pgsrc/Help%2FMoreAboutMechanics
    trunk/locale/zh/pgsrc/Help%2FOldStyleTablePlugin
    trunk/locale/zh/pgsrc/Help%2FPhotoAlbumPlugin
    trunk/locale/zh/pgsrc/Help%2FPhpHighlightPlugin
    trunk/locale/zh/pgsrc/Help%2FPhpWeatherPlugin
    trunk/locale/zh/pgsrc/Help%2FPhpWiki
    trunk/locale/zh/pgsrc/Help%2FRedirectToPlugin
    trunk/locale/zh/pgsrc/Help%2FSystemInfoPlugin
    trunk/locale/zh/pgsrc/Help%2FTranscludePlugin
    trunk/locale/zh/pgsrc/Help%2FWikiPlugin
    trunk/locale/zh/pgsrc/Help%2FWikiWikiWeb
    trunk/locale/zh/pgsrc/HomePage
    trunk/locale/zh/pgsrc/HomePageAlias
    trunk/locale/zh/pgsrc/InterWikiMap
    trunk/locale/zh/pgsrc/InterWikiSearch
    trunk/locale/zh/pgsrc/LikePages
    trunk/locale/zh/pgsrc/OrphanedPages
    trunk/locale/zh/pgsrc/PageDump
    trunk/locale/zh/pgsrc/PhpWikiAdministration
    trunk/locale/zh/pgsrc/RandomPage
    trunk/locale/zh/pgsrc/RecentChanges
    trunk/locale/zh/pgsrc/RecentEdits
    trunk/locale/zh/pgsrc/RecentVisitors
    trunk/locale/zh/pgsrc/SandBox
    trunk/locale/zh/pgsrc/TitleSearch
    trunk/locale/zh/pgsrc/UpLoad
    trunk/locale/zh/pgsrc/UserPreferences
    trunk/locale/zh/pgsrc/WantedPages
    trunk/pgsrc/AllPages
    trunk/pgsrc/AllPagesByAcl
    trunk/pgsrc/AllPagesCreatedByMe
    trunk/pgsrc/AllPagesLastEditedByMe
    trunk/pgsrc/AllPagesOwnedByMe
    trunk/pgsrc/AllUserPages
    trunk/pgsrc/AllUsers
    trunk/pgsrc/AppendText
    trunk/pgsrc/AuthorHistory
    trunk/pgsrc/BackLinks
    trunk/pgsrc/BlogArchives
    trunk/pgsrc/BlogJournal
    trunk/pgsrc/CategoryActionPage
    trunk/pgsrc/CategoryCategory
    trunk/pgsrc/CategoryGroup
    trunk/pgsrc/CategoryHomePages
    trunk/pgsrc/CategoryWikiPlugin
    trunk/pgsrc/Copyrights
    trunk/pgsrc/CreatePage
    trunk/pgsrc/DebugAuthInfo
    trunk/pgsrc/DebugBackendInfo
    trunk/pgsrc/DebugGroupInfo
    trunk/pgsrc/DebugInfo
    trunk/pgsrc/EditMetaData
    trunk/pgsrc/FindPage
    trunk/pgsrc/FullRecentChanges
    trunk/pgsrc/FullTextSearch
    trunk/pgsrc/FuzzyPages
    trunk/pgsrc/GeneralDisclaimer
    trunk/pgsrc/Help
    trunk/pgsrc/Help%2FActionPage
    trunk/pgsrc/Help%2FAddCommentPlugin
    trunk/pgsrc/Help%2FAddingPages
    trunk/pgsrc/Help%2FAdobe%20Flash
    trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users
    trunk/pgsrc/Help%2FAllPagesPlugin
    trunk/pgsrc/Help%2FAllUsersPlugin
    trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin
    trunk/pgsrc/Help%2FAppendTextPlugin
    trunk/pgsrc/Help%2FAsciiMathPlugin
    trunk/pgsrc/Help%2FAsciiSVGPlugin
    trunk/pgsrc/Help%2FAtomFeedPlugin
    trunk/pgsrc/Help%2FAuthorHistoryPlugin
    trunk/pgsrc/Help%2FBackLinksPlugin
    trunk/pgsrc/Help%2FBlogArchivesPlugin
    trunk/pgsrc/Help%2FBlogJournalPlugin
    trunk/pgsrc/Help%2FBoxRightPlugin
    trunk/pgsrc/Help%2FCacheTestPlugin
    trunk/pgsrc/Help%2FCalendarListPlugin
    trunk/pgsrc/Help%2FCalendarPlugin
    trunk/pgsrc/Help%2FCategories
    trunk/pgsrc/Help%2FCategoryPagePlugin
    trunk/pgsrc/Help%2FChartPlugin
    trunk/pgsrc/Help%2FCommentPlugin
    trunk/pgsrc/Help%2FCreateBibPlugin
    trunk/pgsrc/Help%2FCreatePagePlugin
    trunk/pgsrc/Help%2FCreateTocPlugin
    trunk/pgsrc/Help%2FCurrentTimePlugin
    trunk/pgsrc/Help%2FDeadEndPagesPlugin
    trunk/pgsrc/Help%2FDebugAuthInfoPlugin
    trunk/pgsrc/Help%2FDebugBackendInfoPlugin
    trunk/pgsrc/Help%2FDebugGroupInfoPlugin
    trunk/pgsrc/Help%2FDiffPlugin
    trunk/pgsrc/Help%2FDynamicIncludePagePlugin
    trunk/pgsrc/Help%2FEditMetaDataPlugin
    trunk/pgsrc/Help%2FEditText
    trunk/pgsrc/Help%2FExternalSearchPlugin
    trunk/pgsrc/Help%2FFacebookLikePlugin
    trunk/pgsrc/Help%2FFileInfoPlugin
    trunk/pgsrc/Help%2FFoafViewerPlugin
    trunk/pgsrc/Help%2FFullTextSearchPlugin
    trunk/pgsrc/Help%2FFuzzyPagesPlugin
    trunk/pgsrc/Help%2FGoToPlugin
    trunk/pgsrc/Help%2FGoodStyle
    trunk/pgsrc/Help%2FGoogleLink
    trunk/pgsrc/Help%2FGoogleMapsPlugin
    trunk/pgsrc/Help%2FGooglePluginPlugin
    trunk/pgsrc/Help%2FGraphVizPlugin
    trunk/pgsrc/Help%2FHelloWorldPlugin
    trunk/pgsrc/Help%2FHowToUseWiki
    trunk/pgsrc/Help%2FHtmlConverterPlugin
    trunk/pgsrc/Help%2FImages
    trunk/pgsrc/Help%2FIncludePagePlugin
    trunk/pgsrc/Help%2FIncludePagesPlugin
    trunk/pgsrc/Help%2FIncludeSiteMapPlugin
    trunk/pgsrc/Help%2FIncludeTreePlugin
    trunk/pgsrc/Help%2FInterWiki
    trunk/pgsrc/Help%2FInterWikiSearchPlugin
    trunk/pgsrc/Help%2FJabberPresencePlugin
    trunk/pgsrc/Help%2FJeff%20Dairiki
    trunk/pgsrc/Help%2FLdapSearchPlugin
    trunk/pgsrc/Help%2FLikePagesPlugin
    trunk/pgsrc/Help%2FLinkDatabasePlugin
    trunk/pgsrc/Help%2FLinkIcons
    trunk/pgsrc/Help%2FListPagesPlugin
    trunk/pgsrc/Help%2FListSubpagesPlugin
    trunk/pgsrc/Help%2FMagicPhpWikiURLs
    trunk/pgsrc/Help%2FMediawikiTablePlugin
    trunk/pgsrc/Help%2FModeratedPagePlugin
    trunk/pgsrc/Help%2FMoreAboutMechanics
    trunk/pgsrc/Help%2FMostPopularPlugin
    trunk/pgsrc/Help%2FNewPagesPerUserPlugin
    trunk/pgsrc/Help%2FNoCachePlugin
    trunk/pgsrc/Help%2FOldStyleTablePlugin
    trunk/pgsrc/Help%2FOrphanedPagesPlugin
    trunk/pgsrc/Help%2FPageDumpPlugin
    trunk/pgsrc/Help%2FPageGroupPlugin
    trunk/pgsrc/Help%2FPageHistoryPlugin
    trunk/pgsrc/Help%2FPageInfoPlugin
    trunk/pgsrc/Help%2FPageList
    trunk/pgsrc/Help%2FPagePermissions
    trunk/pgsrc/Help%2FPageTrailPlugin
    trunk/pgsrc/Help%2FPasswordResetPlugin
    trunk/pgsrc/Help%2FPhotoAlbumPlugin
    trunk/pgsrc/Help%2FPhotoAlbumPlugin%2FSlides
    trunk/pgsrc/Help%2FPhpHighlightPlugin
    trunk/pgsrc/Help%2FPhpWeatherPlugin
    trunk/pgsrc/Help%2FPhpWiki
    trunk/pgsrc/Help%2FPloticusPlugin
    trunk/pgsrc/Help%2FPluginManagerPlugin
    trunk/pgsrc/Help%2FPopUpPlugin
    trunk/pgsrc/Help%2FPopularNearbyPlugin
    trunk/pgsrc/Help%2FPredefinedIcons
    trunk/pgsrc/Help%2FPreferenceAppPlugin
    trunk/pgsrc/Help%2FPreferencesInfoPlugin
    trunk/pgsrc/Help%2FPrevNextPlugin
    trunk/pgsrc/Help%2FRandomPagePlugin
    trunk/pgsrc/Help%2FRateItPlugin
    trunk/pgsrc/Help%2FRawHtmlPlugin
    trunk/pgsrc/Help%2FRecentChangesCachedPlugin
    trunk/pgsrc/Help%2FRecentChangesPlugin
    trunk/pgsrc/Help%2FRecentCommentsPlugin
    trunk/pgsrc/Help%2FRecentEditsPlugin
    trunk/pgsrc/Help%2FRecentReferrersPlugin
    trunk/pgsrc/Help%2FRedirectToPlugin
    trunk/pgsrc/Help%2FReini%20Urban
    trunk/pgsrc/Help%2FRelatedChangesPlugin
    trunk/pgsrc/Help%2FRichTablePlugin
    trunk/pgsrc/Help%2FRssFeedPlugin
    trunk/pgsrc/Help%2FSearchHighlightPlugin
    trunk/pgsrc/Help%2FSemanticRelations
    trunk/pgsrc/Help%2FSemanticRelationsPlugin
    trunk/pgsrc/Help%2FSemanticSearchPlugin
    trunk/pgsrc/Help%2FSiteMapPlugin
    trunk/pgsrc/Help%2FSpreadsheet
    trunk/pgsrc/Help%2FSqlResultPlugin
    trunk/pgsrc/Help%2FSteve%20Wainstead
    trunk/pgsrc/Help%2FSyncWikiPlugin
    trunk/pgsrc/Help%2FSyntaxHighlighterPlugin
    trunk/pgsrc/Help%2FSystemInfoPlugin
    trunk/pgsrc/Help%2FTeX2pngPlugin
    trunk/pgsrc/Help%2FTemplatePlugin
    trunk/pgsrc/Help%2FTexToPngPlugin
    trunk/pgsrc/Help%2FTextFormattingRules
    trunk/pgsrc/Help%2FTitleSearchPlugin
    trunk/pgsrc/Help%2FTranscludePlugin
    trunk/pgsrc/Help%2FTranslateTextPlugin
    trunk/pgsrc/Help%2FUnfoldSubpagesPlugin
    trunk/pgsrc/Help%2FUpLoadPlugin
    trunk/pgsrc/Help%2FUserPreferencesPlugin
    trunk/pgsrc/Help%2FUserRatingsPlugin
    trunk/pgsrc/Help%2FVideoPlugin
    trunk/pgsrc/Help%2FVisualWikiPlugin
    trunk/pgsrc/Help%2FWabiSabi
    trunk/pgsrc/Help%2FWantedPagesPlugin
    trunk/pgsrc/Help%2FWatchPagePlugin
    trunk/pgsrc/Help%2FWhoIsOnlinePlugin
    trunk/pgsrc/Help%2FWikiAdminChownPlugin
    trunk/pgsrc/Help%2FWikiAdminPurgePlugin
    trunk/pgsrc/Help%2FWikiAdminRemovePlugin
    trunk/pgsrc/Help%2FWikiAdminRenamePlugin
    trunk/pgsrc/Help%2FWikiAdminSearchReplacePlugin
    trunk/pgsrc/Help%2FWikiAdminSelectPlugin
    trunk/pgsrc/Help%2FWikiAdminSetAclPlugin
    trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin
    trunk/pgsrc/Help%2FWikiAdminUtilsPlugin
    trunk/pgsrc/Help%2FWikiBlogPlugin
    trunk/pgsrc/Help%2FWikiFormPlugin
    trunk/pgsrc/Help%2FWikiFormRichPlugin
    trunk/pgsrc/Help%2FWikiForumPlugin
    trunk/pgsrc/Help%2FWikiPlugin
    trunk/pgsrc/Help%2FWikiPollPlugin
    trunk/pgsrc/Help%2FWikiTranslationPlugin
    trunk/pgsrc/Help%2FWikiWikiWeb
    trunk/pgsrc/Help%2FWikicreole
    trunk/pgsrc/Help%2FWikisUsingPhpWiki
    trunk/pgsrc/Help%2FYouTubePlugin
    trunk/pgsrc/Help%2Ftext2pngPlugin
    trunk/pgsrc/HomePage
    trunk/pgsrc/HomePageAlias
    trunk/pgsrc/InterWikiMap
    trunk/pgsrc/InterWikiSearch
    trunk/pgsrc/LdapSearch
    trunk/pgsrc/LeastPopular
    trunk/pgsrc/LikePages
    trunk/pgsrc/LinkDatabase
    trunk/pgsrc/LinkSearch
    trunk/pgsrc/ListRelations
    trunk/pgsrc/LockedPages
    trunk/pgsrc/ModeratedPage
    trunk/pgsrc/MostPopular
    trunk/pgsrc/MyRatings
    trunk/pgsrc/MyRecentChanges
    trunk/pgsrc/MyRecentEdits
    trunk/pgsrc/NewPagesPerUser
    trunk/pgsrc/OrphanedPages
    trunk/pgsrc/PageDump
    trunk/pgsrc/PageHistory
    trunk/pgsrc/PageInfo
    trunk/pgsrc/PasswordReset
    trunk/pgsrc/PhpWikiAdministration
    trunk/pgsrc/PhpWikiAdministration%2FChown
    trunk/pgsrc/PhpWikiAdministration%2FDeleteAcl
    trunk/pgsrc/PhpWikiAdministration%2FPurge
    trunk/pgsrc/PhpWikiAdministration%2FRemove
    trunk/pgsrc/PhpWikiAdministration%2FRename
    trunk/pgsrc/PhpWikiAdministration%2FSearchReplace
    trunk/pgsrc/PhpWikiAdministration%2FSetAcl
    trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple
    trunk/pgsrc/PhpWikiDebug
    trunk/pgsrc/PhpWikiDocumentation
    trunk/pgsrc/PhpWikiManual
    trunk/pgsrc/PhpWikiPoll
    trunk/pgsrc/PhpWikiRecentChanges
    trunk/pgsrc/PluginManager
    trunk/pgsrc/ProjectSummary
    trunk/pgsrc/RandomPage
    trunk/pgsrc/RateIt
    trunk/pgsrc/RecentChanges
    trunk/pgsrc/RecentChangesMyPages
    trunk/pgsrc/RecentComments
    trunk/pgsrc/RecentEdits
    trunk/pgsrc/RecentNewPages
    trunk/pgsrc/RecentReleases
    trunk/pgsrc/RecentVisitors
    trunk/pgsrc/RelatedChanges
    trunk/pgsrc/San%20Diego
    trunk/pgsrc/SandBox
    trunk/pgsrc/SearchHighlight
    trunk/pgsrc/SemanticRelations
    trunk/pgsrc/SemanticSearch
    trunk/pgsrc/SetGlobalAccessRights
    trunk/pgsrc/SetGlobalAccessRightsSimple
    trunk/pgsrc/SpecialPages
    trunk/pgsrc/SpellCheck
    trunk/pgsrc/SystemInfo
    trunk/pgsrc/Template%2FAttribute
    trunk/pgsrc/Template%2FCategory
    trunk/pgsrc/Template%2FExample
    trunk/pgsrc/Template%2FLinkto
    trunk/pgsrc/Template%2FNewPlugin
    trunk/pgsrc/Template%2FRelation
    trunk/pgsrc/Template%2FTalk
    trunk/pgsrc/Template%2FUserPage
    trunk/pgsrc/The%20PhpWiki%20programming%20team
    trunk/pgsrc/TitleSearch
    trunk/pgsrc/TranslateText
    trunk/pgsrc/UpLoad
    trunk/pgsrc/UriResolver
    trunk/pgsrc/UserContribs
    trunk/pgsrc/UserPreferences
    trunk/pgsrc/UserRatings
    trunk/pgsrc/WantedPages
    trunk/pgsrc/WatchPage
    trunk/pgsrc/WhoIsOnline
    trunk/pgsrc/WikiAdminSelect
    trunk/pgsrc/WikiBlog
    trunk/pgsrc/area
    trunk/pgsrc/is_a
    trunk/pgsrc/located_in
    trunk/pgsrc/population
    trunk/themes/blog/pgsrc/About
    trunk/themes/blog/pgsrc/Blog
    trunk/themes/blog/pgsrc/BlogArchives
    trunk/themes/blog/pgsrc/CategoryHowTo
    trunk/themes/blog/pgsrc/HomePage
    trunk/themes/blog/pgsrc/HowTo
    trunk/themes/blog/pgsrc/PhotoAlbum
    trunk/themes/fusionforge/pgsrc/CategoryWiki%20templates
    trunk/themes/fusionforge/pgsrc/CategoryWiki%20user
    trunk/themes/fusionforge/pgsrc/ExternalPages
    trunk/themes/fusionforge/pgsrc/FindPage
    trunk/themes/fusionforge/pgsrc/FullTextSearch
    trunk/themes/fusionforge/pgsrc/HomePage
    trunk/themes/fusionforge/pgsrc/InterWikiMap
    trunk/themes/fusionforge/pgsrc/PhpWikiAdministration
    trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
    trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal
    trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple
    trunk/themes/fusionforge/pgsrc/SpecialPages
    trunk/themes/fusionforge/pgsrc/TextFormattingRules
    trunk/themes/fusionforge/pgsrc/TitleSearch
    trunk/themes/fusionforge/pgsrc/UpLoad
    trunk/themes/fusionforge/pgsrc/colorbox
    trunk/themes/fusionforge/pgsrc/titlebar
    trunk/themes/wikilens/pgsrc/LeftbarContent

Modified: trunk/locale/de/pgsrc/%C3%84hnlicheSeiten
===================================================================
--- trunk/locale/de/pgsrc/%C3%84hnlicheSeiten	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/%C3%84hnlicheSeiten	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=%C3%84hnlicheSeiten;
   flags="";

Modified: trunk/locale/de/pgsrc/AlleBenutzer
===================================================================
--- trunk/locale/de/pgsrc/AlleBenutzer	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/AlleBenutzer	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=AlleBenutzer;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/AlleSeiten
===================================================================
--- trunk/locale/de/pgsrc/AlleSeiten	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/AlleSeiten	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=AlleSeiten;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir
===================================================================
--- trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=AlleSeitenEditiertVonMir;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir
===================================================================
--- trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=AlleSeitenErzeugtVonMir;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir
===================================================================
--- trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=AlleSeitenImBesitzVonMir;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/BackLinks
===================================================================
--- trunk/locale/de/pgsrc/BackLinks	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/BackLinks	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=BackLinks;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/BenutzerEinstellungen
===================================================================
--- trunk/locale/de/pgsrc/BenutzerEinstellungen	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/BenutzerEinstellungen	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=BenutzerEinstellungen;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/DebugAuthInfo
===================================================================
--- trunk/locale/de/pgsrc/DebugAuthInfo	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/DebugAuthInfo	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=DebugAuthInfo;
   flags=LOCKED;

Modified: trunk/locale/de/pgsrc/DebugGruppenInfo
===================================================================
--- trunk/locale/de/pgsrc/DebugGruppenInfo	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/DebugGruppenInfo	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=DebugGruppenInfo;
   flags=LOCKED;

Modified: trunk/locale/de/pgsrc/DebugInfo
===================================================================
--- trunk/locale/de/pgsrc/DebugInfo	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/DebugInfo	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=DebugInfo;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/EditiereText
===================================================================
--- trunk/locale/de/pgsrc/EditiereText	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/EditiereText	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=EditiereText;
   flags="";

Modified: trunk/locale/de/pgsrc/Einstellungen
===================================================================
--- trunk/locale/de/pgsrc/Einstellungen	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Einstellungen	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Einstellungen;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/FuzzySuche
===================================================================
--- trunk/locale/de/pgsrc/FuzzySuche	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/FuzzySuche	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=FuzzySuche;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/G%C3%A4steBuch
===================================================================
--- trunk/locale/de/pgsrc/G%C3%A4steBuch	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/G%C3%A4steBuch	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=G%C3%A4steBuch;
   flags="";

Modified: trunk/locale/de/pgsrc/GaesteBuch
===================================================================
--- trunk/locale/de/pgsrc/GaesteBuch	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/GaesteBuch	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=GaesteBuch;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen
===================================================================
--- trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Geringf%C3%BCgige%C3%84nderungen;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/GleicheSeiten
===================================================================
--- trunk/locale/de/pgsrc/GleicheSeiten	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/GleicheSeiten	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=GleicheSeiten;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/Hilfe
===================================================================
--- trunk/locale/de/pgsrc/Hilfe	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;

Modified: trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FAktionsSeite;
   flags="";

Modified: trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FAutorenProtokollPlugin;
   flags="";

Modified: trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FGraphVizPlugin;
   flags="";

Modified: trunk/locale/de/pgsrc/Hilfe%2FGuterStil
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FGuterStil	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe%2FGuterStil	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FGuterStil;
   flags="";

Modified: trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FHalloWeltPlugin;
   flags="";

Modified: trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FHochLadenPlugin;
   flags="";

Modified: trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FInhaltsVerzeichnisPlugin;
   flags="";

Modified: trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FNeueSeitePlugin;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FNeuerKommentarPlugin;
   flags="";

Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FPhotoAlbumPlugin;
   flags="";

Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FPhotoAlbumPlugin%2FDiashow;
   flags="";

Modified: trunk/locale/de/pgsrc/Hilfe%2FPhpWiki
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FPhpWiki	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe%2FPhpWiki	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FPhpWiki;
   flags="";

Modified: trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FTextBearbeiten;
   flags="";

Modified: trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FTextFormatierungsRegeln;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FVorlagePlugin;
   flags="";

Modified: trunk/locale/de/pgsrc/Hilfe%2FWabiSabi
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWabiSabi	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe%2FWabiSabi	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FWabiSabi;
   flags="";

Modified: trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FWieManWikiBenutzt;
   flags="";

Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FWikiTechnik;
   flags="";

Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FWikiWikiWeb;
   flags="";

Modified: trunk/locale/de/pgsrc/HochLaden
===================================================================
--- trunk/locale/de/pgsrc/HochLaden	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/HochLaden	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=HochLaden;
   flags="";

Modified: trunk/locale/de/pgsrc/InterWikiListe
===================================================================
--- trunk/locale/de/pgsrc/InterWikiListe	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/InterWikiListe	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=InterWikiListe;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/KategorieAktionSeite
===================================================================
--- trunk/locale/de/pgsrc/KategorieAktionSeite	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/KategorieAktionSeite	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=KategorieAktionSeite;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/KategorieKategorie
===================================================================
--- trunk/locale/de/pgsrc/KategorieKategorie	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/KategorieKategorie	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=KategorieKategorie;
   flags="";

Modified: trunk/locale/de/pgsrc/KategorieWikiPlugin
===================================================================
--- trunk/locale/de/pgsrc/KategorieWikiPlugin	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/KategorieWikiPlugin	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=KategorieWikiPlugin;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/LinkSuche
===================================================================
--- trunk/locale/de/pgsrc/LinkSuche	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/LinkSuche	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=LinkSuche;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/ListeRelationen
===================================================================
--- trunk/locale/de/pgsrc/ListeRelationen	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/ListeRelationen	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=ListeRelationen;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/ListeSeiten
===================================================================
--- trunk/locale/de/pgsrc/ListeSeiten	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/ListeSeiten	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=ListeSeiten;
   flags="";

Modified: trunk/locale/de/pgsrc/MeistBesucht
===================================================================
--- trunk/locale/de/pgsrc/MeistBesucht	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/MeistBesucht	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=MeistBesucht;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/ModerierteSeite
===================================================================
--- trunk/locale/de/pgsrc/ModerierteSeite	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/ModerierteSeite	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=ModerierteSeite;
   flags="LOCKED";

Modified: trunk/locale/de/pgsrc/NeueSeite
===================================================================
--- trunk/locale/de/pgsrc/NeueSeite	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/NeueSeite	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=NeueSeite;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/Neueste%C3%84nderungen
===================================================================
--- trunk/locale/de/pgsrc/Neueste%C3%84nderungen	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/Neueste%C3%84nderungen	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Neueste%C3%84nderungen;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/NeuesteSeiten
===================================================================
--- trunk/locale/de/pgsrc/NeuesteSeiten	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/NeuesteSeiten	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=NeuesteSeiten;
   flags="";

Modified: trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen
===================================================================
--- trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=PasswortZur%C3%BCcksetzen;
   flags="";

Modified: trunk/locale/de/pgsrc/PhpWikiDokumentation
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiDokumentation	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/PhpWikiDokumentation	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiDokumentation;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiSystemverwalten;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiSystemverwalten%2FAclSetzen;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiSystemverwalten%2FChown;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiSystemverwalten%2FL%C3%B6schen;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiSystemverwalten%2FSuchenErsetzen;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiSystemverwalten%2FUmbenennen;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/PhpWikiUmfrage
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiUmfrage	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/PhpWikiUmfrage	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiUmfrage;
   flags=PAGE_LOCKED;

Modified: trunk/locale/de/pgsrc/SandKasten
===================================================================
--- trunk/locale/de/pgsrc/SandKasten	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/SandKasten	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:02 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=SandKasten;
   flags="";

Modified: trunk/locale/de/pgsrc/SandKiste
===================================================================
--- trunk/locale/de/pgsrc/SandKiste	2015-12-10 17:49:07 UTC (rev 9739)
+++ trunk/locale/de/pgsrc/SandKiste	2015-12-10 17:50:05 UTC (rev 9740)
@@ -1,5 +1,5 @@
-Date: Mon, 29 Jun 2015 12:04:27 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 1...
 
[truncated message content]

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

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

Revision: 9739
          http://sourceforge.net/p/phpwiki/code/9739
Author:   vargenau
Date:     2015-12-10 17:49:07 +0000 (Thu, 10 Dec 2015)
Log Message:
-----------
1.5.5 2015-12-11

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

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2015-12-10 17:42:08 UTC (rev 9738)
+++ trunk/pgsrc/ReleaseNotes	2015-12-10 17:49:07 UTC (rev 9739)
@@ -1,5 +1,5 @@
-Date: Wed, 23 Sep 2015 10:35:21 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
+Date: Thu, 10 Dec 2015 18:48:03 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
   flags=PAGE_LOCKED;
@@ -8,7 +8,7 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
 
-== 1.5.5 2015-XX-XX Marc-Etienne Vargenau ==
+== 1.5.5 2015-12-11 Marc-Etienne Vargenau ==
 
 * Fix tooltip translation in ~CreateToc plugin
 * Remove access keys
@@ -17,6 +17,7 @@
 * Remove forbidden characters: ~<~>~[~]~{~}~"~|~# from pagename
 * New property: ALLOWED_LOAD giving list of directories from which it is allowed to load pages.
 * Upload: replace multiple spaces by single space
+* Make function merged public lib/diff3.php (support request #162)
 
 == 1.5.4 2015-06-29 Marc-Etienne Vargenau ==
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9738] trunk/lib/diff3.php

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

Revision: 9738
          http://sourceforge.net/p/phpwiki/code/9738
Author:   vargenau
Date:     2015-12-10 17:42:08 +0000 (Thu, 10 Dec 2015)
Log Message:
-----------
Make function merged public

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

Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php	2015-12-10 17:40:05 UTC (rev 9737)
+++ trunk/lib/diff3.php	2015-12-10 17:42:08 UTC (rev 9738)
@@ -21,14 +21,16 @@
         $this->final2 = $final2 ? $final2 : array();
     }
 
-    protected function merged()
+    public function merged()
     {
         if (!isset($this->_merged)) {
             if ($this->final1 === $this->final2)
                 $this->_merged = &$this->final1;
             elseif ($this->final1 === $this->orig)
-                $this->_merged = &$this->final2; elseif ($this->final2 === $this->orig)
-                $this->_merged = &$this->final1; else
+                $this->_merged = &$this->final2;
+            elseif ($this->final2 === $this->orig)
+                $this->_merged = &$this->final1;
+            else
                 $this->_merged = false;
         }
         return $this->_merged;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9737] branches/release-1.5.4/lib/diff3.php

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

Revision: 9737
          http://sourceforge.net/p/phpwiki/code/9737
Author:   vargenau
Date:     2015-12-10 17:40:05 +0000 (Thu, 10 Dec 2015)
Log Message:
-----------
Make function merged public

Modified Paths:
--------------
    branches/release-1.5.4/lib/diff3.php

Modified: branches/release-1.5.4/lib/diff3.php
===================================================================
--- branches/release-1.5.4/lib/diff3.php	2015-12-08 09:48:35 UTC (rev 9736)
+++ branches/release-1.5.4/lib/diff3.php	2015-12-10 17:40:05 UTC (rev 9737)
@@ -21,14 +21,16 @@
         $this->final2 = $final2 ? $final2 : array();
     }
 
-    protected function merged()
+    public function merged()
     {
         if (!isset($this->_merged)) {
             if ($this->final1 === $this->final2)
                 $this->_merged = &$this->final1;
             elseif ($this->final1 === $this->orig)
-                $this->_merged = &$this->final2; elseif ($this->final2 === $this->orig)
-                $this->_merged = &$this->final1; else
+                $this->_merged = &$this->final2;
+            elseif ($this->final2 === $this->orig)
+                $this->_merged = &$this->final1;
+            else
                 $this->_merged = false;
         }
         return $this->_merged;

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

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

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

Revision: 9736
          http://sourceforge.net/p/phpwiki/code/9736
Author:   vargenau
Date:     2015-12-08 09:48:35 +0000 (Tue, 08 Dec 2015)
Log Message:
-----------
Whitespace

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

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2015-12-08 09:47:59 UTC (rev 9735)
+++ trunk/lib/main.php	2015-12-08 09:48:35 UTC (rev 9736)
@@ -306,7 +306,7 @@
         }
     }
 
-    function & getUser()
+    function &getUser()
     {
         if (isset($this->_user))
             return $this->_user;
@@ -314,7 +314,7 @@
             return $GLOBALS['ForbiddenUser'];
     }
 
-    function & getGroup()
+    function &getGroup()
     {
         if (isset($this->_user) and isset($this->_user->_group))
             return $this->_user->_group;
@@ -339,7 +339,7 @@
         return false;
     }
 
-    function & getDbh()
+    function &getDbh()
     {
         return $this->_dbi;
     }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9735] trunk/lib/difflib.php

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

Revision: 9735
          http://sourceforge.net/p/phpwiki/code/9735
Author:   vargenau
Date:     2015-12-08 09:47:59 +0000 (Tue, 08 Dec 2015)
Log Message:
-----------
Initialize x0 and y0

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

Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php	2015-12-08 09:47:06 UTC (rev 9734)
+++ trunk/lib/difflib.php	2015-12-08 09:47:59 UTC (rev 9735)
@@ -680,6 +680,8 @@
         $ntrail = $this->trailing_context_lines;
 
         $this->_start_diff();
+        $x0 = 0;
+        $y0 = 0;
 
         foreach ($diff->edits as $edit) {
             if ($edit->type == 'copy') {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9734] trunk/lib/diff3.php

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

Revision: 9734
          http://sourceforge.net/p/phpwiki/code/9734
Author:   vargenau
Date:     2015-12-08 09:47:06 +0000 (Tue, 08 Dec 2015)
Log Message:
-----------
Better prototype

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

Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php	2015-10-15 08:07:53 UTC (rev 9733)
+++ trunk/lib/diff3.php	2015-12-08 09:47:06 UTC (rev 9734)
@@ -192,7 +192,7 @@
         return $blocks;
     }
 
-    public function merged_output($label1 = false, $label2 = false)
+    public function merged_output($label1 = '', $label2 = '')
     {
         $lines = array();
         foreach ($this->blocks as $block) {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9733] trunk/lib/plugin/FullTextSearch.php

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

Revision: 9733
          http://sourceforge.net/p/phpwiki/code/9733
Author:   vargenau
Date:     2015-10-15 08:07:53 +0000 (Thu, 15 Oct 2015)
Log Message:
-----------
FullTextSearch: better test quiet argument

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

Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2015-09-23 08:37:53 UTC (rev 9732)
+++ trunk/lib/plugin/FullTextSearch.php	2015-10-15 08:07:53 UTC (rev 9733)
@@ -75,7 +75,7 @@
                            _("You must enter a search term."));
         }
         extract($args);
-        if ($quiet == 'false') {
+        if ($quiet === 'false') {
             $quiet = false;
         }
 

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

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

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

Revision: 9732
          http://sourceforge.net/p/phpwiki/code/9732
Author:   vargenau
Date:     2015-09-23 08:37:53 +0000 (Wed, 23 Sep 2015)
Log Message:
-----------
Update ReleaseNotes

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

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2015-09-23 08:32:30 UTC (rev 9731)
+++ trunk/pgsrc/ReleaseNotes	2015-09-23 08:37:53 UTC (rev 9732)
@@ -1,4 +1,4 @@
-Date: Mon,  7 Sep 2015 18:26:37 +0000
+Date: Wed, 23 Sep 2015 10:35:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -14,6 +14,9 @@
 * Remove access keys
 * Check MAX_PAGENAME_LENGTH in CreatePage
 * Fix fatal database error with multiple comma-delimited sortby args
+* Remove forbidden characters: ~<~>~[~]~{~}~"~|~# from pagename
+* New property: ALLOWED_LOAD giving list of directories from which it is allowed to load pages.
+* Upload: replace multiple spaces by single space
 
 == 1.5.4 2015-06-29 Marc-Etienne Vargenau ==
 

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

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

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

Revision: 9731
          http://sourceforge.net/p/phpwiki/code/9731
Author:   vargenau
Date:     2015-09-23 08:32:30 +0000 (Wed, 23 Sep 2015)
Log Message:
-----------
Update French translation

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	2015-09-22 15:51:48 UTC (rev 9730)
+++ trunk/locale/po/de.po	2015-09-23 08:32:30 UTC (rev 9731)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-16 18:47+0200\n"
+"POT-Creation-Date: 2015-09-23 10:31+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."
@@ -719,6 +719,10 @@
 msgstr "Ungültiger Dateityp: %s"
 
 #, php-format
+msgid "Not in allowed list. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Loading “%s”"
 msgstr "»%s« wird geladen"
 
@@ -3262,7 +3266,9 @@
 msgid "File successfully uploaded."
 msgstr "Datei erfolgreich hochgeladen."
 
-msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgid ""
+"Note: filename was sanified: spaces from beginning and end removed, multiple "
+"spaces replaced by one, forbidden characters replaced by dash."
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2015-09-22 15:51:48 UTC (rev 9730)
+++ trunk/locale/po/es.po	2015-09-23 08:32:30 UTC (rev 9731)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-16 18:47+0200\n"
+"POT-Creation-Date: 2015-09-23 10:31+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -702,6 +702,10 @@
 msgstr "Mal tipo del archivo:  %s"
 
 #, php-format
+msgid "Not in allowed list. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Loading “%s”"
 msgstr "“%s” que carga"
 
@@ -3170,7 +3174,9 @@
 msgid "File successfully uploaded."
 msgstr ""
 
-msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgid ""
+"Note: filename was sanified: spaces from beginning and end removed, multiple "
+"spaces replaced by one, forbidden characters replaced by dash."
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2015-09-22 15:51:48 UTC (rev 9730)
+++ trunk/locale/po/fr.po	2015-09-23 08:32:30 UTC (rev 9731)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-16 18:47+0200\n"
+"POT-Creation-Date: 2015-09-23 10:31+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."
@@ -709,6 +709,10 @@
 msgstr "Mauvais type de fichier : %s"
 
 #, php-format
+msgid "Not in allowed list. Unable to load: %s"
+msgstr "Pas dans la liste autorisée. Impossible de charger : %s"
+
+#, php-format
 msgid "Loading “%s”"
 msgstr "Chargement de « %s »"
 
@@ -3225,10 +3229,13 @@
 msgid "File successfully uploaded."
 msgstr "Fichier téléchargé avec succès."
 
-msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgid ""
+"Note: filename was sanified: spaces from beginning and end removed, multiple "
+"spaces replaced by one, forbidden characters replaced by dash."
 msgstr ""
-"Note : certains caractères interdits dans les noms de fichier ont été "
-"remplacés par des tirets."
+"Note : le nom de fichier a été purifié : suppression des espaces au début et "
+"à la fin, espaces multiples remplacés par un espace unique, caractères "
+"interdits remplacés par des tirets."
 
 #, php-format
 msgid "uploaded %s"
@@ -6013,7 +6020,7 @@
 msgstr "Mettre à jour"
 
 #~ msgid "Click a button to get an example text"
-#~ msgstr "Cliquer sur un bouton pour obtenir une exemple de texte"
+#~ msgstr "Cliquer sur un bouton pour obtenir un exemple de texte"
 
 #~ msgid "Adjust"
 #~ msgstr "Ajuster"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2015-09-22 15:51:48 UTC (rev 9730)
+++ trunk/locale/po/it.po	2015-09-23 08:32:30 UTC (rev 9731)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-16 18:47+0200\n"
+"POT-Creation-Date: 2015-09-23 10:31+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"
@@ -691,6 +691,10 @@
 msgstr ""
 
 #, php-format
+msgid "Not in allowed list. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Loading “%s”"
 msgstr ""
 
@@ -3143,7 +3147,9 @@
 msgid "File successfully uploaded."
 msgstr ""
 
-msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgid ""
+"Note: filename was sanified: spaces from beginning and end removed, multiple "
+"spaces replaced by one, forbidden characters replaced by dash."
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2015-09-22 15:51:48 UTC (rev 9730)
+++ trunk/locale/po/ja.po	2015-09-23 08:32:30 UTC (rev 9731)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-16 18:47+0200\n"
+"POT-Creation-Date: 2015-09-23 10:31+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"
@@ -680,6 +680,10 @@
 msgstr ""
 
 #, php-format
+msgid "Not in allowed list. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Loading “%s”"
 msgstr "“%s” を読込み中です。"
 
@@ -3184,7 +3188,9 @@
 msgid "File successfully uploaded."
 msgstr ""
 
-msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgid ""
+"Note: filename was sanified: spaces from beginning and end removed, multiple "
+"spaces replaced by one, forbidden characters replaced by dash."
 msgstr ""
 
 #, fuzzy, php-format

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2015-09-22 15:51:48 UTC (rev 9730)
+++ trunk/locale/po/nl.po	2015-09-23 08:32:30 UTC (rev 9731)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-16 18:47+0200\n"
+"POT-Creation-Date: 2015-09-23 10:31+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"
@@ -680,6 +680,10 @@
 msgstr ""
 
 #, php-format
+msgid "Not in allowed list. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Loading “%s”"
 msgstr ""
 
@@ -3133,7 +3137,9 @@
 msgid "File successfully uploaded."
 msgstr ""
 
-msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgid ""
+"Note: filename was sanified: spaces from beginning and end removed, multiple "
+"spaces replaced by one, forbidden characters replaced by dash."
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2015-09-22 15:51:48 UTC (rev 9730)
+++ trunk/locale/po/phpwiki.pot	2015-09-23 08:32:30 UTC (rev 9731)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-16 18:47+0200\n"
+"POT-Creation-Date: 2015-09-23 10:31+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"
@@ -674,6 +674,10 @@
 msgstr ""
 
 #, php-format
+msgid "Not in allowed list. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Loading “%s”"
 msgstr ""
 
@@ -3125,7 +3129,9 @@
 msgid "File successfully uploaded."
 msgstr ""
 
-msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgid ""
+"Note: filename was sanified: spaces from beginning and end removed, multiple "
+"spaces replaced by one, forbidden characters replaced by dash."
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2015-09-22 15:51:48 UTC (rev 9730)
+++ trunk/locale/po/sv.po	2015-09-23 08:32:30 UTC (rev 9731)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-16 18:47+0200\n"
+"POT-Creation-Date: 2015-09-23 10:31+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -675,6 +675,10 @@
 msgstr ""
 
 #, php-format
+msgid "Not in allowed list. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Loading “%s”"
 msgstr ""
 
@@ -3126,7 +3130,9 @@
 msgid "File successfully uploaded."
 msgstr ""
 
-msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgid ""
+"Note: filename was sanified: spaces from beginning and end removed, multiple "
+"spaces replaced by one, forbidden characters replaced by dash."
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2015-09-22 15:51:48 UTC (rev 9730)
+++ trunk/locale/po/zh.po	2015-09-23 08:32:30 UTC (rev 9731)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-16 18:47+0200\n"
+"POT-Creation-Date: 2015-09-23 10:31+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -706,6 +706,10 @@
 msgstr "錯誤的檔案型態: %s"
 
 #, php-format
+msgid "Not in allowed list. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Loading “%s”"
 msgstr "載入 “%s”"
 
@@ -3258,7 +3262,9 @@
 msgid "File successfully uploaded."
 msgstr "檔案已經成功地上傳."
 
-msgid "Note: some forbidden characters in filename have been replaced by dash."
+msgid ""
+"Note: filename was sanified: spaces from beginning and end removed, multiple "
+"spaces replaced by one, forbidden characters replaced by dash."
 msgstr ""
 
 #, php-format

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

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

Revision: 9730
          http://sourceforge.net/p/phpwiki/code/9730
Author:   vargenau
Date:     2015-09-22 15:51:48 +0000 (Tue, 22 Sep 2015)
Log Message:
-----------
Upload: replace multiple spaces by single space

Modified Paths:
--------------
    trunk/lib/plugin/UpLoad.php
    trunk/lib/stdlib.php

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2015-09-22 15:27:07 UTC (rev 9729)
+++ trunk/lib/plugin/UpLoad.php	2015-09-22 15:51:48 UTC (rev 9730)
@@ -129,7 +129,7 @@
         $userfile = $request->getUploadedFile('userfile');
         if ($userfile) {
             $userfile_name = $userfile->getName();
-            $userfile_name = trim(basename($userfile_name));
+            $userfile_name = basename($userfile_name);
             if (UPLOAD_USERDIR) {
                 $username = $request->_user->_userid;
                 $file_dir .= $username;
@@ -197,7 +197,7 @@
                     $message->pushContent(HTML::div(array('class' => 'feedback'),
                         HTML::p(_("File successfully uploaded.")),
                         HTML::p($link),
-                        HTML::p(_("Note: some forbidden characters in filename have been replaced by dash."))));
+                        HTML::p(_("Note: filename was sanified: spaces from beginning and end removed, multiple spaces replaced by one, forbidden characters replaced by dash."))));
                 } else {
                     $message->pushContent(HTML::div(array('class' => 'feedback'),
                         HTML::p(_("File successfully uploaded.")),

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2015-09-22 15:27:07 UTC (rev 9729)
+++ trunk/lib/stdlib.php	2015-09-22 15:51:48 UTC (rev 9730)
@@ -2113,10 +2113,15 @@
 }
 
 /**
- * Sanify filename: replace all disallowed characters with dashes
+ * Sanify filename: 
+ * - remove spaces from the beginning and end
+ * - replace multiple spaces by single space
+ * - replace all disallowed characters with dashes
  */
 function sanify_filename($filename)
 {
+    $filename = trim($filename);
+    $filename = preg_replace('!\s+!', ' ', $filename);
     return mb_ereg_replace('[^\w\. \-]', '-', $filename);
 }
 

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

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

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

Revision: 9729
          http://sourceforge.net/p/phpwiki/code/9729
Author:   vargenau
Date:     2015-09-22 15:27:07 +0000 (Tue, 22 Sep 2015)
Log Message:
-----------
New property: ALLOWED_LOAD giving list of directories from which it is allowed to load pages.

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini
    trunk/configurator.php
    trunk/g
    trunk/lib/loadsave.php

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2015-09-22 13:32:45 UTC (rev 9728)
+++ trunk/config/config-default.ini	2015-09-22 15:27:07 UTC (rev 9729)
@@ -160,6 +160,7 @@
 ; VIRTUAL_PATH = 
 ; USE_PATH_INFO = 
 ; TEMP_DIR = /tmp
+; ALLOWED_LOAD = /tmp
 
 DISABLE_HTTP_REDIRECT = false
 DISABLE_GETIMAGESIZE = false

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2015-09-22 13:32:45 UTC (rev 9728)
+++ trunk/config/config-dist.ini	2015-09-22 15:27:07 UTC (rev 9729)
@@ -1106,6 +1106,11 @@
 ; better provide it here. E.g. needed for zipdumps.
 ;TEMP_DIR = /tmp
 
+; List of directories from which it is allowed to load pages
+; Directories are separated with ":"
+; It is always allowed to load from pgsrc directories
+;ALLOWED_LOAD = /tmp
+
 ;===========================================================================
 ; Part Seven: Miscellaneous settings
 ;===========================================================================

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2015-09-22 13:32:45 UTC (rev 9728)
+++ trunk/configurator.php	2015-09-22 15:27:07 UTC (rev 9729)
@@ -1487,6 +1487,10 @@
 $properties["TEMP_DIR"] =
     new _define_optional('TEMP_DIR', $temp);
 
+$properties["Allowed Load"] =
+    new _define_commented_optional('ALLOWED_LOAD', '/tmp',
+        'List of directories from which it is allowed to load pages. Directories are separated with ":"');
+
 ///////////////////
 
 $properties["Part Seven"] =

Modified: trunk/g
===================================================================
--- trunk/g	2015-09-22 13:32:45 UTC (rev 9728)
+++ trunk/g	2015-09-22 15:27:07 UTC (rev 9729)
@@ -150,6 +150,9 @@
     // Do not use a directory per user but only one (per project)
     define('UPLOAD_USERDIR', false);
 
+    // Allow Load File only from /tmp
+    define('ALLOWED_LOAD', '/tmp');
+
     // Use black list of extensions instead of white list
     define('DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS', true);
 

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2015-09-22 13:32:45 UTC (rev 9728)
+++ trunk/lib/loadsave.php	2015-09-22 15:27:07 UTC (rev 9729)
@@ -1447,8 +1447,29 @@
 function LoadFileOrDir(&$request)
 {
     $source = $request->getArg('source');
-    $finder = new FileFinder;
+    $finder = new FileFinder();
     $source = $finder->slashifyPath($source);
+    if (!(defined('ALLOWED_LOAD'))) {
+       define('ALLOWED_LOAD', '/tmp');
+    }
+    $allowed_dirs = explode(':', ALLOWED_LOAD);
+    if ($source[0] == '/') { // Absolute path
+        $allowed = false;
+        foreach ($allowed_dirs as $path) {
+            if (string_starts_with($source, $path)) {
+                $allowed = true;
+            }
+        }
+        if (!$allowed) {
+            $html = HTML::p(array('class' => 'error'),
+                            _("Fatal PhpWiki Error")._(': ')
+                            .sprintf(_("Not in allowed list. Unable to load: %s"), $source));
+            GeneratePage($html, $request->_deducePagename());
+            flush();
+            return;
+        }
+    }
+
     StartLoadDump($request, sprintf(_("Loading “%s”"), $source));
     LoadAny($request, $source);
     EndLoadDump($request);

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

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

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

Revision: 9728
          http://sourceforge.net/p/phpwiki/code/9728
Author:   vargenau
Date:     2015-09-22 13:32:45 +0000 (Tue, 22 Sep 2015)
Log Message:
-----------
Use class="error" for fail_message

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

Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl	2015-09-16 16:48:10 UTC (rev 9727)
+++ trunk/themes/default/templates/login.tmpl	2015-09-22 13:32:45 UTC (rev 9728)
@@ -1,5 +1,5 @@
 <?php if ($fail_message) { ?>
-  <p><strong><?php echo $fail_message?></strong></p>
+  <p class="error"><?php echo $fail_message?></p>
   <hr />
 <?php } ?>
 <br class="clear-floats" />

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

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

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

Revision: 9727
          http://sourceforge.net/p/phpwiki/code/9727
Author:   vargenau
Date:     2015-09-16 16:48:10 +0000 (Wed, 16 Sep 2015)
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	2015-09-16 16:32:27 UTC (rev 9726)
+++ trunk/locale/po/de.po	2015-09-16 16:48:10 UTC (rev 9727)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 18:25+0200\n"
+"POT-Creation-Date: 2015-09-16 18:47+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."
@@ -700,14 +700,17 @@
 msgid "Loading InterWikiMap from external file %s."
 msgstr "Die InterWikiListe wird von der externen Datei %s geladen."
 
-#, fuzzy
 msgid "Cannot open ZIP archive for reading"
-msgstr "Konnte ZIP-Datei »%s« nicht zum Lesen öffnen"
+msgstr "Konnte ZIP-Datei nicht zum Lesen öffnen"
 
 msgid "Skipping"
 msgstr "Übersprungen"
 
 #, php-format
+msgid "Not existing source. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
@@ -955,6 +958,10 @@
 msgid "%s: Bad action"
 msgstr "%s: Ungültige Aktion"
 
+#, php-format
+msgid "Illegal chars %s removed"
+msgstr "Ungültiges Zeichen %s entfernt"
+
 msgid "PageDump"
 msgstr "SeiteSpeichern"
 
@@ -4569,10 +4576,6 @@
 msgid "Control characters not allowed"
 msgstr "Steuerzeichen nicht erlaubt"
 
-#, php-format
-msgid "Illegal chars %s removed"
-msgstr "Ungültiges Zeichen %s entfernt"
-
 msgid "Revision Not Found"
 msgstr "Version nicht gefunden"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2015-09-16 16:32:27 UTC (rev 9726)
+++ trunk/locale/po/es.po	2015-09-16 16:48:10 UTC (rev 9727)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 18:25+0200\n"
+"POT-Creation-Date: 2015-09-16 18:47+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -690,6 +690,10 @@
 msgstr "El saltar"
 
 #, php-format
+msgid "Not existing source. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
@@ -935,6 +939,10 @@
 msgid "%s: Bad action"
 msgstr "%s: Mala acción"
 
+#, php-format
+msgid "Illegal chars %s removed"
+msgstr "Los carbones ilegales %s quitaron"
+
 msgid "PageDump"
 msgstr "DescargeDeLaPágina"
 
@@ -4445,10 +4453,6 @@
 msgid "Control characters not allowed"
 msgstr ""
 
-#, php-format
-msgid "Illegal chars %s removed"
-msgstr "Los carbones ilegales %s quitaron"
-
 msgid "Revision Not Found"
 msgstr "Revisión No encontrada"
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2015-09-16 16:32:27 UTC (rev 9726)
+++ trunk/locale/po/fr.po	2015-09-16 16:48:10 UTC (rev 9727)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 18:25+0200\n"
+"POT-Creation-Date: 2015-09-16 18:47+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."
@@ -697,6 +697,10 @@
 msgstr "Ignoré"
 
 #, php-format
+msgid "Not existing source. Unable to load: %s"
+msgstr "Source inexistante. Impossible de charger : %s"
+
+#, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr "Source vide ou inexistante. Impossible de charger : %s"
 
@@ -940,6 +944,10 @@
 msgid "%s: Bad action"
 msgstr "%s : mauvaise action"
 
+#, php-format
+msgid "Illegal chars %s removed"
+msgstr "Caractères interdits %s supprimés"
+
 msgid "PageDump"
 msgstr "RécupérationDeLaPage"
 
@@ -4526,10 +4534,6 @@
 msgid "Control characters not allowed"
 msgstr ""
 
-#, php-format
-msgid "Illegal chars %s removed"
-msgstr "Caractères interdits %s supprimés"
-
 msgid "Revision Not Found"
 msgstr "Version non trouvée"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2015-09-16 16:32:27 UTC (rev 9726)
+++ trunk/locale/po/it.po	2015-09-16 16:48:10 UTC (rev 9727)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 18:25+0200\n"
+"POT-Creation-Date: 2015-09-16 18:47+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"
@@ -679,6 +679,10 @@
 msgstr ""
 
 #, php-format
+msgid "Not existing source. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
@@ -921,6 +925,10 @@
 msgid "%s: Bad action"
 msgstr ""
 
+#, php-format
+msgid "Illegal chars %s removed"
+msgstr ""
+
 msgid "PageDump"
 msgstr ""
 
@@ -4409,10 +4417,6 @@
 msgid "Control characters not allowed"
 msgstr ""
 
-#, php-format
-msgid "Illegal chars %s removed"
-msgstr ""
-
 msgid "Revision Not Found"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2015-09-16 16:32:27 UTC (rev 9726)
+++ trunk/locale/po/ja.po	2015-09-16 16:48:10 UTC (rev 9727)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 18:25+0200\n"
+"POT-Creation-Date: 2015-09-16 18:47+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"
@@ -668,6 +668,10 @@
 msgstr ""
 
 #, php-format
+msgid "Not existing source. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
@@ -919,6 +923,10 @@
 msgid "%s: Bad action"
 msgstr "%s: 正しくない操作です。"
 
+#, php-format
+msgid "Illegal chars %s removed"
+msgstr ""
+
 msgid "PageDump"
 msgstr ""
 
@@ -4547,10 +4555,6 @@
 msgid "Control characters not allowed"
 msgstr ""
 
-#, php-format
-msgid "Illegal chars %s removed"
-msgstr ""
-
 msgid "Revision Not Found"
 msgstr "リビジョンが見つかりません"
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2015-09-16 16:32:27 UTC (rev 9726)
+++ trunk/locale/po/nl.po	2015-09-16 16:48:10 UTC (rev 9727)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 18:25+0200\n"
+"POT-Creation-Date: 2015-09-16 18:47+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"
@@ -668,6 +668,10 @@
 msgstr "Overgeslagen"
 
 #, php-format
+msgid "Not existing source. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
@@ -910,6 +914,10 @@
 msgid "%s: Bad action"
 msgstr ""
 
+#, php-format
+msgid "Illegal chars %s removed"
+msgstr ""
+
 msgid "PageDump"
 msgstr ""
 
@@ -4399,10 +4407,6 @@
 msgid "Control characters not allowed"
 msgstr ""
 
-#, php-format
-msgid "Illegal chars %s removed"
-msgstr ""
-
 msgid "Revision Not Found"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2015-09-16 16:32:27 UTC (rev 9726)
+++ trunk/locale/po/phpwiki.pot	2015-09-16 16:48:10 UTC (rev 9727)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 18:25+0200\n"
+"POT-Creation-Date: 2015-09-16 18:47+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"
@@ -662,6 +662,10 @@
 msgstr ""
 
 #, php-format
+msgid "Not existing source. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
@@ -904,6 +908,10 @@
 msgid "%s: Bad action"
 msgstr ""
 
+#, php-format
+msgid "Illegal chars %s removed"
+msgstr ""
+
 msgid "PageDump"
 msgstr ""
 
@@ -4391,10 +4399,6 @@
 msgid "Control characters not allowed"
 msgstr ""
 
-#, php-format
-msgid "Illegal chars %s removed"
-msgstr ""
-
 msgid "Revision Not Found"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2015-09-16 16:32:27 UTC (rev 9726)
+++ trunk/locale/po/sv.po	2015-09-16 16:48:10 UTC (rev 9727)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 18:25+0200\n"
+"POT-Creation-Date: 2015-09-16 18:47+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -663,6 +663,10 @@
 msgstr ""
 
 #, php-format
+msgid "Not existing source. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
@@ -905,6 +909,10 @@
 msgid "%s: Bad action"
 msgstr ""
 
+#, php-format
+msgid "Illegal chars %s removed"
+msgstr ""
+
 msgid "PageDump"
 msgstr ""
 
@@ -4392,10 +4400,6 @@
 msgid "Control characters not allowed"
 msgstr ""
 
-#, php-format
-msgid "Illegal chars %s removed"
-msgstr ""
-
 msgid "Revision Not Found"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2015-09-16 16:32:27 UTC (rev 9726)
+++ trunk/locale/po/zh.po	2015-09-16 16:48:10 UTC (rev 9727)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 18:25+0200\n"
+"POT-Creation-Date: 2015-09-16 18:47+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -694,6 +694,10 @@
 msgstr "跳過"
 
 #, php-format
+msgid "Not existing source. Unable to load: %s"
+msgstr ""
+
+#, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
@@ -945,6 +949,10 @@
 msgid "%s: Bad action"
 msgstr "%s: 錯誤的動作"
 
+#, php-format
+msgid "Illegal chars %s removed"
+msgstr ""
+
 msgid "PageDump"
 msgstr ""
 
@@ -4625,10 +4633,6 @@
 msgid "Control characters not allowed"
 msgstr "控制字元是不被允許的"
 
-#, php-format
-msgid "Illegal chars %s removed"
-msgstr ""
-
 msgid "Revision Not Found"
 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:[9726] trunk/lib

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

Revision: 9726
          http://sourceforge.net/p/phpwiki/code/9726
Author:   vargenau
Date:     2015-09-16 16:32:27 +0000 (Wed, 16 Sep 2015)
Log Message:
-----------
New function: close_tags

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

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2015-09-16 10:17:38 UTC (rev 9725)
+++ trunk/lib/loadsave.php	2015-09-16 16:32:27 UTC (rev 9726)
@@ -63,8 +63,6 @@
  */
 function EndLoadDump(&$request)
 {
-    global $WikiTheme;
-
     $action = $request->getArg('action');
     if ($action == 'browse') // loading virgin
         $pagelink = WikiLink(HOME_PAGE);
@@ -98,36 +96,7 @@
 
     PrintXML(HTML::p(HTML::strong(_("Complete."))),
         HTML::p(fmt("Return to %s", $pagelink)));
-    // Ugly hack to get valid XHTML code
-    if (is_a($WikiTheme, 'WikiTheme_fusionforge')) {
-        echo "</div>\n";
-        echo "</div>\n";
-        echo "</main>\n";
-        echo "</div>\n";
-    } elseif (is_a($WikiTheme, 'WikiTheme_Sidebar')
-        or is_a($WikiTheme, 'WikiTheme_MonoBook')
-    ) {
-        echo "</div>\n";
-        echo "</div>\n";
-        echo "</div>\n";
-        echo "</div>\n";
-    } elseif (is_a($WikiTheme, 'WikiTheme_wikilens')) {
-        echo "</div>\n";
-        echo "</td>\n";
-        echo "</tr>\n";
-        echo "</table>\n";
-    } elseif (is_a($WikiTheme, 'WikiTheme_blog')) {
-        echo "</div>\n";
-        echo "</div>\n";
-    } elseif (is_a($WikiTheme, 'WikiTheme_Crao')
-        or is_a($WikiTheme, 'WikiTheme_Hawaiian')
-        or is_a($WikiTheme, 'WikiTheme_MacOSX')
-        or is_a($WikiTheme, 'WikiTheme_shamino_com')
-        or is_a($WikiTheme, 'WikiTheme_smaller')
-    ) {
-        echo "</div>\n";
-    }
-    echo "</body></html>\n";
+    close_tags(); // HACK
 }
 
 ////////////////////////////////////////////////////////////////

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2015-09-16 10:17:38 UTC (rev 9725)
+++ trunk/lib/main.php	2015-09-16 16:32:27 UTC (rev 9726)
@@ -849,8 +849,7 @@
         if (!empty($errormsg)) {
             PrintXML(HTML::p(array('class' => 'error'), 
                              _("Fatal PhpWiki Error")._(': ').$errormsg));
-            // HACK:
-            echo "\n</div>\n</div>\n</div>\n</div>\n</body>\n</html>";
+            close_tags(); // HACK
         }
         if (is_object($this->_user)) {
             $this->_user->page = $this->getArg('pagename');

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2015-09-16 10:17:38 UTC (rev 9725)
+++ trunk/lib/stdlib.php	2015-09-16 16:32:27 UTC (rev 9726)
@@ -2119,3 +2119,42 @@
 {
     return mb_ereg_replace('[^\w\. \-]', '-', $filename);
 }
+
+/**
+ * Close all open tags depending on WikiTheme
+ */
+function close_tags()
+{
+    global $WikiTheme;
+
+    // Ugly hack to get valid XHTML code
+    if (is_a($WikiTheme, 'WikiTheme_fusionforge')) {
+        echo "</div>\n";
+        echo "</div>\n";
+        echo "</main>\n";
+        echo "</div>\n";
+    } elseif (is_a($WikiTheme, 'WikiTheme_Sidebar')
+        or is_a($WikiTheme, 'WikiTheme_MonoBook')
+    ) {
+        echo "</div>\n";
+        echo "</div>\n";
+        echo "</div>\n";
+        echo "</div>\n";
+    } elseif (is_a($WikiTheme, 'WikiTheme_wikilens')) {
+        echo "</div>\n";
+        echo "</td>\n";
+        echo "</tr>\n";
+        echo "</table>\n";
+    } elseif (is_a($WikiTheme, 'WikiTheme_blog')) {
+        echo "</div>\n";
+        echo "</div>\n";
+    } elseif (is_a($WikiTheme, 'WikiTheme_Crao')
+        or is_a($WikiTheme, 'WikiTheme_Hawaiian')
+        or is_a($WikiTheme, 'WikiTheme_MacOSX')
+        or is_a($WikiTheme, 'WikiTheme_shamino_com')
+        or is_a($WikiTheme, 'WikiTheme_smaller')
+    ) {
+        echo "</div>\n";
+    }
+    echo "</body></html>\n";
+}

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