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

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

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

Revision: 9387
          http://sourceforge.net/p/phpwiki/code/9387
Author:   vargenau
Date:     2014-11-28 14:27:41 +0000 (Fri, 28 Nov 2014)
Log Message:
-----------
global $request

Modified Paths:
--------------
    trunk/lib/CachedMarkup.php
    trunk/lib/Captcha.php
    trunk/lib/DbSession/ADODB.php
    trunk/lib/DbSession/PDO.php
    trunk/lib/DbSession/SQL.php
    trunk/lib/DbSession/dba.php
    trunk/lib/DbaDatabase.php
    trunk/lib/EditToolbar.php
    trunk/lib/InlineParser.php
    trunk/lib/MailNotify.php
    trunk/lib/PageList.php
    trunk/lib/PagePerm.php
    trunk/lib/PageType.php
    trunk/lib/Request.php
    trunk/lib/WikiDB/backend/ADODB.php
    trunk/lib/WikiDB/backend/PDO.php
    trunk/lib/WikiDB/backend/dbaBase.php
    trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
    trunk/lib/WikiDB/backend.php
    trunk/lib/WikiDB.php
    trunk/lib/WikiGroup.php
    trunk/lib/WikiPlugin.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/WikiTheme.php
    trunk/lib/WikiUser/AdoDb.php
    trunk/lib/WikiUser/Db.php
    trunk/lib/WikiUser/PdoDb.php
    trunk/lib/WikiUser/PearDb.php
    trunk/lib/WikiUser.php
    trunk/lib/WysiwygEdit/Wikiwyg.php
    trunk/lib/WysiwygEdit.php
    trunk/lib/diff.php
    trunk/lib/editpage.php
    trunk/lib/plugin/GraphViz.php
    trunk/lib/plugin/InterWikiSearch.php
    trunk/lib/plugin/JabberPresence.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/plugin/SpellCheck.php
    trunk/lib/plugin/UpLoad.php
    trunk/lib/plugin/VisualWiki.php
    trunk/lib/plugin/WikiAdminSelect.php
    trunk/lib/plugin/WikiAdminSetAcl.php
    trunk/lib/plugin/WikiFormRich.php
    trunk/lib/plugin/WikiPoll.php
    trunk/lib/plugin/WikiTranslation.php
    trunk/lib/spam_babycart.php
    trunk/lib/stdlib.php
    trunk/lib/wikilens/PageListColumns.php
    trunk/lib/wikilens/RatingsDb.php

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/CachedMarkup.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -558,11 +558,16 @@
      */
     function getWikiPageLinks($basepage)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if ($basepage == '') return false;
         if (!isset($this->_page) and isset($this->_attribute)) {
             // An attribute: we store it in the basepage now, to fill the cache for page->save
             // TODO: side-effect free query
-            $page = $GLOBALS['request']->getPage($basepage);
+            $page = $request->getPage($basepage);
             $page->setAttribute($this->_relation, $this->_attribute);
             $this->_page = $basepage;
             return array(array('linkto' => '', 'relation' => $this->_relation));
@@ -750,11 +755,16 @@
 
     function getWikiPageLinks($basepage)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if ($basepage == '') return false;
         /* ":DontStoreLink" */
         if (substr($this->_link, 0, 1) == ':') return false;
         /* store only links to valid pagenames */
-        $dbi = $GLOBALS['request']->getDbh();
+        $dbi = $request->getDbh();
         if ($link = $this->getPagename($basepage) and $dbi->isWikiPage($link)) {
             return array(array('linkto' => $link));
         } else {
@@ -845,8 +855,13 @@
 
     function expand($basepage, &$markup)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $loader = $this->_getLoader();
-        $xml = $loader->expandPI($this->_pi, $GLOBALS['request'], $markup, $basepage);
+        $xml = $loader->expandPI($this->_pi, $request, $markup, $basepage);
         return $xml;
     }
 

Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/Captcha.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -30,18 +30,23 @@
     public $length;
     public $failed_msg;
     /**
-     * @var WikiRequest
+     * @var WikiRequest $request
      */
     public $request;
 
     function Captcha($meta = array(), $width = 250, $height = 80)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $this->meta =& $meta;
         $this->width = $width;
         $this->height = $height;
         $this->length = 8;
         $this->failed_msg = _("Typed in verification word mismatch ... are you a bot?");
-        $this->request =& $GLOBALS['request'];
+        $this->request =& $request;
     }
 
     function captchaword()

Modified: trunk/lib/DbSession/ADODB.php
===================================================================
--- trunk/lib/DbSession/ADODB.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/DbSession/ADODB.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -150,12 +150,17 @@
      */
     public function write($id, $sess_data)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if (defined("WIKI_XMLRPC") or defined("WIKI_SOAP")) return false;
 
         $dbh = $this->_connect();
         $table = $this->_table;
         $qid = $dbh->qstr($id);
-        $qip = $dbh->qstr($GLOBALS['request']->get('REMOTE_ADDR'));
+        $qip = $dbh->qstr($request->get('REMOTE_ADDR'));
         $time = $dbh->qstr(time());
 
         // postgres can't handle binary data in a TEXT field.

Modified: trunk/lib/DbSession/PDO.php
===================================================================
--- trunk/lib/DbSession/PDO.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/DbSession/PDO.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -133,6 +133,11 @@
      */
     public function write($id, $sess_data)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if (defined("WIKI_XMLRPC") or defined("WIKI_SOAP")) return false;
 
         $dbh = $this->_connect();
@@ -156,7 +161,7 @@
             $sth->bindParam(1, $id, PDO::PARAM_STR, 32);
             $sth->bindParam(2, $sess_data, PDO::PARAM_LOB);
             $sth->bindParam(3, $time, PDO::PARAM_INT);
-            $sth->bindParam(4, $GLOBALS['request']->get('REMOTE_ADDR'), PDO::PARAM_STR, 15);
+            $sth->bindParam(4, $request->get('REMOTE_ADDR'), PDO::PARAM_STR, 15);
             if ($result = $sth->execute()) {
                 $this->_backend->commit();
             } else {
@@ -168,7 +173,7 @@
                 . " WHERE sess_id=?");
             $sth->bindParam(1, $sess_data, PDO::PARAM_LOB);
             $sth->bindParam(2, $time, PDO::PARAM_INT);
-            $sth->bindParam(3, $GLOBALS['request']->get('REMOTE_ADDR'), PDO::PARAM_STR, 15);
+            $sth->bindParam(3, $request->get('REMOTE_ADDR'), PDO::PARAM_STR, 15);
             $sth->bindParam(4, $id, PDO::PARAM_STR, 32);
             $result = $sth->execute(); // implicit affected rows
             if ($result === false or $result < 1) { // false or int > 0
@@ -178,7 +183,7 @@
                 $sth->bindParam(1, $id, PDO::PARAM_STR, 32);
                 $sth->bindParam(2, $sess_data, PDO::PARAM_LOB);
                 $sth->bindParam(3, $time, PDO::PARAM_INT);
-                $sth->bindParam(4, $GLOBALS['request']->get('REMOTE_ADDR'), PDO::PARAM_STR, 15);
+                $sth->bindParam(4, $request->get('REMOTE_ADDR'), PDO::PARAM_STR, 15);
                 $result = $sth->execute();
             }
         }

Modified: trunk/lib/DbSession/SQL.php
===================================================================
--- trunk/lib/DbSession/SQL.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/DbSession/SQL.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -137,13 +137,18 @@
      */
     public function write($id, $sess_data)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if (defined("WIKI_XMLRPC") or defined("WIKI_SOAP")) return false;
 
         $dbh = $this->_connect();
         //$dbh->unlock(false,1);
         $table = $this->_table;
         $qid = $dbh->quote($id);
