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

[phpwiki-checkins] SF.net SVN: phpwiki:[9438] trunk/lib/IniConfig.php

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

Revision: 9438
          http://sourceforge.net/p/phpwiki/code/9438
Author:   vargenau
Date:     2014-12-09 15:10:09 +0000 (Tue, 09 Dec 2014)
Log Message:
-----------
Remove unused

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

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2014-12-09 10:56:24 UTC (rev 9437)
+++ trunk/lib/IniConfig.php	2014-12-09 15:10:09 UTC (rev 9438)
@@ -354,9 +354,11 @@
     foreach (array('major', 'minor', 'author') as $major) {
         foreach (array('max_age', 'min_age', 'min_keep', 'keep', 'max_keep') as $max) {
             $item = strtoupper($major) . '_' . strtoupper($max);
-            if (defined($item)) $val = constant($item);
+            if (defined($item))
+                $val = constant($item);
             elseif (array_key_exists($item, $rs))
-                $val = $rs[$item]; elseif (array_key_exists($item, $rsdef))
+                $val = $rs[$item];
+            elseif (array_key_exists($item, $rsdef))
                 $val = $rsdef[$item];
             if (!isset($ExpireParams[$major]))
                 $ExpireParams[$major] = array();
@@ -570,8 +572,8 @@
 // moved from lib/config.php [1ms]
 function fixup_static_configs($file)
 {
-    global $FieldSeparator, $WikiNameRegexp, $AllActionPages;
-    global $DBParams, $LANG, $ErrorManager;
+    global $FieldSeparator, $AllActionPages;
+    global $DBParams;
     // init FileFinder to add proper include paths
     FindFile("lib/interwiki.map", true);
 
@@ -847,8 +849,7 @@
  */
 function fixup_dynamic_configs()
 {
-    global $WikiNameRegexp;
-    global $DBParams, $LANG;
+    global $LANG;
 
     if (defined('INCLUDE_PATH') and INCLUDE_PATH) {
         @ini_set('include_path', INCLUDE_PATH);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9437] trunk/lib/editpage.php

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

Revision: 9437
          http://sourceforge.net/p/phpwiki/code/9437
Author:   vargenau
Date:     2014-12-09 10:56:24 +0000 (Tue, 09 Dec 2014)
Log Message:
-----------
Add public/protected/private

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

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2014-12-08 17:29:32 UTC (rev 9436)
+++ trunk/lib/editpage.php	2014-12-09 10:56:24 UTC (rev 9437)
@@ -91,7 +91,7 @@
             header("Content-Type: text/html; charset=UTF-8");
     }
 
-    function editPage()
+    public function editPage()
     {
         $saveFailed = false;
         $tokens = &$this->tokens;
@@ -156,7 +156,7 @@
             return true;
         } elseif ($this->editaction == 'upload') {
             // run plugin UpLoad
-            $plugin = WikiPluginLoader("UpLoad");
+            $plugin = new WikiPluginLoader("UpLoad");
             $plugin->run();
             // add link to content
             ;
@@ -210,7 +210,7 @@
         return $this->output('editpage', _("Edit: %s"));
     }
 
-    function output($template, $title_fs)
+    public function output($template, $title_fs)
     {
         global $WikiTheme;
         $selected = &$this->selected;
@@ -238,7 +238,7 @@
         return true;
     }
 
-    function viewSource()
+    public function viewSource()
     {
         assert($this->isInitialEdit());
         assert($this->selected);
@@ -248,7 +248,7 @@
         return $this->output('viewsource', _("View Source: %s"));
     }
 
-    function updateLock()
+    private function updateLock()
     {
         $changed = false;
         if (!ENABLE_PAGE_PUBLIC && !ENABLE_EXTERNAL_PAGES) {
@@ -290,7 +290,7 @@
         return $changed; // lock changed.
     }
 
-    function savePage()
+    public function savePage()
     {
         $request = &$this->request;
 
@@ -379,23 +379,23 @@
         return true;
     }
 
-    function isConcurrentUpdate()
+    protected function isConcurrentUpdate()
     {
         assert($this->current->getVersion() >= $this->_currentVersion);
         return $this->current->getVersion() != $this->_currentVersion;
     }
 
-    function canEdit()
+    protected function canEdit()
     {
         return !$this->page->get('locked') || $this->user->isAdmin();
     }
 
-    function isInitialEdit()
+    protected function isInitialEdit()
     {
         return $this->_initialEdit;
     }
 
-    function isUnchanged()
+    private function isUnchanged()
     {
         $current = &$this->current;
         return $this->_content == $current->getPackedContent();
@@ -411,7 +411,7 @@
      *   ENABLE_SPAMASSASSIN:  content patterns by babycart (only php >= 4.3 for now)
      *   ENABLE_SPAMBLOCKLIST: content domain blacklist
      */
-    function isSpam()
+    private function isSpam()
     {
         $current = &$this->current;
         $request = &$this->request;
@@ -487,14 +487,14 @@
 
     /** Number of external links in the wikitext
      */
-    function numLinks(&$text)
+    private function numLinks(&$text)
     {
         return substr_count($text, "http://") + substr_count($text, "https://");
     }
 
     /** Header of the Anti Spam message
      */
-    function getSpamMessage()
+    private function getSpamMessage()
     {
         return
             HTML(HTML::h2(_("Spam Prevention")),
@@ -504,21 +504,21 @@
                 HTML::p(""));
     }
 
-    function getPreview()
+    protected function getPreview()
     {
         require_once 'lib/PageType.php';
         $this->_content = $this->getContent();
         return new TransformedText($this->page, $this->_content, $this->meta);
     }
 
-    function getConvertedPreview()
+    protected function getConvertedPreview()
     {
         require_once 'lib/PageType.php';
         $this->_content = $this->getContent();
         return new TransformedText($this->page, $this->_content, $this->meta);
     }
 
-    function getDiff()
+    private function getDiff()
     {
         require_once 'lib/diff.php';
         $html = HTML();
@@ -537,7 +537,7 @@
     }
 
     // possibly convert HTMLAREA content back to Wiki markup
-    function getContent()
+    private function getContent()
     {
         if (ENABLE_WYSIWYG) {
             // don't store everything as html
@@ -555,7 +555,7 @@
         }
     }
 
-    function getLockedMessage()
+    protected function getLockedMessage()
     {
         return
             HTML(HTML::h2(_("Page Locked")),
@@ -564,12 +564,12 @@
                 HTML::p(_("Sorry for the inconvenience.")));
     }
 
-    function isModerated()
+    private function isModerated()
     {
         return $this->page->get('moderation');
     }
 
-    function getModeratedMessage()
+    private function getModeratedMessage()
     {
         return
             HTML(HTML::h2(WikiLink(_("ModeratedPage"))),
@@ -578,7 +578,7 @@
                     WikiLink(_("UserPreferences")))));
     }
 
-    function getConflictMessage($unresolved = false)
+    protected function getConflictMessage($unresolved = false)
     {
         /*
          xgettext only knows about c/c++ line-continuation strings
@@ -608,7 +608,7 @@
                 $message);
     }
 
-    function getTextArea()
+    private function getTextArea()
     {
         $request = &$this->request;
 
@@ -636,7 +636,7 @@
             return $textarea;
     }
 
-    function getFormElements()
+    protected function getFormElements()
     {
         global $WikiTheme;
         $request = &$this->request;
@@ -746,7 +746,7 @@
         $this->request->redirect(WikiURL($this->page, array(), 'absolute_url'));
     }
 
-    function _restoreState()
+    private function _restoreState()
     {
         $request = &$this->request;
 
@@ -797,7 +797,7 @@
         return true;
     }
 
-    function _initializeState()
+    private function _initializeState()
     {
         $request = &$this->request;
         $current = &$this->current;
@@ -830,7 +830,7 @@
 class LoadFileConflictPageEditor
     extends PageEditor
 {
-    function editPage($saveFailed = true)
+    public function editPage($saveFailed = true)
     {
         $tokens = &$this->tokens;
 
@@ -905,7 +905,7 @@
         return $this->output('editpage', _("Merge and Edit: %s"));
     }
 
-    function output($template, $title_fs)
+    public function output($template, $title_fs)
     {
         $selected = &$this->selected;
         $current = &$this->current;
@@ -931,7 +931,7 @@
         return true;
     }
 
-    function getConflictMessage($unresolved = false)
+    protected function getConflictMessage($unresolved = false)
     {
         $message = HTML(HTML::p(fmt("Some of the changes could not automatically be combined.  Please look for sections beginning with “%s”, and ending with “%s”.  You will need to edit those sections by hand before you click Save.",
                 "<<<<<<<",

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9436] trunk/lib/upgrade.php

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

Revision: 9436
          http://sourceforge.net/p/phpwiki/code/9436
Author:   vargenau
Date:     2014-12-08 17:29:32 +0000 (Mon, 08 Dec 2014)
Log Message:
-----------
Do not update page if already present in theme pgsrc

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

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2014-12-08 17:28:47 UTC (rev 9435)
+++ trunk/lib/upgrade.php	2014-12-08 17:29:32 UTC (rev 9436)
@@ -163,6 +163,7 @@
         $path = $WikiTheme->file("pgsrc");
         // TBD: the call to fileSet prints a warning:
         // Notice: Unable to open directory 'themes/MonoBook/pgsrc' for reading
+        $themepgsrc = array();
         $pgsrc = new fileSet($path);
         if ($pgsrc->getFiles()) {
             echo "<h2>", sprintf(_("Check for necessary theme %s updates"),
@@ -171,6 +172,7 @@
                 if (substr($filename, -1, 1) == '~') continue;
                 if (substr($filename, -5, 5) == '.orig') continue;
                 $pagename = urldecode($filename);
+                $themepgsrc[] = $pagename;
                 $this->doPgsrcUpdate($pagename, $path, $filename);
             }
         }
@@ -198,7 +200,11 @@
                 if ($this->db_version < 1030.12200612) {
                     $this->_rename_to_help_page($pagename);
                 }
-                $this->doPgsrcUpdate($pagename, $path, $filename);
+                if (in_array($pagename, $themepgsrc)) {
+                    echo sprintf(_('%s already checked in theme pgsrc.'), $pagename).' '._('Skipped.').'<br />';
+                } else {
+                    $this->doPgsrcUpdate($pagename, $path, $filename);
+                }
             }
         }
     }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9435] trunk/lib/loadsave.php

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

Revision: 9435
          http://sourceforge.net/p/phpwiki/code/9435
Author:   vargenau
Date:     2014-12-08 17:28:47 +0000 (Mon, 08 Dec 2014)
Log Message:
-----------
Fix "Remove unused"

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

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2014-12-08 17:26:33 UTC (rev 9434)
+++ trunk/lib/loadsave.php	2014-12-08 17:28:47 UTC (rev 9435)
@@ -1268,7 +1268,7 @@
             'content' => preg_replace('/[ \t\r]*\n/', "\n",
                 chop($text))
         );
-        SavePage($request, $pageinfo, sprintf(_("plain file %s")));
+        SavePage($request, $pageinfo, sprintf(_("plain file %s"), $filename));
     }
 }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9434] trunk/wikilist.php

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

Revision: 9434
          http://sourceforge.net/p/phpwiki/code/9434
Author:   vargenau
Date:     2014-12-08 17:26:33 +0000 (Mon, 08 Dec 2014)
Log Message:
-----------
Add nodb=true for wiki upgrade

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

Modified: trunk/wikilist.php
===================================================================
--- trunk/wikilist.php	2014-12-08 17:16:56 UTC (rev 9433)
+++ trunk/wikilist.php	2014-12-08 17:26:33 UTC (rev 9434)
@@ -40,9 +40,9 @@
 
 $headers = array(
     _('Project Name'),
-    _('Project Register Time'),
-    _('Unix name'),
-    _('Public?')
+    _('Registered'),
+    _('Unix Name'),
+    _('Is Public?')
 );
 if (forge_get_config('allow_external')) {
     $headers[] = _("External?");
@@ -81,7 +81,7 @@
             echo '<td>' . $grp['is_external'] . '</td>';
         }
         echo '<td>' . $grp['members'] . '</td>';
-        echo '<td><a href="/wiki/g/' . $grp['unix_group_name'] . '/?action=upgrade">' . _("Upgrade") . '</a></td>';
+        echo '<td><a title="'._('Upgrade').' '.$grp['group_name'].'" href="/wiki/g/'.$grp['unix_group_name'].'/?action=upgrade&amp;nodb=true">'._('Upgrade').'</a></td>';
         echo '</tr>';
         $i++;
     }

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

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

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

Revision: 9433
          http://sourceforge.net/p/phpwiki/code/9433
Author:   vargenau
Date:     2014-12-08 17:16:56 +0000 (Mon, 08 Dec 2014)
Log Message:
-----------
Remove unused

Modified Paths:
--------------
    trunk/lib/loadsave.php
    trunk/lib/plugin/WikiBlog.php

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2014-12-08 17:14:15 UTC (rev 9432)
+++ trunk/lib/loadsave.php	2014-12-08 17:16:56 UTC (rev 9433)
@@ -724,7 +724,6 @@
     }
     $page_iter->free();
 
-    $attrib = false; //array('is_ascii' => 0);
     if (!empty($WikiTheme->dumped_images) and is_array($WikiTheme->dumped_images)) {
         // @mkdir("$directory/images");
         foreach ($WikiTheme->dumped_images as $img_file) {
@@ -866,7 +865,7 @@
 //
 ////////////////////////////////////////////////////////////////
 
-function SavePage(&$request, &$pageinfo, $source, $filename)
+function SavePage(&$request, &$pageinfo, $source)
 {
     static $overwite_all = false;
     $pagedata = $pageinfo['pagedata']; // Page level meta-data.
@@ -912,10 +911,8 @@
     $edit = $request->getArg('edit');
     if ($merging) {
         if (isset($edit['keep_old'])) {
-            $merging = false;
             $skip = true;
         } elseif (isset($edit['overwrite'])) {
-            $merging = false;
             $overwrite = true;
         } elseif ($current and (!$current->hasDefaultContents())
             && ($current->getPackedContent() != $content)
@@ -949,7 +946,6 @@
         $versiondata['author'] = ADMIN_USER;
         $versiondata['author_id'] = ADMIN_USER;
         $mesg->pushContent(' - ', _("New page"));
-        $isnew = true;
     } else {
         if ((!$current->hasDefaultContents())
             && ($current->getPackedContent() != $content)
@@ -978,7 +974,6 @@
                     $current->getVersion()));
             $skip = true;
         }
-        $isnew = false;
     }
 
     if (!$skip) {
@@ -1001,7 +996,6 @@
         $f = str_replace(sprintf(_("plain file %s"), ''), '', $f);
         //check if uploaded file? they pass just the content, but the file is gone
         if (@stat($f)) {
-            global $WikiTheme;
             $meb = Button(array('action' => 'loadfile',
                     'merge' => true,
                     'source' => $f),
@@ -1222,7 +1216,7 @@
  * because the sql passwords are in plaintext there. And the webserver must be able to read it.
  * Detected by Santtu Jarvi.
  */
-function LoadFile(&$request, $filename, $text = false, $mtime = false)
+function LoadFile(&$request, $filename, $text = false)
 {
     if (preg_match("/config$/", dirname($filename)) // our or other config
         and preg_match("/config.*\.ini/", basename($filename))
@@ -1233,8 +1227,6 @@
     }
     if (!is_string($text)) {
         // Read the file.
-        $stat = stat($filename);
-        $mtime = $stat[9];
         $text = implode("", file($filename));
     }
 
@@ -1244,9 +1236,6 @@
     // FIXME: basename("filewithnoslashes") seems to return garbage sometimes.
     $basename = basename("/dummy/" . $filename);
 
-    if (!$mtime)
-        $mtime = time(); // Last resort.
-
     $default_pagename = rawurldecode($basename);
     if (($parts = ParseMimeifiedPages($text))) {
         if (count($parts) > 1)
@@ -1256,8 +1245,7 @@
             // force overwrite
             if (count($parts) > 1)
                 $request->setArg('overwrite', 1);
-            SavePage($request, $pageinfo, sprintf(_("MIME file %s"),
-                $filename), $basename);
+            SavePage($request, $pageinfo, sprintf(_("MIME file %s"), $filename));
         }
         if (count($parts) > 1)
             if ($overwrite)
@@ -1267,8 +1255,7 @@
     } elseif (($pageinfo = ParseSerializedPage($text, $default_pagename,
         $request->getUser()))
     ) {
-        SavePage($request, $pageinfo, sprintf(_("Serialized file %s"),
-            $filename), $basename);
+        SavePage($request, $pageinfo, sprintf(_("Serialized file %s"), $filename));
     } else {
         // plain old file
         $user = $request->getUser();
@@ -1281,8 +1268,7 @@
             'content' => preg_replace('/[ \t\r]*\n/', "\n",
                 chop($text))
         );
-        SavePage($request, $pageinfo, sprintf(_("plain file %s"), $filename),
-            $basename);
+        SavePage($request, $pageinfo, sprintf(_("plain file %s")));
     }
 }
 
@@ -1303,7 +1289,7 @@
             continue;
         }
         longer_timeout($timeout); // longer timeout per page
-        LoadFile($request, $fn, $data, $attrib['mtime']);
+        LoadFile($request, $fn, $data);
     }
 }
 
@@ -1446,7 +1432,7 @@
  */
 function SetupWiki(&$request)
 {
-    global $GenericPages, $LANG;
+    global $GenericPages;
 
     //FIXME: This is a hack (err, "interim solution")
     // This is a bogo-bogo-login:  Login without
@@ -1456,7 +1442,6 @@
     //
     // This really needs to be cleaned up...
     // (I'm working on it.)
-    $real_user = $request->_user;
     $request->_user = new _BogoUser(ADMIN_USER);
 
     StartLoadDump($request, _("Loading up virgin wiki"));

Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php	2014-12-08 17:14:15 UTC (rev 9432)
+++ trunk/lib/plugin/WikiBlog.php	2014-12-08 17:16:56 UTC (rev 9433)
@@ -229,7 +229,7 @@
                     'pagedata' => array(),
                     'versiondata' => array('author' => $blog_meta['creator'], 'is_minor_edit' => 1),
                 );
-                SavePage($request, $pageinfo, '', '');
+                SavePage($request, $pageinfo, '');
             }
             $redirected = $prefix . $pagename . '/' . preg_replace("/T.*/", "", "$time");
             if (!$dbi->isWikiPage($redirected)) {
@@ -240,7 +240,7 @@
                     'pagedata' => array(),
                     'versiondata' => array('author' => $blog_meta['creator'], 'is_minor_edit' => 1),
                 );
-                SavePage($request, $pageinfo, '', '');
+                SavePage($request, $pageinfo, '');
             }
 
             $p = $dbi->getPage($prefix . $pagename . '/'

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9432] trunk/lib/Template.php

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

Revision: 9432
          http://sourceforge.net/p/phpwiki/code/9432
Author:   vargenau
Date:     2014-12-08 17:14:15 +0000 (Mon, 08 Dec 2014)
Log Message:
-----------
Type compatibility

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

Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2014-12-08 14:31:53 UTC (rev 9431)
+++ trunk/lib/Template.php	2014-12-08 17:14:15 UTC (rev 9432)
@@ -273,7 +273,7 @@
  * For dumping pages as html to a file.
  * Used for action=dumphtml,action=ziphtml,format=pdf,format=xml
  */
