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

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

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

Revision: 8764
          http://sourceforge.net/p/phpwiki/code/8764
Author:   vargenau
Date:     2013-04-17 10:34:01 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
return

Modified Paths:
--------------
    trunk/lib/plugin/TeX2png.php
    trunk/lib/plugin/text2png.php

Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php	2013-04-17 10:06:40 UTC (rev 8763)
+++ trunk/lib/plugin/TeX2png.php	2013-04-17 10:34:01 UTC (rev 8764)
@@ -232,7 +232,7 @@
             $link = "http://www.php.net/manual/pl/ref.image.php";
             $error_html .= sprintf(_("See %s"), $link) . ".";
             trigger_error($error_html, E_USER_NOTICE);
-            return;
+            return HTML::p($error_html);
         }
     }
 }

Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2013-04-17 10:06:40 UTC (rev 8763)
+++ trunk/lib/plugin/text2png.php	2013-04-17 10:34:01 UTC (rev 8764)
@@ -83,7 +83,7 @@
             $link = "http://www.php.net/manual/pl/ref.image.php";
             $error_html .= sprintf(_("See %s"), $link) . ".";
             trigger_error($error_html, E_USER_NOTICE);
-            return;
+            return HTML::p($error_html);
         }
     }
 
@@ -170,7 +170,7 @@
                 $link = "http://www.php.net/manual/en/function.imagecreate.php";
                 $error_html .= sprintf(_("See %s"), $link) . ".";
                 trigger_error($error_html, E_USER_NOTICE);
-                return;
+                return HTML::p($error_html);
             }
             $rgb = $this->hexcolor($backcolor, array(255, 255, 255));
             $bg_color = ImageColorAllocate($im, $rgb[0], $rgb[1], $rgb[2]);

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

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

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

Revision: 8763
          http://sourceforge.net/p/phpwiki/code/8763
Author:   vargenau
Date:     2013-04-17 10:06:40 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
No underscore for private function

Modified Paths:
--------------
    trunk/lib/plugin/AppendText.php
    trunk/lib/plugin/ExternalSearch.php
    trunk/lib/plugin/FoafViewer.php
    trunk/lib/plugin/FuzzyPages.php
    trunk/lib/plugin/GraphViz.php
    trunk/lib/plugin/HtmlConverter.php
    trunk/lib/plugin/ModeratedPage.php
    trunk/lib/plugin/OldStyleTable.php
    trunk/lib/plugin/SystemInfo.php
    trunk/lib/plugin/WantedPagesOld.php
    trunk/lib/plugin/_AuthInfo.php
    trunk/lib/plugin/_Retransform.php

Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php	2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/AppendText.php	2013-04-17 10:06:40 UTC (rev 8763)
@@ -54,7 +54,7 @@
         );
     }
 
-    private function _fallback($addtext, $oldtext, $notfound, &$message)
+    private function fallback($addtext, $oldtext, $notfound, &$message)
     {
         $message->pushContent(sprintf(_("%s not found"), $notfound) . ". " .
             _("Appending at the end.") . "\n");
@@ -66,19 +66,19 @@
 
         $args = $this->getArgs($argstr, $request);
         if (!$args['pages'] or !$request->isPost()) {
-            return $this->_work($args['page'], $args, $dbi, $request);
+            return $this->work($args['page'], $args, $dbi, $request);
         } else {
             $html = HTML();
             if ($args['page'] != $basepage)
                 $html->pushContent("pages argument overrides page argument. ignored.", HTML::br());
             foreach ($args['pages'] as $pagename) {
-                $html->pushContent($this->_work($pagename, $args, $dbi, $request));
+                $html->pushContent($this->work($pagename, $args, $dbi, $request));
             }
             return $html;
         }
     }
 
-    private function _work($pagename, $args, $dbi, &$request)
+    private function work($pagename, $args, $dbi, &$request)
     {
         if (empty($args['s'])) {
             if ($request->isPost()) {
@@ -109,7 +109,7 @@
                 ? preg_replace("/(\n${before})/",
                     "\n" . preg_quote($text, "/") . "\\1",
                     $oldtext)
-                : $this->_fallback($text, $oldtext, $args['before'], $message);
+                : $this->fallback($text, $oldtext, $args['before'], $message);
         } elseif (!empty($args['after'])) {
             // Insert after
             $after = preg_quote($args['after'], "/");
@@ -117,7 +117,7 @@
                 ? preg_replace("/(\n${after})/",
                     "\\1\n" . preg_quote($text, "/"),
                     $oldtext)
-                : $this->_fallback($text, $oldtext, $args['after'], $message);
+                : $this->fallback($text, $oldtext, $args['after'], $message);
         } else {
             // Append at the end
             $newtext = $oldtext .

Modified: trunk/lib/plugin/ExternalSearch.php
===================================================================
--- trunk/lib/plugin/ExternalSearch.php	2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/ExternalSearch.php	2013-04-17 10:06:40 UTC (rev 8763)
@@ -47,7 +47,7 @@
         //fixme: better description
     }
 
-    private function _getInterWikiUrl(&$request)
+    private function getInterWikiUrl(&$request)
     {
         $intermap = getInterwikiMap();
         $map = $intermap->_map;
@@ -88,7 +88,7 @@
         if (in_array('url', array_keys($posted))) {
             $s = $posted['s'];
             $this->_url = $posted['url'];
-            $this->_getInterWikiUrl($request);
+            $this->getInterWikiUrl($request);
             if (strstr($this->_url, '%s')) {
                 $this->_url = sprintf($this->_url, $s);
             } else
@@ -104,7 +104,7 @@
         if ($formsize < 1)
             $formsize = 30;
         $this->_url = $url;
-        $this->_getInterWikiUrl($request);
+        $this->getInterWikiUrl($request);
         $form = HTML::form(array('action' => $request->getPostURL(),
                 'method' => 'post',
                 //'class'  => 'class', //fixme

Modified: trunk/lib/plugin/FoafViewer.php
===================================================================
--- trunk/lib/plugin/FoafViewer.php	2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/FoafViewer.php	2013-04-17 10:06:40 UTC (rev 8763)
@@ -57,7 +57,7 @@
 {
     // The handler is handled okay. The only problem is that it still
     // throws a fatal.
-    private function _error_handler($error)
+    private function error_handler($error)
     {
         if (strstr($error->errstr, "Failed opening required 'XML/FOAF/Parser.php'"))
             return true;
@@ -90,7 +90,7 @@
         /* ignore fatal on loading */
         /*
         global $ErrorManager;
-        $ErrorManager->pushErrorHandler(new WikiMethodCb($this,'_error_handler'));
+        $ErrorManager->pushErrorHandler(new WikiMethodCb($this,'error_handler'));
         */
         // Require the XML_FOAF_Parser class. This is a PEAR library not included with phpwiki.
         // see doc/README.foaf

Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php	2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/FuzzyPages.php	2013-04-17 10:06:40 UTC (rev 8763)
@@ -111,7 +111,7 @@
         $row = HTML::tr(HTML::th(_("Name")), HTML::th(_("Score")));
 
         if (defined('DEBUG') && DEBUG && $this->debug) {
-            $this->_pushDebugHeadingTDinto($row);
+            $this->pushDebugHeadingTDinto($row);
         }
 
         $table->pushContent(HTML::thead($row));
@@ -132,7 +132,7 @@
                     round($score)));
 
             if (defined('DEBUG') && DEBUG && $this->debug) {
-                $this->_pushDebugTDinto($row, $found_pagename);
+                $this->pushDebugTDinto($row, $found_pagename);
             }
 
             $tbody->pushContent($row);
@@ -173,14 +173,14 @@
         return $this->formatTable($this->_list, $dbi);
     }
 
-    private function _pushDebugHeadingTDinto(&$row)
+    private function pushDebugHeadingTDinto(&$row)
     {
         $row->pushContent(HTML::td(_("Spelling Score")),
             HTML::td(_("Sound Score")),
             HTML::td('Metaphones'));
     }
 
-    private function _pushDebugTDinto(&$row, $pagename)
+    private function pushDebugTDinto(&$row, $pagename)
     {
         // This actually calculates everything a second time for each pagename
         // so the individual scores can be displayed separately for debugging.

Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php	2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/GraphViz.php	2013-04-17 10:06:40 UTC (rev 8763)
@@ -73,7 +73,7 @@
     extends WikiPluginCached
 {
 
-    private function _mapTypes()
+    private function mapTypes()
     {
         return array("imap", "cmapx", "ismap", "cmap");
     }
@@ -89,7 +89,7 @@
         if ($type == $this->_args['imgtype'])
             return PLUGIN_CACHED_IMG_INLINE;
         $device = strtolower($this->_args['imgtype']);
-        if (in_array($device, $this->_mapTypes()))
+        if (in_array($device, $this->mapTypes()))
             return PLUGIN_CACHED_MAP;
         if (in_array($device, array('svg', 'swf', 'svgz', 'eps', 'ps'))) {
             switch ($this->_args['imgtype']) {
@@ -185,7 +185,7 @@
         //$other_imgtypes = $GLOBALS['PLUGIN_CACHED_IMGTYPES'];
         //unset ($other_imgtypes[$def['imgtype']]);
         $imgtypes = $GLOBALS['PLUGIN_CACHED_IMGTYPES'];
-        $imgtypes = array_merge($imgtypes, array("svg", "svgz", "ps"), $this->_mapTypes());
+        $imgtypes = array_merge($imgtypes, array("svg", "svgz", "ps"), $this->mapTypes());
         $helparr = array(
             '<<GraphViz ' .
                 'imgtype' => ' = "' . $def['imgtype'] . "(default)|" . join('|', $imgtypes) . '"',

Modified: trunk/lib/plugin/HtmlConverter.php
===================================================================
--- trunk/lib/plugin/HtmlConverter.php	2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/HtmlConverter.php	2013-04-17 10:06:40 UTC (rev 8763)
@@ -83,7 +83,7 @@
             } else {
                 $message->pushContent(_("Processed $userfile_name"), HTML::br(), HTML::br());
                 $message->pushContent(_("Copy the output below and paste it into your Wiki page."), HTML::br());
-                $message->pushContent($this->_process($userfile_tmpname));
+                $message->pushContent($this->process($userfile_tmpname));
             }
         } else {
             $message->pushContent(HTML::br(), HTML::br());
@@ -95,7 +95,7 @@
         return $result;
     }
 
-    private function _processA(&$file)
+    private function processA(&$file)
     {
 
         $file = eregi_replace(
@@ -104,7 +104,7 @@
         $file = eregi_replace("{{([-/a-zA-Z0-9._~#@%$?&=:\200-\377\(\)[:space:]]+)}}([^<]+)</a>", "[ \\2 | \\1 ]", $file);
     }
 
-    private function _processIMG(&$file)
+    private function processIMG(&$file)
     {
 
         $img_regexp = "_<img\s+src\s*=\s*\"([-/.a-zA-Z0-9\_~#@%$?&=:\200-\377\(\)\s]+)\"[^>]*>_";
@@ -112,7 +112,7 @@
         $file = preg_replace($img_regexp, "\n\n[Upload:\\1]", $file);
     }
 
-    private function _processUL(&$file)
+    private function processUL(&$file)
     {
 
         // put any <li>-Tag in a new line to indent correctly and strip trailing white space (including new-lines)
@@ -132,15 +132,15 @@
         }
     }
 
-    private function _process($file_name)
+    private function process($file_name)
     {
         $result = HTML();
         $file = file_get_contents($file_name);
         $file = html_entity_decode($file);
 
-        $this->_processA($file);
-        $this->_processIMG($file);
-        $this->_processUL($file);
+        $this->processA($file);
+        $this->processIMG($file);
+        $this->processUL($file);
 
         $file = str_replace("\r\n", "\n", $file);
 

Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php	2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/ModeratedPage.php	2013-04-17 10:06:40 UTC (rev 8763)
@@ -321,7 +321,7 @@
             //                              timestamp,user(obj)+userid
             // handle $moderated['data'][$id]['args']['action']
         } else {
-            return $this->_approval_form($request, $args, $moderation, 'approve');
+            return $this->approval_form($request, $args, $moderation, 'approve');
         }
     }
 
@@ -335,7 +335,7 @@
             // clean up and notify the requestor. Mabye: store and revert to have a diff later on?
             $this->cleanup_and_notify($request, $args, $moderation);
         } else {
-            return $this->_approval_form($request, $args, $moderation, 'reject');
+            return $this->approval_form($request, $args, $moderation, 'reject');
         }
     }
 
@@ -371,7 +371,7 @@
         }
     }
 
-    private function _approval_form(&$request, $args, $moderation, $pass = 'approve')
+    private function approval_form(&$request, $args, $moderation, $pass = 'approve')
     {
         $header = HTML::h3(_("Please approve or reject this request:"));
 

Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php	2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/OldStyleTable.php	2013-04-17 10:06:40 UTC (rev 8763)
@@ -111,17 +111,17 @@
                 // bogus error if argument
                 trigger_error(sprintf(_("Line %s does not begin with a '|'."), $line), E_USER_WARNING);
             } else {
-                $table->pushContent($this->_parse_row($line, $basepage));
+                $table->pushContent($this->parse_row($line, $basepage));
             }
         }
 
         return $table;
     }
 
-    private function _parse_row($line, $basepage)
+    private function parse_row($line, $basepage)
     {
-        $brkt_link = "\\[ .*? [^]\s] .*? \\]";
-        $cell_content = "(?: [^[] | " . ESCAPE_CHAR . "\\[ | $brkt_link )*?";
+        $bracket_link = "\\[ .*? [^]\s] .*? \\]";
+        $cell_content = "(?: [^[] | " . ESCAPE_CHAR . "\\[ | $bracket_link )*?";
 
         preg_match_all("/(\\|+) (v*) ([<>^]?) \s* ($cell_content) \s* (?=\\||\$)/x",
             $line, $matches, PREG_SET_ORDER);

Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/SystemInfo.php	2013-04-17 10:06:40 UTC (rev 8763)
@@ -211,7 +211,7 @@
     }
 
     // numeric array
-    private function _stats($hits, $treshold = 10.0)
+    private function get_stats($hits, $treshold = 10.0)
     {
         sort($hits);
         reset($hits);
@@ -268,7 +268,7 @@
             }
         }
         $treshold = 10.0;
-        $stats = $this->_stats($hits, $treshold);
+        $stats = $this->get_stats($hits, $treshold);
 
         $s = sprintf(_("total hits: %d"), $stats['sum']);
         $s .= ", " . sprintf(_("max: %d"), $stats['max']);
@@ -353,8 +353,8 @@
                                $stats['sum']['major'], $stats['sum']['major_perc'],
                                $stats['sum']['minor'], $stats['sum']['minor_perc'], $stats['sum']['all']);
 
-                $stats['perpage']       = $this->_stats($stats['perpage']);
-                $stats['perpage_major'] = $this->_stats($stats['perpage_major']);
+                $stats['perpage']       = $this->get_stats($stats['perpage']);
+                $stats['perpage_major'] = $this->get_stats($stats['perpage_major']);
                 $stats['perpage']['major_perc'] = $stats['perpage_major']['sum'] * 100.0 / $stats['perpage']['sum'];
                 $stats['perpage']['minor_perc'] = 100 - $stats['perpage']['major_perc'];
                 $stats['perpage_minor']['sum']  = $stats['perpage']['sum'] - $stats['perpage_major']['sum'];

Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php	2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/WantedPagesOld.php	2013-04-17 10:06:40 UTC (rev 8763)
@@ -76,12 +76,12 @@
                 $name = $page_handle->getName();
                 if ($name == __("InterWikiMap")) continue;
                 if (!in_array($name, $exclude))
-                    $this->_iterateLinks($page_handle, $dbi);
+                    $this->iterateLinks($page_handle, $dbi);
             }
         } elseif ($page && $pageisWikiPage = $dbi->isWikiPage($page)) {
             //only get WantedPages links for one page
             $page_handle = $dbi->getPage($page);
-            $this->_iterateLinks($page_handle, $dbi);
+            $this->iterateLinks($page_handle, $dbi);
             if (!$request->getArg('count')) {
                 $args['count'] = count($this->pagelist);
             } else {
@@ -111,7 +111,7 @@
                 $caption = fmt("Wanted Pages for %s (%d total):",
                     $pagelink, $c);
             }
-            return $this->_generateList($caption);
+            return $this->generateList($caption);
 
         } else {
             $spacer = new RawXml("&nbsp;&nbsp;&nbsp;&nbsp;");
@@ -146,13 +146,13 @@
                     $c);
             $this->_columns = array(_("Count"), _("Page Name"));
             if ($c > 0)
-                return $this->_generateTable($caption);
+                return $this->generateTable($caption);
             else
                 return HTML(HTML::p($caption), HTML::p($this->_messageIfEmpty));
         }
     }
 
-    private function _generateTable($caption)
+    private function generateTable($caption)
     {
 
         if (count($this->pagelist) > 0) {
@@ -187,7 +187,7 @@
         return $table;
     }
 
-    private function _generateList($caption)
+    private function generateList($caption)
     {
         $list = HTML();
         $c = count($this->pagelist);
@@ -202,7 +202,7 @@
         return $list;
     }
 
-    private function _iterateLinks($page_handle, $dbi)
+    private function iterateLinks($page_handle, $dbi)
     {
         $links_iter = $page_handle->getLinks($reversed = false);
         while ($link_handle = $links_iter->next()) {

Modified: trunk/lib/plugin/_AuthInfo.php
===================================================================
--- trunk/lib/plugin/_AuthInfo.php	2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/_AuthInfo.php	2013-04-17 10:06:40 UTC (rev 8763)
@@ -65,36 +65,36 @@
         $table = HTML::table(array('border' => 1,
             'cellpadding' => 2,
             'cellspacing' => 0));
-        $table->pushContent($this->_showhash("AUTH DEFINES",
-            $this->_buildConstHash(
+        $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->_showhash("LDAP DEFINES",
-                $this->_buildConstHash(array("LDAP_AUTH_HOST", "LDAP_BASE_DN"))));
+            $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->_showhash("IMAP DEFINES", array("IMAP_AUTH_HOST" => IMAP_AUTH_HOST)));
+            $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->_showhash("AUTH_USER_FILE",
-                $this->_buildConstHash(array("AUTH_USER_FILE",
+            $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->_showhash("GROUP_METHOD",
-                $this->_buildConstHash(array("GROUP_METHOD", "AUTH_GROUP_FILE", "GROUP_LDAP_QUERY"))));
-        $table->pushContent($this->_showhash("\$USER_AUTH_ORDER[]", $GLOBALS['USER_AUTH_ORDER']));
-        $table->pushContent($this->_showhash("USER_AUTH_POLICY", array("USER_AUTH_POLICY" => USER_AUTH_POLICY)));
+            $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->_showhash("\$DBParams[]", $DBParams));
+        $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->_showhash("\$DBAuthParams[]", $DBAuthParams));
+        $table->pushContent($this->show_hash("\$DBAuthParams[]", $DBAuthParams));
         $html->pushContent($table);
         $html->pushContent(HTML(HTML::h3(fmt("Personal Auth Settings for “%s”", $userid))));
         if (!$user) {
@@ -110,33 +110,33 @@
                     $userdata['_file']->users[$u] = "<hidden>";
                 }
             }
-            $table->pushContent($this->_showhash("User: Object of " . get_class($user), $userdata));
+            $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->_showhash("Group: Object of " . get_class($group), $groupdata));
+                $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->_showhash("Group Methods: ", $groupdata));
+                $table->pushContent($this->show_hash("Group Methods: ", $groupdata));
             }
             $html->pushContent($table);
         }
         return $html;
     }
 
-    private function _showhash($heading, $hash, $depth = 0)
+    private function show_hash($heading, $hash, $depth = 0)
     {
         static $seen = array();
-        static $maxdepth = 0;
+        static $max_depth = 0;
         $rows = array();
-        $maxdepth++;
-        if ($maxdepth > 35) return $heading;
+        $max_depth++;
+        if ($max_depth > 35) return $heading;
 
         if ($heading)
             $rows[] = HTML::tr(array('bgcolor' => '#ffcccc',
@@ -157,7 +157,7 @@
                         $val = HTML::table(array('border' => 1,
                                 'cellpadding' => 2,
                                 'cellspacing' => 0),
-                            $this->_showhash($heading, obj2hash($val), $depth + 1));
+                            $this->show_hash($heading, obj2hash($val), $depth + 1));
                     } else {
                         $val = $heading;
                     }
@@ -169,7 +169,7 @@
                         $val = HTML::table(array('border' => 1,
                                 'cellpadding' => 2,
                                 'cellspacing' => 0),
-                            $this->_showhash($heading, $val, $depth + 1));
+                            $this->show_hash($heading, $val, $depth + 1));
                     } else {
                         $val = $heading;
                     }
@@ -189,7 +189,7 @@
         return $rows;
     }
 
-    private function _buildConstHash($constants)
+    private function buildConstHash($constants)
     {
         $hash = array();
         foreach ($constants as $c) {

Modified: trunk/lib/plugin/_Retransform.php
===================================================================
--- trunk/lib/plugin/_Retransform.php	2013-04-17 09:39:53 UTC (rev 8762)
+++ trunk/lib/plugin/_Retransform.php	2013-04-17 10:06:40 UTC (rev 8763)
@@ -38,8 +38,7 @@
 
     function getDefaultArguments()
     {
-        return array('page' => '[pagename]',
-        );
+        return array('page' => '[pagename]');
     }
 
     function run($dbi, $argstr, &$request, $basepage)
@@ -49,8 +48,7 @@
         if (empty($page))
             return '';
 
-        $html = HTML(HTML::h3(fmt("Retransform page “%s”",
-            $page)));
+        $html = HTML(HTML::h3(fmt("Retransform page “%s”", $page)));
 
         // bypass WikiDB and cache, go directly through the backend.
         $backend = &$dbi->_backend;
@@ -61,16 +59,16 @@
         include_once 'lib/PageType.php';
         $formatted = new TransformedText($dbi->getPage($page), $vdata['%content'], $vdata);
         $content =& $formatted->_content;
-        $html->pushContent($this->_DebugPrintArray($content));
+        $html->pushContent($this->DebugPrintArray($content));
         $links = $formatted->getWikiPageLinks();
         if (count($links) > 0) {
             $html->pushContent(HTML::h3("Links"));
-            $html->pushContent($this->_DebugPrintArray($links));
+            $html->pushContent($this->DebugPrintArray($links));
         }
         return $html;
     }
 
-    private function _DebugPrintArray(&$array)
+    private function DebugPrintArray(&$array)
     {
         $html = HTML();
         foreach ($array as $line) {
@@ -82,7 +80,6 @@
         }
         return $html;
     }
-
 }
 
 // Local Variables:

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8762] trunk/lib/plugin/InterWikiSearch.php

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

Revision: 8762
          http://sourceforge.net/p/phpwiki/code/8762
Author:   vargenau
Date:     2013-04-17 09:39:53 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
Remove semicolon

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

Modified: trunk/lib/plugin/InterWikiSearch.php
===================================================================
--- trunk/lib/plugin/InterWikiSearch.php	2013-04-16 16:02:49 UTC (rev 8761)
+++ trunk/lib/plugin/InterWikiSearch.php	2013-04-17 09:39:53 UTC (rev 8762)
@@ -122,8 +122,6 @@
             return $table;
         }
     }
-
-    ;
 }
 
 // Local Variables:

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

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

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

Revision: 8761
          http://sourceforge.net/p/phpwiki/code/8761
Author:   vargenau
Date:     2013-04-16 16:02:49 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
Add highlight.js

Modified Paths:
--------------
    trunk/themes/fusionforge/templates/bottom.tmpl

Added Paths:
-----------
    trunk/highlight.js/
    trunk/highlight.js/LICENSE
    trunk/highlight.js/README.md
    trunk/highlight.js/README.ru.md
    trunk/highlight.js/classref.txt
    trunk/highlight.js/highlight.pack.js
    trunk/highlight.js/styles/
    trunk/highlight.js/styles/arta.css
    trunk/highlight.js/styles/ascetic.css
    trunk/highlight.js/styles/brown_paper.css
    trunk/highlight.js/styles/brown_papersq.png
    trunk/highlight.js/styles/dark.css
    trunk/highlight.js/styles/default.css
    trunk/highlight.js/styles/far.css
    trunk/highlight.js/styles/github.css
    trunk/highlight.js/styles/googlecode.css
    trunk/highlight.js/styles/idea.css
    trunk/highlight.js/styles/ir_black.css
    trunk/highlight.js/styles/magula.css
    trunk/highlight.js/styles/monokai.css
    trunk/highlight.js/styles/pojoaque.css
    trunk/highlight.js/styles/pojoaque.jpg
    trunk/highlight.js/styles/rainbow.css
    trunk/highlight.js/styles/school_book.css
    trunk/highlight.js/styles/school_book.png
    trunk/highlight.js/styles/solarized_dark.css
    trunk/highlight.js/styles/solarized_light.css
    trunk/highlight.js/styles/sunburst.css
    trunk/highlight.js/styles/tomorrow-night-blue.css
    trunk/highlight.js/styles/tomorrow-night-bright.css
    trunk/highlight.js/styles/tomorrow-night-eighties.css
    trunk/highlight.js/styles/tomorrow-night.css
    trunk/highlight.js/styles/tomorrow.css
    trunk/highlight.js/styles/vs.css
    trunk/highlight.js/styles/xcode.css
    trunk/highlight.js/styles/zenburn.css

