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

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

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

Revision: 8489
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8489&view=rev
Author:   vargenau
Date:     2012-11-19 16:40:58 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
Allow AsciiMath plugin in Fusionforge

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

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2012-11-18 17:58:55 UTC (rev 8488)
+++ trunk/lib/IniConfig.php	2012-11-19 16:40:58 UTC (rev 8489)
@@ -659,6 +659,7 @@
     global $AllAllowedPlugins;
     $AllAllowedPlugins = $ActionPages;
     // Add plugins that have no corresponding action page
+    $AllAllowedPlugins[] = 'AsciiMath';
     $AllAllowedPlugins[] = 'AsciiSVG';
     $AllAllowedPlugins[] = 'AtomFeed';
     $AllAllowedPlugins[] = 'BoxRight';
@@ -730,7 +731,6 @@
     if (!FUSIONFORGE) {
         $AllAllowedPlugins[] = 'AddComment';
         $AllAllowedPlugins[] = 'AnalyseAccessLogSql';
-        $AllAllowedPlugins[] = 'AsciiMath';
         $AllAllowedPlugins[] = '_AuthInfo';
         $AllAllowedPlugins[] = '_BackendInfo';
         $AllAllowedPlugins[] = 'CacheTest';

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

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

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

Revision: 8488
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8488&view=rev
Author:   vargenau
Date:     2012-11-18 17:58:55 +0000 (Sun, 18 Nov 2012)
Log Message:
-----------
Whitespace only

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

Modified: trunk/lib/plugin/EditMetaData.php
===================================================================
--- trunk/lib/plugin/EditMetaData.php	2012-11-17 20:25:57 UTC (rev 8487)
+++ trunk/lib/plugin/EditMetaData.php	2012-11-18 17:58:55 UTC (rev 8488)
@@ -33,10 +33,10 @@
  *
  * Access by restricted to ADMIN_USER
  *
- * Written by MichaelVanDam, to test out some ideas about
+ * Written by Michael Van Dam, to test out some ideas about
  * PagePermissions and PageTypes.
  *
- * Rewritten for recursive array support by ReiniUrban.
+ * Rewritten for recursive array support by Reini Urban.
  */
 
 require_once 'lib/plugin/_BackendInfo.php';
@@ -56,8 +56,7 @@
 
     function getDefaultArguments()
     {
-        return array('page' => '[pagename]'
-        );
+        return array('page' => '[pagename]');
     }
 
     function run($dbi, $argstr, &$request, $basepage)
@@ -194,8 +193,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

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

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

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

Revision: 8487
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8487&view=rev
Author:   vargenau
Date:     2012-11-17 20:25:57 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
Wikicreole syntax

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

Modified: trunk/pgsrc/Help%2FGraphVizPlugin
===================================================================
--- trunk/pgsrc/Help%2FGraphVizPlugin	2012-11-17 20:15:29 UTC (rev 8486)
+++ trunk/pgsrc/Help%2FGraphVizPlugin	2012-11-17 20:25:57 UTC (rev 8487)
@@ -1,4 +1,4 @@
-Date: Thu,  9 Dec 2010 14:49:00 +0000
+Date: Thu,  9 Nov 2012 14:49:00 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FGraphVizPlugin;
@@ -8,9 +8,9 @@
 Content-Transfer-Encoding: binary
 
 The **~GraphViz** [[Help:WikiPlugin|plugin]] passes all its arguments to the grapviz =dot=
-binary and displays the result as cached image (PNG,GIF,SVG) or
+binary and displays the result as cached image (PNG, GIF, SVG) or
 imagemap.  See http://www.graphviz.org/Documentation.php,
-esp. http://www.graphviz.org/doc/info/lang.html for the *dot* language
+esp. http://www.graphviz.org/doc/info/lang.html for the **dot** language
 specs.
 
 == Notes ==

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

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

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

Revision: 8486
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8486&view=rev
Author:   vargenau
Date:     2012-11-17 20:15:29 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
pear --> PEAR

Modified Paths:
--------------
    trunk/doc/README.foaf
    trunk/lib/plugin/FoafViewer.php
    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

Modified: trunk/doc/README.foaf
===================================================================
--- trunk/doc/README.foaf	2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/doc/README.foaf	2012-11-17 20:15:29 UTC (rev 8486)
@@ -1,7 +1,7 @@
 !FoaF
 !Technology
 * RAP - RDF API for PHP
-* XML_FOAF, Pear
+* XML_FOAF, PEAR
 
 !Why not bare bones RAP?
 RAP is too hard to work with, it provides all of the needed power and functionality, but this means that it tends to get a bit complex to deal with.
@@ -205,8 +205,8 @@
 # FoafMakePlugin will get some kind of user id from the database, and retrieve any stored information about the user - outputting as FOAF.
 
 !Installing PEAR / XML_FOAF
-The XML_FOAF pear library will not be included with phpwiki, so you have to install the pear 
-library by your own and be sure that the pear path is in the include_path.
+The XML_FOAF PEAR library will not be included with phpwiki, so you have to install the PEAR 
+library by your own and be sure that the PEAR path is in the include_path.
 
 Reason: XML_FOAF is based on XML_Parser and XML_Tree, but phpwiki uses its own XML parser and XML 
 tree representation, so it would be unneccesary and incompatible duplication of the same thing.
@@ -216,7 +216,7 @@
 PEAR Package: XML_Tree 1.1 or newer
 PEAR Package: XML_Beautifier 0.2.2 or newer
 
-Pear is dead simple to install.
+PEAR is dead simple to install.
 !! Win32
 <verbatim>
 Start > Run > Command.com
@@ -234,7 +234,7 @@
 pear install XML_Beautifier
 pear install XML_FOAF
 </verbatim>
-Now, chances are, you won't get away with it all this easy, but if you can't get pear to install XML_FOAF (no ''stable'' package available), then follow these steps next
+Now, chances are, you won't get away with it all this easy, but if you can't get PEAR to install XML_FOAF (no ''stable'' package available), then follow these steps next
 # Download [XML_FOAF 0.2|http://pear.php.net/get/XML_FOAF-0.2.tgz]
 # Extract XML_FOAF-0.2.tgz/XML_FOAF-0.2/FOAF/ to C:\php\pear\XML\FOAF
 # Extract documentation to c:\php\pear\docs\

Modified: trunk/lib/plugin/FoafViewer.php
===================================================================
--- trunk/lib/plugin/FoafViewer.php	2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/lib/plugin/FoafViewer.php	2012-11-17 20:15:29 UTC (rev 8486)
@@ -92,13 +92,13 @@
         global $ErrorManager;
         $ErrorManager->pushErrorHandler(new WikiMethodCb($this,'_error_handler'));
         */
-        // Require the XML_FOAF_Parser class. This is a pear library not included with phpwiki.
+        // Require the XML_FOAF_Parser class. This is a PEAR library not included with phpwiki.
         // see doc/README.foaf
         if (findFile('XML/FOAF/Parser.php', 'missing_ok'))
             require_once 'XML/FOAF/Parser.php';
         //$ErrorManager->popErrorHandler();
         if (!class_exists('XML_FOAF_Parser'))
-            return $this->error(_("required pear library XML/FOAF/Parser.php not found in include_path"));
+            return $this->error(_("required PEAR library XML/FOAF/Parser.php not found in include_path"));
 
         extract($this->getArgs($argstr, $request));
         // Get our FOAF File from the foaf plugin argument or $_GET['foaf']

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/locale/po/de.po	2012-11-17 20:15:29 UTC (rev 8486)
@@ -2514,7 +2514,7 @@
 msgstr ""
 
 #: ../lib/plugin/FoafViewer.php:101
-msgid "required pear library XML/FOAF/Parser.php not found in include_path"
+msgid "required PEAR library XML/FOAF/Parser.php not found in include_path"
 msgstr ""
 
 #: ../lib/plugin/FoafViewer.php:107

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/locale/po/es.po	2012-11-17 20:15:29 UTC (rev 8486)
@@ -2480,7 +2480,7 @@
 msgstr ""
 
 #: ../lib/plugin/FoafViewer.php:101
-msgid "required pear library XML/FOAF/Parser.php not found in include_path"
+msgid "required PEAR library XML/FOAF/Parser.php not found in include_path"
 msgstr ""
 
 #: ../lib/plugin/FoafViewer.php:107

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/locale/po/fr.po	2012-11-17 20:15:29 UTC (rev 8486)
@@ -2484,7 +2484,7 @@
 msgstr ""
 
 #: ../lib/plugin/FoafViewer.php:101
-msgid "required pear library XML/FOAF/Parser.php not found in include_path"
+msgid "required PEAR library XML/FOAF/Parser.php not found in include_path"
 msgstr ""
 
 #: ../lib/plugin/FoafViewer.php:107

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/locale/po/it.po	2012-11-17 20:15:29 UTC (rev 8486)
@@ -2460,7 +2460,7 @@
 msgstr ""
 
 #: ../lib/plugin/FoafViewer.php:101
-msgid "required pear library XML/FOAF/Parser.php not found in include_path"
+msgid "required PEAR library XML/FOAF/Parser.php not found in include_path"
 msgstr ""
 
 #: ../lib/plugin/FoafViewer.php:107

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/locale/po/ja.po	2012-11-17 20:15:29 UTC (rev 8486)
@@ -2485,7 +2485,7 @@
 msgstr ""
 
 #: ../lib/plugin/FoafViewer.php:101
-msgid "required pear library XML/FOAF/Parser.php not found in include_path"
+msgid "required PEAR library XML/FOAF/Parser.php not found in include_path"
 msgstr ""
 
 #: ../lib/plugin/FoafViewer.php:107

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/locale/po/nl.po	2012-11-17 20:15:29 UTC (rev 8486)
@@ -2452,7 +2452,7 @@
 msgstr ""
 
 #: ../lib/plugin/FoafViewer.php:101
-msgid "required pear library XML/FOAF/Parser.php not found in include_path"
+msgid "required PEAR library XML/FOAF/Parser.php not found in include_path"
 msgstr ""
 
 #: ../lib/plugin/FoafViewer.php:107

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/locale/po/phpwiki.pot	2012-11-17 20:15:29 UTC (rev 8486)
@@ -2445,7 +2445,7 @@
 msgstr ""
 
 #: ../lib/plugin/FoafViewer.php:101
-msgid "required pear library XML/FOAF/Parser.php not found in include_path"
+msgid "required PEAR library XML/FOAF/Parser.php not found in include_path"
 msgstr ""
 
 #: ../lib/plugin/FoafViewer.php:107

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/locale/po/sv.po	2012-11-17 20:15:29 UTC (rev 8486)
@@ -2446,7 +2446,7 @@
 msgstr ""
 
 #: ../lib/plugin/FoafViewer.php:101
-msgid "required pear library XML/FOAF/Parser.php not found in include_path"
+msgid "required PEAR library XML/FOAF/Parser.php not found in include_path"
 msgstr ""
 
 #: ../lib/plugin/FoafViewer.php:107

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/locale/po/zh.po	2012-11-17 20:15:29 UTC (rev 8486)
@@ -2548,7 +2548,7 @@
 msgstr ""
 
 #: ../lib/plugin/FoafViewer.php:101
-msgid "required pear library XML/FOAF/Parser.php not found in include_path"
+msgid "required PEAR library XML/FOAF/Parser.php not found in include_path"
 msgstr ""
 
 #: ../lib/plugin/FoafViewer.php:107

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8485] trunk/lib/plugin/AsciiMath.php

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

Revision: 8485
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8485&view=rev
Author:   vargenau
Date:     2012-11-17 19:24:01 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
ASCIIMathPHP-2.0.cfg.php --> ASCIIMathPHP.cfg.php

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

Modified: trunk/lib/plugin/AsciiMath.php
===================================================================
--- trunk/lib/plugin/AsciiMath.php	2012-11-17 19:11:14 UTC (rev 8484)
+++ trunk/lib/plugin/AsciiMath.php	2012-11-17 19:24:01 UTC (rev 8485)
@@ -68,11 +68,7 @@
             return HTML::div(array('class' => "error"), "Please provide a formula to AsciiMath plugin");
         }
 
-        if (phpversion() >= '5') {
-            include 'lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php';
-        } else {
-            include 'lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php';
-        }
+        include 'lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php';
         $ascii_math = new ASCIIMathPHP($symbol_arr, $this->source);
         $ascii_math->genMathML();
         return HTML::raw($ascii_math->getMathML());

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

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

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

Revision: 8484
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8484&view=rev
Author:   vargenau
Date:     2012-11-17 19:11:14 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
PSR-2: Code MUST use 4 spaces for indenting, not tabs

Modified Paths:
--------------
    trunk/lib/nusoap/nusoap.php
    trunk/lib/pear/File_Passwd.php

Modified: trunk/lib/nusoap/nusoap.php
===================================================================
--- trunk/lib/nusoap/nusoap.php	2012-11-17 19:03:07 UTC (rev 8483)
+++ trunk/lib/nusoap/nusoap.php	2012-11-17 19:11:14 UTC (rev 8484)
@@ -2069,7 +2069,7 @@
                 if ($this->wsdl) {
                     //if($this->debug_flag){
                     $this->debug("WSDL debug data:\n" . $this->wsdl->debug_str);
-                    //	}
+                    // }
                     // Added: In case we use a WSDL, return a serialized env. WITH the usedNamespaces.
                     return $this->serializeEnvelope($payload, $this->responseHeaders, $this->wsdl->usedNamespaces, $this->opData['style']);
                 } else {

Modified: trunk/lib/pear/File_Passwd.php
===================================================================
--- trunk/lib/pear/File_Passwd.php	2012-11-17 19:03:07 UTC (rev 8483)
+++ trunk/lib/pear/File_Passwd.php	2012-11-17 19:11:14 UTC (rev 8484)
@@ -72,9 +72,9 @@
     * breaks bc to v1.3 and smaller).
     * Don't forget to call close() to save changes!
     *
-    * @param $file		name of the passwd file
-    * @param $lock		if 'true' $lockfile will be locked
-    * @param $lockfile	name of the temp file, where changes are saved
+    * @param $file        name of the passwd file
+    * @param $lock        if 'true' $lockfile will be locked
+    * @param $lockfile    name of the temp file, where changes are saved
     *
     * @access public
     * @see close()

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8483] trunk/g

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

Revision: 8483
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8483&view=rev
Author:   vargenau
Date:     2012-11-17 19:03:07 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
PSR-2: Code MUST use 4 spaces for indenting, not tabs

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

Modified: trunk/g
===================================================================
--- trunk/g	2012-11-16 18:08:14 UTC (rev 8482)
+++ trunk/g	2012-11-17 19:03:07 UTC (rev 8483)
@@ -52,15 +52,15 @@
 
 html_use_jquery();
 if (forge_get_config('use_jquery_form_navigate')) {
-	use_javascript('/scripts/jquery-formnavigate/jquery.FormNavigate-min.js');
+    use_javascript('/scripts/jquery-formnavigate/jquery.FormNavigate-min.js');
 }
 
 if (isset($group_id) && $group_id) {
-	if (! isset($project) || ! $project) {
-		$project = group_get_object($group_id);
-	}
+    if (! isset($project) || ! $project) {
+        $project = group_get_object($group_id);
+    }
 } elseif(isset($project) && is_object($project)) {
-	$group_id = $project->getID();
+    $group_id = $project->getID();
 }
 
 if (! isset($group_id) || ! isset($project)) {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8482] trunk/pgsrc/ Help%2FAdvice%20for%20Mediawiki%20users

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

Revision: 8482
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8482&view=rev
Author:   vargenau
Date:     2012-11-16 18:08:14 +0000 (Fri, 16 Nov 2012)
Log Message:
-----------
Fix pagename

Modified Paths:
--------------
    trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users

Modified: trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users
===================================================================
--- trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users	2012-11-15 16:52:26 UTC (rev 8481)
+++ trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users	2012-11-16 18:08:14 UTC (rev 8482)
@@ -1,7 +1,7 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Fri, 10 Sep 2012 13:46:13 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
-  pagename=Help%2FAdvice%20Mediawiki%20users;
+  pagename=Help%2FAdvice%20for%20Mediawiki%20users;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
   markup=2;
   charset=UTF-8

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

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

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

Revision: 8481
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8481&view=rev
Author:   vargenau
Date:     2012-11-15 16:52:26 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
Update translations

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/es/LC_MESSAGES/phpwiki.php
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.php
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.php
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.php
    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/sv/LC_MESSAGES/phpwiki.php
    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	2012-11-15 16:42:18 UTC (rev 8480)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2012-11-15 16:52:26 UTC (rev 8481)
@@ -425,6 +425,7 @@
 $locale["Found by "] = "Gefunden von ";
 $locale["FrameInclude"] = "FrameEinbetten";
 $locale["From english to %s: "] = "Von Englisch nach %s: ";
+$locale["Full text search results for “%s”"] = "Volltext-Suchresultate nach »%s«";
 $locale["FullDump"] = "VollSicherung";
 $locale["FullRecentChanges"] = "AlleNeuesteÄnderungen";
 $locale["FullTextSearch"] = "VolltextSuche";

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

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/es/LC_MESSAGES/phpwiki.php	2012-11-15 16:42:18 UTC (rev 8480)
+++ trunk/locale/es/LC_MESSAGES/phpwiki.php	2012-11-15 16:52:26 UTC (rev 8481)
@@ -172,6 +172,7 @@
 $locale["Find page"] = "Buscar Página";
 $locale["FindPage"] = "BuscarPágina";
 $locale["First"] = "Primera";
+$locale["Full text search results for “%s”"] = "Resultados de la búsqueda en el texto completo para '%s'";
 $locale["FullDump"] = "DescargaCompleta";
 $locale["FullTextSearch"] = "BúsquedaDelTexto";
 $locale["Given password ignored."] = "Contraseña no hecho caso.";

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	2012-11-15 16:42:18 UTC (rev 8480)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2012-11-15 16:52:26 UTC (rev 8481)
@@ -441,6 +441,7 @@
 $locale["FrameInclude"] = "InclureUnCadre";
 $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";
 $locale["FullRecentChanges"] = "DernièresModifs";
 $locale["FullTextSearch"] = "RechercheEnTexteIntégral";

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

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/it/LC_MESSAGES/phpwiki.php	2012-11-15 16:42:18 UTC (rev 8480)
+++ trunk/locale/it/LC_MESSAGES/phpwiki.php	2012-11-15 16:52:26 UTC (rev 8481)
@@ -77,6 +77,7 @@
 $locale["Find page"] = "Trova Pagina";
 $locale["FindPage"] = "TrovaPagina";
 $locale["First"] = "Prima";
+$locale["Full text search results for “%s”"] = "Risultati della ricerca su tutto il testo per '%s'";
 $locale["FullTextSearch"] = "RicercaDelTesto";
 $locale["Global user preferences (for all projects)"] = "Preferenze dell'utente globale (per tutti i progetti)";
 $locale["Go"] = "Vai";

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/nl/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/nl/LC_MESSAGES/phpwiki.php	2012-11-15 16:42:18 UTC (rev 8480)
+++ trunk/locale/nl/LC_MESSAGES/phpwiki.php	2012-11-15 16:52:26 UTC (rev 8481)
@@ -28,6 +28,7 @@
 $locale["Fatal PhpWiki Error"] = "PhpWiki Fatale Fout";
 $locale["Find page"] = "Zoek Pagina";
 $locale["FindPage"] = "ZoekPagina";
+$locale["Full text search results for “%s”"] = "Volledige tekst zoek resultaten naar '%s'";
 $locale["FullTextSearch"] = "VolledigeTekstZoek";
 $locale["H"] = "H";
 $locale["Height"] = "Hoogte";

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2012-11-15 16:42:18 UTC (rev 8480)
+++ trunk/locale/po/de.po	2012-11-15 16:52:26 UTC (rev 8481)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-15 14:37+0100\n"
+"POT-Creation-Date: 2012-11-15 17:50+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -2229,7 +2229,7 @@
 msgstr "Bearbeite %s"
 
 #: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1579 ../lib/WikiUser.php:501
+#: ../lib/WikiTheme.php:1559 ../lib/WikiUser.php:501
 #: ../themes/blog/templates/sidebar.tmpl:15
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:26
@@ -2595,7 +2595,7 @@
 msgstr "Den Text aller Seiten dieses Wikis durchsuchen."
 
 #: ../lib/plugin/FullTextSearch.php:92 ../lib/plugin/FullTextSearch.php:127
-#, fuzzy, php-format
+#, php-format
 msgid "Full text search results for “%s”"
 msgstr "Volltext-Suchresultate nach »%s«"
 
@@ -7121,16 +7121,16 @@
 msgid "Modern"
 msgstr "Modern"
 
-#: ../lib/WikiTheme.php:1874
+#: ../lib/WikiTheme.php:1854
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Zusatzprogramm %s: undefiniert"
 
-#: ../lib/WikiTheme.php:1901
+#: ../lib/WikiTheme.php:1881
 msgid "Related Links"
 msgstr "Verwandte Links"
 
-#: ../lib/WikiTheme.php:1924
+#: ../lib/WikiTheme.php:1904
 msgid "External Links"
 msgstr "Externe Links"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-11-15 16:42:18 UTC (rev 8480)
+++ trunk/locale/po/es.po	2012-11-15 16:52:26 UTC (rev 8481)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-15 14:37+0100\n"
+"POT-Creation-Date: 2012-11-15 17:50+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -2198,7 +2198,7 @@
 msgstr "Editar %s"
 
 #: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1579 ../lib/WikiUser.php:501
+#: ../lib/WikiTheme.php:1559 ../lib/WikiUser.php:501
 #: ../themes/blog/templates/sidebar.tmpl:15
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:26
@@ -2556,7 +2556,7 @@
 msgstr ""
 
 #: ../lib/plugin/FullTextSearch.php:92 ../lib/plugin/FullTextSearch.php:127
-#, fuzzy, php-format
+#, php-format
 msgid "Full text search results for “%s”"
 msgstr "Resultados de la búsqueda en el texto completo para '%s'"
 
@@ -6954,16 +6954,16 @@
 msgid "Modern"
 msgstr "Moderno"
 
-#: ../lib/WikiTheme.php:1874
+#: ../lib/WikiTheme.php:1854
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Plugin %s: indefinido"
 
-#: ../lib/WikiTheme.php:1901
+#: ../lib/WikiTheme.php:1881
 msgid "Related Links"
 msgstr "Acoplamientos Relacionados"
 
-#: ../lib/WikiTheme.php:1924
+#: ../lib/WikiTheme.php:1904
 msgid "External Links"
 msgstr "Acoplamientos Externos"
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-11-15 16:42:18 UTC (rev 8480)
+++ trunk/locale/po/fr.po	2012-11-15 16:52:26 UTC (rev 8481)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-15 14:37+0100\n"
+"POT-Creation-Date: 2012-11-15 17:50+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -2197,7 +2197,7 @@
 msgstr "Éditer %s"
 
 #: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1579 ../lib/WikiUser.php:501
+#: ../lib/WikiTheme.php:1559 ../lib/WikiUser.php:501
 #: ../themes/blog/templates/sidebar.tmpl:15
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:26
@@ -2561,7 +2561,7 @@
 msgstr "Rechercher le contenu de toutes les pages de ce wiki."
 
 #: ../lib/plugin/FullTextSearch.php:92 ../lib/plugin/FullTextSearch.php:127
-#, fuzzy, php-format
+#, php-format
 msgid "Full text search results for “%s”"
 msgstr "Résultats de la recherche en texte intégral de ' %s '"
 
@@ -7029,16 +7029,16 @@
 msgid "Modern"
 msgstr "Moderne"
 
-#: ../lib/WikiTheme.php:1874
+#: ../lib/WikiTheme.php:1854
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Plugin %s: non défini"
 
-#: ../lib/WikiTheme.php:1901
+#: ../lib/WikiTheme.php:1881
 msgid "Related Links"
 msgstr "Liens correspondants"
 
-#: ../lib/WikiTheme.php:1924
+#: ../lib/WikiTheme.php:1904
 msgid "External Links"
 msgstr "Liens externes"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-11-15 16:42:18 UTC (rev 8480)
+++ trunk/locale/po/it.po	2012-11-15 16:52:26 UTC (rev 8481)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-15 14:37+0100\n"
+"POT-Creation-Date: 2012-11-15 17:50+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -2178,7 +2178,7 @@
 msgstr "Modifica %s"
 
 #: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1579 ../lib/WikiUser.php:501
+#: ../lib/WikiTheme.php:1559 ../lib/WikiUser.php:501
 #: ../themes/blog/templates/sidebar.tmpl:15
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:26
@@ -2536,7 +2536,7 @@
 msgstr ""
 
 #: ../lib/plugin/FullTextSearch.php:92 ../lib/plugin/FullTextSearch.php:127
-#, fuzzy, php-format
+#, php-format
 msgid "Full text search results for “%s”"
 msgstr "Risultati della ricerca su tutto il testo per '%s'"
 
@@ -6922,16 +6922,16 @@
 msgid "Modern"
 msgstr "Moderno"
 
-#: ../lib/WikiTheme.php:1874
+#: ../lib/WikiTheme.php:1854
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Plugin '%s': non definito"
 
-#: ../lib/WikiTheme.php:1901
+#: ../lib/WikiTheme.php:1881
 msgid "Related Links"
 msgstr "Collegamenti Relativi"
 
-#: ../lib/WikiTheme.php:1924
+#: ../lib/WikiTheme.php:1904
 msgid "External Links"
 msgstr "Collegamenti Esterni"
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-11-15 16:42:18 UTC (rev 8480)
+++ trunk/locale/po/ja.po	2012-11-15 16:52:26 UTC (rev 8481)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-15 14:37+0100\n"
+"POT-Creation-Date: 2012-11-15 17:50+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -2192,7 +2192,7 @@
 msgstr "%s を編集"
 
 #: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1579 ../lib/WikiUser.php:501
+#: ../lib/WikiTheme.php:1559 ../lib/WikiUser.php:501
 #: ../themes/blog/templates/sidebar.tmpl:15
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:26
@@ -7064,16 +7064,16 @@
 msgid "Modern"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1874
+#: ../lib/WikiTheme.php:1854
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1901
+#: ../lib/WikiTheme.php:1881
 msgid "Related Links"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1924
+#: ../lib/WikiTheme.php:1904
 msgid "External Links"
 msgstr ""
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2012-11-15 16:42:18 UTC (rev 8480)
+++ trunk/locale/po/nl.po	2012-11-15 16:52:26 UTC (rev 8481)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-15 14:37+0100\n"
+"POT-Creation-Date: 2012-11-15 17:50+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -2170,7 +2170,7 @@
 msgstr "Verander %s"
 
 #: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1579 ../lib/WikiUser.php:501
+#: ../lib/WikiTheme.php:1559 ../lib/WikiUser.php:501
 #: ../themes/blog/templates/sidebar.tmpl:15
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:26
@@ -2528,7 +2528,7 @@
 msgstr ""
 
 #: ../lib/plugin/FullTextSearch.php:92 ../lib/plugin/FullTextSearch.php:127
-#, fuzzy, php-format
+#, php-format
 msgid "Full text search results for “%s”"
 msgstr "Volledige tekst zoek resultaten naar '%s'"
 
@@ -6909,16 +6909,16 @@
 msgid "Modern"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1874
+#: ../lib/WikiTheme.php:1854
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1901
+#: ../lib/WikiTheme.php:1881
 msgid "Related Links"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1924
+#: ../lib/WikiTheme.php:1904
 msgid "External Links"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2012-11-15 16:42:18 UTC (rev 8480)
+++ trunk/locale/po/phpwiki.pot	2012-11-15 16:52:26 UTC (rev 8481)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-15 14:37+0100\n"
+"POT-Creation-Date: 2012-11-15 17:50+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -2163,7 +2163,7 @@
 msgstr ""
 
 #: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1579 ../lib/WikiUser.php:501
+#: ../lib/WikiTheme.php:1559 ../lib/WikiUser.php:501
 #: ../themes/blog/templates/sidebar.tmpl:15
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:26
@@ -6900,16 +6900,16 @@
 msgid "Modern"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1874
+#: ../lib/WikiTheme.php:1854
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1901
+#: ../lib/WikiTheme.php:1881
 msgid "Related Links"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1924
+#: ../lib/WikiTheme.php:1904
 msgid "External Links"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2012-11-15 16:42:18 UTC (rev 8480)
+++ trunk/locale/po/sv.po	2012-11-15 16:52:26 UTC (rev 8481)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-15 14:37+0100\n"
+"POT-Creation-Date: 2012-11-15 17:50+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -2164,7 +2164,7 @@
 msgstr "Redigera %s"
 
 #: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1579 ../lib/WikiUser.php:501
+#: ../lib/WikiTheme.php:1559 ../lib/WikiUser.php:501
 #: ../themes/blog/templates/sidebar.tmpl:15
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:26
@@ -2522,7 +2522,7 @@
 msgstr ""
 
 #: ../lib/plugin/FullTextSearch.php:92 ../lib/plugin/FullTextSearch.php:127
-#, fuzzy, php-format
+#, php-format
 msgid "Full text search results for “%s”"
 msgstr "Sökresultat för fulltextsökning för '%s'"
 
@@ -6903,16 +6903,16 @@
 msgid "Modern"
 msgstr "Ny|modig"
 
-#: ../lib/WikiTheme.php:1874
+#: ../lib/WikiTheme.php:1854
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1901
+#: ../lib/WikiTheme.php:1881
 msgid "Related Links"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1924
+#: ../lib/WikiTheme.php:1904
 msgid "External Links"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2012-11-15 16:42:18 UTC (rev 8480)
+++ trunk/locale/po/zh.po	2012-11-15 16:52:26 UTC (rev 8481)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-15 14:37+0100\n"
+"POT-Creation-Date: 2012-11-15 17:50+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -2248,7 +2248,7 @@
 msgstr "編輯 %s"
 
 #: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1579 ../lib/WikiUser.php:501
+#: ../lib/WikiTheme.php:1559 ../lib/WikiUser.php:501
 #: ../themes/blog/templates/sidebar.tmpl:15
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:26
@@ -2625,7 +2625,7 @@
 msgstr "在此 wiki 所有頁面中搜尋內容."
 
 #: ../lib/plugin/FullTextSearch.php:92 ../lib/plugin/FullTextSearch.php:127
-#, fuzzy, php-format
+#, php-format
 msgid "Full text search results for “%s”"
 msgstr "以 '%s' 全文搜尋的結果"
 
@@ -7208,16 +7208,16 @@
 msgid "Modern"
 msgstr "Modern"
 
-#: ../lib/WikiTheme.php:1874
+#: ../lib/WikiTheme.php:1854
 #, fuzzy, php-format
 msgid "Plugin %s: undefined"
 msgstr "Plugin %s 失敗."
 
-#: ../lib/WikiTheme.php:1901
+#: ../lib/WikiTheme.php:1881
 msgid "Related Links"
 msgstr "相關連結"
 
-#: ../lib/WikiTheme.php:1924
+#: ../lib/WikiTheme.php:1904
 msgid "External Links"
 msgstr "外部連結"
 

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

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/sv/LC_MESSAGES/phpwiki.php	2012-11-15 16:42:18 UTC (rev 8480)
+++ trunk/locale/sv/LC_MESSAGES/phpwiki.php	2012-11-15 16:52:26 UTC (rev 8481)
@@ -39,6 +39,7 @@
 $locale["File '%s' not found."] = "Fila '%s' ingen funna.";
 $locale["Find page"] = "Sök Efter Sida";
 $locale["FindPage"] = "SökEfterSida";
+$locale["Full text search results for “%s”"] = "Sökresultat för fulltextsökning för '%s'";
 $locale["FullTextSearch"] = "Fulltextsökning";
 $locale["Go"] = "\"Gå till sidan\"";
 $locale["H"] = "H";

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	2012-11-15 16:42:18 UTC (rev 8480)
+++ trunk/locale/zh/LC_MESSAGES/phpwiki.php	2012-11-15 16:52:26 UTC (rev 8481)
@@ -238,6 +238,7 @@
 $locale["First"] = "開頭";
 $locale["FrameInclude"] = "FrameInclude";
 $locale["From english to %s: "] = "從英文到 %s:";
+$locale["Full text search results for “%s”"] = "以 '%s' 全文搜尋的結果";
 $locale["FullDump"] = "完整傾印";
 $locale["FullRecentChanges"] = "FullRecentChanges";
 $locale["FullTextSearch"] = "FullTextSearch";

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8480] trunk/themes/default/moacdropdown/js/Makefile

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

Revision: 8480
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8480&view=rev
Author:   vargenau
Date:     2012-11-15 16:42:18 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
remove Makefile

Removed Paths:
-------------
    trunk/themes/default/moacdropdown/js/Makefile

Deleted: trunk/themes/default/moacdropdown/js/Makefile
===================================================================
--- trunk/themes/default/moacdropdown/js/Makefile	2012-11-15 16:34:13 UTC (rev 8479)
+++ trunk/themes/default/moacdropdown/js/Makefile	2012-11-15 16:42:18 UTC (rev 8480)
@@ -1,9 +0,0 @@
-# jsmin http://www.crockford.com/javascript/jsmin.html
-ALLSRC=mobrowser.js modomevent3.js modomt.js modomext.js getobject2.js xmlextras.js acdropdown.js
-
-../../moacdropdown.js: $(ALLSRC)
-	cat $(ALLSRC) > tmp.js
-	jsmin < tmp.js > $@
-	rm tmp.js
-
-# perl -pi~ -e 's/^\s+//; 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:[8479] trunk

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

Revision: 8479
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8479&view=rev
Author:   vargenau
Date:     2012-11-15 16:34:13 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
Remove moacdropdown/css/dropdown-min.css

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

Removed Paths:
-------------
    trunk/themes/default/moacdropdown/css/dropdown-min.css

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2012-11-15 16:21:08 UTC (rev 8478)
+++ trunk/lib/WikiTheme.php	2012-11-15 16:34:13 UTC (rev 8479)
@@ -1534,31 +1534,11 @@
         static $already = 0;
         if (!$this->HTML_DUMP_SUFFIX and !$already) {
             $dir = $this->_findData('moacdropdown');
-            if (!DEBUG and ($css = $this->_findFile('moacdropdown/css/dropdown-min.css'))) {
+            if (!DEBUG and ($css = $this->_findFile('moacdropdown/css/dropdown.css'))) {
                 $this->addMoreHeaders($this->_CSSlink(0, $css, 'all'));
             } else {
                 $this->addMoreHeaders(HTML::style(array('type' => 'text/css'), "  @import url( $dir/css/dropdown.css );\n"));
             }
-            // if autocomplete_remote is used: (getobject2 also for calc. the showlist width)
-            if (DEBUG) {
-                foreach (array("mobrowser.js", "modomevent3.js", "modomt.js",
-                             "modomext.js", "getobject2.js", "xmlextras.js") as $js) {
-                    $this->addMoreHeaders(JavaScript('', array('src' => "$dir/js/$js")));
-                }
-                $this->addMoreHeaders(JavaScript('', array('src' => "$dir/js/acdropdown.js")));
-            } else {
-                // already in wikicommon-min.js
-                ; //$this->addMoreHeaders(JavaScript('', array('src' => DATA_PATH . "/themes/default/moacdropdown.js")));
-            }
-            /*
-            // for local xmlrpc requests
-            $xmlrpc_url = deduce_script_name();
-            //if (1 or DATABASE_TYPE == 'dba')
-            $xmlrpc_url = DATA_PATH . "/RPC2.php";
-            if ((DEBUG & _DEBUG_REMOTE) and isset($_GET['start_debug']))
-            $xmlrpc_url .= ("?start_debug=".$_GET['start_debug']);
-                $this->addMoreHeaders(JavaScript("var xmlrpc_url = '$xmlrpc_url'"));
-            */
             $already = 1;
         }
     }