-function GeneratePageasXML($content, $title, $page_revision = false, $args = array())
+function GeneratePageasXML($content, $title, $page_revision = null, $args = array())
 {
     global $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:[9431] trunk/lib/upgrade.php

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

Revision: 9431
          http://sourceforge.net/p/phpwiki/code/9431
Author:   vargenau
Date:     2014-12-08 14:31:53 +0000 (Mon, 08 Dec 2014)
Log Message:
-----------
Indent

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

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2014-12-08 14:19:26 UTC (rev 9430)
+++ trunk/lib/upgrade.php	2014-12-08 14:31:53 UTC (rev 9431)
@@ -220,7 +220,8 @@
     private function _rename_to_help_page($pagename)
     {
         $newprefix = _("Help") . "/";
-        if (substr($pagename, 0, strlen($newprefix)) != $newprefix) return;
+        if (substr($pagename, 0, strlen($newprefix)) != $newprefix)
+            return;
         $oldname = substr($pagename, strlen($newprefix));
         $this->_rename_page_helper($oldname, $pagename);
     }
@@ -233,7 +234,8 @@
     private function installTable($table, $backend_type)
     {
         global $DBParams;
-        if (!$this->isSQL) return;
+        if (!$this->isSQL)
+            return;
         echo _("MISSING"), " ... \n";
         /*
           $schema = findFile("schemas/${backend_type}.sql");
@@ -707,8 +709,6 @@
             echo _("OK"), "<br />\n";
             flush();
         }
-
-        return;
     }
 
     /**
@@ -749,7 +749,8 @@
         $ErrorManager->pushErrorHandler(new WikiMethodCb($this, '_dbpermission_filter'));
         $this->error_caught = 0;
         $this->dbi = WikiDB::open($AdminParams);
-        if (!$this->error_caught) return true;
+        if (!$this->error_caught)
+            return true;
         // FAILED: redo our connection with the wikiuser
         $this->dbi = WikiDB::open($DBParams);
         $ErrorManager->flushPostponedErrors();
@@ -759,7 +760,8 @@
 
     private function _db_init()
     {
-        if (!$this->isSQL) return;
+        if (!$this->isSQL)
+            return;
 
         /* SQLite never needs admin params */
         $backend_type = $this->dbi->_backend->backendType();
@@ -826,7 +828,8 @@
      */
     private function _upgrade_cached_html($verbose = true)
     {
-        if (!$this->isSQL) return 0;
+        if (!$this->isSQL)
+            return 0;
         $count = 0;
         if ($this->phpwiki_version >= 1030.10) {
             if ($verbose)
@@ -865,8 +868,8 @@
      */
     private function _convert_cached_html()
     {
-        if (!$this->isSQL) return 0;
-        //if (!in_array(DATABASE_TYPE, array('SQL','ADODB'))) return;
+        if (!$this->isSQL)
+            return 0;
 
         $pages = $this->dbi->getAllPages();
         $cache =& $this->dbi->_cache;
@@ -1013,7 +1016,8 @@
         $this->_configUpdates[] = $entry;
 
         // TODO: find extra file updates
-        if (empty($this->_configUpdates)) return;
+        if (empty($this->_configUpdates))
+            return;
         foreach ($this->_configUpdates as $update) {
             $update->check();
         }
@@ -1075,11 +1079,14 @@
     private function _check_if_already_fixed()
     {
         // not yet fixed?
-        if (!isset($this->upgrade['name'])) return false;
+        if (!isset($this->upgrade['name']))
+            return false;
         // override with force?
-        if ($this->parent->request->getArg('force')) return false;
+        if ($this->parent->request->getArg('force'))
+            return false;
         // already fixed and with an ok version
-        if ($this->upgrade['name'] >= $this->fixed_with) return $this->upgrade['name'];
+        if ($this->upgrade['name'] >= $this->fixed_with)
+            return $this->upgrade['name'];
         // already fixed but with an older version. do it again.
         return false;
     }
@@ -1109,7 +1116,8 @@
 
     private function skip()
     { // not applicable
-        if (isset($this->silent_skip)) return true;
+        if (isset($this->silent_skip))
+            return true;
         echo " " . _("Skipped.") . "<br />\n";
         flush();
         return true;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9430] trunk/lib/upgrade.php

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

Revision: 9430
          http://sourceforge.net/p/phpwiki/code/9430
Author:   vargenau
Date:     2014-12-08 14:19:26 +0000 (Mon, 08 Dec 2014)
Log Message:
-----------
Add public/private; remove unused code

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

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2014-12-08 10:50:45 UTC (rev 9429)
+++ trunk/lib/upgrade.php	2014-12-08 14:19:26 UTC (rev 9430)
@@ -67,7 +67,7 @@
         $this->isSQL = $this->dbi->_backend->isSQL();
     }
 
-    function doPgsrcUpdate($pagename, $path, $filename)
+    private function doPgsrcUpdate($pagename, $path, $filename)
     {
         // don't ever update the HomePage
         if ((defined(HOME_PAGE) and ($pagename == HOME_PAGE))
@@ -117,7 +117,7 @@
         }
     }
 
-    function CheckActionPageUpdate()
+    public function CheckActionPageUpdate()
     {
         echo "<h2>", sprintf(_("Check for necessary %s updates"), _("Action Pages")), "</h2>\n";
         // 1.3.13 before we pull in all missing pages, we rename existing ones
@@ -154,7 +154,7 @@
     }
 
     // see loadsave.php for saving new pages.
-    function CheckPgsrcUpdate()
+    public function CheckPgsrcUpdate()
     {
         // Check some theme specific pgsrc files (blog, wikilens, fusionforge, custom).
         // We check theme specific pgsrc first in case the page is present in both
@@ -203,7 +203,7 @@
         }
     }
 
-    function _rename_page_helper($oldname, $pagename)
+    private function _rename_page_helper($oldname, $pagename)
     {
         echo sprintf(_("rename %s to %s"), $oldname, $pagename), " ...";
         if ($this->dbi->isWikiPage($oldname) and !$this->dbi->isWikiPage($pagename)) {
@@ -217,7 +217,7 @@
         }
     }
 
-    function _rename_to_help_page($pagename)
+    private function _rename_to_help_page($pagename)
     {
         $newprefix = _("Help") . "/";
         if (substr($pagename, 0, strlen($newprefix)) != $newprefix) return;
@@ -230,7 +230,7 @@
      *       and create it.
      * Supported: mysql and generic SQL, for ADODB and PearDB.
      */
-    function installTable($table, $backend_type)
+    private function installTable($table, $backend_type)
     {
         global $DBParams;
         if (!$this->isSQL) return;
@@ -395,7 +395,7 @@
      * jeffs-hacks database api (around 1.3.2) later:
      *   people should export/import their pages if using that old versions.
      */
-    function CheckDatabaseUpdate()
+    public function CheckDatabaseUpdate()
     {
         global $DBParams;
 
@@ -728,7 +728,7 @@
         return false;
     }
 
-    function _try_dbadmin_user($user, $passwd)
+    private function _try_dbadmin_user($user, $passwd)
     {
         global $DBParams;
         $AdminParams = $DBParams;
@@ -757,7 +757,7 @@
         return false;
     }
 
-    function _db_init()
+    private function _db_init()
     {
         if (!$this->isSQL) return;
 
@@ -822,9 +822,9 @@
      *   not into the huge serialized string.
      *
      * It is only rarelely needed: for current page only, if-not-modified,
-     * but was extracetd for every simple page iteration.
+     * but was extracted for every simple page iteration.
      */
-    function _upgrade_cached_html($verbose = true)
+    private function _upgrade_cached_html($verbose = true)
     {
         if (!$this->isSQL) return 0;
         $count = 0;
@@ -848,7 +848,7 @@
                     $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl ADD cached_html BLOB");
                 if ($verbose)
                     echo "<b>", _("CONVERTING"), "</b>", " ... ";
-                $count = _convert_cached_html();
+                $count = $this->_convert_cached_html();
                 if ($verbose)
                     echo $count, " ", _("OK"), "<br />\n";
             } else {
@@ -863,7 +863,7 @@
      * move _cached_html for all pages from pagedata into a new separate blob.
      * decoupled from action=upgrade, so that it can be used by a WikiAdminUtils button also.
      */
-    function _convert_cached_html()
+    private function _convert_cached_html()
     {
         if (!$this->isSQL) return 0;
         //if (!in_array(DATABASE_TYPE, array('SQL','ADODB'))) return;
@@ -891,7 +891,7 @@
     /**
      * upgrade to 1.3.13 link structure.
      */
-    function _upgrade_relation_links()
+    private function _upgrade_relation_links()
     {
         if ($this->phpwiki_version >= 1030.12200610 and $this->isSQL) {
             echo _("Check for relation field in link table"), " ...";
@@ -926,49 +926,11 @@
         }
     }
 
-    function CheckPluginUpdate()
-    {
-        echo "<h2>", sprintf(_("Check for necessary %s updates"),
-            _("plugin argument")), "</h2>\n";
-
-        $this->_configUpdates = array();
-        $this->_configUpdates[] = new UpgradePluginEntry
-        ($this, array('key' => 'plugin_randompage_numpages',
-            'fixed_with' => 1012.0,
-            //'header' => _("change RandomPage pages => numpages"),
-            //'notice'  =>_("found RandomPage plugin"),
-            'check_args' => array("plugin RandomPage pages",
-                "/(<\?\s*plugin\s+ RandomPage\s+)pages/",
-                "\\1numpages")));
-        $this->_configUpdates[] = new UpgradePluginEntry
-        ($this, array('key' => 'plugin_createtoc_position',
-            'fixed_with' => 1013.0,
-            //'header' => _("change CreateToc align => position"),
-            //'notice'  =>_("found CreateToc plugin"),
-            'check_args' => array("plugin CreateToc align",
-                "/(<\?\s*plugin\s+ CreateToc[^\?]+)align/",
-                "\\1position")));
-
-        if (empty($this->_configUpdates)) return;
-        foreach ($this->_configUpdates as $update) {
-            $allpages = $this->dbi->fullSearch($this->check_args[0]);
-            while ($page = $allpages->next()) {
-                $current = $page->getCurrentRevision();
-                $pagetext = $current->getPackedContent();
-                $update->check($this->check_args[1], $this->check_args[2], $pagetext, $page, $current);
-            }
-        }
-        free($allpages);
-        unset($pagetext);
-        unset($current);
-        unset($page);
-    }
-
     /**
      * preg_replace over local file.
      * Only line-orientated matches possible.
      */
-    function fixLocalFile($match, $replace, $filename)
+    public function fixLocalFile($match, $replace, $filename)
     {
         $o_filename = $filename;
         if (!file_exists($filename))
@@ -1016,7 +978,7 @@
         }
     }
 
-    function CheckConfigUpdate()
+    public function CheckConfigUpdate()
     {
         echo "<h2>", sprintf(_("Check for necessary %s updates"),
             "config.ini"), "</h2>\n";
@@ -1105,12 +1067,12 @@
     }
 
     /* needed ? */
-    function setApplicableCb($object)
+    public function setApplicableCb($object)
     {
         $this->applicable_cb =& $object;
     }
 
-    function _check_if_already_fixed()
+    private function _check_if_already_fixed()
     {
         // not yet fixed?
         if (!isset($this->upgrade['name'])) return false;
@@ -1122,7 +1084,7 @@
         return false;
     }
 
-    function pass()
+    public function pass()
     {
         // store in db no to fix again
         $this->upgrade['name'] = $this->parent->phpwiki_version;
@@ -1135,7 +1097,7 @@
         return true;
     }
 
-    function fail()
+    public function fail()
     {
         echo '<span style="color: red; font-weight: bold; ">' . _("FAILED") . "</span>";
         if (isset($this->reason))
@@ -1145,7 +1107,7 @@
         return false;
     }
 
-    function skip()
+    private function skip()
     { // not applicable
         if (isset($this->silent_skip)) return true;
         echo " " . _("Skipped.") . "<br />\n";
@@ -1153,7 +1115,7 @@
         return true;
     }
 
-    function check($args = null)
+    public function check($args = null)
     {
         if ($this->header) echo $this->header, ' ... ';
         if ($when = $this->_check_if_already_fixed()) {
@@ -1187,18 +1149,18 @@
 
 class UpgradeConfigEntry extends UpgradeEntry
 {
-    function _applicable_defined()
+    public function _applicable_defined()
     {
         return (boolean)defined($this->applicable_args[0]);
     }
 
-    function _applicable_defined_and_empty()
+    public function _applicable_defined_and_empty()
     {
         $const = $this->applicable_args[0];
         return (boolean)(defined($const) and !constant($const));
     }
 
-    function default_method($args)
+    public function default_method($args)
     {
         $match = $args[0];
         $replace = $args[1];
@@ -1206,87 +1168,6 @@
     }
 } // class UpdateConfigEntry
 
-/* This is different */
-class UpgradePluginEntry extends UpgradeEntry
-{
-
-    /**
-     * check all pages for a plugin match
-     */
-    public $silent_skip = 1;
-
-    function default_method(&$args)
-    {
-        $match = $args[0];
-        $replace = $args[1];
-        $pagetext =& $args[2];
-        $page =& $args[3];
-        $current =& $args[4];
-        if (preg_match($match, $pagetext)) {
-            echo $page->getName(), " ", $this->notice, " ... ";
-            if ($newtext = preg_replace($match, $replace, $pagetext)) {
-                $meta = $current->_data;
-                $meta['summary'] = "upgrade: " . $this->header;
-                $page->save($newtext, $current->getVersion() + 1, $meta);
-                $this->pass();
-            } else {
-                $this->fail();
-            }
-        }
-    }
-} // class UpdatePluginEntry
-
-/**
- * fix custom themes which are not in our distribution
- * this should be optional
- */
-class UpgradeThemeEntry extends UpgradeEntry
-{
-
-    function default_method(&$args)
-    {
-        $match = $args[0];
-        $replace = $args[1];
-        $template = $args[2];
-    }
-
-    function fixThemeTemplate($match, $new, $template)
-    {
-        // for all custom themes
-        $ourthemes = explode(":", "blog:Crao:default:Hawaiian:MacOSX:MonoBook:Portland:shamino_com:SpaceWiki:wikilens:Wordpress");
-        $themedir = NormalizeLocalFileName("themes");
-        $dh = opendir($themedir);
-        while ($r = readdir($dh)) {
-            if (filetype($r) == 'dir' and $r[0] != '.' and !is_array($r, $ourthemes))
-                $customthemes[] = $r;
-        }
-        $success = true;
-        $errors = '';
-        foreach ($customthemes as $customtheme) {
-            $template = FindFile("themes/$customtheme/templates/$template");
-            $do = $this->parent->fixLocalFile($match, $new, template);
-            if (!$do[0]) {
-                $success = false;
-                $errors .= $do[1] . " ";
-                echo $do[1];
-            }
-        }
-        return array($success, $errors);
-    }
-}
-
-/**
- * TODO:
- *
- * Upgrade: Base class for multipage worksteps
- * identify, validate, display options, next step
- */
-/*
-*/
-
-// TODO: At which step are we?
-// validate and do it again or go on with next step.
-
 /** entry function from lib/main.php
  */
 function DoUpgrade(&$request)
@@ -1303,8 +1184,6 @@
     @ini_set("implicit_flush", true);
     StartLoadDump($request, _("Upgrading this PhpWiki"));
     $upgrade = new Upgrade($request);
-    //if (!$request->getArg('noindex'))
-    //    CheckOldIndexUpdate($request); // index.php => config.ini to upgrade from < 1.3.10
     if (!$request->getArg('nodb')) {
         $upgrade->CheckDatabaseUpdate($request); // first check cached_html and friends
     }
@@ -1312,15 +1191,9 @@
         $upgrade->CheckPgsrcUpdate($request);
         $upgrade->CheckActionPageUpdate($request);
     }
-    // if (!$request->getArg('noplugin')) {
-        // $upgrade->CheckPluginUpdate($request);
-    // }
     if (!$request->getArg('noconfig')) {
         $upgrade->CheckConfigUpdate($request);
     }
-    // This is optional and should be linked. In EndLoadDump or PhpWikiAdministration?
-    //if ($request->getArg('theme'))
-    //      $upgrade->CheckThemeUpdate($request);
     EndLoadDump($request);
 }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9429] trunk/lib/upgrade.php

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

Revision: 9429
          http://sourceforge.net/p/phpwiki/code/9429
Author:   vargenau
Date:     2014-12-08 10:50:45 +0000 (Mon, 08 Dec 2014)
Log Message:
-----------
Allow upgrading pages with non-English locale

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

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2014-12-08 09:37:54 UTC (rev 9428)
+++ trunk/lib/upgrade.php	2014-12-08 10:50:45 UTC (rev 9429)
@@ -143,7 +143,7 @@
             if (substr($filename, -5, 5) == '.orig') continue;
             $pagename = urldecode($filename);
             if (isActionPage($pagename)) {
-                $translation = gettext($pagename);
+                $translation = __($pagename);
                 if ($translation == $pagename)
                     $this->doPgsrcUpdate($pagename, $path, $filename);
                 elseif (FindLocalizedFile('pgsrc/' . urlencode($translation), 1))
@@ -180,7 +180,12 @@
         if ($this->db_version < 1030.12200612) {
             echo "<h4>", _("rename to Help: pages"), "</h4>\n";
         }
-        $path = FindLocalizedFile(WIKI_PGSRC);
+        $translation = __("HomePage");
+        if ($translation == "HomePage") {
+            $path = FindFile(WIKI_PGSRC);
+        } else {
+            $path = FindLocalizedFile(WIKI_PGSRC);
+        }
         $pgsrc = new fileSet($path);
         // fixme: verification, ...
         foreach ($pgsrc->getFiles() as $filename) {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9428] trunk/lib/upgrade.php

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

Revision: 9428
          http://sourceforge.net/p/phpwiki/code/9428
Author:   vargenau
Date:     2014-12-08 09:37:54 +0000 (Mon, 08 Dec 2014)
Log Message:
-----------
Add class variables

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

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2014-12-05 15:00:35 UTC (rev 9427)
+++ trunk/lib/upgrade.php	2014-12-08 09:37:54 UTC (rev 9428)
@@ -51,8 +51,12 @@
 
 class Upgrade
 {
+    public $current_db_version;
+    public $error_caught;
+    public $_configUpdates;
+    public $check_args;
 
-    function Upgrade(&$request)
+    function __construct(&$request)
     {
         $this->request =& $request;
         $this->dbi =& $request->_dbi; // no reference for dbadmin ?
@@ -226,7 +230,6 @@
         global $DBParams;
         if (!$this->isSQL) return;
         echo _("MISSING"), " ... \n";
-        $backend = &$this->dbi->_backend->_dbh;
         /*
           $schema = findFile("schemas/${backend_type}.sql");
           if (!$schema) {
@@ -389,7 +392,7 @@
      */
     function CheckDatabaseUpdate()
     {
-        global $DBAuthParams, $DBParams;
+        global $DBParams;
 
         echo "<h2>", sprintf(_("Check for necessary %s updates"),
             _("database")),
@@ -722,7 +725,7 @@
 
     function _try_dbadmin_user($user, $passwd)
     {
-        global $DBParams, $DBAuthParams;
+        global $DBParams;
         $AdminParams = $DBParams;
         if (DATABASE_TYPE == 'SQL')
             $dsn = DB::parseDSN($AdminParams['dsn']);
@@ -818,7 +821,6 @@
      */
     function _upgrade_cached_html($verbose = true)
     {
-        global $DBParams;
         if (!$this->isSQL) return 0;
         $count = 0;
         if ($this->phpwiki_version >= 1030.10) {
@@ -858,7 +860,6 @@
      */
     function _convert_cached_html()
     {
-        global $DBParams;
         if (!$this->isSQL) return 0;
         //if (!in_array(DATABASE_TYPE, array('SQL','ADODB'))) return;
 
@@ -885,7 +886,7 @@
     /**
      * upgrade to 1.3.13 link structure.
      */
-    function _upgrade_relation_links($verbose = true)
+    function _upgrade_relation_links()
     {
         if ($this->phpwiki_version >= 1030.12200610 and $this->isSQL) {
             echo _("Check for relation field in link table"), " ...";
@@ -945,7 +946,7 @@
 
         if (empty($this->_configUpdates)) return;
         foreach ($this->_configUpdates as $update) {
-            $pages = $this->dbi->fullSearch($this->check_args[0]);
+            $allpages = $this->dbi->fullSearch($this->check_args[0]);
             while ($page = $allpages->next()) {
                 $current = $page->getCurrentRevision();
                 $pagetext = $current->getPackedContent();
@@ -1055,13 +1056,20 @@
 
 class UpgradeEntry
 {
+    public $applicable_cb;
+    public $header;
+    public $fixed_with;
+    public $method_cb;
+    public $check_cb;
+    public $reason;
+
     /**
      * Add an upgrade item to be checked.
      *
      * @param object $parent The parent Upgrade class to inherit the version properties
      * @param array $params
      */
-    function UpgradeEntry(&$parent, $params)
+    function __construct(&$parent, $params)
     {
         $this->parent =& $parent; // get the properties db_version
         foreach (array('key' => 'required',

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

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

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

Revision: 9427
          http://sourceforge.net/p/phpwiki/code/9427
Author:   vargenau
Date:     2014-12-05 15:00:35 +0000 (Fri, 05 Dec 2014)
Log Message:
-----------
Update translations

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

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

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

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

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

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

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

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2014-12-05 14:55:30 UTC (rev 9426)
+++ trunk/locale/po/de.po	2014-12-05 15:00:35 UTC (rev 9427)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 15:43+0100\n"
+"POT-Creation-Date: 2014-12-05 16:00+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."
@@ -4640,8 +4640,8 @@
 msgid "Check for necessary %s updates"
 msgstr ""
 
-msgid "ActionPage"
-msgstr "Aktion Seite"
+msgid "Action Pages"
+msgstr "Aktion Seiten"
 
 #, php-format
 msgid "Check for necessary theme %s updates"
@@ -6041,6 +6041,9 @@
 msgid "Edit this page"
 msgstr "Diese Seite bearbeiten"
 
+#~ msgid "ActionPage"
+#~ msgstr "Aktion Seite"
+
 #~ msgid "ZIP files of database"
 #~ msgstr "Speichern und Archivieren"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2014-12-05 14:55:30 UTC (rev 9426)
+++ trunk/locale/po/es.po	2014-12-05 15:00:35 UTC (rev 9427)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 15:43+0100\n"
+"POT-Creation-Date: 2014-12-05 16:00+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -4518,7 +4518,7 @@
 msgid "Check for necessary %s updates"
 msgstr ""
 
-msgid "ActionPage"
+msgid "Action Pages"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-12-05 14:55:30 UTC (rev 9426)
+++ trunk/locale/po/fr.po	2014-12-05 15:00:35 UTC (rev 9427)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 15:43+0100\n"
+"POT-Creation-Date: 2014-12-05 16:00+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."
@@ -4584,15 +4584,15 @@
 msgid "Check for necessary %s updates"
 msgstr "Vérification des mises à jour nécessaires pour %s"
 
-msgid "ActionPage"
-msgstr "Pages d'action"
+msgid "Action Pages"
+msgstr "les pages d'action"
 
 #, php-format
 msgid "Check for necessary theme %s updates"
 msgstr "Vérification des mises à jour nécessaires pour le thème %s"
 
 msgid "rename to Help: pages"
-msgstr ""
+msgstr "renommer les pages d'aide"
 
 #, php-format
 msgid "rename %s to %s"
@@ -5958,6 +5958,9 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid "ActionPage"
+#~ msgstr "Pages d'action"
+
 #~ msgid "ZIP files of database"
 #~ msgstr "Récupérer dans un fichier ZIP"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2014-12-05 14:55:30 UTC (rev 9426)
+++ trunk/locale/po/it.po	2014-12-05 15:00:35 UTC (rev 9427)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 15:43+0100\n"
+"POT-Creation-Date: 2014-12-05 16:00+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"
@@ -4483,7 +4483,7 @@
 msgid "Check for necessary %s updates"
 msgstr ""
 
-msgid "ActionPage"
+msgid "Action Pages"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2014-12-05 14:55:30 UTC (rev 9426)
+++ trunk/locale/po/ja.po	2014-12-05 15:00:35 UTC (rev 9427)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 15:43+0100\n"
+"POT-Creation-Date: 2014-12-05 16:00+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"
@@ -4623,7 +4623,7 @@
 msgstr ""
 
 #, fuzzy
-msgid "ActionPage"
+msgid "Action Pages"
 msgstr "操作ページ"
 
 #, php-format

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2014-12-05 14:55:30 UTC (rev 9426)
+++ trunk/locale/po/nl.po	2014-12-05 15:00:35 UTC (rev 9427)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 15:43+0100\n"
+"POT-Creation-Date: 2014-12-05 16:00+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"
@@ -4475,7 +4475,7 @@
 msgid "Check for necessary %s updates"
 msgstr ""
 
-msgid "ActionPage"
+msgid "Action Pages"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2014-12-05 14:55:30 UTC (rev 9426)
+++ trunk/locale/po/phpwiki.pot	2014-12-05 15:00:35 UTC (rev 9427)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 15:43+0100\n"
+"POT-Creation-Date: 2014-12-05 16:00+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"
@@ -4467,7 +4467,7 @@
 msgid "Check for necessary %s updates"
 msgstr ""
 
-msgid "ActionPage"
+msgid "Action Pages"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2014-12-05 14:55:30 UTC (rev 9426)
+++ trunk/locale/po/sv.po	2014-12-05 15:00:35 UTC (rev 9427)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 15:43+0100\n"
+"POT-Creation-Date: 2014-12-05 16:00+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -4468,7 +4468,7 @@
 msgid "Check for necessary %s updates"
 msgstr ""
 
-msgid "ActionPage"
+msgid "Action Pages"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2014-12-05 14:55:30 UTC (rev 9426)
+++ trunk/locale/po/zh.po	2014-12-05 15:00:35 UTC (rev 9427)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 15:43+0100\n"
+"POT-Creation-Date: 2014-12-05 16:00+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -4699,7 +4699,7 @@
 msgstr "為 page “%s” 設定 acl."
 
 #, fuzzy
-msgid "ActionPage"
+msgid "Action Pages"
 msgstr "動作頁面"
 
 #, fuzzy, php-format
@@ -6112,18 +6112,6 @@
 msgid "Edit this page"
 msgstr "編輯此頁面"
 
-#, fuzzy
-#~ msgid "Dump to directory"
-#~ msgstr "目錄 “%s”"
-
-#, fuzzy
-#~ msgid "Upgrade"
-#~ msgstr "上傳"
-
-#, fuzzy
-#~ msgid "reverse"
-#~ msgstr "重設"
-
 #~ msgid "Unable to open directory “%s” for reading"
 #~ msgstr "無法開啟目錄 “%s” 進行讀取"
 

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:[9426] trunk/lib/upgrade.php

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

Revision: 9426
          http://sourceforge.net/p/phpwiki/code/9426
Author:   vargenau
Date:     2014-12-05 14:55:30 +0000 (Fri, 05 Dec 2014)
Log Message:
-----------
ActionPage --> Action Pages

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

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2014-12-05 14:54:07 UTC (rev 9425)
+++ trunk/lib/upgrade.php	2014-12-05 14:55:30 UTC (rev 9426)
@@ -115,7 +115,7 @@
 
     function CheckActionPageUpdate()
     {
-        echo "<h2>", sprintf(_("Check for necessary %s updates"), _("ActionPage")), "</h2>\n";
+        echo "<h2>", sprintf(_("Check for necessary %s updates"), _("Action Pages")), "</h2>\n";
         // 1.3.13 before we pull in all missing pages, we rename existing ones
         $this->_rename_page_helper("_AuthInfo", "DebugAuthInfo");
         $this->_rename_page_helper("Help/_AuthInfoPlugin", "Help/DebugAuthInfoPlugin");

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

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

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

Revision: 9425
          http://sourceforge.net/p/phpwiki/code/9425
Author:   vargenau
Date:     2014-12-05 14:54:07 +0000 (Fri, 05 Dec 2014)
Log Message:
-----------
ActionPage --> Action Page

Modified Paths:
--------------
    trunk/locale/po/fr.po
    trunk/themes/MonoBook/templates/actionbar.tmpl

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-12-05 14:45:24 UTC (rev 9424)
+++ trunk/locale/po/fr.po	2014-12-05 14:54:07 UTC (rev 9425)
@@ -4582,14 +4582,14 @@
 
 #, php-format
 msgid "Check for necessary %s updates"
-msgstr ""
+msgstr "Vérification des mises à jour nécessaires pour %s"
 
 msgid "ActionPage"
-msgstr ""
+msgstr "Pages d'action"
 
 #, php-format
 msgid "Check for necessary theme %s updates"
-msgstr ""
+msgstr "Vérification des mises à jour nécessaires pour le thème %s"
 
 msgid "rename to Help: pages"
 msgstr ""

Modified: trunk/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/actionbar.tmpl	2014-12-05 14:45:24 UTC (rev 9424)
+++ trunk/themes/MonoBook/templates/actionbar.tmpl	2014-12-05 14:54:07 UTC (rev 9425)
@@ -11,7 +11,7 @@
     <?php if (!string_ends_with($pagename, '/'._("Discussion"))) { ?>
       <?php $talk = new WikiPageName('Talk:'.$pagename); ?>
       <?php echo ActionButton(array(),
-               $isActionPage ? _("ActionPage") : _("Article"), 
+               $isActionPage ? _("Action Page") : _("Article"), 
                $talk->getParent(), array('class'=>$isBrowse ? "selected" : "", 'title' => "View the page [alt-c]")) ?>
       <?php if (!$isActionPage) { ?>
         <?php if ($dbh->isWikiPage($talk->getName())) { ?>
@@ -24,7 +24,7 @@
       <?php } ?>
     <?php } else {
       $talk = new WikiPageName($pagename); ?>
-      <?php echo ActionButton(array(),$isActionPage ? _("ActionPage") : _("Article"), $talk->getParent(), array('title' => "View the page [alt-c]")) ?>
+      <?php echo ActionButton(array(),$isActionPage ? _("Action Page") : _("Article"), $talk->getParent(), array('title' => "View the page [alt-c]")) ?>
       <?php echo ActionButton(array(),_("Discussion"), $talk->getName(), array('class'=>$isBrowse ? "selected" : "")) ?>
     <?php } ?>
     <?php if (($isAdmin or mayAccessPage('edit', $pagename)) and $revision) { ?>

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

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

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

Revision: 9424
          http://sourceforge.net/p/phpwiki/code/9424
Author:   vargenau
Date:     2014-12-05 14:45:24 +0000 (Fri, 05 Dec 2014)
Log Message:
-----------
Improve translations in wiki creation and upgrade

Modified Paths:
--------------
    trunk/lib/loadsave.php
    trunk/lib/upgrade.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/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2014-12-05 13:24:38 UTC (rev 9423)
+++ trunk/lib/loadsave.php	2014-12-05 14:45:24 UTC (rev 9424)
@@ -63,33 +63,10 @@
     if (is_a($request, 'MockRequest'))
         return;
     $action = $request->getArg('action');
-    $label = '';
-    switch ($action) {
-        case 'zip':
-            $label = _("ZIP files of database");
-            break;
-        case 'dumpserial':
-            $label = _("Dump to directory");
-            break;
-        case 'upload':
-            $label = _("Upload File");
-            break;
-        case 'loadfile':
-            $label = _("Load File");
-            break;
-        case 'upgrade':
-            $label = _("Upgrade");
-            break;
-        case 'dumphtml':
-        case 'ziphtml':
-            $label = _("Dump Pages as XHTML");
-            break;
-    }
-    if ($label) $label = str_replace(" ", "_", $label);
     if ($action == 'browse') // loading virgin
         $pagelink = WikiLink(HOME_PAGE);
     else
-        $pagelink = WikiLink(new WikiPageName(_("PhpWikiAdministration"), false, $label));
+        $pagelink = WikiLink(new WikiPageName(__("PhpWikiAdministration")));
 
     // do deferred sendPageChangeNotification()
     if (!empty($request->_deferredPageChangeNotification)) {
@@ -1536,7 +1513,8 @@
     $pagename = __("InterWikiMap");
     $map = $dbi->getPage($pagename);
     $map->set('locked', true);
-    PrintXML(HTML::p(HTML::em(WikiLink($pagename)), HTML::strong(" locked")));
+    PrintXML(HTML::p(HTML::em(WikiLink($pagename)),
+                     HTML::strong(" "._("locked"))));
     EndLoadDump($request);
 }
 

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2014-12-05 13:24:38 UTC (rev 9423)
+++ trunk/lib/upgrade.php	2014-12-05 14:45:24 UTC (rev 9424)
@@ -402,8 +402,8 @@
                 return;
             }
         }
-        echo "db version: we want ", $this->current_db_version, "\n<br />";
-        echo "db version: we have ", $this->db_version, "\n<br />";
+        echo _("db version: we want "), $this->current_db_version, "\n<br />";
+        echo _("db version: we have "), $this->db_version, "\n<br />";
         if ($this->db_version >= $this->current_db_version) {
             echo _("OK"), "<br />\n";
             return;
@@ -426,7 +426,7 @@
 
         if ($this->phpwiki_version >= 1030.12200612 and $this->db_version < 1030.13) {
             if ($this->isSQL and preg_match("/(pgsql|postgres)/", $backend_type)) {
-                trigger_error("You need to upgrade to schema/psql-initialize.sql manually!",
+                trigger_error(_("You need to upgrade to schema/psql-initialize.sql manually!"),
                     E_USER_WARNING);
                 // $this->_upgrade_psql_tsearch2();
             }

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-12-05 13:24:38 UTC (rev 9423)
+++ trunk/locale/po/de.po	2014-12-05 14:45:24 UTC (rev 9424)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 14:22+0100\n"
+"POT-Creation-Date: 2014-12-05 15:43+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."
@@ -516,29 +516,6 @@
 msgid "unknown color %s ignored"
 msgstr "unbekannte Farbe %s ignoriert"
 
-msgid "ZIP files of database"
-msgstr "Speichern und Archivieren"
-
-msgid "Dump to directory"
-msgstr "Wiki Seiten als Dateien in lokales Verzeichnis speichern"
-
-msgid "Upload File"
-msgstr "Datei Hochladen"
-
-msgid "Load File"
-msgstr "Datei Laden"
-
-msgid "Upgrade"
-msgstr "Updaten"
-
-msgid "Dump Pages as XHTML"
-msgstr "Seiten als XHTML schreiben"
-
-# Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
-# must also be renamed to match what is here.
-msgid "PhpWikiAdministration"
-msgstr "PhpWikiSystemverwalten"
-
 # (Wrong Translation; sorry, but the German term for edit is NOT
 # editieren, but  e d i e r e n).
 #, php-format
@@ -605,6 +582,11 @@
 msgid "%s bytes written"
 msgstr "%s Bytes geschrieben"
 
+# Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
+# must also be renamed to match what is here.
+msgid "PhpWikiAdministration"
+msgstr "PhpWikiSystemverwalten"
+
 #, php-format
 msgid "... copied to %s"
 msgstr "... kopiert nach %s"
@@ -739,6 +721,9 @@
 msgid "Loading up virgin wiki"
 msgstr "Lade neue Seiten in das frische Wiki"
 
+msgid "locked"
+msgstr "gesperrt"
+
 msgid "No uploaded file to upload?"
 msgstr "Keine Datei zum Hochladen?"
 
@@ -1108,9 +1093,6 @@
 msgid "Locked"
 msgstr "Gesperrt"
 
-msgid "locked"
-msgstr "gesperrt"
-
 msgid "External"
 msgstr "Externe"
 
@@ -3904,9 +3886,15 @@
 msgid "Provide generic WikiForm input buttons."
 msgstr ""
 
+msgid "Load File"
+msgstr "Datei Laden"
+
 msgid "Dump Pages"
 msgstr "Seiten Schreiben"
 
+msgid "Dump Pages as XHTML"
+msgstr "Seiten als XHTML schreiben"
+
 #, php-format
 msgid "WikiForm: %s: unknown action"
 msgstr "WikiForm: %s: unbekannte Aktion"
@@ -4675,6 +4663,12 @@
 msgid "database"
 msgstr "Datenbank"
 
+msgid "db version: we want "
+msgstr ""
+
+msgid "db version: we have "
+msgstr ""
+
 msgid "Backend type: "
 msgstr "Backend Typ: "
 
@@ -4682,6 +4676,9 @@
 msgid "Check for table %s"
 msgstr "Prüfe Tabelle %s"
 
+msgid "You need to upgrade to schema/psql-initialize.sql manually!"
+msgstr ""
+
 msgid "Check for new session.sess_ip column"
 msgstr "Prüfe auf neue Spalte session.sess_ip column"
 
@@ -5841,6 +5838,9 @@
 msgid "Like Pages"
 msgstr "Ähnliche Seiten"
 
+msgid "Upload File"
+msgstr "Datei Hochladen"
+
 msgid "Wiki Admin"
 msgstr ""
 
@@ -6041,6 +6041,15 @@
 msgid "Edit this page"
 msgstr "Diese Seite bearbeiten"
 
+#~ msgid "ZIP files of database"
+#~ msgstr "Speichern und Archivieren"
+
+#~ msgid "Dump to directory"
+#~ msgstr "Wiki Seiten als Dateien in lokales Verzeichnis speichern"
+
+#~ msgid "Upgrade"
+#~ msgstr "Updaten"
+
 #~ msgid "reverse"
 #~ msgstr "umdrehen"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2014-12-05 13:24:38 UTC (rev 9423)
+++ trunk/locale/po/es.po	2014-12-05 14:45:24 UTC (rev 9424)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 14:22+0100\n"
+"POT-Creation-Date: 2014-12-05 15:43+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -510,27 +510,6 @@
 msgid "unknown color %s ignored"
 msgstr "el color desconocido %s no hizo caso"
 
-msgid "ZIP files of database"
-msgstr "Archivos del ZIP de la base de datos"
-
-msgid "Dump to directory"
-msgstr "Descarga al directorio"
-
-msgid "Upload File"
-msgstr "Archivo Del Upload"
-
-msgid "Load File"
-msgstr "Archivo De la Carga"
-
-msgid "Upgrade"
-msgstr "Mejora"
-
-msgid "Dump Pages as XHTML"
-msgstr ""
-
-msgid "PhpWikiAdministration"
-msgstr "AdministraciónDePhpWiki"
-
 #, php-format
 msgid "Edited by: %s"
 msgstr "Editar: %s"
@@ -592,6 +571,9 @@
 msgid "%s bytes written"
 msgstr "%s octetos"
 
+msgid "PhpWikiAdministration"
+msgstr "AdministraciónDePhpWiki"
+
 #, php-format
 msgid "... copied to %s"
 msgstr "... copia de [%s]"
@@ -722,6 +704,9 @@
 msgid "Loading up virgin wiki"
 msgstr "El cargar encima de wiki virginal"
 
+msgid "locked"
+msgstr "bloqueada"
+
 msgid "No uploaded file to upload?"
 msgstr "¿Ningún archivo uploaded a upload?"
 
@@ -1089,9 +1074,6 @@
 msgid "Locked"
 msgstr "Bloqueada"
 
-msgid "locked"
-msgstr "bloqueada"
-
 msgid "External"
 msgstr "Externos"
 
@@ -3799,9 +3781,15 @@
 msgid "Provide generic WikiForm input buttons."
 msgstr ""
 
+msgid "Load File"
+msgstr "Archivo De la Carga"
+
 msgid "Dump Pages"
 msgstr ""
 
+msgid "Dump Pages as XHTML"
+msgstr ""
+
 #, php-format
 msgid "WikiForm: %s: unknown action"
 msgstr ""
@@ -4553,6 +4541,12 @@
 msgid "database"
 msgstr ""
 
+msgid "db version: we want "
+msgstr ""
+
+msgid "db version: we have "
+msgstr ""
+
 msgid "Backend type: "
 msgstr ""
 
@@ -4560,6 +4554,9 @@
 msgid "Check for table %s"
 msgstr ""
 
+msgid "You need to upgrade to schema/psql-initialize.sql manually!"
+msgstr ""
+
 msgid "Check for new session.sess_ip column"
 msgstr ""
 
@@ -5686,6 +5683,9 @@
 msgid "Like Pages"
 msgstr ""
 
+msgid "Upload File"
+msgstr "Archivo Del Upload"
+
 msgid "Wiki Admin"
 msgstr "Administración de Wiki"
 
@@ -5871,6 +5871,15 @@
 msgid "Edit this page"
 msgstr "Corrija esta página"
 
+#~ msgid "ZIP files of database"
+#~ msgstr "Archivos del ZIP de la base de datos"
+
+#~ msgid "Dump to directory"
+#~ msgstr "Descarga al directorio"
+
+#~ msgid "Upgrade"
+#~ msgstr "Mejora"
+
 #~ msgid "reverse"
 #~ msgstr "invierta"
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-12-05 13:24:38 UTC (rev 9423)
+++ trunk/locale/po/fr.po	2014-12-05 14:45:24 UTC (rev 9424)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 14:22+0100\n"
+"POT-Creation-Date: 2014-12-05 15:43+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."
@@ -511,27 +511,6 @@
 msgid "unknown color %s ignored"
 msgstr "couleur %s non valable ignorée"
 
-msgid "ZIP files of database"
-msgstr "Récupérer dans un fichier ZIP"
-
-msgid "Dump to directory"
-msgstr "Récupération dans le répertoire"
-
-msgid "Upload File"
-msgstr "Déposer un fichier"
-
-msgid "Load File"
-msgstr "Importer un fichier"
-
-msgid "Upgrade"
-msgstr "Mettre à jour"
-
-msgid "Dump Pages as XHTML"
-msgstr "Exporter les pages en XHTML"
-
-msgid "PhpWikiAdministration"
-msgstr "AdministrationDePhpWiki"
-
 #, php-format
 msgid "Edited by: %s"
 msgstr "Modifié par : %s"
@@ -594,6 +573,9 @@
 msgid "%s bytes written"
 msgstr "%s octets enregistrés"
 
+msgid "PhpWikiAdministration"
+msgstr "AdministrationDePhpWiki"
+
 #, php-format
 msgid "... copied to %s"
 msgstr "... copié à %s"
@@ -723,6 +705,9 @@
 msgid "Loading up virgin wiki"
 msgstr "Chargement du nouveau wiki"
 
+msgid "locked"
+msgstr "verrouillé"
+
 msgid "No uploaded file to upload?"
 msgstr "Pas de fichier à déposer ?"
 
@@ -1089,9 +1074,6 @@
 msgid "Locked"
 msgstr "Verrouillé"
 
-msgid "locked"
-msgstr "verrouillé"
-
 msgid "External"
 msgstr "Externe"
 
@@ -3858,9 +3840,15 @@
 msgid "Provide generic WikiForm input buttons."
 msgstr ""
 
+msgid "Load File"
+msgstr "Importer un fichier"
+
 msgid "Dump Pages"
 msgstr "Récupérer les pages"
 
+msgid "Dump Pages as XHTML"
+msgstr "Exporter les pages en XHTML"
+
 #, php-format
 msgid "WikiForm: %s: unknown action"
 msgstr "FormulaireWiki : %s : action inconnue"
@@ -4619,13 +4607,22 @@
 msgid "database"
 msgstr "base de données"
 
+msgid "db version: we want "
+msgstr "Version de la base de données : on veut "
+
+msgid "db version: we have "
+msgstr "Version de la base de données : on a "
+
 msgid "Backend type: "
-msgstr ""
+msgstr "Type de backend : "
 
 #, php-format
 msgid "Check for table %s"
 msgstr "vérifie la table %s"
 
+msgid "You need to upgrade to schema/psql-initialize.sql manually!"
+msgstr "Vous devez mettre à jour schema/psql-initialize.sql à la main !"
+
 msgid "Check for new session.sess_ip column"
 msgstr "recherche une nouvelle colonne session.sess_ip"
 
@@ -4684,10 +4681,10 @@
 msgstr ""
 
 msgid "DB admin user:"
-msgstr "DB admin nom de user :"
+msgstr "Identifiant de l'administrateur de la base de données :"
 
 msgid "DB admin password:"
-msgstr "DB admin mot de passe :"
+msgstr "Mot de passe de l'administrateur de la base de données :"
 
 msgid "Check for extra page.cached_html column"
 msgstr "recherche une extra colonne page.cached_html"
@@ -5771,6 +5768,9 @@
 msgid "Like Pages"
 msgstr "Pages semblables"
 
+msgid "Upload File"
+msgstr "Déposer un fichier"
+
 msgid "Wiki Admin"
 msgstr "Administration du wiki"
 
@@ -5958,6 +5958,15 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid "ZIP files of database"
+#~ msgstr "Récupérer dans un fichier ZIP"
+
+#~ msgid "Dump to directory"
+#~ msgstr "Récupération dans le répertoire"
+
+#~ msgid "Upgrade"
+#~ msgstr "Mettre à jour"
+
 #~ msgid "reverse"
 #~ msgstr "inverser"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2014-12-05 13:24:38 UTC (rev 9423)
+++ trunk/locale/po/it.po	2014-12-05 14:45:24 UTC (rev 9424)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 14:22+0100\n"
+"POT-Creation-Date: 2014-12-05 15:43+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"
@@ -500,27 +500,6 @@
 msgid "unknown color %s ignored"
 msgstr ""
 
-msgid "ZIP files of database"
-msgstr ""
-
-msgid "Dump to directory"
-msgstr ""
-
-msgid "Upload File"
-msgstr ""
-
-msgid "Load File"
-msgstr ""
-
-msgid "Upgrade"
-msgstr ""
-
-msgid "Dump Pages as XHTML"
-msgstr ""
-
-msgid "PhpWikiAdministration"
-msgstr ""
-
 #, php-format
 msgid "Edited by: %s"
 msgstr "Modifica: %s"
@@ -583,6 +562,9 @@
 msgid "%s bytes written"
 msgstr ""
 
+msgid "PhpWikiAdministration"
+msgstr ""
+
 #, php-format
 msgid "... copied to %s"
 msgstr "... copia di %s"
@@ -711,6 +693,9 @@
 msgid "Loading up virgin wiki"
 msgstr ""
 
+msgid "locked"
+msgstr "bloccata"
+
 msgid "No uploaded file to upload?"
 msgstr ""
 
@@ -1073,9 +1058,6 @@
 msgid "Locked"
 msgstr "Bloccata"
 
-msgid "locked"
-msgstr "bloccata"
-
 msgid "External"
 msgstr "Esterni"
 
@@ -3768,9 +3750,15 @@
 msgid "Provide generic WikiForm input buttons."
 msgstr ""
 
+msgid "Load File"
+msgstr ""
+
 msgid "Dump Pages"
 msgstr ""
 
+msgid "Dump Pages as XHTML"
+msgstr ""
+
 #, php-format
 msgid "WikiForm: %s: unknown action"
 msgstr ""
@@ -4518,6 +4506,12 @@
 msgid "database"
 msgstr ""
 
+msgid "db version: we want "
+msgstr ""
+
+msgid "db version: we have "
+msgstr ""
+
 msgid "Backend type: "
 msgstr ""
 
@@ -4525,6 +4519,9 @@
 msgid "Check for table %s"
 msgstr ""
 
+msgid "You need to upgrade to schema/psql-initialize.sql manually!"
+msgstr ""
+
 msgid "Check for new session.sess_ip column"
 msgstr ""
 
@@ -5630,6 +5627,9 @@
 msgid "Like Pages"
 msgstr ""
 
+msgid "Upload File"
+msgstr ""
+
 msgid "Wiki Admin"
 msgstr "Wiki Amministrazione"
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2014-12-05 13:24:38 UTC (rev 9423)
+++ trunk/locale/po/ja.po	2014-12-05 14:45:24 UTC (rev 9424)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 14:22+0100\n"
+"POT-Creation-Date: 2014-12-05 15:43+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"
@@ -489,27 +489,6 @@
 msgid "unknown color %s ignored"
 msgstr ""
 
-msgid "ZIP files of database"
-msgstr ""
-
-msgid "Dump to directory"
-msgstr ""
-
-msgid "Upload File"
-msgstr "ファイル読込み"
-
-msgid "Load File"
-msgstr "ファイル読込み"
-
-msgid "Upgrade"
-msgstr ""
-
-msgid "Dump Pages as XHTML"
-msgstr "XHTMLで出力"
-
-msgid "PhpWikiAdministration"
-msgstr ""
-
 #, php-format
 msgid "Edited by: %s"
 msgstr "編集: %s"
@@ -570,6 +549,9 @@
 msgid "%s bytes written"
 msgstr "%s  バイト書き込みました"
 
+msgid "PhpWikiAdministration"
+msgstr ""
+
 #, php-format
 msgid "... copied to %s"
 msgstr ""
@@ -700,6 +682,9 @@
 msgid "Loading up virgin wiki"
 msgstr ""
 
+msgid "locked"
+msgstr "ロックしました"
+
 msgid "No uploaded file to upload?"
 msgstr ""
 
@@ -1073,9 +1058,6 @@
 msgid "Locked"
 msgstr "ロックしました"
 
-msgid "locked"
-msgstr "ロックしました"
-
 msgid "External"
 msgstr ""
 
@@ -3830,9 +3812,15 @@
 msgid "Provide generic WikiForm input buttons."
 msgstr ""
 
+msgid "Load File"
+msgstr "ファイル読込み"
+
 msgid "Dump Pages"
 msgstr ""
 
+msgid "Dump Pages as XHTML"
+msgstr "XHTMLで出力"
+
 #, php-format
 msgid "WikiForm: %s: unknown action"
 msgstr "WikiForm: “%s” は未知の操作です。"
@@ -4658,6 +4646,12 @@
 msgid "database"
 msgstr ""
 
+msgid "db version: we want "
+msgstr ""
+
+msgid "db version: we have "
+msgstr ""
+
 msgid "Backend type: "
 msgstr ""
 
@@ -4665,6 +4659,9 @@
 msgid "Check for table %s"
 msgstr ""
 
+msgid "You need to upgrade to schema/psql-initialize.sql manually!"
+msgstr ""
+
 msgid "Check for new session.sess_ip column"
 msgstr ""
 
@@ -5815,6 +5812,9 @@
 msgid "Like Pages"
 msgstr "ページロック"
 
+msgid "Upload File"
+msgstr "ファイル読込み"
+
 #, fuzzy
 msgid "Wiki Admin"
 msgstr "管理"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2014-12-05 13:24:38 UTC (rev 9423)
+++ trunk/locale/po/nl.po	2014-12-05 14:45:24 UTC (rev 9424)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 14:22+0100\n"
+"POT-Creation-Date: 2014-12-05 15:43+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"
@@ -493,27 +493,6 @@
 msgid "unknown color %s ignored"
 msgstr ""
 
-msgid "ZIP files of database"
-msgstr ""
-
-msgid "Dump to directory"
-msgstr ""
-
-msgid "Upload File"
-msgstr ""
-
-msgid "Load File"
-msgstr ""
-
-msgid "Upgrade"
-msgstr ""
-
-msgid "Dump Pages as XHTML"
-msgstr ""
-
-msgid "PhpWikiAdministration"
-msgstr "PhpWikiBeheer"
-
 #, php-format
 msgid "Edited by: %s"
 msgstr "Verander von: %s"
@@ -574,6 +553,9 @@
 msgid "%s bytes written"
 msgstr ""
 
+msgid "PhpWikiAdministration"
+msgstr "PhpWikiBeheer"
+
 #, php-format
 msgid "... copied to %s"
 msgstr ""
@@ -702,6 +684,9 @@
 msgid "Loading up virgin wiki"
 msgstr "Laden van maagdelijke wiki"
 
+msgid "locked"
+msgstr "låst"
+
 msgid "No uploaded file to upload?"
 msgstr ""
 
@@ -1064,9 +1049,6 @@
 msgid "Locked"
 msgstr "Låst"
 
-msgid "locked"
-msgstr "låst"
-
 msgid "External"
 msgstr ""
 
@@ -3760,9 +3742,15 @@
 msgid "Provide generic WikiForm input buttons."
 msgstr ""
 
+msgid "Load File"
+msgstr ""
+
 msgid "Dump Pages"
 msgstr ""
 
+msgid "Dump Pages as XHTML"
+msgstr ""
+
 #, php-format
 msgid "WikiForm: %s: unknown action"
 msgstr ""
@@ -4510,6 +4498,12 @@
 msgid "database"
 msgstr ""
 
+msgid "db version: we want "
+msgstr ""
+
+msgid "db version: we have "
+msgstr ""
+
 msgid "Backend type: "
 msgstr ""
 
@@ -4517,6 +4511,9 @@
 msgid "Check for table %s"
 msgstr ""
 
+msgid "You need to upgrade to schema/psql-initialize.sql manually!"
+msgstr ""
+
 msgid "Check for new session.sess_ip column"
 msgstr ""
 
@@ -5622,6 +5619,9 @@
 msgid "Like Pages"
 msgstr ""
 
+msgid "Upload File"
+msgstr ""
+
 msgid "Wiki Admin"
 msgstr "PhpWiki Beheer"
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2014-12-05 13:24:38 UTC (rev 9423)
+++ trunk/locale/po/phpwiki.pot	2014-12-05 14:45:24 UTC (rev 9424)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 14:22+0100\n"
+"POT-Creation-Date: 2014-12-05 15:43+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"
@@ -487,27 +487,6 @@
 msgid "unknown color %s ignored"
 msgstr ""
 
-msgid "ZIP files of database"
-msgstr ""
-
-msgid "Dump to directory"
-msgstr ""
-
-msgid "Upload File"
-msgstr ""
-
-msgid "Load File"
-msgstr ""
-
-msgid "Upgrade"
-msgstr ""
-
-msgid "Dump Pages as XHTML"
-msgstr ""
-
-msgid "PhpWikiAdministration"
-msgstr ""
-
 #, php-format
 msgid "Edited by: %s"
 msgstr ""
@@ -568,6 +547,9 @@
 msgid "%s bytes written"
 msgstr ""
 
+msgid "PhpWikiAdministration"
+msgstr ""
+
 #, php-format
 msgid "... copied to %s"
 msgstr ""
@@ -696,6 +678,9 @@
 msgid "Loading up virgin wiki"
 msgstr ""
 
+msgid "locked"
+msgstr ""
+
 msgid "No uploaded file to upload?"
 msgstr ""
 
@@ -1058,9 +1043,6 @@
 msgid "Locked"
 msgstr ""
 
-msgid "locked"
-msgstr ""
-
 msgid "External"
 msgstr ""
 
@@ -3752,9 +3734,15 @@
 msgid "Provide generic WikiForm input buttons."
 msgstr ""
 
+msgid "Load File"
+msgstr ""
+
 msgid "Dump Pages"
 msgstr ""
 
+msgid "Dump Pages as XHTML"
+msgstr ""
+
 #, php-format
 msgid "WikiForm: %s: unknown action"
 msgstr ""
@@ -4502,6 +4490,12 @@
 msgid "database"
 msgstr ""
 
+msgid "db version: we want "
+msgstr ""
+
+msgid "db version: we have "
+msgstr ""
+
 msgid "Backend type: "
 msgstr ""
 
@@ -4509,6 +4503,9 @@
 msgid "Check for table %s"
 msgstr ""
 
+msgid "You need to upgrade to schema/psql-initialize.sql manually!"
+msgstr ""
+
 msgid "Check for new session.sess_ip column"
 msgstr ""
 
@@ -5614,6 +5611,9 @@
 msgid "Like Pages"
 msgstr ""
 
+msgid "Upload File"
+msgstr ""
+
 msgid "Wiki Admin"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2014-12-05 13:24:38 UTC (rev 9423)
+++ trunk/locale/po/sv.po	2014-12-05 14:45:24 UTC (rev 9424)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 14:22+0100\n"
+"POT-Creation-Date: 2014-12-05 15:43+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -488,27 +488,6 @@
 msgid "unknown color %s ignored"
 msgstr ""
 
-msgid "ZIP files of database"
-msgstr ""
-
-msgid "Dump to directory"
-msgstr ""
-
-msgid "Upload File"
-msgstr ""
-
-msgid "Load File"
-msgstr ""
-
-msgid "Upgrade"
-msgstr ""
-
-msgid "Dump Pages as XHTML"
-msgstr ""
-
-msgid "PhpWikiAdministration"
-msgstr ""
-
 #, php-format
 msgid "Edited by: %s"
 msgstr ""
@@ -569,6 +548,9 @@
 msgid "%s bytes written"
 msgstr ""
 
+msgid "PhpWikiAdministration"
+msgstr ""
+
 #, php-format
 msgid "... copied to %s"
 msgstr "... kopia är %s"
@@ -697,6 +679,9 @@
 msgid "Loading up virgin wiki"
 msgstr ""
 
+msgid "locked"
+msgstr "låst"
+
 msgid "No uploaded file to upload?"
 msgstr ""
 
@@ -1059,9 +1044,6 @@
 msgid "Locked"
 msgstr "Låst"
 
-msgid "locked"
-msgstr "låst"
-
 msgid "External"
 msgstr ""
 
@@ -3753,9 +3735,15 @@
 msgid "Provide generic WikiForm input buttons."
 msgstr ""
 
+msgid "Load File"
+msgstr ""
+
 msgid "Dump Pages"
 msgstr ""
 
+msgid "Dump Pages as XHTML"
+msgstr ""
+
 #, php-format
 msgid "WikiForm: %s: unknown action"
 msgstr ""
@@ -4503,6 +4491,12 @@
 msgid "database"
 msgstr ""
 
+msgid "db version: we want "
+msgstr ""
+
+msgid "db version: we have "
+msgstr ""
+
 msgid "Backend type: "
 msgstr ""
 
@@ -4510,6 +4504,9 @@
 msgid "Check for table %s"
 msgstr ""
 
+msgid "You need to upgrade to schema/psql-initialize.sql manually!"
+msgstr ""
+
 msgid "Check for new session.sess_ip column"
 msgstr ""
 
@@ -5615,6 +5612,9 @@
 msgid "Like Pages"
 msgstr ""
 
+msgid "Upload File"
+msgstr ""
+
 msgid "Wiki Admin"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2014-12-05 13:24:38 UTC (rev 9423)
+++ trunk/locale/po/zh.po	2014-12-05 14:45:24 UTC (rev 9424)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 14:22+0100\n"
+"POT-Creation-Date: 2014-12-05 15:43+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -512,29 +512,6 @@
 msgid "unknown color %s ignored"
 msgstr ""
 
-msgid "ZIP files of database"
-msgstr ""
-
-#, fuzzy
-msgid "Dump to directory"
-msgstr "目錄 “%s”"
-
-msgid "Upload File"
-msgstr "載入檔案"
-
-msgid "Load File"
-msgstr "載入檔案"
-
-#, fuzzy
-msgid "Upgrade"
-msgstr "上傳"
-
-msgid "Dump Pages as XHTML"
-msgstr "傾印頁面為 XHTML"
-
-msgid "PhpWikiAdministration"
-msgstr ""
-
 #, php-format
 msgid "Edited by: %s"
 msgstr "由 %s 編輯"
@@ -595,6 +572,9 @@
 msgid "%s bytes written"
 msgstr "已寫入 %s bytes"
 
+msgid "PhpWikiAdministration"
+msgstr ""
+
 #, php-format
 msgid "... copied to %s"
 msgstr "... 複製到 %s"
@@ -728,6 +708,9 @@
 msgid "Loading up virgin wiki"
 msgstr "載入原始 wiki"
 
+msgid "locked"
+msgstr "被鎖定"
+
 msgid "No uploaded file to upload?"
 msgstr "沒有要上傳的檔案?"
 
@@ -1102,9 +1085,6 @@
 msgid "Locked"
 msgstr "已鎖定"
 
-msgid "locked"
-msgstr "被鎖定"
-
 #, fuzzy
 msgid "External"
 msgstr "外部連結"
@@ -3923,9 +3903,15 @@
 msgid "Provide generic WikiForm input buttons."
 msgstr ""
 
+msgid "Load File"
+msgstr "載入檔案"
+
 msgid "Dump Pages"
 msgstr "傾印頁面"
 
+msgid "Dump Pages as XHTML"
+msgstr "傾印頁面為 XHTML"
+
 #, php-format
 msgid "WikiForm: %s: unknown action"
 msgstr "WikiForm: %s: 未知的動作"
@@ -4737,6 +4723,12 @@
 msgid "database"
 msgstr "資料庫"
 
+msgid "db version: we want "
+msgstr ""
+
+msgid "db version: we have "
+msgstr ""
+
 msgid "Backend type: "
 msgstr ""
 
@@ -4744,6 +4736,9 @@
 msgid "Check for table %s"
 msgstr "為 page “%s” 設定 acl."
 
+msgid "You need to upgrade to schema/psql-initialize.sql manually!"
+msgstr ""
+
 msgid "Check for new session.sess_ip column"
 msgstr ""
 
@@ -5909,6 +5904,9 @@
 msgid "Like Pages"
 msgstr ""
 
+msgid "Upload File"
+msgstr "載入檔案"
+
 msgid "Wiki Admin"
 msgstr ""
 
@@ -6115,6 +6113,14 @@
 msgstr "編輯此頁面"
 
 #, fuzzy
+#~ msgid "Dump to directory"
+#~ msgstr "目錄 “%s”"
+
+#, fuzzy
+#~ msgid "Upgrade"
+#~ msgstr "上傳"
+
+#, fuzzy
 #~ msgid "reverse"
 #~ msgstr "重設"
 

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

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

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

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

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

Revision: 9423
          http://sourceforge.net/p/phpwiki/code/9423
Author:   vargenau
Date:     2014-12-05 13:24:38 +0000 (Fri, 05 Dec 2014)
Log Message:
-----------
Better tooltip for columns sorting

Modified Paths:
--------------
    trunk/lib/PageList.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/PageList.php
===================================================================
--- trunk/lib/PageList.php	2014-12-05 13:12:53 UTC (rev 9422)
+++ trunk/lib/PageList.php	2014-12-05 13:24:38 UTC (rev 9423)
@@ -115,29 +115,35 @@
                     'alt' => '.'));
             else
                 $noimg = HTML::raw('');
+            $reverse = false;
             if ($pagelist->sortby($colNum, 'check')) { // show icon? request or plugin arg
                 $sortby = $pagelist->sortby($colNum, 'flip_order');
                 $desc = (substr($sortby, 0, 1) == '-'); // +pagename or -pagename
                 $src = $WikiTheme->getButtonURL($desc ? 'sort_up' : 'sort_down');
-                $reverse = $desc ? _("reverse") . " " : "";
+                $reverse = $desc;
             } else {
                 // initially unsorted
                 $sortby = $pagelist->sortby($colNum, 'get');
             }
             if (!$src) {
                 $img = $noimg;
-                $reverse = "";
+                $reverse = false;
                 $img->setAttr('alt', ".");
             } else {
                 $img = HTML::img(array('src' => $src,
                     'alt' => _("Click to reverse sort order")));
             }
+            if ($reverse) {
+                $title = _("Click to sort by reverse %s");
+            } else {
+                $title = _("Click to sort by %s");
+            }
             $s = HTML::a(array('href' =>
-                    //Fixme: pass all also other GET args along. (limit is ok, p[])
+                //Fixme: pass all also other GET args along. (limit is ok, p[])
                 $request->GetURLtoSelf(array('sortby' => $sortby,
                     'id' => $pagelist->id)),
                     'class' => 'gridbutton',
-                    'title' => sprintf(_("Click to sort by %s"), $reverse . $this->_field)),
+                    'title' => sprintf($title, $this->_heading)),
                 $this->_heading,
                 $img);
         } else {

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-12-05 13:12:53 UTC (rev 9422)
+++ trunk/locale/po/de.po	2014-12-05 13:24:38 UTC (rev 9423)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 17:13+0100\n"
+"POT-Creation-Date: 2014-12-05 14:22+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."
@@ -1030,13 +1030,14 @@
 msgid "Sort by %s"
 msgstr "Sortiere nach %s"
 
-msgid "reverse"
-msgstr "umdrehen"
-
 msgid "Click to reverse sort order"
 msgstr "Klicken Sie um die Reihenfolge umzudrehen"
 
 #, php-format
+msgid "Click to sort by reverse %s"
+msgstr "Sortiere nach umdrehen %s"
+
+#, php-format
 msgid "Click to sort by %s"
 msgstr "Sortiere nach %s"
 
@@ -6040,6 +6041,9 @@
 msgid "Edit this page"
 msgstr "Diese Seite bearbeiten"
 
+#~ msgid "reverse"
+#~ msgstr "umdrehen"
+
 #~ msgid ""
 #~ "Invalid filename. File names may only contain alphanumeric characters and "
 #~ "dot, underscore, space or dash."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2014-12-05 13:12:53 UTC (rev 9422)
+++ trunk/locale/po/es.po	2014-12-05 13:24:38 UTC (rev 9423)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 17:13+0100\n"
+"POT-Creation-Date: 2014-12-05 14:22+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -1011,13 +1011,14 @@
 msgid "Sort by %s"
 msgstr "Clase por %s"
 
-msgid "reverse"
-msgstr "invierta"
-
 msgid "Click to reverse sort order"
 msgstr "Tecleo para invertir orden de la clase"
 
 #, php-format
+msgid "Click to sort by reverse %s"
+msgstr "Clase por invierta %s"
+
+#, php-format
 msgid "Click to sort by %s"
 msgstr "Clase por %s"
 
@@ -5870,6 +5871,9 @@
 msgid "Edit this page"
 msgstr "Corrija esta página"
 
+#~ msgid "reverse"
+#~ msgstr "invierta"
+
 #~ msgid "No LDAP in this PHP version"
 #~ msgstr "Ningún LDAP en esta versión de PHP"
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-12-05 13:12:53 UTC (rev 9422)
+++ trunk/locale/po/fr.po	2014-12-05 13:24:38 UTC (rev 9423)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 17:13+0100\n"
+"POT-Creation-Date: 2014-12-05 14:22+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."
@@ -1011,13 +1011,14 @@
 msgid "Sort by %s"
 msgstr "Trier par %s"
 
-msgid "reverse"
-msgstr "inverser"
-
 msgid "Click to reverse sort order"
 msgstr "Cliquez pour inverser le tri"
 
 #, php-format
+msgid "Click to sort by reverse %s"
+msgstr "Cliquez pour trier par %s inverse"
+
+#, php-format
 msgid "Click to sort by %s"
 msgstr "Cliquez pour trier par %s"
 
@@ -5957,6 +5958,9 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid "reverse"
+#~ msgstr "inverser"
+
 #~ msgid ""
 #~ "Invalid filename. File names may only contain alphanumeric characters and "
 #~ "dot, underscore, space or dash."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2014-12-05 13:12:53 UTC (rev 9422)
+++ trunk/locale/po/it.po	2014-12-05 13:24:38 UTC (rev 9423)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 17:13+0100\n"
+"POT-Creation-Date: 2014-12-05 14:22+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"
@@ -995,13 +995,14 @@
 msgid "Sort by %s"
 msgstr "Ordina per %s"
 
-msgid "reverse"
-msgstr "ritorni"
-
 msgid "Click to reverse sort order"
 msgstr ""
 
 #, php-format
+msgid "Click to sort by reverse %s"
+msgstr ""
+
+#, php-format
 msgid "Click to sort by %s"
 msgstr ""
 
@@ -5814,6 +5815,9 @@
 msgid "Edit this page"
 msgstr ""
 
+#~ msgid "reverse"
+#~ msgstr "ritorni"
+
 #~ msgid "Your home page is locked so your preferences cannot not be saved."
 #~ msgstr ""
 #~ "Questa pagina è stata bloccata dall'amministratore in modo da i vostri "

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2014-12-05 13:12:53 UTC (rev 9422)
+++ trunk/locale/po/ja.po	2014-12-05 13:24:38 UTC (rev 9423)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 17:13+0100\n"
+"POT-Creation-Date: 2014-12-05 14:22+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"
@@ -993,13 +993,14 @@
 msgid "Sort by %s"
 msgstr "%sでソートします。"
 
-msgid "reverse"
-msgstr ""
-
 msgid "Click to reverse sort order"
 msgstr ""
 
 #, fuzzy, php-format
+msgid "Click to sort by reverse %s"
+msgstr "%sでソートします。"
+
+#, fuzzy, php-format
 msgid "Click to sort by %s"
 msgstr "%sでソートします。"
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2014-12-05 13:12:53 UTC (rev 9422)
+++ trunk/locale/po/nl.po	2014-12-05 13:24:38 UTC (rev 9423)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 17:13+0100\n"
+"POT-Creation-Date: 2014-12-05 14:22+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"
@@ -986,10 +986,11 @@
 msgid "Sort by %s"
 msgstr ""
 
-msgid "reverse"
+msgid "Click to reverse sort order"
 msgstr ""
 
-msgid "Click to reverse sort order"
+#, php-format
+msgid "Click to sort by reverse %s"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2014-12-05 13:12:53 UTC (rev 9422)
+++ trunk/locale/po/phpwiki.pot	2014-12-05 13:24:38 UTC (rev 9423)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 17:13+0100\n"
+"POT-Creation-Date: 2014-12-05 14:22+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"
@@ -980,10 +980,11 @@
 msgid "Sort by %s"
 msgstr ""
 
-msgid "reverse"
+msgid "Click to reverse sort order"
 msgstr ""
 
-msgid "Click to reverse sort order"
+#, php-format
+msgid "Click to sort by reverse %s"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2014-12-05 13:12:53 UTC (rev 9422)
+++ trunk/locale/po/sv.po	2014-12-05 13:24:38 UTC (rev 9423)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 17:13+0100\n"
+"POT-Creation-Date: 2014-12-05 14:22+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -981,10 +981,11 @@
 msgid "Sort by %s"
 msgstr ""
 
-msgid "reverse"
+msgid "Click to reverse sort order"
 msgstr ""
 
-msgid "Click to reverse sort order"
+#, php-format
+msgid "Click to sort by reverse %s"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2014-12-05 13:12:53 UTC (rev 9422)
+++ trunk/locale/po/zh.po	2014-12-05 13:24:38 UTC (rev 9423)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 17:13+0100\n"
+"POT-Creation-Date: 2014-12-05 14:22+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -1023,13 +1023,13 @@
 msgid "Sort by %s"
 msgstr "以 %s 排序"
 
-#, fuzzy
-msgid "reverse"
-msgstr "重設"
-
 msgid "Click to reverse sort order"
 msgstr "點擊以反轉排列順序"
 
+#, fuzzy, php-format
+msgid "Click to sort by reverse %s"
+msgstr "點擊以 %s 排序"
+
 #, php-format
 msgid "Click to sort by %s"
 msgstr "點擊以 %s 排序"
@@ -6114,6 +6114,10 @@
 msgid "Edit this page"
 msgstr "編輯此頁面"
 
+#, fuzzy
+#~ msgid "reverse"
+#~ msgstr "重設"
+
 #~ msgid "Unable to open directory “%s” for reading"
 #~ msgstr "無法開啟目錄 “%s” 進行讀取"
 

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:[9422] trunk/lib/DbSession/SQL.php

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

Revision: 9422
          http://sourceforge.net/p/phpwiki/code/9422
Author:   vargenau
Date:     2014-12-05 13:12:53 +0000 (Fri, 05 Dec 2014)
Log Message:
-----------
Fix comment

Modified Paths:
--------------
    trunk/lib/DbSession/SQL.php

Modified: trunk/lib/DbSession/SQL.php
===================================================================
--- trunk/lib/DbSession/SQL.php	2014-12-05 12:44:18 UTC (rev 9421)
+++ trunk/lib/DbSession/SQL.php	2014-12-05 13:12:53 UTC (rev 9422)
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
- * Copyright 2005 $ThePhpWikiProgrammingTeam
+/**
+ * DB sessions for pear DB
  *
  * History
  *

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

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

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

Revision: 9421
          http://sourceforge.net/p/phpwiki/code/9421
Author:   vargenau
Date:     2014-12-05 12:44:18 +0000 (Fri, 05 Dec 2014)
Log Message:
-----------
Pr?\195?\169f?\195?\169rences de l'utilisateur --> Mes pr?\195?\169f?\195?\169rences

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

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-12-04 16:29:59 UTC (rev 9420)
+++ trunk/locale/po/fr.po	2014-12-05 12:44:18 UTC (rev 9421)
@@ -5777,7 +5777,7 @@
 msgstr "Ma page"
 
 msgid "User Preferences"
-msgstr "Préférences de l'utilisateur"
+msgstr "Mes préférences"
 
 msgid "User preferences for this project"
 msgstr "Préférences pour ce projet"

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

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

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

Revision: 9420
          http://sourceforge.net/p/phpwiki/code/9420
Author:   vargenau
Date:     2014-12-04 16:29:59 +0000 (Thu, 04 Dec 2014)
Log Message:
-----------
Type compatibility

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

Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2014-12-04 16:19:33 UTC (rev 9419)
+++ trunk/lib/WikiDB/backend.php	2014-12-04 16:29:59 UTC (rev 9420)
@@ -403,7 +403,7 @@
     /**
      * Find recent changes.
      *
-     * @param object $params hash See WikiDB::mostRecent for a description
+     * @param array $params hash See WikiDB::mostRecent for a description
      *  of parameters which can be included in this hash.
      * @return object A WikiDB_backend_iterator.
      * @see WikiDB::mostRecent

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9419] trunk/lib/PageList.php

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

Revision: 9419
          http://sourceforge.net/p/phpwiki/code/9419
Author:   vargenau
Date:     2014-12-04 16:19:33 +0000 (Thu, 04 Dec 2014)
Log Message:
-----------
private $_columns_seen --> public

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

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2014-12-04 16:12:50 UTC (rev 9418)
+++ trunk/lib/PageList.php	2014-12-04 16:19:33 UTC (rev 9419)
@@ -610,7 +610,7 @@
     public $_sortby = array();
     public $_maxlen = 0;
     private $_messageIfEmpty = '';
-    private $_columns_seen = array();
+    public $_columns_seen = array();
     private $_stack;
 
     function __construct($columns = array(), $exclude = array(), $options = 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:[9418] trunk/lib/DbSession

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

Revision: 9418
          http://sourceforge.net/p/phpwiki/code/9418
Author:   vargenau
Date:     2014-12-04 16:12:50 +0000 (Thu, 04 Dec 2014)
Log Message:
-----------
Harmonize lib/DbSession/*.php

Modified Paths:
--------------
    trunk/lib/DbSession/ADODB.php
    trunk/lib/DbSession/PDO.php
    trunk/lib/DbSession/SQL.php
    trunk/lib/DbSession/dba.php

Modified: trunk/lib/DbSession/ADODB.php
===================================================================
--- trunk/lib/DbSession/ADODB.php	2014-12-04 15:51:47 UTC (rev 9417)
+++ trunk/lib/DbSession/ADODB.php	2014-12-04 16:12:50 UTC (rev 9418)
@@ -64,6 +64,7 @@
         return $this->_dbh->Execute($sql);
     }
 
+    // adds surrounding quotes
     function quote($string)
     {
         return $this->_dbh->qstr($string);
@@ -124,11 +125,12 @@
         if (!empty($res) and preg_match('|^[a-zA-Z0-9/+=]+$|', $res))
             $res = base64_decode($res);
         if (strlen($res) > 4000) {
-            trigger_error("Overlarge session data! " . strlen($res) .
-                " gt. 4000", E_USER_WARNING);
+            // trigger_error("Overlarge session data! ".strlen($res). " gt. 4000", E_USER_WARNING);
             $res = preg_replace('/s:6:"_cache";O:12:"WikiDB_cache".+}$/', "", $res);
             $res = preg_replace('/s:12:"_cached_html";s:.+",s:4:"hits"/', 's:4:"hits"', $res);
-            if (strlen($res) > 4000) $res = '';
+            if (strlen($res) > 4000) {
+                $res = '';
+            }
         }
         return $res;
     }
@@ -232,7 +234,7 @@
         return true;
     }
 
-    // WhoIsOnline support.
+    // WhoIsOnline support
     // TODO: ip-accesstime dynamic blocking API
     function currentSessions()
     {

Modified: trunk/lib/DbSession/PDO.php
===================================================================
--- trunk/lib/DbSession/PDO.php	2014-12-04 15:51:47 UTC (rev 9417)
+++ trunk/lib/DbSession/PDO.php	2014-12-04 16:12:50 UTC (rev 9418)
@@ -1,4 +1,23 @@
 <?php
+/*
+ * Copyright 2005 $ThePhpWikiProgrammingTeam
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 /**
  * Db sessions for PDO, based on pear DB Sessions.
@@ -27,7 +46,7 @@
 
     function & _connect()
     {
-        $dbh =& $this->_dbh;
+        $dbh = &$this->_dbh;
         if (!$dbh or !is_object($dbh)) {
             global $DBParams;
             $db = new WikiDB_backend_PDO($DBParams);
@@ -42,6 +61,7 @@
         return $this->_backend->query($sql);
     }
 
+    // adds surrounding quotes
     function quote($string)
     {
         return $this->_backend->quote($string);
@@ -90,7 +110,6 @@
      */
     public function read($id)
     {
-        //$this->log("_read($id)");
         $dbh = $this->_connect();
         $table = $this->_table;
         $sth = $dbh->prepare("SELECT sess_data FROM $table WHERE sess_id=?");
@@ -105,8 +124,7 @@
             $res = base64_decode($res);
         }
         if (strlen($res) > 4000) {
-            trigger_error("Overlarge session data! " . strlen($res) .
-                " gt. 4000", E_USER_WARNING);
+            // trigger_error("Overlarge session data! ".strlen($res). " gt. 4000", E_USER_WARNING);
             $res = preg_replace('/s:6:"_cache";O:12:"WikiDB_cache".+}$/', "", $res);
             $res = preg_replace('/s:12:"_cached_html";s:.+",s:4:"hits"/', 's:4:"hits"', $res);
             if (strlen($res) > 4000) {
@@ -228,7 +246,7 @@
         return true;
     }
 
-    // WhoIsOnline support.
+    // WhoIsOnline support
     // TODO: ip-accesstime dynamic blocking API
     function currentSessions()
     {

Modified: trunk/lib/DbSession/SQL.php
===================================================================
--- trunk/lib/DbSession/SQL.php	2014-12-04 15:51:47 UTC (rev 9417)
+++ trunk/lib/DbSession/SQL.php	2014-12-04 16:12:50 UTC (rev 9418)
@@ -1,7 +1,26 @@
 <?php
+/*
+ * Copyright 2005 $ThePhpWikiProgrammingTeam
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
-/**
- * DB sessions for pear DB
+/*
+ * Copyright 2005 $ThePhpWikiProgrammingTeam
  *
  * History
  *
@@ -15,9 +34,8 @@
 {
     public $_backend_type = "SQL";
 
-    function __construct(&$dbh, $table)
+    function __construct($dbh, $table)
     {
-
         $this->_dbh = $dbh;
         $this->_table = $table;
 
@@ -106,16 +124,18 @@
         $res = $dbh->getOne("SELECT sess_data FROM $table WHERE sess_id=$qid");
 
         $this->_disconnect();
-        if (DB::isError($res) || empty($res))
+        if (DB::isError($res) || empty($res)) {
             return '';
+        }
         if (is_a($dbh, 'DB_pgsql'))
-            //if (preg_match('|^[a-zA-Z0-9/+=]+$|', $res))
             $res = base64_decode($res);
         if (strlen($res) > 4000) {
             // trigger_error("Overlarge session data! ".strlen($res). " gt. 4000", E_USER_WARNING);
             $res = preg_replace('/s:6:"_cache";O:12:"WikiDB_cache".+}$/', "", $res);
             $res = preg_replace('/s:12:"_cached_html";s:.+",s:4:"hits"/', 's:4:"hits"', $res);
-            if (strlen($res) > 4000) $res = '';
+            if (strlen($res) > 4000) {
+                $res = '';
+            }
         }
         return $res;
     }
@@ -145,7 +165,6 @@
         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($request->get('REMOTE_ADDR'));
@@ -158,7 +177,7 @@
             $sess_data = base64_encode($sess_data);
         $qdata = $dbh->quote($sess_data);
 
-        /* AffectedRows with sessions seems to be instable on certain platforms.
+        /* AffectedRows with sessions seems to be unstable on certain platforms.
          * Enable the safe and slow USE_SAFE_DBSESSION then.
          */
         if (USE_SAFE_DBSESSION) {

Modified: trunk/lib/DbSession/dba.php
===================================================================
--- trunk/lib/DbSession/dba.php	2014-12-04 15:51:47 UTC (rev 9417)
+++ trunk/lib/DbSession/dba.php	2014-12-04 16:12:50 UTC (rev 9418)
@@ -1,4 +1,23 @@
 <?php
+/*
+ * Copyright 2005 $ThePhpWikiProgrammingTeam
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 /** DBA Sessions
  *  session:
@@ -15,7 +34,7 @@
 {
     public $_backend_type = "dba";
 
-    function __construct(&$dbh, $table)
+    function __construct($dbh, $table)
     {
         $this->_dbh = $dbh;
         ini_set('session.save_handler', 'user');
@@ -63,18 +82,41 @@
         }
     }
 
-    function open($save_path, $session_name)
+    /**
+     * Opens a session.
+     *
+     * Actually this function is a fake for session_set_save_handle.
+     * @param  string  $save_path    a path to stored files
+     * @param  string  $session_name a name of the concrete file
+     * @return boolean true just a variable to notify PHP that everything
+     * is good.
+     */
+    public function open($save_path, $session_name)
     {
         $dbh = $this->_connect();
         $dbh->open();
     }
 
-    function close()
+    /**
+     * Closes a session.
+     *
+     * This function is called just after <i>write</i> call.
+     *
+     * @return boolean true just a variable to notify PHP that everything
+     * is good.
+     */
+    public function close()
     {
         $this->_disconnect();
     }
 
-    function read($id)
+    /**
+     * Reads the session data from DB.
+     *
+     * @param  string $id an id of current session
+     * @return string
+     */
+    public function read($id)
     {
         $dbh = $this->_connect();
         $result = $dbh->get($id);
@@ -84,14 +126,29 @@
         list(, , $packed) = explode(':', $result, 3);
         $this->_disconnect();
         if (strlen($packed) > 4000) {
-            trigger_error("Overlarge session data!", E_USER_WARNING);
+            // trigger_error("Overlarge session data!", E_USER_WARNING);
             $packed = '';
             //$res = preg_replace('/s:6:"_cache";O:12:"WikiDB_cache".+}$/',"",$res);
         }
         return $packed;
     }
 
-    function write($id, $sess_data)
+    /**
+     * Saves the session data into DB.
+     *
+     * Just  a  comment:       The  "write"  handler  is  not
+     * executed until after the output stream is closed. Thus,
+     * output from debugging statements in the "write" handler
+     * will  never be seen in the browser. If debugging output
+     * is  necessary, it is suggested that the debug output be
+     * written to a file instead.
+     *
+     * @param  string  $id
+     * @param  string  $sess_data
+     * @return boolean true if data saved successfully  and false
+     * otherwise.
+     */
+    public function write($id, $sess_data)
     {
         /**
          * @var WikiRequest $request
@@ -120,7 +177,13 @@
         return true;
     }
 
-    function gc($maxlifetime)
+    /**
+     * Cleans out all expired sessions.
+     *
+     * @param  int     $maxlifetime session's time to live.
+     * @return boolean true
+     */
+    public function gc($maxlifetime)
     {
         $dbh = $this->_connect();
         $threshold = time() - $maxlifetime;
@@ -134,7 +197,7 @@
         return true;
     }
 
-    // WhoIsOnline support.
+    // WhoIsOnline support
     // TODO: ip-accesstime dynamic blocking API
     function currentSessions()
     {

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

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

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

Revision: 9417
          http://sourceforge.net/p/phpwiki/code/9417
Author:   vargenau
Date:     2014-12-04 15:51:47 +0000 (Thu, 04 Dec 2014)
Log Message:
-----------
Add public

Modified Paths:
--------------
    trunk/lib/WikiDB/ADODB.php
    trunk/lib/WikiDB/PDO.php
    trunk/lib/WikiDB/SQL.php

Modified: trunk/lib/WikiDB/ADODB.php
===================================================================
--- trunk/lib/WikiDB/ADODB.php	2014-12-04 15:42:49 UTC (rev 9416)
+++ trunk/lib/WikiDB/ADODB.php	2014-12-04 15:51:47 UTC (rev 9417)
@@ -40,9 +40,9 @@
 
     /**
      * Determine whether page exists (in non-default form).
-     * @see WikiDB::isWikiPage
+     * @see WikiDB::isWikiPage for the slow generic version
      */
-    function isWikiPage($pagename)
+    public function isWikiPage($pagename)
     {
         $pagename = (string)$pagename;
         if ($pagename === '') {
@@ -70,7 +70,7 @@
 
     // ADODB handles everything as string
     // Don't add surrounding quotes '', same as in PearDB
-    function qstr($in)
+    public function qstr($in)
     {
         return $this->_backend->_dbh->addq($in);
     }
@@ -90,7 +90,7 @@
 
     // SQL result: for simple select or create/update queries
     // returns the database specific resource type
-    public function genericSqlQuery($sql, $args = false)
+    public function genericSqlQuery($sql, $args = array())
     {
         if ($args)
             $result = $this->_backend->_dbh->Execute($sql, $args);
@@ -105,7 +105,7 @@
     }
 
     // SQL iter: for simple select or create/update queries
-    // returns the generic iterator object (count,next)
+    // returns the generic iterator object (count, next)
     public function genericSqlIter($sql, $field_list = NULL)
     {
         $result = $this->genericSqlQuery($sql);

Modified: trunk/lib/WikiDB/PDO.php
===================================================================
--- trunk/lib/WikiDB/PDO.php	2014-12-04 15:42:49 UTC (rev 9416)
+++ trunk/lib/WikiDB/PDO.php	2014-12-04 15:51:47 UTC (rev 9417)
@@ -30,17 +30,17 @@
         } else {
             $backend = 'PDO';
         }
-        include_once("lib/WikiDB/backend/$backend.php");
-        $backend_class = "WikiDB_backend_$backend";
+        include_once 'lib/WikiDB/backend/' . $backend . '.php';
+        $backend_class = "WikiDB_backend_" . $backend;
         $backend = new $backend_class($dbparams);
         parent::__construct($backend, $dbparams);
     }
 
     /**
      * Determine whether page exists (in non-default form).
-     * @see WikiDB::isWikiPage
+     * @see WikiDB::isWikiPage for the slow generic version
      */
-    function isWikiPage($pagename)
+    public function isWikiPage($pagename)
     {
         $pagename = (string)$pagename;
         if ($pagename === '') {
@@ -69,7 +69,7 @@
 
     // Don't add surrounding quotes '', same as in PearDB
     // PDO-0.2.1 added now ::quote()
-    function qstr($in)
+    public function qstr($in)
     {
         $in = str_replace(array('\\', "\0"), array('\\\\', "\\\0"), $in);
         return str_replace("'", "\'", $in);

Modified: trunk/lib/WikiDB/SQL.php
===================================================================
--- trunk/lib/WikiDB/SQL.php	2014-12-04 15:42:49 UTC (rev 9416)
+++ trunk/lib/WikiDB/SQL.php	2014-12-04 15:51:47 UTC (rev 9417)
@@ -23,7 +23,7 @@
         parent::__construct($backend, $dbparams);
     }
 
-    static function view_dsn($dsn = false)
+    public static function view_dsn($dsn = false)
     {
         if (!$dsn)
             $dsninfo = DB::parseDSN($GLOBALS['DBParams']['dsn']);
@@ -41,7 +41,7 @@
      * Determine whether page exists (in non-default form).
      * @see WikiDB::isWikiPage for the slow generic version
      */
-    function isWikiPage($pagename)
+    public function isWikiPage($pagename)
     {
         $pagename = (string)$pagename;
         if ($pagename === '') {
@@ -60,7 +60,7 @@
     }
 
     // no surrounding quotes because we know it's a string
-    function qstr($s)
+    public function qstr($s)
     {
         return $this->_backend->_dbh->escapeSimple($s);
     }
@@ -80,7 +80,7 @@
 
     // SQL result: for simple select or create/update queries
     // returns the database specific resource type
-    public function genericSqlQuery($sql, $args = false)
+    public function genericSqlQuery($sql, $args = array())
     {
         if ($args)
             $result = $this->_backend->_dbh->query($sql, $args);
@@ -96,7 +96,7 @@
     }
 
     // SQL iter: for simple select or create/update queries
-    // returns the generic iterator object (count,next)
+    // returns the generic iterator object (count, next)
     public function genericSqlIter($sql, $field_list = NULL)
     {
         $result = $this->genericSqlQuery($sql);

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

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

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

Revision: 9416
          http://sourceforge.net/p/phpwiki/code/9416
Author:   vargenau
Date:     2014-12-04 15:42:49 +0000 (Thu, 04 Dec 2014)
Log Message:
-----------
Add public

Modified Paths:
--------------
    trunk/lib/WikiDB/ADODB.php
    trunk/lib/WikiDB/PDO.php
    trunk/lib/WikiDB/SQL.php
    trunk/lib/WikiDB.php
    trunk/lib/plugin/UnfoldSubpages.php

Modified: trunk/lib/WikiDB/ADODB.php
===================================================================
--- trunk/lib/WikiDB/ADODB.php	2014-12-04 13:41:43 UTC (rev 9415)
+++ trunk/lib/WikiDB/ADODB.php	2014-12-04 15:42:49 UTC (rev 9416)
@@ -55,7 +55,7 @@
     }
 
     // add surrounding quotes '' if string
-    function quote($in)
+    public function quote($in)
     {
         if (is_int($in) || is_double($in)) {
             return $in;
@@ -75,7 +75,7 @@
         return $this->_backend->_dbh->addq($in);
     }
 
-    function isOpen()
+    public function isOpen()
     {
         /**
          * @var WikiRequest $request
@@ -90,7 +90,7 @@
 
     // SQL result: for simple select or create/update queries
     // returns the database specific resource type
-    function genericSqlQuery($sql, $args = false)
+    public function genericSqlQuery($sql, $args = false)
     {
         if ($args)
             $result = $this->_backend->_dbh->Execute($sql, $args);
@@ -106,7 +106,7 @@
 
     // SQL iter: for simple select or create/update queries
     // returns the generic iterator object (count,next)
-    function genericSqlIter($sql, $field_list = NULL)
+    public function genericSqlIter($sql, $field_list = NULL)
     {
         $result = $this->genericSqlQuery($sql);
         return new WikiDB_backend_ADODB_generic_iter($this->_backend, $result, $field_list);

Modified: trunk/lib/WikiDB/PDO.php
===================================================================
--- trunk/lib/WikiDB/PDO.php	2014-12-04 13:41:43 UTC (rev 9415)
+++ trunk/lib/WikiDB/PDO.php	2014-12-04 15:42:49 UTC (rev 9416)
@@ -54,7 +54,7 @@
 
     // With PDO we should really use native quoting using prepared statements with ?
     // Add surrounding quotes '' if string
-    function quote($in)
+    public function quote($in)
     {
         if (is_int($in) || is_double($in)) {
             return $in;
@@ -75,7 +75,7 @@
         return str_replace("'", "\'", $in);
     }
 
-    function isOpen()
+    public function isOpen()
     {
         /**
          * @var WikiRequest $request
@@ -90,7 +90,7 @@
 
     // SQL result: for simple select or create/update queries
     // returns the database specific resource type
-    function genericSqlQuery($sql, $args = array())
+    public function genericSqlQuery($sql, $args = array())
     {
         try {
             $sth = $this->_backend->_dbh->prepare($sql);
@@ -112,7 +112,7 @@
 
     // SQL iter: for simple select or create/update queries
     // returns the generic iterator object (count, next)
-    function genericSqlIter($sql, $field_list = NULL)
+    public function genericSqlIter($sql, $field_list = NULL)
     {
         $result = $this->genericSqlQuery($sql);
         return new WikiDB_backend_PDO_generic_iter($this->_backend, $result, $field_list);

Modified: trunk/lib/WikiDB/SQL.php
===================================================================
--- trunk/lib/WikiDB/SQL.php	2014-12-04 13:41:43 UTC (rev 9415)
+++ trunk/lib/WikiDB/SQL.php	2014-12-04 15:42:49 UTC (rev 9416)
@@ -54,7 +54,7 @@
     }
 
     // adds surrounding quotes
-    function quote($s)
+    public function quote($s)
     {
         return $this->_backend->_dbh->quoteSmart($s);
     }
@@ -65,7 +65,7 @@
         return $this->_backend->_dbh->escapeSimple($s);
     }
 
-    function isOpen()
+    public function isOpen()
     {
         /**
          * @var WikiRequest $request
@@ -80,7 +80,7 @@
 
     // SQL result: for simple select or create/update queries
     // returns the database specific resource type
-    function genericSqlQuery($sql, $args = false)
+    public function genericSqlQuery($sql, $args = false)
     {
         if ($args)
             $result = $this->_backend->_dbh->query($sql, $args);
@@ -97,7 +97,7 @@
 
     // SQL iter: for simple select or create/update queries
     // returns the generic iterator object (count,next)
-    function genericSqlIter($sql, $field_list = NULL)
+    public function genericSqlIter($sql, $field_list = NULL)
     {
         $result = $this->genericSqlQuery($sql);
         return new WikiDB_backend_PearDB_generic_iter($this->_backend, $result);

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2014-12-04 13:41:43 UTC (rev 9415)
+++ trunk/lib/WikiDB.php	2014-12-04 15:42:49 UTC (rev 9416)
@@ -596,7 +596,7 @@
      * int to get a timestamp, or you can use the string value
      * as a good hash for the entire database.
      */
-    function getTimestamp()
+    public function getTimestamp()
     {
         $ts = $this->get('_timestamp');
         return sprintf("%d %d", $ts[0], $ts[1]);
@@ -605,7 +605,7 @@
     /**
      * Update the database timestamp.
      */
-    function touch()
+    public function touch()
     {
         $ts = $this->get('_timestamp');
         $this->set('_timestamp', array(time(), $ts[1] + 1));
@@ -614,12 +614,12 @@
     /**
      * Roughly similar to the float in phpwiki_version(). Set by action=upgrade.
      */
-    function get_db_version()
+    public function get_db_version()
     {
         return (float)$this->get('_db_version');
     }
 
-    function set_db_version($ver)
+    public function set_db_version($ver)
     {
         $this->set('_db_version', (float)$ver);
     }
@@ -693,7 +693,7 @@
 
     // SQL result: for simple select or create/update queries
     // returns the database specific resource type
-    function genericSqlQuery($sql, $args = false)
+    public function genericSqlQuery($sql, $args = false)
     {
         echo "<pre>";
         printSimpleTrace(debug_backtrace());
@@ -704,7 +704,7 @@
 
     // SQL iter: for simple select or create/update queries
     // returns the generic iterator object (count,next)
-    function genericSqlIter($sql, $field_list = NULL)
+    public function genericSqlIter($sql, $field_list = NULL)
     {
         echo "<pre>";
         printSimpleTrace(debug_backtrace());
@@ -715,18 +715,18 @@
 
     // see backend upstream methods
     // ADODB adds surrounding quotes, SQL not yet!
-    function quote($s)
+    public function quote($s)
     {
         return $s;
     }
 
-    function isOpen()
+    public function isOpen()
     {
         return false; /* so far only needed for sql so false it.
                          later we have to check dba also */
     }
 
-    function getParam($param)
+    public function getParam($param)
     {
         global $DBParams;
         if (isset($DBParams[$param]))
@@ -737,7 +737,7 @@
             return false;
     }
 
-    function getAuthParam($param)
+    public function getAuthParam($param)
     {
         global $DBAuthParams;
         if (isset($DBAuthParams[$param]))
@@ -797,7 +797,7 @@
     // To reduce the memory footprint for larger sets of pagelists,
     // we don't cache the content (only true or false) and
     // we purge the pagedata (_cached_html) also
-    function exists()
+    public function exists()
     {
         if (isset($this->_wikidb->_cache->_id_cache[$this->_pagename])) return true;
         $current = $this->getCurrentRevision(false);
@@ -868,7 +868,7 @@
      * <li>It has the same author as the immediately preceding revision.
      * </ul>
      */
-    function mergeRevision($version)
+    public function mergeRevision($version)
     {
         if ($this->_wikidb->readonly) {
             trigger_error("readonly database", E_USER_WARNING);
@@ -1022,7 +1022,7 @@
      *
      * @return mixed
      */
-    function save($wikitext, $version, $meta, $formatted = null)
+    public function save($wikitext, $version, $meta, $formatted = null)
     {
         /**
          * @var WikiRequest $request
@@ -1192,7 +1192,7 @@
      *   WikiDB_PageRevisionIterator containing all revisions of this
      *   WikiDB_Page in reverse order by version number.
      */
-    function getAllRevisions()
+    public function getAllRevisions()
     {
         $backend = &$this->_wikidb->_backend;
         $revs = $backend->get_all_revisions($this->_pagename);
@@ -1233,7 +1233,7 @@
     /**
      * All Links from other pages to this page.
      */
-    function getBackLinks($include_empty = false, $sortby = '', $limit = '', $exclude = '')
+    public function getBackLinks($include_empty = false, $sortby = '', $limit = '', $exclude = '')
     {
         return $this->getLinks(true, $include_empty, $sortby, $limit, $exclude);
     }
@@ -1241,7 +1241,7 @@
     /**
      * Forward Links: All Links from this page to other pages.
      */
-    function getPageLinks($include_empty = false, $sortby = '', $limit = '', $exclude = '')
+    public function getPageLinks($include_empty = false, $sortby = '', $limit = '', $exclude = '')
     {
         return $this->getLinks(false, $include_empty, $sortby, $limit, $exclude);
     }
@@ -1250,7 +1250,7 @@
      * Relations: All links from this page to other pages with relation <> 0.
      * is_a:=page or population:=number
      */
-    function getRelations($sortby = '', $limit = '', $exclude = '')
+    public function getRelations($sortby = '', $limit = '', $exclude = '')
     {
         $backend = &$this->_wikidb->_backend;
         $result = $backend->get_links($this->_pagename, false, true,
@@ -1268,7 +1268,7 @@
     /**
      * possibly faster link existance check. not yet accelerated.
      */
-    function existLink($link, $reversed = false)
+    public function existLink($link, $reversed = false)
     {
         $backend = &$this->_wikidb->_backend;
         if (method_exists($backend, 'exists_link'))
@@ -1341,7 +1341,7 @@
      *
      * @return array The page meta-data (hash).
      */
-    function getMetaData()
+    public function getMetaData()
     {
         $cache = &$this->_wikidb->_cache;
         $data = $cache->get_pagedata($this->_pagename);
@@ -1464,14 +1464,14 @@
         return $version;
     }
 
-    function isUserPage($include_empty = true)
+    public function isUserPage($include_empty = true)
     {
         if (!$include_empty and !$this->exists()) return false;
         return $this->get('pref') ? true : false;
     }
 
     // May be empty. Either the stored owner (/Chown), or the first authorized author
-    function getOwner()
+    public function getOwner()
     {
         if ($owner = $this->get('owner'))
             return $owner;
@@ -1489,7 +1489,7 @@
     }
 
     // The authenticated author of the first revision or empty if not authenticated then.
-    function getCreator()
+    public function getCreator()
     {
         if ($current = $this->getRevision(1, false))
             return $current->get('author_id');
@@ -1498,7 +1498,7 @@
     }
 
     // The authenticated author of the current revision.
-    function getAuthor()
+    public function getAuthor()
     {
         if ($current = $this->getCurrentRevision(false))
             return $current->get('author_id');
@@ -1519,7 +1519,7 @@
         $this->set('attributes', $attr);
     }
 
-    function getAttribute($relation)
+    public function getAttribute($relation)
     {
         $meta = $this->get('attributes');
         if (empty($meta))
@@ -1643,7 +1643,7 @@
      * @return object An XmlContent-like object containing the page transformed
      * contents.
      */
-    function getTransformedContent($pagetype_override = false)
+    public function getTransformedContent($pagetype_override = false)
     {
         if ($pagetype_override) {
             // Figure out the normal page-type for this page.
@@ -1762,7 +1762,7 @@
         return $data['%content'];
     }
 
-    function _get_content()
+    public function _get_content()
     {
         $cache = &$this->_wikidb->_cache;
         $pagename = $this->_pagename;
@@ -1833,7 +1833,7 @@
      *
      * @return array The revision meta-data.
      */
-    function getMetaData()
+    public function getMetaData()
     {
         $meta = array();
         foreach ($this->_data as $key => $val) {
@@ -1882,12 +1882,12 @@
         $this->_options = $options;
     }
 
-    function count()
+    public function count()
     {
         return $this->_iter->count();
     }
 
-    function limit()
+    public function limit()
     {
         return empty($this->_options['limit']) ? 0 : $this->_options['limit'];
     }
@@ -1950,12 +1950,12 @@
         // $this->_iter->free();
     }
 
-    function reset()
+    public function reset()
     {
         $this->_iter->reset();
     }
 
-    function asArray()
+    public function asArray()
     {
         $result = array();
         while ($page = $this->next())
@@ -1963,58 +1963,6 @@
         $this->reset();
         return $result;
     }
-
-    /**
-     * Apply filters for options like 'sortby', 'limit', 'exclude'
-     * for simple queries like titleSearch, where the backend is not ready yet.
-     * Since iteration is usually destructive for SQL results,
-     * we have to generate a copy.
-     */
-    function applyFilters($options = false)
-    {
-        if (!$options) $options = $this->_options;
-        if (isset($options['sortby'])) {
-            $array = array();
-            /* this is destructive */
-            while ($page = $this->next())
-                $result[] = $page->getName();
-            $this->_doSort($array, $options['sortby']);
-        }
-        /* the rest is not destructive.
-         * reconstruct a new iterator
-         */
-        $pagenames = array();
-        $i = 0;
-        if (isset($options['limit']))
-            $limit = $options['limit'];
-        else
-            $limit = 0;
-        if (isset($options['exclude']))
-            $exclude = $options['exclude'];
-        if (is_string($exclude) and !is_array($exclude))
-            $exclude = PageList::explodePageList($exclude, false, false, $limit);
-        foreach ($array as $pagename) {
-            if ($limit and $i++ > $limit)
-                return new WikiDB_Array_PageIterator($pagenames);
-            if (!empty($exclude) and !in_array($pagename, $exclude))
-                $pagenames[] = $pagename;
-            elseif (empty($exclude))
-                $pagenames[] = $pagename;
-        }
-        return new WikiDB_Array_PageIterator($pagenames);
-    }
-
-    /* pagename only */
-    function _doSort(&$array, $sortby)
-    {
-        $sortby = PageList::sortby($sortby, 'init');
-        if ($sortby == '+pagename')
-            sort($array, SORT_STRING);
-        elseif ($sortby == '-pagename')
-            rsort($array, SORT_STRING);
-        reset($array);
-    }
-
 }
 
 /**
@@ -2034,7 +1982,7 @@
         $this->_options = $options;
     }
 
-    function count()
+    public function count()
     {
         return $this->_revisions->count();
     }
@@ -2092,7 +2040,7 @@
         $this->_revisions->free();
     }
 
-    function asArray()
+    public function asArray()
     {
         $result = array();
         while ($rev = $this->next())
@@ -2121,28 +2069,28 @@
         reset($this->_pages);
     }
 
-    function next()
+    public function next()
     {
         $c = current($this->_pages);
         next($this->_pages);
         return $c !== false ? $this->_dbi->getPage($c) : false;
     }
 
-    function count()
+    public function count()
     {
         return count($this->_pages);
     }
 
-    function reset()
+    public function reset()
     {
         reset($this->_pages);
     }
 
-    function free()
+    public function free()
     {
     }
 
-    function asArray()
+    public function asArray()
     {
         reset($this->_pages);
         return $this->_pages;
@@ -2167,28 +2115,28 @@
             reset($this->_array);
     }
 
-    function next()
+    public function next()
     {
         $c = current($this->_array);
         next($this->_array);
         return $c !== false ? $c : false;
     }
 
-    function count()
+    public function count()
     {
         return count($this->_array);
     }
 
-    function reset()
+    public function reset()
     {
         reset($this->_array);
     }
 
-    function free()
+    public function free()
     {
     }
 
-    function asArray()
+    public function asArray()
     {
         if (!empty($this->_array))
             reset($this->_array);
@@ -2232,7 +2180,7 @@
             $this->readonly = $request->_dbi->readonly;
     }
 
-    function close()
+    public function close()
     {
         $this->_pagedata_cache = array();
         $this->_versiondata_cache = array();
@@ -2240,7 +2188,7 @@
         $this->_id_cache = array();
     }
 
-    function get_pagedata($pagename)
+    public function get_pagedata($pagename)
     {
         assert(is_string($pagename) && $pagename != '');
         if (USECACHE) {
@@ -2256,7 +2204,7 @@
         }
     }
 
-    function update_pagedata($pagename, $newdata)
+    public function update_pagedata($pagename, $newdata)
     {
         assert(is_string($pagename) && $pagename != '');
         if (!empty($this->readonly)) {
@@ -2278,7 +2226,7 @@
         }
     }
 
-    function invalidate_cache($pagename)
+    public function invalidate_cache($pagename)
     {
         unset ($this->_pagedata_cache[$pagename]);
         unset ($this->_versiondata_cache[$pagename]);
@@ -2287,7 +2235,7 @@
         //unset ($this->_backend->_page_data);
     }
 
-    function delete_page($pagename)
+    public function delete_page($pagename)
     {
         if (!empty($this->readonly)) {
             trigger_error("readonly database", E_USER_WARNING);
@@ -2298,7 +2246,7 @@
         return $result;
     }
 
-    function purge_page($pagename)
+    public function purge_page($pagename)
     {
         if (!empty($this->readonly)) {
             trigger_error("readonly database", E_USER_WARNING);
@@ -2310,14 +2258,14 @@
     }
 
     // FIXME: ugly and wrong. may overwrite full cache with partial cache
-    function cache_data($data)
+    public function cache_data($data)
     {
         ;
         //if (isset($data['pagedata']))
         //    $this->_pagedata_cache[$data['pagename']] = $data['pagedata'];
     }
 
-    function get_versiondata($pagename, $version, $need_content = false)
+    public function get_versiondata($pagename, $version, $need_content = false)
     {
         //  FIXME: Seriously ugly hackage
         $readdata = false;
@@ -2355,7 +2303,7 @@
         return $vdata;
     }
 
-    function set_versiondata($pagename, $version, $data)
+    public function set_versiondata($pagename, $version, $data)
     {
         //unset($this->_versiondata_cache[$pagename][$version]);
 
@@ -2386,7 +2334,7 @@
         unset($this->_glv_cache[$pagename]);
     }
 
-    function delete_versiondata($pagename, $version)
+    public function delete_versiondata($pagename, $version)
     {
         if (!empty($this->readonly)) {
             trigger_error("readonly database", E_USER_WARNING);
@@ -2400,7 +2348,7 @@
             unset ($this->_glv_cache[$pagename]);
     }
 
-    function get_latest_version($pagename)
+    public function get_latest_version($pagename)
     {
         if (USECACHE) {
             assert(is_string($pagename) && $pagename != '');
@@ -2417,27 +2365,6 @@
     }
 }
 
-function _sql_debuglog($msg, $newline = true, $shutdown = false)
-{
-    static $fp = false;
-    static $i = 0;
-    if (!$fp) {
-        $stamp = strftime("%y%m%d-%H%M%S");
-        $fp = fopen(TEMP_DIR . "/sql-$stamp.log", "a");
-        register_shutdown_function("_sql_debuglog_shutdown_function");
-    } elseif ($shutdown) {
-        fclose($fp);
-        return;
-    }
-    if ($newline) fputs($fp, "[$i++] $msg");
-    else fwrite($fp, $msg);
-}
-
-function _sql_debuglog_shutdown_function()
-{
-    _sql_debuglog('', false, true);
-}
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/UnfoldSubpages.php
===================================================================
--- trunk/lib/plugin/UnfoldSubpages.php	2014-12-04 13:41:43 UTC (rev 9415)
+++ trunk/lib/plugin/UnfoldSubpages.php	2014-12-04 15:42:49 UTC (rev 9416)
@@ -84,10 +84,6 @@
         extract($args);
         $query = new TextSearchQuery($pagename . '/' . '*', true, 'glob');
         $subpages = $dbi->titleSearch($query, $sortby, $limit, $exclude);
-        //if ($sortby)
-        //    $subpages = $subpages->applyFilters(array('sortby' => $sortby, 'limit' => $limit, 'exclude' => $exclude));
-        //$subpages = explodePageList($pagename . SUBPAGE_SEPARATOR . '*', false,
-        //                            $sortby, $limit, $exclude);
         if (is_string($exclude) and !is_array($exclude))
             $exclude = PageList::explodePageList($exclude, false, false, $limit);
         $content = HTML();

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9415] trunk/lib/PageList.php

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

Revision: 9415
          http://sourceforge.net/p/phpwiki/code/9415
Author:   vargenau
Date:     2014-12-04 13:41:43 +0000 (Thu, 04 Dec 2014)
Log Message:
-----------
Rename private functions without underscore

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

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2014-12-04 13:18:15 UTC (rev 9414)
+++ trunk/lib/PageList.php	2014-12-04 13:41:43 UTC (rev 9415)
@@ -631,7 +631,7 @@
         if ($options)
             $this->_options = $options;
 
-        $this->_initAvailableColumns();
+        $this->initAvailableColumns();
         // let plugins predefine only certain objects, such its own custom pagelist columns
         $symbolic_columns =
             array(
@@ -849,7 +849,7 @@
         return $pages;
     }
 
-    private function _getPageFromHandle($page_handle)
+    private function getPageFromHandle($page_handle)
     {
         /**
          * @var WikiRequest $request
@@ -868,9 +868,9 @@
      * Take a PageList_Page object, and return an HTML object to display
      * it in a table or list row.
      */
-    private function _renderPageRow(&$page_handle, $i = 0)
+    private function renderPageRow(&$page_handle, $i = 0)
     {
-        $page_handle = $this->_getPageFromHandle($page_handle);
+        $page_handle = $this->getPageFromHandle($page_handle);
         //FIXME. only on sf.net
         if (!is_object($page_handle)) {
             trigger_error("PageList: Invalid page_handle $page_handle", E_USER_WARNING);
@@ -1000,8 +1000,8 @@
         elseif (isset($this->_options['listtype'])
             and in_array($this->_options['listtype'], array('ol', 'ul', 'comma', 'dl'))
         )
-            return $this->_generateList($caption); elseif (count($this->_columns) == 1)
-            return $this->_generateList($caption); else
+            return $this->generateList($caption); elseif (count($this->_columns) == 1)
+            return $this->generateList($caption); else
             return $this->_generateTable($caption);
     }
 
@@ -1106,7 +1106,7 @@
                 or (method_exists($request->_dbi->_backend, 'sortable_columns')
                     and (in_array($column, $request->_dbi->_backend->sortable_columns())))
             ) {
-                // omit this sort method from the _sortPages call at rendering
+                // omit this sort method from the sortPages call at rendering
                 // asc or desc: +pagename, -pagename
                 return $column . ($order == '+' ? ' ASC' : ' DESC');
             } else {
@@ -1274,7 +1274,7 @@
      *  If the pageList is initialized with $options['types'] these types are also initialized,
      *  overriding the standard types.
      */
-    private function _initAvailableColumns()
+    private function initAvailableColumns()
     {
         global $customPageListColumns;
         $standard_types =
@@ -1381,7 +1381,7 @@
         if (isset($this->_columns_seen[$column]))
             return false; // Already have this one.
         if (!isset($this->_types[$column]))
-            $this->_initAvailableColumns();
+            $this->initAvailableColumns();
         $this->_columns_seen[$column] = true;
 
         if (strstr($column, ':'))
@@ -1436,15 +1436,15 @@
     /**
      * Compare _PageList_Page objects.
      **/
-    private function _pageCompare(&$a, &$b)
+    private function pageCompare(&$a, &$b)
     {
         if (empty($this->_sortby) or count($this->_sortby) == 0) {
             // No columns to sort by
             return 0;
         } else {
-            $pagea = $this->_getPageFromHandle($a); // If a string, convert to page
+            $pagea = $this->getPageFromHandle($a); // If a string, convert to page
             assert(is_a($pagea, 'WikiDB_Page'));
-            $pageb = $this->_getPageFromHandle($b); // If a string, convert to page
+            $pageb = $this->getPageFromHandle($b); // If a string, convert to page
             assert(is_a($pageb, 'WikiDB_Page'));
             foreach ($this->_sortby as $colNum => $direction) {
                 // get column type object
@@ -1480,7 +1480,7 @@
      * If the sortby cols are already sorted by the DB call, don't do usort.
      * TODO: optimize for multiple sortable cols
      */
-    private function _sortPages()
+    private function sortPages()
     {
         if (count($this->_sortby) > 0) {
             $need_sort = $this->_options['dosort'];
@@ -1491,7 +1491,7 @@
                 }
             if ($need_sort) { // There are some columns to sort by
                 // TODO: consider nopage
-                usort($this->_pages, array($this, '_pageCompare'));
+                usort($this->_pages, array($this, 'pageCompare'));
             }
         }
     }
@@ -1588,7 +1588,7 @@
     // make a table given the caption
     public function _generateTable($caption = '')
     {
-        if (count($this->_sortby) > 0) $this->_sortPages();
+        if (count($this->_sortby) > 0) $this->sortPages();
 
         // wikiadminutils hack. that's a way to pagelist non-pages
         $rows = isset($this->_rows) ? $this->_rows : array();
@@ -1606,7 +1606,7 @@
                 $this->_pages = array_slice($this->_pages, $tokens['OFFSET'], $tokens['SIZE']);
         }
         foreach ($this->_pages as $pagenum => $page) {
-            $one_row = $this->_renderPageRow($page, $i++);
+            $one_row = $this->renderPageRow($page, $i++);
             $rows[] = $one_row;
         }
         $table = HTML::table(array('class' => 'fullwidth pagelist'));
@@ -1650,7 +1650,7 @@
     }
 
     /* recursive stack for private sublist options (azhead, cols) */
-    private function _saveOptions($opts)
+    private function saveOptions($opts)
     {
         $stack = array('pages' => $this->_pages);
         foreach ($opts as $k => $v) {
@@ -1662,7 +1662,7 @@
         $this->_stack->push($stack);
     }
 
-    private function _restoreOptions()
+    private function restoreOptions()
     {
         assert($this->_stack);
         $stack = $this->_stack->pop();
@@ -1678,7 +1678,7 @@
     // 'ordered' - OL or UL list (not yet inherited to all plugins)
     // 'comma'  - condensed comma-list only, 1: no links, >1: with links
     // FIXME: only unique list entries, esp. with nopage
-    private function _generateList($caption = '')
+    private function generateList($caption = '')
     {
         if (empty($this->_pages)) {
             return false; // stop recursion
@@ -1686,7 +1686,7 @@
         if (!isset($this->_options['listtype']))
             $this->_options['listtype'] = '';
         foreach ($this->_pages as $pagenum => $page) {
-            $one_row = $this->_renderPageRow($page);
+            $one_row = $this->renderPageRow($page);
             $rows[] = array('header' => WikiLink($page), 'render' => $one_row);
         }
         $out = HTML();
@@ -1698,7 +1698,7 @@
         if (!is_array($this->_pages[0]) and is_string($this->_pages[0])) {
             $this->_pages = array_unique($this->_pages);
         }
-        if (count($this->_sortby) > 0) $this->_sortPages();
+        if (count($this->_sortby) > 0) $this->sortPages();
         $count = $this->getTotal();
         $do_paging = (isset($this->_options['paging'])
             and !empty($this->_options['limit'])
@@ -1731,10 +1731,10 @@
             $width = sprintf("%d", 100 / $this->_options['cols']) . '%';
             $cols = HTML::tr(array('class' => 'top'));
             for ($i = $offset; $i < $offset + $count; $i += $length) {
-                $this->_saveOptions(array('cols' => 0, 'paging' => 'none'));
+                $this->saveOptions(array('cols' => 0, 'paging' => 'none'));
                 $this->_pages = array_slice($this->_pages, $i, $length);
-                $cols->pushContent(HTML::td($this->_generateList()));
-                $this->_restoreOptions();
+                $cols->pushContent(HTML::td($this->generateList()));
+                $this->restoreOptions();
             }
             // speed up table rendering by defining colgroups
             $out->pushContent(HTML::table(HTML::colgroup
@@ -1756,20 +1756,20 @@
                 $page =& $this->_pages[$i];
                 $h = substr($page->getName(), 0, 1);
                 if ($h != $cur_h and $i > $j) {
-                    $this->_saveOptions(array('cols' => 0, 'azhead' => 0, 'ordered' => $j + 1));
+                    $this->saveOptions(array('cols' => 0, 'azhead' => 0, 'ordered' => $j + 1));
                     $this->_pages = array_slice($this->_pages, $j, $i - $j);
-                    $out->pushContent($this->_generateList());
-                    $this->_restoreOptions();
+                    $out->pushContent($this->generateList());
+                    $this->restoreOptions();
                     $j = $i;
                     $out->pushContent(HTML::h3($h));
                     $cur_h = $h;
                 }
             }
             if ($i > $j) { // flush the rest
-                $this->_saveOptions(array('cols' => 0, 'azhead' => 0, 'ordered' => $j + 1));
+                $this->saveOptions(array('cols' => 0, 'azhead' => 0, 'ordered' => $j + 1));
                 $this->_pages = array_slice($this->_pages, $j, $i - $j);
-                $out->pushContent($this->_generateList());
-                $this->_restoreOptions();
+                $out->pushContent($this->generateList());
+                $this->restoreOptions();
             }
             return $out;
         }
@@ -1778,9 +1778,9 @@
             $this->_options['comma'] = 2;
         if (!empty($this->_options['comma'])) {
             if ($this->_options['comma'] == 1)
-                $out->pushContent($this->_generateCommaListAsString());
+                $out->pushContent($this->generateCommaListAsString());
             else
-                $out->pushContent($this->_generateCommaList());
+                $out->pushContent($this->generateCommaList());
             return $out;
         }
 
@@ -1830,7 +1830,7 @@
     // Condense list without a href links: "Page1, Page2, ..."
     // Alternative $seperator = HTML::Raw(' &middot; ')
     // FIXME: only unique list entries, esp. with nopage
-    private function _generateCommaListAsString()
+    private function generateCommaListAsString()
     {
         if (defined($this->_options['commasep']))
             $seperator = $this->_options['commasep'];
@@ -1838,7 +1838,7 @@
             $seperator = ', ';
         $pages = array();
         foreach ($this->_pages as $pagenum => $page) {
-            if ($s = $this->_renderPageRow($page)) // some pages are not viewable
+            if ($s = $this->renderPageRow($page)) // some pages are not viewable
                 $pages[] = is_string($s) ? $s : $s->asString();
         }
         return HTML(join($seperator, $pages));
@@ -1849,17 +1849,17 @@
     // Future: 1 = reserved for plain string (see above)
     //         2 and more => HTML link specialization?
     // FIXME: only unique list entries, esp. with nopage
-    private function _generateCommaList()
+    private function generateCommaList()
     {
         if (defined($this->_options['commasep']))
             $seperator = HTML::raw($this->_options['commasep']);
         else
             $seperator = ', ';
         $html = HTML();
-        $html->pushContent($this->_renderPageRow($this->_pages[0]));
+        $html->pushContent($this->renderPageRow($this->_pages[0]));
         next($this->_pages);
         foreach ($this->_pages as $pagenum => $page) {
-            if ($s = $this->_renderPageRow($page)) // some pages are not viewable
+            if ($s = $this->renderPageRow($page)) // some pages are not viewable
                 $html->pushContent($seperator, $s);
         }
         return $html;

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

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

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

Revision: 9414
          http://sourceforge.net/p/phpwiki/code/9414
Author:   vargenau
Date:     2014-12-04 13:18:15 +0000 (Thu, 04 Dec 2014)
Log Message:
-----------
Add public/private

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

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2014-12-03 16:15:36 UTC (rev 9413)
+++ trunk/lib/PageList.php	2014-12-04 13:18:15 UTC (rev 9414)
@@ -600,16 +600,18 @@
 {
     public $_group_rows = 3;
     public $_columns = array();
-    public $_columnsMap = array(); // Maps column name to column number.
-    public $_excluded_pages = array();
+    private $_columnsMap = array(); // Maps column name to column number.
+    private $_excluded_pages = array();
     public $_pages = array();
     public $_caption = "";
-    public $_pagename_seen = false;
     public $_types = array();
     public $_options = array();
     public $_selected = array();
     public $_sortby = array();
     public $_maxlen = 0;
+    private $_messageIfEmpty = '';
+    private $_columns_seen = array();
+    private $_stack;
 
     function __construct($columns = array(), $exclude = array(), $options = array())
     {
@@ -724,7 +726,7 @@
     // 1: info, 2: exclude, 3: hash of options
     // Here we declare which options are supported, so that
     // the calling plugin may simply merge this with its own default arguments
-    static function supportedArgs()
+    public static function supportedArgs()
     {
         // Todo: add all supported Columns, like locked, minor, ...
         return array( // Currently supported options:
@@ -777,21 +779,15 @@
         );
     }
 
-    function pagingArgs()
+    private function pagingArgs()
     {
         return array('sortby', 'limit', 'paging', 'count', 'dosort');
     }
 
-    function clearArg($arg_name)
-    {
-        if (isset($this->_options[$arg_name]))
-            unset($this->_options[$arg_name]);
-    }
-
     /**
      * @param    mixed $caption    string or HTML
      */
-    function setCaption($caption)
+    public function setCaption($caption)
     {
         $this->_caption = $caption;
     }
@@ -799,12 +795,12 @@
     /**
      * @param    mixed $caption    string or HTML
      */
-    function addCaption($caption)
+    public function addCaption($caption)
     {
         $this->_caption = HTML($this->_caption, " ", $caption);
     }
 
-    function getCaption()
+    private function getCaption()
     {
         // put the total into the caption if needed
         if (is_string($this->_caption) && strstr($this->_caption, '%d'))
@@ -812,23 +808,18 @@
         return $this->_caption;
     }
 
-    function setMessageIfEmpty($msg)
+    public function getTotal()
     {
-        $this->_messageIfEmpty = $msg;
-    }
-
-    function getTotal()
-    {
         return !empty($this->_options['count'])
             ? (integer)$this->_options['count'] : count($this->_pages);
     }
 
-    function isEmpty()
+    public function isEmpty()
     {
         return empty($this->_pages);
     }
 
-    function addPage($page_handle)
+    public function addPage($page_handle)
     {
         $pagename = is_string($page_handle) ? $page_handle : $page_handle->getName();
         if (in_array($pagename, $this->pageNames())) {
@@ -842,7 +833,7 @@
         }
     }
 
-    function pageNames()
+    public function pageNames()
     {
         $pages = array();
         $limit = @$this->_options['limit'];
@@ -858,7 +849,7 @@
         return $pages;
     }
 
-    function _getPageFromHandle($page_handle)
+    private function _getPageFromHandle($page_handle)
     {
         /**
          * @var WikiRequest $request
@@ -866,7 +857,8 @@
         global $request;
 
         if (is_string($page_handle)) {
-            if (empty($page_handle)) return $page_handle;
+            if (empty($page_handle))
+                return $page_handle;
             $page_handle = $request->_dbi->getPage($page_handle);
         }
         return $page_handle;
@@ -876,7 +868,7 @@
      * Take a PageList_Page object, and return an HTML object to display
      * it in a table or list row.
      */
-    function _renderPageRow(&$page_handle, $i = 0)
+    private function _renderPageRow(&$page_handle, $i = 0)
     {
         $page_handle = $this->_getPageFromHandle($page_handle);
         //FIXME. only on sf.net
@@ -920,7 +912,7 @@
     }
 
     /* ignore from, but honor limit */
-    function addPages($page_iter)
+    public function addPages($page_iter)
     {
         // TODO: if limit check max(strlen(pagename))
         $limit = $page_iter->limit();
@@ -948,7 +940,7 @@
             $this->_options['count'] = $i;
     }
 
-    function addPageList($list)
+    public function addPageList($list)
     {
         if (empty($list)) return; // Protect reset from a null arg
         if (isset($this->_options['limit'])) { // extract from,count from limit
@@ -970,7 +962,7 @@
         }
     }
 
-    function maxLen()
+    private function maxLen()
     {
         global $request;
         $dbi =& $request->getDbh();
@@ -990,7 +982,7 @@
     /**
      * @return bool|WikiDB_Page
      */
-    function first()
+    public function first()
     {
         if (count($this->_pages) > 0) {
             return $this->_pages[0];
@@ -998,7 +990,7 @@
         return false;
     }
 
-    function getContent()
+    public function getContent()
     {
         // Note that the <caption> element wants inline content.
         $caption = $this->getCaption();
@@ -1036,7 +1028,7 @@
      * Now all columns are sortable. (patch by Dan Frankowski)
      * Some columns have native DB backend methods, some not.
      */
-    function sortby($column, $action, $valid_fields = false)
+    public function sortby($column, $action, $valid_fields = false)
     {
         global $request;
 
@@ -1129,7 +1121,7 @@
      * Limitation: Doesn't split into comma-sep and then expand wildcards.
      * "Test1*,Test2*" is expanded into TextSearch "Test1* Test2*"
      */
-    static function explodePageList($input, $include_empty = false, $sortby = '',
+    public static function explodePageList($input, $include_empty = false, $sortby = '',
                                     $limit = '', $exclude = '')
     {
         /**
@@ -1162,8 +1154,8 @@
     }
 
     // TODO: optimize getTotal => store in count
-    static function allPagesByAuthor($wildcard, $include_empty = false, $sortby = '',
-                              $limit = '', $exclude = '')
+    public static function allPagesByAuthor($wildcard, $include_empty = false, $sortby = '',
+                                            $limit = '', $exclude = '')
     {
         /**
          * @var WikiRequest $request
@@ -1194,8 +1186,8 @@
         return $allPages;
     }
 
-    static function allPagesByOwner($wildcard, $include_empty = false, $sortby = '',
-                             $limit = '', $exclude = '')
+    public static function allPagesByOwner($wildcard, $include_empty = false, $sortby = '',
+                                           $limit = '', $exclude = '')
     {
         /**
          * @var WikiRequest $request
@@ -1225,7 +1217,7 @@
         return $allPages;
     }
 
-    static function allPagesByCreator($wildcard, $include_empty = false, $sortby = '',
+    public static function allPagesByCreator($wildcard, $include_empty = false, $sortby = '',
                                $limit = '', $exclude = '')
     {
         /**
@@ -1257,8 +1249,8 @@
     }
 
     // UserPages are pages NOT owned by ADMIN_USER
-    static function allUserPages($include_empty = false, $sortby = '',
-                          $limit = '', $exclude = '')
+    public static function allUserPages($include_empty = false, $sortby = '',
+                                        $limit = '', $exclude = '')
     {
         /**
          * @var WikiRequest $request
@@ -1278,14 +1270,11 @@
         return $allPages;
     }
 
-    ////////////////////
-    // private
-    ////////////////////
     /** Plugin and theme hooks:
      *  If the pageList is initialized with $options['types'] these types are also initialized,
      *  overriding the standard types.
      */
-    function _initAvailableColumns()
+    private function _initAvailableColumns()
     {
         global $customPageListColumns;
         $standard_types =
@@ -1362,7 +1351,7 @@
         }
     }
 
-    function getOption($option)
+    public function getOption($option)
     {
         if (array_key_exists($option, $this->_options)) {
             return $this->_options[$option];
@@ -1387,7 +1376,7 @@
      * @param string $column column name
      * @return bool true if column is added, false otherwise
      */
-    function _addColumn($column)
+    public function _addColumn($column)
     {
         if (isset($this->_columns_seen[$column]))
             return false; // Already have this one.
@@ -1428,7 +1417,7 @@
      *
      * @param array|object $col   An object derived from _PageList_Column.
      **/
-    function addColumnObject($col)
+    public function addColumnObject($col)
     {
         if (is_array($col)) { // custom column object
             $params =& $col;
@@ -1447,7 +1436,7 @@
     /**
      * Compare _PageList_Page objects.
      **/
-    function _pageCompare(&$a, &$b)
+    private function _pageCompare(&$a, &$b)
     {
         if (empty($this->_sortby) or count($this->_sortby) == 0) {
             // No columns to sort by
@@ -1491,7 +1480,7 @@
      * If the sortby cols are already sorted by the DB call, don't do usort.
      * TODO: optimize for multiple sortable cols
      */
-    function _sortPages()
+    private function _sortPages()
     {
         if (count($this->_sortby) > 0) {
             $need_sort = $this->_options['dosort'];
@@ -1507,7 +1496,7 @@
         }
     }
 
-    function limit($limit)
+    public function limit($limit)
     {
         if (is_array($limit)) {
             list($from, $count) = $limit;
@@ -1533,7 +1522,7 @@
         }
     }
 
-    function pagingTokens($numrows = false, $ncolumns = false, $limit = false)
+    public function pagingTokens($numrows = false, $ncolumns = false, $limit = false)
     {
         /**
          * @var WikiRequest $request
@@ -1597,7 +1586,7 @@
     }
 
     // make a table given the caption
-    function _generateTable($caption)
+    public function _generateTable($caption = '')
     {
         if (count($this->_sortby) > 0) $this->_sortPages();
 
@@ -1661,7 +1650,7 @@
     }
 
     /* recursive stack for private sublist options (azhead, cols) */
-    function _saveOptions($opts)
+    private function _saveOptions($opts)
     {
         $stack = array('pages' => $this->_pages);
         foreach ($opts as $k => $v) {
@@ -1673,7 +1662,7 @@
         $this->_stack->push($stack);
     }
 
-    function _restoreOptions()
+    private function _restoreOptions()
     {
         assert($this->_stack);
         $stack = $this->_stack->pop();
@@ -1689,7 +1678,7 @@
     // 'ordered' - OL or UL list (not yet inherited to all plugins)
     // 'comma'  - condensed comma-list only, 1: no links, >1: with links
     // FIXME: only unique list entries, esp. with nopage
-    function _generateList($caption = '')
+    private function _generateList($caption = '')
     {
         if (empty($this->_pages)) {
             return false; // stop recursion
@@ -1791,7 +1780,7 @@
             if ($this->_options['comma'] == 1)
                 $out->pushContent($this->_generateCommaListAsString());
             else
-                $out->pushContent($this->_generateCommaList($this->_options['comma']));
+                $out->pushContent($this->_generateCommaList());
             return $out;
         }
 
@@ -1841,7 +1830,7 @@
     // Condense list without a href links: "Page1, Page2, ..."
     // Alternative $seperator = HTML::Raw(' &middot; ')
     // FIXME: only unique list entries, esp. with nopage
-    function _generateCommaListAsString()
+    private function _generateCommaListAsString()
     {
         if (defined($this->_options['commasep']))
             $seperator = $this->_options['commasep'];
@@ -1860,10 +1849,10 @@
     // Future: 1 = reserved for plain string (see above)
     //         2 and more => HTML link specialization?
     // FIXME: only unique list entries, esp. with nopage
-    function _generateCommaList($style = false)
+    private function _generateCommaList()
     {
         if (defined($this->_options['commasep']))
-            $seperator = HTML::Raw($this->_options['commasep']);
+            $seperator = HTML::raw($this->_options['commasep']);
         else
             $seperator = ', ';
         $html = HTML();
@@ -1882,7 +1871,7 @@
         if ($caption) {
             $html->pushContent(HTML::p($caption));
         }
-        if ($this->_messageIfEmpty)
+        if (!empty($this->_messageIfEmpty))
             $html->pushContent(HTML::blockquote(HTML::p($this->_messageIfEmpty)));
         return $html;
     }

Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php	2014-12-03 16:15:36 UTC (rev 9413)
+++ trunk/lib/plugin/WantedPagesOld.php	2014-12-04 13:18:15 UTC (rev 9414)
@@ -28,7 +28,7 @@
 {
     public $pagelist;
     public $_rows;
-    public $_messageIfEmpty;
+    private $_messageIfEmpty;
     public $_columns;
 
     function getDescription()

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2014-12-03 16:15:36 UTC (rev 9413)
+++ trunk/lib/plugin/WikiAdminUtils.php	2014-12-04 13:18:15 UTC (rev 9414)
@@ -286,7 +286,7 @@
         }
         $request->_user = $current_user;
         if (!empty($args['verify']) or empty($pagelist->_rows)) {
-            return HTML($pagelist->_generateTable(false));
+            return HTML($pagelist->_generateTable());
         } elseif (!empty($pagelist->_rows)) {
             $args['verify'] = 1;
             $args['return_url'] = $request->getURLtoSelf();
@@ -296,7 +296,7 @@
                 HiddenInputs(array('require_authority_for_post' =>
                 WIKIAUTH_ADMIN)),
                 HiddenInputs($request->getArgs()),
-                $pagelist->_generateTable(false),
+                $pagelist->_generateTable(),
                 HTML::p(Button('submit:', _("Change Verification Status"),
                         'wikiadmin'),
                     HTML::raw('&nbsp;'),

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