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

[phpwiki-checkins] SF.net SVN: phpwiki:[8514] trunk/index.php

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

Revision: 8514
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8514&view=rev
Author:   vargenau
Date:     2012-11-21 13:32:44 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Use version_compare

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

Modified: trunk/index.php
===================================================================
--- trunk/index.php	2012-11-21 13:31:52 UTC (rev 8513)
+++ trunk/index.php	2012-11-21 13:32:44 UTC (rev 8514)
@@ -32,8 +32,8 @@
 require_once(dirname(__FILE__) . '/lib/IniConfig.php');
 IniConfig(dirname(__FILE__) . "/config/config.ini");
 
-if (!check_php_version(5,2)) {
-    ExitWiki("PhpWiki " . PHPWIKI_VERSION . " requires at least PHP 5.2.");
+if (version_compare(PHP_VERSION, '5.2', '<')) {
+    exit(_("Your PHP version is too old. You must have at least PHP 5.2."));
 }
 
 ////////////////////////////////////////////////////////////////

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

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

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

Revision: 8513
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8513&view=rev
Author:   vargenau
Date:     2012-11-21 13:31:52 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
PHP_VERSION must be at least 5.2

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

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2012-11-21 13:20:41 UTC (rev 8512)
+++ trunk/lib/main.php	2012-11-21 13:31:52 UTC (rev 8513)
@@ -1396,8 +1396,8 @@
 
 function main()
 {
-    if (version_compare(PHP_VERSION, '4.3.9', '<')) {
-        exit(_("Your PHP version is too old. You must have at least PHP 4.3.9"));
+    if (version_compare(PHP_VERSION, '5.2', '<')) {
+        exit(_("Your PHP version is too old. You must have at least PHP 5.2."));
     }
 
     if (!USE_DB_SESSION)

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

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

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

Revision: 8512
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8512&view=rev
Author:   vargenau
Date:     2012-11-21 13:20:41 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Remove no longer true comment

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

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2012-11-21 12:58:40 UTC (rev 8511)
+++ trunk/lib/main.php	2012-11-21 13:20:41 UTC (rev 8512)
@@ -1396,8 +1396,6 @@
 
 function main()
 {
-
-    // latest supported: Red Hat Enterprise Linux ES release 4
     if (version_compare(PHP_VERSION, '4.3.9', '<')) {
         exit(_("Your PHP version is too old. You must have at least PHP 4.3.9"));
     }

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

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

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

Revision: 8511
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8511&view=rev
Author:   vargenau
Date:     2012-11-21 12:58:40 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Remove unused require_once

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

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2012-11-21 11:29:43 UTC (rev 8510)
+++ trunk/lib/WikiDB/backend/PearDB.php	2012-11-21 12:58:40 UTC (rev 8511)
@@ -1,8 +1,6 @@
 <?php
 
 require_once 'lib/WikiDB/backend.php';
-//require_once('lib/FileFinder.php');
-//require_once('lib/ErrorManager.php');
 
 class WikiDB_backend_PearDB
     extends WikiDB_backend
@@ -14,7 +12,6 @@
         // Find and include PEAR's DB.php. maybe we should force our private version again...
         // if DB would have exported its version number, it would be easier.
         @require_once('DB/common.php'); // Either our local pear copy or the system one
-        // check the version!
         $name = "escapeSimple";
         // TODO: apparently some Pear::Db version adds LIMIT 1,0 to getOne(),
         // which is invalid for "select version()"

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8510] trunk/themes/Sidebar/sidebar.css

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

Revision: 8510
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8510&view=rev
Author:   vargenau
Date:     2012-11-21 11:29:43 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Avoid logos overlapping text in footer

Modified Paths:
--------------
    trunk/themes/Sidebar/sidebar.css

Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2012-11-21 11:27:41 UTC (rev 8509)
+++ trunk/themes/Sidebar/sidebar.css	2012-11-21 11:29:43 UTC (rev 8510)
@@ -1437,6 +1437,10 @@
     font-size: 90%;
 }
 
+#footer ul {
+    display: table-cell;
+}
+
 #footer li {
     display: inline;
     margin: 0 1.3em;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8509] trunk/themes/Sidebar/sidebar.css

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

Revision: 8509
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8509&view=rev
Author:   vargenau
Date:     2012-11-21 11:27:41 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Avoid logos overlapping text in footer

Modified Paths:
--------------
    trunk/themes/Sidebar/sidebar.css

Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2012-11-21 11:08:38 UTC (rev 8508)
+++ trunk/themes/Sidebar/sidebar.css	2012-11-21 11:27:41 UTC (rev 8509)
@@ -1453,21 +1453,13 @@
 }
 
 #f-poweredbyico, #f-copyrightico {
+    display: table-cell;
     margin: 0 8px;
-    /*vertical-align: middle;*/
-    height: 31px;
-    position: relative;
-    top: -31px; /* Bump it up just a tad */
+    padding-left: 1em;
+    padding-right: 1em;
+    vertical-align: middle;
 }
 
-#f-poweredbyico {
-    float: right;
-}
-
-#f-copyrightico {
-    float: left;
-}
-
 /* js pref toc */
 #preftoc {
     float: left;

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

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

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

Revision: 8508
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8508&view=rev
Author:   vargenau
Date:     2012-11-21 11:08:38 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Remove check_php_version(5)

Modified Paths:
--------------
    trunk/lib/CachedMarkup.php
    trunk/lib/IniConfig.php
    trunk/lib/WikiDB/backend/PearDB.php
    trunk/lib/WikiTheme.php
    trunk/lib/WikiUser/BogoLogin.php
    trunk/lib/WikiUser/Db.php
    trunk/lib/WikiUserNew.php
    trunk/lib/plugin/RssFeed.php
    trunk/lib/stdlib.php

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2012-11-21 10:34:31 UTC (rev 8507)
+++ trunk/lib/CachedMarkup.php	2012-11-21 11:08:38 UTC (rev 8508)
@@ -214,10 +214,7 @@
         foreach ($this->_content as $item) {
             if (is_string($item)) {
                 $xml .= $item;
-            } elseif (is_subclass_of($item,
-                check_php_version(5)
-                    ? 'Cached_DynamicContent'
-                    : 'cached_dynamiccontent')
+            } elseif (is_subclass_of($item, 'Cached_DynamicContent')
             ) {
                 $val = $item->expand($basepage, $this);
                 $xml .= $val->asXML();
@@ -236,10 +233,7 @@
             $item = $this->_content[$i];
             if (is_string($item)) {
                 print $item;
-            } elseif (is_subclass_of($item,
-                check_php_version(5)
-                    ? 'Cached_DynamicContent'
-                    : 'cached_dynamiccontent')
+            } elseif (is_subclass_of($item, 'Cached_DynamicContent')
             ) { // give the content the chance to know about itself or even
                 // to change itself
                 $val = $item->expand($basepage, $this);

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2012-11-21 10:34:31 UTC (rev 8507)
+++ trunk/lib/IniConfig.php	2012-11-21 11:08:38 UTC (rev 8508)
@@ -324,9 +324,6 @@
             E_USER_ERROR);
     unset($valid_database_types);
     if (DATABASE_TYPE == 'PDO') {
-        if (!check_php_version(5))
-            trigger_error("Invalid DATABASE_TYPE=PDO. PDO requires at least php-5.0!",
-                E_USER_ERROR);
         // try to load it dynamically (unix only)
         if (!loadPhpExtension("pdo")) {
             echo $GLOBALS['php_errormsg'], "<br>\n";

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2012-11-21 10:34:31 UTC (rev 8507)
+++ trunk/lib/WikiDB/backend/PearDB.php	2012-11-21 11:08:38 UTC (rev 8508)
@@ -15,7 +15,7 @@
         // if DB would have exported its version number, it would be easier.
         @require_once('DB/common.php'); // Either our local pear copy or the system one
         // check the version!
-        $name = check_php_version(5) ? "escapeSimple" : strtolower("escapeSimple");
+        $name = "escapeSimple";
         // TODO: apparently some Pear::Db version adds LIMIT 1,0 to getOne(),
         // which is invalid for "select version()"
         if (!in_array($name, get_class_methods("DB_common"))) {

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2012-11-21 10:34:31 UTC (rev 8507)
+++ trunk/lib/WikiTheme.php	2012-11-21 11:08:38 UTC (rev 8508)
@@ -1689,12 +1689,7 @@
     function Button($text, $url, $class = false, $options = false)
     {
         global $request;
-        //php5 workaround
-        if (check_php_version(5)) {
-            $this->_init('a', array('href' => $url));
-        } else {
-            $this->__construct('a', array('href' => $url));
-        }
+        $this->_init('a', array('href' => $url));
         if ($class)
             $this->setAttr('class', $class);
         if ($request->getArg('frame'))

Modified: trunk/lib/WikiUser/BogoLogin.php
===================================================================
--- trunk/lib/WikiUser/BogoLogin.php	2012-11-21 10:34:31 UTC (rev 8507)
+++ trunk/lib/WikiUser/BogoLogin.php	2012-11-21 11:08:38 UTC (rev 8508)
@@ -48,9 +48,6 @@
             if (isset($this->_prefs->_method) and $this->_prefs->_method == 'HomePage') {
                 $user = new _PersonalPagePassUser($this->_userid, $this->_prefs);
                 if ($user->checkPass($submitted_password)) {
-                    if (!check_php_version(5))
-                        eval("\$this = \$user;");
-                    // /*PHP5 patch*/$this = $user;
                     $user = UpgradeUser($this, $user);
                     $this->_level = WIKIAUTH_USER;
                     return $this->_level;

Modified: trunk/lib/WikiUser/Db.php
===================================================================
--- trunk/lib/WikiUser/Db.php	2012-11-21 10:34:31 UTC (rev 8507)
+++ trunk/lib/WikiUser/Db.php	2012-11-21 11:08:38 UTC (rev 8508)
@@ -67,31 +67,13 @@
         $dbtype = $dbi->getParam('dbtype');
         if ($dbtype == 'ADODB') {
             include_once 'lib/WikiUser/AdoDb.php';
-            if (check_php_version(5))
-                return new _AdoDbPassUser($UserName, $this->_prefs);
-            else {
-                $user = new _AdoDbPassUser($UserName, $this->_prefs);
-                eval("\$this = \$user;");
-                return $user;
-            }
+            return new _AdoDbPassUser($UserName, $this->_prefs);
         } elseif ($dbtype == 'SQL') {
             include_once 'lib/WikiUser/PearDb.php';
-            if (check_php_version(5))
-                return new _PearDbPassUser($UserName, $this->_prefs);
-            else {
-                $user = new _PearDbPassUser($UserName, $this->_prefs);
-                eval("\$this = \$user;");
-                return $user;
-            }
+            return new _PearDbPassUser($UserName, $this->_prefs);
         } elseif ($dbtype == 'PDO') {
             include_once 'lib/WikiUser/PdoDb.php';
-            if (check_php_version(5))
-                return new _PdoDbPassUser($UserName, $this->_prefs);
-            else {
-                $user = new _PdoDbPassUser($UserName, $this->_prefs);
-                eval("\$this = \$user;");
-                return $user;
-            }
+            return new _PdoDbPassUser($UserName, $this->_prefs);
         }
         return false;
     }

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2012-11-21 10:34:31 UTC (rev 8507)
+++ trunk/lib/WikiUserNew.php	2012-11-21 11:08:38 UTC (rev 8508)
@@ -690,9 +690,6 @@
                 $class = "_" . $this->_current_method . "PassUser";
                 include_once 'lib/WikiUser/' . $this->_current_method . '.php';
                 $user = new $class($userid, $this->_prefs);
-                if (!check_php_version(5))
-                    eval("\$this = \$user;");
-                // /*PHP5 patch*/$this = $user;
                 $this->_level = $authlevel;
                 return $user;
             }
@@ -710,9 +707,6 @@
             $class = "_" . $this->_current_method . "PassUser";
             include_once 'lib/WikiUser/' . $this->_current_method . '.php';
             $user = new $class($userid, $this->_prefs);
-            if (!check_php_version(5))
-                eval("\$this = \$user;");
-            // /*PHP5 patch*/$this = $user;
             $user->_level = $authlevel;
             return $user;
         }
@@ -1021,73 +1015,31 @@
                     // before we have to upgrade it manually.
                     if (!empty($GLOBALS['PHP_AUTH_USER']) or !empty($_SERVER['REMOTE_USER'])) {
                         include_once 'lib/WikiUser/HttpAuth.php';
-                        if (check_php_version(5))
-                            return new _HttpAuthPassUser($UserName, $this->_prefs);
-                        else {
-                            $user = new _HttpAuthPassUser($UserName, $this->_prefs);
-                            eval("\$this = \$user;");
-                            // /*PHP5 patch*/$this = $user;
-                            return $user;
-                        }
+                        return new _HttpAuthPassUser($UserName, $this->_prefs);
                     } elseif (in_array('Db', $dbh->getAuthParam('USER_AUTH_ORDER')) and
                         $dbh->getAuthParam('auth_check') and
                             ($dbh->getAuthParam('auth_dsn') or $dbh->getParam('dsn'))
                     ) {
-                        if (check_php_version(5))
-                            return new _DbPassUser($UserName, $this->_prefs);
-                        else {
-                            $user = new _DbPassUser($UserName, $this->_prefs);
-                            eval("\$this = \$user;");
-                            // /*PHP5 patch*/$this = $user;
-                            return $user;
-                        }
+                        return new _DbPassUser($UserName, $this->_prefs);
                     } elseif (in_array('LDAP', $dbh->getAuthParam('USER_AUTH_ORDER')) and
                         defined('LDAP_AUTH_HOST') and defined('LDAP_BASE_DN') and
                             function_exists('ldap_connect')
                     ) {
                         include_once 'lib/WikiUser/LDAP.php';
-                        if (check_php_version(5))
-                            return new _LDAPPassUser($UserName, $this->_prefs);
-                        else {
-                            $user = new _LDAPPassUser($UserName, $this->_prefs);
-                            eval("\$this = \$user;");
-                            // /*PHP5 patch*/$this = $user;
-                            return $user;
-                        }
+                        return new _LDAPPassUser($UserName, $this->_prefs);
                     } elseif (in_array('IMAP', $dbh->getAuthParam('USER_AUTH_ORDER')) and
                         defined('IMAP_AUTH_HOST') and function_exists('imap_open')
                     ) {
                         include_once 'lib/WikiUser/IMAP.php';
-                        if (check_php_version(5))
                             return new _IMAPPassUser($UserName, $this->_prefs);
-                        else {
-                            $user = new _IMAPPassUser($UserName, $this->_prefs);
-                            eval("\$this = \$user;");
-                            // /*PHP5 patch*/$this = $user;
-                            return $user;
-                        }
                     } elseif (in_array('File', $dbh->getAuthParam('USER_AUTH_ORDER')) and
                         defined('AUTH_USER_FILE') and file_exists(AUTH_USER_FILE)
                     ) {
                         include_once 'lib/WikiUser/File.php';
-                        if (check_php_version(5))
-                            return new _FilePassUser($UserName, $this->_prefs);
-                        else {
-                            $user = new _FilePassUser($UserName, $this->_prefs);
-                            eval("\$this = \$user;");
-                            // /*PHP5 patch*/$this = $user;
-                            return $user;
-                        }
+                        return new _FilePassUser($UserName, $this->_prefs);
                     } else {
                         include_once 'lib/WikiUser/PersonalPage.php';
-                        if (check_php_version(5))
-                            return new _PersonalPagePassUser($UserName, $this->_prefs);
-                        else {
-                            $user = new _PersonalPagePassUser($UserName, $this->_prefs);
-                            eval("\$this = \$user;");
-                            // /*PHP5 patch*/$this = $user;
-                            return $user;
-                        }
+                        return new _PersonalPagePassUser($UserName, $this->_prefs);
                     }
                 } else
                     // else use the page methods defined in _PassUser.
@@ -1302,8 +1254,6 @@
         }
         /* new user => false does not return false, but the _userid is empty then */
         while ($user and $user->_userid) {
-            if (!check_php_version(5))
-                eval("\$this = \$user;");
             $user = UpgradeUser($this, $user);
             if ($user->userExists()) {
                 $user = UpgradeUser($this, $user);
@@ -1464,8 +1414,6 @@
         ) {
             $class = $this->nextClass();
             while ($user = new $class($this->_userid, $this->_prefs)) {
-                if (!check_php_version(5))
-                    eval("\$this = \$user;");
                 $user = UpgradeUser($this, $user);
                 if ($user->userExists()) {
                     $user = UpgradeUser($this, $user);

Modified: trunk/lib/plugin/RssFeed.php
===================================================================
--- trunk/lib/plugin/RssFeed.php	2012-11-21 10:34:31 UTC (rev 8507)
+++ trunk/lib/plugin/RssFeed.php	2012-11-21 11:08:38 UTC (rev 8508)
@@ -110,8 +110,6 @@
         } else {
             $html = HTML::div(array('class' => 'rss'), HTML::em(_("no RSS items")));
         }
-        if (!check_php_version(5))
-            $rss_parser->__destruct();
         return $html;
     }
 

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2012-11-21 10:34:31 UTC (rev 8507)
+++ trunk/lib/stdlib.php	2012-11-21 11:08:38 UTC (rev 8508)
@@ -1779,12 +1779,7 @@
  */
 function isa($object, $class)
 {
-    //if (check_php_version(5))
-    //    return $object instanceof $class;
-    if (!check_php_version(5))
-        return is_a($object, $class);
-
-    $lclass = check_php_version(5) ? $class : strtolower($class);
+    $lclass = $class;
     return is_object($object)
         && (strtolower(get_class($object)) == strtolower($class)
             || is_subclass_of($object, $lclass));

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8507] trunk/lib/pear/PEAR5.php

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

Revision: 8507
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8507&view=rev
Author:   vargenau
Date:     2012-11-21 10:34:31 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Add PEAR5.php

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

Added: trunk/lib/pear/PEAR5.php
===================================================================
--- trunk/lib/pear/PEAR5.php	                        (rev 0)
+++ trunk/lib/pear/PEAR5.php	2012-11-21 10:34:31 UTC (rev 8507)
@@ -0,0 +1,33 @@
+<?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:[8506] trunk/lib/ErrorManager.php

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

Revision: 8506
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8506&view=rev
Author:   vargenau
Date:     2012-11-21 10:15:22 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Temporary hack to have errors displayed on dev machines.

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

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2012-11-20 20:51:46 UTC (rev 8505)
+++ trunk/lib/ErrorManager.php	2012-11-21 10:15:22 UTC (rev 8506)
@@ -385,6 +385,11 @@
  */
 function ErrorManager_errorHandler($errno, $errstr, $errfile, $errline)
 {
+    // TODO: Temporary hack to have errors displayed on dev machines.
+    if (defined('DEBUG') and DEBUG and $errno < 2048) {
+        print "<br/>PhpWiki Warning: ($errno, $errstr, $errfile, $errline)";
+    }
+
     if (!isset($GLOBALS['ErrorManager'])) {
         $GLOBALS['ErrorManager'] = new ErrorManager;
     }

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

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

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

Revision: 8505
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8505&view=rev
Author:   vargenau
Date:     2012-11-20 20:51:46 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Add examples

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

Modified: trunk/pgsrc/Help%2FAppendTextPlugin
===================================================================
--- trunk/pgsrc/Help%2FAppendTextPlugin	2012-11-20 20:46:28 UTC (rev 8504)
+++ trunk/pgsrc/Help%2FAppendTextPlugin	2012-11-20 20:51:46 UTC (rev 8505)
@@ -49,7 +49,7 @@
 
 == Examples ==
 
-Add from a list of all available plugins one to the current page.
+=== Add from a list of all available plugins one to the current page ===
 
 {{{
 <<WikiFormRich action=AppendText buttontext="AddPlugin"
@@ -57,14 +57,22 @@
 >>
 }}}
 
-Add from a list of all available Categories to the current page.
+<<WikiFormRich action=AppendText buttontext="AddPlugin"
+               pulldown[] name=s text="Plugins: " value=<!plugin-list BackLinks page=CategoryWikiPlugin !>
+>>
 
+=== Add from a list of all available Categories to the current page ===
+
 {{{
 <<WikiFormRich action=AppendText buttontext="AddCategory"
                pulldown[] name=s text="Categories: " value=<!plugin-list TitleSearch s=Category !>
 >>
 }}}
 
+<<WikiFormRich action=AppendText buttontext="AddCategory"
+               pulldown[] name=s text="Categories: " value=<!plugin-list TitleSearch s=Category !>
+>>
+
 <noinclude>
 ----
 [[PhpWikiDocumentation]] [[CategoryWikiPlugin]]

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

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

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

Revision: 8504
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8504&view=rev
Author:   vargenau
Date:     2012-11-20 20:46:28 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
WikiPlugin --> CategoryWikiPlugin

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

Modified: trunk/pgsrc/Help%2FAppendTextPlugin
===================================================================
--- trunk/pgsrc/Help%2FAppendTextPlugin	2012-11-20 20:43:39 UTC (rev 8503)
+++ trunk/pgsrc/Help%2FAppendTextPlugin	2012-11-20 20:46:28 UTC (rev 8504)
@@ -1,4 +1,4 @@
-Date: Fri, 20 Nov 2012 13:46:13 +0000
+Date: Fri, 20 Nov 2012 19:46:13 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAppendTextPlugin;
@@ -41,6 +41,7 @@
 | **after**
 | (Optional) Add after the matching line beginning with after.
 |
+|-
 | **redirect**
 | Redirect to modified page
 | false
@@ -52,7 +53,7 @@
 
 {{{
 <<WikiFormRich action=AppendText buttontext="AddPlugin"
-               pulldown[] name=s text="Plugins: " value=<!plugin-list BackLinks page=WikiPlugin !>
+               pulldown[] name=s text="Plugins: " value=<!plugin-list BackLinks page=CategoryWikiPlugin !>
 >>
 }}}
 

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

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

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

Revision: 8503
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8503&view=rev
Author:   vargenau
Date:     2012-11-20 20:43:39 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Add missing arguments (pages, redirect)

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

Modified: trunk/pgsrc/Help%2FAppendTextPlugin
===================================================================
--- trunk/pgsrc/Help%2FAppendTextPlugin	2012-11-20 20:29:20 UTC (rev 8502)
+++ trunk/pgsrc/Help%2FAppendTextPlugin	2012-11-20 20:43:39 UTC (rev 8503)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2012 13:46:13 +0000
+Date: Fri, 20 Nov 2012 13:46:13 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAppendTextPlugin;
@@ -26,6 +26,10 @@
 | Append to which page
 | Current page.
 |-
+| **pages**
+| Append to multiple pages
+| none
+|-
 | **s**
 | What text to add. Note: A \n is always prepended.
 |
@@ -37,6 +41,9 @@
 | **after**
 | (Optional) Add after the matching line beginning with after.
 |
+| **redirect**
+| Redirect to modified page
+| false
 |}
 
 == Examples ==

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

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

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

Revision: 8502
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8502&view=rev
Author:   vargenau
Date:     2012-11-20 20:29:20 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Add arguments

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

Modified: trunk/pgsrc/Help%2FAppendTextPlugin
===================================================================
--- trunk/pgsrc/Help%2FAppendTextPlugin	2012-11-20 19:51:13 UTC (rev 8501)
+++ trunk/pgsrc/Help%2FAppendTextPlugin	2012-11-20 20:29:20 UTC (rev 8502)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Fri, 10 Sep 2012 13:46:13 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAppendTextPlugin;
@@ -11,7 +11,7 @@
 usage better use the [[Help:AddCommentPlugin|AddComment]] plugin.
 
 {{{
-<<AppendText>>
+<<AppendText arguments>>
 }}}
 
 == Arguments ==

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

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

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

Revision: 8501
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8501&view=rev
Author:   vargenau
Date:     2012-11-20 19:51:13 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
MacIE is dead

Modified Paths:
--------------
    trunk/lib/plugin/AddComment.php
    trunk/lib/plugin/CreateToc.php

Modified: trunk/lib/plugin/AddComment.php
===================================================================
--- trunk/lib/plugin/AddComment.php	2012-11-20 17:21:56 UTC (rev 8500)
+++ trunk/lib/plugin/AddComment.php	2012-11-20 19:51:13 UTC (rev 8501)
@@ -84,10 +84,6 @@
         if ($request->isPost() and !empty($comment['addcomment'])) {
             $this->add($request, $comment, 'comment'); // noreturn
         }
-        if ($args['jshide'] and isBrowserIE() and browserDetect("Mac")) {
-            //trigger_error(_("jshide set to 0 on Mac IE"), E_USER_NOTICE);
-            $args['jshide'] = 0;
-        }
 
         // Now we display previous comments and/or provide entry box
         // for new comments

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2012-11-20 17:21:56 UTC (rev 8500)
+++ trunk/lib/plugin/CreateToc.php	2012-11-20 19:51:13 UTC (rev 8501)
@@ -29,7 +29,6 @@
  * @author:  Reini Urban, Marc-Etienne Vargenau
  *
  * Known problems:
- * - MacIE will not work with jshide.
  * - it will crash with old markup and Apache2 (?)
  * - Certain corner-edges will not work with TOC_FULL_SYNTAX.
  *   I believe I fixed all of them now, but who knows?
@@ -399,9 +398,6 @@
         if (!$pagename) {
             return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename'));
         }
-        if (isBrowserIE() and browserDetect("Mac")) {
-            $jshide = 0;
-        }
         if (($notoc) or ($liststyle == 'ol')) {
             $with_counter = 1;
         }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8500] trunk/index.php

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

Revision: 8500
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8500&view=rev
Author:   vargenau
Date:     2012-11-20 17:21:56 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
check_php_version at start

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

Modified: trunk/index.php
===================================================================
--- trunk/index.php	2012-11-20 15:30:19 UTC (rev 8499)
+++ trunk/index.php	2012-11-20 17:21:56 UTC (rev 8500)
@@ -32,6 +32,10 @@
 require_once(dirname(__FILE__) . '/lib/IniConfig.php');
 IniConfig(dirname(__FILE__) . "/config/config.ini");
 
+if (!check_php_version(5,2)) {
+    ExitWiki("PhpWiki " . PHPWIKI_VERSION . " requires at least PHP 5.2.");
+}
+
 ////////////////////////////////////////////////////////////////
 // PrettyWiki
 // Check if we were included by some other wiki version

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8499] trunk/lib/pear/DB/sybase.php

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

Revision: 8499
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8499&view=rev
Author:   vargenau
Date:     2012-11-20 15:30:19 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Convert to UTF-8

Modified Paths:
--------------
    trunk/lib/pear/DB/sybase.php

Modified: trunk/lib/pear/DB/sybase.php
===================================================================
--- trunk/lib/pear/DB/sybase.php	2012-11-20 14:24:11 UTC (rev 8498)
+++ trunk/lib/pear/DB/sybase.php	2012-11-20 15:30:19 UTC (rev 8499)
@@ -17,7 +17,7 @@
  * @category   Database
  * @package    DB
  * @author     Sterling Hughes <ste...@ph...>
- * @author     Ant\xF4nio Carlos Ven\xE2ncio J\xFAnior <fl...@ph...>
+ * @author     Antônio Carlos Venâncio Júnior <fl...@ph...>
  * @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,7 +42,7 @@
  * @category   Database
  * @package    DB
  * @author     Sterling Hughes <ste...@ph...>
- * @author     Ant\xF4nio Carlos Ven\xE2ncio J\xFAnior <fl...@ph...>
+ * @author     Antônio Carlos Venâncio Júnior <fl...@ph...>
  * @author     Daniel Convissor <da...@ph...>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0

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

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

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

Revision: 8498
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8498&view=rev
Author:   vargenau
Date:     2012-11-20 14:24:11 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Avoid logos overlapping text in footer

Modified Paths:
--------------
    trunk/themes/MonoBook/main.css
    trunk/themes/MonoBook/templates/browse-footer.tmpl

Modified: trunk/themes/MonoBook/main.css
===================================================================
--- trunk/themes/MonoBook/main.css	2012-11-20 13:10:25 UTC (rev 8497)
+++ trunk/themes/MonoBook/main.css	2012-11-20 14:24:11 UTC (rev 8498)
@@ -1382,6 +1382,10 @@
     font-size: 90%;
 }
 
+#footer ul {
+    display: table-cell;
+}
+
 #footer li {
     display: inline;
     margin: 0 1.3em;
@@ -1393,21 +1397,13 @@
 }
 
 #f-poweredbyico, #f-copyrightico {
+    display: table-cell;
     margin: 0 8px;
-    /*vertical-align: middle;*/
-    height: 31px;
-    position: relative;
-    top: -31px; /* Bump it up just a tad */
+    padding-left: 1em;
+    padding-right: 1em;
+    vertical-align: middle;
 }
 
-#f-poweredbyico {
-    float: right;
-}
-
-#f-copyrightico {
-    float: left;
-}
-
 /* js pref toc */
 #preftoc {
     float: left;

Modified: trunk/themes/MonoBook/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/browse-footer.tmpl	2012-11-20 13:10:25 UTC (rev 8497)
+++ trunk/themes/MonoBook/templates/browse-footer.tmpl	2012-11-20 14:24:11 UTC (rev 8498)
@@ -1,5 +1,6 @@
 <?php // <hr class="printer" noshade="noshade" /> ?>
     <div class="visualClear"></div>
+    <div id="f-poweredbyico"><a href="http://www.phpwiki.org/"><img src="<?php echo $WikiTheme->getImageURL("poweredby_phpwiki_51x31.png") ?>" alt="Powered by PhpWiki" /></a></div>
     <ul id="f-list">
       <li id="f-lastmod"> <?php echo $WikiTheme->getOwnerMessage($page) ?>  <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?> </li>
 	  
@@ -23,5 +24,4 @@
 <?php } ?>
 </li>
     </ul>
-    <div id="f-poweredbyico"><a href="http://www.phpwiki.org/"><img src="<?php echo $WikiTheme->getImageURL("poweredby_phpwiki_51x31.png") ?>" alt="Powered by PhpWiki" /></a></div>
     <div id="f-copyrightico"><a href="http://www.gnu.org/copyleft/fdl.html"><img src="<?php echo $WikiTheme->getImageURL("gnu-fdl.png") ?>" alt="GNU Free Documentation License" /></a></div>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8497] trunk/lib/pear/Cache/Container/mdb_cache_schema. xml

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

Revision: 8497
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8497&view=rev
Author:   vargenau
Date:     2012-11-20 13:10:25 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
No need for mdb_cache_schema.xml

Removed Paths:
-------------
    trunk/lib/pear/Cache/Container/mdb_cache_schema.xml

Deleted: trunk/lib/pear/Cache/Container/mdb_cache_schema.xml
===================================================================
--- trunk/lib/pear/Cache/Container/mdb_cache_schema.xml	2012-11-20 11:42:57 UTC (rev 8496)
+++ trunk/lib/pear/Cache/Container/mdb_cache_schema.xml	2012-11-20 13:10:25 UTC (rev 8497)
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<database>
-
- <name>dbname</name>
- <create>1</create>
- <description> </description>
-
- <table>
-  <name>cache</name>
-  <description> </description>
-
-  <declaration>
-
-   <field>
-      <name>ID</name>
-      <type>text</type>
-      <length>32</length>
-      <default></default>
-      <notnull>1</notnull>
-   </field>
-
-   <field>
-      <name>cachegroup</name>
-      <type>text</type>
-      <length>127</length>
-      <default></default>
-      <notnull>1</notnull>
-   </field>
-
-   <field>
-      <name>cachedata</name>
-      <type>clob</type>
-      <default></default>
-      <notnull>1</notnull>
-   </field>
-
-   <field>
-      <name>userdata</name>
-      <type>text</type>
-      <length>255</length>
-      <default></default>
-   </field>
-
-   <field>
-      <name>expires</name>
-      <type>integer</type>
-      <default>0</default>
-      <notnull>1</notnull>
-   </field>
-
-   <field>
-      <name>changed</name>
-      <type>integer</type>
-      <default>0</default>
-      <notnull>1</notnull>
-   </field>
-
-
-   <index>
-    <name>id_index</name>
-    <unique>1</unique>
-    <field> <name>id</name> </field>
-    <field> <name>cachegroup</name> </field>
-   </index>
-
-
-   <index>
-    <name>expires_index</name>
-    <field> <name>expires</name> </field>
-   </index>
-
-  </declaration>
- </table>
-
-</database>
\ 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:[8496] trunk/lib/pear/JSON.php

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

Revision: 8496
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8496&view=rev
Author:   vargenau
Date:     2012-11-20 11:42:57 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Update to JSON-1.0.3

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

Modified: trunk/lib/pear/JSON.php
===================================================================
--- trunk/lib/pear/JSON.php	2012-11-20 11:33:07 UTC (rev 8495)
+++ trunk/lib/pear/JSON.php	2012-11-20 11:42:57 UTC (rev 8496)
@@ -1,6 +1,5 @@
 <?php
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
 /**
  * Converts to and from JSON format.
  *
@@ -51,7 +50,7 @@
  * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
  * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
  * @copyright   2005 Michal Migurski
- * @version
+ * @version     CVS: $Id: JSON.php 305040 2010-11-02 23:19:03Z alan_k $
  * @license     http://www.opensource.org/licenses/bsd-license.php
  * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
  */
@@ -92,6 +91,11 @@
 define('SERVICES_JSON_SUPPRESS_ERRORS', 32);
 
 /**
+ * Behavior switch for Services_JSON::decode()
+ */
+define('SERVICES_JSON_USE_TO_JSON', 64);
+
+/**
  * Converts to and from JSON format.
  *
  * Brief example of use:
@@ -129,12 +133,24 @@
     *                                   By default, a deeply-nested resource will
     *                                   bubble up with an error, so all return values
     *                                   from encode() should be checked with isError()
+    *                           - SERVICES_JSON_USE_TO_JSON:  call toJSON when serializing objects
+    *                                   It serializes the return value from the toJSON call rather 
+    *                                   than the object it'self,  toJSON can return associative arrays, 
+    *                                   strings or numbers, if you return an object, make sure it does
+    *                                   not have a toJSON method, otherwise an error will occur.
     */
     function Services_JSON($use = 0)
     {
         $this->use = $use;
+        $this->_mb_strlen            = function_exists('mb_strlen');
+        $this->_mb_convert_encoding  = function_exists('mb_convert_encoding');
+        $this->_mb_substr            = function_exists('mb_substr');
     }