Deleted: trunk/themes/default/moacdropdown/css/dropdown-min.css
===================================================================
--- trunk/themes/default/moacdropdown/css/dropdown-min.css	2012-11-15 16:21:08 UTC (rev 8478)
+++ trunk/themes/default/moacdropdown/css/dropdown-min.css	2012-11-15 16:34:13 UTC (rev 8479)
@@ -1 +0,0 @@
-div.acinputContainer{position:relative;float:left;height:20px;margin:0;padding:0;border-width:1px;border-style:solid;border-color:#aaa #eee #eee #aaa;background-color:ButtonFace;-moz-box-sizing:border-box;}div.acinputContainer input{position:relative;float:left;height:100%;border-width:1px;margin:0;padding:0;clear:none;float:left;-moz-box-sizing:border-box;}div.acinputContainer input.search{background-color:#b41b00;-moz-box-sizing:border-box;}div.acinputContainer input.button{position:relative;float:left;font-size:2px;width:18px;height:100%;border-width:1px;background-image:url(../i/arrowdown.gif);background-repeat:no-repeat;background-position:2px 2px;-moz-box-sizing:border-box;}input.dropdown{border:1px solid #AAA;border-color:#888 #aaa #aaa #888;margin-bottom:2px;-moz-box-sizing:border-box;}div.autocomplete_holder{position:absolute;font-size:95%;visibility:hidden;background-color:#fff;-moz-box-sizing:border-box;}div.autocomplete_firstborder{border-width:1px;border-style:solid;border-color:ButtonShadow;padding:0;margin-left:3px;margin-bottom:5px;-moz-box-sizing:border-box;}div.autocomplete_secondborder{border-style:none;padding:2px;-moz-box-sizing:border-box;}ul.autocomplete{width:100%;height:95px;overflow-y:auto;overflow:-moz-scrollbars-vertical;font:menu;margin:0;margin-left:0;padding-left:0;text-indent:0;list-style-type:none;vertical-align:middle;background-repeat:no-repeat;-moz-box-sizing:border-box;}ul.autocomplete li a,ul.autocomplete li a:hover,ul.autocomplete li a.selected,ul.autocomplete li a:hover.selected{display:block;width:100%;padding:2px;text-decoration:none;color:#333;border:1px solid #fff;-moz-box-sizing:border-box;margin-left:-14px;voice-family:"\"}\"";voice-family:inherit;margin-left:0;}ul.autocomplete li{padding:0;padding-left:5px;background-position:2px 0;background-repeat:no-repeat;line-height:13px;vertical-align:top;margin:0;-moz-box-sizing:border-box;}ul.autocomplete li a:hover{color:HighlightText;background-color:Highlight;border-color:#e0e0e0;}ul.autocomplete li a.selected{border:1px solid #444;color:#fff;background-color:#004ba6;}ul.autocomplete li a:hover.selected{border:1px solid #e0e0e0;color:white;background-color:#004ba6;background-image:none;}
\ No newline at end of file

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

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

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

Revision: 8478
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8478&view=rev
Author:   vargenau
Date:     2012-11-15 16:21:08 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
Minimized files are not used

Removed Paths:
-------------
    trunk/themes/Crao/Makefile
    trunk/themes/Crao/crao-min.css
    trunk/themes/Crao/sticky-min.js
    trunk/themes/Hawaiian/Hawaiian-min.css
    trunk/themes/Hawaiian/Makefile
    trunk/themes/MacOSX/MacOSX-min.css
    trunk/themes/MacOSX/MacOSX-topbottombars-min.css
    trunk/themes/MacOSX/Makefile
    trunk/themes/Makefile
    trunk/themes/MonoBook/IE60Fixes-min.css
    trunk/themes/MonoBook/IE70Fixes-min.css
    trunk/themes/MonoBook/IEFixes-min.css
    trunk/themes/MonoBook/IEFixes-min.js
    trunk/themes/MonoBook/Makefile
    trunk/themes/MonoBook/commonPrint-min.css
    trunk/themes/MonoBook/main-min.css
    trunk/themes/MonoBook/monobook-min.css
    trunk/themes/MonoBook/rtl-min.css
    trunk/themes/MonoBook/wikibits-min.js
    trunk/themes/MonoBook/wikiprintable-min.css
    trunk/themes/MonoBook/wikistandard-min.css
    trunk/themes/Portland/Makefile
    trunk/themes/Portland/portland-min.css
    trunk/themes/Sidebar/Makefile
    trunk/themes/Sidebar/sidebar-min.css
    trunk/themes/SpaceWiki/Makefile
    trunk/themes/SpaceWiki/SpaceWiki-min.css
    trunk/themes/Wordpress/Makefile
    trunk/themes/Wordpress/Wordpress-min.css
    trunk/themes/blog/IEFixes-min.css
    trunk/themes/blog/Kubrick-min.css
    trunk/themes/blog/Makefile
    trunk/themes/default/ASCIIsvg-min.js
    trunk/themes/default/IEFixes-min.css
    trunk/themes/default/Makefile
    trunk/themes/default/ajax-min.js
    trunk/themes/default/highlight-min.css
    trunk/themes/default/moacdropdown-min.js
    trunk/themes/default/phpwiki-min.css
    trunk/themes/default/phpwiki-modern-min.css
    trunk/themes/default/phpwiki-printer-min.css
    trunk/themes/default/phpwiki-topbottombars-min.css
    trunk/themes/default/sortable-min.js
    trunk/themes/default/toolbar-min.css
    trunk/themes/default/toolbar-min.js
    trunk/themes/default/wikicommon-min.js
    trunk/themes/default/yuicompressor-2.4.7.jar
    trunk/themes/fusionforge/Makefile
    trunk/themes/fusionforge/fusionforge-autonumbering-min.css
    trunk/themes/fusionforge/fusionforge-fullscreen-min.css
    trunk/themes/fusionforge/fusionforge-min.css
    trunk/themes/fusionforge/fusionforge-print-min.css
    trunk/themes/fusionforge/fusionforge-rereading-min.css
    trunk/themes/fusionforge/wikilens-min.js
    trunk/themes/shamino_com/Makefile
    trunk/themes/shamino_com/shamino_com-min.css
    trunk/themes/smaller/Makefile
    trunk/themes/smaller/phpwiki-min.css
    trunk/themes/wikilens/Makefile
    trunk/themes/wikilens/wikilens-min.css
    trunk/themes/wikilens/wikilens-min.js

Deleted: trunk/themes/Crao/Makefile
===================================================================
--- trunk/themes/Crao/Makefile	2012-11-15 14:07:14 UTC (rev 8477)
+++ trunk/themes/Crao/Makefile	2012-11-15 16:21:08 UTC (rev 8478)
@@ -1,13 +0,0 @@
-# themes/Crao/Makefile
-#
-# minify CSS and JS
-#
-
-CSS_SRC = crao.css
-CSS_FILES = $(patsubst %.css,%-min.css,$(CSS_SRC))
-MAIN    = sticky
-JS_MAIN = sticky.js
-
-all	: css js
-
-include ../Makefile.global

Deleted: trunk/themes/Crao/crao-min.css
===================================================================
--- trunk/themes/Crao/crao-min.css	2012-11-15 14:07:14 UTC (rev 8477)
+++ trunk/themes/Crao/crao-min.css	2012-11-15 16:21:08 UTC (rev 8478)
@@ -1 +0,0 @@
-body{background-color:#ccc;font-family:Helvetica,Verdana,Arial,sans-serif;font-size:12px;line-height:14px;margin:0;padding:0;border:0 none;color:#000;text-align:left}img{border:0;vertical-align:middle}table{border-spacing:0;empty-cells:show}a:link,a{color:#33c;text-decoration:underline;background-color:transparent}a:visited{color:#33c;text-decoration:underline;background-color:transparent}a:hover{color:#03f;text-decoration:underline;background-color:transparent}hr{background-color:#ccc;height:1px;border:1px solid #ccc}div.wikitext pre{font-family:monospace}p{font-size:1em;margin:0;margin-bottom:1em}.tt{font-family:monospace}.strike{text-decoration:line-through}.align-left{text-align:left}.align-right{text-align:right}.align-center{text-align:center}.top{vertical-align:top}.nowrap{white-space:nowrap}.fullwidth{width:100%}ul{position:relative;padding:0;margin:0;font-family:Helvetica,Verdana,Arial,sans-serif;font-size:100%;line-height:120%;list-style:inside;background-color:transparent}ul ul{position:relative;font-family:Helvetica,Verdana,Arial,sans-serif;font-size:100%;margin-left:2em}li.rc-major{list-style:none;display:block;background-color:#fff;margin:6px 0;border:1px #666 dashed;padding:.5ex}li.evenrow{border:0;padding:1ex}li.oddrow{border:0;padding:1ex}li strong{font-weight:normal;background-color:transparent}strong.wiki-summary{display:block;padding:5px 0;background-color:transparent}li a.wiki-rc-action{display:inline}li a.wiki-rc-action{border:0}li.rc-major a.wiki{font-size:1.2em;font-weight:bold}li>p{display:inline}p.wiki-rc-action{text-align:center;vertical-align:middle;padding:5px 5px 5px 5px;border:1px #000 solid;background-color:transparent}p a.wiki-rc-action{display:inline;padding:0 10px;font-weight:bold;background-color:transparent}#header{background-color:#333}#logo{color:#ccc;display:inline;margin-top:0;margin-left:0;height:50px;width:auto;background-color:transparent;font:bolder 67px/50px Verdana,Arial,Helvetica,sans-serif;letter-spacing:-0.1em}#logo img{border:0}#logo a{color:#ccc;font:bolder 67px/50px Arial,Verdana,Helvetica,sans-serif;text-decoration:none}div.ie-actionbuttons{position:relative;height:22px;right:0;bottom:0;margin:0;background-color:transparent;background-image:url(images/BG.png);background-repeat:no-repeat;background-position:top right;text-align:right;vertical-align:bottom;padding-left:2em;padding-right:1em;padding-top:.5ex;padding-bottom:.5ex;border:0 none}#actionbuttons{position:fixed;max-width:30%;height:22px;right:0;bottom:0;margin:0;background-color:transparent;background-image:url(images/BG.png);background-position:top left;vertical-align:bottom;padding-left:2em;padding-right:1em;padding-top:.5ex;padding-bottom:.5ex;border:0 none}#actionbuttons a,#actionbuttons a:link{position:relative;display:inline;text-align:right;width:100%;margin-bottom:.5em;margin-top:auto;background-color:transparent;border:0}#content{margin-top:0;margin-left:7%;margin-right:7%;margin-bottom:7%;background-color:#f2f2f2;border:1px #999 solid;padding-left:2em;padding-right:15px;padding-top:15px;padding-bottom:.5ex}div.wikitext{font-size:1em;line-height:130%;text-align:left}blockquote.mail-style-quote{border-left:#f93;margin:0;margin-bottom:1em;border:1px solid #f93;padding:.5em}.mail-style-quote blockquote.mail-style-quote{margin-left:.3em;margin-bottom:0;background-color:transparent;border-style:none;border-left:2px solid #f93;padding:0;padding-left:.5em}blockquote p{margin-top:.5ex;margin-bottom:.5ex}.toolbar,input.button,#signin{font-family:Verdana,Arial,Helvetica,sans-serif}div.toolbar{display:block;background-color:#f2f2f2;border:1px #666 solid;margin:2% 7%}.toolbar{padding:0;margin:0}.edit-toolbar{padding:0;margin:0}.edit-toolbar img,.edit-toolbar input{background-color:#fff;border:1px solid ButtonFace}#navbuttons{display:inline}#navbuttons img{margin:5px 0 5px 10px}#navbuttons a:link,#navbuttons a{font-weight:bold;padding-left:1ex;padding-right:1ex;color:#333}#signin{width:auto;text-align:right;padding-right:10px;background-color:transparent;color:#ccc;font-size:12px}#signin form{text-align:center;padding:1px;margin:0;display:inline}#signin input{padding:0;padding-left:3px;margin:0;font-family:Verdana,Arial,Helvetica,sans-serif;color:#333;font-size:12px}#signin input.wikisignin{padding:0;margin:0;border:0 none}#signin a.wiki{color:#FFF;background-color:transparent}#search{font-size:12px;margin:5px 10px 5px 10px;float:right}#search form{text-align:center;padding:1px;margin:0;display:inline}#search input{padding:0;padding-left:3px;margin:0;font-family:Verdana,Arial,Helvetica,sans-serif;color:#333;font-size:12px}#search input.wikiaction{padding:0;margin:0;border:0 none}.search-context{background:white;font-style:oblique}.search-term{background:yellow;font-weight:normal}#livesearch{height:13px;width:100px}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden}#LSHighlight{background-color:#f08000}#LSResult .evenrow{background-color:#f0f0f0}body.sidebar{font-size:smaller;margin:.5em}body.sidebar div.wikitext{padding:.5em}body.sidebar{padding-left:1em}body.sidebar h2{margin-top:0}form.wikiadmin div{color:#000;background-color:#f2f2f2}a.wikiaction,a.wikiadmin{line-height:2.6ex}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em}img.linkicon{vertical-align:middle}img.rssicon{vertical-align:baseline}a.wikiaction,a.wikiadmin,a.wiki-rc-action,a.wikiunsafe{text-decoration:none;font-family:Verdana,Arial,Helvetica,sans-serif}.wikiunsafe{color:#000;background-color:#f2f2f2}input.wikiadmin{color:#000;background-color:#fff}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;background-color:transparent}.wikiunknown a,.named-wikiunknown a{color:#fff;background-color:#000;text-decoration:none;font-weight:normal;font-size:1em;padding:1px;padding-top:0;padding-bottom:0;border-top:1px solid #000;border-bottom:1px solid #000;margin-right:2px}.backlinks{text-decoration:underline;background-color:transparent;color:#006}.wikipage{font-weight:bold}.interwiki{text-decoration:none}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal}h1,h2,h3,h4,h5,h6{font-family:Arial,Helvetica,sans-serif}h1{margin-top:10px;background-color:transparent;color:#555}h1 a.backlinks{color:#777;text-decoration:none}h1 a.wiki{color:#777;text-decoration:none}h1 a.pagetitle{color:#555;text-decoration:none}h1 a:hover{color:#888;text-decoration:underline}h4,h5,h6{margin-bottom:0;background-color:transparent;color:#111}div.rss{background-color:#fff;color:#000;border:2px solid #ddd}div.feed{font-size:1.4em;padding:.5em}.chandesc{font-size:.9em}div.rssitem{display:block;background-color:#fff;color:#000;border-top:1px solid #ddd;padding:0 .5em}div.itemname{display:block;border:0;margin-top:.5em}div.itemdesc{font-size:1em;margin-bottom:.5em}table,td{font-family:Verdana,Arial,Helvetica,sans-serif}caption{font-family:Verdana,Arial,Helvetica,sans-serif;width:auto}.pagelist{background-color:white;border:1px #333 dashed}.pagelist tr.evenrow{background-color:white}.pagelist tr.oddrow{background-color:white}.pagelist td{padding:3px}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;height:18px;margin:5px 0;float:none;white-space:nowrap;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black}.wikilink{display:block}#revision{font-size:10px;text-align:right;background-color:#f2f2f2;padding-left:2em;padding-right:1em;padding-top:.5ex;padding-bottom:.5ex;clear:both}.editdate{font-family:Arial,Helvetica,sans-serif;margin:0;padding:0;padding-top:.25ex}#xhtml-validator{font-size:small;text-align:center;margin-top:1em}form{margin:0}input,textarea{margin:.1em;background-color:#FFF;vertical-align:middle;font-size:1em}input.wikisignin{border:0 none;background-color:#FFF}input.wikiaction{border:1px solid black;background-color:#d7fa8c}input.numeric{text-align:center}textarea.wikiedit{width:90%;margin:.5ex;padding:2px;font-family:Verdana,Arial,Helvetica,sans-serif}#editarea-size{margin-top:1ex;margin-bottom:-1ex;text-align:right;font-size:smaller;border:1px none}#editarea-size legend{text-align:right;font-size:smaller;border:1px solid #CCC;background-color:#ccc}.editarea legend{font-family:Verdana,Helvetica,Arial,sans-serif;font-size:1em;line-height:1em;padding:.2em;border:1px solid #333;background-color:#eee}fieldset.editarea{margin:1ex;margin-top:1em;text-align:center;padding:10px;border:1px solid #333;background-color:#e8e8e5}fieldset.toolbar{margin:1ex;margin-top:0;text-align:center;padding:3px;border:1px solid #FFF;background-color:#FFF}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em}.transclusion,.wiki-edithelp{font-size:smaller}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex}.wiki-edithelp{background-color:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex}.wiki-edithelp p{font-family:Verdana,Helvetica,Arial,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0}table.cal{float:right;font-size:10px;border:1px solid #333;background-color:#ccc;margin:10px;padding:1px;empty-cells:hide}table.cal td{text-align:right}table.cal-header{font-size:larger;background-color:#333;color:#f2f2f2}table.cal-header tr,table.cal-header td{text-align:center}.cal-arrow{font-weight:bold;text-decoration:none;color:#fff}a.cal-arrow{color:#fff}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:none;background-color:#f2f2f2}a.cal-hide{font-size:9px;text-decoration:none}table.cal td.cal-today{margin:1px;border:1px solid #333;color:#000;background-color:#f2f2f2}table.cal td.cal-day a.cal-day{font-size:9px;text-decoration:underline}.diff .block div{position:relative;padding-left:1.5em}.diff .prefix{position:absolute;left:.5em;top:0}.diff{color:#000;background-color:transparent;border:1px solid black}.diff .block{color:#000;background-color:#ccc;padding-left:1em}.diff .context{color:#000;background-color:transparent;border:0}.diff .block tt{font-weight:normal;font-family:monospace;color:black;background-color:transparent;margin-left:0;border:0}.diff del,.diff ins{font-weight:bold;text-decoration:none}.diff .original,.diff .deleted,.diff .final,.diff .added{color:#000;background-color:white}.diff .original,.diff .deleted{color:#000;background-color:#fcc;border:0}.diff .final,.diff .added{color:#000;background-color:#cfc;border:0}.diff del{color:#000;background-color:#f99}.diff ins{color:#000;background-color:#9f9}td.pageinfo{font-weight:bold}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique}.hint{color:black;background-color:#eee;font-size:smaller;margin-left:5em;border:thin solid #aaa}#clear{clear:both;margin:0;margin-top:-7px;padding:2px;text-align:center;color:#000;background-color:#FFF;border:solid 0}#clear{margin-top:0}img.inlineimage{border:0;vertical-align:middle;margin:0 5px 0 5px}em>img.inlineimage{float:left;border:0;vertical-align:middle;margin:5px 15px 15px 0}strong>img.inlineimage{float:right;border:0;vertical-align:middle;margin:5px 0 15px 15px}h2.wikiblog-heading{font-size:2em;padding-bottom:.5em;border-bottom:2px solid gray}.interwiki-map thead td{text-decoration:underline}.printer{display:none}.error{color:black;background-color:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:medium solid red;clear:both}.debug{color:black;background-color:transparent;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8}
\ No newline at end of file

Deleted: trunk/themes/Crao/sticky-min.js
===================================================================
--- trunk/themes/Crao/sticky-min.js	2012-11-15 14:07:14 UTC (rev 8477)
+++ trunk/themes/Crao/sticky-min.js	2012-11-15 16:21:08 UTC (rev 8478)
@@ -1 +0,0 @@
-var mySticky;var theLayer;lastY=10;YOffset=0;staticYOffset=10;refreshMS=25;function setup(a){bw=new checkBrowser;if(bw.ns4||bw.opera){MM_reloadPage(true)}var b=bw.ie4||bw.ns4||(bw.macie50)?true:false;if(window.attachEvent){fix_bind()}else{if(b){if(bw.ns6){document.getElementById(a).style.position="absolute"}if(bw.macie50){document.getElementById(a).style.position="absolute";document.getElementById(a).style.backgroundColor="#ccffcc"}if(bw.ns6&&YOffset==0){YOffset=-15}mySticky=new makeLayerObj(a);layerSlide(a)}else{mySticky=new makeLayerObj(a);mySticky.css.position="fixed"}}if(!mySticky){mySticky=new makeLayerObj(a)}}fix_elements=new Array();function fix_event(){var a;for(a=0;a<fix_elements.length;a++){fix_elements[a].style.left=parseInt(fix_elements[a].fix_left)+document.getElementsByTagName("html")[0].scrollLeft+document.getElementsByTagName("body")[0].scrollLeft+"px";fix_elements[a].style.top=parseInt(fix_elements[a].fix_top)+document.getElementsByTagName("html")[0].scrollTop+document.getElementsByTagName("body")[0].scrollTop+"px"}}function fix_bind(){var a;for(a=0;a<document.all.length;a++){if(document.all[a].currentStyle.position=="fixed"){document.all[a].fix_left=document.all[a].currentStyle.left;document.all[a].fix_top=document.all[a].currentStyle.top;document.all[a].style.position="absolute";fix_elements[fix_elements.length]=document.all[a];window.attachEvent("onscroll",fix_event);window.attachEvent("onresize",fix_event)}}}function layerSlide(a){if(bw.dhtml){if(!mySticky){mySticky=new makeLayerObj(a)}if(bw.ns){winY=window.pageYOffset}else{if(bw.ie){winY=document.body.scrollTop}}if(bw.ie||bw.ns){if(winY!=lastY&&winY>YOffset-staticYOffset){smooth=0.3*(winY-lastY-YOffset+staticYOffset)}else{if(YOffset-staticYOffset+lastY>YOffset-staticYOffset){smooth=0.3*(winY-lastY-(YOffset-(YOffset-winY)))}else{smooth=0}}if(smooth>0){smooth=Math.ceil(smooth)}else{smooth=Math.floor(smooth)}if(bw.ie){mySticky.css.pixelTop+=smooth}else{if(bw.ns){mySticky.css.top=parseInt(mySticky.css.top)+smooth}}lastY=lastY+smooth;top.window.status=new Date();setTimeout('layerSlide("'+a+'")',refreshMS)}}}function MM_reloadPage(init){if(init==true){with(navigator){if((appName=="Netscape")&&(parseInt(appVersion)==4)){document.MM_pgW=innerWidth;document.MM_pgH=innerHeight;top.onresize=MM_reloadPage}}}else{if(innerWidth!=document.MM_pgW||innerHeight!=document.MM_pgH){location.reload()}}}function makeLayerObj(a){if(document.getElementById){this.css=document.getElementById(a).style}else{if(document.layers){this.css=document.layers[a]}else{if(document.all){this.css=document.all[a].style}}}return this}function checkBrowser(){this.ver=navigator.appVersion;this.name=navigator.appName;this.mac=(navigator.platform.toLowerCase().indexOf("mac")>-1)?true:false;this.opera=(navigator.userAgent.toLowerCase().indexOf("opera")>-1)?true:false;this.dom=document.getElementById?true:false;this.ns=(this.name=="Netscape");this.ie4=(document.all&&!this.dom)?true:false;this.ie=(this.name=="Microsoft Internet Explorer"&&!this.opera)?true:false;this.ie5=(this.ie&&(navigator.userAgent.indexOf("MSIE 5")!=-1))?true:false;this.macie50=(this.mac&&this.ie5&&(navigator.userAgent.indexOf("MSIE 5.0")!=-1))?true:false;this.ns4=(this.ns&&parseInt(this.ver)==4)?true:false;this.ns6=((this.name=="Netscape")&&(parseInt(this.ver)==5))?true:false;this.standards=document.getElementById?true:false;this.dhtml=this.standards||this.ie4||this.ns4}function showMe(a){myFloater=new makeLayerObj(a);myFloater.css.visibility="visible"}function hideMe(a){myFloater=new makeLayerObj(a);myFloater.css.visibility="hidden"};
\ No newline at end of file

Deleted: trunk/themes/Hawaiian/Hawaiian-min.css
===================================================================
--- trunk/themes/Hawaiian/Hawaiian-min.css	2012-11-15 14:07:14 UTC (rev 8477)
+++ trunk/themes/Hawaiian/Hawaiian-min.css	2012-11-15 16:21:08 UTC (rev 8478)
@@ -1 +0,0 @@
-img{border:0;vertical-align:baseline}form{margin:0}input{margin:.1em}input.numeric{text-align:right}table{border-spacing:1px;empty-cells:show}caption{caption-side:top;text-align:left;margin-bottom:.5ex;width:100%}.tt{font-family:monospace}.strike{text-decoration:line-through}.align-left{text-align:left}.align-right{text-align:right}.align-center{text-align:center}.top{vertical-align:top}.nowrap{white-space:nowrap}.fullwidth{width:100%}body{color:black;background-color:white;background-image:url("images/uhhbackground.jpg");background-repeat:repeat;font-family:Arial,Helvetica,sans-serif;margin:1ex .5em}body p{margin-left:1em}#logo img{border:1px outset gray;margin-left:1em;margin-bottom:1ex}img#signature{background-color:white;border:1px outset gray;padding-left:8px;padding-right:8px;padding-top:8px;padding-bottom:14px}div.wikitext{margin-top:1ex;margin-bottom:.5ex;padding-left:.8em;padding-right:.8em;padding-top:.5ex;padding-bottom:.5ex;clear:both}div.wikitext hr{height:1px}div.wikitext pre{font-family:monospace}body.sidebar{font-size:smaller;margin:.5em}body.sidebar div.wikitext{padding:.5em}body.sidebar div.wikitext ul{padding-left:1em}body.sidebar h2{margin-top:0}.wiki,.named-wiki{font-weight:bold;color:#87785c}.wiki{text-decoration:none}.named-wiki{text-decoration:underline}.wikiaction,.wikiadmin,.wiki-rc-action,.backlinks{text-decoration:none}.wikiaction,.wikiadmin{font-weight:bold}.wikiaction,.wikiaction table,span.wikiaction{color:#4d5a6b}.wikiadmin,.wikiadmin table{color:#ff7e00}.backlinks{color:#1d4fc0}h1 .backlinks{text-decoration:underline}.wikiunknown a,.named-wikiunknown a,.wikiunknown u{color:#a6977a}.wikipage{font-weight:bold}.interwiki{text-decoration:none}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal}h1,h2,h3,h4,h5,h6{font-family:Arial,Helvetica,sans-serif}h1{margin:0}caption{font-family:Arial,Helvetica,sans-serif}.pagelist tr.evenrow{background-color:#eee}.pagelist tr.oddrow{background-color:white}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;margin:5px 0;white-space:nowrap;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black}.toolbar,input.button{font-family:Arial,Helvetica,sans-serif}.toolbar{padding:0;margin:0}#navbar,#actionbar{line-height:140%}.editdate{font-family:Arial,Helvetica,sans-serif;margin:0;padding:0;padding-top:.25ex}.wikiedit{width:100%;margin-bottom:.5ex;margin-top:.5ex;padding:2px}input.button{font-family:Arial,Helvetica,sans-serif}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em}.transclusion,.wiki-edithelp{font-size:smaller}.transclusion{background:inherit;border:1px dotted #a6977a;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex}.wiki-edithelp{border:medium solid #d8caae;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex}.wiki-edithelp .wiki{color:#87785c}.wiki-edithelp p{font-family:Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0}table.cal{border:1px outset gray;margin:.5ex .5em;padding:1px;empty-cells:hide}table.cal table.cal-header td{padding-top:110px}table.cal thead tr:first-child{background-image:url("images/pictures/SteamVolcanoDusk.jpg");background-repeat:no-repeat;background-position:center;font-size:larger}table.cal table.cal-header td{text-align:center;color:white;background-color:transparent;border:0}.cal-arrow{text-decoration:none;color:white;font-weight:bold}table.cal tr .cal-dayname{background:inherit}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:none;color:black;padding-bottom:.5ex}table.cal tbody td{border:.5pt solid #ddd;background-color:white;text-align:right}a.cal-hide{text-decoration:none;color:black;font-weight:normal}table.cal td.cal-today{margin:1px;background-color:white;border:.5pt solid black}table.cal td.cal-today a{color:blue}table.cal td.cal-day{margin:1px;background-color:white;border:.5pt solid black}table.cal td.cal-day a{color:red;text-decoration:none}.diff .block{background-color:#ccc;padding:.5ex .5em;margin:.5ex 0}.diff .context{background-color:white}.diff .block tt{font-weight:bold;font-family:monospace;margin-left:-.6em;color:black}.diff del,.diff ins{font-weight:bold;text-decoration:none}.diff .original,.diff .deleted{background-color:#fcc}.diff .final,.diff .added{background-color:#cfc}.diff del{background-color:#f99}.diff ins{background-color:#9f9}.printer{display:none}div.error{color:black;border:medium solid #d8caae;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;font-size:smaller;clear:both}.debug{color:black;font-family:monospace;margin:1ex 0;padding:.5ex .5em;border:medium solid #d8caae}.clear-floats{clear:both}.search-context{background-color:white;font-style:oblique}.search-term{background-color:yellow;font-weight:normal}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden}#LSHighlight{background-color:#f08000}#LSResult .evenrow{background-color:#f0f0f0}.toolbar,div.toolbar{margin:.5ex 0}img.linkicon{vertical-align:middle}div.wikitext{width:auto;background-image:url("images/tchecker-white.png");background-repeat:repeat}.wiki-edithelp{background-image:url("images/tchecker-sand.png");background-repeat:repeat}.wiki-edithelp p{background-image:url("images/tchecker-white.png");background-repeat:repeat}.diff .block div{position:relative;padding-left:1.5em}.diff .prefix{position:absolute;left:.5em;top:0}.debug{background-image:url("images/tchecker-sand.png");background-repeat:repeat}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8}
\ No newline at end of file

Deleted: trunk/themes/Hawaiian/Makefile
===================================================================
--- trunk/themes/Hawaiian/Makefile	2012-11-15 14:07:14 UTC (rev 8477)
+++ trunk/themes/Hawaiian/Makefile	2012-11-15 16:21:08 UTC (rev 8478)
@@ -1,11 +0,0 @@
-# themes/Hawaiian/Makefile
-#
-# minify CSS and JS
-#
-
-CSS_SRC = Hawaiian.css
-CSS_FILES = $(patsubst %.css,%-min.css,$(CSS_SRC))
-
-all	: css
-
-include ../Makefile.global

Deleted: trunk/themes/MacOSX/MacOSX-min.css
===================================================================
--- trunk/themes/MacOSX/MacOSX-min.css	2012-11-15 14:07:14 UTC (rev 8477)
+++ trunk/themes/MacOSX/MacOSX-min.css	2012-11-15 16:21:08 UTC (rev 8478)
@@ -1 +0,0 @@
-body{background:#fafafa url("images/bgpaper8.png")}body.edit{background:#fafafa url("images/bggranular.png")}input[type=submit],input[type=cancel],input[type=image]{vertical-align:middle}h1,h2,h3,.toolbar,td{font-family:"Lucida Grande",Helvetica,Arial,sans-serif}input.button{font-family:"Lucida Grande",Helvetica,Arial,sans-serif}input.numeric{text-align:right}.wikitext pre{font-family:Monaco,monospace}input[type=text]{border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em}.tt{font-family:monospace}.strike{text-decoration:line-through}.align-left{text-align:left}.align-right{text-align:right}.align-center{text-align:center}.top{vertical-align:top}.nowrap{white-space:nowrap}.fullwidth{width:100%}div.wikitext{background:white;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;padding-left:.8em;padding-right:.8em;padding-top:.5em;padding-bottom:.5em;margin:.5ex 0;clear:both}input.wikitext{margin:0}input[type=text]{height:2.7ex;padding:.4ex .3ex}div.toolbar{margin:1ex 0}.interwiki-map thead td{background:#e8e8e8;font-weight:bold;font-size:smaller}.interwiki-map thead td:first-child{text-decoration:underline}.interwiki-moniker{background:#eee}.interwiki-url{background:#f8f8f8}body.sidebar{font-size:smaller;margin:.5em}body.sidebar div.wikitext{padding:.5em}body.sidebar div.wikitext ul{padding-left:1em}body.sidebar h2{margin-top:0}div.error{background:#eee;border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;margin-top:1em;clear:both;font-size:smaller}.debug{color:black;background:white;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em;border:1px solid #eee}a.wiki{text-decoration:none}.wiki,.named-wiki{font-weight:bold;color:#1d42be}.wikiunknown a,.named-wikiunknown a,.wikiunknown U{text-decoration:none}.wikiunknown,.named-wikiunknown{color:#555}a.interwiki{text-decoration:none}.wikipage{font-weight:bold}.interwiki,i .interwiki .wikipage,em .interwiki .wikipage{font-style:oblique}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal}a.wikiaction,a.wikiadmin{text-decoration:none}img{border:0}img.rssicon{vertical-align:middle}img.wiki-button{vertical-align:middle}.wiki-button{border:0}a.wikiaction{border:0}a.backlinks{color:#006}textarea.wikiedit{width:100%;margin-top:1ex}p.editdate{font-size:smaller;margin-bottom:0;font-family:"Lucida Grande",Helvetica,Arial,sans-serif}a.cal-hide,a.cal-arrow{text-decoration:none}.cal-arrow{font-weight:bold}.cal-dayname{font-size:smaller;text-decoration:none}table.cal td{background:white;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3}table.cal-header td{font-size:larger;background:white;border:0}table.cal td.cal-dayname{background:#e8e8e8}table.cal td.cal-today{background:#f4f4f4;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3}.transclusion-title{font-family:"Lucida Grande",Helvetica,Arial,sans-serif;font-size:smaller;text-decoration:underline;text-align:right;font-style:oblique;margin-bottom:.25ex;margin-right:.25em}.transclusion{background:#fdfdfd;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin:.5ex;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;font-size:smaller}.wiki-edithelp .transclusion{font-size:smaller;background:inherit;padding:.5ex .5em;margin:.2ex 5%}.wiki-edithelp .transclusion p{margin:0}.wiki-edithelp{background:white;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;font-size:smaller}.wiki-edithelp p{font-family:Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0}div.wiki-message{background:#fff url("images/bggranular.png");border:solid 1px #d8d8d8;padding:6pt}.printer{display:none}.diff{background:white;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3}.diff .block{background:#d8d8d8}.diff .context{background:white;border:0}.diff .block tt.prefix{font-weight:normal;font-family:monospace;margin-left:-1.6em;color:black;border:0}.diff ins{font-weight:bolder}.diff ins{text-decoration:none}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white}.diff .original:first-child,.diff .deleted:first-child{border-top:2px solid #f99}.diff .original,.diff .deleted{background:white;border-left:2px solid #f99;border-right:2px solid #f99}.diff .original:last-child,.diff .deleted:last-child{border-bottom:2px solid #f99}.diff .final:first-child,.diff .added:first-child{border-top:2px solid #9f9}.diff .final,.diff .added{background:white;border-left:2px solid #9f9;border-right:2px solid #9f9}.diff .final:last-child,.diff .added:last-child{border-bottom:2px solid #9f9}.diff del{background:#fcc}.diff ins{background:#cfc}.pagelist{font-size:smaller}.pagelist tr.evenrow{background:#f8f8f8}.pagelist tr.oddrow{background:#eee}.pagelist thead td{background:#e8e8e8;text-decoration:none;font-weight:bold}.pagelist thead td u{text-decoration:none}.pagelist tbody tr:hover>td{border:solid #ff9 2px}.pagelist tbody tr>td{border:solid transparent 2px}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;height:18px;white-space:nowrap;max-height:24px;padding:5px 0 5px 0;margin:5px 0;float:none;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black}#searchholder{display:inline}.search-context{background:white;font-style:oblique}.search-term{background:#9bdaff;font-weight:normal}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden}#LSHighlight{background-color:#f08000}#LSResult .evenrow{background-color:#f0f0f0}.clear-floats{clear:both}dl{display:table}dt{display:table;font-weight:bold;vertical-align:baseline;margin-top:1.25ex;margin-bottom:.25ex;padding-left:.25ex;padding-right:.25ex;border-bottom-style:dotted;border-bottom-width:2pt;border-bottom-color:#99c}dt a.wiki,dt a.named-wiki{text-decoration:none}dl>dt:first-child{margin-top:0}dd{position:relative;margin-left:3.5em;margin-bottom:.5ex;padding-left:.125em;padding-bottom:.5ex;padding-right:.125em;border-bottom-style:solid;border-bottom-width:thin;border-bottom-color:#99c}pre,div.plugin code{color:black;display:block;background-color:#fcfcfc;font-size:90%;line-height:1.25em;margin-top:.25em;margin-left:0;margin-bottom:2ex;margin-right:0;padding-top:.25em;padding-left:.5em;padding-bottom:.25em;padding-right:.5em;border-style:solid;border-width:1px;border-color:#ccc}pre{background:#fafafa url("images/bgpaper8.png")}ul li.rc-major,ul li.rc-minor{margin-left:0;padding-left:3em;text-indent:-3em}td.pageinfo{font-weight:bold}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique}.printer,.no-css{display:none}.disabled-plugin{clear:both;margin:1ex 0;padding:0}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em}.disabled-plugin pre{color:black;background:#ddd;margin:0;padding:.3ex .5em}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em}blockquote.mail-style-quote{border-left:medium #284 solid;padding-left:1em;margin-left:0;margin-right:0}.mail-style-quote blockquote.mail-style-quote{margin-left:-0.6em}.floatleft{float:left}.floatright{float:right}div.wikiblog{margin:1ex 2em;padding:0}div.wikiblog>div{margin:0;padding:.5ex .5em}div.wikiblog>div.wikiblog-footer{padding:.2ex .5em}h3.wikiblog-summary{font-size:medium;font-weight:bold;margin:0 0 1ex 0}table.wikiblog-form{width:auto;border-collapse:collapse;margin:.25em 0}.wikiblog-form caption{caption-side:top;font-weight:bold;text-align:left;padding:.5ex .5em}.wikiblog-form th{vertical-align:top;text-align:right;padding:0 0 .3em .5em}.wikiblog-form td{padding:.25em .5em}.wikiblog-form td.submit-button{padding:0}.wikiblog-form input[type=text],.wikiblog-form textarea{margin:0;width:100%}div.wikicomment div.wikicomment-footer{padding:.2ex .5em}div.wikicomment div.wikicomment-footer named-wiki{font-size:small}table.interwiki-map{margin:1em 2em}.interwiki-map th{text-decoration:underline;text-align:left;padding-left:1em}.interwiki-map td.interwiki-url{padding-left:2em}.interwiki-map th.interwiki-url{padding-left:3em}.dialog{background-color:#cdf;color:black;margin:2em auto 2em auto;border:thin black solid;width:50%}.dialog h1,.dialog p,.dialog div{text-align:center}.dialog h1{font-size:large;margin:.5em 0 1em 0}.dialog div.message{background-color:white;color:black;color:black;margin:0 1em;padding:.5em .5em}.dialog p.buttons{margin:1em 0 .5em 0}.gensmall{font-size:10px}.genmed{font-size:11px}td.cat{font-weight:bold;letter-spacing:1px;color:#000;background:url(./images/cellpic1.png);height:27px}td.row1{background:#eaedf4;color:#000}td.row2{background:#d9e2ec;color:#000}td.row3{background:#cad9ea;color:#000}td.spacerow{background:#cad9ea;color:#000}.forumline{background:#fff;color:#000;border:1px solid #069}.box{background:#fff;border:1px solid silver}.box-title{font-family:Tahoma,sans-serif;font-weight:normal;background-color:#ccc;color:black;text-align:center;border:0;padding:2px 0 2px 0}.box-data{width:160px;font-size:9pt;font-weight:normal;border:0}.box-data .wiki{font-weight:normal}td.sidebar{border-spacing:0;margin:0}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid #888;padding:.5em}div.rss{margin:1em;padding:1em;font-size:.9em;background-color:#eee;border:thin dashed #aaa}div.feed{color:#333;margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;background-color:#f2f2f2;font-size:1.2em}div.itemdesc{padding-left:1em}div.rssitem{border-top:thin dashed #aaa}table.sqlresult{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px}.sqlresult tr.evenrow{background:#eee}.sqlresult tr.oddrow{background:white}table.sqlresult td{margin:1px;border:1px solid gray}img.tex{vertical-align:middle}.boldsmall{font-weight:bold;font-size:11px}.wikiwyg_toolbar{background:#d3d3d3;border:1px outset;letter-spacing:0;padding:2px}span.wikiwyg_control_link a{padding-right:8px}.wikiwyg_button{background:#d3d3d3;border:1px solid #d3d3d3;cursor:pointer;width:20px;height:20px;vertical-align:bottom}.wikiwyg_button:hover{border:1px outset}.wikiwyg_button:active{border:1px inset}.wikiwyg_separator{background:#d3d3d3;border:1px solid #d3d3d3;width:9px;height:20px;vertical-align:bottom}.wikiwyg_selector{width:70px}.wikiwyg_wysiwyg table{border-collapse:collapse;margin-bottom:.2em}.wikiwyg_wysiwyg table td{border:1px;border-style:solid;padding:.2em;vertical-align:top}textarea.wikiedit,input.wikitext,textarea.summary{background:white;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;padding-left:.8em;padding-right:.8em;padding-top:.5em;padding-bottom:.5em;margin:.5ex 0;clear:both}.toolbar,div.toolbar{margin:.5ex 0}img.linkicon{vertical-align:middle}.interwiki-map thead td,.interwiki-moniker,.interwiki-url{padding-left:1em;padding-right:1em}.diff{margin:.5ex 0;padding:1px}.diff .block{padding:.5ex .5em}.diff .original,.diff .deleted,.diff .final,.diff .added{padding:1px}.diff .block div{position:relative;padding-left:1.5em}.diff .prefix{position:absolute;left:0;top:0}.diff del,.diff ins{padding-left:.5ex;padding-right:.5ex}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8}
\ No newline at end of file

Deleted: trunk/themes/MacOSX/MacOSX-topbottombars-min.css
===================================================================
--- trunk/themes/MacOSX/MacOSX-topbottombars-min.css	2012-11-15 14:07:14 UTC (rev 8477)
+++ trunk/themes/MacOSX/MacOSX-topbottombars-min.css	2012-11-15 16:21:08 UTC (rev 8478)
@@ -1 +0,0 @@
-@import url("MacOSX.css");body{padding-top:16ex;padding-bottom:9ex}div#header,div#footer{background:white url("images/bgpaper8.png");margin:0;padding:0;position:fixed;left:0;right:0;padding-top:.5ex;padding-bottom:.5ex;padding-left:1em;padding-right:1em}hr.toolbar{display:none}div#header{top:0;border-bottom:1px solid #b2b2b2}div#navbuttons{padding-bottom:.25ex}div#footer{border-top:1px solid #b2b2b2;bottom:-1ex;padding-bottom:0}p.editdate{margin-top:.75ex;margin-bottom:.5ex}
\ No newline at end of file

Deleted: trunk/themes/MacOSX/Makefile
===================================================================
--- trunk/themes/MacOSX/Makefile	2012-11-15 14:07:14 UTC (rev 8477)
+++ trunk/themes/MacOSX/Makefile	2012-11-15 16:21:08 UTC (rev 8478)
@@ -1,18 +0,0 @@
-# themes/MacOSX/Makefile
-#
-# minify CSS and JS
-#
-# TODO: resolve @import
-
-CSS_SRC = MacOSX.css MacOSX-topbottombars.css
-#MAIN    = MacOSX
-#JS_MAIN = MacOSX.js
-JS_REST = 
-
-CSS_FILES = $(patsubst %.css,%-min.css,$(CSS_SRC))
-
-all	: css
-
-include ../Makefile.global
-
-

Deleted: trunk/themes/Makefile
===================================================================
--- trunk/themes/Makefile	2012-11-15 14:07:14 UTC (rev 8477)
+++ trunk/themes/Makefile	2012-11-15 16:21:08 UTC (rev 8478)
@@ -1,15 +0,0 @@
-# themes/Makefile
-#
-# minify themes
-#
-
-.PHONY: all css js
-
-THEMES = default MonoBook wikilens Sidebar SpaceWiki blog MacOSX fusionforge \
-	Portland shamino_com Crao Wordpress smaller Hawaiian
-
-# http://developer.yahoo.com/yui/compressor/
-YUICOMPRESSOR = java -jar default/yuicompressor-2.4.7.jar
-
-all: 
-	$(foreach dir,$(THEMES),make -C $(dir);)

Deleted: trunk/themes/MonoBook/IE60Fixes-min.css
===================================================================
--- trunk/themes/MonoBook/IE60Fixes-min.css	2012-11-15 14:07:14 UTC (rev 8477)
+++ trunk/themes/MonoBook/IE60Fixes-min.css	2012-11-15 16:21:08 UTC (rev 8478)
@@ -1 +0,0 @@
-#column-content{float:none;margin-left:0;height:1%}#column-content #content{margin-left:12.2em;margin-top:3em;height:1%}#column-one{position:absolute;z-index:4;top:0;left:0}#footer{margin-left:13.6em;border-left:1px solid #fabd23}body{font-size:80%}tt{font-size:110%}#p-cactions{z-index:3}#p-cactions li{padding-bottom:0!important;border:0;background-color:transparent;cursor:default;float:none!important}#p-cactions li a{display:inline-block!important;vertical-align:top;padding-bottom:0;border:solid #aaa;border-width:1px 1px 0}#p-cactions li.selected a{border-color:#fabd23;padding-bottom:.17em!important}#p-cactions li a:hover{padding-bottom:.17em}#p-navigation a{display:inline-block;width:100%}#portal-personaltools{padding-bottom:.1em}#bodyContent a.external{background:url(images/external.png) center right no-repeat;padding-right:13px}#p-logo a,#p-logo a:hover{cursor:pointer}div.visualClear{width:100%;line-height:0}textarea{width:96%}div.editsection,#catlinks,div.tright,div.tleft{position:relative}span.rateit{text-decoration:none;font-family:Arial,Helvetica,sans-serif;line-height:1em}div#rateit-widget-top{top:38px}
\ No newline at end of file

Deleted: trunk/themes/MonoBook/IE70Fixes-min.css
===================================================================
--- trunk/themes/MonoBook/IE70Fixes-min.css	2012-11-15 14:07:14 UTC (rev 8477)
+++ trunk/themes/MonoBook/IE70Fixes-min.css	2012-11-15 16:21:08 UTC (rev 8478)
@@ -1 +0,0 @@
-#column-content #content{margin-left:12.2em;margin-top:3em;height:1%}.rtl #column-one{padding-top:0}.rtl #column-one #p-navigation{margin-top:160px}#p-cactions{z-index:3}#p-cactions li{padding-bottom:0!important;border:0;background-color:transparent;cursor:default;float:none!important}#p-cactions li a{display:inline-block!important;vertical-align:top;padding-bottom:0;border:solid #aaa;border-width:1px 1px 0}#p-cactions li.selected a{border-color:#fabd23;padding-bottom:.17em!important}#p-cactions li a:hover{padding-bottom:.17em!important}#p-navigation a{display:inline-block;width:100%}#portal-personaltools{padding-bottom:.1em}textarea{width:96%}tt{font-size:110%}#footer li{margin-right:0}
\ No newline at end of file

Deleted: trunk/themes/MonoBook/IEFixes-min.css
===================================================================
--- trunk/themes/MonoBook/IEFixes-min.css	2012-11-15 14:07:14 UTC (rev 8477)
+++ trunk/themes/MonoBook/IEFixes-min.css	2012-11-15 16:21:08 UTC (rev 8478)
@@ -1 +0,0 @@
-@import "null?\"\{";@import "IE60Fixes.css";voice-family:"\"}\"";voice-family:inherit;
\ No newline at end of file

Deleted: trunk/themes/MonoBook/IEFixes-min.js
===================================================================
--- trunk/themes/MonoBook/IEFixes-min.js	2012-11-15 14:07:14 UTC (rev 8477)
+++ trunk/themes/MonoBook/IEFixes-min.js	2012-11-15 16:21:08 UTC (rev 8478)
@@ -1 +0,0 @@
-var rslt=navigator.appVersion.match(/MSIE (\d+\.\d+)/,"");if(rslt!=null){var version=Number(rslt[1])}else{var version=0}function hookit(){fixalpha();relativeforfloats()}function fixalpha(){if(version>=5.5&&document.getElementById("p-logo")){var c=document.getElementById("p-logo").firstChild;var b=c.currentStyle.backgroundImage;if(b.match(/\.png/i)!=null){var a=b.substring(5,b.length-2);c.style.backgroundImage="none";c.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+a+"', sizingMethod='crop')"}}}function relativeforfloats(){var c=document.getElementById("bodyContent");if(c){var a=c.getElementsByTagName("table");var b=c.getElementsByTagName("div")}setrelative(a);setrelative(b)}function setrelative(a){var b=0;while(b<a.length){if((((a[b].style.float&&a[b].style.float!=("none"))||((a[b].align&&a[b].align!=("none"))))&&(!a[b].style.position||a[b].style.position!="relative"))){a[b].style.position="relative"}b++}};
\ No newline at end of file

Deleted: trunk/themes/MonoBook/Makefile
===================================================================
--- trunk/themes/MonoBook/Makefile	2012-11-15 14:07:14 UTC (rev 8477)
+++ trunk/themes/MonoBook/Makefile	2012-11-15 16:21:08 UTC (rev 8478)
@@ -1,17 +0,0 @@
-# themes/MonoBook/Makefile
-#
-# minify CSS and JS
-#
-
-CSS_SRC = IE70Fixes.css   commonPrint.css  rtl.css \
-	  IEFixes.css     main.css         wikiprintable.css \
-	  IE60Fixes.css  monobook.css     wikistandard.css
-MAIN    = wikibits
-JS_MAIN = wikibits.js
-# JS_REST = IEFixes.js
-
-CSS_FILES = $(patsubst %.css,%-min.css,$(CSS_SRC))
-
-all	: css js
-
-include ../Makefile.global

Deleted: trunk/themes/MonoBook/commonPrint-min.css
===================================================================
--- trunk/themes/MonoBook/commonPrint-min.css	2012-11-15 14:07:14 UTC (rev 8477)
+++ trunk/themes/MonoBook/commonPrint-min.css	2012-11-15 16:21:08 UTC (rev 8478)
@@ -1 +0,0 @@
-@page{size:A4 portrait;margin:17mm 10mm 17mm 10mm}h1{string-set:header content()}@page :left{@top-left{content:"Phpwiki"}@top-right{content:string(header)}@bottom-left{content:"Page " counter(page) " of " counter(pages)}}@page :right{@top-left{content:string(header)}@top-right{content:"Phpwiki"}@bottom-right{content:"Page " counter(page) " of " counter(pages)}}@page :first{@top-right{content:normal}@top-left{content:normal}}h1,h2,h3,h4,h5,h6{page-break-after:avoid}table.nobreak{page-break-inside:avoid!important}a.stub,a.new{color:#ba0000;text-decoration:none}.toc,#toc{border:1px solid #aaa;background-color:#f9f9f9;padding:5px}.tocindent{margin-left:2em}.tocline{margin-bottom:0}.toctoggle,.editsection{font-size:smaller}div.toclist a::after{content:leader('.') target-counter(attr(href),page)}div.floatright{float:right;margin:0;position:relative;border:.5em solid White;border-width:.5em 0 .8em 1.4em}div.floatright p{font-style:italic}div.floatleft{float:left;margin:.3em .5em .5em 0;position:relative;border:.5em solid White;border-width:.5em 1.4em .8em 0}div.floatleft p{font-style:italic}div.thumb{margin-bottom:.5em;border-style:solid;border-color:White;width:auto}div.thumb div{border:1px solid #ccc;padding:3px!important;background-color:#f9f9f9;font-size:94%;text-align:center}div.thumb div a img{border:1px solid #ccc}div.thumb div div.thumbcaption{border:0;text-align:left;padding:.3em 0 .1em 0}div.magnify{display:none}div.tright{float:right;border-width:.5em 0 .8em 1.4em}div.tleft{float:left;margin-right:.5em;border-width:.5em 1.4em .8em 0}table.rimage{float:right;width:1pt;position:relative;margin-left:1em;margin-bottom:1em;text-align:center}body{background:White;color:Black;margin:0;padding:0}div#p-personal,div.top,div#column-one,#colophon,.editsection,.toctoggle,div#f-poweredbyico,div#f-copyrightico,li#f-viewcount,li#f-about,li#f-disclaimer,div#xhtml-validator,li#pt-logout,li#pt-login,div#p-logo,div.hint,fieldset.wiki-rc-action,span.debug{display:none}ul{list-style-type:square}#content{background:0;border-style:none!important;font-size:11pt;padding:0!important;margin:0!important;text-align:left}#footer{border:1px solid black}h1,h2,h3,h4,h5,h6{font-weight:bold}p,.documentDescription{margin:1em 0!important;line-height:1.2em}pre{border:1pt dashed black;white-space:pre;font-size:8pt;overflow:auto;padding:0}table.listing,table.listing td{border:1pt solid black;border-collapse:collapse}a{color:Black!important;padding:0!important}a:link,a:visited{color:#520;background-color:transparent;text-decoration:underline}#globalWrapper{width:100%!important;min-width:0!important}#column-content{margin:0!important}#column-content #content{padding:1em;margin:0!important}a,a.external,a.new,a.stub{color:black!important;text-decoration:none!important}a,a.external,a.new,a.stub{color:inherit!important;text-decoration:inherit!important}.urlexpansion{display:inline!important}div.townBox{position:relative;float:right;background:white;margin-left:1em;border:1px solid gray;padding:.3em;width:200px;overflow:hidden;clear:right}div.townBox dl{padding:0;margin:0 0 .3em 0;font-size:96%}div.townBox dl dt{background:0;margin:.4em 0 0 0}div.townBox dl dd{margin:.1em 0 0 1.1em;background-color:#f3f3f3}
\ No newline at end of file

Deleted: trunk/themes/MonoBook/main-min.css
===================================================================
--- trunk/themes/MonoBook/main-min.css	2012-11-15 14:07:14 UTC (rev 8477)
+++ trunk/themes/MonoBook/main-min.css	2012-11-15 16:21:08 UTC (rev 8478)
@@ -1 +0,0 @@
-#column-content{width:100%;float:right;margin:0 0 .6em -12.2em;padding:0;height:1%}#content{position:relative;z-index:2;margin:2.8em 0 0 12.2em;padding:0 1em 1.5em 1em;background-color:white;color:black;border:1px solid #aaa;border-right:0;line-height:1.5em}#column-one{position:absolute;padding-top:160px;top:0;left:0}body{font:small sans-serif;background:#f9f9f9 url("images/headbg.jpg") 0 0 no-repeat;color:black;margin:0;padding:0}#globalWrapper{font-size:127%;width:100%;margin:0;padding:0}.visualClear{clear:both}table{font-size:100%;color:black}a{text-decoration:none;color:#002bb8;background-image:none}a:visited{color:#5a3696}a:active{color:#faa700}a:hover{text-decoration:underline}a.stub{color:#723}img{border:0;vertical-align:middle}p{margin:.4em 0 .5em 0;line-height:1.5em}p img{margin:0}hr{height:1px;color:#aaa;background-color:#aaa;border:0;margin:.2em 0 .2em 0}h1,h2,h3,h4,h5,h6{color:black;background-image:none;font-weight:bold;font-family:Tahoma,sans-serif;margin:0;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa}h1{font-size:188%}h2{font-size:150%}h3{font-size:132%}h4{font-size:116%}h5{font-size:100%}h6{font-size:80%}h4,h5,h6{border-bottom:0;font-weight:normal}li p{margin:0}ul{line-height:1.5em;list-style-type:square;margin:.3em 0 0 1.5em;padding:0;list-style-image:url("images/bullet.png")}ol{line-height:1.5em;margin:.3em 0 0 3.2em;padding:0;list-style-image:none}li{margin-bottom:.1em}dt{font-weight:bold;margin-bottom:.1em}dl{margin-top:.2em;margin-bottom:.5em}dd{line-height:1.5em;margin-left:2em;margin-bottom:.1em}fieldset{border:1px solid #2f6fab;margin:1em 0 1em 0;padding:0 1em 1em 1em;line-height:1.5em}legend{padding:.5em;font-size:95%}form{border:0;margin:0}textarea{width:100%;padding:.1em}input.historysubmit{padding:0 .3em .3em .3em!important;font-size:94%;cursor:pointer;height:1.7em!important;margin-left:1.6em}select{vertical-align:top}abbr,acronym,.explain{border-bottom:1px dotted black;color:black;background-image:none;cursor:help}q{font-family:Times,"Times New Roman",serif;font-style:italic}code{background-color:#f9f9f9}pre{padding:1em;border:1px dashed #2f6fab;color:black;background-color:#f9f9f9;line-height:1.1em}.tt{font-family:monospace}.strike{text-decoration:line-through}.align-left{text-align:left}.align-right{text-align:right}.align-center{text-align:center}.top{vertical-align:top}.nowrap{white-space:nowrap}.fullwidth{width:100%}#siteSub{display:none}#jump-to-nav{display:none}#contentSub{font-size:84%;line-height:1.2em;margin:0 0 1.4em 1em;color:#7d7d7d;width:auto}span.subpages{display:block}#bodyContent h1,#bodyContent h2{margin-bottom:.6em}#bodyContent h3,#bodyContent h4,#bodyContent h5{margin-bottom:.3em}.firstHeading{margin-bottom:.1em}.usermessage{background-color:#ffce7b;border:1px solid #ffa500;color:black;font-weight:bold;margin:2em 0 1em;padding:.5em 1em;vertical-align:middle}#siteNotice{text-align:center;font-size:95%;padding:0 .9em}#siteNotice p{margin:0;padding:0}.errorbox,.successbox{font-size:larger;border:2px solid;padding:.5em 1em;float:left;margin-bottom:2em;color:#000}.errorbox{border-color:red;background-color:#fff2f2}.successbox{border-color:green;background-color:#dfd}.errorbox h2,.successbox h2{font-size:1em;font-weight:bold;display:inline;margin:0 .5em 0 0;border:0}#catlinks{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;margin-top:1em;clear:both}.documentDescription{font-weight:bold;display:block;margin:1em 0;line-height:1.5em}.documentByLine{text-align:right;font-size:90%;clear:both;font-weight:normal;color:#76797c}.center{width:100%;text-align:center}*.center *{margin-left:auto;margin-right:auto}.small,.small *{font-size:94%}table.small{font-size:100%}#toc,.toc{width:200px;border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;float:right;clear:right}#toc #toctitle,.toc .toctitle,.toc #toctitle{display:inline;border:0;padding:0;font-size:110%;font-weight:bold}.toc .toclist,.toc #toclist{width:auto;border:0}#toc #toctitle,.toc #toctitle,#toc .toctitle,.toc .toctitle{text-align:center}#toc p,.toc p{margin:0}#toc ul,.toc ul{width:auto;border:0;line-height:1.5em;list-style-type:square;list-style-image:url("images/bullet.png");font-size:95%;margin-left:5px;padding-left:5px}#toc ul ul,.toc ul ul{margin:0 0 0 2em}#toc .toctoggle,.toc .toctoggle{font-size:94%}.mw-warning{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%}.mw-warning{margin-left:50px;margin-right:50px;text-align:center}div.floatright,table.floatright{clear:right;float:right;position:relative;margin:0 0 .5em .5em;border:0}div.floatright p{font-style:italic}div.floatleft,table.floatleft{float:left;position:relative;margin:0 .5em .5em 0;border:0}div.floatleft p{font-style:italic}div.thumb{margin-bottom:.5em;border-style:solid;border-color:white;width:auto}div.thumb div{border:1px solid #ccc;padding:3px!important;background-color:#f9f9f9;font-size:94%;text-align:center;overflow:hidden}div.thumb div a img{border:1px solid #ccc}div.thumb div div.thumbcaption{border:0;text-align:left;line-height:1.4em;padding:.3em 0 .1em 0}div.magnify{float:right;border-style:none!important;background:none!important}div.magnify a,div.magnify img{display:block;border-style:none!important;background:none!important}div.tright{clear:right;float:right;border-width:.5em 0 .8em 1.4em}div.tleft{float:left;margin-right:.5em;border-width:.5em 1.4em .8em 0}.hiddenStructure{display:none;speak:none}img.tex{vertical-align:middle}span.texhtml{font-family:serif}table.rimage{float:right;position:relative;margin-left:1em;margin-bottom:1em;text-align:center}.toccolours{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%}div.townBox{position:relative;float:right;background-color:white;margin-left:1em;border:1px solid gray;padding:.3em;width:200px;overflow:hidden;clear:right}div.townBox dl{padding:0;margin:0 0 .3em;font-size:96%}div.townBox dl dt{background-image:none;margin:.4em 0 0}div.townBox dl dd{margin:.1em 0 0 1.1em;background-color:#f3f3f3}.special li{line-height:1.4em;margin:0;padding:0}.pageinfo-majoredit{font-weight:normal}.wiki-summary{font-size:94%;font-style:italic}.autocomment{color:gray}#pagehistory span.user{margin-left:1.4em;margin-right:.4em}#pagehistory span.minor{font-weight:bold}#pagehistory li{border:1px solid white}#pagehistory li.selected{background-color:#f9f9f9;border:1px dashed #aaa}table.diff,td.diff-otitle,td.diff-ntitle{background-color:white}td.diff-addedline{background-color:#cfc;font-size:smaller}td.diff-deletedline{background-color:#ffa;font-size:smaller}td.diff-context{background-color:#eee;font-size:smaller}span.diffchange{color:red;font-weight:bold}.diff{margin-top:1ex;margin-bottom:.5ex;background-color:white;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both}.diff .block{background-color:#ddd;padding-left:1em}.diff .context{background-color:white;border:0}.difftext{margin-top:0;margin-bottom:0;background-color:white;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:0}.diff del,.diff ins{font-weight:bold;text-decoration:none}.diff .original,.diff .deleted,.diff .final,.diff .added{background-color:white}.diff .original,.diff .deleted{background-color:#fcc;border:0}.diff .final,.diff .added{background-color:#cfc;border:0}.diff del{background-color:#f99}.diff ins{background-color:#9f9}td.pageinfo{font-weight:bold}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique}div.rss{margin:1em;padding:1em;font-size:.9em;background-color:#eee;border:thin dashed #aaa}div.feed{color:#333;margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;background-color:#f2f2f2;font-size:1.2em}div.itemdesc{padding-left:1em}div.rssitem{border-top:thin dashed #aaa}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle}table.cal{border:1px outset gray;background-color:white;margin:.5ex .5em;padding:1px;empty-cells:hide}table.cal td{background-color:white;text-align:right}table.cal-header{font-size:larger}table.cal-header tr,table.cal-header td{text-align:center}.cal-arrow{font-weight:bold;text-decoration:none}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline}a.cal-hide{text-decoration:none}table.cal td.cal-today{margin:1px;border:1px solid gray}#bodyContent a.external,#bodyContent a[href ^="gopher://"]{background:url("images/url.png") center right no-repeat;padding-right:13px}#bodyContent a[href ^="https://"],.link-https{background:url("images/lock_icon.png") center right no-repeat;padding-right:16px}#bodyContent a[href ^="mailto:"],.link-mailto{background:url("images/mail_icon.png") center right no-repeat;padding-right:18px}#bodyContent a[href ^="news://"]{background:url("images/news_icon.png") center right no-repeat;padding-right:18px}#bodyContent a[href ^="ftp://"],.link-ftp{background:url("images/file_icon.png") center right no-repeat;padding-right:18px}#bodyContent a[href ^="irc://"],.link-irc{background:url("images/discussionitem_...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[8477] trunk/lib/wikilens/RatingsDb.php

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

Revision: 8477
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8477&view=rev
Author:   vargenau
Date:     2012-11-15 14:07:14 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
Check for FUSIONFORGE

Modified Paths:
--------------
    trunk/lib/wikilens/RatingsDb.php

Modified: trunk/lib/wikilens/RatingsDb.php
===================================================================
--- trunk/lib/wikilens/RatingsDb.php	2012-11-15 13:54:31 UTC (rev 8476)
+++ trunk/lib/wikilens/RatingsDb.php	2012-11-15 14:07:14 UTC (rev 8477)
@@ -376,15 +376,24 @@
                 $where = "WHERE";
             }
             if (isset($pagename)) {
-                $raterid = $this->_sqlbackend->_get_pageid($pagename, true);
-                $where .= " raterpage=$raterid";
+                if (defined('FUSIONFORGE') and FUSIONFORGE) {
+                    $rateeid = $this->_sqlbackend->_get_pageid($pagename, true);
+                    $where .= " rateepage=$rateeid";
+                } else {
+                    $raterid = $this->_sqlbackend->_get_pageid($pagename, true);
+                    $where .= " raterpage=$raterid";
+                }
             }
             if (isset($dimension)) {
                 if (isset($pagename)) $where .= " AND";
                 $where .= " dimension=$dimension";
             }
             extract($dbi->_table_names);
-            $query = "SELECT AVG(ratingvalue) as avg FROM $rating_tbl r, $page_tbl p " . $where . " GROUP BY raterpage";
+            if (defined('FUSIONFORGE') and FUSIONFORGE) {
+                $query = "SELECT AVG(ratingvalue) as avg FROM $rating_tbl " . $where;
+            } else {
+                $query = "SELECT AVG(ratingvalue) as avg FROM $rating_tbl r, $page_tbl p " . $where . " GROUP BY raterpage";
+            }
             $result = $dbi->_dbh->query($query);
             $iter = new $this->iter_class($this, $result);
             $row = $iter->next();

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8476] trunk/lib/wikilens/RatingsDb.php

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

Revision: 8476
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8476&view=rev
Author:   vargenau
Date:     2012-11-15 13:54:31 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
Simpler SQL query

Modified Paths:
--------------
    trunk/lib/wikilens/RatingsDb.php

Modified: trunk/lib/wikilens/RatingsDb.php
===================================================================
--- trunk/lib/wikilens/RatingsDb.php	2012-11-15 13:38:31 UTC (rev 8475)
+++ trunk/lib/wikilens/RatingsDb.php	2012-11-15 13:54:31 UTC (rev 8476)
@@ -383,12 +383,8 @@
                 if (isset($pagename)) $where .= " AND";
                 $where .= " dimension=$dimension";
             }
-            //$dbh = &$this->_dbi;
             extract($dbi->_table_names);
-            $query = "SELECT AVG(ratingvalue) as avg"
-                . " FROM $rating_tbl r, $page_tbl p "
-                . $where
-                . " GROUP BY raterpage";
+            $query = "SELECT AVG(ratingvalue) as avg FROM $rating_tbl r, $page_tbl p " . $where . " GROUP BY raterpage";
             $result = $dbi->_dbh->query($query);
             $iter = new $this->iter_class($this, $result);
             $row = $iter->next();

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

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

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

Revision: 8475
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8475&view=rev
Author:   vargenau
Date:     2012-11-15 13:38:31 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
make locale

Modified Paths:
--------------
    trunk/locale/Makefile
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/de/LC_MESSAGES/phpwiki.php
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.php
    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/Makefile
===================================================================
--- trunk/locale/Makefile	2012-11-15 13:33:52 UTC (rev 8474)
+++ trunk/locale/Makefile	2012-11-15 13:38:31 UTC (rev 8475)
@@ -99,7 +99,6 @@
 ${POT_FILE}: ../lib/fortune.php
 ${POT_FILE}: ../lib/gif.php
 ${POT_FILE}: ../lib/Google.php
-${POT_FILE}: ../lib/HtmlElement5.php
 ${POT_FILE}: ../lib/HtmlElement.php
 ${POT_FILE}: ../lib/HtmlParser.php
 ${POT_FILE}: ../lib/HttpClient.php
@@ -240,6 +239,7 @@
 ${POT_FILE}: ../lib/plugin/WhoIsOnline.php
 ${POT_FILE}: ../lib/plugin/WikiAdminChmod.php
 ${POT_FILE}: ../lib/plugin/WikiAdminChown.php
+${POT_FILE}: ../lib/plugin/WikiAdminDeleteAcl.php
 ${POT_FILE}: ../lib/plugin/WikiAdminMarkup.php
 ${POT_FILE}: ../lib/plugin/WikiAdminPurge.php
 ${POT_FILE}: ../lib/plugin/WikiAdminRemove.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	2012-11-15 13:33:52 UTC (rev 8474)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2012-11-15 13:38:31 UTC (rev 8475)
@@ -264,7 +264,6 @@
 $locale["Check you are logged in."] = "Sie sollten jetzt angemeldet sein.";
 $locale["Chmod"] = "Chmod";
 $locale["Chmod to permission:"] = "Ändere auf Berechtigung:";
-$locale["Chown"] = "Chown";
 $locale["Click to authenticate as %s"] = "Hier klicken um sich anzumelden als %s";
 $locale["Click to de-/select all pages"] = "Klicken Sie um alle/keine Seiten auszuwählen";
 $locale["Click to display"] = "Klicken um anzuzeigen";
@@ -939,7 +938,6 @@
 $locale["Set Password"] = "Setze Passwort";
 $locale["Set USE_DB_SESSION to false."] = "Setzen Sie USE_DB_SESSION auf false.";
 $locale["Set individual page permissions."] = "Setze individuelle Zugangsrechte.";
-$locale["SetAcl"] = "AclSetzen";
 $locale["Show and add blogs for %s"] = "Blogs für %s zeigen und hinzufügen";
 $locale["Show and add comments for %s"] = "Kommentare für %s zeigen und hinzufügen";
 $locale["Show changes for:"] = "Zeige Änderungen innerhalb von:";
@@ -975,7 +973,6 @@
 $locale["Spam Prevention"] = "AntiSpam";
 $locale["SpamAssassin reports: "] = "SpamAssassin sagt: ";
 $locale["Special Pages"] = "Spezialseiten";
-$locale["SpecialPages"] = "Spezialseiten";
 $locale["Spelling Score"] = "Buchstabierende";
 $locale["SqlResult"] = "SqlErgebnis";
 $locale["Statistics about %s."] = "Statistik über %s.";

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

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/es/LC_MESSAGES/phpwiki.php	2012-11-15 13:33:52 UTC (rev 8474)
+++ trunk/locale/es/LC_MESSAGES/phpwiki.php	2012-11-15 13:38:31 UTC (rev 8475)
@@ -103,7 +103,6 @@
 $locale["Change page attributes"] = "Cambie las cualidades de la página";
 $locale["Changes"] = "Cambios";
 $locale["Check to add this ACL"] = "Compruebe para agregar este ACL";
-$locale["Chown"] = "Cambie a dueño";
 $locale["Click a button to get an example text"] = "Chasque un botón para conseguir un texto del ejemplo";
 $locale["Click to de-/select all pages"] = "Tecleo para de-/seleccionar todas las páginas";
 $locale["Click to reverse sort order"] = "Tecleo para invertir orden de la clase";
@@ -390,7 +389,6 @@
 $locale["Serialized file %s"] = "Archivo serializado %s";
 $locale["Set Password"] = "Set Contraseña";
 $locale["Set USE_DB_SESSION to false."] = "Fije USE_DB_SESSION a falso.";
-$locale["SetAcl"] = "Fije El Acl";
 $locale["Show changes for:"] = "Demuestre los cambios para:";
 $locale["Sign In"] = "Muestra Adentro";
 $locale["Sign Out"] = "Registro Hacia fuera";

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	2012-11-15 13:33:52 UTC (rev 8474)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2012-11-15 13:38:31 UTC (rev 8475)
@@ -262,7 +262,6 @@
 $locale["Check you are logged in."] = "Vous devez vous identifier";
 $locale["Chmod"] = "Chmod";
 $locale["Chmod to permission:"] = "Changer le mode de permission à :";
-$locale["Chown"] = "Chown";
 $locale["Click a button to get an example text"] = "Cliquer sur un bouton pour obtenir une exemple de texte";
 $locale["Click to authenticate as %s"] = "Cliquez pour vous identifier en tant que %s";
 $locale["Click to de-/select all pages"] = "Cliquez pour (de)sélectionner toutes les pages";
@@ -979,8 +978,6 @@
 $locale["Set Password"] = "Choisir un mot de passe";
 $locale["Set USE_DB_SESSION to false."] = "Mettre USE_DB_SESSION à false.";
 $locale["Set individual page permissions."] = "Modifier les permissions individuelles de la page.";
-$locale["SetAcl"] = "DéfinirAcl";
-$locale["SetAclSimple"] = "DéfinirAclSimple";
 $locale["Show Group Information"] = "Information sur le groupe";
 $locale["Show Page Trail"] = "Afficher le fil d'Ariane";
 $locale["Show Page Trail at top of page."] = "Afficher le fil d'Ariane en tête de la page.";
@@ -1018,7 +1015,6 @@
 $locale["Sound Score"] = "Score de son";
 $locale["Special Actions"] = "Actions spéciales";
 $locale["Special Pages"] = "Pages spéciales";
-$locale["SpecialPages"] = "Pages spéciales";
 $locale["Spell Check"] = "Vérifier l'orthographe";
 $locale["Spell Checker"] = "Correcteur orthographique";
 $locale["Spelling Score"] = "Score d'épellation";

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

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

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

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2012-11-15 13:33:52 UTC (rev 8474)
+++ trunk/locale/po/de.po	2012-11-15 13:38:31 UTC (rev 8475)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-14 18:09+0100\n"
+"POT-Creation-Date: 2012-11-15 14:37+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -194,7 +194,6 @@
 #: ../themes/default/templates/head.tmpl:59
 #: ../themes/default/templates/head.tmpl:61
 #: ../themes/default/templates/navbar.tmpl:13
-#: ../themes/fusionforge/templates/navbar.tmpl:8
 #: ../themes/MonoBook/templates/navbar.tmpl:13
 #: ../themes/Portland/templates/navbar.tmpl:22
 #: ../themes/shamino_com/templates/top.tmpl:17
@@ -213,19 +212,6 @@
 msgid "Unsupported argument: %s=%s"
 msgstr "Nicht unterstütztes Argument: %s=%s"
 
-#: ../lib/display.php:279 ../lib/display.php:286
-#: ../lib/plugin/BackLinks.php:30 ../lib/plugin/_WikiTranslation.php:50
-#: ../themes/blog/templates/navbar.tmpl:8
-#: ../themes/Crao/templates/navbar.tmpl:15
-#: ../themes/default/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/actionbar.tmpl:73
-#: ../themes/MonoBook/templates/navbar.tmpl:49
-#: ../themes/Sidebar/templates/navbar.tmpl:45
-#: ../themes/smaller/templates/navbar.tmpl:14
-#: ../themes/wikilens/templates/navbar.tmpl:21
-msgid "BackLinks"
-msgstr "BackLinks"
-
 #: ../lib/display.php:282 ../lib/display.php:289
 #, php-format
 msgid "BackLinks for %s"
@@ -364,8 +350,8 @@
 "(Kopieren Sie Ihre Veränderungen in die Zwischenablage. Sie können versuchen "
 "eine andere Seite zu edieren oder Ihr Text in einem Texteditor speichern.)"
 
-#: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:831
-#: ../lib/main.php:1214 ../lib/plugin/ModeratedPage.php:43
+#: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:832
+#: ../lib/main.php:1218 ../lib/plugin/ModeratedPage.php:43
 #: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
 #: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
 #: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
@@ -390,7 +376,6 @@
 #: ../themes/default/templates/head.tmpl:85
 #: ../themes/default/templates/homepage.tmpl:10
 #: ../themes/default/templates/navbar.tmpl:24
-#: ../themes/fusionforge/templates/navbar.tmpl:27
 #: ../themes/MonoBook/templates/signin.tmpl:9
 #: ../themes/shamino_com/templates/top.tmpl:25
 #: ../themes/Sidebar/templates/navbar.tmpl:49
@@ -531,7 +516,7 @@
 
 #: ../lib/EditToolbar.php:59 ../lib/plugin/SyncWiki.php:308
 #: ../lib/plugin/SyncWiki.php:335 ../lib/plugin/SyncWiki.php:359
-#: ../lib/plugin/WikiPoll.php:228 ../lib/stdlib.php:2005
+#: ../lib/plugin/WikiPoll.php:228 ../lib/stdlib.php:2003
 #: ../lib/upgrade.php:201 ../lib/upgrade.php:407 ../lib/upgrade.php:421
 #: ../lib/upgrade.php:441 ../lib/upgrade.php:450 ../lib/upgrade.php:474
 #: ../lib/upgrade.php:502 ../lib/upgrade.php:551 ../lib/upgrade.php:554
@@ -712,14 +697,6 @@
 msgid "An unnamed PhpWiki"
 msgstr "Unbenanntes PhpWiki"
 
-#: ../lib/IniConfig.php:1016 ../lib/upgrade.php:73
-#: ../themes/blog/templates/browse-footer.tmpl:3
-#: ../themes/default/templates/userprefs.tmpl:129
-#: ../themes/fusionforge/templates/navbar.tmpl:7
-#: ../themes/Wordpress/templates/actionbar.tmpl:17
-msgid "HomePage"
-msgstr "StartSeite"
-
 #: ../lib/InlineParser.php:358
 msgid "Invalid [] syntax ignored"
 msgstr "Ungültige [] syntax ignoriert"
@@ -740,11 +717,11 @@
 msgid ": "
 msgstr ": "
 
-#: ../lib/InlineParser.php:409 ../lib/main.php:793 ../lib/stdlib.php:988
+#: ../lib/InlineParser.php:409 ../lib/main.php:794 ../lib/stdlib.php:988
 msgid "Page name too long"
 msgstr "Seite Name zu lang"
 
-#: ../lib/InlineParser.php:415 ../lib/main.php:800
+#: ../lib/InlineParser.php:415 ../lib/main.php:801
 #, php-format
 msgid "Illegal character '%s' in page name."
 msgstr "Ungültiges Zeichen '%s' in Seitenname."
@@ -783,17 +760,15 @@
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
 #: ../lib/loadsave.php:96 ../lib/loadsave.php:483 ../lib/loadsave.php:1041
-#: ../lib/loadsave.php:1047 ../lib/loadsave.php:1055 ../lib/main.php:1097
-#: ../lib/main.php:1234 ../lib/main.php:1247 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:147
-#: ../lib/plugin/WikiAdminSelect.php:221
+#: ../lib/loadsave.php:1047 ../lib/loadsave.php:1055 ../lib/main.php:1238
+#: ../lib/main.php:1251 ../lib/PagePerm.php:190 ../lib/PagePerm.php:191
+#: ../lib/plugin/WikiAdminRename.php:147 ../lib/plugin/WikiAdminSelect.php:221
 #: ../themes/blog/templates/navbar.tmpl:11
 #: ../themes/Crao/templates/head.tmpl:70 ../themes/Crao/templates/head.tmpl:71
 #: ../themes/Crao/templates/navbar.tmpl:35
 #: ../themes/default/templates/head.tmpl:78
 #: ../themes/default/templates/head.tmpl:79
 #: ../themes/default/templates/navbar.tmpl:39
-#: ../themes/fusionforge/templates/navbar.tmpl:21
 #: ../themes/MonoBook/templates/navbar.tmpl:55
 #: ../themes/Portland/templates/navbar.tmpl:24
 #: ../themes/shamino_com/templates/actionbar.tmpl:17
@@ -920,14 +895,6 @@
 msgid "'%s': Bad page name"
 msgstr "»%s«: Ungültiger Seitenname"
 
-#: ../lib/loadsave.php:921 ../lib/loadsave.php:1557 ../lib/PageType.php:163
-#: ../lib/plugin/InterWikiSearch.php:56 ../lib/plugin/WantedPagesOld.php:77
-#: ../lib/plugin/WantedPages.php:56 ../themes/default/templates/info.tmpl:155
-#: ../themes/MonoBook/templates/info.tmpl:161
-#: ../themes/MonoBook/templates/info.tmpl:162
-msgid "InterWikiMap"
-msgstr "InterWikiListe"
-
 #: ../lib/loadsave.php:975
 #, php-format
 msgid "from %s"
@@ -1407,52 +1374,29 @@
 msgstr ""
 "Das Herunterladen aller Wiki-Seiten als HTML-Dateien in einer Zip-Datei"
 
-#: ../lib/main.php:819
+#: ../lib/main.php:820
 #, php-format
 msgid "%s: action forwarded to a moderator."
 msgstr ""
 
-#: ../lib/main.php:822
+#: ../lib/main.php:823
 msgid "This action requires moderator approval. Please be patient."
 msgstr ""
 
-#: ../lib/main.php:827
+#: ../lib/main.php:828
 msgid "You must wait for moderator approval."
 msgstr "Sie müssen auf die Zustimmung des Moderators warten."
 
-#: ../lib/main.php:845 ../lib/plugin/ModeratedPage.php:319
+#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:319
 #, php-format
 msgid "%s: Bad action"
 msgstr "%s: Ungültige Aktion"
 
-#: ../lib/main.php:863
+#: ../lib/main.php:864
 msgid "Fatal PhpWiki Error"
 msgstr "Fataler PhpWiki-Fehler"
 
-#: ../lib/main.php:1119
-msgid "Chown"
-msgstr "Chown"
-
-#: ../lib/main.php:1124
-msgid "SetAcl"
-msgstr "AclSetzen"
-
-#: ../lib/main.php:1129
-msgid "SetAclSimple"
-msgstr ""
-
-#: ../lib/main.php:1134
-#, fuzzy
-msgid "DeleteAcl"
-msgstr "Gelöscht"
-
-#: ../lib/main.php:1139 ../lib/PagePerm.php:190
-#: ../lib/plugin/WikiAdminRename.php:147 ../lib/plugin/WikiAdminRename.php:277
-#: ../themes/fusionforge/templates/actionbar.tmpl:104
-msgid "Rename"
-msgstr "Umbenennen"
-
-#: ../lib/main.php:1144 ../lib/main.php:1149 ../lib/plugin/PageDump.php:57
+#: ../lib/main.php:1148 ../lib/main.php:1153 ../lib/plugin/PageDump.php:57
 #: ../themes/Crao/templates/actionbar.tmpl:31
 #: ../themes/default/templates/actionbar.tmpl:36
 #: ../themes/MonoBook/templates/actionbar.tmpl:77
@@ -1464,12 +1408,12 @@
 msgid "PageDump"
 msgstr "SeiteSpeichern"
 
-#: ../lib/main.php:1169 ../lib/plugin/FullTextSearch.php:47
+#: ../lib/main.php:1173 ../lib/plugin/FullTextSearch.php:47
 #: ../lib/plugin/WantedPagesOld.php:130
 msgid "FullTextSearch"
 msgstr "VolltextSuche"
 
-#: ../lib/main.php:1175 ../lib/plugin/RecentChanges.php:900
+#: ../lib/main.php:1179 ../lib/plugin/RecentChanges.php:900
 #: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1522
 #: ../themes/Crao/templates/navbar.tmpl:2
 #: ../themes/Crao/templates/navbar.tmpl:6
@@ -1484,37 +1428,37 @@
 msgid "TitleSearch"
 msgstr "TitelSuche"
 
-#: ../lib/main.php:1371 ../lib/main.php:1384 ../lib/Request.php:870
+#: ../lib/main.php:1375 ../lib/main.php:1388 ../lib/Request.php:877
 #, php-format
 msgid "%s is not writable."
 msgstr "%s is nicht änderbar."
 
-#: ../lib/main.php:1372
+#: ../lib/main.php:1376
 msgid "The session.save_path directory"
 msgstr "Das session.save_path Verzeichnis"
 
-#: ../lib/main.php:1374 ../lib/Request.php:872
+#: ../lib/main.php:1378 ../lib/Request.php:879
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
 "Bitte überprüfen Sie, dass %s änderbar ist, oder ändern Sie %s in config/"
 "config.ini."
 
-#: ../lib/main.php:1375
+#: ../lib/main.php:1379
 #, php-format
 msgid "the session.save_path directory '%s'"
 msgstr "das session.save_path Verzeichnis »%s«"
 
-#: ../lib/main.php:1379
+#: ../lib/main.php:1383
 #, php-format
 msgid "Attempting to use the directory '%s' instead."
 msgstr "Versuche stattdessen das Verzeichnis »%s« zu verwenden."
 
-#: ../lib/main.php:1386
+#: ../lib/main.php:1390
 msgid "Users will not be able to sign in."
 msgstr "Benutzer werden sich nicht anmelden können."
 
-#: ../lib/main.php:1398
+#: ../lib/main.php:1402
 msgid "Your PHP version is too old. You must have at least PHP 4.3.9"
 msgstr ""
 
@@ -1588,8 +1532,8 @@
 msgid "Permission"
 msgstr "Zugriffsrecht"
 
-#: ../lib/PageList.php:1263 ../lib/plugin/WikiAdminSetAcl.php:200
-#: ../lib/plugin/WikiAdminSetAcl.php:254
+#: ../lib/PageList.php:1263 ../lib/plugin/WikiAdminDeleteAcl.php:124
+#: ../lib/plugin/WikiAdminSetAcl.php:200 ../lib/plugin/WikiAdminSetAcl.php:254
 #: ../themes/default/templates/info.tmpl:136
 #: ../themes/MonoBook/templates/info.tmpl:143
 msgid "ACL"
@@ -1685,6 +1629,12 @@
 msgid "Columns: %s."
 msgstr "Spalten: %s."
 
+#: ../lib/PagePerm.php:190 ../lib/plugin/WikiAdminRename.php:147
+#: ../lib/plugin/WikiAdminRename.php:277
+#: ../themes/fusionforge/templates/actionbar.tmpl:104
+msgid "Rename"
+msgstr "Umbenennen"
+
 #: ../lib/PagePerm.php:191
 msgid "SearchReplace"
 msgstr "Suchen & Ersetzen"
@@ -2031,11 +1981,11 @@
 msgid "Go to %s."
 msgstr "Gehe zu %s."
 
-#: ../lib/plugin/AsciiMath.php:49
+#: ../lib/plugin/AsciiMath.php:46
 msgid "AsciiMath"
 msgstr ""
 
-#: ../lib/plugin/AsciiMath.php:54
+#: ../lib/plugin/AsciiMath.php:51
 msgid "Render ASCII Math as MathML"
 msgstr ""
 
@@ -2162,6 +2112,17 @@
 msgid "<not displayed>"
 msgstr "<nicht angezeigt>"
 
+#: ../lib/plugin/BackLinks.php:30 ../lib/plugin/_WikiTranslation.php:50
+#: ../themes/blog/templates/navbar.tmpl:8
+#: ../themes/Crao/templates/navbar.tmpl:15
+#: ../themes/default/templates/navbar.tmpl:18
+#: ../themes/MonoBook/templates/navbar.tmpl:49
+#: ../themes/Sidebar/templates/navbar.tmpl:45
+#: ../themes/smaller/templates/navbar.tmpl:14
+#: ../themes/wikilens/templates/navbar.tmpl:21
+msgid "BackLinks"
+msgstr "BackLinks"
+
 #: ../lib/plugin/BackLinks.php:35
 #, php-format
 msgid "List all pages which link to %s."
@@ -2595,9 +2556,10 @@
 
 #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63
 #: ../lib/plugin/RedirectTo.php:91 ../lib/plugin/SyncWiki.php:77
-#: ../lib/plugin/WikiAdminChown.php:113 ../lib/plugin/WikiAdminMarkup.php:115
-#: ../lib/plugin/WikiAdminPurge.php:99 ../lib/plugin/WikiAdminRemove.php:143
-#: ../lib/plugin/WikiAdminRename.php:149
+#: ../lib/plugin/WikiAdminChown.php:113
+#: ../lib/plugin/WikiAdminDeleteAcl.php:90
+#: ../lib/plugin/WikiAdminMarkup.php:115 ../lib/plugin/WikiAdminPurge.php:99
+#: ../lib/plugin/WikiAdminRemove.php:143 ../lib/plugin/WikiAdminRename.php:149
 #: ../lib/plugin/WikiAdminSearchReplace.php:127
 #: ../lib/plugin/WikiAdminSetAcl.php:147
 #: ../lib/plugin/WikiAdminSetExternal.php:101
@@ -2647,7 +2609,7 @@
 msgid "Ignored stoplist words '%s'"
 msgstr ""
 
-#: ../lib/plugin/FullTextSearch.php:175 ../lib/plugin/WantedPages.php:188
+#: ../lib/plugin/FullTextSearch.php:175 ../lib/plugin/WantedPages.php:186
 #, php-format
 msgid "(%d Links)"
 msgstr "(%d Verweise)"
@@ -2931,7 +2893,6 @@
 # Or in case "Ä" doesn't work as a WikiWord, then use "VergleichbareSeiten".
 #: ../lib/plugin/LikePages.php:31 ../themes/Crao/templates/navbar.tmpl:14
 #: ../themes/default/templates/navbar.tmpl:17
-#: ../themes/fusionforge/templates/navbar.tmpl:15
 #: ../themes/MonoBook/templates/navbar.tmpl:16
 #: ../themes/Portland/templates/navbar.tmpl:5
 #: ../themes/smaller/templates/navbar.tmpl:13
@@ -3328,7 +3289,7 @@
 msgid "Contents"
 msgstr "Inhalt"
 
-#: ../lib/plugin/PageGroup.php:92 ../lib/stdlib.php:2245
+#: ../lib/plugin/PageGroup.php:92 ../lib/stdlib.php:2243
 #, php-format
 msgid "<%s: no such section>"
 msgstr "<%s: unbekannte Sektion>"
@@ -3376,7 +3337,6 @@
 #: ../lib/plugin/PageHistory.php:333 ../lib/plugin/RecentChanges.php:102
 #: ../themes/Crao/templates/actionbar.tmpl:25
 #: ../themes/default/templates/actionbar.tmpl:30
-#: ../themes/fusionforge/templates/actionbar.tmpl:61
 #: ../themes/MonoBook/templates/actionbar.tmpl:40
 #: ../themes/MonoBook/templates/info.tmpl:179
 #: ../themes/Portland/templates/actionbar.tmpl:12
@@ -3419,7 +3379,6 @@
 
 #: ../lib/plugin/PageInfo.php:33 ../themes/Crao/templates/actionbar.tmpl:27
 #: ../themes/default/templates/actionbar.tmpl:32
-#: ../themes/fusionforge/templates/actionbar.tmpl:71
 #: ../themes/MonoBook/templates/actionbar.tmpl:74
 #: ../themes/Portland/templates/actionbar.tmpl:13
 #: ../themes/shamino_com/templates/actionbar.tmpl:4
@@ -3763,7 +3722,6 @@
 msgstr ""
 
 #: ../lib/plugin/RandomPage.php:34 ../lib/plugin/RandomPage.php:87
-#: ../themes/fusionforge/templates/navbar.tmpl:12
 #: ../themes/MonoBook/templates/navbar.tmpl:17
 msgid "RandomPage"
 msgstr "ZufallsSeite"
@@ -5127,7 +5085,7 @@
 msgid "Lists referenced page names which do not exist yet."
 msgstr "Zeige verlinkte Seiten, die noch nicht bearbeitet bzw. erzeugt wurden."
 
-#: ../lib/plugin/WantedPagesOld.php:42 ../lib/plugin/WantedPages.php:56
+#: ../lib/plugin/WantedPagesOld.php:42
 msgid "PgsrcTranslation"
 msgstr "PgsrcTranslation"
 
@@ -5166,7 +5124,6 @@
 msgstr "WunschZettelSeiten in diesem Wiki:"
 
 #: ../lib/plugin/WatchPage.php:37
-#: ../themes/fusionforge/templates/actionbar.tmpl:115
 #: ../themes/MonoBook/templates/actionbar.tmpl:54
 #: ../themes/Sidebar/templates/actionbar.tmpl:29
 msgid "WatchPage"
@@ -5282,12 +5239,14 @@
 msgid "Invalid chmod string"
 msgstr "Ungültiger CHMOD Befehl"
 
-#: ../lib/plugin/WikiAdminChmod.php:89 ../lib/plugin/WikiAdminSetAcl.php:134
+#: ../lib/plugin/WikiAdminChmod.php:89 ../lib/plugin/WikiAdminDeleteAcl.php:77
+#: ../lib/plugin/WikiAdminSetAcl.php:134
 #, php-format
 msgid "%d pages have been changed."
 msgstr "%d Seiten wurden geändert."
 
 #: ../lib/plugin/WikiAdminChmod.php:92 ../lib/plugin/WikiAdminChown.php:104
+#: ../lib/plugin/WikiAdminDeleteAcl.php:81
 #: ../lib/plugin/WikiAdminMarkup.php:106
 #: ../lib/plugin/WikiAdminSearchReplace.php:118
 #: ../lib/plugin/WikiAdminSetAcl.php:138
@@ -5392,6 +5351,48 @@
 msgid "Change owner to: "
 msgstr "Besitzer ändern zu:"
 
+#: ../lib/plugin/WikiAdminDeleteAcl.php:40
+#, fuzzy
+msgid "WikiDeleteAcl"
+msgstr "Gelöscht"
+
+#: ../lib/plugin/WikiAdminDeleteAcl.php:45
+#, fuzzy
+msgid "Delete page permissions."
+msgstr "Vorgabe Zugriffsrecht"
+
+#: ../lib/plugin/WikiAdminDeleteAcl.php:61
+#, fuzzy, php-format
+msgid "ACL deleted for page '%s'"
+msgstr "ACL für Seite '%s' geändert."
+
+#: ../lib/plugin/WikiAdminDeleteAcl.php:66
+#, fuzzy, php-format
+msgid "ACL deleted for page '%s'."
+msgstr "ACL für Seite '%s' nicht geändert."
+
+# Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
+# must also be renamed to match what is here.
+#: ../lib/plugin/WikiAdminDeleteAcl.php:89
+#, fuzzy
+msgid "PhpWikiAdministration/AdminAclDelete"
+msgstr "PhpWikiSystemverwalten/AclSetzen"
+
+#: ../lib/plugin/WikiAdminDeleteAcl.php:127
+#, fuzzy
+msgid "Delete ACL"
+msgstr "Lösche diese ACL"
+
+#: ../lib/plugin/WikiAdminDeleteAcl.php:129
+#, fuzzy
+msgid "Select the pages where to delete access rights"
+msgstr "Wählen Sie die Seiten zum Ändern:"
+
+#: ../lib/plugin/WikiAdminDeleteAcl.php:154
+#: ../lib/plugin/WikiAdminSetAcl.php:243
+msgid "Selected Pages: "
+msgstr "Ausgewählte Seiten: "
+
 #: ../lib/plugin/WikiAdminMarkup.php:37
 msgid "WikiAdminMarkup"
 msgstr "WikiAdminFormatierung"
@@ -5791,10 +5792,6 @@
 msgid "Select the pages where to change access rights"
 msgstr "Wählen Sie die Seiten zum Ändern:"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:243
-msgid "Selected Pages: "
-msgstr "Ausgewählte Seiten: "
-
 #: ../lib/plugin/WikiAdminSetAcl.php:253
 msgid "Type"
 msgstr "Typ"
@@ -6089,7 +6086,6 @@
 #: ../themes/default/templates/head.tmpl:32
 #: ../themes/default/templates/head.tmpl:33
 #: ../themes/default/templates/navbar.tmpl:15
-#: ../themes/fusionforge/templates/navbar.tmpl:10
 #: ../themes/MonoBook/templates/navbar.tmpl:27
 #: ../themes/MonoBook/templates/navbar.tmpl:33
 #: ../themes/Portland/templates/navbar.tmpl:3
@@ -6294,7 +6290,6 @@
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:106
-#: ../themes/fusionforge/templates/navbar.tmpl:18
 #: ../themes/MonoBook/templates/navbar.tmpl:58
 #: ../themes/Sidebar/templates/navbar.tmpl:48
 msgid "UpLoad"
@@ -6391,27 +6386,27 @@
 "neue Version von %s gespeichert. Bitte entscheiden Sie ob Sie die Seite noch "
 "von der Datenbank permanent löschen wollen."
 
-#: ../lib/Request.php:741 ../lib/Request.php:744
+#: ../lib/Request.php:748 ../lib/Request.php:751
 msgid "Upload error: file too big"
 msgstr ""
 
-#: ../lib/Request.php:747
+#: ../lib/Request.php:754
 msgid "Upload error: file only partially received"
 msgstr ""
 
-#: ../lib/Request.php:750
+#: ../lib/Request.php:757
 msgid "Upload error: no file selected"
 msgstr ""
 
-#: ../lib/Request.php:753
+#: ../lib/Request.php:760
 msgid "Upload error: unknown error #"
 msgstr ""
 
-#: ../lib/Request.php:870
+#: ../lib/Request.php:877
 msgid "The PhpWiki access log file"
 msgstr "Die PhpWiki Zugriffslog Datei"
 
-#: ../lib/Request.php:873
+#: ../lib/Request.php:880
 #, php-format
 msgid "the file '%s'"
 msgstr "die Datei %s"
@@ -6420,7 +6415,7 @@
 msgid "Bad URL -- remove all of <, >, \""
 msgstr "URL Formfehler - Entfernen Sie alle Zeichen mit <, >, \""
 
-#: ../lib/stdlib.php:428
+#: ../lib/stdlib.php:432
 msgid "Bad URL for image -- remove all of <, >, \""
 msgstr "URL Formfehler für Bild - Entfernen Sie alle Zeichen mit <, >, \""
 
@@ -6544,7 +6539,7 @@
 msgid "Unable to open directory '%s' for reading"
 msgstr "Konnte Verzeichnis »%s« nicht zum Lesen öffnen"
 
-#: ../lib/stdlib.php:2200 ../lib/stdlib.php:2213
+#: ../lib/stdlib.php:2198 ../lib/stdlib.php:2211
 #, php-format
 msgid "... (first %s words)"
 msgstr "... (erste %s Wörter)"
@@ -6558,6 +6553,12 @@
 msgid "(A|An|And|But|By|For|From|In|Is|It|Of|On|Or|The|To|With)"
 msgstr ""
 
+#: ../lib/upgrade.php:73 ../themes/blog/templates/browse-footer.tmpl:3
+#: ../themes/default/templates/userprefs.tmpl:129
+#: ../themes/Wordpress/templates/actionbar.tmpl:17
+msgid "HomePage"
+msgstr "StartSeite"
+
 #: ../lib/upgrade.php:76
 msgid "always skip the HomePage."
 msgstr ""
@@ -7537,7 +7538,6 @@
 #: ../themes/default/templates/blogform.tmpl:22
 #: ../themes/default/templates/editpage.tmpl:115
 #: ../themes/default/templates/editpage.tmpl:120
-#: ../themes/fusionforge/templates/blogform.tmpl:21
 #: ../themes/fusionforge/templates/editpage.tmpl:114
 #: ../themes/fusionforge/templates/editpage.tmpl:116
 #: ../themes/Portland/templates/editpage.tmpl:76
@@ -8040,6 +8040,12 @@
 msgid "Blog page"
 msgstr "Blog Seite"
 
+#: ../themes/default/templates/info.tmpl:155
+#: ../themes/MonoBook/templates/info.tmpl:161
+#: ../themes/MonoBook/templates/info.tmpl:162
+msgid "InterWikiMap"
+msgstr "InterWikiListe"
+
 #: ../themes/default/templates/info.tmpl:158
 #: ../themes/MonoBook/templates/info.tmpl:165
 msgid "Subpage"
@@ -8562,11 +8568,6 @@
 msgid "Purge"
 msgstr ""
 
-#: ../themes/fusionforge/templates/blogform.tmpl:21
-#: ../themes/fusionforge/templates/editpage.tmpl:116
-msgid "TextFormattingRules"
-msgstr "TextFormatierungsRegeln"
-
 #: ../themes/fusionforge/templates/browse.tmpl:6
 msgid "Error:"
 msgstr ""
@@ -8602,6 +8603,10 @@
 msgid "Make the page external?"
 msgstr ""
 
+#: ../themes/fusionforge/templates/editpage.tmpl:116
+msgid "TextFormattingRules"
+msgstr "TextFormatierungsRegeln"
+
 # (Im Wortsinne heißt das eigentlich: "jüngste = eben gemachte
 # Änderungen"; in terms of newspapers or journalism it's traditionally
 # "NeuesteNachrichten" or much more better "DasNeueste").
@@ -8610,10 +8615,6 @@
 msgstr "Neueste Änderungen"
 
 #: ../themes/fusionforge/templates/navbar.tmpl:9
-msgid "SpecialPages"
-msgstr "Spezialseiten"
-
-#: ../themes/fusionforge/templates/navbar.tmpl:9
 msgid "Special Pages"
 msgstr "Spezialseiten"
 
@@ -8919,6 +8920,15 @@
 msgid "View the current version"
 msgstr "Die aktuelle Version ansehen"
 
+#~ msgid "Chown"
+#~ msgstr "Chown"
+
+#~ msgid "SetAcl"
+#~ msgstr "AclSetzen"
+
+#~ msgid "SpecialPages"
+#~ msgstr "Spezialseiten"
+
 #~ msgid "No pagename specified"
 #~ msgstr "Keine Seite angegeben"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-11-15 13:33:52 UTC (rev 8474)
+++ trunk/locale/po/es.po	2012-11-15 13:38:31 UTC (rev 8475)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-14 18:09+0100\n"
+"POT-Creation-Date: 2012-11-15 14:37+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -195,7 +195,6 @@
 #: ../themes/default/templates/head.tmpl:59
 #: ../themes/default/templates/head.tmpl:61
 #: ../themes/default/templates/navbar.tmpl:13
-#: ../themes/fusionforge/templates/navbar.tmpl:8
 #: ../themes/MonoBook/templates/navbar.tmpl:13
 #: ../themes/Portland/templates/navbar.tmpl:22
 #: ../themes/shamino_com/templates/top.tmpl:17
@@ -214,19 +213,6 @@
 msgid "Unsupported argument: %s=%s"
 msgstr "Discusión sin apoyo: %s=%s"
 
-#: ../lib/display.php:279 ../lib/display.php:286
-#: ../lib/plugin/BackLinks.php:30 ../lib/plugin/_WikiTranslation.php:50
-#: ../themes/blog/templates/navbar.tmpl:8
-#: ../themes/Crao/templates/navbar.tmpl:15
-#: ../themes/default/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/actionbar.tmpl:73
-#: ../themes/MonoBook/templates/navbar.tmpl:49
-#: ../themes/Sidebar/templates/navbar.tmpl:45
-#: ../themes/smaller/templates/navbar.tmpl:14
-#: ../themes/wikilens/templates/navbar.tmpl:21
-msgid "BackLinks"
-msgstr "AcoplamientosTraseros"
-
 #: ../lib/display.php:282 ../lib/display.php:289
 #, php-format
 msgid "BackLinks for %s"
@@ -362,8 +348,8 @@
 "Copie sus cambios al portapapeles o a otro sitio temporal (p.ej. editor de "
 "textos)."
 
-#: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:831
-#: ../lib/main.php:1214 ../lib/plugin/ModeratedPage.php:43
+#: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:832
+#: ../lib/main.php:1218 ../lib/plugin/ModeratedPage.php:43
 #: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
 #: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
 #: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
@@ -388,7 +374,6 @@
 #: ../themes/default/templates/head.tmpl:85
 #: ../themes/default/templates/homepage.tmpl:10
 #: ../themes/default/templates/navbar.tmpl:24
-#: ../themes/fusionforge/templates/navbar.tmpl:27
 #: ../themes/MonoBook/templates/signin.tmpl:9
 #: ../themes/shamino_com/templates/top.tmpl:25
 #: ../themes/Sidebar/templates/navbar.tmpl:49
@@ -525,7 +510,7 @@
 
 #: ../lib/EditToolbar.php:59 ../lib/plugin/SyncWiki.php:308
 #: ../lib/plugin/SyncWiki.php:335 ../lib/plugin/SyncWiki.php:359
-#: ../lib/plugin/WikiPoll.php:228 ../lib/stdlib.php:2005
+#: ../lib/plugin/WikiPoll.php:228 ../lib/stdlib.php:2003
 #: ../lib/upgrade.php:201 ../lib/upgrade.php:407 ../lib/upgrade.php:421
 #: ../lib/upgrade.php:441 ../lib/upgrade.php:450 ../lib/upgrade.php:474
 #: ../lib/upgrade.php:502 ../lib/upgrade.php:551 ../lib/upgrade.php:554
@@ -705,14 +690,6 @@
 msgid "An unnamed PhpWiki"
 msgstr "Un PhpWiki sin un nombre"
 
-#: ../lib/IniConfig.php:1016 ../lib/upgrade.php:73
-#: ../themes/blog/templates/browse-footer.tmpl:3
-#: ../themes/default/templates/userprefs.tmpl:129
-#: ../themes/fusionforge/templates/navbar.tmpl:7
-#: ../themes/Wordpress/templates/actionbar.tmpl:17
-msgid "HomePage"
-msgstr "PáginaPrincipal"
-
 #: ../lib/InlineParser.php:358
 msgid "Invalid [] syntax ignored"
 msgstr "[] el sintaxis inválido no hizo caso"
@@ -733,11 +710,11 @@
 msgid ": "
 msgstr ": "
 
-#: ../lib/InlineParser.php:409 ../lib/main.php:793 ../lib/stdlib.php:988
+#: ../lib/InlineParser.php:409 ../lib/main.php:794 ../lib/stdlib.php:988
 msgid "Page name too long"
 msgstr "La nombre de página demasiado de largo"
 
-#: ../lib/InlineParser.php:415 ../lib/main.php:800
+#: ../lib/InlineParser.php:415 ../lib/main.php:801
 #, fuzzy, php-format
 msgid "Illegal character '%s' in page name."
 msgstr "Los carbones ilegales %s quitaron"
@@ -774,17 +751,15 @@
 msgstr "Páginas de la descarga como XHTML"
 
 #: ../lib/loadsave.php:96 ../lib/loadsave.php:483 ../lib/loadsave.php:1041
-#: ../lib/loadsave.php:1047 ../lib/loadsave.php:1055 ../lib/main.php:1097
-#: ../lib/main.php:1234 ../lib/main.php:1247 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:147
-#: ../lib/plugin/WikiAdminSelect.php:221
+#: ../lib/loadsave.php:1047 ../lib/loadsave.php:1055 ../lib/main.php:1238
+#: ../lib/main.php:1251 ../lib/PagePerm.php:190 ../lib/PagePerm.php:191
+#: ../lib/plugin/WikiAdminRename.php:147 ../lib/plugin/WikiAdminSelect.php:221
 #: ../themes/blog/templates/navbar.tmpl:11
 #: ../themes/Crao/templates/head.tmpl:70 ../themes/Crao/templates/head.tmpl:71
 #: ../themes/Crao/templates/navbar.tmpl:35
 #: ../themes/default/templates/head.tmpl:78
 #: ../themes/default/templates/head.tmpl:79
 #: ../themes/default/templates/navbar.tmpl:39
-#: ../themes/fusionforge/templates/navbar.tmpl:21
 #: ../themes/MonoBook/templates/navbar.tmpl:55
 #: ../themes/Portland/templates/navbar.tmpl:24
 #: ../themes/shamino_com/templates/actionbar.tmpl:17
@@ -906,14 +881,6 @@
 msgid "'%s': Bad page name"
 msgstr "'%s': Mal nombre de la página"
 
-#: ../lib/loadsave.php:921 ../lib/loadsave.php:1557 ../lib/PageType.php:163
-#: ../lib/plugin/InterWikiSearch.php:56 ../lib/plugin/WantedPagesOld.php:77
-#: ../lib/plugin/WantedPages.php:56 ../themes/default/templates/info.tmpl:155
-#: ../themes/MonoBook/templates/info.tmpl:161
-#: ../themes/MonoBook/templates/info.tmpl:162
-msgid "InterWikiMap"
-msgstr "InterMapaDeWiki"
-
 #: ../lib/loadsave.php:975
 #, php-format
 msgid "from %s"
@@ -1384,53 +1351,30 @@
 msgid "Downloading html zip dumps"
 msgstr ""
 
-#: ../lib/main.php:819
+#: ../lib/main.php:820
 #, php-format
 msgid "%s: action forwarded to a moderator."
 msgstr "%s: acción remitida a un asesor."
 
-#: ../lib/main.php:822
+#: ../lib/main.php:823
 msgid "This action requires moderator approval. Please be patient."
 msgstr ""
 "Esta acción requiere la aprobación del asesor.  Sea por favor paciente."
 
-#: ../lib/main.php:827
+#: ../lib/main.php:828
 msgid "You must wait for moderator approval."
 msgstr "Usted debe esperar la aprobación del asesor."
 
-#: ../lib/main.php:845 ../lib/plugin/ModeratedPage.php:319
+#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:319
 #, php-format
 msgid "%s: Bad action"
 msgstr "%s: Mala acción"
 
-#: ../lib/main.php:863
+#: ../lib/main.php:864
 msgid "Fatal PhpWiki Error"
 msgstr "Error Fatal De PhpWiki"
 
-#: ../lib/main.php:1119
-msgid "Chown"
-msgstr "Cambie a dueño"
-
-#: ../lib/main.php:1124
-msgid "SetAcl"
-msgstr "Fije El Acl"
-
-#: ../lib/main.php:1129
-msgid "SetAclSimple"
-msgstr ""
-
-#: ../lib/main.php:1134
-#, fuzzy
-msgid "DeleteAcl"
-msgstr "Borrada"
-
-#: ../lib/main.php:1139 ../lib/PagePerm.php:190
-#: ../lib/plugin/WikiAdminRename.php:147 ../lib/plugin/WikiAdminRename.php:277
-#: ../themes/fusionforge/templates/actionbar.tmpl:104
-msgid "Rename"
-msgstr "Retitule"
-
-#: ../lib/main.php:1144 ../lib/main.php:1149 ../lib/plugin/PageDump.php:57
+#: ../lib/main.php:1148 ../lib/main.php:1153 ../lib/plugin/PageDump.php:57
 #: ../themes/Crao/templates/actionbar.tmpl:31
 #: ../themes/default/templates/actionbar.tmpl:36
 #: ../themes/MonoBook/templates/actionbar.tmpl:77
@@ -1442,12 +1386,12 @@
 msgid "PageDump"
 msgstr "DescargeDeLaPágina"
 
-#: ../lib/main.php:1169 ../lib/plugin/FullTextSearch.php:47
+#: ../lib/main.php:1173 ../lib/plugin/FullTextSearch.php:47
 #: ../lib/plugin/WantedPagesOld.php:130
 msgid "FullTextSearch"
 msgstr "BúsquedaDelTexto"
 
-#: ../lib/main.php:1175 ../lib/plugin/RecentChanges.php:900
+#: ../lib/main.php:1179 ../lib/plugin/RecentChanges.php:900
 #: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1522
 #: ../themes/Crao/templates/navbar.tmpl:2
 #: ../themes/Crao/templates/navbar.tmpl:6
@@ -1462,37 +1406,37 @@
 msgid "TitleSearch"
 msgstr "BúsquedaDeTítulos"
 
-#: ../lib/main.php:1371 ../lib/main.php:1384 ../lib/Request.php:870
+#: ../lib/main.php:1375 ../lib/main.php:1388 ../lib/Request.php:877
 #, php-format
 msgid "%s is not writable."
 msgstr "%s no es escribible."
 
-#: ../lib/main.php:1372
+#: ../lib/main.php:1376
 msgid "The session.save_path directory"
 msgstr "El directorio de session.save_path"
 
-#: ../lib/main.php:1374 ../lib/Request.php:872
+#: ../lib/main.php:1378 ../lib/Request.php:879
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
 "Asegúrese por favor de que %s sea escribible, o redefina %s en config/config."
 "ini."
 
-#: ../lib/main.php:1375
+#: ../lib/main.php:1379
 #, php-format
 msgid "the session.save_path directory '%s'"
 msgstr "el directorio '%s' de session.save_path"
 
-#: ../lib/main.php:1379
+#: ../lib/main.php:1383
 #, php-format
 msgid "Attempting to use the directory '%s' instead."
 msgstr "El procurar utilizar el directorio '%s' en lugar de otro."
 
-#: ../lib/main.php:1386
+#: ../lib/main.php:1390
 msgid "Users will not be able to sign in."
 msgstr "Los usuarios no podrán firmar adentro."
 
-#: ../lib/main.php:1398
+#: ../lib/main.php:1402
 msgid "Your PHP version is too old. You must have at least PHP 4.3.9"
 msgstr ""
 
@@ -1566,8 +1510,8 @@
 msgid "Permission"
 msgstr ""
 
-#: ../lib/PageList.php:1263 ../lib/plugin/WikiAdminSetAcl.php:200
-#: ../lib/plugin/WikiAdminSetAcl.php:254
+#: ../lib/PageList.php:1263 ../lib/plugin/WikiAdminDeleteAcl.php:124
+#: ../lib/plugin/WikiAdminSetAcl.php:200 ../lib/plugin/WikiAdminSetAcl.php:254
 #: ../themes/default/templates/info.tmpl:136
 #: ../themes/MonoBook/templates/info.tmpl:143
 msgid "ACL"
@@ -1663,6 +1607,12 @@
 msgid "Columns: %s."
 msgstr "Columnas: %s."
 
+#: ../lib/PagePerm.php:190 ../lib/plugin/WikiAdminRename.php:147
+#: ../lib/plugin/WikiAdminRename.php:277
+#: ../themes/fusionforge/templates/actionbar.tmpl:104
+msgid "Rename"
+msgstr "Retitule"
+
 #: ../lib/PagePerm.php:191
 msgid "SearchReplace"
 msgstr "Busque Y Substituya"
@@ -2006,11 +1956,11 @@
 msgid "Go to %s."
 msgstr ""
 
-#: ../lib/plugin/AsciiMath.php:49
+#: ../lib/plugin/AsciiMath.php:46
 msgid "AsciiMath"
 msgstr ""
 
-#: ../lib/plugin/AsciiMath.php:54
+#: ../lib/plugin/AsciiMath.php:51
 msgid "Render ASCII Math as MathML"
 msgstr ""
 
@@ -2131,6 +2081,17 @@
 msgid "<not displayed>"
 msgstr ""
 
+#: ../lib/plugin/BackLinks.php:30 ../lib/plugin/_WikiTranslation.php:50
+#: ../themes/blog/templates/navbar.tmpl:8
+#: ../themes/Crao/templates/navbar.tmpl:15
+#: ../themes/default/templates/navbar.tmpl:18
+#: ../themes/MonoBook/templates/navbar.tmpl:49
+#: ../themes/Sidebar/templates/navbar.tmpl:45
+#: ../themes/smaller/templates/navbar.tmpl:14
+#: ../themes/wikilens/templates/navbar.tmpl:21
+msgid "BackLinks"
+msgstr "AcoplamientosTraseros"
+
 #: ../lib/plugin/BackLinks.php:35
 #, php-format
 msgid "List all pages which link to %s."
@@ -2557,9 +2518,10 @@
 
 #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63
 #: ../lib/plugin/RedirectTo.php:91 ../lib/plugin/SyncWiki.php:77
-#: ../lib/plugin/WikiAdminChown.php:113 ../lib/plugin/WikiAdminMarkup.php:115
-#: ../lib/plugin/WikiAdminPurge.php:99 ../lib/plugin/WikiAdminRemove.php:143
-#: ../lib/plugin/WikiAdminRename.php:149
+#: ../lib/plugin/WikiAdminChown.php:113
+#: ../lib/plugin/WikiAdminDeleteAcl.php:90
+#: ../lib/plugin/WikiAdminMarkup.php:115 ../lib/plugin/WikiAdminPurge.php:99
+#: ../lib/plugin/WikiAdminRemove.php:143 ../lib/plugin/WikiAdminRename.php:149
 #: ../lib/plugin/WikiAdminSearchReplace.php:127
 #: ../lib/plugin/WikiAdminSetAcl.php:147
 #: ../lib/plugin/WikiAdminSetExternal.php:101
@@ -2608,7 +2570,7 @@
 msgid "Ignored stoplist words '%s'"
 msgstr ""
 
-#: ../lib/plugin/FullTextSearch.php:175 ../lib/plugin/WantedPages.php:188
+#: ../lib/plugin/FullTextSearch.php:175 ../lib/plugin/WantedPages.php:186
 #, php-format
 msgid "(%d Links)"
 msgstr ""
@@ -2889,7 +2851,6 @@
 
 #: ../lib/plugin/LikePages.php:31 ../themes/Crao/templates/navbar.tmpl:14
 #: ../themes/default/templates/navbar.tmpl:17
-#: ../themes/fusionforge/templates/navbar.tmpl:15
 #: ../themes/MonoBook/templates/navbar.tmpl:16
 #: ../themes/Portland/templates/navbar.tmpl:5
 #: ../themes/smaller/templates/navbar.tmpl:13
@@ -3252,7 +3213,7 @@
 msgid "Contents"
 msgstr ""
 
-#: ../lib/plugin/PageGroup.php:92 ../lib/stdlib.php:2245
+#: ../lib/plugin/PageGroup.php:92 ../lib/stdlib.php:2243
 #, php-format
 msgid "<%s: no such section>"
 msgstr ""
@@ -3300,7 +3261,6 @@
 #: ../lib/plugin/PageHistory.php:333 ../lib/plugin/RecentChanges.php:102
 #: ../themes/Crao/templates/actionbar.tmpl:25
 #: ../themes/default/templates/actionbar.tmpl:30
-#: ../themes/fusionforge/templates/actionbar.tmpl:61
 #: ../themes/MonoBook/templates/actionbar.tmpl:40
 #: ../themes/MonoBook/templates/info.tmpl:179
 #: ../themes/Portland/templates/actionbar.tmpl:12
@@ -3343,7 +3303,6 @@
 
 #: ../lib/plugin/PageInfo.php:33 ../themes/Crao/templates/actionbar.tmpl:27
 #: ../themes/default/templates/actionbar.tmpl:32
-#: ../themes/fusionforge/templates/actionbar.tmpl:71
 #: ../themes/MonoBook/templates/actionbar.tmpl:74
 #: ../themes/Portland/templates/actionbar.tmpl:13
 #: ../themes/shamino_com/templates/actionbar.tmpl:4
@@ -3682,7 +3641,6 @@
 msgstr ""
 
 #: ../lib/plugin/RandomPage.php:34 ../lib/plugin/RandomPage.php:87
-#: ../themes/fusionforge/templates/navbar.tmpl:12
 #: ../themes/MonoBook/templates/navbar.tmpl:17
 msgid "RandomPage"
 msgstr "PáginaAlAzar"
@@ -5008,7 +4966,7 @@
 msgid "Lists referenced page names which do not exist yet."
 msgstr ""
 
-#: ../lib/plugin/WantedPagesOld.php:42 ../lib/plugin/WantedPages.php:56
+#: ../lib/plugin/WantedPagesOld.php:42
 msgid "PgsrcTranslation"
 msgstr ""
 
@@ -5046,7 +5004,6 @@
 msgstr ""
 
 #: ../lib/plugin/WatchPage.php:37
-#: ../themes/fusionforge/templates/actionbar.tmpl:115
 #: ../themes/MonoBook/templates/actionbar.tmpl:54
 #: ../themes/Sidebar/templates/actionbar.tmpl:29
 msgid "WatchPage"
@@ -5162,12 +5119,14 @@
 msgid "Invalid chmod string"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:89 ../lib/plugin/WikiAdminSetAcl.php:134
+#: ../lib/plugin/WikiAdminChmod.php:89 ../lib/plugin/WikiAdminDeleteAcl.php:77
+#: ../lib/plugin/WikiAdminSetAcl.php:134
 #, php-format
 msgid "%d pages have been changed."
 msgstr ""
 
 #: ../lib/plugin/WikiAdminChmod.php:92 ../lib/plugin/WikiAdminChown.php:104
+#: ../lib/plugin/WikiAdminDeleteAcl.php:81
 #: ../lib/plugin/WikiAdminMarkup.php:106
 #: ../lib/plugin/WikiAdminSearchReplace.php:118
 #: ../lib/plugin/WikiAdminSetAcl.php:138
@@ -5270,6 +5229,45 @@
 msgid "Change owner to: "
 msgstr ""
 
+#: ../lib/plugin/WikiAdminDeleteAcl.php:40
+#, fuzzy
+msgid "WikiDeleteAcl"
+msgstr "Borrada"
+
+#: ../lib/plugin/WikiAdminDeleteAcl.php:45
+#, fuzzy
+msgid "Delete page permissions."
+msgstr "Permisos escasos."
+
+#: ../lib/plugin/WikiAdminDeleteAcl.php:61
+#, php-format
+msgid "ACL deleted for page '%s'"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminDeleteAcl.php:66
+#, php-format
+msgid "ACL deleted for page '%s'."
+msgstr ""
+
+#: ../lib/plugin/WikiAdminDeleteAcl.php:89
+#, fuzzy
+msgid "PhpWikiAdministration/AdminAclDelete"
+msgstr "AdministraciónDePhpWiki"
+
+#: ../lib/plugin/WikiAdminDeleteAcl.php:127
+#, fuzzy
+msgid "Delete ACL"
+msgstr "Suprima este ACL"
+
+#: ../lib/plugin/WikiAdminDeleteAcl.php:129
+msgid "Select the pages where to delete access rights"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminDeleteAcl.php:154
+#: ../lib/plugin/WikiAdminSetAcl.php:243
+msgid "Selected Pages: "
+msgstr ""
+
 #: ../lib/plugin/WikiAdminMarkup.php:37
 msgid "WikiAdminMarkup"
 msgstr ""
@@ -5651,10 +5649,6 @@
 msgid "Select the pages where to change access rights"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:243
-msgid "Selected Pages: "
-msgstr ""
-
 #: ../lib/plugin/WikiAdminSetAcl.php:253
 msgid "Type"
 msgstr ""
@@ -5943,7 +5937,6 @@
 #: ../themes/default/templates/head.tmpl:32
 #: ../themes/default/templates/head.tmpl:33
 #: ../themes/default/templates/navbar.tmpl:15
-#: ../themes/fusionforge/templates/navbar.tmpl:10
 #: ../themes/MonoBook/templates/navbar.tmpl:27
 #: ../themes/MonoBook/templates/navbar.tmpl:33
 #: ../themes/Portland/templates/navbar.tmpl:3
@@ -6134,7 +6127,6 @@
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:106
-#: ../themes/fusionforge/templates/navbar.tmpl:18
 #: ../themes/MonoBook/templates/navbar.tmpl:58
 #: ../themes/Sidebar/templates/navbar.tmpl:48
 msgid "UpLoad"
@@ -6225,27 +6217,27 @@
 "from the database."
 msgstr ""
 
-#: ../lib/Request.php:741 ../lib/Request.php:744
+#: ../lib/Request.php:748 ../lib/Request.php:751
 msgid "Upload error: file too big"
 msgstr "Error del upload: archivo demasiado grande"
 
-#: ../lib/Request.php:747
+#: ../lib/Request.php:754
 msgid "Upload error: file only partially received"
 msgstr "Error del upload: el archivo recieved solamente parcialmente"
 
-#: ../lib/Request.php:750
+#: ../lib/Request.php:757
 msgid "Upload error: no file selected"
 msgstr "Error del upload: ningún archivo seleccionado"
 
-#: ../lib/Request.php:753
+#: ../lib/Request.php:760
 msgid "Upload error: unknown error #"
 msgstr "Error del upload: error desconocido #"
 
-#: ../lib/Request.php:870
+#: ../lib/Request.php:877
 msgid "The PhpWiki access log file"
 msgstr "El fichero de diario del acceso de PhpWiki"
 
-#: ../lib/Request.php:873
+#: ../lib/Request.php:880
 #, php-format
 msgid "the file '%s'"
 msgstr "el archivo %s"
@@ -6254,7 +6246,7 @@
 msgid "Bad URL -- remove all of <, >, \""
 msgstr ""
 
-#: ../lib/stdlib.php:428
+#: ../lib/stdlib.php:432
 msgid "Bad URL for image -- remove all of <, >, \""
 msgstr ""
 
@@ -6377,7 +6369,7 @@
 msgid "Unable to open directory '%s' for reading"
 msgstr ""
 
-#: ../lib/stdlib.php:2200 ../lib/stdlib.php:2213
+#: ../lib/stdlib.php:2198 ../lib/stdlib.php:2211
 #, php-format
 msgid "... (first %s words)"
 msgstr ""
@@ -6391,6 +6383,12 @@
 msgid "(A|An|And|But|By|For|From|In|Is|It|Of|On|Or|The|To|With)"
 msgstr ""
 
+#: ../lib/upgrade.php:73 ../themes/blog/templates/browse-footer.tmpl:3
+#: ../themes/default/templates/userprefs.tmpl:129
+#: ../themes/Wordpress/templates/actionbar.tmpl:17
+msgid "HomePage"
+msgstr "PáginaPrincipal"
+
 #: ../lib/upgrade.php:76
 msgid "always skip the HomePage."
 msgstr ""
@@ -7369,7 +7367,6 @@
 #: ../themes/default/templates/blogform.tmpl:22
 #: ../themes/default/templates/editpage.tmpl:115
 #: ../themes/default/templates/editpage.tmpl:120
-#: ../themes/fusionforge/templates/blogform.tmpl:21
 #: ../themes/fusionforge/templates/editpage.tmpl:114
 #: ../themes/fusionforge/templates/editpage.tmpl:116
 #: ../themes/Portland/templates/editpage.tmpl:76
@@ -7866,6 +7863,12 @@
 msgid "Blog page"
 msgstr ""
 
+#: ../themes/default/templates/info.tmpl:155
+#: ../themes/MonoBook/templates/info.tmpl:161
+#: ../themes/MonoBook/templates/info.tmpl:162
+msgid "InterWikiMap"
+msgstr "InterMapaDeWiki"
+
 #: ../themes/default/templates/info.tmpl:158
 #: ../themes/MonoBook/templates/info.tmpl:165
 msgid "Subpage"
@@ -8360,11 +8363,6 @@
 msgid "Purge"
 msgstr ""
 
-#: ../themes/fusionforge/templates/blogform.tmpl:21
-#: ../themes/fusionforge/templates/editpage.tmpl:116
-msgid "TextFormattingRules"
-msgstr "ReglasDeFormatoDeTexto"
-
 #: ../themes/fusionforge/templates/browse.tmpl:6
 msgid "Error:"
 msgstr ""
@@ -8398,15 +8396,15 @@
 msgid "Make the page external?"
 msgstr ""
 
+#: ../themes/fusionforge/templates/editpage.tmpl:116
+msgid "TextFormattingRules"
+msgstr "ReglasDeFormatoDeTexto"
+
 #: ../themes/fusionforge/templates/navbar.tmpl:8
 msgid "Recent Changes"
 msgstr "Cambios Recientes"
 
 #: ../themes/fusionforge/templates/navbar.tmpl:9
-msgid "SpecialPages"
-msgstr ""
-
-#: ../themes/fusionforge/templates/navbar.tmpl:9
 msgid "Special Pages"
 msgstr ""
 
@@ -8694,5 +8692,11 @@
 msgid "View the current version"
 msgstr "Vea la versión actual"
 
+#~ msgid "Chown"
+#~ msgstr "Cambie a dueño"
+
+#~ msgid "SetAcl"
+#~ msgstr "Fije El Acl"
+
 #~ msgid "too long"
 #~ msgstr "demasiado de largo"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-11-15 13:33:52 UTC (rev 8474)
+++ trunk/locale/po/fr.po	2012-11-15 13:38:31 UTC (rev 8475)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-14 18:09+0100\n"
+"POT-Creation-Date: 2012-11-15 14:37+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -191,7 +191,6 @@
 #: ../themes/default/templates/head.tmpl:59
 #: ../themes/default/templates/head.tmpl:61
 #: ../themes/default/templates/navbar.tmpl:13
-#: ../themes/fusionforge/templates/navbar.tmpl:8
 #: ../themes/MonoBook/templates/navbar.tmpl:13
 #: ../themes/Portland/templates/navbar.tmpl:22
 #: ../themes/shamino_com/templates/top.tmpl:17
@@ -210,19 +209,6 @@
 msgid "Unsupported argument: %s=%s"
 msgstr ""
 
-#: ../lib/display.php:279 ../lib/display.php:286
-#: ../lib/plugin/BackLinks.php:30 ../lib/plugin/_WikiTranslation.php:50
-#: ../themes/blog/templates/navbar.tmpl:8
-#: ../themes/Crao/templates/navbar.tmpl:15
-#: ../themes/default/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/actionbar.tmpl:73
-#: ../themes/MonoBook/templates/navbar.tmpl:49
-#: ../themes/Sidebar/templates/navbar.tmpl:45
-#: ../themes/smaller/templates/navbar.tmpl:14
-#: ../themes/wikilens/templates/navbar.tmpl:21
-msgid "BackLinks"
-msgstr "RétroLiens"
-
 #: ../lib/display.php:282 ../lib/display.php:289
 #, php-format
 msgid "BackLinks for %s"
@@ -360,8 +346,8 @@
 "modifier une page différente ou enregistrer votre texte à l'aide d'un "
 "éditeur)."
 
-#: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:831
-#: ../lib/main.php:1214 ../lib/plugin/ModeratedPage.php:43
+#: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:832
+#: ../lib/main.php:1218 ../lib/plugin/ModeratedPage.php:43
 #: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
 #: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
 #: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
@@ -386,7 +372,6 @@
 #: ../themes/default/templates/head.tmpl:85
 #: ../themes/default/templates/homepage.tmpl:10
 #: ../themes/default/templates/navbar.tmpl:24
-#: ../themes/fusionforge/templates/navbar.tmpl:27
 #: ../themes/MonoBook/templates/signin.tmpl:9
 #: ../themes/shamino_com/templates/top.tmpl:25
 #: ../themes/Sidebar/templates/navbar.tmpl:49
@@ -524,7 +509,7 @@
 
 #: ../lib/EditToolbar.php:59 ../lib/plugin/SyncWiki.php:308
 #: ../lib/plugin/SyncWiki.php:335 ../lib/plugin/SyncWiki.php:359
-#: ../lib/plugin/WikiPoll.php:228 ../lib/stdlib.php:2005
+#: ../lib/plugin/WikiPoll.php:228 ../lib/stdlib.php:2003
 #: ../lib/upgrade.php:201 ../lib/upgrade.php:407 ../lib/upgrade.php:421
 #: ../lib/upgrade.php:441 ../lib/upgrade.php:450 ../lib/upgrade.php:474
 #: ../lib/upgrade.php:502 ../lib/upgrade.php:551 ../lib/upgrade.php:554
@@ -704,14 +689,6 @@
 msgid "An unnamed PhpWiki"
 msgstr "Un PhpWiki sans titre"
 
-#: ../lib/IniConfig.php:1016 ../lib/upgrade.php:73
-#: ../themes/blog/templates/browse-footer.tmpl:3
-#: ../themes/default/templates/userprefs.tmpl:129
-#: ../themes/fusionforge/templates/navbar.tmpl:7
-#: ../themes/Wordpress/templates/actionbar.tmpl:17
-msgid "HomePage"
-msgstr "PageAccueil"
-
 #: ../lib/InlineParser.php:358
 msgid "Invalid [] syntax ignored"
 msgstr "Syntaxe [] invalide ignorée"
@@ -732,11 +709,11 @@
 msgid ": "
 msgstr " : "
 
-#: ../lib/InlineParser.php:409 ../lib/main.php:793 ../lib/stdlib.php:988
+#: ../lib/InlineParser.php:409 ../lib/main.php:794 ../lib/stdlib.php:988
 msgid "Page name too long"
 msgstr "Le nom de la page est trop long"
 
-#: ../lib/InlineParser.php:415 ../lib/main.php:800
+#: ../lib/InlineParser.php:415 ../lib/main.php:801
 #, php-format
 msgid "Illegal character '%s' in page name."
 msgstr "Caractère « %s » interdit dans le nom de la page."
@@ -773,17 +750,15 @@
 msgstr "Exporter les pages en XHTML"
 
 #: ../lib/loadsave.php:96 ../lib/loadsave.php:483 ../lib/loadsave.php:1041
-#: ../lib/loadsave.php:1047 ../lib/loadsave.php:1055 ../lib/main.php:1097
-#: ../lib/main.php:1234 ../lib/main.php:1247 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:147
-#: ../lib/plugin/WikiAdminSelect.php:221
+#: ../lib/loadsave.php:1047 ../lib/loadsave.php:1055 ../lib/main.php:1238
+#: ../lib/main.php:1251 ../lib/PagePerm.php:190 ../lib/PagePerm.php:191
+#: ../lib/plugin/WikiAdminRename.php:147 ../lib/plugin/WikiAdminSelect.php:221
 #: ../themes/blog/templates/navbar.tmpl:11
 #: ../themes/Crao/templates/head.tmpl:70 ../themes/Crao/templates/head.tmpl:71
 #: ../themes/Crao/templates/navbar.tmpl:35
 #: ../themes/default/templates/head.tmpl:78
 #: ../themes/default/templates/head.tmpl:79
 #: ../themes/default/templates/navbar.tmpl:39
-#: ../themes/fusionforge/templates/navbar.tmpl:21
 #: ../themes/MonoBook/templates/navbar.tmpl:55
 #: ../themes/Portland/templates/navbar.tmpl:24
 #: ../themes/shamino_com/templates/actionbar.tmpl:17
@@ -906,14 +881,6 @@
 msgid "'%s': Bad page name"
 msgstr "« %s » : nom de page non valide"
 
-#: ../lib/loadsave.php:921 ../lib/loadsave.php:1557 ../lib/PageType.php:163
-#: ../lib/plugin/InterWikiSearch.php:56 ../lib/plugin/WantedPagesOld.php:77
-#: ../lib/plugin/WantedPages.php:56 ../themes/default/templates/info.tmpl:155
-#: ../themes/MonoBook/templates/info.tmpl:161
-#: ../themes/MonoBook/templates/info.tmpl:162
-msgid "InterWikiMap"
-msgstr "CarteInterWiki"
-
 #: ../lib/loadsave.php:975
 #, php-format
 msgid "from %s"
@@ -1380,52 +1347,29 @@
 msgid "Downloading html zip dumps"
 msgstr "Téléchargement des sauvegardes HTML compressées"
 
-#: ../lib/main.php:819
+#: ../lib/main.php:820
 #, php-format
 msgid "%s: action forwarded to a moderator."
 msgstr ""
 
-#: ../lib/main.php:822
+#: ../lib/main.php:823
 msgid "This action requires moderator approval. Please be patient."
 msgstr ""
 
-#: ../lib/main.php:827
+#: ../lib/main.php:828
 msgid "You must wait for moderator approval."
 msgstr ""
 
-#: ../lib/main.php:845 ../lib/plugin/ModeratedPage.php:319
+#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:319
 #, php-format
 msgid "%s: Bad action"
 msgstr "%s : Mauvaise action"
 
-#: ../lib/main.php:863
+#: ../lib/main.php:864
 msgid "Fatal PhpWiki Error"
 msgstr "Erreur fatale de PhpWiki"
 
-#: ../lib/main.php:1119
-msgid "Chown"
-msgstr "Chown"
-
-#: ../lib/main.php:1124
-msgid "SetAcl"
-msgstr "DéfinirAcl"
-
-#: ../lib/main.php:1129
-msgid "SetAclSimple"
-msgstr "DéfinirAclSimple"
-
-#: ../lib/main.php:1134
-#, fuzzy
-msgid "DeleteAcl"
-msgstr "Supprimé"
-
-#: ../lib/main.php:1139 ../lib/PagePerm.php:190
-#: ../lib/plugin/WikiAdminRename.php:147 ../lib/plugin/WikiAdminRename.php:277
-#: ../themes/fusionforge/templates/actionbar.tmpl:104
-msgid "Rename"
-msgstr "Renommer"
-
-#: ../lib/main.php:1144 ../lib/main.php:1149 ../lib/plugin/PageDump.php:57
+#: ../lib/main.php:1148 ../lib/main.php:1153 ../lib/plugin/PageDump.php:57
 #: ../themes/Crao/templates/actionbar.tmpl:31
 #: ../themes/default/templates/actionbar.tmpl:36
 #: ../themes/MonoBook/templates/actionbar.tmpl:77
@@ -1437,12 +1381,12 @@
 msgid "PageDump"
 msgstr "RécupérationDeLaPage"
 
-#: ../lib/main.php:1169 ../lib/plugin/FullTextSearch.php:47
+#: ../lib/main.php:1173 ../lib/plugin/FullTextSearch.php:47
 #: ../lib/plugin/WantedPagesOld.php:130
 msgid "FullTextSearch"
 msgstr "RechercheEnTexteIntégral"
 
-#: ../lib/main.php:1175 ../lib/plugin/RecentChanges.php:900
+#: ../lib/main.php:1179 ../lib/plugin/RecentChanges.php:900
 #: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1522
 #: ../themes/Crao/templates/navbar.tmpl:2
 #: ../themes/Crao/templates/navbar.tmpl:6
@@ -1457,37 +1401,37 @@
 msgid "TitleSearch"
 msgstr "RechercheParTitre"
 
-#: ../lib/main.php:1371 ../lib/main.php:1384 ../lib/Request.php:870
+#: ../lib/main.php:1375 ../lib/main.php:1388 ../lib/Request.php:877
 #, php-format
 msgid "%s is not writable."
 msgstr "%s n'est pas modifiable."
 
-#: ../lib/main.php:1372
+#: ../lib/main.php:1376
 msgid "The session.save_path directory"
 msgstr "Le répertoire 'session.save_path'"
 
-#: ../lib/main.php:1374 ../lib/Request.php:872
+#: ../lib/main.php:1378 ../lib/Request.php:879
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
 "Veuillez vous assurer que %s est modifiable, ou redéfinissez %s dans config/"
 "config.ini."
 
-#: ../lib/main.php:1375
+#: ../lib/main.php:1379
 #, php-format
 msgid "the session.save_path directory '%s'"
 msgstr "le répertoire 'session.save_path' « %s »"
 
-#: ../lib/main.php:1379
+#: ../lib/main.php:1383
 #, php-format
 msgid "Attempting to use the directory '%s' instead."
 msgstr "Tentative d'utilisation du répertoire « %s » à la place."
 
-#: ../lib/main.php:1386
+#: ../lib/main.php:1390
 msgid "Users will not be able to sign in."
 msgstr "Les utilisateurs ne pourront pas s'inscrire."
 
-#: ../lib/main.php:1398
+#: ../lib/main.php:1402
 msgid "Your PHP version is too old. You must have at least PHP 4.3.9"
 msgstr ""
 "Votre version de PHP est trop ancienne. Il faut avoir au moins PHP 4.3.9"
@@ -1562,8 +1506,8 @@
 msgid "Permission"
 msgstr "Permission"
 
-#: ../lib/PageList.php:1263 ../lib/plugin/WikiAdminSetAcl.php:200
-#: ../lib/plugin/WikiAdminSetAcl.php:254
+#: ../lib/PageList.php:1263 ../lib/plugin/WikiAdminDeleteAcl.php:124
+#: ../lib/plugin/WikiAdminSetAcl.php:200 ../lib/plugin/WikiAdminSetAcl.php:254
 #: ../themes/default/templates/info.tmpl:136
 #: ../themes/MonoBook/templates/info.tmpl:143
 msgid "ACL"
@@ -1659,6 +1603,12 @@
 msgid "Columns: %s."
 msgstr "Colonnes : %s."
 
+#: ../lib/PagePerm.php:190 ../lib/plugin/WikiAdminRename.php:147
+#: ../lib/plugin/WikiAdminRename.php:277
+#: ../themes/fusionforge/templates/actionbar.tmpl:104
+msgid "Rename"
+msgstr "Renommer"
+
 #: ../lib/PagePerm.php:191
 msgid "SearchReplace"
 msgstr "Rechercher & Remplacer"
@@ -2000,11 +1950,11 @@
 msgid "Go to %s."
 msgstr "Aller à %s"
 
-#: ../lib/plugin/AsciiMath.php:49
+#: ../lib/plugin/AsciiMath.php:46
 msgid "AsciiMath"
 msgstr ""
 
-#: ../lib/plugin/AsciiMath.php:54
+#: ../lib/plugin/AsciiMath.php:51
 msgid "Render ASCII Math as MathML"
 msgstr ""
 
@@ -2130,6 +2080,17 @@
 msgid "<not displayed>"
 msgstr "<non affiché>"
 
+#: ../lib/plugin/BackLinks.php:30 ../lib/plugin/_WikiTranslation.php:50
+#: ../themes/blog/templates/navbar.tmpl:8
+#: ../themes/Crao/templates/navbar.tmpl:15
+#: ../themes/default/templates/navbar.tmpl:18
+#: ../themes/MonoBook/templates/navbar.tmpl:49
+#: ../themes/Sidebar/templates/navbar.tmpl:45
+#: ../themes/smaller/templates/navbar.tmpl:14
+#: ../themes/wikilens/templates/navbar.tmpl:21
+msgid "BackLinks"
+msgstr "RétroLiens"
+
 #: ../lib/plugin/BackLinks.php:35
 #, php-format
 msgid "List all pages which link to %s."
@@ -2562,9 +2523,10 @@
 
 #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63
 #: ../lib/plugin/RedirectTo.php:91 ../lib/plugin/SyncWiki.php:77
-#: ../lib/plugin/WikiAdminChown.php:113 ../lib/plugin/WikiAdminMarkup.php:115
-#: ../lib/plugin/WikiAdminPurge.php:99 ../lib/plugin/WikiAdminRemove.php:143
-#: ../lib/plugin/WikiAdminRename.php:149
+#: ../lib/plugin/WikiAdminChown.php:113
+#: ../lib/plugin/WikiAdminDeleteAcl.php:90
+#: ../lib/plugin/WikiAdminMarkup.php:115 ../lib/plugin/WikiAdminPurge.php:99
+#: ../lib/plugin/WikiAdminRemove.php:143 ../lib/plugin/WikiAdminRename.php:149
 #: ../lib/plugin/WikiAdminSearchReplace.php:127
 #: ../lib/plugin/WikiAdminSetAcl.php:147
 #: ../lib/plugin/WikiAdminSetExternal.php:101
@@ -2613,7 +2575,7 @@
 msgid "Ignored stoplist words '%s'"
 msgstr ""
 
-#: ../lib/plugin/FullTextSearch.php:175 ../lib/plugin/WantedPages.php:188
+#: ../lib/plugin/FullTextSearch.php:175 ../lib/plugin/WantedPages.php:186
 #, php-format
 msgid "(%d Links)"
 msgstr "(%d liens)"
@@ -2896,7 +2858,6 @@
 
 #: ../lib/plugin/LikePages.php:31 ../themes/Crao/templates/navbar.tmpl:14
 #: ../themes/default/templates/navbar.tmpl:17
-#: ../themes/fusionforge/templates/navbar.tmpl:15
 #: ../themes/MonoBook/templates/navbar.tmpl:16
 #: ../themes/Portland/templates/navbar.tmpl:5
 #: ../themes/smaller/templates/navb...
 
[truncated message content]

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

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

Revision: 8474
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8474&view=rev
Author:   vargenau
Date:     2012-11-15 13:33:52 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
Extract URL

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

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2012-11-15 13:32:14 UTC (rev 8473)
+++ trunk/lib/stdlib.php	2012-11-15 13:33:52 UTC (rev 8474)
@@ -425,6 +425,9 @@
     if (empty($alt)) {
         $alt = "";
     }
+    // Extract URL
+    $arr = explode(' ', $url);
+    if (!empty($arr)) $url = $arr[0];
     if (!IsSafeURL($url)) {
         $link = HTML::span(array('class' => 'error'), _('Bad URL for image -- remove all of <, >, "'));
         return $link;
@@ -432,13 +435,9 @@
     // spaces in inline images must be %20 encoded!
     $link = HTML::img(array('src' => $url));
 
-    // Extract attributes and shorten url
-    $arr = parse_attributes(strstr($url, " "));
+    // Extract attributes
+    $arr = parse_attributes(strstr($ori_url, " "));
     foreach ($arr as $attr => $value) {
-        // strip attr=... url suffix
-        $link->setAttr('src', $url);
-        $i = strpos($url, $attr);
-        $url = substr($url, 0, $i - 1);
         // These attributes take strings: lang, id, title, alt
         if (($attr == "lang")
             || ($attr == "id")
@@ -489,7 +488,7 @@
         }
     }
     // Correct silently the most common error
-    if (strstr($ori_url, " ") and !preg_match("/^http/", $url)) {
+    if ($url != $ori_url and empty($arr) and !preg_match("/^http/", $url)) {
         // space belongs to the path
         $file = NormalizeLocalFileName($ori_url);
         if (file_exists($file)) {
@@ -1666,8 +1665,6 @@
     }
 }
 
-
-
 // File globbing
 
 // expands a list containing regex's to its matching entries

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

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

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

Revision: 8473
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8473&view=rev
Author:   vargenau
Date:     2012-11-15 13:32:14 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
gettext --> __

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

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2012-11-15 10:52:50 UTC (rev 8472)
+++ trunk/lib/stdlib.php	2012-11-15 13:32:14 UTC (rev 8473)
@@ -1938,7 +1938,7 @@
 
     global $AllActionPages;
 
-    $localizedAllActionPages = array_map("gettext", $AllActionPages);
+    $localizedAllActionPages = array_map("__", $AllActionPages);
 
     return (in_array($filename, $localizedAllActionPages));
 }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8472] trunk/lib/HtmlElement.php

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

Revision: 8472
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8472&view=rev
Author:   vargenau
Date:     2012-11-15 10:52:50 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
Remove empty line

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

Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php	2012-11-15 10:44:32 UTC (rev 8471)
+++ trunk/lib/HtmlElement.php	2012-11-15 10:52:50 UTC (rev 8472)
@@ -125,8 +125,6 @@
     }
 }
 