Added: trunk/highlight.js/LICENSE
===================================================================
--- trunk/highlight.js/LICENSE	                        (rev 0)
+++ trunk/highlight.js/LICENSE	2013-04-16 16:02:49 UTC (rev 8761)
@@ -0,0 +1,24 @@
+Copyright (c) 2006, Ivan Sagalaev
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of highlight.js nor the names of its contributors 
+      may be used to endorse or promote products derived from this software 
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Added: trunk/highlight.js/README.md
===================================================================
--- trunk/highlight.js/README.md	                        (rev 0)
+++ trunk/highlight.js/README.md	2013-04-16 16:02:49 UTC (rev 8761)
@@ -0,0 +1,143 @@
+# Highlight.js
+
+Highlight.js highlights syntax in code examples on blogs, forums and,
+in fact, on any web page. It's very easy to use because it works
+automatically: finds blocks of code, detects a language, highlights it.
+
+Autodetection can be fine tuned when it fails by itself (see "Heuristics").
+
+
+## Basic usage
+
+Link the library and a stylesheet from your page and hook highlighting to
+the page load event:
+
+```html
+<link rel="stylesheet" href="styles/default.css">
+<script src="highlight.pack.js"></script>
+<script>hljs.initHighlightingOnLoad();</script>
+```
+
+This will highlight all code on the page marked up as `<pre><code> .. </code></pre>`.
+If you use different markup or need to apply highlighting dynamically, read
+"Custom initialization" below.
+
+- You can download your own customized version of "highlight.pack.js" or
+  use the hosted one as described on the download page:
+  <http://softwaremaniacs.org/soft/highlight/en/download/>
+
+- Style themes are available in the download package or as hosted files.
+  To create a custom style for your site see the class reference in the file
+  [classref.txt][cr] from the downloaded package.
+
+[cr]: http://github.com/isagalaev/highlight.js/blob/master/classref.txt
+
+
+## node.js
+
+Highlight.js can be used under node.js. The package with all supported languages is
+installable from NPM:
+
+    npm install highlight.js
+
+Alternatively, you can build it from the source with only languages you need:
+
+    python tools/build.py -tnode lang1 lang2 ..
+
+Using the library:
+
+```javascript
+var hljs = require('highlight.js');
+
+// If you know the language
+hljs.highlight(lang, code).value;
+
+// Automatic language detection
+hljs.highlightAuto(code).value;
+```
+
+## Tab replacement
+
+You can replace TAB ('\x09') characters used for indentation in your code
+with some fixed number of spaces or with a `<span>` to give them special
+styling:
+
+```html
+<script type="text/javascript">
+  hljs.tabReplace = '    '; // 4 spaces
+  // ... or
+  hljs.tabReplace = '<span class="indent">\t</span>';
+
+  hljs.initHighlightingOnLoad();
+</script>
+```
+
+## Custom initialization
+
+If you use different markup for code blocks you can initialize them manually
+with `highlightBlock(code, tabReplace, useBR)` function. It takes a DOM element
+containing the code to highlight and optionally a string with which to replace
+TAB characters.
+
+Initialization using, for example, jQuery might look like this:
+
+```javascript
+$(document).ready(function() {
+  $('pre code').each(function(i, e) {hljs.highlightBlock(e)});
+});
+```
+
+You can use `highlightBlock` to highlight blocks dynamically inserted into
+the page. Just make sure you don't do it twice for already highlighted
+blocks.
+
+If your code container relies on `<br>` tags instead of line breaks (i.e. if
+it's not `<pre>`) pass `true` into the third parameter of `highlightBlock`
+to make highlight.js use `<br>` in the output:
+
+```javascript
+$('div.code').each(function(i, e) {hljs.highlightBlock(e, null, true)});
+```
+
+
+## Heuristics
+
+Autodetection of a code's language is done using a simple heuristic:
+the program tries to highlight a fragment with all available languages and
+counts all syntactic structures that it finds along the way. The language
+with greatest count wins.
+
+This means that in short fragments the probability of an error is high
+(and it really happens sometimes). In this cases you can set the fragment's
+language explicitly by assigning a class to the `<code>` element:
+
+```html
+<pre><code class="html">...</code></pre>
+```
+
+You can use class names recommended in HTML5: "language-html",
+"language-php". Classes also can be assigned to the `<pre>` element.
+
+To disable highlighting of a fragment altogether use "no-highlight" class:
+
+```html
+<pre><code class="no-highlight">...</code></pre>
+```
+
+
+## Export
+
+File export.html contains a little program that allows you to paste in a code
+snippet and then copy and paste the resulting HTML code generated by the
+highlighter. This is useful in situations when you can't use the script itself
+on a site.
+
+
+## Meta
+
+- Version: 7.3
+- URL:     http://softwaremaniacs.org/soft/highlight/en/
+- Author:  Ivan Sagalaev (<ma...@so...>)
+
+For the license terms see LICENSE files.
+For the list of contributors see AUTHORS.en.txt file.

Added: trunk/highlight.js/README.ru.md
===================================================================
--- trunk/highlight.js/README.ru.md	                        (rev 0)
+++ trunk/highlight.js/README.ru.md	2013-04-16 16:02:49 UTC (rev 8761)
@@ -0,0 +1,149 @@
+# Highlight.js
+
+Highlight.js нужен для подсветки синтаксиса в примерах кода в блогах,
+форумах и вообще на любых веб-страницах. Пользоваться им очень просто,
+потому что работает он автоматически: сам находит блоки кода, сам
+определяет язык, сам подсвечивает.
+
+Автоопределением языка можно управлять, когда оно не справляется само (см.
+дальше "Эвристика").
+
+
+## Простое использование
+
+Подключите библиотеку и стиль на страницу и повесть вызов подсветки на
+загрузку страницы:
+
+```html
+<link rel="stylesheet" href="styles/default.css">
+<script src="highlight.pack.js"></script>
+<script>hljs.initHighlightingOnLoad();</script>
+```
+
+Весь код на странице, обрамлённый в теги `<pre><code> .. </code></pre>`
+будет автоматически подсвечен. Если вы используете другие теги или хотите
+подсвечивать блоки кода динамически, читайте "Инициализацию вручную" ниже.
+
+- Вы можете скачать собственную версию "highlight.pack.js" или сослаться
+  на захостенный файл, как описано на странице загрузки:
+  <http://softwaremaniacs.org/soft/highlight/download/>
+
+- Стилевые темы можно найти в загруженном архиве или также использовать
+  захостенные. Чтобы сделать собственный стиль для своего сайта, вам
+  будет полезен справочник классов в файле [classref.txt][cr], который тоже
+  есть в архиве.
+
+[cr]: http://github.com/isagalaev/highlight.js/blob/master/classref.txt
+
+
+## node.js
+
+Highlight.js можно использовать в node.js. Библиотеку со всеми возможными языками можно
+установить с NPM:
+
+    npm install highlight.js
+
+Также её можно собрать из исходников с только теми языками, которые нужны:
+
+    python tools/build.py -tnode lang1 lang2 ..
+
+Использование библиотеки:
+
+```javascript
+var hljs = require('highlight.js');
+
+// Если вы знаете язык
+hljs.highlight(lang, code).value;
+
+// Автоопределение языка
+hljs.highlightAuto(code).value;
+```
+
+
+## Замена TABов
+
+Также вы можете заменить символы TAB ('\x09'), используемые для отступов, на
+фиксированное количество пробелов или на отдельный `<span>`, чтобы задать ему
+какой-нибудь специальный стиль:
+
+```html
+<script type="text/javascript">
+  hljs.tabReplace = '    '; // 4 spaces
+  // ... or
+  hljs.tabReplace = '<span class="indent">\t</span>';
+
+  hljs.initHighlightingOnLoad();
+</script>
+```
+
+
+## Инициализация вручную
+
+Если вы используете другие теги для блоков кода, вы можете инициализировать их
+явно с помощью функции `highlightBlock(code, tabReplace, useBR)`. Она принимает
+DOM-элемент с текстом расцвечиваемого кода и опционально - строчку для замены
+символов TAB.
+
+Например с использованием jQuery код инициализации может выглядеть так:
+
+```javascript
+$(document).ready(function() {
+  $('pre code').each(function(i, e) {hljs.highlightBlock(e)});
+});
+```
+
+`highlightBlock` можно также использовать, чтобы подсветить блоки кода,
+добавленные на страницу динамически. Только убедитесь, что вы не делаете этого
+повторно для уже раскрашенных блоков.
+
+Если ваш блок кода использует `<br>` вместо переводов строки (т.е. если это не
+`<pre>`), передайте `true` третьим параметром в `highlightBlock`:
+
+```javascript
+$('div.code').each(function(i, e) {hljs.highlightBlock(e, null, true)});
+```
+
+
+## Эвристика
+
+Определение языка, на котором написан фрагмент, делается с помощью
+довольно простой эвристики: программа пытается расцветить фрагмент всеми
+языками подряд, и для каждого языка считает количество подошедших
+синтаксически конструкций и ключевых слов. Для какого языка нашлось больше,
+тот и выбирается.
+
+Это означает, что в коротких фрагментах высока вероятность ошибки, что
+периодически и случается. Чтобы указать язык фрагмента явно, надо написать
+его название в виде класса к элементу `<code>`:
+
+```html
+<pre><code class="html">...</code></pre>
+```
+
+Можно использовать рекомендованные в HTML5 названия классов:
+"language-html", "language-php". Также можно назначать классы на элемент
+`<pre>`.
+
+Чтобы запретить расцветку фрагмента вообще, используется класс "no-highlight":
+
+```html
+<pre><code class="no-highlight">...</code></pre>
+```
+
+
+## Экспорт
+
+В файле export.html находится небольшая программка, которая показывает и дает
+скопировать непосредственно HTML-код подсветки для любого заданного фрагмента кода.
+Это может понадобится например на сайте, на котором нельзя подключить сам скрипт
+highlight.js.
+
+
+## Координаты
+
+- Версия: 7.3
+- URL:    http://softwaremaniacs.org/soft/highlight/
+- Автор:  Иван Сагалаев (<ma...@so...>)
+
+Лицензионное соглашение читайте в файле LICENSE.
+Список соавторов читайте в файле AUTHORS.ru.txt

Added: trunk/highlight.js/classref.txt
===================================================================
--- trunk/highlight.js/classref.txt	                        (rev 0)
+++ trunk/highlight.js/classref.txt	2013-04-16 16:02:49 UTC (rev 8761)
@@ -0,0 +1,568 @@
+This is a full list of available classes corresponding to languages'
+syntactic structures. The parentheses after language name contain identifiers
+used as class names in `<code>` element.
+
+Python ("python"):
+
+  keyword          keyword
+  built_in         built-in objects (None, False, True and Ellipsis)
+  number           number
+  string           string (of any type)
+  comment          comment
+  decorator        @-decorator for functions
+  function         function header "def some_name(...):"
+  class            class header "class SomeName(...):"
+  title            name of a function or a class inside a header
+  params           everything inside parentheses in a function's or class' header
+
+Python profiler results ("profile"):
+
+  number           number
+  string           string
+  builtin          builtin function entry
+  filename         filename in an entry
+  summary          profiling summary
+  header           header of table of results
+  keyword          column header
+  function         function name in an entry (including parentheses)
+  title            actual name of a function in an entry (excluding parentheses)
+  prompt           interpreter prompt (>>> or ...)
+
+Ruby ("ruby"):
+
+  keyword          keyword
+  string           string
+  subst            in-string substitution (#{...})
+  comment          comment
+  yardoctag        YARD tag
+  function         function header "def some_name(...):"
+  class            class header "class SomeName(...):"
+  title            name of a function or a class inside a header
+  parent           name of a parent class
+  symbol           symbol
+
+Perl ("perl"):
+
+  keyword          keyword
+  comment          comment
+  number           number
+  string           string
+  regexp           regular expression
+  sub              subroutine header (from "sub" till "{")
+  variable         variable starting with "$", "%", "@"
+  operator         operator
+  pod              plain old doc
+
+PHP ("php"):
+
+  keyword          keyword
+  number           number
+  string           string (of any type)
+  comment          comment
+  phpdoc           phpdoc params in comments
+  variable         variable starting with "$"
+  preprocessor     preprocessor marks: "<?php" and "?>"
+
+Scala ("scala"):
+
+  keyword          keyword
+  number           number
+  string           string
+  comment          comment
+  annotation       annotation
+  javadoc          javadoc comment
+  javadoctag       @-tag in javadoc
+  class            class header
+  title            class name inside a header
+  params           everything in parentheses inside a class header
+  inheritance      keywords "extends" and "with" inside class header
+
+Go language ("go"):
+  comment          comment
+  string           string constant
+  number           number
+  keyword          language keywords
+  constant         true false nil iota
+  typename         built-in plain types (int, string etc.)
+  built_in         built-in functions
+
+HTML, XML ("xml"):
+
+  tag              any tag from "<" till ">"
+  attribute        tag's attribute with or without value
+  value            attribute's value
+  comment          comment
+  pi               processing instruction (<? ... ?>)
+  doctype          <!DOCTYPE ... > declaration
+  cdata            CDATA section
+
+CSS ("css"):
+
+  tag              tag in selectors
+  id               #some_name in selectors
+  class            .some_name in selectors
+  at_rule          @-rule till first "{" or ";"
+  attr_selector    attribute selector (square brackets in a[href^=http://])
+  pseudo           pseudo classes and elemens (:after, ::after etc.)
+  comment          comment
+  rules            everything from "{" till "}"
+  attribute        property name inside a rule
+  value            property value inside a rule, from ":" till ";" or
+                   till the end of rule block
+  number           number within a value
+  string           string within a value
+  hexcolor         hex color (#FFFFFF) within a value
+  function         CSS function within a value
+  important        "!important" symbol
+
+Markdown ("markdown"):
+
+  header            header
+  bullet            list bullet
+  emphasis          emphasis
+  strong            strong emphasis
+  blockquote        blockquote
+  code              code
+  horizontal_rule   horizontal rule
+  link_label        link label
+  link_url          link url
+
+Django ("django"):
+
+  keyword          HTML tag in HTML, default tags and default filters in templates
+  tag              any tag from "<" till ">"
+  comment          comment
+  doctype          <!DOCTYPE ... > declaration
+  attribute        tag's attribute with or withou value
+  value            attribute's value
+  template_tag     template tag {% .. %}
+  variable         template variable {{ .. }}
+  template_comment template comment, both {# .. #} and {% comment %}
+  filter           filter from "|" till the next filter or the end of tag
+  argument         filter argument
+
+JSON ("json"):
+
+  number           number
+  literal          "true", "false" and "null"
+  string           string value
+  attribute        name of an object property
+  value            value of an object property
+
+JavaScript ("javascript"):
+
+  keyword          keyword
+  comment          comment
+  number           number
+  literal          special literal: "true", "false" and "null"
+  string           string
+  regexp           regular expression
+  function         header of a function
+  title            name of a function inside a header
+  params           parentheses and everything inside them in a function's header
+
+CoffeeScript ("coffeescript"):
+
+  keyword          keyword
+  comment          comment
+  number           number
+  literal          special literal: "true", "false" and "null"
+  string           string
+  regexp           regular expression
+  function         header of a function
+  class            header of a class
+  title            name of a function variable inside a header
+  params           parentheses and everything inside them in a function's header
+  property         @-property within class and functions
+
+ActionScript ("actionscript"):
+
+  comment          comment
+  string           string
+  number           number
+  keyword          keywords
+  literal          literal
+  reserved         reserved keyword
+  title            name of declaration (package, class or function)
+  preprocessor     preprocessor directive (import, include)
+  type             type of returned value (for functions)
+  package          package (named or not)
+  class            class/interface
+  function         function
+  param            params of function
+  rest_arg         rest argument of function
+
+VBScript ("vbscript"):
+
+  keyword          keyword
+  number           number
+  string           string
+  comment          comment
+  built_in         built-in function
+
+HTTP ("http"):
+
+  request          first line of a request
+  status           first line of a response
+  attribute        header name
+  string           header value or query string in a request line
+  number           status code
+
+Lua ("lua"):
+
+  keyword          keyword
+  number           number
+  string           string
+  comment          comment
+  built_in         built-in operator
+  function         header of a function
+  title            name of a function inside a header
+  params           everything inside parentheses in a function's header
+  long_brackets    multiline string in [=[ .. ]=]
+
+Delphi ("delphi"):
+
+  keyword          keyword
+  comment          comment (of any type)
+  number           number
+  string           string
+  function         header of a function, procedure, constructor and destructor
+  title            name of a function, procedure, constructor or destructor
+                   inside a header
+  params           everything inside parentheses in a function's header
+  class            class' body from "= class" till "end;"
+
+Java ("java"):
+
+  keyword          keyword
+  number           number
+  string           string
+  comment          commment
+  annotaion        annotation
+  javadoc          javadoc comment
+  class            class header from "class" till "{"
+  title            class name inside a header
+  params           everything in parentheses inside a class header
+  inheritance      keywords "extends" and "implements" inside class header
+
+C++ ("cpp"):
+
+  keyword          keyword
+  number           number
+  string           string and character
+  comment          comment
+  preprocessor     preprocessor directive
+  stl_container    instantiation of STL containers ("vector<...>")
+
+Objective C ("objectivec"):
+  keyword          keyword
+  built_in         Cocoa/Cocoa Touch constants and classes
+  number           number
+  string           string
+  comment          comment
+  preprocessor     preprocessor directive
+  class            interface/implementation, protocol and forward class declaration
+  variable         properties and struct accesors
+
+Vala ("vala"):
+
+  keyword          keyword
+  number           number
+  string           string
+  comment          comment
+  class            class definitions
+  title            in class definition
+  constant         ALL_UPPER_CASE
+
+C# ("cs"):
+
+  keyword          keyword
+  number           number
+  string           string
+  comment          commment
+  xmlDocTag        xmldoc tag ("///", "<!--", "-->", "<..>")
+
+D language ("d"):
+
+  comment          comment
+  string           string constant
+  number           number
+  keyword          language keywords (including @attributes)
+  constant         true false null
+  built_in         built-in plain types (int, string etc.)
+
+RenderMan RSL ("rsl"):
+
+  keyword          keyword
+  number           number
+  string           string (including @"..")
+  comment          comment
+  preprocessor     preprocessor directive
+  shader           sahder keywords
+  shading          shading keywords
+  built_in         built-in function
+
+RenderMan RIB ("rib"):
+
+  keyword          keyword
+  number           number
+  string           string
+  comment          comment
+  commands         command
+
+Maya Embedded Language ("mel"):
+
+  keyword          keyword
+  number           number
+  string           string
+  comment          comment
+  variable         variable
+
+SQL ("sql"):
+
+  keyword          keyword (mostly SQL'92 and SQL'99)
+  number           number
+  string           string (of any type: "..", '..', `..`)
+  comment          comment
+  aggregate        aggregate function
+
+Smalltalk ("smalltalk"):
+
+  keyword          keyword
+  number           number
+  string           string
+  comment          commment
+  symbol           symbol
+  array            array
+  class            name of a class
+  char             char
+  localvars        block of local variables
+
+Lisp ("lisp"):
+
+  keyword          keyword
+  number           number
+  string           string
+  comment          commment
+  variable         variable
+  literal          b, t and nil
+  list             non-quoted list
+  title            first symbol in a non-quoted list
+  body             remainder of the non-quoted list
+  quoted           quoted list, both "(quote .. )" and "'(..)"
+
+Clojure ("clojure"):
+
+  comment          comments and hints
+  string           string
+  number           number
+  collection       collections
+  attribute        :keyword
+  title            function name (built-in or user defined)
+  built_in         built-in function name
+
+Ini ("ini"):
+
+  title            title of a section
+  value            value of a setting of any type
+  string           string
+  number           number
+  keyword          boolean value keyword
+
+Apache ("apache"):
+
+  keyword          keyword
+  number           number
+  comment          commment
+  literal          On and Off
+  sqbracket        variables in rewrites "%{..}"
+  cbracket         options in rewrites "[..]"
+  tag              begin and end of a configuration section
+
+Nginx ("nginx"):
+
+  title            directive title
+  string           string
+  number           number
+  comment          comment
+  built_in         built-in constant
+  variable         $-variable
+  regexp           regexp
+
+Diff ("diff"):
+
+  header           file header
+  chunk            chunk header within a file
+  addition         added lines
+  deletion         deleted lines
+  change           changed lines
+
+DOS ("dos"):
+
+  keyword          keyword
+  flow             batch control keyword
+  stream           DOS special files ("con", "prn", ...)
+  winutils         some commands (see dos.js specifically)
+  envvar           environment variables
+
+Bash ("bash"):
+
+  keyword          keyword
+  string           string
+  number           number
+  comment          comment
+  literal          special literal: "true" и "false"
+  variable         variable
+  shebang          script interpreter header
+
+CMake ("cmake")
+
+  keyword          keyword
+  number           number
+  string           string
+  comment          commment
+  envvar           $-variable
+
+Axapta ("axapta"):
+
+  keyword          keyword
+  number           number
+  string           string
+  comment          commment
+  class            class header from "class" till "{"
+  title            class name inside a header
+  params           everything in parentheses inside a class header
+  inheritance      keywords "extends" and "implements" inside class header
+  preprocessor     preprocessor directive
+
+1C ("1c"):
+
+  keyword          keyword
+  number           number
+  date             date
+  string           string
+  comment          commment
+  function         header of function or procudure
+  title            function name inside a header
+  params           everything in parentheses inside a function header
+  preprocessor     preprocessor directive
+
+AVR assembler ("avrasm"):
+
+  keyword          keyword
+  built_in         pre-defined register
+  number           number
+  string           string
+  comment          commment
+  label            label
+  preprocessor     preprocessor directive
+  localvars        substitution in .macro
+
+VHDL ("vhdl")
+
+  keyword          keyword
+  number           number
+  string           string
+  comment          commment
+  literal          signal logical value
+  typename         typename
+  attribute        signal attribute
+
+Parser3 ("parser3"):
+
+  keyword          keyword
+  number           number
+  comment          commment
+  variable         variable starting with "$"
+  preprocessor     preprocessor directive
+  title            user-defined name starting with "@"
+
+TeX ("tex"):
+
+  comment          comment
+  number           number
+  command          command
+  parameter        parameter
+  formula          formula
+  special          special symbol
+
+Haskell ("haskell"):
+
+  keyword          keyword
+  number           number
+  string           string
+  comment          comment
+  class            type classes and other data types
+  title            function name
+  type             type class name
+  typedef          definition of types (type, newtype, data)
+
+Erlang ("erlang"):
+
+  comment          comment
+  string           string
+  number           number
+  keyword          keyword
+  record_name      record access (#record_name)
+  title            name of declaration function
+  variable         variable (starts with capital letter or with _)
+  pp.keywords      module's attribute (-attribute)
+  function_name    atom or atom:atom in case of function call
+
+Rust ("rust"):
+
+  comment          comment
+  string           string
+  number           number
+  keyword          keyword
+  title            name of declaration
+  preprocessor     preprocessor directive
+
+Matlab ("matlab"):
+
+  comment          comment
+  string           string
+  number           number
+  keyword          keyword
+  title            function name
+  function         function
+  param            params of function
+  matrix           matrix in [ .. ]
+  cell             cell in { .. }
+
+R ("r"):
+
+  comment          comment
+  string           string constant
+  number           number
+  keyword          language keywords (function, if) plus "structural"
+                   functions (attach, require, setClass)
+  literal          special literal: TRUE, FALSE, NULL, NA, etc.
+
+OpenGL Shading Language ("glsl"):
+
+  comment          comment
+  number           number
+  preprocessor     preprocessor directive
+  keyword          keyword
+  built_in         GLSL built-in functions and variables
+  literal          true false
+
+AppleScript ("applescript"):
+
+  keyword          keyword
+  command          core AppleScript command
+  constant         AppleScript built in constant
+  type             AppleScript variable type (integer, etc.)
+  property         Applescript built in property (length, etc.)
+  number           number
+  string           string
+  comment          comment
+  title            name of a handler
+
+Brainfuck ("brainfuck"):
+
+  title            Brainfuck while loop command
+  literal          Brainfuck inc and dec commands
+  comment          comment
+  string           Brainfuck input and output commands

Added: trunk/highlight.js/highlight.pack.js
===================================================================
--- trunk/highlight.js/highlight.pack.js	                        (rev 0)
+++ trunk/highlight.js/highlight.pack.js	2013-04-16 16:02:49 UTC (rev 8761)
@@ -0,0 +1 @@
+var hljs=new function(){function l(o){return o.replace(/&/gm,"&amp;").replace(/</gm,"&lt;").replace(/>/gm,"&gt;")}function b(p){for(var o=p.firstChild;o;o=o.nextSibling){if(o.nodeName=="CODE"){return o}if(!(o.nodeType==3&&o.nodeValue.match(/\s+/))){break}}}function h(p,o){return Array.prototype.map.call(p.childNodes,function(q){if(q.nodeType==3){return o?q.nodeValue.replace(/\n/g,""):q.nodeValue}if(q.nodeName=="BR"){return"\n"}return h(q,o)}).join("")}function a(q){var p=(q.className+" "+q.parentNode.className).split(/\s+/);p=p.map(function(r){return r.replace(/^language-/,"")});for(var o=0;o<p.length;o++){if(e[p[o]]||p[o]=="no-highlight"){return p[o]}}}function c(q){var o=[];(function p(r,s){for(var t=r.firstChild;t;t=t.nextSibling){if(t.nodeType==3){s+=t.nodeValue.length}else{if(t.nodeName=="BR"){s+=1}else{if(t.nodeType==1){o.push({event:"start",offset:s,node:t});s=p(t,s);o.push({event:"stop",offset:s,node:t})}}}}return s})(q,0);return o}function j(x,v,w){var p=0;var y="";var r=[];function t(){if(x.length&&v.length){if(x[0].offset!=v[0].offset){return(x[0].offset<v[0].offset)?x:v}else{return v[0].event=="start"?x:v}}else{return x.length?x:v}}function s(A){function z(B){return" "+B.nodeName+'="'+l(B.value)+'"'}return"<"+A.nodeName+Array.prototype.map.call(A.attributes,z).join("")+">"}while(x.length||v.length){var u=t().splice(0,1)[0];y+=l(w.substr(p,u.offset-p));p=u.offset;if(u.event=="start"){y+=s(u.node);r.push(u.node)}else{if(u.event=="stop"){var o,q=r.length;do{q--;o=r[q];y+=("</"+o.nodeName.toLowerCase()+">")}while(o!=u.node);r.splice(q,1);while(q<r.length){y+=s(r[q]);q++}}}}return y+l(w.substr(p))}function f(q){function o(s,r){return RegExp(s,"m"+(q.cI?"i":"")+(r?"g":""))}function p(y,w){if(y.compiled){return}y.compiled=true;var s=[];if(y.k){var r={};function z(A,t){t.split(" ").forEach(function(B){var C=B.split("|");r[C[0]]=[A,C[1]?Number(C[1]):1];s.push(C[0])})}y.lR=o(y.l||hljs.IR,true);if(typeof y.k=="string"){z("keyword",y.k)}else{for(var x in y.k){if(!y.k.hasOwnProperty(x)){continue}z(x,y.k[x])}}y.k=r}if(w){if(y.bWK){y.b="\\b("+s.join("|")+")\\s"}y.bR=o(y.b?y.b:"\\B|\\b");if(!y.e&&!y.eW){y.e="\\B|\\b"}if(y.e){y.eR=o(y.e)}y.tE=y.e||"";if(y.eW&&w.tE){y.tE+=(y.e?"|":"")+w.tE}}if(y.i){y.iR=o(y.i)}if(y.r===undefined){y.r=1}if(!y.c){y.c=[]}for(var v=0;v<y.c.length;v++){if(y.c[v]=="self"){y.c[v]=y}p(y.c[v],y)}if(y.starts){p(y.starts,w)}var u=[];for(var v=0;v<y.c.length;v++){u.push(y.c[v].b)}if(y.tE){u.push(y.tE)}if(y.i){u.push(y.i)}y.t=u.length?o(u.join("|"),true):{exec:function(t){return null}}}p(q)}function d(D,E){function o(r,M){for(var L=0;L<M.c.length;L++){var K=M.c[L].bR.exec(r);if(K&&K.index==0){return M.c[L]}}}function s(K,r){if(K.e&&K.eR.test(r)){return K}if(K.eW){return s(K.parent,r)}}function t(r,K){return K.i&&K.iR.test(r)}function y(L,r){var K=F.cI?r[0].toLowerCase():r[0];return L.k.hasOwnProperty(K)&&L.k[K]}function G(){var K=l(w);if(!A.k){return K}var r="";var N=0;A.lR.lastIndex=0;var L=A.lR.exec(K);while(L){r+=K.substr(N,L.index-N);var M=y(A,L);if(M){v+=M[1];r+='<span class="'+M[0]+'">'+L[0]+"</span>"}else{r+=L[0]}N=A.lR.lastIndex;L=A.lR.exec(K)}return r+K.substr(N)}function z(){if(A.sL&&!e[A.sL]){return l(w)}var r=A.sL?d(A.sL,w):g(w);if(A.r>0){v+=r.keyword_count;B+=r.r}return'<span class="'+r.language+'">'+r.value+"</span>"}function J(){return A.sL!==undefined?z():G()}function I(L,r){var K=L.cN?'<span class="'+L.cN+'">':"";if(L.rB){x+=K;w=""}else{if(L.eB){x+=l(r)+K;w=""}else{x+=K;w=r}}A=Object.create(L,{parent:{value:A}});B+=L.r}function C(K,r){w+=K;if(r===undefined){x+=J();return 0}var L=o(r,A);if(L){x+=J();I(L,r);return L.rB?0:r.length}var M=s(A,r);if(M){if(!(M.rE||M.eE)){w+=r}x+=J();do{if(A.cN){x+="</span>"}A=A.parent}while(A!=M.parent);if(M.eE){x+=l(r)}w="";if(M.starts){I(M.starts,"")}return M.rE?0:r.length}if(t(r,A)){throw"Illegal"}w+=r;return r.length||1}var F=e[D];f(F);var A=F;var w="";var B=0;var v=0;var x="";try{var u,q,p=0;while(true){A.t.lastIndex=p;u=A.t.exec(E);if(!u){break}q=C(E.substr(p,u.index-p),u[0]);p=u.index+q}C(E.substr(p));return{r:B,keyword_count:v,value:x,language:D}}catch(H){if(H=="Illegal"){return{r:0,keyword_count:0,value:l(E)}}else{throw H}}}function g(s){var o={keyword_count:0,r:0,value:l(s)};var q=o;for(var p in e){if(!e.hasOwnProperty(p)){continue}var r=d(p,s);r.language=p;if(r.keyword_count+r.r>q.keyword_count+q.r){q=r}if(r.keyword_count+r.r>o.keyword_count+o.r){q=o;o=r}}if(q.language){o.second_best=q}return o}function i(q,p,o){if(p){q=q.replace(/^((<[^>]+>|\t)+)/gm,function(r,v,u,t){return v.replace(/\t/g,p)})}if(o){q=q.replace(/\n/g,"<br>")}return q}function m(r,u,p){var v=h(r,p);var t=a(r);if(t=="no-highlight"){return}var w=t?d(t,v):g(v);t=w.language;var o=c(r);if(o.length){var q=document.createElement("pre");q.innerHTML=w.value;w.value=j(o,c(q),v)}w.value=i(w.value,u,p);var s=r.className;if(!s.match("(\\s|^)(language-)?"+t+"(\\s|$)")){s=s?(s+" "+t):t}r.innerHTML=w.value;r.className=s;r.result={language:t,kw:w.keyword_count,re:w.r};if(w.second_best){r.second_best={language:w.second_best.language,kw:w.second_best.keyword_count,re:w.second_best.r}}}function n(){if(n.called){return}n.called=true;Array.prototype.map.call(document.getElementsByTagName("pre"),b).filter(Boolean).forEach(function(o){m(o,hljs.tabReplace)})}function k(){window.addEventListener("DOMContentLoaded",n,false);window.addEventListener("load",n,false)}var e={};this.LANGUAGES=e;this.highlight=d;this.highlightAuto=g;this.fixMarkup=i;this.highlightBlock=m;this.initHighlighting=n;this.initHighlightingOnLoad=k;this.IR="[a-zA-Z][a-zA-Z0-9_]*";this.UIR="[a-zA-Z_][a-zA-Z0-9_]*";this.NR="\\b\\d+(\\.\\d+)?";this.CNR="(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)";this.BNR="\\b(0b[01]+)";this.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|\\.|-|-=|/|/=|:|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~";this.BE={b:"\\\\[\\s\\S]",r:0};this.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[this.BE],r:0};this.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[this.BE],r:0};this.CLCM={cN:"comment",b:"//",e:"$"};this.CBLCLM={cN:"comment",b:"/\\*",e:"\\*/"};this.HCM={cN:"comment",b:"#",e:"$"};this.NM={cN:"number",b:this.NR,r:0};this.CNM={cN:"number",b:this.CNR,r:0};this.BNM={cN:"number",b:this.BNR,r:0};this.inherit=function(q,r){var o={};for(var p in q){o[p]=q[p]}if(r){for(var p in r){o[p]=r[p]}}return o}}();hljs.LANGUAGES.bash=function(a){var g="true false";var e="if then else elif fi for break continue while in do done echo exit return set declare";var c={cN:"variable",b:"\\$[a-zA-Z0-9_#]+"};var b={cN:"variable",b:"\\${([^}]|\\\\})+}"};var h={cN:"string",b:'"',e:'"',i:"\\n",c:[a.BE,c,b],r:0};var d={cN:"string",b:"'",e:"'",c:[{b:"''"}],r:0};var f={cN:"test_condition",b:"",e:"",c:[h,d,c,b],k:{literal:g},r:0};return{k:{keyword:e,literal:g},c:[{cN:"shebang",b:"(#!\\/bin\\/bash)|(#!\\/bin\\/sh)",r:10},c,b,a.HCM,h,d,a.inherit(f,{b:"\\[ ",e:" \\]",r:0}),a.inherit(f,{b:"\\[\\[ ",e:" \\]\\]"})]}}(hljs);hljs.LANGUAGES.cs=function(a){return{k:"abstract as base bool break byte case catch char checked class const continue decimal default delegate do double else enum event explicit extern false finally fixed float for foreach goto if implicit in int interface internal is lock long namespace new null object operator out override params private protected public readonly ref return sbyte sealed short sizeof stackalloc static string struct switch this throw true try typeof uint ulong unchecked unsafe ushort using virtual volatile void while ascending descending from get group into join let orderby partial select set value var where yield",c:[{cN:"comment",b:"///",e:"$",rB:true,c:[{cN:"xmlDocTag",b:"///|<!--|-->"},{cN:"xmlDocTag",b:"</?",e:">"}]},a.CLCM,a.CBLCLM,{cN:"preprocessor",b:"#",e:"$",k:"if else elif endif define undef warning error line region endregion pragma checksum"},{cN:"string",b:'@"',e:'"',c:[{b:'""'}]},a.ASM,a.QSM,a.CNM]}}(hljs);hljs.LANGUAGES.ruby=function(e){var a="[a-zA-Z_][a-zA-Z0-9_]*(\\!|\\?)?";var j="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?";var g={keyword:"and false then defined module in return redo if BEGIN retry end for true self when next until do begin unless END rescue nil else break undef not super class case require yield alias while ensure elsif or include"};var c={cN:"yardoctag",b:"@[A-Za-z]+"};var k=[{cN:"comment",b:"#",e:"$",c:[c]},{cN:"comment",b:"^\\=begin",e:"^\\=end",c:[c],r:10},{cN:"comment",b:"^__END__",e:"\\n$"}];var d={cN:"subst",b:"#\\{",e:"}",l:a,k:g};var i=[e.BE,d];var b=[{cN:"string",b:"'",e:"'",c:i,r:0},{cN:"string",b:'"',e:'"',c:i,r:0},{cN:"string",b:"%[qw]?\\(",e:"\\)",c:i},{cN:"string",b:"%[qw]?\\[",e:"\\]",c:i},{cN:"string",b:"%[qw]?{",e:"}",c:i},{cN:"string",b:"%[qw]?<",e:">",c:i,r:10},{cN:"string",b:"%[qw]?/",e:"/",c:i,r:10},{cN:"string",b:"%[qw]?%",e:"%",c:i,r:10},{cN:"string",b:"%[qw]?-",e:"-",c:i,r:10},{cN:"string",b:"%[qw]?\\|",e:"\\|",c:i,r:10}];var h={cN:"function",bWK:true,e:" |$|;",k:"def",c:[{cN:"title",b:j,l:a,k:g},{cN:"params",b:"\\(",e:"\\)",l:a,k:g}].concat(k)};var f=k.concat(b.concat([{cN:"class",bWK:true,e:"$|;",k:"class module",c:[{cN:"title",b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?",r:0},{cN:"inheritance",b:"<\\s*",c:[{cN:"parent",b:"("+e.IR+"::)?"+e.IR}]}].concat(k)},h,{cN:"constant",b:"(::)?(\\b[A-Z]\\w*(::)?)+",r:0},{cN:"symbol",b:":",c:b.concat([{b:j}]),r:0},{cN:"symbol",b:a+":",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"number",b:"\\?\\w"},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"("+e.RSR+")\\s*",c:k.concat([{cN:"regexp",b:"/",e:"/[a-z]*",i:"\\n",c:[e.BE,d]}]),r:0}]));d.c=f;h.c[1].c=f;return{l:a,k:g,c:f}}(hljs);hljs.LANGUAGES.diff=function(a){return{c:[{cN:"chunk",b:"^\\@\\@ +\\-\\d+,\\d+ +\\+\\d+,\\d+ +\\@\\@$",r:10},{cN:"chunk",b:"^\\*\\*\\* +\\d+,\\d+ +\\*\\*\\*\\*$",r:10},{cN:"chunk",b:"^\\-\\-\\- +\\d+,\\d+ +\\-\\-\\-\\-$",r:10},{cN:"header",b:"Index: ",e:"$"},{cN:"header",b:"=====",e:"=====$"},{cN:"header",b:"^\\-\\-\\-",e:"$"},{cN:"header",b:"^\\*{3} ",e:"$"},{cN:"header",b:"^\\+\\+\\+",e:"$"},{cN:"header",b:"\\*{5}",e:"\\*{5}$"},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"change",b:"^\\!",e:"$"}]}}(hljs);hljs.LANGUAGES.javascript=function(a){return{k:{keyword:"in if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const",literal:"true false null undefined NaN Infinity"},c:[a.ASM,a.QSM,a.CLCM,a.CBLCLM,a.CNM,{b:"("+a.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[a.CLCM,a.CBLCLM,{cN:"regexp",b:"/",e:"/[gim]*",i:"\\n",c:[{b:"\\\\/"}]},{b:"<",e:">;",sL:"xml"}],r:0},{cN:"function",bWK:true,e:"{",k:"function",c:[{cN:"title",b:"[A-Za-z$_][0-9A-Za-z$_]*"},{cN:"params",b:"\\(",e:"\\)",c:[a.CLCM,a.CBLCLM],i:"[\"'\\(]"}],i:"\\[|%"}]}}(hljs);hljs.LANGUAGES.css=function(a){var b={cN:"function",b:a.IR+"\\(",e:"\\)",c:[a.NM,a.ASM,a.QSM]};return{cI:true,i:"[=/|']",c:[a.CBLCLM,{cN:"id",b:"\\#[A-Za-z0-9_-]+"},{cN:"class",b:"\\.[A-Za-z0-9_-]+",r:0},{cN:"attr_selector",b:"\\[",e:"\\]",i:"$"},{cN:"pseudo",b:":(:)?[a-zA-Z0-9\\_\\-\\+\\(\\)\\\"\\']+"},{cN:"at_rule",b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{cN:"at_rule",b:"@",e:"[{;]",eE:true,k:"import page media charset",c:[b,a.ASM,a.QSM,a.NM]},{cN:"tag",b:a.IR,r:0},{cN:"rules",b:"{",e:"}",i:"[^\\s]",r:0,c:[a.CBLCLM,{cN:"rule",b:"[^\\s]",rB:true,e:";",eW:true,c:[{cN:"attribute",b:"[A-Z\\_\\.\\-]+",e:":",eE:true,i:"[^\\s]",starts:{cN:"value",eW:true,eE:true,c:[b,a.NM,a.QSM,a.ASM,a.CBLCLM,{cN:"hexcolor",b:"\\#[0-9A-F]+"},{cN:"important",b:"!important"}]}}]}]}]}}(hljs);hljs.LANGUAGES.xml=function(a){var c="[A-Za-z0-9\\._:-]+";var b={eW:true,c:[{cN:"attribute",b:c,r:0},{b:'="',rB:true,e:'"',c:[{cN:"value",b:'"',eW:true}]},{b:"='",rB:true,e:"'",c:[{cN:"value",b:"'",eW:true}]},{b:"=",c:[{cN:"value",b:"[^\\s/>]+"}]}]};return{cI:true,c:[{cN:"pi",b:"<\\?",e:"\\?>",r:10},{cN:"doctype",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},{cN:"comment",b:"<!--",e:"-->",r:10},{cN:"cdata",b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{title:"style"},c:[b],starts:{e:"</style>",rE:true,sL:"css"}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{title:"script"},c:[b],starts:{e:"<\/script>",rE:true,sL:"javascript"}},{b:"<%",e:"%>",sL:"vbscript"},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"title",b:"[^ />]+"},b]}]}}(hljs);hljs.LANGUAGES.http=function(a){return{i:"\\S",c:[{cN:"status",b:"^HTTP/[0-9\\.]+",e:"$",c:[{cN:"number",b:"\\b\\d{3}\\b"}]},{cN:"request",b:"^[A-Z]+ (.*?) HTTP/[0-9\\.]+$",rB:true,e:"$",c:[{cN:"string",b:" ",e:" ",eB:true,eE:true}]},{cN:"attribute",b:"^\\w",e:": ",eE:true,i:"\\n|\\s|=",starts:{cN:"string",e:"$"}},{b:"\\n\\n",starts:{sL:"",eW:true}}]}}(hljs);hljs.LANGUAGES.java=function(a){return{k:"false synchronized int abstract float private char boolean static null if const for true while long throw strictfp finally protected import native final return void enum else break transient new catch instanceof byte super volatile case assert short package default double public try this switch continue throws",c:[{cN:"javadoc",b:"/\\*\\*",e:"\\*/",c:[{cN:"javadoctag",b:"@[A-Za-z]+"}],r:10},a.CLCM,a.CBLCLM,a.ASM,a.QSM,{cN:"class",bWK:true,e:"{",k:"class interface",i:":",c:[{bWK:true,k:"extends implements",r:10},{cN:"title",b:a.UIR}]},a.CNM,{cN:"annotation",b:"@[A-Za-z]+"}]}}(hljs);hljs.LANGUAGES.php=function(a){var e={cN:"variable",b:"\\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*"};var b=[a.inherit(a.ASM,{i:null}),a.inherit(a.QSM,{i:null}),{cN:"string",b:'b"',e:'"',c:[a.BE]},{cN:"string",b:"b'",e:"'",c:[a.BE]}];var c=[a.BNM,a.CNM];var d={cN:"title",b:a.UIR};return{cI:true,k:"and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return implements parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception php_user_filter default die require __FUNCTION__ enddeclare final try this switch continue endfor endif declare unset true false namespace trait goto instanceof insteadof __DIR__ __NAMESPACE__ __halt_compiler",c:[a.CLCM,a.HCM,{cN:"comment",b:"/\\*",e:"\\*/",c:[{cN:"phpdoc",b:"\\s@[A-Za-z]+"}]},{cN:"comment",eB:true,b:"__halt_compiler.+?;",eW:true},{cN:"string",b:"<<<['\"]?\\w+['\"]?$",e:"^\\w+;",c:[a.BE]},{cN:"preprocessor",b:"<\\?php",r:10},{cN:"preprocessor",b:"\\?>"},e,{cN:"function",bWK:true,e:"{",k:"function",i:"\\$|\\[|%",c:[d,{cN:"params",b:"\\(",e:"\\)",c:["self",e,a.CBLCLM].concat(b).concat(c)}]},{cN:"class",bWK:true,e:"{",k:"class",i:"[:\\(\\$]",c:[{bWK:true,eW:true,k:"extends",c:[d]},d]},{b:"=>"}].concat(b).concat(c)}}(hljs);hljs.LANGUAGES.python=function(a){var f={cN:"prompt",b:"^(>>>|\\.\\.\\.) "};var c=[{cN:"string",b:"(u|b)?r?'''",e:"'''",c:[f],r:10},{cN:"string",b:'(u|b)?r?"""',e:'"""',c:[f],r:10},{cN:"string",b:"(u|r|ur)'",e:"'",c:[a.BE],r:10},{cN:"string",b:'(u|r|ur)"',e:'"',c:[a.BE],r:10},{cN:"string",b:"(b|br)'",e:"'",c:[a.BE]},{cN:"string",b:'(b|br)"',e:'"',c:[a.BE]}].concat([a.ASM,a.QSM]);var e={cN:"title",b:a.UIR};var d={cN:"params",b:"\\(",e:"\\)",c:["self",a.CNM,f].concat(c)};var b={bWK:true,e:":",i:"[${=;\\n]",c:[e,d],r:10};return{k:{keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda nonlocal|10",built_in:"None True False Ellipsis NotImplemented"},i:"(</|->|\\?)",c:c.concat([f,a.HCM,a.inherit(b,{cN:"function",k:"def"}),a.inherit(b,{cN:"class",k:"class"}),a.CNM,{cN:"decorator",b:"@",e:"$"},{b:"\\b(print|exec)\\("}])}}(hljs);hljs.LANGUAGES.sql=function(a){return{cI:true,c:[{cN:"operator",b:"(begin|start|commit|rollback|savepoint|lock|alter|create|drop|rename|call|delete|do|handler|insert|load|replace|select|truncate|update|set|show|pragma|grant)\\b(?!:)",e:";",eW:true,k:{keyword:"all partial global month current_timestamp using go revoke smallint indicator end-exec disconnect zone with character assertion to add current_user usage input local alter match collate real then rollback get read timestamp session_user not integer bit unique day minute desc insert execute like ilike|2 level decimal drop continue isolation found where constraints domain right national some module transaction relative second connect escape close system_user for deferred section cast current sqlstate allocate intersect deallocate numeric public preserve full goto initially asc no key output collation group by union session both last language constraint column of space foreign deferrable prior connection unknown action commit view or first into float year primary cascaded except restrict set references names table outer open select size are rows from prepare distinct leading create only next inner authorization schema corresponding option declare precision immediate else timezone_minute external varying translation true case exception join hour default double scroll value cursor descriptor values dec fetch procedure delete and false int is describe char as at in varchar null trailing any absolute current_time end grant privileges when cross check write current_date pad begin temporary exec time update catalog user sql date on identity timezone_hour natural whenever interval work order cascade diagnostics nchar having left call do handler load replace truncate start lock show pragma exists number",aggregate:"count sum min max avg"},c:[{cN:"string",b:"'",e:"'",c:[a.BE,{b:"''"}],r:0},{cN:"string",b:'"',e:'"',c:[a.BE,{b:'""'}],r:0},{cN:"string",b:"`",e:"`",c:[a.BE]},a.CNM]},a.CBLCLM,{cN:"comment",b:"--",e:"$"}]}}(hljs);hljs.LANGUAGES.ini=function(a){return{cI:true,i:"[^\\s]",c:[{cN:"comment",b:";",e:"$"},{cN:"title",b:"^\\[",e:"\\]"},{cN:"setting",b:"^[a-z0-9\\[\\]_-]+[ \\t]*=[ \\t]*",e:"$",c:[{cN:"value",eW:true,k:"on off true false yes no",c:[a.QSM,a.NM]}]}]}}(hljs);hljs.LANGUAGES.perl=function(e){var a="getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qqfileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmgetsub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedirioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when";var d={cN:"subst",b:"[$@]\\{",e:"\\}",k:a,r:10};var b={cN:"variable",b:"\\$\\d"};var i={cN:"variable",b:"[\\$\\%\\@\\*](\\^\\w\\b|#\\w+(\\:\\:\\w+)*|[^\\s\\w{]|{\\w+}|\\w+(\\:\\:\\w*)*)"};var f=[e.BE,d,b,i];var h={b:"->",c:[{b:e.IR},{b:"{",e:"}"}]};var g={cN:"comment",b:"^(__END__|__DATA__)",e:"\\n$",r:5};var c=[b,i,e.HCM,g,{cN:"comment",b:"^\\=\\w",e:"\\=cut",eW:true},h,{cN:"string",b:"q[qwxr]?\\s*\\(",e:"\\)",c:f,r:5},{cN:"string",b:"q[qwxr]?\\s*\\[",e:"\\]",c:f,r:5},{cN:"string",b:"q[qwxr]?\\s*\\{",e:"\\}",c:f,r:5},{cN:"string",b:"q[qwxr]?\\s*\\|",e:"\\|",c:f,r:5},{cN:"string",b:"q[qwxr]?\\s*\\<",e:"\\>",c:f,r:5},{cN:"string",b:"qw\\s+q",e:"q",c:f,r:5},{cN:"string",b:"'",e:"'",c:[e.BE],r:0},{cN:"string",b:'"',e:'"',c:f,r:0},{cN:"string",b:"`",e:"`",c:[e.BE]},{cN:"string",b:"{\\w+}",r:0},{cN:"string",b:"-?\\w+\\s*\\=\\>",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"("+e.RSR+"|\\b(split|return|print|reverse|grep)\\b)\\s*",k:"split return print reverse grep",r:0,c:[e.HCM,g,{cN:"regexp",b:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",r:10},{cN:"regexp",b:"(m|qr)?/",e:"/[a-z]*",c:[e.BE],r:0}]},{cN:"sub",bWK:true,e:"(\\s*\\(.*?\\))?[;{]",k:"sub",r:5},{cN:"operator",b:"-\\w\\b",r:0}];d.c=c;h.c[1].c=c;return{k:a,c:c}}(hljs);hljs.LANGUAGES.json=function(a){var e={literal:"true false null"};var d=[a.QSM,a.CNM];var c={cN:"value",e:",",eW:true,eE:true,c:d,k:e};var b={b:"{",e:"}",c:[{cN:"attribute",b:'\\s*"',e:'"\\s*:\\s*',eB:true,eE:true,c:[a.BE],i:"\\n",starts:c}],i:"\\S"};var f={b:"\\[",e:"\\]",c:[a.inherit(c,{cN:null})],i:"\\S"};d.splice(d.length,0,b,f);return{c:d,k:e,i:"\\S"}}(hljs);hljs.LANGUAGES.cpp=function(a){var b={keyword:"false int float while private char catch export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const struct for static_cast|10 union namespace unsigned long throw volatile static protected bool template mutable if public friend do return goto auto void enum else break new extern using true class asm case typeid short reinterpret_cast|10 default double register explicit signed typename try this switch continue wchar_t inline delete alignof char16_t char32_t constexpr decltype noexcept nullptr static_assert thread_local restrict _Bool complex",built_in:"std string cin cout cerr clog stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap array shared_ptr"};return{k:b,i:"</",c:[a.CLCM,a.CBLCLM,a.QSM,{cN:"string",b:"'\\\\?.",e:"'",i:"."},{cN:"number",b:"\\b(\\d+(\\.\\d*)?|\\.\\d+)(u|U|l|L|ul|UL|f|F)"},a.CNM,{cN:"preprocessor",b:"#",e:"$"},{cN:"stl_container",b:"\\b(deque|list|queue|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",e:">",k:b,r:10,c:["self"]}]}}(hljs);
\ No newline at end of file

Added: trunk/highlight.js/styles/arta.css
===================================================================
--- trunk/highlight.js/styles/arta.css	                        (rev 0)
+++ trunk/highlight.js/styles/arta.css	2013-04-16 16:02:49 UTC (rev 8761)
@@ -0,0 +1,158 @@
+/*
+Date: 17.V.2011
+Author: pumbur <pu...@pu...>
+*/
+
+pre code
+{
+  display: block; padding: 0.5em;
+  background: #222;
+}
+
+pre .profile .header *,
+pre .ini .title,
+pre .nginx .title
+{
+  color: #fff;
+}
+
+pre .comment,
+pre .javadoc,
+pre .preprocessor,
+pre .preprocessor .title,
+pre .shebang,
+pre .profile .summary,
+pre .diff,
+pre .pi,
+pre .doctype,
+pre .tag,
+pre .template_comment,
+pre .css .rules,
+pre .tex .special
+{
+  color: #444;
+}
+
+pre .string,
+pre .symbol,
+pre .diff .change,
+pre .regexp,
+pre .xml .attribute,
+pre .smalltalk .char,
+pre .xml .value,
+pre .ini .value,
+pre .clojure .attribute
+{
+  color: #ffcc33;
+}
+
+pre .number,
+pre .addition
+{
+  color: #00cc66;
+}
+
+pre .built_in,
+pre .literal,
+pre .vhdl .typename,
+pre .go .constant,
+pre .go .typename,
+pre .ini .keyword,
+pre .lua .title,
+pre .perl .variable,
+pre .php .variable,
+pre .mel .variable,
+pre .django .variable,
+pre .css .funtion,
+pre .smalltalk .method,
+pre .hexcolor,
+pre .important,
+pre .flow,
+pre .inheritance,
+pre .parser3 .variable
+{
+  color: #32AAEE;
+}
+
+pre .keyword,
+pre .tag .title,
+pre .css .tag,
+pre .css .class,
+pre .css .id,
+pre .css .pseudo,
+pre .css .attr_selector,
+pre .lisp .title,
+pre .clojure .built_in,
+pre .winutils,
+pre .tex .command,
+pre .request,
+pre .status
+{
+  color: #6644aa;
+}
+
+pre .title,
+pre .ruby .constant,
+pre .vala .constant,
+pre .parent,
+pre .deletion,
+pre .template_tag,
+pre .css .keyword,
+pre .objectivec .class .id,
+pre .smalltalk .class,
+pre .lisp .keyword,
+pre .apache .tag,
+pre .nginx .variable,
+pre .envvar,
+pre .bash .variable,
+pre .go .built_in,
+pre .vbscript .built_in,
+pre .lua .built_in,
+pre .rsl .built_in,
+pre .tail,
+pre .avrasm .label,
+pre .tex .formula,
+pre .tex .formula *
+{
+  color: #bb1166;
+}
+
+pre .yardoctag,
+pre .phpdoc,
+pre .profile .header,
+pre .ini .title,
+pre .apache .tag,
+pre .parser3 .title
+{
+  font-weight: bold;
+}
+
+pre .coffeescript .javascript,
+pre .javascript .xml,
+pre .tex .formula,
+pre .xml .javascript,
+pre .xml .vbscript,
+pre .xml .css,
+pre .xml .cdata
+{
+  opacity: 0.6;
+}
+
+pre code,
+pre .javascript,
+pre .css,
+pre .xml,
+pre .subst,
+pre .diff .chunk,
+pre .css .value,
+pre .css .attribute,
+pre .lisp .string,
+pre .lisp .number,
+pre .tail .params,
+pre .container,
+pre .haskell *,
+pre .erlang *,
+pre .erlang_repl *
+{
+  color: #aaa;
+}

Added: trunk/highlight.js/styles/ascetic.css
===================================================================
--- trunk/highlight.js/styles/ascetic.css	                        (rev 0)
+++ trunk/highlight.js/styles/ascetic.css	2013-04-16 16:02:49 UTC (rev 8761)
@@ -0,0 +1,50 @@
+/*
+
+Original style from softwaremaniacs.org (c) Ivan Sagalaev <Ma...@So...>
+
+*/
+
+pre code {
+  display: block; padding: 0.5em;
+  background: white; color: black;
+}
+
+pre .string,
+pre .tag .value,
+pre .filter .argument,
+pre .addition,
+pre .change,
+pre .apache .tag,
+pre .apache .cbracket,
+pre .nginx .built_in,
+pre .tex .formula {
+  color: #888;
+}
+
+pre .comment,
+pre .template_comment,
+pre .shebang,
+pre .doctype,
+pre .pi,
+pre .javadoc,
+pre .deletion,
+pre .apache .sqbracket {
+  color: #CCC;
+}
+
+pre .keyword,
+pre .tag .title,
+pre .ini .title,
+pre .lisp .title,
+pre .clojure .title,
+pre .http .title,
+pre .nginx .title,
+pre .css .tag,
+pre .winutils,
+pre .flow,
+pre .apache .tag,
+pre .tex .command,
+pre .request,
+pre .status {
+  font-weight: bold;
+}

Added: trunk/highlight.js/styles/brown_paper.css
===================================================================
--- trunk/highlight.js/styles/brown_paper.css	                        (rev 0)
+++ trunk/highlight.js/styles/brown_paper.css	2013-04-16 16:02:49 UTC (rev 8761)
@@ -0,0 +1,104 @@
+/*
+
+Brown Paper style from goldblog.com.ua (c) Zaripov Yura <yu...@uk...>
+
+*/
+
+pre code {
+  display: block; padding: 0.5em;
+  background:#b7a68e url(./brown_papersq.png);
+}
+
+pre .keyword,
+pre .literal,
+pre .change,
+pre .winutils,
+pre .flow,
+pre .lisp .title,
+pre .clojure .built_in,
+pre .nginx .title,
+pre .tex .special,
+pre .request,
+pre .status {
+  color:#005599;
+  font-weight:bold;
+}
+
+pre code,
+pre .subst,
+pre .tag .keyword {
+  color: #363C69;
+}
+
+pre .string,
+pre .title,
+pre .haskell .type,
+pre .tag .value,
+pre .css .rules .value,
+pre .preprocessor,
+pre .ruby .symbol,
+pre .ruby .symbol .string,
+pre .ruby .class .parent,
+pre .built_in,
+pre .sql .aggregate,
+pre .django .template_tag,
+pre .django .variable,
+pre .smalltalk .class,
+pre .javadoc,
+pre .ruby .string,
+pre .django .filter .argument,
+pre .smalltalk .localvars,
+pre .smalltalk .array,
+pre .attr_selector,
+pre .pseudo,
+pre .addition,
+pre .stream,
+pre .envvar,
+pre .apache .tag,
+pre .apache .cbracket,
+pre .tex .number {
+  color: #2C009F;
+}
+
+pre .comment,
+pre .java .annotation,
+pre .python .decorator,
+pre .template_comment,
+pre .pi,
+pre .doctype,
+pre .deletion,
+pre .shebang,
+pre .apache .sqbracket,
+pre .nginx .built_in,
+pre .tex .formula {
+  color: #802022;
+}
+
+pre .keyword,
+pre .literal,
+pre .css .id,
+pre .phpdoc,
+pre .title,
+pre .haskell .type,
+pre .vbscript .built_in,
+pre .sql .aggregate,
+pre .rsl .built_in,
+pre .smalltalk .class,
+pre .diff .header,
+pre .chunk,
+pre .winutils,
+pre .bash .variable,
+pre .apache .tag,
+pre .tex .command {
+  font-weight: bold;
+}
+
+pre .coffeescript .javascript,
+pre .javascript .xml,
+pre .tex .formula,
+pre .xml .javascript,
+pre .xml .vbscript,
+pre .xml .css,
+pre .xml .cdata {
+  opacity: 0.8;
+}

Added: trunk/highlight.js/styles/brown_papersq.png
===================================================================
(Binary files differ)

Index: trunk/highlight.js/styles/brown_papersq.png
===================================================================
--- trunk/highlight.js/styles/brown_papersq.png	2013-04-16 15:53:47 UTC (rev 8760)
+++ trunk/highlight.js/styles/brown_papersq.png	2013-04-16 16:02:49 UTC (rev 8761)

Property changes on: trunk/highlight.js/styles/brown_papersq.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/highlight.js/styles/dark.css
===================================================================
--- trunk/highlight.js/styles/dark.css	                        (rev 0)
+++ trunk/highlight.js/styles/dark.css	2013-04-16 16:02:49 UTC (rev 8761)
@@ -0,0 +1,103 @@
+/*
+
+Dark style from softwaremaniacs.org (c) Iv...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[8760] trunk/lib/plugin/CreateToc.php

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

Revision: 8760
          http://sourceforge.net/p/phpwiki/code/8760
Author:   vargenau
Date:     2013-04-16 15:53:47 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
Remove unused param in getCounter

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

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2013-04-16 15:42:21 UTC (rev 8759)
+++ trunk/lib/plugin/CreateToc.php	2013-04-16 15:53:47 UTC (rev 8760)
@@ -114,7 +114,7 @@
     }
 
     // Get string corresponding to the current title
-    private function getCounter(&$counter, $level, $firstlevelstyle)
+    private function getCounter(&$counter, $firstlevelstyle)
     {
         if ($firstlevelstyle == 'roman') {
             $str = $this->roman_counter($counter[1]);
@@ -311,7 +311,7 @@
                         $manchor = MangleXmlIdentifier($anchor);
                         $texts = $s;
                         if ($counter) {
-                            $texts = $this->getCounter($tocCounter, $level, $firstlevelstyle) . ' ' . $s;
+                            $texts = $this->getCounter($tocCounter, $firstlevelstyle) . ' ' . $s;
                         }
                         $headers[] = array('text' => $texts,
                             'anchor' => $anchor,
@@ -330,7 +330,7 @@
                             $x = $markup->_content[$j];
                             $qheading = $this->quote($s);
                             if ($counter)
-                                $counterString = $this->getCounter($tocCounter, $level, $firstlevelstyle);
+                                $counterString = $this->getCounter($tocCounter, $firstlevelstyle);
                             if (($hstart === 0) && is_string($markup->_content[$j])) {
                                 if ($backlink) {
                                     if ($counter)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8759] trunk/lib/plugin/WikicreoleTable.php

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

Revision: 8759
          http://sourceforge.net/p/phpwiki/code/8759
Author:   vargenau
Date:     2013-04-16 15:42:21 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
No underscore for private function

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

Modified: trunk/lib/plugin/WikicreoleTable.php
===================================================================
--- trunk/lib/plugin/WikicreoleTable.php	2013-04-16 15:32:54 UTC (rev 8758)
+++ trunk/lib/plugin/WikicreoleTable.php	2013-04-16 15:42:21 UTC (rev 8759)
@@ -93,52 +93,52 @@
             }
         }
 
-        $nbrows = sizeof($table);
+        $nb_rows = sizeof($table);
         // If table is empty, do not generate table markup
-        if ($nbrows == 0) {
+        if ($nb_rows == 0) {
             return HTML::raw('');
         }
 
         // Number of columns is the number of cells in the longer row
-        $nbcols = 0;
-        for ($i = 0; $i < $nbrows; $i++) {
-            $nbcols = max($nbcols, sizeof($table[$i]));
+        $nb_cols = 0;
+        for ($i = 0; $i < $nb_rows; $i++) {
+            $nb_cols = max($nb_cols, sizeof($table[$i]));
         }
 
-        for ($i = 0; $i < $nbrows; $i++) {
-            for ($j = 0; $j < $nbcols; $j++) {
+        for ($i = 0; $i < $nb_rows; $i++) {
+            for ($j = 0; $j < $nb_cols; $j++) {
                 if (!isset($table[$i][$j])) {
                     $table[$i][$j] = '';
                 } elseif (preg_match('/@@/', $table[$i][$j])) {
-                    $table[$i][$j] = $this->_compute_tablecell($table, $i, $j, $nbrows, $nbcols);
+                    $table[$i][$j] = $this->compute_table_cell($table, $i, $j, $nb_rows, $nb_cols);
                 }
             }
         }
 
-        $htmltable = HTML::table(array('class' => "bordered"));
+        $html_table = HTML::table(array('class' => "bordered"));
         foreach ($table as $row) {
-            $htmlrow = HTML::tr();
+            $html_row = HTML::tr();
             foreach ($row as $cell) {
                 if ($cell && $cell[0] == '=') {
                     $cell = trim(substr($cell, 1));
-                    $htmlrow->pushContent(HTML::th(TransformInline($cell, 2.0, $basepage)));
+                    $html_row->pushContent(HTML::th(TransformInline($cell, 2.0, $basepage)));
                 } else {
                     if (is_numeric($cell)) {
-                        $htmlrow->pushContent(HTML::td(array('style' => "text-align:right"), $cell));
+                        $html_row->pushContent(HTML::td(array('style' => "text-align:right"), $cell));
                     } else {
-                        $htmlrow->pushContent(HTML::td(TransformInline($cell, 2.0, $basepage)));
+                        $html_row->pushContent(HTML::td(TransformInline($cell, 2.0, $basepage)));
                     }
                 }
             }
-            $htmltable->pushContent($htmlrow);
+            $html_table->pushContent($html_row);
         }
-        return $htmltable;
+        return $html_table;
     }
 
     private function parse_row($line)
     {
-        $brkt_link = "\\[ .*? [^]\s] .*? \\]";
-        $cell_content = "(?: [^[] | " . ESCAPE_CHAR . "\\[ | $brkt_link )*?";
+        $bracket_link = "\\[ .*? [^]\s] .*? \\]";
+        $cell_content = "(?: [^[] | " . ESCAPE_CHAR . "\\[ | $bracket_link )*?";
 
         preg_match_all("/(\\|+) \s* ($cell_content) \s* (?=\\||\$)/x",
             $line, $matches, PREG_SET_ORDER);
@@ -158,7 +158,7 @@
      * $i and $j: indexes of cell to compute
      * $imax and $jmax: table dimensions
      */
-    private function _compute_tablecell($table, $i, $j, $imax, $jmax)
+    private function compute_table_cell($table, $i, $j, $imax, $jmax)
     {
 
         // What is implemented:

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

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

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

Revision: 8758
          http://sourceforge.net/p/phpwiki/code/8758
Author:   vargenau
Date:     2013-04-16 15:32:54 +0000 (Tue, 16 Apr 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/fr/LC_MESSAGES/phpwiki.php
    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
    trunk/locale/zh/LC_MESSAGES/phpwiki.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/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-04-16 15:31:08 UTC (rev 8757)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-04-16 15:32:54 UTC (rev 8758)
@@ -999,7 +999,6 @@
 $locale["Sorry, no dynamic DB Session support."] = "Désolé, Session dynamique non supportées.";
 $locale["Sorry, this page does not exist."] = "Désolé, cette page n'existe pas.";
 $locale["Sorry, this version of PHP cannot create PNG image files."] = "Désolé, cette version de PHP ne peut pas créer des fichiers d'image PNG.";
-$locale["Sorry. Access Restrictions not yet implemented"] = "Désolé. Restriction d'accès pas encore disponible";
 $locale["Sort by %s"] = "Trier par %s";
 $locale["Sound Score"] = "Score de son";
 $locale["Special Actions"] = "Actions spéciales";

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-04-16 15:31:08 UTC (rev 8757)
+++ trunk/locale/po/de.po	2013-04-16 15:32:54 UTC (rev 8758)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:18+0200\n"
+"POT-Creation-Date: 2013-04-16 17:32+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."
@@ -4213,9 +4213,6 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr "Alle leeren Seiten endgültig entfernen, die nicht verlinkt sind."
 
-msgid "Access Restrictions"
-msgstr ""
-
 msgid "Convert cached_html"
 msgstr ""
 
@@ -4261,9 +4258,6 @@
 msgid "Converted successfully %d pages"
 msgstr "%d Seiten erfolgreich konvertiert"
 
-msgid "Sorry. Access Restrictions not yet implemented"
-msgstr ""
-
 msgid "E-mail"
 msgstr "E-Mail"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2013-04-16 15:31:08 UTC (rev 8757)
+++ trunk/locale/po/es.po	2013-04-16 15:32:54 UTC (rev 8758)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:18+0200\n"
+"POT-Creation-Date: 2013-04-16 17:32+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -4076,9 +4076,6 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-msgid "Access Restrictions"
-msgstr ""
-
 msgid "Convert cached_html"
 msgstr ""
 
@@ -4124,9 +4121,6 @@
 msgid "Converted successfully %d pages"
 msgstr ""
 
-msgid "Sorry. Access Restrictions not yet implemented"
-msgstr ""
-
 msgid "E-mail"
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2013-04-16 15:31:08 UTC (rev 8757)
+++ trunk/locale/po/fr.po	2013-04-16 15:32:54 UTC (rev 8758)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:18+0200\n"
+"POT-Creation-Date: 2013-04-16 17:32+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."
@@ -4124,9 +4124,6 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-msgid "Access Restrictions"
-msgstr ""
-
 msgid "Convert cached_html"
 msgstr ""
 
@@ -4172,9 +4169,6 @@
 msgid "Converted successfully %d pages"
 msgstr "%d pages converties avec succès"
 
-msgid "Sorry. Access Restrictions not yet implemented"
-msgstr "Désolé. Restriction d'accès pas encore disponible"
-
 msgid "E-mail"
 msgstr "Adresse électronique"
 
@@ -6085,6 +6079,9 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid "Sorry. Access Restrictions not yet implemented"
+#~ msgstr "Désolé. Restriction d'accès pas encore disponible"
+
 #~ msgid "SteveWainstead"
 #~ msgstr "SteveWainstead"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2013-04-16 15:31:08 UTC (rev 8757)
+++ trunk/locale/po/it.po	2013-04-16 15:32:54 UTC (rev 8758)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:18+0200\n"
+"POT-Creation-Date: 2013-04-16 17:32+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"
@@ -4050,9 +4050,6 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-msgid "Access Restrictions"
-msgstr ""
-
 msgid "Convert cached_html"
 msgstr ""
 
@@ -4098,9 +4095,6 @@
 msgid "Converted successfully %d pages"
 msgstr ""
 
-msgid "Sorry. Access Restrictions not yet implemented"
-msgstr ""
-
 msgid "E-mail"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2013-04-16 15:31:08 UTC (rev 8757)
+++ trunk/locale/po/ja.po	2013-04-16 15:32:54 UTC (rev 8758)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:18+0200\n"
+"POT-Creation-Date: 2013-04-16 17:32+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"
@@ -4157,9 +4157,6 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-msgid "Access Restrictions"
-msgstr ""
-
 msgid "Convert cached_html"
 msgstr ""
 
@@ -4205,9 +4202,6 @@
 msgid "Converted successfully %d pages"
 msgstr ""
 
-msgid "Sorry. Access Restrictions not yet implemented"
-msgstr ""
-
 #, fuzzy
 msgid "E-mail"
 msgstr "メール"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2013-04-16 15:31:08 UTC (rev 8757)
+++ trunk/locale/po/nl.po	2013-04-16 15:32:54 UTC (rev 8758)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:18+0200\n"
+"POT-Creation-Date: 2013-04-16 17:32+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"
@@ -4035,9 +4035,6 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-msgid "Access Restrictions"
-msgstr ""
-
 msgid "Convert cached_html"
 msgstr ""
 
@@ -4083,9 +4080,6 @@
 msgid "Converted successfully %d pages"
 msgstr ""
 
-msgid "Sorry. Access Restrictions not yet implemented"
-msgstr ""
-
 msgid "E-mail"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2013-04-16 15:31:08 UTC (rev 8757)
+++ trunk/locale/po/phpwiki.pot	2013-04-16 15:32:54 UTC (rev 8758)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:18+0200\n"
+"POT-Creation-Date: 2013-04-16 17:32+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"
@@ -4024,9 +4024,6 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-msgid "Access Restrictions"
-msgstr ""
-
 msgid "Convert cached_html"
 msgstr ""
 
@@ -4072,9 +4069,6 @@
 msgid "Converted successfully %d pages"
 msgstr ""
 
-msgid "Sorry. Access Restrictions not yet implemented"
-msgstr ""
-
 msgid "E-mail"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2013-04-16 15:31:08 UTC (rev 8757)
+++ trunk/locale/po/sv.po	2013-04-16 15:32:54 UTC (rev 8758)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:18+0200\n"
+"POT-Creation-Date: 2013-04-16 17:32+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -4027,9 +4027,6 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-msgid "Access Restrictions"
-msgstr ""
-
 msgid "Convert cached_html"
 msgstr ""
 
@@ -4075,9 +4072,6 @@
 msgid "Converted successfully %d pages"
 msgstr ""
 
-msgid "Sorry. Access Restrictions not yet implemented"
-msgstr ""
-
 msgid "E-mail"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2013-04-16 15:31:08 UTC (rev 8757)
+++ trunk/locale/po/zh.po	2013-04-16 15:32:54 UTC (rev 8758)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:18+0200\n"
+"POT-Creation-Date: 2013-04-16 17:32+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -4298,9 +4298,6 @@
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-msgid "Access Restrictions"
-msgstr ""
-
 msgid "Convert cached_html"
 msgstr ""
 
@@ -4348,9 +4345,6 @@
 msgid "Converted successfully %d pages"
 msgstr "檔案已經成功地上傳."
 
-msgid "Sorry. Access Restrictions not yet implemented"
-msgstr "抱歉. 存取限制尚未被實作."
-
 msgid "E-mail"
 msgstr "E-mail"
 
@@ -6334,6 +6328,9 @@
 msgid "Edit this page"
 msgstr "編輯此頁面"
 
+#~ msgid "Sorry. Access Restrictions not yet implemented"
+#~ msgstr "抱歉. 存取限制尚未被實作."
+
 #~ msgid "SteveWainstead"
 #~ msgstr "SteveWainstead"
 

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

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

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/zh/LC_MESSAGES/phpwiki.php	2013-04-16 15:31:08 UTC (rev 8757)
+++ trunk/locale/zh/LC_MESSAGES/phpwiki.php	2013-04-16 15:32:54 UTC (rev 8758)
@@ -503,7 +503,6 @@
 $locale["Sorry! You must wait at least 20 minutes until you can vote again!"] = "抱歉! 你必須等至少 20 分鐘才能在投票!";
 $locale["Sorry, no dynamic DB Session support."] = "抱歉,無動態 DB Session 支援.";
 $locale["Sorry, this version of PHP cannot create PNG image files."] = "抱歉, 這個版本的 PHP 無法建立 PNG 圖片檔.";
-$locale["Sorry. Access Restrictions not yet implemented"] = "抱歉. 存取限制尚未被實作.";
 $locale["Sort by %s"] = "以 %s 排序";
 $locale["Sound Score"] = "音節得分";
 $locale["Spelling Score"] = "拼字得分";

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8757] trunk/lib/plugin/AnalyseAccessLogSql.php

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

Revision: 8757
          http://sourceforge.net/p/phpwiki/code/8757
Author:   vargenau
Date:     2013-04-16 15:31:08 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
No underscore for private functions

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

Modified: trunk/lib/plugin/AnalyseAccessLogSql.php
===================================================================
--- trunk/lib/plugin/AnalyseAccessLogSql.php	2013-04-16 15:18:12 UTC (rev 8756)
+++ trunk/lib/plugin/AnalyseAccessLogSql.php	2013-04-16 15:31:08 UTC (rev 8757)
@@ -24,7 +24,7 @@
  * access log. This information may be sensitive and so is limited to
  * administrator access only.
  *
- * To add a new query, see _getQueryString()
+ * To add a new query, see getQueryString()
  */
 class WikiPlugin_AnalyseAccessLogSql
     extends WikiPlugin
@@ -53,11 +53,11 @@
      *          ."WHERE referer IS NOT NULL "
      *          .$where_conditions
      */
-    private function _getQueryString(&$args)
+    private function getQueryString(&$args)
     {
         // extract any parametrised conditions from the arguments,
         // in particular, how much history to select
-        $where_conditions = $this->_getWhereConditions($args);
+        $where_conditions = $this->getWhereConditions($args);
 
         // get the correct name for the table
         //FIXME is there a more correct way to do this?
@@ -90,7 +90,7 @@
                 break;
             case 'external_referers':
                 $args['local_referrers'] = 'false';
-                $where_conditions = $this->_getWhereConditions($args);
+                $where_conditions = $this->getWhereConditions($args);
                 if ($where_conditions <> '')
                     $where_conditions = 'WHERE ' . $where_conditions . ' ';
                 $query = "SELECT "
@@ -224,7 +224,7 @@
 
     /** Honeypot for xgettext. Those strings are translated dynamically.
      */
-    private function _locale_dummy()
+    private function locale_dummy()
     {
         $dummy = array(
             // mode caption
@@ -279,13 +279,13 @@
         if (!ACCESS_LOG_SQL) // need read access
             return HTML::p(_("The SQL_ACCESS_LOG is not enabled."));
 
-        // set aside a place for the table headers, see _setHeaders()
+        // set aside a place for the table headers, see setHeaders()
         $this->_theadrow = HTML::tr();
         $this->_headerSet = false;
 
         $args = $this->getArgs($argstr, $request);
 
-        $query = $this->_getQueryString($args);
+        $query = $this->getQueryString($args);
 
         if ($query == '')
             return HTML::p(sprintf(_("Unrecognised parameter 'mode=%s'"),
@@ -294,17 +294,17 @@
         // get the data back.
         // Note that this must be done before the final generation ofthe table,
         // otherwise the headers will not be ready
-        $tbody = $this->_getQueryResults($query, $dbi);
+        $tbody = $this->getQueryResults($query, $dbi);
 
         return HTML::table(array('border' => 1,
                 'cellspacing' => 1,
                 'cellpadding' => 1),
-            HTML::caption(HTML::h1(HTML::br(), $this->_getCaption($args))),
+            HTML::caption(HTML::h1(HTML::br(), $this->getCaption($args))),
             HTML::thead($this->_theadrow),
             $tbody);
     }
 
-    private function _getQueryResults($query, &$dbi)
+    private function getQueryResults($query, &$dbi)
     {
         $queryResult = $dbi->genericSqlIter($query);
         if (!$queryResult) {
@@ -312,7 +312,7 @@
         } else {
             $tbody = HTML::tbody();
             while ($row = $queryResult->next()) {
-                $this->_setHeaders($row);
+                $this->setHeaders($row);
                 $tr = HTML::tr();
                 foreach ($row as $value) {
                     // output a '-' for empty values, otherwise the table looks strange
@@ -325,7 +325,7 @@
         return $tbody;
     }
 
-    private function _setHeaders($row)
+    private function setHeaders($row)
     {
         if (!$this->_headerSet) {
             foreach ($row as $key => $value) {
@@ -335,7 +335,7 @@
         }
     }
 
-    private function _getWhereConditions(&$args)
+    private function getWhereConditions(&$args)
     {
         $where_conditions = '';
 
@@ -389,7 +389,7 @@
         return $where_conditions;
     }
 
-    private function _getCaption(&$args)
+    private function getCaption(&$args)
     {
         $caption = $args['caption'];
         if ($caption == '')

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

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

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

Revision: 8756
          http://sourceforge.net/p/phpwiki/code/8756
Author:   vargenau
Date:     2013-04-16 15:18:12 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
access-restrictions are not implemented

Modified Paths:
--------------
    trunk/TODO
    trunk/lib/plugin/WikiAdminUtils.php
    trunk/locale/de/pgsrc/PhpWikiSystemverwalten
    trunk/locale/fr/pgsrc/AdministrationDePhpWiki
    trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki
    trunk/pgsrc/Help%2FWikiAdminUtilsPlugin
    trunk/pgsrc/PhpWikiAdministration

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2013-04-16 14:57:15 UTC (rev 8755)
+++ trunk/TODO	2013-04-16 15:18:12 UTC (rev 8756)
@@ -88,7 +88,6 @@
 * plugin\SearchHighlight
 * logfile stuff:
 *   plugin\RecentReferrers
-*   WikiAccessRestrictions
 * SpamAssassinIntegration
 
 already done lately:

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2013-04-16 14:57:15 UTC (rev 8755)
+++ trunk/lib/plugin/WikiAdminUtils.php	2013-04-16 15:18:12 UTC (rev 8756)
@@ -26,7 +26,6 @@
 purge-cache
 purge-bad-pagenames
 purge-empty-pages
-access-restrictions
 email-verification
 convert-cached-html
 db-check
@@ -116,7 +115,6 @@
         $labels = array('purge-cache' => _("Purge Markup Cache"),
             'purge-bad-pagenames' => _("Purge all Pages With Invalid Names"),
             'purge-empty-pages' => _("Purge all empty, unreferenced Pages"),
-            'access-restrictions' => _("Access Restrictions"),
             'email-verification' => _("E-mail address confirmation"),
             'convert-cached-html' => _("Convert cached_html"),
             'db-check' => _("DB Check"),
@@ -231,13 +229,6 @@
         return $dbh->_backend->rebuild($args);
     }
 
-    //TODO: We need a separate plugin for this.
-    //      Too many options.
-    private function _do_access_restrictions(&$request, &$args)
-    {
-        return _("Sorry. Access Restrictions not yet implemented");
-    }
-
     // pagelist with enable/disable button
     private function _do_email_verification(&$request, &$args)
     {

Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten	2013-04-16 14:57:15 UTC (rev 8755)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten	2013-04-16 15:18:12 UTC (rev 8756)
@@ -1,4 +1,4 @@
-Date: Mon,  4 Feb 2013 10:43:14 +0000
+Date: Tue, 16 Apr 2013 17:14:25 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiSystemverwalten;
@@ -12,7 +12,7 @@
 nicht funktionieren.//
 
 <<CreateToc jshide||=1 with_toclink||=1 >>
-----
+
 == Seiten Explorer ==
 
 Entweder wähle zuerst die Seiten und führe dann die Aktion aus:
@@ -43,16 +43,6 @@
            label="E-Mail Verifizierung"
    >>
 
-Zugangsbeschränkungen (disabled):
-
-  To prevent from robots eating all possible ressources in a short time, blocking from certain IP's or not-well-behaving user agents can be defined below. See PhpWiki:HowToBlockRobots and MeatBall:SurgeProtector. _Note: Not yet enabled._
-
-  <<WikiAdminUtils
-           action=access-restrictions
-           label="Zugangsbeschränkungen"
-   >>
-
-----------
 == Aufräumen ==
 
 Räume die Wiki SandKiste auf. Hiermit kann man die Seite mit der
@@ -60,7 +50,6 @@
 
 [ SandKiste löschen | phpwiki:?action=loadfile&overwrite=1&source=locale/de/pgsrc/SandKiste ].
 
-----------
 == Speichern und Archivieren ==
 
 ==== Backup der PhpWiki Datenbank als ZIP Dateien
@@ -90,8 +79,6 @@
 Verzeichnis geschrieben. Beachte, dass evtl. deine Benutzerrechte dazu
 ausreichen müssen.
 
------------
-
 == Wiederherstellen ==
 
 Wenn du ein PhpWiki Backup besitzt, kannst du dieses hier wieder
@@ -127,8 +114,6 @@
 
 ;:[ Upgrade | phpwiki:HomePage?action=upgrade ]
 
------------
-
 == Daten-Format ==
 
 Momentan werden alle Seiten dateiweise als MIME (RFC:2045) E-Mail's
@@ -159,8 +144,6 @@
 Verzeichnis oder Einzeldateien als MIME E-Mail, Serialisiert oder
 einfache Textdatei.)
 
-----
-
 == Seiten als XHTML Dateien speichern ==
 
   <<WikiForm action=dumphtml>>
@@ -171,8 +154,6 @@
   Das XHTML-Verzeichnis kann auch heruntergeladen werden als eine
   **[XHTML ZIP Datei | phpwiki:?action=ziphtml]**.
 
-----
-
 == PhpWiki Internals ==
 
 These are here mostly for debugging purposes (at least, that's the

Modified: trunk/locale/fr/pgsrc/AdministrationDePhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/AdministrationDePhpWiki	2013-04-16 14:57:15 UTC (rev 8755)
+++ trunk/locale/fr/pgsrc/AdministrationDePhpWiki	2013-04-16 15:18:12 UTC (rev 8756)
@@ -1,4 +1,4 @@
-Date: Mon,  8 Apr 2013 15:13:02 +0000
+Date: Tue, 16 Apr 2013 17:14:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=AdministrationDePhpWiki;
@@ -14,7 +14,6 @@
 
 <<CreateToc jshide||=1 with_toclink||=1>>
 
-----
 == Explorateur de pages
 
 D'abord choississez une ou plusieurs pages et ensuite définissez une action :
@@ -36,14 +35,6 @@
            label="Vérification de l'email"
   >>
 
-Pour prévenir des robots occupant toutes les ressources en un court temps, bloquant depuis certaines adresses IP ou ayant un mauvais comportement, les agents utilisateurs peuvent être définis ci-dessous. Voir PhpWiki:HowToBlockRobots et MeatBall:SurgeProtector. _Note : Pas encore activé._
-
-  <<WikiAdminUtils
-           action=access-restrictions
-           label="Restrictions d'accès"
-  >>
-
-----------
 == Nettoyage
 
 Le [BacÀSable] Wiki est très simple à nettoyer. Vous pouvez ici le restaurer 
@@ -51,7 +42,6 @@
 
 [ Râtisser le BacÀSable | phpwiki:?action=loadfile&source=pgsrc/SandBox ]
 
-----------
 == Sauvegarde des pages
 
 === Récupération des fichiers
@@ -72,7 +62,6 @@
 
 La version la plus récente de chaque page sera écrite dans le répertoire, à raison d'une page par fichier. Votre serveur doit avoir le droit d'écrire dans le répertoire !
 
------------
 == Restauration
 
 Si vous avez sauvegardé un ensemble de pages de PhpWiki, vous pouvez les recharger ici. Notez que les pages dans votre base de données seront écrasées ; ainsi, si vous avez récupéré votre [PageAccueil], lorsque vous le rechargerez depuis ce formulaire, il écrasera celui qui est actuellement dans votre base de données. Si vous désirez être sélectif, effacez juste du répertoire (ou du fichier zip) les pages que vous ne voulez pas charger.
@@ -97,7 +86,6 @@
 
 ;:[ Mise à jour | phpwiki:HomePage?action=upgrade ]
 
------------
 == Format des fichiers
 
 Actuellement, les pages sont stockées, une par fichier, sous forme de messages électronique (RFC:822) MIME (RFC:2045). Le content-type utilisé est ''application/x-phpwiki'', et les métadonnées de chaque page sont codées dans les paramètres du content-type. Si le fichier contient plusieurs versions d'une page, il aura comme type ''multipart/mixed'', et contiendra plusieurs sous-parties, chacune de type ''application/x-phpwiki''. Le corps du message contient le texte de la page.
@@ -114,8 +102,6 @@
 
 Les fonctions de téléchargement et de chargement reconnaîtront automatiquement chacun de ces trois types de fichiers, et les géreront convenablement.
 
-----
-
 == Sauvegarde des pages au format xhtml
 
   <<WikiForm action=dumphtml>>
@@ -124,8 +110,6 @@
 
 La collection de fichiers XHTML peut aussi être téléchargée comme une **[XHTML ZIP Snapshot | phpwiki:?action=ziphtml]**.
 
-----
-
 == Le coeur de phpwiki
 
 Tout ceci surtout pour des débogages (au moins c'est ce que j'espère).

Modified: trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki
===================================================================
--- trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki	2013-04-16 14:57:15 UTC (rev 8755)
+++ trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki	2013-04-16 15:18:12 UTC (rev 8756)
@@ -1,4 +1,4 @@
-Date: Fri,  4 Feb 2011 16:36:44 +0000
+Date: Tue, 16 Apr 2013 17:14:15 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=AmministrazioneDiPhpWiki;
@@ -34,14 +34,6 @@
            label="Email Verification"
    >>
 
-To prevent from robots eating all possible ressources in a short time, blocking from certain IP's or not-well-behaving user agents can be defined below. See PhpWiki:HowToBlockRobots and MeatBall:SurgeProtector. _Note: Not yet enabled._
-
-  <<WikiAdminUtils
-           action=access-restrictions
-           label="Access Restrictions"
-   >>
-
-----
 == Cleanup
 
 A Wiki SandBox is very easy to clean. Here you can restore it to
@@ -49,8 +41,6 @@
 
   [Rake the SandBox|phpwiki:?action=loadfile&source=pgsrc/SandBox].
 
-----------
-
 == Making Snapshots or Backups
 
 === ZIP files of database
@@ -79,7 +69,6 @@
 directory, one page per file. Your server must have write permissions
 to the directory!
 
------------
 == Restoring
 
 If you have dumped a set of pages from PhpWiki, you can reload them
@@ -114,7 +103,6 @@
 
 ;:[ Upgrade | phpwiki:HomePage?action=upgrade ]
 
------------
 
 == Format of the files
 
@@ -143,7 +131,6 @@
 The upload and load functions will automatically recognize each of
 these three types of files, and handle them accordingly.
 
-----
 
 == Dump pages as XHTML
 
@@ -157,7 +144,6 @@
   The XHTML file collection can also be downloaded as an
   **[XHTML ZIP Snapshot | phpwiki:?action=ziphtml]**.
 
-----
 
 == Phpwiki Internals
 
@@ -195,5 +181,4 @@
            label="Exorcise WikiDB"
    >>
 
-----
 PhpWikiDocumentation

Modified: trunk/pgsrc/Help%2FWikiAdminUtilsPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminUtilsPlugin	2013-04-16 14:57:15 UTC (rev 8755)
+++ trunk/pgsrc/Help%2FWikiAdminUtilsPlugin	2013-04-16 15:18:12 UTC (rev 8756)
@@ -1,4 +1,4 @@
-Date: Fri,  7 Dec 2012 15:16:29 +0000
+Date: Tue, 16 Apr 2013 17:13:59 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiAdminUtilsPlugin;
@@ -14,7 +14,6 @@
 <<WikiAdminUtils action="purge-cache" >>
 <<WikiAdminUtils action="purge-bad-pagenames" >>
 <<WikiAdminUtils action="purge-empty-pages" >>
-<<WikiAdminUtils action="access-restrictions" >>
 <<WikiAdminUtils action="email-verification" >>
 <<WikiAdminUtils action="convert-cached-html" >>
 <<WikiAdminUtils action="db-check" >>
@@ -30,7 +29,7 @@
 ! Default value
 |-
 | **action**
-| Valid action are: "purge-cache", "purge-bad-pagenames", "purge-empty-pages", "access-restrictions", "email-verification", "convert-cached-html", "db-check" and "db-rebuild"
+| Valid action are: "purge-cache", "purge-bad-pagenames", "purge-empty-pages", "email-verification", "convert-cached-html", "db-check" and "db-rebuild"
 | //None//
 |-
 | **label**

Modified: trunk/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/pgsrc/PhpWikiAdministration	2013-04-16 14:57:15 UTC (rev 8755)
+++ trunk/pgsrc/PhpWikiAdministration	2013-04-16 15:18:12 UTC (rev 8756)
@@ -1,4 +1,4 @@
-Date: Fri,  6 Apr 2012 16:15:14 +0000
+Date: Tue, 16 Apr 2013 17:13:59 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration;
@@ -44,14 +44,6 @@
 
 <<WikiAdminUtils action=email-verification label="Email Verification">>
 
-=== Access Restrictions (disabled) ===
-
-To prevent from robots eating all possible ressources in a short time, blocking from certain IPs
-or not-well-behaving user agents can be defined below. See [[PhpWiki:HowToBlockRobots]] and
-[[MeatBall:SurgeProtector]]. //Note: Not yet enabled.//
-
-<<WikiAdminUtils action=access-restrictions label="Access Restrictions">>
-
 == Cleanup ==
 
 A Wiki SandBox is very easy to clean. Here you can restore it to

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

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

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

Revision: 8755
          http://sourceforge.net/p/phpwiki/code/8755
Author:   vargenau
Date:     2013-04-16 14:57:15 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
private --> protected

Modified Paths:
--------------
    trunk/lib/plugin/BlogArchives.php
    trunk/lib/plugin/BlogJournal.php
    trunk/lib/plugin/WikiBlog.php
    trunk/lib/plugin/WikiFormRich.php

Modified: trunk/lib/plugin/BlogArchives.php
===================================================================
--- trunk/lib/plugin/BlogArchives.php	2013-04-16 14:55:33 UTC (rev 8754)
+++ trunk/lib/plugin/BlogArchives.php	2013-04-16 14:57:15 UTC (rev 8755)
@@ -88,7 +88,7 @@
         //    unset($pagelist->_columns['pagename']);
 
         if (!empty($args['month'])) {
-            $prefix = $parent . $this->_blogPrefix('wikiblog') . SUBPAGE_SEPARATOR . $args['month'];
+            $prefix = $parent . $this->blogPrefix('wikiblog') . SUBPAGE_SEPARATOR . $args['month'];
             $pages = $dbi->titleSearch(new TextSearchQuery("^" . $prefix, true, 'posix'));
             $html = HTML::ul();
             while ($page = $pages->next()) {
@@ -98,7 +98,7 @@
                 $html->pushContent(HTML::li(WikiLink($page, 'known', $rev->get('summary'))));
             }
             if (!$args['noheader'])
-                return HTML(HTML::h3(sprintf(_("Blog Entries for %s:"), $this->_monthTitle($args['month']))),
+                return HTML(HTML::h3(sprintf(_("Blog Entries for %s:"), $this->monthTitle($args['month']))),
                     $html);
             else
                 return $html;
@@ -118,11 +118,11 @@
                 $mon = $blog['month'];
                 if (empty($months[$mon]))
                     $months[$mon] =
-                        array('title' => $this->_monthTitle($mon),
+                        array('title' => $this->monthTitle($mon),
                             'num' => 1,
                             'month' => $mon,
                             'link' => WikiURL($basepage,
-                                $this->_nonDefaultArgs(array('month' => $mon))));
+                                $this->nonDefaultArgs(array('month' => $mon))));
                 else
                     $months[$mon]['num']++;
             }

Modified: trunk/lib/plugin/BlogJournal.php
===================================================================
--- trunk/lib/plugin/BlogJournal.php	2013-04-16 14:55:33 UTC (rev 8754)
+++ trunk/lib/plugin/BlogJournal.php	2013-04-16 14:57:15 UTC (rev 8755)
@@ -79,7 +79,7 @@
         }
         $parent = (empty($args['user']) ? '' : $args['user'] . SUBPAGE_SEPARATOR);
 
-        $prefix = $base = $parent . $this->_blogPrefix('wikiblog');
+        $prefix = $base = $parent . $this->blogPrefix('wikiblog');
         if ($args['month'])
             $prefix .= (SUBPAGE_SEPARATOR . $args['month']);
         $pages = $dbi->titleSearch(new TextSearchQuery("^" . $prefix . SUBPAGE_SEPARATOR, true, 'posix'));
@@ -100,7 +100,7 @@
         if (!$i)
             return HTML(HTML::h3(_("No Blog Entries")), $html);
         if (!$args['noheader'])
-            return HTML(HTML::h3(sprintf(_("Blog Entries for %s:"), $this->_monthTitle($args['month']))),
+            return HTML(HTML::h3(sprintf(_("Blog Entries for %s:"), $this->monthTitle($args['month']))),
                 $html);
         else
             return $html;

Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php	2013-04-16 14:55:33 UTC (rev 8754)
+++ trunk/lib/plugin/WikiBlog.php	2013-04-16 14:57:15 UTC (rev 8755)
@@ -196,7 +196,7 @@
 
         $saved = false;
         if ($type != 'wikiforum')
-            $pagename = $this->_blogPrefix($type);
+            $pagename = $this->blogPrefix($type);
         else {
             $pagename = substr($summary, 0, 12);
             if (empty($pagename)) {
@@ -286,14 +286,14 @@
             if ($args['order'] == 'reverse')
                 $blogs = array_reverse($blogs);
 
-            $name = $this->_blogPrefix($type);
+            $name = $this->blogPrefix($type);
             if (!$args['noheader'])
                 $html->pushContent(HTML::h4(array('class' => "$type-heading"),
                     fmt("%s on %s:", $name, WikiLink($basepage))));
             foreach ($blogs as $rev) {
                 if (!$rev->get($type)) {
                     // Ack! this is an old-style blog with data ctime in page meta-data.
-                    $content = $this->_transformOldFormatBlog($rev, $type);
+                    $content = $this->transformOldFormatBlog($rev, $type);
                 } else {
                     $content = $rev->getTransformedContent($type);
                 }
@@ -306,7 +306,7 @@
 
     // Subpage for the basepage. All Blogs/Forum/Comment entries are
     // Subpages under this pagename, to find them faster.
-    private function _blogPrefix($type = 'wikiblog')
+    protected function blogPrefix($type = 'wikiblog')
     {
         if ($type == 'wikiblog')
             $basepage = "Blog";
@@ -317,7 +317,7 @@
         return $basepage;
     }
 
-    private function _transformOldFormatBlog($rev, $type = 'wikiblog')
+    private function transformOldFormatBlog($rev, $type = 'wikiblog')
     {
         $page = $rev->getPage();
         $metadata = array();
@@ -334,7 +334,7 @@
     {
         $prefix = (empty($basepage)
             ? ""
-            : $basepage . SUBPAGE_SEPARATOR) . $this->_blogPrefix($type);
+            : $basepage . SUBPAGE_SEPARATOR) . $this->blogPrefix($type);
         $pages = $dbi->titleSearch(new TextSearchQuery('"' . $prefix . '"', true, 'none'));
 
         $blogs = array();
@@ -370,7 +370,7 @@
     }
 
     // "2004-12" => "December 2004"
-    private function _monthTitle($month)
+    protected function monthTitle($month)
     {
         if (!$month) $month = strftime("%Y-%m");
         //list($year,$mon) = explode("-",$month);
@@ -378,7 +378,7 @@
     }
 
     // "UserName/Blog/2004-12-13/12:28:50+01:00" => array('month' => "2004-12", ...)
-    private function _blog($rev_or_page)
+    protected function _blog($rev_or_page)
     {
         $pagename = $rev_or_page->getName();
         if (preg_match("/^(.*Blog)\/(\d\d\d\d-\d\d)-(\d\d)\/(.*)/", $pagename, $m))
@@ -386,14 +386,14 @@
         return array('pagename' => $pagename,
             // page (list pages per month) or revision (list months)?
             //'title' => isa($rev_or_page,'WikiDB_PageRevision') ? $rev_or_page->get('summary') : '',
-            //'monthtitle' => $this->_monthTitle($month),
+            //'monthtitle' => $this->monthTitle($month),
             'month' => $month,
             'day' => $day,
             'time' => $time,
             'prefix' => $prefix);
     }
 
-    private function _nonDefaultArgs($args)
+    protected function nonDefaultArgs($args)
     {
         return array_diff_assoc($args, $this->getDefaultArguments());
     }

Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php	2013-04-16 14:55:33 UTC (rev 8754)
+++ trunk/lib/plugin/WikiFormRich.php	2013-04-16 14:57:15 UTC (rev 8755)
@@ -238,7 +238,7 @@
                         if (empty($input['value']) and ($s = $request->getArg($input['name'])))
                             $input['value'] = $s;
                         if (!empty($input['autocomplete']))
-                            $this->_doautocomplete($form, $inputtype, $input, $input['value']);
+                            $this->do_autocomplete($form, $inputtype, $input, $input['value']);
                         if ($nobr)
                             $form->pushContent($text, $nbsp, HTML::input($input));
                         else
@@ -252,7 +252,7 @@
                         unset($input['type']);
                         if (is_string($values)) $values = explode(",", $values);
                         if (!empty($input['autocomplete']))
-                            $this->_doautocomplete($form, $inputtype, $input, $values);
+                            $this->do_autocomplete($form, $inputtype, $input, $values);
                         $select = HTML::select($input);
                         if (empty($values) and ($s = $request->getArg($input['name']))) {
                             $select->pushContent(HTML::option(array('value' => $s), $s));
@@ -318,7 +318,7 @@
         return $form;
     }
 
-    private function _doautocomplete(&$form, $inputtype, &$input, &$values)
+    private function do_autocomplete(&$form, $inputtype, &$input, &$values)
     {
         global $request;
         $input['class'] = "dropdown";

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8754] trunk/lib/plugin/WikicreoleTable.php

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

Revision: 8754
          http://sourceforge.net/p/phpwiki/code/8754
Author:   vargenau
Date:     2013-04-16 14:55:33 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
No underscore for private parse_row function

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

Modified: trunk/lib/plugin/WikicreoleTable.php
===================================================================
--- trunk/lib/plugin/WikicreoleTable.php	2013-04-16 14:42:30 UTC (rev 8753)
+++ trunk/lib/plugin/WikicreoleTable.php	2013-04-16 14:55:33 UTC (rev 8754)
@@ -89,7 +89,7 @@
                 $line = substr($line, 0, -1);
             }
             if ($line[0] == '|') {
-                $table[] = $this->_parse_row($line);
+                $table[] = $this->parse_row($line);
             }
         }
 
@@ -135,7 +135,7 @@
         return $htmltable;
     }
 
-    private function _parse_row($line)
+    private function parse_row($line)
     {
         $brkt_link = "\\[ .*? [^]\s] .*? \\]";
         $cell_content = "(?: [^[] | " . ESCAPE_CHAR . "\\[ | $brkt_link )*?";

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

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

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

Revision: 8753
          http://sourceforge.net/p/phpwiki/code/8753
Author:   vargenau
Date:     2013-04-16 14:42:30 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
function _PageList_Column* are not private

Modified Paths:
--------------
    trunk/lib/plugin/FullTextSearch.php
    trunk/lib/plugin/LinkSearch.php
    trunk/lib/plugin/ListPages.php
    trunk/lib/plugin/SemanticSearch.php
    trunk/lib/plugin/WantedPages.php
    trunk/lib/plugin/_WikiTranslation.php

Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2013-04-16 14:40:01 UTC (rev 8752)
+++ trunk/lib/plugin/FullTextSearch.php	2013-04-16 14:42:30 UTC (rev 8753)
@@ -157,7 +157,7 @@
  */
 class _PageList_Column_hilight extends _PageList_Column
 {
-    private function _PageList_Column_WantedPages_links(&$params)
+    function _PageList_Column_WantedPages_links(&$params)
     {
         $this->parentobj =& $params[3];
         $this->_PageList_Column($params[0], $params[1], $params[2]);

Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php	2013-04-16 14:40:01 UTC (rev 8752)
+++ trunk/lib/plugin/LinkSearch.php	2013-04-16 14:42:30 UTC (rev 8753)
@@ -168,7 +168,7 @@
 class _PageList_Column_LinkSearch_link
     extends _PageList_Column
 {
-    private function _PageList_Column_LinkSearch_link($field, $heading, &$pagelist)
+    function _PageList_Column_LinkSearch_link($field, $heading, &$pagelist)
     {
         $this->_field = $field;
         $this->_heading = $heading;

Modified: trunk/lib/plugin/ListPages.php
===================================================================
--- trunk/lib/plugin/ListPages.php	2013-04-16 14:40:01 UTC (rev 8752)
+++ trunk/lib/plugin/ListPages.php	2013-04-16 14:42:30 UTC (rev 8753)
@@ -135,7 +135,7 @@
 // how many back-/forwardlinks for this page
 class _PageList_Column_ListPages_count extends _PageList_Column
 {
-    private function _PageList_Column_ListPages_count($field, $display, $backwards = false)
+    function _PageList_Column_ListPages_count($field, $display, $backwards = false)
     {
         $this->_direction = $backwards;
         return $this->_PageList_Column($field, $display, 'center');

Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php	2013-04-16 14:40:01 UTC (rev 8752)
+++ trunk/lib/plugin/SemanticSearch.php	2013-04-16 14:42:30 UTC (rev 8753)
@@ -435,7 +435,7 @@
 class _PageList_Column_SemanticSearch_relation
     extends _PageList_Column
 {
-    private function _PageList_Column_SemanticSearch_relation($field, $heading, &$pagelist)
+    function _PageList_Column_SemanticSearch_relation($field, $heading, &$pagelist)
     {
         $this->_field = $field;
         $this->_heading = $heading;

Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php	2013-04-16 14:40:01 UTC (rev 8752)
+++ trunk/lib/plugin/WantedPages.php	2013-04-16 14:42:30 UTC (rev 8753)
@@ -147,7 +147,7 @@
 // which links to the missing page
 class _PageList_Column_WantedPages_wanted extends _PageList_Column
 {
-    private function _PageList_Column_WantedPages_wanted(&$params)
+    function _PageList_Column_WantedPages_wanted(&$params)
     {
         $this->parentobj =& $params[3];
         $this->_PageList_Column($params[0], $params[1], $params[2]);
@@ -172,7 +172,7 @@
  */
 class _PageList_Column_WantedPages_links extends _PageList_Column
 {
-    private function _PageList_Column_WantedPages_links(&$params)
+    function _PageList_Column_WantedPages_links(&$params)
     {
         $this->parentobj =& $params[3];
         $this->_PageList_Column($params[0], $params[1], $params[2]);

Modified: trunk/lib/plugin/_WikiTranslation.php
===================================================================
--- trunk/lib/plugin/_WikiTranslation.php	2013-04-16 14:40:01 UTC (rev 8752)
+++ trunk/lib/plugin/_WikiTranslation.php	2013-04-16 14:42:30 UTC (rev 8753)
@@ -371,7 +371,7 @@
 
 class _PageList_Column_customlang extends _PageList_Column
 {
-    private function _PageList_Column_customlang($field, $from_lang, $plugin)
+    function _PageList_Column_customlang($field, $from_lang, $plugin)
     {
         $this->_field = $field;
         $this->_from_lang = $from_lang;

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

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

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

Revision: 8752
          http://sourceforge.net/p/phpwiki/code/8752
Author:   vargenau
Date:     2013-04-16 14:40:01 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
function _getValue is not private

Modified Paths:
--------------
    trunk/lib/plugin/BackLinks.php
    trunk/lib/plugin/FullTextSearch.php
    trunk/lib/plugin/LinkDatabase.php
    trunk/lib/plugin/LinkSearch.php
    trunk/lib/plugin/ListPages.php
    trunk/lib/plugin/ListSubpages.php
    trunk/lib/plugin/SemanticSearch.php
    trunk/lib/plugin/WantedPages.php
    trunk/lib/plugin/WikiAdminRemove.php
    trunk/lib/plugin/WikiAdminRename.php
    trunk/lib/plugin/WikiAdminUtils.php
    trunk/lib/plugin/_WikiTranslation.php

Modified: trunk/lib/plugin/BackLinks.php
===================================================================
--- trunk/lib/plugin/BackLinks.php	2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/BackLinks.php	2013-04-16 14:40:01 UTC (rev 8752)
@@ -179,7 +179,7 @@
 // how many links from this backLink to other pages
 class _PageList_Column_BackLinks_count extends _PageList_Column
 {
-    private function _getValue($page, &$revision_handle)
+    function _getValue($page, &$revision_handle)
     {
         $iter = $page->getPageLinks();
         $count = $iter->count();

Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/FullTextSearch.php	2013-04-16 14:40:01 UTC (rev 8752)
@@ -163,7 +163,7 @@
         $this->_PageList_Column($params[0], $params[1], $params[2]);
     }
 
-    private function _getValue(&$page, $revision_handle)
+    function _getValue(&$page, $revision_handle)
     {
         $pagename = $page->getName();
         $count = count($this->parentobj->_wpagelist[$pagename]);

Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php	2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/LinkDatabase.php	2013-04-16 14:40:01 UTC (rev 8752)
@@ -188,7 +188,7 @@
 
 class _PageList_Column_LinkDatabase_links extends _PageList_Column
 {
-    private function _getValue($page, &$revision_handle)
+    function _getValue($page, &$revision_handle)
     {
         $out = HTML();
         $links = $page->getPageLinks();

Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php	2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/LinkSearch.php	2013-04-16 14:40:01 UTC (rev 8752)
@@ -177,7 +177,7 @@
         $this->_pagelist =& $pagelist;
     }
 
-    private function _getValue(&$page, $revision_handle)
+    function _getValue(&$page, $revision_handle)
     {
         if (is_object($page)) $text = $page->getName();
         else $text = $page;

Modified: trunk/lib/plugin/ListPages.php
===================================================================
--- trunk/lib/plugin/ListPages.php	2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/ListPages.php	2013-04-16 14:40:01 UTC (rev 8752)
@@ -141,7 +141,7 @@
         return $this->_PageList_Column($field, $display, 'center');
     }
 
-    private function _getValue($page, &$revision_handle)
+    function _getValue($page, &$revision_handle)
     {
         $iter = $page->getLinks($this->_direction);
         $count = $iter->count();

Modified: trunk/lib/plugin/ListSubpages.php
===================================================================
--- trunk/lib/plugin/ListSubpages.php	2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/ListSubpages.php	2013-04-16 14:40:01 UTC (rev 8752)
@@ -116,7 +116,7 @@
 // how many backlinks for this subpage
 class _PageList_Column_ListSubpages_count extends _PageList_Column
 {
-    private function _getValue($page, &$revision_handle)
+    function _getValue($page, &$revision_handle)
     {
         $iter = $page->getBackLinks();
         $count = $iter->count();

Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php	2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/SemanticSearch.php	2013-04-16 14:40:01 UTC (rev 8752)
@@ -444,7 +444,7 @@
         $this->_pagelist =& $pagelist;
     }
 
-    private function _getValue(&$page, $revision_handle)
+    function _getValue(&$page, $revision_handle)
     {
         $link = $this->_pagelist->_links[$this->current_row];
         return WikiLink($link['linkname'], 'if_known');
@@ -454,7 +454,7 @@
 class _PageList_Column_SemanticSearch_link
     extends _PageList_Column_SemanticSearch_relation
 {
-    private function _getValue(&$page, $revision_handle)
+    function _getValue(&$page, $revision_handle)
     {
         $link = $this->_pagelist->_links[$this->current_row];
         if ($this->_field != 'value')

Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php	2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/WantedPages.php	2013-04-16 14:40:01 UTC (rev 8752)
@@ -153,7 +153,7 @@
         $this->_PageList_Column($params[0], $params[1], $params[2]);
     }
 
-    private function _getValue(&$page, $revision_handle)
+    function _getValue(&$page, $revision_handle)
     {
         $html = false;
         $pagename = $page->getName();
@@ -178,7 +178,7 @@
         $this->_PageList_Column($params[0], $params[1], $params[2]);
     }
 
-    private function _getValue(&$page, $revision_handle)
+    function _getValue(&$page, $revision_handle)
     {
         $pagename = $page->getName();
         $count = count($this->parentobj->_wpagelist[$pagename]);

Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php	2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/WikiAdminRemove.php	2013-04-16 14:40:01 UTC (rev 8752)
@@ -241,7 +241,7 @@
 
 class _PageList_Column_remove extends _PageList_Column
 {
-    private function _getValue($page_handle, &$revision_handle)
+    function _getValue($page_handle, &$revision_handle)
     {
         return Button(array('action' => 'remove'), _("Remove"),
             $page_handle->getName());

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/WikiAdminRename.php	2013-04-16 14:40:01 UTC (rev 8752)
@@ -310,7 +310,7 @@
 // moved from lib/PageList.php
 class _PageList_Column_renamed_pagename extends _PageList_Column
 {
-    private function _getValue($page_handle, &$revision_handle)
+    function _getValue($page_handle, &$revision_handle)
     {
         global $request;
         $post_args = $request->getArg('admin_rename');

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/WikiAdminUtils.php	2013-04-16 14:40:01 UTC (rev 8752)
@@ -316,7 +316,7 @@
 class _PageList_Column_email
     extends _PageList_Column
 {
-    private function _getValue(&$prefs, $dummy)
+    function _getValue(&$prefs, $dummy)
     {
         return $prefs->get('email');
     }
@@ -325,7 +325,7 @@
 class _PageList_Column_emailVerified
     extends _PageList_Column
 {
-    private function _getValue(&$prefs, $status)
+    function _getValue(&$prefs, $status)
     {
         $name = $prefs->get('userid');
         $input = HTML::input(array('type' => 'checkbox',

Modified: trunk/lib/plugin/_WikiTranslation.php
===================================================================
--- trunk/lib/plugin/_WikiTranslation.php	2013-04-16 14:38:58 UTC (rev 8751)
+++ trunk/lib/plugin/_WikiTranslation.php	2013-04-16 14:40:01 UTC (rev 8752)
@@ -387,7 +387,7 @@
         $this->_PageList_Column_base($this->_field);
     }
 
-    private function _getValue($page, &$revision_handle)
+    function _getValue($page, &$revision_handle)
     {
         if (is_object($page)) $text = $page->getName();
         else $text = $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:[8751] trunk/lib/plugin/CreateToc.php

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

Revision: 8751
          http://sourceforge.net/p/phpwiki/code/8751
Author:   vargenau
Date:     2013-04-16 14:38:58 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
More private functions

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

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2013-04-16 14:29:36 UTC (rev 8750)
+++ trunk/lib/plugin/CreateToc.php	2013-04-16 14:38:58 UTC (rev 8751)
@@ -176,7 +176,7 @@
      * @param $hstart id (in $content) of heading start
      * @param $hend   id (in $content) of heading end
      */
-    function searchHeader($content, $start_index, $heading,
+    private function searchHeader($content, $start_index, $heading,
                           $level, &$hstart, &$hend, $basepage = false)
     {
         $hstart = 0;
@@ -254,7 +254,7 @@
     // We must omit lines starting with "!" if inside a Mediawiki table
     // (they represent a table header)
     // Feature request: proper nesting; multiple levels (e.g. 1,3)
-    function extractHeaders(&$content, &$markup, $backlink = 0,
+    private function extractHeaders(&$content, &$markup, $backlink = 0,
                             $counter = 0, $levels = false, $firstlevelstyle = 'number', $basepage = '')
     {
         if (!$levels) $levels = array(1, 2);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8750] trunk/lib/plugin/CreateToc.php

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

Revision: 8750
          http://sourceforge.net/p/phpwiki/code/8750
Author:   vargenau
Date:     2013-04-16 14:29:36 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
Remove underscore for private functions

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

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2013-04-16 14:17:35 UTC (rev 8749)
+++ trunk/lib/plugin/CreateToc.php	2013-04-16 14:29:36 UTC (rev 8750)
@@ -72,14 +72,14 @@
     }
 
     // Initialisation of toc counter
-    private function _initTocCounter()
+    private function initTocCounter()
     {
         $counter = array(1 => 0, 2 => 0, 3 => 0, 4 => 0, 5 => 0);
         return $counter;
     }
 
     // Update toc counter with a new title
-    private function _tocCounter(&$counter, $level)
+    private function tocCounter(&$counter, $level)
     {
         $counter[$level]++;
         for ($i = $level + 1; $i <= 5; $i++) {
@@ -87,7 +87,7 @@
         }
     }
 
-    private function _roman_counter($number)
+    private function roman_counter($number)
     {
 
         $n = intval($number);
@@ -104,7 +104,7 @@
         return $result;
     }
 
-    private function _letter_counter($number)
+    private function letter_counter($number)
     {
         if ($number <= 26) {
             return chr(ord("A") + $number - 1);
@@ -114,12 +114,12 @@
     }
 
     // Get string corresponding to the current title
-    private function _getCounter(&$counter, $level, $firstlevelstyle)
+    private function getCounter(&$counter, $level, $firstlevelstyle)
     {
         if ($firstlevelstyle == 'roman') {
-            $str = $this->_roman_counter($counter[1]);
+            $str = $this->roman_counter($counter[1]);
         } elseif ($firstlevelstyle == 'letter') {
-            $str = $this->_letter_counter($counter[1]);
+            $str = $this->letter_counter($counter[1]);
         } else {
             $str = $counter[1];
         }
@@ -131,7 +131,7 @@
     }
 
     // Get HTML header corresponding to current level (level is set of ! or =)
-    private function _getHeader($level)
+    private function getHeader($level)
     {
 
         $count = substr_count($level, '!');
@@ -159,7 +159,7 @@
         return "";
     }
 
-    private function _quote($heading)
+    private function quote($heading)
     {
         if (TOC_FULL_SYNTAX) {
             $theading = TransformInline($heading);
@@ -181,8 +181,8 @@
     {
         $hstart = 0;
         $hend = 0;
-        $h = $this->_getHeader($level);
-        $qheading = $this->_quote($heading);
+        $h = $this->getHeader($level);
+        $qheading = $this->quote($heading);
         for ($j = $start_index; $j < count($content); $j++) {
             if (is_string($content[$j])) {
                 if (preg_match("/<$h>$qheading<\/$h>/",
@@ -234,7 +234,7 @@
     /** prevent from duplicate anchors,
      *  beautify spaces: " " => "_" and not "x20."
      */
-    private function _nextAnchor($s)
+    private function nextAnchor($s)
     {
         static $anchors = array();
 
@@ -258,7 +258,7 @@
                             $counter = 0, $levels = false, $firstlevelstyle = 'number', $basepage = '')
     {
         if (!$levels) $levels = array(1, 2);
-        $tocCounter = $this->_initTocCounter();
+        $tocCounter = $this->initTocCounter();
         reset($levels);
         sort($levels);
         $headers = array();
@@ -299,7 +299,7 @@
                     or (((strpos($trim, '!') === 0))
                         && ((preg_match('/^\s*(!{' . $phpwikiclassiclevel . ',' . $phpwikiclassiclevel . '})([^!].*)$/', $content[$i], $match))))
                 ) {
-                    $this->_tocCounter($tocCounter, $level);
+                    $this->tocCounter($tocCounter, $level);
                     if (!strstr($content[$i], '#[')) {
                         $s = trim($match[2]);
                         // If it is Wikicreole syntax, remove '='s at the end
@@ -307,11 +307,11 @@
                             $s = trim($s, "=");
                             $s = trim($s);
                         }
-                        $anchor = $this->_nextAnchor($s);
+                        $anchor = $this->nextAnchor($s);
                         $manchor = MangleXmlIdentifier($anchor);
                         $texts = $s;
                         if ($counter) {
-                            $texts = $this->_getCounter($tocCounter, $level, $firstlevelstyle) . ' ' . $s;
+                            $texts = $this->getCounter($tocCounter, $level, $firstlevelstyle) . ' ' . $s;
                         }
                         $headers[] = array('text' => $texts,
                             'anchor' => $anchor,
@@ -328,9 +328,9 @@
                             $markup->_basepage);
                         if ($j and isset($markup->_content[$j])) {
                             $x = $markup->_content[$j];
-                            $qheading = $this->_quote($s);
+                            $qheading = $this->quote($s);
                             if ($counter)
-                                $counterString = $this->_getCounter($tocCounter, $level, $firstlevelstyle);
+                                $counterString = $this->getCounter($tocCounter, $level, $firstlevelstyle);
                             if (($hstart === 0) && is_string($markup->_content[$j])) {
                                 if ($backlink) {
                                     if ($counter)
@@ -354,7 +354,7 @@
                                 }
                             } else {
                                 $x = $markup->_content[$hstart];
-                                $h = $this->_getHeader($match[1]);
+                                $h = $this->getHeader($match[1]);
 
                                 if ($backlink) {
                                     if ($counter) {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8749] trunk/lib/plugin/_WikiTranslation.php

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

Revision: 8749
          http://sourceforge.net/p/phpwiki/code/8749
Author:   vargenau
Date:     2013-04-16 14:17:35 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
Reformat code

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

Modified: trunk/lib/plugin/_WikiTranslation.php
===================================================================
--- trunk/lib/plugin/_WikiTranslation.php	2013-04-16 14:03:08 UTC (rev 8748)
+++ trunk/lib/plugin/_WikiTranslation.php	2013-04-16 14:17:35 UTC (rev 8749)
@@ -86,25 +86,25 @@
         _("Help/WabiSabi") . ',' .
         _("Help/WikiBlogPlugin") . ',' .
         _("Help/WikiPlugin") . ',' .
-        _("Help/WikiWikiWeb");
-_("HomePageAlias") . ',' .
-    _("InterWiki") . ',' .
-//  _("PageDump") .','.
-    _("PhpWikiAdministration/Chmod") . ',' .
-    _("PhpWikiAdministration/Chown") . ',' .
-    _("PhpWikiAdministration/Remove") . ',' .
-    _("PhpWikiAdministration/Rename") . ',' .
-    _("PhpWikiAdministration/Replace") . ',' .
-    _("PhpWikiAdministration/SetAcl") . ',' .
-    _("PhpWikiDocumentation") . ',' .
-    _("PhpWikiPoll") . ',' .
-    _("RecentVisitors") . ',' .
-    _("ReleaseNotes") . ',' .
-//    _("SpellCheck") .','.
-    _("TranslateText") . ',' .
-    _("UpLoad") . ',' .
+        _("Help/WikiWikiWeb") . ',' .
+        _("HomePageAlias") . ',' .
+        _("InterWiki") . ',' .
+        _("PageDump") . ',' .
+        _("PhpWikiAdministration/Chmod") . ',' .
+        _("PhpWikiAdministration/Chown") . ',' .
+        _("PhpWikiAdministration/Remove") . ',' .
+        _("PhpWikiAdministration/Rename") . ',' .
+        _("PhpWikiAdministration/Replace") . ',' .
+        _("PhpWikiAdministration/SetAcl") . ',' .
+        _("PhpWikiDocumentation") . ',' .
+        _("PhpWikiPoll") . ',' .
+        _("RecentVisitors") . ',' .
+        _("ReleaseNotes") . ',' .
+        _("SpellCheck") . ',' .
+        _("TranslateText") . ',' .
+        _("UpLoad");
 
-    require_once 'lib/PageList.php';
+require_once 'lib/PageList.php';
 
 class WikiPlugin__WikiTranslation
     extends WikiPlugin

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

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

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

Revision: 8748
          http://sourceforge.net/p/phpwiki/code/8748
Author:   vargenau
Date:     2013-04-16 14:03:08 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
Add private keyword for functions

Modified Paths:
--------------
    trunk/lib/plugin/AnalyseAccessLogSql.php
    trunk/lib/plugin/AppendText.php
    trunk/lib/plugin/BackLinks.php
    trunk/lib/plugin/Calendar.php
    trunk/lib/plugin/CalendarList.php
    trunk/lib/plugin/CreateToc.php
    trunk/lib/plugin/EditMetaData.php
    trunk/lib/plugin/ExternalSearch.php
    trunk/lib/plugin/FileInfo.php
    trunk/lib/plugin/FoafViewer.php
    trunk/lib/plugin/FullTextSearch.php
    trunk/lib/plugin/FuzzyPages.php
    trunk/lib/plugin/GraphViz.php
    trunk/lib/plugin/HtmlConverter.php
    trunk/lib/plugin/InterWikiSearch.php
    trunk/lib/plugin/LikePages.php
    trunk/lib/plugin/LinkDatabase.php
    trunk/lib/plugin/LinkSearch.php
    trunk/lib/plugin/ListPages.php
    trunk/lib/plugin/ListSubpages.php
    trunk/lib/plugin/ModeratedPage.php
    trunk/lib/plugin/OldStyleTable.php
    trunk/lib/plugin/PageHistory.php
    trunk/lib/plugin/PluginManager.php
    trunk/lib/plugin/RateIt.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/plugin/SemanticSearch.php
    trunk/lib/plugin/SyncWiki.php
    trunk/lib/plugin/SystemInfo.php
    trunk/lib/plugin/Transclude.php
    trunk/lib/plugin/WantedPages.php
    trunk/lib/plugin/WantedPagesOld.php
    trunk/lib/plugin/WikiAdminRemove.php
    trunk/lib/plugin/WikiAdminRename.php
    trunk/lib/plugin/WikiAdminSelect.php
    trunk/lib/plugin/WikiAdminUtils.php
    trunk/lib/plugin/WikiBlog.php
    trunk/lib/plugin/WikiFormRich.php
    trunk/lib/plugin/WikicreoleTable.php
    trunk/lib/plugin/_AuthInfo.php
    trunk/lib/plugin/_BackendInfo.php
    trunk/lib/plugin/_Retransform.php
    trunk/lib/plugin/_WikiTranslation.php

Modified: trunk/lib/plugin/AnalyseAccessLogSql.php
===================================================================
--- trunk/lib/plugin/AnalyseAccessLogSql.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/AnalyseAccessLogSql.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -53,7 +53,7 @@
      *          ."WHERE referer IS NOT NULL "
      *          .$where_conditions
      */
-    function _getQueryString(&$args)
+    private function _getQueryString(&$args)
     {
         // extract any parametrised conditions from the arguments,
         // in particular, how much history to select
@@ -224,7 +224,7 @@
 
     /** Honeypot for xgettext. Those strings are translated dynamically.
      */
-    function _locale_dummy()
+    private function _locale_dummy()
     {
         $dummy = array(
             // mode caption
@@ -304,7 +304,7 @@
             $tbody);
     }
 
-    function _getQueryResults($query, &$dbi)
+    private function _getQueryResults($query, &$dbi)
     {
         $queryResult = $dbi->genericSqlIter($query);
         if (!$queryResult) {
@@ -325,7 +325,7 @@
         return $tbody;
     }
 
-    function _setHeaders($row)
+    private function _setHeaders($row)
     {
         if (!$this->_headerSet) {
             foreach ($row as $key => $value) {
@@ -335,7 +335,7 @@
         }
     }
 
-    function _getWhereConditions(&$args)
+    private function _getWhereConditions(&$args)
     {
         $where_conditions = '';
 
@@ -389,7 +389,7 @@
         return $where_conditions;
     }
 
-    function _getCaption(&$args)
+    private function _getCaption(&$args)
     {
         $caption = $args['caption'];
         if ($caption == '')

Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/AppendText.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -54,7 +54,7 @@
         );
     }
 
-    function _fallback($addtext, $oldtext, $notfound, &$message)
+    private function _fallback($addtext, $oldtext, $notfound, &$message)
     {
         $message->pushContent(sprintf(_("%s not found"), $notfound) . ". " .
             _("Appending at the end.") . "\n");
@@ -78,7 +78,7 @@
         }
     }
 
-    function _work($pagename, $args, $dbi, &$request)
+    private function _work($pagename, $args, $dbi, &$request)
     {
         if (empty($args['s'])) {
             if ($request->isPost()) {

Modified: trunk/lib/plugin/BackLinks.php
===================================================================
--- trunk/lib/plugin/BackLinks.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/BackLinks.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -179,7 +179,7 @@
 // how many links from this backLink to other pages
 class _PageList_Column_BackLinks_count extends _PageList_Column
 {
-    function _getValue($page, &$revision_handle)
+    private function _getValue($page, &$revision_handle)
     {
         $iter = $page->getPageLinks();
         $count = $iter->count();

Modified: trunk/lib/plugin/Calendar.php
===================================================================
--- trunk/lib/plugin/Calendar.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/Calendar.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -76,7 +76,7 @@
         }
     }
 
-    function __header($pagename, $time)
+    private function __header($pagename, $time)
     {
         $args = &$this->args;
 
@@ -111,7 +111,7 @@
                 $row)));
     }
 
-    function __daynames($start_wday)
+    private function __daynames($start_wday)
     {
         $time = mktime(12, 0, 0, 1, 1, 2001);
         $t = localtime($time, 1);
@@ -136,7 +136,7 @@
         return $row;
     }
 
-    function __date($dbi, $time)
+    private function __date($dbi, $time)
     {
         $args = &$this->args;
 

Modified: trunk/lib/plugin/CalendarList.php
===================================================================
--- trunk/lib/plugin/CalendarList.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/CalendarList.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -97,7 +97,7 @@
         }
     }
 
-    function _count_events($dbi, $n = 7, $direction = 1)
+    private function _count_events($dbi, $n = 7, $direction = 1)
     {
         //        This is used by the last_n/next_n options to determine the date that
         //        accounts for the number of N events in the past/future.
@@ -120,7 +120,7 @@
         return $timeTMP;
     }
 
-    function _date($dbi, $time)
+    private function _date($dbi, $time)
     {
         $args = &$this->args;
         $date_string = strftime($args['date_format'], $time);

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/CreateToc.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -72,14 +72,14 @@
     }
 
     // Initialisation of toc counter
-    function _initTocCounter()
+    private function _initTocCounter()
     {
         $counter = array(1 => 0, 2 => 0, 3 => 0, 4 => 0, 5 => 0);
         return $counter;
     }
 
     // Update toc counter with a new title
-    function _tocCounter(&$counter, $level)
+    private function _tocCounter(&$counter, $level)
     {
         $counter[$level]++;
         for ($i = $level + 1; $i <= 5; $i++) {
@@ -87,7 +87,7 @@
         }
     }
 
-    function _roman_counter($number)
+    private function _roman_counter($number)
     {
 
         $n = intval($number);
@@ -104,7 +104,7 @@
         return $result;
     }
 
-    function _letter_counter($number)
+    private function _letter_counter($number)
     {
         if ($number <= 26) {
             return chr(ord("A") + $number - 1);
@@ -114,7 +114,7 @@
     }
 
     // Get string corresponding to the current title
-    function _getCounter(&$counter, $level, $firstlevelstyle)
+    private function _getCounter(&$counter, $level, $firstlevelstyle)
     {
         if ($firstlevelstyle == 'roman') {
             $str = $this->_roman_counter($counter[1]);
@@ -131,7 +131,7 @@
     }
 
     // Get HTML header corresponding to current level (level is set of ! or =)
-    function _getHeader($level)
+    private function _getHeader($level)
     {
 
         $count = substr_count($level, '!');
@@ -159,7 +159,7 @@
         return "";
     }
 
-    function _quote($heading)
+    private function _quote($heading)
     {
         if (TOC_FULL_SYNTAX) {
             $theading = TransformInline($heading);
@@ -234,7 +234,7 @@
     /** prevent from duplicate anchors,
      *  beautify spaces: " " => "_" and not "x20."
      */
-    function _nextAnchor($s)
+    private function _nextAnchor($s)
     {
         static $anchors = array();
 

Modified: trunk/lib/plugin/EditMetaData.php
===================================================================
--- trunk/lib/plugin/EditMetaData.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/EditMetaData.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -163,7 +163,7 @@
         return $html;
     }
 
-    function _showvalue($key, $val, $prefix = '')
+    private function _showvalue($key, $val, $prefix = '')
     {
         if (is_array($val) or is_object($val)) return $val;
         if (in_array($key, $this->hidden_pagemeta)) return '';

Modified: trunk/lib/plugin/ExternalSearch.php
===================================================================
--- trunk/lib/plugin/ExternalSearch.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/ExternalSearch.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -47,7 +47,7 @@
         //fixme: better description
     }
 
-    function _getInterWikiUrl(&$request)
+    private function _getInterWikiUrl(&$request)
     {
         $intermap = getInterwikiMap();
         $map = $intermap->_map;

Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/FileInfo.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -197,7 +197,7 @@
         return '';
     }
 
-    function _formatsize($n, $factor, $suffix = '')
+    private function _formatsize($n, $factor, $suffix = '')
     {
         if ($n > $factor) {
             $b = $n / $factor;

Modified: trunk/lib/plugin/FoafViewer.php
===================================================================
--- trunk/lib/plugin/FoafViewer.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/FoafViewer.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -57,7 +57,7 @@
 {
     // The handler is handled okay. The only problem is that it still
     // throws a fatal.
-    function _error_handler($error)
+    private function _error_handler($error)
     {
         if (strstr($error->errstr, "Failed opening required 'XML/FOAF/Parser.php'"))
             return true;

Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/FullTextSearch.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -157,13 +157,13 @@
  */
 class _PageList_Column_hilight extends _PageList_Column
 {
-    function _PageList_Column_WantedPages_links(&$params)
+    private function _PageList_Column_WantedPages_links(&$params)
     {
         $this->parentobj =& $params[3];
         $this->_PageList_Column($params[0], $params[1], $params[2]);
     }
 
-    function _getValue(&$page, $revision_handle)
+    private function _getValue(&$page, $revision_handle)
     {
         $pagename = $page->getName();
         $count = count($this->parentobj->_wpagelist[$pagename]);

Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/FuzzyPages.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -173,14 +173,14 @@
         return $this->formatTable($this->_list, $dbi);
     }
 
-    function _pushDebugHeadingTDinto(&$row)
+    private function _pushDebugHeadingTDinto(&$row)
     {
         $row->pushContent(HTML::td(_("Spelling Score")),
             HTML::td(_("Sound Score")),
             HTML::td('Metaphones'));
     }
 
-    function _pushDebugTDinto(&$row, $pagename)
+    private function _pushDebugTDinto(&$row, $pagename)
     {
         // This actually calculates everything a second time for each pagename
         // so the individual scores can be displayed separately for debugging.

Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/GraphViz.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -73,7 +73,7 @@
     extends WikiPluginCached
 {
 
-    function _mapTypes()
+    private function _mapTypes()
     {
         return array("imap", "cmapx", "ismap", "cmap");
     }

Modified: trunk/lib/plugin/HtmlConverter.php
===================================================================
--- trunk/lib/plugin/HtmlConverter.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/HtmlConverter.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -95,7 +95,7 @@
         return $result;
     }
 
-    function _processA(&$file)
+    private function _processA(&$file)
     {
 
         $file = eregi_replace(
@@ -104,7 +104,7 @@
         $file = eregi_replace("{{([-/a-zA-Z0-9._~#@%$?&=:\200-\377\(\)[:space:]]+)}}([^<]+)</a>", "[ \\2 | \\1 ]", $file);
     }
 
-    function _processIMG(&$file)
+    private function _processIMG(&$file)
     {
 
         $img_regexp = "_<img\s+src\s*=\s*\"([-/.a-zA-Z0-9\_~#@%$?&=:\200-\377\(\)\s]+)\"[^>]*>_";
@@ -112,7 +112,7 @@
         $file = preg_replace($img_regexp, "\n\n[Upload:\\1]", $file);
     }
 
-    function _processUL(&$file)
+    private function _processUL(&$file)
     {
 
         // put any <li>-Tag in a new line to indent correctly and strip trailing white space (including new-lines)
@@ -132,7 +132,7 @@
         }
     }
 
-    function _process($file_name)
+    private function _process($file_name)
     {
         $result = HTML();
         $file = file_get_contents($file_name);

Modified: trunk/lib/plugin/InterWikiSearch.php
===================================================================
--- trunk/lib/plugin/InterWikiSearch.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/InterWikiSearch.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -84,12 +84,12 @@
                 $this->_transform($this->_getFooter($text)));
         }
 
-        function _formatMap()
+        private function _formatMap()
         {
             return $this->_arrayToTable($this->_getMap(), $GLOBALS['request']);
         }
 
-        function _arrayToTable($array, &$request)
+        private function _arrayToTable($array, &$request)
         {
             $thead = HTML::thead();
             $label[0] = _("Wiki Name");

Modified: trunk/lib/plugin/LikePages.php
===================================================================
--- trunk/lib/plugin/LikePages.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/LikePages.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -110,7 +110,7 @@
         return $pagelist;
     }
 
-    function _quote($str)
+    private function _quote($str)
     {
         return "'" . str_replace("'", "''", $str) . "'";
     }

Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/LinkDatabase.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -188,7 +188,7 @@
 
 class _PageList_Column_LinkDatabase_links extends _PageList_Column
 {
-    function _getValue($page, &$revision_handle)
+    private function _getValue($page, &$revision_handle)
     {
         $out = HTML();
         $links = $page->getPageLinks();

Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/LinkSearch.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -168,7 +168,7 @@
 class _PageList_Column_LinkSearch_link
     extends _PageList_Column
 {
-    function _PageList_Column_LinkSearch_link($field, $heading, &$pagelist)
+    private function _PageList_Column_LinkSearch_link($field, $heading, &$pagelist)
     {
         $this->_field = $field;
         $this->_heading = $heading;
@@ -177,7 +177,7 @@
         $this->_pagelist =& $pagelist;
     }
 
-    function _getValue(&$page, $revision_handle)
+    private function _getValue(&$page, $revision_handle)
     {
         if (is_object($page)) $text = $page->getName();
         else $text = $page;

Modified: trunk/lib/plugin/ListPages.php
===================================================================
--- trunk/lib/plugin/ListPages.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/ListPages.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -135,13 +135,13 @@
 // how many back-/forwardlinks for this page
 class _PageList_Column_ListPages_count extends _PageList_Column
 {
-    function _PageList_Column_ListPages_count($field, $display, $backwards = false)
+    private function _PageList_Column_ListPages_count($field, $display, $backwards = false)
     {
         $this->_direction = $backwards;
         return $this->_PageList_Column($field, $display, 'center');
     }
 
-    function _getValue($page, &$revision_handle)
+    private function _getValue($page, &$revision_handle)
     {
         $iter = $page->getLinks($this->_direction);
         $count = $iter->count();

Modified: trunk/lib/plugin/ListSubpages.php
===================================================================
--- trunk/lib/plugin/ListSubpages.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/ListSubpages.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -116,7 +116,7 @@
 // how many backlinks for this subpage
 class _PageList_Column_ListSubpages_count extends _PageList_Column
 {
-    function _getValue($page, &$revision_handle)
+    private function _getValue($page, &$revision_handle)
     {
         $iter = $page->getBackLinks();
         $count = $iter->count();

Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/ModeratedPage.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -371,7 +371,7 @@
         }
     }
 
-    function _approval_form(&$request, $args, $moderation, $pass = 'approve')
+    private function _approval_form(&$request, $args, $moderation, $pass = 'approve')
     {
         $header = HTML::h3(_("Please approve or reject this request:"));
 

Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/OldStyleTable.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -118,7 +118,7 @@
         return $table;
     }
 
-    function _parse_row($line, $basepage)
+    private function _parse_row($line, $basepage)
     {
         $brkt_link = "\\[ .*? [^]\s] .*? \\]";
         $cell_content = "(?: [^[] | " . ESCAPE_CHAR . "\\[ | $brkt_link )*?";

Modified: trunk/lib/plugin/PageHistory.php
===================================================================
--- trunk/lib/plugin/PageHistory.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/PageHistory.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -25,7 +25,7 @@
 class _PageHistory_PageRevisionIter
     extends WikiDB_PageRevisionIterator
 {
-    function _PageHistory_PageRevisionIter($rev_iter, $params)
+    private function _PageHistory_PageRevisionIter($rev_iter, $params)
     {
 
         $this->_iter = $rev_iter;

Modified: trunk/lib/plugin/PluginManager.php
===================================================================
--- trunk/lib/plugin/PluginManager.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/PluginManager.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -62,12 +62,12 @@
         return $h;
     }
 
-    function _generatePageheader(&$info, &$html)
+    private function _generatePageheader(&$info, &$html)
     {
         $html->pushContent(HTML::p($this->getDescription()));
     }
 
-    function _generateColheadings(&$info, &$table)
+    private function _generateColheadings(&$info, &$table)
     {
         // table headings
         $tr = HTML::tr();
@@ -80,7 +80,7 @@
         $table->pushContent(HTML::thead($tr));
     }
 
-    function _generateTableBody(&$info, &$dbi, &$request, &$table)
+    private function _generateTableBody(&$info, &$dbi, &$request, &$table)
     {
 
         global $AllAllowedPlugins;

Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/RateIt.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -127,7 +127,7 @@
      * Take a string and quote it sufficiently to be passed as a Javascript
      * string between ''s
      */
-    function _javascript_quote_string($s)
+    private function _javascript_quote_string($s)
     {
         return str_replace("'", "\'", $s);
     }

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/RecentChanges.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -28,7 +28,7 @@
     var $_absurls = false;
     var $action = "RecentChanges";
 
-    function _RecentChanges_Formatter($rc_args)
+    private function _RecentChanges_Formatter($rc_args)
     {
         $this->_args = $rc_args;
         $this->_diffargs = array('action' => 'diff');
@@ -1515,7 +1515,7 @@
         $this->pushContent($table);
     }
 
-    function _makeDayButton($days_button, $days)
+    private function _makeDayButton($days_button, $days)
     {
         global $request;
 
@@ -1533,7 +1533,7 @@
         return ($days_button == $days) ? $selected : $unselected;
     }
 
-    function _makeUsersButton($users)
+    private function _makeUsersButton($users)
     {
         global $request;
 
@@ -1554,7 +1554,7 @@
             HTML::a(array('href' => $url, 'class' => 'wiki-rc-action'), $label));
     }
 
-    function _makePagesButton($pages)
+    private function _makePagesButton($pages)
     {
         global $request;
 
@@ -1575,7 +1575,7 @@
             HTML::a(array('href' => $url, 'class' => 'wiki-rc-action'), $label));
     }
 
-    function _makeMinorButton($minor_button, $show_minor)
+    private function _makeMinorButton($minor_button, $show_minor)
     {
         global $request;
 
@@ -1587,7 +1587,7 @@
         return ($minor_button == $show_minor) ? $selected : $unselected;
     }
 
-    function _makeShowAllButton($showall_button, $show_all)
+    private function _makeShowAllButton($showall_button, $show_all)
     {
         global $request;
 
@@ -1599,7 +1599,7 @@
         return ($showall_button == $show_all) ? $selected : $unselected;
     }
 
-    function _makeNewPagesButton($newpages_button, $only_new)
+    private function _makeNewPagesButton($newpages_button, $only_new)
     {
         global $request;
 

Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/SemanticSearch.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -435,7 +435,7 @@
 class _PageList_Column_SemanticSearch_relation
     extends _PageList_Column
 {
-    function _PageList_Column_SemanticSearch_relation($field, $heading, &$pagelist)
+    private function _PageList_Column_SemanticSearch_relation($field, $heading, &$pagelist)
     {
         $this->_field = $field;
         $this->_heading = $heading;
@@ -444,7 +444,7 @@
         $this->_pagelist =& $pagelist;
     }
 
-    function _getValue(&$page, $revision_handle)
+    private function _getValue(&$page, $revision_handle)
     {
         $link = $this->_pagelist->_links[$this->current_row];
         return WikiLink($link['linkname'], 'if_known');
@@ -454,7 +454,7 @@
 class _PageList_Column_SemanticSearch_link
     extends _PageList_Column_SemanticSearch_relation
 {
-    function _getValue(&$page, $revision_handle)
+    private function _getValue(&$page, $revision_handle)
     {
         $link = $this->_pagelist->_links[$this->current_row];
         if ($this->_field != 'value')

Modified: trunk/lib/plugin/SyncWiki.php
===================================================================
--- trunk/lib/plugin/SyncWiki.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/SyncWiki.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -87,7 +87,7 @@
         return $this->_makeButton($request, $args, $label);
     }
 
-    function _do_syncwiki(&$request, $args)
+    private function _do_syncwiki(&$request, $args)
     {
         longer_timeout(240);
 
@@ -250,7 +250,7 @@
     }
 
     /* path must have ending slash */
-    function _dir($path)
+    private function _dir($path)
     {
         $dh = @opendir($path);
         while ($filename = readdir($dh)) {
@@ -265,7 +265,7 @@
         closedir($dh);
     }
 
-    function _addConflict($what, $args, $our, $extdate = null)
+    private function _addConflict($what, $args, $our, $extdate = null)
     {
         $pagename = $our->getName();
         $meb = Button(array('action' => $args['action'],
@@ -285,7 +285,7 @@
     }
 
     // TODO: store log or checkpoint for restauration?
-    function _import($args, $our, $extdate = null)
+    private function _import($args, $our, $extdate = null)
     {
         $reaction = 'import ';
         if ($args['noimport']) return ($reaction . _("skipped"));
@@ -309,7 +309,7 @@
     }
 
     // TODO: store log or checkpoint for restauration?
-    function _export($args, $our)
+    private function _export($args, $our)
     {
         global $request;
         $reaction = 'export ';
@@ -338,7 +338,7 @@
     }
 
     // TODO: store log or checkpoint for restauration?
-    function _upload($args, $path, $timeout)
+    private function _upload($args, $path, $timeout)
     {
         $reaction = 'upload ';
         if ($args['noupload']) return ($reaction . _("skipped"));

Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/SystemInfo.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -211,7 +211,7 @@
     }
 
     // numeric array
-    function _stats($hits, $treshold = 10.0)
+    private function _stats($hits, $treshold = 10.0)
     {
         sort($hits);
         reset($hits);

Modified: trunk/lib/plugin/Transclude.php
===================================================================
--- trunk/lib/plugin/Transclude.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/Transclude.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -132,7 +132,7 @@
      *
      * @access private
      */
-    function _js()
+    private function _js()
     {
         static $seen = false;
 

Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/WantedPages.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -147,13 +147,13 @@
 // which links to the missing page
 class _PageList_Column_WantedPages_wanted extends _PageList_Column
 {
-    function _PageList_Column_WantedPages_wanted(&$params)
+    private function _PageList_Column_WantedPages_wanted(&$params)
     {
         $this->parentobj =& $params[3];
         $this->_PageList_Column($params[0], $params[1], $params[2]);
     }
 
-    function _getValue(&$page, $revision_handle)
+    private function _getValue(&$page, $revision_handle)
     {
         $html = false;
         $pagename = $page->getName();
@@ -172,13 +172,13 @@
  */
 class _PageList_Column_WantedPages_links extends _PageList_Column
 {
-    function _PageList_Column_WantedPages_links(&$params)
+    private function _PageList_Column_WantedPages_links(&$params)
     {
         $this->parentobj =& $params[3];
         $this->_PageList_Column($params[0], $params[1], $params[2]);
     }
 
-    function _getValue(&$page, $revision_handle)
+    private function _getValue(&$page, $revision_handle)
     {
         $pagename = $page->getName();
         $count = count($this->parentobj->_wpagelist[$pagename]);

Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/WantedPagesOld.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -152,7 +152,7 @@
         }
     }
 
-    function _generateTable($caption)
+    private function _generateTable($caption)
     {
 
         if (count($this->pagelist) > 0) {
@@ -187,7 +187,7 @@
         return $table;
     }
 
-    function _generateList($caption)
+    private function _generateList($caption)
     {
         $list = HTML();
         $c = count($this->pagelist);
@@ -202,7 +202,7 @@
         return $list;
     }
 
-    function _iterateLinks($page_handle, $dbi)
+    private function _iterateLinks($page_handle, $dbi)
     {
         $links_iter = $page_handle->getLinks($reversed = false);
         while ($link_handle = $links_iter->next()) {

Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/WikiAdminRemove.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -241,7 +241,7 @@
 
 class _PageList_Column_remove extends _PageList_Column
 {
-    function _getValue($page_handle, &$revision_handle)
+    private function _getValue($page_handle, &$revision_handle)
     {
         return Button(array('action' => 'remove'), _("Remove"),
             $page_handle->getName());

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/WikiAdminRename.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -310,7 +310,7 @@
 // moved from lib/PageList.php
 class _PageList_Column_renamed_pagename extends _PageList_Column
 {
-    function _getValue($page_handle, &$revision_handle)
+    private function _getValue($page_handle, &$revision_handle)
     {
         global $request;
         $post_args = $request->getArg('admin_rename');

Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/WikiAdminSelect.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -234,7 +234,7 @@
         }
     }
 
-    function _tablePush(&$table, $first, $second)
+    private function _tablePush(&$table, $first, $second)
     {
         $table->pushContent(
             HTML::tr(

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/WikiAdminUtils.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -84,7 +84,7 @@
         return $this->_makeButton($request, $args, $label);
     }
 
-    function _makeButton(&$request, $args, $label)
+    private function _makeButton(&$request, $args, $label)
     {
         $args['return_url'] = $request->getURLtoSelf();
         return HTML::form(array('action' => $request->getPostURL(),
@@ -111,7 +111,7 @@
         $alert->show(); // noreturn
     }
 
-    function _getLabel($action)
+    private function _getLabel($action)
     {
         $labels = array('purge-cache' => _("Purge Markup Cache"),
             'purge-bad-pagenames' => _("Purge all Pages With Invalid Names"),
@@ -125,7 +125,7 @@
         return @$labels[$action];
     }
 
-    function _do_purge_cache(&$request, $args)
+    private function _do_purge_cache(&$request, $args)
     {
         $dbi = $request->getDbh();
         $pages = $dbi->getAllPages('include_empty'); // Do we really want the empty ones too?
@@ -135,7 +135,7 @@
         return _("Markup cache purged!");
     }
 
-    function _do_purge_bad_pagenames(&$request, $args)
+    private function _do_purge_bad_pagenames(&$request, $args)
     {
         // FIXME: this should be moved into WikiDB::normalize() or something...
         $dbi = $request->getDbh();
@@ -163,7 +163,7 @@
     /**
      * Purge all non-referenced empty pages. Mainly those created by bad link extraction.
      */
-    function _do_purge_empty_pages(&$request, $args)
+    private function _do_purge_empty_pages(&$request, $args)
     {
         $dbi = $request->getDbh();
         $count = 0;
@@ -198,7 +198,7 @@
                     : ''));
     }
 
-    function _do_convert_cached_html(&$request, $args)
+    private function _do_convert_cached_html(&$request, $args)
     {
 
         require_once 'lib/upgrade.php';
@@ -215,7 +215,7 @@
         }
     }
 
-    function _do_db_check(&$request, $args)
+    private function _do_db_check(&$request, $args)
     {
         longer_timeout(180);
         $dbh = $request->getDbh();
@@ -223,7 +223,7 @@
         return $dbh->_backend->check($args);
     }
 
-    function _do_db_rebuild(&$request, $args)
+    private function _do_db_rebuild(&$request, $args)
     {
         longer_timeout(240);
         $dbh = $request->getDbh();
@@ -233,13 +233,13 @@
 
     //TODO: We need a separate plugin for this.
     //      Too many options.
-    function _do_access_restrictions(&$request, &$args)
+    private function _do_access_restrictions(&$request, &$args)
     {
         return _("Sorry. Access Restrictions not yet implemented");
     }
 
     // pagelist with enable/disable button
-    function _do_email_verification(&$request, &$args)
+    private function _do_email_verification(&$request, &$args)
     {
         $dbi = $request->getDbh();
         $pagelist = new PageList('pagename', 0, $args);
@@ -316,7 +316,7 @@
 class _PageList_Column_email
     extends _PageList_Column
 {
-    function _getValue(&$prefs, $dummy)
+    private function _getValue(&$prefs, $dummy)
     {
         return $prefs->get('email');
     }
@@ -325,7 +325,7 @@
 class _PageList_Column_emailVerified
     extends _PageList_Column
 {
-    function _getValue(&$prefs, $status)
+    private function _getValue(&$prefs, $status)
     {
         $name = $prefs->get('userid');
         $input = HTML::input(array('type' => 'checkbox',

Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/WikiBlog.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -306,7 +306,7 @@
 
     // Subpage for the basepage. All Blogs/Forum/Comment entries are
     // Subpages under this pagename, to find them faster.
-    function _blogPrefix($type = 'wikiblog')
+    private function _blogPrefix($type = 'wikiblog')
     {
         if ($type == 'wikiblog')
             $basepage = "Blog";
@@ -317,7 +317,7 @@
         return $basepage;
     }
 
-    function _transformOldFormatBlog($rev, $type = 'wikiblog')
+    private function _transformOldFormatBlog($rev, $type = 'wikiblog')
     {
         $page = $rev->getPage();
         $metadata = array();
@@ -370,7 +370,7 @@
     }
 
     // "2004-12" => "December 2004"
-    function _monthTitle($month)
+    private function _monthTitle($month)
     {
         if (!$month) $month = strftime("%Y-%m");
         //list($year,$mon) = explode("-",$month);
@@ -378,7 +378,7 @@
     }
 
     // "UserName/Blog/2004-12-13/12:28:50+01:00" => array('month' => "2004-12", ...)
-    function _blog($rev_or_page)
+    private function _blog($rev_or_page)
     {
         $pagename = $rev_or_page->getName();
         if (preg_match("/^(.*Blog)\/(\d\d\d\d-\d\d)-(\d\d)\/(.*)/", $pagename, $m))
@@ -393,7 +393,7 @@
             'prefix' => $prefix);
     }
 
-    function _nonDefaultArgs($args)
+    private function _nonDefaultArgs($args)
     {
         return array_diff_assoc($args, $this->getDefaultArguments());
     }

Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/WikiFormRich.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -318,7 +318,7 @@
         return $form;
     }
 
-    function _doautocomplete(&$form, $inputtype, &$input, &$values)
+    private function _doautocomplete(&$form, $inputtype, &$input, &$values)
     {
         global $request;
         $input['class'] = "dropdown";

Modified: trunk/lib/plugin/WikicreoleTable.php
===================================================================
--- trunk/lib/plugin/WikicreoleTable.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/WikicreoleTable.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -135,7 +135,7 @@
         return $htmltable;
     }
 
-    function _parse_row($line)
+    private function _parse_row($line)
     {
         $brkt_link = "\\[ .*? [^]\s] .*? \\]";
         $cell_content = "(?: [^[] | " . ESCAPE_CHAR . "\\[ | $brkt_link )*?";
@@ -158,7 +158,7 @@
      * $i and $j: indexes of cell to compute
      * $imax and $jmax: table dimensions
      */
-    function _compute_tablecell($table, $i, $j, $imax, $jmax)
+    private function _compute_tablecell($table, $i, $j, $imax, $jmax)
     {
 
         // What is implemented:

Modified: trunk/lib/plugin/_AuthInfo.php
===================================================================
--- trunk/lib/plugin/_AuthInfo.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/_AuthInfo.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -130,7 +130,7 @@
         return $html;
     }
 
-    function _showhash($heading, $hash, $depth = 0)
+    private function _showhash($heading, $hash, $depth = 0)
     {
         static $seen = array();
         static $maxdepth = 0;
@@ -189,7 +189,7 @@
         return $rows;
     }
 
-    function _buildConstHash($constants)
+    private function _buildConstHash($constants)
     {
         $hash = array();
         foreach ($constants as $c) {

Modified: trunk/lib/plugin/_BackendInfo.php
===================================================================
--- trunk/lib/plugin/_BackendInfo.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/_BackendInfo.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -108,7 +108,7 @@
      * Really should have a _fixupPagedata and _fixupVersiondata, but this works.
      * also used in plugin/EditMetaData
      */
-    function _fixupData(&$data, $prefix = '')
+    private function _fixupData(&$data, $prefix = '')
     {
         if (!is_array($data)) return;
 
@@ -167,7 +167,7 @@
     }
 
     /* also used in plugin/EditMetaData */
-    function _showhash($heading, $hash, $prefix = '')
+    private function _showhash($heading, $hash, $prefix = '')
     {
         $rows = array();
         if ($heading)
@@ -194,7 +194,7 @@
     }
 
     /* also used in plugin/EditMetaData */
-    function _showvalue($key, $val, $prefix = '')
+    private function _showvalue($key, $val, $prefix = '')
     {
         return $val ? $val : HTML::raw('&nbsp;');
     }

Modified: trunk/lib/plugin/_Retransform.php
===================================================================
--- trunk/lib/plugin/_Retransform.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/_Retransform.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -70,7 +70,7 @@
         return $html;
     }
 
-    function _DebugPrintArray(&$array)
+    private function _DebugPrintArray(&$array)
     {
         $html = HTML();
         foreach ($array as $line) {

Modified: trunk/lib/plugin/_WikiTranslation.php
===================================================================
--- trunk/lib/plugin/_WikiTranslation.php	2013-04-10 08:22:28 UTC (rev 8747)
+++ trunk/lib/plugin/_WikiTranslation.php	2013-04-16 14:03:08 UTC (rev 8748)
@@ -371,7 +371,7 @@
 
 class _PageList_Column_customlang extends _PageList_Column
 {
-    function _PageList_Column_customlang($field, $from_lang, $plugin)
+    private function _PageList_Column_customlang($field, $from_lang, $plugin)
     {
         $this->_field = $field;
         $this->_from_lang = $from_lang;
@@ -387,7 +387,7 @@
         $this->_PageList_Column_base($this->_field);
     }
 
-    function _getValue($page, &$revision_handle)
+    private function _getValue($page, &$revision_handle)
     {
         if (is_object($page)) $text = $page->getName();
         else $text = $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:[8747] trunk/g

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

Revision: 8747
          http://sourceforge.net/p/phpwiki/code/8747
Author:   vargenau
Date:     2013-04-10 08:22:28 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
Disable Toolbar for tests

Modified Paths:
--------------
    trunk/g

Modified: trunk/g
===================================================================
--- trunk/g	2013-04-10 07:39:34 UTC (rev 8746)
+++ trunk/g	2013-04-10 08:22:28 UTC (rev 8747)
@@ -54,6 +54,10 @@
 html_use_jquery();
 if (forge_get_config('use_jquery_form_navigate')) {
     use_javascript('/scripts/jquery-formnavigate/jquery.FormNavigate-min.js');
+    define('ENABLE_EDIT_TOOLBAR', true);
+} else {
+    // Disable Toolbar for tests
+    define('ENABLE_EDIT_TOOLBAR', false);
 }
 
 if (isset($group_id) && $group_id) {

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

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

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

Revision: 8746
          http://sourceforge.net/p/phpwiki/code/8746
Author:   vargenau
Date:     2013-04-10 07:39:34 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
Avoid PHP warning: Undefined variable: EDIT_TOOLBAR, /opt/acosforge-trunk/src/plugins/wiki/www/lib/Template.php when ENABLE_EDIT_TOOLBAR is false

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

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2013-04-08 14:23:40 UTC (rev 8745)
+++ trunk/lib/editpage.php	2013-04-10 07:39:34 UTC (rev 8746)
@@ -180,6 +180,8 @@
             require_once 'lib/EditToolbar.php';
             $toolbar = new EditToolbar();
             $tokens = array_merge($tokens, $toolbar->getTokens());
+        } else {
+            $tokens['EDIT_TOOLBAR'] = '';
         }
 
         return $this->output('editpage', _("Edit: %s"));

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8745] trunk/lib/plugin/PhpWeather.php

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

Revision: 8745
          http://sourceforge.net/p/phpwiki/code/8745
Author:   vargenau
Date:     2013-04-08 14:23:40 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
Use smart quotes

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

Modified: trunk/lib/plugin/PhpWeather.php
===================================================================
--- trunk/lib/plugin/PhpWeather.php	2013-04-08 14:19:07 UTC (rev 8744)
+++ trunk/lib/plugin/PhpWeather.php	2013-04-08 14:23:40 UTC (rev 8745)
@@ -110,7 +110,7 @@
             /* We check and correct the language if necessary: */
             //if (!in_array($language, array_keys($w->get_languages('text')))) {
             if (!in_array($language, array_keys(get_languages('text')))) {
-                trigger_error(sprintf(_("%s does not know about the language “%s”, using 'en' instead."),
+                trigger_error(sprintf(_("%s does not know about the language “%s”, using “en” instead."),
                         $this->getName(), $language),
                     E_USER_NOTICE);
                 $language = 'en';

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

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

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

Revision: 8744
          http://sourceforge.net/p/phpwiki/code/8744
Author:   vargenau
Date:     2013-04-08 14:19:07 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
Spelling

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/fr/LC_MESSAGES/phpwiki.php
    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/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-04-08 14:14:38 UTC (rev 8743)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-04-08 14:19:07 UTC (rev 8744)
@@ -422,7 +422,7 @@
 $locale["Failed to connect to LDAP host"] = "Impossible de se connecter au serveur LDAP ";
 $locale["Fatal PhpWiki Error"] = "Erreur fatale de PhpWiki";
 $locale["Favorite Categories"] = "Catégories populaires";
-$locale["File successfully uploaded."] = "Fichier téléchargé avec succès";
+$locale["File successfully uploaded."] = "Fichier téléchargé avec succès.";
 $locale["File “%s” not found."] = "Fichier « %s » non trouvé.";
 $locale["Files with extension %s are not allowed."] = "%s: extension interdite.";
 $locale["Find page"] = "Rechercher";
@@ -430,7 +430,7 @@
 $locale["First"] = "Premier";
 $locale["Found by "] = "Trouvé par ";
 $locale["FrameInclude"] = "InclureUnCadre";
-$locale["From english to %s: "] = "De l'anglais au %s: ";
+$locale["From english to %s: "] = "De l'anglais au %s : ";
 $locale["Full changes"] = "Changements exhaustifs";
 $locale["Full text search results for “%s”"] = "Résultats de la recherche en texte intégral de « %s »";
 $locale["FullDump"] = "SauvegardeTotale";
@@ -530,7 +530,7 @@
 $locale["Include an external web page within the body of a wiki page."] = "Inclure une page externe dans le corps de la page wiki.";
 $locale["Include recursively all linked pages starting at %s."] = "Créer une carte du site commençant à %s.";
 $locale["Include text from another wiki page."] = "Inclure le texte d'une autre page wiki.";
-$locale["Include the content of all SubPages of the current page."] = "Pour inclure le contenu de toutes les sous pages de la page actuelle.";
+$locale["Include the content of all SubPages of the current page."] = "Pour inclure le contenu de toutes les sous-pages de la page actuelle.";
 $locale["IncludePage"] = "InclureUnePage";
 $locale["IncludePages"] = "InclurePages";
 $locale["IncludeSiteMap"] = "CarteDuSite";
@@ -776,7 +776,7 @@
 $locale["Pages which have been deleted at least %s days are already checked."] = "Les pages qui ont été supprimées il y a au plus %s jours sont déjà cochées.";
 $locale["Password cannot be changed."] = "Impossible de changer le mot de passe.";
 $locale["Password updated."] = "Mot de passe mis à jour";
-$locale["Password was not changed."] = "Le mot de passe n'a pas été mis à jour";
+$locale["Password was not changed."] = "Le mot de passe n'a pas été mis à jour.";
 $locale["Password:"] = "Mot de passe :";
 $locale["Past versions of this page."] = "Versions précédentes de cette page.";
 $locale["Perform searches on InterWiki sites listed in InterWikiMap."] = "Effectuer une recherche sur les sites InterWiki contenu dans la carte InterWiki.";
@@ -1241,7 +1241,7 @@
 $locale["You must specify a directory to dump to"] = "Vous devez spécifier un répertoire pour l'archivage de la sauvegarde";
 $locale["You stored an empty password in your “%s” page."] = "Vous n'avez pas saisi de mot de passe pour la page %s.";
 $locale["Your PHP version is too old. You must have at least PHP 5.2."] = "Votre version de PHP est trop ancienne. Il faut avoir au moins PHP 5.2.";
-$locale["Your UserPreferences have been successfully reset to default."] = "Vos préférences ont été réinitialisées avec succès";
+$locale["Your UserPreferences have been successfully reset to default."] = "Vos préférences ont été réinitialisées avec succès.";
 $locale["Your WikiDB DB backend “%s” cannot be used for DbSession."] = "Votre choix « %s » de WikiDB DB ne peut pas être utilisé pour DbSession.";
 $locale["Your access permissions are only for a BogoUser."] = "Vos permissions d'acces sont celles d'un utilisateur Bogo.";
 $locale["Your are probably trying to edit/create an invalid version of this page."] = "Vous essayez probablement de modifier ou de créer une version invalide de cette page.";

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-04-08 14:14:38 UTC (rev 8743)
+++ trunk/locale/po/de.po	2013-04-08 14:19:07 UTC (rev 8744)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:13+0200\n"
+"POT-Creation-Date: 2013-04-08 16:18+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."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2013-04-08 14:14:38 UTC (rev 8743)
+++ trunk/locale/po/es.po	2013-04-08 14:19:07 UTC (rev 8744)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:13+0200\n"
+"POT-Creation-Date: 2013-04-08 16:18+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2013-04-08 14:14:38 UTC (rev 8743)
+++ trunk/locale/po/fr.po	2013-04-08 14:19:07 UTC (rev 8744)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:13+0200\n"
+"POT-Creation-Date: 2013-04-08 16:18+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."
@@ -3378,7 +3378,7 @@
 
 #, php-format
 msgid "From english to %s: "
-msgstr "De l'anglais au %s: "
+msgstr "De l'anglais au %s : "
 
 msgid "Translate"
 msgstr "Traduire"
@@ -3387,7 +3387,7 @@
 msgstr "ListeDesSousPages"
 
 msgid "Include the content of all SubPages of the current page."
-msgstr "Pour inclure le contenu de toutes les sous pages de la page actuelle."
+msgstr "Pour inclure le contenu de toutes les sous-pages de la page actuelle."
 
 #, php-format
 msgid "%s has no subpages defined."
@@ -3436,7 +3436,7 @@
 msgstr "Désolé, mais le fichier est trop gros."
 
 msgid "File successfully uploaded."
-msgstr "Fichier téléchargé avec succès"
+msgstr "Fichier téléchargé avec succès."
 
 #, php-format
 msgid "uploaded %s"
@@ -3474,7 +3474,7 @@
 "préférences ne peuvent pas être enregistrées."
 
 msgid "Your UserPreferences have been successfully reset to default."
-msgstr "Vos préférences ont été réinitialisées avec succès"
+msgstr "Vos préférences ont été réinitialisées avec succès."
 
 msgid "Do you really want to reset all your UserPreferences?"
 msgstr "Voulez-vous réellement réinitialiser toutes vos préférences ?"
@@ -3486,7 +3486,7 @@
 msgstr "Mot de passe mis à jour"
 
 msgid "Password was not changed."
-msgstr "Le mot de passe n'a pas été mis à jour"
+msgstr "Le mot de passe n'a pas été mis à jour."
 
 msgid "Password cannot be changed."
 msgstr "Impossible de changer le mot de passe."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2013-04-08 14:14:38 UTC (rev 8743)
+++ trunk/locale/po/it.po	2013-04-08 14:19:07 UTC (rev 8744)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:13+0200\n"
+"POT-Creation-Date: 2013-04-08 16:18+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"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2013-04-08 14:14:38 UTC (rev 8743)
+++ trunk/locale/po/ja.po	2013-04-08 14:19:07 UTC (rev 8744)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:13+0200\n"
+"POT-Creation-Date: 2013-04-08 16:18+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"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2013-04-08 14:14:38 UTC (rev 8743)
+++ trunk/locale/po/nl.po	2013-04-08 14:19:07 UTC (rev 8744)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:13+0200\n"
+"POT-Creation-Date: 2013-04-08 16:18+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"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2013-04-08 14:14:38 UTC (rev 8743)
+++ trunk/locale/po/phpwiki.pot	2013-04-08 14:19:07 UTC (rev 8744)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:13+0200\n"
+"POT-Creation-Date: 2013-04-08 16:18+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"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2013-04-08 14:14:38 UTC (rev 8743)
+++ trunk/locale/po/sv.po	2013-04-08 14:19:07 UTC (rev 8744)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:13+0200\n"
+"POT-Creation-Date: 2013-04-08 16:18+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2013-04-08 14:14:38 UTC (rev 8743)
+++ trunk/locale/po/zh.po	2013-04-08 14:19:07 UTC (rev 8744)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 16:13+0200\n"
+"POT-Creation-Date: 2013-04-08 16:18+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"

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

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

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

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

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

Revision: 8743
          http://sourceforge.net/p/phpwiki/code/8743
Author:   vargenau
Date:     2013-04-08 14:14:38 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
Use smart quotes

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/de/LC_MESSAGES/phpwiki.php
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.php
    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
    trunk/locale/zh/LC_MESSAGES/phpwiki.php

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

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php	2013-04-08 13:18:14 UTC (rev 8742)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2013-04-08 14:14:38 UTC (rev 8743)
@@ -41,7 +41,7 @@
 $locale["%s days"] = "%s Tagen";
 $locale["%s does not appear to be a WikiPlugin."] = "%s scheint kein Zusatzprogramm zu sein.";
 $locale["%s does not exist"] = "%s existiert nicht";
-$locale["%s does not know about the language “%s”, using 'en' instead."] = "%s weißt nichts von die Sprache »%s«, stattdessen wird 'en' angewendet.";
+$locale["%s does not know about the language “%s”, using “en” instead."] = "%s weißt nichts von die Sprache »%s«, stattdessen wird 'en' angewendet.";
 $locale["%s has no subpages defined."] = "%s hat keine zugewiesenen Unterseiten.";
 $locale["%s is disallowed on this wiki."] = "»%s« ist auf diesem Wiki nicht zugelassen.";
 $locale["%s is empty."] = "%s ist leer.";

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/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-04-08 13:18:14 UTC (rev 8742)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-04-08 14:14:38 UTC (rev 8743)
@@ -48,7 +48,7 @@
 $locale["%s days"] = "%s jours";
 $locale["%s does not appear to be a WikiPlugin."] = "%s ne semble pas être un greffon.";
 $locale["%s does not exist"] = "%s n'existe pas";
-$locale["%s does not know about the language “%s”, using 'en' instead."] = "%s ne connaît pas le langage « %s » utilisation de 'en' a la place.";
+$locale["%s does not know about the language “%s”, using “en” instead."] = "%s ne connaît pas le langage « %s », utilisation de « en » à la place.";
 $locale["%s has no subpages defined."] = "La page %s n'a aucune sous-page définie.";
 $locale["%s is disallowed on this wiki."] = "L'action %s est interdite sur ce wiki.";
 $locale["%s is empty."] = "%s est vide.";
@@ -808,6 +808,7 @@
 $locale["Please set ENCRYPTED_PASSWD to true in config/config.ini."] = "Veuillez définir ENCRYPTED_PASSWD à true dans config/config.ini.";
 $locale["Please set a password in UserPreferences."] = "Veuillez définir votre mot de passe dans PréférencesUtilisateurs.";
 $locale["Please use one of the downloadable versions rather than copying and pasting from the above preview."] = "Veuillez utiliser une des versions téléchargeables au lieu de copier-coller à partir de la prévisualisation.";
+$locale["Ploticus image creation."] = "Création de l'image Ploticus.";
 $locale["Plugin"] = "Greffon";
 $locale["Plugin %s disabled."] = "Greffon %s désactivé.";
 $locale["Plugin %s failed."] = "Échec du greffon %s.";

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-04-08 13:18:14 UTC (rev 8742)
+++ trunk/locale/po/de.po	2013-04-08 14:14:38 UTC (rev 8743)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 15:17+0200\n"
+"POT-Creation-Date: 2013-04-08 16:13+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."
@@ -2471,7 +2471,7 @@
 msgstr "Die angegebene ICAO »%s« war nicht bekannt."
 
 #, php-format
-msgid "%s does not know about the language “%s”, using 'en' instead."
+msgid "%s does not know about the language “%s”, using “en” instead."
 msgstr ""
 "%s weißt nichts von die Sprache »%s«, stattdessen wird 'en' angewendet."
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2013-04-08 13:18:14 UTC (rev 8742)
+++ trunk/locale/po/es.po	2013-04-08 14:14:38 UTC (rev 8743)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 15:17+0200\n"
+"POT-Creation-Date: 2013-04-08 16:13+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -2397,7 +2397,7 @@
 msgstr ""
 
 #, php-format
-msgid "%s does not know about the language “%s”, using 'en' instead."
+msgid "%s does not know about the language “%s”, using “en” instead."
 msgstr ""
 
 msgid "Submit country"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2013-04-08 13:18:14 UTC (rev 8742)
+++ trunk/locale/po/fr.po	2013-04-08 14:14:38 UTC (rev 8743)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 15:17+0200\n"
+"POT-Creation-Date: 2013-04-08 16:13+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."
@@ -2415,8 +2415,8 @@
 msgstr "L'ICAO “%s” n'a pas été reconnu."
 
 #, php-format
-msgid "%s does not know about the language “%s”, using 'en' instead."
-msgstr "%s ne connaît pas le langage « %s » utilisation de 'en' a la place."
+msgid "%s does not know about the language “%s”, using “en” instead."
+msgstr "%s ne connaît pas le langage « %s », utilisation de « en » à la place."
 
 msgid "Submit country"
 msgstr ""
@@ -2430,9 +2430,8 @@
 msgid "Ploticus"
 msgstr ""
 
-#, fuzzy
 msgid "Ploticus image creation."
-msgstr "Création de la page"
+msgstr "Création de l'image Ploticus."
 
 msgid "shell commands not allowed in Ploticus"
 msgstr ""

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2013-04-08 13:18:14 UTC (rev 8742)
+++ trunk/locale/po/it.po	2013-04-08 14:14:38 UTC (rev 8743)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 15:17+0200\n"
+"POT-Creation-Date: 2013-04-08 16:13+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"
@@ -2375,7 +2375,7 @@
 msgstr ""
 
 #, php-format
-msgid "%s does not know about the language “%s”, using 'en' instead."
+msgid "%s does not know about the language “%s”, using “en” instead."
 msgstr ""
 
 msgid "Submit country"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2013-04-08 13:18:14 UTC (rev 8742)
+++ trunk/locale/po/ja.po	2013-04-08 14:14:38 UTC (rev 8743)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 15:17+0200\n"
+"POT-Creation-Date: 2013-04-08 16:13+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"
@@ -2419,7 +2419,7 @@
 msgstr ""
 
 #, php-format
-msgid "%s does not know about the language “%s”, using 'en' instead."
+msgid "%s does not know about the language “%s”, using “en” instead."
 msgstr ""
 
 msgid "Submit country"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2013-04-08 13:18:14 UTC (rev 8742)
+++ trunk/locale/po/nl.po	2013-04-08 14:14:38 UTC (rev 8743)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 15:17+0200\n"
+"POT-Creation-Date: 2013-04-08 16:13+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"
@@ -2366,7 +2366,7 @@
 msgstr ""
 
 #, php-format
-msgid "%s does not know about the language “%s”, using 'en' instead."
+msgid "%s does not know about the language “%s”, using “en” instead."
 msgstr ""
 
 msgid "Submit country"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2013-04-08 13:18:14 UTC (rev 8742)
+++ trunk/locale/po/phpwiki.pot	2013-04-08 14:14:38 UTC (rev 8743)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 15:17+0200\n"
+"POT-Creation-Date: 2013-04-08 16:13+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"
@@ -2357,7 +2357,7 @@
 msgstr ""
 
 #, php-format
-msgid "%s does not know about the language “%s”, using 'en' instead."
+msgid "%s does not know about the language “%s”, using “en” instead."
 msgstr ""
 
 msgid "Submit country"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2013-04-08 13:18:14 UTC (rev 8742)
+++ trunk/locale/po/sv.po	2013-04-08 14:14:38 UTC (rev 8743)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 15:17+0200\n"
+"POT-Creation-Date: 2013-04-08 16:13+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -2360,7 +2360,7 @@
 msgstr ""
 
 #, php-format
-msgid "%s does not know about the language “%s”, using 'en' instead."
+msgid "%s does not know about the language “%s”, using “en” instead."
 msgstr ""
 
 msgid "Submit country"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2013-04-08 13:18:14 UTC (rev 8742)
+++ trunk/locale/po/zh.po	2013-04-08 14:14:38 UTC (rev 8743)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-08 15:17+0200\n"
+"POT-Creation-Date: 2013-04-08 16:13+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -2493,7 +2493,7 @@
 msgstr "ICAO “%s” 無法被認可."
 
 #, php-format
-msgid "%s does not know about the language “%s”, using 'en' instead."
+msgid "%s does not know about the language “%s”, using “en” instead."
 msgstr "%s 不認識此語言 “%s”, 使用 'en' 代替."
 
 msgid "Submit country"

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

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

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/zh/LC_MESSAGES/phpwiki.php	2013-04-08 13:18:14 UTC (rev 8742)
+++ trunk/locale/zh/LC_MESSAGES/phpwiki.php	2013-04-08 14:14:38 UTC (rev 8743)
@@ -23,7 +23,7 @@
 $locale["%s bytes written"] = "已寫入 %s bytes";
 $locale["%s days"] = "%s 天";
 $locale["%s does not appear to be a WikiPlugin."] = "%s 看起來不是 WikiPlugin.";
-$locale["%s does not know about the language “%s”, using 'en' instead."] = "%s 不認識此語言 “%s”, 使用 'en' 代替.";
+$locale["%s does not know about the language “%s”, using “en” instead."] = "%s 不認識此語言 “%s”, 使用 'en' 代替.";
 $locale["%s is disallowed on this wiki."] = "在此 wiki 上, %s 是被禁止的.";
 $locale["%s is empty."] = "%s 是空白的.";
 $locale["%s is not writable."] = "%s 無法寫入.";

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

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

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

Revision: 8742
          http://sourceforge.net/p/phpwiki/code/8742
Author:   vargenau
Date:     2013-04-08 13:18:14 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
Orthographe

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/fr/LC_MESSAGES/phpwiki.php
    trunk/locale/fr/pgsrc/AdministrationDePhpWiki
    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/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-04-02 15:49:52 UTC (rev 8741)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-04-08 13:18:14 UTC (rev 8742)
@@ -48,7 +48,7 @@
 $locale["%s days"] = "%s jours";
 $locale["%s does not appear to be a WikiPlugin."] = "%s ne semble pas être un greffon.";
 $locale["%s does not exist"] = "%s n'existe pas";
-$locale["%s does not know about the language “%s”, using 'en' instead."] = "%s ne connait pas le langage « %s » utilisation de 'en' a la place.";
+$locale["%s does not know about the language “%s”, using 'en' instead."] = "%s ne connaît pas le langage « %s » utilisation de 'en' a la place.";
 $locale["%s has no subpages defined."] = "La page %s n'a aucune sous-page définie.";
 $locale["%s is disallowed on this wiki."] = "L'action %s est interdite sur ce wiki.";
 $locale["%s is empty."] = "%s est vide.";
@@ -107,7 +107,7 @@
 $locale["<system theme>"] = "<thème du système>";
 $locale["<unknown>"] = "<inconnu>";
 $locale["A required argument “%s” is missing."] = "L'argument obligatoire « %s » manque.";
-$locale["ACCESS DENIED: You must log in to upload files."] = "ACCES REFUSE: Vous devez être connecté pour uploader.";
+$locale["ACCESS DENIED: You must log in to upload files."] = "ACCÈS REFUSÉ : Vous devez être connecté pour télécharger.";
 $locale["ACL"] = "ACL";
 $locale["ACL changed for page “%s”"] = "ACL modifié pour la page %s.";
 $locale["ACL deleted for page “%s”"] = "ACL supprimée pour la page %s";
@@ -151,9 +151,9 @@
 $locale["AllUsers"] = "TousLesUtilisateurs";
 $locale["Allow / Deny"] = "Autoriser / Refuser";
 $locale["Allowed protocols"] = "Protocoles autorisés";
-$locale["Allows selection of multiple pages which get passed to other WikiAdmin plugins."] = "Permet de choisir plusieurs pages qui seront passées vers d'autre plugins WikiAdmin.";
+$locale["Allows selection of multiple pages which get passed to other WikiAdmin plugins."] = "Permet de choisir plusieurs pages qui seront passées vers d'autre greffons WikiAdmin.";
 $locale["Already logged in"] = "Déjà connecté";
-$locale["Also pages which have been deleted at least %s days."] = "Même les pages qui ont été supprimées il y a au plus %s days.";
+$locale["Also pages which have been deleted at least %s days."] = "Même les pages qui ont été supprimées il y a au plus %s jours.";
 $locale["An unnamed PhpWiki"] = "Un PhpWiki sans titre";
 $locale["Anonymous Users"] = "Utilisateurs anonymes";
 $locale["Appearance"] = "Apparence";
@@ -170,7 +170,7 @@
 $locale["Are you sure you want to permanently purge the following files?"] = "Êtes-vous sûr de vouloir purger définitivement les pages suivantes ?";
 $locale["Are you sure you want to remove the selected files?"] = "Êtes-vous certain de vouloir supprimer les fichiers sélectionnés ?";
 $locale["Are you sure you want to rename the selected pages?"] = "Êtes-vous sûr de vouloir renommer les pages sélectionnées ?";
-$locale["Are you sure you want to replace text in the selected files?"] = "Etes-vous sur de vouloir rechercher et remplacer dans les fichiers sélectionnées ?";
+$locale["Are you sure you want to replace text in the selected files?"] = "Êtes-vous sur de vouloir rechercher et remplacer dans les fichiers sélectionnés ?";
 $locale["Argument “%s” not declared by plugin."] = "argument “%s” non déclaré par le plugin.";
 $locale["Arguments"] = "Arguments";
 $locale["Attempting to use the directory “%s” instead."] = "Tentative d'utilisation du répertoire « %s » à la place.";
@@ -198,7 +198,7 @@
 $locale["Bad URL for image -- remove all of <, >, \""] = "Mauvaise URL pour l'image -- retirez tous les <, >, \"";
 $locale["Bad Version"] = "Mauvaise version";
 $locale["Bad file type: %s"] = "Mauvais type de fichier : %s";
-$locale["Bad url in src: remove all of <, >, \""] = "Mauvaise url dans la source : retirez tous les <, >, \"";
+$locale["Bad url in src: remove all of <, >, \""] = "Mauvaise URL dans la source : retirez tous les <, >, \"";
 $locale["Blog"] = "Blog";
 $locale["Blog page"] = "Page de blog";
 $locale["Bogo Users"] = "Utilisateurs Bogo";
@@ -227,7 +227,7 @@
 $locale["CategoryHomePages"] = "CatégoriePagesAccueil";
 $locale["CategoryHomepage"] = "CatégoriePagesAccueil";
 $locale["CategoryPage"] = "CatégoriePages";
-$locale["Change Access Rights"] = "Droits d'acces";
+$locale["Change Access Rights"] = "Droits d'accès";
 $locale["Change Owner"] = "Changer le propriétaire";
 $locale["Change Password"] = "Modifier mon mot de passe";
 $locale["Change Verification Status"] = "Changer la vérification du statut";
@@ -278,7 +278,7 @@
 $locale["Confirm markup change"] = "Confirmer le changement de type de syntaxe";
 $locale["Confirm ownership change"] = "Confirmer le changement de propriétaire";
 $locale["Confirm purge"] = "Confirmer la purge";
-$locale["Confirm removal"] = "Confirm la suppression";
+$locale["Confirm removal"] = "Confirmer la suppression";
 $locale["Conflicting Edits!"] = "Modifications conflictuelles !";
 $locale["Content"] = "Contenu";
 $locale["Content of versions "] = "Contenu des versions ";
@@ -317,8 +317,8 @@
 $locale["DB admin user:"] = "DB admin nom de user :";
 $locale["Database"] = "Base de données";
 $locale["Date Format"] = "Format de la date";
-$locale["DebugGroupInfo"] = "InfosDeDéboguageGroupe";
-$locale["DebugInfo"] = "InfosDeDéboguage";
+$locale["DebugGroupInfo"] = "InfosDeDébogageGroupe";
+$locale["DebugInfo"] = "InfosDeDébogage";
 $locale["Default InterWiki map file not loaded."] = "Carte InterWiki par défaut non chargée.";
 $locale["Default language: “%s”"] = "Langage par défaut : %s";
 $locale["Default preferences will be used."] = "Les préférences par défaut seront utilisées.";
@@ -344,7 +344,7 @@
 $locale["Discussion"] = "Discussion";
 $locale["Display a list of randomly chosen pages or redirects to a random page."] = "Affiche une liste de pages prises au hasard sur ce wiki.";
 $locale["Display a set of photos listed in a text file with optional descriptions."] = "Affiche un groupe de photos listées dans un fichier texte avec des descriptions facultatives.";
-$locale["Display a url in a separate frame inside our body. Only one frame allowed."] = "Affiche une url dans une cadre interne à la page. Un seul cadre autorisé.";
+$locale["Display a url in a separate frame inside our body. Only one frame allowed."] = "Affiche une URL dans une cadre interne à la page. Un seul cadre autorisé.";
 $locale["Display arbitrary SQL result tables."] = "Affiche le résultat de requêtes SQL simples.";
 $locale["Display as Pdf"] = "Afficher en PDF";
 $locale["Display differences between revisions."] = "Affiche les différences entre versions.";
@@ -395,7 +395,7 @@
 $locale["Either %s is missing or DATABASE_TYPE != “%s”"] = "%s est manquant ou DATABASE_TYPE != %s";
 $locale["Elapsed time: %s s"] = "Temps écoulé : %s s";
 $locale["Embed hidden comments in WikiPages."] = "Cacher des commentaires dans une page wiki.";
-$locale["Empty Preferences or format of UserPreferences cookie not recognised."] = "PréférencesUtilisateurs vides, le cookie peut etre mal reconnu.";
+$locale["Empty Preferences or format of UserPreferences cookie not recognised."] = "PréférencesUtilisateurs vides, le cookie peut être mal reconnu.";
 $locale["Empty link to: %s"] = "Lien vide vers : %s";
 $locale["Empty pagename!"] = "Nom de page vide !";
 $locale["Enable DoubleClick Edit"] = "Autoriser la modification par double clic";
@@ -430,7 +430,7 @@
 $locale["First"] = "Premier";
 $locale["Found by "] = "Trouvé par ";
 $locale["FrameInclude"] = "InclureUnCadre";
-$locale["From english to %s: "] = "De l'Anglais au %s: ";
+$locale["From english to %s: "] = "De l'anglais au %s: ";
 $locale["Full changes"] = "Changements exhaustifs";
 $locale["Full text search results for “%s”"] = "Résultats de la recherche en texte intégral de « %s »";
 $locale["FullDump"] = "SauvegardeTotale";
@@ -439,8 +439,8 @@
 $locale["FuzzyPages"] = "PagesFloues";
 $locale["General Auth Settings"] = "Préférences générales d'auteur";
 $locale["Get an e-mail notification at changes of the following pages:"] = "Recevoir une notification par courriel pour les modifications des pages suivantes :";
-$locale["Get debugging information for %s."] = "Obtenir des infos de déboguage pour %s.";
-$locale["Get preferences information for current user %s."] = "Obtenir des infos de préférences pour l'utilisateur %s.";
+$locale["Get debugging information for %s."] = "Obtenir des informations de débogage pour %s.";
+$locale["Get preferences information for current user %s."] = "Obtenir des informations de préférences pour l'utilisateur %s.";
 $locale["Given password ignored."] = "Mot de passe ignoré.";
 $locale["Global user preferences (for all projects)"] = "Préférences globales (pour tous les projets)";
 $locale["Go"] = "OK";
@@ -527,7 +527,7 @@
 $locale["Image saved to cache file: %s"] = "Image sauvée dans le fichier cache : %s";
 $locale["In the time since you started editing this page, another user has saved a new version of it."] = "Depuis que vous avez commencé à modifier cette page, un autre utilisateur en a enregistré une nouvelle version.";
 $locale["In total there are %d user sessions online. :: Unique %d Registered and %d Guests"] = "Au total: %d utilisateurs en ligne. :: %d enregistré(s) et %d invité(s)";
-$locale["Include an external web page within the body of a wiki page."] = "Inclure une page externe dans le corps de la WikiPage.";
+$locale["Include an external web page within the body of a wiki page."] = "Inclure une page externe dans le corps de la page wiki.";
 $locale["Include recursively all linked pages starting at %s."] = "Créer une carte du site commençant à %s.";
 $locale["Include text from another wiki page."] = "Inclure le texte d'une autre page wiki.";
 $locale["Include the content of all SubPages of the current page."] = "Pour inclure le contenu de toutes les sous pages de la page actuelle.";
@@ -791,7 +791,7 @@
 $locale["PhotoAlbum"] = "AlbumPhotos";
 $locale["PhpHighlight"] = "ColorationPhp";
 $locale["PhpWeather"] = "MétéoPhp";
-$locale["PhpWiki developers should manually inspect the downloaded file for nested markup before rewrapping with emacs and checking into Subversion."] = "Les développeurs de PhpWiki devraient inspecter manuellement les balises des fichiers téléchargés avant de les éditer sous emacs et les publier sous Subversion.";
+$locale["PhpWiki developers should manually inspect the downloaded file for nested markup before rewrapping with emacs and checking into Subversion."] = "Les développeurs de PhpWiki devraient inspecter manuellement les balises des fichiers téléchargés avant de les éditer sous Emacs et les publier sous Subversion.";
 $locale["PhpWiki engine version"] = "Version de PhpWiki";
 $locale["PhpWikiAdministration"] = "AdministrationDePhpWiki";
 $locale["PhpWikiAdministration/Chmod"] = "AdministrationDePhpWiki/Chmod";
@@ -839,7 +839,7 @@
 $locale["Printer"] = "Imprimante";
 $locale["Propagate new permissions to all subpages?"] = "Propager les nouvelles permissions aux sous-pages ?";
 $locale["Provide access to PhpWiki's lower level system information."] = "Affiche les informations de bas niveau pour PhpWiki.";
-$locale["Provide for raw HTML within wiki pages."] = "Un Plugin pour intégrer du code HTML dans les WikiPages.";
+$locale["Provide for raw HTML within wiki pages."] = "Un greffon pour intégrer du code HTML dans les pages wiki.";
 $locale["Provide weather reports from the Internet."] = "Météo importée d'internet.";
 $locale["Public"] = "Public";
 $locale["Purge"] = "Purger";
@@ -879,10 +879,10 @@
 $locale["Recursive inclusion of page %s ignored"] = "Insertion récursive de la page %s ignoré";
 $locale["Recursive inclusion of url %s"] = "Insertion récursive de l'URL %s";
 $locale["Recursive redirect to self: “%s”"] = "Redirection récursive vers soi-même: %s";
-$locale["Recursively get BackLinks or links."] = "Obtenir récursivement des rétroLiens ou liens.";
+$locale["Recursively get BackLinks or links."] = "Obtenir récursivement des rétroliens ou liens.";
 $locale["Redirect"] = "Redirection";
 $locale["Redirect to an external web site based on form input."] = "Redirige vers un site externe basé sur un formulaire.";
-$locale["Redirect to another URL or page."] = "Redirige vers une autre url ou page.";
+$locale["Redirect to another URL or page."] = "Redirige vers une autre URL ou page.";
 $locale["RedirectTo"] = "RedirigerVers";
 $locale["References"] = "Références";
 $locale["Regex?"] = "expression régulière ?";
@@ -908,6 +908,7 @@
 $locale["Rename"] = "Renommer";
 $locale["Rename Page"] = "Renommer la page";
 $locale["Rename selected pages"] = "Renommer les pages sélectionnées";
+$locale["Rename selected pages."] = "Renommer les pages sélectionnées.";
 $locale["Rename to"] = "Renommer en";
 $locale["Renamed by: %s"] = "Renommée par : %s";
 $locale["Renamed page from “%s” to “%s”."] = "Page renommée de « %s » à « %s ».";
@@ -1011,7 +1012,7 @@
 $locale["Strike"] = "Biffé";
 $locale["Strike-through text"] = "Biffé";
 $locale["String \"%s\" not found."] = "Chaîne \"%s\" non trouvée.";
-$locale["SubPages of %s:"] = "SousPages de %s :";
+$locale["SubPages of %s:"] = "Sous-pages de %s :";
 $locale["Submit"] = "Soumettre";
 $locale["Submit location"] = "Soumettre la localisation";
 $locale["Subpage"] = "Sous-page";
@@ -1099,7 +1100,7 @@
 $locale["Top Menu"] = "Menu du haut";
 $locale["Top Recommendations"] = "Meilleures recommandations";
 $locale["Topic"] = "Sujet";
-$locale["Total %d plugins: "] = "%d plugins au total : ";
+$locale["Total %d plugins: "] = "%d greffons au total : ";
 $locale["Total Budget"] = "Budget total";
 $locale["Total Voters"] = "Total des votants";
 $locale["Total of %d languages: "] = "%d langages au total : ";
@@ -1245,7 +1246,7 @@
 $locale["Your are probably trying to edit/create an invalid version of this page."] = "Vous essayez probablement de modifier ou de créer une version invalide de cette page.";
 $locale["Your browser should have redirected you to %s."] = "Votre navigateur aurait du vous redirigé vers %s.";
 $locale["Your careful attention to detail is much appreciated."] = "Votre souci particulier du détail est très apprécié.";
-$locale["Your changes can not be saved as they are, since doing so would overwrite the other author's changes. So, your changes and those of the other author have been combined. The result is shown below."] = "Vos modifications ne peuvent être enegistrées, puisqu'elles écraseraient celles de l'autre utilisateur. Ainsi donc, vos modifications et celles de l'autre auteur ont été combinées. Le résultat est affiché ci-dessous.";
+$locale["Your changes can not be saved as they are, since doing so would overwrite the other author's changes. So, your changes and those of the other author have been combined. The result is shown below."] = "Vos modifications ne peuvent être enregistrées, puisqu'elles écraseraient celles de l'autre utilisateur. Ainsi donc, vos modifications et celles de l'autre auteur ont été combinées. Le résultat est affiché ci-dessous.";
 $locale["Your current rating: "] = "Votre note actuelle : ";
 $locale["Your current watchlist: "] = "Votre liste de suivi actuelle : ";
 $locale["Your e-mail"] = "Votre adresse électronique";
@@ -1253,7 +1254,7 @@
 $locale["Your home page is locked so your preferences cannot not be saved."] = "Votre page personnelle est verrouillée et par conséquent vos préférences n'ont pas pu être enregistrées.";
 $locale["Your rating was %.1f"] = "Votre note est %.1f";
 $locale["Your signature"] = "Votre signature";
-$locale["Your translated text doesn't yet appear in this %s, but the Administrator will pick it up and add to the installation."] = "Le texte traduit n'apparait pas encore dans ce %s, mais l'administrateur l'ajoutera à l'installation.";
+$locale["Your translated text doesn't yet appear in this %s, but the Administrator will pick it up and add to the installation."] = "Le texte traduit n'apparaît pas encore dans ce %s, mais l'administrateur l'ajoutera à l'installation.";
 $locale["Your translated text is either empty or equal to the untranslated text. Please try again."] = "Soit votre texte est vide soit il est le même que le texte à traduire, veuillez réessayer.";
 $locale["Your translation is stored in %s"] = "Votre traduction est enregistrée dans %s";
 $locale["Your version"] = "Votre version";
@@ -1337,7 +1338,7 @@
 $locale["purge this page"] = "purger cette page";
 $locale["really"] = "vraiment";
 $locale["remove this page"] = "supprimer cette page";
-$locale["rename %s to %s"] = "retitrez la page de “%s” à “%s”";
+$locale["rename %s to %s"] = "renommer la page de “%s” à “%s”";
 $locale["rename this page"] = "renommer cette page";
 $locale["renamed from %s"] = "renommée à partir de %s";
 $locale["reverse"] = "inverser";
@@ -1361,7 +1362,7 @@
 $locale["unknown color %s ignored"] = "couleur %s non valable ignorée";
 $locale["unknown format."] = "format inconnu.";
 $locale["unlock this page"] = "déverrouiller cette page";
-$locale["upload a zip dump"] = "déposer un fichier zip";
+$locale["upload a zip dump"] = "déposer un fichier ZIP";
 $locale["uploaded %s"] = "Téléchargé %s";
 $locale["use this plugin"] = "utiliser ce greffon";
 $locale["users"] = "utilisateurs";

Modified: trunk/locale/fr/pgsrc/AdministrationDePhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/AdministrationDePhpWiki	2013-04-02 15:49:52 UTC (rev 8741)
+++ trunk/locale/fr/pgsrc/AdministrationDePhpWiki	2013-04-08 13:18:14 UTC (rev 8742)
@@ -1,4 +1,4 @@
-Date: Fri,  4 Feb 2011 16:36:25 +0000
+Date: Mon,  8 Apr 2013 15:13:02 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=AdministrationDePhpWiki;
@@ -128,7 +128,7 @@
 
 == Le coeur de phpwiki
 
-Tout ceci surtout pour des déboguages (au moins c'est ce que j'espère).
+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 
 pas vous faire de mal.

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-04-02 15:49:52 UTC (rev 8741)
+++ trunk/locale/po/de.po	2013-04-08 13:18:14 UTC (rev 8742)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-04 11:12+0100\n"
+"POT-Creation-Date: 2013-04-08 15:17+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."
@@ -2450,6 +2450,9 @@
 msgid "PHP syntax highlighting."
 msgstr "Hervorhebung der PHP-Syntax (Syntax highlighting)."
 
+msgid "Please provide source code to PhpHighlight plugin"
+msgstr ""
+
 #, php-format
 msgid "Invalid color: %s"
 msgstr "Ungültige Farbe: %s"

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2013-04-02 15:49:52 UTC (rev 8741)
+++ trunk/locale/po/es.po	2013-04-08 13:18:14 UTC (rev 8742)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-04 11:12+0100\n"
+"POT-Creation-Date: 2013-04-08 15:17+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -2376,6 +2376,9 @@
 msgid "PHP syntax highlighting."
 msgstr ""
 
+msgid "Please provide source code to PhpHighlight plugin"
+msgstr ""
+
 #, php-format
 msgid "Invalid color: %s"
 msgstr ""

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2013-04-02 15:49:52 UTC (rev 8741)
+++ trunk/locale/po/fr.po	2013-04-08 13:18:14 UTC (rev 8742)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-04 11:12+0100\n"
+"POT-Creation-Date: 2013-04-08 15:17+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."
@@ -290,7 +290,7 @@
 "the other author's changes. So, your changes and those of the other author "
 "have been combined. The result is shown below."
 msgstr ""
-"Vos modifications ne peuvent être enegistrées, puisqu'elles écraseraient "
+"Vos modifications ne peuvent être enregistrées, puisqu'elles écraseraient "
 "celles de l'autre utilisateur. Ainsi donc, vos modifications et celles de "
 "l'autre auteur ont été combinées. Le résultat est affiché ci-dessous."
 
@@ -856,7 +856,7 @@
 msgstr "déverrouiller cette page"
 
 msgid "upload a zip dump"
-msgstr "déposer un fichier zip"
+msgstr "déposer un fichier ZIP"
 
 msgid "verify the current action"
 msgstr "vérifier l'action actuelle"
@@ -1405,11 +1405,11 @@
 "éditée par %s."
 
 msgid "DebugInfo"
-msgstr "InfosDeDéboguage"
+msgstr "InfosDeDébogage"
 
 #, php-format
 msgid "Get debugging information for %s."
-msgstr "Obtenir des infos de déboguage pour %s."
+msgstr "Obtenir des informations de débogage pour %s."
 
 #, php-format
 msgid "Querying backend directly for “%s”"
@@ -1728,7 +1728,7 @@
 msgid ""
 "Display a url in a separate frame inside our body. Only one frame allowed."
 msgstr ""
-"Affiche une url dans une cadre interne à la page. Un seul cadre autorisé."
+"Affiche une URL dans une cadre interne à la page. Un seul cadre autorisé."
 
 msgid "Plugin not run: not in browse mode"
 msgstr "Greffon non exécuté (hors navigation)"
@@ -1849,7 +1849,7 @@
 msgstr ""
 
 msgid "DebugGroupInfo"
-msgstr "InfosDeDéboguageGroupe"
+msgstr "InfosDeDébogageGroupe"
 
 #, php-format
 msgid "Show Group Information."
@@ -2053,7 +2053,7 @@
 
 #, php-format
 msgid "SubPages of %s:"
-msgstr "SousPages de %s :"
+msgstr "Sous-pages de %s :"
 
 msgid "MediawikiTable"
 msgstr ""
@@ -2224,7 +2224,7 @@
 "markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 "Les développeurs de PhpWiki devraient inspecter manuellement les balises des "
-"fichiers téléchargés avant de les éditer sous emacs et les publier sous "
+"fichiers téléchargés avant de les éditer sous Emacs et les publier sous "
 "Subversion."
 
 msgid "Warning:"
@@ -2373,7 +2373,7 @@
 "descriptions facultatives."
 
 msgid "Bad url in src: remove all of <, >, \""
-msgstr "Mauvaise url dans la source : retirez tous les <, >, \""
+msgstr "Mauvaise URL dans la source : retirez tous les <, >, \""
 
 msgid "File extension for csv file has to be '.csv'"
 msgstr ""
@@ -2392,6 +2392,9 @@
 msgid "PHP syntax highlighting."
 msgstr "Coloration syntaxique du PHP."
 
+msgid "Please provide source code to PhpHighlight plugin"
+msgstr ""
+
 #, php-format
 msgid "Invalid color: %s"
 msgstr "Couleur non valide : %s"
@@ -2413,7 +2416,7 @@
 
 #, php-format
 msgid "%s does not know about the language “%s”, using 'en' instead."
-msgstr "%s ne connait pas le langage « %s » utilisation de 'en' a la place."
+msgstr "%s ne connaît pas le langage « %s » utilisation de 'en' a la place."
 
 msgid "Submit country"
 msgstr ""
@@ -2522,7 +2525,7 @@
 
 #, php-format
 msgid "Get preferences information for current user %s."
-msgstr "Obtenir des infos de préférences pour l'utilisateur %s."
+msgstr "Obtenir des informations de préférences pour l'utilisateur %s."
 
 msgid "PrevNext"
 msgstr "PrécédentSuivant"
@@ -2602,7 +2605,7 @@
 msgstr "Annuler la notation"
 
 msgid "Provide for raw HTML within wiki pages."
-msgstr "Un Plugin pour intégrer du code HTML dans les WikiPages."
+msgstr "Un greffon pour intégrer du code HTML dans les pages wiki."
 
 msgid "Raw HTML is disabled in this wiki."
 msgstr "Le HTML est interdit sur ce wiki."
@@ -2800,7 +2803,7 @@
 msgstr "RedirigerVers"
 
 msgid "Redirect to another URL or page."
-msgstr "Redirige vers une autre url ou page."
+msgstr "Redirige vers une autre URL ou page."
 
 msgid "Illegal characters in external URL."
 msgstr "Caractère interdit dans une URL externe."
@@ -2981,7 +2984,7 @@
 msgstr "CarteDuSite"
 
 msgid "Recursively get BackLinks or links."
-msgstr "Obtenir récursivement des rétroLiens ou liens."
+msgstr "Obtenir récursivement des rétroliens ou liens."
 
 #, php-format
 msgid "(max. recursion level: %d)"
@@ -3173,7 +3176,7 @@
 
 #, php-format
 msgid "Total %d plugins: "
-msgstr "%d plugins au total : "
+msgstr "%d greffons au total : "
 
 #, php-format
 msgid "Total of %d languages: "
@@ -3309,7 +3312,7 @@
 msgstr "Insérer"
 
 msgid "Include an external web page within the body of a wiki page."
-msgstr "Inclure une page externe dans le corps de la WikiPage."
+msgstr "Inclure une page externe dans le corps de la page wiki."
 
 msgid "Transcluded page"
 msgstr "Page insérée"
@@ -3367,7 +3370,7 @@
 "Your translated text doesn't yet appear in this %s, but the Administrator "
 "will pick it up and add to the installation."
 msgstr ""
-"Le texte traduit n'apparait pas encore dans ce %s, mais l'administrateur "
+"Le texte traduit n'apparaît pas encore dans ce %s, mais l'administrateur "
 "l'ajoutera à l'installation."
 
 #, php-format
@@ -3376,7 +3379,7 @@
 
 #, php-format
 msgid "From english to %s: "
-msgstr "De l'Anglais au %s: "
+msgstr "De l'anglais au %s: "
 
 msgid "Translate"
 msgstr "Traduire"
@@ -3407,7 +3410,7 @@
 msgstr "Vous êtes déjà membre de ce projet."
 
 msgid "ACCESS DENIED: You must log in to upload files."
-msgstr "ACCES REFUSE: Vous devez être connecté pour uploader."
+msgstr "ACCÈS REFUSÉ : Vous devez être connecté pour télécharger."
 
 #, php-format
 msgid "ERROR uploading “%s”"
@@ -3866,7 +3869,7 @@
 msgstr "Supprimer"
 
 msgid "Confirm removal"
-msgstr "Confirm la suppression"
+msgstr "Confirmer la suppression"
 
 msgid "Are you sure you want to remove the selected files?"
 msgstr "Êtes-vous certain de vouloir supprimer les fichiers sélectionnés ?"
@@ -3879,7 +3882,7 @@
 
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
-msgstr "Même les pages qui ont été supprimées il y a au plus %s days."
+msgstr "Même les pages qui ont été supprimées il y a au plus %s jours."
 
 #, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
@@ -3889,9 +3892,8 @@
 msgid "WikiAdminRename"
 msgstr ""
 
-#, fuzzy
 msgid "Rename selected pages."
-msgstr "Renommer les pages sélectionnées"
+msgstr "Renommer les pages sélectionnées."
 
 msgid "Cannot rename. New page name too long."
 msgstr "Impossible de renommer. Le nom de la page est trop long."
@@ -3981,8 +3983,8 @@
 
 msgid "Are you sure you want to replace text in the selected files?"
 msgstr ""
-"Etes-vous sur de vouloir rechercher et remplacer dans les fichiers "
-"sélectionnées ?"
+"Êtes-vous sur de vouloir rechercher et remplacer dans les fichiers "
+"sélectionnés ?"
 
 msgid "Select the pages to search and replace"
 msgstr ""
@@ -4008,7 +4010,7 @@
 "Allows selection of multiple pages which get passed to other WikiAdmin "
 "plugins."
 msgstr ""
-"Permet de choisir plusieurs pages qui seront passées vers d'autre plugins "
+"Permet de choisir plusieurs pages qui seront passées vers d'autre greffons "
 "WikiAdmin."
 
 msgid "Select: "
@@ -4054,7 +4056,7 @@
 "sélectionnés ?"
 
 msgid "Change Access Rights"
-msgstr "Droits d'acces"
+msgstr "Droits d'accès"
 
 msgid "Select the pages where to change access rights"
 msgstr ""
@@ -4655,7 +4657,7 @@
 
 #, php-format
 msgid "rename %s to %s"
-msgstr "retitrez la page de “%s” à “%s”"
+msgstr "renommer la page de “%s” à “%s”"
 
 msgid "MISSING"
 msgstr "MANQUANT"
@@ -5077,7 +5079,7 @@
 msgstr "Permissions insuffisantes."
 
 msgid "Empty Preferences or format of UserPreferences cookie not recognised."
-msgstr "PréférencesUtilisateurs vides, le cookie peut etre mal reconnu."
+msgstr "PréférencesUtilisateurs vides, le cookie peut être mal reconnu."
 
 msgid "Default preferences will be used."
 msgstr "Les préférences par défaut seront utilisées."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2013-04-02 15:49:52 UTC (rev 8741)
+++ trunk/locale/po/it.po	2013-04-08 13:18:14 UTC (rev 8742)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-04 11:12+0100\n"
+"POT-Creation-Date: 2013-04-08 15:17+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"
@@ -2354,6 +2354,9 @@
 msgid "PHP syntax highlighting."
 msgstr ""
 
+msgid "Please provide source code to PhpHighlight plugin"
+msgstr ""
+
 #, php-format
 msgid "Invalid color: %s"
 msgstr ""

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2013-04-02 15:49:52 UTC (rev 8741)
+++ trunk/locale/po/ja.po	2013-04-08 13:18:14 UTC (rev 8742)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-04 11:12+0100\n"
+"POT-Creation-Date: 2013-04-08 15:17+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"
@@ -2398,6 +2398,9 @@
 msgid "PHP syntax highlighting."
 msgstr "PHP構文ハイライト"
 
+msgid "Please provide source code to PhpHighlight plugin"
+msgstr ""
+
 #, php-format
 msgid "Invalid color: %s"
 msgstr ""

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2013-04-02 15:49:52 UTC (rev 8741)
+++ trunk/locale/po/nl.po	2013-04-08 13:18:14 UTC (rev 8742)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-04 11:12+0100\n"
+"POT-Creation-Date: 2013-04-08 15:17+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"
@@ -2345,6 +2345,9 @@
 msgid "PHP syntax highlighting."
 msgstr ""
 
+msgid "Please provide source code to PhpHighlight plugin"
+msgstr ""
+
 #, php-format
 msgid "Invalid color: %s"
 msgstr ""

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2013-04-02 15:49:52 UTC (rev 8741)
+++ trunk/locale/po/phpwiki.pot	2013-04-08 13:18:14 UTC (rev 8742)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-04 11:12+0100\n"
+"POT-Creation-Date: 2013-04-08 15:17+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"
@@ -2336,6 +2336,9 @@
 msgid "PHP syntax highlighting."
 msgstr ""
 
+msgid "Please provide source code to PhpHighlight plugin"
+msgstr ""
+
 #, php-format
 msgid "Invalid color: %s"
 msgstr ""

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2013-04-02 15:49:52 UTC (rev 8741)
+++ trunk/locale/po/sv.po	2013-04-08 13:18:14 UTC (rev 8742)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-04 11:12+0100\n"
+"POT-Creation-Date: 2013-04-08 15:17+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -2339,6 +2339,9 @@
 msgid "PHP syntax highlighting."
 msgstr ""
 
+msgid "Please provide source code to PhpHighlight plugin"
+msgstr ""
+
 #, php-format
 msgid "Invalid color: %s"
 msgstr ""

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2013-04-02 15:49:52 UTC (rev 8741)
+++ trunk/locale/po/zh.po	2013-04-08 13:18:14 UTC (rev 8742)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-04 11:12+0100\n"
+"POT-Creation-Date: 2013-04-08 15:17+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -2472,6 +2472,9 @@
 msgid "PHP syntax highlighting."
 msgstr "PHP 語法效果"
 
+msgid "Please provide source code to PhpHighlight plugin"
+msgstr ""
+
 #, php-format
 msgid "Invalid color: %s"
 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:[8741] trunk

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

Revision: 8741
          http://sourceforge.net/p/phpwiki/code/8741
Author:   vargenau
Date:     2013-04-02 15:49:52 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
Use HTML 5 DOCTYPE

Modified Paths:
--------------
    trunk/configurator.php
    trunk/lib/ErrorManager.php
    trunk/lib/plugin/RecentChanges.php
    trunk/passencrypt.php
    trunk/themes/Crao/templates/htmldump.tmpl
    trunk/themes/Sidebar/templates/frame-left.tmpl
    trunk/themes/default/templates/htmldump.tmpl

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2013-04-02 15:34:45 UTC (rev 8740)
+++ trunk/configurator.php	2013-04-02 15:49:52 UTC (rev 8741)
@@ -159,13 +159,11 @@
     IniConfig($fs_def_file);
 }
 
-echo '<', '?xml version="1.0" encoding="utf-8"?', ">\n";
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <meta charset="UTF-8" />
     <title>Configuration tool for PhpWiki <?php echo $config_file ?></title>
     <style type="text/css" media="screen">
         <!--

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2013-04-02 15:34:45 UTC (rev 8740)
+++ trunk/lib/ErrorManager.php	2013-04-02 15:49:52 UTC (rev 8741)
@@ -269,12 +269,10 @@
         // Handle it ourself.
         if ($error->isFatal()) {
             $this->_noCacheHeaders();
-            echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-            echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n";
-            echo "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
+            echo "<!DOCTYPE html>\n";
             echo "<html>\n";
             echo "<head>\n";
-            echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n";
+            echo "<meta charset=\"UTF-8\" />\n";
             echo "<title>Fatal Error</title>\n";
             echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"themes/default/phpwiki.css\" />\n";
             echo "</head>\n";

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2013-04-02 15:34:45 UTC (rev 8740)
+++ trunk/lib/plugin/RecentChanges.php	2013-04-02 15:49:52 UTC (rev 8741)
@@ -733,12 +733,8 @@
         global $request;
         $request->discardOutput();
 
-        printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", 'UTF-8');
-        printf('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"');
-        printf('  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');
-        printf('<html xmlns="http://www.w3.org/1999/xhtml">');
-
-        printf("<head>\n");
+        print("<!DOCTYPE html>\n");
+        print("<head>\n");
         extract($this->_args);
         if (!empty($category))
             $title = $category;

Modified: trunk/passencrypt.php
===================================================================
--- trunk/passencrypt.php	2013-04-02 15:34:45 UTC (rev 8740)
+++ trunk/passencrypt.php	2013-04-02 15:49:52 UTC (rev 8741)
@@ -1,9 +1,7 @@
-<?php echo "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n"; ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+    <meta charset="UTF-8" />
     <title>Password Encryption Tool</title>
     <!--
     Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam

Modified: trunk/themes/Crao/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Crao/templates/htmldump.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
+++ trunk/themes/Crao/templates/htmldump.tmpl	2013-04-02 15:49:52 UTC (rev 8741)
@@ -4,7 +4,7 @@
  * mainly for the outer level <html> stuff and the and <head>.
  */
 ?>
-<!DOCTYPE>
+<!DOCTYPE html>
 <head>
 <meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />

Modified: trunk/themes/Sidebar/templates/frame-left.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/frame-left.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
+++ trunk/themes/Sidebar/templates/frame-left.tmpl	2013-04-02 15:49:52 UTC (rev 8741)
@@ -3,7 +3,7 @@
  * This template is responsible mainly for the outer level <html> stuff.
  */
 ?>
-<!DOCTYPE>
+<!DOCTYPE html>
 <head>
 <meta charset="UTF-8" />
 <?php echo Template('head') ?>

Modified: trunk/themes/default/templates/htmldump.tmpl
===================================================================
--- trunk/themes/default/templates/htmldump.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
+++ trunk/themes/default/templates/htmldump.tmpl	2013-04-02 15:49:52 UTC (rev 8741)
@@ -4,11 +4,10 @@
  * mainly for the outer level <html> stuff and the and <head>.
  */
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
 <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?>" />

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

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

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

Revision: 8740
          http://sourceforge.net/p/phpwiki/code/8740
Author:   vargenau
Date:     2013-04-02 15:34:45 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
Use HTML 5 DOCTYPE; force CHARSET=utf-8

Modified Paths:
--------------
    trunk/themes/Crao/templates/navbar.tmpl
    trunk/themes/Crao/templates/signin.tmpl
    trunk/themes/MonoBook/templates/navbar.tmpl
    trunk/themes/Sidebar/templates/html.tmpl
    trunk/themes/Sidebar/templates/htmldump.tmpl
    trunk/themes/Sidebar/templates/search.tmpl
    trunk/themes/blog/templates/blogform.tmpl
    trunk/themes/default/templates/blogform.tmpl
    trunk/themes/default/templates/head.tmpl
    trunk/themes/default/templates/html.tmpl
    trunk/themes/default/templates/htmldump.tmpl
    trunk/themes/default/templates/redirect.tmpl
    trunk/themes/default/templates/search.tmpl
    trunk/themes/default/templates/signin.tmpl
    trunk/themes/fusionforge/templates/blogform.tmpl
    trunk/themes/shamino_com/templates/signin.tmpl
    trunk/themes/shamino_com/templates/top.tmpl
    trunk/themes/smaller/templates/navbar.tmpl
    trunk/themes/smaller/templates/signin.tmpl

Modified: trunk/themes/Crao/templates/navbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/navbar.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
+++ trunk/themes/Crao/templates/navbar.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
@@ -1,6 +1,6 @@
 <!-- The top navigation/search bar -->
 <form action="<?php echo WikiURL(_("TitleSearch"))?>"
-      method="get" accept-charset="<?php echo $charset?>" id="searchform">
+      method="get" accept-charset="UTF-8" id="searchform">
 <input type="hidden" name="auto_redirect" value="1" />
 <?php if (! USE_PATH_INFO) { ?>
   <input type="hidden" name="pagename" value="<?php echo _("TitleSearch")?>" />

Modified: trunk/themes/Crao/templates/signin.tmpl
===================================================================
--- trunk/themes/Crao/templates/signin.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
+++ trunk/themes/Crao/templates/signin.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
@@ -5,7 +5,7 @@
     $NOFORM = true;
 ?>
 <?php if (empty($NOFORM)) { ?>
-  <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="<?php echo $charset?>" name="<?php echo $FORMNAME?>">
+  <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>">
   <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?>
 <?php } ?>
 <?php if ($user->isSignedIn()) {

Modified: trunk/themes/MonoBook/templates/navbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/navbar.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
+++ trunk/themes/MonoBook/templates/navbar.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
@@ -29,7 +29,7 @@
 						       'type'=>'submit',
 						       'value'=>_("Go"))))) ?>
 <!-- <form action="<?php echo WikiURL(_("TitleSearch"))?>"
-      method="get" accept-charset="<?php echo $charset?>">
+      method="get" accept-charset="UTF-8">
       <?php echo WikiLink(_("FindPage"), "searchButton",_("Search:")) ?>
       <input type="hidden" name="auto_redirect" value="1" />
       <input type="text"  name="s" size="12" maxlength="256"

Modified: trunk/themes/Sidebar/templates/html.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/html.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
+++ trunk/themes/Sidebar/templates/html.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
@@ -2,10 +2,9 @@
 /*
  * This template is responsible mainly for the outer level <html> stuff.
  */
-echo "<","?xml version=\"1.0\" encoding=\"", $charset, "\"?", ">\n";
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html <?php /* xmlns="http://www.w3.org/1999/xhtml" */ ?> xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>">
+?>
+<!DOCTYPE html>
+<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>">
 <?php echo Template('head') ?>
 <?php echo Template('body') ?>
 </html>

Modified: trunk/themes/Sidebar/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/htmldump.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
+++ trunk/themes/Sidebar/templates/htmldump.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
@@ -4,11 +4,10 @@
  * mainly for the outer level <html> stuff and the and <head>.
  */
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset?>" />
+<meta charset="UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
 <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?>" />

Modified: trunk/themes/Sidebar/templates/search.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/search.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
+++ trunk/themes/Sidebar/templates/search.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
@@ -1,7 +1,7 @@
 <!--{{{ LiveSearch -->
 <div id="searchholder">
 <form id="searchform" action="<?php echo WikiURL(_("FindPage"))?>"
-      method="get" accept-charset="<?php echo $charset?>" style="display:inline" class="searchform">
+      method="get" accept-charset="UTF-8" style="display:inline" class="searchform">
 <?php 
 $s = $request->getArg('s') ? $request->getArg('s') : _("Search");
 $p = $WikiTheme->tooltipAccessKeyPrefix();

Modified: trunk/themes/blog/templates/blogform.tmpl
===================================================================
--- trunk/themes/blog/templates/blogform.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
+++ trunk/themes/blog/templates/blogform.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
@@ -1,6 +1,6 @@
 <div class="wikiblog wikiblog-form">
 <form action="<?php echo $request->getPostURL()?>" method="post" name="editpage"
-      accept-charset="<?php echo $charset?>" id="wikiblog-form">
+      accept-charset="UTF-8" id="wikiblog-form">
   <input type="hidden" name="edit[pagename]" value="<?php echo $PAGENAME?>" />
   <input type="hidden" name="mode" value="add" />
   <div class="wikiblog-form">

Modified: trunk/themes/default/templates/blogform.tmpl
===================================================================
--- trunk/themes/default/templates/blogform.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
+++ trunk/themes/default/templates/blogform.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
@@ -1,6 +1,6 @@
 <div class="wikiblog wikiblog-form">
 <form action="<?php echo $request->getPostURL()?>" method="post" name="editpage"
-      accept-charset="<?php echo $charset?>" id="wikiblog-form">
+      accept-charset="UTF-8" id="wikiblog-form">
   <input type="hidden" name="edit[pagename]" value="<?php echo $PAGENAME?>" />
   <input type="hidden" name="mode" value="add" />
   <div class="wikiblog-form">

Modified: trunk/themes/default/templates/head.tmpl
===================================================================
--- trunk/themes/default/templates/head.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
+++ trunk/themes/default/templates/head.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
@@ -1,8 +1,8 @@
 <head>
 <?php if (ENABLE_XHTML_XML and strstr($request->get('HTTP_ACCEPT'),'application/xhtml+xml')) { ?>
-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=<?php echo $charset?>" />
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 <?php } else { ?>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset?>" />
+<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']?>" />

Modified: trunk/themes/default/templates/html.tmpl
===================================================================
--- trunk/themes/default/templates/html.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
+++ trunk/themes/default/templates/html.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
@@ -2,10 +2,9 @@
 /*
  * This template is responsible mainly for the outer level <html> stuff.
  */
-echo "<","?xml version=\"1.0\" encoding=\"", $charset, "\"?", ">\n";
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>">
+?>
+<!DOCTYPE html>
+<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>">
 <?php echo Template('head') ?>
 <?php echo Template('body') ?>
 </html>

Modified: trunk/themes/default/templates/htmldump.tmpl
===================================================================
--- trunk/themes/default/templates/htmldump.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
+++ trunk/themes/default/templates/htmldump.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
@@ -8,7 +8,7 @@
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset?>" />
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
 <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?>" />

Modified: trunk/themes/default/templates/redirect.tmpl
===================================================================
--- trunk/themes/default/templates/redirect.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
+++ trunk/themes/default/templates/redirect.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
@@ -2,10 +2,9 @@
 /* 
  * Redirect output.
  */
-echo "<","?xml version=\"1.0\" encoding=\"", $charset, "\"?", ">\n";
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+?>
+<!DOCTYPE html>
+<html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <meta name="robots" content="noindex, nofollow" />

Modified: trunk/themes/default/templates/search.tmpl
===================================================================
--- trunk/themes/default/templates/search.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
+++ trunk/themes/default/templates/search.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
@@ -1,7 +1,7 @@
 <!--{{{ LiveSearch --> <?php // -*- php -*- ?>
 <div id="searchholder">
 <form id="searchform" action="<?php echo WikiURL(_("TitleSearch"))?>"
-      method="get" accept-charset="<?php echo $charset?>" style="display:inline" class="searchform">
+      method="get" accept-charset="UTF-8" style="display:inline" class="searchform">
 <?php 
 $s = $request->getArg('s') ? $request->getArg('s') : _("Search");
 $p = $WikiTheme->tooltipAccessKeyPrefix();

Modified: trunk/themes/default/templates/signin.tmpl
===================================================================
--- trunk/themes/default/templates/signin.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
+++ trunk/themes/default/templates/signin.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
@@ -5,7 +5,7 @@
     $NOFORM = true;
 ?>
 <?php if (empty($NOFORM)) { ?>
-  <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="<?php echo $charset?>" name="<?php echo $FORMNAME?>">
+  <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>">
   <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?>
 <?php } ?>
 <?php 

Modified: trunk/themes/fusionforge/templates/blogform.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/blogform.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
+++ trunk/themes/fusionforge/templates/blogform.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
@@ -1,6 +1,6 @@
 <div class="wikiblog wikiblog-form">
 <form action="<?php echo $request->getPostURL()?>" method="post" name="editpage"
-      accept-charset="<?php echo $charset?>" id="wikiblog-form">
+      accept-charset="UTF-8" id="wikiblog-form">
   <input type="hidden" name="edit[pagename]" value="<?php echo $PAGENAME?>" />
   <input type="hidden" name="mode" value="add" />
   <div class="wikiblog-form">

Modified: trunk/themes/shamino_com/templates/signin.tmpl
===================================================================
--- trunk/themes/shamino_com/templates/signin.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
+++ trunk/themes/shamino_com/templates/signin.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
@@ -6,7 +6,7 @@
     $NOFORM = true;
 ?>
 <?php if (empty($NOFORM)) { ?>
-  <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="<?php echo $charset?>" name="<?php echo $FORMNAME?>">
+  <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>">
   <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?>
 <?php }
 if ($user->isAuthenticated()) {

Modified: trunk/themes/shamino_com/templates/top.tmpl
===================================================================
--- trunk/themes/shamino_com/templates/top.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
+++ trunk/themes/shamino_com/templates/top.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
@@ -13,7 +13,7 @@
 <?php echo $HEADER ?>
 <?php if (empty($GLOBALS['HIDE_TOOLBARS'])) { ?>
  - <form action="<?php echo WikiURL(_("TitleSearch"))?>"
-      method="get" accept-charset="<?php echo $charset?>" style="display: inline">
+      method="get" accept-charset="UTF-8" style="display: inline">
    <a class="wikilink" href="<?php echo WikiURL(_("RecentChanges"))?>"><?php echo _("RecentChanges")?></a>
    - <a class="wikilink" href="<?php echo WikiURL(_("FindPage"))?>"><?php echo _("FindPage")?>:</a>
    <input type="hidden" name="auto_redirect" value="1" />

Modified: trunk/themes/smaller/templates/navbar.tmpl
===================================================================
--- trunk/themes/smaller/templates/navbar.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
+++ trunk/themes/smaller/templates/navbar.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
@@ -1,6 +1,6 @@
 <!-- The top navigation/search bar -->
 <form action="<?php echo WikiURL(_("TitleSearch"))?>"
-      method="get" accept-charset="<?php echo $charset?>">
+      method="get" accept-charset="UTF-8">
   <div id="navbuttons">
    <?php echo WikiLink(_("RecentChanges"), "","News") ?>
    <?php echo $SEP?><?php echo WikiLink(_("FindPage"), "","Search:") ?>

Modified: trunk/themes/smaller/templates/signin.tmpl
===================================================================
--- trunk/themes/smaller/templates/signin.tmpl	2013-04-02 13:51:35 UTC (rev 8739)
+++ trunk/themes/smaller/templates/signin.tmpl	2013-04-02 15:34:45 UTC (rev 8740)
@@ -5,7 +5,7 @@
     $NOFORM = true;
 ?>
 <?php if (empty($NOFORM)) { ?>
-  <form style="display:inline" method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="<?php echo $charset?>" name="<?php echo $FORMNAME?>">
+  <form style="display:inline" method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>">
   <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?>
 <?php } ?>
 <?php 

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