-
+    // private - cache the mbstring lookup results..
+    var $_mb_strlen = false;
+    var $_mb_substr = false;
+    var $_mb_convert_encoding = false;
+    
    /**
     * convert a string from one UTF-16 char to one UTF-8 char
     *
@@ -149,7 +165,7 @@
     function utf162utf8($utf16)
     {
         // oh please oh please oh please oh please oh please
-        if(function_exists('mb_convert_encoding')) {
+        if($this->_mb_convert_encoding) {
             return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
         }
 
@@ -193,11 +209,11 @@
     function utf82utf16($utf8)
     {
         // oh please oh please oh please oh please oh please
-        if(function_exists('mb_convert_encoding')) {
+        if($this->_mb_convert_encoding) {
             return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
         }
 
-        switch(strlen($utf8)) {
+        switch($this->strlen8($utf8)) {
             case 1:
                 // this case should never be reached, because we are in ASCII range
                 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
@@ -224,7 +240,7 @@
     }
 
    /**
-    * encodes an arbitrary variable into JSON format
+    * encodes an arbitrary variable into JSON format (and sends JSON Header)
     *
     * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
     *                           see argument 1 to Services_JSON() above for array-parsing behavior.
@@ -236,6 +252,44 @@
     */
     function encode($var)
     {
+        header('Content-type: application/json');
+        return $this->encodeUnsafe($var);
+    }
+    /**
+    * encodes an arbitrary variable into JSON format without JSON Header - warning - may allow XSS!!!!)
+    *
+    * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
+    *                           see argument 1 to Services_JSON() above for array-parsing behavior.
+    *                           if var is a strng, note that encode() always expects it
+    *                           to be in ASCII or UTF-8 format!
+    *
+    * @return   mixed   JSON string representation of input var or an error if a problem occurs
+    * @access   public
+    */
+    function encodeUnsafe($var)
+    {
+        // see bug #16908 - regarding numeric locale printing
+        $lc = setlocale(LC_NUMERIC, 0);
+        setlocale(LC_NUMERIC, 'C');
+        $ret = $this->_encode($var);
+        setlocale(LC_NUMERIC, $lc);
+        return $ret;
+        
+    }
+    /**
+    * PRIVATE CODE that does the work of encodes an arbitrary variable into JSON format 
+    *
+    * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
+    *                           see argument 1 to Services_JSON() above for array-parsing behavior.
+    *                           if var is a strng, note that encode() always expects it
+    *                           to be in ASCII or UTF-8 format!
+    *
+    * @return   mixed   JSON string representation of input var or an error if a problem occurs
+    * @access   public
+    */
+    function _encode($var) 
+    {
+         
         switch (gettype($var)) {
             case 'boolean':
                 return $var ? 'true' : 'false';
@@ -248,12 +302,12 @@
 
             case 'double':
             case 'float':
-                return (float) $var;
+                return  (float) $var;
 
             case 'string':
                 // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
                 $ascii = '';
-                $strlen_var = strlen($var);
+                $strlen_var = $this->strlen8($var);
 
                /*
                 * Iterate over every character in the string,
@@ -295,6 +349,12 @@
                         case (($ord_var_c & 0xE0) == 0xC0):
                             // characters U-00000080 - U-000007FF, mask 110XXXXX
                             // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            if ($c+1 >= $strlen_var) {
+                                $c += 1;
+                                $ascii .= '?';
+                                break;
+                            }
+                            
                             $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
                             $c += 1;
                             $utf16 = $this->utf82utf16($char);
@@ -302,17 +362,27 @@
                             break;
 
                         case (($ord_var_c & 0xF0) == 0xE0):
+                            if ($c+2 >= $strlen_var) {
+                                $c += 2;
+                                $ascii .= '?';
+                                break;
+                            }
                             // characters U-00000800 - U-0000FFFF, mask 1110XXXX
                             // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                             $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}));
+                                         @ord($var{$c + 1}),
+                                         @ord($var{$c + 2}));
                             $c += 2;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
                             break;
 
                         case (($ord_var_c & 0xF8) == 0xF0):
+                            if ($c+3 >= $strlen_var) {
+                                $c += 3;
+                                $ascii .= '?';
+                                break;
+                            }
                             // characters U-00010000 - U-001FFFFF, mask 11110XXX
                             // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                             $char = pack('C*', $ord_var_c,
@@ -327,6 +397,11 @@
                         case (($ord_var_c & 0xFC) == 0xF8):
                             // characters U-00200000 - U-03FFFFFF, mask 111110XX
                             // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            if ($c+4 >= $strlen_var) {
+                                $c += 4;
+                                $ascii .= '?';
+                                break;
+                            }
                             $char = pack('C*', $ord_var_c,
                                          ord($var{$c + 1}),
                                          ord($var{$c + 2}),
@@ -338,6 +413,11 @@
                             break;
 
                         case (($ord_var_c & 0xFE) == 0xFC):
+                        if ($c+5 >= $strlen_var) {
+                                $c += 5;
+                                $ascii .= '?';
+                                break;
+                            }
                             // characters U-04000000 - U-7FFFFFFF, mask 1111110X
                             // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                             $char = pack('C*', $ord_var_c,
@@ -352,9 +432,8 @@
                             break;
                     }
                 }
+                return  '"'.$ascii.'"';
 
-                return '"'.$ascii.'"';
-
             case 'array':
                /*
                 * As per JSON spec if any array key is not an integer
@@ -390,7 +469,7 @@
                 }
 
                 // treat it like a regular array
-                $elements = array_map(array($this, 'encode'), $var);
+                $elements = array_map(array($this, '_encode'), $var);
 
                 foreach($elements as $element) {
                     if(Services_JSON::isError($element)) {
@@ -401,8 +480,27 @@
                 return '[' . join(',', $elements) . ']';
 
             case 'object':
+            
+                // support toJSON methods.
+                if (($this->use & SERVICES_JSON_USE_TO_JSON) && method_exists($var, 'toJSON')) {
+                    // this may end up allowing unlimited recursion
+                    // so we check the return value to make sure it's not got the same method.
+                    $recode = $var->toJSON();
+                    
+                    if (method_exists($recode, 'toJSON')) {
+                        
+                        return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
+                        ? 'null'
+                        : new Services_JSON_Error(class_name($var).
+                            " toJSON returned an object with a toJSON method.");
+                            
+                    }
+                    
+                    return $this->_encode( $recode );
+                } 
+                
                 $vars = get_object_vars($var);
-
+                
                 $properties = array_map(array($this, 'name_value'),
                                         array_keys($vars),
                                         array_values($vars));
@@ -433,13 +531,13 @@
     */
     function name_value($name, $value)
     {
-        $encoded_value = $this->encode($value);
+        $encoded_value = $this->_encode($value);
 
         if(Services_JSON::isError($encoded_value)) {
             return $encoded_value;
         }
 
-        return $this->encode(strval($name)) . ':' . $encoded_value;
+        return $this->_encode(strval($name)) . ':' . $encoded_value;
     }
 
    /**
@@ -512,14 +610,14 @@
 
                 } elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
                     // STRINGS RETURNED IN UTF-8 FORMAT
-                    $delim = substr($str, 0, 1);
-                    $chrs = substr($str, 1, -1);
+                    $delim = $this->substr8($str, 0, 1);
+                    $chrs = $this->substr8($str, 1, -1);
                     $utf8 = '';
-                    $strlen_chrs = strlen($chrs);
+                    $strlen_chrs = $this->strlen8($chrs);
 
                     for ($c = 0; $c < $strlen_chrs; ++$c) {
 
-                        $substr_chrs_c_2 = substr($chrs, $c, 2);
+                        $substr_chrs_c_2 = $this->substr8($chrs, $c, 2);
                         $ord_chrs_c = ord($chrs{$c});
 
                         switch (true) {
@@ -554,10 +652,10 @@
                                 }
                                 break;
 
-                            case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6)):
+                            case preg_match('/\\\u[0-9A-F]{4}/i', $this->substr8($chrs, $c, 6)):
                                 // single, escaped unicode character
-                                $utf16 = chr(hexdec(substr($chrs, ($c + 2), 2)))
-                                       . chr(hexdec(substr($chrs, ($c + 4), 2)));
+                                $utf16 = chr(hexdec($this->substr8($chrs, ($c + 2), 2)))
+                                       . chr(hexdec($this->substr8($chrs, ($c + 4), 2)));
                                 $utf8 .= $this->utf162utf8($utf16);
                                 $c += 5;
                                 break;
@@ -569,35 +667,35 @@
                             case ($ord_chrs_c & 0xE0) == 0xC0:
                                 // characters U-00000080 - U-000007FF, mask 110XXXXX
                                 //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 2);
+                                $utf8 .= $this->substr8($chrs, $c, 2);
                                 ++$c;
                                 break;
 
                             case ($ord_chrs_c & 0xF0) == 0xE0:
                                 // characters U-00000800 - U-0000FFFF, mask 1110XXXX
                                 // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 3);
+                                $utf8 .= $this->substr8($chrs, $c, 3);
                                 $c += 2;
                                 break;
 
                             case ($ord_chrs_c & 0xF8) == 0xF0:
                                 // characters U-00010000 - U-001FFFFF, mask 11110XXX
                                 // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 4);
+                                $utf8 .= $this->substr8($chrs, $c, 4);
                                 $c += 3;
                                 break;
 
                             case ($ord_chrs_c & 0xFC) == 0xF8:
                                 // characters U-00200000 - U-03FFFFFF, mask 111110XX
                                 // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 5);
+                                $utf8 .= $this->substr8($chrs, $c, 5);
                                 $c += 4;
                                 break;
 
                             case ($ord_chrs_c & 0xFE) == 0xFC:
                                 // characters U-04000000 - U-7FFFFFFF, mask 1111110X
                                 // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 6);
+                                $utf8 .= $this->substr8($chrs, $c, 6);
                                 $c += 5;
                                 break;
 
@@ -627,7 +725,7 @@
                                            'where' => 0,
                                            'delim' => false));
 
-                    $chrs = substr($str, 1, -1);
+                    $chrs = $this->substr8($str, 1, -1);
                     $chrs = $this->reduce_string($chrs);
 
                     if ($chrs == '') {
@@ -642,19 +740,19 @@
 
                     //print("\nparsing {$chrs}\n");
 
-                    $strlen_chrs = strlen($chrs);
+                    $strlen_chrs = $this->strlen8($chrs);
 
                     for ($c = 0; $c <= $strlen_chrs; ++$c) {
 
                         $top = end($stk);
-                        $substr_chrs_c_2 = substr($chrs, $c, 2);
+                        $substr_chrs_c_2 = $this->substr8($chrs, $c, 2);
 
                         if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
                             // found a comma that is not inside a string, array, etc.,
                             // OR we've reached the end of the character list
-                            $slice = substr($chrs, $top['where'], ($c - $top['where']));
+                            $slice = $this->substr8($chrs, $top['where'], ($c - $top['where']));
                             array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
-                            //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+                            //print("Found split at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
 
                             if (reset($stk) == SERVICES_JSON_IN_ARR) {
                                 // we are in an array, so just push an element onto the stack
@@ -666,21 +764,20 @@
                                 // element in an associative array,
                                 // for now
                                 $parts = array();
-
-                                if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
-                                    // "name":value pair
+                                
+                               if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:/Uis', $slice, $parts)) {
+ 	                              // "name":value pair
                                     $key = $this->decode($parts[1]);
-                                    $val = $this->decode($parts[2]);
-
+                                    $val = $this->decode(trim(substr($slice, strlen($parts[0])), ", \t\n\r\0\x0B"));
                                     if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
                                         $obj[$key] = $val;
                                     } else {
                                         $obj->$key = $val;
                                     }
-                                } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
+                                } elseif (preg_match('/^\s*(\w+)\s*:/Uis', $slice, $parts)) {
                                     // name:value pair, where name is unquoted
                                     $key = $parts[1];
-                                    $val = $this->decode($parts[2]);
+                                    $val = $this->decode(trim(substr($slice, strlen($parts[0])), ", \t\n\r\0\x0B"));
 
                                     if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
                                         $obj[$key] = $val;
@@ -698,12 +795,12 @@
 
                         } elseif (($chrs{$c} == $top['delim']) &&
                                  ($top['what'] == SERVICES_JSON_IN_STR) &&
-                                 ((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)) {
+                                 (($this->strlen8($this->substr8($chrs, 0, $c)) - $this->strlen8(rtrim($this->substr8($chrs, 0, $c), '\\'))) % 2 != 1)) {
                             // found a quote, we're in a string, and it's not escaped
                             // we know that it's not escaped becase there is _not_ an
                             // odd number of backslashes at the end of the string so far
                             array_pop($stk);
-                            //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
+                            //print("Found end of string at {$c}: ".$this->substr8($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
 
                         } elseif (($chrs{$c} == '[') &&
                                  in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
@@ -714,7 +811,7 @@
                         } elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
                             // found a right-bracket, and we're in an array
                             array_pop($stk);
-                            //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+                            //print("Found end of array at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
 
                         } elseif (($chrs{$c} == '{') &&
                                  in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
@@ -725,7 +822,7 @@
                         } elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
                             // found a right-brace, and we're in an object
                             array_pop($stk);
-                            //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+                            //print("Found end of object at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
 
                         } elseif (($substr_chrs_c_2 == '/*') &&
                                  in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
@@ -742,7 +839,7 @@
                             for ($i = $top['where']; $i <= $c; ++$i)
                                 $chrs = substr_replace($chrs, ' ', $i, 1);
 
-                            //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+                            //print("Found end of comment at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
 
                         }
 
@@ -774,6 +871,38 @@
 
         return false;
     }
+    
+    /**
+    * Calculates length of string in bytes
+    * @param string 
+    * @return integer length
+    */
+    function strlen8( $str ) 
+    {
+        if ( $this->_mb_strlen ) {
+            return mb_strlen( $str, "8bit" );
+        }
+        return strlen( $str );
+    }
+    
+    /**
+    * Returns part of a string, interpreting $start and $length as number of bytes.
+    * @param string 
+    * @param integer start 
+    * @param integer length 
+    * @return integer length
+    */
+    function substr8( $string, $start, $length=false ) 
+    {
+        if ( $length === false ) {
+            $length = $this->strlen8( $string ) - $start;
+        }
+        if ( $this->_mb_substr ) {
+            return mb_substr( $string, $start, $length, "8bit" );
+        }
+        return substr( $string, $start, $length );
+    }
+
 }
 
 if (class_exists('PEAR_Error')) {
@@ -800,5 +929,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:[8495] trunk/lib/pear

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

Revision: 8495
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8495&view=rev
Author:   vargenau
Date:     2012-11-20 11:33:07 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Update to DB-1.7.14

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	2012-11-20 09:06:44 UTC (rev 8494)
+++ trunk/lib/pear/DB/common.php	2012-11-20 11:33:07 UTC (rev 8495)
@@ -1,152 +1,248 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 foldmethod=marker: */
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | li...@ph... so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Stig Bakken <ss...@ph...>                                    |
-// |         Tomas V.V.Cox <co...@id...>                              |
-// | Maintainer: Daniel Convissor <da...@ph...>                       |
-// +----------------------------------------------------------------------+
 
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Contains the DB_common base class
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to li...@ph... so we can mail you a copy immediately.
+ *
+ * @category   Database
+ * @package    DB
+ * @author     Stig Bakken <ss...@ph...>
+ * @author     Tomas V.V. Cox <co...@id...>
+ * @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    CVS: $Id: common.php 315557 2011-08-26 14:32:35Z danielc $
+ * @link       http://pear.php.net/package/DB
+ */
+
+/**
+ * Obtain the PEAR class so it can be extended from
+ */
 require_once 'PEAR.php';
 
 /**
- * DB_common is a base class for DB implementations, and must be
- * inherited by all such
+ * DB_common is the base class from which each database driver class extends
  *
- * @package  DB
- * @version
- * @category Database
- * @author   Stig Bakken <ss...@ph...>
- * @author   Tomas V.V.Cox <co...@id...>
+ * All common methods are declared here.  If a given DBMS driver contains
+ * a particular method, that method will overload the one here.
+ *
+ * @category   Database
+ * @package    DB
+ * @author     Stig Bakken <ss...@ph...>
+ * @author     Tomas V.V. Cox <co...@id...>
+ * @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.7.14
+ * @link       http://pear.php.net/package/DB
  */
 class DB_common extends PEAR
 {
     // {{{ properties
 
     /**
-     * assoc of capabilities for this DB implementation
-     * $features['limit'] =>  'emulate' => emulate with fetch row by number
-     *                        'alter'   => alter the query
-     *                        false     => skip rows
-     * @var array
+     * The current default fetch mode
+     * @var integer
      */
-    var $features = array();
+    var $fetchmode = DB_FETCHMODE_ORDERED;
 
     /**
-     * assoc mapping native error codes to DB ones
-     * @var array
+     * The name of the class into which results should be fetched when
+     * DB_FETCHMODE_OBJECT is in effect
+     *
+     * @var string
      */
-    var $errorcode_map = array();
+    var $fetchmode_object_class = 'stdClass';
 
     /**
-     * DB type (mysql, oci8, odbc etc.)
-     * @var string
+     * Was a connection present when the object was serialized()?
+     * @var bool
+     * @see DB_common::__sleep(), DB_common::__wake()
      */
-    var $phptype;
+    var $was_connected = null;
 
     /**
+     * The most recently executed query
      * @var string
      */
-    var $prepare_tokens;
+    var $last_query = '';
 
     /**
-     * @var string
+     * Run-time configuration options
+     *
+     * The 'optimize' option has been deprecated.  Use the 'portability'
+     * option instead.
+     *
+     * @var array
+     * @see DB_common::setOption()
      */
-    var $prepare_types;
+    var $options = array(
+        'result_buffering' => 500,
+        'persistent' => false,
+        'ssl' => false,
+        'debug' => 0,
+        'seqname_format' => '%s_seq',
+        'autofree' => false,
+        'portability' => DB_PORTABILITY_NONE,
+        'optimize' => 'performance',  // Deprecated.  Use 'portability'.
+    );
 
     /**
-     * @var string
+     * The parameters from the most recently executed query
+     * @var array
+     * @since Property available since Release 1.7.0
      */
-    var $prepared_queries;
+    var $last_parameters = array();
 
     /**
-     * @var integer
+     * The elements from each prepared statement
+     * @var array
      */
-    var $prepare_maxstmt = 0;
+    var $prepare_tokens = array();
 
     /**
-     * @var string
+     * The data types of the various elements in each prepared statement
+     * @var array
      */
-    var $last_query = '';
+    var $prepare_types = array();
 
     /**
-     * @var integer
+     * The prepared queries
+     * @var array
      */
-    var $fetchmode = DB_FETCHMODE_ORDERED;
+    var $prepared_queries = array();
 
     /**
-     * @var string
+     * Flag indicating that the last query was a manipulation query.
+     * @access protected
+     * @var boolean
      */
-    var $fetchmode_object_class = 'stdClass';
+    var $_last_query_manip = false;
 
     /**
-     * Run-time configuration options.
+     * Flag indicating that the next query <em>must</em> be a manipulation
+     * query.
+     * @access protected
+     * @var boolean
+     */
+    var $_next_query_manip = false;
+
+
+    // }}}
+    // {{{ DB_common
+
+    /**
+     * This constructor calls <kbd>$this->PEAR('DB_Error')</kbd>
      *
-     * The 'optimize' option has been deprecated.  Use the 'portability'
-     * option instead.
+     * @return void
+     */
+    function DB_common()
+    {
+        $this->PEAR('DB_Error');
+    }
+
+    // }}}
+    // {{{ __sleep()
+
+    /**
+     * Automatically indicates which properties should be saved
+     * when PHP's serialize() function is called
      *
-     * @see DB_common::setOption()
-     * @var array
+     * @return array  the array of properties names that should be saved
      */
-    var $options = array(
-        'persistent' => false,
-        'ssl' => false,
-        'debug' => 0,
-        'seqname_format' => '%s_seq',
-        'autofree' => false,
-        'portability' => DB_PORTABILITY_NONE,
-        'optimize' => 'performance',  // Deprecated.  Use 'portability'.
-    );
+    function __sleep()
+    {
+        if ($this->connection) {
+            // Don't disconnect(), people use serialize() for many reasons
+            $this->was_connected = true;
+        } else {
+            $this->was_connected = false;
+        }
+        if (isset($this->autocommit)) {
+            return array('autocommit',
+                         'dbsyntax',
+                         'dsn',
+                         'features',
+                         'fetchmode',
+                         'fetchmode_object_class',
+                         'options',
+                         'was_connected',
+                   );
+        } else {
+            return array('dbsyntax',
+                         'dsn',
+                         'features',
+                         'fetchmode',
+                         'fetchmode_object_class',
+                         'options',
+                         'was_connected',
+                   );
+        }
+    }
 
+    // }}}
+    // {{{ __wakeup()
+
     /**
-     * DB handle
-     * @var resource
+     * Automatically reconnects to the database when PHP's unserialize()
+     * function is called
+     *
+     * The reconnection attempt is only performed if the object was connected
+     * at the time PHP's serialize() function was run.
+     *
+     * @return void
      */
-    var $dbh;
+    function __wakeup()
+    {
+        if ($this->was_connected) {
+            $this->connect($this->dsn, $this->options['persistent']);
+        }
+    }
 
     // }}}
-    // {{{ toString()
+    // {{{ __toString()
 
     /**
-     * String conversation
+     * Automatic string conversion for PHP 5
      *
-     * @return string
-     * @access private
+     * @return string  a string describing the current PEAR DB object
+     *
+     * @since Method available since Release 1.7.0
      */
-    function toString()
+    function __toString()
     {
         $info = strtolower(get_class($this));
         $info .=  ': (phptype=' . $this->phptype .
                   ', dbsyntax=' . $this->dbsyntax .
                   ')';
-
         if ($this->connection) {
             $info .= ' [connected]';
         }
-
         return $info;
     }
 
     // }}}
-    // {{{ constructor
+    // {{{ toString()
 
     /**
-     * Constructor
+     * DEPRECATED:  String conversion method
+     *
+     * @return string  a string describing the current PEAR DB object
+     *
+     * @deprecated Method deprecated in Release 1.7.0
      */
-    function DB_common()
+    function toString()
     {
-        $this->PEAR('DB_Error');
+        return $this->__toString();
     }
 
     // }}}
@@ -156,11 +252,12 @@
      * DEPRECATED: Quotes a string so it can be safely used within string
      * delimiters in a query
      *
-     * @return string quoted string
+     * @param string $string  the string to be quoted
      *
+     * @return string  the quoted string
+     *
      * @see DB_common::quoteSmart(), DB_common::escapeSimple()
-     * @deprecated  Deprecated in release 1.2 or lower
-     * @internal
+     * @deprecated Method deprecated some time before Release 1.2
      */
     function quoteString($string)
     {
@@ -177,25 +274,25 @@
     /**
      * DEPRECATED: Quotes a string so it can be safely used in a query
      *
-     * @param string $string the input string to quote
+     * @param string $string  the string to quote
      *
-     * @return string The NULL string or the string quotes
-     *                in magic_quote_sybase style
+     * @return string  the quoted string or the string <samp>NULL</samp>
+     *                  if the value submitted is <kbd>null</kbd>.
      *
      * @see DB_common::quoteSmart(), DB_common::escapeSimple()
-     * @deprecated  Deprecated in release 1.6.0
-     * @internal
+     * @deprecated Deprecated in release 1.6.0
      */
     function quote($string = null)
     {
-        return ($string === null) ? 'NULL' : "'".str_replace("'", "''", $string)."'";
+        return ($string === null) ? 'NULL'
+                                  : "'" . str_replace("'", "''", $string) . "'";
     }
 
     // }}}
     // {{{ quoteIdentifier()
 
     /**
-     * Quote a string so it can be safely used as a table or column name
+     * Quotes a string so it can be safely used as a table or column name
      *
      * Delimiting style depends on which database driver is being used.
      *
@@ -219,17 +316,17 @@
      *   + odbc(db2)
      *   + pgsql
      *   + sqlite
-     *   + sybase
+     *   + sybase (must execute <kbd>set quoted_identifier on</kbd> sometime
+     *     prior to use)
      *
      * InterBase doesn't seem to be able to use delimited identifiers
      * via PHP 4.  They work fine under PHP 5.
      *
-     * @param string $str identifier name to be quoted
+     * @param string $str  the identifier name to be quoted
      *
-     * @return string quoted identifier string
+     * @return string  the quoted identifier
      *
-     * @since 1.6.0
-     * @access public
+     * @since Method available since Release 1.6.0
      */
     function quoteIdentifier($str)
     {
@@ -240,16 +337,15 @@
     // {{{ quoteSmart()
 
     /**
-     * Format input so it can be safely used in a query
+     * Formats input so it can be safely used in a query
      *
      * The output depends on the PHP data type of input and the database
      * type being used.
      *
-     * @param mixed $in data to be quoted
+     * @param mixed $in  the data to be formatted
      *
-     * @return mixed the format of the results depends on the input's
-     *                PHP type:
-     *
+     * @return mixed  the formatted data.  The format depends on the input's
+     *                 PHP type:
      * <ul>
      *  <li>
      *    <kbd>input</kbd> -> <samp>returns</samp>
@@ -261,7 +357,7 @@
      *    <kbd>integer</kbd> or <kbd>double</kbd> -> the unquoted number
      *  </li>
      *  <li>
-     *    &type.bool; -> output depends on the driver in use
+     *    <kbd>bool</kbd> -> output depends on the driver in use
      *    Most drivers return integers: <samp>1</samp> if
      *    <kbd>true</kbd> or <samp>0</samp> if
      *    <kbd>false</kbd>.
@@ -338,192 +434,116 @@
      *  </li>
      * </ul>
      *
-     * @since 1.6.0
      * @see DB_common::escapeSimple()
-     * @access public
+     * @since Method available since Release 1.6.0
      */
     function quoteSmart($in)
     {
-        if (is_int($in) || is_double($in)) {
+        if (is_int($in)) {
             return $in;
+        } elseif (is_float($in)) {
+            return $this->quoteFloat($in);
         } elseif (is_bool($in)) {
-            return $in ? 1 : 0;
+            return $this->quoteBoolean($in);
         } elseif (is_null($in)) {
             return 'NULL';
         } else {
+            if ($this->dbsyntax == 'access'
+                && preg_match('/^#.+#$/', $in))
+            {
+                return $this->escapeSimple($in);
+            }
             return "'" . $this->escapeSimple($in) . "'";
         }
     }
 
     // }}}
-    // {{{ escapeSimple()
+    // {{{ quoteBoolean()
 
     /**
-     * Escape a string according to the current DBMS's standards
+     * Formats a boolean value for use within a query in a locale-independent
+     * manner.
      *
-     * In SQLite, this makes things safe for inserts/updates, but may
-     * cause problems when performing text comparisons against columns
-     * containing binary data. See the
-     * {@link http://php.net/sqlite_escape_string PHP manual} for more info.
-     *
-     * @param string $str the string to be escaped
-     *
-     * @return string the escaped string
-     *
-     * @since 1.6.0
+     * @param boolean the boolean value to be quoted.
+     * @return string the quoted string.
      * @see DB_common::quoteSmart()
-     * @access public
+     * @since Method available since release 1.7.8.
      */
-    function escapeSimple($str) {
-        return str_replace("'", "''", $str);
+    function quoteBoolean($boolean) {
+        return $boolean ? '1' : '0';
     }
-
+     
     // }}}
-    // {{{ provides()
+    // {{{ quoteFloat()
 
     /**
-     * Tell whether a DB implementation or its backend extension
-     * supports a given feature
+     * Formats a float value for use within a query in a locale-independent
+     * manner.
      *
-     * @param  array $feature name of the feature (see the DB class doc)
-     * @return bool  whether this DB implementation supports $feature
-     * @access public
+     * @param float the float value to be quoted.
+     * @return string the quoted string.
+     * @see DB_common::quoteSmart()
+     * @since Method available since release 1.7.8.
      */
-    function provides($feature)
-    {
-        return $this->features[$feature];
+    function quoteFloat($float) {
+        return "'".$this->escapeSimple(str_replace(',', '.', strval(floatval($float))))."'";
     }
-
+     
     // }}}
-    // {{{ errorCode()
+    // {{{ escapeSimple()
 
     /**
-     * Map native error codes to DB's portable ones
+     * Escapes a string according to the current DBMS's standards
      *
-     * Requires that the DB implementation's constructor fills
-     * in the <var>$errorcode_map</var> property.
+     * In SQLite, this makes things safe for inserts/updates, but may
+     * cause problems when performing text comparisons against columns
+     * containing binary data. See the
+     * {@link http://php.net/sqlite_escape_string PHP manual} for more info.
      *
-     * @param mixed $nativecode the native error code, as returned by the
-     * backend database extension (string or integer)
+     * @param string $str  the string to be escaped
      *
-     * @return int a portable DB error code, or DB_ERROR if this DB
-     * implementation has no mapping for the given error code.
+     * @return string  the escaped string
      *
-     * @access public
+     * @see DB_common::quoteSmart()
+     * @since Method available since Release 1.6.0
      */
-    function errorCode($nativecode)
+    function escapeSimple($str)
     {
-        if (isset($this->errorcode_map[$nativecode])) {
-            return $this->errorcode_map[$nativecode];
-        }
-        // Fall back to DB_ERROR if there was no mapping.
-        return DB_ERROR;
+        return str_replace("'", "''", $str);
     }
 
     // }}}
-    // {{{ errorMessage()
+    // {{{ provides()
 
     /**
-     * Map a DB error code to a textual message.  This is actually
-     * just a wrapper for DB::errorMessage()
+     * Tells whether the present driver supports a given feature
      *
-     * @param integer $dbcode the DB error code
+     * @param string $feature  the feature you're curious about
      *
-     * @return string the corresponding error message, of false
-     * if the error code was unknown
-     *
-     * @access public
+     * @return bool  whether this driver supports $feature
      */
-    function errorMessage($dbcode)
+    function provides($feature)
     {
-        return DB::errorMessage($this->errorcode_map[$dbcode]);
+        return $this->features[$feature];
     }
 
     // }}}
-    // {{{ raiseError()
-
-    /**
-     * Communicate an error and invoke error callbacks, etc
-     *
-     * Basically a wrapper for PEAR::raiseError without the message string.
-     *
-     * @param mixed    integer error code, or a PEAR error object (all
-     *                 other parameters are ignored if this parameter is
-     *                 an object
-     *
-     * @param int      error mode, see PEAR_Error docs
-     *
-     * @param mixed    If error mode is PEAR_ERROR_TRIGGER, this is the
-     *                 error level (E_USER_NOTICE etc).  If error mode is
-     *                 PEAR_ERROR_CALLBACK, this is the callback function,
-     *                 either as a function name, or as an array of an
-     *                 object and method name.  For other error modes this
-     *                 parameter is ignored.
-     *
-     * @param string   Extra debug information.  Defaults to the last
-     *                 query and native error code.
-     *
-     * @param mixed    Native error code, integer or string depending the
-     *                 backend.
-     *
-     * @return object a PEAR error object
-     *
-     * @access public
-     * @see PEAR_Error
-     */
-    function &raiseError($code = DB_ERROR, $mode = null, $options = null,
-                         $userinfo = null, $nativecode = null)
-    {
-        // The error is yet a DB error object
-        if (is_object($code)) {
-            // because we the static PEAR::raiseError, our global
-            // handler should be used if it is set
-            if ($mode === null && !empty($this->_default_error_mode)) {
-                $mode    = $this->_default_error_mode;
-                $options = $this->_default_error_options;
-            }
-            $tmp = PEAR::raiseError($code, null, $mode, $options, null, null, true);
-            return $tmp;
-        }
-
-        if ($userinfo === null) {
-            $userinfo = $this->last_query;
-        }
-
-        if ($nativecode) {
-            $userinfo .= ' [nativecode=' . trim($nativecode) . ']';
-        }
-
-        $tmp = PEAR::raiseError(null, $code, $mode, $options, $userinfo,
-                                'DB_Error', true);
-        return $tmp;
-    }
-
-    // }}}
     // {{{ setFetchMode()
 
     /**
-     * Sets which fetch mode should be used by default on queries
-     * on this connection
+     * Sets the fetch mode that should be used by default for query results
      *
-     * @param integer $fetchmode DB_FETCHMODE_ORDERED or
-     *        DB_FETCHMODE_ASSOC, possibly bit-wise OR'ed with
-     *        DB_FETCHMODE_FLIPPED.
+     * @param integer $fetchmode    DB_FETCHMODE_ORDERED, DB_FETCHMODE_ASSOC
+     *                               or DB_FETCHMODE_OBJECT
+     * @param string $object_class  the class name of the object to be returned
+     *                               by the fetch methods when the
+     *                               DB_FETCHMODE_OBJECT mode is selected.
+     *                               If no class is specified by default a cast
+     *                               to object from the assoc array row will be
+     *                               done.  There is also the posibility to use
+     *                               and extend the 'DB_row' class.
      *
-     * @param string $object_class The class of the object
-     *                      to be returned by the fetch methods when
-     *                      the DB_FETCHMODE_OBJECT mode is selected.
-     *                      If no class is specified by default a cast
-     *                      to object from the assoc array row will be done.
-     *                      There is also the posibility to use and extend the
-     *                      'DB_row' class.
-     *
-     * @see DB_FETCHMODE_ORDERED
-     * @see DB_FETCHMODE_ASSOC
-     * @see DB_FETCHMODE_FLIPPED
-     * @see DB_FETCHMODE_OBJECT
-     * @see DB_row::DB_row()
-     * @access public
+     * @see DB_FETCHMODE_ORDERED, DB_FETCHMODE_ASSOC, DB_FETCHMODE_OBJECT
      */
     function setFetchMode($fetchmode, $object_class = 'stdClass')
     {
@@ -543,7 +563,7 @@
     // {{{ setOption()
 
     /**
-     * Set run-time configuration options for PEAR DB
+     * Sets run-time configuration options for PEAR DB
      *
      * Options, their data types, default values and description:
      * <ul>
@@ -552,6 +572,13 @@
      *      <br />should results be freed automatically when there are no
      *            more rows?
      * </li><li>
+     * <var>result_buffering</var> <kbd>integer</kbd> = <samp>500</samp>
+     *      <br />how many rows of the result set should be buffered?
+     *      <br />In mysql: mysql_unbuffered_query() is used instead of
+     *            mysql_query() if this value is 0.  (Release 1.7.0)
+     *      <br />In oci8: this value is passed to ocisetprefetch().
+     *            (Release 1.7.0)
+     * </li><li>
      * <var>debug</var> <kbd>integer</kbd> = <samp>0</samp>
      *      <br />debug level
      * </li><li>
@@ -638,7 +665,6 @@
      *   that code gets mapped to DB_ERROR_NOSUCHFIELD.
      *   DB_ERROR_MISMATCH -> DB_ERROR_NOSUCHFIELD
      *
-     *
      * <samp>DB_PORTABILITY_NULL_TO_EMPTY</samp>
      * convert null values to empty strings in data output by get*() and
      * fetch*().  Needed because Oracle considers empty strings to be null,
@@ -651,26 +677,26 @@
      * -----------------------------------------
      *
      * Example 1. Simple setOption() example
-     * <code> <?php
-     * $dbh->setOption('autofree', true);
-     * ?></code>
+     * <code>
+     * $db->setOption('autofree', true);
+     * </code>
      *
      * Example 2. Portability for lowercasing and trimming
-     * <code> <?php
-     * $dbh->setOption('portability',
-     *                  DB_PORTABILITY_LOWERCASE | DB_PORTABILITY_RTRIM);
-     * ?></code>
+     * <code>
+     * $db->setOption('portability',
+     *                 DB_PORTABILITY_LOWERCASE | DB_PORTABILITY_RTRIM);
+     * </code>
      *
      * Example 3. All portability options except trimming
-     * <code> <?php
-     * $dbh->setOption('portability',
-     *                  DB_PORTABILITY_ALL ^ DB_PORTABILITY_RTRIM);
-     * ?></code>
+     * <code>
+     * $db->setOption('portability',
+     *                 DB_PORTABILITY_ALL ^ DB_PORTABILITY_RTRIM);
+     * </code>
      *
      * @param string $option option name
-     * @param mixed  $value  value for the option
+     * @param mixed  $value value for the option
      *
-     * @return int DB_OK on success.  DB_Error object on failure.
+     * @return int  DB_OK on success.  A DB_Error object on failure.
      *
      * @see DB_common::$options
      */
@@ -715,9 +741,9 @@
     /**
      * Returns the value of an option
      *
-     * @param string $option option name
+     * @param string $option  the option name you're curious about
      *
-     * @return mixed the option value
+     * @return mixed  the option's value
      */
     function getOption($option)
     {
@@ -746,15 +772,15 @@
      *                   data in a db)
      *
      * Example 1.
-     * <code> <?php
-     * $sth = $dbh->prepare('INSERT INTO tbl (a, b, c) VALUES (?, !, &)');
+     * <code>
+     * $sth = $db->prepare('INSERT INTO tbl (a, b, c) VALUES (?, !, &)');
      * $data = array(
      *     "John's text",
      *     "'it''s good'",
      *     'filename.txt'
      * );
-     * $res = $dbh->execute($sth, $data);
-     * ?></code>
+     * $res = $db->execute($sth, $data);
+     * </code>
      *
      * Use backslashes to escape placeholder characters if you don't want
      * them to be interpreted as placeholders:
@@ -766,12 +792,12 @@
      *
      * {@internal ibase and oci8 have their own prepare() methods.}}
      *
-     * @param string $query query to be prepared
+     * @param string $query  the query to be prepared
      *
-     * @return mixed DB statement resource on success. DB_Error on failure.
+     * @return mixed  DB statement resource on success. A DB_Error object
+     *                 on failure.
      *
      * @see DB_common::execute()
-     * @access public
      */
     function prepare($query)
     {
@@ -811,19 +837,27 @@
     // {{{ autoPrepare()
 
     /**
-     * Automaticaly generate an insert or update query and pass it to prepare()
+     * Automaticaly generates an insert or update query and pass it to prepare()
      *
-     * @param  string   $table        name of the table
-     * @param  array    $table_fields ordered array containing the fields names
-     * @param  int      $mode         type of query to make (DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE)
-     * @param  string   $where        in case of update queries, this string will be put after the sql WHERE statement
-     * @return resource handle for the query
-     * @see DB_common::prepare(), DB_common::buildManipSQL()
-     * @access public
+     * @param string $table         the table name
+     * @param array  $table_fields  the array of field names
+     * @param int    $mode          a type of query to make:
+     *                               DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
+     * @param string $where         for update queries: the WHERE clause to
+     *                               append to the SQL statement.  Don't
+     *                               include the "WHERE" keyword.
+     *
+     * @return resource  the query handle
+     *
+     * @uses DB_common::prepare(), DB_common::buildManipSQL()
      */
-    function autoPrepare($table, $table_fields, $mode = DB_AUTOQUERY_INSERT, $where = false)
+    function autoPrepare($table, $table_fields, $mode = DB_AUTOQUERY_INSERT,
+                         $where = false)
     {
         $query = $this->buildManipSQL($table, $table_fields, $mode, $where);
+        if (DB::isError($query)) {
+            return $query;
+        }
         return $this->prepare($query);
     }
 
@@ -831,21 +865,33 @@
     // {{{ autoExecute()
 
     /**
-     * Automaticaly generate an insert or update query and call prepare()
+     * Automaticaly generates an insert or update query and call prepare()
      * and execute() with it
      *
-     * @param  string $table         name of the table
-     * @param  array  $fields_values assoc ($key=>$value) where $key is a field name and $value its value
-     * @param  int    $mode          type of query to make (DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE)
-     * @param  string $where         in case of update queries, this string will be put after the sql WHERE statement
-     * @return mixed  a new DB_Result or a DB_Error when fail
-     * @see DB_common::autoPrepare(), DB_common::buildManipSQL()
-     * @access public
+     * @param string $table         the table name
+     * @param array  $fields_values the associative array where $key is a
+     *                               field name and $value its value
+     * @param int    $mode          a type of query to make:
+     *                               DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
+     * @param string $where         for update queries: the WHERE clause to
+     *                               append to the SQL statement.  Don't
+     *                               include the "WHERE" keyword.
+     *
+     * @return mixed  a new DB_result object for successful SELECT queries
+     *                 or DB_OK for successul data manipulation queries.
+     *                 A DB_Error object on failure.
+     *
+     * @uses DB_common::autoPrepare(), DB_common::execute()
      */
-    function autoExecute($table, $fields_values, $mode = DB_AUTOQUERY_INSERT, $where = false)
+    function autoExecute($table, $fields_values, $mode = DB_AUTOQUERY_INSERT,
+                         $where = false)
     {
-        $sth = $this->autoPrepare($table, array_keys($fields_values), $mode, $where);
-        $ret =& $this->execute($sth, array_values($fields_values));
+        $sth = $this->autoPrepare($table, array_keys($fields_values), $mode,
+                                  $where);
+        if (DB::isError($sth)) {
+            return $sth;
+        }
+        $ret = $this->execute($sth, array_values($fields_values));
         $this->freePrepared($sth);
         return $ret;
 
@@ -855,25 +901,39 @@
     // {{{ buildManipSQL()
 
     /**
-     * Make automaticaly an sql query for prepare()
+     * Produces an SQL query string for autoPrepare()
      *
-     * Example : buildManipSQL('table_sql', array('field1', 'field2', 'field3'), DB_AUTOQUERY_INSERT)
-     *           will return the string : INSERT INTO table_sql (field1,field2,field3) VALUES (?,?,?)
-     * NB : - This belongs more to a SQL Builder class, but this is a simple facility
-     *      - Be carefull ! If you don't give a $where param with an UPDATE query, all
-     *        the records of the table will be updated !
+     * Example:
+     * <pre>
+     * buildManipSQL('table_sql', array('field1', 'field2', 'field3'),
+     *               DB_AUTOQUERY_INSERT);
+     * </pre>
      *
-     * @param  string $table        name of the table
-     * @param  array  $table_fields ordered array containing the fields names
-     * @param  int    $mode         type of query to make (DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE)
-     * @param  string $where        in case of update queries, this string will be put after the sql WHERE statement
-     * @return string sql query for prepare()
-     * @access public
+     * That returns
+     * <samp>
+     * INSERT INTO table_sql (field1,field2,field3) VALUES (?,?,?)
+     * </samp>
+     *
+     * NOTES:
+     *   - This belongs more to a SQL Builder class, but this is a simple
+     *     facility.
+     *   - Be carefull! If you don't give a $where param with an UPDATE
+     *     query, all the records of the table will be updated!
+     *
+     * @param string $table         the table name
+     * @param array  $table_fields  the array of field names
+     * @param int    $mode          a type of query to make:
+     *                               DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
+     * @param string $where         for update queries: the WHERE clause to
+     *                               append to the SQL statement.  Don't
+     *                               include the "WHERE" keyword.
+     *
+     * @return string  the sql query for autoPrepare()
      */
     function buildManipSQL($table, $table_fields, $mode, $where = false)
     {
         if (count($table_fields) == 0) {
-            $this->raiseError(DB_ERROR_NEED_MORE_DATA);
+            return $this->raiseError(DB_ERROR_NEED_MORE_DATA);
         }
         $first = true;
         switch ($mode) {
@@ -907,7 +967,7 @@
                 }
                 return $sql;
             default:
-                $this->raiseError(DB_ERROR_SYNTAX);
+                return $this->raiseError(DB_ERROR_SYNTAX);
         }
     }
 
@@ -918,31 +978,32 @@
      * Executes a DB statement prepared with prepare()
      *
      * Example 1.
-     * <code> <?php
-     * $sth = $dbh->prepare('INSERT INTO tbl (a, b, c) VALUES (?, !, &)');
+     * <code>
+     * $sth = $db->prepare('INSERT INTO tbl (a, b, c) VALUES (?, !, &)');
      * $data = array(
      *     "John's text",
      *     "'it''s good'",
      *     'filename.txt'
      * );
-     * $res =& $dbh->execute($sth, $data);
-     * ?></code>
+     * $res = $db->execute($sth, $data);
+     * </code>
      *
-     * @param resource $stmt a DB statement resource returned from prepare()
-     * @param mixed    $data array, string or numeric data to be used in
-     *                      execution of the statement.  Quantity of items
-     *                      passed must match quantity of placeholders in
-     *                      query:  meaning 1 placeholder for non-array
-     *                      parameters or 1 placeholder per array element.
+     * @param resource $stmt  a DB statement resource returned from prepare()
+     * @param mixed    $data  array, string or numeric data to be used in
+     *                         execution of the statement.  Quantity of items
+     *                         passed must match quantity of placeholders in
+     *                         query:  meaning 1 placeholder for non-array
+     *                         parameters or 1 placeholder per array element.
      *
-     * @return object a new DB_Result or a DB_Error when fail
+     * @return mixed  a new DB_result object for successful SELECT queries
+     *                 or DB_OK for successul data manipulation queries.
+     *                 A DB_Error object on failure.
      *
      * {@internal ibase and oci8 have their own execute() methods.}}
      *
      * @see DB_common::prepare()
-     * @access public
      */
-    function execute($stmt, $data = array())
+    function &execute($stmt, $data = array())
     {
         $realquery = $this->executeEmulateQuery($stmt, $data);
         if (DB::isError($realquery)) {
@@ -950,7 +1011,7 @@
         }
         $result = $this->simpleQuery($realquery);
 
-        if (DB::isError($result) || $result === DB_OK) {
+        if ($result === DB_OK || DB::isError($result)) {
             return $result;
         } else {
             $tmp = new DB_result($this, $result);
@@ -962,26 +1023,26 @@
     // {{{ executeEmulateQuery()
 
     /**
-     * Emulates the execute statement, when not supported
+     * Emulates executing prepared statements if the DBMS not support them
      *
-     * @param resource $stmt a DB statement resource returned from execute()
-     * @param mixed    $data array, string or numeric data to be used in
-     *                      execution of the statement.  Quantity of items
-     *                      passed must match quantity of placeholders in
-     *                      query:  meaning 1 placeholder for non-array
-     *                      parameters or 1 placeholder per array element.
+     * @param resource $stmt  a DB statement resource returned from execute()
+     * @param mixed    $data  array, string or numeric data to be used in
+     *                         execution of the statement.  Quantity of items
+     *                         passed must match quantity of placeholders in
+     *                         query:  meaning 1 placeholder for non-array
+     *                         parameters or 1 placeholder per array element.
      *
-     * @return mixed a string containing the real query run when emulating
-     *               prepare/execute.  A DB error code is returned on failure.
+     * @return mixed  a string containing the real query run when emulating
+     *                 prepare/execute.  A DB_Error object on failure.
      *
+     * @access protected
      * @see DB_common::execute()
-     * @access private
      */
     function executeEmulateQuery($stmt, $data = array())
     {
-        if (!is_array($data)) {
-            $data = array($data);
-        }
+        $stmt = (int)$stmt;
+        $data = (array)$data;
+        $this->last_parameters = $data;
 
         if (count($this->prepare_types[$stmt]) != count($data)) {
             $this->last_query = $this->prepared_queries[$stmt];
@@ -1015,8 +1076,7 @@
     // {{{ executeMultiple()
 
     /**
-     * This function does several execute() calls on the same
-     * statement handle
+     * Performs several execute() calls on the same statement handle
      *
      * $data must be an array indexed numerically
      * from 0, one execute call is done for every "row" in the array.
@@ -1024,19 +1084,18 @@
      * If an error occurs during execute(), executeMultiple() does not
      * execute the unfinished rows, but rather returns that error.
      *
-     * @param resource $stmt query handle from prepare()
-     * @param array    $data numeric array containing the
-     *                       data to insert into the query
+     * @param resource $stmt  query handle from prepare()
+     * @param array    $data  numeric array containing the
+     *                         data to insert into the query
      *
-     * @return mixed DB_OK or DB_Error
+     * @return int  DB_OK on success.  A DB_Error object on failure.
      *
      * @see DB_common::prepare(), DB_common::execute()
-     * @access public
      */
     function executeMultiple($stmt, $data)
     {
         foreach ($data as $value) {
-            $res =& $this->execute($stmt, $value);
+            $res = $this->execute($stmt, $value);
             if (DB::isError($res)) {
                 return $res;
             }
@@ -1048,14 +1107,20 @@
     // {{{ freePrepared()
 
     /**
-     * Free the resource used in a prepared query
+     * Frees the internal resources associated with a prepared query
      *
-     * @param $stmt The resurce returned by the prepare() function
+     * @param resource $stmt           the prepared statement's PHP resource
+     * @param bool     $free_resource  should the PHP resource be freed too?
+     *                                  Use false if you need to get data
+     *                                  from the result set later.
+     *
+     * @return bool  TRUE on success, FALSE if $result is invalid
+     *
      * @see DB_common::prepare()
      */
-    function freePrepared($stmt)
+    function freePrepared($stmt, $free_resource = true)
     {
-        // Free the internal prepared vars
+        $stmt = (int)$stmt;
         if (isset($this->prepare_tokens[$stmt])) {
             unset($this->prepare_tokens[$stmt]);
             unset($this->prepare_types[$stmt]);
@@ -1069,19 +1134,20 @@
     // {{{ modifyQuery()
 
     /**
-     * This method is used by backends to alter queries for various
-     * reasons
+     * Changes a query string for various DBMS specific reasons
      *
-     * It is defined here to assure that all implementations
-     * have this method defined.
+     * It is defined here to ensure all drivers have this method available.
      *
-     * @param string $query query to modify
+     * @param string $query  the query string to modify
      *
-     * @return the new (modified) query
+     * @return string  the modified query string
      *
-     * @access private
+     * @access protected
+     * @see DB_mysql::modifyQuery(), DB_oci8::modifyQuery(),
+     *      DB_sqlite::modifyQuery()
      */
-    function modifyQuery($query) {
+    function modifyQuery($query)
+    {
         return $query;
     }
 
@@ -1089,17 +1155,25 @@
     // {{{ modifyLimitQuery()
 
     /**
-     * This method is used by backends to alter limited queries
+     * Adds LIMIT clauses to a query string according to current DBMS standards
      *
-     * @param string  $query query to modify
-     * @param integer $from  the row to start to fetching
-     * @param integer $count the numbers of rows to fetch
+     * It is defined here to assure that all implementations
+     * have this method defined.
      *
-     * @return the new (modified) query
+     * @param string $query   the query to modify
+     * @param int    $from    the row to start to fetching (0 = the first row)
+     * @param int    $count   the numbers of rows to fetch
+     * @param mixed  $params  array, string or numeric data to be used in
+     *                         execution of the statement.  Quantity of items
+     *                         passed must match quantity of placeholders in
+     *                         query:  meaning 1 placeholder for non-array
+     *                         parameters or 1 placeholder per array element.
      *
-     * @access private
+     * @return string  the query string with LIMIT clauses added
+     *
+     * @access protected
      */
-    function modifyLimitQuery($query, $from, $count)
+    function modifyLimitQuery($query, $from, $count, $params = array())
     {
         return $query;
     }
@@ -1108,25 +1182,24 @@
     // {{{ query()
 
     /**
-     * Send a query to the database and return any results with a
-     * DB_result object
+     * Sends a query to the database server
      *
      * The query string can be either a normal statement to be sent directly
      * to the server OR if <var>$params</var> are passed the query can have
      * placeholders and it will be passed through prepare() and execute().
      *
-     * @param string $query  the SQL query or the statement to prepare
-     * @param mixed  $params array, string or numeric data to be used in
-     *                       execution of the statement.  Quantity of items
-     *                       passed must match quantity of placeholders in
-     *                       query:  meaning 1 placeholder for non-array
-     *                       parameters or 1 placeholder per array element.
+     * @param string $query   the SQL query or the statement to prepare
+     * @param mixed  $params  array, string or numeric data to be used in
+     *                         execution of the statement.  Quantity of items
+     *                         passed must match quantity of placeholders in
+     *                         query:  meaning 1 placeholder for non-array
+     *                         parameters or 1 placeholder per array element.
      *
-     * @return mixed a DB_result object or DB_OK on success, a DB
-     *                error on failure
+     * @return mixed  a new DB_result object for successful SELECT queries
+     *                 or DB_OK for successul data manipulation queries.
+     *                 A DB_Error object on failure.
      *
      * @see DB_result, DB_common::prepare(), DB_common::execute()
-     * @access public
      */
     function &query($query, $params = array())
     {
@@ -1136,14 +1209,15 @@
                 return $sth;
             }
             $ret = $this->execute($sth, $params);
-            $this->freePrepared($sth);
+            $this->freePrepared($sth, false);
             return $ret;
         } else {
+            $this->last_parameters = array();
             $result = $this->simpleQuery($query);
-            if (DB::isError($result) || $result === DB_OK) {
+            if ($result === DB_OK || DB::isError($result)) {
                 return $result;
             } else {
-                $tmp =& new DB_result($this, $result);
+                $tmp = new DB_result($this, $result);
                 return $tmp;
             }
         }
@@ -1153,25 +1227,29 @@
     // {{{ limitQuery()
 
     /**
-     * Generates a limited query
+     * Generates and executes a LIMIT query
      *
-     * @param string  $query  query
-     * @param integer $from   the row to start to fetching
-     * @param integer $count  the numbers of rows to fetch
-     * @param array   $params required for a statement
+     * @param string $query   the query
+     * @param intr   $from    the row to start to fetching (0 = the first row)
+     * @param int    $count   the numbers of rows to fetch
+     * @param mixed  $params  array, string or numeric data to be used in
+     *                         execution of the statement.  Quantity of items
+     *                         passed must match quantity of placeholders in
+     *                         query:  meaning 1 placeholder for non-array
+     *                         parameters or 1 placeholder per array element.
      *
-     * @return mixed a DB_Result object, DB_OK or a DB_Error
-     *
-     * @access public
+     * @return mixed  a new DB_result object for successful SELECT queries
+     *                 or DB_OK for successul data manipulation queries.
+     *                 A DB_Error object on failure.
      */
     function &limitQuery($query, $from, $count, $params = array())
     {
-        $query = $this->modifyLimitQuery($query, $from, $count);
+        $query = $this->modifyLimitQuery($query, $from, $count, $params);
         if (DB::isError($query)){
             return $query;
         }
-        $result =& $this->query($query, $params);
-        if (is_a($result, 'DB_result')) {
+        $result = $this->query($query, $params);
+        if (is_object($result) && is_a($result, 'DB_result')) {
             $result->setOption('limit_from', $from);
             $result->setOption('limit_count', $count);
         }
@@ -1182,34 +1260,33 @@
     // {{{ getOne()
 
     /**
-     * Fetch the first column of the first row of data returned from
-     * a query
+     * Fetches the first column of the first row from a query result
      *
      * Takes care of doing the query and freeing the results when finished.
      *
-     * @param string $query  the SQL query
-     * @param mixed  $params array, string or numeric data to be used in
-     *                       execution of the statement.  Quantity of items
-     *                       passed must match quantity of placeholders in
-     *                       query:  meaning 1 placeholder for non-array
-     *                       parameters or 1 placeholder per array element.
+     * @param string $query   the SQL query
+     * @param mixed  $params  array, string or numeric data to be used in
+     *                         execution of the statement.  Quantity of items
+     *                         passed must match quantity of placeholders in
+     *                         query:  meaning 1 placeholder for non-array
+     *                         parameters or 1 placeholder per array element.
      *
-     * @return mixed the returned value of the query.  DB_Error on failure.
-     *
-     * @access public
+     * @return mixed  the returned value of the query.
+     *                 A DB_Error object on failure.
      */
     function &getOne($query, $params = array())
     {
-        settype($params, 'array');
+        $params = (array)$params;
+        // modifyLimitQuery() would be nice here, but it causes BC issues
         if (sizeof($params) > 0) {
             $sth = $this->prepare($query);
             if (DB::isError($sth)) {
                 return $sth;
             }
-            $res =& $this->execute($sth, $params);
+            $res = $this->execute($sth, $params);
             $this->freePrepared($sth);
         } else {
-            $res =& $this->query($query);
+            $res = $this->query($query);
         }
 
         if (DB::isError($res)) {
@@ -1230,24 +1307,22 @@
     // {{{ getRow()
 
     /**
-     * Fetch the first row of data returned from a query
+     * Fetches the first row of data returned from a query result
      *
      * Takes care of doing the query and freeing the results when finished.
      *
-     * @param string $query  the SQL query
-     * @param array  $params array to be used in execution of the statement.
-     *                       Quantity of array elements must match quantity
-     *                       of placeholders in query.  This function does
-     *                       NOT support scalars.
-     * @param int $fetchmode the fetch mode to use
+     * @param string $query   the SQL query
+     * @param mixed  $params  array, string or numeric data to be used in
+     *                         execution of the statement.  Quantity of items
+     *                         passed must match quantity of placeholders in
+     *                         query:  meaning 1 placeholder for non-array
+     *                         parameters or 1 placeholder per array element.
+     * @param int $fetchmode  the fetch mode to use
      *
-     * @return array the first row of results as an array indexed from
-     *               0, or a DB error code.
-     *
-     * @access public
+     * @return array  the first row of results as an array.
+     *                 A DB_Error object on failure.
      */
-    function &getRow($query,
-                     $params = array(),
+    function &getRow($query, $params = array(),
                      $fetchmode = DB_FETCHMODE_DEFAULT)
     {
         // compat check, the params and fetchmode parameters used to
@@ -1266,16 +1341,16 @@
                 $params = array();
             }
         }
-
+        // modifyLimitQuery() would be nice here, but it causes BC issues
         if (sizeof($params) > 0) {
             $sth = $this->prepare($query);
             if (DB::isError($sth)) {
                 return $sth;
             }
-            $res =& $this->execute($sth, $params);
+            $res = $this->execute($sth, $params);
             $this->freePrepared($sth);
         } else {
-            $res =& $this->query($query);
+            $res = $this->query($query);
         }
 
         if (DB::isError($res)) {
@@ -1297,27 +1372,25 @@
     // {{{ getCol()
 
     /**
-     * Fetch a single column from a result set and return it as an
+     * Fetches a single column from a query result and returns it as an
      * indexed array
      *
-     * @param string $query the SQL query
-     * @param mixed  $col   which column to return (integer [column number,
-     *                       starting at 0] or string [column name])
-     * @param mixed $params array, string or numeric data to be used in
-     *                       execution of the statement.  Quantity of items
-     *                       passed must match quantity of placeholders in
-     *                       query:  meaning 1 placeholder for non-array
-     *                       parameters or 1 placeholder per array element.
+     * @param string $query   the SQL query
+     * @param mixed  $col     which column to return (integer [column number,
+     *                         starting at 0] or string [column name])
+     * @param mixed  $params  array, string or numeric data to be used in
+     *                         execution of the statement.  Quantity of items
+     *                         passed must match quantity of placeholders in
+     *                         query:  meaning 1 placeholder for non-array
+     *                         parameters or 1 placeholder per array element.
      *
-     * @return array an indexed array with the data from the first
-     *                row at index 0, or a DB error code
+     * @return array  the results as an array.  A DB_Error object on failure.
      *
      * @see DB_common::query()
-     * @access public
      */
     function &getCol($query, $col = 0, $params = array())
     {
-        settype($params, 'array');
+        $params = (array)$params;
         if (sizeof($params) > 0) {
             $sth = $this->prepare($query);
 
@@ -1325,10 +1398,10 @@
                 return $sth;
             }
 
-            $res =& $this->execute($sth, $params);
+            $res = $this->execute($sth, $params);
             $this->freePrepared($sth);
         } else {
-            $res =& $this->query($query);
+            $res = $this->query($query);
         }
 
         if (DB::isError($res)) {
@@ -1336,10 +1409,18 @@
         }
 
         $fetchmode = is_int($col) ? DB_FETCHMODE_ORDERED : DB_FETCHMODE_ASSOC;
-        $ret = array();
 
-        while (is_array($row = $res->fetchRow($fetchmode))) {
-            $ret[] = $row[$col];
+        if (!is_array($row = $res->fetchRow($fetchmode))) {
+            $ret = array();
+        } else {
+            if (!array_key_exists($col, $row)) {
+                $ret = $this->raiseError(DB_ERROR_NOSUCHFIELD);
+            } else {
+                $ret = array($row[$col]);
+                while (is_array($row = $res->fetchRow($fetchmode))) {
+                    $ret[] = $row[$col];
+                }
+            }
         }
 
         $res->free();
@@ -1355,7 +1436,7 @@
     // {{{ getAssoc()
 
     /**
-     * Fetch the entire result set of a query and return it as an
+     * Fetches an entire query result and returns it as an
      * associative array using the first column as the key
      *
      * If the result set contains more than two columns, the value
@@ -1416,32 +1497,32 @@
      * Keep in mind that database functions in PHP usually return string
      * values for results regardless of the database's internal type.
      *
-     * @param string  $query       the SQL query
-     * @param boolean $force_array used only when the query returns
+     * @param string $query        the SQL query
+     * @param bool   $force_array  used only when the query returns
      *                              exactly two columns.  If true, the values
      *                              of the returned array will be one-element
      *                              arrays instead of scalars.
-     * @param mixed $params array, string or numeric data to be used in
-     *                        execution of the statement.  Quantity of items
-     *                        passed must match quantity of placeholders in
-     *                        query:  meaning 1 placeholder for non-array
-     *                        parameters or 1 placeholder per array element.
-     * @param boolean $group if true, the values of the returned array
-     *                        is wrapped in another array.  If the same
-     *                        key value (in the first column) repeats
-     *                        itself, the values will be appended to
-     *                        this array instead of overwriting the
-     *                        existing values.
+     * @param mixed  $params       array, string or numeric data to be used in
+     *                              execution of the statement.  Quantity of
+     *                              items passed must match quantity of
+     *                              placeholders in query:  meaning 1
+     *                              placeholder for non-array parameters or
+     *                              1 placeholder per array element.
+     * @param int   $fetchmode     the fetch mode to use
+     * @param bool  $group         if true, the values of the returned array
+     *                              is wrapped in another array.  If the same
+     *                              key value (in the first column) repeats
+     *                              itself, the values will be appended to
+     *                              this array instead of overwriting the
+     *                              existing values.
      *
-     * @return array associative array with results from the query.
-     *                DB Error on failure.
-     *
-     * @access public
+     * @return array  the associative array containing the query results.
+     *                A DB_Error object on failure.
      */
     function &getAssoc($query, $force_array = false, $params = array(),
                        $fetchmode = DB_FETCHMODE_DEFAULT, $group = false)
     {
-        settype($params, 'array');
+        $params = (array)$params;
         if (sizeof($params) > 0) {
             $sth = $this->prepare($query);
 
@@ -1449,10 +1530,10 @@
                 return $sth;
             }
 
-            $res =& $this->execute($sth, $params);
+            $res = $this->execute($sth, $params);
             $this->freePrepared($sth);
         } else {
-            $res =& $this->query($query);
+            $res = $this->query($query);
         }
 
         if (DB::isError($res)) {
@@ -1464,7 +1545,7 @@
         $cols = $res->numCols();
 
         if ($cols < 2) {
-            $tmp =& $this->raiseError(DB_ERROR_TRUNCATED);
+            $tmp = $this->raiseError(DB_ERROR_TRUNCATED);
             return $tmp;
         }
 
@@ -1532,21 +1613,24 @@
     // {{{ getAll()
 
     /**
-     * Fetch all the rows returned from a query
+     * Fetches all of the rows from a query result
      *
-     * @param string $query  the SQL query
-     * @param array  $params array to be used in execution of the statement.
-     *                       Quantity of array elements must match quantity
-     *                       of placeholders in query.  This function does
-     *                       NOT support scalars.
-     * @param int $fetchmode the fetch mode to use
+     * @param string $query      the SQL query
+     * @param mixed  $params     array, string or numeric data to be used in
+     *                            execution of the statement.  Quantity of
+     *                            items passed must match quantity of
+     *                            placeholders in query:  meaning 1
+     *                            placeholder for non-array parameters or
+     *                            1 placeholder per array element.
+     * @param int    $fetchmode  the fetch mode to use:
+     *                            + DB_FETCHMODE_ORDERED
+     *                            + DB_FETCHMODE_ASSOC
+     *                            + DB_FETCHMODE_ORDERED | DB_FETCHMODE_FLIPPED
+     *                            + DB_FETCHMODE_ASSOC | DB_FETCHMODE_FLIPPED
      *
-     * @return array an nested array.  DB error on failure.
-     *
-     * @access public
+     * @return array  the nested array.  A DB_Error object on failure.
      */
-    function &getAll($query,
-                     $params = array(),
+    function &getAll($query, $params = array(),
                      $fetchmode =...
 
[truncated message content]

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

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

Revision: 8494
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8494&view=rev
Author:   vargenau
Date:     2012-11-20 09:06:44 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Update to PEAR Cache-1.5.6

Modified Paths:
--------------
    trunk/lib/pear/Cache/Container/db.php
    trunk/lib/pear/Cache/Container/file.php
    trunk/lib/pear/Cache/Container/trifile.php
    trunk/lib/pear/Cache/Container.php
    trunk/lib/pear/Cache/Error.php
    trunk/lib/pear/Cache/Graphics.php

Added Paths:
-----------
    trunk/lib/pear/Cache/Application.php
    trunk/lib/pear/Cache/Cache.php
    trunk/lib/pear/Cache/Container/dbx.php
    trunk/lib/pear/Cache/Container/mdb.php
    trunk/lib/pear/Cache/Container/mdb_cache_schema.xml
    trunk/lib/pear/Cache/Container/msession.php
    trunk/lib/pear/Cache/Container/phplib.php
    trunk/lib/pear/Cache/Container/shm.php
    trunk/lib/pear/Cache/Function.php
    trunk/lib/pear/Cache/HTTP_Request.php
    trunk/lib/pear/Cache/Output.php
    trunk/lib/pear/Cache/OutputCompression.php

Added: trunk/lib/pear/Cache/Application.php
===================================================================
--- trunk/lib/pear/Cache/Application.php	                        (rev 0)
+++ trunk/lib/pear/Cache/Application.php	2012-11-20 09:06:44 UTC (rev 8494)
@@ -0,0 +1,179 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PEAR :: Cache                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license,      |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/2_02.txt.                                 |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | li...@ph... so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Richard Heyes <ri...@ph...>                         |
+// +----------------------------------------------------------------------+
+//
+// $Id: Application.php 178289 2005-01-26 09:47:28Z dufuz $
+
+require_once 'Cache.php';
+
+// Application level variables
+//
+// Purpose
+// Variables that are persisent across all user sessions,
+// not just a specific user ala normal sessions.
+//
+// Usage:
+//
+// Example 1:
+//
+// $app  =& new Cache_Application();
+// $_APP =& $app->getData();
+//
+// In this case the $_APP variable is akin to the $_SESSION variable.
+// If you add/remove stuff, it will be reflected in the next request
+// (of any user).
+//
+// Example 2:
+//
+// $foo = 'Some data';
+// $bar = 'Some other data';
+//
+// $app =& new Cache_Application();
+// $app->register('foo');
+// $app->register('bar', $bar); 
+//
+// $foo = 'Different data';
+//
+// In this case the variables are registered with the register() function.
+// This is akin to session_register().
+//
+// As with session_register(), the contents of the variable at the *end* of the
+// request is registered and not at the point of registration. Therefore in this
+// example, for the $foo variable, the string 'Different data' is stored and not 
+// 'Some data'. The exception to this rule is if you use the second argument to
+// register() as in the second call to it above. This will cause the data supplied
+// in the second argument to be stored and not the contents at the end of the request.
+//
+// Note: If you use this method with register_globals turned on, the variables will be
+//       automatically globalled upon startup, (ie. when you create the object).
+//
+// Note: If you register a variable that is not set when the script finishes, it will
+//       registered as null.
+//
+//
+// *** You are strongly recommended to use only one method of the two above. ***
+//
+// (In fact if you use the register() function with register_globals Off, you have to
+//  use the $_APP method to get at the data).
+
+class Cache_Application extends Cache
+{
+
+    var $data;
+    var $id;
+    var $group;
+    var $registered_vars;
+
+    /**
+    * Constructor
+    *
+    * @param    string  Name of container class
+    * @param    array   Array with container class options
+    */
+    function Cache_Application($container = 'file', $container_options = array('cache_dir' => '/tmp/', 'filename_prefix' => 'cache_'), $id = 'application_var', $group = 'application_cache')
+    {
+        $this->id    = $id;
+        $this->group = $group;
+        $this->registered_vars = array();
+
+        $this->Cache($container, $container_options);
+        $this->data = $this->isCached($this->id, $this->group) ? unserialize($this->get($this->id, $this->group)) : array();
+
+        // If register_globals on, global all registered variables
+        if (ini_get('register_globals') && is_array($this->data)) {
+            foreach ($this->data as $key => $value) {
+                global $$key;
+                $$key = $value;
+            }
+        }
+    }
+
+    /**
+    * Destructor
+    *
+    * Gets values of all registered variables and stores them. Then calls save() to
+    * write data away.
+    */
+    function _Cache_Application()
+    {
+        // Get contents of all registered variables
+        if (is_array($this->registered_vars) && !empty($this->registered_vars)) {
+            foreach ($this->registered_vars as $varname) {
+                global $$varname;
+                $this->data[$varname] = $$varname;
+            }
+        }
+
+        // Save the data
+        $this->save($this->id, serialize($this->data), 0, $this->group);
+    }
+
+    /**
+    * register()
+    *
+    * Registers a variable to be stored.
+    *
+    * @param    string  Name of variable to register
+    * @param    mixed   Optional data to store
+    */
+    function register($varname, $data = null)
+    {
+        if (isset($data)) {
+            $this->data[$varname] = $data;
+        } else {
+            $this->registered_vars[] = $varname;
+        }
+    }
+
+    /**
+    * unregister()
+    *
+    * Unregisters a variable from being stored.
+    *
+    * @param    string  Name of variable to unregister
+    */
+    function unregister($varname)
+    {
+        if (isset($this->data[$varname])) {
+            unset($this->data[$varname]);
+        }
+    }
+
+    /**
+    * clear()
+    *
+    * Removes all stored data
+    */
+    function clear()
+    {
+        $this->data = array();
+    }
+
+    /**
+    * getData()
+    *
+    * Use this to get a reference to the data to manipulate
+    * in calling script. Eg. $_APP =& $obj->getData();
+    *
+    * @return mixed   A reference to the data
+    */
+    function &getData()
+    {
+        return $this->data;
+    }
+}
+?>
\ No newline at end of file

Added: trunk/lib/pear/Cache/Cache.php
===================================================================
--- trunk/lib/pear/Cache/Cache.php	                        (rev 0)
+++ trunk/lib/pear/Cache/Cache.php	2012-11-20 09:06:44 UTC (rev 8494)
@@ -0,0 +1,368 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PEAR :: Cache                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/2_02.txt.                                 |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | li...@ph... so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Ulf Wendel <ulf...@ph...>                           |
+// |          Sebastian Bergmann <sb...@se...>               |
+// +----------------------------------------------------------------------+
+//
+// $Id: Cache.php 267047 2008-10-07 08:58:46Z dufuz $
+
+require_once 'PEAR.php';
+require_once 'Cache/Error.php';
+
+/**
+* Cache is a base class for cache implementations.
+*
+* The pear cache module is a generic data cache which can be used to
+* cache script runs. The idea behind the cache is quite simple. If you have
+* the same input parameters for whatever tasks/algorithm you use you'll
+* usually get the same output. So why not caching templates, functions calls,
+* graphic generation etc. Caching certain actions e.g. XSLT tranformations
+* saves you lots of time.
+*
+* The design of the cache reminds of PHPLibs session implementation. A
+* (PHPLib: session) controller uses storage container (PHPLib: ct_*.inc) to save
+* certain data (PHPLib: session data). In contrast to the session stuff it's up to
+* you to generate an ID for the data to cache. If you're using the output cache
+* you might use the script name as a seed for cache::generateID(), if your using the
+* function cache you'd use an array with all function parameters.
+*
+* Usage example of the generic data cache:
+*
+* require_once('Cache.php');
+*
+* $cache = new Cache('file', array('cache_dir' => 'cache/') );
+* $id = $cache->generateID('testentry');
+*
+* if ($data = $cache->get($id)) {
+*    print "Cache hit.<br>Data: $data";
+*
+* } else {
+*   $data = 'data of any kind';
+*   $cache->save($id, $data);
+*   print 'Cache miss.<br>';
+* }
+*
+* WARNING: No File/DB-Table-Row locking is implemented yet,
+*          it's possible, that you get corrupted data-entries under
+*          bad circumstances  (especially with the file container)
+*
+* @author   Ulf Wendel <ulf...@ph...>
+* @version  $Id: Cache.php 267047 2008-10-07 08:58:46Z dufuz $
+* @package  Cache
+* @access   public
+*/
+class Cache extends PEAR
+{
+
+    /**
+    * Enables / disables caching.
+    *
+    * TODO: Add explanation what this is good for.
+    *
+    * @var      boolean
+    * @access   private
+    */
+    var $caching = true;
+
+    /**
+    * Garbage collection: probability in seconds
+    *
+    * If set to a value above 0 a garbage collection will
+    * flush all cache entries older than the specified number
+    * of seconds.
+    *
+    * @var      integer
+    * @see      $gc_probability, $gc_maxlifetime
+    * @access   public
+    */
+    var $gc_time  = 1;
+
+    /**
+    * Garbage collection: probability in percent
+    *
+    * TODO: Add an explanation.
+    *
+    * @var      integer     0 => never
+    * @see      $gc_time, $gc_maxlifetime
+    * @access   public
+    */
+    var $gc_probability = 1;
+
+    /**
+    * Garbage collection: delete all entries not use for n seconds.
+    *
+    * Default is one day, 60 * 60 * 24 = 86400 seconds.
+    *
+    * @var  integer
+    * @see  $gc_probability, $gc_time
+    */
+    var $gc_maxlifetime = 86400;
+
+    /**
+    * Storage container object.
+    *
+    * @var  object Cache_Container
+    */
+    var $container;
+
+    //
+    // public methods
+    //
+
+    /**
+    *
+    * @param    string  Name of container class
+    * @param    array   Array with container class options
+    */
+    function Cache($container, $container_options = '')
+    {
+        $this->PEAR();
+        $container = strtolower($container);
+        $container_class = 'Cache_Container_' . $container;
+        $container_classfile = 'Cache/Container/' . $container . '.php';
+
+        include_once $container_classfile;
+        $this->container = new $container_class($container_options);
+    }
+
+    //deconstructor
+    function _Cache()
+    {
+        $this->garbageCollection();
+    }
+
+    /**
+     * Returns the current caching state.
+     *
+     * @return  boolean     The current caching state.
+     * @access  public
+     */
+    function getCaching()
+    {
+        return $this->caching;
+    }
+
+    /**
+     * Enables or disables caching.
+     *
+     * @param   boolean     The new caching state.
+     * @access  public
+     */
+    function setCaching($state)
+    {
+        $this->caching = $state;
+    }
+
+    /**
+    * Returns the requested dataset it if exists and is not expired
+    *
+    * @param    string  dataset ID
+    * @param    string  cache group
+    * @return   mixed   cached data or null on failure
+    * @access   public
+    */
+    function get($id, $group = 'default')
+    {
+        if (!$this->caching) {
+            return '';
+        }
+
+        if ($this->isCached($id, $group) && !$this->isExpired($id, $group)) {
+            return $this->load($id, $group);
+        }
+        return null;
+    } // end func get
+
+    /**
+    * Stores the given data in the cache.
+    *
+    * @param    string  dataset ID used as cache identifier
+    * @param    mixed   data to cache
+    * @param    integer lifetime of the cached data in seconds - 0 for endless
+    * @param    string  cache group
+    * @return   boolean
+    * @access   public
+    */
+    function save($id, $data, $expires = 0, $group = 'default')
+    {
+        if (!$this->caching) {
+            return true;
+        }
+        return $this->extSave($id, $data, '',$expires, $group);
+    } // end func save
+
+    /**
+    * Stores a dataset with additional userdefined data.
+    *
+    * @param    string  dataset ID
+    * @param    mixed   data to store
+    * @param    string  additional userdefined data
+    * @param    mixed   userdefined expire date
+    * @param    string  cache group
+    * @return   boolean
+    * @throws   Cache_Error
+    * @access   public
+    * @see      getUserdata()
+    */
+    function extSave($id, $cachedata, $userdata, $expires = 0, $group = 'default')
+    {
+        if (!$this->caching) {
+            return true;
+        }
+        return $this->container->save($id, $cachedata, $expires, $group, $userdata);
+    } // end func extSave
+
+    /**
+    * Loads the given ID from the cache.
+    *
+    * @param    string  dataset ID
+    * @param    string  cache group
+    * @return   mixed   cached data or null on failure
+    * @access   public
+    */
+    function load($id, $group = 'default')
+    {
+        if (!$this->caching) {
+            return '';
+        }
+        return $this->container->load($id, $group);
+    } // end func load
+
+    /**
+    * Returns the userdata field of a cached data set.
+    *
+    * @param    string  dataset ID
+    * @param    string  cache group
+    * @return   string  userdata
+    * @access   public
+    * @see      extSave()
+    */
+    function getUserdata($id, $group = 'default')
+    {
+        if (!$this->caching) {
+            return '';
+        }
+        return $this->container->getUserdata($id, $group);
+    } // end func getUserdata
+
+    /**
+    * Removes the specified dataset from the cache.
+    *
+    * @param    string  dataset ID
+    * @param    string  cache group
+    * @return   boolean
+    * @access   public
+    */
+    function remove($id, $group = 'default')
+    {
+        if (!$this->caching) {
+            return true;
+        }
+        return $this->container->remove($id, $group);
+    } // end func remove
+
+    /**
+    * Flushes the cache - removes all data from it
+    *
+    * @param    string  cache group, if empty all groups will be flashed
+    * @return   integer number of removed datasets
+    */
+    function flush($group = 'default')
+    {
+        if (!$this->caching) {
+            return true;
+        }
+        return $this->container->flush($group);
+    } // end func flush
+
+    /**
+    * Checks if a dataset exists.
+    *
+    * Note: this does not say that the cached data is not expired!
+    *
+    * @param    string  dataset ID
+    * @param    string  cache group
+    * @return   boolean
+    * @access   public
+    */
+    function isCached($id, $group = 'default')
+    {
+        if (!$this->caching) {
+            return false;
+        }
+        return $this->container->isCached($id, $group);
+    } // end func isCached
+
+    /**
+    * Checks if a dataset is expired
+    *
+    * @param    string  dataset ID
+    * @param    string  cache group
+    * @param    integer maximum age for the cached data in seconds - 0 for endless
+    *                   If the cached data is older but the given lifetime it will
+    *                   be removed from the cache. You don't have to provide this
+    *                   argument if you call isExpired(). Every dataset knows
+    *                   it's expire date and will be removed automatically. Use
+    *                   this only if you know what you're doing...
+    * @return   boolean
+    * @access   public
+    */
+    function isExpired($id, $group = 'default', $max_age = 0)
+    {
+        if (!$this->caching) {
+            return true;
+        }
+        return $this->container->isExpired($id, $group, $max_age);
+    } // end func isExpired
+
+    /**
+    * Generates a "unique" ID for the given value
+    *
+    * This is a quick but dirty hack to get a "unique" ID for a any kind of variable.
+    * ID clashes might occur from time to time although they are extreme unlikely!
+    *
+    * @param    mixed   variable to generate a ID for
+    * @return   string  "unique" ID
+    * @access   public
+    */
+    function generateID($variable)
+    {
+        // WARNING: ID clashes are possible although unlikely
+        return md5(serialize($variable));
+    }
+
+    /**
+    * Calls the garbage collector of the storage object with a certain probability
+    *
+    * @param    boolean Force a garbage collection run?
+    * @see  $gc_probability, $gc_time
+    */
+    function garbageCollection($force = false)
+    {
+        static $last_run = 0;
+
+        if (!$this->caching) {
+            return;
+        }
+
+        // time and probability based
+        if (($force) || ($last_run && $last_run < time() + $this->gc_time) || (rand(1, 100) < $this->gc_probability)) {
+            $this->container->garbageCollection($this->gc_maxlifetime);
+            $last_run = time();
+        }
+    } // end func garbageCollection
+
+} // end class cache
+?>

Modified: trunk/lib/pear/Cache/Container/db.php
===================================================================
--- trunk/lib/pear/Cache/Container/db.php	2012-11-20 08:46:58 UTC (rev 8493)
+++ trunk/lib/pear/Cache/Container/db.php	2012-11-20 09:06:44 UTC (rev 8494)
@@ -16,6 +16,8 @@
 // |          Sebastian Bergmann <sb...@se...>               |
 // |          Chuck Hagenbuch <ch...@ho...>                           |
 // +----------------------------------------------------------------------+
+//
+// $Id: db.php 178288 2005-01-26 09:42:30Z dufuz $
 
 require_once 'DB.php';
 require_once 'Cache/Container.php';
@@ -37,23 +39,24 @@
 * For _MySQL_ you need this DB table:
 *
 * CREATE TABLE cache (
-*   id          CHAR(32) NOT NULL DEFAULT '',
-*   cachegroup  VARCHAR(127) NOT NULL DEFAULT '',
-*   cachedata   BLOB NOT NULL DEFAULT '',
-*   userdata    VARCHAR(255) NOT NULL DEFAUL '',
-*   expires     INT(9) NOT NULL DEFAULT 0,
+*   id          CHAR(32) NOT null DEFAULT '',
+*   cachegroup  VARCHAR(127) NOT null DEFAULT '',
+*   cachedata   BLOB NOT null DEFAULT '',
+*   userdata    VARCHAR(255) NOT null DEFAULT '',
+*   expires     INT(9) NOT null DEFAULT 0,
 *
-*   changed     TIMESTAMP(14) NOT NULL,
+*   changed     TIMESTAMP(14) NOT null,
 *
 *   INDEX (expires),
 *   PRIMARY KEY (id, cachegroup)
 * )
 *
 * @author   Sebastian Bergmann <sb...@se...>
-* @version
+* @version  $Id: db.php 178288 2005-01-26 09:42:30Z dufuz $
 * @package  Cache
 */
-class Cache_Container_db extends Cache_Container {
+class Cache_Container_db extends Cache_Container
+{
 
     /**
     * Name of the DB table to store caching data
@@ -84,15 +87,14 @@
 
         $this->setOptions($options,  array_merge($this->allowed_options, array('dsn', 'cache_table')));
 
-        if (!$this->dsn)
+        if (!$this->dsn) {
             return new Cache_Error('No dsn specified!', __FILE__, __LINE__);
-
+        }
         $this->db = DB::connect($this->dsn, true);
-        if (DB::isError($this->db)) {
+        if (PEAR::isError($this->db)) {
             return new Cache_Error('DB::connect failed: ' . DB::errorMessage($this->db), __FILE__, __LINE__);
-        } else {
-            $this->db->setFetchMode(DB_FETCHMODE_ASSOC);
         }
+        $this->db->setFetchMode(DB_FETCHMODE_ASSOC);
     }
 
     function fetch($id, $group)
@@ -105,15 +107,15 @@
 
         $res = $this->db->query($query);
 
-        if (DB::isError($res))
+        if (PEAR::isError($res)) {
             return new Cache_Error('DB::query failed: ' . DB::errorMessage($res), __FILE__, __LINE__);
-
+        }
         $row = $res->fetchRow();
-        if (is_array($row))
+        if (is_array($row)) {
             $data = array($row['expires'], $this->decode($row['cachedata']), $row['userdata']);
-        else
-            $data = array(NULL, NULL, NULL);
-
+        } else {
+            $data = array(null, null, null);
+        }
         // last used required by the garbage collection
         // WARNING: might be MySQL specific
         $query = sprintf("UPDATE %s SET changed = (NOW() + 0) WHERE id = '%s' AND cachegroup = '%s'",
@@ -124,9 +126,9 @@
 
         $res = $this->db->query($query);
 
-        if (DB::isError($res))
+        if (PEAR::isError($res)) {
             return new Cache_Error('DB::query failed: ' . DB::errorMessage($res), __FILE__, __LINE__);
-
+        }
         return $data;
     }
 
@@ -152,7 +154,7 @@
 
         $res = $this->db->query($query);
 
-        if (DB::isError($res)) {
+        if (PEAR::isError($res)) {
             return new Cache_Error('DB::query failed: ' . DB::errorMessage($res) , __FILE__, __LINE__);
         }
     }
@@ -169,8 +171,9 @@
 
         $res = $this->db->query($query);
 
-        if (DB::isError($res))
+        if (PEAR::isError($res)) {
             return new Cache_Error('DB::query failed: ' . DB::errorMessage($res), __FILE__, __LINE__);
+        }
     }
 
     function flush($group = '')
@@ -185,7 +188,7 @@
 
         $res = $this->db->query($query);
 
-        if (DB::isError($res))
+        if (PEAR::isError($res))
             return new Cache_Error('DB::query failed: ' . DB::errorMessage($res), __FILE__, __LINE__);
     }
 
@@ -199,16 +202,15 @@
 
         $res = $this->db->query($query);
 
-        if (DB::isError($res))
+        if (PEAR::isError($res)) {
             return new Cache_Error('DB::query failed: ' . DB::errorMessage($res), __FILE__, __LINE__);
-
+        }
         $row = $res->fetchRow();
 
         if (is_array($row)) {
             return true;
-        } else {
-            return false;
         }
+        return false;
     }
 
     function garbageCollection($maxlifetime)
@@ -227,19 +229,18 @@
                          $this->cache_table
                        );
         $cachesize = $this->db->GetOne($query);
-        if (DB::isError($cachesize)) {
+        if (PEAR::isError($cachesize)) {
             return new Cache_Error('DB::query failed: ' . DB::errorMessage($cachesize), __FILE__, __LINE__);
         }
 
         //if cache is to big.
-        if ($cachesize > $this->highwater)
-        {
+        if ($cachesize > $this->highwater) {
             //find the lowwater mark.
             $query = sprintf('select length(cachedata) as size, changed from %s order by changed DESC',
                                      $this->cache_table
                        );
             $res = $this->db->query($query);
-            if (DB::isError($res)) {
+            if (PEAR::isError($res)) {
                 return new Cache_Error('DB::query failed: ' . DB::errorMessage($res), __FILE__, __LINE__);
             }
 
@@ -257,9 +258,10 @@
             $res = $this->db->query($query);
         }
 
-        if (DB::isError($res)) {
+        if (PEAR::isError($res)) {
             return new Cache_Error('DB::query failed: ' . DB::errorMessage($res), __FILE__, __LINE__);
         }
     }
 
 }
+?>

Added: trunk/lib/pear/Cache/Container/dbx.php
===================================================================
--- trunk/lib/pear/Cache/Container/dbx.php	                        (rev 0)
+++ trunk/lib/pear/Cache/Container/dbx.php	2012-11-20 09:06:44 UTC (rev 8494)
@@ -0,0 +1,295 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PEAR :: Cache                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/2_02.txt.                                 |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | li...@ph... so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Christian Stocker <ch...@ph...>                         |
+// +----------------------------------------------------------------------+
+//
+// $Id: dbx.php 268860 2008-11-12 14:56:26Z clockwerx $
+
+
+require_once 'Cache/Container.php';
+
+/**
+* ext/dbx Cache Container.
+*
+* WARNING: Other systems might or might not support certain datatypes of 
+* the tables shown. As far as I know there's no large binary 
+* type in SQL-92 or SQL-99. Postgres seems to lack any 
+* BLOB or TEXT type, for MS-SQL you could use IMAGE, don't know 
+* about other databases. Please add sugestions for other databases to 
+* the inline docs.
+*
+* The field 'changed' has no meaning for the Cache itself. It's just there 
+* because it's a good idea to have an automatically updated timestamp
+* field for debugging in all of your tables.
+*
+* For _MySQL_ you need this DB table:
+*
+* CREATE TABLE cache (
+*   id          CHAR(32) NOT null DEFAULT '',
+*   cachegroup  VARCHAR(127) NOT null DEFAULT '',
+*   cachedata   BLOB NOT null DEFAULT '',
+*   userdata    VARCHAR(255) NOT null DEFAULT '',
+*   expires     INT(9) NOT null DEFAULT 0,
+*  
+*   changed     TIMESTAMP(14) NOT null,
+*  
+*   INDEX (expires),
+*   PRIMARY KEY (id, cachegroup)
+* )
+*
+* @author   Christian Stocker <ch...@ph...>
+* @version  $Id: dbx.php 268860 2008-11-12 14:56:26Z clockwerx $
+* @package  Cache
+*/
+class Cache_Container_dbx extends Cache_Container
+{
+
+    /**
+    * Name of the DB table to store caching data
+    * 
+    * @see  Cache_Container_file::$filename_prefix
+    */  
+    var $cache_table = '';
+
+    /**
+    * DBx module to use
+    *
+    *  at the moment only mysql or odbc
+    * 
+    * @var  string
+    */
+    var $module = '';
+
+    /**
+    * DB host to use
+    * 
+    * @var  string
+    */
+    var $host = '';
+
+    /**
+    * DB database to use
+    * 
+    * @var  string
+    */
+    var $db = '';
+
+    /**
+    * DB username to use
+    * 
+    * @var  string
+    */
+    var $username = '';
+
+    /**
+    * DB password to use
+    * 
+    * @var  string
+    */
+    var $password = '';
+    
+    
+    /**
+    * Establish a persistent connection?
+    * 
+    * @var  boolean 
+    */
+    var $persistent = true;
+    
+
+    function Cache_Container_dbx($options)
+    {
+        if (!is_array($options) ) {
+            return new Cache_Error('No options specified!', __FILE__, __LINE__);
+        }
+
+        $this->setOptions($options,  array_merge($this->allowed_options, array('module','host','db','username','password', 'cache_table', 'persistent')));
+
+        if (!$this->module)
+            return new Cache_Error('No module specified!', __FILE__, __LINE__);
+
+        $this->db = dbx_connect($this->module, $this->host, $this->db, $this->username, $this->password, $this->persistent);
+
+        if (dbx_error($this->db)) {
+            return new Cache_Error('DBx connect failed: ' . dbx_error($this->db), __FILE__, __LINE__);
+        } else {
+            //not implemented yet in dbx
+            //$this->db->setFetchMode(DB_FETCHMODE_ASSOC);
+        }
+    }
+
+    function fetch($id, $group)
+    {
+        $query = sprintf("SELECT cachedata, userdata, expires FROM %s WHERE id = '%s' AND cachegroup = '%s'",
+                         $this->cache_table,
+                         addslashes($id),
+                         addslashes($group)
+                        );
+
+        $res = dbx_query($this->db, $query);
+        if (dbx_error($this->db)) {
+            return new Cache_Error('DBx query failed: ' . dbx_error($this->db), __FILE__, __LINE__);
+        }
+        $row = $res->data[0];
+
+        if (is_array($row)) {
+            $data = array($row['expires'], $this->decode($row['cachedata']), $row['userdata']);
+        } else {
+            $data = array(null, null, null);
+        }
+        // last used required by the garbage collection   
+        // WARNING: might be MySQL specific         
+        $query = sprintf("UPDATE %s SET changed = (NOW() + 0) WHERE id = '%s' AND cachegroup = '%s'",
+                            $this->cache_table,
+                            addslashes($id),
+                            addslashes($group)
+                          );
+        
+        $res = dbx_query($this->db, $query);
+        if (dbx_error($this->db)) {
+            return new Cache_Error('DBx query failed: ' . dbx_error($this->db), __FILE__, __LINE__);                             
+        }
+        return $data;            
+    }
+
+    /**
+    * Stores a dataset.
+    * 
+    * WARNING: we use the SQL command REPLACE INTO this might be 
+    * MySQL specific. As MySQL is very popular the method should
+    * work fine for 95% of you.
+    */
+    function save($id, $data, $expires, $group, $userdata)
+    {
+        $this->flushPreload($id, $group);
+
+        $query = sprintf("REPLACE INTO %s (userdata, cachedata, expires, id, cachegroup) VALUES ('%s', '%s', %d, '%s', '%s')",
+                         $this->cache_table,
+                         addslashes($userdata),
+                         addslashes($this->encode($data)),
+                         $this->getExpiresAbsolute($expires) ,
+                         addslashes($id),
+                         addslashes($group)
+                        );
+
+        $res = dbx_query($this->db, $query);
+
+        if (dbx_error($this->db)) {
+            return new Cache_Error('DBx query failed: ' . dbx_error($this->db) , __FILE__, __LINE__);
+        }
+    }
+
+    function remove($id, $group)
+    {
+        $this->flushPreload($id, $group);
+
+        $query = sprintf("DELETE FROM %s WHERE id = '%s' and cachegroup = '%s'",
+                         $this->cache_table,
+                         addslashes($id),
+                         addslashes($group)
+                        );
+
+        $res = dbx_query($this->db, $query);
+
+        if (dbx_error($this->db)) {
+            return new Cache_Error('DBx query failed: ' . dbx_error($this->db), __FILE__, __LINE__);
+        }
+    }
+
+    function flush($group = '')
+    {
+        $this->flushPreload();
+
+        if ($group) {
+            $query = sprintf("DELETE FROM %s WHERE cachegroup = '%s'", $this->cache_table, addslashes($group));
+        } else {
+            $query = sprintf("DELETE FROM %s", $this->cache_table);
+        }
+
+        $res = dbx_query($this->db,$query);
+
+        if (dbx_error($this->db)) {
+            return new Cache_Error('DBx query failed: ' . dbx_error($this->db), __FILE__, __LINE__);
+        }
+    }
+
+    function idExists($id, $group)
+    {
+        $query = sprintf("SELECT id FROM %s WHERE ID = '%s' AND cachegroup = '%s'",
+                         $this->cache_table,
+                         addslashes($id),
+                         addslashes($group)
+                        );
+
+        $res = dbx_query($this->db, $query);
+
+        if (dbx_error($this->db)) {
+            return new Cache_Error('DBx query failed: ' . dbx_error($this->db), __FILE__, __LINE__);
+        }
+
+        $row = $res[0];
+
+        if (is_array($row)) {
+            return true;
+        }
+        return false;
+    }
+
+    function garbageCollection($maxlifetime)
+    {
+        $this->flushPreload();
+        
+        $query = sprintf('DELETE FROM %s WHERE (expires <= %d AND expires > 0) OR changed <= (NOW() - %d)',
+                         $this->cache_table,
+                         time(),
+                         $maxlifetime
+                       );
+
+
+        $res = dbx_query($this->db, $query);
+
+        if (dbx_error($this->db)) {
+            return new Cache_Error('DBx query failed: ' . dbx_error($this->db), __FILE__, __LINE__);
+        }
+        $query = sprintf('select sum(length(cachedata)) as CacheSize from %s',
+                         $this->cache_table
+                       );
+
+        $res = dbx_query($this->db, $query);
+        //if cache is to big.
+        if ($res->data[0][CacheSize] > $this->highwater) {
+            //find the lowwater mark.
+            $query = sprintf('select length(cachedata) as size, changed from %s order by changed DESC',
+                                     $this->cache_table
+                       );
+
+            $res = dbx_query($this->db, $query);
+            $keep_size = 0;
+            $i = 0;
+            while ($keep_size < $this->lowwater && $i < $res->rows ) {
+                $keep_size += $res->data[$i][size];
+                $i++;
+            }
+    
+            //delete all entries, which were changed before the "lowwwater mark"
+            $query = sprintf('delete from %s where changed <= %s',
+                                     $this->cache_table,
+                                     $res->data[$i][changed]
+                                   );
+            $res = dbx_query($this->db, $query);
+        }
+    }
+}
+?>

Modified: trunk/lib/pear/Cache/Container/file.php
===================================================================
--- trunk/lib/pear/Cache/Container/file.php	2012-11-20 08:46:58 UTC (rev 8493)
+++ trunk/lib/pear/Cache/Container/file.php	2012-11-20 09:06:44 UTC (rev 8494)
@@ -15,6 +15,8 @@
 // | Authors: Ulf Wendel <ulf...@ph...>                           |
 // |          Sebastian Bergmann <sb...@se...>               |
 // +----------------------------------------------------------------------+
+//
+// $Id: file.php 293864 2010-01-23 03:49:21Z clockwerx $
 
 require_once 'Cache/Container.php';
 
@@ -22,9 +24,10 @@
 * Stores cache contents in a file.
 *
 * @author   Ulf Wendel  <ulf...@ph...>
-* @version
+* @version  $Id: file.php 293864 2010-01-23 03:49:21Z clockwerx $
 */
-class Cache_Container_file extends Cache_Container {
+class Cache_Container_file extends Cache_Container
+{
 
     /**
     * File locking
@@ -63,25 +66,27 @@
     * @var  string
     */
     var $filename_prefix = '';
-
+    
+    
     /**
     * List of cache entries, used within a gc run
-    *
+    * 
     * @var array
     */
     var $entries;
-
+    
     /**
     * Total number of bytes required by all cache entries, used within a gc run.
-    *
+    * 
     * @var  int
     */
     var $total_size = 0;
 
+
     /**
     * Max Line Length of userdata
     *
-    * If set to 0, it will take the default
+    * If set to 0, it will take the default 
     * ( 1024 in php 4.2, unlimited in php 4.3)
     * see http://ch.php.net/manual/en/function.fgets.php
     * for details
@@ -95,13 +100,13 @@
     *
     * @param    array   Config options: ["cache_dir" => ..., "filename_prefix" => ...]
     */
-     function Cache_Container_file($options = '') {
-        if (is_array($options))
+     function Cache_Container_file($options = '')
+     {
+        if (is_array($options)) {
             $this->setOptions($options, array_merge($this->allowed_options, array('cache_dir', 'filename_prefix', 'max_userdata_linelength')));
-
+        }
         clearstatcache();
-        if ($this->cache_dir)
-        {
+        if ($this->cache_dir) {
             // make relative paths absolute for use in deconstructor.
             // it looks like the deconstructor has problems with relative paths
             if (OS_UNIX && '/' != $this->cache_dir{0}  )
@@ -116,22 +121,27 @@
         }
         $this->entries = array();
         $this->group_dirs = array();
-
+                    
     } // end func contructor
 
-    function fetch($id, $group) {
+    function fetch($id, $group)
+    {
         $file = $this->getFilename($id, $group);
-        if (!file_exists($file))
-            return array(NULL, NULL, NULL);
+        if (PEAR::isError($file)) {
+            return $file;
+        }
 
+        if (!file_exists($file)) {
+            return array(null, null, null);
+        }
         // retrive the content
-        if (!($fh = @fopen($file, 'rb')))
+        if (!($fh = @fopen($file, 'rb'))) {
             return new Cache_Error("Can't access cache file '$file'. Check access rights and path.", __FILE__, __LINE__);
-
+        }
         // File locking (shared lock)
-        if ($this->fileLocking)
+        if ($this->fileLocking) {
             flock($fh, LOCK_SH);
-
+        }
         // file format:
         // 1st line: expiration date
         // 2nd line: user data
@@ -142,12 +152,16 @@
         } else {
             $userdata = trim(fgets($fh, $this->max_userdata_linelength));
         }
-        $cachedata = $this->decode(fread($fh, filesize($file)));
+        $buffer = '';
+        while (!feof($fh)) {
+        	$buffer .= fread($fh, 8192);
+        }
+        $cachedata = $this->decode($buffer);
 
         // Unlocking
-        if ($this->fileLocking)
+        if ($this->fileLocking) {
             flock($fh, LOCK_UN);
-
+        }
         fclose($fh);
 
         // last usage date used by the gc - maxlifetime
@@ -164,17 +178,19 @@
     * WARNING: If you supply userdata it must not contain any linebreaks,
     * otherwise it will break the filestructure.
     */
-    function save($id, $cachedata, $expires, $group, $userdata) {
+    function save($id, $cachedata, $expires, $group, $userdata)
+    {
         $this->flushPreload($id, $group);
 
         $file = $this->getFilename($id, $group);
-        if (!($fh = @fopen($file, 'wb')))
+        if (!($fh = @fopen($file, 'wb'))) {
             return new Cache_Error("Can't access '$file' to store cache data. Check access rights and path.", __FILE__, __LINE__);
+        }
 
         // File locking (exclusive lock)
-        if ($this->fileLocking)
+        if ($this->fileLocking) {
             flock($fh, LOCK_EX);
-
+        }
         // file format:
         // 1st line: expiration date
         // 2nd line: user data
@@ -185,24 +201,28 @@
         fwrite($fh, $this->encode($cachedata));
 
         // File unlocking
-        if ($this->fileLocking)
+        if ($this->fileLocking) {
             flock($fh, LOCK_UN);
-
+        }
         fclose($fh);
 
         // I'm not sure if we need this
-    // i don't think we need this (chregu)
+	// i don't think we need this (chregu)
         // touch($file);
 
         return true;
     } // end func save
 
-    function remove($id, $group) {
+    function remove($id, $group)
+    {
         $this->flushPreload($id, $group);
 
         $file = $this->getFilename($id, $group);
+        if (PEAR::isError($file)) {
+            return $file;
+        }
+
         if (file_exists($file)) {
-
             $ok = unlink($file);
             clearstatcache();
 
@@ -212,7 +232,8 @@
         return false;
     } // end func remove
 
-    function flush($group) {
+    function flush($group)
+    {
         $this->flushPreload();
         $dir = ($group) ? $this->cache_dir . $group . '/' : $this->cache_dir;
 
@@ -223,8 +244,8 @@
         return $num_removed;
     } // end func flush
 
-    function idExists($id, $group) {
-
+    function idExists($id, $group)
+    {
         return file_exists($this->getFilename($id, $group));
     } // end func idExists
 
@@ -241,34 +262,35 @@
     * @param    integer Maximum lifetime in seconds of an no longer used/touched entry
     * @throws   Cache_Error
     */
-    function garbageCollection($maxlifetime) {
-
+    function garbageCollection($maxlifetime)
+    {
         $this->flushPreload();
         clearstatcache();
 
         $ok = $this->doGarbageCollection($maxlifetime, $this->cache_dir);
 
-        // check the space used by the cache entries
+        // check the space used by the cache entries        
         if ($this->total_size > $this->highwater) {
-
+        
             krsort($this->entries);
             reset($this->entries);
-
+            
             while ($this->total_size > $this->lowwater && list($lastmod, $entry) = each($this->entries)) {
-                if (@unlink($entry['file']))
+                if (@unlink($entry['file'])) {
                     $this->total_size -= $entry['size'];
-                else
-                    new CacheError("Can't delete {$entry["file"]}. Check the permissions.");
+                } else {
+                    new CacheError("Can't delete {$entry['file']}. Check the permissions.");
+                }
             }
-
+            
         }
-
+        
         $this->entries = array();
         $this->total_size = 0;
-
+        
         return $ok;
     } // end func garbageCollection
-
+    
     /**
     * Does the recursive gc procedure, protected.
     *
@@ -277,11 +299,12 @@
     *                   recursive function call!
     * @throws   Cache_Error
     */
-    function doGarbageCollection($maxlifetime, $dir) {
+    function doGarbageCollection($maxlifetime, $dir)
+    {
+        if (!is_writable($dir) || !is_readable($dir) || !($dh = opendir($dir))) {
+            return new Cache_Error("Can't remove directory '$dir'. Check permissions and path.", __FILE__, __LINE__);
+        }
 
-        if (!($dh = opendir($dir)))
-            return new Cache_Error("Can't access cache directory '$dir'. Check permissions and path.", __FILE__, __LINE__);
-
         while ($file = readdir($dh)) {
             if ('.' == $file || '..' == $file)
                 continue;
@@ -301,13 +324,14 @@
             $expire = fgets($fh, 11);
             fclose($fh);
             $lastused = filemtime($file);
-
+            
             $this->entries[$lastused] = array('file' => $file, 'size' => filesize($file));
             $this->total_size += filesize($file);
-
+            
             // remove if expired
-            if (( ($expire && $expire <= time()) || ($lastused <= (time() - $maxlifetime)) ) && !unlink($file))
+            if (( ($expire && $expire <= time()) || ($lastused <= (time() - $maxlifetime)) ) && !unlink($file)) {
                 new Cache_Error("Can't unlink cache file '$file', skipping. Check permissions and path.", __FILE__, __LINE__);
+            }
         }
 
         closedir($dh);
@@ -325,17 +349,21 @@
     * @return   string  full filename with the path
     * @access   public
     */
-    function getFilename($id, $group) {
-
-        if (isset($this->group_dirs[$group]))
+    function getFilename($id, $group)
+    {
+        if (isset($this->group_dirs[$group])) {
             return $this->group_dirs[$group] . $this->filename_prefix . $id;
+        }
 
         $dir = $this->cache_dir . $group . '/';
-        if (!file_exists($dir)) {
-            mkdir($dir, 0755);
-            clearstatcache();
+        if (is_writeable($this->cache_dir)) {
+            if (!file_exists($dir)) {
+                mkdir($dir, 0755, true);
+                clearstatcache();
+            }
+        } else {
+            return new Cache_Error("Can't make directory '$dir'. Check permissions and path.", __FILE__, __LINE__);
         }
-
         $this->group_dirs[$group] = $dir;
 
         return $dir . $this->filename_prefix . $id;
@@ -348,9 +376,11 @@
     * @return   integer number of removed files
     * @throws   Cache_Error
     */
-    function deleteDir($dir) {
-        if (!($dh = opendir($dir)))
+    function deleteDir($dir)
+    {
+        if (!is_writable($dir) || !is_readable($dir) || !($dh = opendir($dir))) {
             return new Cache_Error("Can't remove directory '$dir'. Check permissions and path.", __FILE__, __LINE__);
+        }
 
         $num_removed = 0;
 
@@ -379,5 +409,6 @@
 
         return $num_removed;
     } // end func deleteDir
-
+    
 } // end class file
+?>

Added: trunk/lib/pear/Cache/Container/mdb.php
===================================================================
--- trunk/lib/pear/Cache/Container/mdb.php	                        (rev 0)
+++ trunk/lib/pear/Cache/Container/mdb.php	2012-11-20 09:06:44 UTC (rev 8494)
@@ -0,0 +1,380 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PEAR :: Cache :: MDB Container                                       |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/2_02.txt.                                 |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | li...@ph... so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Note: This is a MDB-oriented rewrite of Cache/Container/db.php.      |
+// | Thanks to Lukas Smith for his patience in answering my questions     |
+// +----------------------------------------------------------------------+
+// | Author: Lorenzo Alberton <l.alberton at quipo.it>                    |
+// +----------------------------------------------------------------------+
+//
+// $Id: mdb.php 174777 2004-12-15 09:09:33Z dufuz $
+
+require_once 'MDB.php';
+require_once 'Cache/Container.php';
+
+/**
+* PEAR/MDB Cache Container.
+*
+* NB: The field 'changed' has no meaning for the Cache itself. It's just there
+* because it's a good idea to have an automatically updated timestamp
+* field for debugging in all of your tables.
+*
+* A XML MDB-compliant schema example for the table needed is provided.
+* Look at the file "mdb_cache_schema.xml" for that.
+*
+* ------------------------------------------
+* A basic usage example:
+* ------------------------------------------
+*
+* $dbinfo = array(
+*   'database'    => 'dbname',
+*   'phptype'     => 'mysql',
+*   'username'    => 'root',
+*   'password'    => '',
+*   'cache_table' => 'cache'
+* );
+*
+*
+* $cache = new Cache('mdb', $dbinfo);
+* $id = $cache->generateID('testentry');
+*
+* if ($data = $cache->get($id)) {
+*    echo 'Cache hit.<br />Data: '.$data;
+*
+* } else {
+*   $data = 'data of any kind';
+*   $cache->save($id, $data);
+*   echo 'Cache miss.<br />';
+* }
+*
+* ------------------------------------------
+*
+* @author   Lorenzo Alberton <l.alberton at quipo.it>
+* @version  $Id: mdb.php 174777 2004-12-15 09:09:33Z dufuz $
+* @package  Cache
+*/
+class Cache_Container_mdb extends Cache_Container
+{
+
+    /**
+     * Name of the MDB table to store caching data
+     *
+     * @see  Cache_Container_file::$filename_prefix
+     */
+    var $cache_table = '';
+
+    /**
+     * PEAR MDB object
+     *
+     * @var  object PEAR_MDB
+     */
+    var $db;
+
+    /**
+     * Constructor
+     *
+     * @param mixed Array with connection info or dsn string
+     */
+    function Cache_Container_mdb($options)
+    {
+        $this->db = &MDB::Connect($options);
+        if (MDB::isError($this->db)) {
+           return new Cache_Error('MDB::connect failed: '
+                    . $this->db->getMessage(), __FILE__, __LINE__);
+        } else {
+            $this->db->setFetchMode(MDB_FETCHMODE_ASSOC);
+        }
+        $this->setOptions($options, array_merge($this->allowed_options,
+                                         array('dsn', 'cache_table')));
+    }
+
+    /**
+     * Fetch in the db the data that matches input parameters
+     *
+     * @param    string  dataset ID
+     * @param    string  cache group
+     * @return   mixed   dataset value or null/Cache_Error on failure
+     * @access   public
+     */
+    function fetch($id, $group)
+    {
+        $query = 'SELECT cachedata FROM ' . $this->cache_table
+                .' WHERE id='       . $this->db->getTextValue($id)
+                .' AND cachegroup=' . $this->db->getTextValue($group);
+        if ($res = $this->db->query($query)) {
+            if ($this->db->endOfResult($res)) {
+                //no rows returned
+                $data = array(null, null, null);
+            } else {
+                $clob = $this->db->fetchClob($res,0,'cachedata');
+                if (!MDB::isError($clob)) {
+                    $cached_data = '';
+                    while(!$this->db->endOfLOB($clob)) {
+                        if (MDB::isError($error =
+                                    $this->db->readLob($clob,$data,8000)<0)) {
+                            return new Cache_Error('MDB::query failed: '
+                                    . $error->getMessage(), __FILE__, __LINE__);
+                        }
+                        $cached_data .= $data;
+                    }
+                    unset($data);
+                    $this->db->destroyLob($clob);
+                    $this->db->freeResult($res);
+
+                    //finished fetching LOB, now fetch other fields...
+                    $query = 'SELECT userdata, expires FROM ' . $this->cache_table
+                            .' WHERE id='       . $this->db->getTextValue($id)
+                            .' AND cachegroup=' . $this->db->getTextValue($group);
+                    if ($res = $this->db->query($query)) {
+                        $row = $this->db->fetchInto($res);
+                        if (is_array($row)) {
+                            $data = array(
+                                        $row['expires'],
+                                        $this->decode($cached_data),
+                                        $row['userdata']
+                                    );
+                        } else {
+                            $data = array(null, null, null);
+                        }
+                    } else {
+                        $data = array(null, null, null);
+                    }
+                } else {
+                    return new Cache_Error('MDB::query failed: '
+                             . $clob->getMessage(), __FILE__, __LINE__);
+                }
+            }
+            $this->db->freeResult($res);
+        } else {
+            //return new Cache_Error('MDB::query failed: '
+            //          . $result->getMessage(), __FILE__, __LINE__);
+            $data = array(null, null, null);
+        }
+
+        // last used required by the garbage collection
+        $query = 'UPDATE '          . $this->cache_table
+                .' SET changed='    . time()
+                .' WHERE id='       . $this->db->getTextValue($id)
+                .' AND cachegroup=' . $this->db->getTextValue($group);
+
+        $res = $this->db->query($query);
+        if (MDB::isError($res)) {
+            return new Cache_Error('MDB::query failed: '
+                . $this->db->errorMessage($res), __FILE__, __LINE__);
+        }
+        return $data;
+    }
+
+   /**
+     * Stores a dataset in the database
+     *
+     * If dataset_ID already exists, overwrite it with new data,
+     * else insert data in a new record.
+     *
+     * @param    string  dataset ID
+     * @param    mixed   data to be cached
+     * @param    integer expiration time
+     * @param    string  cache group
+     * @param    string  userdata
+     * @access   public
+     */
+    function save($id, $data, $expires, $group, $userdata)
+    {
+        global $db;
+        $this->flushPreload($id, $group);
+
+        $fields = array(
+            'id'        => array(
+                            'Type'   => 'text',
+                            'Value'  => $id,
+                            'Key'    => true
+                        ),
+            'userdata'  => array(
+                            'Type'   => 'integer',
+                            'Value'  => $userdata,
+                            'null'   => ($userdata ? false : true)
+                        ),
+            'expires'   => array(
+                            'Type'   => 'integer',
+                            'Value'  => $this->getExpiresAbsolute($expires)
+                        ),
+            'cachegroup' => array(
+                            'Type'   => 'text',
+                            'Value'  => $group
+                        )
+            );
+
+        $result = $this->db->replace($this->cache_table, $fields);
+
+        if (MDB::isError($result)) {
+            //Var_Dump::display($result);
+            return new Cache_Error('MDB::query failed: '
+                    . $this->db->errorMessage($result), __FILE__, __LINE__);
+        }
+        unset($fields); //end first part of query
+        $query2 = 'UPDATE '   . $this->cache_table
+                 .' SET cachedata=?'
+                 .' WHERE id='. $this->db->getTextValue($id);
+
+        if (($prepared_query = $this->db->prepareQuery($query2))) {
+            $char_lob = array(
+                            'Error' => '',
+                            'Type' => 'data',
+                            'Data' => $this->encode($data)
+                        );
+            if (!MDB::isError($clob = $this->db->createLob($char_lob))) {
+                $this->db->setParamClob($prepared_query,1,$clob,'cachedata');
+                if(MDB::isError($error=$this->db->executeQuery($prepared_query))) {
+                    return new Cache_Error('MDB::query failed: '
+                            . $error->getMessage() , __FILE__, __LINE__);
+                }
+                $this->db->destroyLob($clob);
+            } else {
+                // creation of the handler object failed
+                return new Cache_Error('MDB::query failed: '
+                        . $clob->getMessage() , __FILE__, __LINE__);
+            }
+            $this->db->freePreparedQuery($prepared_query);
+        } else {
+            //prepared query failed
+            return new Cache_Error('MDB::query failed: '
+                    . $prepared_query->getMessage() , __FILE__, __LINE__);
+        }
+    }
+
+    /**
+     * Removes a dataset from the database
+     *
+     * @param    string  dataset ID
+     * @param    string  cache group
+     */
+    function remove($id, $group)
+    {
+        $this->flushPreload($id, $group);
+
+        $query = 'DELETE FROM '     . $this->cache_table
+                .' WHERE id='       . $this->db->getTextValue($id)
+                .' AND cachegroup=' . $this->db->getTextValue($group);
+
+        $res = $this->db->query($query);
+        if (MDB::isError($res)) {
+            return new Cache_Error('MDB::query failed: '
+                    . $this->db->errorMessage($res), __FILE__, __LINE__);
+        }
+    }
+
+    /**
+     * Remove all cached data for a certain group, or empty
+     * the cache table if no group is specified.
+     *
+     * @param    string  cache group
+     */
+    function flush($group = '')
+    {
+        $this->flushPreload();
+
+        if ($group) {
+            $query = 'DELETE FROM '       . $this->cache_table
+                    .' WHERE cachegroup=' . $this->db->getTextValue($group);
+        } else {
+            $query = 'DELETE FROM ' . $this->cache_table;
+        }
+
+        $res = $this->db->query($query);
+        if (MDB::isError($res)) {
+            return new Cache_Error('MDB::query failed: '
+                . $this->db->errorMessage($res), __FILE__, __LINE__);
+        }
+    }
+
+    /**
+     * Check if a dataset ID/group exists.
+     *
+     * @param    string  dataset ID
+     * @param    string  cache group
+     * @return   boolean
+     */
+    function idExists($id, $group)
+    {
+        $query = 'SELECT id FROM '  . $this->cache_table
+                .' WHERE id='       . $this->db->getTextValue($id)
+                .' AND cachegroup=' . $this->db->getTextValue($group);
+        echo $query;
+        $res = $this->db->query($query);
+        if (MDB::isError($res)) {
+            return new Cache_Error('MDB::query failed: '
+                    . $this->db->errorMessage($res), __FILE__, __LINE__);
+        }
+        $row = $this->db->fetchInto($res);
+
+        if (is_array($row)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Garbage collector.
+     *
+     * @param    int maxlifetime
+     */
+    function garbageCollection($maxlifetime)
+    {
+        $this->flushPreload();
+        $query = 'DELETE FROM '        . $this->cache_table
+                .' WHERE (expires <= ' . time()
+                .' AND expires > 0) OR changed <= '. time() - $maxlifetime;
+
+        $res = $this->db->query($query);
+
+        $query = 'SELECT sum(length(cachedata)) as CacheSize FROM '
+                . $this->cache_table;
+
+        $cachesize = $this->db->getOne($query);
+        if (MDB::isError($cachesize)) {
+            return new Cache_Error('MDB::query failed: '
+                   . $this->db->errorMessage($cachesize), __FILE__, __LINE__);
+        }
+        //if cache is to big.
+        if ($cachesize > $this->highwater) {
+            //find the lowwater mark.
+            $query = 'SELECT length(cachedata) as size, changed FROM '
+                    . $this->cache_table .' ORDER BY changed DESC';
+
+            $res = $this->db->query($query);
+            if (MDB::isError($res)) {
+               return new Cache_Error('MDB::query failed: '
+                    . $this->db->errorMessage($res), __FILE__, __LINE__);
+            }
+            $numrows = $this->db->numRows($res);
+            $keep_size = 0;
+            while ($keep_size < $this->lowwater && $numrows--) {
+                $entry = $this->db->fetchInto($res,MDB_FETCHMODE_ASSOC);
+                $keep_size += $entry['size'];
+            }
+
+            //delete all entries, which were changed before the "lowwater mark"
+            $query = 'DELETE FROM ' . $this->cache_table
+                    .' WHERE changed<='.($entry['changed'] ? $entry['changed'] : 0);
+
+            $res = $this->db->query($query);
+            if (MDB::isError($res)) {
+               return new Cache_Error('MDB::query failed: '
+                    . $this->db->errorMessage($res), __FILE__, __LINE__);
+            }
+        }
+    }
+
+}
+?>
\ No newline at end of file

Added: trunk/lib/pear/Cache/Container/mdb_cache_schema.xml
===================================================================
--- trunk/lib/pear/Cache/Container/mdb_cache_schema.xml	                        (rev 0)
+++ trunk/lib/pear/Cache/Container/mdb_cache_schema.xml	2012-11-20 09:06:44 UTC (rev 8494)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<database>
+
+ <name>dbname</name>
+ <create>1</create>
+ <descrip...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[8493] trunk/lib/pear/PEAR.php

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

Revision: 8493
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8493&view=rev
Author:   vargenau
Date:     2012-11-20 08:46:58 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Update to PEAR-1.9.4

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

Modified: trunk/lib/pear/PEAR.php
===================================================================
--- trunk/lib/pear/PEAR.php	2012-11-19 17:07:29 UTC (rev 8492)
+++ trunk/lib/pear/PEAR.php	2012-11-20 08:46:58 UTC (rev 8493)
@@ -1,32 +1,38 @@
 <?php
-//
-// +----------------------------------------------------------------------+
-// | PEAR, the PHP Extension and Application Repository                   |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | li...@ph... so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Sterling Hughes <ste...@ph...>                          |
-// |          Stig Bakken <ss...@ph...>                                   |
-// |          Tomas V.V.Cox <co...@id...>                             |
-// +----------------------------------------------------------------------+
-//
-// From Pear CVS: Id: PEAR.php,v 1.59 2003/04/03 23:10:10 ssb Exp
-//
+/**
+ * PEAR, the PHP Extension and Application Repository
+ *
+ * PEAR class and PEAR_Error class
+ *
+ * PHP versions 4 and 5
+ *
+ * @category   pear
+ * @package    PEAR
+ * @author     Sterling Hughes <ste...@ph...>
+ * @author     Stig Bakken <ss...@ph...>
+ * @author     Tomas V.V.Cox <co...@id...>
+ * @author     Greg Beaver <ce...@ph...>
+ * @copyright  1997-2010 The Authors
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    CVS: $Id: PEAR.php 313023 2011-07-06 19:17:11Z dufuz $
+ * @link       http://pear.php.net/package/PEAR
+ * @since      File available since Release 0.1
+ */
 
-define('PEAR_ERROR_RETURN',   1);
-define('PEAR_ERROR_PRINT',    2);
-define('PEAR_ERROR_TRIGGER',  4);
-define('PEAR_ERROR_DIE',      8);
-define('PEAR_ERROR_CALLBACK', 16);
+/**#@+
+ * ERROR constants
+ */
+define('PEAR_ERROR_RETURN',     1);
+define('PEAR_ERROR_PRINT',      2);
+define('PEAR_ERROR_TRIGGER',    4);
+define('PEAR_ERROR_DIE',        8);
+define('PEAR_ERROR_CALLBACK',  16);
+/**
+ * WARNING: obsolete
+ * @deprecated
+ */
 define('PEAR_ERROR_EXCEPTION', 32);
+/**#@-*/
 define('PEAR_ZE2', (function_exists('version_compare') &&
                     version_compare(zend_version(), "2-dev", "ge")));
 
@@ -63,16 +69,23 @@
  * destructor, use error_log(), syslog() or something similar.
  *
  * IMPORTANT! To use the emulated destructors you need to create the
- * objects by reference, ej: $obj =& new PEAR_child;
+ * objects by reference: $obj =& new PEAR_child;
  *
- * @since PHP 4.0.2
- * @author Stig Bakken <ss...@ph...>
- * @see http://pear.php.net/manual/
+ * @category   pear
+ * @package    PEAR
+ * @author     Stig Bakken <ss...@ph...>
+ * @author     Tomas V.V. Cox <co...@id...>
+ * @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.4
+ * @link       http://pear.php.net/package/PEAR
+ * @see        PEAR_Error
+ * @since      Class available since PHP 4.0.2
+ * @link        http://pear.php.net/manual/en/core.pear.php#core.pear.pear
  */
 class PEAR
 {
-    // {{{ properties
-
     /**
      * Whether to enable internal debug messages.
      *
@@ -123,34 +136,36 @@
      */
     var $_expected_errors = array();
 
-    // }}}
-
-    // {{{ constructor
-
     /**
      * Constructor.  Registers this object in
      * $_PEAR_destructor_object_list for destructor emulation if a
      * destructor object exists.
      *
-     * @param string $error_class (optional) which class to use for
+     * @param string $error_class  (optional) which class to use for
      *        error objects, defaults to PEAR_Error.
      * @access public
      * @return void
      */
     function PEAR($error_class = null)
     {
-        $classname = get_class($this);
+        $classname = strtolower(get_class($this));
         if ($this->_debug) {
             print "PEAR constructor called, class=$classname\n";
         }
+
         if ($error_class !== null) {
             $this->_error_class = $error_class;
         }
-        while ($classname) {
+
+        while ($classname && strcasecmp($classname, "pear")) {
             $destructor = "_$classname";
             if (method_exists($this, $destructor)) {
                 global $_PEAR_destructor_object_list;
                 $_PEAR_destructor_object_list[] = &$this;
+                if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
+                    register_shutdown_function("_PEAR_call_destructors");
+                    $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
+                }
                 break;
             } else {
                 $classname = get_parent_class($classname);
@@ -158,9 +173,6 @@
         }
     }
 
-    // }}}
-    // {{{ destructor
-
     /**
      * Destructor (the emulated type of...).  Does nothing right now,
      * but is included for forward compatibility, so subclass
@@ -174,17 +186,14 @@
      */
     function _PEAR() {
         if ($this->_debug) {
-            printf("PEAR destructor called, class=%s\n", get_class($this));
+            printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
         }
     }
 
-    // }}}
-    // {{{ getStaticProperty()
-
     /**
     * 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('myVar');
+    * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
     * You MUST use a reference, or they will not persist!
     *
     * @access public
@@ -196,12 +205,17 @@
     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];
     }
 
-    // }}}
-    // {{{ registerShutdownFunc()
-
     /**
     * Use this function to register a shutdown method for static
     * classes.
@@ -213,39 +227,41 @@
     */
     function registerShutdownFunc($func, $args = array())
     {
+        // if we are called statically, there is a potential
+        // that no shutdown func is registered.  Bug #6445
+        if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
+            register_shutdown_function("_PEAR_call_destructors");
+            $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
+        }
         $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
     }
 
-    // }}}
-    // {{{ isError()
-
     /**
      * Tell whether a value is a PEAR error.
      *
-     * @param mixed $data the value to test
-     * @param int   $code if $data is an error object, return true
-     *                        only if $obj->getCode() == $code
+     * @param   mixed $data   the value to test
+     * @param   int   $code   if $data is an error object, return true
+     *                        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
+     * @return  bool    true if parameter is an error
      */
     function isError($data, $code = null)
     {
-        if (is_object($data) && (strtolower(get_class($data)) == 'pear_error' ||
-                                 is_subclass_of($data, 'pear_error'))) {
-            if (is_null($code)) {
-                return true;
-            } elseif (is_string($code)) {
-                return $data->getMessage() == $code;
-            } else {
-                return $data->getCode() == $code;
-            }
+        if (!is_a($data, 'PEAR_Error')) {
+            return false;
         }
-        return false;
+
+        if (is_null($code)) {
+            return true;
+        } elseif (is_string($code)) {
+            return $data->getMessage() == $code;
+        }
+
+        return $data->getCode() == $code;
     }
 
-    // }}}
-    // {{{ setErrorHandling()
-
     /**
      * Sets how errors generated by this object should be handled.
      * Can be invoked both in objects and statically.  If called
@@ -284,10 +300,9 @@
      *
      * @since PHP 4.0.5
      */
-
     function setErrorHandling($mode = null, $options = null)
     {
-        if (isset($this)) {
+        if (isset($this) && is_a($this, 'PEAR')) {
             $setmode     = &$this->_default_error_mode;
             $setoptions  = &$this->_default_error_options;
         } else {
@@ -296,11 +311,11 @@
         }
 
         switch ($mode) {
+            case PEAR_ERROR_EXCEPTION:
             case PEAR_ERROR_RETURN:
             case PEAR_ERROR_PRINT:
             case PEAR_ERROR_TRIGGER:
             case PEAR_ERROR_DIE:
-            case PEAR_ERROR_EXCEPTION:
             case null:
                 $setmode = $mode;
                 $setoptions = $options;
@@ -308,9 +323,8 @@
 
             case PEAR_ERROR_CALLBACK:
                 $setmode = $mode;
-                if ((is_string($options) && function_exists($options)) ||
-                    (is_array($options) && method_exists(@$options[0], @$options[1])))
-                {
+                // class/object method callback
+                if (is_callable($options)) {
                     $setoptions = $options;
                 } else {
                     trigger_error("invalid error callback", E_USER_WARNING);
@@ -323,9 +337,6 @@
         }
     }
 
-    // }}}
-    // {{{ expectError()
-
     /**
      * This method is used to tell which errors you expect to get.
      * Expected errors are always returned with error mode
@@ -338,7 +349,7 @@
      *
      * @param mixed $code a single error code or an array of error codes to expect
      *
-     * @return int the new depth of the "expected errors" stack
+     * @return int     the new depth of the "expected errors" stack
      * @access public
      */
     function expectError($code = '*')
@@ -348,26 +359,20 @@
         } else {
             array_push($this->_expected_errors, array($code));
         }
-        return sizeof($this->_expected_errors);
+        return count($this->_expected_errors);
     }
 
-    // }}}
-    // {{{ popExpect()
-
     /**
      * This method pops one element off the expected error codes
      * stack.
      *
-     * @return array the list of error codes that were popped
+     * @return array   the list of error codes that were popped
      */
     function popExpect()
     {
         return array_pop($this->_expected_errors);
     }
 
-    // }}}
-    // {{{ _checkDelExpect()
-
     /**
      * This method checks unsets an error code if available
      *
@@ -379,8 +384,7 @@
     function _checkDelExpect($error_code)
     {
         $deleted = false;
-
-        foreach ($this->_expected_errors AS $key => $error_array) {
+        foreach ($this->_expected_errors as $key => $error_array) {
             if (in_array($error_code, $error_array)) {
                 unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
                 $deleted = true;
@@ -391,12 +395,10 @@
                 unset($this->_expected_errors[$key]);
             }
         }
+
         return $deleted;
     }
 
-    // }}}
-    // {{{ delExpect()
-
     /**
      * This method deletes all occurences of the specified element from
      * the expected error codes stack.
@@ -409,35 +411,27 @@
     function delExpect($error_code)
     {
         $deleted = false;
-
         if ((is_array($error_code) && (0 != count($error_code)))) {
-            // $error_code is a non-empty array here;
-            // we walk through it trying to unset all
-            // values
-            foreach($error_code AS $key => $error) {
-                if ($this->_checkDelExpect($error)) {
-                    $deleted =  true;
-                } else {
-                    $deleted = false;
-                }
+            // $error_code is a non-empty array here; we walk through it trying
+            // to unset all values
+            foreach ($error_code as $key => $error) {
+                $deleted =  $this->_checkDelExpect($error) ? true : false;
             }
+
             return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
         } elseif (!empty($error_code)) {
             // $error_code comes alone, trying to unset it
             if ($this->_checkDelExpect($error_code)) {
                 return true;
-            } else {
-                return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
             }
-        } else {
-            // $error_code is empty
-            return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
+
+            return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
         }
+
+        // $error_code is empty
+        return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
     }
 
-    // }}}
-    // {{{ raiseError()
-
     /**
      * This method is a wrapper that returns an instance of the
      * configured error class with this object's default error
@@ -446,10 +440,10 @@
      *
      * @param mixed $message a text error message or a PEAR error object
      *
-     * @param int $code a numeric error code (it is up to your class
+     * @param int $code      a numeric error code (it is up to your class
      *                  to define these if you want to use codes)
      *
-     * @param int $mode One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
+     * @param int $mode      One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
      *                  PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
      *                  PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
      *
@@ -471,7 +465,7 @@
      *                  the error message parameter will be dropped.
      *
      * @access public
-     * @return object a PEAR error object
+     * @return object   a PEAR error object
      * @see PEAR::setErrorHandling
      * @since PHP 4.0.5
      */
@@ -488,22 +482,30 @@
             $code        = $message->getCode();
             $userinfo    = $message->getUserInfo();
             $error_class = $message->getType();
+            $message->error_message_prefix = '';
             $message     = $message->getMessage();
         }
 
-        if (isset($this) && isset($this->_expected_errors) && sizeof($this->_expected_errors) > 0 && sizeof($exp = end($this->_expected_errors))) {
+        if (
+            isset($this) &&
+            isset($this->_expected_errors) &&
+            count($this->_expected_errors) > 0 &&
+            count($exp = end($this->_expected_errors))
+        ) {
             if ($exp[0] == "*" ||
                 (is_int(reset($exp)) && in_array($code, $exp)) ||
-                (is_string(reset($exp)) && in_array($message, $exp))) {
+                (is_string(reset($exp)) && in_array($message, $exp))
+            ) {
                 $mode = PEAR_ERROR_RETURN;
             }
         }
+
         // 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;
+                $mode    = $this->_default_error_mode;
+                $options = $this->_default_error_options;
             // Global error handler
             } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
                 $mode    = $GLOBALS['_PEAR_default_error_mode'];
@@ -518,62 +520,145 @@
         } 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) {
-            return new $ec($code, $mode, $options, $userinfo);
+            $a = new $ec($code, $mode, $options, $userinfo);
         } else {
-            return new $ec($message, $code, $mode, $options, $userinfo);
+            $a = new $ec($message, $code, $mode, $options, $userinfo);
         }
+
+        return $a;
     }
 
-    // }}}
-    // {{{ throwError()
-
     /**
      * Simpler form of raiseError with fewer options.  In most cases
      * message, code and userinfo are enough.
      *
-     * @param string $message
+     * @param mixed $message a text error message or a PEAR error object
      *
+     * @param int $code      a numeric error code (it is up to your class
+     *                  to define these if you want to use codes)
+     *
+     * @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)
+    function &throwError($message = null, $code = null, $userinfo = null)
     {
-        if (isset($this) && is_subclass_of($this, 'PEAR_Error')) {
-            return $this->raiseError($message, $code, null, null, $userinfo);
-        } else {
-            return PEAR::raiseError($message, $code, null, null, $userinfo);
+        if (isset($this) && is_a($this, 'PEAR')) {
+            $a = &$this->raiseError($message, $code, null, null, $userinfo);
+            return $a;
         }
+
+        $a = &PEAR::raiseError($message, $code, null, null, $userinfo);
+        return $a;
     }
 
-    // }}}
-    // {{{ pushErrorHandling()
+    function staticPushErrorHandling($mode, $options = null)
+    {
+        $stack       = &$GLOBALS['_PEAR_error_handler_stack'];
+        $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
+        $def_options = &$GLOBALS['_PEAR_default_error_options'];
+        $stack[] = array($def_mode, $def_options);
+        switch ($mode) {
+            case PEAR_ERROR_EXCEPTION:
+            case PEAR_ERROR_RETURN:
+            case PEAR_ERROR_PRINT:
+            case PEAR_ERROR_TRIGGER:
+            case PEAR_ERROR_DIE:
+            case null:
+                $def_mode = $mode;
+                $def_options = $options;
+                break;
 
+            case PEAR_ERROR_CALLBACK:
+                $def_mode = $mode;
+                // class/object method callback
+                if (is_callable($options)) {
+                    $def_options = $options;
+                } else {
+                    trigger_error("invalid error callback", E_USER_WARNING);
+                }
+                break;
+
+            default:
+                trigger_error("invalid error mode", E_USER_WARNING);
+                break;
+        }
+        $stack[] = array($mode, $options);
+        return true;
+    }
+
+    function staticPopErrorHandling()
+    {
+        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
+        $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
+        $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
+        array_pop($stack);
+        list($mode, $options) = $stack[sizeof($stack) - 1];
+        array_pop($stack);
+        switch ($mode) {
+            case PEAR_ERROR_EXCEPTION:
+            case PEAR_ERROR_RETURN:
+            case PEAR_ERROR_PRINT:
+            case PEAR_ERROR_TRIGGER:
+            case PEAR_ERROR_DIE:
+            case null:
+                $setmode = $mode;
+                $setoptions = $options;
+                break;
+
+            case PEAR_ERROR_CALLBACK:
+                $setmode = $mode;
+                // class/object method callback
+                if (is_callable($options)) {
+                    $setoptions = $options;
+                } else {
+                    trigger_error("invalid error callback", E_USER_WARNING);
+                }
+                break;
+
+            default:
+                trigger_error("invalid error mode", E_USER_WARNING);
+                break;
+        }
+        return true;
+    }
+
     /**
-    * Push a new error handler on top of the error handler options stack. With this
+     * Push a new error handler on top of the error handler options stack. With this
      * you can easily override the actual error handler for some code and restore
-    * it later with popErrorHandling.
-    *
-     * @param mixed $mode    (same as setErrorHandling)
+     * it later with popErrorHandling.
+     *
+     * @param mixed $mode (same as setErrorHandling)
      * @param mixed $options (same as setErrorHandling)
-    *
-    * @return bool Always true
-    *
-    * @see PEAR::setErrorHandling
-    */
+     *
+     * @return bool Always true
+     *
+     * @see PEAR::setErrorHandling
+     */
     function pushErrorHandling($mode, $options = null)
     {
         $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-            if (isset($this)) {
-                $def_mode = &$this->_default_error_mode;
-                $def_options = &$this->_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')) {
+            $def_mode    = &$this->_default_error_mode;
+            $def_options = &$this->_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)) {
+        if (isset($this) && is_a($this, 'PEAR')) {
             $this->setErrorHandling($mode, $options);
         } else {
             PEAR::setErrorHandling($mode, $options);
@@ -582,9 +667,6 @@
         return true;
     }
 
-    // }}}
-    // {{{ popErrorHandling()
-
     /**
     * Pop the last error handler used
     *
@@ -598,7 +680,7 @@
         array_pop($stack);
         list($mode, $options) = $stack[sizeof($stack) - 1];
         array_pop($stack);
-        if (isset($this)) {
+        if (isset($this) && is_a($this, 'PEAR')) {
             $this->setErrorHandling($mode, $options);
         } else {
             PEAR::setErrorHandling($mode, $options);
@@ -606,9 +688,6 @@
         return true;
     }
 
-    // }}}
-    // {{{ loadExtension()
-
     /**
     * OS independant PHP extension load. Remember to take care
     * on the correct extension name for case sensitive OSes.
@@ -618,28 +697,39 @@
     */
     function loadExtension($ext)
     {
-        if (!extension_loaded($ext)) {
-            if (OS_WINDOWS) {
-                $suffix = '.dll';
-            } elseif (PHP_OS == 'HP-UX') {
-                $suffix = '.sl';
-            } elseif (PHP_OS == 'AIX') {
-                $suffix = '.a';
-            } elseif (PHP_OS == 'OSX') {
-                $suffix = '.bundle';
-            } else {
-                $suffix = '.so';
-            }
-            return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
+        if (extension_loaded($ext)) {
+            return true;
         }
-        return true;
+
+        // 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
+        ) {
+            return false;
+        }
+
+        if (OS_WINDOWS) {
+            $suffix = '.dll';
+        } elseif (PHP_OS == 'HP-UX') {
+            $suffix = '.sl';
+        } elseif (PHP_OS == 'AIX') {
+            $suffix = '.a';
+        } elseif (PHP_OS == 'OSX') {
+            $suffix = '.bundle';
+        } else {
+            $suffix = '.so';
+        }
+
+        return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
     }
+}
 
-    // }}}
+if (PEAR_ZE2) {
+    include_once 'PEAR5.php';
 }
 
-// {{{ _PEAR_call_destructors()
-
 function _PEAR_call_destructors()
 {
     global $_PEAR_destructor_object_list;
@@ -647,6 +737,16 @@
         sizeof($_PEAR_destructor_object_list))
     {
         reset($_PEAR_destructor_object_list);
+        if (PEAR_ZE2) {
+            $destructLifoExists = PEAR5::getStaticProperty('PEAR', 'destructlifo');
+        } else {
+            $destructLifoExists = PEAR::getStaticProperty('PEAR', 'destructlifo');
+        }
+
+        if ($destructLifoExists) {
+            $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
+        }
+
         while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
             $classname = get_class($objref);
             while ($classname) {
@@ -665,19 +765,36 @@
     }
 
     // Now call the shutdown functions
-    if (is_array($GLOBALS['_PEAR_shutdown_funcs']) AND !empty($GLOBALS['_PEAR_shutdown_funcs'])) {
+    if (
+        isset($GLOBALS['_PEAR_shutdown_funcs']) &&
+        is_array($GLOBALS['_PEAR_shutdown_funcs']) &&
+        !empty($GLOBALS['_PEAR_shutdown_funcs'])
+    ) {
         foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
             call_user_func_array($value[0], $value[1]);
         }
     }
 }
 
-// }}}
-
+/**
+ * Standard PEAR error class for PHP 4
+ *
+ * This class is supserseded by {@link PEAR_Exception} in PHP 5
+ *
+ * @category   pear
+ * @package    PEAR
+ * @author     Stig Bakken <ss...@ph...>
+ * @author     Tomas V.V. Cox <co...@id...>
+ * @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.4
+ * @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
+ */
 class PEAR_Error
 {
-    // {{{ properties
-
     var $error_message_prefix = '';
     var $mode                 = PEAR_ERROR_RETURN;
     var $level                = E_USER_NOTICE;
@@ -686,21 +803,18 @@
     var $userinfo             = '';
     var $backtrace            = null;
 
-    // }}}
-    // {{{ constructor
-
     /**
      * PEAR_Error constructor
      *
-     * @param string $message message
+     * @param string $message  message
      *
-     * @param int $code (optional) error code
+     * @param int $code     (optional) error code
      *
-     * @param int $mode (optional) error mode, one of: PEAR_ERROR_RETURN,
+     * @param int $mode     (optional) error mode, one of: PEAR_ERROR_RETURN,
      * PEAR_ERROR_PRINT, PEAR_ERROR_DIE, PEAR_ERROR_TRIGGER,
      * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION
      *
-     * @param mixed $options (optional) error level, _OR_ in the case of
+     * @param mixed $options   (optional) error level, _OR_ in the case of
      * PEAR_ERROR_CALLBACK, the callback function or object/method
      * tuple.
      *
@@ -719,9 +833,20 @@
         $this->code      = $code;
         $this->mode      = $mode;
         $this->userinfo  = $userinfo;
-        if (function_exists("debug_backtrace")) {
+
+        if (PEAR_ZE2) {
+            $skiptrace = PEAR5::getStaticProperty('PEAR_Error', 'skiptrace');
+        } else {
+            $skiptrace = PEAR::getStaticProperty('PEAR_Error', 'skiptrace');
+        }
+
+        if (!$skiptrace) {
             $this->backtrace = debug_backtrace();
+            if (isset($this->backtrace[0]) && isset($this->backtrace[0]['object'])) {
+                unset($this->backtrace[0]['object']);
+            }
         }
+
         if ($mode & PEAR_ERROR_CALLBACK) {
             $this->level = E_USER_NOTICE;
             $this->callback = $options;
@@ -729,20 +854,25 @@
             if ($options === null) {
                 $options = E_USER_NOTICE;
             }
+
             $this->level = $options;
             $this->callback = null;
         }
+
         if ($this->mode & PEAR_ERROR_PRINT) {
             if (is_null($options) || is_int($options)) {
                 $format = "%s";
             } else {
                 $format = $options;
             }
+
             printf($format, $this->getMessage());
         }
+
         if ($this->mode & PEAR_ERROR_TRIGGER) {
             trigger_error($this->getMessage(), $this->level);
         }
+
         if ($this->mode & PEAR_ERROR_DIE) {
             $msg = $this->getMessage();
             if (is_null($options) || is_int($options)) {
@@ -755,56 +885,43 @@
             }
             die(sprintf($format, $msg));
         }
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_string($this->callback) && strlen($this->callback)) {
-                call_user_func($this->callback, $this);
-            } elseif (is_array($this->callback) &&
-                      sizeof($this->callback) == 2 &&
-                      is_object($this->callback[0]) &&
-                      is_string($this->callback[1]) &&
-                      strlen($this->callback[1])) {
-                      @call_user_func($this->callback, $this);
-            }
-            }
-        if (PEAR_ZE2 && $this->mode & PEAR_ERROR_EXCEPTION) {
-            eval('throw $this;');
+
+        if ($this->mode & PEAR_ERROR_CALLBACK && is_callable($this->callback)) {
+            call_user_func($this->callback, $this);
         }
+
+        if ($this->mode & PEAR_ERROR_EXCEPTION) {
+            trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions", E_USER_WARNING);
+            eval('$e = new Exception($this->message, $this->code);throw($e);');
+        }
     }
 
-    // }}}
-    // {{{ getMode()
-
     /**
      * Get the error mode from an error object.
      *
      * @return int error mode
      * @access public
      */
-    function getMode() {
+    function getMode()
+    {
         return $this->mode;
     }
 
-    // }}}
-    // {{{ getCallback()
-
     /**
      * Get the callback function/method from an error object.
      *
      * @return mixed callback function or object/method array
      * @access public
      */
-    function getCallback() {
+    function getCallback()
+    {
         return $this->callback;
     }
 
-    // }}}
-    // {{{ getMessage()
-
-
     /**
      * Get the error message from an error object.
      *
-     * @return string full error message
+     * @return  string  full error message
      * @access public
      */
     function getMessage()
@@ -812,10 +929,6 @@
         return ($this->error_message_prefix . $this->message);
     }
 
-
-    // }}}
-    // {{{ getCode()
-
     /**
      * Get error code from an error object
      *
@@ -827,9 +940,6 @@
         return $this->code;
      }
 
-    // }}}
-    // {{{ getType()
-
     /**
      * Get the name of this error/exception.
      *
@@ -841,9 +951,6 @@
         return get_class($this);
     }
 
-    // }}}
-    // {{{ getUserInfo()
-
     /**
      * Get additional user-supplied information.
      *
@@ -855,9 +962,6 @@
         return $this->userinfo;
     }
 
-    // }}}
-    // {{{ getDebugInfo()
-
     /**
      * Get additional debug information supplied by the application.
      *
@@ -869,28 +973,25 @@
         return $this->getUserInfo();
     }
 
-    // }}}
-    // {{{ getBacktrace()
-
     /**
      * Get the call backtrace from where the error was generated.
      * Supported with PHP 4.3.0 or newer.
      *
-     * @param  int   $frame (optional) what frame to fetch
+     * @param int $frame (optional) what frame to fetch
      * @return array Backtrace, or NULL if not available.
      * @access public
      */
     function getBacktrace($frame = null)
     {
+        if (defined('PEAR_IGNORE_BACKTRACE')) {
+            return null;
+        }
         if ($frame === null) {
             return $this->backtrace;
         }
         return $this->backtrace[$frame];
     }
 
-    // }}}
-    // {{{ addUserInfo()
-
     function addUserInfo($info)
     {
         if (empty($this->userinfo)) {
@@ -900,8 +1001,10 @@
         }
     }
 
-    // }}}
-    // {{{ toString()
+    function __toString()
+    {
+        return $this->getMessage();
+    }
 
     /**
      * Make a string representation of this object.
@@ -909,21 +1012,24 @@
      * @return string a string with an object summary
      * @access public
      */
-    function toString() {
+    function toString()
+    {
         $modes = array();
         $levels = array(E_USER_NOTICE  => 'notice',
                         E_USER_WARNING => 'warning',
                         E_USER_ERROR   => 'error');
         if ($this->mode & PEAR_ERROR_CALLBACK) {
             if (is_array($this->callback)) {
-                $callback = get_class($this->callback[0]) . '::' .
+                $callback = (is_object($this->callback[0]) ?
+                    strtolower(get_class($this->callback[0])) :
+                    $this->callback[0]) . '::' .
                     $this->callback[1];
             } else {
                 $callback = $this->callback;
             }
             return sprintf('[%s: message="%s" code=%d mode=callback '.
                            'callback=%s prefix="%s" info="%s"]',
-                           get_class($this), $this->message, $this->code,
+                           strtolower(get_class($this)), $this->message, $this->code,
                            $callback, $this->error_message_prefix,
                            $this->userinfo);
         }
@@ -941,21 +1047,17 @@
         }
         return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
                        'prefix="%s" info="%s"]',
-                       get_class($this), $this->message, $this->code,
+                       strtolower(get_class($this)), $this->message, $this->code,
                        implode("|", $modes), $levels[$this->level],
                        $this->error_message_prefix,
                        $this->userinfo);
     }
-
-    // }}}
 }
 
-register_shutdown_function("_PEAR_call_destructors");
-
 /*
  * Local Variables:
  * mode: php
- * tab-width: 8
+ * tab-width: 4
  * c-basic-offset: 4
  * End:
  */

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

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

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

Revision: 8492
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8492&view=rev
Author:   vargenau
Date:     2012-11-19 17:07:29 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
Update locale

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	2012-11-19 17:02:07 UTC (rev 8491)
+++ trunk/locale/po/de.po	2012-11-19 17:07:29 UTC (rev 8492)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-15 17:50+0100\n"
+"POT-Creation-Date: 2012-11-19 18:05+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."
@@ -141,11 +141,11 @@
 msgid "Previous Author"
 msgstr "Voriger Autor"
 
-#: ../lib/diff.php:329 ../lib/plugin/Diff.php:176
+#: ../lib/diff.php:329 ../lib/plugin/Diff.php:175
 msgid "Newer page:"
 msgstr "Neuere Seite:"
 
-#: ../lib/diff.php:331 ../lib/plugin/Diff.php:178
+#: ../lib/diff.php:331 ../lib/plugin/Diff.php:177
 msgid "Older page:"
 msgstr "Ältere Seite:"
 
@@ -185,9 +185,9 @@
 # Änderungen"; in terms of newspapers or journalism it's traditionally
 # "NeuesteNachrichten" or much more better "DasNeueste").
 #: ../lib/display.php:172 ../lib/display.php:413 ../lib/loadsave.php:1576
-#: ../lib/plugin/RecentChanges.php:64 ../lib/plugin/RecentChanges.php:230
-#: ../lib/plugin/RecentChanges.php:237 ../lib/plugin/RecentChanges.php:440
-#: ../lib/plugin/RecentChanges.php:751 ../lib/plugin/RecentChanges.php:1280
+#: ../lib/plugin/RecentChanges.php:64 ../lib/plugin/RecentChanges.php:229
+#: ../lib/plugin/RecentChanges.php:236 ../lib/plugin/RecentChanges.php:439
+#: ../lib/plugin/RecentChanges.php:749 ../lib/plugin/RecentChanges.php:1278
 #: ../lib/RSSWriter091.php:110 ../themes/blog/templates/actionbar.tmpl:10
 #: ../themes/Crao/templates/head.tmpl:53
 #: ../themes/Crao/templates/navbar.tmpl:11
@@ -207,7 +207,7 @@
 msgstr "NeuesteÄnderungen"
 
 #: ../lib/display.php:209 ../lib/display.php:452
-#: ../lib/plugin/FileInfo.php:156 ../lib/TextSearchQuery.php:116
+#: ../lib/plugin/FileInfo.php:156 ../lib/TextSearchQuery.php:115
 #, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr "Nicht unterstütztes Argument: %s=%s"
@@ -393,7 +393,7 @@
 "in your %s, you will get a notification of approval or rejection."
 msgstr ""
 
-#: ../lib/editpage.php:592 ../lib/editpage.php:958
+#: ../lib/editpage.php:592 ../lib/editpage.php:956
 #, php-format
 msgid ""
 "Some of the changes could not automatically be combined.  Please look for "
@@ -405,15 +405,15 @@
 "enden. Sie müssen diese Teile von Hand bearbeiten, bevor Sie auf Speichern "
 "klicken."
 
-#: ../lib/editpage.php:596 ../lib/editpage.php:961
+#: ../lib/editpage.php:596 ../lib/editpage.php:959
 msgid "Please check it through before saving."
 msgstr "Bitte überprüfen Sie erst alles, bevor Sie es abspeichern."
 
-#: ../lib/editpage.php:606
+#: ../lib/editpage.php:605
 msgid "Conflicting Edits!"
 msgstr "Widersprechende Änderungen!"
 
-#: ../lib/editpage.php:607
+#: ../lib/editpage.php:606
 msgid ""
 "In the time since you started editing this page, another user has saved a "
 "new version of it."
@@ -421,7 +421,7 @@
 "Während der Zeit, seit Sie mit der Bearbeitung dieser Seite begonnen haben, "
 "hat ein anderer Benutzer bereits eine neuere Version gespeichert."
 
-#: ../lib/editpage.php:608
+#: ../lib/editpage.php:607
 msgid ""
 "Your changes can not be saved as they are, since doing so would overwrite "
 "the other author's changes. So, your changes and those of the other author "
@@ -432,50 +432,50 @@
 "überschrieben. Deshalb sind Ihre und die Änderungen des anderen Autors "
 "miteinander kombiniert worden. Das Ergebnis sehen Sie unten."
 
-#: ../lib/editpage.php:679 ../lib/plugin/HtmlConverter.php:70
+#: ../lib/editpage.php:677 ../lib/plugin/HtmlConverter.php:70
 msgid "Convert"
 msgstr "Konvertieren"
 
-#: ../lib/editpage.php:708 ../lib/EditToolbar.php:214
+#: ../lib/editpage.php:706 ../lib/EditToolbar.php:214
 #: ../lib/EditToolbar.php:216 ../lib/WysiwygEdit/Wikiwyg.php:82
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../lib/editpage.php:715 ../lib/EditToolbar.php:207
+#: ../lib/editpage.php:713 ../lib/EditToolbar.php:207
 #: ../lib/EditToolbar.php:209 ../lib/WysiwygEdit/Wikiwyg.php:83
 msgid "Save"
 msgstr "Speichern"
 
-#: ../lib/editpage.php:719
+#: ../lib/editpage.php:717
 msgid "Changes"
 msgstr "Änderungen"
 
-#: ../lib/editpage.php:723 ../lib/plugin/UpLoad.php:165
+#: ../lib/editpage.php:721 ../lib/plugin/UpLoad.php:165
 #: ../lib/plugin/UpLoad.php:170 ../lib/plugin/WikiForm.php:98
 msgid "Upload"
 msgstr "Hochladen"
 
-#: ../lib/editpage.php:726
+#: ../lib/editpage.php:724
 msgid "Spell Check"
 msgstr ""
 
-#: ../lib/editpage.php:749 ../themes/Portland/templates/editpage.tmpl:36
+#: ../lib/editpage.php:747 ../themes/Portland/templates/editpage.tmpl:36
 #: ../themes/Wordpress/templates/editpage.tmpl:52
 #, php-format
 msgid "Author will be logged as %s."
 msgstr "%s wird als Autor aufgenommen."
 
-#: ../lib/editpage.php:912
+#: ../lib/editpage.php:910
 msgid "Keep old"
 msgstr ""
 
-#: ../lib/editpage.php:915
+#: ../lib/editpage.php:913
 msgid "Overwrite with new"
 msgstr ""
 
 # (Wrong Translation; sorry, but the German term for edit is NOT
 # editieren, but  e d i e r e n).
-#: ../lib/editpage.php:925
+#: ../lib/editpage.php:923
 #, php-format
 msgid "Merge and Edit: %s"
 msgstr "Zusammenfügen und Bearbeiten: %s"
@@ -516,7 +516,7 @@
 
 #: ../lib/EditToolbar.php:59 ../lib/plugin/SyncWiki.php:308
 #: ../lib/plugin/SyncWiki.php:335 ../lib/plugin/SyncWiki.php:359
-#: ../lib/plugin/WikiPoll.php:228 ../lib/stdlib.php:2003
+#: ../lib/plugin/WikiPoll.php:228 ../lib/stdlib.php:1997
 #: ../lib/upgrade.php:201 ../lib/upgrade.php:407 ../lib/upgrade.php:421
 #: ../lib/upgrade.php:441 ../lib/upgrade.php:450 ../lib/upgrade.php:474
 #: ../lib/upgrade.php:502 ../lib/upgrade.php:551 ../lib/upgrade.php:554
@@ -726,7 +726,7 @@
 msgid "Illegal character '%s' in page name."
 msgstr "Ungültiges Zeichen '%s' in Seitenname."
 
-#: ../lib/InlineParser.php:979
+#: ../lib/InlineParser.php:978
 #, php-format
 msgid "unknown color %s ignored"
 msgstr "unbekannte Farbe %s ignoriert"
@@ -856,7 +856,7 @@
 msgstr "gespeichert als %s"
 
 #: ../lib/loadsave.php:391 ../lib/loadsave.php:710
-#: ../lib/plugin/text2png.php:227
+#: ../lib/plugin/text2png.php:226
 #, php-format
 msgid "couldn't open file '%s' for writing"
 msgstr "Datei »%s« konnte nicht zum Schreiben geöffnet werden"
@@ -901,7 +901,7 @@
 msgstr "von %s"
 
 #: ../lib/loadsave.php:984 ../lib/MailNotify.php:313
-#: ../lib/plugin/RecentChanges.php:150
+#: ../lib/plugin/RecentChanges.php:149
 msgid "New page"
 msgstr "Neue Seite"
 
@@ -1038,7 +1038,7 @@
 msgid "Default InterWiki map file not loaded."
 msgstr "Standard-Datei der InterWikiListe nicht geladen."
 
-#: ../lib/loadsave.php:1170 ../lib/PageType.php:330
+#: ../lib/loadsave.php:1170 ../lib/PageType.php:329
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr "Die InterWikiListe wird von der externen Datei %s geladen."
@@ -1125,7 +1125,7 @@
 msgstr "Seite gelöscht %s von Benutzer %s"
 
 #: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
-#: ../lib/WikiUserNew.php:1857
+#: ../lib/WikiUserNew.php:1855
 msgid "E-mail address confirmation"
 msgstr "E-Mail Bestätigung"
 
@@ -1144,7 +1144,7 @@
 "will expire at %s."
 msgstr ""
 
-#: ../lib/main.php:111 ../lib/WikiDB.php:1064
+#: ../lib/main.php:111 ../lib/WikiDB.php:1063
 msgid "Optimizing database"
 msgstr "Datenbank wird optimiert"
 
@@ -1413,7 +1413,7 @@
 msgid "FullTextSearch"
 msgstr "VolltextSuche"
 
-#: ../lib/main.php:1179 ../lib/plugin/RecentChanges.php:900
+#: ../lib/main.php:1179 ../lib/plugin/RecentChanges.php:898
 #: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1522
 #: ../themes/Crao/templates/navbar.tmpl:2
 #: ../themes/Crao/templates/navbar.tmpl:6
@@ -1428,7 +1428,7 @@
 msgid "TitleSearch"
 msgstr "TitelSuche"
 
-#: ../lib/main.php:1375 ../lib/main.php:1388 ../lib/Request.php:877
+#: ../lib/main.php:1375 ../lib/main.php:1388 ../lib/Request.php:876
 #, php-format
 msgid "%s is not writable."
 msgstr "%s is nicht änderbar."
@@ -1437,7 +1437,7 @@
 msgid "The session.save_path directory"
 msgstr "Das session.save_path Verzeichnis"
 
-#: ../lib/main.php:1378 ../lib/Request.php:879
+#: ../lib/main.php:1378 ../lib/Request.php:878
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
@@ -1722,7 +1722,7 @@
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
 msgstr "ACHTUNG: Die InterWikiListe Seite ist ungesperrt. Ignoriert."
 
-#: ../lib/PageType.php:289 ../lib/PageType.php:292 ../lib/stdlib.php:854
+#: ../lib/PageType.php:288 ../lib/PageType.php:291 ../lib/stdlib.php:854
 #: ../themes/default/templates/navbar.tmpl:5
 #: ../themes/default/templates/navbar.tmpl:7
 #: ../themes/fusionforge/templates/actionbar.tmpl:13
@@ -1738,11 +1738,11 @@
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../lib/PageType.php:439
+#: ../lib/PageType.php:437
 msgid "Moniker"
 msgstr "Kurzname"
 
-#: ../lib/PageType.php:440
+#: ../lib/PageType.php:438
 msgid "InterWiki Address"
 msgstr "InterWiki-Adresse"
 
@@ -1914,7 +1914,7 @@
 msgid "hours"
 msgstr "Stunden"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:242 ../lib/plugin/VisualWiki.php:520
+#: ../lib/plugin/AnalyseAccessLogSql.php:242 ../lib/plugin/VisualWiki.php:517
 msgid "days"
 msgstr "Tage"
 
@@ -2392,23 +2392,23 @@
 msgid "Display differences between revisions"
 msgstr "Zeilenweiser Vergleich der Versionen"
 
-#: ../lib/plugin/Diff.php:186
+#: ../lib/plugin/Diff.php:185
 msgid "Content of versions "
 msgstr ""
 
-#: ../lib/plugin/Diff.php:187
+#: ../lib/plugin/Diff.php:186
 msgid " and "
 msgstr " und  "
 
-#: ../lib/plugin/Diff.php:187
+#: ../lib/plugin/Diff.php:186
 msgid " is identical."
 msgstr " sind identisch."
 
-#: ../lib/plugin/Diff.php:192
+#: ../lib/plugin/Diff.php:191
 msgid "Version "
 msgstr "Version "
 
-#: ../lib/plugin/Diff.php:193
+#: ../lib/plugin/Diff.php:192
 msgid " was created because: "
 msgstr ""
 
@@ -2429,7 +2429,7 @@
 #: ../lib/plugin/DynamicIncludePage.php:81
 #: ../lib/plugin/DynamicIncludePage.php:82
 #: ../lib/plugin/NewPagesPerUser.php:113 ../lib/plugin/NewPagesPerUser.php:114
-#: ../lib/plugin/RecentChanges.php:1491 ../lib/plugin/RecentChanges.php:1492
+#: ../lib/plugin/RecentChanges.php:1487 ../lib/plugin/RecentChanges.php:1488
 #: ../themes/Sidebar/themeinfo.php:59 ../themes/Sidebar/themeinfo.php:60
 msgid "Click to hide/show"
 msgstr "Hier klicken um zu verstecken"
@@ -2443,22 +2443,22 @@
 msgid "Edit metadata for %s"
 msgstr "Meta-Daten für %s bearbeiten"
 
-#: ../lib/plugin/EditMetaData.php:131
+#: ../lib/plugin/EditMetaData.php:130
 #, php-format
 msgid "No metadata for %s"
 msgstr "Keine Meta-Daten für %s"
 
-#: ../lib/plugin/EditMetaData.php:144
+#: ../lib/plugin/EditMetaData.php:143
 msgid ""
 "Add or change a page-level metadata 'key=>value' pair. Note that you can "
 "remove a key by leaving the value-box empty."
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:147 ../lib/upgrade.php:801
+#: ../lib/plugin/EditMetaData.php:146 ../lib/upgrade.php:801
 msgid "Submit"
 msgstr "Eingeben"
 
-#: ../lib/plugin/EditMetaData.php:162
+#: ../lib/plugin/EditMetaData.php:161
 msgid "Requires WikiAdmin privileges to edit."
 msgstr "Verlangt Administratorenrechte zur Bearbeitung."
 
@@ -2584,8 +2584,8 @@
 msgstr "Rekursiver Selbstaufruf der URL %s"
 
 #: ../lib/plugin/FrameInclude.php:112 ../lib/plugin/SemanticSearch.php:295
-#: ../lib/plugin/TeX2png.php:234 ../lib/plugin/text2png.php:85
-#: ../lib/plugin/text2png.php:172
+#: ../lib/plugin/TeX2png.php:234 ../lib/plugin/text2png.php:84
+#: ../lib/plugin/text2png.php:171
 #, php-format
 msgid "See %s"
 msgstr "Siehe %s"
@@ -2609,7 +2609,7 @@
 msgid "Ignored stoplist words '%s'"
 msgstr ""
 
-#: ../lib/plugin/FullTextSearch.php:175 ../lib/plugin/WantedPages.php:186
+#: ../lib/plugin/FullTextSearch.php:173 ../lib/plugin/WantedPages.php:186
 #, php-format
 msgid "(%d Links)"
 msgstr "(%d Verweise)"
@@ -2641,11 +2641,11 @@
 msgid "No fuzzy matches with '%s'"
 msgstr ""
 
-#: ../lib/plugin/FuzzyPages.php:183
+#: ../lib/plugin/FuzzyPages.php:182
 msgid "Spelling Score"
 msgstr "Buchstabierende"
 
-#: ../lib/plugin/FuzzyPages.php:184
+#: ../lib/plugin/FuzzyPages.php:183
 msgid "Sound Score"
 msgstr "Aussprachliche"
 
@@ -2843,7 +2843,7 @@
 msgid "Wiki Name"
 msgstr "Name des Wikis"
 
-#: ../lib/plugin/InterWikiSearch.php:96 ../lib/plugin/RecentChanges.php:897
+#: ../lib/plugin/InterWikiSearch.php:96 ../lib/plugin/RecentChanges.php:895
 #: ../lib/plugin/SemanticSearchAdvanced.php:113
 #: ../themes/Crao/templates/navbar.tmpl:40
 #: ../themes/Crao/templates/navbar.tmpl:42
@@ -3289,7 +3289,7 @@
 msgid "Contents"
 msgstr "Inhalt"
 
-#: ../lib/plugin/PageGroup.php:92 ../lib/stdlib.php:2243
+#: ../lib/plugin/PageGroup.php:92 ../lib/stdlib.php:2237
 #, php-format
 msgid "<%s: no such section>"
 msgstr "<%s: unbekannte Sektion>"
@@ -3356,7 +3356,7 @@
 msgid "Version %d"
 msgstr "Version %d."
 
-#: ../lib/plugin/PageHistory.php:193 ../lib/plugin/RecentChanges.php:525
+#: ../lib/plugin/PageHistory.php:193 ../lib/plugin/RecentChanges.php:524
 #: ../themes/default/templates/info.tmpl:15
 #: ../themes/default/templates/info.tmpl:19
 #: ../themes/MacOSX/lib/RecentChanges.php:35
@@ -3820,7 +3820,7 @@
 msgstr "%s wird/werden nur in gesperrten Seiten erlaubt."
 
 #: ../lib/plugin/RecentChanges.php:53 ../lib/plugin/RecentChanges.php:59
-#: ../lib/plugin/RecentChanges.php:582
+#: ../lib/plugin/RecentChanges.php:581
 msgid "UserContribs"
 msgstr "BenutzerBewertungen"
 
@@ -3834,206 +3834,206 @@
 msgstr ""
 
 # KleineÄnderungen?
-#: ../lib/plugin/RecentChanges.php:63 ../lib/plugin/RecentChanges.php:440
-#: ../lib/plugin/RecentChanges.php:751 ../lib/plugin/RecentEdits.php:30
+#: ../lib/plugin/RecentChanges.php:63 ../lib/plugin/RecentChanges.php:439
+#: ../lib/plugin/RecentChanges.php:749 ../lib/plugin/RecentEdits.php:30
 #: ../lib/plugin/RecentEdits.php:58 ../lib/plugin/RelatedChanges.php:47
 #: ../themes/Portland/templates/editpage.tmpl:40
 #: ../themes/Wordpress/templates/editpage.tmpl:57
 msgid "RecentEdits"
 msgstr "GeringfügigeÄnderungen"
 
-#: ../lib/plugin/RecentChanges.php:148
+#: ../lib/plugin/RecentChanges.php:147
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: ../lib/plugin/RecentChanges.php:173
+#: ../lib/plugin/RecentChanges.php:172
 #: ../themes/SpaceWiki/lib/RecentChanges.php:60
 msgid "diff"
 msgstr "diff"
 
-#: ../lib/plugin/RecentChanges.php:188
+#: ../lib/plugin/RecentChanges.php:187
 msgid "hist"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:234
+#: ../lib/plugin/RecentChanges.php:233
 msgid "contribs"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:241
+#: ../lib/plugin/RecentChanges.php:240
 msgid "new pages"
 msgstr "neue Seiten"
 
-#: ../lib/plugin/RecentChanges.php:325
+#: ../lib/plugin/RecentChanges.php:324
 msgid "edits"
 msgstr "Änderungen"
 
-#: ../lib/plugin/RecentChanges.php:327
+#: ../lib/plugin/RecentChanges.php:326
 msgid "major edits"
 msgstr "Größere Änderungen"
 
-#: ../lib/plugin/RecentChanges.php:328
+#: ../lib/plugin/RecentChanges.php:327
 msgid "minor edits"
 msgstr "Kleinere Änderungen"
 
-#: ../lib/plugin/RecentChanges.php:329 ../lib/plugin/RecentChanges.php:431
+#: ../lib/plugin/RecentChanges.php:328 ../lib/plugin/RecentChanges.php:430
 #: ../lib/plugin/RecentComments.php:50
 msgid "Recent Comments"
 msgstr "Neueste Kommentare"
 
-#: ../lib/plugin/RecentChanges.php:330
+#: ../lib/plugin/RecentChanges.php:329
 msgid "comments"
 msgstr "Kommentare"
 
 # Erzeugen??
-#: ../lib/plugin/RecentChanges.php:332
+#: ../lib/plugin/RecentChanges.php:331
 msgid "created new pages"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:338
+#: ../lib/plugin/RecentChanges.php:337
 #, php-format
 msgid " for pages changed by %s"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:344
+#: ../lib/plugin/RecentChanges.php:343
 #, php-format
 msgid " for pages owned by %s"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:347
+#: ../lib/plugin/RecentChanges.php:346
 #, php-format
 msgid " for all pages linking to %s"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:350
+#: ../lib/plugin/RecentChanges.php:349
 #, php-format
 msgid " for all pages matching '%s'"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:375
+#: ../lib/plugin/RecentChanges.php:374
 #, php-format
 msgid "The %d most recent %s during the past day are listed below."
 msgstr "Die %d jüngste %s innerhalb des letzten Tages sind unten aufgelistet."
 
-#: ../lib/plugin/RecentChanges.php:378
+#: ../lib/plugin/RecentChanges.php:377
 #, php-format
 msgid "The %d most recent %s during the past %s days are listed below."
 msgstr ""
 "Die %d jüngste %s innerhalb der letzten %s Tage sind unten aufgelistet."
 
-#: ../lib/plugin/RecentChanges.php:381
+#: ../lib/plugin/RecentChanges.php:380
 #, php-format
 msgid "The %d most recent %s are listed below."
 msgstr "Die %d jüngste %s sind unten aufgelistet."
 
-#: ../lib/plugin/RecentChanges.php:386
+#: ../lib/plugin/RecentChanges.php:385
 #, php-format
 msgid "The %d oldest %s during the past day are listed below."
 msgstr "Die %d älteste %s innerhalb des letzten Tages sind unten aufgelistet."
 
-#: ../lib/plugin/RecentChanges.php:389
+#: ../lib/plugin/RecentChanges.php:388
 #, php-format
 msgid "The %d oldest %s during the past %s days are listed below."
 msgstr ""
 "Die %d älteste %s innerhalb der letzten %s Tage sind unten aufgelistet."
 
-#: ../lib/plugin/RecentChanges.php:392
+#: ../lib/plugin/RecentChanges.php:391
 #, php-format
 msgid "The %d oldest %s are listed below."
 msgstr "Die %d älteste %s sind unten aufgelistet."
 
-#: ../lib/plugin/RecentChanges.php:397
+#: ../lib/plugin/RecentChanges.php:396
 #, php-format
 msgid "The most recent %s during the past day are listed below."
 msgstr "Die jüngste %s innerhalb des letzten Tages sind unten aufgelistet."
 
-#: ../lib/plugin/RecentChanges.php:400
+#: ../lib/plugin/RecentChanges.php:399
 #, php-format
 msgid "The most recent %s during the past %s days are listed below."
 msgstr "Die jüngste %s innerhalb der letzten %s Tage sind unten aufgelistet."
 
-#: ../lib/plugin/RecentChanges.php:403
+#: ../lib/plugin/RecentChanges.php:402
 #, php-format
 msgid "All %s are listed below."
 msgstr "Alle %s sind unten aufgelistet."
 
-#: ../lib/plugin/RecentChanges.php:432 ../lib/plugin/RecentComments.php:90
+#: ../lib/plugin/RecentChanges.php:431 ../lib/plugin/RecentComments.php:90
 msgid "No comments found"
 msgstr "Keine Kommentare gefunden."
 
-#: ../lib/plugin/RecentChanges.php:434
+#: ../lib/plugin/RecentChanges.php:433
 msgid "No changes found"
 msgstr "Keine Änderungen gefunden."
 
-#: ../lib/plugin/RecentChanges.php:454
+#: ../lib/plugin/RecentChanges.php:453
 msgid "Click to add this feed to your sidebar"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:898
+#: ../lib/plugin/RecentChanges.php:896
 msgid "Title Search"
 msgstr "TitelSuche"
 
-#: ../lib/plugin/RecentChanges.php:1285
+#: ../lib/plugin/RecentChanges.php:1283
 msgid "List all recent changes in this wiki."
 msgstr "Alle Änderungen in diesem Wiki auflisten."
 
-#: ../lib/plugin/RecentChanges.php:1499
+#: ../lib/plugin/RecentChanges.php:1495
 msgid "Show changes for:"
 msgstr "Zeige Änderungen innerhalb von:"
 
-#: ../lib/plugin/RecentChanges.php:1546
+#: ../lib/plugin/RecentChanges.php:1542
 msgid "1 day"
 msgstr "1 Tag"
 
-#: ../lib/plugin/RecentChanges.php:1548
+#: ../lib/plugin/RecentChanges.php:1544
 msgid "All time"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1550
+#: ../lib/plugin/RecentChanges.php:1546
 #, php-format
 msgid "%s days"
 msgstr "%s Tagen"
 
-#: ../lib/plugin/RecentChanges.php:1563
+#: ../lib/plugin/RecentChanges.php:1559
 msgid "All users"
 msgstr "Alle Benutzer"
 
-#: ../lib/plugin/RecentChanges.php:1566
+#: ../lib/plugin/RecentChanges.php:1562
 msgid "My modifications only"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1584
+#: ../lib/plugin/RecentChanges.php:1580
 #: ../themes/MonoBook/templates/navbar.tmpl:75
 msgid "All pages"
 msgstr "Alle Seiten"
 
-#: ../lib/plugin/RecentChanges.php:1587
+#: ../lib/plugin/RecentChanges.php:1583
 msgid "My pages only"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1605
+#: ../lib/plugin/RecentChanges.php:1601
 msgid "Major modifications only"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1605
+#: ../lib/plugin/RecentChanges.php:1601
 msgid "All modifications"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1617
+#: ../lib/plugin/RecentChanges.php:1613
 msgid "Page once only"
 msgstr ""
 
 # (Im Wortsinne heißt das eigentlich: "jüngste = eben gemachte
 # Änderungen"; in terms of newspapers or journalism it's traditionally
 # "NeuesteNachrichten" or much more better "DasNeueste").
-#: ../lib/plugin/RecentChanges.php:1617
+#: ../lib/plugin/RecentChanges.php:1613
 msgid "Full changes"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1629
+#: ../lib/plugin/RecentChanges.php:1625
 msgid "Old and new pages"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1629
+#: ../lib/plugin/RecentChanges.php:1625
 msgid "New pages only"
 msgstr "Nur neue Seiten"
 
@@ -4326,7 +4326,7 @@
 msgid "Recursively get BackLinks or links"
 msgstr "Alle BackLinks für %s (rekursiv)"
 
-#: ../lib/plugin/SiteMap.php:173
+#: ../lib/plugin/SiteMap.php:172
 #, php-format
 msgid "(max. recursion level: %d)"
 msgstr "(max. Rekursionstiefe: %d)"
@@ -4702,16 +4702,16 @@
 msgid "TeX imagepath not writable."
 msgstr "Keine Schreibrechte für das TeX Bildpath"
 
-#: ../lib/plugin/TeX2png.php:232 ../lib/plugin/text2png.php:83
+#: ../lib/plugin/TeX2png.php:232 ../lib/plugin/text2png.php:82
 msgid "Sorry, this version of PHP cannot create PNG image files."
 msgstr ""
 "Das geht leider nicht. Diese PHP Version kann keine PNG Bilder erzeugen."
 
-#: ../lib/plugin/text2png.php:58
+#: ../lib/plugin/text2png.php:57
 msgid "Convert text into a png image using GD."
 msgstr "Text mit der GD Bibliothek in ein PNG Bild konvertieren."
 
-#: ../lib/plugin/text2png.php:168
+#: ../lib/plugin/text2png.php:167
 msgid ""
 "PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png."
 "php' for details."
@@ -4719,17 +4719,17 @@
 "PHP konnte keinen neues GD Bild erzeugen. Lesen Sie 'lib/plugin/text2png."
 "php' für Details."
 
-#: ../lib/plugin/text2png.php:213
+#: ../lib/plugin/text2png.php:212
 #, php-format
 msgid "Image saved to cache file: %s"
 msgstr "Bild gespeichert als Cachedatei: %s"
 
-#: ../lib/plugin/text2png.php:217
+#: ../lib/plugin/text2png.php:216
 #, php-format
 msgid "Image loaded from cache file: %s"
 msgstr "Bild geladen von Cachedatei: %s"
 
-#: ../lib/plugin/text2png.php:225
+#: ../lib/plugin/text2png.php:224
 msgid " produced by "
 msgstr ""
 
@@ -5072,7 +5072,7 @@
 "from graphviz."
 msgstr ""
 
-#: ../lib/plugin/VisualWiki.php:514
+#: ../lib/plugin/VisualWiki.php:511
 msgid "Legend"
 msgstr "Legende"
 
@@ -6310,7 +6310,7 @@
 "service for %s to language %s"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:428
+#: ../lib/plugin/_WikiTranslation.php:426
 #, php-format
 msgid "Define the translation for %s in %s"
 msgstr "Definiere die Übersetzung für %s nach %s"
@@ -6386,27 +6386,27 @@
 "neue Version von %s gespeichert. Bitte entscheiden Sie ob Sie die Seite noch "
 "von der Datenbank permanent löschen wollen."
 
-#: ../lib/Request.php:748 ../lib/Request.php:751
+#: ../lib/Request.php:747 ../lib/Request.php:750
 msgid "Upload error: file too big"
 msgstr ""
 
-#: ../lib/Request.php:754
+#: ../lib/Request.php:753
 msgid "Upload error: file only partially received"
 msgstr ""
 
-#: ../lib/Request.php:757
+#: ../lib/Request.php:756
 msgid "Upload error: no file selected"
 msgstr ""
 
-#: ../lib/Request.php:760
+#: ../lib/Request.php:759
 msgid "Upload error: unknown error #"
 msgstr ""
 
-#: ../lib/Request.php:877
+#: ../lib/Request.php:876
 msgid "The PhpWiki access log file"
 msgstr "Die PhpWiki Zugriffslog Datei"
 
-#: ../lib/Request.php:880
+#: ../lib/Request.php:879
 #, php-format
 msgid "the file '%s'"
 msgstr "die Datei %s"
@@ -6482,74 +6482,74 @@
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1303
+#: ../lib/stdlib.php:1302
 msgid "Revision Not Found"
 msgstr "Version nicht gefunden"
 
-#: ../lib/stdlib.php:1304
+#: ../lib/stdlib.php:1303
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr "Leider ist keine Version %d von %s in der Datenbank."
 
-#: ../lib/stdlib.php:1307
+#: ../lib/stdlib.php:1306
 msgid "Bad Version"
 msgstr "Ungültige Version"
 
-#: ../lib/stdlib.php:1447
+#: ../lib/stdlib.php:1444
 msgid "-???"
 msgstr ""
 
-#: ../lib/stdlib.php:1450
+#: ../lib/stdlib.php:1447
 #, php-format
 msgid "%s B"
 msgstr ""
 
-#: ../lib/stdlib.php:1452 ../themes/MonoBook/templates/info.tmpl:27
+#: ../lib/stdlib.php:1449 ../themes/MonoBook/templates/info.tmpl:27
 #, php-format
 msgid "%s bytes"
 msgstr "%s Bytes"
 
-#: ../lib/stdlib.php:1456
+#: ../lib/stdlib.php:1453
 #, php-format
 msgid "%s KiB"
 msgstr ""
 
-#: ../lib/stdlib.php:1458 ../themes/MonoBook/templates/info.tmpl:30
+#: ../lib/stdlib.php:1455 ../themes/MonoBook/templates/info.tmpl:30
 #, php-format
 msgid "%s KiB (%s bytes)"
 msgstr "%s KiB (%s Bytes)"
 
-#: ../lib/stdlib.php:1548 ../lib/XmlElement.php:518
+#: ../lib/stdlib.php:1545 ../lib/XmlElement.php:516
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr "Kann »%s« Typ-Formatzeichenketten nicht mit »%s« vermischen."
 
-#: ../lib/stdlib.php:1557
+#: ../lib/stdlib.php:1554
 #, php-format
 msgid "%s: argument index out of range"
 msgstr "%s: Ungültiger Index in Array"
 
-#: ../lib/stdlib.php:1643 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1640 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr "%s ist leer."
 
-#: ../lib/stdlib.php:1650
+#: ../lib/stdlib.php:1647
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr "Konnte Verzeichnis »%s« nicht zum Lesen öffnen"
 
-#: ../lib/stdlib.php:2198 ../lib/stdlib.php:2211
+#: ../lib/stdlib.php:2192 ../lib/stdlib.php:2205
 #, php-format
 msgid "... (first %s words)"
 msgstr "... (erste %s Wörter)"
 
-#: ../lib/Template.php:192
+#: ../lib/Template.php:190
 #, php-format
 msgid "%4d  %s\n"
 msgstr "%4d  %s\n"
 
-#: ../lib/TextSearchQuery.php:128
+#: ../lib/TextSearchQuery.php:127
 msgid "(A|An|And|But|By|For|From|In|Is|It|Of|On|Or|The|To|With)"
 msgstr ""
 
@@ -6841,18 +6841,18 @@
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr "WikiDB::renamePage() für dieses Backend noch nicht implementiert"
 
-#: ../lib/WikiDB.php:986
+#: ../lib/WikiDB.php:985
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr "%s: Datum dieser aktuellen Neubearbeitung ist %s"
 
-#: ../lib/WikiDB.php:1755 ../lib/WikiDB.php:1759
+#: ../lib/WikiDB.php:1753 ../lib/WikiDB.php:1757
 #: ../themes/default/templates/homepage.tmpl:6
 #, php-format
 msgid "Describe %s here."
 msgstr "Beschreiben Sie %s hier."
 
-#: ../lib/WikiDB.php:1794
+#: ../lib/WikiDB.php:1792
 #, php-format
 msgid "Oops! Revision %s of %s seems to have been deleted!"
 msgstr "Hoppla! Es scheint, die Version %s von %s wurde gelöscht!"
@@ -6967,7 +6967,7 @@
 msgid "Members:"
 msgstr "Mitglieder:"
 
-#: ../lib/WikiPluginCached.php:705
+#: ../lib/WikiPluginCached.php:703
 #, php-format
 msgid ""
 "There is no image creation data available to id '%s'. Please reload "
@@ -6975,7 +6975,7 @@
 msgstr ""
 "Es sind keine Bilddaten vorhanden für '%'. Bitte laden Sie die Seite neu."
 
-#: ../lib/WikiPluginCached.php:873
+#: ../lib/WikiPluginCached.php:870
 msgid "Image map expired. Reload wiki page to recreate its html part."
 msgstr ""
 
@@ -7241,11 +7241,11 @@
 msgid "Default preferences will be used."
 msgstr "Die Vorgabe Benutzereinstellungen werden verwendent."
 
-#: ../lib/WikiUserNew.php:1342
+#: ../lib/WikiUserNew.php:1341
 msgid "The length of the password is shorter than the system policy allows."
 msgstr "Die Länge des Passwortes ist kürzer als vom System gefordert."
 
-#: ../lib/WikiUserNew.php:1369
+#: ../lib/WikiUserNew.php:1368
 msgid ""
 "The length of the stored password is shorter than the system policy allows. "
 "Sorry, you cannot login.\n"
@@ -7255,11 +7255,11 @@
 "Sie können sich leider nicht anmelden.\n"
 " Sie müssen den System Administrator bitten, Ihr Passwort neu zu setzen."
 
-#: ../lib/WikiUserNew.php:1383
+#: ../lib/WikiUserNew.php:1382
 msgid "The crypt function is not available in this version of PHP."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1384
+#: ../lib/WikiUserNew.php:1383
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
@@ -7267,12 +7267,12 @@
 "Sie haben vergessen ENCRYPTED_PASSWD auf true zu setzen. Bitte aktualisieren "
 "Sie config/config.ini und überprüfen sie auch ADMIN_PASSWD."
 
-#: ../lib/WikiUserNew.php:1396
+#: ../lib/WikiUserNew.php:1395
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 "Sie haben vergessen ENCRYPTED_PASSWD auf true in config/config.ini zu setzen."
 
-#: ../lib/WikiUserNew.php:1858
+#: ../lib/WikiUserNew.php:1856
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -7286,12 +7286,12 @@
 "versenden.\n"
 "Siehe %s"
 
-#: ../lib/WikiUserNew.php:1920
+#: ../lib/WikiUserNew.php:1918
 #, php-format
 msgid "E-mail address '%s' is not properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1924
+#: ../lib/WikiUserNew.php:1922
 #, php-format
 msgid "E-mail address '%s' is properly formatted"
 msgstr ""
@@ -7428,21 +7428,21 @@
 "Kann Daten nicht dekomprimieren: Die zlib-Bibliothek wurde in PHP nicht "
 "installiert/aktiviert."
 
-#: ../lib/ziplib.php:417
+#: ../lib/ziplib.php:416
 #, php-format
 msgid "Can't open zip file '%s' for reading"
 msgstr "Konnte ZIP-Datei »%s« nicht zum Lesen öffnen"
 
-#: ../lib/ziplib.php:428 ../lib/ziplib.php:432
+#: ../lib/ziplib.php:427 ../lib/ziplib.php:431
 msgid "Unexpected EOF in zip file"
 msgstr "Unerwartetes Dateiende (EOF-Fehler) in ZIP-Datei"
 
-#: ../lib/ziplib.php:755
+#: ../lib/ziplib.php:753
 #, php-format
 msgid "[%d] See [%s]"
 msgstr "[%d] Siehe [%s]"
 
-#: ../lib/ziplib.php:762
+#: ../lib/ziplib.php:760
 msgid "References"
 msgstr "Fußnoten"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-11-19 17:02:07 UTC (rev 8491)
+++ trunk/locale/po/es.po	2012-11-19 17:07:29 UTC (rev 8492)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-15 17:50+0100\n"
+"POT-Creation-Date: 2012-11-19 18:05+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -145,11 +145,11 @@
 msgid "Previous Author"
 msgstr "Autor Anterior"
 
-#: ../lib/diff.php:329 ../lib/plugin/Diff.php:176
+#: ../lib/diff.php:329 ../lib/plugin/Diff.php:175
 msgid "Newer page:"
 msgstr "Página más nueva:"
 
-#: ../lib/diff.php:331 ../lib/plugin/Diff.php:178
+#: ../lib/diff.php:331 ../lib/plugin/Diff.php:177
 msgid "Older page:"
 msgstr "Página más viejo:"
 
@@ -186,9 +186,9 @@
 msgstr ""
 
 #: ../lib/display.php:172 ../lib/display.php:413 ../lib/loadsave.php:1576
-#: ../lib/plugin/RecentChanges.php:64 ../lib/plugin/RecentChanges.php:230
-#: ../lib/plugin/RecentChanges.php:237 ../lib/plugin/RecentChanges.php:440
-#: ../lib/plugin/RecentChanges.php:751 ../lib/plugin/RecentChanges.php:1280
+#: ../lib/plugin/RecentChanges.php:64 ../lib/plugin/RecentChanges.php:229
+#: ../lib/plugin/RecentChanges.php:236 ../lib/plugin/RecentChanges.php:439
+#: ../lib/plugin/RecentChanges.php:749 ../lib/plugin/RecentChanges.php:1278
 #: ../lib/RSSWriter091.php:110 ../themes/blog/templates/actionbar.tmpl:10
 #: ../themes/Crao/templates/head.tmpl:53
 #: ../themes/Crao/templates/navbar.tmpl:11
@@ -208,7 +208,7 @@
 msgstr "CambiosRecientes"
 
 #: ../lib/display.php:209 ../lib/display.php:452
-#: ../lib/plugin/FileInfo.php:156 ../lib/TextSearchQuery.php:116
+#: ../lib/plugin/FileInfo.php:156 ../lib/TextSearchQuery.php:115
 #, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr "Discusión sin apoyo: %s=%s"
@@ -391,7 +391,7 @@
 "in your %s, you will get a notification of approval or rejection."
 msgstr ""
 
-#: ../lib/editpage.php:592 ../lib/editpage.php:958
+#: ../lib/editpage.php:592 ../lib/editpage.php:956
 #, php-format
 msgid ""
 "Some of the changes could not automatically be combined.  Please look for "
@@ -402,15 +402,15 @@
 "favor las secciones que comienzan con '%s', y terminando con '%s'. Usted "
 "necesitará corregir esas secciones a mano antes de que usted chasque excepto."
 
-#: ../lib/editpage.php:596 ../lib/editpage.php:961
+#: ../lib/editpage.php:596 ../lib/editpage.php:959
 msgid "Please check it through before saving."
 msgstr "Compruébelo por favor a través antes de ahorrar."
 
-#: ../lib/editpage.php:606
+#: ../lib/editpage.php:605
 msgid "Conflicting Edits!"
 msgstr "¡El Estar en conflicto Corrige!"
 
-#: ../lib/editpage.php:607
+#: ../lib/editpage.php:606
 msgid ""
 "In the time since you started editing this page, another user has saved a "
 "new version of it."
@@ -418,7 +418,7 @@
 "En el tiempo desde que usted comenzó a corregir esta página, otro usuario ha "
 "ahorrado una nueva versión de ella."
 
-#: ../lib/editpage.php:608
+#: ../lib/editpage.php:607
 msgid ""
 "Your changes can not be saved as they are, since doing so would overwrite "
 "the other author's changes. So, your changes and those of the other author "
@@ -428,48 +428,48 @@
 "sobreescribirían los cambios del otro autor. Así pues, se han combinado sus "
 "cambios y los del otro autor. El resultado se demuestra abajo."
 
-#: ../lib/editpage.php:679 ../lib/plugin/HtmlConverter.php:70
+#: ../lib/editpage.php:677 ../lib/plugin/HtmlConverter.php:70
 msgid "Convert"
 msgstr "Convertido"
 
-#: ../lib/editpage.php:708 ../lib/EditToolbar.php:214
+#: ../lib/editpage.php:706 ../lib/EditToolbar.php:214
 #: ../lib/EditToolbar.php:216 ../lib/WysiwygEdit/Wikiwyg.php:82
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: ../lib/editpage.php:715 ../lib/EditToolbar.php:207
+#: ../lib/editpage.php:713 ../lib/EditToolbar.php:207
 #: ../lib/EditToolbar.php:209 ../lib/WysiwygEdit/Wikiwyg.php:83
 msgid "Save"
 msgstr "Guardar"
 
-#: ../lib/editpage.php:719
+#: ../lib/editpage.php:717
 msgid "Changes"
 msgstr "Cambios"
 
-#: ../lib/editpage.php:723 ../lib/plugin/UpLoad.php:165
+#: ../lib/editpage.php:721 ../lib/plugin/UpLoad.php:165
 #: ../lib/plugin/UpLoad.php:170 ../lib/plugin/WikiForm.php:98
 msgid "Upload"
 msgstr ""
 
-#: ../lib/editpage.php:726
+#: ../lib/editpage.php:724
 msgid "Spell Check"
 msgstr ""
 
-#: ../lib/editpage.php:749 ../themes/Portland/templates/editpage.tmpl:36
+#: ../lib/editpage.php:747 ../themes/Portland/templates/editpage.tmpl:36
 #: ../themes/Wordpress/templates/editpage.tmpl:52
 #, php-format
 msgid "Author will be logged as %s."
 msgstr "Registrarán al autor como %s."
 
-#: ../lib/editpage.php:912
+#: ../lib/editpage.php:910
 msgid "Keep old"
 msgstr ""
 
-#: ../lib/editpage.php:915
+#: ../lib/editpage.php:913
 msgid "Overwrite with new"
 msgstr ""
 
-#: ../lib/editpage.php:925
+#: ../lib/editpage.php:923
 #, php-format
 msgid "Merge and Edit: %s"
 msgstr "Fusión y Editar: %s"
@@ -510,7 +510,7 @@
 
 #: ../lib/EditToolbar.php:59 ../lib/plugin/SyncWiki.php:308
 #: ../lib/plugin/SyncWiki.php:335 ../lib/plugin/SyncWiki.php:359
-#: ../lib/plugin/WikiPoll.php:228 ../lib/stdlib.php:2003
+#: ../lib/plugin/WikiPoll.php:228 ../lib/stdlib.php:1997
 #: ../lib/upgrade.php:201 ../lib/upgrade.php:407 ../lib/upgrade.php:421
 #: ../lib/upgrade.php:441 ../lib/upgrade.php:450 ../lib/upgrade.php:474
 #: ../lib/upgrade.php:502 ../lib/upgrade.php:551 ../lib/upgrade.php:554
@@ -719,7 +719,7 @@
 msgid "Illegal character '%s' in page name."
 msgstr "Los carbones ilegales %s quitaron"
 
-#: ../lib/InlineParser.php:979
+#: ../lib/InlineParser.php:978
 #, php-format
 msgid "unknown color %s ignored"
 msgstr "el color desconocido %s no hizo caso"
@@ -842,7 +842,7 @@
 msgstr "ahorrado como %s"
 
 #: ../lib/loadsave.php:391 ../lib/loadsave.php:710
-#: ../lib/plugin/text2png.php:227
+#: ../lib/plugin/text2png.php:226
 #, php-format
 msgid "couldn't open file '%s' for writing"
 msgstr "Error al escribir la página '%s'"
@@ -887,7 +887,7 @@
 msgstr "de %s"
 
 #: ../lib/loadsave.php:984 ../lib/MailNotify.php:313
-#: ../lib/plugin/RecentChanges.php:150
+#: ../lib/plugin/RecentChanges.php:149
 msgid "New page"
 msgstr "Página nueva"
 
@@ -1019,7 +1019,7 @@
 msgid "Default InterWiki map file not loaded."
 msgstr "Archivo del InterMapa de Wiki del defecto no cargado."
 
-#: ../lib/loadsave.php:1170 ../lib/PageType.php:330
+#: ../lib/loadsave.php:1170 ../lib/PageType.php:329
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr "Cargamento InterMapaDeWiki del archivo externo %s."
@@ -1106,7 +1106,7 @@
 msgstr "El usuarios %s eliminado página %s"
 
 #: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
-#: ../lib/WikiUserNew.php:1857
+#: ../lib/WikiUserNew.php:1855
 msgid "E-mail address confirmation"
 msgstr "Verificación Del Email"
 
@@ -1125,7 +1125,7 @@
 "will expire at %s."
 msgstr ""
 
-#: ../lib/main.php:111 ../lib/WikiDB.php:1064
+#: ../lib/main.php:111 ../lib/WikiDB.php:1063
 msgid "Optimizing database"
 msgstr "Base de datos óptima"
 
@@ -1391,7 +1391,7 @@
 msgid "FullTextSearch"
 msgstr "BúsquedaDelTexto"
 
-#: ../lib/main.php:1179 ../lib/plugin/RecentChanges.php:900
+#: ../lib/main.php:1179 ../lib/plugin/RecentChanges.php:898
 #: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1522
 #: ../themes/Crao/templates/navbar.tmpl:2
 #: ../themes/Crao/templates/navbar.tmpl:6
@@ -1406,7 +1406,7 @@
 msgid "TitleSearch"
 msgstr "BúsquedaDeTítulos"
 
-#: ../lib/main.php:1375 ../lib/main.php:1388 ../lib/Request.php:877
+#: ../lib/main.php:1375 ../lib/main.php:1388 ../lib/Request.php:876
 #, php-format
 msgid "%s is not writable."
 msgstr "%s no es escribible."
@@ -1415,7 +1415,7 @@
 msgid "The session.save_path directory"
 msgstr "El directorio de session.save_path"
 
-#: ../lib/main.php:1378 ../lib/Request.php:879
+#: ../lib/main.php:1378 ../lib/Request.php:878
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
@@ -1701,7 +1701,7 @@
 "ADVERTENCIA: Se abre la página de InterMapaDeWiki, tan no usando esos "
 "acoplamientos."
 
-#: ../lib/PageType.php:289 ../lib/PageType.php:292 ../lib/stdlib.php:854
+#: ../lib/PageType.php:288 ../lib/PageType.php:291 ../lib/stdlib.php:854
 #: ../themes/default/templates/navbar.tmpl:5
 #: ../themes/default/templates/navbar.tmpl:7
 #: ../themes/fusionforge/templates/actionbar.tmpl:13
@@ -1717,11 +1717,11 @@
 msgid "Discussion"
 msgstr "Discusión"
 
-#: ../lib/PageType.php:439
+#: ../lib/PageType.php:437
 msgid "Moniker"
 msgstr ""
 
-#: ../lib/PageType.php:440
+#: ../lib/PageType.php:438
 msgid "InterWiki Address"
 msgstr ""
 
@@ -1890,7 +1890,7 @@
 msgid "hours"
 msgstr "horas"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:242 ../lib/plugin/VisualWiki.php:520
+#: ../lib/plugin/AnalyseAccessLogSql.php:242 ../lib/plugin/VisualWiki.php:517
 msgid "days"
 msgstr "dias"
 
@@ -2360,23 +2360,23 @@
 msgid "Display differences between revisions"
 msgstr ""
 
-#: ../lib/plugin/Diff.php:186
+#: ../lib/plugin/Diff.php:185
 msgid "Content of versions "
 msgstr ""
 
-#: ../lib/plugin/Diff.php:187
+#: ../lib/plugin/Diff.php:186
 msgid " and "
 msgstr " y "
 
-#: ../lib/plugin/Diff.php:187
+#: ../lib/plugin/Diff.php:186
 msgid " is identical."
 msgstr " es idéntico."
 
-#: ../lib/plugin/Diff.php:192
+#: ../lib/plugin/Diff.php:191
 msgid "Version "
 msgstr "Versión "
 
-#: ../lib/plugin/Diff.php:193
+#: ../lib/plugin/Diff.php:192
 msgid " was created because: "
 msgstr ""
 
@@ -2397,7 +2397,7 @@
 #: ../lib/plugin/DynamicIncludePage.php:81
 #: ../lib/plugin/DynamicIncludePage.php:82
 #: ../lib/plugin/NewPagesPerUser.php:113 ../lib/plugin/NewPagesPerUser.php:114
-#: ../lib/plugin/RecentChanges.php:1491 ../lib/plugin/RecentChanges.php:1492
+#: ../lib/plugin/RecentChanges.php:1487 ../lib/plugin/RecentChanges.php:1488
 #: ../themes/Sidebar/themeinfo.php:59 ../themes/Sidebar/themeinfo.php:60
 msgid "Click to hide/show"
 msgstr ""
@@ -2411,22 +2411,22 @@
 msgid "Edit metadata for %s"
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:131
+#: ../lib/plugin/EditMetaData.php:130
 #, php-format
 msgid "No metadata for %s"
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:144
+#: ../lib/plugin/EditMetaData.php:143
 msgid ""
 "Add or change a page-level metadata 'key=>value' pair. Note that you can "
 "remove a key by leaving the value-box empty."
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:147 ../lib/upgrade.php:801
+#: ../lib/plugin/EditMetaData.php:146 ../lib/upgrade.php:801
 msgid "Submit"
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:162
+#: ../lib/plugin/EditMetaData.php:161
 msgid "Requires WikiAdmin privileges to edit."
 msgstr ""
 
@@ -2545,8 +2545,8 @@
 msgstr ""
 
 #: ../lib/plugin/FrameInclude.php:112 ../lib/plugin/SemanticSearch.php:295
-#: ../lib/plugin/TeX2png.php:234 ../lib/plugin/text2png.php:85
-#: ../lib/plugin/text2png.php:172
+#: ../lib/plugin/TeX2png.php:234 ../lib/plugin/text2png.php:84
+#: ../lib/plugin/text2png.php:171
 #, php-format
 msgid "See %s"
 msgstr ""
@@ -2570,7 +2570,7 @@
 msgid "Ignored stoplist words '%s'"
 msgstr ""
 
-#: ../lib/plugin/FullTextSearch.php:175 ../lib/plugin/WantedPages.php:186
+#: ../lib/plugin/FullTextSearch.php:173 ../lib/plugin/WantedPages.php:186
 #, php-format
 msgid "(%d Links)"
 msgstr ""
@@ -2602,11 +2602,11 @@
 msgid "No fuzzy matches with '%s'"
 msgstr ""
 
-#: ../lib/plugin/FuzzyPages.php:183
+#: ../lib/plugin/FuzzyPages.php:182
 msgid "Spelling Score"
 msgstr ""
 
-#: ../lib/plugin/FuzzyPages.php:184
+#: ../lib/plugin/FuzzyPages.php:183
 msgid "Sound Score"
 msgstr ""
 
@@ -2804,7 +2804,7 @@
 msgid "Wiki Name"
 msgstr "Nombre de la Wiki"
 
-#: ../lib/plugin/InterWikiSearch.php:96 ../lib/plugin/RecentChanges.php:897
+#: ../lib/plugin/InterWikiSearch.php:96 ../lib/plugin/RecentChanges.php:895
 #: ../lib/plugin/SemanticSearchAdvanced.php:113
 #: ../themes/Crao/templates/navbar.tmpl:40
 #: ../themes/Crao/templates/navbar.tmpl:42
@@ -3213,7 +3213,7 @@
 msgid "Contents"
 msgstr ""
 
-#: ../lib/plugin/PageGroup.php:92 ../lib/stdlib.php:2243
+#: ../lib/plugin/PageGroup.php:92 ../lib/stdlib.php:2237
 #, php-format
 msgid "<%s: no such section>"
 msgstr ""
@@ -3280,7 +3280,7 @@
 msgid "Version %d"
 msgstr "Versión %d"
 
-#: ../lib/plugin/PageHistory.php:193 ../lib/plugin/RecentChanges.php:525
+#: ../lib/plugin/PageHistory.php:193 ../lib/plugin/RecentChanges.php:524
 #: ../themes/default/templates/info.tmpl:15
 #: ../themes/default/templates/info.tmpl:19
 #: ../themes/MacOSX/lib/RecentChanges.php:35
@@ -3736,7 +3736,7 @@
 msgstr ""
 
 #: ../lib/plugin/RecentChanges.php:53 ../lib/plugin/RecentChanges.php:59
-#: ../lib/plugin/RecentChanges.php:582
+#: ../lib/plugin/RecentChanges.php:581
 msgid "UserContribs"
 msgstr ""
 
@@ -3746,204 +3746,204 @@
 msgid "RecentNewPages"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:63 ../lib/plugin/RecentChanges.php:440
-#: ../lib/plugin/RecentChanges.php:751 ../lib/plugin/RecentEdits.php:30
+#: ../lib/plugin/RecentChanges.php:63 ../lib/plugin/RecentChanges.php:439
+#: ../lib/plugin/RecentChanges.php:749 ../lib/plugin/RecentEdits.php:30
 #: ../lib/plugin/RecentEdits.php:58 ../lib/plugin/RelatedChanges.php:47
 #: ../themes/Portland/templates/editpage.tmpl:40
 #: ../themes/Wordpress/templates/editpage.tmpl:57
 msgid "RecentEdits"
 msgstr "RecienteCorrige"
 
-#: ../lib/plugin/RecentChanges.php:148
+#: ../lib/plugin/RecentChanges.php:147
 msgid "Deleted"
 msgstr "Borrada"
 
-#: ../lib/plugin/RecentChanges.php:173
+#: ../lib/plugin/RecentChanges.php:172
 #: ../themes/SpaceWiki/lib/RecentChanges.php:60
 msgid "diff"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:188
+#: ../lib/plugin/RecentChanges.php:187
 msgid "hist"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:234
+#: ../lib/plugin/RecentChanges.php:233
 msgid "contribs"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:241
+#: ../lib/plugin/RecentChanges.php:240
 msgid "new pages"
 msgstr "páginas nuevas"
 
-#: ../lib/plugin/RecentChanges.php:325
+#: ../lib/plugin/RecentChanges.php:324
 msgid "edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:327
+#: ../lib/plugin/RecentChanges.php:326
 msgid "major edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:328
+#: ../lib/plugin/RecentChanges.php:327
 msgid "minor edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:329 ../lib/plugin/RecentChanges.php:431
+#: ../lib/plugin/RecentChanges.php:328 ../lib/plugin/RecentChanges.php:430
 #: ../lib/plugin/RecentComments.php:50
 msgid "Recent Comments"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:330
+#: ../lib/plugin/RecentChanges.php:329
 msgid "comments"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:332
+#: ../lib/plugin/RecentChanges.php:331
 msgid "created new pages"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:338
+#: ../lib/plugin/RecentChanges.php:337
 #, php-format
 msgid " for pages changed by %s"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:344
+#: ../lib/plugin/RecentChanges.php:343
 #, php-format
 msgid " for pages owned by %s"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:347
+#: ../lib/plugin/RecentChanges.php:346
 #, php-format
 msgid " for all pages linking to %s"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:350
+#: ../lib/plugin/RecentChanges.php:349
 #, php-format
 msgid " for all pages matching '%s'"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:375
+#: ../lib/plugin/RecentChanges.php:374
 #, php-format
 msgid "The %d most recent %s during the past day are listed below."
 msgstr ""
 "Los %d la mayoría del %s reciente durante el último día se enumeran abajo."
 
-#: ../lib/plugin/RecentChanges.php:378
+#: ../lib/plugin/RecentChanges.php:377
 #, php-format
 msgid "The %d most recent %s during the past %s days are listed below."
 msgstr ""
 "Los %d la mayoría del %s reciente durante los últimos días de %s se enumeran "
 "abajo."
 
-#: ../lib/plugin/RecentChanges.php:381
+#: ../lib/plugin/RecentChanges.php:380
 #, php-format
 msgid "The %d most recent %s are listed below."
 msgstr "Los %d la mayoría del %s reciente se enumeran abajo."
 
-#: ../lib/plugin/RecentChanges.php:386
+#: ../lib/plugin/RecentChanges.php:385
 #, php-format
 msgid "The %d oldest %s during the past day are listed below."
 msgstr "Los %d el %s más viejo durante el último día se enumeran abajo."
 
-#: ../lib/plugin/RecentChanges.php:389
+#: ../lib/plugin/RecentChanges.php:388
 #, php-format
 msgid "The %d oldest %s during the past %s days are listed below."
 msgstr ""
 "Los %d el %s más viejo durante los últimos días de %s se enumeran abajo."
 
-#: ../lib/plugin/RecentChanges.php:392
+#: ../lib/plugin/RecentChanges.php:391
 #, php-format
 msgid "The %d oldest %s are listed below."
 msgstr "Los %d el %s más viejo se enumeran abajo."
 
-#: ../lib/plugin/RecentChanges.php:397
+#: ../lib/plugin/RecentChanges.php:396
 #, php-format
 msgid "The most recent %s during the past day are listed below."
 msgstr "Los %s más recientes durante el último día se enumeran abajo."
 
-#: ../lib/plugin/RecentChanges.php:400
+#: ../lib/plugin/RecentChanges.php:399
 #, php-format
 msgid "The most recent %s during the past %s days are listed below."
 msgstr "Los %s más recientes durante los últimos días de %s se enumeran abajo."
 
-#: ../lib/plugin/RecentChanges.php:403
+#: ../lib/plugin/RecentChanges.php:402
 #, php-format
 msgid "All %s are listed below."
 msgstr "Todos los %s se enumeran abajo."
 
-#: ../lib/plugin/RecentChanges.php:432 ../lib/plugin/RecentComments.php:90
+#: ../lib/plugin/RecentChanges.php:431 ../lib/plugin/RecentComments.php:90
 msgid "No comments found"
 msgstr "Ningunos comentarios encontrados"
 
-#: ../lib/plugin/RecentChanges.php:434
+#: ../lib/plugin/RecentChanges.php:433
 msgid "No changes found"
 msgstr "Ningunos cambios encontrados"
 
-#: ../lib/plugin/RecentChanges.php:454
+#: ../lib/plugin/RecentChanges.php:453
 msgid "Click to add this feed to your sidebar"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:898
+#: ../lib/plugin/RecentChanges.php:896
 msgid "Title Search"
 msgstr "Una búsqueda de títulos"
 
-#: ../lib/plugin/RecentChanges.php:1285
+#: ../lib/plugin/RecentChanges.php:1283
 msgid "List all recent changes in this wiki."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1499
+#: ../lib/plugin/RecentChanges.php:1495
 msgid "Show changes for:"
 msgstr "Demuestre los cambios para:"
 
-#: ../lib/plugin/RecentChanges.php:1546
+#: ../lib/plugin/RecentChanges.php:1542
 msgid "1 day"
 msgstr "1 día"
 
-#: ../lib/plugin/RecentChanges.php:1548
+#: ../lib/plugin/RecentChanges.php:1544
 msgid "All time"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1550
+#: ../lib/plugin/RecentChanges.php:1546
 #, php-format
 msgid "%s days"
 msgstr "%s dias"
 
-#: ../lib/plugin/RecentChanges.php:1563
+#: ../lib/plugin/RecentChanges.php:1559
 msgid "All users"
 msgstr "TodasLasUsuarios"
 
-#: ../lib/plugin/RecentChanges.php:1566
+#: ../lib/plugin/RecentChanges.php:1562
 msgid "My modifications only"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1584
+#: ../lib/plugin/RecentChanges.php:1580
 #: ../themes/MonoBook/templates/navbar.tmpl:75
 msgid "All pages"
 msgstr "Todas las Páginas"
 
-#: ../lib/plugin/RecentChanges.php:1587
+#: ../lib/plugin/RecentChanges.php:1583
 msgid "My pages only"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1605
+#: ../lib/plugin/RecentChanges.php:1601
 msgid "Major modifications only"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1605
+#: ../lib/plugin/RecentChanges.php:1601
 msgid "All modifications"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1617
+#: ../lib/plugin/RecentChanges.php:1613
 msgid "Page once only"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1617
+#: ../lib/plugin/RecentChanges.php:1613
 msgid "Full changes"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1629
+#: ../lib/plugin/RecentChanges.php:1625
 msgid "Old and new pages"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1629
+#: ../lib/plugin/RecentChanges.php:1625
 msgid "New pages only"
 msgstr "Página nueva sólo"
 
@@ -4228,7 +4228,7 @@
 msgid "Recursively get BackLinks or links"
 msgstr ""
 
-#: ../lib/plugin/SiteMap.php:173
+#: ../lib/plugin/SiteMap.php:172
 #, php-format
 msgid "(max. recursion level: %d)"
 msgstr ""
@@ -4597,31 +4597,31 @@
 msgid "TeX imagepath not writable."
 msgstr ""
 
-#: ../lib/plugin/TeX2png.php:232 ../lib/plugin/text2png.php:83
+#: ../lib/plugin/TeX2png.php:232 ../lib/plugin/text2png.php:82
 msgid "Sorry, this version of PHP cannot create PNG image files."
 msgstr ""
 
-#: ../lib/plugin/text2png.php:58
+#: ../lib/plugin/text2png.php:57
 msgid "Convert text into a png image using GD."
 msgstr ""
 
-#: ../lib/plugin/text2png.php:168
+#: ../lib/plugin/text2png.php:167
 msgid ""
 "PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png."
 "php' for details."
 msgstr ""
 
-#: ../lib/plugin/text2png.php:213
+#: ../lib/plugin/text2png.php:212
 #, php-format
 msgid "Image saved to cache file: %s"
 msgstr ""
 
-#: ../lib/plugin/text2png.php:217
+#: ../lib/plugin/text2png.php:216
 #, php-format
 msgid "Image loaded from cache file: %s"
 msgstr ""
 
-#: ../lib/plugin/text2png.php:225
+#: ../lib/plugin/text2png.php:224
 msgid " produced by "
 msgstr ""
 
@@ -4953,7 +4953,7 @@
 "from graphviz."
 msgstr ""
 
-#: ../lib/plugin/VisualWiki.php:514
+#: ../lib/plugin/VisualWiki.php:511
 msgid "Legend"
 msgstr ""
 
@@ -6147,7 +6147,7 @@
 "service for %s to language %s"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:428
+#: ../lib/plugin/_WikiTranslation.php:426
 #, php-format
 msgid "Define the translation for %s in %s"
 msgstr ""
@@ -6217,27 +6217,27 @@
 "from the database."
 msgstr ""
 
-#: ../lib/Request.php:748 ../lib/Request.php:751
+#: ../lib/Request.php:747 ../lib/Request.php:750
 msgid "Upload error: file too big"
 msgstr "Error del upload: archivo demasiado grande"
 
-#: ../lib/Request.php:754
+#: ../lib/Request.php:753
 msgid "Upload error: file only partially received"
 msgstr "Error del upload: el archivo recieved solamente parcialmente"
 
-#: ../lib/Request.php:757
+#: ../lib/Request.php:756
 msgid "Upload error: no file selected"
 msgstr "Error del upload: ningún archivo seleccionado"
 
-#: ../lib/Request.php:760
+#: ../lib/Request.php:759
 msgid "Upload error: unknown error #"
 msgstr "Error del upload: error desconocido #"
 
-#: ../lib/Request.php:877
+#: ../lib/Request.php:876
 msgid "The PhpWiki access log file"
 msgstr "El fichero de diario del acceso de PhpWiki"
 
-#: ../lib/Request.php:880
+#: ../lib/Request.php:879
 #, php-format
 msgid "the file '%s'"
 msgstr "el archivo %s"
@@ -6312,74 +6312,74 @@
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1303
+#: ../lib/stdlib.php:1302
 msgid "Revision Not Found"
 msgstr "Revisión No encontrada"
 
-#: ../lib/stdlib.php:1304
+#: ../lib/stdlib.php:1303
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr "Estoy apesadumbrado.  La versión %d de %s no está en la base de datos."
 
-#: ../lib/stdlib.php:1307
+#: ../lib/stdlib.php:1306
 msgid "Bad Version"
 msgstr ""
 
-#: ../lib/stdlib.php:1447
+#: ../lib/stdlib.php:1444
 msgid "-???"
 msgstr ""
 
-#: ../lib/stdlib.php:1450
+#: ../lib/stdlib.php:1447
 #, php-format
 msgid "%s B"
 msgstr ""
 
-#: ../lib/stdlib.php:1452 ../themes/MonoBook/templates/info.tmpl:27
+#: ../lib/stdlib.php:1449 ../themes/MonoBook/templates/info.tmpl:27
 #, php-format
 msgid "%s bytes"
 msgstr "%s octetos"
 
-#: ../lib/stdlib.php:1456
+#: ../lib/stdlib.php:1453
 #, php-format
 msgid "%s KiB"
 msgstr "%s Kio"
 
-#: ../lib/stdlib.php:1458 ../themes/MonoBook/templates/info.tmpl:30
+#: ../lib/stdlib.php:1455 ../themes/MonoBook/templates/info.tmpl:30
 #, php-format
 msgid "%s KiB (%s bytes)"
 msgstr "%s Kio (%s octetos)"
 
-#: ../lib/stdlib.php:1548 ../lib/XmlElement.php:518
+#: ../lib/stdlib.php:1545 ../lib/XmlElement.php:516
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr ""
 
-#: ../lib/stdlib.php:1557
+#: ../lib/stdlib.php:1554
 #, php-format
 msgid "%s: argument index out of range"
 msgstr ""
 
-#: ../lib/stdlib.php:1643 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1640 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr ""
 
-#: ../lib/stdlib.php:1650
+#: ../lib/stdlib.php:1647
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr ""
 
-#: ../lib/stdlib.php:2198 ../lib/stdlib.php:2211
+#: ../lib/stdlib.php:2192 ../lib/stdlib.php:2205
 #, php-format
 msgid "... (first %s words)"
 msgstr ""
 
-#: ../lib/Template.php:192
+#: ../lib/Template.php:190
 #, php-format
 msgid "%4d  %s\n"
 msgstr "%4d  %s\n"
 
-#: ../lib/TextSearchQuery.php:128
+#: ../lib/TextSearchQuery.php:127
 msgid "(A|An|And|But|By|For|From|In|Is|It|Of|On|Or|The|To|With)"
 msgstr ""
 
@@ -6671,18 +6671,18 @@
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr "WikiDB::renamePage() no todavía puesto en ejecucio'n para este backend"
 
-#: ../lib/WikiDB.php:986
+#: ../lib/WikiDB.php:985
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr "%s: La fecha de la nueva revisión es %s"
 
-#: ../lib/WikiDB.php:1755 ../lib/WikiDB.php:1759
+#: ../lib/WikiDB.php:1753 ../lib/WikiDB.php:1757
 #: ../themes/default/templates/homepage.tmpl:6
 #, php-format
 msgid "Describe %s here."
 msgstr "Describe %s aquí."
 
-#: ../lib/WikiDB.php:1794
+#: ../lib/WikiDB.php:1792
 #, php-format
 msgid "Oops! Revision %s of %s seems to have been deleted!"
 msgstr "¡Oops! ¡La revisión %s de %s se parece haber sido suprimida!"
@@ -6797,7 +6797,7 @@
 msgid "Members:"
 msgstr "Miembros:"
 
-#: ../lib/WikiPluginCached.php:705
+#: ../lib/WikiPluginCached.php:703
 #, php-format
 msgid ""
 "There is no image creation data available to id '%s'. Please reload "
@@ -6806,7 +6806,7 @@
 "No hay datos de la creación de la imagen disponibles para la identificación "
 "'%s '. Por favor recarga que refiere la página."
 
-#: ../lib/WikiPluginCached.php:873
+#: ../lib/WikiPluginCached.php:870
 msgid "Image map expired. Reload wiki page to recreate its html part."
 msgstr ""
 "El mapa de imagen expiró.  Recargue la página del wiki para reconstruir su "
@@ -7074,13 +7074,13 @@
 msgid "Default preferences will be used."
 msgstr "Las preferencias del defecto serán utilizadas."
 
-#: ../lib/WikiUserNew.php:1342
+#: ../lib/WikiUserNew.php:1341
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 "La longitud de la contraseña es más corta que la política del sistema "
 "permite."
 
-#: ../lib/WikiUserNew.php:1369
+#: ../lib/WikiUserNew.php:1368
 msgid ""
 "The length of the stored password is shorter than the system policy allows. "
 "Sorry, you cannot login.\n"
@@ -7091,11 +7091,11 @@
 " Usted tiene que pedir que el administrador de sistema reajuste su "
 "contraseña."
 
-#: ../lib/WikiUserNew.php:1383
+#: ../lib/WikiUserNew.php:1382
 msgid "The crypt function is not available in this version of PHP."
 msgstr "La función de la cripta no está disponible en esta versión de PHP."
 
-#: ../lib/WikiUserNew.php:1384
+#: ../lib/WikiUserNew.php:1383
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
@@ -7103,11 +7103,11 @@
 "En ENCRYPTED_PASSWD por favor fijado a falso config/config.ini y "
 "probablemente cambio ADMIN_PASSWD."
 
-#: ../lib/WikiUserNew.php:1396
+#: ../lib/WikiUserNew.php:1395
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr "ENCRYPTED_PASSWD por favor fijado a verdad en config/config.ini."
 
-#: ../lib/WikiUserNew.php:1858
+#: ../lib/WikiUserNew.php:1856
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -7120,12 +7120,12 @@
 "para enviar notificaciones del cambio de la página.\n"
 "Vea %s"
 
-#: ../lib/WikiUserNew.php:1920
+#: ../lib/WikiUserNew.php:1918
 #, php-format
 msgid "E-mail address '%s' is not properly formatted"
 msgstr "La dirección '%s' del email no se ajusta a formato correctamente"
 
-#: ../lib/WikiUserNew.php:1924
+#: ../lib/WikiUserNew.php:1922
 #, php-format
 msgid "E-mail address '%s' is properly formatted"
 msgstr "La dirección '%s' del email se ajusta a formato correctamente"
@@ -7257,21 +7257,21 @@
 msgid "Can't inflate data: zlib support not enabled in this PHP"
 msgstr ""
 
-#: ../lib/ziplib.php:417
+#: ../lib/ziplib.php:416
 #, php-format
 msgid "Can't open zip file '%s' for reading"
 msgstr ""
 
-#: ../lib/ziplib.php:428 ../lib/ziplib.php:432
+#: ../lib/ziplib.php:427 ../lib/ziplib.php:431
 msgid "Unexpected EOF in zip file"
 msgstr "EOF inesperado en archivo del zip"
 
-#: ../lib/ziplib.php:755
+#: ../lib/ziplib.php:753
 #, php-format
 msgid "[%d] See [%s]"
 msgstr "[%d] Vea [%s]"
 
-#: ../lib/ziplib.php:762
+#: ../lib/ziplib.php:760
 msgid "References"
 msgstr "Referencia...
 
[truncated message content]

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

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

Revision: 8491
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8491&view=rev
Author:   vargenau
Date:     2012-11-19 17:02:07 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
Remove extra empty lines

Modified Paths:
--------------
    trunk/lib/AccessLog.php
    trunk/lib/BlockParser.php
    trunk/lib/DbaDatabase.php
    trunk/lib/DbaListSet.php
    trunk/lib/FileFinder.php
    trunk/lib/HtmlParser.php
    trunk/lib/InlineParser.php
    trunk/lib/PageType.php
    trunk/lib/Request.php
    trunk/lib/SpamBlocklist.php
    trunk/lib/Template.php
    trunk/lib/TextSearchQuery.php
    trunk/lib/WikiDB.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/WikiUserNew.php
    trunk/lib/XmlElement.php
    trunk/lib/editpage.php
    trunk/lib/stdlib.php
    trunk/lib/ziplib.php

Modified: trunk/lib/AccessLog.php
===================================================================
--- trunk/lib/AccessLog.php	2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/AccessLog.php	2012-11-19 17:02:07 UTC (rev 8491)
@@ -671,7 +671,6 @@
         );
     }
 
-
     function table_output()
     {
         $query = $this->_getQueryString($args);

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/BlockParser.php	2012-11-19 17:02:07 UTC (rev 8491)
@@ -1395,7 +1395,6 @@
     }
 }
 
-
 ////////////////////////////////////////////////////////////////
 //
 

Modified: trunk/lib/DbaDatabase.php
===================================================================
--- trunk/lib/DbaDatabase.php	2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/DbaDatabase.php	2012-11-19 17:02:07 UTC (rev 8491)
@@ -139,7 +139,6 @@
             return $this->_error("replace($key)");
     }
 
-
     function firstkey()
     {
         return dba_firstkey($this->_dbh);

Modified: trunk/lib/DbaListSet.php
===================================================================
--- trunk/lib/DbaListSet.php	2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/DbaListSet.php	2012-11-19 17:02:07 UTC (rev 8491)
@@ -47,7 +47,6 @@
         return intval($prev);
     }
 
-
     function next($i)
     {
         list(, $next,) = explode(':', $this->_dbh->fetch(intval($i)), 3);

Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php	2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/FileFinder.php	2012-11-19 17:02:07 UTC (rev 8491)
@@ -202,7 +202,6 @@
         return false;
     }
 
-
     /**
      * Search our path for a file.
      *

Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php	2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/HtmlParser.php	2012-11-19 17:02:07 UTC (rev 8491)
@@ -222,7 +222,6 @@
     }
 }
 
-
 class HtmlParser_PhpWiki2
     extends HtmlParser
 {

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/InlineParser.php	2012-11-19 17:02:07 UTC (rev 8491)
@@ -895,7 +895,6 @@
     }
 }
 
-
 class Markup_html_abbr extends BalancedMarkup
 {
     //rurban: abbr|acronym need an optional title tag.

Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/PageType.php	2012-11-19 17:02:07 UTC (rev 8491)
@@ -255,7 +255,6 @@
         return $link;
     }
 
-
     function _parseMap($text)
     {
         if (!preg_match_all("/^\s*(\S+)\s+(.+)$/m",
@@ -353,7 +352,6 @@
     }
 }
 
-
 /** How to transform text.
  */
 class PageFormatter

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/Request.php	2012-11-19 17:02:07 UTC (rev 8491)
@@ -543,7 +543,6 @@
         return Request_UploadedFile::getUploadedFile($key);
     }
 
-
     function _fix_magic_quotes_gpc()
     {
         $needs_fix = array('HTTP_POST_VARS',
@@ -1260,7 +1259,6 @@
     unset($request->_accesslog->entries);
 }
 
-
 class HTTP_ETag
 {
     function HTTP_ETag($val, $is_weak = false)
@@ -1283,7 +1281,6 @@
         return true;
     }
 
-
     function asString()
     {
         $quoted = '"' . addslashes($this->_val) . '"';

Modified: trunk/lib/SpamBlocklist.php
===================================================================
--- trunk/lib/SpamBlocklist.php	2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/SpamBlocklist.php	2012-11-19 17:02:07 UTC (rev 8491)
@@ -98,7 +98,6 @@
     return 0;
 }
 
-
 /*
 if (defined('SPAMBLOCKLIST_TEST') and SPAMBLOCKLIST_TEST) {
     BlackListDebug("10.20.30.40");

Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/Template.php	2012-11-19 17:02:07 UTC (rev 8491)
@@ -129,7 +129,6 @@
         $this->_locals[$varname] = $value;
     }
 
-
     function printExpansion($defaults = false)
     {
         if (!is_array($defaults)) // HTML object or template object
@@ -181,7 +180,6 @@
         return $this->getExpansion();
     }
 
-
     // Debugging:
     function _dump_template()
     {
@@ -272,7 +270,6 @@
     printXML(new Template('html', $request, $args));
 }
 
-
 /**
  * For dumping pages as html to a file.
  * Used for action=dumphtml,action=ziphtml,format=pdf,format=xml

Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php	2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/TextSearchQuery.php	2012-11-19 17:02:07 UTC (rev 8491)
@@ -95,7 +95,6 @@
 define ('TSQ_NODE_OR',         11);
 */
 
-
 class TextSearchQuery
 {
     /**
@@ -190,7 +189,6 @@
         return min(1.0, $score / 10.0);
     }
 
-
     /**
      * Get a regular expression suitable for highlighting matched words.
      *
@@ -404,8 +402,6 @@
     }
 }
 
-
-
 /**
  * A simple algebraic matcher for numeric attributes.
  *  NumericSearchQuery can do ("population < 20000 and area > 1000000", array("population", "area"))
@@ -1182,7 +1178,6 @@
         return $expr;
     }
 
-
     function get_atom()
     {
         if ($atom = $this->get_word(TSQ_ALLWORDS)) // Bug#1791564 not involved: '*'

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/WikiDB.php	2012-11-19 17:02:07 UTC (rev 8491)
@@ -921,7 +921,6 @@
         $backend->unlock(array('version'));
     }
 
-
     /**
      * Create a new revision of a {@link WikiDB_Page}.
      *
@@ -1455,7 +1454,6 @@
         return $strval;
     }
 
-
     /**
      * @access private
      * @param integer_or_object $version_or_pagerevision
@@ -1861,7 +1859,6 @@
         return $meta;
     }
 
-
     /**
      * Return a string representation of the revision.
      *

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/WikiPluginCached.php	2012-11-19 17:02:07 UTC (rev 8491)
@@ -620,7 +620,6 @@
         Header($IMAGEHEADER[$doctype]);
     }
 
-
     /**
      * Converts argument array to a string of format option="value".
      * This should only be used for displaying plugin options for
@@ -681,7 +680,6 @@
         return true;
     } // checkCall1
 
-
     /**
      * Extracts the parameters necessary to reconstruct the plugin
      * call needed to produce the requested image.
@@ -712,7 +710,6 @@
         return true;
     } // checkCall2
 
-
     /**
      * Creates an image or image map depending on the plugin type.
      * @access static private
@@ -968,7 +965,6 @@
         }
     } // printError
 
-
     /**
      * Basic text to image converter for error handling which allows
      * multiple line output.

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/WikiUserNew.php	2012-11-19 17:02:07 UTC (rev 8491)
@@ -1335,7 +1335,6 @@
         }
     }
 
-
     function _checkPassLength($submitted_password)
     {
         if (strlen($submitted_password) < PASSWORD_LENGTH_MINIMUM) {
@@ -1488,7 +1487,6 @@
  *
  */
 
-
 /**
  * For security, this class should not be extended. Instead, extend
  * from _PassUser (think of this as unix "root").

Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php	2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/XmlElement.php	2012-11-19 17:02:07 UTC (rev 8491)
@@ -388,13 +388,11 @@
         return substr($this->startTag(), 0, -1) . "/>";
     }
 
-
     function endTag()
     {
         return "</$this->_tag>";
     }
 
-
     function printXML()
     {
         if ($this->isEmpty())

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/editpage.php	2012-11-19 17:02:07 UTC (rev 8491)
@@ -595,7 +595,6 @@
         else
             $message = HTML::p(_("Please check it through before saving."));
 
-
         /*$steps = HTML::ol(HTML::li(_("Copy your changes to the clipboard or to another temporary place (e.g. text editor).")),
           HTML::li(fmt("%s of the page. You should now see the most current version of the page. Your changes are no longer there.",
                        $re_edit_link)),
@@ -609,7 +608,6 @@
                 $message);
     }
 
-
     function getTextArea()
     {
         $request = &$this->request;

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/stdlib.php	2012-11-19 17:02:07 UTC (rev 8491)
@@ -1209,7 +1209,6 @@
     }
 }
 
-
 /**
  * Expand tabs in string.
  *
@@ -1333,7 +1332,6 @@
         $sign, $mins / 60, $colon, $mins % 60);
 }
 
-
 /**
  * Format time in ISO-8601 format.
  *
@@ -1431,7 +1429,6 @@
     return date("D M j H:i:s Y", $time);
 }
 
-
 /**
  * Format number as kibibytes or bytes.
  * Short format is used for PageList
@@ -1823,7 +1820,6 @@
     );
 }
 
-
 /** Hash a value.
  *
  * This is used for generating ETags.
@@ -1841,7 +1837,6 @@
     trigger_error("Can't hash $x", E_USER_ERROR);
 }
 
-
 /**
  * Seed the random number generator.
  *
@@ -1993,7 +1988,6 @@
         $request->finish();
     }
 
-
     function _getButtons()
     {
         global $request;

Modified: trunk/lib/ziplib.php
===================================================================
--- trunk/lib/ziplib.php	2012-11-19 16:58:59 UTC (rev 8490)
+++ trunk/lib/ziplib.php	2012-11-19 17:02:07 UTC (rev 8491)
@@ -248,7 +248,6 @@
     return mktime($hour, $min, $sec, $month, $mday, $year);
 }
 
-
 /**
  * Class for zipfile creation.
  */
@@ -687,7 +686,6 @@
     return $headers;
 }
 
-
 function ParseMimeContentType($string)
 {
     // FIXME: Remove (RFC822 style comments).

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

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

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

Revision: 8490
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8490&view=rev
Author:   vargenau
Date:     2012-11-19 16:58:59 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
Remove extra empty lines

Modified Paths:
--------------
    trunk/lib/plugin/AddComment.php
    trunk/lib/plugin/AllUsers.php
    trunk/lib/plugin/AppendText.php
    trunk/lib/plugin/AsciiSVG.php
    trunk/lib/plugin/AuthorHistory.php
    trunk/lib/plugin/BackLinks.php
    trunk/lib/plugin/BlogArchives.php
    trunk/lib/plugin/BlogJournal.php
    trunk/lib/plugin/Calendar.php
    trunk/lib/plugin/CalendarList.php
    trunk/lib/plugin/CategoryPage.php
    trunk/lib/plugin/Chart.php
    trunk/lib/plugin/Comment.php
    trunk/lib/plugin/CreateBib.php
    trunk/lib/plugin/CreatePage.php
    trunk/lib/plugin/CreateToc.php
    trunk/lib/plugin/CurrentTime.php
    trunk/lib/plugin/DeadEndPages.php
    trunk/lib/plugin/Diff.php
    trunk/lib/plugin/DynamicIncludePage.php
    trunk/lib/plugin/ExternalSearch.php
    trunk/lib/plugin/FacebookLike.php
    trunk/lib/plugin/FileInfo.php
    trunk/lib/plugin/FrameInclude.php
    trunk/lib/plugin/FullTextSearch.php
    trunk/lib/plugin/FuzzyPages.php
    trunk/lib/plugin/GoTo.php
    trunk/lib/plugin/GoogleMaps.php
    trunk/lib/plugin/GooglePlugin.php
    trunk/lib/plugin/GraphViz.php
    trunk/lib/plugin/HelloWorld.php
    trunk/lib/plugin/Imdb.php
    trunk/lib/plugin/IncludePage.php
    trunk/lib/plugin/IncludePages.php
    trunk/lib/plugin/JabberPresence.php
    trunk/lib/plugin/LdapSearch.php
    trunk/lib/plugin/LikePages.php
    trunk/lib/plugin/LinkDatabase.php
    trunk/lib/plugin/LinkSearch.php
    trunk/lib/plugin/ListPages.php
    trunk/lib/plugin/ListRelations.php
    trunk/lib/plugin/ListSubpages.php
    trunk/lib/plugin/ModeratedPage.php
    trunk/lib/plugin/MostPopular.php
    trunk/lib/plugin/NewPagesPerUser.php
    trunk/lib/plugin/NoCache.php
    trunk/lib/plugin/OldStyleTable.php
    trunk/lib/plugin/OrphanedPages.php
    trunk/lib/plugin/PageDump.php
    trunk/lib/plugin/PageGroup.php
    trunk/lib/plugin/PageHistory.php
    trunk/lib/plugin/PageInfo.php
    trunk/lib/plugin/PageTrail.php
    trunk/lib/plugin/PasswordReset.php
    trunk/lib/plugin/PhotoAlbum.php
    trunk/lib/plugin/PhpHighlight.php
    trunk/lib/plugin/PhpWeather.php
    trunk/lib/plugin/Ploticus.php
    trunk/lib/plugin/PluginManager.php
    trunk/lib/plugin/PopUp.php
    trunk/lib/plugin/PopularNearby.php
    trunk/lib/plugin/PreferenceApp.php
    trunk/lib/plugin/Processing.php
    trunk/lib/plugin/RandomPage.php
    trunk/lib/plugin/RateIt.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/plugin/RedirectTo.php
    trunk/lib/plugin/RssFeed.php
    trunk/lib/plugin/SearchHighlight.php
    trunk/lib/plugin/SemanticRelations.php
    trunk/lib/plugin/SemanticSearch.php
    trunk/lib/plugin/SemanticSearchAdvanced.php
    trunk/lib/plugin/SiteMap.php
    trunk/lib/plugin/SpellCheck.php
    trunk/lib/plugin/SqlResult.php
    trunk/lib/plugin/SyncWiki.php
    trunk/lib/plugin/SyntaxHighlighter.php
    trunk/lib/plugin/TeX2png.php
    trunk/lib/plugin/Template.php
    trunk/lib/plugin/TexToPng.php
    trunk/lib/plugin/TitleSearch.php
    trunk/lib/plugin/Transclude.php
    trunk/lib/plugin/TranslateText.php
    trunk/lib/plugin/UnfoldSubpages.php
    trunk/lib/plugin/UriResolver.php
    trunk/lib/plugin/UserPreferences.php
    trunk/lib/plugin/UserRatings.php
    trunk/lib/plugin/Video.php
    trunk/lib/plugin/VisualWiki.php
    trunk/lib/plugin/WatchPage.php
    trunk/lib/plugin/WhoIsOnline.php
    trunk/lib/plugin/WikiAdminDeleteAcl.php
    trunk/lib/plugin/WikiAdminRemove.php
    trunk/lib/plugin/WikiAdminRename.php
    trunk/lib/plugin/WikiAdminSetAclSimple.php
    trunk/lib/plugin/WikiAdminUtils.php
    trunk/lib/plugin/WikiBlog.php
    trunk/lib/plugin/WikiForm.php
    trunk/lib/plugin/WikiFormRich.php
    trunk/lib/plugin/WikiForum.php
    trunk/lib/plugin/WikiPoll.php
    trunk/lib/plugin/YouTube.php
    trunk/lib/plugin/_AuthInfo.php
    trunk/lib/plugin/_BackendInfo.php
    trunk/lib/plugin/_PreferencesInfo.php
    trunk/lib/plugin/_Retransform.php
    trunk/lib/plugin/_WikiTranslation.php
    trunk/lib/plugin/text2png.php

Modified: trunk/lib/plugin/AddComment.php
===================================================================
--- trunk/lib/plugin/AddComment.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/AddComment.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -142,8 +142,6 @@
 
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/AllUsers.php
===================================================================
--- trunk/lib/plugin/AllUsers.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/AllUsers.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -111,8 +111,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/AppendText.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -153,8 +153,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/AsciiSVG.php
===================================================================
--- trunk/lib/plugin/AsciiSVG.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/AsciiSVG.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -87,8 +87,6 @@
     }
 }
 
-
-
 class AsciiSVG_HTML extends HtmlElement
 {
     function startTag()

Modified: trunk/lib/plugin/AuthorHistory.php
===================================================================
--- trunk/lib/plugin/AuthorHistory.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/AuthorHistory.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -221,8 +221,6 @@
 
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/BackLinks.php
===================================================================
--- trunk/lib/plugin/BackLinks.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/BackLinks.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -176,8 +176,6 @@
 
 }
 
-
-
 // how many links from this backLink to other pages
 class _PageList_Column_BackLinks_count extends _PageList_Column
 {

Modified: trunk/lib/plugin/BlogArchives.php
===================================================================
--- trunk/lib/plugin/BlogArchives.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/BlogArchives.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -150,8 +150,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/BlogJournal.php
===================================================================
--- trunk/lib/plugin/BlogJournal.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/BlogJournal.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -108,8 +108,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/Calendar.php
===================================================================
--- trunk/lib/plugin/Calendar.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Calendar.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -246,8 +246,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/CalendarList.php
===================================================================
--- trunk/lib/plugin/CalendarList.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/CalendarList.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -226,8 +226,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/CategoryPage.php
===================================================================
--- trunk/lib/plugin/CategoryPage.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/CategoryPage.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -82,8 +82,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/Chart.php
===================================================================
--- trunk/lib/plugin/Chart.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Chart.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -154,8 +154,6 @@
     }
 }
 
-
-
 class SVG_HTML extends HtmlElement
 {
     function startTag()

Modified: trunk/lib/plugin/Comment.php
===================================================================
--- trunk/lib/plugin/Comment.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Comment.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -60,8 +60,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/CreateBib.php
===================================================================
--- trunk/lib/plugin/CreateBib.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/CreateBib.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -158,8 +158,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/CreatePage.php
===================================================================
--- trunk/lib/plugin/CreatePage.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/CreatePage.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -150,8 +150,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/CreateToc.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -528,8 +528,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/CurrentTime.php
===================================================================
--- trunk/lib/plugin/CurrentTime.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/CurrentTime.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -85,8 +85,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/DeadEndPages.php
===================================================================
--- trunk/lib/plugin/DeadEndPages.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/DeadEndPages.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -33,8 +33,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/Diff.php
===================================================================
--- trunk/lib/plugin/Diff.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Diff.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -169,7 +169,6 @@
         }
         $html->pushContent($otherdiffs);
 
-
         if ($old and $old->getVersion() == 0)
             $old = false;
 
@@ -202,8 +201,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/DynamicIncludePage.php
===================================================================
--- trunk/lib/plugin/DynamicIncludePage.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/DynamicIncludePage.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -97,8 +97,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/ExternalSearch.php
===================================================================
--- trunk/lib/plugin/ExternalSearch.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/ExternalSearch.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -154,8 +154,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/FacebookLike.php
===================================================================
--- trunk/lib/plugin/FacebookLike.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/FacebookLike.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -76,8 +76,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/FileInfo.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -351,8 +351,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/FrameInclude.php
===================================================================
--- trunk/lib/plugin/FrameInclude.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/FrameInclude.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -148,8 +148,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/FullTextSearch.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -153,8 +153,6 @@
     }
 }
 
-
-
 /*
  * List of Links and link to ListLinks
  */

Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/FuzzyPages.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -157,7 +157,6 @@
         return $table;
     }
 
-
     function run($dbi, $argstr, &$request, $basepage)
     {
         $args = $this->getArgs($argstr, $request);
@@ -200,8 +199,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/GoTo.php
===================================================================
--- trunk/lib/plugin/GoTo.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/GoTo.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -88,8 +88,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/GoogleMaps.php
===================================================================
--- trunk/lib/plugin/GoogleMaps.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/GoogleMaps.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -157,8 +157,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/GooglePlugin.php
===================================================================
--- trunk/lib/plugin/GooglePlugin.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/GooglePlugin.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -126,8 +126,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/GraphViz.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -464,8 +464,6 @@
 
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/HelloWorld.php
===================================================================
--- trunk/lib/plugin/HelloWorld.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/HelloWorld.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -72,8 +72,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/Imdb.php
===================================================================
--- trunk/lib/plugin/Imdb.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Imdb.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -109,8 +109,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/IncludePage.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -212,8 +212,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/IncludePages.php
===================================================================
--- trunk/lib/plugin/IncludePages.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/IncludePages.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -86,8 +86,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/JabberPresence.php
===================================================================
--- trunk/lib/plugin/JabberPresence.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/JabberPresence.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -74,8 +74,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/LdapSearch.php
===================================================================
--- trunk/lib/plugin/LdapSearch.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/LdapSearch.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -205,8 +205,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/LikePages.php
===================================================================
--- trunk/lib/plugin/LikePages.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/LikePages.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -116,8 +116,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/LinkDatabase.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -182,8 +182,6 @@
     }
 }
 
-
-
 class _PageList_Column_LinkDatabase_links extends _PageList_Column
 {
     function _getValue($page, &$revision_handle)

Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/LinkSearch.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -165,8 +165,6 @@
     }
 }
 
-
-
 // FIXME: sortby errors with this column
 class _PageList_Column_LinkSearch_link
     extends _PageList_Column

Modified: trunk/lib/plugin/ListPages.php
===================================================================
--- trunk/lib/plugin/ListPages.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/ListPages.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -132,8 +132,6 @@
     }
 }
 
-
-
 // how many back-/forwardlinks for this page
 class _PageList_Column_ListPages_count extends _PageList_Column
 {

Modified: trunk/lib/plugin/ListRelations.php
===================================================================
--- trunk/lib/plugin/ListRelations.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/ListRelations.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -62,8 +62,6 @@
 
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/ListSubpages.php
===================================================================
--- trunk/lib/plugin/ListSubpages.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/ListSubpages.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -113,8 +113,6 @@
     }
 }
 
-
-
 // how many backlinks for this subpage
 class _PageList_Column_ListSubpages_count extends _PageList_Column
 {

Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/ModeratedPage.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -458,8 +458,6 @@
 
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/MostPopular.php
===================================================================
--- trunk/lib/plugin/MostPopular.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/MostPopular.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -102,8 +102,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/NewPagesPerUser.php
===================================================================
--- trunk/lib/plugin/NewPagesPerUser.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/NewPagesPerUser.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -136,8 +136,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/NoCache.php
===================================================================
--- trunk/lib/plugin/NoCache.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/NoCache.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -61,8 +61,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/OldStyleTable.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -153,8 +153,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/OrphanedPages.php
===================================================================
--- trunk/lib/plugin/OrphanedPages.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/OrphanedPages.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -98,8 +98,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PageDump.php
===================================================================
--- trunk/lib/plugin/PageDump.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PageDump.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -319,8 +319,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PageGroup.php
===================================================================
--- trunk/lib/plugin/PageGroup.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PageGroup.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -203,8 +203,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PageHistory.php
===================================================================
--- trunk/lib/plugin/PageHistory.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PageHistory.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -353,8 +353,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PageInfo.php
===================================================================
--- trunk/lib/plugin/PageInfo.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PageInfo.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -71,8 +71,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PageTrail.php
===================================================================
--- trunk/lib/plugin/PageTrail.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PageTrail.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -93,8 +93,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PasswordReset.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -195,8 +195,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PhotoAlbum.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -669,8 +669,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PhpHighlight.php
===================================================================
--- trunk/lib/plugin/PhpHighlight.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PhpHighlight.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -182,8 +182,6 @@
 
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PhpWeather.php
===================================================================
--- trunk/lib/plugin/PhpWeather.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PhpWeather.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -197,8 +197,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/Ploticus.php
===================================================================
--- trunk/lib/plugin/Ploticus.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Ploticus.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -301,8 +301,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PluginManager.php
===================================================================
--- trunk/lib/plugin/PluginManager.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PluginManager.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -186,8 +186,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PopUp.php
===================================================================
--- trunk/lib/plugin/PopUp.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PopUp.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -100,8 +100,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PopularNearby.php
===================================================================
--- trunk/lib/plugin/PopularNearby.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PopularNearby.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -151,8 +151,6 @@
     }
 }
 
-
-
 function cmp_by_hits($a, $b)
 {
     if ($a['hits'] == $b['hits']) return 0;

Modified: trunk/lib/plugin/PreferenceApp.php
===================================================================
--- trunk/lib/plugin/PreferenceApp.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/PreferenceApp.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -310,8 +310,6 @@
 
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/Processing.php
===================================================================
--- trunk/lib/plugin/Processing.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Processing.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -86,8 +86,6 @@
     }
 }
 
-
-
 class Processing_HTML extends HtmlElement
 {
     function startTag()

Modified: trunk/lib/plugin/RandomPage.php
===================================================================
--- trunk/lib/plugin/RandomPage.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/RandomPage.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -113,8 +113,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/RateIt.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -450,8 +450,6 @@
 
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/RecentChanges.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -121,7 +121,6 @@
         return $this->authorHasPage() ? WikiURL($author) : false;
     }
 
-
     function status($rev)
     {
         if ($rev->hasDefaultContents())
@@ -728,7 +727,6 @@
             "]");
     }
 
-
     function format($changes)
     {
         $this->_args['daylist'] = false; //don't show day buttons in Mozilla sidebar
@@ -1474,8 +1472,6 @@
 
 }
 
-
-
 class OptionsButtonBars extends HtmlElement
 {
 

Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/RedirectTo.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -106,8 +106,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/RssFeed.php
===================================================================
--- trunk/lib/plugin/RssFeed.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/RssFeed.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -129,8 +129,6 @@
 
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/SearchHighlight.php
===================================================================
--- trunk/lib/plugin/SearchHighlight.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/SearchHighlight.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -110,8 +110,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/SemanticRelations.php
===================================================================
--- trunk/lib/plugin/SemanticRelations.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/SemanticRelations.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -143,8 +143,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/SemanticSearch.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -435,8 +435,6 @@
     }
 }
 
-
-
 class _PageList_Column_SemanticSearch_relation
     extends _PageList_Column
 {

Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -220,8 +220,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/SiteMap.php
===================================================================
--- trunk/lib/plugin/SiteMap.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/SiteMap.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -141,7 +141,6 @@
         return $pagearr;
     }
 
-
     function run($dbi, $argstr, &$request, $basepage)
     {
         include_once 'lib/BlockParser.php';
@@ -223,8 +222,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/SpellCheck.php
===================================================================
--- trunk/lib/plugin/SpellCheck.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/SpellCheck.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -191,8 +191,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/SqlResult.php
===================================================================
--- trunk/lib/plugin/SqlResult.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/SqlResult.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -220,8 +220,6 @@
 
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/SyncWiki.php
===================================================================
--- trunk/lib/plugin/SyncWiki.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/SyncWiki.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -365,8 +365,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/SyntaxHighlighter.php
===================================================================
--- trunk/lib/plugin/SyntaxHighlighter.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/SyntaxHighlighter.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -162,8 +162,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/TeX2png.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -238,8 +238,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Template.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -267,8 +267,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/TexToPng.php
===================================================================
--- trunk/lib/plugin/TexToPng.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/TexToPng.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -191,7 +191,6 @@
         return strtr($help, '/', '\\');
     } // helptext
 
-
     function checkParams(&$tex, &$magstep, $subslash, &$aalias, &$transp)
     {
 

Modified: trunk/lib/plugin/TitleSearch.php
===================================================================
--- trunk/lib/plugin/TitleSearch.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/TitleSearch.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -109,8 +109,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/Transclude.php
===================================================================
--- trunk/lib/plugin/Transclude.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Transclude.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -162,8 +162,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/TranslateText.php
===================================================================
--- trunk/lib/plugin/TranslateText.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/TranslateText.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -135,8 +135,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/UnfoldSubpages.php
===================================================================
--- trunk/lib/plugin/UnfoldSubpages.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/UnfoldSubpages.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -181,8 +181,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/UriResolver.php
===================================================================
--- trunk/lib/plugin/UriResolver.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/UriResolver.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -65,8 +65,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/UserPreferences.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -176,8 +176,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/UserRatings.php
===================================================================
--- trunk/lib/plugin/UserRatings.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/UserRatings.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -233,8 +233,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/Video.php
===================================================================
--- trunk/lib/plugin/Video.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/Video.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -146,8 +146,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/VisualWiki.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -219,7 +219,6 @@
             array(255, 255, 255));
     }
 
-
     /**
      * Selects the first (smallest or biggest) WikiPages in
      * a given category.
@@ -272,7 +271,6 @@
         return array_keys($selected);
     }
 
-
     /**
      * Extracts a subset of all pages from the wiki and find their
      * connections to other pages. Also collects some page features
@@ -456,7 +454,6 @@
         if ($width and $height)
             $dot .= "    size=\"$width,$height\";\n    ";
 
-
         switch ($shape) {
             case 'point':
                 $dot .= "edge [arrowhead=none];\nnode [shape=$shape,fontname=$fontname,width=0.15,height=0.15,fontsize=$fontsize];\n";
@@ -538,7 +535,6 @@
         return $ok;
     }
 
-
     /**
      * static workaround on broken Cache or broken dot executable,
      * called only if debug=static.

Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WatchPage.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -172,8 +172,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WhoIsOnline.php
===================================================================
--- trunk/lib/plugin/WhoIsOnline.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WhoIsOnline.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -206,8 +206,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WikiAdminDeleteAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminDeleteAcl.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiAdminDeleteAcl.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -156,8 +156,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiAdminRemove.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -248,8 +248,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiAdminRename.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -331,8 +331,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -181,8 +181,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiAdminUtils.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -311,8 +311,6 @@
     }
 }
 
-
-
 require_once 'lib/PageList.php';
 
 class _PageList_Column_email

Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiBlog.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -432,8 +432,6 @@
 
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WikiForm.php
===================================================================
--- trunk/lib/plugin/WikiForm.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiForm.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -116,8 +116,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiFormRich.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -399,8 +399,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WikiForum.php
===================================================================
--- trunk/lib/plugin/WikiForum.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiForum.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -136,8 +136,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/WikiPoll.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -337,8 +337,6 @@
 
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/YouTube.php
===================================================================
--- trunk/lib/plugin/YouTube.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/YouTube.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -200,8 +200,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/_AuthInfo.php
===================================================================
--- trunk/lib/plugin/_AuthInfo.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/_AuthInfo.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -201,8 +201,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/_BackendInfo.php
===================================================================
--- trunk/lib/plugin/_BackendInfo.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/_BackendInfo.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -201,8 +201,6 @@
 
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/_PreferencesInfo.php
===================================================================
--- trunk/lib/plugin/_PreferencesInfo.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/_PreferencesInfo.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -51,8 +51,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/_Retransform.php
===================================================================
--- trunk/lib/plugin/_Retransform.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/_Retransform.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -85,8 +85,6 @@
 
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/_WikiTranslation.php
===================================================================
--- trunk/lib/plugin/_WikiTranslation.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/_WikiTranslation.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -382,8 +382,6 @@
     }
 }
 
-
-
 class _PageList_Column_customlang extends _PageList_Column
 {
     function _PageList_Column_customlang($field, $from_lang, $plugin)

Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2012-11-19 16:40:58 UTC (rev 8489)
+++ trunk/lib/plugin/text2png.php	2012-11-19 16:58:59 UTC (rev 8490)
@@ -44,7 +44,6 @@
 if (!defined('text2png_debug'))
     define('text2png_debug', DEBUG & _DEBUG_VERBOSE);
 
-
 class WikiPlugin_text2png
     extends WikiPlugin
 {
@@ -231,8 +230,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

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