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

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

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

Revision: 8839
          http://sourceforge.net/p/phpwiki/code/8839
Author:   vargenau
Date:     2013-09-03 12:42:18 +0000 (Tue, 03 Sep 2013)
Log Message:
-----------
Initialize $html

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

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2013-09-03 10:00:36 UTC (rev 8838)
+++ trunk/lib/plugin/RecentChanges.php	2013-09-03 12:42:18 UTC (rev 8839)
@@ -795,6 +795,9 @@
     function format($changes)
     {
         include_once 'lib/InlineParser.php';
+
+        $html = HTML(HTML::h2(false, $this->headline()));
+
         $first = true;
         while ($rev = $changes->next()) {
             // enforce view permission

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

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

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

Revision: 8838
          http://sourceforge.net/p/phpwiki/code/8838
Author:   vargenau
Date:     2013-09-03 10:00:36 +0000 (Tue, 03 Sep 2013)
Log Message:
-----------
Fusionforge: Use english catalog for search in the wiki as phpwiki is using english to split words

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

Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2013-09-03 09:55:48 UTC (rev 8837)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2013-09-03 10:00:36 UTC (rev 8838)
@@ -620,9 +620,9 @@
             $search_string = str_replace('%', '', $search_string);
             $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$pat') AND (";
 
-            $search_clause .= "idxFTI @@ to_tsquery('$search_string')";
+            $search_clause .= "idxFTI @@ to_tsquery('english', '$search_string')";
             if (!$orderby)
-                $orderby = " ORDER BY ts_rank(idxFTI, to_tsquery('$search_string')) DESC";
+                $orderby = " ORDER BY ts_rank(idxFTI, to_tsquery('english', '$search_string')) DESC";
         } else {
             $callback = new WikiMethodCb($searchobj, "_pagename_match_clause");
             $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$pat') AND (";

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

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

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

Revision: 8837
          http://sourceforge.net/p/phpwiki/code/8837
Author:   vargenau
Date:     2013-09-03 09:55:48 +0000 (Tue, 03 Sep 2013)
Log Message:
-----------
use And by default; cleanup

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

Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php	2013-09-03 09:39:54 UTC (rev 8836)
+++ trunk/lib/SemanticWeb.php	2013-09-03 09:55:48 UTC (rev 8837)
@@ -318,7 +318,7 @@
     {
         $ori_value = $value;
         $value = preg_replace("/,/", "", $value);
-        $this->_bound[] = array('linkname' => $x,
+        $this->bound[] = array('linkname' => $x,
             'linkvalue' => $value);
         // We must ensure that the same baseunits are matched against.
         // We cannot compare m^2 to m or ''
@@ -329,20 +329,20 @@
                 ;
             } else {
                 // non-matching units are silently ignored
-                $this->_workquery = '';
+                $this->workquery = '';
                 return '';
             }
         }
         $value = $val_base;
         if (!is_numeric($value)) {
-            $this->_workquery = ''; //must return false
+            $this->workquery = ''; //must return false
             trigger_error("Cannot match against non-numeric attribute value $x := $ori_value",
                 E_USER_NOTICE);
             return '';
         }
 
-        $this->_workquery = preg_replace("/\b" . preg_quote($x, "/") . "\b/", $value, $this->_workquery);
-        return $this->_workquery;
+        $this->workquery = preg_replace("/\b" . preg_quote($x, "/") . "\b/", $value, $this->workquery);
+        return $this->workquery;
     }
 
 }

Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php	2013-09-03 09:39:54 UTC (rev 8836)
+++ trunk/lib/TextSearchQuery.php	2013-09-03 09:55:48 UTC (rev 8837)
@@ -80,23 +80,11 @@
 // all bits from word to the last.
 define ('TSQ_ALLWORDS', (4096 * 2) - 1 - (16 - 1));
 
-/*
-define ('TSQ_NODE_ALL',   0);
-define ('TSQ_NODE_EXACT', 1);
-define ('TSQ_NODE_NOT',   2);
-define ('TSQ_NODE_WORD',  3);
-define ('TSQ_NODE_STARTS_WITH', 4);
-define ('TSQ_NODE_ENDS_WITH',   5);
-define ('TSQ_NODE_REGEX',       6);
-define ('TSQ_NODE_REGEX_GLOB',  7);
-define ('TSQ_NODE_REGEX_PCRE',  8);
-define ('TSQ_NODE_REGEX_SQL',   9);
-define ('TSQ_NODE_AND',        10);
-define ('TSQ_NODE_OR',         11);
-*/
-
 class TextSearchQuery
 {
+    private $sql_clause_cb;
+    private $word;
+
     /**
      * Create a new query.
      *
@@ -120,7 +108,7 @@
         if ($regex != 'pcre') {
             $parser = new TextSearchQuery_Parser;
             $this->_tree = $parser->parse($search_query, $case_exact, $this->_regex);
-            $this->_optimize(); // broken under certain circumstances: "word -word -word"
+            $this->optimize(); // broken under certain circumstances: "word -word -word"
             if (defined("FULLTEXTSEARCH_STOPLIST"))
                 $this->_stoplist = FULLTEXTSEARCH_STOPLIST;
             else // default stoplist, localizable.
@@ -139,7 +127,7 @@
         return 'text';
     }
 
-    function _optimize()
+    private function optimize()
     {
         $this->_tree = $this->_tree->optimize();
     }
@@ -213,88 +201,31 @@
         return $this->_hilight_regexp;
     }
 
-    /**
-     * Make an SQL clause which matches the query.
-     * Deprecated, use makeSqlClauseObj instead.
-     *
-     * @param $make_sql_clause_cb WikiCallback
-     * A callback which takes a single word as an argument and
-     * returns an SQL clause which will match exactly those records
-     * containing the word.  The word passed to the callback will always
-     * be in all lower case.
-     *
-     * Support db-specific extensions, like MATCH AGAINST or REGEX
-     * mysql => 4.0.1 can also do Google: MATCH AGAINST IN BOOLEAN MODE
-     * by using makeSqlClauseObj
-     *
-     * Old example usage:
-     * <pre>
-     *     function sql_title_match($word) {
-     *         return sprintf("LOWER(title) like '%s'",
-     *                        addslashes($word));
-     *     }
-     *
-     *     ...
-     *
-     *     $query = new TextSearchQuery("wiki -page");
-     *     $cb = new WikiFunctionCb('sql_title_match');
-     *     $sql_clause = $query->makeSqlClause($cb);
-     * </pre>
-     * This will result in $sql_clause containing something like
-     * "(LOWER(title) like 'wiki') AND NOT (LOWER(title) like 'page')".
-     *
-     * @return string The SQL clause.
-     */
-    function makeSqlClause($sql_clause_cb)
-    {
-        $this->_sql_clause_cb = $sql_clause_cb;
-        return $this->_sql_clause($this->_tree);
-    }
-
-    // deprecated: use _sql_clause_obj now.
-    function _sql_clause($node)
-    {
-        switch ($node->_op) {
-            case TSQ_TOK_WORD: // word => %word%
-                return $this->_sql_clause_cb->call($node->word);
-            case TSQ_TOK_NOT:
-                return "NOT (" . $this->_sql_clause($node->leaves[0]) . ")";
-            case TSQ_TOK_BINOP:
-                $subclauses = array();
-                foreach ($node->leaves as $leaf)
-                    $subclauses[] = "(" . $this->_sql_clause($leaf) . ")";
-                return join(" $node->op ", $subclauses);
-            default:
-                assert($node->_op == TSQ_TOK_VOID);
-                return '1=1';
-        }
-    }
-
     /** Get away with the callback and use a db-specific search class instead.
      * @see WikiDB_backend_PearDB_search
      */
     function makeSqlClauseObj(&$sql_search_cb)
     {
-        $this->_sql_clause_cb = $sql_search_cb;
-        return $this->_sql_clause_obj($this->_tree);
+        $this->sql_clause_cb = $sql_search_cb;
+        return $this->sql_clause_obj($this->_tree);
     }
 
-    function _sql_clause_obj($node)
+    private function sql_clause_obj($node)
     {
         switch ($node->_op) {
             case TSQ_TOK_NOT:
-                return "NOT (" . $this->_sql_clause_cb->call($node->leaves[0]) . ")";
+                return "NOT (" . $this->sql_clause_cb->call($node->leaves[0]) . ")";
             case TSQ_TOK_BINOP:
                 $subclauses = array();
                 foreach ($node->leaves as $leaf)
-                    $subclauses[] = "(" . $this->_sql_clause_obj($leaf) . ")";
+                    $subclauses[] = "(" . $this->sql_clause_obj($leaf) . ")";
                 return join(" $node->op ", $subclauses);
             case TSQ_TOK_VOID:
                 return '0=1';
             case TSQ_TOK_ALL:
                 return '1=1';
             default:
-                return $this->_sql_clause_cb->call($node);
+                return $this->sql_clause_cb->call($node);
         }
     }
 
@@ -303,11 +234,11 @@
      */
     function makeTsearch2SqlClauseObj(&$sql_search_cb)
     {
-        $this->_sql_clause_cb = $sql_search_cb;
-        return $this->_Tsearch2Sql_clause_obj($this->_tree);
+        $this->sql_clause_cb = $sql_search_cb;
+        return $this->Tsearch2Sql_clause_obj($this->_tree);
     }
 
-    function _Tsearch2Sql_clause_obj($node)
+    private function Tsearch2Sql_clause_obj($node)
     {
         // TODO: "such a phrase"
         switch ($node->_op) {
@@ -316,14 +247,14 @@
             case TSQ_TOK_BINOP:
                 $subclauses = array();
                 foreach ($node->leaves as $leaf)
-                    $subclauses[] = $this->_Tsearch2Sql_clause_obj($leaf);
-                return join($node->_op == 'AND' ? "&" : "|", $subclauses);
+                    $subclauses[] = $this->Tsearch2Sql_clause_obj($leaf);
+                return join($node->_op == 'OR' ? "|" : "&", $subclauses);
             case TSQ_TOK_VOID:
                 return '';
             case TSQ_TOK_ALL:
                 return '1';
             default:
-                return $this->_sql_clause_cb->call($node);
+                return $this->sql_clause_cb->call($node);
         }
     }
 
@@ -340,10 +271,10 @@
      */
     function asString()
     {
-        return $this->_as_string($this->_tree);
+        return $this->as_string($this->_tree);
     }
 
-    function _as_string($node, $indent = '')
+    private function as_string($node, $indent = '')
     {
         switch ($node->_op) {
             case TSQ_TOK_WORD:
@@ -356,7 +287,7 @@
                 $lines = array($indent . $node->op . ":");
                 $indent .= "  ";
                 foreach ($node->leaves as $leaf)
-                    $lines[] = $this->_as_string($leaf, $indent);
+                    $lines[] = $this->as_string($leaf, $indent);
                 return join("\n", $lines);
         }
     }
@@ -391,11 +322,6 @@
         return "";
     }
 
-    function makeSqlClause($make_sql_clause_cb)
-    {
-        return "(1 = 0)";
-    }
-
     function asString()
     {
         return "NullTextSearchQuery";
@@ -420,6 +346,9 @@
  */
 class NumericSearchQuery
 {
+    protected $bound;
+    protected $workquery;
+
     /**
      * Create a new query.
      *   NumericSearchQuery("population > 20000 or population < 200", "population")
@@ -541,10 +470,10 @@
      * Check the bound, numeric-only query against unwanted functions and sideeffects.
      * "4560000 < 20000 and 1456022 > 1000000"
      */
-    function _live_check()
+    private function live_check()
     {
         // TODO: check $this->_workquery again?
-        return !empty($this->_workquery);
+        return !empty($this->workquery);
     }
 
     /**
@@ -567,23 +496,23 @@
      * @param $x string       The variable name to be replaced in the query.
      * @return string
      */
-    function _bind($value, $x)
+    private function bind($value, $x)
     {
         // TODO: check is_number, is_float, is_integer and do casting
-        $this->_bound[] = array('linkname' => $x,
+        $this->bound[] = array('linkname' => $x,
             'linkvalue' => $value);
         $value = preg_replace("/[^-+0123456789.,]/", "", $value);
         //$c = "/\b".preg_quote($x,"/")."\b/";
-        $this->_workquery = preg_replace("/\b" . preg_quote($x, "/") . "\b/", $value, $this->_workquery);
+        $this->workquery = preg_replace("/\b" . preg_quote($x, "/") . "\b/", $value, $this->workquery);
         // FIXME: do again a final check. now only numbers and some operators are allowed.
-        return $this->_workquery;
+        return $this->workquery;
     }
 
     /* array of successfully bound vars, and in case of success, the resulting vars
      */
-    function _bound()
+    private function bound()
     {
-        return $this->_bound;
+        return $this->bound;
     }
 
     /**
@@ -591,7 +520,7 @@
      * Purpose: Be silent about missing vars, just return false.
     `*
      * @access public
-     * @param $variable string or hash of name => value  The keys must satisfy all placeholders in the definition.
+     * @param string $variables string or hash of name => value  The keys must satisfy all placeholders in the definition.
      * We want the full hash and not just the keys because a hash check is faster than the array of keys check.
      * @return boolean
      */
@@ -625,25 +554,25 @@
     function match(&$variable)
     {
         $p =& $this->_placeholders;
-        $this->_workquery = $this->_query;
+        $this->workquery = $this->_query;
         if (!is_array($p)) {
             if (is_array($variable)) { // which var to match? we cannot decide this here
                 if (!isset($variable[$p]))
-                    trigger_error("Required NumericSearchQuery->match variable $x not defined.", E_USER_ERROR);
-                $this->_bind($variable[$p], $p);
+                    trigger_error("Required NumericSearchQuery->match variable $p not defined.", E_USER_ERROR);
+                $this->bind($variable[$p], $p);
             } else {
-                $this->_bind($variable, $p);
+                $this->bind($variable, $p);
             }
         } else {
             foreach ($p as $x) {
                 if (!isset($variable[$x]))
                     trigger_error("Required NumericSearchQuery->match variable $x not defined.", E_USER_ERROR);
-                $this->_bind($variable[$x], $x);
+                $this->bind($variable[$x], $x);
             }
         }
-        if (!$this->_live_check()) // check returned an error
+        if (!$this->live_check()) // check returned an error
             return false;
-        $search = $this->_workquery;
+        $search = $this->workquery;
         $result = false;
         //if (DEBUG & _DEBUG_VERBOSE)
         //    trigger_error("\$result = (boolean)($search);", E_USER_NOTICE);
@@ -652,7 +581,7 @@
         // php-5.1.2 cgi true, 4.2.2 cgi true
         eval("\$result = (boolean)($search);");
         if ($result and is_array($p)) {
-            return $this->_bound();
+            return $this->bound();
         }
         return $result;
     }
@@ -672,6 +601,7 @@
 {
     public $op = 'VOID';
     public $_op = 0;
+    public $word;
 
     /**
      * Optimize this node.
@@ -683,7 +613,7 @@
     }
 
     /**
-     * @return regexp matching this node.
+     * @return string regexp matching this node.
      */
     function regexp()
     {
@@ -691,7 +621,7 @@
     }
 
     /**
-     * @param bool True if this node has been negated (higher in the parse tree.)
+     * @param bool $negated True if this node has been negated (higher in the parse tree.)
      * @return array A list of all non-negated words contained by this node.
      */
     function highlight_words($negated = false)
@@ -704,7 +634,7 @@
         return $this->word;
     }
 
-    function _sql_quote()
+    protected function sql_quote()
     {
         global $request;
         $word = preg_replace('/(?=[%_\\\\])/', "\\", $this->word);
@@ -738,7 +668,7 @@
 
     function sql()
     {
-        return '%' . $this->_sql_quote($this->word) . '%';
+        return '%' . $this->sql_quote($this->word) . '%';
     }
 }
 
@@ -772,7 +702,7 @@
 
     function sql()
     {
-        return $this->_sql_quote($this->word) . '%';
+        return $this->sql_quote($this->word) . '%';
     }
 }
 
@@ -799,7 +729,7 @@
 
     function sql()
     {
-        return '%' . $this->_sql_quote($this->word);
+        return '%' . $this->sql_quote($this->word);
     }
 }
 
@@ -843,7 +773,7 @@
 
     function sql()
     {
-        return $this->_sql_quote($this->word);
+        return $this->sql_quote($this->word);
     }
 }
 
@@ -936,7 +866,7 @@
         $this->leaves = $leaves;
     }
 