-        $qip = $dbh->quote($GLOBALS['request']->get('REMOTE_ADDR'));
+        $qip = $dbh->quote($request->get('REMOTE_ADDR'));
         $time = $dbh->quote(time());
         if (DEBUG and $sess_data == 'wiki_user|N;') {
             trigger_error("delete empty session $qid", E_USER_WARNING);

Modified: trunk/lib/DbSession/dba.php
===================================================================
--- trunk/lib/DbSession/dba.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/DbSession/dba.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -93,11 +93,16 @@
 
     function write($id, $sess_data)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if (defined("WIKI_XMLRPC") or defined("WIKI_SOAP")) return false;
 
         $dbh = $this->_connect();
         $time = time();
-        $ip = $GLOBALS['request']->get('REMOTE_ADDR');
+        $ip = $request->get('REMOTE_ADDR');
         if (strlen($sess_data) > 4000) {
             trigger_error("Overlarge session data!", E_USER_WARNING);
             $sess_data = '';

Modified: trunk/lib/DbaDatabase.php
===================================================================
--- trunk/lib/DbaDatabase.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/DbaDatabase.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -13,7 +13,7 @@
     public $_handler;
     public $_timeout;
     /**
-     * @var resource
+     * @var resource $_dbh
      */
     public $_dbh;
     public $readonly;
@@ -48,6 +48,11 @@
 
     function open($mode = 'w')
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if ($this->_dbh)
             return true; // already open.
 
@@ -85,7 +90,7 @@
                 // try to continue with read-only
                 if (!defined("READONLY"))
                     define("READONLY", true);
-                $GLOBALS['request']->_dbi->readonly = true;
+                $request->_dbi->readonly = true;
                 $this->readonly = true;
                 $mode = "r";
             }
@@ -108,7 +113,7 @@
                 // try to continue with read-only
                 if (!defined("READONLY"))
                     define("READONLY", true);
-                $GLOBALS['request']->_dbi->readonly = true;
+                $request->_dbi->readonly = true;
                 $this->readonly = true;
                 if (!file_exists($this->_file)) {
                     $ErrorManager->handleError($error);

Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/EditToolbar.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -35,6 +35,10 @@
     function __construct()
     {
         global $WikiTheme;
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
 
         $this->tokens = array();
 
@@ -83,7 +87,7 @@
 
         require_once 'lib/WikiPluginCached.php';
         $cache = WikiPluginCached::newCache();
-        $dbi = $GLOBALS['request']->getDbh();
+        $dbi = $request->getDbh();
         // regenerate if number of pages changes (categories, pages, templates, images uploaded)
         $key = $dbi->numPages();
         $key .= '+categories+plugin' . (isBrowserSafari() ? '+safari' : '');
@@ -302,10 +306,14 @@
     //result is cached
     private function categoriesPulldown()
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
         global $WikiTheme;
 
         require_once 'lib/TextSearchQuery.php';
-        $dbi =& $GLOBALS['request']->_dbi;
+        $dbi =& $request->_dbi;
         // KEYWORDS formerly known as $KeywordLinkRegexp
         $pages = $dbi->titleSearch(new TextSearchQuery(KEYWORDS, true));
         if ($pages) {
@@ -391,8 +399,13 @@
     // result is cached. Esp. the args are expensive
     private function pagesPulldown($query, $case_exact = false, $regex = 'auto')
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         require_once 'lib/TextSearchQuery.php';
-        $dbi =& $GLOBALS['request']->_dbi;
+        $dbi =& $request->_dbi;
         $page_iter = $dbi->titleSearch(new TextSearchQuery($query, $case_exact, $regex));
         if ($page_iter->count() > 0) {
             global $WikiTheme;

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/InlineParser.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -475,7 +475,12 @@
 {
     function __construct()
     {
-        $this->suggestions = $GLOBALS['request']->getArg('suggestions');
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
+        $this->suggestions = $request->getArg('suggestions');
     }
 
     function getMatchRegexp()
@@ -498,7 +503,12 @@
 {
     function __construct()
     {
-        $result = $GLOBALS['request']->_searchhighlight;
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
+        $result = $request->_searchhighlight;
         require_once 'lib/TextSearchQuery.php';
         $query = new TextSearchQuery($result['query']);
         $this->hilight_re = $query->getHighlightRegexp();
@@ -1360,8 +1370,13 @@
 
 function TransformInline($text, $basepage = false)
 {
+    /**
+      * @var WikiRequest $request
+      */
+    global $request;
+
     static $trfm;
-    $action = $GLOBALS['request']->getArg('action');
+    $action = $request->getArg('action');
     if (empty($trfm) or $action == 'SpellCheck') {
         $trfm = new InlineTransformer;
     }

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/MailNotify.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -323,7 +323,12 @@
      */
     function onChangePage(&$wikidb, &$wikitext, $version, &$meta)
     {
-        if (!is_a($GLOBALS['request'], 'MockRequest')) {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
+        if (!is_a($request, 'MockRequest')) {
             $notify = $wikidb->get('notify');
             /* Generate notification emails? */
             if (!empty($notify) and is_array($notify)) {
@@ -340,9 +345,14 @@
 
     function onDeletePage(&$wikidb, $pagename)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $result = true;
         /* Generate notification emails? */
-        if (!$wikidb->isWikiPage($pagename) and !is_a($GLOBALS['request'], 'MockRequest')) {
+        if (!$wikidb->isWikiPage($pagename) and !is_a($request, 'MockRequest')) {
             $notify = $wikidb->get('notify');
             if (!empty($notify) and is_array($notify)) {
                 //TODO: deferr it (quite a massive load if you remove some pages).
@@ -358,7 +368,12 @@
 
     function onRenamePage(&$wikidb, $oldpage, $new_pagename)
     {
-        if (!is_a($GLOBALS['request'], 'MockRequest')) {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
+        if (!is_a($request, 'MockRequest')) {
             $notify = $wikidb->get('notify');
             if (!empty($notify) and is_array($notify)) {
                 $this->getPageChangeEmails($notify);

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/PageList.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -51,6 +51,7 @@
 class _PageList_Column_base
 {
     public $_tdattr = array();
+    public $_field;
 
     function __construct($default_heading, $align = false)
     {
@@ -471,8 +472,13 @@
 {
     function __construct($field, $default_heading, $align = false)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         parent::__construct($field, $default_heading, $align);
-        $this->dbi =& $GLOBALS['request']->getDbh();
+        $this->dbi =& $request->getDbh();
     }
 
     function _getValue($page_handle, &$revision_handle)
@@ -607,14 +613,19 @@
 
     function __construct($columns = array(), $exclude = array(), $options = array())
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         // unique id per pagelist on each page.
-        if (!isset($GLOBALS['request']->_pagelist))
-            $GLOBALS['request']->_pagelist = 0;
+        if (!isset($request->_pagelist))
+            $request->_pagelist = 0;
         else
-            $GLOBALS['request']->_pagelist++;
-        $this->id = $GLOBALS['request']->_pagelist;
-        if ($GLOBALS['request']->getArg('count'))
-            $options['count'] = $GLOBALS['request']->getArg('count');
+            $request->_pagelist++;
+        $this->id = $request->_pagelist;
+        if ($request->getArg('count'))
+            $options['count'] = $request->getArg('count');
         if ($options)
             $this->_options = $options;
 
@@ -849,9 +860,14 @@
 
     function _getPageFromHandle($page_handle)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if (is_string($page_handle)) {
             if (empty($page_handle)) return $page_handle;
-            $page_handle = $GLOBALS['request']->_dbi->getPage($page_handle);
+            $page_handle = $request->_dbi->getPage($page_handle);
         }
         return $page_handle;
     }
@@ -1116,6 +1132,11 @@
     static function explodePageList($input, $include_empty = false, $sortby = '',
                                     $limit = '', $exclude = '')
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if (empty($input)) {
             return array();
         }
@@ -1127,7 +1148,7 @@
             include_once 'lib/TextSearchQuery.php';
             $search = new TextSearchQuery(str_replace(",", " or ", $input), true,
                 (substr($input, 0, 1) == "^") ? 'posix' : 'glob');
-            $dbi = $GLOBALS['request']->getDbh();
+            $dbi = $request->getDbh();
             $iter = $dbi->titleSearch($search, $sortby, $limit, $exclude);
             $pages = array();
             while ($pagehandle = $iter->next()) {
@@ -1144,11 +1165,16 @@
     static function allPagesByAuthor($wildcard, $include_empty = false, $sortby = '',
                               $limit = '', $exclude = '')
     {
-        $dbi = $GLOBALS['request']->getDbh();
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
+        $dbi = $request->getDbh();
         $allPagehandles = $dbi->getAllPages($include_empty, $sortby, $limit, $exclude);
         $allPages = array();
         if ($wildcard === '[]') {
-            $wildcard = $GLOBALS['request']->_user->getAuthenticatedId();
+            $wildcard = $request->_user->getAuthenticatedId();
             if (!$wildcard) return $allPages;
         }
         $do_glob = preg_match('/[\?\*]/', $wildcard);
@@ -1171,11 +1197,16 @@
     static function allPagesByOwner($wildcard, $include_empty = false, $sortby = '',
                              $limit = '', $exclude = '')
     {
-        $dbi = $GLOBALS['request']->getDbh();
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
+        $dbi = $request->getDbh();
         $allPagehandles = $dbi->getAllPages($include_empty, $sortby, $limit, $exclude);
         $allPages = array();
         if ($wildcard === '[]') {
-            $wildcard = $GLOBALS['request']->_user->getAuthenticatedId();
+            $wildcard = $request->_user->getAuthenticatedId();
             if (!$wildcard) return $allPages;
         }
         $do_glob = preg_match('/[\?\*]/', $wildcard);
@@ -1197,11 +1228,16 @@
     static function allPagesByCreator($wildcard, $include_empty = false, $sortby = '',
                                $limit = '', $exclude = '')
     {
-        $dbi = $GLOBALS['request']->getDbh();
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
+        $dbi = $request->getDbh();
         $allPagehandles = $dbi->getAllPages($include_empty, $sortby, $limit, $exclude);
         $allPages = array();
         if ($wildcard === '[]') {
-            $wildcard = $GLOBALS['request']->_user->getAuthenticatedId();
+            $wildcard = $request->_user->getAuthenticatedId();
             if (!$wildcard) return $allPages;
         }
         $do_glob = preg_match('/[\?\*]/', $wildcard);
@@ -1224,7 +1260,12 @@
     static function allUserPages($include_empty = false, $sortby = '',
                           $limit = '', $exclude = '')
     {
-        $dbi = $GLOBALS['request']->getDbh();
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
+        $dbi = $request->getDbh();
         $allPagehandles = $dbi->getAllPages($include_empty, $sortby, $limit, $exclude);
         $allPages = array();
         while ($pagehandle = $allPagehandles->next()) {
@@ -1372,7 +1413,7 @@
         if (!(defined('FUSIONFORGE') and FUSIONFORGE)) {
             // FIXME: anon users might rate and see ratings also.
             // Defer this logic to the plugin.
-            if ($column == 'rating' and !$GLOBALS['request']->_user->isSignedIn()) {
+            if ($column == 'rating' and !$request->_user->isSignedIn()) {
                 return false;
             }
         }
@@ -1491,6 +1532,11 @@
 
     function pagingTokens($numrows = false, $ncolumns = false, $limit = false)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if ($numrows === false)
             $numrows = $this->getTotal();
         if ($limit === false)
@@ -1505,7 +1551,6 @@
         )
             return false;
 
-        $request = &$GLOBALS['request'];
         $pagename = $request->getArg('pagename');
         $defargs = array_merge(array('id' => $this->id), $request->args);
         if (USE_PATH_INFO) unset($defargs['pagename']);

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/PagePerm.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -359,7 +359,12 @@
 
     function PagePermission($hash = array())
     {
-        $this->_group = &$GLOBALS['request']->getGroup();
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
+        $this->_group = &$request->getGroup();
         if (is_array($hash) and !empty($hash)) {
             $accessTypes = $this->accessTypes();
             foreach ($hash as $access => $requires) {
@@ -597,8 +602,13 @@
     function asEditableTable($type)
     {
         global $WikiTheme;
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if (!isset($this->_group)) {
-            $this->_group =& $GLOBALS['request']->getGroup();
+            $this->_group =& $request->getGroup();
         }
         $table = HTML::table();
         $table->pushContent(HTML::tr(

Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/PageType.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -153,8 +153,13 @@
 {
     function __construct($pagetext = false)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if (!$pagetext) {
-            $dbi = $GLOBALS['request']->getDbh();
+            $dbi = $request->getDbh();
             $page = $dbi->getPage(__("InterWikiMap"));
             if ($page->get('locked')) {
                 $current = $page->getCurrentRevision();
@@ -258,6 +263,11 @@
 
     private function _parseMap($text)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if (!preg_match_all("/^\s*(\S+)\s+(.+)$/m",
             $text, $matches, PREG_SET_ORDER)
         )
@@ -284,7 +294,7 @@
         // Talk:UserName => UserName/Discussion
         // Talk:PageName => PageName/Discussion as default, which might be overridden
         if (empty($map["Talk"])) {
-            $pagename = $GLOBALS['request']->getArg('pagename');
+            $pagename = $request->getArg('pagename');
             // against PageName/Discussion/Discussion
             if (string_ends_with($pagename, '/' . _("Discussion")))
                 $map["Talk"] = "%s";
@@ -301,7 +311,7 @@
             if (strstr($map[$special], '%u'))
                 $map[$special] = str_replace($map[$special],
                     '%u',
-                    $GLOBALS['request']->_user->_userid);
+                    $request->_user->_userid);
             if (strstr($map[$special], '%b'))
                 $map[$special] = str_replace($map[$special],
                     '%b',

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/Request.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -32,6 +32,8 @@
 
     function __construct()
     {
+        global $request;
+
         $this->_fix_multipart_form_data();
 
         switch ($this->get('REQUEST_METHOD')) {
@@ -54,7 +56,7 @@
             $this->_accesslog = new Request_AccessLog(ACCESS_LOG, ACCESS_LOG_SQL);
         }
 
-        $GLOBALS['request'] = $this;
+        $request = $this;
     }
 
     function get($key)

Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/WikiDB/backend/ADODB.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -367,9 +367,9 @@
     /**
      * Get version data.
      *
-     * @param $version int Which version to get.
+     * @param int $version Which version to get.
      *
-     * @return hash The version data, or false if specified version does not
+     * @return array hash The version data, or false if specified version does not
      *              exist.
      */
     function get_versiondata($pagename, $version, $want_content = false)
@@ -513,6 +513,11 @@
      */
     function delete_page($pagename)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $dbh = &$this->_dbh;
         extract($this->_table_names);
 
@@ -523,7 +528,7 @@
             return false;
         }
         $mtime = time();
-        $user =& $GLOBALS['request']->_user;
+        $user =& $request->_user;
         $meta = array('author' => $user->getId(),
             'author_id' => $user->getAuthenticatedId(),
             'mtime' => $mtime);

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/WikiDB/backend/PDO.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -32,6 +32,11 @@
 
     function __construct($dbparams)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $this->_dbparams = $dbparams;
         if (strstr($dbparams['dsn'], "://")) { // pear DB syntax
             $parsed = parseDSN($dbparams['dsn']);
@@ -616,6 +621,11 @@
      */
     function delete_page($pagename)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $dbh = &$this->_dbh;
         extract($this->_table_names);
 
@@ -626,7 +636,7 @@
             return false;
         }
         $mtime = time();
-        $user =& $GLOBALS['request']->_user;
+        $user =& $request->_user;
         $meta = array('author' => $user->getId(),
             'author_id' => $user->getAuthenticatedId(),
             'mtime' => $mtime);

Modified: trunk/lib/WikiDB/backend/dbaBase.php
===================================================================
--- trunk/lib/WikiDB/backend/dbaBase.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/WikiDB/backend/dbaBase.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -193,6 +193,11 @@
      */
     function delete_page($pagename)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $version = $this->get_latest_version($pagename);
         $data = $this->_versiondb->get((int)$version . ":$pagename");
         // returns serialized string
@@ -206,9 +211,9 @@
         assert(is_array($data) and !empty($data)); // mtime
         $data['%content'] = '';
         $data['mtime'] = time();
-        $data['summary'] = "removed by " . $GLOBALS["request"]->_deduceUsername();
+        $data['summary'] = "removed by " . $request->_deduceUsername();
         $this->set_versiondata($pagename, $version + 1, $data);
-        $this->set_links($pagename, false);
+        $this->set_links($pagename, array());
     }
 
     /**
@@ -225,11 +230,16 @@
         }
         $pagedb->set($pagename, false);
 
-        $this->set_links($pagename, false);
+        $this->set_links($pagename, array());
     }
 
     function rename_page($pagename, $to)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $result = $this->_pagedb->get($pagename);
         if ($result) {
             list($version, $flags, $data) = explode(':', $result, 3);
@@ -247,7 +257,7 @@
         $pvdata = $this->get_versiondata($pagename, $version, true);
         $data['mtime'] = time();
         $data['summary'] = "renamed from " . $pagename
-            . " by " . $GLOBALS["request"]->_deduceUsername();
+            . " by " . $request->_deduceUsername();
         $this->set_versiondata($to, $version, $pvdata);
 
         // update links and backlinks
@@ -455,6 +465,11 @@
     function link_search($pages, $query, $linktype,
                          $relation = false, $options = array())
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $linkdb = &$this->_linkdb;
         $links = array();
         $reverse = false;
@@ -479,7 +494,7 @@
             $pagename = substr($link, 1);
             if (!$pages->match($pagename)) continue;
             if ($linktype == 'attribute') {
-                $page = $GLOBALS['request']->_dbi->getPage($pagename);
+                $page = $request->_dbi->getPage($pagename);
                 $attribs = $page->get('attributes');
                 if ($attribs) {
                     /* Optimization on expressive searches:
@@ -557,6 +572,11 @@
      */
     function relation_search($pages, $query, $options = array())
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $linkdb = &$this->_linkdb;
         $links = array();
         // We need to detect which attributes and relation names we should look for. NYI
@@ -576,7 +596,7 @@
             if (!$pages->match($pagename)) continue;
             $pagelinks = array();
             if ($want_attributes) {
-                $page = $GLOBALS['request']->_dbi->getPage($pagename);
+                $page = $request->_dbi->getPage($pagename);
                 $attribs = $page->get('attributes');
                 $pagelinks = $attribs;
             }
@@ -658,7 +678,7 @@
     extends WikiDB_backend_iterator
 {
     // fixed for linkrelations
-    function __construct(&$backend, &$pages, $options = false)
+    function __construct(&$backend, &$pages, $options = array())
     {
         $this->_backend = $backend;
         $this->_options = $options;

Modified: trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -41,6 +41,11 @@
     function __construct(&$backend, &$pageiter, $search, $linktype,
                          $relation = false, $options = array())
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $this->_backend = &$backend;
         $this->_pages = $pageiter;
         $this->search = $search; // search the linkvalue. it should be the value or pagename
@@ -52,7 +57,7 @@
         $this->limit = isset($options['limit']) ? $options['limit'] : '';
         $this->exclude = isset($options['exclude']) ? $options['exclude'] : '';
         $this->_field = 'pagename'; // the name of the linkvalue field to apply the search
-        $this->_dbi =& $GLOBALS['request']->_dbi;
+        $this->_dbi =& $request->_dbi;
         if ($linktype == 'relation') {
             $this->_want_relations = true;
             $this->_field = 'linkrelation';

Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/WikiDB/backend.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -580,7 +580,7 @@
      * Duplicate the PageList function here to avoid loading the whole
      * PageList.php, and it forces the backend specific sortable_columns()
      */
-    function sortby($column, $action, $sortable_columns = false)
+    function sortby($column, $action, $sortable_columns = array())
     {
         /**
          * @var WikiRequest $request

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/WikiDB.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -110,12 +110,17 @@
      */
     function __construct(&$backend, $dbparams)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $this->_backend =& $backend;
         // don't do the following with the auth_dsn!
         if (isset($dbparams['auth_dsn'])) return;
 
         $this->_cache = new WikiDB_cache($backend);
-        if (!empty($GLOBALS['request'])) $GLOBALS['request']->_dbi = $this;
+        if (!empty($request)) $request->_dbi = $this;
 
         // If the database doesn't yet have a timestamp, initialize it now.
         if ($this->get('_timestamp') === false)
@@ -506,6 +511,11 @@
      */
     public function renamePage($from, $to, $updateWikiLinks = false)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if (!empty($this->readonly)) {
             trigger_error("readonly database", E_USER_WARNING);
             return false;
@@ -563,7 +573,7 @@
                 E_USER_WARNING);
         }
         /* Generate notification emails? */
-        if ($result and ENABLE_MAILNOTIFY and !is_a($GLOBALS['request'], 'MockRequest')) {
+        if ($result and ENABLE_MAILNOTIFY and !is_a($request, 'MockRequest')) {
             $notify = $this->get('notify');
             if (!empty($notify) and is_array($notify)) {
                 include_once 'lib/MailNotify.php';
@@ -721,15 +731,25 @@
     function getParam($param)
     {
         global $DBParams;
-        if (isset($DBParams[$param])) return $DBParams[$param];
-        elseif ($param == 'prefix') return ''; else return false;
+        if (isset($DBParams[$param]))
+            return $DBParams[$param];
+        elseif ($param == 'prefix')
+            return '';
+        else
+            return false;
     }
 
     function getAuthParam($param)
     {
         global $DBAuthParams;
-        if (isset($DBAuthParams[$param])) return $DBAuthParams[$param];
-        elseif ($param == 'USER_AUTH_ORDER') return $GLOBALS['USER_AUTH_ORDER']; elseif ($param == 'USER_AUTH_POLICY') return $GLOBALS['USER_AUTH_POLICY']; else return false;
+        if (isset($DBAuthParams[$param]))
+            return $DBAuthParams[$param];
+        elseif ($param == 'USER_AUTH_ORDER')
+            return $GLOBALS['USER_AUTH_ORDER'];
+        elseif ($param == 'USER_AUTH_POLICY')
+            return $GLOBALS['USER_AUTH_POLICY'];
+        else
+            return false;
     }
 }
 
@@ -1003,6 +1023,11 @@
      */
     function save($wikitext, $version, $meta, $formatted = null)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if ($this->_wikidb->readonly) {
             trigger_error("readonly database", E_USER_WARNING);
             return false;
@@ -1047,7 +1072,7 @@
             $notify = $this->_wikidb->get('notify');
             if (!empty($notify)
                 and is_array($notify)
-                    and !is_a($GLOBALS['request'], 'MockRequest')
+                    and !is_a($request, 'MockRequest')
             ) {
                 include_once 'lib/MailNotify.php';
                 $MailNotify = new MailNotify($newrevision->getName());
@@ -1058,13 +1083,13 @@
         // more pagechange callbacks: (in a hackish manner for now)
         if (ENABLE_RECENTCHANGESBOX
             and empty($meta['is_minor_edit'])
-                and !in_array($GLOBALS['request']->getArg('action'),
+                and !in_array($request->getArg('action'),
                     array('loadfile', 'upgrade'))
         ) {
             require_once 'lib/WikiPlugin.php';
             $w = new WikiPluginLoader();
             $p = $w->getPlugin("RecentChangesCached", false);
-            $p->box_update(false, $GLOBALS['request'], $this->_pagename);
+            $p->box_update(false, $request, $this->_pagename);
         }
         return $newrevision;
     }
@@ -1674,6 +1699,11 @@
      */
     public function getPackedContent()
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $data = &$this->_data;
 
         if (empty($data['%content'])
@@ -1686,7 +1716,7 @@
             // Lib from http://www.aasted.org/quote/
             if (defined('FORTUNE_DIR')
                 and is_dir(FORTUNE_DIR)
-                    and in_array($GLOBALS['request']->getArg('action'),
+                    and in_array($request->getArg('action'),
                         array('create', 'edit'))
             ) {
                 include_once 'lib/fortune.php';
@@ -2155,6 +2185,11 @@
 
     function WikiDB_cache(&$backend)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $this->_backend = &$backend;
 
         $this->_pagedata_cache = array();
@@ -2163,8 +2198,8 @@
         $this->_glv_cache = array();
         $this->_id_cache = array(); // formerly ->_dbi->_iwpcache (nonempty pages => id)
 
-        if (isset($GLOBALS['request']->_dbi))
-            $this->readonly = $GLOBALS['request']->_dbi->readonly;
+        if (isset($request->_dbi))
+            $this->readonly = $request->_dbi->readonly;
     }
 
     function close()

Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/WikiGroup.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -77,7 +77,6 @@
     function WikiGroup($not_current = false)
     {
         $this->not_current = $not_current;
-        //$this->request =& $GLOBALS['request'];
     }
 
     /**
@@ -481,9 +480,7 @@
      */
     function __construct()
     {
-        //$this->request = &$GLOBALS['request'];
         $this->username = $this->_getUserName();
-        //$this->username = null;
         $this->membership = array();
     }
 
@@ -581,10 +578,15 @@
      */
     function getMembersOf($group)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if ($this->specialGroup($group))
             return $this->getSpecialMembersOf($group);
 
-        $group_page = $GLOBALS['request']->getPage($group);
+        $group_page = $request->getPage($group);
         $group_revision = $group_page->getCurrentRevision();
         if ($group_revision->hasDefaultContents()) {
             trigger_error(sprintf(_("Group %s does not exist"), $group), E_USER_WARNING);
@@ -842,9 +844,7 @@
 {
     function __construct()
     {
-        //$this->request = &$GLOBALS['request'];
         $this->username = $this->_getUserName();
-        //$this->username = null;
         $this->membership = array();
 
         if (!defined('AUTH_GROUP_FILE')) {
@@ -952,7 +952,6 @@
 {
     function __construct()
     {
-        //$this->request = &$GLOBALS['request'];
         $this->username = $this->_getUserName();
         $this->membership = array();
 

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/WikiPlugin.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -171,6 +171,11 @@
 
     function parseArgStr($argstr)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $args = array();
         $defaults = array();
         if (empty($argstr))
@@ -195,7 +200,7 @@
             $markup = null;
             $basepage = null;
             $plugin_val = preg_replace(array("/^<!/", "/!>$/"), array("<?", "?>"), $plugin_val);
-            $val = $loader->expandPI($plugin_val, $GLOBALS['request'], $markup, $basepage);
+            $val = $loader->expandPI($plugin_val, $request, $markup, $basepage);
             if ($op == '=') {
                 $args[$arg] = $val; // comma delimited pagenames or array()?
             } else {

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/WikiPluginCached.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -1075,13 +1075,18 @@
      */
     function execute($cmd, $until = '')
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         // cmd must redirect stderr to stdout though!
         $errstr = exec($cmd); //, $outarr, $returnval); // normally 127
         //$errstr = join('',$outarr);
         $ok = empty($errstr);
         if (!$ok) {
             trigger_error("\n" . $cmd . " failed: $errstr", E_USER_WARNING);
-        } elseif ($GLOBALS['request']->getArg('debug'))
+        } elseif ($request->getArg('debug'))
             trigger_error("\n" . $cmd . ": success\n", E_USER_NOTICE);
         if (!isWindows()) {
             if ($until) {

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/WikiTheme.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -230,8 +230,8 @@
             $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("jquery.tablesorter.min.js"))));
         }
         // by pixels
-        if ((is_object($GLOBALS['request']) // guard against unittests
-            and $GLOBALS['request']->getPref('doubleClickEdit'))
+        if ((is_object($request) // guard against unittests
+            and $request->getPref('doubleClickEdit'))
             or ENABLE_DOUBLECLICKEDIT
         )
             $this->initDoubleClickEdit();
@@ -525,9 +525,14 @@
      */
     function getOwnerMessage($page)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if (!ENABLE_PAGEPERM or !class_exists("PagePermission"))
             return '';
-        $dbi =& $GLOBALS['request']->_dbi;
+        $dbi =& $request->_dbi;
         $owner = $page->getOwner();
         if ($owner) {
             /*
@@ -548,9 +553,14 @@
        Prefer author (name) over internal author_id (IP) */
     function getAuthorMessage($revision)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if (!$revision)
             return '';
-        $dbi =& $GLOBALS['request']->_dbi;
+        $dbi =& $request->_dbi;
         $author = $revision->get('author');
         if (!$author)
             $author = $revision->get('author_id');
@@ -1262,10 +1272,14 @@
      * TODO: first css, then js. Maybe separate it into addJSHeaders/addCSSHeaders
      * or use an optional type argument, and separate it within _MoreHeaders[]
      */
-    //$GLOBALS['request']->_MoreHeaders = array();
     function addMoreHeaders($element)
     {
-        $GLOBALS['request']->_MoreHeaders[] = $element;
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
+        $request->_MoreHeaders[] = $element;
         if (!empty($this->_headers_printed) and $this->_headers_printed) {
             trigger_error(_("Some action(page) wanted to add more headers, but they were already printed.")
                     . "\n" . $element->asXML(),
@@ -1310,7 +1324,6 @@
         return $out;
     }
 
-    //$GLOBALS['request']->_MoreAttr = array();
     // new arg: named elements to be able to remove them. such as DoubleClickEdit for htmldumps
     function addMoreAttr($tag, $name, $element)
     {
@@ -1583,7 +1596,12 @@
 
     function calendarInit($force = false)
     {
-        $dbi = $GLOBALS['request']->getDbh();
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
+        $dbi = $request->getDbh();
         // display flat calender dhtml in the sidebar
         if ($force or $dbi->isWikiPage($this->calendarBase())) {
             $jslang = @$GLOBALS['LANG'];
@@ -1747,7 +1765,7 @@
             $this->setAttr('class', $class);
         // Google honors this
         if (in_array(strtolower($text), array('edit', 'create', 'diff', 'pdf'))
-            and !$GLOBALS['request']->_user->isAuthenticated()
+            and !$request->_user->isAuthenticated()
         )
             $this->setAttr('rel', 'nofollow');
 
@@ -1870,8 +1888,13 @@
 
     function format($args = array())
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         return $this->_plugin->box($args ? array_merge($this->_args, $args) : $this->_args,
-            $GLOBALS['request'],
+            $request,
             $this->_basepage);
     }
 }

Modified: trunk/lib/WikiUser/AdoDb.php
===================================================================
--- trunk/lib/WikiUser/AdoDb.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/WikiUser/AdoDb.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -40,6 +40,11 @@
 
     function _AdoDbPassUser($UserName = '', $prefs = false)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if (!$this->_prefs and is_a($this, "_AdoDbPassUser")) {
             if ($prefs) $this->_prefs = $prefs;
             if (!isset($this->_prefs->_method))
@@ -51,7 +56,7 @@
         }
         $this->_userid = $UserName;
         $this->getAuthDbh();
-        $this->_auth_crypt_method = $GLOBALS['request']->_dbi->getAuthParam('auth_crypt_method');
+        $this->_auth_crypt_method = $request->_dbi->getAuthParam('auth_crypt_method');
         // Don't prepare the configured auth statements anymore
         return $this;
     }
@@ -135,6 +140,11 @@
 
     function userExists()
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $this->getAuthDbh();
         $dbh = &$this->_auth_dbi;
         if (!$dbh) { // needed?
@@ -143,7 +153,7 @@
         if (!$this->isValidName()) {
             return $this->_tryNextUser();
         }
-        $dbi =& $GLOBALS['request']->_dbi;
+        $dbi =& $request->_dbi;
         // Prepare the configured auth statements
         if ($dbi->getAuthParam('auth_check') and empty($this->_authselect)) {
             $this->_authselect = $this->prepare($dbi->getAuthParam('auth_check'),
@@ -199,7 +209,11 @@
 
     function checkPass($submitted_password)
     {
-        //global $DBAuthParams;
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $this->getAuthDbh();
         if (!$this->_auth_dbi) { // needed?
             return $this->_tryNextPass($submitted_password);
@@ -212,7 +226,7 @@
             return WIKIAUTH_FORBIDDEN;
         }
         $dbh =& $this->_auth_dbi;
-        $dbi =& $GLOBALS['request']->_dbi;
+        $dbi =& $request->_dbi;
         if (empty($this->_authselect) and $dbi->getAuthParam('auth_check')) {
             $this->_authselect = $this->prepare($dbi->getAuthParam('auth_check'),
                 array("password", "userid"));
@@ -265,14 +279,24 @@
 
     function mayChangePass()
     {
-        return $GLOBALS['request']->_dbi->getAuthParam('auth_update');
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
+        return $request->_dbi->getAuthParam('auth_update');
     }
 
     function storePass($submitted_password)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $this->getAuthDbh();
         $dbh = &$this->_auth_dbi;
-        $dbi =& $GLOBALS['request']->_dbi;
+        $dbi =& $request->_dbi;
         if ($dbi->getAuthParam('auth_update') and empty($this->_authupdate)) {
             $this->_authupdate = $this->prepare($dbi->getAuthParam('auth_update'),
                 array("password", "userid"));

Modified: trunk/lib/WikiUser/Db.php
===================================================================
--- trunk/lib/WikiUser/Db.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/WikiUser/Db.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -51,6 +51,11 @@
     // sets the auth_dbi and pref methods, before this class is initialized.
     function _DbPassUser($UserName = '', $prefs = false)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if (!$this->_prefs) {
             if ($prefs) $this->_prefs = $prefs;
         }
@@ -63,7 +68,7 @@
         $this->_authmethod = 'Db';
         //$this->getAuthDbh();
         //$this->_auth_crypt_method = @$GLOBALS['DBAuthParams']['auth_crypt_method'];
-        $dbi =& $GLOBALS['request']->_dbi;
+        $dbi =& $request->_dbi;
         $dbtype = $dbi->getParam('dbtype');
         if ($dbtype == 'ADODB') {
             include_once 'lib/WikiUser/AdoDb.php';

Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/WikiUser/PdoDb.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -37,6 +37,10 @@
 
     function _PdoDbPassUser($UserName = '', $prefs = false)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
 
         if (!$this->_prefs and is_a($this, "_PdoDbPassUser")) {
             if ($prefs) $this->_prefs = $prefs;
@@ -50,7 +54,7 @@
         $this->_userid = $UserName;
         // make use of session data. generally we only initialize this every time,
         // but do auth checks only once
-        $this->_auth_crypt_method = $GLOBALS['request']->_dbi->getAuthParam('auth_crypt_method');
+        $this->_auth_crypt_method = $request->_dbi->getAuthParam('auth_crypt_method');
         return $this;
     }
 
@@ -114,6 +118,11 @@
 
     function userExists()
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $this->getAuthDbh();
         $dbh = &$this->_auth_dbi;
         if (!$dbh) { // needed?
@@ -123,7 +132,7 @@
             trigger_error(_("Invalid username."), E_USER_WARNING);
             return $this->_tryNextUser();
         }
-        $dbi =& $GLOBALS['request']->_dbi;
+        $dbi =& $request->_dbi;
         if ($dbi->getAuthParam('auth_check') and empty($this->_authselect)) {
             try {
                 $this->_authselect = $dbh->prepare($dbi->getAuthParam('auth_check'));
@@ -246,17 +255,27 @@
 
     function mayChangePass()
     {
-        return $GLOBALS['request']->_dbi->getAuthParam('auth_update');
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
+        return $request->_dbi->getAuthParam('auth_update');
     }
 
     function storePass($submitted_password)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if (!$this->isValidName()) {
             return false;
         }
         $this->getAuthDbh();
         $dbh = &$this->_auth_dbi;
-        $dbi =& $GLOBALS['request']->_dbi;
+        $dbi =& $request->_dbi;
         if ($dbi->getAuthParam('auth_update') and empty($this->_authupdate)) {
             try {
                 $this->_authupdate = $dbh->prepare($dbi->getAuthParam('auth_update'));

Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/WikiUser/PearDb.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -35,7 +35,11 @@
 
     function _PearDbPassUser($UserName = '', $prefs = false)
     {
-        //global $DBAuthParams;
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if (!$this->_prefs and is_a($this, "_PearDbPassUser")) {
             if ($prefs) {
                 $this->_prefs = $prefs;
@@ -50,7 +54,7 @@
         $this->_userid = $UserName;
         // make use of session data. generally we only initialize this every time,
         // but do auth checks only once
-        $this->_auth_crypt_method = $GLOBALS['request']->_dbi->getAuthParam('auth_crypt_method');
+        $this->_auth_crypt_method = $request->_dbi->getAuthParam('auth_crypt_method');
         return $this;
     }
 
@@ -84,6 +88,11 @@
 
     function setPreferences($prefs, $id_only = false)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         // if the prefs are changed
         if ($count = _AnonUser::setPreferences($prefs, 1)) {
             //global $request;
@@ -108,7 +117,7 @@
                 } else {
                     // Otherwise, insert a record for them and set it to the defaults.
                     // jo...@de...
-                    $dbi = $GLOBALS['request']->getDbh();
+                    $dbi = $request->getDbh();
                     $this->_prefs->_insert = $this->prepare($dbi->getAuthParam('pref_insert'),
                         array("pref_blob", "userid"));
                     $dbh->simpleQuery(sprintf($this->_prefs->_insert,
@@ -129,7 +138,11 @@
 
     function userExists()
     {
-        //global $DBAuthParams;
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $this->getAuthDbh();
         $dbh = &$this->_auth_dbi;
         if (!$dbh) { // needed?
@@ -139,7 +152,7 @@
             trigger_error(_("Invalid username."), E_USER_WARNING);
             return $this->_tryNextUser();
         }
-        $dbi =& $GLOBALS['request']->_dbi;
+        $dbi =& $request->_dbi;
         // Prepare the configured auth statements
         if ($dbi->getAuthParam('auth_check') and empty($this->_authselect)) {
             $this->_authselect = $this->prepare($dbi->getAuthParam('auth_check'),
@@ -229,17 +242,27 @@
 
     function mayChangePass()
     {
-        return $GLOBALS['request']->_dbi->getAuthParam('auth_update');
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
+        return $request->_dbi->getAuthParam('auth_update');
     }
 
     function storePass($submitted_password)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         if (!$this->isValidName()) {
             return false;
         }
         $this->getAuthDbh();
         $dbh = &$this->_auth_dbi;
-        $dbi =& $GLOBALS['request']->_dbi;
+        $dbi =& $request->_dbi;
         if ($dbi->getAuthParam('auth_update') and empty($this->_authupdate)) {
             $this->_authupdate = $this->prepare($dbi->getAuthParam('auth_update'),
                 array("password", "userid"));

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2014-11-28 09:51:10 UTC (rev 9386)
+++ trunk/lib/WikiUser.php	2014-11-28 14:27:41 UTC (rev 9387)
@@ -185,13 +185,8 @@
         return $GLOBALS['ForbiddenUser'];
 
     //FIXME: check admin membership later at checkPass. Now we cannot raise the level.
-    //$group = &WikiGroup::getGroup($GLOBALS['request']);
     if ($UserName == ADMIN_USER)
         return new _AdminUser($UserName);
-    /* elseif ($group->isMember(GROUP_ADMIN)) { // unneeded code
-        return _determineBogoUserOrPassUser($UserName);
-    }
-    */
     else
         return _determineBogoUserOrPassUser($UserName);
 }
@@ -199,6 +194,10 @@
 function _determineBogoUserOrPassUser($UserName)
 {
     global $ForbiddenUser;
+    /**
+     * @var WikiRequest $request
+     */
+    global $request;
 
     // Sanity check. User name is a condition of the definition of
     // _BogoUser and _PassUser.
@@ -210,7 +209,7 @@
     if (_isBogoUserAllowed() and isWikiWord($UserName)) {
         include_once 'lib/WikiUser/BogoLogin.php';
         $_BogoUser = new _BogoLoginPassUser($UserName);
-        if ($_BogoUser->userExists() or $GLOBALS['request']->getArg('auth'))
+        if ($_BogoUser->userExists() or $request->getArg('auth'))
             return $_BogoUser;
     }
     if (_isUserPasswordsAllowed()) {
@@ -222,9 +221,9 @@
         else {
             $_PassUser = new _PassUser($UserName,
                 isset($_BogoUser) ? $_BogoUser->_prefs : false);
-            if ($_PassUser->userExists() or $GLOBALS['request']->getArg('auth')) {
-                if (isset($GLOBALS['request']->_user_class))
-                    $class = $GLOBALS['request']->_user_class;
+            if ($_PassUser->userExists() or $request->getArg('auth')) {
+                if (isset($request->_user_class))
+                    $class = $request->_user_class;
                 elseif (strtolower(get_class($_PassUser)) == "_passuser")
                     $class = $_PassUser->nextClass(); else
                     $class = get_class($_PassUser);
@@ -320,14 +319,14 @@
         }
         if (!empty($user->_authmethod))
             $newuser->_authmethod = $user->_authmethod;
-        $GLOBALS['request']->_user_class = get_class($newuser);
+        $request->_user_class = get_class($newuser);
         /*
         foreach (get_object_vars($user) as $k => $v) {
             if (!empty($v)) $olduser->$k = $v;
         }
         */
         $newuser->hasHomePage(); // revive db handle, because these don't survive sessions
-        //$GLOBALS['request']->_user = $olduser;
+        //$request->_user = $olduser;
         return $newuser;
     } else {
         return false;
@@ -555,7 +554,7 @@
         if (!$this->isSignedIn()) return false;
         if (!$this->isAuthenticated()) return false;
 
-        if (!$group) $group = &$GLOBALS['request']->getGroup();
+        if (!$group) $group = &$request->getGroup();
         return ($this->_level > WIKIAUTH_BOGO and $group->isMember(GROUP_ADMIN));
     }
 
@@ -563,9 +562,14 @@
      */
     function getId()
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         return ($this->UserName()
             ? $this->UserName()
-            : $GLOBALS['request']->get('REMOTE_ADDR'));
+            : $request->get('REMOTE_ADDR'));
     }
 
     /** Name for an authenticated user. No IP here.
@@ -574,7 +578,7 @@
     {
         return ($this->isAuthenticated()
             ? $this->_userid
-            : ''); //$GLOBALS['request']->get('REMOTE_ADDR') );
+            : ''); // $request->get('REMOTE_ADDR') );
     }
 
     function hasAuthority($require_level)
@@ -631,8 +635,8 @@
                 }
                 //error_log("$entry\n", 3, LOGIN_LOG);
             }
-            if (method_exists($GLOBALS['request']->_user, "logout")) { //_HttpAuthPassUser
-                $GLOBALS['request']->_user->logout();
+            if (method_exists($request->_user, "logout")) { //_HttpAuthPassUser
+                $request->...
 
[truncated message content]

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

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

Revision: 9386
          http://sourceforge.net/p/phpwiki/code/9386
Author:   vargenau
Date:     2014-11-28 09:51:10 +0000 (Fri, 28 Nov 2014)
Log Message:
-----------
function get_links is abstract

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

Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2014-11-27 15:32:22 UTC (rev 9385)
+++ trunk/lib/WikiDB/backend.php	2014-11-28 09:51:10 UTC (rev 9386)
@@ -71,11 +71,14 @@
  */
 abstract class WikiDB_backend
 {
+    public $_sortby;
+    public $_dbh;
+
     /**
      * Get page meta-data from database.
      *
-     * @param $pagename string Page name.
-     * @return hash
+     * @param string $pagename Page name.
+     * @return array hash
      * Returns a hash containing the page meta-data.
      * Returns an empty array if there is no meta-data for the requested page.
      * Keys which might be present in the hash are:
@@ -108,15 +111,15 @@
      *   $backend->update_pagedata($pagename, array('locked' => false));
      * </pre>
      *
-     * @param $pagename string Page name.
-     * @param $newdata hash New meta-data.
+     * @param string $pagename Page name.
+     * @param array $newdata hash New meta-data.
      */
     abstract function update_pagedata($pagename, $newdata);
 
     /**
      * Get the current version number for a page.
      *
-     * @param $pagename string Page name.
+     * @param string $pagename Page name.
      * @return int The latest version number for the page.  Returns zero if
      *  no versions of a page exist.
      */
@@ -125,26 +128,26 @@
     /**
      * Get preceding version number.
      *
-     * @param $pagename string Page name.
-     * @param $version int Find version before this one.
+     * @param string $pagename Page name.
+     * @param int $version Find version before this one.
      * @return int The version number of the version in the database which
-     *  immediately preceeds $version.
+     *  immediately precedes $version.
      */
     abstract function get_previous_version($pagename, $version);
 
     /**
      * Get revision meta-data and content.
      *
-     * @param $pagename string Page name.
-     * @param $version integer Which version to get.
-     * @param $want_content boolean
+     * @param string $pagename Page name.
+     * @param int $version Which version to get.
+     * @param bool $want_content
      *  Indicates the caller really wants the page content.  If this
      *  flag is not set, the backend is free to skip fetching of the
      *  page content (as that may be expensive).  If the backend omits
      *  the content, the backend might still want to set the value of
      *  '%content' to the empty string if it knows there's no content.
      *
-     * @return hash The version data, or false if specified version does not
+     * @return array|bool hash The version data, or false if specified version does not
      *    exist.
      *
      * Some keys which might be present in the $versiondata hash are:
@@ -164,14 +167,19 @@
      * This should remove all links (from the named page) from
      * the link database.
      *
-     * @param $pagename string Page name.
+     * @param string $pagename Page name.
      * i.e save_page('') and DELETE nonempty id
      * Can be undone and is seen in RecentChanges.
      */
     function delete_page($pagename)
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         $mtime = time();
-        $user =& $GLOBALS['request']->_user;
+        $user =& $request->_user;
         $vdata = array('author' => $user->getId(),
             'author_id' => $user->getAuthenticatedId(),
             'mtime' => $mtime);
@@ -194,6 +202,7 @@
     /**
      * Delete page (and all its revisions) from the database.
      *
+     * @param string $pagename Page name.
      */
     abstract function purge_page($pagename);
 
@@ -206,8 +215,8 @@
      * In fact, to be safe, backends should probably allow the deletion of
      * the most recent version.
      *
-     * @param $pagename string Page name.
-     * @param $version integer Version to delete.
+     * @param string $pagename Page name.
+     * @param int $version int Version to delete.
      */
     abstract function delete_versiondata($pagename, $version);
 
@@ -217,9 +226,9 @@
      * If the given ($pagename,$version) is already in the database,
      * this method completely overwrites any stored data for that version.
      *
-     * @param $pagename string Page name.
-     * @param $version int New revisions content.
-     * @param $data hash New revision metadata.
+     * @param string $pagename string Page name.
+     * @param int $version New revisions content.
+     * @param array $data hash New revision metadata.
      *
      * @see get_versiondata
      */
@@ -230,11 +239,11 @@
      *
      * If the given ($pagename,$version) is already in the database,
      * this method only changes those meta-data values whose keys are
-     * explicity listed in $newdata.
+     * explicitly listed in $newdata.
      *
-     * @param $pagename string Page name.
-     * @param $version int New revisions content.
-     * @param $newdata hash New revision metadata.
+     * @param string $pagename Page name.
+     * @param int $version New revisions content.
+     * @param array $newdata hash New revision metadata.
      * @see set_versiondata, get_versiondata
      */
     function update_versiondata($pagename, $version, $newdata)
@@ -256,9 +265,9 @@
     /**
      * Set links for page.
      *
-     * @param $pagename string Page name.
+     * @param string $pagename Page name.
      *
-     * @param $links array List of page(names) which page links to.
+     * @param array $links List of page(names) which page links to.
      */
     abstract function set_links($pagename, $links);
 
@@ -276,17 +285,14 @@
      * @return object A WikiDB_backend_iterator.
      */
 
-    function get_links($pagename, $reversed, $include_empty = false,
-                       $sortby = '', $limit = '', $exclude = '')
-    {
-        //FIXME: implement simple (but slow) link finder.
-        die("FIXME get_links");
-    }
+    // FIXME: implement simple (but slow) link finder.
+    abstract function get_links($pagename, $reversed, $include_empty = false,
+                                $sortby = '', $limit = '', $exclude = '');
 
     /**
      * Get all revisions of a page.
      *
-     * @param $pagename string The page name.
+     * @param string $pagename The page name.
      * @return object A WikiDB_backend_iterator.
      */
     function get_all_revisions($pagename)
@@ -299,7 +305,7 @@
      * Get all pages in the database.
      *
      * Pages should be returned in alphabetical order if that is
-     * feasable.
+     * feasible.
      *
      * @param bool $include_defaulted
      * If set, even pages with no content will be returned
@@ -315,7 +321,7 @@
      * @param string $exclude
      * @return object A WikiDB_backend_iterator.
      */
-    abstract protected function get_all_pages($include_defaulted, $orderby = false, $limit = '', $exclude = '');
+    abstract public function get_all_pages($include_defaulted, $orderby = false, $limit = '', $exclude = '');
 
     /**
      * Title or full text search.
@@ -426,7 +432,7 @@
      *
      * Calls may be nested.
      *
-     * @param $write_lock boolean Unless this is set to false, a write lock
+     * @param bool $write_lock Unless this is set to false, a write lock
      *     is acquired, otherwise a read lock.  If the backend doesn't support
      *     read locking, then it should make a write lock no matter which type
      *     of lock was requested.
@@ -440,7 +446,7 @@
     /**
      * Unlock backend database.
      *
-     * @param $force boolean Normally, the database is not unlocked until
+     * @param bool $force Normally, the database is not unlocked until
      *  unlock() is called as many times as lock() has been.  If $force is
      *  set to true, the the database is unconditionally unlocked.
      */
@@ -448,7 +454,6 @@
     {
     }
 
-
     /**
      * Close database.
      */
@@ -482,7 +487,7 @@
      * </pre>
      *
      * @param bool $args
-     * @return boolean True iff database is in a consistent state.
+     * @return bool True iff database is in a consistent state.
      */
     function check($args = false)
     {
@@ -496,11 +501,15 @@
      * (I.e. rebuild indexes, etc...)
      *
      * @param bool $args
-     * @return boolean True iff successful.
+     * @return bool True iff successful.
      */
     function rebuild($args = false)
     {
+        /**
+         * @var WikiRequest $request
+         */
         global $request;
+
         $dbh = $request->getDbh();
         $iter = $dbh->getAllPages(false);
         while ($page = $iter->next()) {
@@ -573,7 +582,13 @@
      */
     function sortby($column, $action, $sortable_columns = false)
     {
-        if (empty($column)) return '';
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
+        if (empty($column))
+            return '';
         //support multiple comma-delimited sortby args: "+hits,+pagename"
         if (strstr($column, ',')) {
             $result = array();
@@ -605,8 +620,8 @@
             return $order . $column;
         } elseif ($action == 'check') {
             return (!empty($this->_sortby[$column]) or
-                ($GLOBALS['request']->getArg('sortby') and
-                    strstr($GLOBALS['request']->getArg('sortby'), $column)));
+                ($request->getArg('sortby') and
+                    strstr($request->getArg('sortby'), $column)));
         } elseif ($action == 'db') {
             // native sort possible?
             if (!empty($this) and !$sortable_columns)
@@ -685,6 +700,8 @@
  */
 abstract class WikiDB_backend_iterator
 {
+    public $_options;
+
     /**
      * Get the next record in the iterator set.
      *
@@ -811,11 +828,6 @@
         }
         return false;
     }
-
-    function getStoplisted($word)
-    {
-        return $this->stoplisted;
-    }
 }
 
 /**

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

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

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

Revision: 9385
          http://sourceforge.net/p/phpwiki/code/9385
Author:   vargenau
Date:     2014-11-27 15:32:22 +0000 (Thu, 27 Nov 2014)
Log Message:
-----------
Add <label>

Modified Paths:
--------------
    trunk/themes/MonoBook/templates/info.tmpl
    trunk/themes/default/templates/info.tmpl

Modified: trunk/themes/MonoBook/templates/info.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/info.tmpl	2014-11-26 13:47:32 UTC (rev 9384)
+++ trunk/themes/MonoBook/templates/info.tmpl	2014-11-27 15:32:22 UTC (rev 9385)
@@ -31,7 +31,7 @@
 }
 // Count words
 preg_match_all('/\\w+\\W*/', $revision->_data['%content'], $whitespacematches);
-if (1 == $c = count_all($whitespacematches))
+if (1 == ($c = count_all($whitespacematches)))
   $wordcount = fmt("1 word");
 else
   $wordcount = fmt("%s words", $c);
@@ -50,6 +50,7 @@
 
     $LOCKED_CB = HTML::input(array('type' => 'checkbox',
                                    'name' => 'edit[locked]',
+                                   'id' => 'locked',
                                    'disabled' => !$user->isadmin(),
                                    'checked'  => $page->get('locked')));
 
@@ -125,7 +126,7 @@
 <?php if ($is_current) { ?>
   <tr>
     <td class="align-right"><?php echo $LOCKED_CB ?></td>
-    <td class="pageinfo"><?php echo _("Locked")?></td>
+    <td class="pageinfo"><label for="locked"><?php echo _("Locked")?></label></td>
   </tr>
   <tr>
     <td class="align-right pageinfo"><?php echo _("ACL type") . _(":") ?></td>

Modified: trunk/themes/default/templates/info.tmpl
===================================================================
--- trunk/themes/default/templates/info.tmpl	2014-11-26 13:47:32 UTC (rev 9384)
+++ trunk/themes/default/templates/info.tmpl	2014-11-27 15:32:22 UTC (rev 9385)
@@ -36,6 +36,7 @@
 
     $LOCKED_CB = HTML::input(array('type' => 'checkbox',
                                    'name' => 'edit[locked]',
+                                   'id' => 'locked',
                                    'disabled' => !$user->isadmin(),
                                    'checked'  => $page->get('locked')));
 
@@ -112,7 +113,7 @@
 <?php if ($is_current) { ?>
   <tr>
     <td class="align-right"><?php echo $LOCKED_CB ?></td>
-    <td class="pageinfo"><?php echo _("Locked")?></td>
+    <td class="pageinfo"><label for="locked"><?php echo _("Locked")?></label></td>
   </tr>
 <?php if (ENABLE_EXTERNAL_PAGES) { ?>
   <tr>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9384] trunk/lib/plugin/DebugBackendInfo.php

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

Revision: 9384
          http://sourceforge.net/p/phpwiki/code/9384
Author:   vargenau
Date:     2014-11-26 13:47:32 +0000 (Wed, 26 Nov 2014)
Log Message:
-----------
Remove unused parameters

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

Modified: trunk/lib/plugin/DebugBackendInfo.php
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php	2014-11-26 13:39:34 UTC (rev 9383)
+++ trunk/lib/plugin/DebugBackendInfo.php	2014-11-26 13:47:32 UTC (rev 9384)
@@ -54,7 +54,6 @@
         extract($args);
         if (empty($userid) or $userid == $request->_user->UserName()) {
             $user = $request->_user;
-            $userid = $user->UserName();
         } else {
             $user = WikiUser($userid);
         }
@@ -141,7 +140,7 @@
                 $data[$key] = HTML::pre(ob_get_contents());
                 ob_end_clean();
             } elseif (is_bool($val)) {
-                $data[$key] = $this->_showvalue($key, $val ? "true" : "false", $prefix);
+                $data[$key] = $this->_showvalue($val ? "true" : "false");
             } elseif (is_string($val) && ((substr($val, 0, 2) == 'a:'
                 or (substr($val, 0, 2) == 'O:')))
             ) {
@@ -194,14 +193,13 @@
                         HTML::raw(' '))),
                 HTML::td(array(
                         'style' => 'color:black; background-color:white'),
-                    $this->_showvalue($key, $val, $prefix))
+                    $this->_showvalue($val))
             );
         }
         return $rows;
     }
 
-    /* also used in plugin/EditMetaData */
-    protected function _showvalue($key, $val, $prefix = '')
+    private function _showvalue($val)
     {
         return $val ? $val : HTML::raw(' ');
     }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9383] trunk/lib/plugin/EditMetaData.php

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

Revision: 9383
          http://sourceforge.net/p/phpwiki/code/9383
Author:   vargenau
Date:     2014-11-26 13:39:34 +0000 (Wed, 26 Nov 2014)
Log Message:
-----------
Remove unused function _showvalue

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

Modified: trunk/lib/plugin/EditMetaData.php
===================================================================
--- trunk/lib/plugin/EditMetaData.php	2014-11-26 13:20:23 UTC (rev 9382)
+++ trunk/lib/plugin/EditMetaData.php	2014-11-26 13:39:34 UTC (rev 9383)
@@ -125,10 +125,6 @@
 
         // Now we show the meta data and provide entry box for new data.
         $html = HTML();
-        //$html->pushContent(HTML::h3(fmt("Existing page-level metadata for %s:",
-        //                                $page)));
-        //$dl = $this->_display_values('', $pagemeta);
-        //$html->pushContent($dl);
         if (!$pagemeta) {
             // FIXME: invalid HTML
             $html->pushContent(HTML::p(fmt("No metadata for %s", $page)));
@@ -164,35 +160,6 @@
         }
         return $html;
     }
-
-    protected function _showvalue($key, $val, $prefix = '')
-    {
-        if (is_array($val) or is_object($val)) return $val;
-        if (in_array($key, $this->hidden_pagemeta)) return '';
-        if ($prefix) {
-            $fullkey = $prefix . '[' . $key . ']';
-            if (substr($fullkey, 0, 1) == '[') {
-                $meta = "meta" . $fullkey;
-                $fullkey = preg_replace("/\]\[/", "[", substr($fullkey, 1), 1);
-            } else {
-                $meta = preg_replace("/^([^\[]+)\[/", "meta[$1][", $fullkey, 1);
-            }
-        } else {
-            $fullkey = $key;
-            $meta = "meta[" . $key . "]";
-        }
-        //$meta = "meta[".$fullkey."]";
-        $arr = array('name' => $meta, 'value' => $val);
-        if (strlen($val) > 20)
-            $arr['size'] = strlen($val);
-        if (in_array($key, $this->readonly_pagemeta)) {
-            $arr['readonly'] = 'readonly';
-            return HTML::input($arr);
-        } else {
-            return HTML(HTML::em($fullkey), HTML::br(),
-                HTML::input($arr));
-        }
-    }
 }
 
 // Local Variables:

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

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

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

Revision: 9382
          http://sourceforge.net/p/phpwiki/code/9382
Author:   vargenau
Date:     2014-11-26 13:20:23 +0000 (Wed, 26 Nov 2014)
Log Message:
-----------
Update pgsrc

Modified Paths:
--------------
    trunk/pgsrc/Help%2FRecentChangesPlugin
    trunk/pgsrc/Help%2FRecentCommentsPlugin
    trunk/pgsrc/Help%2FRecentEditsPlugin
    trunk/pgsrc/ReleaseNotes

Modified: trunk/pgsrc/Help%2FRecentChangesPlugin
===================================================================
--- trunk/pgsrc/Help%2FRecentChangesPlugin	2014-11-26 11:31:15 UTC (rev 9381)
+++ trunk/pgsrc/Help%2FRecentChangesPlugin	2014-11-26 13:20:23 UTC (rev 9382)
@@ -1,4 +1,4 @@
-Date: Tue,  7 Oct 2014 19:05:57 +0000
+Date: Wed, 26 Nov 2014 14:19:39 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FRecentChangesPlugin;
@@ -76,7 +76,7 @@
 |-
 | **historylinks**
 | Show history links
-| false (true for Monobook and FusionForge)
+| false (true for Monobook and ~FusionForge)
 |-
 | **caption**
 | Custom caption

Modified: trunk/pgsrc/Help%2FRecentCommentsPlugin
===================================================================
--- trunk/pgsrc/Help%2FRecentCommentsPlugin	2014-11-26 11:31:15 UTC (rev 9381)
+++ trunk/pgsrc/Help%2FRecentCommentsPlugin	2014-11-26 13:20:23 UTC (rev 9382)
@@ -1,4 +1,4 @@
-Date: Tue,  7 Oct 2014 19:05:57 +0000
+Date: Wed, 26 Nov 2014 14:19:39 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FRecentCommentsPlugin;
@@ -67,7 +67,7 @@
 |-
 | **historylinks**
 | Show history links
-| false (true for Monobook and FusionForge)
+| false (true for Monobook and ~FusionForge)
 |-
 | **category**
 | Limit pages to a given category

Modified: trunk/pgsrc/Help%2FRecentEditsPlugin
===================================================================
--- trunk/pgsrc/Help%2FRecentEditsPlugin	2014-11-26 11:31:15 UTC (rev 9381)
+++ trunk/pgsrc/Help%2FRecentEditsPlugin	2014-11-26 13:20:23 UTC (rev 9382)
@@ -1,4 +1,4 @@
-Date: Tue,  7 Oct 2014 19:05:57 +0000
+Date: Wed, 26 Nov 2014 14:19:39 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FRecentEditsPlugin;
@@ -67,7 +67,7 @@
 |-
 | **historylinks**
 | Show history links
-| false (true for Monobook and FusionForge)
+| false (true for Monobook and ~FusionForge)
 |-
 | **caption**
 | Custom caption

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2014-11-26 11:31:15 UTC (rev 9381)
+++ trunk/pgsrc/ReleaseNotes	2014-11-26 13:20:23 UTC (rev 9382)
@@ -1,4 +1,4 @@
-Date: Mon, 24 Nov 2014 15:49:15 +0000
+Date: Wed, 26 Nov 2014 14:19:39 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -15,6 +15,7 @@
 * bigger wikipaging font
 * test again for function 'posix_times', it does not exist on Windows (reported by jdebert)
 * remove FPDF, lib/gif.php, lib/font (was not used)
+* rename plugin _Retransform to ~DebugRetransform
 
 == 1.5.2 2014-10-10 Marc-Etienne Vargenau ==
 

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

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

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

Revision: 9381
          http://sourceforge.net/p/phpwiki/code/9381
Author:   vargenau
Date:     2014-11-26 11:31:15 +0000 (Wed, 26 Nov 2014)
Log Message:
-----------
Rename plugin _Retransform to DebugRetransform

Modified Paths:
--------------
    trunk/lib/IniConfig.php
    trunk/lib/plugin/DebugRetransform.php

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2014-11-26 11:19:50 UTC (rev 9380)
+++ trunk/lib/IniConfig.php	2014-11-26 11:31:15 UTC (rev 9381)
@@ -688,6 +688,7 @@
     $AllAllowedPlugins[] = 'DebugGroupInfo';
     $AllAllowedPlugins[] = 'DebugAuthInfo';
     $AllAllowedPlugins[] = 'DebugBackendInfo';
+    $AllAllowedPlugins[] = 'DebugRetransform';
 
     // The FUSIONFORGE theme omits them
     if (!(defined('FUSIONFORGE') and FUSIONFORGE)) {
@@ -704,7 +705,6 @@
         $AllAllowedPlugins[] = 'PopularNearby';
         $AllAllowedPlugins[] = 'PreferenceApp';
         $AllAllowedPlugins[] = 'PreferencesInfo';
-        $AllAllowedPlugins[] = '_Retransform';
         $AllAllowedPlugins[] = 'SqlResult';
         $AllAllowedPlugins[] = 'TeX2png';
         $AllAllowedPlugins[] = 'text2png';

Modified: trunk/lib/plugin/DebugRetransform.php
===================================================================
--- trunk/lib/plugin/DebugRetransform.php	2014-11-26 11:19:50 UTC (rev 9380)
+++ trunk/lib/plugin/DebugRetransform.php	2014-11-26 11:31:15 UTC (rev 9381)
@@ -23,7 +23,7 @@
 /**
  * Only useful for link and parser debugging purposes.
  */
-class WikiPlugin__Retransform
+class WikiPlugin_DebugRetransform
     extends WikiPlugin
 {
     function getDescription()

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9380] trunk/lib/plugin/DebugAuthInfo.php

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

Revision: 9380
          http://sourceforge.net/p/phpwiki/code/9380
Author:   vargenau
Date:     2014-11-26 11:19:50 +0000 (Wed, 26 Nov 2014)
Log Message:
-----------
Increase max_depth

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

Modified: trunk/lib/plugin/DebugAuthInfo.php
===================================================================
--- trunk/lib/plugin/DebugAuthInfo.php	2014-11-26 10:41:51 UTC (rev 9379)
+++ trunk/lib/plugin/DebugAuthInfo.php	2014-11-26 11:19:50 UTC (rev 9380)
@@ -145,8 +145,9 @@
         static $max_depth = 0;
         $rows = array();
         $max_depth++;
-        if ($max_depth > 35)
-            return $heading;
+        if ($max_depth > 100) {
+            return HTML();
+        }
 
         if ($heading)
             $rows[] = HTML::tr(array(

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9379] trunk/lib/plugin/DebugAuthInfo.php

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

Revision: 9379
          http://sourceforge.net/p/phpwiki/code/9379
Author:   vargenau
Date:     2014-11-26 10:41:51 +0000 (Wed, 26 Nov 2014)
Log Message:
-----------
Remove unused variable

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

Modified: trunk/lib/plugin/DebugAuthInfo.php
===================================================================
--- trunk/lib/plugin/DebugAuthInfo.php	2014-11-26 10:35:23 UTC (rev 9378)
+++ trunk/lib/plugin/DebugAuthInfo.php	2014-11-26 10:41:51 UTC (rev 9379)
@@ -110,7 +110,6 @@
             }
             $table->pushContent($this->show_hash("User: Object of " . get_class($user), $userdata));
             $group = &$request->getGroup();
-            $groups = $group->getAllGroupsIn();
             $groupdata = $this->obj2hash($group, array('_dbi', '_request', 'password', 'passwd'));
             unset($groupdata['request']);
             $table->pushContent($this->show_hash("Group: Object of " . get_class($group), $groupdata));

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9378] trunk/lib/plugin/DebugAuthInfo.php

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

Revision: 9378
          http://sourceforge.net/p/phpwiki/code/9378
Author:   vargenau
Date:     2014-11-26 10:35:23 +0000 (Wed, 26 Nov 2014)
Log Message:
-----------
Indent

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

Modified: trunk/lib/plugin/DebugAuthInfo.php
===================================================================
--- trunk/lib/plugin/DebugAuthInfo.php	2014-11-25 17:13:29 UTC (rev 9377)
+++ trunk/lib/plugin/DebugAuthInfo.php	2014-11-26 10:35:23 UTC (rev 9378)
@@ -146,7 +146,8 @@
         static $max_depth = 0;
         $rows = array();
         $max_depth++;
-        if ($max_depth > 35) return $heading;
+        if ($max_depth > 35)
+            return $heading;
 
         if ($heading)
             $rows[] = HTML::tr(array(
@@ -161,8 +162,13 @@
             foreach ($hash as $key => $val) {
                 if (is_object($val)) {
                     $heading = "Object of " . get_class($val);
-                    if ($depth > 3) $val = $heading;
-                    elseif ($heading == "Object of wikidb_sql") $val = $heading; elseif (substr($heading, 0, 13) == "Object of db_") $val = $heading; elseif (!isset($seen[$heading])) {
+                    if ($depth > 3)
+                        $val = $heading;
+                    elseif ($heading == "Object of wikidb_sql")
+                        $val = $heading;
+                    elseif (substr($heading, 0, 13) == "Object of db_")
+                        $val = $heading;
+                    elseif (!isset($seen[$heading])) {
                         //if (empty($seen[$heading])) $seen[$heading] = 1;
                         $val = HTML::table(array('class' => 'bordered'),
                             $this->show_hash($heading, $this->obj2hash($val), $depth + 1));
@@ -171,7 +177,8 @@
                     }
                 } elseif (is_array($val)) {
                     $heading = $key . "[]";
-                    if ($depth > 3) $val = $heading;
+                    if ($depth > 3)
+                        $val = $heading;
                     elseif (!isset($seen[$heading])) {
                         //if (empty($seen[$heading])) $seen[$heading] = 1;
                         $val = HTML::table(array('class' => 'bordered'),
@@ -199,8 +206,10 @@
         $hash = array();
         foreach ($constants as $c) {
             $hash[$c] = defined($c) ? constant($c) : '<empty>';
-            if ($hash[$c] === false) $hash[$c] = 'false';
-            elseif ($hash[$c] === true) $hash[$c] = 'true';
+            if ($hash[$c] === false)
+                $hash[$c] = 'false';
+            elseif ($hash[$c] === true)
+                $hash[$c] = 'true';
         }
         return $hash;
     }

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

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

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

Revision: 9377
          http://sourceforge.net/p/phpwiki/code/9377
Author:   vargenau
Date:     2014-11-25 17:13:29 +0000 (Tue, 25 Nov 2014)
Log Message:
-----------
Use smart quotes

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

Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php	2014-11-25 16:34:47 UTC (rev 9376)
+++ trunk/lib/plugin/LinkSearch.php	2014-11-25 17:13:29 UTC (rev 9377)
@@ -162,7 +162,7 @@
             $pagelist->setCaption
             ( // on mozilla the form doesn't fit into the caption very well.
                 HTML($noform ? '' : HTML($form, HTML::hr()),
-                    fmt("LinkSearch result for \"%s\" in pages \"%s\", direction %s", $s, $page, $direction)));
+                    fmt("LinkSearch result for “%s” in pages “%s”, direction %s", $s, $page, $direction)));
         }
         return $pagelist;
     }

Modified: trunk/lib/plugin/RelatedChanges.php
===================================================================
--- trunk/lib/plugin/RelatedChanges.php	2014-11-25 16:34:47 UTC (rev 9376)
+++ trunk/lib/plugin/RelatedChanges.php	2014-11-25 17:13:29 UTC (rev 9377)
@@ -35,7 +35,7 @@
     function description()
     {
         return HTML::p(false, $this->pre_description(),
-            fmt(" (to pages linked from \"%s\")", $this->_args['page']));
+            fmt(" (to pages linked from “%s”)", $this->_args['page']));
     }
 }
 

Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php	2014-11-25 16:34:47 UTC (rev 9376)
+++ trunk/lib/plugin/WatchPage.php	2014-11-25 17:13:29 UTC (rev 9377)
@@ -80,7 +80,7 @@
         if ($isNecessary) {
             $form->pushContent(HTML::p(_("New watchlist: "),
                     $this->showWatchList($this->addpagelist($page, $pagelist))),
-                HTML::p(sprintf(_("Do you %s want to add this page \"%s\" to your WatchList?"),
+                HTML::p(sprintf(_("Do you %s want to add this page “%s” to your WatchList?"),
                     ($verified ? _("really") : ""), $page)),
                 HTML::p(Button('submit:add', _("Yes")),
                     HTML::raw(' '),

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2014-11-25 16:34:47 UTC (rev 9376)
+++ trunk/lib/stdlib.php	2014-11-25 17:13:29 UTC (rev 9377)
@@ -469,13 +469,13 @@
         if (file_exists($file)) {
             $link = HTML::img(array('src' => $ori_url));
             trigger_error(
-                sprintf(_("Invalid image link fixed %s => %s. Spaces must be quoted with %%20."),
+                sprintf(_("Invalid image link fixed “%s” => “%s”. Spaces must be quoted with %%20."),
                     $url, $ori_url), E_USER_WARNING);
         } elseif (string_starts_with($ori_url, getUploadDataPath())) {
             $file = substr($file, strlen(getUploadDataPath()));
             $path = getUploadFilePath() . $file;
             if (file_exists($path)) {
-                trigger_error(sprintf(_("Invalid image link fixed \"%s\" => \"%s\".\n Spaces must be quoted with %%20."),
+                trigger_error(sprintf(_("Invalid image link fixed “%s” => “%s”. Spaces must be quoted with %%20."),
                     $url, $ori_url), E_USER_WARNING);
                 $link->setAttr('src', getUploadDataPath() . $file);
                 $url = $ori_url;

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	2014-11-25 16:34:47 UTC (rev 9376)
+++ trunk/locale/po/de.po	2014-11-25 17:13:29 UTC (rev 9377)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-21 18:10+0100\n"
+"POT-Creation-Date: 2014-11-25 17:59+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."
@@ -1913,7 +1913,7 @@
 msgstr "Verweis"
 
 #, php-format
-msgid "LinkSearch result for \"%s\" in pages \"%s\", direction %s"
+msgid "LinkSearch result for “%s” in pages “%s”, direction %s"
 msgstr ""
 
 msgid "List pages that are explicitly given as the pages argument."
@@ -2468,6 +2468,9 @@
 msgid "%s is only allowed in locked pages."
 msgstr "%s wird/werden nur in gesperrten Seiten erlaubt."
 
+msgid "Cache output of RecentChanges called with default arguments."
+msgstr ""
+
 msgid "UserContribs"
 msgstr "BenutzerBewertungen"
 
@@ -2690,8 +2693,8 @@
 msgstr "Zeige Redirekt-Seite."
 
 #, php-format
-msgid " (to pages linked from \"%s\")"
-msgstr "(auf Seiten verlinkt von \"%s\")"
+msgid " (to pages linked from “%s”)"
+msgstr " (auf Seiten verlinkt von »%s«)"
 
 msgid "List of changes on all pages which are linked to from this page."
 msgstr ""
@@ -3411,7 +3414,7 @@
 msgstr ""
 
 #, php-format
-msgid "Do you %s want to add this page \"%s\" to your WatchList?"
+msgid "Do you %s want to add this page “%s” to your WatchList?"
 msgstr ""
 
 msgid "really"
@@ -4546,15 +4549,9 @@
 msgstr "Ungültiger Parameter %s=%s für Bild %s"
 
 #, php-format
-msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
+msgid "Invalid image link fixed “%s” => “%s”. Spaces must be quoted with %%20."
 msgstr ""
 
-#, php-format
-msgid ""
-"Invalid image link fixed \"%s\" => \"%s\".\n"
-" Spaces must be quoted with %%20."
-msgstr ""
-
 msgid "Invalid image size"
 msgstr "Ungültige Bildgröße"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2014-11-25 16:34:47 UTC (rev 9376)
+++ trunk/locale/po/es.po	2014-11-25 17:13:29 UTC (rev 9377)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-21 18:10+0100\n"
+"POT-Creation-Date: 2014-11-25 17:59+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -1880,7 +1880,7 @@
 msgstr ""
 
 #, php-format
-msgid "LinkSearch result for \"%s\" in pages \"%s\", direction %s"
+msgid "LinkSearch result for “%s” in pages “%s”, direction %s"
 msgstr ""
 
 msgid "List pages that are explicitly given as the pages argument."
@@ -2404,6 +2404,9 @@
 msgid "%s is only allowed in locked pages."
 msgstr ""
 
+msgid "Cache output of RecentChanges called with default arguments."
+msgstr ""
+
 msgid "UserContribs"
 msgstr ""
 
@@ -2617,7 +2620,7 @@
 msgstr ""
 
 #, php-format
-msgid " (to pages linked from \"%s\")"
+msgid " (to pages linked from “%s”)"
 msgstr ""
 
 msgid "List of changes on all pages which are linked to from this page."
@@ -3316,7 +3319,7 @@
 msgstr ""
 
 #, php-format
-msgid "Do you %s want to add this page \"%s\" to your WatchList?"
+msgid "Do you %s want to add this page “%s” to your WatchList?"
 msgstr ""
 
 msgid "really"
@@ -4424,15 +4427,9 @@
 msgstr ""
 
 #, php-format
-msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
+msgid "Invalid image link fixed “%s” => “%s”. Spaces must be quoted with %%20."
 msgstr ""
 
-#, php-format
-msgid ""
-"Invalid image link fixed \"%s\" => \"%s\".\n"
-" Spaces must be quoted with %%20."
-msgstr ""
-
 msgid "Invalid image size"
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-11-25 16:34:47 UTC (rev 9376)
+++ trunk/locale/po/fr.po	2014-11-25 17:13:29 UTC (rev 9377)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-21 18:10+0100\n"
+"POT-Creation-Date: 2014-11-25 17:59+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1892,7 +1892,7 @@
 msgstr "Lien"
 
 #, php-format
-msgid "LinkSearch result for \"%s\" in pages \"%s\", direction %s"
+msgid "LinkSearch result for “%s” in pages “%s”, direction %s"
 msgstr ""
 
 msgid "List pages that are explicitly given as the pages argument."
@@ -2424,6 +2424,9 @@
 msgid "%s is only allowed in locked pages."
 msgstr "%s n'est autorisé que dans les pages verrouillées."
 
+msgid "Cache output of RecentChanges called with default arguments."
+msgstr ""
+
 msgid "UserContribs"
 msgstr ""
 
@@ -2642,8 +2645,8 @@
 msgstr "Voir la page de redirection."
 
 #, php-format
-msgid " (to pages linked from \"%s\")"
-msgstr " (aux pages liées à \"%s\")"
+msgid " (to pages linked from “%s”)"
+msgstr " (aux pages liées à « %s »)"
 
 msgid "List of changes on all pages which are linked to from this page."
 msgstr ""
@@ -3361,7 +3364,7 @@
 msgstr "Nouvelle liste de suivi : "
 
 #, php-format
-msgid "Do you %s want to add this page \"%s\" to your WatchList?"
+msgid "Do you %s want to add this page “%s” to your WatchList?"
 msgstr "Voulez-vous %s ajouter la page « %s » à votre liste de suivi ?"
 
 msgid "really"
@@ -4488,15 +4491,9 @@
 msgstr "Attribut non valable %s=%s pour l'image %s"
 
 #, php-format
-msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
+msgid "Invalid image link fixed “%s” => “%s”. Spaces must be quoted with %%20."
 msgstr ""
 
-#, php-format
-msgid ""
-"Invalid image link fixed \"%s\" => \"%s\".\n"
-" Spaces must be quoted with %%20."
-msgstr ""
-
 msgid "Invalid image size"
 msgstr "Taille d'image invalide"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2014-11-25 16:34:47 UTC (rev 9376)
+++ trunk/locale/po/it.po	2014-11-25 17:13:29 UTC (rev 9377)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-21 18:10+0100\n"
+"POT-Creation-Date: 2014-11-25 17:59+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -1862,7 +1862,7 @@
 msgstr ""
 
 #, php-format
-msgid "LinkSearch result for \"%s\" in pages \"%s\", direction %s"
+msgid "LinkSearch result for “%s” in pages “%s”, direction %s"
 msgstr ""
 
 msgid "List pages that are explicitly given as the pages argument."
@@ -2382,6 +2382,9 @@
 msgid "%s is only allowed in locked pages."
 msgstr ""
 
+msgid "Cache output of RecentChanges called with default arguments."
+msgstr ""
+
 msgid "UserContribs"
 msgstr ""
 
@@ -2590,7 +2593,7 @@
 msgstr ""
 
 #, php-format
-msgid " (to pages linked from \"%s\")"
+msgid " (to pages linked from “%s”)"
 msgstr ""
 
 msgid "List of changes on all pages which are linked to from this page."
@@ -3289,7 +3292,7 @@
 msgstr ""
 
 #, php-format
-msgid "Do you %s want to add this page \"%s\" to your WatchList?"
+msgid "Do you %s want to add this page “%s” to your WatchList?"
 msgstr ""
 
 msgid "really"
@@ -4389,15 +4392,9 @@
 msgstr ""
 
 #, php-format
-msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
+msgid "Invalid image link fixed “%s” => “%s”. Spaces must be quoted with %%20."
 msgstr ""
 
-#, php-format
-msgid ""
-"Invalid image link fixed \"%s\" => \"%s\".\n"
-" Spaces must be quoted with %%20."
-msgstr ""
-
 msgid "Invalid image size"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2014-11-25 16:34:47 UTC (rev 9376)
+++ trunk/locale/po/ja.po	2014-11-25 17:13:29 UTC (rev 9377)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-21 18:10+0100\n"
+"POT-Creation-Date: 2014-11-25 17:59+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1883,7 +1883,7 @@
 msgstr "ログイン"
 
 #, php-format
-msgid "LinkSearch result for \"%s\" in pages \"%s\", direction %s"
+msgid "LinkSearch result for “%s” in pages “%s”, direction %s"
 msgstr ""
 
 msgid "List pages that are explicitly given as the pages argument."
@@ -2406,6 +2406,9 @@
 msgid "%s is only allowed in locked pages."
 msgstr ""
 
+msgid "Cache output of RecentChanges called with default arguments."
+msgstr ""
+
 #, fuzzy
 msgid "UserContribs"
 msgstr "ユーザー統計"
@@ -2629,7 +2632,7 @@
 msgstr ""
 
 #, php-format
-msgid " (to pages linked from \"%s\")"
+msgid " (to pages linked from “%s”)"
 msgstr ""
 
 msgid "List of changes on all pages which are linked to from this page."
@@ -3334,7 +3337,7 @@
 msgstr ""
 
 #, php-format
-msgid "Do you %s want to add this page \"%s\" to your WatchList?"
+msgid "Do you %s want to add this page “%s” to your WatchList?"
 msgstr ""
 
 msgid "really"
@@ -4527,15 +4530,9 @@
 msgstr "インライン画像一覧"
 
 #, php-format
-msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
+msgid "Invalid image link fixed “%s” => “%s”. Spaces must be quoted with %%20."
 msgstr ""
 
-#, php-format
-msgid ""
-"Invalid image link fixed \"%s\" => \"%s\".\n"
-" Spaces must be quoted with %%20."
-msgstr ""
-
 #, fuzzy
 msgid "Invalid image size"
 msgstr "インライン画像一覧"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2014-11-25 16:34:47 UTC (rev 9376)
+++ trunk/locale/po/nl.po	2014-11-25 17:13:29 UTC (rev 9377)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-21 18:10+0100\n"
+"POT-Creation-Date: 2014-11-25 17:59+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -1853,7 +1853,7 @@
 msgstr ""
 
 #, php-format
-msgid "LinkSearch result for \"%s\" in pages \"%s\", direction %s"
+msgid "LinkSearch result for “%s” in pages “%s”, direction %s"
 msgstr ""
 
 msgid "List pages that are explicitly given as the pages argument."
@@ -2373,6 +2373,9 @@
 msgid "%s is only allowed in locked pages."
 msgstr ""
 
+msgid "Cache output of RecentChanges called with default arguments."
+msgstr ""
+
 msgid "UserContribs"
 msgstr ""
 
@@ -2582,7 +2585,7 @@
 msgstr ""
 
 #, php-format
-msgid " (to pages linked from \"%s\")"
+msgid " (to pages linked from “%s”)"
 msgstr ""
 
 msgid "List of changes on all pages which are linked to from this page."
@@ -3281,7 +3284,7 @@
 msgstr ""
 
 #, php-format
-msgid "Do you %s want to add this page \"%s\" to your WatchList?"
+msgid "Do you %s want to add this page “%s” to your WatchList?"
 msgstr ""
 
 msgid "really"
@@ -4381,15 +4384,9 @@
 msgstr ""
 
 #, php-format
-msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
+msgid "Invalid image link fixed “%s” => “%s”. Spaces must be quoted with %%20."
 msgstr ""
 
-#, php-format
-msgid ""
-"Invalid image link fixed \"%s\" => \"%s\".\n"
-" Spaces must be quoted with %%20."
-msgstr ""
-
 msgid "Invalid image size"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2014-11-25 16:34:47 UTC (rev 9376)
+++ trunk/locale/po/phpwiki.pot	2014-11-25 17:13:29 UTC (rev 9377)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-21 18:10+0100\n"
+"POT-Creation-Date: 2014-11-25 17:59+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1847,7 +1847,7 @@
 msgstr ""
 
 #, php-format
-msgid "LinkSearch result for \"%s\" in pages \"%s\", direction %s"
+msgid "LinkSearch result for “%s” in pages “%s”, direction %s"
 msgstr ""
 
 msgid "List pages that are explicitly given as the pages argument."
@@ -2367,6 +2367,9 @@
 msgid "%s is only allowed in locked pages."
 msgstr ""
 
+msgid "Cache output of RecentChanges called with default arguments."
+msgstr ""
+
 msgid "UserContribs"
 msgstr ""
 
@@ -2575,7 +2578,7 @@
 msgstr ""
 
 #, php-format
-msgid " (to pages linked from \"%s\")"
+msgid " (to pages linked from “%s”)"
 msgstr ""
 
 msgid "List of changes on all pages which are linked to from this page."
@@ -3273,7 +3276,7 @@
 msgstr ""
 
 #, php-format
-msgid "Do you %s want to add this page \"%s\" to your WatchList?"
+msgid "Do you %s want to add this page “%s” to your WatchList?"
 msgstr ""
 
 msgid "really"
@@ -4373,15 +4376,9 @@
 msgstr ""
 
 #, php-format
-msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
+msgid "Invalid image link fixed “%s” => “%s”. Spaces must be quoted with %%20."
 msgstr ""
 
-#, php-format
-msgid ""
-"Invalid image link fixed \"%s\" => \"%s\".\n"
-" Spaces must be quoted with %%20."
-msgstr ""
-
 msgid "Invalid image size"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2014-11-25 16:34:47 UTC (rev 9376)
+++ trunk/locale/po/sv.po	2014-11-25 17:13:29 UTC (rev 9377)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-21 18:10+0100\n"
+"POT-Creation-Date: 2014-11-25 17:59+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -1848,7 +1848,7 @@
 msgstr ""
 
 #, php-format
-msgid "LinkSearch result for \"%s\" in pages \"%s\", direction %s"
+msgid "LinkSearch result for “%s” in pages “%s”, direction %s"
 msgstr ""
 
 msgid "List pages that are explicitly given as the pages argument."
@@ -2368,6 +2368,9 @@
 msgid "%s is only allowed in locked pages."
 msgstr ""
 
+msgid "Cache output of RecentChanges called with default arguments."
+msgstr ""
+
 msgid "UserContribs"
 msgstr ""
 
@@ -2576,7 +2579,7 @@
 msgstr ""
 
 #, php-format
-msgid " (to pages linked from \"%s\")"
+msgid " (to pages linked from “%s”)"
 msgstr ""
 
 msgid "List of changes on all pages which are linked to from this page."
@@ -3274,7 +3277,7 @@
 msgstr ""
 
 #, php-format
-msgid "Do you %s want to add this page \"%s\" to your WatchList?"
+msgid "Do you %s want to add this page “%s” to your WatchList?"
 msgstr ""
 
 msgid "really"
@@ -4374,15 +4377,9 @@
 msgstr ""
 
 #, php-format
-msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
+msgid "Invalid image link fixed “%s” => “%s”. Spaces must be quoted with %%20."
 msgstr ""
 
-#, php-format
-msgid ""
-"Invalid image link fixed \"%s\" => \"%s\".\n"
-" Spaces must be quoted with %%20."
-msgstr ""
-
 msgid "Invalid image size"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2014-11-25 16:34:47 UTC (rev 9376)
+++ trunk/locale/po/zh.po	2014-11-25 17:13:29 UTC (rev 9377)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-21 18:10+0100\n"
+"POT-Creation-Date: 2014-11-25 17:59+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -1512,9 +1512,9 @@
 msgid "CreatePage failed"
 msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "Do you really want to create the page “%s”?"
-msgstr "你確定你想要永久更名選定的檔案?"
+msgstr ""
 
 msgid "The new page you want to create will be a subpage."
 msgstr ""
@@ -1928,7 +1928,7 @@
 msgstr ""
 
 #, php-format
-msgid "LinkSearch result for \"%s\" in pages \"%s\", direction %s"
+msgid "LinkSearch result for “%s” in pages “%s”, direction %s"
 msgstr ""
 
 msgid "List pages that are explicitly given as the pages argument."
@@ -2468,6 +2468,9 @@
 msgid "%s is only allowed in locked pages."
 msgstr "%s 只允許在鎖定的頁面中."
 
+msgid "Cache output of RecentChanges called with default arguments."
+msgstr ""
+
 #, fuzzy
 msgid "UserContribs"
 msgstr "使用者統計"
@@ -2695,7 +2698,7 @@
 msgstr "查看重導向的頁面."
 
 #, fuzzy, php-format
-msgid " (to pages linked from \"%s\")"
+msgid " (to pages linked from “%s”)"
 msgstr "%s 個頁面連結到 %s:"
 
 #, fuzzy
@@ -3417,7 +3420,7 @@
 msgstr ""
 
 #, php-format
-msgid "Do you %s want to add this page \"%s\" to your WatchList?"
+msgid "Do you %s want to add this page “%s” to your WatchList?"
 msgstr ""
 
 msgid "really"
@@ -3620,7 +3623,6 @@
 msgid "Rename to"
 msgstr "更名為"
 
-#, fuzzy
 msgid "Are you sure you want to rename the selected pages?"
 msgstr "你確定你想要永久更名選定的檔案?"
 
@@ -4607,15 +4609,9 @@
 msgstr "錯誤的顏色值: %s"
 
 #, php-format
-msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
+msgid "Invalid image link fixed “%s” => “%s”. Spaces must be quoted with %%20."
 msgstr ""
 
-#, php-format
-msgid ""
-"Invalid image link fixed \"%s\" => \"%s\".\n"
-" Spaces must be quoted with %%20."
-msgstr ""
-
 #, fuzzy
 msgid "Invalid image size"
 msgstr "Inline 圖片"

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

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

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

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

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

Revision: 9376
          http://sourceforge.net/p/phpwiki/code/9376
Author:   vargenau
Date:     2014-11-25 16:34:47 +0000 (Tue, 25 Nov 2014)
Log Message:
-----------
Type compatibility

Modified Paths:
--------------
    trunk/lib/PageList.php
    trunk/lib/plugin/EditMetaData.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/plugin/text2png.php

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2014-11-25 16:19:16 UTC (rev 9375)
+++ trunk/lib/PageList.php	2014-11-25 16:34:47 UTC (rev 9376)
@@ -1385,7 +1385,7 @@
     /**
      * Add a column to this PageList, given a column object.
      *
-     * @param $col object   An object derived from _PageList_Column.
+     * @param array|object $col   An object derived from _PageList_Column.
      **/
     function addColumnObject($col)
     {

Modified: trunk/lib/plugin/EditMetaData.php
===================================================================
--- trunk/lib/plugin/EditMetaData.php	2014-11-25 16:19:16 UTC (rev 9375)
+++ trunk/lib/plugin/EditMetaData.php	2014-11-25 16:34:47 UTC (rev 9376)
@@ -114,7 +114,7 @@
             }
             if ($changed) {
                 $dbi->touch();
-                $url = $request->getURLtoSelf(false,
+                $url = $request->getURLtoSelf(array(),
                     array('meta', 'metaedit', 'metafield', 'metavalue'));
                 $request->redirect($url);
                 // The rest of the output will not be seen due to the

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2014-11-25 16:19:16 UTC (rev 9375)
+++ trunk/lib/plugin/RecentChanges.php	2014-11-25 16:34:47 UTC (rev 9376)
@@ -189,7 +189,7 @@
         return HTML("(", $button, ")");
     }
 
-    function pageLink($rev, $link_text = false)
+    function pageLink($rev, $link_text = '')
     {
 
         return WikiLink($this->include_versions_in_URLs() ? $rev : $rev->getPage(),

Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2014-11-25 16:19:16 UTC (rev 9375)
+++ trunk/lib/plugin/text2png.php	2014-11-25 16:34:47 UTC (rev 9376)
@@ -94,7 +94,7 @@
      * '#000'    => array(0,0,0)
      * '#000000' => array(0,0,0)
      */
-    function hexcolor($h, $default = false)
+    function hexcolor($h, $default = array())
     {
         if ($h[0] != '#') return $default;
         $rgb = substr($h, 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:[9375] trunk/lib

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

Revision: 9375
          http://sourceforge.net/p/phpwiki/code/9375
Author:   vargenau
Date:     2014-11-25 16:19:16 +0000 (Tue, 25 Nov 2014)
Log Message:
-----------
Move function obj2hash to plugin using it

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

Modified: trunk/lib/plugin/DebugAuthInfo.php
===================================================================
--- trunk/lib/plugin/DebugAuthInfo.php	2014-11-25 16:12:04 UTC (rev 9374)
+++ trunk/lib/plugin/DebugAuthInfo.php	2014-11-25 16:19:16 UTC (rev 9375)
@@ -102,7 +102,7 @@
         } else {
             $table = HTML::table(array('class' => 'bordered'));
             //$table->pushContent(HTML::tr(HTML::td(array('colspan' => 2))));
-            $userdata = obj2hash($user, array('_dbi', '_request', 'password', 'passwd'));
+            $userdata = $this->obj2hash($user, array('_dbi', '_request', 'password', 'passwd'));
             if (is_a($user, "_FilePassUser")) {
                 foreach ($userdata['_file']->users as $u => $p) {
                     $userdata['_file']->users[$u] = "<hidden>";
@@ -111,7 +111,7 @@
             $table->pushContent($this->show_hash("User: Object of " . get_class($user), $userdata));
             $group = &$request->getGroup();
             $groups = $group->getAllGroupsIn();
-            $groupdata = obj2hash($group, array('_dbi', '_request', 'password', 'passwd'));
+            $groupdata = $this->obj2hash($group, array('_dbi', '_request', 'password', 'passwd'));
             unset($groupdata['request']);
             $table->pushContent($this->show_hash("Group: Object of " . get_class($group), $groupdata));
             $groups = $group->getAllGroupsIn();
@@ -126,6 +126,20 @@
         return $html;
     }
 
+    // needed to store serialized objects-values only (perm, pref)
+    private function obj2hash($obj, $exclude = array())
+    {
+        $a = array();
+        $fields = get_object_vars($obj);
+        foreach ($fields as $key => $val) {
+            if (in_array($key, $exclude)) {
+                continue;
+            }
+            $a[$key] = $val;
+        }
+        return $a;
+    }
+
     private function show_hash($heading, $hash, $depth = 0)
     {
         static $seen = array();
@@ -141,7 +155,7 @@
                         'style' => 'color:black'),
                     $heading));
         if (is_object($hash))
-            $hash = obj2hash($hash);
+            $hash = $this->obj2hash($hash);
         if (!empty($hash)) {
             ksort($hash);
             foreach ($hash as $key => $val) {
@@ -151,7 +165,7 @@
                     elseif ($heading == "Object of wikidb_sql") $val = $heading; elseif (substr($heading, 0, 13) == "Object of db_") $val = $heading; elseif (!isset($seen[$heading])) {
                         //if (empty($seen[$heading])) $seen[$heading] = 1;
                         $val = HTML::table(array('class' => 'bordered'),
-                            $this->show_hash($heading, obj2hash($val), $depth + 1));
+                            $this->show_hash($heading, $this->obj2hash($val), $depth + 1));
                     } else {
                         $val = $heading;
                     }

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2014-11-25 16:12:04 UTC (rev 9374)
+++ trunk/lib/stdlib.php	2014-11-25 16:19:16 UTC (rev 9375)
@@ -71,7 +71,6 @@
 
     phpwiki_version ()
     isWikiWord ($word)
-    obj2hash($obj, $exclude = array())
     url_get_contents ($uri)
     GenerateId ($name)
     firstNWordsOfContent ($n, $content)
@@ -1698,20 +1697,6 @@
     return preg_match("/^$WikiNameRegexp\$/", $word);
 }
 
-// needed to store serialized objects-values only (perm, pref)
-function obj2hash($obj, $exclude = array())
-{
-    $a = array();
-    $fields = get_object_vars($obj);
-    foreach ($fields as $key => $val) {
-        if (in_array($key, $exclude)) {
-            continue;
-        }
-        $a[$key] = $val;
-    }
-    return $a;
-}
-
 /**
  * isAsciiString($string)
  */

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9374] trunk/lib/stdlib.php

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

Revision: 9374
          http://sourceforge.net/p/phpwiki/code/9374
Author:   vargenau
Date:     2014-11-25 16:12:04 +0000 (Tue, 25 Nov 2014)
Log Message:
-----------
Simplify function obj2hash

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

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2014-11-25 16:03:47 UTC (rev 9373)
+++ trunk/lib/stdlib.php	2014-11-25 16:12:04 UTC (rev 9374)
@@ -71,7 +71,7 @@
 
     phpwiki_version ()
     isWikiWord ($word)
-    obj2hash ($obj, $exclude = false, $fields = false)
+    obj2hash($obj, $exclude = array())
     url_get_contents ($uri)
     GenerateId ($name)
     firstNWordsOfContent ($n, $content)
@@ -1699,13 +1699,13 @@
 }
 
 // needed to store serialized objects-values only (perm, pref)
-function obj2hash($obj, $exclude = false, $fields = false)
+function obj2hash($obj, $exclude = array())
 {
     $a = array();
-    if (!$fields) $fields = get_object_vars($obj);
+    $fields = get_object_vars($obj);
     foreach ($fields as $key => $val) {
-        if (is_array($exclude)) {
-            if (in_array($key, $exclude)) continue;
+        if (in_array($key, $exclude)) {
+            continue;
         }
         $a[$key] = $val;
     }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9373] trunk/lib/plugin/RecentChangesCached.php

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

Revision: 9373
          http://sourceforge.net/p/phpwiki/code/9373
Author:   vargenau
Date:     2014-11-25 16:03:47 +0000 (Tue, 25 Nov 2014)
Log Message:
-----------
Do not call nonstatic function statically

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

Modified: trunk/lib/plugin/RecentChangesCached.php
===================================================================
--- trunk/lib/plugin/RecentChangesCached.php	2014-11-25 16:02:37 UTC (rev 9372)
+++ trunk/lib/plugin/RecentChangesCached.php	2014-11-25 16:03:47 UTC (rev 9373)
@@ -46,12 +46,13 @@
 
     function getDescription()
     {
-        return 'Cache output of RecentChanges called with default arguments.';
+        return _('Cache output of RecentChanges called with default arguments.');
     }
 
     function getDefaultArguments()
     {
-        return WikiPlugin_RecentChanges::getDefaultArguments();
+        $rc = new WikiPlugin_RecentChanges();
+        return $rc->getDefaultArguments();
     }
 
     function getExpire($dbi, $argarray, $request)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9372] trunk/lib/plugin/RecentChanges.php

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

Revision: 9372
          http://sourceforge.net/p/phpwiki/code/9372
Author:   vargenau
Date:     2014-11-25 16:02:37 +0000 (Tue, 25 Nov 2014)
Log Message:
-----------
Prettyprint

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

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2014-11-25 16:01:00 UTC (rev 9371)
+++ trunk/lib/plugin/RecentChanges.php	2014-11-25 16:02:37 UTC (rev 9372)
@@ -1403,14 +1403,19 @@
             if ($format == 'rss')
                 $fmt_class = '_RecentChanges_RssFormatter';
             elseif ($format == 'rss2')
-                $fmt_class = '_RecentChanges_Rss2Formatter'; elseif ($format == 'atom')
-                $fmt_class = '_RecentChanges_AtomFormatter'; elseif ($format == 'rss091') {
+                $fmt_class = '_RecentChanges_Rss2Formatter';
+            elseif ($format == 'atom')
+                $fmt_class = '_RecentChanges_AtomFormatter';
+            elseif ($format == 'rss091') {
                 include_once 'lib/RSSWriter091.php';
                 $fmt_class = '_RecentChanges_RssFormatter091';
             } elseif ($format == 'sidebar')
-                $fmt_class = '_RecentChanges_SideBarFormatter'; elseif ($format == 'box')
-                $fmt_class = '_RecentChanges_BoxFormatter'; elseif ($format == 'contribs')
-                $fmt_class = '_RecentChanges_UserContribsFormatter'; else
+                $fmt_class = '_RecentChanges_SideBarFormatter';
+            elseif ($format == 'box')
+                $fmt_class = '_RecentChanges_BoxFormatter';
+            elseif ($format == 'contribs')
+                $fmt_class = '_RecentChanges_UserContribsFormatter';
+            else
                 $fmt_class = '_RecentChanges_HtmlFormatter';
         }
 

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

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

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

Revision: 9371
          http://sourceforge.net/p/phpwiki/code/9371
Author:   vargenau
Date:     2014-11-25 16:01:00 +0000 (Tue, 25 Nov 2014)
Log Message:
-----------
Add static

Modified Paths:
--------------
    trunk/lib/SemanticWeb.php
    trunk/lib/WikiDB/SQL.php
    trunk/lib/plugin/PhotoAlbum.php
    trunk/lib/wikilens/RatingsDb.php
    trunk/lib/wikilens/RatingsUser.php

Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php	2014-11-25 15:45:06 UTC (rev 9370)
+++ trunk/lib/SemanticWeb.php	2014-11-25 16:01:00 UTC (rev 9371)
@@ -210,7 +210,7 @@
     /** This function transforms a valid url-encoded URI into a string
      *  that can be used as an XML-ID. The mapping should be injective.
      */
-    function makeXMLExportId($uri)
+    static function makeXMLExportId($uri)
     {
         $uri = str_replace('-', '-2D', $uri);
         //$uri = str_replace( ':', '-3A', $uri); //already done by PHP

Modified: trunk/lib/WikiDB/SQL.php
===================================================================
--- trunk/lib/WikiDB/SQL.php	2014-11-25 15:45:06 UTC (rev 9370)
+++ trunk/lib/WikiDB/SQL.php	2014-11-25 16:01:00 UTC (rev 9371)
@@ -23,7 +23,7 @@
         parent::__construct($backend, $dbparams);
     }
 
-    function view_dsn($dsn = false)
+    static function view_dsn($dsn = false)
     {
         if (!$dsn)
             $dsninfo = DB::parseDSN($GLOBALS['DBParams']['dsn']);

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2014-11-25 15:45:06 UTC (rev 9370)
+++ trunk/lib/plugin/PhotoAlbum.php	2014-11-25 16:01:00 UTC (rev 9371)
@@ -72,7 +72,7 @@
 class ImageTile extends HtmlElement
 {
     // go away, hack!
-    function image_tile( /*...*/)
+    static function image_tile( /*...*/)
     {
         $el = new HTML ('img');
         $tag = func_get_args();

Modified: trunk/lib/wikilens/RatingsDb.php
===================================================================
--- trunk/lib/wikilens/RatingsDb.php	2014-11-25 15:45:06 UTC (rev 9370)
+++ trunk/lib/wikilens/RatingsDb.php	2014-11-25 16:01:00 UTC (rev 9371)
@@ -83,7 +83,7 @@
     }
 
     // this is a singleton.  It ensures there is only 1 ratingsDB.
-    function & getTheRatingsDb()
+    static function & getTheRatingsDb()
     {
         static $_theRatingsDb;
 

Modified: trunk/lib/wikilens/RatingsUser.php
===================================================================
--- trunk/lib/wikilens/RatingsUser.php	2014-11-25 15:45:06 UTC (rev 9370)
+++ trunk/lib/wikilens/RatingsUser.php	2014-11-25 16:01:00 UTC (rev 9371)
@@ -27,7 +27,7 @@
  */
 class RatingsUserFactory
 {
-    function & getUser($userid)
+    static function & getUser($userid)
     {
         //print "getUser($userid) ";
         global $_ratingsUserCache;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9370] trunk/lib/plugin/WikiForum.php

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

Revision: 9370
          http://sourceforge.net/p/phpwiki/code/9370
Author:   vargenau
Date:     2014-11-25 15:45:06 +0000 (Tue, 25 Nov 2014)
Log Message:
-----------
Add return argument

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

Modified: trunk/lib/plugin/WikiForum.php
===================================================================
--- trunk/lib/plugin/WikiForum.php	2014-11-24 14:49:45 UTC (rev 9369)
+++ trunk/lib/plugin/WikiForum.php	2014-11-25 15:45:06 UTC (rev 9370)
@@ -83,7 +83,7 @@
 
         if ($request->isPost() and !empty($forum['add'])) {
             $this->add($request, $forum, 'wikiforum');
-            return;
+            return HTML();
         }
 
         // Now we display previous comments and/or provide entry box

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

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

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

Revision: 9369
          http://sourceforge.net/p/phpwiki/code/9369
Author:   vargenau
Date:     2014-11-24 14:49:45 +0000 (Mon, 24 Nov 2014)
Log Message:
-----------
Revert r9177: function posix_times does not exist on Windows (reported by jdebert)

Revision Links:
--------------
    http://sourceforge.net/p/phpwiki/code/9177

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

Modified: trunk/lib/prepend.php
===================================================================
--- trunk/lib/prepend.php	2014-11-23 20:18:22 UTC (rev 9368)
+++ trunk/lib/prepend.php	2014-11-24 14:49:45 UTC (rev 9369)
@@ -69,7 +69,10 @@
     function DebugTimer()
     {
         $this->_start = $this->microtime();
-        $this->_times = posix_times();
+        // Function 'posix_times' does not exist on Windows
+        if (function_exists('posix_times')) {
+            $this->_times = posix_times();
+        }
     }
 
     /**
@@ -96,6 +99,10 @@
 
     function getStats()
     {
+        if (!isset($this->_times)) {
+            // posix_times() not available.
+            return sprintf("real: %.3f", $this->getTime('real'));
+        }
         $now = posix_times();
         return sprintf("real: %.3f, user: %.3f, sys: %.3f",
             $this->getTime('real'),

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2014-11-23 20:18:22 UTC (rev 9368)
+++ trunk/pgsrc/ReleaseNotes	2014-11-24 14:49:45 UTC (rev 9369)
@@ -1,4 +1,4 @@
-Date: Fri, 21 Nov 2014 12:46:01 +0000
+Date: Mon, 24 Nov 2014 15:49:15 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -13,6 +13,7 @@
 * easier file upload: forbidden characters in filename are replaced by dashes (instead of rejecting upload)
 * improve handling of image insertion icon in edit toolbar (icon did not always appear after image uploading)
 * bigger wikipaging font
+* test again for function 'posix_times', it does not exist on Windows (reported by jdebert)
 * remove FPDF, lib/gif.php, lib/font (was not used)
 
 == 1.5.2 2014-10-10 Marc-Etienne Vargenau ==

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

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

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

Revision: 9368
          http://sourceforge.net/p/phpwiki/code/9368
Author:   vargenau
Date:     2014-11-23 20:18:22 +0000 (Sun, 23 Nov 2014)
Log Message:
-----------
Fix double return

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

Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2014-11-23 20:06:27 UTC (rev 9367)
+++ trunk/lib/WikiGroup.php	2014-11-23 20:18:22 UTC (rev 9368)
@@ -373,7 +373,6 @@
             default:
                 trigger_error(__sprintf("Unknown special group “%s”", $group), E_USER_WARNING);
                 return false;
-                return array();
         }
     }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9367] trunk/lib/WikiTheme.php

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

Revision: 9367
          http://sourceforge.net/p/phpwiki/code/9367
Author:   vargenau
Date:     2014-11-23 20:06:27 +0000 (Sun, 23 Nov 2014)
Log Message:
-----------
PHP Doc

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

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2014-11-23 20:00:55 UTC (rev 9366)
+++ trunk/lib/WikiTheme.php	2014-11-23 20:06:27 UTC (rev 9367)
@@ -188,6 +188,8 @@
 
     /**
      * noinit: Do not initialize unnecessary items in default_theme fallback twice.
+     * @param string $theme_name
+     * @param bool $noinit
      */
     function WikiTheme($theme_name = 'default', $noinit = false)
     {
@@ -210,7 +212,11 @@
                 }
             }
         }
-        if ($noinit) return;
+
+        if ($noinit) {
+            return;
+        }
+
         $this->_css = array();
 
         // on derived classes do not add headers twice
@@ -329,9 +335,9 @@
     /**
      * Set format string used for dates.
      *
-     * @param $fs string Format string for dates.
+     * @param string $fs Format string for dates.
      *
-     * @param $show_mod_time bool If true (default) then times
+     * @param bool $show_mod_time If true (default) then times
      * are included in the messages generated by getLastModifiedMessage(),
      * otherwise, only the date of last modification will be shown.
      */
@@ -344,7 +350,7 @@
     /**
      * Set format string used for times.
      *
-     * @param $fs string Format string for times.
+     * @param string $fs Format string for times.
      */
     function setTimeFormat($fs)
     {
@@ -357,7 +363,7 @@
      * Any time zone offset specified in the users preferences is
      * taken into account by this method.
      *
-     * @param $time_t integer Unix-style time.
+     * @param int $time_t Unix-style time.
      *
      * @return string The date.
      */
@@ -378,7 +384,7 @@
      * Any time zone offset specified in the users preferences is
      * taken into account by this method.
      *
-     * @param $time_t integer Unix-style time.
+     * @param int $time_t Unix-style time.
      *
      * @return string The time.
      */
@@ -397,7 +403,7 @@
      * Any time zone offset specified in the users preferences is
      * taken into account by this method.
      *
-     * @param $time_t integer Unix-style time.
+     * @param int $time_t Unix-style time.
      *
      * @return string The date and time.
      */
@@ -420,7 +426,7 @@
      * Any time zone offset specified in the users preferences is
      * taken into account by this method.
      *
-     * @param $time_t integer Unix-style time.
+     * @param int $time_t Unix-style time.
      *
      * @return string The day.
      */
@@ -513,6 +519,9 @@
 
     /**
      * Format the "Author" and "Owner" messages for a page revision.
+     *
+     * @param WikiDB_Page $page
+     * @return string
      */
     function getOwnerMessage($page)
     {
@@ -539,11 +548,14 @@
        Prefer author (name) over internal author_id (IP) */
     function getAuthorMessage($revision)
     {
-        if (!$revision) return '';
+        if (!$revision)
+            return '';
         $dbi =& $GLOBALS['request']->_dbi;
         $author = $revision->get('author');
-        if (!$author) $author = $revision->get('author_id');
-        if (!$author) return '';
+        if (!$author)
+            $author = $revision->get('author_id');
+        if (!$author)
+            return '';
         if ($dbi->isWikiPage($author)) {
             return fmt("by %s", WikiLink($author));
         } else {
@@ -707,7 +719,7 @@
     ////////////////////////////////////////////////////////////////
     public $_imageAliases = array();
 
-    /**
+    /*
      *
      * (To disable an image, alias the image to <code>false</code>.
      */
@@ -986,8 +998,9 @@
         return $tooltipAccessKeyPrefix;
     }
 
-    /** Define the accesskey in the title only, with ending [p] or [alt-p].
-     *  This fixes the prefix in the title and sets the accesskey.
+    /*
+     * Define the access key in the title only, with ending [p] or [alt-p].
+     *  This fixes the prefix in the title and sets the access key.
      */
     function fixAccesskey($attrs)
     {
@@ -1244,7 +1257,7 @@
     }
 
     public $_headers_printed;
-    /**
+    /*
      * Add a random header element to head
      * TODO: first css, then js. Maybe separate it into addJSHeaders/addCSSHeaders
      * or use an optional type argument, and separate it within _MoreHeaders[]
@@ -1260,7 +1273,7 @@
         }
     }
 
-    /**
+    /*
      * Singleton. Only called once, by the head template. See the warning above.
      */
     function getMoreHeaders()
@@ -1329,11 +1342,11 @@
         return $out;
     }
 
-    /**
+    /*
      * Common Initialisations
      */
 
-    /**
+    /*
      * The ->load() method replaces the formerly global code in themeinfo.php.
      * This is run only once for the selected theme, and not for the parent themes.
      * Without this you would not be able to derive from other themes.
@@ -1359,14 +1372,14 @@
         $this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css');
         $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
 
-        /**
+        /*
          * The logo image appears on every page and links to the HomePage.
          */
         $this->addImageAlias('logo', WIKI_NAME . 'Logo.png');
 
         $this->addImageAlias('search', 'search.png');
 
-        /**
+        /*
          * The Signature image is shown after saving an edited page. If this
          * is set to false then the "Thank you for editing..." screen will
          * be omitted.
@@ -1389,13 +1402,13 @@
 
         $this->setButtonSeparator("\n | ");
 
-        /**
+        /*
          * WikiWords can automatically be split by inserting spaces between
          * the words. The default is to leave WordsSmashedTogetherLikeSo.
          */
         $this->setAutosplitWikiWords(false);
 
-        /**
+        /*
          * Layout improvement with dangling links for mostly closed wiki's:
          * If false, only users with edit permissions will be presented the
          * special wikiunknown class with "?" and Tooltip.
@@ -1428,7 +1441,7 @@
          */
         //$this->setDateFormat("%B %d, %Y", false);
 
-        /**
+        /*
          * Custom UserPreferences:
          * A list of name => _UserPreference class pairs.
          * Rationale: Certain themes should be able to extend the predefined list
@@ -1438,7 +1451,7 @@
          */
         //$this->customUserPreference();
 
-        /**
+        /*
          * Register custom PageList type and define custom PageList classes.
          * Rationale: Certain themes should be able to extend the predefined list
          * of pagelist types. E.g. certain plugins, like MostPopular might use
@@ -1450,7 +1463,7 @@
 
     } // end of load
 
-    /**
+    /*
      * Custom UserPreferences:
      * A list of name => _UserPreference class pairs.
      * Rationale: Certain themes should be able to extend the predefined list
@@ -1468,7 +1481,8 @@
         }
     }
 
-    /** addPageListColumn(array('rating' => new _PageList_Column_rating('rating', _("Rate"))))
+    /*
+     * addPageListColumn(array('rating' => new _PageList_Column_rating('rating', _("Rate"))))
      *  Register custom PageList types for special themes, like
      *  'rating' for wikilens
      */
@@ -1638,7 +1652,8 @@
     //
     ////////////////////////////////////////////////////////////////
 
-    /**  CbUserLogin (&$request, $userid)
+    /*
+     * CbUserLogin (&$request, $userid)
      * Callback when a user logs in
      */
     function CbUserLogin(&$request, $userid)
@@ -1646,7 +1661,8 @@
         ; // do nothing
     }
 
-    /** CbNewUserEdit (&$request, $userid)
+    /*
+     * CbNewUserEdit (&$request, $userid)
      * Callback when a new user creates or edits a page
      */
     function CbNewUserEdit(&$request, $userid)
@@ -1654,7 +1670,8 @@
         ; // i.e. create homepage with Template/UserPage
     }
 
-    /** CbNewUserLogin (&$request, $userid)
+    /*
+     * CbNewUserLogin (&$request, $userid)
      * Callback when a "new user" logs in.
      *  What is new? We only record changes, not logins.
      *  Should we track user actions?
@@ -1665,7 +1682,8 @@
         ; // do nothing
     }
 
-    /** CbUserLogout (&$request, $userid)
+    /*
+     * CbUserLogout (&$request, $userid)
      * Callback when a user logs out
      */
     function CbUserLogout(&$request, $userid)
@@ -1675,16 +1693,15 @@
 
 }
 
-/**
+/*
  * A class representing a clickable "button".
  *
- * In it's simplest (default) form, a "button" is just a link associated
+ * In its simplest (default) form, a "button" is just a link associated
  * with some sort of wiki-action.
  */
 class Button extends HtmlElement
 {
-    /** Constructor
-     *
+    /**
      * @param string $text The text for the button.
      * @param string $url The url (href) for the button.
      * @param string $class The CSS class for the button.
@@ -1710,12 +1727,12 @@
 
 }
 
-/**
+/*
  * A clickable image button.
  */
 class ImageButton extends Button
 {
-    /** Constructor
+    /**
      *
      * @param $text string The text for the button.
      * @param $url string The url (href) for the button.
@@ -1743,13 +1760,12 @@
     }
 }
 
-/**
+/*
  * A class representing a form <samp>submit</samp> button.
  */
 class SubmitButton extends HtmlElement
 {
-    /** Constructor
-     *
+    /**
      * @param $text string The text for the button.
      * @param $name string The name of the form field.
      * @param $class string The CSS class for the button.
@@ -1770,13 +1786,12 @@
 
 }
 
-/**
+/*
  * A class representing an image form <samp>submit</samp> button.
  */
 class SubmitImageButton extends SubmitButton
 {
-    /** Constructor
-     *
+    /**
      * @param $text string The text for the button.
      * @param $name string The name of the form field.
      * @param $class string The CSS class for the button.
@@ -1800,7 +1815,7 @@
 
 }
 
-/**
+/*
  * A sidebar box with title and body, narrow fixed-width.
  * To represent abbrevated content of plugins, links or forms,
  * like "Getting Started", "Search", "Sarch Pagename",
@@ -1815,7 +1830,6 @@
  */
 class SidebarBox
 {
-
     function SidebarBox($title, $body)
     {
         require_once 'lib/WikiPlugin.php';
@@ -1829,7 +1843,7 @@
     }
 }
 
-/**
+/*
  * A sidebar box for plugins.
  * Any plugin may provide a box($args=false, $request=false, $basepage=false)
  * method, with the help of WikiPlugin::makeBox()

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

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

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

Revision: 9366
          http://sourceforge.net/p/phpwiki/code/9366
Author:   vargenau
Date:     2014-11-23 20:00:55 +0000 (Sun, 23 Nov 2014)
Log Message:
-----------
function getGroup is static

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

Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2014-11-23 19:58:23 UTC (rev 9365)
+++ trunk/lib/WikiGroup.php	2014-11-23 20:00:55 UTC (rev 9366)
@@ -106,7 +106,7 @@
      * @param  bool $not_current The global WikiRequest object.
      * @return object Subclass of WikiGroup selected via GROUP_METHOD.
      */
-    function getGroup($not_current = false)
+    static function getGroup($not_current = false)
     {
         switch (GROUP_METHOD) {
             case "NONE":
@@ -139,21 +139,22 @@
         return null;
     }
 
-    /** ACL PagePermissions will need those special groups based on the User status only.
-     *  translated
+    /*
+     * ACL PagePermissions will need those special groups based on the User status only.
+     * translated
      */
     function specialGroup($group)
     {
         return in_array($group, $this->specialGroups());
     }
 
-    /** untranslated */
+    /* untranslated */
     function _specialGroup($group)
     {
         return in_array($group, $this->_specialGroups());
     }
 
-    /** translated */
+    /* translated */
     function specialGroups()
     {
         return array(
@@ -167,7 +168,7 @@
             GROUP_CREATOR);
     }
 
-    /** untranslated */
+    /* untranslated */
     function _specialGroups()
     {
         return array(
@@ -334,7 +335,6 @@
 
     function getSpecialMembersOf($group)
     {
-        //$request = &$this->request;
         $all = $this->_allUsers();
         $users = array();
         switch ($group) {
@@ -369,10 +369,11 @@
             case GROUP_OWNER:
             case GROUP_CREATOR:
                 // this could get complex so just return an empty array
-                return false;
+                return array();
             default:
                 trigger_error(__sprintf("Unknown special group “%s”", $group), E_USER_WARNING);
                 return false;
+                return array();
         }
     }
 

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

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

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

Revision: 9365
          http://sourceforge.net/p/phpwiki/code/9365
Author:   vargenau
Date:     2014-11-23 19:58:23 +0000 (Sun, 23 Nov 2014)
Log Message:
-----------
Type compatibility

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

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2014-11-23 18:26:27 UTC (rev 9364)
+++ trunk/lib/WikiDB.php	2014-11-23 19:58:23 UTC (rev 9365)
@@ -102,7 +102,7 @@
         include_once("lib/WikiDB/$dbtype.php");
 
         $class = 'WikiDB_' . $dbtype;
-        return new $class ($dbparams);
+        return new $class($dbparams);
     }
 
     /**
@@ -1128,8 +1128,7 @@
      * This method find the most recent revision before a specified
      * version.
      *
-     * @param bool|int $version Find most recent revision before this version.
-     *  You can also use a WikiDB_PageRevision object to specify the $version.
+     * @param bool|int|WikiDB_PageRevision $version Find most recent revision before this version.
      *
      * @param bool $need_content
      *
@@ -1834,7 +1833,7 @@
  */
 class WikiDB_PageIterator
 {
-    function WikiDB_PageIterator(&$wikidb, &$iter, $options = false)
+    function WikiDB_PageIterator(&$wikidb, &$iter, $options = array())
     {
         $this->_iter = $iter; // a WikiDB_backend_iterator
         $this->_wikidb = &$wikidb;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9364] trunk/lib/Request.php

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

Revision: 9364
          http://sourceforge.net/p/phpwiki/code/9364
Author:   vargenau
Date:     2014-11-23 18:26:27 +0000 (Sun, 23 Nov 2014)
Log Message:
-----------
PHP Doc; add class variables

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

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2014-11-21 17:11:59 UTC (rev 9363)
+++ trunk/lib/Request.php	2014-11-23 18:26:27 UTC (rev 9364)
@@ -23,6 +23,12 @@
 class Request
 {
     public $args = array();
+    public $_validators;
+    private $_is_compressing_output;
+    public $_is_buffering_output;
+    public $_ob_get_length;
+    private $_do_chunked_output;
+    public $_finishing;
 
     function __construct()
     {
@@ -103,7 +109,7 @@
     }
 
     // Well oh well. Do we really want to pass POST params back as GET?
-    function getURLtoSelf($args = false, $exclude = array())
+    function getURLtoSelf($args = array(), $exclude = array())
     {
         $get_args = $this->args;
         if ($args)
@@ -513,11 +519,6 @@
         $this->session->set($key, $val);
     }
 
-    function deleteSessionVar($key)
-    {
-        $this->session->delete($key);
-    }
-
     function getCookieVar($key)
     {
         return $this->cookies->get($key);
@@ -684,7 +685,6 @@
         if (isset($deleted[$key])) return;
         if (defined('WIKI_XMLRPC') and WIKI_XMLRPC) return;
 
-        $vars = &$GLOBALS['HTTP_COOKIE_VARS'];
         if (!defined('COOKIE_DOMAIN'))
             @setcookie($key, '', 0);
         else
@@ -709,7 +709,7 @@
         $this->_info = $fileinfo;
     }
 
-    function getUploadedFile($postname)
+    static function getUploadedFile($postname)
     {
         global $HTTP_POST_FILES;
 
@@ -832,6 +832,9 @@
  */
 class Request_AccessLog
 {
+    public $reader;
+    public $sqliter;
+
     /**
      * @param string $logfile Log file name.
      * @param bool $do_sql
@@ -910,8 +913,10 @@
     {
         if ($external_only) { // see stdlin.php:isExternalReferrer()
             $base = SERVER_URL;
-            $blen = strlen($base);
+        } else {
+            $base = '';
         }
+        $blen = strlen($base);
         if (!empty($this->_dbi)) {
             // check same hosts in referer and request and remove them
             $ext_where = " AND LEFT(referer,$blen) <> " . $this->_dbi->quote($base)
@@ -944,7 +949,6 @@
      */
     function read_file()
     {
-        global $request;
         if ($this->logfile) $this->logfile = ACCESS_LOG; // support Request_AccessLog::read
 
         if (empty($this->reader)) // start at the beginning
@@ -1013,6 +1017,17 @@
 
 class Request_AccessLogEntry
 {
+    public $host;
+    public $ident;
+    public $user;
+    public $request;
+    public $referer;
+    public $user_agent;
+    public $duration;
+    public $request_args;
+    public $request_method;
+    public $request_uri;
+
     /**
      * The log entry will be automatically appended to the log file or
      * SQL table when the current request terminates.
@@ -1322,6 +1337,10 @@
         return $this->_mtime;
     }
 
+    /**
+     * @param Request $request
+     * @return int
+     */
     function checkConditionalRequest(&$request)
     {
         $result = max($this->_checkIfUnmodifiedSince($request),
@@ -1340,6 +1359,10 @@
         return false;
     }
 
+    /**
+     * @param Request $request
+     * @return int
+     */
     function _checkIfUnmodifiedSince(&$request)
     {
         if ($this->_mtime !== false) {
@@ -1350,6 +1373,10 @@
         return _HTTP_VAL_PASS;
     }
 
+    /**
+     * @param Request $request
+     * @return int
+     */
     function _checkIfModifiedSince(&$request)
     {
         if ($this->_mtime !== false and $request->isGetOrHead()) {
@@ -1363,6 +1390,10 @@
         return _HTTP_VAL_PASS;
     }
 
+    /**
+     * @param Request $request
+     * @return int
+     */
     function _checkIfMatch(&$request)
     {
         if ($this->_tag && ($taglist = $request->get("HTTP_IF_MATCH"))) {
@@ -1373,6 +1404,10 @@
         return _HTTP_VAL_PASS;
     }
 
+    /**
+     * @param Request $request
+     * @return int
+     */
     function _checkIfNoneMatch(&$request)
     {
         if ($this->_tag && ($taglist = $request->get("HTTP_IF_NONE_MATCH"))) {

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

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

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

Revision: 9363
          http://sourceforge.net/p/phpwiki/code/9363
Author:   vargenau
Date:     2014-11-21 17:11:59 +0000 (Fri, 21 Nov 2014)
Log Message:
-----------
Simpler message; update translations

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

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2014-11-21 16:51:08 UTC (rev 9362)
+++ trunk/lib/stdlib.php	2014-11-21 17:11:59 UTC (rev 9363)
@@ -907,7 +907,7 @@
             return $request->getArg('pagename');
         }
         assert($name[0] == '/');
-        $this->_errors[] = sprintf(_("Leading %s not allowed"), '/');
+        $this->_errors[] = _("Leading “/” not allowed");
         return substr($name, 1);
     }
 
@@ -939,14 +939,8 @@
         while ($pagename and $pagename[0] == '/')
             $pagename = substr($pagename, 1);
         if ($pagename != $orig)
-            $this->_errors[] = sprintf(_("Leading %s not allowed"), '/');
+            $this->_errors[] = _("Leading “/” not allowed");
 
-        // ";" is urlencoded, so safe from php arg-delim problems
-        /*if (strstr($pagename, ';')) {
-            $this->_warnings[] = _("';' is deprecated");
-            $pagename = str_replace(';', '', $pagename);
-        }*/
-
         // not only for SQL, also to restrict url length
         if (strlen($pagename) > MAX_PAGENAME_LENGTH) {
             $pagename = substr($pagename, 0, MAX_PAGENAME_LENGTH);

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	2014-11-21 16:51:08 UTC (rev 9362)
+++ trunk/locale/po/de.po	2014-11-21 17:11:59 UTC (rev 9363)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 11:21+0100\n"
+"POT-Creation-Date: 2014-11-21 18:10+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."
@@ -3208,7 +3208,7 @@
 msgid "Include the content of all SubPages of the current page."
 msgstr "Enthält den Inhalt alle UnterSeiten der aktuellen Seite."
 
-msgid "Upload files to the local InterWiki Upload:<filename>"
+msgid "Upload files to the local InterWiki [[Upload:filename]]"
 msgstr ""
 
 msgid "You cannot upload files."
@@ -3251,20 +3251,16 @@
 msgid "Only files with the extension %s are allowed."
 msgstr "Nur Dateien mit der Endung %s sind erlaubt."
 
-msgid ""
-"Invalid filename. File names may only contain alphanumeric characters and "
-"dot, underscore, space or dash."
-msgstr ""
-"Dateinamen dürfen nur folgende Zeichen enthalten: alphanumerische Zeichen, "
-"Punkt, Unterstrich, Leerzeichen und Bindestrich."
+msgid "Sorry but this file is too big."
+msgstr "Leider ist diese Datei zu groß."
 
+msgid "Invalid filename."
+msgstr "Ungültiger Dateiname."
+
 #, php-format
 msgid "There is already a file with name “%s” uploaded."
 msgstr "Es existiert schon eine gleichnamige, hochgeladene Datei »%s«."
 
-msgid "Sorry but this file is too big."
-msgstr "Leider ist diese Datei zu groß."
-
 msgid "File successfully uploaded."
 msgstr "Datei erfolgreich hochgeladen."
 
@@ -4572,10 +4568,8 @@
 msgid "“%s”: Bad page name: %s"
 msgstr "»%s«: Ungültiger Seitenname: %s"
 
-# z.B. führende Leerzeichen
-#, php-format
-msgid "Leading %s not allowed"
-msgstr "Führende %s nicht erlaubt"
+msgid "Leading “/” not allowed"
+msgstr "Führende »/« nicht erlaubt"
 
 msgid "White space converted to single space"
 msgstr ""
@@ -5710,10 +5704,8 @@
 msgid "Enable DoubleClick Edit"
 msgstr ""
 
-#, php-format
 msgid ""
-"Enabled makes it hard to double-click words and sentences for cut and paste. "
-"See %s."
+"Enabled makes it hard to double-click words and sentences for cut and paste."
 msgstr ""
 
 msgid "Edit Area Size"
@@ -6049,6 +6041,13 @@
 msgid "Edit this page"
 msgstr "Diese Seite bearbeiten"
 
+#~ msgid ""
+#~ "Invalid filename. File names may only contain alphanumeric characters and "
+#~ "dot, underscore, space or dash."
+#~ msgstr ""
+#~ "Dateinamen dürfen nur folgende Zeichen enthalten: alphanumerische "
+#~ "Zeichen, Punkt, Unterstrich, Leerzeichen und Bindestrich."
+
 #~ msgid "Unable to open directory “%s” for reading"
 #~ msgstr "Konnte Verzeichnis »%s« nicht zum Lesen öffnen"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2014-11-21 16:51:08 UTC (rev 9362)
+++ trunk/locale/po/es.po	2014-11-21 17:11:59 UTC (rev 9363)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 11:21+0100\n"
+"POT-Creation-Date: 2014-11-21 18:10+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -3117,7 +3117,7 @@
 msgid "Include the content of all SubPages of the current page."
 msgstr ""
 
-msgid "Upload files to the local InterWiki Upload:<filename>"
+msgid "Upload files to the local InterWiki [[Upload:filename]]"
 msgstr ""
 
 msgid "You cannot upload files."
@@ -3159,18 +3159,16 @@
 msgid "Only files with the extension %s are allowed."
 msgstr ""
 
-msgid ""
-"Invalid filename. File names may only contain alphanumeric characters and "
-"dot, underscore, space or dash."
+msgid "Sorry but this file is too big."
 msgstr ""
 
+msgid "Invalid filename."
+msgstr "Nombre de archivo inválido."
+
 #, php-format
 msgid "There is already a file with name “%s” uploaded."
 msgstr ""
 
-msgid "Sorry but this file is too big."
-msgstr ""
-
 msgid "File successfully uploaded."
 msgstr ""
 
@@ -4448,8 +4446,7 @@
 msgid "“%s”: Bad page name: %s"
 msgstr ""
 
-#, php-format
-msgid "Leading %s not allowed"
+msgid "Leading “/” not allowed"
 msgstr ""
 
 msgid "White space converted to single space"
@@ -5564,10 +5561,8 @@
 msgid "Enable DoubleClick Edit"
 msgstr ""
 
-#, php-format
 msgid ""
-"Enabled makes it hard to double-click words and sentences for cut and paste. "
-"See %s."
+"Enabled makes it hard to double-click words and sentences for cut and paste."
 msgstr ""
 
 msgid "Edit Area Size"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-11-21 16:51:08 UTC (rev 9362)
+++ trunk/locale/po/fr.po	2014-11-21 17:11:59 UTC (rev 9363)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 11:21+0100\n"
+"POT-Creation-Date: 2014-11-21 18:10+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -3156,8 +3156,8 @@
 msgid "Include the content of all SubPages of the current page."
 msgstr "Pour inclure le contenu de toutes les sous-pages de la page actuelle."
 
-msgid "Upload files to the local InterWiki Upload:<filename>"
-msgstr "Transférer les fichiers vers Upload:<filename>"
+msgid "Upload files to the local InterWiki [[Upload:filename]]"
+msgstr "Transférer les fichiers vers [[Upload:fichier]]"
 
 msgid "You cannot upload files."
 msgstr ""
@@ -3198,20 +3198,16 @@
 msgid "Only files with the extension %s are allowed."
 msgstr "Seuls les fichiers avec les extensions %s sont autorisés."
 
-msgid ""
-"Invalid filename. File names may only contain alphanumeric characters and "
-"dot, underscore, space or dash."
-msgstr ""
-"Nom de fichier incorrect. Les noms de fichiers sont formés de lettres, "
-"chiffres, points, blancs soulignés, espaces ou tirets."
+msgid "Sorry but this file is too big."
+msgstr "Désolé, mais le fichier est trop gros."
 
+msgid "Invalid filename."
+msgstr "Nom de fichier incorrect."
+
 #, php-format
 msgid "There is already a file with name “%s” uploaded."
 msgstr "Un fichier portant le nom « %s » existe déjà."
 
-msgid "Sorry but this file is too big."
-msgstr "Désolé, mais le fichier est trop gros."
-
 msgid "File successfully uploaded."
 msgstr "Fichier téléchargé avec succès."
 
@@ -4514,8 +4510,7 @@
 msgid "“%s”: Bad page name: %s"
 msgstr ""
 
-#, php-format
-msgid "Leading %s not allowed"
+msgid "Leading “/” not allowed"
 msgstr ""
 
 msgid "White space converted to single space"
@@ -5642,10 +5637,8 @@
 msgid "Enable DoubleClick Edit"
 msgstr "Autoriser la modification par double clic"
 
-#, php-format
 msgid ""
-"Enabled makes it hard to double-click words and sentences for cut and paste. "
-"See %s."
+"Enabled makes it hard to double-click words and sentences for cut and paste."
 msgstr ""
 
 msgid "Edit Area Size"
@@ -5963,6 +5956,13 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid ""
+#~ "Invalid filename. File names may only contain alphanumeric characters and "
+#~ "dot, underscore, space or dash."
+#~ msgstr ""
+#~ "Nom de fichier incorrect. Les noms de fichiers sont formés de lettres, "
+#~ "chiffres, points, blancs soulignés, espaces ou tirets."
+
 #~ msgid "Unable to open directory “%s” for reading"
 #~ msgstr "Impossible d'ouvrir le répertoire « %s » en lecture"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2014-11-21 16:51:08 UTC (rev 9362)
+++ trunk/locale/po/it.po	2014-11-21 17:11:59 UTC (rev 9363)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 11:21+0100\n"
+"POT-Creation-Date: 2014-11-21 18:10+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -3090,7 +3090,7 @@
 msgid "Include the content of all SubPages of the current page."
 msgstr ""
 
-msgid "Upload files to the local InterWiki Upload:<filename>"
+msgid "Upload files to the local InterWiki [[Upload:filename]]"
 msgstr ""
 
 msgid "You cannot upload files."
@@ -3132,18 +3132,16 @@
 msgid "Only files with the extension %s are allowed."
 msgstr ""
 
-msgid ""
-"Invalid filename. File names may only contain alphanumeric characters and "
-"dot, underscore, space or dash."
+msgid "Sorry but this file is too big."
 msgstr ""
 
+msgid "Invalid filename."
+msgstr ""
+
 #, php-format
 msgid "There is already a file with name “%s” uploaded."
 msgstr ""
 
-msgid "Sorry but this file is too big."
-msgstr ""
-
 msgid "File successfully uploaded."
 msgstr ""
 
@@ -4413,8 +4411,7 @@
 msgid "“%s”: Bad page name: %s"
 msgstr ""
 
-#, php-format
-msgid "Leading %s not allowed"
+msgid "Leading “/” not allowed"
 msgstr ""
 
 msgid "White space converted to single space"
@@ -5509,10 +5506,8 @@
 msgid "Enable DoubleClick Edit"
 msgstr ""
 
-#, php-format
 msgid ""
-"Enabled makes it hard to double-click words and sentences for cut and paste. "
-"See %s."
+"Enabled makes it hard to double-click words and sentences for cut and paste."
 msgstr ""
 
 msgid "Edit Area Size"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2014-11-21 16:51:08 UTC (rev 9362)
+++ trunk/locale/po/ja.po	2014-11-21 17:11:59 UTC (rev 9363)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 11:21+0100\n"
+"POT-Creation-Date: 2014-11-21 18:10+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3131,7 +3131,7 @@
 msgid "Include the content of all SubPages of the current page."
 msgstr ""
 
-msgid "Upload files to the local InterWiki Upload:<filename>"
+msgid "Upload files to the local InterWiki [[Upload:filename]]"
 msgstr ""
 
 msgid "You cannot upload files."
@@ -3173,18 +3173,17 @@
 msgid "Only files with the extension %s are allowed."
 msgstr ""
 
-msgid ""
-"Invalid filename. File names may only contain alphanumeric characters and "
-"dot, underscore, space or dash."
+msgid "Sorry but this file is too big."
 msgstr ""
 
+#, fuzzy
+msgid "Invalid filename."
+msgstr "インライン画像一覧"
+
 #, php-format
 msgid "There is already a file with name “%s” uploaded."
 msgstr ""
 
-msgid "Sorry but this file is too big."
-msgstr ""
-
 msgid "File successfully uploaded."
 msgstr ""
 
@@ -4551,8 +4550,7 @@
 msgid "“%s”: Bad page name: %s"
 msgstr ""
 
-#, php-format
-msgid "Leading %s not allowed"
+msgid "Leading “/” not allowed"
 msgstr ""
 
 msgid "White space converted to single space"
@@ -5680,10 +5678,8 @@
 msgid "Enable DoubleClick Edit"
 msgstr ""
 
-#, php-format
 msgid ""
-"Enabled makes it hard to double-click words and sentences for cut and paste. "
-"See %s."
+"Enabled makes it hard to double-click words and sentences for cut and paste."
 msgstr ""
 
 msgid "Edit Area Size"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2014-11-21 16:51:08 UTC (rev 9362)
+++ trunk/locale/po/nl.po	2014-11-21 17:11:59 UTC (rev 9363)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 11:21+0100\n"
+"POT-Creation-Date: 2014-11-21 18:10+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -3082,7 +3082,7 @@
 msgid "Include the content of all SubPages of the current page."
 msgstr ""
 
-msgid "Upload files to the local InterWiki Upload:<filename>"
+msgid "Upload files to the local InterWiki [[Upload:filename]]"
 msgstr ""
 
 msgid "You cannot upload files."
@@ -3124,18 +3124,16 @@
 msgid "Only files with the extension %s are allowed."
 msgstr ""
 
-msgid ""
-"Invalid filename. File names may only contain alphanumeric characters and "
-"dot, underscore, space or dash."
+msgid "Sorry but this file is too big."
 msgstr ""
 
+msgid "Invalid filename."
+msgstr ""
+
 #, php-format
 msgid "There is already a file with name “%s” uploaded."
 msgstr ""
 
-msgid "Sorry but this file is too big."
-msgstr ""
-
 msgid "File successfully uploaded."
 msgstr ""
 
@@ -4405,8 +4403,7 @@
 msgid "“%s”: Bad page name: %s"
 msgstr ""
 
-#, php-format
-msgid "Leading %s not allowed"
+msgid "Leading “/” not allowed"
 msgstr ""
 
 msgid "White space converted to single space"
@@ -5501,10 +5498,8 @@
 msgid "Enable DoubleClick Edit"
 msgstr ""
 
-#, php-format
 msgid ""
-"Enabled makes it hard to double-click words and sentences for cut and paste. "
-"See %s."
+"Enabled makes it hard to double-click words and sentences for cut and paste."
 msgstr ""
 
 msgid "Edit Area Size"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2014-11-21 16:51:08 UTC (rev 9362)
+++ trunk/locale/po/phpwiki.pot	2014-11-21 17:11:59 UTC (rev 9363)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 11:21+0100\n"
+"POT-Creation-Date: 2014-11-21 18:10+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3074,7 +3074,7 @@
 msgid "Include the content of all SubPages of the current page."
 msgstr ""
 
-msgid "Upload files to the local InterWiki Upload:<filename>"
+msgid "Upload files to the local InterWiki [[Upload:filename]]"
 msgstr ""
 
 msgid "You cannot upload files."
@@ -3116,18 +3116,16 @@
 msgid "Only files with the extension %s are allowed."
 msgstr ""
 
-msgid ""
-"Invalid filename. File names may only contain alphanumeric characters and "
-"dot, underscore, space or dash."
+msgid "Sorry but this file is too big."
 msgstr ""
 
+msgid "Invalid filename."
+msgstr ""
+
 #, php-format
 msgid "There is already a file with name “%s” uploaded."
 msgstr ""
 
-msgid "Sorry but this file is too big."
-msgstr ""
-
 msgid "File successfully uploaded."
 msgstr ""
 
@@ -4397,8 +4395,7 @@
 msgid "“%s”: Bad page name: %s"
 msgstr ""
 
-#, php-format
-msgid "Leading %s not allowed"
+msgid "Leading “/” not allowed"
 msgstr ""
 
 msgid "White space converted to single space"
@@ -5493,10 +5490,8 @@
 msgid "Enable DoubleClick Edit"
 msgstr ""
 
-#, php-format
 msgid ""
-"Enabled makes it hard to double-click words and sentences for cut and paste. "
-"See %s."
+"Enabled makes it hard to double-click words and sentences for cut and paste."
 msgstr ""
 
 msgid "Edit Area Size"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2014-11-21 16:51:08 UTC (rev 9362)
+++ trunk/locale/po/sv.po	2014-11-21 17:11:59 UTC (rev 9363)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 11:21+0100\n"
+"POT-Creation-Date: 2014-11-21 18:10+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -3075,7 +3075,7 @@
 msgid "Include the content of all SubPages of the current page."
 msgstr ""
 
-msgid "Upload files to the local InterWiki Upload:<filename>"
+msgid "Upload files to the local InterWiki [[Upload:filename]]"
 msgstr ""
 
 msgid "You cannot upload files."
@@ -3117,18 +3117,16 @@
 msgid "Only files with the extension %s are allowed."
 msgstr ""
 
-msgid ""
-"Invalid filename. File names may only contain alphanumeric characters and "
-"dot, underscore, space or dash."
+msgid "Sorry but this file is too big."
 msgstr ""
 
+msgid "Invalid filename."
+msgstr ""
+
 #, php-format
 msgid "There is already a file with name “%s” uploaded."
 msgstr ""
 
-msgid "Sorry but this file is too big."
-msgstr ""
-
 msgid "File successfully uploaded."
 msgstr ""
 
@@ -4398,8 +4396,7 @@
 msgid "“%s”: Bad page name: %s"
 msgstr ""
 
-#, php-format
-msgid "Leading %s not allowed"
+msgid "Leading “/” not allowed"
 msgstr ""
 
 msgid "White space converted to single space"
@@ -5494,10 +5491,8 @@
 msgid "Enable DoubleClick Edit"
 msgstr ""
 
-#, php-format
 msgid ""
-"Enabled makes it hard to double-click words and sentences for cut and paste. "
-"See %s."
+"Enabled makes it hard to double-click words and sentences for cut and paste."
 msgstr ""
 
 msgid "Edit Area Size"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2014-11-21 16:51:08 UTC (rev 9362)
+++ trunk/locale/po/zh.po	2014-11-21 17:11:59 UTC (rev 9363)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 11:21+0100\n"
+"POT-Creation-Date: 2014-11-21 18:10+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -3206,8 +3206,8 @@
 msgid "Include the content of all SubPages of the current page."
 msgstr "含括目前頁面所有子頁面的內容."
 
-msgid "Upload files to the local InterWiki Upload:<filename>"
-msgstr "上傳檔案到本地 InterWiki. Upload:<filename>"
+msgid "Upload files to the local InterWiki [[Upload:filename]]"
+msgstr "上傳檔案到本地 InterWiki. [[Upload:filename]]"
 
 #, fuzzy
 msgid "You cannot upload files."
@@ -3249,19 +3249,18 @@
 msgid "Only files with the extension %s are allowed."
 msgstr "副檔名 %s 不被允許."
 
-msgid ""
-"Invalid filename. File names may only contain alphanumeric characters and "
-"dot, underscore, space or dash."
-msgstr ""
+#, fuzzy
+msgid "Sorry but this file is too big."
+msgstr "抱歉,因為檔案太大了."
 
+#, fuzzy
+msgid "Invalid filename."
+msgstr "Inline 圖片"
+
 #, php-format
 msgid "There is already a file with name “%s” uploaded."
 msgstr "已經有個名為 %s 的檔案存在."
 
-#, fuzzy
-msgid "Sorry but this file is too big."
-msgstr "抱歉,因為檔案太大了."
-
 msgid "File successfully uploaded."
 msgstr "檔案已經成功地上傳."
 
@@ -4631,9 +4630,8 @@
 msgid "“%s”: Bad page name: %s"
 msgstr "“%s”: 錯誤頁面名稱: %s"
 
-#, php-format
-msgid "Leading %s not allowed"
-msgstr "前面的 %s 是不被允許的"
+msgid "Leading “/” not allowed"
+msgstr "前面的 / 是不被允許的"
 
 msgid "White space converted to single space"
 msgstr "空白空格轉換為單一空格"
@@ -5780,10 +5778,8 @@
 msgid "Enable DoubleClick Edit"
 msgstr ""
 
-#, php-format
 msgid ""
-"Enabled makes it hard to double-click words and sentences for cut and paste. "
-"See %s."
+"Enabled makes it hard to double-click words and sentences for cut and paste."
 msgstr ""
 
 msgid "Edit Area Size"

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

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

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