-
-
 function HTML( /* $content, ... */)
 {
     return new XmlContent(func_get_args());

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

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

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

Revision: 8471
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8471&view=rev
Author:   vargenau
Date:     2012-11-15 10:44:32 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
PHP 5 only

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

Added Paths:
-----------
    trunk/lib/HtmlElement.php

Removed Paths:
-------------
    trunk/lib/HtmlElement.php
    trunk/lib/HtmlElement5.php

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2012-11-15 10:41:15 UTC (rev 8470)
+++ trunk/lib/ErrorManager.php	2012-11-15 10:44:32 UTC (rev 8471)
@@ -679,11 +679,7 @@
     }
 }
 
-if (check_php_version(5, 2)) {
-    require_once(dirname(__FILE__) . '/HtmlElement5.php');
-} else {
-    require_once(dirname(__FILE__) . '/HtmlElement.php');
-}
+require_once(dirname(__FILE__) . '/HtmlElement.php');
 
 if (!isset($GLOBALS['ErrorManager'])) {
     $GLOBALS['ErrorManager'] = new ErrorManager;

Deleted: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php	2012-11-15 10:41:15 UTC (rev 8470)
+++ trunk/lib/HtmlElement.php	2012-11-15 10:44:32 UTC (rev 8471)
@@ -1,682 +0,0 @@
-<?php
-/**
- * Code for writing the HTML subset of XML.
- * @author: Jeff Dairiki
- *
- * This code is now php5 compatible. --2004-04-19 23:51:43 rurban
- * php-5.3 uses now HtmlElement5.php with public static
- *
- * Todo: Add support for a JavaScript backend, a php2js compiler.
- * HTML::div(array('onClick' => 'HTML::div(...)'))
- */
-if (!class_exists("XmlElement"))
-    require_once(dirname(__FILE__) . "/XmlElement.php");
-if (class_exists("HtmlElement"))
-    return;
-
-/**
- * An XML element.
- */
-//apd_set_session_trace(35);
-
-class HtmlElement extends XmlElement
-{
-    function __construct($tagname /* , $attr_or_content , ...*/)
-    {
-        $this->_init(func_get_args());
-        $this->_properties = HTML::getTagProperties($tagname);
-    }
-
-    function _init($args)
-    {
-        if (!is_array($args))
-            $args = func_get_args();
-
-        assert(count($args) >= 1);
-        assert(is_string($args[0]));
-        $this->_tag = array_shift($args);
-
-        if ($args && is_array($args[0]))
-            $this->_attr = array_shift($args);
-        else {
-            $this->_attr = array();
-            if ($args && $args[0] === false)
-                array_shift($args);
-        }
-        $this->setContent($args);
-        $this->_properties = HTML::getTagProperties($this->_tag);
-    }
-
-    /**
-     * @access protected
-     * This is used by the static factory methods is class HTML.
-     */
-    function _init2($args)
-    {
-        if ($args) {
-            if (is_array($args[0]))
-                $this->_attr = array_shift($args);
-            elseif ($args[0] === false)
-                array_shift($args);
-        }
-
-        if (count($args) == 1 && is_array($args[0]))
-            $args = $args[0];
-        $this->_content = $args;
-        return $this;
-    }
-
-    /** Add a "tooltip" to an element.
-     *
-     * @param $tooltip_text string The tooltip text.
-     */
-    function addTooltip($tooltip_text, $accesskey = null)
-    {
-        $this->setAttr('title', $tooltip_text);
-        if ($accesskey) $this->setAccesskey($accesskey);
-
-        // FIXME: this should be initialized from title by an onLoad() function.
-        //        (though, that may not be possible.)
-        $qtooltip = str_replace("'", "\\'", $tooltip_text);
-        $this->setAttr('onmouseover',
-            sprintf('window.status="%s"; return true;',
-                addslashes($tooltip_text)));
-        $this->setAttr('onmouseout', "window.status='';return true;");
-    }
-
-    function setAccesskey($key)
-    {
-        global $WikiTheme;
-        if (strlen($key) != 1) return;
-        $this->setAttr("accesskey", $key);
-
-        if (!empty($this->_attr['title'])) {
-            if (preg_match("/\[(alt-)?(.)\]$/", $this->_attr['title'], $m)) {
-                $this->_attr['title'] = preg_replace
-                ("/\[(alt-)?(.)\]$/",
-                    "[" . $WikiTheme->tooltipAccessKeyPrefix() . "-\\2]",
-                    $this->_attr['title']);
-            } else {
-                $this->_attr['title'] .=
-                    " [" . $WikiTheme->tooltipAccessKeyPrefix() . "-$key]";
-            }
-        } else {
-            $this->_attr['title'] =
-                "[" . $WikiTheme->tooltipAccessKeyPrefix() . "-$key]";
-        }
-    }
-
-    function emptyTag()
-    {
-        if (($this->_properties & HTMLTAG_EMPTY) == 0)
-            return $this->startTag() . "</$this->_tag>";
-
-        return substr($this->startTag(), 0, -1) . " />";
-    }
-
-    function hasInlineContent()
-    {
-        return ($this->_properties & HTMLTAG_ACCEPTS_INLINE) != 0;
-    }
-
-    function isInlineElement()
-    {
-        return ($this->_properties & HTMLTAG_INLINE) != 0;
-    }
-}
-
-
-
-function HTML( /* $content, ... */)
-{
-    return new XmlContent(func_get_args());
-}
-
-class HTML extends HtmlElement
-{
-    function raw($html_text)
-    {
-        return new RawXml($html_text);
-    }
-
-    function getTagProperties($tag)
-    {
-        $props = &$GLOBALS['HTML_TagProperties'];
-        return isset($props[$tag]) ? $props[$tag] : 0;
-    }
-
-    function _setTagProperty($prop_flag, $tags)
-    {
-        $props = &$GLOBALS['HTML_TagProperties'];
-        if (is_string($tags))
-            $tags = preg_split('/\s+/', $tags);
-        foreach ($tags as $tag) {
-            $tag = trim($tag);
-            if ($tag)
-                if (isset($props[$tag]))
-                    $props[$tag] |= $prop_flag;
-                else
-                    $props[$tag] = $prop_flag;
-        }
-    }
-
-    // See admin/mkfuncs shell script to generate the following static methods
-
-    function link( /*...*/)
-    {
-        $el = new HtmlElement('link');
-        return $el->_init2(func_get_args());
-    }
-
-    function meta( /*...*/)
-    {
-        $el = new HtmlElement('meta');
-        return $el->_init2(func_get_args());
-    }
-
-    function style( /*...*/)
-    {
-        $el = new HtmlElement('style');
-        return $el->_init2(func_get_args());
-    }
-
-    function script( /*...*/)
-    {
-        $el = new HtmlElement('script');
-        return $el->_init2(func_get_args());
-    }
-
-    function noscript( /*...*/)
-    {
-        $el = new HtmlElement('noscript');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    function a( /*...*/)
-    {
-        $el = new HtmlElement('a');
-        return $el->_init2(func_get_args());
-    }
-
-    function img( /*...*/)
-    {
-        $el = new HtmlElement('img');
-        return $el->_init2(func_get_args());
-    }
-
-    function br( /*...*/)
-    {
-        $el = new HtmlElement('br');
-        return $el->_init2(func_get_args());
-    }
-
-    function span( /*...*/)
-    {
-        $el = new HtmlElement('span');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    function h1( /*...*/)
-    {
-        $el = new HtmlElement('h1');
-        return $el->_init2(func_get_args());
-    }
-
-    function h2( /*...*/)
-    {
-        $el = new HtmlElement('h2');
-        return $el->_init2(func_get_args());
-    }
-
-    function h3( /*...*/)
-    {
-        $el = new HtmlElement('h3');
-        return $el->_init2(func_get_args());
-    }
-
-    function h4( /*...*/)
-    {
-        $el = new HtmlElement('h4');
-        return $el->_init2(func_get_args());
-    }
-
-    function h5( /*...*/)
-    {
-        $el = new HtmlElement('h5');
-        return $el->_init2(func_get_args());
-    }
-
-    function h6( /*...*/)
-    {
-        $el = new HtmlElement('h6');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    function hr( /*...*/)
-    {
-        $el = new HtmlElement('hr');
-        return $el->_init2(func_get_args());
-    }
-
-    function div( /*...*/)
-    {
-        $el = new HtmlElement('div');
-        return $el->_init2(func_get_args());
-    }
-
-    function p( /*...*/)
-    {
-        $el = new HtmlElement('p');
-        return $el->_init2(func_get_args());
-    }
-
-    function pre( /*...*/)
-    {
-        $el = new HtmlElement('pre');
-        return $el->_init2(func_get_args());
-    }
-
-    function blockquote( /*...*/)
-    {
-        $el = new HtmlElement('blockquote');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    function em( /*...*/)
-    {
-        $el = new HtmlElement('em');
-        return $el->_init2(func_get_args());
-    }
-
-    function strong( /*...*/)
-    {
-        $el = new HtmlElement('strong');
-        return $el->_init2(func_get_args());
-    }
-
-    function small( /*...*/)
-    {
-        $el = new HtmlElement('small');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    function tt( /*...*/)
-    {
-        $el = new HtmlElement('tt');
-        return $el->_init2(func_get_args());
-    }
-
-    function u( /*...*/)
-    {
-        $el = new HtmlElement('u');
-        return $el->_init2(func_get_args());
-    }
-
-    function sup( /*...*/)
-    {
-        $el = new HtmlElement('sup');
-        return $el->_init2(func_get_args());
-    }
-
-    function sub( /*...*/)
-    {
-        $el = new HtmlElement('sub');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    function ul( /*...*/)
-    {
-        $el = new HtmlElement('ul');
-        return $el->_init2(func_get_args());
-    }
-
-    function ol( /*...*/)
-    {
-        $el = new HtmlElement('ol');
-        return $el->_init2(func_get_args());
-    }
-
-    function dl( /*...*/)
-    {
-        $el = new HtmlElement('dl');
-        return $el->_init2(func_get_args());
-    }
-
-    function li( /*...*/)
-    {
-        $el = new HtmlElement('li');
-        return $el->_init2(func_get_args());
-    }
-
-    function dt( /*...*/)
-    {
-        $el = new HtmlElement('dt');
-        return $el->_init2(func_get_args());
-    }
-
-    function dd( /*...*/)
-    {
-        $el = new HtmlElement('dd');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    function table( /*...*/)
-    {
-        $el = new HtmlElement('table');
-        return $el->_init2(func_get_args());
-    }
-
-    function caption( /*...*/)
-    {
-        $el = new HtmlElement('caption');
-        return $el->_init2(func_get_args());
-    }
-
-    function thead( /*...*/)
-    {
-        $el = new HtmlElement('thead');
-        return $el->_init2(func_get_args());
-    }
-
-    function tbody( /*...*/)
-    {
-        $el = new HtmlElement('tbody');
-        return $el->_init2(func_get_args());
-    }
-
-    function tfoot( /*...*/)
-    {
-        $el = new HtmlElement('tfoot');
-        return $el->_init2(func_get_args());
-    }
-
-    function tr( /*...*/)
-    {
-        $el = new HtmlElement('tr');
-        return $el->_init2(func_get_args());
-    }
-
-    function td( /*...*/)
-    {
-        $el = new HtmlElement('td');
-        return $el->_init2(func_get_args());
-    }
-
-    function th( /*...*/)
-    {
-        $el = new HtmlElement('th');
-        return $el->_init2(func_get_args());
-    }
-
-    function colgroup( /*...*/)
-    {
-        $el = new HtmlElement('colgroup');
-        return $el->_init2(func_get_args());
-    }
-
-    function col( /*...*/)
-    {
-        $el = new HtmlElement('col');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    function form( /*...*/)
-    {
-        $el = new HtmlElement('form');
-        return $el->_init2(func_get_args());
-    }
-
-    function input( /*...*/)
-    {
-        $el = new HtmlElement('input');
-        return $el->_init2(func_get_args());
-    }
-
-    function button( /*...*/)
-    {
-        $el = new HtmlElement('button');
-        return $el->_init2(func_get_args());
-    }
-
-    function option( /*...*/)
-    {
-        $el = new HtmlElement('option');
-        return $el->_init2(func_get_args());
-    }
-
-    function select( /*...*/)
-    {
-        $el = new HtmlElement('select');
-        return $el->_init2(func_get_args());
-    }
-
-    function textarea( /*...*/)
-    {
-        $el = new HtmlElement('textarea');
-        return $el->_init2(func_get_args());
-    }
-
-    function label( /*...*/)
-    {
-        $el = new HtmlElement('label');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    function area( /*...*/)
-    {
-        $el = new HtmlElement('area');
-        return $el->_init2(func_get_args());
-    }
-
-    function map( /*...*/)
-    {
-        $el = new HtmlElement('map');
-        return $el->_init2(func_get_args());
-    }
-
-    function frame( /*...*/)
-    {
-        $el = new HtmlElement('frame');
-        return $el->_init2(func_get_args());
-    }
-
-    function frameset( /*...*/)
-    {
-        $el = new HtmlElement('frameset');
-        return $el->_init2(func_get_args());
-    }
-
-    function iframe( /*...*/)
-    {
-        $el = new HtmlElement('iframe');
-        return $el->_init2(func_get_args());
-    }
-
-    function nobody( /*...*/)
-    {
-        $el = new HtmlElement('nobody');
-        return $el->_init2(func_get_args());
-    }
-
-    function object( /*...*/)
-    {
-        $el = new HtmlElement('object');
-        return $el->_init2(func_get_args());
-    }
-
-    function embed( /*...*/)
-    {
-        $el = new HtmlElement('embed');
-        return $el->_init2(func_get_args());
-    }
-
-    function param( /*...*/)
-    {
-        $el = new HtmlElement('param');
-        return $el->_init2(func_get_args());
-    }
-
-    function fieldset( /*...*/)
-    {
-        $el = new HtmlElement('fieldset');
-        return $el->_init2(func_get_args());
-    }
-
-    function legend( /*...*/)
-    {
-        $el = new HtmlElement('legend');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    function video( /*...*/)
-    {
-        $el = new HtmlElement('video');
-        return $el->_init2(func_get_args());
-    }
-}
-
-define('HTMLTAG_EMPTY', 1);
-define('HTMLTAG_INLINE', 2);
-define('HTMLTAG_ACCEPTS_INLINE', 4);
-
-HTML::_setTagProperty(HTMLTAG_EMPTY,
-    'area base basefont br col frame hr img input isindex link meta param');
-HTML::_setTagProperty(HTMLTAG_ACCEPTS_INLINE,
-    // %inline elements:
-    'b big i small tt ' // %fontstyle
-        . 's strike u ' // (deprecated)
-        . 'abbr acronym cite code dfn em kbd samp strong var ' //%phrase
-        . 'a img object embed br script map q sub sup span bdo ' //%special
-        . 'button input label option select textarea label ' //%formctl
-
-        // %block elements which contain inline content
-        . 'address h1 h2 h3 h4 h5 h6 p pre '
-        // %block elements which contain either block or inline content
-        . 'div fieldset frameset'
-
-        // other with inline content
-        . 'caption dt label legend video '
-        // other with either inline or block
-        . 'dd del ins li td th colgroup');
-
-HTML::_setTagProperty(HTMLTAG_INLINE,
-    // %inline elements:
-    'b big i small tt ' // %fontstyle
-        . 's strike u ' // (deprecated)
-        . 'abbr acronym cite code dfn em kbd samp strong var ' //%phrase
-        . 'a img object br script map q sub sup span bdo ' //%special
-        . 'button input label option select textarea ' //%formctl
-        . 'nobody iframe'
-);
-
-/**
- * Generate hidden form input fields.
- *
- * @param $query_args hash  A hash mapping names to values for the hidden inputs.
- * Values in the hash can themselves be hashes.  The will result in hidden inputs
- * which will reconstruct the nested structure in the resulting query args as
- * processed by PHP.
- *
- * Example:
- *
- * $args = array('x' => '2',
- *               'y' => array('a' => 'aval', 'b' => 'bval'));
- * $inputs = HiddenInputs($args);
- *
- * Will result in:
- *
- *  <input type="hidden" name="x" value = "2" />
- *  <input type="hidden" name="y[a]" value = "aval" />
- *  <input type="hidden" name="y[b]" value = "bval" />
- *
- * @return object An XmlContent object containing the inputs.
- */
-function HiddenInputs($query_args, $pfx = false, $exclude = array())
-{
-    $inputs = HTML();
-
-    foreach ($query_args as $key => $val) {
-        if (in_array($key, $exclude)) continue;
-        $name = $pfx ? $pfx . "[$key]" : $key;
-        if (is_array($val))
-            $inputs->pushContent(HiddenInputs($val, $name));
-        else
-            $inputs->pushContent(HTML::input(array('type' => 'hidden',
-                'name' => $name,
-                'value' => $val)));
-    }
-    return $inputs;
-}
-
-/** Generate a <script> tag containing javascript.
- *
- * @param string $js  The javascript.
- * @param string $script_args  (optional) hash of script tags options
- *                             e.g. to provide another version or the defer attr
- * @return HtmlElement A <script> element.
- */
-function JavaScript($js, $script_args = false)
-{
-    $default_script_args = array( //'version' => 'JavaScript', // not xhtml conformant
-        'type' => 'text/javascript');
-    $script_args = $script_args ? array_merge($default_script_args, $script_args)
-        : $default_script_args;
-    if (empty($js))
-        return HTML(HTML::script($script_args), "\n");
-    else
-        // see http://devedge.netscape.com/viewsource/2003/xhtml-style-script/
-        return HTML(HTML::script($script_args,
-            new RawXml((ENABLE_XHTML_XML ? "\n//<![CDATA[" : "\n<!--//")
-                . "\n" . trim($js) . "\n"
-                . (ENABLE_XHTML_XML ? "//]]>\n" : "// -->"))), "\n");
-}
-
-/** Conditionally display content based of whether javascript is supported.
- *
- * This conditionally (on the client side) displays one of two alternate
- * contents depending on whether the client supports javascript.
- *
- * NOTE:
- * The content you pass as arguments to this function must be block-level.
- * (This is because the <noscript> tag is block-level.)
- *
- * @param mixed $if_content Content to display if the browser supports
- * javascript.
- *
- * @param mixed $else_content Content to display if the browser does
- * not support javascript.
- *
- * @return XmlContent
- */
-function IfJavaScript($if_content = false, $else_content = false)
-{
-    $html = array();
-    if ($if_content) {
-        $xml = AsXML($if_content);
-        $js = sprintf('document.write("%s");',
-            addcslashes($xml, "\0..\37!@\\\177..\377"));
-        $html[] = JavaScript($js);
-    }
-    if ($else_content) {
-        $html[] = HTML::noscript(false, $else_content);
-    }
-    return HTML($html);
-}
-
-// Local Variables:
-// mode: php
-// tab-width: 8
-// c-basic-offset: 4
-// c-hanging-comment-ender-p: nil
-// indent-tabs-mode: nil
-// End:

Copied: trunk/lib/HtmlElement.php (from rev 8469, trunk/lib/HtmlElement5.php)
===================================================================
--- trunk/lib/HtmlElement.php	                        (rev 0)
+++ trunk/lib/HtmlElement.php	2012-11-15 10:44:32 UTC (rev 8471)
@@ -0,0 +1,682 @@
+<?php
+/**
+ * Code for writing the HTML subset of XML.
+ * @author: Jeff Dairiki
+ *
+ * This code is now php5 compatible. --2004-04-19 23:51:43 rurban
+ * Specialized for php-5.3: added public static 2010-06-07 09:51:37 rurban
+ *
+ * Todo: Add support for a JavaScript backend, a php2js compiler.
+ * HTML::div(array('onclick' => 'HTML::div(...)'))
+ */
+if (!class_exists("XmlElement"))
+    require_once(dirname(__FILE__) . "/XmlElement.php");
+if (class_exists("HtmlElement"))
+    return;
+
+/**
+ * An XML element.
+ */
+//apd_set_session_trace(35);
+
+class HtmlElement extends XmlElement
+{
+    function __construct($tagname /* , $attr_or_content , ...*/)
+    {
+        $this->_init(func_get_args());
+        $this->_properties = HTML::getTagProperties($tagname);
+    }
+
+    function _init($args)
+    {
+        if (!is_array($args))
+            $args = func_get_args();
+
+        assert(count($args) >= 1);
+        assert(is_string($args[0]));
+        $this->_tag = array_shift($args);
+
+        if ($args && is_array($args[0]))
+            $this->_attr = array_shift($args);
+        else {
+            $this->_attr = array();
+            if ($args && $args[0] === false)
+                array_shift($args);
+        }
+        $this->setContent($args);
+        $this->_properties = HTML::getTagProperties($this->_tag);
+    }
+
+    /**
+     * @access protected
+     * This is used by the static factory methods is class HTML.
+     */
+    function _init2($args)
+    {
+        if ($args) {
+            if (is_array($args[0]))
+                $this->_attr = array_shift($args);
+            elseif ($args[0] === false)
+                array_shift($args);
+        }
+
+        if (count($args) == 1 && is_array($args[0]))
+            $args = $args[0];
+        $this->_content = $args;
+        return $this;
+    }
+
+    /** Add a "tooltip" to an element.
+     *
+     * @param $tooltip_text string The tooltip text.
+     */
+    function addTooltip($tooltip_text, $accesskey = null)
+    {
+        $this->setAttr('title', $tooltip_text);
+        if ($accesskey) $this->setAccesskey($accesskey);
+
+        // FIXME: this should be initialized from title by an onLoad() function.
+        //        (though, that may not be possible.)
+        $qtooltip = str_replace("'", "\\'", $tooltip_text);
+        $this->setAttr('onmouseover',
+            sprintf('window.status="%s"; return true;',
+                addslashes($tooltip_text)));
+        $this->setAttr('onmouseout', "window.status='';return true;");
+    }
+
+    function setAccesskey($key)
+    {
+        global $WikiTheme;
+        if (strlen($key) != 1) return;
+        $this->setAttr("accesskey", $key);
+
+        if (!empty($this->_attr['title'])) {
+            if (preg_match("/\[(alt-)?(.)\]$/", $this->_attr['title'], $m)) {
+                $this->_attr['title'] = preg_replace
+                ("/\[(alt-)?(.)\]$/",
+                    "[" . $WikiTheme->tooltipAccessKeyPrefix() . "-\\2]",
+                    $this->_attr['title']);
+            } else {
+                $this->_attr['title'] .=
+                    " [" . $WikiTheme->tooltipAccessKeyPrefix() . "-$key]";
+            }
+        } else {
+            $this->_attr['title'] =
+                "[" . $WikiTheme->tooltipAccessKeyPrefix() . "-$key]";
+        }
+    }
+
+    function emptyTag()
+    {
+        if (($this->_properties & HTMLTAG_EMPTY) == 0)
+            return $this->startTag() . "</$this->_tag>";
+
+        return substr($this->startTag(), 0, -1) . " />";
+    }
+
+    function hasInlineContent()
+    {
+        return ($this->_properties & HTMLTAG_ACCEPTS_INLINE) != 0;
+    }
+
+    function isInlineElement()
+    {
+        return ($this->_properties & HTMLTAG_INLINE) != 0;
+    }
+}
+
+
+
+function HTML( /* $content, ... */)
+{
+    return new XmlContent(func_get_args());
+}
+
+class HTML extends HtmlElement
+{
+    public static function raw($html_text)
+    {
+        return new RawXml($html_text);
+    }
+
+    public static function getTagProperties($tag)
+    {
+        $props = &$GLOBALS['HTML_TagProperties'];
+        return isset($props[$tag]) ? $props[$tag] : 0;
+    }
+
+    public static function _setTagProperty($prop_flag, $tags)
+    {
+        $props = &$GLOBALS['HTML_TagProperties'];
+        if (is_string($tags))
+            $tags = preg_split('/\s+/', $tags);
+        foreach ($tags as $tag) {
+            $tag = trim($tag);
+            if ($tag)
+                if (isset($props[$tag]))
+                    $props[$tag] |= $prop_flag;
+                else
+                    $props[$tag] = $prop_flag;
+        }
+    }
+
+    // See admin/mkfuncs shell script to generate the following static methods
+
+    public static function link( /*...*/)
+    {
+        $el = new HtmlElement('link');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function meta( /*...*/)
+    {
+        $el = new HtmlElement('meta');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function style( /*...*/)
+    {
+        $el = new HtmlElement('style');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function script( /*...*/)
+    {
+        $el = new HtmlElement('script');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function noscript( /*...*/)
+    {
+        $el = new HtmlElement('noscript');
+        return $el->_init2(func_get_args());
+    }
+
+    /****************************************/
+    public static function a( /*...*/)
+    {
+        $el = new HtmlElement('a');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function img( /*...*/)
+    {
+        $el = new HtmlElement('img');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function br( /*...*/)
+    {
+        $el = new HtmlElement('br');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function span( /*...*/)
+    {
+        $el = new HtmlElement('span');
+        return $el->_init2(func_get_args());
+    }
+
+    /****************************************/
+    public static function h1( /*...*/)
+    {
+        $el = new HtmlElement('h1');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function h2( /*...*/)
+    {
+        $el = new HtmlElement('h2');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function h3( /*...*/)
+    {
+        $el = new HtmlElement('h3');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function h4( /*...*/)
+    {
+        $el = new HtmlElement('h4');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function h5( /*...*/)
+    {
+        $el = new HtmlElement('h5');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function h6( /*...*/)
+    {
+        $el = new HtmlElement('h6');
+        return $el->_init2(func_get_args());
+    }
+
+    /****************************************/
+    public static function hr( /*...*/)
+    {
+        $el = new HtmlElement('hr');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function div( /*...*/)
+    {
+        $el = new HtmlElement('div');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function p( /*...*/)
+    {
+        $el = new HtmlElement('p');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function pre( /*...*/)
+    {
+        $el = new HtmlElement('pre');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function blockquote( /*...*/)
+    {
+        $el = new HtmlElement('blockquote');
+        return $el->_init2(func_get_args());
+    }
+
+    /****************************************/
+    public static function em( /*...*/)
+    {
+        $el = new HtmlElement('em');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function strong( /*...*/)
+    {
+        $el = new HtmlElement('strong');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function small( /*...*/)
+    {
+        $el = new HtmlElement('small');
+        return $el->_init2(func_get_args());
+    }
+
+    /****************************************/
+    public static function tt( /*...*/)
+    {
+        $el = new HtmlElement('tt');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function u( /*...*/)
+    {
+        $el = new HtmlElement('u');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function sup( /*...*/)
+    {
+        $el = new HtmlElement('sup');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function sub( /*...*/)
+    {
+        $el = new HtmlElement('sub');
+        return $el->_init2(func_get_args());
+    }
+
+    /****************************************/
+    public static function ul( /*...*/)
+    {
+        $el = new HtmlElement('ul');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function ol( /*...*/)
+    {
+        $el = new HtmlElement('ol');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function dl( /*...*/)
+    {
+        $el = new HtmlElement('dl');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function li( /*...*/)
+    {
+        $el = new HtmlElement('li');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function dt( /*...*/)
+    {
+        $el = new HtmlElement('dt');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function dd( /*...*/)
+    {
+        $el = new HtmlElement('dd');
+        return $el->_init2(func_get_args());
+    }
+
+    /****************************************/
+    public static function table( /*...*/)
+    {
+        $el = new HtmlElement('table');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function caption( /*...*/)
+    {
+        $el = new HtmlElement('caption');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function thead( /*...*/)
+    {
+        $el = new HtmlElement('thead');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function tbody( /*...*/)
+    {
+        $el = new HtmlElement('tbody');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function tfoot( /*...*/)
+    {
+        $el = new HtmlElement('tfoot');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function tr( /*...*/)
+    {
+        $el = new HtmlElement('tr');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function td( /*...*/)
+    {
+        $el = new HtmlElement('td');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function th( /*...*/)
+    {
+        $el = new HtmlElement('th');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function colgroup( /*...*/)
+    {
+        $el = new HtmlElement('colgroup');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function col( /*...*/)
+    {
+        $el = new HtmlElement('col');
+        return $el->_init2(func_get_args());
+    }
+
+    /****************************************/
+    public static function form( /*...*/)
+    {
+        $el = new HtmlElement('form');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function input( /*...*/)
+    {
+        $el = new HtmlElement('input');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function button( /*...*/)
+    {
+        $el = new HtmlElement('button');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function option( /*...*/)
+    {
+        $el = new HtmlElement('option');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function select( /*...*/)
+    {
+        $el = new HtmlElement('select');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function textarea( /*...*/)
+    {
+        $el = new HtmlElement('textarea');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function label( /*...*/)
+    {
+        $el = new HtmlElement('label');
+        return $el->_init2(func_get_args());
+    }
+
+    /****************************************/
+    public static function area( /*...*/)
+    {
+        $el = new HtmlElement('area');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function map( /*...*/)
+    {
+        $el = new HtmlElement('map');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function frame( /*...*/)
+    {
+        $el = new HtmlElement('frame');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function frameset( /*...*/)
+    {
+        $el = new HtmlElement('frameset');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function iframe( /*...*/)
+    {
+        $el = new HtmlElement('iframe');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function nobody( /*...*/)
+    {
+        $el = new HtmlElement('nobody');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function object( /*...*/)
+    {
+        $el = new HtmlElement('object');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function embed( /*...*/)
+    {
+        $el = new HtmlElement('embed');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function param( /*...*/)
+    {
+        $el = new HtmlElement('param');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function fieldset( /*...*/)
+    {
+        $el = new HtmlElement('fieldset');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function legend( /*...*/)
+    {
+        $el = new HtmlElement('legend');
+        return $el->_init2(func_get_args());
+    }
+
+    /****************************************/
+    public static function video( /*...*/)
+    {
+        $el = new HtmlElement('video');
+        return $el->_init2(func_get_args());
+    }
+}
+
+define('HTMLTAG_EMPTY', 1);
+define('HTMLTAG_INLINE', 2);
+define('HTMLTAG_ACCEPTS_INLINE', 4);
+
+HTML::_setTagProperty(HTMLTAG_EMPTY,
+    'area base basefont br col embed frame hr img input isindex link meta param');
+HTML::_setTagProperty(HTMLTAG_ACCEPTS_INLINE,
+    // %inline elements:
+    'b big i small tt ' // %fontstyle
+        . 's strike u ' // (deprecated)
+        . 'abbr acronym cite code dfn em kbd samp strong var ' //%phrase
+        . 'a img object embed br script map q sub sup span bdo ' //%special
+        . 'button input label option select textarea label ' //%formctl
+
+        // %block elements which contain inline content
+        . 'address h1 h2 h3 h4 h5 h6 p pre '
+        // %block elements which contain either block or inline content
+        . 'div fieldset frameset'
+
+        // other with inline content
+        . 'caption dt label legend video '
+        // other with either inline or block
+        . 'dd del ins li td th colgroup');
+
+HTML::_setTagProperty(HTMLTAG_INLINE,
+    // %inline elements:
+    'b big i small tt ' // %fontstyle
+        . 's strike u ' // (deprecated)
+        . 'abbr acronym cite code dfn em kbd samp strong var ' //%phrase
+        . 'a img object br script map q sub sup span bdo ' //%special
+        . 'button input label option select textarea ' //%formctl
+        . 'nobody iframe'
+);
+
+/**
+ * Generate hidden form input fields.
+ *
+ * @param $query_args hash  A hash mapping names to values for the hidden inputs.
+ * Values in the hash can themselves be hashes.  The will result in hidden inputs
+ * which will reconstruct the nested structure in the resulting query args as
+ * processed by PHP.
+ *
+ * Example:
+ *
+ * $args = array('x' => '2',
+ *               'y' => array('a' => 'aval', 'b' => 'bval'));
+ * $inputs = HiddenInputs($args);
+ *
+ * Will result in:
+ *
+ *  <input type="hidden" name="x" value = "2" />
+ *  <input type="hidden" name="y[a]" value = "aval" />
+ *  <input type="hidden" name="y[b]" value = "bval" />
+ *
+ * @return object An XmlContent object containing the inputs.
+ */
+function HiddenInputs($query_args, $pfx = false, $exclude = array())
+{
+    $inputs = HTML();
+
+    foreach ($query_args as $key => $val) {
+        if (in_array($key, $exclude)) continue;
+        $name = $pfx ? $pfx . "[$key]" : $key;
+        if (is_array($val))
+            $inputs->pushContent(HiddenInputs($val, $name));
+        else
+            $inputs->pushContent(HTML::input(array('type' => 'hidden',
+                'name' => $name,
+                'value' => $val)));
+    }
+    return $inputs;
+}
+
+/** Generate a <script> tag containing javascript.
+ *
+ * @param string $js  The javascript.
+ * @param string $script_args  (optional) hash of script tags options
+ *                             e.g. to provide another version or the defer attr
+ * @return HtmlElement A <script> element.
+ */
+function JavaScript($js, $script_args = false)
+{
+    $default_script_args = array( //'version' => 'JavaScript', // not xhtml conformant
+        'type' => 'text/javascript');
+    $script_args = $script_args ? array_merge($default_script_args, $script_args)
+        : $default_script_args;
+    if (empty($js))
+        return HTML(HTML::script($script_args), "\n");
+    else
+        // see http://devedge.netscape.com/viewsource/2003/xhtml-style-script/
+        return HTML(HTML::script($script_args,
+            new RawXml((ENABLE_XHTML_XML ? "\n//<![CDATA[" : "\n<!--//")
+                . "\n" . trim($js) . "\n"
+                . (ENABLE_XHTML_XML ? "//]]>\n" : "// -->"))), "\n");
+}
+
+/** Conditionally display content based of whether javascript is supported.
+ *
+ * This conditionally (on the client side) displays one of two alternate
+ * contents depending on whether the client supports javascript.
+ *
+ * NOTE:
+ * The content you pass as arguments to this function must be block-level.
+ * (This is because the <noscript> tag is block-level.)
+ *
+ * @param mixed $if_content Content to display if the browser supports
+ * javascript.
+ *
+ * @param mixed $else_content Content to display if the browser does
+ * not support javascript.
+ *
+ * @return XmlContent
+ */
+function IfJavaScript($if_content = false, $else_content = false)
+{
+    $html = array();
+    if ($if_content) {
+        $xml = AsXML($if_content);
+        $js = sprintf('document.write("%s");',
+            addcslashes($xml, "\0..\37!@\\\177..\377"));
+        $html[] = JavaScript($js);
+    }
+    if ($else_content) {
+        $html[] = HTML::noscript(false, $else_content);
+    }
+    return HTML($html);
+}
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:


Property changes on: trunk/lib/HtmlElement.php
___________________________________________________________________
Added: svn:mergeinfo
   + 

Deleted: trunk/lib/HtmlElement5.php
===================================================================
--- trunk/lib/HtmlElement5.php	2012-11-15 10:41:15 UTC (rev 8470)
+++ trunk/lib/HtmlElement5.php	2012-11-15 10:44:32 UTC (rev 8471)
@@ -1,682 +0,0 @@
-<?php
-/**
- * Code for writing the HTML subset of XML.
- * @author: Jeff Dairiki
- *
- * This code is now php5 compatible. --2004-04-19 23:51:43 rurban
- * Specialized for php-5.3: added public static 2010-06-07 09:51:37 rurban
- *
- * Todo: Add support for a JavaScript backend, a php2js compiler.
- * HTML::div(array('onclick' => 'HTML::div(...)'))
- */
-if (!class_exists("XmlElement"))
-    require_once(dirname(__FILE__) . "/XmlElement.php");
-if (class_exists("HtmlElement"))
-    return;
-
-/**
- * An XML element.
- */
-//apd_set_session_trace(35);
-
-class HtmlElement extends XmlElement
-{
-    function __construct($tagname /* , $attr_or_content , ...*/)
-    {
-        $this->_init(func_get_args());
-        $this->_properties = HTML::getTagProperties($tagname);
-    }
-
-    function _init($args)
-    {
-        if (!is_array($args))
-            $args = func_get_args();
-
-        assert(count($args) >= 1);
-        assert(is_string($args[0]));
-        $this->_tag = array_shift($args);
-
-        if ($args && is_array($args[0]))
-            $this->_attr = array_shift($args);
-        else {
-            $this->_attr = array();
-            if ($args && $args[0] === false)
-                array_shift($args);
-        }
-        $this->setContent($args);
-        $this->_properties = HTML::getTagProperties($this->_tag);
-    }
-
-    /**
-     * @access protected
-     * This is used by the static factory methods is class HTML.
-     */
-    function _init2($args)
-    {
-        if ($args) {
-            if (is_array($args[0]))
-                $this->_attr = array_shift($args);
-            elseif ($args[0] === false)
-                array_shift($args);
-        }
-
-        if (count($args) == 1 && is_array($args[0]))
-            $args = $args[0];
-        $this->_content = $args;
-        return $this;
-    }
-
-    /** Add a "tooltip" to an element.
-     *
-     * @param $tooltip_text string The tooltip text.
-     */
-    function addTooltip($tooltip_text, $accesskey = null)
-    {
-        $this->setAttr('title', $tooltip_text);
-        if ($accesskey) $this->setAccesskey($accesskey);
-
-        // FIXME: this should be initialized from title by an onLoad() function.
-        //        (though, that may not be possible.)
-        $qtooltip = str_replace("'", "\\'", $tooltip_text);
-        $this->setAttr('onmouseover',
-            sprintf('window.status="%s"; return true;',
-                addslashes($tooltip_text)));
-        $this->setAttr('onmouseout', "window.status='';return true;");
-    }
-
-    function setAccesskey($key)
-    {
-        global $WikiTheme;
-        if (strlen($key) != 1) return;
-        $this->setAttr("accesskey", $key);
-
-        if (!empty($this->_attr['title'])) {
-            if (preg_match("/\[(alt-)?(.)\]$/", $this->_attr['title'], $m)) {
-                $this->_attr['title'] = preg_replace
-                ("/\[(alt-)?(.)\]$/",
-                    "[" . $WikiTheme->tooltipAccessKeyPrefix() . "-\\2]",
-                    $this->_attr['title']);
-            } else {
-                $this->_attr['title'] .=
-                    " [" . $WikiTheme->tooltipAccessKeyPrefix() . "-$key]";
-            }
-        } else {
-            $this->_attr['title'] =
-                "[" . $WikiTheme->tooltipAccessKeyPrefix() . "-$key]";
-        }
-    }
-
-    function emptyTag()
-    {
-        if (($this->_properties & HTMLTAG_EMPTY) == 0)
-            return $this->startTag() . "</$this->_tag>";
-
-        return substr($this->startTag(), 0, -1) . " />";
-    }
-
-    function hasInlineContent()
-    {
-        return ($this->_properties & HTMLTAG_ACCEPTS_INLINE) != 0;
-    }
-
-    function isInlineElement()
-    {
-        return ($this->_properties & HTMLTAG_INLINE) != 0;
-    }
-}
-
-
-
-function HTML( /* $content, ... */)
-{
-    return new XmlContent(func_get_args());
-}
-
-class HTML extends HtmlElement
-{
-    public static function raw($html_text)
-    {
-        return new RawXml($html_text);
-    }
-
-    public static function getTagProperties($tag)
-    {
-        $props = &$GLOBALS['HTML_TagProperties'];
-        return isset($props[$tag]) ? $props[$tag] : 0;
-    }
-
-    public static function _setTagProperty($prop_flag, $tags)
-    {
-        $props = &$GLOBALS['HTML_TagProperties'];
-        if (is_string($tags))
-            $tags = preg_split('/\s+/', $tags);
-        foreach ($tags as $tag) {
-            $tag = trim($tag);
-            if ($tag)
-                if (isset($props[$tag]))
-                    $props[$tag] |= $prop_flag;
-                else
-                    $props[$tag] = $prop_flag;
-        }
-    }
-
-    // See admin/mkfuncs shell script to generate the following static methods
-
-    public static function link( /*...*/)
-    {
-        $el = new HtmlElement('link');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function meta( /*...*/)
-    {
-        $el = new HtmlElement('meta');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function style( /*...*/)
-    {
-        $el = new HtmlElement('style');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function script( /*...*/)
-    {
-        $el = new HtmlElement('script');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function noscript( /*...*/)
-    {
-        $el = new HtmlElement('noscript');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    public static function a( /*...*/)
-    {
-        $el = new HtmlElement('a');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function img( /*...*/)
-    {
-        $el = new HtmlElement('img');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function br( /*...*/)
-    {
-        $el = new HtmlElement('br');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function span( /*...*/)
-    {
-        $el = new HtmlElement('span');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    public static function h1( /*...*/)
-    {
-        $el = new HtmlElement('h1');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function h2( /*...*/)
-    {
-        $el = new HtmlElement('h2');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function h3( /*...*/)
-    {
-        $el = new HtmlElement('h3');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function h4( /*...*/)
-    {
-        $el = new HtmlElement('h4');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function h5( /*...*/)
-    {
-        $el = new HtmlElement('h5');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function h6( /*...*/)
-    {
-        $el = new HtmlElement('h6');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    public static function hr( /*...*/)
-    {
-        $el = new HtmlElement('hr');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function div( /*...*/)
-    {
-        $el = new HtmlElement('div');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function p( /*...*/)
-    {
-        $el = new HtmlElement('p');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function pre( /*...*/)
-    {
-        $el = new HtmlElement('pre');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function blockquote( /*...*/)
-    {
-        $el = new HtmlElement('blockquote');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    public static function em( /*...*/)
-    {
-        $el = new HtmlElement('em');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function strong( /*...*/)
-    {
-        $el = new HtmlElement('strong');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function small( /*...*/)
-    {
-        $el = new HtmlElement('small');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    public static function tt( /*...*/)
-    {
-        $el = new HtmlElement('tt');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function u( /*...*/)
-    {
-        $el = new HtmlElement('u');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function sup( /*...*/)
-    {
-        $el = new HtmlElement('sup');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function sub( /*...*/)
-    {
-        $el = new HtmlElement('sub');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    public static function ul( /*...*/)
-    {
-        $el = new HtmlElement('ul');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function ol( /*...*/)
-    {
-        $el = new HtmlElement('ol');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function dl( /*...*/)
-    {
-        $el = new HtmlElement('dl');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function li( /*...*/)
-    {
-        $el = new HtmlElement('li');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function dt( /*...*/)
-    {
-        $el = new HtmlElement('dt');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function dd( /*...*/)
-    {
-        $el = new HtmlElement('dd');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    public static function table( /*...*/)
-    {
-        $el = new HtmlElement('table');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function caption( /*...*/)
-    {
-        $el = new HtmlElement('caption');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function thead( /*...*/)
-    {
-        $el = new HtmlElement('thead');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function tbody( /*...*/)
-    {
-        $el = new HtmlElement('tbody');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function tfoot( /*...*/)
-    {
-        $el = new HtmlElement('tfoot');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function tr( /*...*/)
-    {
-        $el = new HtmlElement('tr');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function td( /*...*/)
-    {
-        $el = new HtmlElement('td');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function th( /*...*/)
-    {
-        $el = new HtmlElement('th');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function colgroup( /*...*/)
-    {
-        $el = new HtmlElement('colgroup');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function col( /*...*/)
-    {
-        $el = new HtmlElement('col');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    public static function form( /*...*/)
-    {
-        $el = new HtmlElement('form');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function input( /*...*/)
-    {
-        $el = new HtmlElement('input');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function button( /*...*/)
-    {
-        $el = new HtmlElement('button');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function option( /*...*/)
-    {
-        $el = new HtmlElement('option');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function select( /*...*/)
-    {
-        $el = new HtmlElement('select');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function textarea( /*...*/)
-    {
-        $el = new HtmlElement('textarea');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function label( /*...*/)
-    {
-        $el = new HtmlElement('label');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    public static function area( /*...*/)
-    {
-        $el = new HtmlElement('area');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function map( /*...*/)
-    {
-        $el = new HtmlElement('map');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function frame( /*...*/)
-    {
-        $el = new HtmlElement('frame');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function frameset( /*...*/)
-    {
-        $el = new HtmlElement('frameset');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function iframe( /*...*/)
-    {
-        $el = new HtmlElement('iframe');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function nobody( /*...*/)
-    {
-        $el = new HtmlElement('nobody');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function object( /*...*/)
-    {
-        $el = new HtmlElement('object');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function embed( /*...*/)
-    {
-        $el = new HtmlElement('embed');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function param( /*...*/)
-    {
-        $el = new HtmlElement('param');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function fieldset( /*...*/)
-    {
-        $el = new HtmlElement('fieldset');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function legend( /*...*/)
-    {
-        $el = new HtmlElement('legend');
-        return $el->_init2(func_get_args());
-    }
-
-    /****************************************/
-    public static function video( /*...*/)
-    {
-        $el = new HtmlElement('video');
-        return $el->_init2(func_get_args());
-    }
-}
-
-define('HTMLTAG_EMPTY', 1);
-define('HTMLTAG_INLINE', 2);
-define('HTMLTAG_ACCEPTS_INLINE', 4);
-
-HTML::_setTagProperty(HTMLTAG_EMPTY,
-    'area base basefont br col embed frame hr img input isindex link meta param');
-HTML::_setTagProperty(HTMLTAG_ACCEPTS_INLINE,
-    // %inline elements:
-    'b big i small tt ' // %fontstyle
-        . 's strike u ' // (deprecated)
-        . 'abbr acronym cite code dfn em kbd samp strong var ' //%phrase
-        . 'a img object embed br script map q sub sup span bdo ' //%special
-        . 'button input label option select textarea label ' //%formctl
-
-        // %block elements which contain inline content
-        . 'address h1 h2 h3 h4 h5 h6 p pre '
-        // %block elements which contain either block or inline content
-        . 'div fieldset frameset'
-
-        // other with inline content
-        . 'caption dt label legend video '
-        // other with either inline or block
-        . 'dd del ins li td th colgroup');
-
-HTML::_setTagProperty(HTMLTAG_INLINE,
-    // %inline elements:
-    'b big i small tt ' // %fontstyle
-        . 's strike u ' // (deprecated)
-        . 'abbr acronym cite code dfn em kbd samp strong var ' //%phrase
-        . 'a img object br script map q sub sup span bdo ' //%special
-        . 'button input label option select textarea ' //%formctl
-        . 'nobody iframe'
-);
-
-/**
- * Generate hidden form input fields.
- *
- * @param $query_args hash  A hash mapping names to values for the hidden inputs.
- * Values in the hash can themselves be hashes.  The will result in hidden inputs
- * which will reconstruct the nested structure in the resulting query args as
- * processed by PHP.
- *
- * Example:
- *
- * $args = array('x' => '2',
- *               'y' => array('a' => 'aval', 'b' => 'bval'));
- * $inputs = HiddenInputs($args);
- *
- * Will result in:
- *
- *  <input type="hidden" name="x" value = "2" />
- *  <input type="hidden" name="y[a]" value = "aval" />
- *  <input type="hidden" name="y[b]" value = "bval" />
- *
- * @return object An XmlContent object containing the inputs.
- */
-function HiddenInputs($query_args, $pfx = false, $exclude = array())
-{
-    $inputs = HTML();
-
-    foreach ($query_args as $key => $val) {
-        if (in_array($key, $exclude)) continue;
-        $name = $pfx ? $pfx . "[$key]" : $key;
-        if (is_array($val))
-            $inputs->pushContent(HiddenInputs($val, $name));
-        else
-            $inputs->pushContent(HTML::input(array('type' => 'hidden',
-                'name' => $name,
-                'value' => $val)));
-    }
-    return $inputs;
-}
-
-/** Generate a <script> tag containing javascript.
- *
- * @param string $js  The javascript.
- * @param string $script_args  (optional) hash of script tags options
- *                             e.g. to provide another version or the defer attr
- * @return HtmlElement A <script> element.
- */
-function JavaScript($js, $script_args = false)
-{
-    $default_script_args = array( //'version' => 'JavaScript', // not xhtml conformant
-        'type' => 'text/javascript');
-    $script_args = $script_args ? array_merge($default_script_args, $script_args)
-        : $default_script_args;
-    if (empty($js))
-        return HTML(HTML::script($script_args), "\n");
-    else
-        // see http://devedge.netscape.com/viewsource/2003/xhtml-style-script/
-        return HTML(HTML::script($script_args,
-            new RawXml((ENABLE_XHTML_XML ? "\n//<![CDATA[" : "\n<!--//")
-                . "\n" . trim($js) . "\n"
-                . (ENABLE_XHTML_XML ? "//]]>\n" : "// -->"))), "\n");
-}
-
-/** Conditionally display content based of whether javascript is supported.
- *
- * This conditionally (on the client side) displays one of two alternate
- * contents depending on whether the client supports javascript.
- *
- * NOTE:
- * The content you pass as arguments to this function must be block-level.
- * (This is because the <noscript> tag is block-level.)
- *
- * @param mixed $if_content Content to display if the browser supports
- * javascript.
- *
- * @param mixed $else_content Content to display if the browser does
- * not support javascript.
- *
- * @return XmlContent
- */
-function IfJavaScript($if_content = false, $else_content = false)
-{
-    $html = array();
-    if ($if_content) {
-        $xml = AsXML($if_content);
-        $js = sprintf('document.write("%s");',
-            addcslashes($xml, "\0..\37!@\\\177..\377"));
-        $html[] = JavaScript($js);
-    }
-    if ($else_content) {
-        $html[] = HTML::noscript(false, $else_content);
-    }
-    return HTML($html);
-}
-
-// Local Variables:
-// mode: php
-// tab-width: 8
-// c-basic-offset: 4
-// c-hanging-comment-ender-p: nil
-// indent-tabs-mode: nil
-// End:

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8470] trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php

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

Revision: 8470
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8470&view=rev
Author:   vargenau
Date:     2012-11-15 10:41:15 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
Remove empty line

Modified Paths:
--------------
    trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php

Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php	2012-11-15 10:34:21 UTC (rev 8469)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php	2012-11-15 10:41:15 UTC (rev 8470)
@@ -214,4 +214,3 @@
 '<<'	=> array( 'input'=>'<<', 'tag'=>'mo', 'output'=>'&#' . hexdec('2329') . ';', 'left_bracket'=>TRUE), // 2005-06-07 wes
 '>>'	=> array( 'input'=>'>>', 'tag'=>'mo', 'output'=>'&#' . hexdec('232A') . ';', 'right_bracket'=>TRUE) // 2005-06-07 wes
 );
-

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

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

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

Revision: 8469
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8469&view=rev
Author:   vargenau
Date:     2012-11-15 10:34:21 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
PHP 5 only

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

Added Paths:
-----------
    trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
    trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php

Removed Paths:
-------------
    trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php
    trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
    trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
    trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php

Deleted: trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php	2012-11-15 10:29:20 UTC (rev 8468)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php	2012-11-15 10:34:21 UTC (rev 8469)
@@ -1,217 +0,0 @@
-<?php
-
-$symbol_arr = array(
-
-// Greek symbols
-'alpha'	=> array( 'input'=>'alpha','tag'=>'mi', 'output'=>'&#' . hexdec('03B1') . ';'),
-'beta'	=> array( 'input'=>'beta','tag'=>'mi', 'output'=>'&#' . hexdec('03B2') . ';'),
-'chi'	=> array( 'input'=>'chi','tag'=>'mi', 'output'=>'&#' . hexdec('03C7') . ';'),
-'delta'	=> array( 'input'=>'delta','tag'=>'mi', 'output'=>'&#' . hexdec('03B4') . ';'),
-'Delta'	=> array( 'input'=>'Delta','tag'=>'mo', 'output'=>'&#' . hexdec('0394') . ';'),
-'epsi'	=> array( 'input'=>'epsi','tag'=>'mi', 'output'=>'&#' . hexdec('03B5') . ';'),
-'varepsilon'	=> array( 'input'=>'varepsilon','tag'=>'mi', 'output'=>'&#' . hexdec('025B') . ';'),
-'eta'	=> array( 'input'=>'eta','tag'=>'mi', 'output'=>'&#' . hexdec('03B7') . ';'),
-'gamma'	=> array( 'input'=>'gamma','tag'=>'mi', 'output'=>'&#' . hexdec('03B3') . ';'),
-'Gamma'	=> array( 'input'=>'Gamma','tag'=>'mi', 'output'=>'&#' . hexdec('0393') . ';'),
-'iota'	=> array( 'input'=>'iota','tag'=>'mi', 'output'=>'&#' . hexdec('03B9') . ';'),
-'kappa'	=> array( 'input'=>'kappa','tag'=>'mi', 'output'=>'&#' . hexdec('03BA') . ';'),
-'lambda'	=> array( 'input'=>'lambda','tag'=>'mi', 'output'=>'&#' . hexdec('03BB') . ';'),
-'Lambda'	=> array( 'input'=>'Lambda','tag'=>'mo', 'output'=>'&#' . hexdec('039B') . ';'),
-'mu'	=> array( 'input'=>'mu','tag'=>'mi', 'output'=>'&#' . hexdec('03BC') . ';'),
-'nu'	=> array( 'input'=>'nu','tag'=>'mi', 'output'=>'&#' . hexdec('03BD') . ';'),
-'omega'	=> array( 'input'=>'omega','tag'=>'mi', 'output'=>'&#' . hexdec('03C9') . ';'),
-'Omega'	=> array( 'input'=>'Omega','tag'=>'mo', 'output'=>'&#' . hexdec('03A9') . ';'),
-'phi'	=> array( 'input'=>'phi','tag'=>'mi', 'output'=>'&#' . hexdec('03C6') . ';'),
-'varphi'	=> array( 'input'=>'varphi','tag'=>'mi', 'output'=>'&#' . hexdec('03D5') . ';'),
-'Phi'	=> array( 'input'=>'Phi','tag'=>'mo', 'output'=>'&#' . hexdec('03A6') . ';'),
-'pi'	=> array( 'input'=>'pi','tag'=>'mi', 'output'=>'&#' . hexdec('03C0') . ';'),
-'Pi'	=> array( 'input'=>'Pi','tag'=>'mo', 'output'=>'&#' . hexdec('03A0') . ';'),
-'psi'	=> array( 'input'=>'psi','tag'=>'mi', 'output'=>'&#' . hexdec('03C8') . ';'),
-'rho'	=> array( 'input'=>'rho','tag'=>'mi', 'output'=>'&#' . hexdec('03C1') . ';'),
-'sigma'	=> array( 'input'=>'sigma','tag'=>'mi', 'output'=>'&#' . hexdec('03C3') . ';'),
-'Sigma'	=> array( 'input'=>'Sigma','tag'=>'mo', 'output'=>'&#' . hexdec('03A3') . ';'),
-'tau'	=> array( 'input'=>'tau','tag'=>'mi', 'output'=>'&#' . hexdec('03C4') . ';'),
-'theta'	=> array( 'input'=>'theta','tag'=>'mi', 'output'=>'&#' . hexdec('03B8') . ';'),
-'vartheta'	=> array( 'input'=>'vartheta','tag'=>'mi', 'output'=>'&#' . hexdec('03D1') . ';'),
-'Theta'	=> array( 'input'=>'Theta','tag'=>'mo', 'output'=>'&#' . hexdec('0398') . ';'),
-'upsilon'	=> array( 'input'=>'upsilon','tag'=>'mi', 'output'=>'&#' . hexdec('03C5') . ';'),
-'xi'	=> array( 'input'=>'xi','tag'=>'mi', 'output'=>'&#' . hexdec('03BE') . ';'),
-'Xi'	=> array( 'input'=>'alpha','tag'=>'mo', 'output'=>'&#' . hexdec('039E') . ';'),
-'zeta'	=> array( 'input'=>'zeta','tag'=>'mi', 'output'=>'&#' . hexdec('03B6') . ';'),
-
-// Binary operation symbols
-'*'		=> array( 'input'=>'*','tag'=>'mo', 'output'=>'&#' . hexdec('22C5') . ';'),
-'**'	=> array( 'input'=>'**','tag'=>'mo', 'output'=>'&#' . hexdec('22C6') . ';'),
-'//'	=> array( 'input'=>'//','tag'=>'mo', 'output'=>'/'),
-'\\\\'	=> array( 'input'=>'\\\\','tag'=>'mo', 'output'=>'\\'),
-'xx'	=> array( 'input'=>'xx','tag'=>'mo', 'output'=>'&#' . hexdec('00D7') . ';'),
-'-:'	=> array( 'input'=>'-:','tag'=>'mo', 'output'=>'&#' . hexdec('00F7') . ';'),
-'@'		=> array( 'input'=>'@','tag'=>'mo', 'output'=>'&#' . hexdec('2218') . ';'),
-'o+'	=> array( 'input'=>'o+','tag'=>'mo', 'output'=>'&#' . hexdec('2295') . ';'),
-'ox'	=> array( 'input'=>'ox','tag'=>'mo', 'output'=>'&#' . hexdec('2297') . ';'),
-'sum'	=> array( 'input'=>'sum','tag'=>'mo', 'output'=>'&#' . hexdec('2211') . ';', 'underover'=>TRUE),
-'prod'	=> array( 'input'=>'prod','tag'=>'mo', 'output'=>'&#' . hexdec('220F') . ';', 'underover'=>TRUE),
-'^^'	=> array( 'input'=>'^^','tag'=>'mo', 'output'=>'&#' . hexdec('2227') . ';'),
-'^^^'	=> array( 'input'=>'^^^','tag'=>'mo', 'output'=>'&#' . hexdec('22C0') . ';', 'underover'=>TRUE),
-'vv'	=> array( 'input'=>'vv','tag'=>'mo', 'output'=>'&#' . hexdec('2228') . ';'),
-'vvv'	=> array( 'input'=>'vvv','tag'=>'mo', 'output'=>'&#' . hexdec('22C1') . ';', 'underover'=>TRUE),
-'nn'	=> array( 'input'=>'nn','tag'=>'mo', 'output'=>'&#' . hexdec('2229') . ';'),
-'nnn'	=> array( 'input'=>'nnn','tag'=>'mo', 'output'=>'&#' . hexdec('22C5') . ';', 'underover'=>TRUE),
-'uu'	=> array( 'input'=>'uu','tag'=>'mo', 'output'=>'&#' . hexdec('222A') . ';'),
-'uuu'	=> array( 'input'=>'uuu','tag'=>'mo', 'output'=>'&#' . hexdec('22C3') . ';', 'underover'=>TRUE),
-
-// Binary relation symbols
-'!='	=> array( 'input'=>'!=','tag'=>'mo', 'output'=>'&#' . hexdec('2260') . ';'),
-':='    => array( 'input'=>':=','tag'=>'mo', 'output'=>':=' ), 				/* 2005-06-05 wes */
-'<'		=> array( 'input'=>'<','tag'=>'mo', 'output'=>'&lt;'),
-'lt'	=> array( 'input'=>'lt','tag'=>'mo', 'output'=>'&lt;'), 			/* 2005-06-05 wes */
-'<='	=> array( 'input'=>'<=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
-'lt='	=> array( 'input'=>'lt=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
-'le'	=> array( 'input'=>'le','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'), 	/* 2005-06-05 wes */
-'>'		=> array( 'input'=>'>','tag'=>'mo', 'output'=>'&gt;'),
-'>='	=> array( 'input'=>'>=','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
-'qeq'	=> array( 'input'=>'geq','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
-'-<'	=> array( 'input'=>'-<','tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'),
-'-lt'	=> array( 'input'=>'-lt','tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'),
-'>-'	=> array( 'input'=>'>-','tag'=>'mo', 'output'=>'&#' . hexdec('227B') . ';'),
-'in'	=> array( 'input'=>'in','tag'=>'mo', 'output'=>'&#' . hexdec('2208') . ';'),
-'!in'	=> array( 'input'=>'!in','tag'=>'mo', 'output'=>'&#' . hexdec('2209') . ';'),
-'sub'	=> array( 'input'=>'sub','tag'=>'mo', 'output'=>'&#' . hexdec('2282') . ';'),
-'sup'	=> array( 'input'=>'sup','tag'=>'mo', 'output'=>'&#' . hexdec('2283') . ';'),
-'sube'	=> array( 'input'=>'sube','tag'=>'mo', 'output'=>'&#' . hexdec('2286') . ';'),
-'supe'	=> array( 'input'=>'supe','tag'=>'mo', 'output'=>'&#' . hexdec('2287') . ';'),
-'-='	=> array( 'input'=>'-=','tag'=>'mo', 'output'=>'&#' . hexdec('2261') . ';'),
-'~='	=> array( 'input'=>'~=','tag'=>'mo', 'output'=>'&#' . hexdec('2245') . ';'),
-'~~'	=> array( 'input'=>'~~','tag'=>'mo', 'output'=>'&#' . hexdec('2248') . ';'),
-'prop'	=> array( 'input'=>'prop','tag'=>'mo', 'output'=>'&#' . hexdec('221D') . ';'),
-
-// Logical symbols
-'and'	=> array( 'input'=>'and','tag'=>'mtext', 'output'=>'and', 'space'=>'1ex'),
-'or'	=> array( 'input'=>'or','tag'=>'mtext', 'output'=>'or', 'space'=>'1ex'),
-'not'	=> array( 'input'=>'not','tag'=>'mo', 'output'=>'&#' . hexdec('00AC') . ';'),
-'=>'	=> array( 'input'=>'=>','tag'=>'mo', 'output'=>'&#' . hexdec('21D2') . ';'),
-'if'	=> array( 'input'=>'if','tag'=>'mo', 'output'=>'if', 'space'=>'1ex'),
-'iff'	=> array( 'input'=>'iff','tag'=>'mo', 'output'=>'&#' . hexdec('21D4') . ';'),
-'<=>'	=> array( 'input'=>'iff','tag'=>'mo', 'output'=>'&#' . hexdec('21D4') . ';'), /* 2005-06-07 wes */
-'AA'	=> array( 'input'=>'AA','tag'=>'mo', 'output'=>'&#' . hexdec('2200') . ';'),
-'EE'	=> array( 'input'=>'EE','tag'=>'mo', 'output'=>'&#' . hexdec('2203') . ';'),
-'_|_'	=> array( 'input'=>'_|_','tag'=>'mo', 'output'=>'&#' . hexdec('22A5') . ';'),
-'TT'	=> array( 'input'=>'TT','tag'=>'mo', 'output'=>'&#' . hexdec('22A4') . ';'),
-'|-'	=> array( 'input'=>'|-','tag'=>'mo', 'output'=>'&#' . hexdec('22A2') . ';'),
-'|='	=> array( 'input'=>'|=','tag'=>'mo', 'output'=>'&#' . hexdec('22A8') . ';'),
-
-// Miscellaneous symbols
-'ang'   => array('input'=>'ang','tag'=>'mo','output'=>'&#' . hexdec('2220') . ';'),
-'deg'   => array('input'=>'deg','tag'=>'mo','output'=>'&#' . hexdec('00B0') . ';'),
-'int'	=> array( 'input'=>'int','tag'=>'mo', 'output'=>'&#' . hexdec('222B') . ';'),
-'dx'	=> array( 'input'=>'dx','tag'=>'mi', 'output'=>'{:d x:}', 'definition'=>TRUE), /* 2005-06-11 wes */
-'dy'	=> array( 'input'=>'dy','tag'=>'mi', 'output'=>'{:d y:}', 'definition'=>TRUE), /* 2005-06-11 wes */
-'dz'	=> array( 'input'=>'dz','tag'=>'mi', 'output'=>'{:d z:}', 'definition'=>TRUE), /* 2005-06-11 wes */
-'dt'	=> array( 'input'=>'dt','tag'=>'mi', 'output'=>'{:d t:}', 'definition'=>TRUE), /* 2005-06-11 wes */
-'oint'	=> array( 'input'=>'oint','tag'=>'mo', 'output'=>'&#' . hexdec('222E') . ';'),
-'del'	=> array( 'input'=>'del','tag'=>'mo', 'output'=>'&#' . hexdec('2202') . ';'),
-'grad'	=> array( 'input'=>'grad','tag'=>'mo', 'output'=>'&#' . hexdec('2207') . ';'),
-'+-'	=> array( 'input'=>'+-','tag'=>'mo', 'output'=>'&#' . hexdec('00B1') . ';'),
-'O/'	=> array( 'input'=>'0/','tag'=>'mo', 'output'=>'&#' . hexdec('2205') . ';'),
-'oo'	=> array( 'input'=>'oo','tag'=>'mo', 'output'=>'&#' . hexdec('221E') . ';'),
-'aleph'	=> array( 'input'=>'aleph','tag'=>'mo', 'output'=>'&#' . hexdec('2135') . ';'),
-'...'	=> array( 'input'=>'int','tag'=>'mo', 'output'=>'...'),
-'~'	=> array( 'input'=>'!~','tag'=>'mo', 'output'=>'&#' . hexdec('0020') . ';'),
-'\\ '	=> array( 'input'=>'~','tag'=>'mo', 'output'=>'&#' . hexdec('00A0') . ';'),
-'quad'	=> array( 'input'=>'quad','tag'=>'mo', 'output'=>'&#' . hexdec('00A0') . ';&#' . hexdec('00A0') . ';'),
-'qquad'	=> array( 'input'=>'qquad','tag'=>'mo', 'output'=>	'&#' . hexdec('00A0') . ';&#' . hexdec('00A0') . ';&#' . hexdec('00A0') . ';'),
-'cdots'	=> array( 'input'=>'cdots','tag'=>'mo', 'output'=>'&#' . hexdec('22EF') . ';'),
-'vdots'	=> array( 'input'=>'vdots','tag'=>'mo', 'output'=>'&#' . hexdec('22EE') . ';'), /* 2005-06-11 wes */
-'ddots'	=> array( 'input'=>'ddots','tag'=>'mo', 'output'=>'&#' . hexdec('22F1') . ';'), /* 2005-06-11 wes */
-'diamond'	=> array( 'input'=>'diamond','tag'=>'mo', 'output'=>'&#' . hexdec('22C4') . ';'),
-'square'	=> array( 'input'=>'square','tag'=>'mo', 'output'=>'&#' . hexdec('25A1') . ';'),
-'|_'	=> array( 'input'=>'|_','tag'=>'mo', 'output'=>'&#' . hexdec('230A') . ';'),
-'_|'	=> array( 'input'=>'_|','tag'=>'mo', 'output'=>'&#' . hexdec('230B') . ';'),
-'|~'	=> array( 'input'=>'|~','tag'=>'mo', 'output'=>'&#' . hexdec('2308') . ';'),
-'~|'	=> array( 'input'=>'~|','tag'=>'mo', 'output'=>'&#' . hexdec('2309') . ';'),
-'CC'	=> array( 'input'=>'CC','tag'=>'mo', 'output'=>'&#' . hexdec('2102') . ';'),
-'NN'	=> array( 'input'=>'NN','tag'=>'mo', 'output'=>'&#' . hexdec('2115') . ';'),
-'QQ'	=> array( 'input'=>'QQ','tag'=>'mo', 'output'=>'&#' . hexdec('211A') . ';'),
-'RR'	=> array( 'input'=>'RR','tag'=>'mo', 'output'=>'&#' . hexdec('211D') . ';'),
-'ZZ'	=> array( 'input'=>'ZZ','tag'=>'mo', 'output'=>'&#' . hexdec('2124') . ';'),
-
-// Standard functions
-'lim'	=> array( 'input'=>'lim','tag'=>'mo', 'output'=>'lim', 'underover'=>TRUE),
-'Lim'	=> array( 'input'=>'Lim','tag'=>'mo', 'output'=>'Lim', 'underover'=>TRUE), /* 2005-06-11 wes */
-'sin'	=> array( 'input'=>'sin','tag'=>'mo', 'output'=>'sin', 'unary'=>TRUE, 'func'=>TRUE),
-'cos'	=> array( 'input'=>'cos', 'tag'=>'mo', 'output'=>'cos', 'unary'=>TRUE, 'func'=>TRUE),
-'tan'	=> array( 'input'=>'tan', 'tag'=>'mo', 'output'=>'tan', 'unary'=>TRUE, 'func'=>TRUE),
-'arcsin'	=> array( 'input'=>'arcsin','tag'=>'mo', 'output'=>'arcsin', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
-'arccos'	=> array( 'input'=>'arccos', 'tag'=>'mo', 'output'=>'arccos', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
-'arctan'	=> array( 'input'=>'arctan', 'tag'=>'mo', 'output'=>'arctan', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
-'sinh'	=> array( 'input'=>'sinh','tag'=>'mo', 'output'=>'sinh', 'unary'=>TRUE, 'func'=>TRUE),
-'cosh'	=> array( 'input'=>'cosh', 'tag'=>'mo', 'output'=>'cosh', 'unary'=>TRUE, 'func'=>TRUE),
-'tanh'	=> array( 'input'=>'tanh', 'tag'=>'mo', 'output'=>'tanh', 'unary'=>TRUE, 'func'=>TRUE),
-'cot'	=> array( 'input'=>'cot','tag'=>'mo', 'output'=>'cot', 'unary'=>TRUE, 'func'=>TRUE),
-'sec'	=> array( 'input'=>'sec', 'tag'=>'mo', 'output'=>'sec', 'unary'=>TRUE, 'func'=>TRUE),
-'csc'	=> array( 'input'=>'csc', 'tag'=>'mo', 'output'=>'csc', 'unary'=>TRUE, 'func'=>TRUE),
-'coth'	=> array( 'input'=>'coth','tag'=>'mo', 'output'=>'coth', 'unary'=>TRUE, 'func'=>TRUE),
-'sech'	=> array( 'input'=>'sech', 'tag'=>'mo', 'output'=>'sech', 'unary'=>TRUE, 'func'=>TRUE),
-'csch'	=> array( 'input'=>'csch', 'tag'=>'mo', 'output'=>'csch', 'unary'=>TRUE, 'func'=>TRUE),
-'log'	=> array( 'input'=>'log', 'tag'=>'mo', 'output'=>'log', 'unary'=>TRUE, 'func'=>TRUE),
-'ln'	=> array( 'input'=>'ln', 'tag'=>'mo', 'output'=>'ln', 'unary'=>TRUE, 'func'=>TRUE),
-'det'	=> array( 'input'=>'det', 'tag'=>'mo', 'output'=>'det', 'unary'=>TRUE, 'func'=>TRUE),
-'dim'	=> array( 'input'=>'dim', 'tag'=>'mo', 'output'=>'dim'),
-'mod'	=> array( 'input'=>'mod', 'tag'=>'mo', 'output'=>'mod'),
-'gcd'	=> array( 'input'=>'gcd', 'tag'=>'mo', 'output'=>'gcd', 'unary'=>TRUE, 'func'=>TRUE),
-'lcm'	=> array( 'input'=>'lcm', 'tag'=>'mo', 'output'=>'lcm', 'unary'=>TRUE, 'func'=>TRUE),
-'lub'	=> array( 'input'=>'lub', 'tag'=>'mo', 'output'=>'lub'), /* 2005-06-11 wes */
-'glb'	=> array( 'input'=>'glb', 'tag'=>'mo', 'output'=>'glb'), /* 2005-06-11 wes */
-'min'	=> array( 'input'=>'min', 'tag'=>'mo', 'output'=>'min', 'underover'=>TRUE), /* 2005-06-11 wes */
-'max'	=> array( 'input'=>'max', 'tag'=>'mo', 'output'=>'max', 'underover'=>TRUE), /* 2005-06-11 wes */
-'f'	=> array( 'input'=>'f','tag'=>'mi', 'output'=>'f', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
-'g'	=> array( 'input'=>'g', 'tag'=>'mi', 'output'=>'g', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
-
-// Arrows
-'uarr'	=> array( 'input'=>'uarr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2191') . ';'),
-'darr'	=> array( 'input'=>'darr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2193') . ';'),
-'rarr'	=> array( 'input'=>'rarr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2192') . ';'),
-'->'	=> array( 'input'=>'->', 'tag'=>'mo', 'output'=>'&#' . hexdec('2192') . ';'),
-'|->'	=> array( 'input'=>'|->', 'tag'=>'mo', 'output'=>'&#' . hexdec('21A6') . ';'), /* 2005-06-11 wes */
-'larr'	=> array( 'input'=>'larr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2190') . ';'),
-'harr'	=> array( 'input'=>'harr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2194') . ';'),
-'rArr'	=> array( 'input'=>'rArr', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D2') . ';'),
-'lArr'	=> array( 'input'=>'lArr', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D0') . ';'),
-'hArr'	=> array( 'input'=>'hArr', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D4') . ';'),
-
-// Commands with argument
-'sqrt'	=> array( 'input'=>'sqrt', 'tag'=>'msqrt', 'output'=>'sqrt', 'unary'=>TRUE ),
-'root'	=> array( 'input'=>'root', 'tag'=>'mroot', 'output'=>'root', 'binary'=>TRUE ),
-'frac'	=> array( 'input'=>'frac', 'tag'=>'mfrac', 'output'=>'/', 'binary'=>TRUE),
-'/'		=> array( 'input'=>'/', 'tag'=>'mfrac', 'output'=>'/', 'infix'=>TRUE),
-'_'		=> array( 'input'=>'_', 'tag'=>'msub', 'output'=>'_', 'infix'=>TRUE),
-'^'		=> array( 'input'=>'^', 'tag'=>'msup', 'output'=>'^', 'infix'=>TRUE),
-'hat'	=> array( 'input'=>'hat', 'tag'=>'mover', 'output'=>'&#' . hexdec('005E') . ';', 'unary'=>TRUE, 'acc'=>TRUE),
-'bar'	=> array( 'input'=>'bar', 'tag'=>'mover', 'output'=>'&#' . hexdec('00AF') . ';', 'unary'=>TRUE, 'acc'=>TRUE),
-'vec'	=> array( 'input'=>'vec', 'tag'=>'mover', 'output'=>'&#' . hexdec('2192') . ';', 'unary'=>TRUE, 'acc'=>TRUE),
-'dot'	=> array( 'input'=>'dot', 'tag'=>'mover', 'output'=>'.', 'unary'=>TRUE, 'acc'=>TRUE),
-'ddot'	=> array( 'input'=>'ddot', 'tag'=>'mover', 'output'=>'..', 'unary'=>TRUE, 'acc'=>TRUE),
-'ul'	=> array( 'input'=>'ul', 'tag'=>'munder', 'output'=>'&#' . hexdec('0332') . ';', 'unary'=>TRUE, 'acc'=>TRUE),
-'avec'	=> array( 'input'=>'avec', 'tag'=>'munder', 'output'=>'~', 'unary'=>TRUE, 'acc'=>TRUE),
-'text'	=> array( 'input'=>'text', 'tag'=>'mtext', 'output'=>'text', 'unary'=>TRUE),
-'mbox'	=> array( 'input'=>'mbox', 'tag'=>'mtext', 'output'=>'mbox', 'unary'=>TRUE),
-'"' => array( 'input'=>'"', 'tag'=>'mtext','output'=>'mbox', 'unary'=>TRUE),
-
-/* 2005-06-05 wes: added stackrel */
-'stackrel' => array( 'input'=>'stackrel', 'tag'=>'mover', 'output'=>'stackrel', 'binary'=>TRUE),
-
-// Grouping brackets
-'('		=> array( 'input'=>'(', 'tag'=>'mo', 'output'=>'(', 'left_bracket'=>TRUE),
-')'		=> array( 'input'=>')', 'tag'=>'mo', 'output'=>')', 'right_bracket'=>TRUE),
-'['		=> array( 'input'=>'[', 'tag'=>'mo', 'output'=>'[', 'left_bracket'=>TRUE),
-']'		=> array( 'input'=>']', 'tag'=>'mo', 'output'=>']', 'right_bracket'=>TRUE),
-'{'		=> array( 'input'=>'{', 'tag'=>'mo', 'output'=>'{', 'left_bracket'=>TRUE),
-'}'		=> array( 'input'=>'}', 'tag'=>'mo', 'output'=>'}', 'right_bracket'=>TRUE),
-'(:'	=> array( 'input'=>'(:', 'tag'=>'mo', 'output'=>'&#' . hexdec('2329') . ';', 'left_bracket'=>TRUE),
-':)'	=> array( 'input'=>':)', 'tag'=>'mo', 'output'=>'&#' . hexdec('232A') . ';', 'right_bracket'=>TRUE),
-'{:'	=> array( 'input'=>'{:', 'tag'=>'mo', 'output'=>'{:', 'left_bracket'=>TRUE, 'invisible'=>TRUE),
-':}'	=> array( 'input'=>':}', 'tag'=>'mo', 'output'=>':}', 'right_bracket'=>TRUE ,'invisible'=>TRUE),
-'<<'	=> array( 'input'=>'<<', 'tag'=>'mo', 'output'=>'&#' . hexdec('2329') . ';', 'left_bracket'=>TRUE), // 2005-06-07 wes
-'>>'	=> array( 'input'=>'>>', 'tag'=>'mo', 'output'=>'&#' . hexdec('232A') . ';', 'right_bracket'=>TRUE) // 2005-06-07 wes
-);
-

Deleted: trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php	2012-11-15 10:29:20 UTC (rev 8468)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php	2012-11-15 10:34:21 UTC (rev 8469)
@@ -1,1118 +0,0 @@
-<?php
-
-/****
- * ASCIIMathPHP and associated classes:
- * -- XMLNode
- * -- MathMLNode extends XMLNode
- *
- * These classes are a PHP port of ASCIIMath
- * Version 1.3 Feb 19 2004, (c) Peter Jipsen http://www.chapman.edu/~jipsen
- *
- * ASCIIMathPHP Version 1.11, 26 April 2006, (c) Kee-Lin Steven Chan (kc...@co...)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License (at http://www.gnu.org/copyleft/gpl.html)
- * for more details.
- *
- * ChangeLog
- *
- * Ver 2.0
- * -- PHP5 only version of ASCIIMathPHP
- *
- * Ver 1.12.1
- * -- Included the missing setCurrExpr() method
- *
- * Ver 1.12
- * -- Added changes that David Lippman <DLi...@pi...> made to bring ASCIIMathPHP up to
- * ASCIIMath 1.4.7 functionality.
- * -- Added parseIntExpr, for intermediate expression parsing rule, allowing x^2/x^3 to render as (x^2)/(x^3)
- * -- Added quotes as another way of designating text; "hello" is equivalent to text(hello)
- * -- Added FUNC designator to allow sin, cos, etc to act as functions, so sin(x)/x renders as {sin(x)}/x
- *
- * Ver 1.11
- * -- Fixed bug that stopped script execution for incomplete expressions
- * -- Changed the algorithm for parsing expressions so that it matches the longest string possible (greedy)
- *
- * Ver 1.10
- * -- Added definition support
- * -- Added stackrel support
- * -- Added a bunch of different symbols etc. >>, << and definitions like dx, dy, dz etc.
- *
- * Ver 1.02
- * -- Fixed bug with mbox and text
- * -- Fixed spacing bug with mbox and text
- *
- * Ver 1.01
- * -- Fixed Bug that did not parse symbols greater than a single character
- * correctly when appearing at end of expression.
- *
- ***/
-
-class XMLNode
-{
-    // Private variables
-    var $_id;
-    var $_name;
-    var $_content;
-    var $_mt_elem_flg;
-    var $_attr_arr;
-    var $_child_arr;
-    var $_nmspc;
-    var $_nmspc_alias;
-    var $_parent_id;
-    var $_parent_node;
-
-    function XMLNode($id = NULL)
-    {
-        $this->_id = isset($id) ? $id : md5(uniqid(rand(),1));
-        $this->_name = '';
-        $this->_content = '';
-        $this->_mt_elem_flg = FALSE;
-        $this->_attr_arr = array();
-        $this->_child_arr = array();
-        $this->_nmspc = '';
-        $this->_nmspc_alias = '';
-        $this->_parent_id = FALSE;
-        $this->_parent_node = NULL;
-    }
-
-    function addChild(&$node)
-    {
-        $this->_child_arr[$node->getId()] = $node;
-        $node->setParentId($this->_id);
-        $node->setParentNode($this);
-    }
-
-    function addChildArr(&$node_arr)
-    {
-        $key_arr = array_keys($node_arr);
-        $num_key = count($key_arr);
-
-        for ($i = 0; $i < $num_key; $i++) {
-            $node = $node_arr[$key_arr[$i]];
-            $this->addChild($node);
-        }
-    }
-
-    function insertChildBefore($idx,&$node)
-    {
-        $key_arr = array_keys($this->_child_arr);
-        $num_key = count($key_arr);
-        $tmp_arr = arry();
-
-        for ($i = 0;$i < $num_key;$i++) {
-            if ($i == $idx) {
-                $tmp_arr[$node->getId()] = $node;
-            }
-            $tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]];
-        }
-        $this->_child_arr = $tmp_arr;
-    }
-
-    function insertChildAfter($idx,&$node)
-    {
-        $key_arr = array_keys($this->_child_arr);
-        $num_key = count($key_arr);
-        $tmp_arr = arry();
-
-        for ($i = 0;$i < $num_key;$i++) {
-            $tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]];
-            if ($i == $idx) {
-                $tmp_arr[$node->getId()] = $node;
-            }
-        }
-        $this->_child_arr = $tmp_arr;
-    }
-
-    function setId($id)
-    {
-        $this->_id = $id;
-    }
-
-    function setName($name)
-    {
-        $this->_name = $name;
-    }
-
-    function setNamepace($nmspc)
-    {
-        $this->_nmspc = $nmspc;
-    }
-
-    function setNamespaceAlias($nmspc_alias)
-    {
-        $this->_nmspc_alias = $nmspc_alias;
-    }
-
-    function setContent($content)
-    {
-        $this->_content = $content;
-    }
-
-    function setEmptyElem($mt_elem_flg)
-    {
-        $this->_mt_elem_flg = $mt_elem_flg;
-    }
-
-    function setAttr($attr_nm,$attr_val)
-    {
-        $this->_attr_arr[$attr_nm] = $attr_val;
-    }
-
-    function setAttrArr($attr_arr)
-    {
-        $this->_attr_arr = $attr_arr;
-    }
-
-    function setParentId($id)
-    {
-        $this->_parent_id = $id;
-    }
-
-    function setParentNode(&$node)
-    {
-        $this->_parent_node = $node;
-    }
-
-    function getId()
-    {
-        return($this->_id);
-    }
-
-    function getName()
-    {
-        return($this->_name);
-    }
-
-    function getNamespace()
-    {
-        return($this->_nmspc);
-    }
-
-    function getNamespaceAlias()
-    {
-        return($this->_nmspc_alias);
-    }
-
-    function getContent()
-    {
-        return($this->_content);
-    }
-
-    function getAttr($attr_nm)
-    {
-        if (isset($this->_attr_arr[$attr_nm])) {
-            return($this->_attr_arr[$attr_nm]);
-        } else {
-            return(NULL);
-        }
-    }
-
-    function getAttrArr()
-    {
-        return($this->_attr_arr);
-    }
-
-    function getParentId()
-    {
-        return($this->parent_id);
-    }
-
-    function getParentNode()
-    {
-        return($this->_parent_node);
-    }
-
-    function getChild($id)
-    {
-        if (isset($this->_child_arr[$id])) {
-            return($this->_child_arr[$id]);
-        } else {
-            return(FALSE);
-        }
-    }
-
-    function getFirstChild()
-    {
-        $id_arr = array_keys($this->_child_arr);
-        $num_child = count($id_arr);
-
-        if ($num_child > 0) {
-            return($this->_child_arr[$id_arr[0]]);
-        } else {
-            return(FALSE);
-        }
-    }
-
-    function getLastChild()
-    {
-        $id_arr = array_keys($this->_child_arr);
-        $num_child = count($id_arr);
-
-        if ($num_child > 0) {
-            return($this->_child_arr[$id_arr[$num_child - 1]]);
-        } else {
-            return(FALSE);
-        }
-    }
-
-    function getChildByIdx($idx)
-    {
-        $id_arr = array_keys($this->_child_arr);
-
-        if (isset($this->_child_arr[$id_arr[$idx]])) {
-            return($this->_child_arr[$id_arr[$idx]]);
-        } else {
-            return(FALSE);
-        }
-    }
-
-    function getNumChild()
-    {
-        return(count($this->_child_arr));
-    }
-
-    function removeChild($id)
-    {
-        unset($this->_child_arr[$id]);
-    }
-
-    function removeChildByIdx($idx)
-    {
-        $key_arr = array_keys($this->_child_arr);
-        unset($this->_child_arr[$key_arr[$idx]]);
-    }
-
-    function removeFirstChild()
-    {
-        $key_arr = array_keys($this->_child_arr);
-        unset($this->_child_arr[$key_arr[0]]);
-    }
-
-    function removeLastChild()
-    {
-        $key_arr = array_keys($this->_child_arr);
-        unset($this->_child_arr[$key_arr[count($key_arr)-1]]);
-    }
-
-    function dumpXML($indent_str = "\t")
-    {
-        $attr_txt = $this->_dumpAttr();
-        $name = $this->_dumpName();
-        $xmlns = $this->_dumpXmlns();
-        $lvl = $this->_getCurrentLevel();
-        $indent = str_pad('',$lvl,$indent_str);
-
-        if ($this->_mt_elem_flg) {
-            $tag = "$indent<$name$xmlns$attr_txt />";
-            return($tag);
-        } else {
-            $key_arr = array_keys($this->_child_arr);
-            $num_child = count($key_arr);
-
-            $tag = "$indent<$name$xmlns$attr_txt>$this->_content";
-
-            for ($i = 0;$i < $num_child;$i++) {
-                $node = $this->_child_arr[$key_arr[$i]];
-
-                $child_txt = $node->dumpXML($indent_str);
-                $tag .= "\n$child_txt";
-            }
-
-            $tag .= ($num_child > 0 ? "\n$indent</$name>" : "</$name>");
-            return($tag);
-        }
-    }
-
-    function _dumpAttr()
-    {
-        $id_arr = array_keys($this->_attr_arr);
-        $id_arr_cnt = count($id_arr);
-        $attr_txt = '';
-
-        for($i = 0;$i < $id_arr_cnt;$i++) {
-            $key = $id_arr[$i];
-            $attr_txt .= " $key=\"{$this->_attr_arr[$key]}\"";
-        }
-
-        return($attr_txt);
-    }
-
-    function _dumpName()
-    {
-        $alias = $this->getNamespaceAlias();
-        if ($alias == '') {
-            return($this->getName());
-        } else {
-            return("$alias:" . $this->getName());
-        }
-    }
-
-    function _dumpXmlns()
-    {
-        $nmspc = $this->getNamespace();
-        $alias = $this->getNamespaceAlias();
-
-        if ($nmspc != '') {
-            if ($alias == '') {
-                return(" xmlns=\"" . $nmspc . "\"");
-            } else {
-                return(" xmlns:$alias=\"" . $nmspc . "\"");
-            }
-        } else {
-            return('');
-        }
-    }
-
-    function _getCurrentLevel()
-    {
-        if ($this->_parent_id === FALSE) {
-            return(0);
-        } else {
-            $node = $this->getParentNode();
-            $lvl = $node->_getCurrentLevel();
-            $lvl++;
-            return($lvl);
-        }
-    }
-}
-
-class MathMLNode extends XMLNode
-{
-    function MathMLNode($id = NULL)
-    {
-        parent::XMLNode($id);
-    }
-
-    function removeBrackets()
-    {
-        if ($this->_name == 'mrow') {
-            if ($c_node_0 = $this->getFirstChild()) {
-                $c_node_0->isLeftBracket() ? $this->removeFirstChild() : 0;
-            }
-
-            if ($c_node_0 = $this->getLastChild()) {
-                $c_node_0->isRightBracket() ? $this->removeLastChild() : 0;
-            }
-        }
-    }
-
-    function isLeftBracket()
-    {
-        switch ($this->_content) {
-            case '{':
-            case '[':
-            case '(':
-                return(TRUE);
-                break;
-        }
-        return(FALSE);
-    }
-
-    function isRightBracket()
-    {
-        switch ($this->_content) {
-            case '}':
-            case ']':
-            case ')':
-                return(TRUE);
-                break;
-        }
-        return(FALSE);
-    }
-}
-
-class ASCIIMathPHP
-{
-    var $_expr;
-    var $_curr_expr;
-    var $_prev_expr;
-    var $_symbol_arr;
-    var $_node_arr;
-    var $_node_cntr;
-
-    function ASCIIMathPHP($symbol_arr,$expr = NULL)
-    {
-        $this->_symbol_arr = $symbol_arr;
-        if (isset($expr)) {
-            $this->setExpr($expr);
-        }
-    }
-
-    /**
-     * Returns an empty node (containing a non-breaking space) 26-Apr-2006
-     *
-     * Used when an expression is incomplete
-     *
-     * @return object
-     *
-     * @access private
-     */
-    function emptyNode()
-    {
-        $tmp_node = $this->createNode();
-        $tmp_node->setName('mn');
-        $tmp_node->setContent('&#' . hexdec('200B') . ';');
-        return $tmp_node;
-    }
-
-    function pushExpr($prefix) // 2005-06-11 wes
-    {
-        $this->_curr_expr = $prefix . $this->_curr_expr;
-    }
-
-    function setExpr($expr)
-    {
-        $this->_expr = $expr;
-        $this->_curr_expr = $expr;
-        $this->_prev_expr = $expr;
-
-        $this->_node_arr = array();
-        $this->_node_cntr = 0;
-    }
-
-    function genMathML($attr_arr = NULL)
-    {
-        // <math> node
-        $node_0 = $this->createNode();
-        $node_0->setName('math');
-        $node_0->setNamepace('http://www.w3.org/1998/Math/MathML');
-
-        // <mstyle> node
-        if (isset($attr_arr)) {
-            $node_1 = $this->createNode();
-            $node_1->setName('mstyle');
-            $node_1->setAttrArr($attr_arr);
-
-            $node_arr = $this->parseExpr();
-
-            $node_1->addChildArr($node_arr);
-            $node_0->addChild($node_1);
-        } else {
-            $node_arr = $this->parseExpr();
-            $node_0->addChildArr($node_arr);
-        }
-
-        return TRUE;
-    }
-
-    /*
-    function  mergeNodeArr(&$node_arr_0,&$node_arr_1)
-    {
-        $key_arr_0 = array_keys($node_arr_0);
-        $key_arr_1 = array_keys($node_arr_1);
-
-        $num_key_0 = count($key_arr_0);
-        $num_key_1 = count($key_arr_1);
-
-        $merge_arr = array();
-
-        for ($i = 0;$i < $num_key_0;$i++) {
-            $merge_arr[$key_arr_0[$i]] = $node_arr_0[$key_arr_0[$i]];
-        }
-
-        for ($j = 0;$j < $num_key_1;$i++) {
-            $merge_arr[$key_arr_1[$i]] = $node_arr_1[$key_arr_1[$i]];
-        }
-
-        return($merge_arr);
-    }
-    */
-
-    //Broken out of parseExpr Sept 7, 2006 David Lippman for
-    //ASCIIMathML 1.4.7 compatibility
-    function  parseIntExpr()
-    {
-        $sym_0 = $this->getSymbol();
-        $node_0 = $this->parseSmplExpr();
-        $sym = $this->getSymbol();
-
-        if (isset($sym['infix']) && $sym['input'] != '/') {
-            $this->chopExpr($sym['symlen']);
-            $node_1 = $this->parseSmplExpr();
-
-            if ($node_1 === FALSE) { //show box in place of missing argument
-                $node_1 = $this->emptyNode();//??
-            } else {
-                $node_1->removeBrackets();
-            }
-
-            // If 'sub' -- subscript
-            if ($sym['input'] == '_') {
-
-                $sym_1 = $this->getSymbol();
-
-                // If 'sup' -- superscript
-                if ($sym_1['input'] == '^') {
-                    $this->chopExpr($sym_1['symlen']);
-                    $node_2 = $this->parseSmplExpr();
-                    $node_2->removeBrackets();
-
-                    $node_3 = $this->createNode();
-                    $node_3->setName(isset($sym_0['underover']) ? 'munderover' : 'msubsup');
-                    $node_3->addChild($node_0);
-                    $node_3->addChild($node_1);
-                    $node_3->addChild($node_2);
-
-                    $node_4 = $this->createNode();
-                    $node_4->setName('mrow');
-                    $node_4->addChild($node_3);
-
-                    return $node_4;
-                } else {
-                    $node_2 = $this->createNode();
-                    $node_2->setName(isset($sym_0['underover']) ? 'munder' : 'msub');
-                    $node_2->addChild($node_0);
-                    $node_2->addChild($node_1);
-
-                    return $node_2;
-                }
-            } else {
-                $node_2 = $this->createNode();
-                $node_2->setName($sym['tag']);
-                $node_2->addChild($node_0);
-                $node_2->addChild($node_1);
-
-                return($node_2);
-            }
-        } elseif ($node_0 !== FALSE) {
-            return($node_0);
-        } else {
-            return $this->emptyNode();
-        }
-
-    }
-
-    function  parseExpr()
-    {
-        // Child/Fragment array
-        $node_arr = array();
-
-        // Deal whole expressions like 'ax + by + c = 0' etc.
-        do {
-            $sym_0 = $this->getSymbol();
-            $node_0 = $this->parseIntExpr();
-            $sym = $this->getSymbol();
-            // var_dump($sym);
-
-            if (isset($sym['infix']) && $sym['input'] == '/') {
-                $this->chopExpr($sym['symlen']);
-                $node_1 = $this->parseIntExpr();
-
-                if ($node_1 === FALSE) { //should show box in place of missing argument
-                    $node_1 = $this->emptyNode();
-                    continue;
-                }
-
-                $node_1->removeBrackets();
-
-                // If 'div' -- divide
-                $node_0->removeBrackets();
-                $node_2 = $this->createNode();
-                $node_2->setName($sym['tag']);
-                $node_2->addChild($node_0);
-                $node_2->addChild($node_1);
-                $node_arr[$node_2->getId()] = $node_2;
-
-            } elseif ($node_0 !== FALSE) {
-                $node_arr[$node_0->getId()] = $node_0;
-            }
-        } while (!isset($sym['right_bracket']) && $sym !== FALSE && $sym['output'] != '');
-
-        //var_dump($sym);
-        // Possibly to deal with matrices
-        if (isset($sym['right_bracket'])) {
-            $node_cnt = count($node_arr);
-            $key_node_arr = array_keys($node_arr);
-
-            if ($node_cnt > 1) {
-                $node_5 = $node_arr[$key_node_arr[$node_cnt-1]];
-                $node_6 = $node_arr[$key_node_arr[$node_cnt-2]];
-            } else {
-                $node_5 = FALSE;
-                $node_6 = FALSE;
-            }
-
-            // Dealing with matrices
-            if ($node_5 !== FALSE && $node_6 !== FALSE &&
-                $node_cnt > 1 &&
-                $node_5->getName() == 'mrow' &&
-                $node_6->getName() == 'mo' &&
-                $node_6->getContent() == ',') {
-
-                // Checking if Node 5 has a LastChild
-                if ($node_7 = $node_5->getLastChild()) {
-                    $node_7_cntnt = $node_7->getContent();
-                } else {
-                    $node_7_cntnt = FALSE;
-                }
-
-                // If there is a right bracket
-                if ($node_7 !== FALSE && ($node_7_cntnt == ']' || $node_7_cntnt == ')')) {
-
-                    // Checking if Node 5 has a firstChild
-                    if ($node_8 = $node_5->getFirstChild()) {
-                        $node_8_cntnt = $node_8->getContent();
-                    } else {
-                        $node_8_cntnt = FALSE;
-                    }
-
-                    // If there is a matching left bracket
-                    if ($node_8 !== FALSE &&
-                        (($node_8_cntnt == '(' && $node_7_cntnt == ')' && $sym['output'] != '}') ||
-                        ($node_8_cntnt == '[' && $node_7_cntnt == ']'))) {
-
-                        $is_mtrx_flg = TRUE;
-                        $comma_pos_arr = array();
-
-                        $i = 0;
-
-                        while ($i < $node_cnt && $is_mtrx_flg) {
-                            $tmp_node = $node_arr[$key_node_arr[$i]];
-
-                            if($tmp_node_first = $tmp_node->getFirstChild()) {
-                                $tnfc = $tmp_node_first->getContent();
-                            } else {
-                                $tnfc = FALSE;
-                            }
-
-                            if($tmp_node_last = $tmp_node->getLastChild()) {
-                                $tnlc = $tmp_node_last->getContent();
-                            } else {
-                                $tnlc = FALSE;
-                            }
-
-                            if (isset($key_node_arr[$i+1])) {
-                                $next_tmp_node = $node_arr[$key_node_arr[$i+1]];
-                                $ntnn = $next_tmp_node->getName();
-                                $ntnc = $next_tmp_node->getContent();
-                            } else {
-                                $ntnn = FALSE;
-                                $ntnc = FALSE;
-                            }
-
-                            // Checking each node in node array for matrix criteria
-                            if ($is_mtrx_flg) {
-                                $is_mtrx_flg = $tmp_node->getName() == 'mrow' &&
-                                    ($i == $node_cnt-1 || $ntnn == 'mo' && $ntnc == ',') &&
-                                    $tnfc == $node_8_cntnt && $tnlc == $node_7_cntnt;
-                            }
-
-                            if ($is_mtrx_flg) {
-                                for ($j = 0;$j < $tmp_node->getNumChild();$j++) {
-                                    $tmp_c_node = $tmp_node->getChildByIdx($j);
-
-                                    if ($tmp_c_node->getContent() == ',') {
-                                        $comma_pos_arr[$i][] = $j;
-                                    }
-                                }
-                            }
-
-                            if ($is_mtrx_flg && $i > 1) {
-
-                                $cnt_cpan = isset($comma_pos_arr[$i]) ? count($comma_pos_arr[$i]) : NULL;
-                                $cnt_cpap = isset($comma_pos_arr[$i-2]) ? count($comma_pos_arr[$i-2]) : NULL;
-                                $is_mtrx_flg = $cnt_cpan == $cnt_cpap;
-                            }
-
-                            $i += 2;
-                        }
-
-                        // If the node passes the matrix tests
-                        if ($is_mtrx_flg) {
-                            $tab_node_arr = array();
-
-                            for ($i = 0;$i < $node_cnt;$i += 2) {
-                                $tmp_key_node_arr = array_keys($node_arr);
-                                if (!($tmp_node = $node_arr[$tmp_key_node_arr[0]])) {
-                                    break;
-                                }
-                                $num_child = $tmp_node->getNumChild();
-                                $k = 0;
-
-                                $tmp_node->removeFirstChild();
-
-                                $row_node_arr = array();
-                                $row_frag_node_arr = array();
-
-                                for ($j = 1;$j < ($num_child-1);$j++) {
-                                    if (isset($comma_pos_arr[$i][$k]) &&
-                                        $j == $comma_pos_arr[$i][$k]) {
-
-                                        $tmp_node->removeFirstChild();
-
-                                        $tmp_c_node = $this->createNode();
-                                        $tmp_c_node->setName('mtd');
-                                        $tmp_c_node->addChildArr($row_frag_node_arr);
-                                        $row_frag_node_arr = array();
-
-                                        $row_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
-
-                                        $k++;
-                                    } else {
-
-                                        if ($tmp_c_node = $tmp_node->getFirstChild()) {
-                                            $row_frag_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
-                                            $tmp_node->removeFirstChild();
-                                        }
-                                    }
-                                }
-
-                                $tmp_c_node = $this->createNode();
-                                $tmp_c_node->setName('mtd');
-                                $tmp_c_node->addChildArr($row_frag_node_arr);
-
-                                $row_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
-
-                                if (count($node_arr) > 2) {
-                                    $tmp_key_node_arr = array_keys($node_arr);
-                                    unset($node_arr[$tmp_key_node_arr[0]]);
-                                    unset($node_arr[$tmp_key_node_arr[1]]);
-                                }
-
-                                $tmp_c_node = $this->createNode();
-                                $tmp_c_node->setName('mtr');
-                                $tmp_c_node->addChildArr($row_node_arr);
-
-                                $tab_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
-                            }
-
-                            $tmp_c_node = $this->createNode();
-                            $tmp_c_node->setName('mtable');
-                            $tmp_c_node->addChildArr($tab_node_arr);
-
-                            if (isset($sym['invisible'])) {
-                                $tmp_c_node->setAttr('columnalign','left');
-                            }
-
-                            $key_node_arr = array_keys($node_arr);
-                            $tmp_c_node->setId($key_node_arr[0]);
-
-                            $node_arr[$tmp_c_node->getId()] = $tmp_c_node;
-                        }
-                    }
-                }
-            }
-
-            $this->chopExpr($sym['symlen']);
-            if (!isset($sym['invisible'])) {
-                $node_7 = $this->createNode();
-                $node_7->setName('mo');
-                $node_7->setContent($sym['output']);
-                $node_arr[$node_7->getId()] = $node_7;
-            }
-        }
-
-        return($node_arr);
-    }
-
-    function  parseSmplExpr()
-    {
-        $sym = $this->getSymbol();
-
-        if (!$sym || isset($sym['right_bracket'])) //return FALSE;
-            return $this->emptyNode();
-
-        $this->chopExpr($sym['symlen']);
-
-        // 2005-06-11 wes: add definition type support
-        if(isset($sym['definition'])) {
-            $this->pushExpr($sym['output']);
-            $sym = $this->getSymbol();
-            $this->chopExpr($sym['symlen']);
-        }
-
-        if (isset($sym['left_bracket'])) {
-            $node_arr = $this->parseExpr();
-
-            if (isset($sym['invisible'])) {
-                $node_0 = $this->createNode();
-                $node_0->setName('mrow');
-                $node_0->addChildArr($node_arr);
-
-                return($node_0);
-            } else {
-                $node_0 = $this->createNode();
-                $node_0->setName('mo');
-                $node_0->setContent($sym['output']);
-
-                $node_1 = $this->createNode();
-                $node_1->setName('mrow');
-                $node_1->addChild($node_0);
-                $node_1->addChildArr($node_arr);
-
-                return($node_1);
-            }
-        } elseif (isset($sym['unary'])) {
-
-            if ($sym['input'] == 'sqrt') {
-                $node_0 = $this->parseSmplExpr();
-                $node_0->removeBrackets();
-
-                $node_1 = $this->createNode();
-                $node_1->setName($sym['tag']);
-                $node_1->addChild($node_0);
-
-                return($node_1);
-            } elseif (isset($sym['func'])) { //added 2006-9-7 David Lippman
-                $expr = ltrim($this->getCurrExpr());
-                $st = $expr{0};
-                $node_0 = $this->parseSmplExpr();
-                //$node_0->removeBrackets();
-                if ($st=='^' || $st == '_' || $st=='/' || $st=='|' || $st==',') {
-                    $node_1 = $this->createNode();
-                    $node_1->setName($sym['tag']);
-                    $node_1->setContent($sym['output']);
-                    $this->setCurrExpr($expr);
-                    return($node_1);
-                } else {
-                    $node_1 = $this->createNode();
-                    $node_1->setName('mrow');
-                    $node_2 = $this->createNode();
-                    $node_2->setName($sym['tag']);
-                    $node_2->setContent($sym['output']);
-                    $node_1->addChild($node_2);
-                    $node_1->addChild($node_0);
-                    return($node_1);
-                }
-            } elseif ($sym['input'] == 'text' || $sym['input'] == 'mbox' || $sym['input'] == '"') {
-                $expr = ltrim($this->getCurrExpr());
-                if ($sym['input']=='"') {
-                    $end_brckt = '"';
-                    $txt = substr($expr,0,strpos($expr,$end_brckt));
-                } else {
-                    switch($expr{0}) {
-                        case '(':
-                            $end_brckt = ')';
-                            break;
-                        case '[':
-                            $end_brckt = ']';
-                            break;
-                        case '{':
-                            $end_brckt = '}';
-                            break;
-                        default:
-                            $end_brckt = chr(11); // A character that will never be matched.
-                            break;
-                    }
-                    $txt = substr($expr,1,strpos($expr,$end_brckt)-1);
-                }
-
-                //$txt = substr($expr,1,strpos($expr,$end_brckt)-1);
-                $len = strlen($txt);
-
-                $node_0 = $this->createNode();
-                $node_0->setName('mrow');
-
-                if ($len > 0) {
-                    if ($txt{0} == " ") {
-                        $node_1 = $this->createNode();
-                        $node_1->setName('mspace');
-                        $node_1->setAttr('width','1ex');
-
-                        $node_0->addChild($node_1);
-                    }
-
-                    $node_3 = $this->createNode();
-                    $node_3->setName($sym['tag']);
-                    $node_3->setContent(trim($txt));
-
-                    $node_0->addChild($node_3);
-
-                    if ($len > 1 && $txt{$len-1} == " ") {
-                        $node_2 = $this->createNode();
-                        $node_2->setName('mspace');
-                        $node_2->setAttr('width','1ex');
-
-                        $node_0->addChild($node_2);
-                    }
-
-                    $this->chopExpr($len+2);
-                }
-                return($node_0);
-
-            } elseif (isset($sym['acc'])) {
-                $node_0 = $this->parseSmplExpr();
-                $node_0->removeBrackets();
-
-                $node_1 = $this->createNode();
-                $node_1->setName($sym['tag']);
-                $node_1->addChild($node_0);
-
-                $node_2 = $this->createNode();
-                $node_2->setName('mo');
-                $node_2->setContent($sym['output']);
-
-                $node_1->addChild($node_2);
-                return($node_1);
-            } else {
-                // Font change commands -- to complete
-            }
-        } elseif (isset($sym['binary'])) {
-            $node_arr = array();
-
-            $node_0 = $this->parseSmplExpr();
-            $node_0->removeBrackets();
-
-            $node_1 = $this->parseSmplExpr();
-            $node_1->removeBrackets();
-
-            /* 2005-06-05 wes: added stackrel */
-            if ($sym['input'] == 'root' || $sym['input'] == 'stackrel') {
-                $node_arr[$node_1->getId()] = $node_1;
-                $node_arr[$node_0->getId()] = $node_0;
-            } elseif ($sym['input'] == 'frac') {
-                $node_arr[$node_0->getId()] = $node_0;
-                $node_arr[$node_1->getId()] = $node_1;
-            }
-
-            $node_2 = $this->createNode();
-            $node_2->setName($sym['tag']);
-            $node_2->addChildArr($node_arr);
-
-            return($node_2);
-        } elseif (isset($sym['infix'])) {
-            $node_0 = $this->createNode();
-            $node_0->setName('mo');
-            $node_0->setContent($sym['output']);
-
-            return($node_0);
-        } elseif (isset($sym['space'])) {
-            $node_0 = $this->createNode();
-            $node_0->setName('mrow');
-
-            $node_1 = $this->createNode();
-            $node_1->setName('mspace');
-            $node_1->setAttr('width',$sym['space']);
-
-            $node_2 = $this->createNode();
-            $node_2->setName($sym['tag']);
-            $node_2->setContent($sym['output']);
-
-            $node_3 = $this->createNode();
-            $node_3->setName('mspace');
-            $node_3->setAttr('width',$sym['space']);
-
-            $node_0->addChild($node_1);
-            $node_0->addChild($node_2);
-            $node_0->addChild($node_3);
-
-            return($node_0);
-        } else {
-
-            // A constant
-            $node_0 = $this->createNode();
-            $node_0->setName($sym['tag']);
-            $node_0->setContent($sym['output']);
-            return($node_0);
-        }
-
-        // Return an empty node
-        return $this->emptyNode();
-    }
-
-    function getMathML()
-    {
-        $root = $this->_node_arr[0];
-        return($root->dumpXML());
-    }
-
-    function getCurrExpr()
-    {
-        return($this->_curr_expr);
-    }
-
-    function setCurrExpr($str)
-    {
-        $this->_curr_expr = $str;
-    }
-
-    function getExpr()
-    {
-        return($this->_expr);
-    }
-
-    function getPrevExpr()
-    {
-        return($this->_prev_expr);
-    }
-
-    function  createNode()
-    {
-        $node = new MathMLNode($this->_node_cntr);
-        // $node->setNamespaceAlias('m');
-        $this->_node_arr[$this->_node_cntr] = $node;
-        $this->_node_cntr++;
-        return($node);
-    }
-
-    /**
-     * Gets the largest symbol in the expression (greedy). Changed from non-greedy 26-Apr-2006
-     *
-     * @parameter boolean[optional] Chop original string?
-     *
-     * @return mixed
-     *
-     * @access private
-     */
-    function getSymbol($chop_flg = FALSE)
-    {
-        // Implemented a reverse symbol matcher.
-        // Instead of going front to back, it goes back to front. Steven 26-Apr-2006
-        $chr_cnt = strlen($this->_curr_expr);
-
-        if ($chr_cnt == 0) return FALSE;
-
-        for ($i = $chr_cnt; $i > 0; $i--) {
-            $sym_0 = substr($this->_curr_expr,0,$i);
-
-            // Reading string for numeric values
-            if (is_numeric($sym_0)) {
-
-                if ($chop_flg) $this->chopExpr($i);
-                return array('input'=>$sym_0, 'tag'=>'mn', 'output'=>$sym_0, 'symlen'=>$i);
-
-            } elseif (isset($this->_symbol_arr[$sym_0])) {
-
-                if ($chop_flg) $this->chopExpr($i);
-                $sym_arr = $this->_symbol_arr[$sym_0];
-                $sym_arr['symlen'] = $i;
-                return $sym_arr;
-            }
-        }
-
-        // Reading string for alphabetic constants and the minus sign
-        $char = $this->_curr_expr{0};
-        $len_left = $chop_flg ? $this->chopExpr(1) : strlen($this->_curr_expr)-1;
-
-        // Deals with expressions of length 1
-        if ($len_left == 0 && isset($this->_symbol_arr[$char])) {
-            $sym_arr = $this->_symbol_arr[$char];
-            $sym_arr['symlen'] = 1;
-            return $sym_arr;
-        } else {
-            $tag = preg_match('/[a-z]/i',$char) ? 'mi' : 'mo';
-            return array('input'=>$char, 'tag'=>$tag, 'output'=>$char, 'symlen'=>1);
-        }
-    }
-
-    function chopExpr($strlen)
-    {
-        $this->_prev_expr = $this->_curr_expr;
-
-        if ($strlen == strlen($this->_curr_expr)) {
-            $this->_curr_expr = '';
-            return(0);
-        } else {
-            $this->_curr_expr = ltrim(substr($this->_curr_expr,$strlen));
-            return(strlen($this->_curr_expr));
-        }
-    }
-}

Deleted: trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php	2012-11-15 10:29:20 UTC (rev 8468)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php	2012-11-15 10:34:21 UTC (rev 8469)
@@ -1,217 +0,0 @@
-<?php
-
-$symbol_arr = array(
-
-// Greek symbols
-'alpha'    => array( 'input'=>'alpha','tag'=>'mi', 'output'=>'&#' . hexdec('03B1') . ';'),
-'beta'    => array( 'input'=>'beta','tag'=>'mi', 'output'=>'&#' . hexdec('03B2') . ';'),
-'chi'    => array( 'input'=>'chi','tag'=>'mi', 'output'=>'&#' . hexdec('03C7') . ';'),
-'delta'    => array( 'input'=>'delta','tag'=>'mi', 'output'=>'&#' . hexdec('03B4') . ';'),
-'Delta'    => array( 'input'=>'Delta','tag'=>'mo', 'output'=>'&#' . hexdec('0394') . ';'),
-'epsi'    => array( 'input'=>'epsi','tag'=>'mi', 'output'=>'&#' . hexdec('03B5') . ';'),
-'varepsilon'    => array( 'input'=>'varepsilon','tag'=>'mi', 'output'=>'&#' . hexdec('025B') . ';'),
-'eta'    => array( 'input'=>'eta','tag'=>'mi', 'output'=>'&#' . hexdec('03B7') . ';'),
-'gamma'    => array( 'input'=>'gamma','tag'=>'mi', 'output'=>'&#' . hexdec('03B3') . ';'),
-'Gamma'    => array( 'input'=>'Gamma','tag'=>'mi', 'output'=>'&#' . hexdec('0393') . ';'),
-'iota'    => array( 'input'=>'iota','tag'=>'mi', 'output'=>'&#' . hexdec('03B9') . ';'),
-'kappa'    => array( 'input'=>'kappa','tag'=>'mi', 'output'=>'&#' . hexdec('03BA') . ';'),
-'lambda'    => array( 'input'=>'lambda','tag'=>'mi', 'output'=>'&#' . hexdec('03BB') . ';'),
-'Lambda'    => array( 'input'=>'Lambda','tag'=>'mo', 'output'=>'&#' . hexdec('039B') . ';'),
-'mu'    => array( 'input'=>'mu','tag'=>'mi', 'output'=>'&#' . hexdec('03BC') . ';'),
-'nu'    => array( 'input'=>'nu','tag'=>'mi', 'output'=>'&#' . hexdec('03BD') . ';'),
-'omega'    => array( 'input'=>'omega','tag'=>'mi', 'output'=>'&#' . hexdec('03C9') . ';'),
-'Omega'    => array( 'input'=>'Omega','tag'=>'mo', 'output'=>'&#' . hexdec('03A9') . ';'),
-'phi'    => array( 'input'=>'phi','tag'=>'mi', 'output'=>'&#' . hexdec('03C6') . ';'),
-'varphi'    => array( 'input'=>'varphi','tag'=>'mi', 'output'=>'&#' . hexdec('03D5') . ';'),
-'Phi'    => array( 'input'=>'Phi','tag'=>'mo', 'output'=>'&#' . hexdec('03A6') . ';'),
-'pi'    => array( 'input'=>'pi','tag'=>'mi', 'output'=>'&#' . hexdec('03C0') . ';'),
-'Pi'    => array( 'input'=>'Pi','tag'=>'mo', 'output'=>'&#' . hexdec('03A0') . ';'),
-'psi'    => array( 'input'=>'psi','tag'=>'mi', 'output'=>'&#' . hexdec('03C8') . ';'),
-'rho'    => array( 'input'=>'rho','tag'=>'mi', 'output'=>'&#' . hexdec('03C1') . ';'),
-'sigma'    => array( 'input'=>'sigma','tag'=>'mi', 'output'=>'&#' . hexdec('03C3') . ';'),
-'Sigma'    => array( 'input'=>'Sigma','tag'=>'mo', 'output'=>'&#' . hexdec('03A3') . ';'),
-'tau'    => array( 'input'=>'tau','tag'=>'mi', 'output'=>'&#' . hexdec('03C4') . ';'),
-'theta'    => array( 'input'=>'theta','tag'=>'mi', 'output'=>'&#' . hexdec('03B8') . ';'),
-'vartheta'    => array( 'input'=>'vartheta','tag'=>'mi', 'output'=>'&#' . hexdec('03D1') . ';'),
-'Theta'    => array( 'input'=>'Theta','tag'=>'mo', 'output'=>'&#' . hexdec('0398') . ';'),
-'upsilon'    => array( 'input'=>'upsilon','tag'=>'mi', 'output'=>'&#' . hexdec('03C5') . ';'),
-'xi'    => array( 'input'=>'xi','tag'=>'mi', 'output'=>'&#' . hexdec('03BE') . ';'),
-'Xi'    => array( 'input'=>'alpha','tag'=>'mo', 'output'=>'&#' . hexdec('039E') . ';'),
-'zeta'    => array( 'input'=>'zeta','tag'=>'mi', 'output'=>'&#' . hexdec('03B6') . ';'),
-
-// Binary operation symbols
-'*'        => array( 'input'=>'*','tag'=>'mo', 'output'=>'&#' . hexdec('22C5') . ';'),
-'**'    => array( 'input'=>'**','tag'=>'mo', 'output'=>'&#' . hexdec('22C6') . ';'),
-'//'    => array( 'input'=>'//','tag'=>'mo', 'output'=>'/'),
-'\\\\'    => array( 'input'=>'\\\\','tag'=>'mo', 'output'=>'\\'),
-'xx'    => array( 'input'=>'xx','tag'=>'mo', 'output'=>'&#' . hexdec('00D7') . ';'),
-'-:'    => array( 'input'=>'-:','tag'=>'mo', 'output'=>'&#' . hexdec('00F7') . ';'),
-'@'        => array( 'input'=>'@','tag'=>'mo', 'output'=>'&#' . hexdec('2218') . ';'),
-'o+'    => array( 'input'=>'o+','tag'=>'mo', 'output'=>'&#' . hexdec('2295') . ';'),
-'ox'    => array( 'input'=>'ox','tag'=>'mo', 'output'=>'&#' . hexdec('2297') . ';'),
-'sum'    => array( 'input'=>'sum','tag'=>'mo', 'output'=>'&#' . hexdec('2211') . ';', 'underover'=>TRUE),
-'prod'    => array( 'input'=>'prod','tag'=>'mo', 'output'=>'&#' . hexdec('220F') . ';', 'underover'=>TRUE),
-'^^'    => array( 'input'=>'^^','tag'=>'mo', 'output'=>'&#' . hexdec('2227') . ';'),
-'^^^'    => array( 'input'=>'^^^','tag'=>'mo', 'output'=>'&#' . hexdec('22C0') . ';', 'underover'=>TRUE),
-'vv'    => array( 'input'=>'vv','tag'=>'mo', 'output'=>'&#' . hexdec('2228') . ';'),
-'vvv'    => array( 'input'=>'vvv','tag'=>'mo', 'output'=>'&#' . hexdec('22C1') . ';', 'underover'=>TRUE),
-'nn'    => array( 'input'=>'nn','tag'=>'mo', 'output'=>'&#' . hexdec('2229') . ';'),
-'nnn'    => array( 'input'=>'nnn','tag'=>'mo', 'output'=>'&#' . hexdec('22C5') . ';', 'underover'=>TRUE),
-'uu'    => array( 'input'=>'uu','tag'=>'mo', 'output'=>'&#' . hexdec('222A') . ';'),
-'uuu'    => array( 'input'=>'uuu','tag'=>'mo', 'output'=>'&#' . hexdec('22C3') . ';', 'underover'=>TRUE),
-
-// Binary relation symbols
-'!='    => array( 'input'=>'!=','tag'=>'mo', 'output'=>'&#' . hexdec('2260') . ';'),
-':='    => array( 'input'=>':=','tag'=>'mo', 'output'=>':=' ),                 /* 2005-06-05 wes */
-'<'        => array( 'input'=>'<','tag'=>'mo', 'output'=>'&lt;'),
-'lt'    => array( 'input'=>'lt','tag'=>'mo', 'output'=>'&lt;'),             /* 2005-06-05 wes */
-'<='    => array( 'input'=>'<=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
-'lt='    => array( 'input'=>'lt=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
-'le'    => array( 'input'=>'le','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),     /* 2005-06-05 wes */
-'>'        => array( 'input'=>'>','tag'=>'mo', 'output'=>'&gt;'),
-'>='    => array( 'input'=>'>=','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
-'qeq'    => array( 'input'=>'geq','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
-'-<'    => array( 'input'=>'-<','tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'),
-'-lt'    => array( 'input'=>'-lt','tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'),
-'>-'    => array( 'input'=>'>-','tag'=>'mo', 'output'=>'&#' . hexdec('227B') . ';'),
-'in'    => array( 'input'=>'in','tag'=>'mo', 'output'=>'&#' . hexdec('2208') . ';'),
-'!in'    => array( 'input'=>'!in','tag'=>'mo', 'output'=>'&#' . hexdec('2209') . ';'),
-'sub'    => array( 'input'=>'sub','tag'=>'mo', 'output'=>'&#' . hexdec('2282') . ';'),
-'sup'    => array( 'input'=>'sup','tag'=>'mo', 'output'=>'&#' . hexdec('2283') . ';'),
-'sube'    => array( 'input'=>'sube','tag'=>'mo', 'output'=>'&#' . hexdec('2286') . ';'),
-'supe'    => ...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[8468] trunk/INSTALL

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

Revision: 8468
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8468&view=rev
Author:   vargenau
Date:     2012-11-15 10:29:20 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
PHP 4 is dead

Modified Paths:
--------------
    trunk/INSTALL

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2012-11-15 09:26:01 UTC (rev 8467)
+++ trunk/INSTALL	2012-11-15 10:29:20 UTC (rev 8468)
@@ -1,12 +1,9 @@
 REQUIREMENTS
 
-PhpWiki requires a web server with at least PHP version 4.3.9 
-(Red Hat Enterprise Linux ES release 4).
-PhpWiki was tested with 4.4.7 (centos4), 4.3.9, 4.3.10, 4.4.9, 5.0.3,
-5.1.6 (centos5), 5.2.10, 5.2.17, 5.3.2, 5.3.3, 5.3.6, 5.3.8.
+PhpWiki 1.4.0 requires a web server with at least PHP version 5.2.
 
 All users of PHP are strongly encouraged to upgrade to
-PHP 5.3.8 (Current stable) this is the supported version
+PHP 5.3.18 (Current stable) this is the supported version
 or if not possible to PHP 5.2.17 (Old stable).
 
 Visit <http://www.php.net> and <http://php.net/downloads.php> 

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

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

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

Revision: 8467
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8467&view=rev
Author:   vargenau
Date:     2012-11-15 09:26:01 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
Define function __

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

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2012-11-14 18:15:33 UTC (rev 8466)
+++ trunk/lib/IniConfig.php	2012-11-15 09:26:01 UTC (rev 8467)
@@ -1013,7 +1013,7 @@
     if (!defined('WIKI_NAME'))
         define('WIKI_NAME', _("An unnamed PhpWiki"));
     if (!defined('HOME_PAGE'))
-        define('HOME_PAGE', _("HomePage"));
+        define('HOME_PAGE', __("HomePage"));
 
     //////////////////////////////////////////////////////////////////
     // Autodetect URL settings:
@@ -1151,6 +1151,21 @@
 
 }
 
+/*
+ * We have to handle three languages:
+ * 1) English, the language of the source code
+ * 2) The language in which the wiki was created (DEFAULT_LANGUAGE)
+ * 3) The language selected by the user, in which the wiki is displayed (LANG)
+ *
+ * The function "_" translates from English to LANG.
+ * The function "__" translates from English to DEFAULT_LANGUAGE.
+ */
+
+function __($text)
+{
+    return $text;
+}
+
 // Local Variables:
 // mode: php
 // tab-width: 8

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8466] trunk/pgsrc/PhpWikiAdministration%2FDeleteAcl

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

Revision: 8466
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8466&view=rev
Author:   vargenau
Date:     2012-11-14 18:15:33 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Add pgsrc/PhpWikiAdministration%2FDeleteAcl

Added Paths:
-----------
    trunk/pgsrc/PhpWikiAdministration%2FDeleteAcl

Added: trunk/pgsrc/PhpWikiAdministration%2FDeleteAcl
===================================================================
--- trunk/pgsrc/PhpWikiAdministration%2FDeleteAcl	                        (rev 0)
+++ trunk/pgsrc/PhpWikiAdministration%2FDeleteAcl	2012-11-14 18:15:33 UTC (rev 8466)
@@ -0,0 +1,14 @@
+Date: Fri, 10 Sep 2010 13:46:13 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+X-Rcs-Id: $Id: PhpWikiAdministration%2FDeleteAcl 7682 2010-09-10 12:03:36Z vargenau $
+Content-Type: application/x-phpwiki;
+  pagename=PhpWikiAdministration%2FDeleteAcl;
+  flags=PAGE_LOCKED;
+  markup=2;
+  charset=UTF-8
+Content-Transfer-Encoding: binary
+
+<<WikiAdminDeleteAcl>>
+
+----
+[[CategoryActionPage]]

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

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

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

Revision: 8465
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8465&view=rev
Author:   vargenau
Date:     2012-11-14 18:09:15 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Use __ for translation

Modified Paths:
--------------
    trunk/lib/PageType.php
    trunk/lib/display.php
    trunk/lib/loadsave.php
    trunk/lib/main.php
    trunk/lib/plugin/InterWikiSearch.php
    trunk/lib/plugin/WantedPages.php
    trunk/lib/plugin/WantedPagesOld.php
    trunk/themes/fusionforge/templates/actionbar.tmpl
    trunk/themes/fusionforge/templates/blogform.tmpl
    trunk/themes/fusionforge/templates/navbar.tmpl

Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/PageType.php	2012-11-14 18:09:15 UTC (rev 8465)
@@ -160,7 +160,7 @@
     {
         if (!$pagetext) {
             $dbi = $GLOBALS['request']->getDbh();
-            $page = $dbi->getPage(_("InterWikiMap"));
+            $page = $dbi->getPage(__("InterWikiMap"));
             if ($page->get('locked')) {
                 $current = $page->getCurrentRevision();
                 $pagetext = $current->getPackedContent();

Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/display.php	2012-11-14 18:09:15 UTC (rev 8465)
@@ -276,14 +276,14 @@
             $first_pages .= $p . SUBPAGE_SEPARATOR;
         }
         $backlink = HTML::a(array('href' => WikiURL($pagename,
-                array('action' => _("BackLinks"))),
+                array('action' => __("BackLinks"))),
                 'class' => 'backlinks'),
             $WikiTheme->maybeSplitWikiWord($last_page));
         $backlink->addTooltip(sprintf(_("BackLinks for %s"), $pagename));
         $pageheader->pushContent($backlink);
     } else {
         $pageheader = HTML::a(array('href' => WikiURL($pagename,
-                array('action' => _("BackLinks"))),
+                array('action' => __("BackLinks"))),
                 'class' => 'backlinks'),
             $WikiTheme->maybeSplitWikiWord($pagename));
         $pageheader->addTooltip(sprintf(_("BackLinks for %s"), $pagename));

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/loadsave.php	2012-11-14 18:09:15 UTC (rev 8465)
@@ -918,7 +918,7 @@
     $pagename = $pagename_check->getName();
     $content = $pageinfo['content'];
 
-    if ($pagename == _("InterWikiMap"))
+    if ($pagename == __("InterWikiMap"))
         $content = _tryinsertInterWikiMap($content);
 
     $dbi =& $request->_dbi;
@@ -1554,7 +1554,7 @@
         }
     }
 
-    $pagename = _("InterWikiMap");
+    $pagename = __("InterWikiMap");
     $map = $dbi->getPage($pagename);
     $map->set('locked', true);
     PrintXML(HTML::p(HTML::em(WikiLink($pagename)), HTML::strong(" locked")));

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/main.php	2012-11-14 18:09:15 UTC (rev 8465)
@@ -1035,6 +1035,9 @@
         static $cache;
         if (!$action) return false;
 
+        if (isActionPage($action))
+            return $cache[$action] = $action;
+
         // check for translated version, as per users preferred language
         // (or system default in case it is not en)
         $translation = gettext($action);
@@ -1095,7 +1098,7 @@
 
     function adminActionSubpage($subpage)
     {
-        $page = _("PhpWikiAdministration") . "/" . $subpage;
+        $page = __("PhpWikiAdministration") . "/" . $subpage;
         $action = $this->findActionPage($page);
         if ($action) {
             if (!$this->getArg('s'))
@@ -1117,27 +1120,27 @@
 
     function action_chown()
     {
-        $this->adminActionSubpage(_("Chown"));
+        $this->adminActionSubpage(__("Chown"));
     }
 
     function action_setacl()
     {
-        $this->adminActionSubpage(_("SetAcl"));
+        $this->adminActionSubpage(__("SetAcl"));
     }
 
     function action_setaclsimple()
     {
-        $this->adminActionSubpage(_("SetAclSimple"));
+        $this->adminActionSubpage(__("SetAclSimple"));
     }
 
     function action_deleteacl()
     {
-        $this->adminActionSubpage(_("DeleteAcl"));
+        $this->adminActionSubpage(__("DeleteAcl"));
     }
 
     function action_rename()
     {
-        $this->adminActionSubpage(_("Rename"));
+        $this->adminActionSubpage(__("Rename"));
     }
 
     function action_dump()

Modified: trunk/lib/plugin/InterWikiSearch.php
===================================================================
--- trunk/lib/plugin/InterWikiSearch.php	2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/plugin/InterWikiSearch.php	2012-11-14 18:09:15 UTC (rev 8465)
@@ -53,11 +53,11 @@
             return $this->disabled("Sorry, this plugin is currently out of order.");
 
         $page = $dbi->getPage($request->getArg('pagename'));
-        return new TransformedText($page, _('InterWikiMap'), array('markup' => 2),
+        return new TransformedText($page, __('InterWikiMap'), array('markup' => 2),
             'searchableInterWikiMap');
         /*
         return new PageType($pagerevisionhandle,
-                            $pagename = _('InterWikiMap'),
+                            $pagename = __('InterWikiMap'),
                             $markup = 2,
                             $overridePageType = 'PageType_searchableInterWikiMap');
         */

Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php	2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/plugin/WantedPages.php	2012-11-14 18:09:15 UTC (rev 8465)
@@ -53,7 +53,7 @@
             array('page' => '[pagename]', // just for a single page.
                 'withlinks' => 0,
                 'noheader' => false,
-                'exclude_from' => _("PgsrcTranslation") . ',' . _("InterWikiMap"),
+                'exclude_from' => __("PgsrcTranslation") . ',' . __("InterWikiMap"),
                 'limit' => '100',
                 'paging' => 'auto'));
     }
@@ -143,8 +143,6 @@
     }
 }
 
-
-
 // which links to the missing page
 class _PageList_Column_WantedPages_wanted extends _PageList_Column
 {

Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php	2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/plugin/WantedPagesOld.php	2012-11-14 18:09:15 UTC (rev 8465)
@@ -74,7 +74,7 @@
             $allpages_iter = $dbi->getAllPages($include_empty, $sortby, $limit);
             while ($page_handle = $allpages_iter->next()) {
                 $name = $page_handle->getName();
-                if ($name == _("InterWikiMap")) continue;
+                if ($name == __("InterWikiMap")) continue;
                 if (!in_array($name, $exclude))
                     $this->_iterateLinks($page_handle, $dbi);
             }
@@ -215,8 +215,6 @@
     }
 }
 
-
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/actionbar.tmpl	2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/themes/fusionforge/templates/actionbar.tmpl	2012-11-14 18:09:15 UTC (rev 8465)
@@ -58,7 +58,7 @@
 
     <?php if ($dbh->isWikiPage($page->getName())) { ?>
 
-    <li><?php echo Button(_("PageHistory"), _("History")) ?></li>
+    <li><?php echo Button(__("PageHistory"), _("History")) ?></li>
 
     <?php if ($curuserprefs->get('diffMenuItem')) { ?>
       <li><?php echo Button("diff", _("Last Difference")) ?> </li>
@@ -68,9 +68,9 @@
       <li><?php echo Button('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?></li>
     <?php } ?>
 
-      <li><?php echo Button(_("PageInfo"), _("Page Info")) ?></li>
+      <li><?php echo Button(__("PageInfo"), _("Page Info")) ?></li>
 
-      <li><?php echo Button(array('action'=>_("BackLinks")), _("Back Links"),$page->getName()) ?></li>
+      <li><?php echo Button(array('action'=>__("BackLinks")), _("Back Links"),$page->getName()) ?></li>
 
     <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>
       <?php if ($curuserprefs->get('pdfMenuItem')) { ?>
@@ -112,7 +112,7 @@
   </ul>
 
   <ul>
-    <li><?php echo Button(_("WatchPage"), _("Watch Page")) ?></li>
+    <li><?php echo Button(__("WatchPage"), _("Watch Page")) ?></li>
   </ul>
   </div>
   </menu>

Modified: trunk/themes/fusionforge/templates/blogform.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/blogform.tmpl	2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/themes/fusionforge/templates/blogform.tmpl	2012-11-14 18:09:15 UTC (rev 8465)
@@ -18,7 +18,7 @@
 
 <hr noshade="noshade" />
 <div id="newMarkup" class="wiki-edithelp">
-  <?plugin IncludePage page=_("TextFormattingRules") section=_("Synopsis") quiet=1?>
+  <?plugin IncludePage page="TextFormattingRules" section="Synopsis" quiet=1?>
 </div>
 <?php echo $HIDDEN_INPUTS?>
 </form>

Modified: trunk/themes/fusionforge/templates/navbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/navbar.tmpl	2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/themes/fusionforge/templates/navbar.tmpl	2012-11-14 18:09:15 UTC (rev 8465)
@@ -4,25 +4,25 @@
 $username = $user->UserName();
 ?>
 
-   <li class="submenu"><?php echo WikiLink(_("HomePage"), "", _("Home Page")) ?></li>
-   <li class="submenu"><?php echo WikiLink(_("RecentChanges"), "", _("Recent Changes")) ?></li>
-   <li class="submenu"><?php echo WikiLink(_("SpecialPages"), "", _("Special Pages")) ?></li>
-   <li class="submenu"><?php echo WikiLink(_("FindPage"), "", _("Search")) ?></li>
+   <li class="submenu"><?php echo WikiLink(__("HomePage"), "", _("Home Page")) ?></li>
+   <li class="submenu"><?php echo WikiLink(__("RecentChanges"), "", _("Recent Changes")) ?></li>
+   <li class="submenu"><?php echo WikiLink(__("SpecialPages"), "", _("Special Pages")) ?></li>
+   <li class="submenu"><?php echo WikiLink(__("FindPage"), "", _("Search")) ?></li>
    <?php if ($curuserprefs->get('randomPageMenuItem')) { ?>
-     <li class="submenu"><?php echo WikiLink(_("RandomPage"), "", _("Random Page")) ?></li>
+     <li class="submenu"><?php echo WikiLink(__("RandomPage"), "", _("Random Page")) ?></li>
    <?php } ?>
    <?php if ($curuserprefs->get('likePagesMenuItem')) { ?>
-     <li class="submenu"><?php echo Button(array('action'=>_("LikePages")), _("Like Pages"),$page->getName()) ?></li>
+     <li class="submenu"><?php echo Button(array('action'=>__("LikePages")), _("Like Pages"),$page->getName()) ?></li>
    <?php } ?>
    <?php if (!empty($user) && $user->isSignedIn()) { ?>
-     <li class="submenu"><?php echo WikiLink(_("UpLoad"), "", _("Upload File")) ?></li>
+     <li class="submenu"><?php echo WikiLink(__("UpLoad"), "", _("Upload File")) ?></li>
    <?php } ?>
    <?php if (!empty($user) && $user->isAdmin()) { ?>
-     <li class="submenu"><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Wiki Admin")) ?></li>
+     <li class="submenu"><?php echo WikiLink(__("PhpWikiAdministration"), "", _("Wiki Admin")) ?></li>
    <?php } ?>
    <?php if (!empty($user) && $user->isSignedIn()) { ?>
      <?php if ($dbh->isWikiPage($username)) { ?>
        <li class="submenu"><?php echo WikiLink($username, "", _("My User Page")) ?></li>
      <?php } ?>
-     <li class="submenu"><?php echo WikiLink(_("UserPreferences"), "", _("User Preferences")) ?></li>
+     <li class="submenu"><?php echo WikiLink(__("UserPreferences"), "", _("User Preferences")) ?></li>
    <?php } ?>

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