-    function _flatten()
+    protected function flatten()
     {
         // This flattens e.g. (AND (AND a b) (OR c d) e)
         //        to (AND a b e (OR c d))
@@ -953,7 +883,7 @@
 
     function optimize()
     {
-        $this->_flatten();
+        $this->flatten();
         assert(!empty($this->leaves));
         if (count($this->leaves) == 1)
             return $this->leaves[0]; // (AND x) -> x
@@ -980,7 +910,7 @@
 
     function optimize()
     {
-        $this->_flatten();
+        $this->flatten();
 
         // Convert (AND (NOT a) (NOT b) c d) into (AND (NOT (OR a b)) c d).
         // Since OR's are more efficient for regexp matching:
@@ -1047,12 +977,12 @@
 
         if ($words)
             array_unshift($regexps,
-                '(?=.*' . $this->_join($words) . ')');
+                '(?=.*' . $this->join($words) . ')');
 
-        return $this->_join($regexps);
+        return $this->join($regexps);
     }
 
-    function _join($regexps)
+    private function join($regexps)
     {
         assert(count($regexps) > 0);
 
@@ -1110,10 +1040,13 @@
      * *                  ALL
      */
 
+    public $lexer;
+    private $regex;
+
     function parse($search_expr, $case_exact = false, $regex = TSQ_REGEX_AUTO)
     {
         $this->lexer = new TextSearchQuery_Lexer($search_expr, $case_exact, $regex);
-        $this->_regex = $regex;
+        $this->regex = $regex;
         $tree = $this->get_list('toplevel');
         // Assert failure when using the following URL in debug mode.
         // /TitleSearch?action=FullTextSearch&s=WFXSSProbe'")/>&case_exact=1&regex=sql

Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2013-09-03 09:39:54 UTC (rev 8836)
+++ trunk/lib/WikiDB/backend.php	2013-09-03 09:55:48 UTC (rev 8837)
@@ -851,7 +851,7 @@
 {
     function _pagename_match_clause($node)
     {
-        // word already quoted by TextSearchQuery_node_word::_sql_quote()
+        // word already quoted by TextSearchQuery_node_word::sql_quote()
         $word = $node->sql();
         if ($word == '%') // ALL shortcut
             return "1=1";

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

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

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

Revision: 8836
          http://sourceforge.net/p/phpwiki/code/8836
Author:   vargenau
Date:     2013-09-03 09:39:54 +0000 (Tue, 03 Sep 2013)
Log Message:
-----------
Remove IMDB stuff

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

Removed Paths:
-------------
    trunk/lib/imdb.php
    trunk/lib/plugin/Imdb.php

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2013-09-03 09:39:16 UTC (rev 8835)
+++ trunk/lib/IniConfig.php	2013-09-03 09:39:54 UTC (rev 8836)
@@ -713,7 +713,6 @@
         $AllAllowedPlugins[] = 'GraphViz';
         $AllAllowedPlugins[] = 'DebugGroupInfo';
         $AllAllowedPlugins[] = 'HtmlConverter';
-        $AllAllowedPlugins[] = 'Imdb';
         $AllAllowedPlugins[] = 'JabberPresence';
         $AllAllowedPlugins[] = 'ListPages';
         $AllAllowedPlugins[] = 'PhpWeather';

Deleted: trunk/lib/imdb.php
===================================================================
--- trunk/lib/imdb.php	2013-09-03 09:39:16 UTC (rev 8835)
+++ trunk/lib/imdb.php	2013-09-03 09:39:54 UTC (rev 8836)
@@ -1,450 +0,0 @@
-<?php
-/**
- * Copyright 2004 Reini Urban
- *
- * This file is (not yet) 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.
- */
-
-/**
- * Accessors for a local imdb database.
- * Import it via amdbfront.
- * Get the dsn alias from lib/plugin/SqlResult.ini
- */
-class imdb
-{
-
-    function imdb()
-    {
-        global $DBParams;
-        $ini = parse_ini_file(FindFile("config/SqlResult.ini"));
-        $dsn = $ini['imdb'];
-        if ($DBParams['dbtype'] == 'SQL') {
-            $this->_dbh = DB::connect($dsn);
-            $this->_dbtype = "PearDB";
-        } else {
-            if ($DBParams['dbtype'] != 'ADODB') {
-                // require_once('lib/WikiDB/adodb/adodb-errorhandler.inc.php');
-                require_once 'lib/WikiDB/adodb/adodb-pear.inc.php';
-            }
-            $parsed = parseDSN($dsn);
-            $this->_dbh = &ADONewConnection($parsed['phptype']);
-            $conn = $this->_dbh->Connect($parsed['hostspec'], $parsed['username'],
-                $parsed['password'], $parsed['database']);
-            $this->_dbtype = "ADODB";
-        }
-        $this->_title_1_1 = array
-        ("business", "moviebudgets", "colorinfo", "mpaaratingsreasons");
-        $this->_title_1_n = array
-        ("akatitles", "alternateversions",
-            "miscellaneouscompanies", "moviecountries",
-            "certificates", "completecast", "completecrew", "crazycredits",
-            "genres", "goofs", "keywords", "movielinks", "plot", "quotes", "ratings", "soundtracks",
-            "specialeffectscompanies",
-            "taglines", "trivia", "distributors", "language", "laserdisc", "literature",
-            "locations", "miscellaneouscompanies",
-            "productioncompanies", "releasedates", "runningtimes", "soundmix", "technical"
-        );
-    }
-
-    /* key accessors. return a hash */
-    function title($title_id)
-    {
-        $result = $this->_dbh->genericSqlIter("SELECT m.title, m.date FROM movies as m WHERE m.title_id = '$title_id'");
-        return $result->next();
-    }
-
-    function name($name_id)
-    {
-        $result = $this->_dbh->genericSqlIter
-        ("SELECT n.name, b.* "
-            . " FROM name AS n"
-            . " LEFT JOIN biographies AS b USING (name_id)"
-            . " WHERE n.name_id = '$name_id' ");
-        return $result->next();
-    }
-
-    /* main movie information, with just the top names */
-    /* 1:1 title info: moviebudgets, colorinfo, business? */
-    function movie($title_id)
-    {
-        $result = $this->_dbh->genericSqlIter("SELECT m.title, m.date"
-            . " FROM movies as m"
-            . " WHERE m.title_id = '$title_id'");
-        $movie = $result->next();
-        $movie['title_id'] = $title_id;
-        /* add the individual results to hash */
-        foreach (array_merge($this->_title_1_1, $this->_title_1_n) as $accessor) {
-            if (method_exists($this, $accessor))
-                $iter = $this->$accessor($title_id);
-            else
-                $iter = $this->_titleQuery($accessor, $accessor, $title_id);
-            while ($row = $iter->next()) {
-                $movie[$accessor][] = $row;
-            }
-        }
-        // add the names also?
-        return $movie;
-    }
-
-    function movie_main($title_id)
-    {
-        return movie($title_id);
-    }
-
-    /* full movie information, with full cast and crew */
-    function movie_full($title_id)
-    {
-        $movie = $this->movie($title_id);
-        /* add the individual results to hash */
-        foreach (array_merge($this->_cast, $this->_crew) as $accessor) {
-            if (method_exists($this, $accessor))
-                $iter = $this->$accessor($title_id);
-            else
-                $iter = $this->_titleQuery($accessor, $accessor, $title_id);
-            while ($row = $iter->next()) {
-                $movie[$accessor][] = $row;
-            }
-        }
-        return $movie;
-    }
-
-    /* combined movie information */
-    function movie_combined($title_id)
-    {
-        $movie = $this->movie($title_id);
-        /* add the individual results to hash */
-        foreach (array_merge($this->_combined) as $accessor) {
-            if (method_exists($this, $accessor))
-                $iter = $this->$accessor($title_id);
-            else
-                $iter = $this->_titleQuery($accessor, $accessor, $title_id);
-            while ($row = $iter->next()) {
-                $movie[$accessor][] = $row;
-            }
-        }
-        return $movie;
-    }
-
-    /* movie company_credits information */
-    function movie_company_credits($title_id)
-    {
-        $movie = $this->movie($title_id);
-        /* add the individual results to hash */
-        foreach (array_merge($this->_company_credits) as $accessor) {
-            if (method_exists($this, $accessor))
-                $iter = $this->$accessor($title_id);
-            else
-                $iter = $this->_titleQuery($accessor, $accessor, $title_id);
-            while ($row = $iter->next()) {
-                $movie[$accessor][] = $row;
-            }
-        }
-        return $movie;
-    }
-
-    /* 1:n title subselects: possibly multiple rows per title */
-    /* accessors with same field and tablename are not needed */
-    function _titleQuery($field, $table, $title_id)
-    {
-        return $this->_dbh->genericSqlIter
-        ("SELECT $field FROM $table WHERE title_id = '$title_id'");
-    }
-
-    function akatitles($title_id)
-    {
-        return $this->_titleQuery("akatitle", "akatitles", $title_id);
-    }
-
-    function business($title_id)
-    {
-        return $this->_titleQuery("*", "business", $title_id);
-    }
-
-    function moviebudgets($title_id)
-    {
-        return $this->_titleQuery("b.currency, b.budget, b.info", "moviebudgets as b", $title_id);
-    }
-
-    function completecast($title_id)
-    {
-        return $this->_titleQuery("cast", "completecast", $title_id);
-    }
-
-    function completecrew($title_id)
-    {
-        return $this->_titleQuery("crew", "completecrew", $title_id);
-    }
-
-    function genres($title_id)
-    {
-        return $this->_titleQuery("genre", "genres", $title_id);
-    }
-
-    /* how many rows? */
-    function goofs($title_id)
-    {
-        return $this->_titleQuery("text", "goofs", $title_id);
-    }
-
-    /* how many rows? */
-    function keywords($title_id)
-    {
-        return $this->_titleQuery("keyword", "keywords", $title_id);
-    }
-
-    // (ml_id, description) values (1, 'followed by');
-    function movielinks($title_id)
-    {
-        return $this->_dbh->genericSqlIter
-        ("SELECT m.title,ml.description, mref.title AS title_ref"
-            . " FROM movielinks AS l, ml, movies as m, movies AS mref"
-            . " WHERE l.title_ref = mref.title_id AND l.title_id = mref.title_id"
-            . " AND l.ml_id = ml.ml_id AND l.title_id = '$title_id'");
-    }
-
-    /* how many rows? */
-    function plot($title_id)
-    {
-        return $this->_titleQuery("*", "plot", $title_id);
-    }
-
-    /* how many rows? */
-    function quotes($title_id)
-    {
-        return $this->_titleQuery("*", "quotes", $title_id);
-    }
-
-    /* TODO: how? */
-    function ratings($title_id)
-    {
-        return $this->_titleQuery("*", "ratings", $title_id);
-    }
-
-    function soundtracks($title_id)
-    {
-        return $this->_titleQuery("*", "soundtracks", $title_id);
-    }
-
-    function specialeffectscompanies($title_id)
-    {
-        return $this->_titleQuery("*", "specialeffectscompanies", $title_id);
-    }
-
-    /* how many rows? */
-    function taglines($title_id)
-    {
-        return $this->_titleQuery("content", "taglines", $title_id);
-    }
-
-    /* how many rows? */
-    function trivia($title_id)
-    {
-        return $this->_titleQuery("content", "trivia", $title_id);
-    }
-
-    function distributors($title_id)
-    {
-        return $this->_titleQuery("distributor", "distributors", $title_id);
-    }
-
-    function language($title_id)
-    {
-        return $this->_titleQuery("language", "language", $title_id);
-    }
-
-    function laserdisc($title_id)
-    {
-        return $this->_titleQuery("content", "laserdisc", $title_id);
-    }
-
-    function literature($title_id)
-    {
-        return $this->_titleQuery("literature", "literature", $title_id);
-    }
-
-    function locations($title_id)
-    {
-        return $this->_titleQuery("location", "locations", $title_id);
-    }
-
-    function miscellaneouscompanies($title_id)
-    {
-        return $this->_titleQuery("company", "miscellaneouscompanies", $title_id);
-    }
-
-    function mpaaratingsreasons($title_id)
-    {
-        return $this->_titleQuery("mpaarating", "mpaaratingsreasons", $title_id);
-    }
-
-    function productioncompanies($title_id)
-    {
-        return $this->_titleQuery("company", "productioncompanies", $title_id);
-    }
-
-    function soundmix($title_id)
-    {
-        return $this->_titleQuery("soundmix", "soundmix", $title_id);
-    }
-
-    function technical($title_id)
-    {
-        return $this->_titleQuery("technical", "technical", $title_id);
-    }
-
-    function releasedates($title_id)
-    {
-        return $this->_dbh->genericSqlIter
-        ("SELECT c.country,r.releasedate,r.info"
-            . " FROM country as c, releasedates AS r"
-            . " WHERE c.country_id = r.country_id AND r.title_id = '$title_id'");
-    }
-
-    function runningtimes($title_id)
-    {
-        return $this->_dbh->genericSqlIter
-        ("SELECT c.country,r.time,,r.info"
-            . " FROM country as c, runningtimes AS r"
-            . " WHERE c.country_id = r.country_id AND r.title_id = '$title_id'");
-    }
-
-    function moviecountries($title_id)
-    {
-        return $this->_dbh->genericSqlIter
-        ("SELECT c.country FROM country AS c, moviecountries AS m"
-            . " WHERE c.country_id = m.country_id AND m.title_id = '$title_id'");
-    }
-
-    function certificates($title_id)
-    {
-        return $this->_dbh->genericSqlIter
-        ("SELECT co.country, c.certificate, c.info"
-            . " FROM country as co, certificates as c"
-            . " WHERE co.country_id = c.country_id AND c.title_id = '$title_id'"
-            . " GROUP BY c.country_id");
-    }
-
-    /* 1:n name subselects: possibly multiple rows per name */
-    /*
-create table akanames (name_id integer unsigned not null, akaname varchar(255) not null);
-create table biographies (name_id integer unsigned not null, RN text, NK text, DB text, DD text, HT text, BG text, BO text, BT text, PI text, OW text, TR text, QU text, SA text, WN text, SP text, TM text, IT text, AT text, PT text, CV text, AG text, primary key (name_id));
-create table guestappearances (name_id integer unsigned not null, title_id integer unsigned not null, role varchar(255));
-create table characters (name_id integer unsigned not null, title_id integer unsigned not null, role varchar(255), position integer unsigned, job_id tinyint unsigned not null);
-     */
-    function akanames($name_id)
-    {
-        return $this->_dbh->genericSqlIter
-        ("SELECT akanames FROM akanames WHERE name_id = '$name_id'");
-    }
-
-    function guestappearances($name_id)
-    {
-        return $this->_dbh->genericSqlIter
-        ("SELECT g.role, m.movie, m.date"
-            . " FROM guestappearances as g"
-            . " WHERE g.name_id = '$name_id' AND g.title_id = m.title_id");
-    }
-
-    function biographies($name_id)
-    {
-        return $this->_dbh->genericSqlIter
-        ("SELECT n.name, b.*"
-            . " FROM name as n"
-            . " LEFT JOIN biographies as b USING (name_id)"
-            . " WHERE n.name_id = '$name_id' ");
-    }
-
-    /* Search functions */
-    function searchTitle($title)
-    {
-        return $this->_search($title, '_sql_title_clause',
-            "SELECT m.title_id, m.title, m.date" .
-                " FROM movies as m" .
-                " WHERE ",
-            "ORDER BY m.date DESC");
-    }
-
-    function searchName($name)
-    {
-        return $this->_search($name, '_sql_name_clause',
-            "SELECT n.name_id, n.name, j.description, c.role, m.title_id, m.title" .
-                " FROM names as n, jobs as j, characters as c, movies as m" .
-                " WHERE n.name_id = c.name_id" .
-                " AND m.title_id = c.title_id" .
-                " AND c.job_id = j.job_id" .
-                " AND ",
-            "GROUP BY m.title_id ORDER BY j.description");
-    }
-
-    /* Search helpers */
-    // quote the LIKE argument and construct the WHERE clause
-    function _sql_match_clause($field, $word)
-    {
-        //not sure if we need this.  ADODB may do it for us
-        $word = preg_replace('/(?=[%_\\\\])/', "\\", $word);
-        // (we need it for at least % and _ --- they're the wildcard characters
-        //  for the LIKE operator, and we need to quote them if we're searching
-        //  for literal '%'s or '_'s.  --- I'm not sure about \, but it seems to
-        //  work as is.
-        $word = $this->_dbh->qstr("%" . strtolower($word) . "%");
-        return "LOWER($field) LIKE $word";
-    }
-
-    function _sql_title_clause($word)
-    {
-        return $this->_sql_match_clause("title", $word);
-    }
-
-    function _sql_name_clause($word)
-    {
-        return $this->_sql_match_clause("name", $word);
-    }
-
-    function _search($what, $callback_fn, $query, $order = '')
-    {
-        include_once 'lib/TextSearchQuery.php';
-        // $dbh = $GLOBALS['request']->getDbh();
-        //TODO: check if the db is mysql resp. capable of google like search.
-        //      postgresql tsearch2 for example
-        // See TextSearchQuery.php
-        $search = new TextSearchQuery($what);
-        $callback = new WikiMethodCb($this, $callback_fn);
-        $search_clause = $search->makeSqlClause($callback);
-        $result = $this->_dbh->genericSqlIter($query . " " . $search_clause . " " . $order);
-    }
-
-    /*
-// all movies with actor:
-SELECT m.title, m.date, n.name, c.role
-  FROM movies as m, names as n, jobs as j, characters as c
-  WHERE n.name LIKE "%%where%%"
-  AND m.title_id = c.title_id
-  AND n.name_id = c.name_id
-  AND c.job_id = j.job_id
-  AND j.description = 'Actor'
-  ORDER BY m.date DESC
-    */
-
-}
-
-// Local Variables:
-// mode: php
-// tab-width: 8
-// c-basic-offset: 4
-// c-hanging-comment-ender-p: nil
-// indent-tabs-mode: nil
-// End:

Deleted: trunk/lib/plugin/Imdb.php
===================================================================
--- trunk/lib/plugin/Imdb.php	2013-09-03 09:39:16 UTC (rev 8835)
+++ trunk/lib/plugin/Imdb.php	2013-09-03 09:39:54 UTC (rev 8836)
@@ -1,113 +0,0 @@
-<?php
-
-/*
- * Copyright 2004 $ThePhpWikiProgrammingTeam
- *
- * This file is (not yet) 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.
- */
-
-/**
- * Query results from a local imdb copy.
- * see amdbfront for the conversion.
- * "imdb = mysql://user:pass@localhost/imdb" in lib/plugin/SqlResult.ini
- *
- * Queries:
- * <<Imdb query=movie_main title||="Sample Movie (2002)" >>
- * <<Imdb query=movie_combined title||="Sample Movie (2002)" >>
- * <<Imdb query=movie_full title||="Sample Movie (2002)" >>
- * <<Imdb query=movie_company_credits title||="Sample Movie (2002)" >>
- * <<Imdb query=name name||="Lastname, Firstname (I)" >>
- * More title queries:
- *  business, moviebudgets, colorinfo, mpaaratingsreasons,
- *  akatitles, alternateversions, miscellaneouscompanies, moviecountries,
- *  certificates, completecast, completecrew, crazycredits, genres, goofs,
- *  keywords, movielinks, plot, quotes, ratings, soundtracks, specialeffectscompanies,
- *  taglines, trivia, distributors, language, laserdisc, literature, locations,
- *  miscellaneouscompanies, productioncompanies, releasedates, runningtimes, soundmix,
- *  technical
- * More name queries:
- *   akanames, guestappearances, biographies
- *   job.descriptions
- *
- * @author: ReiniUrban
- */
-
-include_once 'lib/plugin/SqlResult.php';
-
-class WikiPlugin_Imdb
-    extends WikiPlugin_SqlResult
-{
-    function getDescription()
-    {
-        return _("Query a local imdb database.");
-    }
-
-    function getDefaultArguments()
-    {
-        return array(
-            'query' => false, // what
-            'template' => false, // TODO: use a custom <theme>/template.tmpl for the result
-            'where' => false, // custom filter for the query
-            'title' => false, // custom filter for the query
-            'name' => false, // custom filter for the query
-            'sortby' => false, // for paging, default none
-            'limit' => false, // for paging, default: only the first 50
-        );
-    }
-
-    function run($dbi, $argstr, &$request, $basepage)
-    {
-        $args = $this->getArgs($argstr, $request);
-        extract($args);
-        include_once 'lib/imdb.php';
-        $imdb = new imdb();
-
-        if (method_exists($imdb, $query)) {
-            $SqlResult = $imdb->$query($title ? $title : $name);
-        } else {
-            $SqlResult = array();
-        }
-
-        // if ($limit) ; // TODO: fill paging vars (see PageList)
-        if ($ordered) {
-            $html = HTML::ol(array('class' => 'sqlresult'));
-            foreach ($SqlResult as $row) {
-                $html->pushContent(HTML::li(array('class' => $i++ % 2 ? 'evenrow' : 'oddrow'), $row[0]));
-            }
-        } else {
-            $html = HTML::table(array('class' => 'sqlresult'));
-            $i = 0;
-            foreach ($SqlResult as $row) {
-                $tr = HTML::tr(array('class' => $i++ % 2 ? 'evenrow' : 'oddrow'));
-                foreach ($row as $col) {
-                    $tr->pushContent(HTML::td($col));
-                }
-                $html->pushContent($tr);
-            }
-        }
-        // if ($limit) ; // do paging via pagelink template
-        return $html;
-    }
-}
-
-// Local Variables:
-// mode: php
-// tab-width: 8
-// c-basic-offset: 4
-// c-hanging-comment-ender-p: nil
-// indent-tabs-mode: nil
-// End:

Modified: trunk/lib/plugin/WikiTranslation.php
===================================================================
--- trunk/lib/plugin/WikiTranslation.php	2013-09-03 09:39:16 UTC (rev 8835)
+++ trunk/lib/plugin/WikiTranslation.php	2013-09-03 09:39:54 UTC (rev 8836)
@@ -109,7 +109,6 @@
     _("HelloWorldPlugin") . ',' .
     _("HomePageAlias") . ',' .
     _("HtmlConverter") . ',' .
-    _("Imdb") . ',' .
     _("IncludePage") . ',' .
     _("IncludePagePlugin") . ',' .
     _("IncludePages") . ',' .

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

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

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

Revision: 8835
          http://sourceforge.net/p/phpwiki/code/8835
Author:   vargenau
Date:     2013-09-03 09:39:16 +0000 (Tue, 03 Sep 2013)
Log Message:
-----------
Remove IMDB stuff

Modified Paths:
--------------
    trunk/locale/Makefile
    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/Makefile
===================================================================
--- trunk/locale/Makefile	2013-07-18 09:20:00 UTC (rev 8834)
+++ trunk/locale/Makefile	2013-09-03 09:39:16 UTC (rev 8835)
@@ -115,7 +115,6 @@
 ${POT_FILE}: ../lib/HtmlParser.php
 ${POT_FILE}: ../lib/HttpClient.php
 ${POT_FILE}: ../lib/imagecache.php
-${POT_FILE}: ../lib/imdb.php
 ${POT_FILE}: ../lib/IniConfig.php
 ${POT_FILE}: ../lib/InlineParser.php
 ${POT_FILE}: ../lib/install.php
@@ -170,7 +169,6 @@
 ${POT_FILE}: ../lib/plugin/GraphViz.php
 ${POT_FILE}: ../lib/plugin/HelloWorld.php
 ${POT_FILE}: ../lib/plugin/HtmlConverter.php
-${POT_FILE}: ../lib/plugin/Imdb.php
 ${POT_FILE}: ../lib/plugin/IncludePage.php
 ${POT_FILE}: ../lib/plugin/IncludePages.php
 ${POT_FILE}: ../lib/plugin/IncludeSiteMap.php

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	2013-07-18 09:20:00 UTC (rev 8834)
+++ trunk/locale/po/de.po	2013-09-03 09:39:16 UTC (rev 8835)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-28 14:17+0200\n"
+"POT-Creation-Date: 2013-09-03 11:38+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -1798,9 +1798,6 @@
 msgid "Copy the output below and paste it into your Wiki page."
 msgstr ""
 
-msgid "Query a local imdb database."
-msgstr ""
-
 msgid "Include text from another wiki page."
 msgstr "Text von einer andere Seite einfügen."
 
@@ -2422,13 +2419,21 @@
 msgstr "Keine Seite angegeben"
 
 #, php-format
-msgid "Rating: %s (%d vote"
-msgstr ""
-
-#, php-format
 msgid "Your rating was %.1f"
 msgstr "Deine Bewertung war %.1f"
 
+# (Wrong Translation; sorry, but the German term for edit is NOT
+# editieren, but  e d i e r e n).
+#, fuzzy, php-format
+msgid "Prediction: %s"
+msgstr "Bearbeite: %s"
+
+# (Wrong Translation; sorry, but the German term for edit is NOT
+# editieren, but  e d i e r e n).
+#, fuzzy, php-format
+msgid "Prediction: %.1f"
+msgstr "Bearbeite: %s"
+
 msgid "RateIt"
 msgstr "BewerteEs"
 
@@ -4080,9 +4085,6 @@
 msgid "HtmlConverter"
 msgstr "HtmlKonvertieren"
 
-msgid "Imdb"
-msgstr ""
-
 msgid "IncludePage"
 msgstr "SeiteEinfügen"
 
@@ -6092,13 +6094,7 @@
 #~ msgid "Original (1.2 or 1.0)"
 #~ msgstr "Original (1,2 oder 1,0)"
 
-# (Wrong Translation; sorry, but the German term for edit is NOT
-# editieren, but  e d i e r e n).
 #, fuzzy
-#~ msgid "Prediction: %s"
-#~ msgstr "Bearbeite: %s"
-
-#, fuzzy
 #~ msgid "%s not found"
 #~ msgstr "%s nicht gefunden"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2013-07-18 09:20:00 UTC (rev 8834)
+++ trunk/locale/po/es.po	2013-09-03 09:39:16 UTC (rev 8835)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-28 14:17+0200\n"
+"POT-Creation-Date: 2013-09-03 11:38+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -1764,9 +1764,6 @@
 msgid "Copy the output below and paste it into your Wiki page."
 msgstr ""
 
-msgid "Query a local imdb database."
-msgstr ""
-
 msgid "Include text from another wiki page."
 msgstr ""
 
@@ -2356,13 +2353,17 @@
 msgstr ""
 
 #, php-format
-msgid "Rating: %s (%d vote"
-msgstr ""
-
-#, php-format
 msgid "Your rating was %.1f"
 msgstr ""
 
+#, fuzzy, php-format
+msgid "Prediction: %s"
+msgstr "Editar: %s"
+
+#, fuzzy, php-format
+msgid "Prediction: %.1f"
+msgstr "Editar: %s"
+
 msgid "RateIt"
 msgstr ""
 
@@ -3967,9 +3968,6 @@
 msgid "HtmlConverter"
 msgstr "HtmlConvertido"
 
-msgid "Imdb"
-msgstr ""
-
 msgid "IncludePage"
 msgstr ""
 
@@ -5902,10 +5900,6 @@
 #~ msgstr "Versión %s"
 
 #, fuzzy
-#~ msgid "Prediction: %s"
-#~ msgstr "Editar: %s"
-
-#, fuzzy
 #~ msgid "%s not found"
 #~ msgstr "fichero %s no encontrado"
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2013-07-18 09:20:00 UTC (rev 8834)
+++ trunk/locale/po/fr.po	2013-09-03 09:39:16 UTC (rev 8835)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-28 14:17+0200\n"
+"POT-Creation-Date: 2013-09-03 11:38+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1768,9 +1768,6 @@
 msgid "Copy the output below and paste it into your Wiki page."
 msgstr ""
 
-msgid "Query a local imdb database."
-msgstr ""
-
 msgid "Include text from another wiki page."
 msgstr "Inclure le texte d'une autre page wiki."
 
@@ -2373,13 +2370,17 @@
 msgstr "aucune page indiquée"
 
 #, php-format
-msgid "Rating: %s (%d vote"
-msgstr ""
-
-#, php-format
 msgid "Your rating was %.1f"
 msgstr "Votre note est %.1f"
 
+#, php-format
+msgid "Prediction: %s"
+msgstr "Prédiction : %s"
+
+#, php-format
+msgid "Prediction: %.1f"
+msgstr "Prédiction : %.1f"
+
 msgid "RateIt"
 msgstr "ClassezLa"
 
@@ -4016,9 +4017,6 @@
 msgid "HtmlConverter"
 msgstr "ConvertisseurHtml"
 
-msgid "Imdb"
-msgstr "Imdb"
-
 msgid "IncludePage"
 msgstr "InclureUnePage"
 
@@ -5981,15 +5979,12 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid "Imdb"
+#~ msgstr "Imdb"
+
 #~ msgid "Version %s"
 #~ msgstr "Version %s"
 
-#~ msgid "Prediction: %s"
-#~ msgstr "Prédiction : %s"
-
-#~ msgid "Prediction: %.1f"
-#~ msgstr "Prédiction : %.1f"
-
 #, fuzzy
 #~ msgid "%s not found"
 #~ msgstr "%s non trouvé dans %s"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2013-07-18 09:20:00 UTC (rev 8834)
+++ trunk/locale/po/it.po	2013-09-03 09:39:16 UTC (rev 8835)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-28 14:17+0200\n"
+"POT-Creation-Date: 2013-09-03 11:38+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -1746,9 +1746,6 @@
 msgid "Copy the output below and paste it into your Wiki page."
 msgstr ""
 
-msgid "Query a local imdb database."
-msgstr ""
-
 msgid "Include text from another wiki page."
 msgstr ""
 
@@ -2334,13 +2331,17 @@
 msgstr ""
 
 #, php-format
-msgid "Rating: %s (%d vote"
-msgstr ""
-
-#, php-format
 msgid "Your rating was %.1f"
 msgstr ""
 
+#, fuzzy, php-format
+msgid "Prediction: %s"
+msgstr "Modifica: %s"
+
+#, fuzzy, php-format
+msgid "Prediction: %.1f"
+msgstr "Modifica: %s"
+
 msgid "RateIt"
 msgstr ""
 
@@ -3933,9 +3934,6 @@
 msgid "HtmlConverter"
 msgstr "HtmlConvertito"
 
-msgid "Imdb"
-msgstr ""
-
 msgid "IncludePage"
 msgstr "InserireLaPagina"
 
@@ -5840,10 +5838,6 @@
 #~ msgstr "Versione %s"
 
 #, fuzzy
-#~ msgid "Prediction: %s"
-#~ msgstr "Modifica: %s"
-
-#, fuzzy
 #~ msgid "%s not found"
 #~ msgstr "file %s non trovato"
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2013-07-18 09:20:00 UTC (rev 8834)
+++ trunk/locale/po/ja.po	2013-09-03 09:39:16 UTC (rev 8835)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-28 14:17+0200\n"
+"POT-Creation-Date: 2013-09-03 11:38+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1768,9 +1768,6 @@
 msgid "Copy the output below and paste it into your Wiki page."
 msgstr ""
 
-msgid "Query a local imdb database."
-msgstr ""
-
 msgid "Include text from another wiki page."
 msgstr ""
 
@@ -2367,13 +2364,17 @@
 msgstr ""
 
 #, php-format
-msgid "Rating: %s (%d vote"
-msgstr ""
-
-#, php-format
 msgid "Your rating was %.1f"
 msgstr ""
 
+#, fuzzy, php-format
+msgid "Prediction: %s"
+msgstr "編集: %s"
+
+#, fuzzy, php-format
+msgid "Prediction: %.1f"
+msgstr "編集: %s"
+
 msgid "RateIt"
 msgstr ""
 
@@ -4052,9 +4053,6 @@
 msgid "HtmlConverter"
 msgstr ""
 
-msgid "Imdb"
-msgstr ""
-
 #, fuzzy
 msgid "IncludePage"
 msgstr "インライン画像一覧"
@@ -6131,14 +6129,6 @@
 #~ msgstr "バージョン %s"
 
 #, fuzzy
-#~ msgid "Prediction: %s"
-#~ msgstr "編集: %s"
-
-#, fuzzy
-#~ msgid "Prediction: %.1f"
-#~ msgstr "編集: %s"
-
-#, fuzzy
 #~ msgid "%s not found"
 #~ msgstr "%s: ファイルが見つかりません。"
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2013-07-18 09:20:00 UTC (rev 8834)
+++ trunk/locale/po/nl.po	2013-09-03 09:39:16 UTC (rev 8835)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-28 14:17+0200\n"
+"POT-Creation-Date: 2013-09-03 11:38+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -1738,9 +1738,6 @@
 msgid "Copy the output below and paste it into your Wiki page."
 msgstr ""
 
-msgid "Query a local imdb database."
-msgstr ""
-
 msgid "Include text from another wiki page."
 msgstr ""
 
@@ -2326,13 +2323,17 @@
 msgstr ""
 
 #, php-format
-msgid "Rating: %s (%d vote"
-msgstr ""
-
-#, php-format
 msgid "Your rating was %.1f"
 msgstr ""
 
+#, fuzzy, php-format
+msgid "Prediction: %s"
+msgstr "Verander: %s"
+
+#, fuzzy, php-format
+msgid "Prediction: %.1f"
+msgstr "Verander: %s"
+
 msgid "RateIt"
 msgstr ""
 
@@ -3925,9 +3926,6 @@
 msgid "HtmlConverter"
 msgstr ""
 
-msgid "Imdb"
-msgstr ""
-
 msgid "IncludePage"
 msgstr ""
 
@@ -5826,10 +5824,6 @@
 msgstr ""
 
 #, fuzzy
-#~ msgid "Prediction: %s"
-#~ msgstr "Verander: %s"
-
-#, fuzzy
 #~ msgid "period"
 #~ msgstr "versie %d"
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2013-07-18 09:20:00 UTC (rev 8834)
+++ trunk/locale/po/phpwiki.pot	2013-09-03 09:39:16 UTC (rev 8835)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-28 14:17+0200\n"
+"POT-Creation-Date: 2013-09-03 11:38+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1732,9 +1732,6 @@
 msgid "Copy the output below and paste it into your Wiki page."
 msgstr ""
 
-msgid "Query a local imdb database."
-msgstr ""
-
 msgid "Include text from another wiki page."
 msgstr ""
 
@@ -2320,13 +2317,17 @@
 msgstr ""
 
 #, php-format
-msgid "Rating: %s (%d vote"
+msgid "Your rating was %.1f"
 msgstr ""
 
 #, php-format
-msgid "Your rating was %.1f"
+msgid "Prediction: %s"
 msgstr ""
 
+#, php-format
+msgid "Prediction: %.1f"
+msgstr ""
+
 msgid "RateIt"
 msgstr ""
 
@@ -3919,9 +3920,6 @@
 msgid "HtmlConverter"
 msgstr ""
 
-msgid "Imdb"
-msgstr ""
-
 msgid "IncludePage"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2013-07-18 09:20:00 UTC (rev 8834)
+++ trunk/locale/po/sv.po	2013-09-03 09:39:16 UTC (rev 8835)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-28 14:17+0200\n"
+"POT-Creation-Date: 2013-09-03 11:38+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -1733,9 +1733,6 @@
 msgid "Copy the output below and paste it into your Wiki page."
 msgstr ""
 
-msgid "Query a local imdb database."
-msgstr ""
-
 msgid "Include text from another wiki page."
 msgstr ""
 
@@ -2321,13 +2318,17 @@
 msgstr ""
 
 #, php-format
-msgid "Rating: %s (%d vote"
-msgstr ""
-
-#, php-format
 msgid "Your rating was %.1f"
 msgstr ""
 
+#, fuzzy, php-format
+msgid "Prediction: %s"
+msgstr "Redigera: %s"
+
+#, fuzzy, php-format
+msgid "Prediction: %.1f"
+msgstr "Redigera: %s"
+
 msgid "RateIt"
 msgstr ""
 
@@ -3920,9 +3921,6 @@
 msgid "HtmlConverter"
 msgstr ""
 
-msgid "Imdb"
-msgstr ""
-
 msgid "IncludePage"
 msgstr ""
 
@@ -5819,10 +5817,6 @@
 msgstr ""
 
 #, fuzzy
-#~ msgid "Prediction: %s"
-#~ msgstr "Redigera: %s"
-
-#, fuzzy
 #~ msgid "%s not found"
 #~ msgstr "%s: fila ingen funna"
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2013-07-18 09:20:00 UTC (rev 8834)
+++ trunk/locale/po/zh.po	2013-09-03 09:39:16 UTC (rev 8835)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-28 14:17+0200\n"
+"POT-Creation-Date: 2013-09-03 11:38+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -1816,9 +1816,6 @@
 msgid "Copy the output below and paste it into your Wiki page."
 msgstr ""
 
-msgid "Query a local imdb database."
-msgstr ""
-
 msgid "Include text from another wiki page."
 msgstr "從其他 wiki 頁面含括文字."
 
@@ -2438,13 +2435,17 @@
 msgstr "沒有指定頁面"
 
 #, php-format
-msgid "Rating: %s (%d vote"
-msgstr ""
-
-#, php-format
 msgid "Your rating was %.1f"
 msgstr "你的評比是 %.1f"
 
+#, fuzzy, php-format
+msgid "Prediction: %s"
+msgstr "編輯: %s"
+
+#, fuzzy, php-format
+msgid "Prediction: %.1f"
+msgstr "編輯: %s"
+
 msgid "RateIt"
 msgstr ""
 
@@ -4153,9 +4154,6 @@
 msgid "HtmlConverter"
 msgstr "內容"
 
-msgid "Imdb"
-msgstr ""
-
 msgid "IncludePage"
 msgstr "含括頁面"
 
@@ -6247,14 +6245,6 @@
 #~ msgstr "原始 (1.2 或 1.0)"
 
 #, fuzzy
-#~ msgid "Prediction: %s"
-#~ msgstr "編輯: %s"
-
-#, fuzzy
-#~ msgid "Prediction: %.1f"
-#~ msgstr "編輯: %s"
-
-#, fuzzy
 #~ msgid "%s not found"
 #~ 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:[8834] trunk/lib/PageList.php

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

Revision: 8834
          http://sourceforge.net/p/phpwiki/code/8834
Author:   vargenau
Date:     2013-07-18 09:20:00 +0000 (Thu, 18 Jul 2013)
Log Message:
-----------
Add braces

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

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2013-07-18 09:19:23 UTC (rev 8833)
+++ trunk/lib/PageList.php	2013-07-18 09:20:00 UTC (rev 8834)
@@ -1099,8 +1099,12 @@
     function explodePageList($input, $include_empty = false, $sortby = '',
                              $limit = '', $exclude = '')
     {
-        if (empty($input)) return array();
-        if (is_array($input)) return $input;
+        if (empty($input)) {
+            return array();
+        }
+        if (is_array($input)) {
+            return $input;
+        }
         // expand wildcards from list of all pages
         if (preg_match('/[\?\*]/', $input) or substr($input, 0, 1) == "^") {
             include_once 'lib/TextSearchQuery.php';

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8833] trunk/lib/plugin/WikiAdminSelect.php

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

Revision: 8833
          http://sourceforge.net/p/phpwiki/code/8833
Author:   vargenau
Date:     2013-07-18 09:19:23 +0000 (Thu, 18 Jul 2013)
Log Message:
-----------
protected

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

Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php	2013-07-17 12:08:03 UTC (rev 8832)
+++ trunk/lib/plugin/WikiAdminSelect.php	2013-07-18 09:19:23 UTC (rev 8833)
@@ -62,7 +62,7 @@
      * Default collector for all WikiAdmin* plugins.
      * preSelectS() is similar, but fills $this->_list
      */
-    function collectPages(&$list, &$dbi, $sortby, $limit = 0, $exclude = '')
+    protected function collectPages(&$list, &$dbi, $sortby, $limit = 0, $exclude = '')
     {
         $allPages = $dbi->getAllPages(0, $sortby, $limit, $exclude);
         while ($pagehandle = $allPages->next()) {
@@ -80,17 +80,20 @@
      * 'only: forgot what the difference to 's' was.
      * Sets $this->_list, which is picked up by collectPages() and is a default for p[]
      */
-    function preSelectS(&$args, &$request)
+    protected function preSelectS(&$args, &$request)
     {
         // override plugin argument by GET: probably not needed if s||="" is used
         // anyway, we force it for unique interface.
-        if (!empty($request->getArg['s']))
+        if (!empty($request->getArg['s'])) {
             $args['s'] = $request->getArg['s'];
-        if (!empty($args['owner']))
+        }
+        if (!empty($args['owner'])) {
             $sl = PageList::allPagesByOwner($args['owner'], false, $args['sortby'], $args['limit'], $args['exclude']);
-        elseif (!empty($args['author']))
-            $sl = PageList::allPagesByAuthor($args['author'], false, $args['sortby'], $args['limit'], $args['exclude']); elseif (!empty($args['creator']))
-            $sl = PageList::allPagesByCreator($args['creator'], false, $args['sortby'], $args['limit'], $args['exclude']); elseif (!empty($args['s']) or !empty($args['only'])) {
+        } elseif (!empty($args['author'])) {
+            $sl = PageList::allPagesByAuthor($args['author'], false, $args['sortby'], $args['limit'], $args['exclude']);
+        } elseif (!empty($args['creator'])) {
+            $sl = PageList::allPagesByCreator($args['creator'], false, $args['sortby'], $args['limit'], $args['exclude']);
+        } elseif (!empty($args['s']) or !empty($args['only'])) {
             // all pages by name
             $sl = explodePageList(empty($args['only']) ? $args['s'] : $args['only']);
         }

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

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

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

Revision: 8832
          http://sourceforge.net/p/phpwiki/code/8832
Author:   vargenau
Date:     2013-07-17 12:08:03 +0000 (Wed, 17 Jul 2013)
Log Message:
-----------
Use forge_get_config('groupdir_prefix')

Modified Paths:
--------------
    trunk/g
    trunk/view.php

Modified: trunk/g
===================================================================
--- trunk/g	2013-07-09 08:02:04 UTC (rev 8831)
+++ trunk/g	2013-07-17 12:08:03 UTC (rev 8832)
@@ -117,7 +117,7 @@
 
     define('ENABLE_RATEIT', $wc->getWikiConfig('ENABLE_RATEIT'));
 
-    define('UPLOAD_FILE_PATH', '/opt/groups/'.WIKI_NAME.'/www/uploads/');
+    define('UPLOAD_FILE_PATH', forge_get_config('groupdir_prefix').'/'.WIKI_NAME.'/www/uploads/');
     // define('UPLOAD_DATA_PATH', SERVER_URL . '/www/'.WIKI_NAME.'/uploads/');
     if ($project->isPublic()) {
         define('UPLOAD_DATA_PATH', '/www/'.WIKI_NAME.'/uploads/');
@@ -225,8 +225,8 @@
     define('ENABLE_REVERSE_DNS', false);
 
     // Web DAV location
-    define('DEFAULT_DUMP_DIR', "/opt/groups/".$group_name."/wikidump/");
-    define('HTML_DUMP_DIR', "/opt/groups/".$group_name."/wikidumphtml/");
+    define('DEFAULT_DUMP_DIR', forge_get_config('groupdir_prefix').'/'.$group_name."/wikidump/");
+    define('HTML_DUMP_DIR', forge_get_config('groupdir_prefix').'/'.$group_name."/wikidumphtml/");
 
     define('COMPRESS_OUTPUT', false);
 

Modified: trunk/view.php
===================================================================
--- trunk/view.php	2013-07-09 08:02:04 UTC (rev 8831)
+++ trunk/view.php	2013-07-17 12:08:03 UTC (rev 8832)
@@ -75,7 +75,7 @@
 array_shift($arr);
 $path = join('/', $arr);
 
-$basepath = realpath('/opt/groups/' . $project->getUnixName() . '/www/uploads/');
+$basepath = realpath(forge_get_config('groupdir_prefix') .'/'. $project->getUnixName() . '/www/uploads/');
 $filepath = realpath($basepath . '/' . $path);
 $filename = basename($filepath);
 

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

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

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

Revision: 8831
          http://sourceforge.net/p/phpwiki/code/8831
Author:   vargenau
Date:     2013-07-09 08:02:04 +0000 (Tue, 09 Jul 2013)
Log Message:
-----------
Whitespace

Modified Paths:
--------------
    trunk/lib/loadsave.php
    trunk/lib/upgrade.php
    trunk/locale/de/pgsrc/AlleBenutzer
    trunk/locale/de/pgsrc/G%C3%A4steBuch
    trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin
    trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin
    trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin
    trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin
    trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin
    trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln
    trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
    trunk/locale/de/pgsrc/HochLaden
    trunk/locale/de/pgsrc/LeereSeiten
    trunk/locale/de/pgsrc/ListeSeiten
    trunk/locale/de/pgsrc/ModerierteSeite
    trunk/locale/de/pgsrc/NeuesteSeiten
    trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen
    trunk/locale/de/pgsrc/PhpWikiSystemverwalten
    trunk/locale/de/pgsrc/SeiteFinden
    trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen
    trunk/locale/de/pgsrc/Vorlage%2FBeispiel
    trunk/locale/de/pgsrc/WunschZettelSeiten
    trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo
    trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki
    trunk/locale/es/pgsrc/Ayuda%2FKBrown
    trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto
    trunk/locale/es/pgsrc/Ayuda%2FWabiSabi
    trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes
    trunk/locale/fr/pgsrc/AdministrationDePhpWiki
    trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu
    trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages
    trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques
    trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien
    trunk/locale/fr/pgsrc/Aide%2FInterWiki
    trunk/locale/fr/pgsrc/Aide%2FPlugin%C3%89diterMetaData
    trunk/locale/fr/pgsrc/Aide%2FPluginAjouterDesCommentaires
    trunk/locale/fr/pgsrc/Aide%2FPluginAlbumPhotos
    trunk/locale/fr/pgsrc/Aide%2FPluginBeauTableau
    trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde
    trunk/locale/fr/pgsrc/Aide%2FPluginCalendrier
    trunk/locale/fr/pgsrc/Aide%2FPluginColorationPhp
    trunk/locale/fr/pgsrc/Aide%2FPluginCommenter
    trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUnePage
    trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUneTdm
    trunk/locale/fr/pgsrc/Aide%2FPluginHistoriqueAuteur
    trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre
    trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnePage
    trunk/locale/fr/pgsrc/Aide%2FPluginIns%C3%A9rer
    trunk/locale/fr/pgsrc/Aide%2FPluginListeDesSousPages
    trunk/locale/fr/pgsrc/Aide%2FPluginListeDuCalendrier
    trunk/locale/fr/pgsrc/Aide%2FPluginM%C3%A9t%C3%A9oPhp
    trunk/locale/fr/pgsrc/Aide%2FPluginRechercheExterne
    trunk/locale/fr/pgsrc/Aide%2FPluginRedirection
    trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss
    trunk/locale/fr/pgsrc/Aide%2FPluginTableauAncienStyle
    trunk/locale/fr/pgsrc/Aide%2FPluginTestDeCache
    trunk/locale/fr/pgsrc/Aide%2FPluginWiki
    trunk/locale/fr/pgsrc/Aide%2FPluginWikiBlog
    trunk/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes
    trunk/locale/fr/pgsrc/Aide%2FURLMagiquesPhpWiki
    trunk/locale/fr/pgsrc/ChercherUnePage
    trunk/locale/fr/pgsrc/Derni%C3%A8resModifs
    trunk/locale/fr/pgsrc/Derni%C3%A8resModifsCompl%C3%A8tes
    trunk/locale/fr/pgsrc/InfosDeD%C3%A9bogage
    trunk/locale/fr/pgsrc/ListeDePages
    trunk/locale/fr/pgsrc/PagesFloues
    trunk/locale/fr/pgsrc/PagesRecherch%C3%A9es
    trunk/locale/fr/pgsrc/PagesSemblables
    trunk/locale/fr/pgsrc/PierrickMeignen
    trunk/locale/fr/pgsrc/Pr%C3%A9f%C3%A9rencesUtilisateurs
    trunk/locale/fr/pgsrc/R%C3%A9cup%C3%A9rationDeLaPage
    trunk/locale/fr/pgsrc/R%C3%A9troLiens
    trunk/locale/fr/pgsrc/RechercheInterWiki
    trunk/locale/fr/pgsrc/TousLesUtilisateurs
    trunk/locale/fr/pgsrc/ToutesLesPages
    trunk/locale/fr/pgsrc/TraduireUnTexte
    trunk/locale/it/pgsrc/Aiuto%2FBuonStile
    trunk/locale/it/pgsrc/Aiuto%2FComeUsareWiki
    trunk/locale/it/pgsrc/Aiuto%2FRegoleFormattazioneTesto
    trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki
    trunk/locale/it/pgsrc/NoteDiRilascio
    trunk/locale/it/pgsrc/PaginaDiProva
    trunk/locale/nl/pgsrc/Help%2FPaginasToevoegen
    trunk/locale/nl/pgsrc/Help%2FTekstFormatteringsRegels
    trunk/locale/nl/pgsrc/Help%2FToverPhpWikiURLs
    trunk/locale/nl/pgsrc/PhpWikiBeheer
    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/zh/pgsrc/Help%2FExternalSearchPlugin
    trunk/locale/zh/pgsrc/Help%2FInterWiki
    trunk/locale/zh/pgsrc/Help%2FLinkIcons
    trunk/locale/zh/pgsrc/Help%2FPhpHighlightPlugin
    trunk/locale/zh/pgsrc/PhpWikiAdministration
    trunk/pgsrc/Help%2FFacebookLikePlugin
    trunk/pgsrc/Help%2FJabberPresencePlugin
    trunk/pgsrc/Help%2FPageDumpPlugin
    trunk/pgsrc/Help%2FPhotoAlbumPlugin
    trunk/pgsrc/Help%2FTextFormattingRules
    trunk/pgsrc/Help%2FVisualWikiPlugin
    trunk/pgsrc/Help%2FWikiBlogPlugin
    trunk/pgsrc/The%20PhpWiki%20programming%20team

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/lib/loadsave.php	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1508,17 +1508,18 @@
     // Ensure that all mandatory pages are loaded
     $finder = new FileFinder;
 
-    $mandatory = array('SandBox', 
+    $mandatory = array('SandBox',
                        'Template/Category',
                        'Template/Talk',
                        'SpecialPages',
                        'CategoryCategory',
                        'CategoryActionPage',
-                       'Help/TextFormattingRules',
                        'PhpWikiAdministration');
 
     if ((defined('FUSIONFORGE') and FUSIONFORGE)) {
         $mandatory[] = 'Template/UserPage';
+    } else {
+        $mandatory[] = 'Help/TextFormattingRules';
     }
 
     $mandatory = array_merge($mandatory, $GLOBALS['AllActionPages']);

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/lib/upgrade.php	2013-07-09 08:02:04 UTC (rev 8831)
@@ -100,7 +100,7 @@
                     LoadAny($this->request, $path . "/" . $filename);
                     echo "<br />\n";
                 } else {
-                    echo "$path/$pagename" . _(": ") . _("older than the existing page.") 
+                    echo "$path/$pagename" . _(": ") . _("older than the existing page.")
                          . " " . _("Skipped."), "<br />\n";
                 }
             } else {

Modified: trunk/locale/de/pgsrc/AlleBenutzer
===================================================================
--- trunk/locale/de/pgsrc/AlleBenutzer	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/AlleBenutzer	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri,  4 Feb 2011 17:33:12 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=AlleBenutzer;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Liste aller eingetragenen Benutzer, die ihre 
+Liste aller eingetragenen Benutzer, die ihre
 BenutzerEinstellungen schon einmal gespeichert haben,
 entweder in ihrer Homepage oder - wenn so konfiguriert -
 in einer Datenbank.

Modified: trunk/locale/de/pgsrc/G%C3%A4steBuch
===================================================================
--- trunk/locale/de/pgsrc/G%C3%A4steBuch	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/G%C3%A4steBuch	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=G%C3%A4steBuch;
@@ -8,6 +8,6 @@
 
 Tragen Sie sich einfach mit Namen und Datum auf dieser Seite ein!
 
-Jeff Dairiki, Arno Hollosi, Steve Wainstead, Reini Urban, und alle weiteren  
+Jeff Dairiki, Arno Hollosi, Steve Wainstead, Reini Urban, und alle weiteren
 [PhpWiki Autoren|PhpWiki:ThePhpWikiProgrammingTeam].
 ----

Modified: trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Tue,  4 Jan 2011 11:59:41 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FAutorenProtokollPlugin;
@@ -35,7 +35,7 @@
 **author** |
   Benutzername. Vorgabe: aktueller Benutzername
 **page** |
-  Seitenname.  Vorgabe: aktuelle Seite. 
+  Seitenname.  Vorgabe: aktuelle Seite.
   Besondere Werte: page=username: page=author, page=all: Liste aller Seiten mit Änderungen dieses Benutzers.
 **info**|
   Liste der Spaltentypen. Vorgabe: version,minor,author,summary,mtime

Modified: trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FHalloWeltPlugin;
@@ -17,16 +17,16 @@
 }}}
 
 -----
-PhpWiki's Plugin Architektur erlaubt dir benutzerdefinierte HTML Elemente deinem Wiki hinzuzufügen. Du mußt nur eine neue Klasse (Unterklasse) von der ~WikiPlugin Klasse ableiten, wie mit dem Namen unterhalb, und mit der run() Methode ja nach Wiki- oder Request Argumenten die HTML Ausgabe zu erzeugen. 
+PhpWiki's Plugin Architektur erlaubt dir benutzerdefinierte HTML Elemente deinem Wiki hinzuzufügen. Du mußt nur eine neue Klasse (Unterklasse) von der ~WikiPlugin Klasse ableiten, wie mit dem Namen unterhalb, und mit der run() Methode ja nach Wiki- oder Request Argumenten die HTML Ausgabe zu erzeugen.
 
-* Entweder man erzeugt sie über die HTML Klassen, 
-* oder über ein theme Template (Vorlage). Templates sind unübersichtlicher, und Verleiten zum 
+* Entweder man erzeugt sie über die HTML Klassen,
+* oder über ein theme Template (Vorlage). Templates sind unübersichtlicher, und Verleiten zum
   Erzeugen von ungültigem XHTML code, sind aber leichter anpassbar.
 
 <<PhpHighlight
 
 /**
- * Ein einfaches Beispiels-WikiPlugin. 
+ * Ein einfaches Beispiels-WikiPlugin.
  * Name, Argumente und Texte bitte auf englisch, und erst in locale/po/de.po
  * auf Deutsch übersetzen.
  *

Modified: trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Tue,  4 Jan 2011 11:59:41 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FHochLadenPlugin;
@@ -6,13 +6,13 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Das HochLaden [[Hilfe:WikiPlugin|WikiPlugin]] zeigt eine Eingabebox und zwei Knöpfe. 
-Mit dem ersten Knopf "Durchsuchen..." kann man eine Datei aus dem 
-lokalem Dateisystem auswählen, die man hochladen möchte. 
-Der Textwert dieses Knopfes ("Durchsuchen...") hängt von Ihrem Browser ab. 
-Der zweite "HochLaden" Knopf lädt die Datei dann in das upload Verzeichnis auf dem 
+Das HochLaden [[Hilfe:WikiPlugin|WikiPlugin]] zeigt eine Eingabebox und zwei Knöpfe.
+Mit dem ersten Knopf "Durchsuchen..." kann man eine Datei aus dem
+lokalem Dateisystem auswählen, die man hochladen möchte.
+Der Textwert dieses Knopfes ("Durchsuchen...") hängt von Ihrem Browser ab.
+Der zweite "HochLaden" Knopf lädt die Datei dann in das upload Verzeichnis auf dem
 Server hoch.
-Der Inhalt dieses Verzeichnis ist geheim, jede Datei dort kann mit dem "Upload~:" 
+Der Inhalt dieses Verzeichnis ist geheim, jede Datei dort kann mit dem "Upload~:"
 [InterWikiKarte]n Prefix zum Dateinamen verwendet werden.
 So können Sie z.B. leicht hochgeladene Bilder anzeigen. Siehe PhpWiki:InlineUploadedImages
 
@@ -24,14 +24,14 @@
 === Argumente:
 **logfile**:
   Lokaler Pfad. Vorgabe: "phpwiki-upload.log"
-  Das Format ist momentan HTML - eine neue <tr> Zeile per Datei - und nicht die sonst übliche 
+  Das Format ist momentan HTML - eine neue <tr> Zeile per Datei - und nicht die sonst übliche
   Log Datei Syntax.
 **autolink**:
   Füge den hochgeladene Dateinamen zur Liste der hochgeladenen Dateien auf der Seite 'page' dazu.
   Vorgabe: true
 **page**:
-  Die Seite auf der hochgeladene Dateien aufgelistet werden, wenn 'autolink' 
-  auf true gesetzt ist. 
+  Die Seite auf der hochgeladene Dateien aufgelistet werden, wenn 'autolink'
+  auf true gesetzt ist.
   Vorgabe: current page.
 
 ==== Probleme:

Modified: trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Tue,  4 Jan 2011 11:59:41 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FNeueSeitePlugin;
@@ -8,10 +8,10 @@
 
 WikiPlugin um leicht neue Seiten zu erzeugen, optional mit vorgegebenem Inhalt. Seit v1.3.8
 
-Sie können den neuen Seitennamen von einer Eingabebox bekommen, optional mit 
+Sie können den neuen Seitennamen von einer Eingabebox bekommen, optional mit
 neuem Inhalt von einer bestehenden Vorgabe oder Kategorieseite.
 
-Schreibe "<~?plugin-form ~CreatePage ?~>" in eine Seite, zeige diese Seite an, 
+Schreibe "<~?plugin-form ~CreatePage ?~>" in eine Seite, zeige diese Seite an,
 gebe den Namen der neuen Seite an und klicke auf den NeueSeite Knopf.
 
 === Benutzung
@@ -34,7 +34,7 @@
 
 === Pläne
 
-The content might hold some variables, which will be expanded on creation. 
+The content might hold some variables, which will be expanded on creation.
 The syntax is not clear yet.
 
 === Autor
@@ -45,7 +45,7 @@
 
 <?plugin-form CreatePage s=MyHomePage ?>
 
-Siehe auch PhpWiki:EasilyCreateNewPages 
+Siehe auch PhpWiki:EasilyCreateNewPages
 
 ----
 [[PhpWikiDokumentation]] [[KategorieWikiPlugin]]

Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FPhotoAlbumPlugin;
@@ -7,9 +7,9 @@
 Content-Transfer-Encoding: binary
 
 == Zusammenfassung
-Zeigt eine Liste von Bilder aus einer Definitionsdatei mit optionaler Beschreibung als Album an. 
+Zeigt eine Liste von Bilder aus einer Definitionsdatei mit optionaler Beschreibung als Album an.
 
-== Benutzung 
+== Benutzung
 {{{
 <<PhotoAlbum
          src=http://server/textfile
@@ -27,14 +27,14 @@
 _Nur der ='src'= Parameter ist verpflichtend._
 
 *src*:
-  Url or local path to a CSV textfile which separates filename and 
+  Url or local path to a CSV textfile which separates filename and
   description of each photo. Photos listed in the text file have to be in same
   directory as the file. Descriptions are optional.
-  If the the local path points to a directory, is relative from PHPWIKI_DIR, 
-  and the main script is in PHPWIKI_DIR, weblocation must not be given, and 
+  If the the local path points to a directory, is relative from PHPWIKI_DIR,
+  and the main script is in PHPWIKI_DIR, weblocation must not be given, and
   all pictures from this directory are displayed.
 
-*url*: 
+*url*:
   defines the the webpath to the srcdir directory (formerly called weblocation)
 
 *mode*:
@@ -52,9 +52,9 @@
   "desc"   - Only description (from textfile) shown %%%
   "both"   - If no description found, then filename will be used %%%
 
-*link*: 
+*link*:
   true or false
-  If true, each image will be hyperlinked to a page where the single 
+  If true, each image will be hyperlinked to a page where the single
   photo will be shown full-size. Only works when mode != 'normal'
 
 *align*:
@@ -75,7 +75,7 @@
 
 *height*, *width*:
   Height and width are calculated compared to original metrics
-  retrieved by [php-function:getimagesize] and can be absolute (50px) 
+  retrieved by [php-function:getimagesize] and can be absolute (50px)
   or a percentage (e.g. "50%").
 
 *attrib*:

Modified: trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Mon, 17 Jun 2013 13:19:42 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FTextFormatierungsRegeln;
@@ -106,24 +106,24 @@
 
 == Querverweise (Links) ==
 
-* Hyperlinks zu anderen Seiten im Wiki werden erstellt, indem man den Namen in eckige Klammern 
+* Hyperlinks zu anderen Seiten im Wiki werden erstellt, indem man den Namen in eckige Klammern
   einschließt [das ist ein Link] oder besser WikiWörterVerwendet.
 * Hyperlinks zu externen Seiten werden so erstellt: [http://www.wcsb.org/]
-* Du kannst Links zu externen Seiten einen Namen geben, indem du in der eckigen Klammer erst 
+* Du kannst Links zu externen Seiten einen Namen geben, indem du in der eckigen Klammer erst
   den Namen und dann, getrennt durch einen senkrechten Strich (|), die Adresse angibst:
   [PhpWiki Homepage | http://phpwiki.sourceforge.net/] ---
   [Die Start Seite | StartSeite]
 
-* Du kannst das Erstellen eines Links verhindern, indem du vor das Wort eine 
+* Du kannst das Erstellen eines Links verhindern, indem du vor das Wort eine
   Tilde '<tt>~~</tt>' setzt, zum Beispiel ~DasIstKeinLink.
   ~http://not.linked.to/
 * You can create footnotes by using ~[1], ~[2], ~[3], ... like this here #[|ftnt
-_ref_1]<sup>~[[1|#ftnt_1]~]</sup>. See footnote for counterpart.  (If the ~[ is 
+_ref_1]<sup>~[[1|#ftnt_1]~]</sup>. See footnote for counterpart.  (If the ~[ is
 in the first column, it is a footnote <em>definition</em> rather than a footnote
  <em>reference</em> #[|ftnt_ref_1]<sup>~[[1|#ftnt_1]~]</sup>.)
-* Wenn du im Text Adressen eingibst, die mit **http:**, **ftp:** oder **mailto:** beginnen, 
+* Wenn du im Text Adressen eingibst, die mit **http:**, **ftp:** oder **mailto:** beginnen,
   werden diese auch automatisch in Links umgewandelt, zum Beispiel http://c2.com/
-* Adressen, die mit **.png** oder **.jpg** enden (d.h. Bilder) werden in die Seite 
+* Adressen, die mit **.png** oder **.jpg** enden (d.h. Bilder) werden in die Seite
   eingefügt, wenn sie in eckige Klammern gesetzt werden, z. B.: [http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/themes/default/images/png.png]
 
 == Tabellen ==

Modified: trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FVorlagePlugin;
@@ -13,7 +13,7 @@
 Include text from a wiki page and replace certain placeholders by parameters.
 Similiar to CreatePage with the template argument, but at run-time.
 
-Similiar to the mediawiki templates but not with the "|" parameter seperator. 
+Similiar to the mediawiki templates but not with the "|" parameter seperator.
 Note: The mediawiki syntax is also supported.
 
 === Usage
@@ -41,7 +41,7 @@
 ==== Parameter expansion:
   vars="var1=value1&var2=value2"
 
-We only support named parameters, not numbered ones as in mediawiki, and 
+We only support named parameters, not numbered ones as in mediawiki, and
 the placeholder is %%var%% and not {{~{var~}}} as in mediawiki.
 
 The following predefined variables are automatically expanded if existing:
@@ -50,7 +50,7 @@
   mtime     - last modified date + time
   ctime     - creation date + time
   author    - last author
-  owner     
+  owner
   creator   - first author
   SERVER_URL, DATA_PATH, SCRIPT_NAME, PHPWIKI_BASE_URL and BASE_URL
 }}}
@@ -58,11 +58,11 @@
 <noinclude> .. </noinclude> is stripped
 
 ==== In work:
-  Support a mediawiki-style syntax extension which maps 
+  Support a mediawiki-style syntax extension which maps
 {{{
     {{Template/Film|title=Some Good Film|year=1999}}
 }}}
-  to 
+  to
 {{{
     <<Template page=Template/Film vars="title=Some Good Film&year=1999" >>
 }}}

Modified: trunk/locale/de/pgsrc/HochLaden
===================================================================
--- trunk/locale/de/pgsrc/HochLaden	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/HochLaden	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=HochLaden;
@@ -6,4 +6,4 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-<<UpLoad >> 
+<<UpLoad>>

Modified: trunk/locale/de/pgsrc/LeereSeiten
===================================================================
--- trunk/locale/de/pgsrc/LeereSeiten	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/LeereSeiten	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Nicht alle diese Seiten werden wirklich benötigt. Der Linkextraktor ist immer noch viel zu optimistisch, bei Interlinks, usw. D.h. viele dieser Links sind gar keine internen Seiten. 
+Nicht alle diese Seiten werden wirklich benötigt. Der Linkextraktor ist immer noch viel zu optimistisch, bei Interlinks, usw. D.h. viele dieser Links sind gar keine internen Seiten.
 Einige Web-Robots erzeugen manchmal auch leere Seiten.
 
-<<WantedPages limit=20 with_count=0 as_tree=0 maxlinks=5 sort='pagename' >>
+<<WantedPages limit=20 with_count=0 as_tree=0 maxlinks=5 sort='pagename'>>

Modified: trunk/locale/de/pgsrc/ListeSeiten
===================================================================
--- trunk/locale/de/pgsrc/ListeSeiten	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/ListeSeiten	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=ListeSeiten;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Ein einfaches Beispiel für das ListPagesPlugin. Hauptsächlich für ein wikilens Thema benutzt, 
+Ein einfaches Beispiel für das ListPagesPlugin. Hauptsächlich für ein wikilens Thema benutzt,
 um Ratings Info anzuzeigen.
 
 <<ListPages pages=HomePage,FindPage,WikiWikiWeb >>

Modified: trunk/locale/de/pgsrc/ModerierteSeite
===================================================================
--- trunk/locale/de/pgsrc/ModerierteSeite	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/ModerierteSeite	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 11 Jan 2013 11:17:06 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=ModerierteSeite;
@@ -12,15 +12,15 @@
 
 == Was ist eine ModerierteSeite?
 
-Eine ModerierteSeite ist ein seitenspezifische Einstellung, die gewisse Aktionen auf moderierten 
-Seiten einschränkt. 
+Eine ModerierteSeite ist ein seitenspezifische Einstellung, die gewisse Aktionen auf moderierten
+Seiten einschränkt.
 The requested action and page is stored internally and an email is sent to the moderators
-described in the linked and locked ModeratedPage action page. 
-Any moderator may approve or reject the action by simply clicking an url. 
-When approving the action, the requested action (edit, rename, ...) is performed. 
+described in the linked and locked ModeratedPage action page.
+Any moderator may approve or reject the action by simply clicking an url.
+When approving the action, the requested action (edit, rename, ...) is performed.
 
 In both cases the author is notified, so it's recommended for the
-moderator to click on either the approve or reject links in the moderation email. 
+moderator to click on either the approve or reject links in the moderation email.
 In case of multiple moderators: first comes, first serves.
 
 == How to enable ModerierteSeite on a single page?
@@ -41,7 +41,7 @@
 == Plugin Arguments
 
 * moderators: comma separated list of registered usernames or groups.
-  Each user should have his email defined in his prefs. Default: "Administrators" or 
+  Each user should have his email defined in his prefs. Default: "Administrators" or
   <<SystemInfo ADMIN_USER >>
 * requirelevel: one of 0, 1, 2 or 10 on which moderation is used. Default: false (use requireaccess instead)
 * requireaccess: comma separated list of access perms, on which the moderation is used
@@ -50,25 +50,25 @@
 
 == How does it work internally?
 
-You need to lock the page additionally, so that the link parser performs 
-some magic whether the ModerierteSeite link is present or not, for efficiency 
-reasons. It can be unlocked again, and even the ModeratedPage link may be removed. 
-The status will only be changed on the *lock* action, whether the ModeratedPage 
+You need to lock the page additionally, so that the link parser performs
+some magic whether the ModerierteSeite link is present or not, for efficiency
+reasons. It can be unlocked again, and even the ModeratedPage link may be removed.
+The status will only be changed on the *lock* action, whether the ModeratedPage
 link is present or not.
 
-The moderation status is stored in each page in question. 
+The moderation status is stored in each page in question.
 Each moderated action is stored in the page also, together with a randomly
-created permission key to allow Grant by a simple external unauthorized request. 
-There's no timeout on moderated actions, so the actions may stack up. 
-The delayed actions may be performed in any order, there's no strict ordering to 
+created permission key to allow Grant by a simple external unauthorized request.
+There's no timeout on moderated actions, so the actions may stack up.
+The delayed actions may be performed in any order, there's no strict ordering to
 follow for the moderator.
 
 == How to enable ModerierteSeite on multiple/all pages?
 
-If you enable the config option ENABLE_MODERATEDPAGE_ALL, the page moderation status on 
+If you enable the config option ENABLE_MODERATEDPAGE_ALL, the page moderation status on
 every page is automatically set to check this action page ModeratedPage.
 
-There may come another administrative plugin to change the moderation 
+There may come another administrative plugin to change the moderation
 status on selected pages.
 
 ----

Modified: trunk/locale/de/pgsrc/NeuesteSeiten
===================================================================
--- trunk/locale/de/pgsrc/NeuesteSeiten	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/NeuesteSeiten	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=NeuesteSeiten;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Hier ist eine Liste von zuletzt erzeugten neuen Seiten in diesem Wiki. 
+Hier ist eine Liste von zuletzt erzeugten neuen Seiten in diesem Wiki.
 <em>(Siehe <strong>NeuesteÄnderungen</strong> für alle neuen Änderungen).</em>
 
 --------

Modified: trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen
===================================================================
--- trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=PasswortZur%C3%BCcksetzen;
@@ -6,12 +6,12 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Jeder Administrator darf jedes Passwort jedes Benutzers zurücksetzen oder löschen. Der Benutzer darf sich dann 
+Jeder Administrator darf jedes Passwort jedes Benutzers zurücksetzen oder löschen. Der Benutzer darf sich dann
 z.B. mit einem leerem Passwort anmelden oder ein neues beim Anmelden vergeben.
 
-Ein normaler Benutzer darf nur sein eigenes Passwort zurücksetzen, wenn er seine E-Mail Addresse in den 
-BenutzerEinstellungen definiert hat. 
-Für Benutzer mit undefinierter oder ungeprüfter E-Mail Addresse müssen sie einen Administrator 
+Ein normaler Benutzer darf nur sein eigenes Passwort zurücksetzen, wenn er seine E-Mail Addresse in den
+BenutzerEinstellungen definiert hat.
+Für Benutzer mit undefinierter oder ungeprüfter E-Mail Addresse müssen sie einen Administrator
 benachrichtigen, um das Passwort zurücksetzen zu lassen.
 
 Authenticated users should change their passwords at their UserPreferences page.

Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Jun 2013 17:02:10 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiSystemverwalten;
@@ -30,11 +30,11 @@
 
 Email Verification:
 
-  Die PhpWiki:EmailVerification ist momentan nicht strikt, d.h. einige mögliche falsche Ergebnisse der 
-  automatischen Überprüfung auf gültige E-Mail Addressen kann hier verwaltet werden. Manche Domains oder 
+  Die PhpWiki:EmailVerification ist momentan nicht strikt, d.h. einige mögliche falsche Ergebnisse der
+  automatischen Überprüfung auf gültige E-Mail Addressen kann hier verwaltet werden. Manche Domains oder
   Email server können nicht automatisch überprüft werden.
 
-  Dieser Link zeigt eine Liste aller mit E-Mail registrierten Benutzer, und Checkboxes um die 
+  Dieser Link zeigt eine Liste aller mit E-Mail registrierten Benutzer, und Checkboxes um die
   Verifizierung manuell zu ändern.
 
   <<WikiAdminUtils
@@ -45,7 +45,7 @@
 == Aufräumen ==
 
 Räume die Wiki SandKiste auf. Hiermit kann man die Seite mit der
-Version von locale/de/pgsrc/SandKiste erneut initialisieren: 
+Version von locale/de/pgsrc/SandKiste erneut initialisieren:
 
 [ SandKiste löschen | phpwiki:?action=loadfile&overwrite=1&source=locale/de/pgsrc/SandKiste ].
 
@@ -147,7 +147,7 @@
 
   <<WikiForm action=dumphtml>>
 
-Erzeugt ein Verzeichnis aller Wiki Dateien als statische XHTML Dateien, die 
+Erzeugt ein Verzeichnis aller Wiki Dateien als statische XHTML Dateien, die
 auch ohne Webserver und Datenbank betrachtbar sind.
 
   Das XHTML-Verzeichnis kann auch heruntergeladen werden als eine
@@ -187,7 +187,7 @@
   <<WikiAdminUtils
            action=purge-bad-pagenames
            label="WikiDB Bereinigen"
-   >> 
+   >>
 
 
 === Clean WikiDB of empty and unreferenced pages
@@ -202,8 +202,8 @@
 
 === Convert cached_html to new SQL column
 
-  This is only needed on SQL or ADODB if you didn't do action=upgrade, but created the 
-  new page.cached_html field separately, and now you want to move this data from 
+  This is only needed on SQL or ADODB if you didn't do action=upgrade, but created the
+  new page.cached_html field separately, and now you want to move this data from
   page.pagedata over to page.cached_html.
 
   <<WikiAdminUtils
@@ -223,7 +223,7 @@
 
 === Rebuild WikiDB
 
-  This will retransform all pages and rebuild the Wiki database on consistency errors or parser updates. 
+  This will retransform all pages and rebuild the Wiki database on consistency errors or parser updates.
   This can last several minutes, eat a lot of memory and possibly times out===
 
   <<WikiAdminUtils

Modified: trunk/locale/de/pgsrc/SeiteFinden
===================================================================
--- trunk/locale/de/pgsrc/SeiteFinden	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/SeiteFinden	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Tue,  4 Jan 2011 11:59:41 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=SeiteFinden;
@@ -11,7 +11,7 @@
 
 * WieManWikiBenutzt sagt wie die Sache hier in einem Wiki
   funktioniert.
-* NeuesteÄnderungen ist eine automatisch erstellte Liste der zuletzt 
+* NeuesteÄnderungen ist eine automatisch erstellte Liste der zuletzt
   geänderten Seiten.
 * WikiTechnik erklärt die Technik, mit der PhpWiki arbeitet.
 

Modified: trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen
===================================================================
--- trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Verlinkte%C3%84nderungen;
@@ -6,4 +6,4 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-<<RelatedChanges show_minor||=1 days||=7 daylist=1,3,7,30,90,0 >> 
+<<RelatedChanges show_minor||=1 days||=7 daylist=1,3,7,30,90,0 >>

Modified: trunk/locale/de/pgsrc/Vorlage%2FBeispiel
===================================================================
--- trunk/locale/de/pgsrc/Vorlage%2FBeispiel	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/Vorlage%2FBeispiel	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Vorlage%2FBeispiel;
@@ -7,13 +7,13 @@
 Content-Transfer-Encoding: binary
 
 <noinclude>
-Die folgenden vordefinierten Variablen werden zwischen zwei %% gesetzt automatisch expandiert, 
+Die folgenden vordefinierten Variablen werden zwischen zwei %% gesetzt automatisch expandiert,
 auf ihren Wert gesetzt:
   pagename
   mtime     - last modified date + time
   ctime     - creation date + time
   author    - last author
-  owner     
+  owner    
   creator   - first author
   SERVER_URL, DATA_PATH, SCRIPT_NAME, PHPWIKI_BASE_URL and BASE_URL
 </noinclude>

Modified: trunk/locale/de/pgsrc/WunschZettelSeiten
===================================================================
--- trunk/locale/de/pgsrc/WunschZettelSeiten	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/WunschZettelSeiten	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=WunschZettelSeiten;
@@ -7,8 +7,8 @@
 Content-Transfer-Encoding: binary
 
 Das ist eine Liste von Seiten, die in diesem Wiki zitiert werden, aber
-nicht noch nicht erzeugt wurden. Obwohl sie anscheinend benötigt werden, 
-kann es auch sein, dass sie falsch geschriebene existierende Seiten sind, 
+nicht noch nicht erzeugt wurden. Obwohl sie anscheinend benötigt werden,
+kann es auch sein, dass sie falsch geschriebene existierende Seiten sind,
 oder einfach zu triviale Seiten, um erzeugt zu werden.
 
 Am besten wäre es natürlich, dass solche Seiten nicht erzeugt werden,

Modified: trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo
===================================================================
--- trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:44 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Ayuda%2FBuenEstilo;
@@ -6,14 +6,14 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-"Young writers often suppose that style is a garnish for the meat of 
-prose, a sauce by which a dull dish is made palatable. Style has no such 
-separate entity; it is nondetachable, unfilterable. The beginner should 
-approach style warily, realizing that it is himself he is approaching, no 
-other; and he should begin by turning resolutely away from all devices 
-that are popularly believed to indicate style--all mannerisms, tricks, 
-adornments. The approach to style is by way of plainness, simplicity, 
-orderliness, sincerity." 
+"Young writers often suppose that style is a garnish for the meat of
+prose, a sauce by which a dull dish is made palatable. Style has no such
+separate entity; it is nondetachable, unfilterable. The beginner should
+approach style warily, realizing that it is himself he is approaching, no
+other; and he should begin by turning resolutely away from all devices
+that are popularly believed to indicate style--all mannerisms, tricks,
+adornments. The approach to style is by way of plainness, simplicity,
+orderliness, sincerity."
 
 --Strunk y White, "Los elementos del estilo"
 

Modified: trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki
===================================================================
--- trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:44 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Ayuda%2FComoUsarWiki;
@@ -35,7 +35,7 @@
 
 * Se pueden poner lineas horizontales con cuatro o más guiones como estos:
 ----
-* Para crear hipervínculos solamente hay que poner las palabras juntas y capitalizarlas. Imaginemonos que quiere crear una página sobre como Steve Wainstead come gusanos. Todo lo que tiene que hacer es algo parecido a: SteveWainsteadComeGusanos. Si la página no existe, entonces aparecerá un simbolo ? después del vínculo, invitandole a crear la página: EstaPaginaNoDeberiaExistir. (Y por favor no arruine este ejemplo creando una aquí) 
+* Para crear hipervínculos solamente hay que poner las palabras juntas y capitalizarlas. Imaginemonos que quiere crear una página sobre como Steve Wainstead come gusanos. Todo lo que tiene que hacer es algo parecido a: SteveWainsteadComeGusanos. Si la página no existe, entonces aparecerá un simbolo ? después del vínculo, invitandole a crear la página: EstaPaginaNoDeberiaExistir. (Y por favor no arruine este ejemplo creando una aquí)
 * Para vincular páginas fuera del Wiki, simplementa hay que poner la URL y Wiki lo vinculará por usted: http://www.nytimes.com/
 * Para poner imágenes, simplemente ponga el hipervínculo entre corchetes, por ejemplo: [[http://www.yourhost.yourdomain/images/picture.png]. Las URL de imagenes que no esten entre corchetes aparecerán como vínculos a la imagen.
 * Ahora está listo para comenzar a AgregarPaginas.

Modified: trunk/locale/es/pgsrc/Ayuda%2FKBrown
===================================================================
--- trunk/locale/es/pgsrc/Ayuda%2FKBrown	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/es/pgsrc/Ayuda%2FKBrown	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:44 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Ayuda%2FKBrown;
@@ -7,7 +7,7 @@
   markup=1
 Content-Transfer-Encoding: binary
 
-Puse mi mejor esfuerzo para traducir esta página al español. 
+Puse mi mejor esfuerzo para traducir esta página al español.
 Me pueden encontrar en http://sandino.net y mailto:kb...@sa....
 
 Por favor envíen reportes de bugs a mailto:php...@li...

Modified: trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto
===================================================================
--- trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Tue,  4 Jan 2011 11:59:17 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Ayuda%2FReglasDeFormatoDeTexto;
@@ -12,7 +12,7 @@
 **Énfasis:** '****' para ''itálicas'', _''''_ para **bold**, '****'_''''_ para ''**ambos**''.%%%
 **Listas:** * para listas de balazos, # para listas numeradas, ''**;** term **:** definición'' para listas de definiciones.%%%
 **Referencias:** !UnirPalabrasEnMayúsculas o usar corchetes para una [[enlace hacia una página] o URL [[!http://cool.wiki.int/].%%%
-**Anotaciones:** Use [[1],[[2],[[3],... %%% 
+**Anotaciones:** Use [[1],[[2],[[3],... %%%
 **Preveción enlazar:** Evite hacer enlaces con "!": !!NoHiperEnlaces. Enlaces con nombres como [[[[text | URL] (doble "["). %%%
 **Varios:** "!", "!!", "!!!" para hacer títulos, "%''''%%" hace un salto de línea, "-''''---" Hace una linea horizontal.
 
@@ -67,7 +67,7 @@
 
 * Los enlaces a otras páginas dentro de Wiki son realizadas poniendo el nombre entre corchetes: [esto es un vinculo de página] o UsandoPalabarasWiki (preferido)
 * Los enlaces a páginas externas son realizados como este: [http://www.wcsb.org/]
-* Puede nombrar los enlaces a páginas externas poniendo un nombre, una barra (|) y el enlace: [página web de Steve | http://wcsb.org/~swain/]  
+* Puede nombrar los enlaces a páginas externas poniendo un nombre, una barra (|) y el enlace: [página web de Steve | http://wcsb.org/~swain/] 
 * Puede suprimir enlace a viejas referencias, precediendo la palabra con un '!', e.j. !NotLinkedAsWikiName
 * You can create footnotes by using [[1], [[2], [[3], ... like this here [1]. See footnote for counterpart.  (If the [[ is in the first column, it is a footnote ''definition'' rather than a footnote ''reference'' [1].)
 * También, el sistema antiguo de enlazar los URL's sigue siendo soportado: preceda los URLs con "http:", "ftp:" o "mailto:" para crear enlaces automáticamante como en: http://c2.com/

Modified: trunk/locale/es/pgsrc/Ayuda%2FWabiSabi
===================================================================
--- trunk/locale/es/pgsrc/Ayuda%2FWabiSabi	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/es/pgsrc/Ayuda%2FWabiSabi	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:44 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Ayuda%2FWabiSabi;
@@ -17,7 +17,7 @@
 Los conceptos de wabi-sabi están relacionados con los conceptos del budismo Zen, asi los primeros japoneses que practicaron wabi-sabi eran maestros de té, curas y monjes que practicaban el Zen. El budismo Zen es originario de la India, pasó a China en el siglo 6, y fué introducido por primera vez en Japón sobre el siglo 12. El Zen enfatiza la "penetración intuitiva en la verdad transcendental más allá de todo concepto intelectual." El corazón del wabi-sabi es la importancia de caminos transcendentales sobre la observación y el pensamiento sobre las cosas y la existencia.
 * Todas las cosas son no permamentes
 * Todas las cosas son imperfectas
-* Todas las cosas son incompletas 
+* Todas las cosas son incompletas
 
 Características materiales de wabi-sabi:
 

Modified: trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes
===================================================================
--- trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Tue, 25 Jan 2011 21:26:14 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=%C3%89ditionsR%C3%A9centes;
@@ -6,9 +6,9 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Voici une liste des pages récemment éditées sur ce wiki. **Toutes** les 
-modifications **mineures** sont montrées, et pas uniquement les plus 
-récentes (voir DernièresModifs pour les modifications non-mineures les 
+Voici une liste des pages récemment éditées sur ce wiki. **Toutes** les
+modifications **mineures** sont montrées, et pas uniquement les plus
+récentes (voir DernièresModifs pour les modifications non-mineures les
 plus récentes).
 
 --------

Modified: trunk/locale/fr/pgsrc/AdministrationDePhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/AdministrationDePhpWiki	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/fr/pgsrc/AdministrationDePhpWiki	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Tue, 16 Apr 2013 17:14:34 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=AdministrationDePhpWiki;
@@ -6,9 +6,9 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-_*Note :*_ _La plupart des actions sur cette page nécessitent des privilèges 
-d'administrateur. Elles ne fonctionneront pas à moins que vous ayez défini un 
-nom d'administrateur et un mot de passe dans le fichier de configuration de 
+_*Note :*_ _La plupart des actions sur cette page nécessitent des privilèges
+d'administrateur. Elles ne fonctionneront pas à moins que vous ayez défini un
+nom d'administrateur et un mot de passe dans le fichier de configuration de
 PhpWiki_
 
 <<CreateToc jshide||=1 with_toclink||=1>>
@@ -36,7 +36,7 @@
 
 == Nettoyage
 
-Le [BacÀSable] Wiki est très simple à nettoyer. Vous pouvez ici le restaurer 
+Le [BacÀSable] Wiki est très simple à nettoyer. Vous pouvez ici le restaurer
 dans un état virginal en chargeant sa version par défaut depuis pgsrc:
 
 [ Râtisser le BacÀSable | phpwiki:?action=loadfile&source=pgsrc/SandBox ]
@@ -79,7 +79,7 @@
 
 === Mise à jour
 
-Fait quelques vérifications et mises à jours automatiquement après avoir installé un nouveau moteur phpwiki de mise à jour 
+Fait quelques vérifications et mises à jours automatiquement après avoir installé un nouveau moteur phpwiki de mise à jour
 * Met à jour les nouvelles pages ou les pages révisées depuis pgsrc
 * Met à jour la base de données (mysql _page.id auto_increment_, ADD _session.sess_ip_),
 
@@ -113,7 +113,7 @@
 
 Tout ceci surtout pour des débogages (au moins c'est ce que j'espère).
 
-En utilisation normale, vous ne devriez par les utiliser mais ça ne devrait 
+En utilisation normale, vous ne devriez par les utiliser mais ça ne devrait
 pas vous faire de mal.
 
 === Purger le cache
@@ -131,7 +131,7 @@
 
  *Attention!* en appuyant sur ce bouton toutes les pages vides et non référencées seront supprimées sans aucune possiblité de les restaurer.
  Ceci supprimera toute possibilité de retrouver les page ainsi supprimées.
- 
+
  <<WikiAdminUtils
            action=purge-empty-pages
            label="Purge all empty unreferenced pages"

Modified: trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Thu, 27 Jan 2011 10:22:55 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Aide%2F%C3%89diterLeContenu;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Toute les pages (sauf les résultats de recherche) ont un lien //Modifier//. 
+Toute les pages (sauf les résultats de recherche) ont un lien //Modifier//.
 Vous pouvez modifier la page que vous lisez en cliquant sur ce lien.
 
 <noinclude>

Modified: trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Thu, 27 Jan 2011 10:22:55 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FAjouterDesPages;
@@ -6,25 +6,25 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Pour ajouter une nouvelle page à Wiki, vous n'avez qu'à trouver un titre 
-parlant, mettre en majuscules toutes les initiales des mots (au moins deux) et les 
-CollerEnsembleCommeCeci. Wiki le reconnaîtra automagiquement comme étant 
+Pour ajouter une nouvelle page à Wiki, vous n'avez qu'à trouver un titre
+parlant, mettre en majuscules toutes les initiales des mots (au moins deux) et les
+CollerEnsembleCommeCeci. Wiki le reconnaîtra automagiquement comme étant
 un hyperlien. Éventullement, vous pouvez mettre n'importe quoi entre [crochets]
 mais c'est conseillé d'utiliser les majuscules.
 
-Vous pouvez alors y aller et CliquerSurLePointdInterrogation au bout de votre 
+Vous pouvez alors y aller et CliquerSurLePointdInterrogation au bout de votre
 nouvel hyperlien, et le Wiki vous donnera une fenêtre pour créer la nouvelle page.
 
-Si vous désirez ajouter au Wiki un document complexe, vous vous en sortirez 
-probablement mieux en fournissant l'URL pointant vers lui plutôt qu'en essayant 
-d'ajouter ici le texte du document. Voici par exemple un lien vers la page 
+Si vous désirez ajouter au Wiki un document complexe, vous vous en sortirez
+probablement mieux en fournissant l'URL pointant vers lui plutôt qu'en essayant
+d'ajouter ici le texte du document. Voici par exemple un lien vers la page
 d'accueil du projet PhpWiki : http://phpwiki.sourceforge.net/
 
-Le Wiki ne gère pas les balises HTML (voir RèglesDeFormatageDesTextes). <tags>Ils 
-sortiront juste sous forme de texte.</tags> Wiki est conçu pour être aussi simple 
+Le Wiki ne gère pas les balises HTML (voir RèglesDeFormatageDesTextes). <tags>Ils
+sortiront juste sous forme de texte.</tags> Wiki est conçu pour être aussi simple
 que possible pour encourager son utilisation.
 
-Notez qu'il existe une fonctionnalité que votre administrateur système peut valider 
+Notez qu'il existe une fonctionnalité que votre administrateur système peut valider
 pour autoriser le HTML incorporé, mais cela implique des risques de sécurité.
 
 <noinclude>

Modified: trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Thu, 27 Jan 2011 18:00:26 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FD%C3%A9tailsTechniques;
@@ -6,22 +6,22 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-~PhpWiki est écrit en PHP, langage de scripting côté serveur, disponible 
-sur http://www.php.net/. PHP ressemble au C et à Perl dans sa syntaxe, et 
+~PhpWiki est écrit en PHP, langage de scripting côté serveur, disponible
+sur http://www.php.net/. PHP ressemble au C et à Perl dans sa syntaxe, et
 fonctionne comme ASP, ~EmbPerl ou JSP.
 
-~PhpWiki est constitué d'une douzaine de fichiers environ de PHP mélangé à du HTML. 
-Les pages web qui forment un [[Aide:WikiWikiWeb|WikiWikiWeb]] basé sur PHP sont stockées dans un fichier 
-DBM avec des copies de sauvegarde des versions précédentes stockées dans un second 
+~PhpWiki est constitué d'une douzaine de fichiers environ de PHP mélangé à du HTML.
+Les pages web qui forment un [[Aide:WikiWikiWeb|WikiWikiWeb]] basé sur PHP sont stockées dans un fichier
+DBM avec des copies de sauvegarde des versions précédentes stockées dans un second
 fichier DBM.
 
-Chaque fois qu'un utilisateur utilise le site, la page demandée est extraite de la DBM 
-et rendue à la volée. L'utilisateur ne demande jamais que le fichier index.php, qui 
+Chaque fois qu'un utilisateur utilise le site, la page demandée est extraite de la DBM
+et rendue à la volée. L'utilisateur ne demande jamais que le fichier index.php, qui
 décide alors quels sont les fichiers php à inclure.
 
-Les liens vers des pages au sein du wiki sont ajoutés automatiquement. 
-Ceci peut être l'aspect le plus intéressant d'un wiki, la capacité à ajouter des 
-pages simplement en créant des liens vers elles. L'autre caractéristique la plus 
+Les liens vers des pages au sein du wiki sont ajoutés automatiquement.
+Ceci peut être l'aspect le plus intéressant d'un wiki, la capacité à ajouter des
+pages simplement en créant des liens vers elles. L'autre caractéristique la plus
 intéressante est la facilité avec laquelle on peut créer des URL externes tels que :
 
 # http://www.wcsb.org/
@@ -30,10 +30,10 @@
 # http://www.slashdot.com/
 # http://theregister.co.uk/
 
-Combiné avec un seul espace de noms et un système de marquage simple, un Wiki exhibe 
+Combiné avec un seul espace de noms et un système de marquage simple, un Wiki exhibe
 nombre des caractéristiques du [[Aide:WabiSabi|WabiSabi]].
 
-PhpWiki est publié sous Licence Publique Générale GNU (GNU GPL), que vous devriez 
+PhpWiki est publié sous Licence Publique Générale GNU (GNU GPL), que vous devriez
 pouvoir lire ici : [[http://www.gnu.org/copyleft/gpl.txt]].
 
 <noinclude>

Modified: trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Thu, 27 Jan 2011 18:00:26 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FIc%C3%B4nesDeLien;
@@ -8,8 +8,8 @@
 
 == Description ==
 
-Les **~IcônesDeLien** forment une nouvelle caractéristique optionnelle de ~PhpWiki. 
-Lorsqu'elles sont activées, des icônes seront affichées devant les URL pour 
+Les **~IcônesDeLien** forment une nouvelle caractéristique optionnelle de ~PhpWiki.
+Lorsqu'elles sont activées, des icônes seront affichées devant les URL pour
 indiquer de quel type de lien il s'agit.
 
 | {{/themes/default/images/http.png}}      | lien http
@@ -41,10 +41,10 @@
 
 //Une icône générique est affichée pour les autres liens d'un type moins commun.//
 * news://nntp.news.com]
-* gopher://gopher.caltech.cmu.edu 
+* gopher://gopher.caltech.cmu.edu
 
-IcônesDeLien s'affichera seulement lorsque le protocole d'URL fait partie de ceux qui 
-sont autorisé dans PhpWiki. Les exemples suivants ne montrent rien et PhpWiki ignorera 
+IcônesDeLien s'affichera seulement lorsque le protocole d'URL fait partie de ceux qui
+sont autorisé dans PhpWiki. Les exemples suivants ne montrent rien et PhpWiki ignorera
 l'activation du double-clique à moins que l'administrateur l'ajoute :
 
 * bogus://oedipus.nostradamus.com %%%

Modified: trunk/locale/fr/pgsrc/Aide%2FInterWiki
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FInterWiki	2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/fr/pgsrc/Aide%2FInterWiki	2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Thu, 27 Jan 2011 18:00:26 +0000
+Date: Mon,  8 Jul 2013 17:59:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FInterWiki;
@@ -6,39 +6,39 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Ce wiki accepte les liens **~InterWiki** dans un style copié sur celui du wiki 
-[UseMod:]. Les liens vers des pages d'autres wikis peuvent être réalisés 
-sans avoir à connaître ou taper les URL complets, par exemple : 
-MeatBall:InterWiki produira un lien vers la page nommée "~InterWiki" sur 
+Ce wiki accepte les liens **~InterWiki** dans un style copié sur celui du wiki
+[UseMod:]. Les liens vers des pages d'autres wikis peuvent être réalisés
+sans avoir à connaître ou taper les URL complets, par exemple :
+MeatBall:InterWiki produira un lien vers la page nommée "~InterWiki" sur
 MeatballWiki.
 
-La carte ~InterWiki est extraite du bloc <verbatim> dans la [[CarteInterWiki]], 
-mais cette page doit être verrouillée pour que cela fonctionne. 
-Ceci interdit aux hackers potentiels de pouvoir changer abominablement 
-tous les liens ~InterWiki pour qu'ils pointent vers un URL diabolique. 
-Si aucune carte n'est trouvée dans la [[CarteInterWiki]] (ou si la page n'est 
+La carte ~InterWiki est extraite du bloc <verbatim> dans la [[CarteInterWiki]],
+mais cette page doit être verrouillée pour que cela fonctionne.
+Ceci interdit aux hackers potentiels de pouvoir changer abominablement
+tous les liens ~InterWiki pour qu'ils pointent vers un URL diabolique.
+Si aucune carte n'est trouvée dans la [[CarteInterWiki]] (ou si la page n'est
 pas verrouillée), PhpWiki utilisera à la place le fichier lib/interwiki.map
-de votre distribution phpwiki. Le fichier de la carte ~Interwiki est 
+de votre distribution phpwiki. Le fichier de la carte ~Interwiki est
 utilisée sur PhpWiki : vous pouvez la voir sur [http://phpwiki.sf.net/interwiki.map].
 
-Le fichier de la carte est mis à jour à la main. Il est basé sur et 
-périodiquement synchronisé avec [l'InterMap de UseMod|http://usemod.com/intermap.txt] 
-mais il n'est pas tout à fait identique. Une différence notable par rapport 
-à [UseMod:] est que PhpWiki supporte les '%s' au sein des URL dans la 
+Le fichier de la carte est mis à jour à la main. Il est basé sur et
+périodiquement synchronisé avec [l'InterMap de UseMod|http://usemod.com/intermap.txt]
+mais il n'est pas tout à fait identique. Une différence notable par rapport
+à [UseMod:] est que PhpWiki supporte les '%s' au sein des URL dans la
 carte -- voir l'entrée RFC pour un exemple de son fonctionnement.
 
-Toutes les entrées de la carte ~InterWiki ne sont pas forcément des wikis. 
-Par exemple, celles-ci sont juste des sites web 
-normaux : Dictionary:fungible, [JargonFile:Alderson loop], [IMDB:Roman Holiday], 
+Toutes les entrées de la carte ~InterWiki ne sont pas forcément des wikis.
+Par exemple, celles-ci sont juste des sites web
+normaux : Dictionary:fungible, [JargonFile:Alderson loop], [IMDB:Roman Holiday],
 RFC:2822, et ISBN:020171499X.
 
-Le mot-clé "Category" est une entrée spéciale qui permet de créer des liens 
-entre une page et une page de catégorie sans créer de référence inverse. 
-Ainsi [Category:Category] crée un lien vers la page CategoryCategory, et 
-pourtant cette page n'apparaîtra pas dans la liste des rétroliens de 
+Le mot-clé "Category" est une entrée spéciale qui permet de créer des liens
+entre une page et une page de catégorie sans créer de référence inverse.
+Ainsi [Category:Category] crée un lien vers la page CategoryCategory, et
+pourtant cette page n'apparaîtra pas dans la liste des rétroliens de
 CategoryCategory.
 
-Le terme "~InterWiki" se réfère aussi à un concept plus large. Voir 
+Le terme "~InterWiki" se réfère aussi à un concept plus ...
 
[truncated message content]

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

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

Revision: 8830
          http://sourceforge.net/p/phpwiki/code/8830
Author:   vargenau
Date:     2013-07-04 16:42:06 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
authentication

Modified Paths:
--------------
    trunk/pgsrc/Help%2FModeratedPagePlugin
    trunk/pgsrc/PasswordReset

Modified: trunk/pgsrc/Help%2FModeratedPagePlugin
===================================================================
--- trunk/pgsrc/Help%2FModeratedPagePlugin	2013-07-04 16:35:10 UTC (rev 8829)
+++ trunk/pgsrc/Help%2FModeratedPagePlugin	2013-07-04 16:42:06 UTC (rev 8830)
@@ -1,4 +1,4 @@
-Date: Fri,  7 Dec 2012 14:58:45 +0000
+Date: Thu,  4 Jul 2013 18:41:29 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FModeratedPagePlugin;
@@ -11,7 +11,7 @@
 A ModeratedPage is a page-internal setting, which restricts certain actions on certain pages.
 The requested action and page is stored internally and an email is sent to the moderators
 described in the linked and locked ModeratedPage action page.
-Any moderator may approve or reject the action by simply clicking an url.
+Any moderator may approve or reject the action by simply clicking an URL.
 When approving the action, the requested action (edit, rename, ...) is performed.
 
 In both cases the author is notified, so it's recommended for the
@@ -22,7 +22,7 @@
 
 * Check the status of this action page, esp. the moderators in the
   plugin line, if they had their emails stored in their
-  UserPreferences, and if the action page is locked.
+  [[UserPreferences]], and if the action page is locked.
 * Add a link to this action page in the page(s) in question.
 * Save the page.
 * Lock the page to actually change the moderation status. You may want to unlock it then.

Modified: trunk/pgsrc/PasswordReset
===================================================================
--- trunk/pgsrc/PasswordReset	2013-07-04 16:35:10 UTC (rev 8829)
+++ trunk/pgsrc/PasswordReset	2013-07-04 16:42:06 UTC (rev 8830)
@@ -1,4 +1,4 @@
-Date: Wed, 11 Jan 2012 16:18:06 +0000
+Date: Thu,  4 Jul 2013 18:41:29 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=PasswordReset;
@@ -13,9 +13,9 @@
 A normal user may only reset a users password who has his email address defined.
 For users with undefined email address you have to ask an Administrator to reset any password.
 
-Authenticated users should change their passwords at their UserPreferences page.
+Authenticated users should change their passwords at their [[UserPreferences]] page.
 
-Attention: Certain external authentification methods don't allow changing passwords. You'll have to ask or change it there then.
+Attention: Certain external authentication methods don't allow changing passwords. You'll have to ask or change it there then.
 ----
 
 <<PasswordReset>>

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

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

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

Revision: 8829
          http://sourceforge.net/p/phpwiki/code/8829
Author:   vargenau
Date:     2013-07-04 16:35:10 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
Avoid warning

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

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2013-07-04 15:54:04 UTC (rev 8828)
+++ trunk/lib/main.php	2013-07-04 16:35:10 UTC (rev 8829)
@@ -983,7 +983,7 @@
 
         if ($this->getArg('auth')) {
              $auth = $this->getArg('auth');
-             if ($auth['userid']) {
+             if (isset($auth['userid'])) {
                  return $auth['userid'];
              }
         }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8828] trunk/lib/plugin/PasswordReset.php

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

Revision: 8828
          http://sourceforge.net/p/phpwiki/code/8828
Author:   vargenau
Date:     2013-07-04 15:54:04 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
private

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

Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php	2013-07-04 14:52:25 UTC (rev 8827)
+++ trunk/lib/plugin/PasswordReset.php	2013-07-04 15:54:04 UTC (rev 8828)
@@ -49,7 +49,7 @@
     }
 
     /* reset password, verified */
-    function doReset($userid)
+    private function doReset($userid)
     {
 
         $user = WikiUser($userid);
@@ -65,7 +65,7 @@
         $alert->show();
     }
 
-    function doEmail(&$request, $userid)
+    private function doEmail(&$request, $userid)
     {
 
         $thisuser = WikiUser($userid);
@@ -87,7 +87,7 @@
         $alert->show();
     }
 
-    function doForm(&$request, $userid = '', $header = '', $footer = '')
+    private function doForm(&$request, $userid = '', $header = '', $footer = '')
     {
         if (!$header) {
             $header = HTML::p(_("Reset password of user: "),

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

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

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

Revision: 8827
          http://sourceforge.net/p/phpwiki/code/8827
Author:   vargenau
Date:     2013-07-04 14:52:25 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
Clean up 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	2013-07-04 14:49:32 UTC (rev 8826)
+++ trunk/locale/po/de.po	2013-07-04 14:52:25 UTC (rev 8827)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-19 15:31+0200\n"
+"POT-Creation-Date: 2013-07-04 16:51+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -2024,7 +2024,6 @@
 msgid "Don't cache this page."
 msgstr "Cache diese Seite nicht."
 
-# OldTextFormattingRules AlteTextFormatierungsRegeln
 msgid "Layout tables using the old markup style."
 msgstr ""
 "Tabellen unter Verwendung traditioneller (alter) Wikitext Formatierung."
@@ -2683,7 +2682,6 @@
 msgid "RelatedChanges"
 msgstr "VerlinkteÄnderungen"
 
-# OldTextFormattingRules AlteTextFormatierungsRegeln
 msgid "Layout tables using a very rich markup style."
 msgstr "Tabellen mit erweiterter HTML Syntax."
 
@@ -3860,7 +3858,6 @@
 msgid "%s on %s:"
 msgstr "%s um %s:"
 
-# OldTextFormattingRules AlteTextFormatierungsRegeln
 msgid "Layout tables using the Wikicreole syntax."
 msgstr "Tabellen unter Wikicreole Formatierung."
 
@@ -3952,9 +3949,8 @@
 msgid "AuthorHistoryPlugin"
 msgstr "AutorenProtokollPlugin"
 
-#, fuzzy
 msgid "DebugBackendInfo"
-msgstr "DebugInfo"
+msgstr "DebugBackendInfo"
 
 msgid "BackLinks"
 msgstr "BackLinks"
@@ -4269,9 +4265,8 @@
 msgid "ReleaseNotes"
 msgstr ""
 
-#, fuzzy
 msgid "DebugRetransform"
-msgstr "DebugInfo"
+msgstr "DebugRetransform"
 
 msgid "RichTable"
 msgstr "ErweiterteTabellen"
@@ -4417,9 +4412,8 @@
 msgid "WikiPoll"
 msgstr "WikiUmfrage"
 
-#, fuzzy
 msgid "WikiTranslation"
-msgstr "_WikiÜbersetzung"
+msgstr "WikiÜbersetzung"
 
 msgid "WikiWikiWeb"
 msgstr "WikiWikiWeb"
@@ -5386,12 +5380,6 @@
 msgid "This is a minor change."
 msgstr "Kleinere Änderung."
 
-msgid "Use old markup"
-msgstr "Alte Formatierungssyntax verwenden"
-
-msgid "OldTextFormattingRules"
-msgstr "AlteTextFormatierungsRegeln"
-
 msgid "HowToUseWiki"
 msgstr "WieManWikiBenutzt"
 
@@ -6106,44 +6094,6 @@
 msgid "Edit this page"
 msgstr "Diese Seite bearbeiten"
 
-#~ msgid "_PreferencesInfo"
-#~ msgstr "_EinstellungenInfo"
-
-#~ msgid "Markup"
-#~ msgstr "Quelltext"
-
-#~ msgid "CreateToc disabled for old markup."
-#~ msgstr "InhaltsVerzeichnis deaktiviert für altes Markup."
-
-#~ msgid "Change the markup type of selected pages."
-#~ msgstr "Ändere den Formatierungstyp aller ausgewählte Seiten."
-
-#~ msgid "Change markup type from %s to %s"
-#~ msgstr "Ändere Formatierungs-Typ von %s zu %s"
-
-#~ msgid "change page “%s” to markup type “%s”."
-#~ msgstr "Formatierung der Seite »%s« auf »%s« geändert."
-
-#~ msgid "Couldn't change page “%s” to markup type “%s”."
-#~ msgstr "Konnte die Formatierung der Seite »%s« nicht auf »%s« ändern."
-
-#~ msgid ""
-#~ "Are you sure you want to change the markup type of the selected files?"
-#~ msgstr ""
-#~ "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"
-
-#~ msgid "Change markup type"
-#~ msgstr "Ändere Formatierungs-Typ"
-
-#~ msgid "Select the pages to change the markup type"
-#~ msgstr "Wählen Sie die Seiten zum Ändern:"
-
-#~ msgid "Change markup to: "
-#~ msgstr "Ändere Formatierung zu: "
-
-#~ msgid "WikiAdminMarkup"
-#~ msgstr "WikiAdminFormatierung"
-
 #~ msgid "Version %s"
 #~ msgstr "Version %s."
 
@@ -6157,40 +6107,17 @@
 #~ msgid "Error: Empty search string."
 #~ msgstr "Fehler: Leeres Suchwort."
 
-#~ msgid "chmod page “%s” to “%s”."
-#~ msgstr "Berechtigung der Seite »%s« auf »%s« geändert."
-
-#~ msgid "Couldn't chmod page “%s” to “%s”."
-#~ msgstr "Konnte die Berechtigung der Seite »%s« nicht auf »%s« ändern."
-
-#~ msgid "Invalid chmod string"
-#~ msgstr "Ungültiger CHMOD Befehl"
-
 #~ msgid "Are you sure you want to permanently change the selected files?"
 #~ msgstr ""
 #~ "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"
 
-#~ msgid "Chmod"
-#~ msgstr "Chmod"
-
 #~ msgid "Select the pages to change:"
 #~ msgstr "Wählen Sie die Seiten zum Ändern:"
 
 #~ msgid "Chmod to permission:"
 #~ msgstr "Ändere auf Berechtigung:"
 
-#~ msgid "WikiAdminChmod"
-#~ msgstr "WikiAdminChmod"
-
 #, fuzzy
-#~ msgid "mode"
-#~ msgstr "Chmod"
-
-#, fuzzy
-#~ msgid "period"
-#~ msgstr "Version %d."
-
-#, fuzzy
 #~ msgid "History of all major edits by %s to page %s."
 #~ msgstr ""
 #~ "Verlaufsprotokoll aller großen und kleinen Änderungen von %s der Seite %s."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2013-07-04 14:49:32 UTC (rev 8826)
+++ trunk/locale/po/es.po	2013-07-04 14:52:25 UTC (rev 8827)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-19 15:31+0200\n"
+"POT-Creation-Date: 2013-07-04 16:51+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -3839,9 +3839,8 @@
 msgid "AuthorHistoryPlugin"
 msgstr ""
 
-#, fuzzy
 msgid "DebugBackendInfo"
-msgstr "InformacionDeLaPagina"
+msgstr "DebugBackendInfo"
 
 msgid "BackLinks"
 msgstr "AcoplamientosTraseros"
@@ -5240,12 +5239,6 @@
 msgid "This is a minor change."
 msgstr "Esto es un cambio pequeño."
 
-msgid "Use old markup"
-msgstr ""
-
-msgid "OldTextFormattingRules"
-msgstr "ViejoReglasDeFormatoDeTexto"
-
 msgid "HowToUseWiki"
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2013-07-04 14:49:32 UTC (rev 8826)
+++ trunk/locale/po/fr.po	2013-07-04 14:52:25 UTC (rev 8827)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-19 15:31+0200\n"
+"POT-Creation-Date: 2013-07-04 16:51+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -3067,9 +3067,8 @@
 msgid "This internal action page cannot viewed."
 msgstr "Cette page ne peut être vue."
 
-#, fuzzy
 msgid "You can only use it via the WikiTranslation plugin."
-msgstr "Vous pouvez uniquement l'utiliser via le greffon _WikiTranslation."
+msgstr "Vous pouvez uniquement l'utiliser via le greffon WikiTranslation."
 
 msgid "Translation Error!"
 msgstr "Erreur de traduction !"
@@ -3889,9 +3888,8 @@
 msgid "AuthorHistoryPlugin"
 msgstr "GreffonHistoriqueAuteur"
 
-#, fuzzy
 msgid "DebugBackendInfo"
-msgstr "InfosDeDébogage"
+msgstr "InfosDeDébogageBackend"
 
 msgid "BackLinks"
 msgstr "RétroLiens"
@@ -5294,12 +5292,6 @@
 msgid "This is a minor change."
 msgstr "Modification mineure."
 
-msgid "Use old markup"
-msgstr "Anciennes règles"
-
-msgid "OldTextFormattingRules"
-msgstr "AnciennesRèglesDeFormatageDesTextes"
-
 msgid "HowToUseWiki"
 msgstr "CommentUtiliserWiki"
 
@@ -5993,27 +5985,9 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
-#~ msgid "_PreferencesInfo"
-#~ msgstr "_PréférencesInfo"
-
-#~ msgid "Markup"
-#~ msgstr "Syntaxe"
-
-#~ msgid "Change the markup type of selected pages."
-#~ msgstr "Changer la syntaxe des pages sélectionnées."
-
-#~ msgid "Confirm markup change"
-#~ msgstr "Confirmer le changement de type de syntaxe"
-
-#~ msgid "Change markup type"
-#~ msgstr "Changer le type de syntaxe"
-
 #~ msgid "Version %s"
 #~ msgstr "Version %s"
 
-#~ msgid "Original (1.2 or 1.0)"
-#~ msgstr "Original (1.2 ou 1.0)"
-
 #, fuzzy
 #~ msgid "%s not found"
 #~ msgstr "%s non trouvé dans %s"
@@ -6021,47 +5995,15 @@
 #~ msgid "Error: Empty search string."
 #~ msgstr "Erreur : la chaîne à rechercher est vide."
 
-#~ msgid "chmod page “%s” to “%s”."
-#~ msgstr "Changement de mode %s à %s."
-
-#~ msgid "Couldn't chmod page “%s” to “%s”."
-#~ msgstr "Impossible de changer le mode “%s” à “%s”."
-
-#~ msgid "Invalid chmod string"
-#~ msgstr "Chaîne de caractère invalide pour le changement de mode"
-
 #~ msgid "Are you sure you want to permanently change the selected files?"
 #~ msgstr ""
 #~ "Êtes-vous sûr de vouloir modifier de manière permanente les fichiers "
 #~ "sélectionnés ?"
 
-#~ msgid "Chmod"
-#~ msgstr "Chmod"
-
 #~ msgid "Select the pages to change:"
 #~ msgstr "Sélectionnez les pages à modifier :"
 
-#~ msgid "This plugin is currently under development and does not work!"
-#~ msgstr "Ce greffon est en cours de développement et ne marche pas !"
-
-#~ msgid "Chmod to permission:"
-#~ msgstr "Changer le mode de permission à :"
-
-#~ msgid "(ugo : rwx)"
-#~ msgstr "(ugo : rwx)"
-
-#~ msgid "WikiAdminChmod"
-#~ msgstr "WikiAdminChmod"
-
 #, fuzzy
-#~ msgid "mode"
-#~ msgstr "Chmod"
-
-#, fuzzy
-#~ msgid "period"
-#~ msgstr "version %d"
-
-#, fuzzy
 #~ msgid "History of all major edits by %s to page %s."
 #~ msgstr ""
 #~ "Historique de toutes les éditions majeures et mineures par %s sur la page "

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2013-07-04 14:49:32 UTC (rev 8826)
+++ trunk/locale/po/it.po	2013-07-04 14:52:25 UTC (rev 8827)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-19 15:31+0200\n"
+"POT-Creation-Date: 2013-07-04 16:51+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -3805,9 +3805,8 @@
 msgid "AuthorHistoryPlugin"
 msgstr ""
 
-#, fuzzy
 msgid "DebugBackendInfo"
-msgstr "InfoDebug"
+msgstr "DebugBackendInfo"
 
 msgid "BackLinks"
 msgstr ""
@@ -3923,9 +3922,8 @@
 msgid "GraphViz"
 msgstr ""
 
-#, fuzzy
 msgid "DebugGroupInfo"
-msgstr "InfoDebug"
+msgstr "DebugGroupInfo"
 
 msgid "HelloWorld"
 msgstr ""
@@ -4104,9 +4102,8 @@
 msgid "ReleaseNotes"
 msgstr ""
 
-#, fuzzy
 msgid "DebugRetransform"
-msgstr "InfoDebug"
+msgstr "DebugRetransform"
 
 msgid "RichTable"
 msgstr ""
@@ -5178,12 +5175,6 @@
 msgid "This is a minor change."
 msgstr ""
 
-msgid "Use old markup"
-msgstr ""
-
-msgid "OldTextFormattingRules"
-msgstr ""
-
 msgid "HowToUseWiki"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2013-07-04 14:49:32 UTC (rev 8826)
+++ trunk/locale/po/ja.po	2013-07-04 14:52:25 UTC (rev 8827)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-19 15:31+0200\n"
+"POT-Creation-Date: 2013-07-04 16:51+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5375,12 +5375,6 @@
 msgid "This is a minor change."
 msgstr ""
 
-msgid "Use old markup"
-msgstr "古いマークアップを使用"
-
-msgid "OldTextFormattingRules"
-msgstr ""
-
 msgid "HowToUseWiki"
 msgstr ""
 
@@ -6090,6 +6084,9 @@
 msgid "Edit this page"
 msgstr "ページを編集しています。"
 
+#~ msgid "Use old markup"
+#~ msgstr "古いマークアップを使用"
+
 #, fuzzy
 #~ msgid "_PreferencesInfo"
 #~ msgstr "参照一覧"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2013-07-04 14:49:32 UTC (rev 8826)
+++ trunk/locale/po/nl.po	2013-07-04 14:52:25 UTC (rev 8827)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-19 15:31+0200\n"
+"POT-Creation-Date: 2013-07-04 16:51+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -4241,9 +4241,8 @@
 msgid "WikiPoll"
 msgstr ""
 
-#, fuzzy
 msgid "WikiTranslation"
-msgstr "PhpWikiBeheer"
+msgstr ""
 
 msgid "WikiWikiWeb"
 msgstr ""
@@ -5168,12 +5167,6 @@
 msgid "This is a minor change."
 msgstr ""
 
-msgid "Use old markup"
-msgstr ""
-
-msgid "OldTextFormattingRules"
-msgstr "OudTekstFormatteringsRegels"
-
 msgid "HowToUseWiki"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2013-07-04 14:49:32 UTC (rev 8826)
+++ trunk/locale/po/phpwiki.pot	2013-07-04 14:52:25 UTC (rev 8827)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-19 15:31+0200\n"
+"POT-Creation-Date: 2013-07-04 16:51+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5159,12 +5159,6 @@
 msgid "This is a minor change."
 msgstr ""
 
-msgid "Use old markup"
-msgstr ""
-
-msgid "OldTextFormattingRules"
-msgstr ""
-
 msgid "HowToUseWiki"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2013-07-04 14:49:32 UTC (rev 8826)
+++ trunk/locale/po/sv.po	2013-07-04 14:52:25 UTC (rev 8827)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-19 15:31+0200\n"
+"POT-Creation-Date: 2013-07-04 16:51+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -5160,12 +5160,6 @@
 msgid "This is a minor change."
 msgstr ""
 
-msgid "Use old markup"
-msgstr ""
-
-msgid "OldTextFormattingRules"
-msgstr ""
-
 msgid "HowToUseWiki"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2013-07-04 14:49:32 UTC (rev 8826)
+++ trunk/locale/po/zh.po	2013-07-04 14:52:25 UTC (rev 8827)
@@ -1,4 +1,4 @@
-# Traditional Chinese(UTF-8) PhpWiki locale
+# Traditional Chinese PhpWiki locale
 # This file is part of PhpWiki.
 # Copyright (C) Copyright 1999, 2000, 2001, 2002 ThePhpWikiProgrammingTeam.
 #
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-19 15:31+0200\n"
+"POT-Creation-Date: 2013-07-04 16:51+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -5488,12 +5488,6 @@
 msgid "This is a minor change."
 msgstr "這是次要變更."
 
-msgid "Use old markup"
-msgstr "使用舊標記"
-
-msgid "OldTextFormattingRules"
-msgstr ""
-
 msgid "HowToUseWiki"
 msgstr ""
 
@@ -6207,6 +6201,9 @@
 msgid "Edit this page"
 msgstr "編輯此頁面"
 
+#~ msgid "Use old markup"
+#~ msgstr "使用舊標記"
+
 #, fuzzy
 #~ msgid "_PreferencesInfo"
 #~ 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:[8826] trunk

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

Revision: 8826
          http://sourceforge.net/p/phpwiki/code/8826
Author:   vargenau
Date:     2013-07-04 14:49:32 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
Clean up old markup

Modified Paths:
--------------
    trunk/pgsrc/Help%2FPageList
    trunk/pgsrc/PhpWikiAdministration
    trunk/themes/Crao/templates/editpage.tmpl
    trunk/themes/Portland/templates/editpage.tmpl
    trunk/themes/Wordpress/templates/editpage.tmpl
    trunk/themes/blog/templates/blogform.tmpl
    trunk/themes/default/templates/blogform.tmpl
    trunk/themes/default/templates/editpage.tmpl
    trunk/themes/fusionforge/templates/blogform.tmpl

Modified: trunk/pgsrc/Help%2FPageList
===================================================================
--- trunk/pgsrc/Help%2FPageList	2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/pgsrc/Help%2FPageList	2013-07-04 14:49:32 UTC (rev 8826)
@@ -1,4 +1,4 @@
-Date: Fri, 11 Jan 2013 11:16:51 +0000
+Date: Fri, 28 Jun 2013 15:51:27 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPageList;
@@ -103,7 +103,6 @@
 |= locked    | Locked
 |= external  | External
 |= minor     | Minor Edit
-|= markup    | Markup
 |= size      | Size
 |= creator   | Creator
 |= owner     | Owner

Modified: trunk/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/pgsrc/PhpWikiAdministration	2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/pgsrc/PhpWikiAdministration	2013-07-04 14:49:32 UTC (rev 8826)
@@ -1,4 +1,4 @@
-Date: Tue, 16 Apr 2013 17:13:59 +0000
+Date: Fri, 28 Jun 2013 15:51:27 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration;
@@ -19,7 +19,7 @@
 
 or call the available ~WikiAdmin actions directly:
 
-| [[/Chown]] | [[/Markup]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]] | [[/DeleteAcl]]
+| [[/Chown]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]] | [[/DeleteAcl]]
 
 == Global Access Rights ==
 

Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl	2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/Crao/templates/editpage.tmpl	2013-07-04 14:49:32 UTC (rev 8826)
@@ -54,7 +54,6 @@
   <?php } ?>
   <fieldset class="toolbar"> 
     <?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label>&nbsp;&nbsp;
-    <?php echo $OLD_MARKUP_CB?>  <label for="useOldMarkup"><?php echo _("Use old markup")?></label> <?php echo $OLD_MARKUP_CONVERT?>
 <?php if ($user->isAdmin()) { ?>
     <?php echo $LOCKED_CB ?> <label for="edit-locked"><?php echo _("Locked")?></label>
 <?php } ?>
@@ -70,37 +69,10 @@
     <label><?php echo Template('signin', array('FORMNAME' => 'editpage')) ?></label>
   </fieldset>
 <hr noshade="noshade" />
-<script type="text/javascript">
-<!--
-function showOldMarkupRules(show) {
-  if (document.getElementById) {
-    if (!show) {
-      document.getElementById('newMarkup').style.display="block";
-      document.getElementById('oldMarkup').style.display="none";
-    } else {
-      document.getElementById('newMarkup').style.display="none";
-      document.getElementById('oldMarkup').style.display="block";
-    }
-  }
-}
-// -->
-</script>
-<div id="oldMarkup" class="wiki-edithelp">
+<div class="wiki-edithelp">
 <!-- FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules -->
 <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help")."/"._("OldTextFormattingRules") section=_("Synopsis") quiet=1?>
-</div>
-<div id="newMarkup" class="wiki-edithelp">
-<!-- FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules -->
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
 <?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
 </div>
 <?php echo $HIDDEN_INPUTS?>
 </form>
-<script type="text/javascript">
-<!--
-if (document.getElementById) {
-  showOldMarkupRules(document.getElementById('useOldMarkup').checked);
-}
-// -->
-</script>

Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl	2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/Portland/templates/editpage.tmpl	2013-07-04 14:49:32 UTC (rev 8826)
@@ -42,8 +42,6 @@
   <?php echo _("Edit Area Size")?>: <b><?php echo _("H")?></b> <?php echo $HEIGHT_PREF?> 
   <b><?php echo _("W")?></b> <?php echo $WIDTH_PREF?>
   <?php echo Button("submit:", _("Adjust"), 'wikiaction')?>
-  <br />
-  <?php echo $OLD_MARKUP_CB?>  <?php echo _("Use old markup")?>
 </p>
 
 <?php if (isset($PREVIEW_CONTENT)) { ?>
@@ -53,41 +51,12 @@
   <hr />
 <?php } ?>
 
-<script type="text/javascript">
-<!--
-function showOldMarkupRules(show) {
-  if (document.getElementById) {
-    if (!show) {
-      document.getElementById('newMarkup').style.display="block";
-      document.getElementById('oldMarkup').style.display="none";
-    } else {
-      document.getElementById('newMarkup').style.display="none";
-      document.getElementById('oldMarkup').style.display="block";
-    }
-  }
-}
-// -->
-</script>
-
-<div id="oldMarkup" class="wiki-edithelp">
+<div class="wiki-edithelp">
 <!-- FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules -->
 <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help")."/"._("OldTextFormattingRules") section=_("Synopsis") quiet=1?>
-</div>
-<div id="newMarkup" class="wiki-edithelp">
-<!-- FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules -->
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
 <?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
 </div>
 <?php echo $HIDDEN_INPUTS?>
 </form>
 
-<script type="text/javascript">
-<!--
-if (document.getElementById) {
-  showOldMarkupRules(document.getElementById('useOldMarkup').checked);
-}
-// -->
-</script>
-
 <hr />

Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl	2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/Wordpress/templates/editpage.tmpl	2013-07-04 14:49:32 UTC (rev 8826)
@@ -55,7 +55,6 @@
   <?php echo fmt("I'm just doing minor edits. Please divert the usual logging to %s instead.",
         WikiLink(_("RecentEdits"))) ?></label>
 <br />
-<?php echo $OLD_MARKUP_CB?> <label for="useOldMarkup"><?php echo _("Use old markup")?> </label> <?php echo $OLD_MARKUP_CONVERT?> 
   <?php if ($user->isAdmin()) { ?> 
     <?php echo $SEP?><?php echo $LOCKED_CB ?> <label for="edit-locked"><?php echo _("Locked")?></label>
    <?php } ?>
@@ -68,42 +67,13 @@
   <hr />
 <?php } ?>
 
-<script type="text/javascript">
-<!--
-function showOldMarkupRules(show) {
-  if (document.getElementById) {
-    if (!show) {
-      document.getElementById('newMarkup').style.display="block";
-      document.getElementById('oldMarkup').style.display="none";
-    } else {
-      document.getElementById('newMarkup').style.display="none";
-      document.getElementById('oldMarkup').style.display="block";
-    }
-  }
-}
-// -->
-</script>
-
-<div id="oldMarkup" class="wiki-edithelp">
+<div class="wiki-edithelp">
 <!-- FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules -->
 <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help")."/"._("OldTextFormattingRules") section=_("Synopsis") quiet=1?>
-</div>
-<div id="newMarkup" class="wiki-edithelp">
-<!-- FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules -->
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
 <?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
 </div>
 <?php echo $HIDDEN_INPUTS?>
 </form>
 </div>
 
-<script type="text/javascript">
-<!--
-if (document.getElementById) {
-  showOldMarkupRules(document.getElementById('useOldMarkup').checked);
-}
-// -->
-</script>
-
 <hr />

Modified: trunk/themes/blog/templates/blogform.tmpl
===================================================================
--- trunk/themes/blog/templates/blogform.tmpl	2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/blog/templates/blogform.tmpl	2013-07-04 14:49:32 UTC (rev 8826)
@@ -17,7 +17,7 @@
   </div>
 
 <hr noshade="noshade" />
-<div id="newMarkup" class="wiki-edithelp">
+<div class="wiki-edithelp">
   <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
   <?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
 </div>

Modified: trunk/themes/default/templates/blogform.tmpl
===================================================================
--- trunk/themes/default/templates/blogform.tmpl	2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/default/templates/blogform.tmpl	2013-07-04 14:49:32 UTC (rev 8826)
@@ -17,7 +17,7 @@
   </div>
 
 <hr />
-<div id="newMarkup" class="wiki-edithelp">
+<div class="wiki-edithelp">
   <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
   <?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
 </div>

Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/default/templates/editpage.tmpl	2013-07-04 14:49:32 UTC (rev 8826)
@@ -57,7 +57,6 @@
 <tr class="middle">
   <td> 
     <?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label><br />
-    <?php echo $OLD_MARKUP_CB ?> <label for="useOldMarkup"><?php echo _("Use old markup")?></label> <?php echo $OLD_MARKUP_CONVERT?>
   </td>
   <td class="align-center">
     <?php if (!empty($WYSIWYG_B)){ ?>
@@ -92,37 +91,8 @@
 
 <hr />
 
-<script type="text/javascript">
-<!--
-function showOldMarkupRules(show) {
-  if (document.getElementById) {
-    if (!show) {
-      document.getElementById('newMarkup').style.display="block";
-      document.getElementById('oldMarkup').style.display="none";
-    } else {
-      document.getElementById('newMarkup').style.display="none";
-      document.getElementById('oldMarkup').style.display="block";
-    }
-  }
-}
-// -->
-</script>
-
-<div id="oldMarkup" class="wiki-edithelp">
+<div class="wiki-edithelp">
 <!-- FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules -->
 <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help")."/"._("OldTextFormattingRules") section=_("Synopsis") quiet=1?>
-</div>
-<div id="newMarkup" class="wiki-edithelp">
-<!-- FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules -->
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
 <?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
 </div>
-
-<script type="text/javascript">
-<!--
-if (document.getElementById) {
-  showOldMarkupRules(document.getElementById('useOldMarkup').checked);
-}
-// -->
-</script>

Modified: trunk/themes/fusionforge/templates/blogform.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/blogform.tmpl	2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/fusionforge/templates/blogform.tmpl	2013-07-04 14:49:32 UTC (rev 8826)
@@ -17,7 +17,7 @@
   </div>
 
 <hr noshade="noshade" />
-<div id="newMarkup" class="wiki-edithelp">
+<div class="wiki-edithelp">
   <?plugin IncludePage page="TextFormattingRules" section="Synopsis" quiet=1?>
 </div>
 <?php echo $HIDDEN_INPUTS?>

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

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

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

Revision: 8825
          http://sourceforge.net/p/phpwiki/code/8825
Author:   vargenau
Date:     2013-07-04 14:45:29 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
Better handling of mandatory pages

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

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2013-07-04 14:43:33 UTC (rev 8824)
+++ trunk/lib/loadsave.php	2013-07-04 14:45:29 UTC (rev 8825)
@@ -1508,16 +1508,23 @@
     // Ensure that all mandatory pages are loaded
     $finder = new FileFinder;
 
-    if (!(defined('FUSIONFORGE') and FUSIONFORGE)) {
-        $mandatory = explode(':', 'SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration');
-    } elseif (WIKI_NAME == "help") {
-        $mandatory = explode(':', 'SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/TextFormattingRules:PhpWikiAdministration');
-    } else {
-        $mandatory = explode(':', 'SandBox:Template/UserPage:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:TextFormattingRules:PhpWikiAdministration');
+    $mandatory = array('SandBox', 
+                       'Template/Category',
+                       'Template/Talk',
+                       'SpecialPages',
+                       'CategoryCategory',
+                       'CategoryActionPage',
+                       'Help/TextFormattingRules',
+                       'PhpWikiAdministration');
+
+    if ((defined('FUSIONFORGE') and FUSIONFORGE)) {
+        $mandatory[] = 'Template/UserPage';
     }
-    foreach (array_merge($mandatory,
-        $GLOBALS['AllActionPages'],
-        array(constant('HOME_PAGE'))) as $f) {
+
+    $mandatory = array_merge($mandatory, $GLOBALS['AllActionPages']);
+    $mandatory[] = constant('HOME_PAGE');
+
+    foreach ($mandatory as $f) {
         $page = gettext($f);
         $epage = urlencode($page);
         if (!$dbi->isWikiPage($page)) {

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

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

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

Revision: 8824
          http://sourceforge.net/p/phpwiki/code/8824
Author:   vargenau
Date:     2013-07-04 14:43:33 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
Assume function_exists("_")

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

Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php	2013-07-04 14:28:23 UTC (rev 8823)
+++ trunk/lib/FileFinder.php	2013-07-04 14:43:33 UTC (rev 8824)
@@ -195,10 +195,7 @@
      */
     function _not_found($file)
     {
-        if (function_exists("_"))
-            trigger_error(sprintf(_("%s: file not found"), $file), E_USER_ERROR);
-        else
-            trigger_error(sprintf("%s: file not found", $file), E_USER_ERROR);
+        trigger_error(sprintf(_("%s: file not found"), $file), E_USER_ERROR);
         return false;
     }
 

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

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

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

Revision: 8823
          http://sourceforge.net/p/phpwiki/code/8823
Author:   vargenau
Date:     2013-07-04 14:28:23 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
<menu> --> <nav>

Modified Paths:
--------------
    trunk/themes/fusionforge/fusionforge.css
    trunk/themes/fusionforge/templates/actionbar.tmpl

Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2013-06-19 13:32:18 UTC (rev 8822)
+++ trunk/themes/fusionforge/fusionforge.css	2013-07-04 14:28:23 UTC (rev 8823)
@@ -407,11 +407,11 @@
     font-weight: bold;
 }
 
-menu, menu ul {
+nav, nav ul {
     padding: 0;
 }
 
-menu ul {
+nav ul {
     display: inline;
     margin-right: 10px;
 }
@@ -419,6 +419,7 @@
 #actionbuttons {
     white-space: nowrap;
     margin-left: 0;
+    margin-top: 10px;
     margin-bottom: 0;
 }
 

Modified: trunk/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/actionbar.tmpl	2013-06-19 13:32:18 UTC (rev 8822)
+++ trunk/themes/fusionforge/templates/actionbar.tmpl	2013-07-04 14:28:23 UTC (rev 8823)
@@ -7,8 +7,7 @@
 $isBrowse = $request->getArg('action') == 'browse';
 ?>
 
-  <menu id="actionbuttons">
-  <div>
+  <nav id="actionbuttons">
   <ul>
     <?php if (!string_ends_with($pagename, SUBPAGE_SEPARATOR._("Discussion"))) { ?>
     <?php $talk = new WikiPageName('Talk:'.$pagename); ?>
@@ -112,5 +111,4 @@
   <ul>
     <li><?php echo Button(__("WatchPage"), _("Watch Page")) ?></li>
   </ul>
-  </div>
-  </menu>
+  </nav>

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

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

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

Revision: 8822
          http://sourceforge.net/p/phpwiki/code/8822
Author:   vargenau
Date:     2013-06-19 13:32:18 +0000 (Wed, 19 Jun 2013)
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	2013-06-19 13:30:06 UTC (rev 8821)
+++ trunk/locale/po/de.po	2013-06-19 13:32:18 UTC (rev 8822)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-17 17:54+0200\n"
+"POT-Creation-Date: 2013-06-19 15:31+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -2423,13 +2423,21 @@
 msgstr "Keine Seite angegeben"
 
 #, php-format
-msgid "Rating: %s (%d vote"
-msgstr ""
-
-#, php-format
 msgid "Your rating was %.1f"
 msgstr "Deine Bewertung war %.1f"
 
+# (Wrong Translation; sorry, but the German term for edit is NOT
+# editieren, but  e d i e r e n).
+#, fuzzy, php-format
+msgid "Prediction: %s"
+msgstr "Bearbeite: %s"
+
+# (Wrong Translation; sorry, but the German term for edit is NOT
+# editieren, but  e d i e r e n).
+#, fuzzy, php-format
+msgid "Prediction: %.1f"
+msgstr "Bearbeite: %s"
+
 msgid "RateIt"
 msgstr "BewerteEs"
 
@@ -6098,18 +6106,6 @@
 msgid "Edit this page"
 msgstr "Diese Seite bearbeiten"
 
-# (Wrong Translation; sorry, but the German term for edit is NOT
-# editieren, but  e d i e r e n).
-#, fuzzy
-#~ msgid "Prediction: %s"
-#~ msgstr "Bearbeite: %s"
-
-# (Wrong Translation; sorry, but the German term for edit is NOT
-# editieren, but  e d i e r e n).
-#, fuzzy
-#~ msgid "Prediction: %.1f"
-#~ msgstr "Bearbeite: %s"
-
 #~ msgid "_PreferencesInfo"
 #~ msgstr "_EinstellungenInfo"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2013-06-19 13:30:06 UTC (rev 8821)
+++ trunk/locale/po/es.po	2013-06-19 13:32:18 UTC (rev 8822)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-17 17:54+0200\n"
+"POT-Creation-Date: 2013-06-19 15:31+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -2356,13 +2356,17 @@
 msgstr ""
 
 #, php-format
-msgid "Rating: %s (%d vote"
-msgstr ""
-
-#, php-format
 msgid "Your rating was %.1f"
 msgstr ""
 
+#, fuzzy, php-format
+msgid "Prediction: %s"
+msgstr "Editar: %s"
+
+#, fuzzy, php-format
+msgid "Prediction: %.1f"
+msgstr "Editar: %s"
+
 msgid "RateIt"
 msgstr ""
 
@@ -5905,14 +5909,6 @@
 msgid "Edit this page"
 msgstr "Corrija esta página"
 
-#, fuzzy
-#~ msgid "Prediction: %s"
-#~ msgstr "Editar: %s"
-
-#, fuzzy
-#~ msgid "Prediction: %.1f"
-#~ msgstr "Editar: %s"
-
 #~ msgid "Version %s"
 #~ msgstr "Versión %s"
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2013-06-19 13:30:06 UTC (rev 8821)
+++ trunk/locale/po/fr.po	2013-06-19 13:32:18 UTC (rev 8822)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-17 17:54+0200\n"
+"POT-Creation-Date: 2013-06-19 15:31+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -2373,13 +2373,17 @@
 msgstr "aucune page indiquée"
 
 #, php-format
-msgid "Rating: %s (%d vote"
-msgstr ""
-
-#, php-format
 msgid "Your rating was %.1f"
 msgstr "Votre note est %.1f"
 
+#, php-format
+msgid "Prediction: %s"
+msgstr "Prédiction : %s"
+
+#, php-format
+msgid "Prediction: %.1f"
+msgstr "Prédiction : %.1f"
+
 msgid "RateIt"
 msgstr "ClassezLa"
 
@@ -5989,12 +5993,6 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
-#~ msgid "Prediction: %s"
-#~ msgstr "Prédiction : %s"
-
-#~ msgid "Prediction: %.1f"
-#~ msgstr "Prédiction : %.1f"
-
 #~ msgid "_PreferencesInfo"
 #~ msgstr "_PréférencesInfo"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2013-06-19 13:30:06 UTC (rev 8821)
+++ trunk/locale/po/it.po	2013-06-19 13:32:18 UTC (rev 8822)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-17 17:54+0200\n"
+"POT-Creation-Date: 2013-06-19 15:31+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -2334,13 +2334,17 @@
 msgstr ""
 
 #, php-format
-msgid "Rating: %s (%d vote"
-msgstr ""
-
-#, php-format
 msgid "Your rating was %.1f"
 msgstr ""
 
+#, fuzzy, php-format
+msgid "Prediction: %s"
+msgstr "Modifica: %s"
+
+#, fuzzy, php-format
+msgid "Prediction: %.1f"
+msgstr "Modifica: %s"
+
 msgid "RateIt"
 msgstr ""
 
@@ -5842,14 +5846,6 @@
 msgid "Edit this page"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Prediction: %s"
-#~ msgstr "Modifica: %s"
-
-#, fuzzy
-#~ msgid "Prediction: %.1f"
-#~ msgstr "Modifica: %s"
-
 #~ msgid "_PreferencesInfo"
 #~ msgstr "_PreferenzeInfo"
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2013-06-19 13:30:06 UTC (rev 8821)
+++ trunk/locale/po/ja.po	2013-06-19 13:32:18 UTC (rev 8822)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-17 17:54+0200\n"
+"POT-Creation-Date: 2013-06-19 15:31+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -2367,13 +2367,17 @@
 msgstr ""
 
 #, php-format
-msgid "Rating: %s (%d vote"
-msgstr ""
-
-#, php-format
 msgid "Your rating was %.1f"
 msgstr ""
 
+#, fuzzy, php-format
+msgid "Prediction: %s"
+msgstr "編集: %s"
+
+#, fuzzy, php-format
+msgid "Prediction: %.1f"
+msgstr "編集: %s"
+
 msgid "RateIt"
 msgstr ""
 
@@ -6087,14 +6091,6 @@
 msgstr "ページを編集しています。"
 
 #, fuzzy
-#~ msgid "Prediction: %s"
-#~ msgstr "編集: %s"
-
-#, fuzzy
-#~ msgid "Prediction: %.1f"
-#~ msgstr "編集: %s"
-
-#, fuzzy
 #~ msgid "_PreferencesInfo"
 #~ msgstr "参照一覧"
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2013-06-19 13:30:06 UTC (rev 8821)
+++ trunk/locale/po/nl.po	2013-06-19 13:32:18 UTC (rev 8822)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-17 17:54+0200\n"
+"POT-Creation-Date: 2013-06-19 15:31+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -2326,13 +2326,17 @@
 msgstr ""
 
 #, php-format
-msgid "Rating: %s (%d vote"
-msgstr ""
-
-#, php-format
 msgid "Your rating was %.1f"
 msgstr ""
 
+#, fuzzy, php-format
+msgid "Prediction: %s"
+msgstr "Verander: %s"
+
+#, fuzzy, php-format
+msgid "Prediction: %.1f"
+msgstr "Verander: %s"
+
 msgid "RateIt"
 msgstr ""
 
@@ -5833,14 +5837,6 @@
 msgstr ""
 
 #, fuzzy
-#~ msgid "Prediction: %s"
-#~ msgstr "Verander: %s"
-
-#, fuzzy
-#~ msgid "Prediction: %.1f"
-#~ msgstr "Verander: %s"
-
-#, fuzzy
 #~ msgid "period"
 #~ msgstr "versie %d"
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2013-06-19 13:30:06 UTC (rev 8821)
+++ trunk/locale/po/phpwiki.pot	2013-06-19 13:32:18 UTC (rev 8822)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-17 17:54+0200\n"
+"POT-Creation-Date: 2013-06-19 15:31+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -2320,13 +2320,17 @@
 msgstr ""
 
 #, php-format
-msgid "Rating: %s (%d vote"
+msgid "Your rating was %.1f"
 msgstr ""
 
 #, php-format
-msgid "Your rating was %.1f"
+msgid "Prediction: %s"
 msgstr ""
 
+#, php-format
+msgid "Prediction: %.1f"
+msgstr ""
+
 msgid "RateIt"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2013-06-19 13:30:06 UTC (rev 8821)
+++ trunk/locale/po/sv.po	2013-06-19 13:32:18 UTC (rev 8822)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-17 17:54+0200\n"
+"POT-Creation-Date: 2013-06-19 15:31+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -2321,13 +2321,17 @@
 msgstr ""
 
 #, php-format
-msgid "Rating: %s (%d vote"
-msgstr ""
-
-#, php-format
 msgid "Your rating was %.1f"
 msgstr ""
 
+#, fuzzy, php-format
+msgid "Prediction: %s"
+msgstr "Redigera: %s"
+
+#, fuzzy, php-format
+msgid "Prediction: %.1f"
+msgstr "Redigera: %s"
+
 msgid "RateIt"
 msgstr ""
 
@@ -5825,14 +5829,6 @@
 msgstr ""
 
 #, fuzzy
-#~ msgid "Prediction: %s"
-#~ msgstr "Redigera: %s"
-
-#, fuzzy
-#~ msgid "Prediction: %.1f"
-#~ msgstr "Redigera: %s"
-
-#, fuzzy
 #~ msgid "%s not found"
 #~ msgstr "%s: fila ingen funna"
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2013-06-19 13:30:06 UTC (rev 8821)
+++ trunk/locale/po/zh.po	2013-06-19 13:32:18 UTC (rev 8822)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-17 17:54+0200\n"
+"POT-Creation-Date: 2013-06-19 15:31+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -2438,13 +2438,17 @@
 msgstr "沒有指定頁面"
 
 #, php-format
-msgid "Rating: %s (%d vote"
-msgstr ""
-
-#, php-format
 msgid "Your rating was %.1f"
 msgstr "你的評比是 %.1f"
 
+#, fuzzy, php-format
+msgid "Prediction: %s"
+msgstr "編輯: %s"
+
+#, fuzzy, php-format
+msgid "Prediction: %.1f"
+msgstr "編輯: %s"
+
 msgid "RateIt"
 msgstr ""
 
@@ -6204,14 +6208,6 @@
 msgstr "編輯此頁面"
 
 #, fuzzy
-#~ msgid "Prediction: %s"
-#~ msgstr "編輯: %s"
-
-#, fuzzy
-#~ msgid "Prediction: %.1f"
-#~ msgstr "編輯: %s"
-
-#, fuzzy
 #~ msgid "_PreferencesInfo"
 #~ 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:[8821] trunk/lib/CachedMarkup.php

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

Revision: 8821
          http://sourceforge.net/p/phpwiki/code/8821
Author:   vargenau
Date:     2013-06-19 13:30:06 +0000 (Wed, 19 Jun 2013)
Log Message:
-----------
trigger_error only if DEBUG

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

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2013-06-19 13:28:34 UTC (rev 8820)
+++ trunk/lib/CachedMarkup.php	2013-06-19 13:30:06 UTC (rev 8821)
@@ -237,8 +237,13 @@
             ) { // give the content the chance to know about itself or even
                 // to change itself
                 $val = $item->expand($basepage, $this);
-                if ($val) $val->printXML();
-                else trigger_error('empty item ' . print_r($item, true));
+                if ($val) {
+                    $val->printXML();
+                } else {
+                    if (DEBUG) {
+                        trigger_error('empty item ' . print_r($item, true));
+                    }
+                }
             } else {
                 $item->printXML();
             }

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

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

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

Revision: 8820
          http://sourceforge.net/p/phpwiki/code/8820
Author:   vargenau
Date:     2013-06-19 13:28:34 +0000 (Wed, 19 Jun 2013)
Log Message:
-----------
Avoid fatal error in ListRelations

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

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2013-06-19 13:25:45 UTC (rev 8819)
+++ trunk/lib/WikiDB.php	2013-06-19 13:28:34 UTC (rev 8820)
@@ -1969,7 +1969,7 @@
      */
     function free()
     {
-        $this->_iter->free();
+        // $this->_iter->free();
     }
 
     function reset()

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

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

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

Revision: 8819
          http://sourceforge.net/p/phpwiki/code/8819
Author:   vargenau
Date:     2013-06-19 13:25:45 +0000 (Wed, 19 Jun 2013)
Log Message:
-----------
Remove http-equiv=Content-Style-Type, http-equiv=Content-Language

Modified Paths:
--------------
    trunk/themes/Sidebar/templates/htmldump.tmpl
    trunk/themes/default/templates/head.tmpl
    trunk/themes/default/templates/htmldump.tmpl

Modified: trunk/themes/Sidebar/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/htmldump.tmpl	2013-06-18 16:31:53 UTC (rev 8818)
+++ trunk/themes/Sidebar/templates/htmldump.tmpl	2013-06-19 13:25:45 UTC (rev 8819)
@@ -12,8 +12,6 @@
 <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" />
 <link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
 <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="<?php echo $GLOBALS['LANG']?>" />
 <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>
 <meta name="robots" content="<?php echo $ROBOTS_CONTENT ?>" />
 <?php if (!empty($PAGE_DESCRIPTION)) { ?>

Modified: trunk/themes/default/templates/head.tmpl
===================================================================
--- trunk/themes/default/templates/head.tmpl	2013-06-18 16:31:53 UTC (rev 8818)
+++ trunk/themes/default/templates/head.tmpl	2013-06-19 13:25:45 UTC (rev 8819)
@@ -4,8 +4,6 @@
 <?php } else { ?>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <?php } ?>
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="<?php echo $GLOBALS['LANG']?>" />
 <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>
 <meta name="robots" content="<?php echo $ROBOTS_CONTENT ?>" />
 <?php if (!empty($PAGE_DESCRIPTION)) { ?>

Modified: trunk/themes/default/templates/htmldump.tmpl
===================================================================
--- trunk/themes/default/templates/htmldump.tmpl	2013-06-18 16:31:53 UTC (rev 8818)
+++ trunk/themes/default/templates/htmldump.tmpl	2013-06-19 13:25:45 UTC (rev 8819)
@@ -12,8 +12,6 @@
 <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" />
 <link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />
 <link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="Content-Language" content="<?php echo $GLOBALS['LANG']?>" />
 <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>
 <meta name="robots" content="<?php echo $ROBOTS_CONTENT ?>" />
 <?php if (!empty($PAGE_DESCRIPTION)) { ?>

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

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

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

Revision: 8818
          http://sourceforge.net/p/phpwiki/code/8818
Author:   vargenau
Date:     2013-06-18 16:31:53 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
Use CSS

Modified Paths:
--------------
    trunk/lib/plugin/AnalyseAccessLogSql.php
    trunk/lib/plugin/DebugAuthInfo.php
    trunk/lib/plugin/DebugBackendInfo.php
    trunk/lib/plugin/EditMetaData.php
    trunk/lib/plugin/LdapSearch.php
    trunk/lib/plugin/ModeratedPage.php
    trunk/lib/plugin/PreferenceApp.php
    trunk/lib/plugin/SemanticSearch.php
    trunk/lib/plugin/WikiForum.php

Modified: trunk/lib/plugin/AnalyseAccessLogSql.php
===================================================================
--- trunk/lib/plugin/AnalyseAccessLogSql.php	2013-06-18 15:39:31 UTC (rev 8817)
+++ trunk/lib/plugin/AnalyseAccessLogSql.php	2013-06-18 16:31:53 UTC (rev 8818)
@@ -291,7 +291,7 @@
         // otherwise the headers will not be ready
         $tbody = $this->getQueryResults($query, $dbi);
 
-        return HTML::table(array('border' => 1),
+        return HTML::table(array('class' => 'bordered'),
             HTML::caption($this->getCaption($args)),
             HTML::thead($this->_theadrow),
             $tbody);

Modified: trunk/lib/plugin/DebugAuthInfo.php
===================================================================
--- trunk/lib/plugin/DebugAuthInfo.php	2013-06-18 15:39:31 UTC (rev 8817)
+++ trunk/lib/plugin/DebugAuthInfo.php	2013-06-18 16:31:53 UTC (rev 8818)
@@ -57,7 +57,7 @@
         }
 
         $html = HTML(HTML::h3(fmt("General Auth Settings")));
-        $table = HTML::table(array('border' => 1));
+        $table = HTML::table(array('class' => 'bordered'));
         $table->pushContent($this->show_hash("AUTH DEFINES",
             $this->buildConstHash(
                 array("ENABLE_USER_NEW", "ALLOW_ANON_USER",
@@ -93,7 +93,7 @@
         if (!$user) {
             $html->pushContent(HTML::p(fmt("No userid")));
         } else {
-            $table = HTML::table(array('border' => 1));
+            $table = HTML::table(array('class' => 'bordered'));
             //$table->pushContent(HTML::tr(HTML::td(array('colspan' => 2))));
             $userdata = obj2hash($user, array('_dbi', '_request', 'password', 'passwd'));
             if (isa($user, "_FilePassUser")) {
@@ -130,10 +130,10 @@
         if ($max_depth > 35) return $heading;
 
         if ($heading)
-            $rows[] = HTML::tr(array('bgcolor' => '#ffcccc',
-                    'style' => 'color:#000000'),
+            $rows[] = HTML::tr(array(
+                    'style' => 'color:#000;background-color:#ffcccc'),
                 HTML::td(array('colspan' => 2,
-                        'style' => 'color:#000000'),
+                        'style' => 'color:#000'),
                     $heading));
         if (is_object($hash))
             $hash = obj2hash($hash);
@@ -145,7 +145,7 @@
                     if ($depth > 3) $val = $heading;
                     elseif ($heading == "Object of wikidb_sql") $val = $heading; elseif (substr($heading, 0, 13) == "Object of db_") $val = $heading; elseif (!isset($seen[$heading])) {
                         //if (empty($seen[$heading])) $seen[$heading] = 1;
-                        $val = HTML::table(array('border' => 1),
+                        $val = HTML::table(array('class' => 'bordered'),
                             $this->show_hash($heading, obj2hash($val), $depth + 1));
                     } else {
                         $val = $heading;
@@ -155,20 +155,18 @@
                     if ($depth > 3) $val = $heading;
                     elseif (!isset($seen[$heading])) {
                         //if (empty($seen[$heading])) $seen[$heading] = 1;
-                        $val = HTML::table(array('border' => 1,
-                                'cellpadding' => 2,
-                                'cellspacing' => 0),
+                        $val = HTML::table(array('class' => 'bordered'),
                             $this->show_hash($heading, $val, $depth + 1));
                     } else {
                         $val = $heading;
                     }
                 }
                 $rows[] = HTML::tr(HTML::td(array('align' => 'right',
-                            'bgcolor' => '#cccccc',
+                            'bgcolor' => '#ccc',
                             'style' => 'color:#000000'),
                         HTML(HTML::raw(' '), $key,
                             HTML::raw(' '))),
-                    HTML::td(array('bgcolor' => '#ffffff',
+                    HTML::td(array('bgcolor' => '#fff',
                             'style' => 'color:#000000'),
                         $val ? $val : HTML::raw(' '))
                 );

Modified: trunk/lib/plugin/DebugBackendInfo.php
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php	2013-06-18 15:39:31 UTC (rev 8817)
+++ trunk/lib/plugin/DebugBackendInfo.php	2013-06-18 16:31:53 UTC (rev 8818)
@@ -52,7 +52,7 @@
         $html = HTML(HTML::h3(fmt("Querying backend directly for “%s”",
             $page)));
 
-        $table = HTML::table(array('border' => 1));
+        $table = HTML::table(array('class' => 'bordered'));
         $pagedata = $backend->get_pagedata($page);
         if (!$pagedata) {
             // FIXME: invalid HTML
@@ -127,12 +127,12 @@
                 // how to indent this table?
                 $val = unserialize($val);
                 $this->_fixupData($val, $fullkey);
-                $data[$key] = HTML::table(array('border' => 1),
+                $data[$key] = HTML::table(array('class' => 'bordered'),
                     $this->_showhash(false, $val, $fullkey));
             } elseif (is_array($val)) {
                 // how to indent this table?
                 $this->_fixupData($val, $fullkey);
-                $data[$key] = HTML::table(array('border' => 1),
+                $data[$key] = HTML::table(array('class' => 'bordered'),
                     $this->_showhash(false, $val, $fullkey));
             } elseif (is_object($val)) {
                 // how to indent this table?
@@ -140,7 +140,7 @@
                 print_r($val);
                 $val = HTML::pre(ob_get_contents());
                 ob_end_clean();
-                $data[$key] = HTML::table(array('border' => 1),
+                $data[$key] = HTML::table(array('class' => 'bordered'),
                     $this->_showhash(false, $val, $fullkey));
             } elseif ($key and $key == '%content') {
                 if ($val === true)
@@ -158,22 +158,21 @@
     {
         $rows = array();
         if ($heading)
-            $rows[] = HTML::tr(array('bgcolor' => '#ffcccc',
-                    'style' => 'color:#000000'),
+            $rows[] = HTML::tr(array(
+                    'style' => 'color:#000;background-color:#ffcccc'),
                 HTML::td(array('colspan' => 2,
-                        'style' => 'color:#000000'),
+                        'style' => 'color:#000'),
                     $heading));
         if (!is_array($hash)) return array();
         ksort($hash);
         foreach ($hash as $key => $val) {
             if ($this->chunk_split and is_string($val)) $val = chunk_split($val);
-            $rows[] = HTML::tr(HTML::td(array('align' => 'right',
-                        'bgcolor' => '#cccccc',
-                        'style' => 'color:#000000'),
+            $rows[] = HTML::tr(HTML::td(array('class' => 'align-right',
+                        'style' => 'color:#000;background-color:#ccc'),
                     HTML(HTML::raw(' '), $key,
                         HTML::raw(' '))),
-                HTML::td(array('bgcolor' => '#ffffff',
-                        'style' => 'color:#000000'),
+                HTML::td(array(
+                        'style' => 'color:#000;background-color:#fff'),
                     $this->_showvalue($key, $val, $prefix))
             );
         }

Modified: trunk/lib/plugin/EditMetaData.php
===================================================================
--- trunk/lib/plugin/EditMetaData.php	2013-06-18 15:39:31 UTC (rev 8817)
+++ trunk/lib/plugin/EditMetaData.php	2013-06-18 16:31:53 UTC (rev 8818)
@@ -125,7 +125,7 @@
             $html->pushContent(HTML::p(fmt("No metadata for %s", $page)));
             $table = HTML();
         } else {
-            $table = HTML::table(array('border' => 1));
+            $table = HTML::table(array('class' => 'bordered'));
             $this->_fixupData($pagemeta);
             $table->pushContent($this->_showhash("MetaData('$page')", $pagemeta));
         }

Modified: trunk/lib/plugin/LdapSearch.php
===================================================================
--- trunk/lib/plugin/LdapSearch.php	2013-06-18 15:39:31 UTC (rev 8817)
+++ trunk/lib/plugin/LdapSearch.php	2013-06-18 16:31:53 UTC (rev 8818)
@@ -196,7 +196,7 @@
             }
             $html->pushContent($row);
         }
-        return HTML::table(array('border' => 1), $html);
+        return HTML::table(array('class' => 'bordered'), $html);
     }
 }
 

Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php	2013-06-18 15:39:31 UTC (rev 8817)
+++ trunk/lib/plugin/ModeratedPage.php	2013-06-18 16:31:53 UTC (rev 8818)
@@ -374,7 +374,7 @@
 
         $loader = new WikiPluginLoader();
         $BackendInfo = $loader->getPlugin("DebugBackendInfo");
-        $table = HTML::table(array('border' => 1));
+        $table = HTML::table(array('class' => 'bordered'));
         $content = $table;
         $diff = '';
         if ($moderation['args']['action'] == 'edit') {

Modified: trunk/lib/plugin/PreferenceApp.php
===================================================================
--- trunk/lib/plugin/PreferenceApp.php	2013-06-18 15:39:31 UTC (rev 8817)
+++ trunk/lib/plugin/PreferenceApp.php	2013-06-18 16:31:53 UTC (rev 8818)
@@ -179,12 +179,12 @@
 
         $table = HTML::table();
         $tr = HTML::tr();
-        $td = HTML::td(array('bgcolor' => '#FFFFFF'));
+        $td = HTML::td(array('style' => 'background-color:#fff'));
         $td->pushContent(" ");
         $tr->pushContent($td);
 
         foreach ($people as $person) {
-            $td = HTML::td(array('bgcolor' => '#FFFFFF'));
+            $td = HTML::td(array('style' => 'background-color:#fff'));
             $td->pushContent(HTML::a(array('href' => WikiURL($person),
                     'class' => 'wiki'
                 ),
@@ -192,10 +192,10 @@
             //$td->pushContent(WikiLink(" $person "));
             $tr->pushContent($td);
         }
-        $td = HTML::td(array('bgcolor' => '#FFFFFF'));
+        $td = HTML::td(array('style' => 'background-color:#fff'));
         $td->pushContent(_("Total Units"));
         $tr->pushContent($td);
-        $td = HTML::td(array('bgcolor' => '#FFFFFF'));
+        $td = HTML::td(array('style' => 'background-color:#fff'));
         $td->pushContent(_("Total Voters"));
         $tr->pushContent($td);
         $table->pushContent($tr);
@@ -229,7 +229,7 @@
         }
         for ($i = 0; $i < count($pageids); $i++) {
             $tr = HTML::tr();
-            $td = HTML::td(array('align' => 'left', 'bgcolor' => '#f7f7f7'));
+            $td = HTML::td(array('style' => 'text-align:left;background-color:#f7f7f7'));
             $td->pushContent(HTML::a(array('href' => WikiURL($pageids[$i]),
                     'class' => 'wiki'
                 ),
@@ -238,7 +238,7 @@
             $total_cans = 0;
             $total_voters = 0;
             for ($j = 0; $j < count($people); $j++) {
-                $td = HTML::td(array('align' => 'right', 'bgcolor' => '#f7f7f7'));
+                $td = HTML::td(array('style' => 'text-align:right;background-color:#f7f7f7'));
                 $output = $outputArray[$people[$j]][$pageids[$i]];
                 $total_cans = $total_cans + $output;
                 if ($output == "") {
@@ -286,15 +286,15 @@
             $td->pushContent(HTML::strong($cans));
             $tr->pushContent($td);
         }
-        $td = HTML::td(array('align' => 'right'));
+        $td = HTML::td(array('class' => 'align-right'));
         $td->pushContent(HTML::strong($cans_total));
         $tr->pushContent($td);
-        $td = HTML::td(array('align' => 'right'));
+        $td = HTML::td(array('class' => 'align-right'));
         $td->pushContent(HTML::strong($total_voters));
         $tr->pushContent($td);
         $table->pushContent($tr);
 
-        $table2 = HTML::table(array('bgcolor' => '#dedfdf'));
+        $table2 = HTML::table(array('style' => 'background-color:#dedfdf'));
         $table2->pushContent(HTML::tr(HTML::td($table)));
         $html->pushContent($table2);
 

Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php	2013-06-18 15:39:31 UTC (rev 8817)
+++ trunk/lib/plugin/SemanticSearch.php	2013-06-18 16:31:53 UTC (rev 8818)
@@ -141,8 +141,7 @@
             $reldef,
             $hiddenfield, HiddenInputs(array('attribute' => '')),
             $instructions, HTML::br(),
-            HTML::table
-            (array('border' => 0, 'cellspacing' => 2),
+            HTML::table(
                 HTML::colgroup(array('span' => 6)),
                 HTML::thead
                 (HTML::tr(

Modified: trunk/lib/plugin/WikiForum.php
===================================================================
--- trunk/lib/plugin/WikiForum.php	2013-06-18 15:39:31 UTC (rev 8817)
+++ trunk/lib/plugin/WikiForum.php	2013-06-18 16:31:53 UTC (rev 8818)
@@ -112,7 +112,7 @@
 
         $dbi = $request->getDbh();
         $topics = $this->findBlogs($dbi, $args['pagename'], 'wikiforum');
-        $html = HTML::table(array('border' => 0));
+        $html = HTML::table();
         $row = HTML::tr(HTML::th('title'),
             HTML::th('last post'),
             HTML::th('author'));

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

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

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

Revision: 8817
          http://sourceforge.net/p/phpwiki/code/8817
Author:   vargenau
Date:     2013-06-18 15:39:31 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
Use CSS

Modified Paths:
--------------
    trunk/configurator.php
    trunk/lib/AccessLog.php
    trunk/lib/BlockParser.php
    trunk/lib/HtmlParser.php
    trunk/lib/PageList.php
    trunk/lib/PagePerm.php
    trunk/lib/plugin/AnalyseAccessLogSql.php
    trunk/lib/plugin/Calendar.php
    trunk/lib/plugin/DebugAuthInfo.php
    trunk/lib/plugin/DebugBackendInfo.php
    trunk/lib/plugin/EditMetaData.php
    trunk/lib/plugin/LdapSearch.php
    trunk/lib/plugin/ModeratedPage.php
    trunk/lib/plugin/PhotoAlbum.php
    trunk/lib/plugin/PreferenceApp.php
    trunk/lib/plugin/PrevNext.php
    trunk/lib/plugin/RecentReferrers.php
    trunk/lib/plugin/SemanticSearchAdvanced.php
    trunk/lib/plugin/UpLoad.php
    trunk/lib/plugin/WantedPagesOld.php
    trunk/themes/Crao/crao.css
    trunk/themes/Crao/templates/navbar.tmpl
    trunk/themes/Crao/templates/top.tmpl
    trunk/themes/Hawaiian/Hawaiian.css
    trunk/themes/MacOSX/MacOSX.css
    trunk/themes/MacOSX/images/index.php
    trunk/themes/MonoBook/main.css
    trunk/themes/Portland/portland.css
    trunk/themes/Portland/templates/body.tmpl
    trunk/themes/Portland/templates/debug.tmpl
    trunk/themes/Portland/templates/editpage.tmpl
    trunk/themes/Portland/templates/navbar.tmpl
    trunk/themes/Sidebar/sidebar.css
    trunk/themes/Sidebar/templates/debug.tmpl
    trunk/themes/SpaceWiki/SpaceWiki.css
    trunk/themes/Wordpress/Wordpress.css
    trunk/themes/Wordpress/templates/editpage.tmpl
    trunk/themes/blog/Kubrick.css
    trunk/themes/blog/templates/actionbar.tmpl
    trunk/themes/default/phpwiki.css
    trunk/themes/default/templates/actionbar.tmpl
    trunk/themes/default/templates/addcomment.tmpl
    trunk/themes/default/templates/debug.tmpl
    trunk/themes/default/templates/editpage.tmpl
    trunk/themes/default/templates/forumadd.tmpl
    trunk/themes/default/templates/login.tmpl
    trunk/themes/default/templates/online.tmpl
    trunk/themes/default/templates/pagelink.tmpl
    trunk/themes/fusionforge/templates/editpage.tmpl
    trunk/themes/shamino_com/shamino_com.css
    trunk/themes/smaller/templates/actionbar.tmpl
    trunk/themes/wikilens/templates/body.tmpl

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/configurator.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -1866,7 +1866,7 @@
         global $tdwidth;
         $i = "<h3>" . $title . "</h3>\n    " . nl2p($this->_get_description()) . "\n";
         // $i .= "<em>Not editable.</em><br />\n<pre>" . $this->default_value."</pre>";
-        return '<tr><td width="100%" class="unchangeable-variable-top" colspan="2">' . "\n" . $i . "</td></tr>\n"
+        return '<tr><td style="width:100%" class="unchangeable-variable-top" colspan="2">' . "\n" . $i . "</td></tr>\n"
             . '<tr style="border-top: none;"><td class="unchangeable-variable-left" width="' . $tdwidth . '">&nbsp;</td>';
     }
 }
@@ -2495,7 +2495,8 @@
     {
         $id = preg_replace("/\W/", "", $this->config_item_name);
         $group_name = preg_replace("/\W/", "", $title);
-        $i = "<tr class=\"header\" id=\"$id\">\n<td class=\"part\" width=\"100%\" colspan=\"2\" bgcolor=\"#eeeeee\">\n";
+        $i = '<tr class="header" id="'.$id.'">'."\n";
+        $i .= '<td class="part" style="width:100%;background-color:#eee" colspan="2">'."\n";
         $i .= "<h2>" . $title . "</h2>\n    " . nl2p($this->_get_description()) . "\n";
         $i .= "<p><a href=\"javascript:toggle_group('$id')\" id=\"{$id}_text\">Hide options.</a></p>";
         return $i . "</td>\n";

Modified: trunk/lib/AccessLog.php
===================================================================
--- trunk/lib/AccessLog.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/AccessLog.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -656,10 +656,8 @@
         // otherwise the headers will not be ready
         $tbody = $this->_getQueryResults($query, $dbi);
 
-        return HTML::table(array('border' => 1,
-                'cellspacing' => 1,
-                'cellpadding' => 1),
-            HTML::caption(HTML::h1(HTML::br(), $this->_getCaption($args))),
+        return HTML::table(array('border' => 1),
+            HTML::caption($this->_getCaption($args)),
             HTML::thead($this->_theadrow),
             $tbody);
     }

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/BlockParser.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -851,9 +851,7 @@
             $defs[$key]->setWidth($ncols);
 
         return HTML::table(array('class' => 'wiki-dl-table',
-                'border' => 1,
-                'cellspacing' => 0,
-                'cellpadding' => 6),
+                'border' => 1),
             $defs);
     }
 }

Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/HtmlParser.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -379,7 +379,7 @@
             if (!$alignment and preg_match("/float(right|left)/i", $css_class, $m)) ;
             $alignment = $m[1];
             if ($alignment) {
-                $attrs[] = "align=$alignment";
+                $attrs[] = "class=align-$alignment";
                 $this->log("  Image is contained within a DIV that specifies $alignment alignment");
                 $this->log("  Adding '$alignment' to [Image] markup attributes");
             } else {
@@ -389,7 +389,7 @@
             $this->log("  Image is not contained within a DIV");
         }
         if ($alignment)
-            $attrs[] = "align=$alignment";
+            $attrs[] = "class=align-$alignment";
         //
         // Check if we need to request a thumbnail of this
         // image; it's needed if the specified width attribute

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/PageList.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -1650,7 +1650,7 @@
                 $this->_options['limit']);
             if ($tokens) {
                 $paging = Template("pagelink", $tokens);
-                $out->pushContent(HTML::table(array('width' => '100%'), $paging));
+                $out->pushContent(HTML::table(array('class' => 'fullwidth'), $paging));
             }
         }
 
@@ -1669,7 +1669,7 @@
                 $length += 1;
             }
             $width = sprintf("%d", 100 / $this->_options['cols']) . '%';
-            $cols = HTML::tr(array('valign' => 'top'));
+            $cols = HTML::tr(array('class' => 'top'));
             for ($i = $offset; $i < $offset + $count; $i += $length) {
                 $this->_saveOptions(array('cols' => 0, 'paging' => 'none'));
                 $this->_pages = array_slice($this->_pages, $i, $length);
@@ -1761,7 +1761,7 @@
         }
         $out->pushContent($list);
         if ($do_paging and $tokens) {
-            $out->pushContent(HTML::table(array('width' => '100%'), $paging));
+            $out->pushContent(HTML::table(array('class' => 'fullwidth'), $paging));
         }
         return $out;
     }

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/PagePerm.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -578,7 +578,7 @@
                 $td->pushContent(HTML::tr(HTML::td(array('align' => 'right'), $group),
                     HTML::td($bool ? '[X]' : '[ ]')));
             }
-            $table->pushContent(HTML::tr(array('valign' => 'top'),
+            $table->pushContent(HTML::tr(array('class' => 'top'),
                 HTML::td($access), HTML::td($td)));
         }
         if ($type == 'default')
@@ -639,7 +639,7 @@
                 $addbutton->setAttr('checked', 'checked');
                 $newperm->setAttr('checked', 'checked');
                 $table->pushContent(
-                    HTML::tr(array('valign' => 'top'),
+                    HTML::tr(array('class' => 'top'),
                         HTML::td(HTML::strong($access . ":")),
                         HTML::td($newgroup),
                         HTML::td($nbsp, $newperm),
@@ -686,7 +686,7 @@
             }
             if (!empty($groups))
                 $table->pushContent(
-                    HTML::tr(array('valign' => 'top'),
+                    HTML::tr(array('class' => 'top'),
                         HTML::td(array('align' => 'right'), _("add ")),
                         HTML::td($newgroup),
                         HTML::td(array('align' => 'center'), $nbsp, $newperm),

Modified: trunk/lib/plugin/AnalyseAccessLogSql.php
===================================================================
--- trunk/lib/plugin/AnalyseAccessLogSql.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/AnalyseAccessLogSql.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -291,10 +291,8 @@
         // otherwise the headers will not be ready
         $tbody = $this->getQueryResults($query, $dbi);
 
-        return HTML::table(array('border' => 1,
-                'cellspacing' => 1,
-                'cellpadding' => 1),
-            HTML::caption(HTML::h1(HTML::br(), $this->getCaption($args))),
+        return HTML::table(array('border' => 1),
+            HTML::caption($this->getCaption($args)),
             HTML::thead($this->_theadrow),
             $tbody);
     }

Modified: trunk/lib/plugin/Calendar.php
===================================================================
--- trunk/lib/plugin/Calendar.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/Calendar.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -101,9 +101,7 @@
 
         return HTML::tr(HTML::td(array('colspan' => $args['display_weeknum'] ? 8 : 7,
                 'align' => 'center'),
-            HTML::table(array('width' => '100%',
-                    'class' => 'cal-header'),
-                $row)));
+            HTML::table(array('class' => 'cal-header fullwidth'), $row)));
     }
 
     private function __daynames($start_wday)
@@ -189,9 +187,7 @@
             1, // mday (1-31)
             $args['year']);
 
-        $cal = HTML::table(array('cellspacing' => 0,
-                'cellpadding' => 2,
-                'class' => 'cal'),
+        $cal = HTML::table(array('class' => 'cal'),
             HTML::thead(
                 $this->__header($request->getArg('pagename'),
                     $time),

Modified: trunk/lib/plugin/DebugAuthInfo.php
===================================================================
--- trunk/lib/plugin/DebugAuthInfo.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/DebugAuthInfo.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -57,9 +57,7 @@
         }
 
         $html = HTML(HTML::h3(fmt("General Auth Settings")));
-        $table = HTML::table(array('border' => 1,
-            'cellpadding' => 2,
-            'cellspacing' => 0));
+        $table = HTML::table(array('border' => 1));
         $table->pushContent($this->show_hash("AUTH DEFINES",
             $this->buildConstHash(
                 array("ENABLE_USER_NEW", "ALLOW_ANON_USER",
@@ -95,9 +93,7 @@
         if (!$user) {
             $html->pushContent(HTML::p(fmt("No userid")));
         } else {
-            $table = HTML::table(array('border' => 1,
-                'cellpadding' => 2,
-                'cellspacing' => 0));
+            $table = HTML::table(array('border' => 1));
             //$table->pushContent(HTML::tr(HTML::td(array('colspan' => 2))));
             $userdata = obj2hash($user, array('_dbi', '_request', 'password', 'passwd'));
             if (isa($user, "_FilePassUser")) {
@@ -149,9 +145,7 @@
                     if ($depth > 3) $val = $heading;
                     elseif ($heading == "Object of wikidb_sql") $val = $heading; elseif (substr($heading, 0, 13) == "Object of db_") $val = $heading; elseif (!isset($seen[$heading])) {
                         //if (empty($seen[$heading])) $seen[$heading] = 1;
-                        $val = HTML::table(array('border' => 1,
-                                'cellpadding' => 2,
-                                'cellspacing' => 0),
+                        $val = HTML::table(array('border' => 1),
                             $this->show_hash($heading, obj2hash($val), $depth + 1));
                     } else {
                         $val = $heading;

Modified: trunk/lib/plugin/DebugBackendInfo.php
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/DebugBackendInfo.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -52,9 +52,7 @@
         $html = HTML(HTML::h3(fmt("Querying backend directly for “%s”",
             $page)));
 
-        $table = HTML::table(array('border' => 1,
-            'cellpadding' => 2,
-            'cellspacing' => 0));
+        $table = HTML::table(array('border' => 1));
         $pagedata = $backend->get_pagedata($page);
         if (!$pagedata) {
             // FIXME: invalid HTML
@@ -129,16 +127,12 @@
                 // how to indent this table?
                 $val = unserialize($val);
                 $this->_fixupData($val, $fullkey);
-                $data[$key] = HTML::table(array('border' => 1,
-                        'cellpadding' => 2,
-                        'cellspacing' => 0),
+                $data[$key] = HTML::table(array('border' => 1),
                     $this->_showhash(false, $val, $fullkey));
             } elseif (is_array($val)) {
                 // how to indent this table?
                 $this->_fixupData($val, $fullkey);
-                $data[$key] = HTML::table(array('border' => 1,
-                        'cellpadding' => 2,
-                        'cellspacing' => 0),
+                $data[$key] = HTML::table(array('border' => 1),
                     $this->_showhash(false, $val, $fullkey));
             } elseif (is_object($val)) {
                 // how to indent this table?
@@ -146,9 +140,7 @@
                 print_r($val);
                 $val = HTML::pre(ob_get_contents());
                 ob_end_clean();
-                $data[$key] = HTML::table(array('border' => 1,
-                        'cellpadding' => 2,
-                        'cellspacing' => 0),
+                $data[$key] = HTML::table(array('border' => 1),
                     $this->_showhash(false, $val, $fullkey));
             } elseif ($key and $key == '%content') {
                 if ($val === true)

Modified: trunk/lib/plugin/EditMetaData.php
===================================================================
--- trunk/lib/plugin/EditMetaData.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/EditMetaData.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -125,9 +125,7 @@
             $html->pushContent(HTML::p(fmt("No metadata for %s", $page)));
             $table = HTML();
         } else {
-            $table = HTML::table(array('border' => 1,
-                'cellpadding' => 2,
-                'cellspacing' => 0));
+            $table = HTML::table(array('border' => 1));
             $this->_fixupData($pagemeta);
             $table->pushContent($this->_showhash("MetaData('$page')", $pagemeta));
         }

Modified: trunk/lib/plugin/LdapSearch.php
===================================================================
--- trunk/lib/plugin/LdapSearch.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/LdapSearch.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -196,7 +196,7 @@
             }
             $html->pushContent($row);
         }
-        return HTML::table(array('cellpadding' => 1, 'cellspacing' => 1, 'border' => 1), $html);
+        return HTML::table(array('border' => 1), $html);
     }
 }
 

Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/ModeratedPage.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -374,9 +374,7 @@
 
         $loader = new WikiPluginLoader();
         $BackendInfo = $loader->getPlugin("DebugBackendInfo");
-        $table = HTML::table(array('border' => 1,
-            'cellpadding' => 2,
-            'cellspacing' => 0));
+        $table = HTML::table(array('border' => 1));
         $content = $table;
         $diff = '';
         if ($moderation['args']['action'] == 'edit') {

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/PhotoAlbum.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -303,9 +303,8 @@
             }
 
             // cell operations
-            $cell = array('align' => "center",
-                'valign' => "top",
-                'class' => 'photoalbum cell',
+            $cell = array(
+                'class' => 'photoalbum cell align-center top',
                 'bgcolor' => "$color");
             if ($cellwidth != 'auto') {
                 if ($cellwidth == 'equal') {
@@ -366,8 +365,8 @@
             if ($mode == 'tiles') {
                 $row->pushContent(
                     HTML::td($cell,
-                        HTML::div(array('valign' => 'top'), $url_image),
-                        HTML::div(array('valign' => 'bottom'),
+                        HTML::div(array('class' => 'top'), $url_image),
+                        HTML::div(array('class' => 'bottom'),
                             HTML::div(array('class' => 'boldsmall'),
                                 ($url_text)),
                             HTML::br(),
@@ -380,12 +379,12 @@
             } elseif ($mode == 'list') {
                 $desc = ($showdesc != 'none') ? $value["desc"] : '';
                 $row->pushContent(
-                    HTML::td(array("valign" => "top",
+                    HTML::td(array("class" => "top",
                             "nowrap" => 0,
                             "bgcolor" => $color),
                         HTML::div(array('class' => 'boldsmall'), ($url_text))));
                 $row->pushContent(
-                    HTML::td(array("valign" => "top",
+                    HTML::td(array("class" => "top",
                             "nowrap" => 0,
                             "bgcolor" => $color),
                         HTML::div(array('class' => 'gensmall'),
@@ -396,7 +395,7 @@
 
                 if ($desc != '')
                     $row->pushContent(
-                        HTML::td(array("valign" => "top",
+                        HTML::td(array("class" => "top",
                                 "nowrap" => 0,
                                 "bgcolor" => $color),
                             HTML::div(array('class' => 'gensmall'), $desc)));
@@ -493,9 +492,7 @@
         }
 
         //create main table
-        $table_attributes = array("border" => 0,
-            "cellpadding" => 5,
-            "cellspacing" => 2,
+        $table_attributes = array(
             "class" => "photoalbum",
             "width" => $tablewidth ? $tablewidth : "100%");
 

Modified: trunk/lib/plugin/PreferenceApp.php
===================================================================
--- trunk/lib/plugin/PreferenceApp.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/PreferenceApp.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -177,7 +177,7 @@
             }
         }
 
-        $table = HTML::table(array('cellpadding' => '5', 'cellspacing' => '1', 'border' => '0'));
+        $table = HTML::table();
         $tr = HTML::tr();
         $td = HTML::td(array('bgcolor' => '#FFFFFF'));
         $td->pushContent(" ");

Modified: trunk/lib/plugin/PrevNext.php
===================================================================
--- trunk/lib/plugin/PrevNext.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/PrevNext.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -77,10 +77,10 @@
         $sep = $WikiTheme->getButtonSeparator();
         if ($align == 'center') {
             $tr = HTML::tr();
-            $links = HTML::table(array('cellpadding' => 0, 'cellspacing' => 0, 'width' => '100%'), $tr);
+            $links = HTML::table(array('class' => 'fullwidth'), $tr);
         } elseif ($align == 'right') {
             $td = HTML::td(array('align' => $align));
-            $links = HTML::table(array('cellpadding' => 0, 'cellspacing' => 0, 'width' => '100%'), HTML::tr($td));
+            $links = HTML::table(array('class' => 'fullwidth'), HTML::tr($td));
         } else {
             $links = HTML();
         }

Modified: trunk/lib/plugin/RecentReferrers.php
===================================================================
--- trunk/lib/plugin/RecentReferrers.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/RecentReferrers.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -51,10 +51,7 @@
             return HTML::div(array('class' => "error"), "Error: no ACCESS_LOG");
         }
         $args = $this->getArgs($argstr, $request);
-        $table = HTML::table(array('cellpadding' => 1,
-            'cellspacing' => 2,
-            'border' => 0,
-            'class' => 'pagelist'));
+        $table = HTML::table(array('class' => 'pagelist'));
         if (!$args['noheader'] and !empty($args['caption']))
             $table->pushContent(HTML::caption(array('align' => 'top'), $args['caption']));
         $limit = $args['limit'];

Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -113,7 +113,7 @@
             $reldef,
             $hiddenfield, HiddenInputs(array('attribute' => '')),
             $instructions, HTML::br(),
-            HTML::table(array('border' => '0', 'width' => '100%'),
+            HTML::table(array('class' => 'fullwidth'),
                 HTML::tr(HTML::td(_("Page Name")._(': '), $pagefilter),
                     HTML::td(array('align' => 'right'),
                         $help)),

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/UpLoad.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -290,7 +290,7 @@
             fwrite($log_handle,
                 "\n"
                     . "<tr><td><a href=\"$userfile_name\">$userfile_name</a></td>"
-                    . "<td align=\"right\">$file_size kB</td>"
+                    . "<td class=\"align-right\">$file_size kB</td>"
                     . "<td>&nbsp;&nbsp;" . $WikiTheme->formatDate(time()) . "</td>"
                     . "<td>&nbsp;&nbsp;<em>" . $user->getId() . "</em></td></tr>");
             fclose($log_handle);

Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/WantedPagesOld.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -151,10 +151,7 @@
     {
 
         if (count($this->pagelist) > 0) {
-            $table = HTML::table(array('cellpadding' => 0,
-                'cellspacing' => 1,
-                'border' => 0,
-                'class' => 'pagelist'));
+            $table = HTML::table(array('class' => 'pagelist'));
             if ($caption)
                 $table->pushContent(HTML::caption(array('align' => 'top'),
                     $caption));

Modified: trunk/themes/Crao/crao.css
===================================================================
--- trunk/themes/Crao/crao.css	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Crao/crao.css	2013-06-18 15:39:31 UTC (rev 8817)
@@ -100,6 +100,18 @@
     vertical-align: top;
 }
 
+.bottom {
+    vertical-align: bottom;
+}
+
+.middle {
+    vertical-align: middle;
+}
+
+.baseline {
+    vertical-align: baseline;
+}
+
 .nowrap {
     white-space: nowrap;
 }

Modified: trunk/themes/Crao/templates/navbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/navbar.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Crao/templates/navbar.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -6,8 +6,8 @@
   <input type="hidden" name="pagename" value="<?php echo _("TitleSearch")?>" />
 <?php } ?>
 <div id="navbuttons">
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
-<tr valign="middle"><td align="left">
+<table width="fullwidth">
+<tr class="middle"><td align="left">
 <?php echo WikiLink(_("RecentChanges"), "button") ?>
 <?php if (!empty($revision)) { ?>
 <?php echo $SEP?><?php echo Button("RelatedChanges", _("RelatedChanges")) ?>

Modified: trunk/themes/Crao/templates/top.tmpl
===================================================================
--- trunk/themes/Crao/templates/top.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Crao/templates/top.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -3,8 +3,8 @@
 if (!$HIDE_TOOLBARS) {
 ?>
 <!-- The logo -->
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
- <tr valign="middle">
+<table class="fullwidth">
+ <tr class="middle">
   <td><div id="logo"><a href="<?php echo WikiURL(HOME_PAGE)?>"><?php echo WIKI_NAME?></a></div></td>
   <td><div id="signin"><?php echo Template('signin')  ?></div></td>
  </tr>

Modified: trunk/themes/Hawaiian/Hawaiian.css
===================================================================
--- trunk/themes/Hawaiian/Hawaiian.css	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Hawaiian/Hawaiian.css	2013-06-18 15:39:31 UTC (rev 8817)
@@ -67,6 +67,18 @@
     vertical-align: top;
 }
 
+.bottom {
+    vertical-align: bottom;
+}
+
+.middle {
+    vertical-align: middle;
+}
+
+.baseline {
+    vertical-align: baseline;
+}
+
 .nowrap {
     white-space: nowrap;
 }

Modified: trunk/themes/MacOSX/MacOSX.css
===================================================================
--- trunk/themes/MacOSX/MacOSX.css	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/MacOSX/MacOSX.css	2013-06-18 15:39:31 UTC (rev 8817)
@@ -98,6 +98,18 @@
     vertical-align: top;
 }
 
+.bottom {
+    vertical-align: bottom;
+}
+
+.middle {
+    vertical-align: middle;
+}
+
+.baseline {
+    vertical-align: baseline;
+}
+
 .nowrap {
     white-space: nowrap;
 }

Modified: trunk/themes/MacOSX/images/index.php
===================================================================
--- trunk/themes/MacOSX/images/index.php	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/MacOSX/images/index.php	2013-06-18 15:39:31 UTC (rev 8817)
@@ -15,7 +15,7 @@
     }
     //--></script>
 </head>
-<body bgcolor="#8888aa">
+<body style="background-color:"#8888aa">
 <?php
 $dir = opendir(".");
 while ($fileName = readdir($dir))

Modified: trunk/themes/MonoBook/main.css
===================================================================
--- trunk/themes/MonoBook/main.css	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/MonoBook/main.css	2013-06-18 15:39:31 UTC (rev 8817)
@@ -288,6 +288,18 @@
     vertical-align: top;
 }
 
+.bottom {
+    vertical-align: bottom;
+}
+
+.middle {
+    vertical-align: middle;
+}
+
+.baseline {
+    vertical-align: baseline;
+}
+
 .nowrap {
     white-space: nowrap;
 }

Modified: trunk/themes/Portland/portland.css
===================================================================
--- trunk/themes/Portland/portland.css	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Portland/portland.css	2013-06-18 15:39:31 UTC (rev 8817)
@@ -51,6 +51,18 @@
     vertical-align: top;
 }
 
+.bottom {
+    vertical-align: bottom;
+}
+
+.middle {
+    vertical-align: middle;
+}
+
+.baseline {
+    vertical-align: baseline;
+}
+
 .nowrap {
     white-space: nowrap;
 }

Modified: trunk/themes/Portland/templates/body.tmpl
===================================================================
--- trunk/themes/Portland/templates/body.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Portland/templates/body.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -3,8 +3,8 @@
 <h1><a class="wikilink"
        href="<?php echo WikiURL(HOME_PAGE)?>"
        ><img src="<?php echo $WikiTheme->getImageURL('logo')?>"
-             border="0" alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>"
-             align="bottom" /></a> <?php echo $HEADER?></h1>
+             alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>"
+             class="bottom" /></a> <?php echo $HEADER?></h1>
 <?php echo $CONTENT ?>
 <?php echo Template('navbar') ?>
 <!-- RELATEDPAGES were here. -->

Modified: trunk/themes/Portland/templates/debug.tmpl
===================================================================
--- trunk/themes/Portland/templates/debug.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Portland/templates/debug.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -1,5 +1,5 @@
 <?php global $RUNTIMER; ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<table class="fullwidth">
 <tr><td>
 <div id="xhtml-validator"><a href="http://validator.w3.org/check/referer">Valid XHTML 1.0</a>
 <a href="http://jigsaw.w3.org/css-validator/check/referer">Valid CSS</a>

Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Portland/templates/editpage.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -10,9 +10,8 @@
 <form method="post" name="editpage"
       action="<?php echo $request->getPostURL() ?>"
       accept-charset="UTF-8">
-<table class="toolbar" width="100%"
-       cellpadding="0" cellspacing="0" border="0">
-<tr align="bottom">
+<table class="toolbar fullwidth">
+<tr class="bottom">
   <td>
     <?php echo $PAGE_LOCKED_MESSAGE ?>
     <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
@@ -21,7 +20,7 @@
             <?php echo _("Saving this page will overwrite the current version.")?></strong></p>
     <?php } ?>
   </td>
-  <td align="right">
+  <td class="align-right">
     <?php echo $PREVIEW_B ?>
     <?php if ($SAVE_B) { ?>
       <?php echo $SEP?> <?php echo $SAVE_B ?>

Modified: trunk/themes/Portland/templates/navbar.tmpl
===================================================================
--- trunk/themes/Portland/templates/navbar.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Portland/templates/navbar.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -14,10 +14,8 @@
      CSSs float:left; and float:right;.  However float:right; seems
      to cause MSIE4.01/NT to hang.
      So, we use tables...  -->
-<table class="toolbar" width="100%"
-       cellpadding="0" cellspacing="0" border="0"
-       id="actionbar">
-<tr valign="baseline">
+<table class="toolbar fullwidth" id="actionbar">
+<tr class="baseline">
   <td>
    <?php echo WikiLink(_("RecentChanges"), "button") ?>
     <?php if ($user->isAdmin()) { ?>

Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Sidebar/sidebar.css	2013-06-18 15:39:31 UTC (rev 8817)
@@ -287,6 +287,18 @@
     vertical-align: top;
 }
 
+.bottom {
+    vertical-align: bottom;
+}
+
+.middle {
+    vertical-align: middle;
+}
+
+.baseline {
+    vertical-align: baseline;
+}
+
 .nowrap {
     white-space: nowrap;
 }

Modified: trunk/themes/Sidebar/templates/debug.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/debug.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Sidebar/templates/debug.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -1,5 +1,5 @@
 <?php global $RUNTIMER; ?>
-<table width="%100" border="0" cellpadding="0" cellspacing="0">
+<table width="%100">
 <tr><td>
 <div id="xhtml-validator"><a href="http://validator.w3.org/check/referer"><img
         id="xhtml"

Modified: trunk/themes/SpaceWiki/SpaceWiki.css
===================================================================
--- trunk/themes/SpaceWiki/SpaceWiki.css	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/SpaceWiki/SpaceWiki.css	2013-06-18 15:39:31 UTC (rev 8817)
@@ -98,6 +98,18 @@
     vertical-align: top;
 }
 
+.bottom {
+    vertical-align: bottom;
+}
+
+.middle {
+    vertical-align: middle;
+}
+
+.baseline {
+    vertical-align: baseline;
+}
+
 .nowrap {
     white-space: nowrap;
 }

Modified: trunk/themes/Wordpress/Wordpress.css
===================================================================
--- trunk/themes/Wordpress/Wordpress.css	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Wordpress/Wordpress.css	2013-06-18 15:39:31 UTC (rev 8817)
@@ -39,6 +39,18 @@
     vertical-align: top;
 }
 
+.bottom {
+    vertical-align: bottom;
+}
+
+.middle {
+    vertical-align: middle;
+}
+
+.baseline {
+    vertical-align: baseline;
+}
+
 .nowrap {
     white-space: nowrap;
 }

Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Wordpress/templates/editpage.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -12,9 +12,8 @@
 <form method="post" name="editpage" id="editpage"
       action="<?php echo $request->getPostURL() ?>"
       accept-charset="UTF-8">
-  <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
-<table class="toolbar" width="100%"
-       cellpadding="0" cellspacing="0" border="0">
+  <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1">'; ?>
+<table class="toolbar fullwidth">
 <tr align="bottom">
   <td>
     <?php echo $PAGE_LOCKED_MESSAGE ?>

Modified: trunk/themes/blog/Kubrick.css
===================================================================
--- trunk/themes/blog/Kubrick.css	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/blog/Kubrick.css	2013-06-18 15:39:31 UTC (rev 8817)
@@ -250,6 +250,18 @@
     vertical-align: top;
 }
 
+.bottom {
+    vertical-align: bottom;
+}
+
+.middle {
+    vertical-align: middle;
+}
+
+.baseline {
+    vertical-align: baseline;
+}
+
 .nowrap {
     white-space: nowrap;
 }

Modified: trunk/themes/blog/templates/actionbar.tmpl
===================================================================
--- trunk/themes/blog/templates/actionbar.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/blog/templates/actionbar.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -1,5 +1,5 @@
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
-<tr valign="baseline">
+<table class="fullwidth">
+<tr class="baseline">
   <td>
   <div class="actionbuttons">
     <?php echo WikiLink(HOME_PAGE, "known",_("Home")) ?>

Modified: trunk/themes/default/phpwiki.css
===================================================================
--- trunk/themes/default/phpwiki.css	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/default/phpwiki.css	2013-06-18 15:39:31 UTC (rev 8817)
@@ -59,6 +59,18 @@
     vertical-align: top;
 }
 
+.bottom {
+    vertical-align: bottom;
+}
+
+.middle {
+    vertical-align: middle;
+}
+
+.baseline {
+    vertical-align: baseline;
+}
+
 .nowrap {
     white-space: nowrap;
 }

Modified: trunk/themes/default/templates/actionbar.tmpl
===================================================================
--- trunk/themes/default/templates/actionbar.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/default/templates/actionbar.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -4,8 +4,8 @@
        * CSSs float:left; and float:right;.  However float:right; seems
        * to cause MSIE4.01/NT to hang. 
        * So, we use tables...  */ ?>
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
-<tr valign="baseline">
+<table class="fullwidth">
+<tr class="baseline">
   <td>
   <div id="actionbuttons">
     <?php if ((!$page->get('locked') || $user->isAdmin()) and $revision) { ?>
@@ -51,10 +51,10 @@
   </td>
 <?php if (empty($NOSIGNIN)) { ?>
 <?php
-/* valign="top" is not ideal here but required to get reasonable alignment
+/* class="top" is not ideal here but required to get reasonable alignment
    with the other action buttons in some browsers, like OmniWeb and Safari
    (therefore probably Konquorer too) */ ?>
-  <td align="right" valign="top">
+  <td class="align-right top">
     <div id="signin"><?php echo Template('signin') ?></div>
   </td>
 <?php } ?>

Modified: trunk/themes/default/templates/addcomment.tmpl
===================================================================
--- trunk/themes/default/templates/addcomment.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/default/templates/addcomment.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -8,7 +8,7 @@
   <input type="hidden" name="comment[pagename]" value="<?php echo $PAGENAME?>" />
   <?php echo HiddenInputs($request->getArgs()) ?>
   <table class="wikicomment-form">
-     <tr><td width="100%"><textarea class="commentedit" rows="3" cols="55"
+     <tr><td><textarea class="commentedit" rows="3" cols="55"
                        name="comment[content]"></textarea></td>
          <td class="submit-button"><input type="submit" value="<?php echo 
 _("Add Comment")

Modified: trunk/themes/default/templates/debug.tmpl
===================================================================
--- trunk/themes/default/templates/debug.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/default/templates/debug.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -1,5 +1,5 @@
 <?php global $RUNTIMER; ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<table class="fullwidth">
 <tr><td>
 <?php /* Note: The Portland theme's debug.tmpl overrides this file with it's own non-graphical variant. */ ?>
 <div id="xhtml-validator"><a href="http://validator.w3.org/check/referer"><img

Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/default/templates/editpage.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -33,7 +33,7 @@
   <br class="clear-floats" />
   <table class="fullwidth">
     <tr><td><?php echo $EDIT_TOOLBAR ?></td>
-        <td align="right"><div id="editarea-size">
+        <td class="align-right"><div id="editarea-size">
     <?php echo _("Size").':'?>
     <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?> 
     <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
@@ -53,14 +53,13 @@
   <?php echo $CAPTCHA_LABEL ?><?php echo $CAPTCHA_INPUT ?>
 </div> 
 <?php } ?>
-<table class="toolbar" width="100%"
-       cellpadding="0" cellspacing="0" border="0">
-<tr valign="middle">
+<table class="toolbar fullwidth">
+<tr class="middle">
   <td> 
     <?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label><br />
     <?php echo $OLD_MARKUP_CB ?> <label for="useOldMarkup"><?php echo _("Use old markup")?></label> <?php echo $OLD_MARKUP_CONVERT?>
   </td>
-  <td align="center">
+  <td class="align-center">
     <?php if (!empty($WYSIWYG_B)){ ?>
     <?php echo $WYSIWYG_B?><?php echo $SEP?>
     <?php } ?>
@@ -80,7 +79,7 @@
     &nbsp;&nbsp;<?php echo $PUBLIC_CB ?> <label for="edit-public" title="<?php echo _("Export to a separate public area?")?>"><?php echo _("Public")?></label>
     <?php }} ?>
   </td>
-  <td colspan="2" align="right">
+  <td colspan="2" class="align-right">
     <?php if (!$user->isAuthenticated()) { ?>
     <?php echo Template('signin', array('FORMNAME' => 'editpage')) ?>
     <?php } ?>

Modified: trunk/themes/default/templates/forumadd.tmpl
===================================================================
--- trunk/themes/default/templates/forumadd.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/default/templates/forumadd.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -9,15 +9,15 @@
   <table class="wikiforum-reply">
      <caption><?php echo _("Post new")?></caption>
      <col class="label" width="1*" /><col class="input" width="100*" />
-     <tr><th align="right"><?php echo _("Title:")?></th>
+     <tr><th class="align-right"><?php echo _("Title:")?></th>
          <td><input class="wikitext" type="text" size="60"
                     maxlength="256" name="forum[summary]" value="<?php echo isset($forum['summary']) ? $forum['summary'] : '' ?>" /></td>
      </tr>
-    <tr><th align="right"><?php echo _("Reply")?>:</th>
+    <tr><th class="align-right"><?php echo _("Reply")?>:</th>
          <td><textarea class="forumedit" rows="5" cols="60"
                        name="forum[body]"><?php echo isset($forum['body']) ? $forum['body'] : ''?></textarea></td>
      </tr>
-     <tr><td colspan="2" align="center" class="submit-button"
+     <tr><td colspan="2" class="align-center" class="submit-button"
              ><input type="submit" value="<?php echo _("Add Message")?>"
                      name="forum[add]" class="wikiaction" /></td>
      </tr>

Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/default/templates/login.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -66,9 +66,9 @@
 <td>
 <fieldset>
 <legend><?php echo _("Sign In") ?></legend>
-<table cellspacing="4">
+<table>
 <tr>
-  <td align="right"><?php echo _("UserId:") ?></td>
+  <td class="align-right"><?php echo _("UserId:") ?></td>
   <td><input type="text" name="auth[userid]" size="12" maxlength="256" value="<?php echo $userid?>" tabindex="1" />
     <?php if (ENABLE_AUTH_OPENID) { ?>
     &nbsp;&nbsp;<?php echo _("or")?> <a href="http://openid.net/"><?php echo _("OpenID") ?></a>:&nbsp;<input type="text" id="inp-openid" name="openid_url" size="32" maxlength="256" value="" tabindex="3" />
@@ -76,10 +76,10 @@
 </td>
 </tr>
 <tr>
-  <td align="right"><?php echo _("Password:") ?></td>
+  <td class="align-right"><?php echo _("Password:") ?></td>
   <td><input type="password" name="auth[passwd]" size="12" maxlength="256" tabindex="2" /></td>
 </tr>
-<tr><td></td><td align="left">
+<tr><td></td><td class="align-left">
   <?php echo Button("submit:", _("Sign In"), 'wikiaction')?>
   <?php if (!$require_level) { ?>
     <?php echo Button("submit:auth[cancel]", _("Cancel"), 'button')?>

Modified: trunk/themes/default/templates/online.tmpl
===================================================================
--- trunk/themes/default/templates/online.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/default/templates/online.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -14,7 +14,7 @@
       $header = HTML::a(array('href'=>$url,'title'=>_("Switch to detailed list")),_("Who is Online"));
     }
 ?>
-<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
+<table class="forumline fullwidth">
   <tr><td class="cat" colspan="2"><?php echo $header ?></td></tr>
   <tr><td class="row1" rowspan="3"><?php echo $ONLINE_ICON ?></td>
       <td class="row1 gensmall"><?php echo fmt("Our users created a total of %d pages.",$NUM_PAGES) ?><br />
@@ -56,7 +56,7 @@
     $url = WikiUrl($pagename,array("mode"=>"summary"));
     $header = HTML::a(array('href'=>$url,'title'=>_("Switch to summary")),_("Who is Online"));
 ?>
-<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
+<table class="forumline fullwidth">
   <tr><td class="cat" colspan="3"><?php echo $header ?></td></tr>
    <tr><td class="cat" colspan="3"><?php echo _("Registered Users") ?></td></tr>
   <?php if (!empty($ADMINS) and $dispose_admin) { ?> 

Modified: trunk/themes/default/templates/pagelink.tmpl
===================================================================
--- trunk/themes/default/templates/pagelink.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/default/templates/pagelink.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -11,7 +11,7 @@
   $NEXT = false;
 }
 ?>
-<tr><td width="100%" colspan="<?php echo $COLS ?>"><table width="100%" class="wikipaging"><tr class="wikipaging">
+<tr><td style="width:100%" colspan="<?php echo $COLS ?>"><table class="fullwidth wikipaging"><tr class="wikipaging">
   <td class="wikipaging<?php echo $PREV ? "-enabled" : "-disabled" ?>" align="left">
       <?php echo $PREV ? HTML::a(array('href'=>$FIRST_LINK), "|<<") : "|<<" ?>
       &nbsp;

Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -66,7 +66,7 @@
   <br class="clear-floats" />
   <table class="fullwidth">
     <tr><td><?php echo $EDIT_TOOLBAR ?></td>
-        <td align="right"><div id="editarea-size">
+        <td class="align-right"><div id="editarea-size">
     <?php echo _("Size").':'?>
     <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
     <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
@@ -77,11 +77,11 @@
   <label for="edit-summary"><?php echo _("Summary").':'?></label> <?php echo $SUMMARY_INPUT?>
 </div>
 <table class="fullwidth">
-<tr valign="middle">
+<tr class="middle">
   <td>
     <?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label><br />
   </td>
-  <td align="center">
+  <td class="align-center">
     <?php echo $PREVIEW_B ?>
     <?php if ($SAVE_B)  { ?>
       <?php echo $SEP?><?php echo $SAVE_B ?>

Modified: trunk/themes/shamino_com/shamino_com.css
===================================================================
--- trunk/themes/shamino_com/shamino_com.css	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/shamino_com/shamino_com.css	2013-06-18 15:39:31 UTC (rev 8817)
@@ -175,6 +175,18 @@
     vertical-align: top;
 }
 
+.bottom {
+    vertical-align: bottom;
+}
+
+.middle {
+    vertical-align: middle;
+}
+
+.baseline {
+    vertical-align: baseline;
+}
+
 .nowrap {
     white-space: nowrap;
 }

Modified: trunk/themes/smaller/templates/actionbar.tmpl
===================================================================
--- trunk/themes/smaller/templates/actionbar.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/smaller/templates/actionbar.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -8,8 +8,8 @@
        * CSSs float:left; and float:right;.  However float:right; seems
        * to cause MSIE4.01/NT to hang. 
        * So, we use tables...  */ ?>
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
-<tr valign="baseline">
+<table class="fullwidth">
+<tr class="baseline">
   <td>
   <div id="actionbuttons">
      <?php if ((!$page->get('locked') || $user->isAdmin()) and $revision) { ?>
@@ -45,7 +45,7 @@
   </div>
   </td>
 <?php if (empty($NOSIGNIN)) { ?>
-  <td align="right">
+  <td class="align-right">
     <div id="signin"><?php echo Template('signin') ?></div>
   </td>
 <?php } ?>

Modified: trunk/themes/wikilens/templates/body.tmpl
===================================================================
--- trunk/themes/wikilens/templates/body.tmpl	2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/wikilens/templates/body.tmpl	2013-06-18 15:39:31 UTC (rev 8817)
@@ -5,7 +5,7 @@
   <?php echo Template('top') ?>
 </div>
 </td></tr>
-<tr valign="top"><td class="leftnav" width="120">
+<tr class="top"><td class="leftnav" width="120">
 <div class="toolbar">
   <?php echo Template('navbar') ?>
 </div>

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

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

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

Revision: 8816
          http://sourceforge.net/p/phpwiki/code/8816
Author:   vargenau
Date:     2013-06-18 13:42:44 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
private --> protected

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

Modified: trunk/lib/plugin/DebugBackendInfo.php
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php	2013-06-18 13:39:29 UTC (rev 8815)
+++ trunk/lib/plugin/DebugBackendInfo.php	2013-06-18 13:42:44 UTC (rev 8816)
@@ -103,7 +103,7 @@
      * Really should have a _fixupPagedata and _fixupVersiondata, but this works.
      * also used in plugin/EditMetaData
      */
-    private function _fixupData(&$data, $prefix = '')
+    protected function _fixupData(&$data, $prefix = '')
     {
         if (!is_array($data)) return;
 
@@ -162,7 +162,7 @@
     }
 
     /* also used in plugin/EditMetaData */
-    private function _showhash($heading, $hash, $prefix = '')
+    protected function _showhash($heading, $hash, $prefix = '')
     {
         $rows = array();
         if ($heading)
@@ -189,7 +189,7 @@
     }
 
     /* also used in plugin/EditMetaData */
-    private function _showvalue($key, $val, $prefix = '')
+    protected function _showvalue($key, $val, $prefix = '')
     {
         return $val ? $val : HTML::raw(' ');
     }

Modified: trunk/lib/plugin/EditMetaData.php
===================================================================
--- trunk/lib/plugin/EditMetaData.php	2013-06-18 13:39:29 UTC (rev 8815)
+++ trunk/lib/plugin/EditMetaData.php	2013-06-18 13:42:44 UTC (rev 8816)
@@ -158,7 +158,7 @@
         return $html;
     }
 
-    private function _showvalue($key, $val, $prefix = '')
+    protected function _showvalue($key, $val, $prefix = '')
     {
         if (is_array($val) or is_object($val)) return $val;
         if (in_array($key, $this->hidden_pagemeta)) return '';

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

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

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

Revision: 8815
          http://sourceforge.net/p/phpwiki/code/8815
Author:   vargenau
Date:     2013-06-18 13:39:29 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
Merge OldTextFormattingRules into TextFormattingRules; rename underscore plugins

Modified Paths:
--------------
    trunk/lib/BlockParser.php
    trunk/lib/CachedMarkup.php
    trunk/lib/IniConfig.php
    trunk/lib/InlineParser.php
    trunk/lib/PageList.php
    trunk/lib/PageType.php
    trunk/lib/WysiwygEdit/Wikiwyg.php
    trunk/lib/WysiwygEdit.php
    trunk/lib/XmlRpcServer.php
    trunk/lib/diff.php
    trunk/lib/editpage.php
    trunk/lib/main.php
    trunk/lib/plugin/CalendarList.php
    trunk/lib/plugin/CreatePage.php
    trunk/lib/plugin/CreateToc.php
    trunk/lib/plugin/EditMetaData.php
    trunk/lib/plugin/FileInfo.php
    trunk/lib/plugin/GoogleMaps.php
    trunk/lib/plugin/IncludePage.php
    trunk/lib/plugin/InterWikiSearch.php
    trunk/lib/plugin/MediawikiTable.php
    trunk/lib/plugin/ModeratedPage.php
    trunk/lib/plugin/OldStyleTable.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/plugin/RichTable.php
    trunk/lib/plugin/SiteMap.php
    trunk/lib/plugin/SpellCheck.php
    trunk/lib/plugin/Template.php
    trunk/lib/plugin/TranslateText.php
    trunk/lib/plugin/UnfoldSubpages.php
    trunk/lib/plugin/WikiBlog.php
    trunk/lib/plugin/WikicreoleTable.php
    trunk/lib/stdlib.php
    trunk/lib/wikilens/PageListColumns.php
    trunk/lib/wikilens/Utils.php
    trunk/lib/ziplib.php
    trunk/themes/MonoBook/templates/info.tmpl
    trunk/themes/Portland/lib/RecentChanges.php
    trunk/themes/SpaceWiki/lib/RecentChanges.php
    trunk/themes/Wordpress/lib/RecentChanges.php
    trunk/themes/default/templates/info.tmpl
    trunk/themes/default/templates/login.tmpl
    trunk/themes/default/templates/userprefs.tmpl

Added Paths:
-----------
    trunk/lib/plugin/DebugAuthInfo.php
    trunk/lib/plugin/DebugBackendInfo.php
    trunk/lib/plugin/DebugGroupInfo.php
    trunk/lib/plugin/DebugRetransform.php
    trunk/lib/plugin/PreferencesInfo.php

Removed Paths:
-------------
    trunk/lib/plugin/WikiAdminMarkup.php
    trunk/lib/plugin/_AuthInfo.php
    trunk/lib/plugin/_BackendInfo.php
    trunk/lib/plugin/_GroupInfo.php
    trunk/lib/plugin/_PreferencesInfo.php
    trunk/lib/plugin/_Retransform.php
    trunk/lib/plugin/_WikiTranslation.php

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/BlockParser.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -1401,17 +1401,12 @@
 /**
  * Transform the text of a page, and return a parse tree.
  */
-function TransformTextPre($text, $markup = 2.0, $basepage = false)
+function TransformTextPre($text, $basepage = false)
 {
     if (isa($text, 'WikiDB_PageRevision')) {
         $rev = $text;
         $text = $rev->getPackedContent();
-        $markup = $rev->get('markup');
     }
-    // NEW: default markup is new, to increase stability
-    if (!empty($markup) && $markup < 2.0) {
-        $text = ConvertOldMarkup($text);
-    }
     // Expand leading tabs.
     $text = expand_tabs($text);
     $output = new WikiText($text);
@@ -1423,9 +1418,9 @@
  * Transform the text of a page, and return an XmlContent,
  * suitable for printXml()-ing.
  */
-function TransformText($text, $markup = 2.0, $basepage = false)
+function TransformText($text, $basepage = false)
 {
-    $output = TransformTextPre($text, $markup, $basepage);
+    $output = TransformTextPre($text, $basepage);
     if ($basepage) {
         // This is for immediate consumption.
         // We must bind the contents to a base pagename so that

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/CachedMarkup.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -87,7 +87,7 @@
         }
         if (preg_match("/^\w+$/", $packed))
             return $packed;
-        // happened with _BackendInfo problem also.
+        // happened with DebugBackendInfo problem also.
         trigger_error("Can't unpack bad cached markup. Probably php_zlib extension not loaded.",
             E_USER_WARNING);
         return false;

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/IniConfig.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -704,14 +704,14 @@
     // The FUSIONFORGE theme omits them
     if (!(defined('FUSIONFORGE') and FUSIONFORGE)) {
         $AllAllowedPlugins[] = 'AnalyseAccessLogSql';
-        $AllAllowedPlugins[] = '_AuthInfo';
-        $AllAllowedPlugins[] = '_BackendInfo';
+        $AllAllowedPlugins[] = 'DebugAuthInfo';
+        $AllAllowedPlugins[] = 'DebugBackendInfo';
         $AllAllowedPlugins[] = 'CacheTest';
         $AllAllowedPlugins[] = 'CategoryPage';
         $AllAllowedPlugins[] = 'FoafViewer';
         $AllAllowedPlugins[] = 'FrameInclude';
         $AllAllowedPlugins[] = 'GraphViz';
-        $AllAllowedPlugins[] = '_GroupInfo';
+        $AllAllowedPlugins[] = 'DebugGroupInfo';
         $AllAllowedPlugins[] = 'HtmlConverter';
         $AllAllowedPlugins[] = 'Imdb';
         $AllAllowedPlugins[] = 'JabberPresence';
@@ -720,7 +720,7 @@
         $AllAllowedPlugins[] = 'Ploticus';
         $AllAllowedPlugins[] = 'PopularNearby';
         $AllAllowedPlugins[] = 'PreferenceApp';
-        $AllAllowedPlugins[] = '_PreferencesInfo';
+        $AllAllowedPlugins[] = 'PreferencesInfo';
         $AllAllowedPlugins[] = '_Retransform';
         $AllAllowedPlugins[] = 'SqlResult';
         $AllAllowedPlugins[] = 'TeX2png';
@@ -728,13 +728,12 @@
         $AllAllowedPlugins[] = 'TexToPng';
         $AllAllowedPlugins[] = 'VisualWiki';
         $AllAllowedPlugins[] = 'WantedPagesOld';
-        $AllAllowedPlugins[] = 'WikiAdminMarkup';
         $AllAllowedPlugins[] = 'WikiForum';
-        $AllAllowedPlugins[] = '_WikiTranslation';
+        $AllAllowedPlugins[] = 'WikiTranslation';
     }
 
     // Used by SetupWiki to pull in required pages, if not translated, then in English.
-    // Also used by _WikiTranslation. Really important are only those which return pagelists
+    // Also used by WikiTranslation. Really important are only those which return pagelists
     // or contain basic functionality.
     $AllActionPages = $ActionPages;
     $AllActionPages[] = 'AllPagesCreatedByMe';
@@ -764,11 +763,6 @@
     $AllActionPages[] = 'SetGlobalAccessRightsSimple';
     $AllActionPages[] = 'UserContribs';
 
-    // The FUSIONFORGE theme omits them
-    if (!(defined('FUSIONFORGE') and FUSIONFORGE)) {
-        $AllActionPages[] = 'PhpWikiAdministration/Markup';
-    }
-
     if ((defined('FUSIONFORGE') and FUSIONFORGE)) {
         if (ENABLE_EXTERNAL_PAGES) {
             $AllAllowedPlugins[] = 'WikiAdminSetExternal';

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/InlineParser.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /**
- * This is the code which deals with the inline part of the (new-style)
+ * This is the code which deals with the inline part of the
  * wiki-markup.
  *
  * @package Markup
@@ -1435,7 +1435,7 @@
     }
 }
 
-function TransformInline($text, $markup = 2.0, $basepage = false)
+function TransformInline($text, $basepage = false)
 {
     static $trfm;
     $action = $GLOBALS['request']->getArg('action');
@@ -1443,17 +1443,13 @@
         $trfm = new InlineTransformer;
     }
 
-    if ($markup < 2.0) {
-        $text = ConvertOldMarkup($text, 'inline');
-    }
-
     if ($basepage) {
         return new CacheableMarkup($trfm->parse($text), $basepage);
     }
     return $trfm->parse($text);
 }
 
-function TransformLinks($text, $markup = 2.0, $basepage = false)
+function TransformLinks($text, $basepage = false)
 {
     static $trfm;
 
@@ -1461,10 +1457,6 @@
         $trfm = new LinkTransformer;
     }
 
-    if ($markup < 2.0) {
-        $text = ConvertOldMarkup($text, 'links');
-    }
-
     if ($basepage) {
         return new CacheableMarkup($trfm->parse($text), $basepage);
     }
@@ -1474,7 +1466,7 @@
 /**
  * Transform only html markup and entities.
  */
-function TransformInlineNowiki($text, $markup = 2.0, $basepage = false)
+function TransformInlineNowiki($text, $basepage = false)
 {
     static $trfm;
 

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/PageList.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -436,7 +436,7 @@
         }
         include_once 'lib/BlockParser.php';
         // false --> don't bother processing hrefs for embedded WikiLinks
-        $ct = TransformText($c, $revision_handle->get('markup'), false);
+        $ct = TransformText($c, false);
         if (empty($pagelist->_sortby[$this->_field]))
             unset($revision_handle->_data['%pagedata']['_cached_html']);
         return HTML::div(array('style' => 'font-size:x-small'),
@@ -752,7 +752,6 @@
             'hits' => null,
             'size' => null,
             'version' => null,
-            'markup' => null,
             'external' => null,
         );
     }
@@ -1279,8 +1278,6 @@
                 'minor'
                 => new _PageList_Column_bool('rev:is_minor_edit',
                     _("Minor Edit"), _("minor")),
-                'markup'
-                => new _PageList_Column('rev:markup', _("Markup")),
                 // 'rating' initialised by the wikilens theme hook: addPageListColumn
                 /*
                 'rating'

Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/PageType.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -365,18 +365,12 @@
     {
         $this->_page = $page;
         $this->_meta = $meta;
-        if (!empty($meta['markup']))
-            $this->_markup = $meta['markup'];
-        else
-            $this->_markup = 2; // dump used old-markup as empty.
-        // FIXME: To be able to restore old plain-backups we should keep markup 1 as default.
-        // New policy: default = new markup (old crashes quite often)
     }
 
     function _transform($text)
     {
         include_once 'lib/BlockParser.php';
-        return TransformText($text, $this->_markup);
+        return TransformText($text);
     }
 
     /** Transform the page text.
@@ -535,7 +529,7 @@
     function _transform($text)
     {
         include_once 'lib/BlockParser.php';
-        return TransformText($text, $this->_markup);
+        return TransformText($text);
     }
 
     // one page or set of pages?

Modified: trunk/lib/WysiwygEdit/Wikiwyg.php
===================================================================
--- trunk/lib/WysiwygEdit/Wikiwyg.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/WysiwygEdit/Wikiwyg.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -156,7 +156,7 @@
     function convert()
     {
         require_once 'lib/BlockParser.php';
-        $xmlcontent = TransformText($this->_wikitext, 2.0, $this->_request->getArg('pagename'));
+        $xmlcontent = TransformText($this->_wikitext, $this->_request->getArg('pagename'));
         $this->_html = $xmlcontent->AsXML();
 
         $this->replace_inside_html();
@@ -298,7 +298,7 @@
         $plugin = "<?plugin RichTable " . $plugin . " ?>";
 
         require_once 'lib/BlockParser.php';
-        $xmlcontent = TransformText($plugin, 2.0, $GLOBALS['request']->getArg('pagename'));
+        $xmlcontent = TransformText($plugin, $GLOBALS['request']->getArg('pagename'));
         return $xmlcontent->AsXML();
     }
 }

Modified: trunk/lib/WysiwygEdit.php
===================================================================
--- trunk/lib/WysiwygEdit.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/WysiwygEdit.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -50,7 +50,7 @@
     function ConvertBefore($text)
     {
         require_once 'lib/BlockParser.php';
-        $xml = TransformText($text, 2.0, $GLOBALS['request']->getArg('pagename'));
+        $xml = TransformText($text, $GLOBALS['request']->getArg('pagename'));
         return $xml->AsXML();
     }
 

Modified: trunk/lib/XmlRpcServer.php
===================================================================
--- trunk/lib/XmlRpcServer.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/XmlRpcServer.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -501,7 +501,6 @@
         );
         $version_meta = array('author' => $userid,
             'author_id' => $userid,
-            'markup' => 2.0,
             'summary' => isset($summary) ? $summary : _("xml-rpc change"),
             'mtime' => $now,
             'pagetype' => 'wikitext',

Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/diff.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -353,7 +353,7 @@
 
         $html->pushContent(HTML::hr(), HTML::h2($new_version));
         require_once 'lib/BlockParser.php';
-        $html->pushContent(TransformText($new, $new->get('markup'), $pagename));
+        $html->pushContent(TransformText($new, $pagename));
     }
 
     require_once 'lib/Template.php';

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/editpage.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -390,10 +390,6 @@
     function isUnchanged()
     {
         $current = &$this->current;
-
-        if ($this->meta['markup'] != $current->get('markup'))
-            return false;
-
         return $this->_content == $current->getPackedContent();
     }
 
@@ -511,8 +507,6 @@
     {
         require_once 'lib/PageType.php';
         $this->_content = $this->getContent();
-        $this->meta['markup'] = 2.0;
-        $this->_content = ConvertOldMarkup($this->_content);
         return new TransformedText($this->page, $this->_content, $this->meta);
     }
 
@@ -664,15 +658,6 @@
             'name' => 'edit[minor_edit]',
             'id' => 'edit-minor_edit',
             'checked' => (bool)$this->meta['is_minor_edit']));
-        $el['OLD_MARKUP_CB']
-            = HTML::input(array('type' => 'checkbox',
-            'name' => 'edit[markup]',
-            'value' => 'old',
-            'checked' => $this->meta['markup'] < 2.0,
-            'id' => 'useOldMarkup',
-            'onclick' => 'showOldMarkupRules(this.checked)'));
-        $el['OLD_MARKUP_CONVERT'] = ($this->meta['markup'] < 2.0)
-            ? Button('submit:edit[edit_convert]', _("Convert"), 'wikiaction') : '';
         $el['LOCKED_CB']
             = HTML::input(array('type' => 'checkbox',
             'name' => 'edit[locked]',
@@ -779,8 +764,6 @@
         if ($this->_currentVersion > $this->current->getVersion())
             return false; // FIXME: some kind of warning?
 
-        $is_old_markup = !empty($posted['markup']) && $posted['markup'] == 'old';
-        $meta['markup'] = $is_old_markup ? false : 2.0;
         $meta['summary'] = trim(substr($posted['summary'], 0, 256));
         $meta['is_minor_edit'] = !empty($posted['minor_edit']);
         $meta['pagetype'] = !empty($posted['pagetype']) ? $posted['pagetype'] : false;
@@ -827,13 +810,6 @@
             && $current->get('author') == $user->getId()
         );
 
-        // Default for new pages is new-style markup.
-        if ($selected->hasDefaultContents())
-            $is_new_markup = true;
-        else
-            $is_new_markup = $selected->get('markup') >= 2.0;
-
-        $this->meta['markup'] = $is_new_markup ? 2.0 : false;
         $this->meta['pagetype'] = $selected->get('pagetype');
         if ($this->meta['pagetype'] == 'wikiblog')
             $this->meta['summary'] = $selected->get('summary'); // keep blog title

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/main.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -966,8 +966,8 @@
         // Handle untranslated actionpages in non-english
         // (people playing with switching languages)
         if (0 and $GLOBALS['LANG'] != 'en') {
-            require_once 'lib/plugin/_WikiTranslation.php';
-            $trans = new WikiPlugin__WikiTranslation();
+            require_once 'lib/plugin/WikiTranslation.php';
+            $trans = new WikiPlugin_WikiTranslation();
             $en_action = $trans->translate($action, 'en', $GLOBALS['LANG']);
             if (isActionPage($en_action))
                 return $en_action;
@@ -1063,8 +1063,8 @@
         global $LANG;
         if ($LANG != "en") {
             require_once 'lib/WikiPlugin.php';
-            require_once 'lib/plugin/_WikiTranslation.php';
-            $trans = new WikiPlugin__WikiTranslation();
+            require_once 'lib/plugin/WikiTranslation.php';
+            $trans = new WikiPlugin_WikiTranslation();
             $trans->lang = $LANG;
             $default = $trans->translate_to_en($action, $LANG);
             if ($default and isActionPage($default))

Modified: trunk/lib/plugin/CalendarList.php
===================================================================
--- trunk/lib/plugin/CalendarList.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/CalendarList.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -128,7 +128,7 @@
             $r = $p->getCurrentRevision();
             $c = $r->getContent();
             include_once 'lib/BlockParser.php';
-            $content = TransformText(implode("\n", $c), $r->get('markup'));
+            $content = TransformText(implode("\n", $c));
             $link = HTML::a(array('class' => 'cal-hide',
                     'href' => WikiURL($page_for_date,
                         array('action' => 'edit')),

Modified: trunk/lib/plugin/CreatePage.php
===================================================================
--- trunk/lib/plugin/CreatePage.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/CreatePage.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -115,13 +115,11 @@
                 return $this->error(fmt("%s already exists", WikiLink($s)));
             } else {
                 $user = $request->getUser();
-                $meta = array('markup' => 2.0,
-                    'author' => $user->getId());
+                $meta = array('author' => $user->getId());
                 if (!empty($param['template']) and !$initial_content) {
                     $tmplpage = $dbi->getPage($template);
                     $currenttmpl = $tmplpage->getCurrentRevision();
                     $initial_content = $currenttmpl->getPackedContent();
-                    $meta['markup'] = $currenttmpl->_data['markup'];
 
                     if (preg_match('/<noinclude>.+<\/noinclude>/s', $initial_content)) {
                         $initial_content = preg_replace("/<noinclude>.+?<\/noinclude>/s", "",

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/CreateToc.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -29,7 +29,6 @@
  * @author:  Reini Urban, Marc-Etienne Vargenau
  *
  * Known problems:
- * - it will crash with old markup and Apache2 (?)
  * - Certain corner-edges will not work with TOC_FULL_SYNTAX.
  *   I believe I fixed all of them now, but who knows?
  * - bug #969495 "existing labels not honored" seems to be fixed.
@@ -430,13 +429,6 @@
         }
 
         $current = $page->getCurrentRevision();
-        //FIXME: I suspect this only to crash with Apache2
-        if (!$current->get('markup') or $current->get('markup') < 2) {
-            if (in_array(php_sapi_name(), array('apache2handler', 'apache2filter'))) {
-                return $this->error(_("CreateToc disabled for old markup."));
-            }
-        }
-
         $content = $r->getContent();
 
         $html = HTML::div(array('class' => 'toc', 'id' => GenerateId("toc")));

Copied: trunk/lib/plugin/DebugAuthInfo.php (from rev 8810, trunk/lib/plugin/_AuthInfo.php)
===================================================================
--- trunk/lib/plugin/DebugAuthInfo.php	                        (rev 0)
+++ trunk/lib/plugin/DebugAuthInfo.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -0,0 +1,205 @@
+<?php
+
+/**
+ * Copyright 2004 $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.
+ */
+
+require_once 'lib/Template.php';
+/**
+ * Used to debug auth problems and settings.
+ * This plugin is only testing purposes.
+ * if DEBUG is false, only admin can call it, which is of no real use.
+ *
+ * Warning! This may display db and user passwords in cleartext.
+ */
+class WikiPlugin_DebugAuthInfo
+    extends WikiPlugin
+{
+    function getDescription()
+    {
+        return _("Display general and user specific auth information.");
+    }
+
+    function getDefaultArguments()
+    {
+        return array('userid' => '');
+    }
+
+    function run($dbi, $argstr, &$request, $basepage)
+    {
+        $args = $this->getArgs($argstr, $request);
+        extract($args);
+        if (empty($userid) or $userid == $request->_user->UserName()) {
+            $user = $request->_user;
+            $userid = $user->UserName();
+        } else {
+            $user = WikiUser($userid);
+        }
+        if (!$user->isAdmin() and !(DEBUG && _DEBUG_LOGIN)) {
+            $request->_notAuthorized(WIKIAUTH_ADMIN);
+            $this->disabled("! user->isAdmin");
+        }
+
+        $html = HTML(HTML::h3(fmt("General Auth Settings")));
+        $table = HTML::table(array('border' => 1,
+            'cellpadding' => 2,
+            'cellspacing' => 0));
+        $table->pushContent($this->show_hash("AUTH DEFINES",
+            $this->buildConstHash(
+                array("ENABLE_USER_NEW", "ALLOW_ANON_USER",
+                    "ALLOW_ANON_EDIT", "ALLOW_BOGO_LOGIN",
+                    "REQUIRE_SIGNIN_BEFORE_EDIT", "ALLOW_USER_PASSWORDS",
+                    "PASSWORD_LENGTH_MINIMUM", "USE_DB_SESSION"))));
+        if ((defined('ALLOW_LDAP_LOGIN') && ALLOW_LDAP_LOGIN) or in_array("LDAP", $GLOBALS['USER_AUTH_ORDER']))
+            $table->pushContent($this->show_hash("LDAP DEFINES",
+                $this->buildConstHash(array("LDAP_AUTH_HOST", "LDAP_BASE_DN"))));
+        if ((defined('ALLOW_IMAP_LOGIN') && ALLOW_IMAP_LOGIN) or in_array("IMAP", $GLOBALS['USER_AUTH_ORDER']))
+            $table->pushContent($this->show_hash("IMAP DEFINES", array("IMAP_AUTH_HOST" => IMAP_AUTH_HOST)));
+        if (defined('AUTH_USER_FILE') or in_array("File", $GLOBALS['USER_AUTH_ORDER']))
+            $table->pushContent($this->show_hash("AUTH_USER_FILE",
+                $this->buildConstHash(array("AUTH_USER_FILE",
+                    "AUTH_USER_FILE_STORABLE"))));
+        if (defined('GROUP_METHOD'))
+            $table->pushContent($this->show_hash("GROUP_METHOD",
+                $this->buildConstHash(array("GROUP_METHOD", "AUTH_GROUP_FILE", "GROUP_LDAP_QUERY"))));
+        $table->pushContent($this->show_hash("\$USER_AUTH_ORDER[]", $GLOBALS['USER_AUTH_ORDER']));
+        $table->pushContent($this->show_hash("USER_AUTH_POLICY", array("USER_AUTH_POLICY" => USER_AUTH_POLICY)));
+        $DBParams = $GLOBALS['DBParams'];
+        $DBParams['dsn'] = class_exists('WikiDB_SQL') ? WikiDB_SQL::view_dsn($DBParams['dsn']) : '';
+        $table->pushContent($this->show_hash("\$DBParams[]", $DBParams));
+        $DBAuthParams = $GLOBALS['DBAuthParams'];
+        if (isset($DBAuthParams['auth_dsn']) and class_exists('WikiDB_SQL'))
+            $DBAuthParams['auth_dsn'] = WikiDB_SQL::view_dsn($DBAuthParams['auth_dsn']);
+        else
+            $DBAuthParams['auth_dsn'] = '';
+        unset($DBAuthParams['dummy']);
+        $table->pushContent($this->show_hash("\$DBAuthParams[]", $DBAuthParams));
+        $html->pushContent($table);
+        $html->pushContent(HTML(HTML::h3(fmt("Personal Auth Settings for “%s”", $userid))));
+        if (!$user) {
+            $html->pushContent(HTML::p(fmt("No userid")));
+        } else {
+            $table = HTML::table(array('border' => 1,
+                'cellpadding' => 2,
+                'cellspacing' => 0));
+            //$table->pushContent(HTML::tr(HTML::td(array('colspan' => 2))));
+            $userdata = obj2hash($user, array('_dbi', '_request', 'password', 'passwd'));
+            if (isa($user, "_FilePassUser")) {
+                foreach ($userdata['_file']->users as $u => $p) {
+                    $userdata['_file']->users[$u] = "<hidden>";
+                }
+            }
+            $table->pushContent($this->show_hash("User: Object of " . get_class($user), $userdata));
+            if (ENABLE_USER_NEW) {
+                $group = &$request->getGroup();
+                $groups = $group->getAllGroupsIn();
+                $groupdata = obj2hash($group, array('_dbi', '_request', 'password', 'passwd'));
+                unset($groupdata['request']);
+                $table->pushContent($this->show_hash("Group: Object of " . get_class($group), $groupdata));
+                $groups = $group->getAllGroupsIn();
+                $groupdata = array('getAllGroupsIn' => $groups);
+                foreach ($groups as $g) {
+                    $groupdata["getMembersOf($g)"] = $group->getMembersOf($g);
+                    $groupdata["isMember($g)"] = $group->isMember($g);
+                }
+                $table->pushContent($this->show_hash("Group Methods: ", $groupdata));
+            }
+            $html->pushContent($table);
+        }
+        return $html;
+    }
+
+    private function show_hash($heading, $hash, $depth = 0)
+    {
+        static $seen = array();
+        static $max_depth = 0;
+        $rows = array();
+        $max_depth++;
+        if ($max_depth > 35) return $heading;
+
+        if ($heading)
+            $rows[] = HTML::tr(array('bgcolor' => '#ffcccc',
+                    'style' => 'color:#000000'),
+                HTML::td(array('colspan' => 2,
+                        'style' => 'color:#000000'),
+                    $heading));
+        if (is_object($hash))
+            $hash = obj2hash($hash);
+        if (!empty($hash)) {
+            ksort($hash);
+            foreach ($hash as $key => $val) {
+                if (is_object($val)) {
+                    $heading = "Object of " . get_class($val);
+                    if ($depth > 3) $val = $heading;
+                    elseif ($heading == "Object of wikidb_sql") $val = $heading; elseif (substr($heading, 0, 13) == "Object of db_") $val = $heading; elseif (!isset($seen[$heading])) {
+                        //if (empty($seen[$heading])) $seen[$heading] = 1;
+                        $val = HTML::table(array('border' => 1,
+                                'cellpadding' => 2,
+                                'cellspacing' => 0),
+                            $this->show_hash($heading, obj2hash($val), $depth + 1));
+                    } else {
+                        $val = $heading;
+                    }
+                } elseif (is_array($val)) {
+                    $heading = $key . "[]";
+                    if ($depth > 3) $val = $heading;
+                    elseif (!isset($seen[$heading])) {
+                        //if (empty($seen[$heading])) $seen[$heading] = 1;
+                        $val = HTML::table(array('border' => 1,
+                                'cellpadding' => 2,
+                                'cellspacing' => 0),
+                            $this->show_hash($heading, $val, $depth + 1));
+                    } else {
+                        $val = $heading;
+                    }
+                }
+                $rows[] = HTML::tr(HTML::td(array('align' => 'right',
+                            'bgcolor' => '#cccccc',
+                            'style' => 'color:#000000'),
+                        HTML(HTML::raw('&nbsp;'), $key,
+                            HTML::raw('&nbsp;'))),
+                    HTML::td(array('bgcolor' => '#ffffff',
+                            'style' => 'color:#000000'),
+                        $val ? $val : HTML::raw('&nbsp;'))
+                );
+                //if (empty($seen[$key])) $seen[$key] = 1;
+            }
+        }
+        return $rows;
+    }
+
+    private function buildConstHash($constants)
+    {
+        $hash = array();
+        foreach ($constants as $c) {
+            $hash[$c] = defined($c) ? constant($c) : '<empty>';
+            if ($hash[$c] === false) $hash[$c] = 'false';
+            elseif ($hash[$c] === true) $hash[$c] = 'true';
+        }
+        return $hash;
+    }
+}
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:

Copied: trunk/lib/plugin/DebugBackendInfo.php (from rev 8810, trunk/lib/plugin/_BackendInfo.php)
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php	                        (rev 0)
+++ trunk/lib/plugin/DebugBackendInfo.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -0,0 +1,205 @@
+<?php
+
+/**
+ * Copyright 1999,2000,2001,2002,2006,2007 $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.
+ */
+
+require_once 'lib/Template.php';
+/**
+ */
+class WikiPlugin_DebugBackendInfo
+    extends WikiPlugin
+{
+    function getDescription()
+    {
+        return sprintf(_("Get debugging information for %s."), '[pagename]');
+    }
+
+    function getDefaultArguments()
+    {
+        return array('page' => '[pagename]',
+            'notallversions' => 0);
+    }
+
+    function run($dbi, $argstr, &$request, $basepage)
+    {
+        $args = $this->getArgs($argstr, $request);
+        extract($args);
+        if (empty($page))
+            return $this->error("page missing");
+
+        $backend = &$dbi->_backend;
+        $this->chunk_split = true;
+        $this->readonly_pagemeta = array();
+        $this->hidden_pagemeta = array('_cached_html');
+
+        $html = HTML(HTML::h3(fmt("Querying backend directly for “%s”",
+            $page)));
+
+        $table = HTML::table(array('border' => 1,
+            'cellpadding' => 2,
+            'cellspacing' => 0));
+        $pagedata = $backend->get_pagedata($page);
+        if (!$pagedata) {
+            // FIXME: invalid HTML
+            $html->pushContent(HTML::p(fmt("No pagedata for %s", $page)));
+        } else {
+            $this->_fixupData($pagedata);
+            $table->pushContent($this->_showhash("get_pagedata('$page')", $pagedata));
+        }
+        if (!$notallversions) {
+            $version = $backend->get_latest_version($page);
+            $vdata = $backend->get_versiondata($page, $version, true);
+            $this->_fixupData($vdata);
+            $table->pushContent(HTML::tr(HTML::td(array('colspan' => 2))));
+            $table->pushContent($this->_showhash("get_versiondata('$page',$version)",
+                $vdata));
+        } else {
+            for ($version = $backend->get_latest_version($page);
+                 $version;
+                 $version = $backend->get_previous_version($page, $version)) {
+                $vdata = $backend->get_versiondata($page, $version, true);
+                $this->_fixupData($vdata);
+                $table->pushContent(HTML::tr(HTML::td(array('colspan' => 2))));
+                $table->pushContent($this->_showhash("get_versiondata('$page',$version)",
+                    $vdata));
+            }
+        }
+
+        $linkdata = $backend->get_links($page, false);
+        if ($linkdata->count())
+            $table->pushContent($this->_showhash("get_links('$page')", $linkdata->asArray()));
+        $relations = $backend->get_links($page, false, false, false, false, false, true);
+        if ($relations->count()) {
+            $table->pushContent($this->_showhash("get_relations('$page')", array()));
+            while ($rel = $relations->next())
+                $table->pushContent($this->_showhash(false, $rel));
+        }
+        $linkdata = $backend->get_links($page, true);
+        if ($linkdata->count())
+            $table->pushContent($this->_showhash("get_backlinks('$page')", $linkdata->asArray()));
+
+        $html->pushContent($table);
+        return $html;
+    }
+
+    /**
+     * Really should have a _fixupPagedata and _fixupVersiondata, but this works.
+     * also used in plugin/EditMetaData
+     */
+    private function _fixupData(&$data, $prefix = '')
+    {
+        if (!is_array($data)) return;
+
+        global $request;
+        $user = $request->getUser();
+        foreach ($data as $key => $val) {
+            $fullkey = $prefix . '[' . $key . ']';
+            if (is_integer($key)) {
+                ;
+            } elseif ($key == 'passwd' and !$user->isAdmin()) {
+                $data[$key] = $val ? _("<not displayed>") : _("<empty>");
+            } elseif ($key and $key == '_cached_html') {
+                $val = TransformedText::unpack($val);
+                ob_start();
+                print_r($val);
+                $data[$key] = HTML::pre(ob_get_contents());
+                ob_end_clean();
+            } elseif (is_bool($val)) {
+                $data[$key] = $this->_showvalue($key, $val ? "true" : "false", $prefix);
+            } elseif (is_string($val) && ((substr($val, 0, 2) == 'a:'
+                or (substr($val, 0, 2) == 'O:')))
+            ) {
+                // how to indent this table?
+                $val = unserialize($val);
+                $this->_fixupData($val, $fullkey);
+                $data[$key] = HTML::table(array('border' => 1,
+                        'cellpadding' => 2,
+                        'cellspacing' => 0),
+                    $this->_showhash(false, $val, $fullkey));
+            } elseif (is_array($val)) {
+                // how to indent this table?
+                $this->_fixupData($val, $fullkey);
+                $data[$key] = HTML::table(array('border' => 1,
+                        'cellpadding' => 2,
+                        'cellspacing' => 0),
+                    $this->_showhash(false, $val, $fullkey));
+            } elseif (is_object($val)) {
+                // how to indent this table?
+                ob_start();
+                print_r($val);
+                $val = HTML::pre(ob_get_contents());
+                ob_end_clean();
+                $data[$key] = HTML::table(array('border' => 1,
+                        'cellpadding' => 2,
+                        'cellspacing' => 0),
+                    $this->_showhash(false, $val, $fullkey));
+            } elseif ($key and $key == '%content') {
+                if ($val === true)
+                    $val = '<true>';
+                elseif (strlen($val) > 40)
+                    $val = substr($val, 0, 40) . " ...";
+                $data[$key] = $val;
+            }
+        }
+        unset($data['%pagedata']); // problem in backend
+    }
+
+    /* also used in plugin/EditMetaData */
+    private function _showhash($heading, $hash, $prefix = '')
+    {
+        $rows = array();
+        if ($heading)
+            $rows[] = HTML::tr(array('bgcolor' => '#ffcccc',
+                    'style' => 'color:#000000'),
+                HTML::td(array('colspan' => 2,
+                        'style' => 'color:#000000'),
+                    $heading));
+        if (!is_array($hash)) return array();
+        ksort($hash);
+        foreach ($hash as $key => $val) {
+            if ($this->chunk_split and is_string($val)) $val = chunk_split($val);
+            $rows[] = HTML::tr(HTML::td(array('align' => 'right',
+                        'bgcolor' => '#cccccc',
+                        'style' => 'color:#000000'),
+                    HTML(HTML::raw('&nbsp;'), $key,
+                        HTML::raw('&nbsp;'))),
+                HTML::td(array('bgcolor' => '#ffffff',
+                        'style' => 'color:#000000'),
+                    $this->_showvalue($key, $val, $prefix))
+            );
+        }
+        return $rows;
+    }
+
+    /* also used in plugin/EditMetaData */
+    private function _showvalue($key, $val, $prefix = '')
+    {
+        return $val ? $val : HTML::raw('&nbsp;');
+    }
+
+}
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:

Copied: trunk/lib/plugin/DebugGroupInfo.php (from rev 8810, trunk/lib/plugin/_GroupInfo.php)
===================================================================
--- trunk/lib/plugin/DebugGroupInfo.php	                        (rev 0)
+++ trunk/lib/plugin/DebugGroupInfo.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * Copyright 2004 $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.
+ */
+
+/**
+ * @author: Charles Corrigan
+ */
+class WikiPlugin_DebugGroupInfo
+    extends WikiPlugin
+{
+    function getDescription()
+    {
+        return sprintf(_("Show Group Information."));
+    }
+
+    function getDefaultArguments()
+    {
+        return array();
+    }
+
+    function run($dbi, $argstr, &$request, $basepage)
+    {
+        $args = $this->getArgs($argstr, $request);
+        extract($args);
+
+        $output = HTML(HTML::h1("Group Info"));
+
+        $group = WikiGroup::getGroup();
+        $allGroups = $group->getAllGroupsIn();
+
+        foreach ($allGroups as $g) {
+            $members = $group->getMembersOf($g);
+            $output->pushContent(HTML::h3($g . " - members: " .
+                    sizeof($members) . " - isMember: " . ($group->isMember($g) ? "yes" : "no")
+            ));
+            foreach ($members as $m) {
+                $output->pushContent($m);
+                $output->pushContent(HTML::br());
+            }
+        }
+        $output->pushContent(HTML::p("--- the end ---"));
+
+        return $output;
+    }
+}

Copied: trunk/lib/plugin/DebugRetransform.php (from rev 8810, trunk/lib/plugin/_Retransform.php)
===================================================================
--- trunk/lib/plugin/DebugRetransform.php	                        (rev 0)
+++ trunk/lib/plugin/DebugRetransform.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * Copyright 2007 $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.
+ */
+
+/**
+ * Only useful for link and parser debugging purposes.
+ */
+class WikiPlugin__Retransform
+    extends WikiPlugin
+{
+    function getDescription()
+    {
+        return sprintf(_("Show a markup retransformation of page %s."), '[pagename]');
+    }
+
+    function getDefaultArguments()
+    {
+        return array('page' => '[pagename]');
+    }
+
+    function run($dbi, $argstr, &$request, $basepage)
+    {
+        $args = $this->getArgs($argstr, $request);
+        extract($args);
+        if (empty($page))
+            return '';
+
+        $html = HTML(HTML::h3(fmt("Retransform page “%s”", $page)));
+
+        // bypass WikiDB and cache, go directly through the backend.
+        $backend = &$dbi->_backend;
+        //$pagedata = $backend->get_pagedata($page);
+        $version = $backend->get_latest_version($page);
+        $vdata = $backend->get_versiondata($page, $version, true);
+
+        include_once 'lib/PageType.php';
+        $formatted = new TransformedText($dbi->getPage($page), $vdata['%content'], $vdata);
+        $content =& $formatted->_content;
+        $html->pushContent($this->DebugPrintArray($content));
+        $links = $formatted->getWikiPageLinks();
+        if (count($links) > 0) {
+            $html->pushContent(HTML::h3("Links"));
+            $html->pushContent($this->DebugPrintArray($links));
+        }
+        return $html;
+    }
+
+    private function DebugPrintArray(&$array)
+    {
+        $html = HTML();
+        foreach ($array as $line) {
+            ob_start();
+            print_r($line);
+            $s = HTML::pre(ob_get_contents());
+            ob_end_clean();
+            $html->pushContent($s);
+        }
+        return $html;
+    }
+}
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:

Modified: trunk/lib/plugin/EditMetaData.php
===================================================================
--- trunk/lib/plugin/EditMetaData.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/EditMetaData.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -39,10 +39,10 @@
  * Rewritten for recursive array support by Reini Urban.
  */
 
-require_once 'lib/plugin/_BackendInfo.php';
+require_once 'lib/plugin/DebugBackendInfo.php';
 
 class WikiPlugin_EditMetaData
-    extends WikiPlugin__BackendInfo
+    extends WikiPlugin_DebugBackendInfo
 {
     function getDescription()
     {

Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/FileInfo.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -167,7 +167,7 @@
         $result = call_user_func_array("sprintf", $s);
         if (in_array('link', $modes)) {
             require_once 'lib/InlineParser.php';
-            return TransformInline($result, 2, $basepage);
+            return TransformInline($result, $basepage);
         } else {
             return HTML::raw($result);
         }

Modified: trunk/lib/plugin/GoogleMaps.php
===================================================================
--- trunk/lib/plugin/GoogleMaps.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/GoogleMaps.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -117,8 +117,7 @@
                 include_once 'lib/BlockParser.php';
                 $page = $dbi->getPage($request->getArg('pagename'));
                 $rev = $page->getCurrentRevision(false);
-                $markup = $rev->get('markup');
-                $markertext = TransformText($InfoText, $markup, $basepage);
+                $markertext = TransformText($InfoText, $basepage);
             }
             $markerjs = JavaScript("
 function createMarker(point, text) {

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/IncludePage.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -154,7 +154,7 @@
         array_push($included_pages, $page);
 
         include_once 'lib/BlockParser.php';
-        $content = TransformText($ct, $r->get('markup'), $page);
+        $content = TransformText($ct, $page);
 
         array_pop($included_pages);
 

Modified: trunk/lib/plugin/InterWikiSearch.php
===================================================================
--- trunk/lib/plugin/InterWikiSearch.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/InterWikiSearch.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -48,12 +48,11 @@
             return $this->disabled("Sorry, this plugin is currently out of order.");
 
         $page = $dbi->getPage($request->getArg('pagename'));
-        return new TransformedText($page, __('InterWikiMap'), array('markup' => 2),
+        return new TransformedText($page, __('InterWikiMap'), array(),
             'searchableInterWikiMap');
         /*
         return new PageType($pagerevisionhandle,
                             $pagename = __('InterWikiMap'),
-                            $markup = 2,
                             $overridePageType = 'PageType_searchableInterWikiMap');
         */
     }

Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/MediawikiTable.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -65,8 +65,6 @@
     function run($dbi, $argstr, &$request, $basepage)
     {
         include_once 'lib/BlockParser.php';
-        // MediawikiTablePlugin markup is new.
-        $markup = 2.0;
 
         // We allow the compact Mediawiki syntax with:
         // - multiple cells on the same line (separated by "||"),
@@ -127,7 +125,7 @@
                             if (is_numeric(trim($content))) {
                                 $cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($content)));
                             } else {
-                                $cell->pushContent(TransformText(trim($content), $markup, $basepage));
+                                $cell->pushContent(TransformText(trim($content), $basepage));
                             }
                             unset($content);
                         }
@@ -188,7 +186,7 @@
                         if (is_numeric(trim($content))) {
                             $cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($content)));
                         } else {
-                            $cell->pushContent(TransformText(trim($content), $markup, $basepage));
+                            $cell->pushContent(TransformText(trim($content), $basepage));
                         }
                         unset($content);
                     }
@@ -237,7 +235,7 @@
                     if (is_numeric(trim($line))) {
                         $cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($line)));
                     } else {
-                        $cell->pushContent(TransformText(trim($line), $markup, $basepage));
+                        $cell->pushContent(TransformText(trim($line), $basepage));
                     }
                     continue;
                 }
@@ -255,7 +253,7 @@
                     if (is_numeric(trim($content))) {
                         $cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($content)));
                     } else {
-                        $cell->pushContent(TransformText(trim($content), $markup, $basepage));
+                        $cell->pushContent(TransformText(trim($content), $basepage));
                     }
 
                 }

Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/ModeratedPage.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -373,7 +373,7 @@
         $header = HTML::h3(_("Please approve or reject this request:"));
 
         $loader = new WikiPluginLoader();
-        $BackendInfo = $loader->getPlugin("_BackendInfo");
+        $BackendInfo = $loader->getPlugin("DebugBackendInfo");
         $table = HTML::table(array('border' => 1,
             'cellpadding' => 2,
             'cellspacing' => 0));

Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/OldStyleTable.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -138,8 +138,7 @@
             else
                 $attr['align'] = 'left';
 
-            // Assume new-style inline markup.
-            $content = TransformInline($m[4], 2.0, $basepage);
+            $content = TransformInline($m[4], $basepage);
 
             $row->pushContent(HTML::td($attr, HTML::raw('&nbsp;'),
                 $content, HTML::raw('&nbsp;')));

Copied: trunk/lib/plugin/PreferencesInfo.php (from rev 8810, trunk/lib/plugin/_PreferencesInfo.php)
===================================================================
--- trunk/lib/plugin/PreferencesInfo.php	                        (rev 0)
+++ trunk/lib/plugin/PreferencesInfo.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Copyright 1999, 2000, 2001, 2002 $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.
+ */
+
+/**
+ * Plugin to display the current preferences without auth check.
+ */
+class WikiPlugin_PreferencesInfo
+    extends WikiPlugin
+{
+    function getDescription()
+    {
+        return sprintf(_("Get preferences information for current user %s."),
+            '[userid]');
+    }
+
+    function getDefaultArguments()
+    {
+        return array('page' => '[pagename]',
+            'userid' => '[userid]');
+    }
+
+    function run($dbi, $argstr, &$request, $basepage)
+    {
+        $args = $this->getArgs($argstr, $request);
+        // $user = &$request->getUser();
+        return Template('userprefs', $args);
+    }
+}
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/RecentChanges.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -248,7 +248,7 @@
             return '';
         return HTML::span(array('class' => 'wiki-summary'),
             "(",
-            // TransformLinks($summary, $rev->get('markup'), $rev->getPageName()),
+            // TransformLinks($summary, $rev->getPageName()),
             // We do parse the summary:
             // 1) if the summary contains {{foo}}, the template must no be
             //    expanded
@@ -721,7 +721,7 @@
         return HTML::span(array('class' => 'wiki-summary'),
             "[",
             /*TransformLinks(*/
-            $summary, /* $rev->get('markup')),*/
+            $summary,
             "]");
     }
 

Modified: trunk/lib/plugin/RichTable.php
===================================================================
--- trunk/lib/plugin/RichTable.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/RichTable.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -43,8 +43,6 @@
     function run($dbi, $argstr, &$request, $basepage)
     {
         include_once 'lib/BlockParser.php';
-        // RichTablePlugin markup is new.
-        $markup = 2.0;
 
         $lines = preg_split('/\n/', $argstr);
         $table = HTML::table();
@@ -71,7 +69,7 @@
                             if (is_numeric(trim($content))) {
                                 $cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($content)));
                             } else {
-                                $cell->pushContent(TransformText($content, $markup, $basepage));
+                                $cell->pushContent(TransformText($content, $basepage));
                             }
                             unset($content);
                         }
@@ -97,7 +95,7 @@
                         if (is_numeric(trim($content))) {
                             $cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($content)));
                         } else {
-                            $cell->pushContent(TransformText($content, $markup, $basepage));
+                            $cell->pushContent(TransformText($content, $basepage));
                         }
                         unset($content);
                     }
@@ -131,7 +129,7 @@
                     if (is_numeric(trim($content))) {
                         $cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($content)));
                     } else {
-                        $cell->pushContent(TransformText($content, $markup, $basepage));
+                        $cell->pushContent(TransformText($content, $basepage));
                     }
                 }
                 $row->pushContent($cell);

Modified: trunk/lib/plugin/SiteMap.php
===================================================================
--- trunk/lib/plugin/SiteMap.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/SiteMap.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -165,7 +165,7 @@
         if (!$noheader) {
             $out = $this->getDescription() . " " . sprintf(_("(max. recursion level: %d)"),
                 $reclimit) . ":\n\n";
-            $html->pushContent(TransformText($out, 1.0, $page));
+            $html->pushContent(TransformText($out, $page));
         }
         $pagelist = new PageList($info, $exclude);
         $p = $dbi->getPage($page);
@@ -202,14 +202,12 @@
                 $plugin_args = 'page=\'' . $link->getName() . '\' ' . $includepages;
                 $pagehtml = $plugin->run($dbi, $plugin_args, $request, $basepage);
                 $html->pushContent($pagehtml);
-                //$html->pushContent( HTML(TransformText($indenter, 1.0, $page), $pagehtml));
-                //$out .= $indenter . $pagehtml . "\n";
             } else {
                 $out .= $key . "\n";
             }
         }
         if (empty($includepages)) {
-            return TransformText($out, 2.0, $page);
+            return TransformText($out, $page);
         } else {
             return $html;
         }

Modified: trunk/lib/plugin/SpellCheck.php
===================================================================
--- trunk/lib/plugin/SpellCheck.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/SpellCheck.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -163,7 +163,7 @@
         }
         $GLOBALS['request']->setArg('suggestions', $sugg);
         include_once 'lib/BlockParser.php';
-        $ori_html = TransformText($revision, $revision->get('markup'), $page);
+        $ori_html = TransformText($revision, $page);
         $GLOBALS['request']->setArg('suggestions', false);
 
         $html->pushContent($ori_html, HTML::hr(), HTML::h1(_("SpellCheck result")));

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/Template.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -197,10 +197,10 @@
         $initial_content = trim($initial_content, "\n");
         if (preg_match("/\n/", $initial_content)) {
             include_once 'lib/BlockParser.php';
-            $content = TransformText($initial_content, $r->get('markup'), $page);
+            $content = TransformText($initial_content, $page);
         } else {
             include_once 'lib/InlineParser.php';
-            $content = TransformInline($initial_content, $r->get('markup'), $page);
+            $content = TransformInline($initial_content, $page);
         }
 
         array_pop($included_pages);

Modified: trunk/lib/plugin/TranslateText.php
===================================================================
--- trunk/lib/plugin/TranslateText.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/TranslateText.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -26,7 +26,7 @@
  * One required argument: lang
  * Requires that an action page with the <<TranslateText >> line exists.
  *
- * Usually called from <<_WikiTranslation >>
+ * Usually called from <<WikiTranslation >>
  * Contributed translation are stored in UsersPage/ContributedTranslations
  *
  * Examples:
@@ -35,10 +35,10 @@
  * @author:  Reini Urban
  */
 
-require_once 'lib/plugin/_WikiTranslation.php';
+require_once 'lib/plugin/WikiTranslation.php';
 
 class WikiPlugin_TranslateText
-    extends WikiPlugin__WikiTranslation
+    extends WikiPlugin_WikiTranslation
 {
     function getDescription()
     {
@@ -60,7 +60,7 @@
         if (!$lang)
             return $this->error(
                 _("This internal action page cannot viewed.") . "\n" .
-                    _("You can only use it via the _WikiTranslation plugin."));
+                    _("You can only use it via the WikiTranslation plugin."));
 
         $this->lang = $lang;
         //action=save
@@ -83,8 +83,7 @@
                     $meta = $current->_data;
                 } else {
                     $text = '';
-                    $meta = array('markup' => 2.0,
-                        'author' => $user->getId());
+                    $meta = array('author' => $user->getId());
                 }
                 $text .= $user->getId() . " " . Iso8601DateTime() . "\n" .
                     "* " . sprintf(_("Translate “%s” to “%s” in *%s*"),

Modified: trunk/lib/plugin/UnfoldSubpages.php
===================================================================
--- trunk/lib/plugin/UnfoldSubpages.php	2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/UnfoldSubpages.php	2013-06-18 13:39:29 UTC (rev 8815)
@@ -151,11 +151,10 @@
                 if ($smalltitle) {
                     $pname = array_pop(explode(SUBPAGE_SEPARATOR, $cpagename)); // get last subpage name
                     // Use _("%s: %s") instead of .": ". for French punctuation
-                    $ct = T...
 
[truncated message content]