phpwiki-checkins Mailing List for PhpWiki (Page 112)

Brought to you by: carstenklapp, dairiki, rurban, vargenau, wainstead

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

You can subscribe to this list here.

2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (43)	Nov (73)	Dec (10)
2001	Jan (34)	Feb (110)	Mar (24)	Apr (44)	May (37)	Jun (22)	Jul (20)	Aug (28)	Sep (50)	Oct (11)	Nov (132)	Dec (595)
2002	Jan (1099)	Feb (579)	Mar (63)	Apr	May	Jun	Jul	Aug (125)	Sep (101)	Oct (25)	Nov (34)	Dec (47)
2003	Jan (82)	Feb (182)	Mar (71)	Apr (3)	May (1)	Jun (3)	Jul	Aug	Sep (14)	Oct (6)	Nov (124)	Dec (68)
2004	Jan (64)	Feb (191)	Mar (199)	Apr (298)	May (252)	Jun (426)	Jul (134)	Aug (13)	Sep (96)	Oct (75)	Nov (232)	Dec (171)
2005	Jan (205)	Feb (165)	Mar (8)	Apr (74)	May (21)	Jun (19)	Jul (37)	Aug (69)	Sep (141)	Oct (118)	Nov (31)	Dec (7)
2006	Jan (5)	Feb (10)	Mar (35)	Apr (24)	May (34)	Jun (29)	Jul (5)	Aug (38)	Sep (30)	Oct (37)	Nov (30)	Dec (86)
2007	Jan (414)	Feb (40)	Mar (18)	Apr (10)	May (66)	Jun (60)	Jul (105)	Aug (55)	Sep (64)	Oct (7)	Nov (11)	Dec (5)
2008	Jan (26)	Feb (28)	Mar (79)	Apr (34)	May (61)	Jun (24)	Jul (29)	Aug (160)	Sep (62)	Oct (70)	Nov (32)	Dec (14)
2009	Jan (140)	Feb (135)	Mar (153)	Apr (53)	May (24)	Jun (138)	Jul (90)	Aug (46)	Sep (72)	Oct (84)	Nov (32)	Dec (4)
2010	Jan (13)	Feb (7)	Mar (14)	Apr (55)	May (89)	Jun (131)	Jul (41)	Aug (38)	Sep (42)	Oct (11)	Nov (27)	Dec (54)
2011	Jan (127)	Feb (16)	Mar (71)	Apr (52)	May (32)	Jun (31)	Jul (4)	Aug	Sep (45)	Oct (26)	Nov (36)	Dec (10)
2012	Jan (23)	Feb (6)	Mar (13)	Apr (18)	May (1)	Jun (4)	Jul (3)	Aug (12)	Sep (57)	Oct (96)	Nov (163)	Dec (124)
2013	Jan (11)	Feb (17)	Mar (7)	Apr (48)	May (15)	Jun (29)	Jul (12)	Aug	Sep (9)	Oct	Nov	Dec (3)
2014	Jan (4)	Feb (1)	Mar (2)	Apr (1)	May (8)	Jun (90)	Jul (104)	Aug (12)	Sep (81)	Oct (139)	Nov (111)	Dec (64)
2015	Jan (46)	Feb (74)	Mar (56)	Apr (61)	May (3)	Jun (7)	Jul (11)	Aug (5)	Sep (15)	Oct (1)	Nov (1)	Dec (15)
2016	Jan (25)	Feb (33)	Mar (24)	Apr (4)	May (24)	Jun (3)	Jul (75)	Aug	Sep (2)	Oct (38)	Nov (4)	Dec (18)
2017	Jan (8)	Feb (1)	Mar (1)	Apr	May (14)	Jun	Jul (5)	Aug (9)	Sep	Oct (23)	Nov	Dec
2018	Jan	Feb	Mar	Apr	May	Jun (2)	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar (9)	Apr (60)	May (1)	Jun	Jul (13)	Aug	Sep (11)	Oct	Nov	Dec
2020	Jan	Feb	Mar (15)	Apr (4)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (47)
2021	Jan (24)	Feb (33)	Mar (1)	Apr	May (1)	Jun (64)	Jul (71)	Aug (114)	Sep (82)	Oct (32)	Nov (76)	Dec (86)
2022	Jan (162)	Feb (41)	Mar (11)	Apr (9)	May	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov	Dec (7)
2023	Jan	Feb (1)	Mar (2)	Apr	May	Jun	Jul (25)	Aug	Sep	Oct	Nov (7)	Dec
2024	Jan (7)	Feb (3)	Mar (3)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2025	Jan	Feb (90)	Mar (19)	Apr	May (6)	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 110 111 112 113 114 .. 538 > >> (Page 112 of 538)

[phpwiki-checkins] SF.net SVN: phpwiki:[8414] trunk/lib/WikiDB/adodb/readme.htm

From: <var...@us...> - 2012-10-11 12:35:23

Revision: 8414
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8414&view=rev
Author:   vargenau
Date:     2012-10-11 12:35:13 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
Fix CSS style

Modified Paths:
--------------
    trunk/lib/WikiDB/adodb/readme.htm

Modified: trunk/lib/WikiDB/adodb/readme.htm
===================================================================
--- trunk/lib/WikiDB/adodb/readme.htm	2012-10-11 12:11:16 UTC (rev 8413)
+++ trunk/lib/WikiDB/adodb/readme.htm	2012-10-11 12:35:13 UTC (rev 8414)
@@ -1,13 +1,15 @@
+<!DOCTYPE html>
 <html>
 <head>
     <title>ADODB Manual</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <XSTYLE
-            body
-    ,td {font-family:Arial,Helvetica,sans-serif;font-size:11pt}
+    <meta charset="UTF-8" />
+    <style type="text/css">
+    <!--
+    body,td {font-family:Arial,Helvetica,sans-serif;font-size:11pt}
     pre {font-size:9pt}
     .toplink {font-size:8pt}
-    />
+    -->
+  </style>
 </head>
 <body bgcolor="#FFFFFF">
 

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

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

From: <var...@us...> - 2012-10-11 12:11:27

Revision: 8413
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8413&view=rev
Author:   vargenau
Date:     2012-10-11 12:11:16 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
Remove extra white lines

Modified Paths:
--------------
    trunk/lib/diff3.php
    trunk/lib/imdb.php

Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php	2012-10-11 12:05:36 UTC (rev 8412)
+++ trunk/lib/diff3.php	2012-10-11 12:11:16 UTC (rev 8413)
@@ -114,8 +114,6 @@
     }
 }
 
-
-
 class Diff3
 {
     function Diff3($orig, $final1, $final2)

Modified: trunk/lib/imdb.php
===================================================================
--- trunk/lib/imdb.php	2012-10-11 12:05:36 UTC (rev 8412)
+++ trunk/lib/imdb.php	2012-10-11 12:11:16 UTC (rev 8413)
@@ -441,8 +441,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:[8412] trunk/configurator.php

From: <var...@us...> - 2012-10-11 12:05:42

Revision: 8412
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8412&view=rev
Author:   vargenau
Date:     2012-10-11 12:05:36 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
Repair comment

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

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2012-10-11 11:52:26 UTC (rev 8411)
+++ trunk/configurator.php	2012-10-11 12:05:36 UTC (rev 8412)
@@ -222,8 +222,7 @@
         -->
     </style>
     <script type="text/javascript">
-        <
-        !--
+        <!--
                 function update(accepted, error, value, output) {
                     var msg = document.getElementById(output);
                     if (accepted) {
@@ -306,7 +305,7 @@
             }
         }
 
-        -- >
+        // -->
     </script>
 </head>
 <body onload="do_init();">

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8411] trunk/lib/plugin/_GroupInfo.php

From: <var...@us...> - 2012-10-11 11:52:37

Revision: 8411
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8411&view=rev
Author:   vargenau
Date:     2012-10-11 11:52:26 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
No empty line at end of file

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

Modified: trunk/lib/plugin/_GroupInfo.php
===================================================================
--- trunk/lib/plugin/_GroupInfo.php	2012-10-11 09:32:21 UTC (rev 8410)
+++ trunk/lib/plugin/_GroupInfo.php	2012-10-11 11:52:26 UTC (rev 8411)
@@ -66,5 +66,3 @@
         return $output;
     }
 }
-
-

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

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

From: <var...@us...> - 2012-10-11 09:32:31

Revision: 8410
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8410&view=rev
Author:   vargenau
Date:     2012-10-11 09:32:21 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
Remove useless semicolon

Modified Paths:
--------------
    trunk/lib/HtmlElement.php
    trunk/lib/HtmlElement5.php
    trunk/lib/PageList.php
    trunk/lib/RssWriter.php
    trunk/lib/RssWriter2.php
    trunk/lib/SemanticWeb.php
    trunk/lib/Template.php
    trunk/lib/TextSearchQuery.php
    trunk/lib/WikiDB.php
    trunk/lib/WikiPlugin.php
    trunk/lib/WikiTheme.php
    trunk/lib/XmlElement.php
    trunk/lib/diff3.php
    trunk/lib/imdb.php
    trunk/lib/stdlib.php

Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php	2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/HtmlElement.php	2012-10-11 09:32:21 UTC (rev 8410)
@@ -125,8 +125,8 @@
     }
 }
 
-;
 
+
 function HTML( /* $content, ... */)
 {
     return new XmlContent(func_get_args());

Modified: trunk/lib/HtmlElement5.php
===================================================================
--- trunk/lib/HtmlElement5.php	2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/HtmlElement5.php	2012-10-11 09:32:21 UTC (rev 8410)
@@ -125,8 +125,8 @@
     }
 }
 
-;
 
+
 function HTML( /* $content, ... */)
 {
     return new XmlContent(func_get_args());

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/PageList.php	2012-10-11 09:32:21 UTC (rev 8410)
@@ -176,8 +176,8 @@
     }
 }
 
-;
 
+
 class _PageList_Column extends _PageList_Column_base
 {
     function _PageList_Column($field, $default_heading, $align = false)
@@ -216,8 +216,8 @@
     }
 }
 
-;
 
+
 /* overcome a call_user_func limitation by not being able to do:
  * call_user_func_array(array(&$class, $class_name), $params);
  * So we need $class = new $classname($params);
@@ -289,8 +289,8 @@
     }
 }
 
-;
 
+
 class _PageList_Column_checkbox extends _PageList_Column
 {
     function _PageList_Column_checkbox($field, $default_heading, $name = 'p')
@@ -341,8 +341,8 @@
     }
 }
 
-;
 
+
 class _PageList_Column_time extends _PageList_Column
 {
     function _PageList_Column_time($field, $default_heading)
@@ -364,8 +364,8 @@
     }
 }
 
-;
 
+
 class _PageList_Column_version extends _PageList_Column
 {
     function _getValue($page_handle, &$revision_handle)
@@ -376,8 +376,8 @@
     }
 }
 
-;
 
+
 // Output is hardcoded to limit of first 50 bytes. Otherwise
 // on very large Wikis this will fail if used with AllPages
 // (PHP memory limit exceeded)
@@ -485,9 +485,9 @@
     }
 }
 
-;
 
 
+
 class _PageList_Column_author extends _PageList_Column
 {
     function _PageList_Column_author($field, $default_heading, $align = false)
@@ -511,8 +511,8 @@
     }
 }
 
-;
 
+
 class _PageList_Column_owner extends _PageList_Column_author
 {
     function _getValue($page_handle, &$revision_handle)
@@ -530,8 +530,8 @@
     }
 }
 
-;
 
+
 class _PageList_Column_creator extends _PageList_Column_author
 {
     function _getValue($page_handle, &$revision_handle)
@@ -549,8 +549,8 @@
     }
 }
 
-;
 
+
 class _PageList_Column_pagename extends _PageList_Column_base
 {
     var $_field = 'pagename';
@@ -584,8 +584,8 @@
     }
 }
 
-;
 
+
 class _PageList_Column_perm extends _PageList_Column
 {
     function _getValue($page_handle, &$revision_handle)
@@ -597,8 +597,8 @@
     }
 }
 
-;
 
+
 class _PageList_Column_acl extends _PageList_Column
 {
     function _getValue($page_handle, &$revision_handle)
@@ -621,8 +621,8 @@
     }
 }
 
-;
 
+
 class PageList
 {
     var $_group_rows = 3;
@@ -1875,8 +1875,8 @@
 
 }
 
-;
 
+
 /* List pages with checkboxes to select from.
  * The [Select] button toggles via Javascript flipAll
  */

Modified: trunk/lib/RssWriter.php
===================================================================
--- trunk/lib/RssWriter.php	2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/RssWriter.php	2012-10-11 09:32:21 UTC (rev 8410)
@@ -198,8 +198,8 @@
     }
 }
 
-;
 
+
 /* Taken from mediawiki.
  * See http://www.atomenabled.org/developers/syndication/
  */

Modified: trunk/lib/RssWriter2.php
===================================================================
--- trunk/lib/RssWriter2.php	2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/RssWriter2.php	2012-10-11 09:32:21 UTC (rev 8410)
@@ -78,8 +78,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php	2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/SemanticWeb.php	2012-10-11 09:32:21 UTC (rev 8410)
@@ -241,8 +241,8 @@
 {
 }
 
-;
 
+
 /**
  * OwlWriter - A class to represent a set of wiki pages (a DL model) as OWL.
  * Requires an actionpage returning a pagelist.
@@ -256,8 +256,8 @@
 {
 }
 
-;
 
+
 /**
  * ModelWriter - Export a KB as set of wiki pages.
  * Requires an actionpage returning a pagelist.
@@ -271,8 +271,8 @@
 {
 }
 
-;
 
+
 /**
  *  NumericSearchQuery can do:
  *         ("population < 20000 and area > 1000000", array("population", "area"))
@@ -414,26 +414,26 @@
     }
 }
 
-;
 
+
 class ReasonerBackend_LISA extends ReasonerBackend
 {
 }
 
-;
 
+
 class ReasonerBackend_Racer extends ReasonerBackend
 {
 }
 
-;
 
+
 class ReasonerBackend_KM extends ReasonerBackend
 {
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/Template.php	2012-10-11 09:32:21 UTC (rev 8410)
@@ -224,8 +224,8 @@
     }
 }
 
-;
 
+
 /**
  * Get a templates
  *

Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php	2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/TextSearchQuery.php	2012-10-11 09:32:21 UTC (rev 8410)
@@ -404,8 +404,8 @@
     }
 }
 
-;
 
+
 /**
  * A simple algebraic matcher for numeric attributes.
  *  NumericSearchQuery can do ("population < 20000 and area > 1000000", array("population", "area"))

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/WikiDB.php	2012-10-11 09:32:21 UTC (rev 8410)
@@ -755,9 +755,9 @@
     }
 }
 
-;
 
 
+
 /**
  * A base class which representing a wiki-page within a
  * WikiDB.
@@ -1539,8 +1539,8 @@
 
 }
 
-;
 
+
 /**
  * This class represents a specific revision of a WikiDB_Page within
  * a WikiDB.
@@ -1888,9 +1888,9 @@
     }
 }
 
-;
 
 
+
 /**
  * Class representing a sequence of WikiDB_Pages.
  * TODO: Enhance to php5 iterators
@@ -2046,8 +2046,8 @@
 
 }
 
-;
 
+
 /**
  * A class which represents a sequence of WikiDB_PageRevisions.
  * TODO: Enhance to php5 iterators
@@ -2134,8 +2134,8 @@
     }
 }
 
-;
 
+
 /** pseudo iterator
  */
 class WikiDB_Array_PageIterator
@@ -2431,8 +2431,8 @@
     }
 }
 
-;
 
+
 function _sql_debuglog($msg, $newline = true, $shutdown = false)
 {
     static $fp = false;

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/WikiPlugin.php	2012-10-11 09:32:21 UTC (rev 8410)
@@ -554,8 +554,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/WikiTheme.php	2012-10-11 09:32:21 UTC (rev 8410)
@@ -1691,8 +1691,8 @@
 
 }
 
-;
 
+
 /**
  * A class representing a clickable "button".
  *
@@ -1735,9 +1735,9 @@
 
 }
 
-;
 
 
+
 /**
  * A clickable image button.
  */
@@ -1771,8 +1771,8 @@
     }
 }
 
-;
 
+
 /**
  * A class representing a form <samp>submit</samp> button.
  */
@@ -1801,8 +1801,8 @@
 
 }
 
-;
 
+
 /**
  * A class representing an image form <samp>submit</samp> button.
  */
@@ -1834,8 +1834,8 @@
 
 }
 
-;
 
+
 /**
  * A sidebar box with title and body, narrow fixed-width.
  * To represent abbrevated content of plugins, links or forms,

Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php	2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/XmlElement.php	2012-10-11 09:32:21 UTC (rev 8410)
@@ -199,8 +199,8 @@
     }
 }
 
-;
 
+
 /**
  * An XML element.
  *
@@ -459,8 +459,8 @@
 
 }
 
-;
 
+
 class RawXml
 {
     function RawXml($xml_text)

Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php	2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/diff3.php	2012-10-11 09:32:21 UTC (rev 8410)
@@ -114,8 +114,8 @@
     }
 }
 
-;
 
+
 class Diff3
 {
     function Diff3($orig, $final1, $final2)

Modified: trunk/lib/imdb.php
===================================================================
--- trunk/lib/imdb.php	2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/imdb.php	2012-10-11 09:32:21 UTC (rev 8410)
@@ -441,8 +441,8 @@
 
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2012-10-11 09:24:50 UTC (rev 8409)
+++ trunk/lib/stdlib.php	2012-10-11 09:32:21 UTC (rev 8410)
@@ -1665,8 +1665,8 @@
     }
 }
 
-;
 
+
 // 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:[8409] trunk/lib/plugin

From: <var...@us...> - 2012-10-11 09:25:03

Revision: 8409
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8409&view=rev
Author:   vargenau
Date:     2012-10-11 09:24:50 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
Remove useless semicolon

Modified Paths:
--------------
    trunk/lib/plugin/AddComment.php
    trunk/lib/plugin/AllPages.php
    trunk/lib/plugin/AllUsers.php
    trunk/lib/plugin/AppendText.php
    trunk/lib/plugin/AsciiMath.php
    trunk/lib/plugin/AsciiSVG.php
    trunk/lib/plugin/AuthorHistory.php
    trunk/lib/plugin/BackLinks.php
    trunk/lib/plugin/BlogArchives.php
    trunk/lib/plugin/BlogJournal.php
    trunk/lib/plugin/Calendar.php
    trunk/lib/plugin/CalendarList.php
    trunk/lib/plugin/CategoryPage.php
    trunk/lib/plugin/Chart.php
    trunk/lib/plugin/Comment.php
    trunk/lib/plugin/CreateBib.php
    trunk/lib/plugin/CreatePage.php
    trunk/lib/plugin/CreateToc.php
    trunk/lib/plugin/CurrentTime.php
    trunk/lib/plugin/DeadEndPages.php
    trunk/lib/plugin/Diff.php
    trunk/lib/plugin/DynamicIncludePage.php
    trunk/lib/plugin/EditMetaData.php
    trunk/lib/plugin/ExternalSearch.php
    trunk/lib/plugin/FacebookLike.php
    trunk/lib/plugin/FileInfo.php
    trunk/lib/plugin/FrameInclude.php
    trunk/lib/plugin/FullTextSearch.php
    trunk/lib/plugin/FuzzyPages.php
    trunk/lib/plugin/GoTo.php
    trunk/lib/plugin/GoogleMaps.php
    trunk/lib/plugin/GooglePlugin.php
    trunk/lib/plugin/GraphViz.php
    trunk/lib/plugin/HelloWorld.php
    trunk/lib/plugin/Imdb.php
    trunk/lib/plugin/IncludePage.php
    trunk/lib/plugin/IncludePages.php
    trunk/lib/plugin/InterWikiSearch.php
    trunk/lib/plugin/JabberPresence.php
    trunk/lib/plugin/LdapSearch.php
    trunk/lib/plugin/LikePages.php
    trunk/lib/plugin/LinkDatabase.php
    trunk/lib/plugin/LinkSearch.php
    trunk/lib/plugin/ListPages.php
    trunk/lib/plugin/ListRelations.php
    trunk/lib/plugin/ListSubpages.php
    trunk/lib/plugin/ModeratedPage.php
    trunk/lib/plugin/MostPopular.php
    trunk/lib/plugin/NewPagesPerUser.php
    trunk/lib/plugin/NoCache.php
    trunk/lib/plugin/OldStyleTable.php
    trunk/lib/plugin/OrphanedPages.php
    trunk/lib/plugin/PageDump.php
    trunk/lib/plugin/PageGroup.php
    trunk/lib/plugin/PageHistory.php
    trunk/lib/plugin/PageInfo.php
    trunk/lib/plugin/PageTrail.php
    trunk/lib/plugin/PasswordReset.php
    trunk/lib/plugin/PhotoAlbum.php
    trunk/lib/plugin/PhpHighlight.php
    trunk/lib/plugin/PhpWeather.php
    trunk/lib/plugin/Ploticus.php
    trunk/lib/plugin/PluginManager.php
    trunk/lib/plugin/PopUp.php
    trunk/lib/plugin/PopularNearby.php
    trunk/lib/plugin/PreferenceApp.php
    trunk/lib/plugin/Processing.php
    trunk/lib/plugin/RandomPage.php
    trunk/lib/plugin/RateIt.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/plugin/RedirectTo.php
    trunk/lib/plugin/RssFeed.php
    trunk/lib/plugin/SearchHighlight.php
    trunk/lib/plugin/SemanticRelations.php
    trunk/lib/plugin/SemanticSearch.php
    trunk/lib/plugin/SemanticSearchAdvanced.php
    trunk/lib/plugin/SiteMap.php
    trunk/lib/plugin/SpellCheck.php
    trunk/lib/plugin/SqlResult.php
    trunk/lib/plugin/SyncWiki.php
    trunk/lib/plugin/SyntaxHighlighter.php
    trunk/lib/plugin/TeX2png.php
    trunk/lib/plugin/Template.php
    trunk/lib/plugin/TitleSearch.php
    trunk/lib/plugin/Transclude.php
    trunk/lib/plugin/TranslateText.php
    trunk/lib/plugin/UnfoldSubpages.php
    trunk/lib/plugin/UriResolver.php
    trunk/lib/plugin/UserPreferences.php
    trunk/lib/plugin/UserRatings.php
    trunk/lib/plugin/Video.php
    trunk/lib/plugin/WantedPages.php
    trunk/lib/plugin/WantedPagesOld.php
    trunk/lib/plugin/WatchPage.php
    trunk/lib/plugin/WhoIsOnline.php
    trunk/lib/plugin/WikiAdminRemove.php
    trunk/lib/plugin/WikiAdminRename.php
    trunk/lib/plugin/WikiAdminSetAclSimple.php
    trunk/lib/plugin/WikiAdminUtils.php
    trunk/lib/plugin/WikiBlog.php
    trunk/lib/plugin/WikiForm.php
    trunk/lib/plugin/WikiFormRich.php
    trunk/lib/plugin/WikiForum.php
    trunk/lib/plugin/WikiPoll.php
    trunk/lib/plugin/YouTube.php
    trunk/lib/plugin/_AuthInfo.php
    trunk/lib/plugin/_BackendInfo.php
    trunk/lib/plugin/_GroupInfo.php
    trunk/lib/plugin/_PreferencesInfo.php
    trunk/lib/plugin/_Retransform.php
    trunk/lib/plugin/_WikiTranslation.php
    trunk/lib/plugin/text2png.php

Modified: trunk/lib/plugin/AddComment.php
===================================================================
--- trunk/lib/plugin/AddComment.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/AddComment.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -142,8 +142,8 @@
 
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/AllPages.php
===================================================================
--- trunk/lib/plugin/AllPages.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/AllPages.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -147,8 +147,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/AllUsers.php
===================================================================
--- trunk/lib/plugin/AllUsers.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/AllUsers.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -111,8 +111,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/AppendText.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -153,8 +153,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/AsciiMath.php
===================================================================
--- trunk/lib/plugin/AsciiMath.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/AsciiMath.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -82,8 +82,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/AsciiSVG.php
===================================================================
--- trunk/lib/plugin/AsciiSVG.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/AsciiSVG.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -87,8 +87,8 @@
     }
 }
 
-;
 
+
 class AsciiSVG_HTML extends HtmlElement
 {
     function startTag()

Modified: trunk/lib/plugin/AuthorHistory.php
===================================================================
--- trunk/lib/plugin/AuthorHistory.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/AuthorHistory.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -221,8 +221,8 @@
 
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/BackLinks.php
===================================================================
--- trunk/lib/plugin/BackLinks.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/BackLinks.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -176,8 +176,8 @@
 
 }
 
-;
 
+
 // how many links from this backLink to other pages
 class _PageList_Column_BackLinks_count extends _PageList_Column
 {

Modified: trunk/lib/plugin/BlogArchives.php
===================================================================
--- trunk/lib/plugin/BlogArchives.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/BlogArchives.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -150,8 +150,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/BlogJournal.php
===================================================================
--- trunk/lib/plugin/BlogJournal.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/BlogJournal.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -108,8 +108,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/Calendar.php
===================================================================
--- trunk/lib/plugin/Calendar.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/Calendar.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -246,8 +246,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/CalendarList.php
===================================================================
--- trunk/lib/plugin/CalendarList.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/CalendarList.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -226,8 +226,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/CategoryPage.php
===================================================================
--- trunk/lib/plugin/CategoryPage.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/CategoryPage.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -82,8 +82,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/Chart.php
===================================================================
--- trunk/lib/plugin/Chart.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/Chart.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -154,8 +154,8 @@
     }
 }
 
-;
 
+
 class SVG_HTML extends HtmlElement
 {
     function startTag()

Modified: trunk/lib/plugin/Comment.php
===================================================================
--- trunk/lib/plugin/Comment.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/Comment.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -60,8 +60,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/CreateBib.php
===================================================================
--- trunk/lib/plugin/CreateBib.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/CreateBib.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -158,8 +158,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/CreatePage.php
===================================================================
--- trunk/lib/plugin/CreatePage.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/CreatePage.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -150,8 +150,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/CreateToc.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -528,8 +528,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/CurrentTime.php
===================================================================
--- trunk/lib/plugin/CurrentTime.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/CurrentTime.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -85,8 +85,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/DeadEndPages.php
===================================================================
--- trunk/lib/plugin/DeadEndPages.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/DeadEndPages.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -33,8 +33,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/Diff.php
===================================================================
--- trunk/lib/plugin/Diff.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/Diff.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -202,8 +202,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/DynamicIncludePage.php
===================================================================
--- trunk/lib/plugin/DynamicIncludePage.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/DynamicIncludePage.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -97,8 +97,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/EditMetaData.php
===================================================================
--- trunk/lib/plugin/EditMetaData.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/EditMetaData.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -194,8 +194,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/ExternalSearch.php
===================================================================
--- trunk/lib/plugin/ExternalSearch.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/ExternalSearch.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -154,8 +154,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/FacebookLike.php
===================================================================
--- trunk/lib/plugin/FacebookLike.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/FacebookLike.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -76,8 +76,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/FileInfo.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -351,8 +351,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/FrameInclude.php
===================================================================
--- trunk/lib/plugin/FrameInclude.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/FrameInclude.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -148,8 +148,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/FullTextSearch.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -153,8 +153,8 @@
     }
 }
 
-;
 
+
 /*
  * List of Links and link to ListLinks
  */

Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/FuzzyPages.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -200,8 +200,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/GoTo.php
===================================================================
--- trunk/lib/plugin/GoTo.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/GoTo.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -88,8 +88,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/GoogleMaps.php
===================================================================
--- trunk/lib/plugin/GoogleMaps.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/GoogleMaps.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -157,8 +157,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/GooglePlugin.php
===================================================================
--- trunk/lib/plugin/GooglePlugin.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/GooglePlugin.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -126,8 +126,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/GraphViz.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -464,8 +464,8 @@
 
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/HelloWorld.php
===================================================================
--- trunk/lib/plugin/HelloWorld.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/HelloWorld.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -72,8 +72,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/Imdb.php
===================================================================
--- trunk/lib/plugin/Imdb.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/Imdb.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -109,8 +109,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/IncludePage.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -212,8 +212,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/IncludePages.php
===================================================================
--- trunk/lib/plugin/IncludePages.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/IncludePages.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -86,8 +86,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/InterWikiSearch.php
===================================================================
--- trunk/lib/plugin/InterWikiSearch.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/InterWikiSearch.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -64,8 +64,8 @@
     }
 }
 
-;
 
+
 /**
  * @desc
  */

Modified: trunk/lib/plugin/JabberPresence.php
===================================================================
--- trunk/lib/plugin/JabberPresence.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/JabberPresence.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -74,8 +74,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/LdapSearch.php
===================================================================
--- trunk/lib/plugin/LdapSearch.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/LdapSearch.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -205,8 +205,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/LikePages.php
===================================================================
--- trunk/lib/plugin/LikePages.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/LikePages.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -116,8 +116,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/LinkDatabase.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -182,8 +182,8 @@
     }
 }
 
-;
 
+
 class _PageList_Column_LinkDatabase_links extends _PageList_Column
 {
     function _getValue($page, &$revision_handle)

Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/LinkSearch.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -165,8 +165,8 @@
     }
 }
 
-;
 
+
 // FIXME: sortby errors with this column
 class _PageList_Column_LinkSearch_link
     extends _PageList_Column

Modified: trunk/lib/plugin/ListPages.php
===================================================================
--- trunk/lib/plugin/ListPages.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/ListPages.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -132,8 +132,8 @@
     }
 }
 
-;
 
+
 // how many back-/forwardlinks for this page
 class _PageList_Column_ListPages_count extends _PageList_Column
 {

Modified: trunk/lib/plugin/ListRelations.php
===================================================================
--- trunk/lib/plugin/ListRelations.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/ListRelations.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -62,8 +62,8 @@
 
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/ListSubpages.php
===================================================================
--- trunk/lib/plugin/ListSubpages.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/ListSubpages.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -113,8 +113,8 @@
     }
 }
 
-;
 
+
 // how many backlinks for this subpage
 class _PageList_Column_ListSubpages_count extends _PageList_Column
 {

Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/ModeratedPage.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -458,8 +458,8 @@
 
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/MostPopular.php
===================================================================
--- trunk/lib/plugin/MostPopular.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/MostPopular.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -102,8 +102,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/NewPagesPerUser.php
===================================================================
--- trunk/lib/plugin/NewPagesPerUser.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/NewPagesPerUser.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -136,8 +136,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/NoCache.php
===================================================================
--- trunk/lib/plugin/NoCache.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/NoCache.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -61,8 +61,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/OldStyleTable.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -153,8 +153,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/OrphanedPages.php
===================================================================
--- trunk/lib/plugin/OrphanedPages.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/OrphanedPages.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -98,8 +98,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PageDump.php
===================================================================
--- trunk/lib/plugin/PageDump.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/PageDump.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -319,8 +319,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PageGroup.php
===================================================================
--- trunk/lib/plugin/PageGroup.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/PageGroup.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -203,8 +203,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PageHistory.php
===================================================================
--- trunk/lib/plugin/PageHistory.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/PageHistory.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -353,8 +353,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PageInfo.php
===================================================================
--- trunk/lib/plugin/PageInfo.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/PageInfo.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -71,8 +71,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PageTrail.php
===================================================================
--- trunk/lib/plugin/PageTrail.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/PageTrail.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -93,8 +93,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/PasswordReset.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -195,8 +195,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/PhotoAlbum.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -669,8 +669,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PhpHighlight.php
===================================================================
--- trunk/lib/plugin/PhpHighlight.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/PhpHighlight.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -182,8 +182,8 @@
 
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PhpWeather.php
===================================================================
--- trunk/lib/plugin/PhpWeather.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/PhpWeather.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -197,8 +197,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/Ploticus.php
===================================================================
--- trunk/lib/plugin/Ploticus.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/Ploticus.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -301,8 +301,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PluginManager.php
===================================================================
--- trunk/lib/plugin/PluginManager.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/PluginManager.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -186,8 +186,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PopUp.php
===================================================================
--- trunk/lib/plugin/PopUp.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/PopUp.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -100,8 +100,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PopularNearby.php
===================================================================
--- trunk/lib/plugin/PopularNearby.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/PopularNearby.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -151,8 +151,8 @@
     }
 }
 
-;
 
+
 function cmp_by_hits($a, $b)
 {
     if ($a['hits'] == $b['hits']) return 0;

Modified: trunk/lib/plugin/PreferenceApp.php
===================================================================
--- trunk/lib/plugin/PreferenceApp.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/PreferenceApp.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -310,8 +310,8 @@
 
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/Processing.php
===================================================================
--- trunk/lib/plugin/Processing.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/Processing.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -86,8 +86,8 @@
     }
 }
 
-;
 
+
 class Processing_HTML extends HtmlElement
 {
     function startTag()

Modified: trunk/lib/plugin/RandomPage.php
===================================================================
--- trunk/lib/plugin/RandomPage.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/RandomPage.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -113,8 +113,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/RateIt.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -450,8 +450,8 @@
 
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/RecentChanges.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -1474,8 +1474,8 @@
 
 }
 
-;
 
+
 class OptionsButtonBars extends HtmlElement
 {
 

Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/RedirectTo.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -106,8 +106,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/RssFeed.php
===================================================================
--- trunk/lib/plugin/RssFeed.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/RssFeed.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -129,8 +129,8 @@
 
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/SearchHighlight.php
===================================================================
--- trunk/lib/plugin/SearchHighlight.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/SearchHighlight.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -110,8 +110,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/SemanticRelations.php
===================================================================
--- trunk/lib/plugin/SemanticRelations.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/SemanticRelations.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -143,8 +143,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/SemanticSearch.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -435,8 +435,8 @@
     }
 }
 
-;
 
+
 class _PageList_Column_SemanticSearch_relation
     extends _PageList_Column
 {

Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -220,8 +220,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/SiteMap.php
===================================================================
--- trunk/lib/plugin/SiteMap.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/SiteMap.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -223,8 +223,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/SpellCheck.php
===================================================================
--- trunk/lib/plugin/SpellCheck.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/SpellCheck.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -191,8 +191,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/SqlResult.php
===================================================================
--- trunk/lib/plugin/SqlResult.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/SqlResult.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -220,8 +220,8 @@
 
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/SyncWiki.php
===================================================================
--- trunk/lib/plugin/SyncWiki.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/SyncWiki.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -365,8 +365,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/SyntaxHighlighter.php
===================================================================
--- trunk/lib/plugin/SyntaxHighlighter.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/SyntaxHighlighter.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -162,8 +162,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/TeX2png.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -238,8 +238,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/Template.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -267,8 +267,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/TitleSearch.php
===================================================================
--- trunk/lib/plugin/TitleSearch.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/TitleSearch.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -109,8 +109,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/Transclude.php
===================================================================
--- trunk/lib/plugin/Transclude.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/Transclude.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -162,8 +162,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/TranslateText.php
===================================================================
--- trunk/lib/plugin/TranslateText.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/TranslateText.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -135,8 +135,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/UnfoldSubpages.php
===================================================================
--- trunk/lib/plugin/UnfoldSubpages.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/UnfoldSubpages.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -181,8 +181,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/UriResolver.php
===================================================================
--- trunk/lib/plugin/UriResolver.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/UriResolver.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -65,8 +65,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/UserPreferences.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -176,8 +176,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/UserRatings.php
===================================================================
--- trunk/lib/plugin/UserRatings.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/UserRatings.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -233,8 +233,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/Video.php
===================================================================
--- trunk/lib/plugin/Video.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/Video.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -146,8 +146,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/WantedPages.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -143,8 +143,8 @@
     }
 }
 
-;
 
+
 // 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-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/WantedPagesOld.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -215,8 +215,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/WatchPage.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -172,8 +172,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WhoIsOnline.php
===================================================================
--- trunk/lib/plugin/WhoIsOnline.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/WhoIsOnline.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -206,8 +206,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/WikiAdminRemove.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -248,8 +248,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/WikiAdminRename.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -331,8 +331,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -181,8 +181,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/WikiAdminUtils.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -311,8 +311,8 @@
     }
 }
 
-;
 
+
 require_once 'lib/PageList.php';
 
 class _PageList_Column_email

Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/WikiBlog.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -432,8 +432,8 @@
 
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WikiForm.php
===================================================================
--- trunk/lib/plugin/WikiForm.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/WikiForm.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -116,8 +116,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/WikiFormRich.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -399,8 +399,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WikiForum.php
===================================================================
--- trunk/lib/plugin/WikiForum.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/WikiForum.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -136,8 +136,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/WikiPoll.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -337,8 +337,8 @@
 
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/YouTube.php
===================================================================
--- trunk/lib/plugin/YouTube.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/YouTube.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -200,8 +200,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/_AuthInfo.php
===================================================================
--- trunk/lib/plugin/_AuthInfo.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/_AuthInfo.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -201,8 +201,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/_BackendInfo.php
===================================================================
--- trunk/lib/plugin/_BackendInfo.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/_BackendInfo.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -201,8 +201,8 @@
 
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/_GroupInfo.php
===================================================================
--- trunk/lib/plugin/_GroupInfo.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/_GroupInfo.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -67,4 +67,4 @@
     }
 }
 
-;
+

Modified: trunk/lib/plugin/_PreferencesInfo.php
===================================================================
--- trunk/lib/plugin/_PreferencesInfo.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/_PreferencesInfo.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -51,8 +51,8 @@
     }
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/_Retransform.php
===================================================================
--- trunk/lib/plugin/_Retransform.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/_Retransform.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -85,8 +85,8 @@
 
 }
 
-;
 
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/_WikiTranslation.php
===================================================================
--- trunk/lib/plugin/_WikiTranslation.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/_WikiTranslation.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -382,8 +382,8 @@
     }
 }
 
-;
 
+
 class _PageList_Column_customlang extends _PageList_Column
 {
     function _PageList_Column_customlang($field, $from_lang, $plugin)

Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2012-10-11 07:32:06 UTC (rev 8408)
+++ trunk/lib/plugin/text2png.php	2012-10-11 09:24:50 UTC (rev 8409)
@@ -231,8 +231,8 @@
     }
 }
 
-;
 
+
 // 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:[8408] trunk/lib/loadsave.php

From: <var...@us...> - 2012-10-11 07:32:16

Revision: 8408
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8408&view=rev
Author:   vargenau
Date:     2012-10-11 07:32:06 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
No need to indent

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

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2012-10-11 07:28:17 UTC (rev 8407)
+++ trunk/lib/loadsave.php	2012-10-11 07:32:06 UTC (rev 8408)
@@ -970,7 +970,7 @@
                 $page->set($key, $value);
         }
 
-    $mesg = HTML::p(array('style' => 'text-indent: 3em;'));
+    $mesg = HTML::p();
     if ($source)
         $mesg->pushContent(' ', fmt("from %s", $source));
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8407] trunk/lib/MailNotify.php

From: <var...@us...> - 2012-10-11 07:28:28

Revision: 8407
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8407&view=rev
Author:   vargenau
Date:     2012-10-11 07:28:17 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
quoted_printable_encode inserts "\r\n" if line is too long, use "\n" only

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

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2012-10-10 16:51:57 UTC (rev 8406)
+++ trunk/lib/MailNotify.php	2012-10-11 07:28:17 UTC (rev 8407)
@@ -479,7 +479,8 @@
 
         // Let us try quoted printable first
         if (function_exists('quoted_printable_encode')) { // PHP 5.3
-            return "=?UTF-8?Q?" . quoted_printable_encode($subject) . "?=";
+            // quoted_printable_encode inserts "\r\n" if line is too long, use "\n" only
+            return "=?UTF-8?Q?" . str_replace("\r\n", "\n", quoted_printable_encode($subject)) . "?=";
         }
 
         // If not, encode in base64 (less human-readable)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8406] trunk/lib/plugin/BackLinks.php

From: <var...@us...> - 2012-10-10 16:52:08

Revision: 8406
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8406&view=rev
Author:   vargenau
Date:     2012-10-10 16:51:57 +0000 (Wed, 10 Oct 2012)
Log Message:
-----------
Comment "override DB sort"

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

Modified: trunk/lib/plugin/BackLinks.php
===================================================================
--- trunk/lib/plugin/BackLinks.php	2012-10-10 16:42:37 UTC (rev 8405)
+++ trunk/lib/plugin/BackLinks.php	2012-10-10 16:51:57 UTC (rev 8406)
@@ -72,7 +72,7 @@
         }
         if (!empty($limit))
             $args['limit'] = $limit;
-        $args['dosort'] = !empty($args['sortby']); // override DB sort (??)
+        // $args['dosort'] = !empty($args['sortby']); // override DB sort (??)
         $pagelist = new PageList($info, $exclude, $args);
 
         // support logical AND: page1,page2

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8405] trunk/lib/plugin/SiteMap.php

From: <var...@us...> - 2012-10-10 16:42:48

Revision: 8405
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8405&view=rev
Author:   vargenau
Date:     2012-10-10 16:42:37 +0000 (Wed, 10 Oct 2012)
Log Message:
-----------
Use PHP "empty" function

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

Modified: trunk/lib/plugin/SiteMap.php
===================================================================
--- trunk/lib/plugin/SiteMap.php	2012-10-10 16:08:08 UTC (rev 8404)
+++ trunk/lib/plugin/SiteMap.php	2012-10-10 16:42:37 UTC (rev 8405)
@@ -196,7 +196,7 @@
             if (!is_string($includepages))
                 $includepages = ' '; // avoid plugin loader problems
             $loader = new WikiPluginLoader();
-            $plugin = $loader->getPlugin($dtree ? 'DynamicIncludePage' : 'IncludePage', false);
+            $plugin = $loader->getPlugin(!empty($dtree) ? 'DynamicIncludePage' : 'IncludePage', false);
             $nothing = '';
         }
 

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

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

From: <var...@us...> - 2012-10-10 16:08:17

Revision: 8404
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8404&view=rev
Author:   vargenau
Date:     2012-10-10 16:08:08 +0000 (Wed, 10 Oct 2012)
Log Message:
-----------
Update locale

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

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

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

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

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

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

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

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2012-10-10 10:13:58 UTC (rev 8403)
+++ trunk/locale/po/de.po	2012-10-10 16:08:08 UTC (rev 8404)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-02 11:47+0200\n"
+"POT-Creation-Date: 2012-10-10 18:07+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -17,153 +17,153 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/CachedMarkup.php:535
+#: ../lib/CachedMarkup.php:579
 msgid "BAD semantic relation link"
 msgstr ""
 
-#: ../lib/CachedMarkup.php:566
+#: ../lib/CachedMarkup.php:611
 #, php-format
 msgid "Attribute %s, base value: %s"
 msgstr "Attribut %s, Basis: %s"
 
-#: ../lib/CachedMarkup.php:567
+#: ../lib/CachedMarkup.php:612
 #, php-format
 msgid "Attribute %s, value: %s"
 msgstr "Attribut %s, Wert: %s"
 
-#: ../lib/CachedMarkup.php:574
+#: ../lib/CachedMarkup.php:619
 #, php-format
 msgid "Relation %s to page %s"
 msgstr "Relation %s zu Seite %s"
 
-#: ../lib/CachedMarkup.php:629
+#: ../lib/CachedMarkup.php:679
 msgid "Found by "
 msgstr "Gefunden von "
 
-#: ../lib/Captcha.php:32
+#: ../lib/Captcha.php:34
 msgid "Typed in verification word mismatch ... are you a bot?"
 msgstr ""
 
-#: ../lib/Captcha.php:69
+#: ../lib/Captcha.php:75
 msgid "Type word above:"
 msgstr ""
 
-#: ../lib/DbaDatabase.php:20
+#: ../lib/DbaDatabase.php:21
 #, php-format
 msgid "The DBA handler %s is unsupported!"
 msgstr "Die DBA Methode %s wird nicht unterstützt!"
 
-#: ../lib/DbaDatabase.php:21
+#: ../lib/DbaDatabase.php:22
 #, php-format
 msgid "Supported handlers are: %s"
 msgstr "Unterstützte DBA Methoden sind: %s"
 
-#: ../lib/DbSession.php:41
+#: ../lib/DbSession.php:42
 #, php-format
 msgid "Your WikiDB DB backend '%s' cannot be used for DbSession."
 msgstr "Ihr WikiDB DB backend '%s' wird von DbSession nicht unterstützt."
 
-#: ../lib/DbSession.php:42
+#: ../lib/DbSession.php:43
 #, php-format
 msgid "Set USE_DB_SESSION to false."
 msgstr "Setzen Sie USE_DB_SESSION auf false."
 
-#: ../lib/diff.php:198 ../lib/plugin/Diff.php:66
+#: ../lib/diff.php:221 ../lib/plugin/Diff.php:71
 #, php-format
 msgid "version %s"
 msgstr "Version %s"
 
-#: ../lib/diff.php:201 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:530
-#: ../lib/WikiTheme.php:532
+#: ../lib/diff.php:224 ../lib/plugin/Diff.php:74 ../lib/WikiTheme.php:541
+#: ../lib/WikiTheme.php:543
 #, php-format
 msgid "by %s"
 msgstr "von %s"
 
-#: ../lib/diff.php:205 ../lib/plugin/Diff.php:71
-#: ../lib/wikilens/PageListColumns.php:357
+#: ../lib/diff.php:228 ../lib/plugin/Diff.php:76
+#: ../lib/wikilens/PageListColumns.php:380
 msgid "None"
 msgstr "Keine"
 
-#: ../lib/diff.php:228 ../lib/plugin/Diff.php:94
-#: ../lib/plugin/PageHistory.php:324 ../lib/plugin/PageInfo.php:54
+#: ../lib/diff.php:251 ../lib/plugin/Diff.php:100
+#: ../lib/plugin/PageHistory.php:347 ../lib/plugin/PageInfo.php:58
 #, php-format
 msgid "I'm sorry, there is no such page as %s."
 msgstr "Leider gibt es keine solche Seite %s."
 
-#: ../lib/diff.php:231 ../lib/diff.php:340
+#: ../lib/diff.php:254 ../lib/diff.php:361
 #, php-format
 msgid "Diff: %s"
 msgstr "Vergleich von: %s"
 
-#: ../lib/diff.php:238 ../lib/diff.php:248 ../lib/plugin/Diff.php:102
-#: ../lib/plugin/Diff.php:112
+#: ../lib/diff.php:261 ../lib/diff.php:270 ../lib/plugin/Diff.php:108
+#: ../lib/plugin/Diff.php:117
 #, php-format
 msgid "version %d"
 msgstr "Version %d."
 
-#: ../lib/diff.php:242 ../lib/plugin/Diff.php:106
+#: ../lib/diff.php:264 ../lib/plugin/Diff.php:111
 msgid "current version"
 msgstr "aktuelle Version"
 
-#: ../lib/diff.php:259 ../lib/plugin/Diff.php:123
+#: ../lib/diff.php:280 ../lib/plugin/Diff.php:127
 msgid "revision by previous author"
 msgstr "Revidierte Ausgabe des vorigen Autors"
 
-#: ../lib/diff.php:265 ../lib/plugin/Diff.php:129
+#: ../lib/diff.php:286 ../lib/plugin/Diff.php:133
 msgid "previous revision"
 msgstr "vorige Neubearbeitung"
 
-#: ../lib/diff.php:275 ../lib/plugin/Diff.php:139
+#: ../lib/diff.php:296 ../lib/plugin/Diff.php:143
 msgid "predecessor to the previous major change"
 msgstr "Vorgänger zur vorherigen größeren Änderung"
 
 # word substitution order changes here
-#: ../lib/diff.php:286 ../lib/plugin/Diff.php:149
+#: ../lib/diff.php:307 ../lib/plugin/Diff.php:153
 #, php-format
 msgid "Differences between %s and %s of %s."
 msgstr "Zeilenweiser Vergleich von %3$s, von %1$s mit %2$s."
 
 # (Differences sind eigentlich= Unterschiede, Abweichungen)
 # (eigentlich=weitere Abweichungen, Veränderungen)
-#: ../lib/diff.php:289 ../lib/plugin/Diff.php:152
+#: ../lib/diff.php:310 ../lib/plugin/Diff.php:156
 msgid "Other diffs:"
 msgstr "Andere Vergleiche:"
 
-#: ../lib/diff.php:290 ../lib/plugin/Diff.php:153
+#: ../lib/diff.php:311 ../lib/plugin/Diff.php:157
 msgid "Previous Major Revision"
 msgstr "Vorige größere Neubearbeitung"
 
-#: ../lib/diff.php:291 ../lib/plugin/Diff.php:154
+#: ../lib/diff.php:312 ../lib/plugin/Diff.php:158
 msgid "Previous Revision"
 msgstr "Vorige Neubearbeitung"
 
-#: ../lib/diff.php:292 ../lib/plugin/Diff.php:155
+#: ../lib/diff.php:313 ../lib/plugin/Diff.php:159
 msgid "Previous Author"
 msgstr "Voriger Autor"
 
-#: ../lib/diff.php:308 ../lib/plugin/Diff.php:172
+#: ../lib/diff.php:329 ../lib/plugin/Diff.php:176
 msgid "Newer page:"
 msgstr "Neuere Seite:"
 
-#: ../lib/diff.php:310 ../lib/plugin/Diff.php:174
+#: ../lib/diff.php:331 ../lib/plugin/Diff.php:178
 msgid "Older page:"
 msgstr "Ältere Seite:"
 
-#: ../lib/diff.php:318
+#: ../lib/diff.php:339
 #, php-format
 msgid "Content of versions %1$s and %2$s is identical."
 msgstr ""
 
-#: ../lib/diff.php:325
+#: ../lib/diff.php:346
 #, php-format
 msgid "Version %1$s was created because: %2$s"
 msgstr ""
 
-#: ../lib/display.php:74 ../lib/display.php:344
-#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:154
-#: ../lib/plugin/PageGroup.php:165 ../lib/plugin/PageGroup.php:181
-#: ../lib/plugin/PageGroup.php:188 ../lib/plugin/PageHistory.php:232
-#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:37
+#: ../lib/display.php:77 ../lib/display.php:347
+#: ../lib/plugin/HelloWorld.php:69 ../lib/plugin/PageGroup.php:160
+#: ../lib/plugin/PageGroup.php:171 ../lib/plugin/PageGroup.php:187
+#: ../lib/plugin/PageGroup.php:194 ../lib/plugin/PageHistory.php:246
+#: ../lib/plugin/UnfoldSubpages.php:159 ../themes/Crao/templates/head.tmpl:37
 #: ../themes/default/templates/head.tmpl:43
 #: ../themes/default/templates/top.tmpl:9
 #: ../themes/MonoBook/templates/logo.tmpl:2
@@ -176,18 +176,18 @@
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../lib/display.php:105 ../lib/display.php:206 ../lib/display.php:448
-#: ../lib/plugin/LinkDatabase.php:42
+#: ../lib/display.php:108 ../lib/display.php:208 ../lib/display.php:451
+#: ../lib/plugin/LinkDatabase.php:43
 msgid "LinkDatabase"
 msgstr "LinkDatenbank"
 
 # (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").
-#: ../lib/display.php:170 ../lib/display.php:410 ../lib/loadsave.php:1562
-#: ../lib/plugin/RecentChanges.php:62 ../lib/plugin/RecentChanges.php:210
-#: ../lib/plugin/RecentChanges.php:217 ../lib/plugin/RecentChanges.php:393
-#: ../lib/plugin/RecentChanges.php:681 ../lib/plugin/RecentChanges.php:1160
+#: ../lib/display.php:172 ../lib/display.php:413 ../lib/loadsave.php:1576
+#: ../lib/plugin/RecentChanges.php:64 ../lib/plugin/RecentChanges.php:230
+#: ../lib/plugin/RecentChanges.php:237 ../lib/plugin/RecentChanges.php:440
+#: ../lib/plugin/RecentChanges.php:751 ../lib/plugin/RecentChanges.php:1280
 #: ../lib/RSSWriter091.php:110 ../themes/blog/templates/actionbar.tmpl:11
 #: ../themes/Crao/templates/head.tmpl:53
 #: ../themes/Crao/templates/navbar.tmpl:11
@@ -207,14 +207,14 @@
 msgid "RecentChanges"
 msgstr "NeuesteÄnderungen"
 
-#: ../lib/display.php:207 ../lib/display.php:449
-#: ../lib/plugin/FileInfo.php:126 ../lib/TextSearchQuery.php:115
+#: ../lib/display.php:209 ../lib/display.php:452
+#: ../lib/plugin/FileInfo.php:156 ../lib/TextSearchQuery.php:116
 #, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr "Nicht unterstütztes Argument: %s=%s"
 
-#: ../lib/display.php:276 ../lib/display.php:283
-#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:50
+#: ../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
@@ -226,19 +226,19 @@
 msgid "BackLinks"
 msgstr "BackLinks"
 
-#: ../lib/display.php:279 ../lib/display.php:286
+#: ../lib/display.php:282 ../lib/display.php:289
 #, php-format
 msgid "BackLinks for %s"
 msgstr "BackLinks für %s"
 
 # versandet (=full of sand) ;)
 # weitergeleitet von
-#: ../lib/display.php:294
+#: ../lib/display.php:297
 #, php-format
 msgid "(Redirected from %s)"
 msgstr "(Weitergeleitet von %s)"
 
-#: ../lib/display.php:367 ../themes/Crao/templates/head.tmpl:60
+#: ../lib/display.php:370 ../themes/Crao/templates/head.tmpl:60
 #: ../themes/Crao/templates/head.tmpl:61
 #: ../themes/default/templates/head.tmpl:68
 #: ../themes/default/templates/head.tmpl:69
@@ -247,65 +247,65 @@
 msgid "SandBox"
 msgstr "SandKasten"
 
-#: ../lib/editpage.php:161 ../lib/editpage.php:581
+#: ../lib/editpage.php:154 ../lib/editpage.php:593
 msgid "Your version"
 msgstr "Ihre Version"
 
-#: ../lib/editpage.php:161 ../lib/editpage.php:582
+#: ../lib/editpage.php:154 ../lib/editpage.php:594
 msgid "Other version"
 msgstr "Andere Version"
 
-#: ../lib/editpage.php:172
+#: ../lib/editpage.php:165
 msgid "Some internal editing error"
 msgstr ""
 
-#: ../lib/editpage.php:173
+#: ../lib/editpage.php:166
 msgid ""
 "Your are probably trying to edit/create an invalid version of this page."
 msgstr ""
 "Sie versuchen offenbar eine ungültige Version dieser Seite zu bearbeiten."
 
-#: ../lib/editpage.php:174
+#: ../lib/editpage.php:167
 msgid "&version=-1 might help."
 msgstr "&version=-1 wird empfohlen."
 
 # (Wrong Translation; sorry, but the German term for edit is NOT
 # editieren, but  e d i e r e n).
-#: ../lib/editpage.php:193
+#: ../lib/editpage.php:186
 #, php-format
 msgid "Edit: %s"
 msgstr "Bearbeite: %s"
 
-#: ../lib/editpage.php:230
+#: ../lib/editpage.php:224
 #, php-format
 msgid "View Source: %s"
 msgstr "Quelltext Ansicht: %s"
 
-#: ../lib/editpage.php:248
+#: ../lib/editpage.php:243
 msgid "Page now locked."
 msgstr "Seite jetzt gesperrt."
 
-#: ../lib/editpage.php:249
+#: ../lib/editpage.php:244
 msgid "Page now unlocked."
 msgstr "Seite jetzt freigegeben."
 
-#: ../lib/editpage.php:256
+#: ../lib/editpage.php:251
 msgid "Page now public."
 msgstr "Seite jetzt öffentlich freigegeben."
 
-#: ../lib/editpage.php:257
+#: ../lib/editpage.php:252
 msgid "Page now not-public."
 msgstr "Seite jetzt nicht mehr öffentlich freigegeben."
 
-#: ../lib/editpage.php:266
+#: ../lib/editpage.php:261
 msgid "Page now external."
 msgstr ""
 
-#: ../lib/editpage.php:267
+#: ../lib/editpage.php:262
 msgid "Page now not-external."
 msgstr ""
 
-#: ../lib/editpage.php:376
+#: ../lib/editpage.php:372
 #, php-format
 msgid "Saved: %s"
 msgstr "Gespeichert: %s"
@@ -314,41 +314,41 @@
 msgid "Too many external links."
 msgstr "Zu viele externe Links."
 
-#: ../lib/editpage.php:443
+#: ../lib/editpage.php:444
 msgid "SpamAssassin reports: "
 msgstr "SpamAssassin sagt: "
 
-#: ../lib/editpage.php:470
+#: ../lib/editpage.php:471
 msgid "External links contain blocked domains:"
 msgstr ""
 
-#: ../lib/editpage.php:471
+#: ../lib/editpage.php:472
 #, php-format
 msgid "%s is listed at %s with %s"
 msgstr "%s ist gelistet auf %s mit %s"
 
-#: ../lib/editpage.php:495
+#: ../lib/editpage.php:498
 msgid "Spam Prevention"
 msgstr "AntiSpam"
 
-#: ../lib/editpage.php:496
+#: ../lib/editpage.php:499
 msgid "This page edit seems to contain spam and was therefore not saved."
 msgstr "Diese Bearbeitung scheint Spam beinzuhalten und wurde ignoriert."
 
-#: ../lib/editpage.php:498 ../lib/editpage.php:557
+#: ../lib/editpage.php:501 ../lib/editpage.php:564
 msgid "Sorry for the inconvenience."
 msgstr ""
 "Entschuldigen Sie bitte die hiermit für Sie verbundenen Unannehmlichkeiten."
 
-#: ../lib/editpage.php:523
+#: ../lib/editpage.php:529
 msgid "Versions are identical"
 msgstr "Versionen sind identisch"
 
-#: ../lib/editpage.php:554 ../themes/MacOSX/themeinfo.php:136
+#: ../lib/editpage.php:561 ../themes/MacOSX/themeinfo.php:140
 msgid "Page Locked"
 msgstr "Seite Gesperrt"
 
-#: ../lib/editpage.php:555
+#: ../lib/editpage.php:562
 msgid ""
 "This page has been locked by the administrator so your changes can not be "
 "saved."
@@ -356,7 +356,7 @@
 "Diese Seite wurde vom Administrator für die allgemeine Bearbeitung gesperrt. "
 "Ihre Änderungen können deshalb nicht gespeichert werden."
 
-#: ../lib/editpage.php:556
+#: ../lib/editpage.php:563
 msgid ""
 "(Copy your changes to the clipboard. You can try editing a different page or "
 "save your text in a text editor.)"
@@ -364,26 +364,26 @@
 "(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:565 ../lib/editpage.php:566 ../lib/main.php:806
-#: ../lib/main.php:1173 ../lib/plugin/ModeratedPage.php:42
-#: ../lib/plugin/ModeratedPage.php:147 ../lib/plugin/ModeratedPage.php:217
-#: ../lib/plugin/ModeratedPage.php:257 ../lib/plugin/ModeratedPage.php:260
-#: ../lib/plugin/ModeratedPage.php:262 ../lib/plugin/ModeratedPage.php:264
-#: ../lib/plugin/ModeratedPage.php:348 ../lib/plugin/ModeratedPage.php:352
-#: ../lib/plugin/ModeratedPage.php:407 ../lib/plugin/ModeratedPage.php:432
+#: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:831
+#: ../lib/main.php:1209 ../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
+#: ../lib/plugin/ModeratedPage.php:360 ../lib/plugin/ModeratedPage.php:364
+#: ../lib/plugin/ModeratedPage.php:420 ../lib/plugin/ModeratedPage.php:446
 msgid "ModeratedPage"
 msgstr "ModerierteSeite"
 
-#: ../lib/editpage.php:566
+#: ../lib/editpage.php:576
 #, php-format
 msgid ""
 "You can edit away, but your changes will have to be approved by the defined "
 "moderators at the definition in %s"
 msgstr ""
 
-#: ../lib/editpage.php:568 ../lib/plugin/PasswordReset.php:154
-#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:121
-#: ../lib/plugin/WatchPage.php:143 ../themes/blog/templates/navbar.tmpl:14
+#: ../lib/editpage.php:578 ../lib/plugin/PasswordReset.php:162
+#: ../lib/plugin/UserPreferences.php:40 ../lib/plugin/WatchPage.php:129
+#: ../lib/plugin/WatchPage.php:151 ../themes/blog/templates/navbar.tmpl:14
 #: ../themes/Crao/templates/head.tmpl:76 ../themes/Crao/templates/head.tmpl:77
 #: ../themes/Crao/templates/navbar.tmpl:21
 #: ../themes/default/templates/head.tmpl:84
@@ -401,14 +401,14 @@
 msgid "UserPreferences"
 msgstr "BenutzerEinstellungen"
 
-#: ../lib/editpage.php:567
+#: ../lib/editpage.php:577
 #, php-format
 msgid ""
 "The approval has a grace period of 5 days. If you have your E-Mail defined "
 "in your %s, you will get a notification of approval or rejection."
 msgstr ""
 
-#: ../lib/editpage.php:580 ../lib/editpage.php:942
+#: ../lib/editpage.php:592 ../lib/editpage.php:958
 #, php-format
 msgid ""
 "Some of the changes could not automatically be combined.  Please look for "
@@ -420,15 +420,15 @@
 "enden. Sie müssen diese Teile von Hand bearbeiten, bevor Sie auf Speichern "
 "klicken."
 
-#: ../lib/editpage.php:584 ../lib/editpage.php:945
+#: ../lib/editpage.php:596 ../lib/editpage.php:961
 msgid "Please check it through before saving."
 msgstr "Bitte überprüfen Sie erst alles, bevor Sie es abspeichern."
 
-#: ../lib/editpage.php:595
+#: ../lib/editpage.php:606
 msgid "Conflicting Edits!"
 msgstr "Widersprechende Änderungen!"
 
-#: ../lib/editpage.php:596
+#: ../lib/editpage.php:607
 msgid ""
 "In the time since you started editing this page, another user has saved a "
 "new version of it."
@@ -436,7 +436,7 @@
 "Während der Zeit, seit Sie mit der Bearbeitung dieser Seite begonnen haben, "
 "hat ein anderer Benutzer bereits eine neuere Version gespeichert."
 
-#: ../lib/editpage.php:597
+#: ../lib/editpage.php:608
 msgid ""
 "Your changes can not be saved as they are, since doing so would overwrite "
 "the other author's changes. So, your changes and those of the other author "
@@ -447,272 +447,272 @@
 "überschrieben. Deshalb sind Ihre und die Änderungen des anderen Autors "
 "miteinander kombiniert worden. Das Ergebnis sehen Sie unten."
 
-#: ../lib/editpage.php:666 ../lib/plugin/HtmlConverter.php:66
+#: ../lib/editpage.php:679 ../lib/plugin/HtmlConverter.php:70
 msgid "Convert"
 msgstr "Konvertieren"
 
-#: ../lib/editpage.php:695 ../lib/EditToolbar.php:210
-#: ../lib/EditToolbar.php:212 ../lib/WysiwygEdit/Wikiwyg.php:79
+#: ../lib/editpage.php:708 ../lib/EditToolbar.php:214
+#: ../lib/EditToolbar.php:216 ../lib/WysiwygEdit/Wikiwyg.php:82
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../lib/editpage.php:702 ../lib/EditToolbar.php:203
-#: ../lib/EditToolbar.php:205 ../lib/WysiwygEdit/Wikiwyg.php:80
+#: ../lib/editpage.php:715 ../lib/EditToolbar.php:207
+#: ../lib/EditToolbar.php:209 ../lib/WysiwygEdit/Wikiwyg.php:83
 msgid "Save"
 msgstr "Speichern"
 
-#: ../lib/editpage.php:706
+#: ../lib/editpage.php:719
 msgid "Changes"
 msgstr "Änderungen"
 
-#: ../lib/editpage.php:710 ../lib/plugin/UpLoad.php:161
-#: ../lib/plugin/UpLoad.php:166 ../lib/plugin/WikiForm.php:94
+#: ../lib/editpage.php:723 ../lib/plugin/UpLoad.php:165
+#: ../lib/plugin/UpLoad.php:170 ../lib/plugin/WikiForm.php:98
 msgid "Upload"
 msgstr "Hochladen"
 
-#: ../lib/editpage.php:713
+#: ../lib/editpage.php:726
 msgid "Spell Check"
 msgstr ""
 
-#: ../lib/editpage.php:736 ../themes/Portland/templates/editpage.tmpl:36
+#: ../lib/editpage.php:749 ../themes/Portland/templates/editpage.tmpl:36
 #: ../themes/Wordpress/templates/editpage.tmpl:52
 #, php-format
 msgid "Author will be logged as %s."
 msgstr "%s wird als Autor aufgenommen."
 
-#: ../lib/editpage.php:897
+#: ../lib/editpage.php:912
 msgid "Keep old"
 msgstr ""
 
-#: ../lib/editpage.php:900
+#: ../lib/editpage.php:915
 msgid "Overwrite with new"
 msgstr ""
 
 # (Wrong Translation; sorry, but the German term for edit is NOT
 # editieren, but  e d i e r e n).
-#: ../lib/editpage.php:910
+#: ../lib/editpage.php:925
 #, php-format
 msgid "Merge and Edit: %s"
 msgstr "Zusammenfügen und Bearbeiten: %s"
 
-#: ../lib/EditToolbar.php:48
+#: ../lib/EditToolbar.php:50
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: ../lib/EditToolbar.php:50
+#: ../lib/EditToolbar.php:52
 msgid "Undo disabled"
 msgstr "Undo deaktiviert"
 
-#: ../lib/EditToolbar.php:51
+#: ../lib/EditToolbar.php:53
 msgid "Operation undone"
 msgstr "Aktion rückgängig gemacht"
 
-#: ../lib/EditToolbar.php:52
+#: ../lib/EditToolbar.php:54
 msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?"
 msgstr "Substring \"\\1\" \\2 mal gefunden. Ersetze mit \"\\3\"?"
 
-#: ../lib/EditToolbar.php:53
+#: ../lib/EditToolbar.php:55
 #, php-format
 msgid "String \"%s\" not found."
 msgstr "Zeichenkette \"%s\" nicht gefunden."
 
-#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:255
-#: ../lib/EditToolbar.php:256 ../lib/plugin/WikiAdminSearchReplace.php:193
+#: ../lib/EditToolbar.php:56 ../lib/EditToolbar.php:259
+#: ../lib/EditToolbar.php:260 ../lib/plugin/WikiAdminSearchReplace.php:200
 msgid "Search & Replace"
 msgstr "Suchen & Ersetzen"
 
-#: ../lib/EditToolbar.php:55
+#: ../lib/EditToolbar.php:57
 msgid "Search for"
 msgstr "Suche nach"
 
-#: ../lib/EditToolbar.php:56
+#: ../lib/EditToolbar.php:58
 msgid "Replace with"
 msgstr "Ersetze mit"
 
-#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:299
-#: ../lib/plugin/SyncWiki.php:325 ../lib/plugin/SyncWiki.php:348
-#: ../lib/plugin/WikiPoll.php:221 ../lib/stdlib.php:1952
-#: ../lib/upgrade.php:195 ../lib/upgrade.php:398 ../lib/upgrade.php:412
-#: ../lib/upgrade.php:432 ../lib/upgrade.php:441 ../lib/upgrade.php:465
-#: ../lib/upgrade.php:493 ../lib/upgrade.php:543 ../lib/upgrade.php:546
-#: ../lib/upgrade.php:578 ../lib/upgrade.php:580 ../lib/upgrade.php:607
-#: ../lib/upgrade.php:667 ../lib/upgrade.php:692 ../lib/upgrade.php:835
-#: ../lib/upgrade.php:838 ../lib/upgrade.php:905
+#: ../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/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
+#: ../lib/upgrade.php:586 ../lib/upgrade.php:588 ../lib/upgrade.php:615
+#: ../lib/upgrade.php:675 ../lib/upgrade.php:700 ../lib/upgrade.php:848
+#: ../lib/upgrade.php:851 ../lib/upgrade.php:920
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:322
-#: ../lib/EditToolbar.php:372 ../lib/EditToolbar.php:402
-#: ../lib/EditToolbar.php:440 ../lib/EditToolbar.php:475
+#: ../lib/EditToolbar.php:60 ../lib/EditToolbar.php:327
+#: ../lib/EditToolbar.php:378 ../lib/EditToolbar.php:409
+#: ../lib/EditToolbar.php:448 ../lib/EditToolbar.php:484
 msgid "Close"
 msgstr "Schließen"
 
-#: ../lib/EditToolbar.php:125
+#: ../lib/EditToolbar.php:129
 msgid "Bold text"
 msgstr "Fetter Text"
 
-#: ../lib/EditToolbar.php:126
+#: ../lib/EditToolbar.php:130
 msgid "Bold text [alt-b]"
 msgstr "Fetter Text [alt-f]"
 
-#: ../lib/EditToolbar.php:130
+#: ../lib/EditToolbar.php:134
 msgid "Italic text"
 msgstr "Kursiver Text"
 
-#: ../lib/EditToolbar.php:131
+#: ../lib/EditToolbar.php:135
 msgid "Italic text [alt-i]"
 msgstr "Kursiver Text [alt-k]"
 
-#: ../lib/EditToolbar.php:135
+#: ../lib/EditToolbar.php:139
 msgid "Strike-through text"
 msgstr "Durchgestrichen"
 
-#: ../lib/EditToolbar.php:136
+#: ../lib/EditToolbar.php:140
 msgid "Strike"
 msgstr "Durchstreichen"
 
-#: ../lib/EditToolbar.php:140
+#: ../lib/EditToolbar.php:144
 msgid "Color text"
 msgstr "Farbiger Text"
 
-#: ../lib/EditToolbar.php:141
+#: ../lib/EditToolbar.php:145
 msgid "Color"
 msgstr "Farbe"
 
-#: ../lib/EditToolbar.php:145
+#: ../lib/EditToolbar.php:149
 msgid "PageName|optional label"
 msgstr "SeitenName|optionaler Name"
 
-#: ../lib/EditToolbar.php:146
+#: ../lib/EditToolbar.php:150
 msgid "Link to page"
 msgstr "Link auf Seite"
 
-#: ../lib/EditToolbar.php:150
+#: ../lib/EditToolbar.php:154
 msgid "http://www.example.com|optional label"
 msgstr "http://www.example.com|optionaler Name"
 
-#: ../lib/EditToolbar.php:151
+#: ../lib/EditToolbar.php:155
 msgid "External link (remember http:// prefix)"
 msgstr "Externer Link (http:// prefix)"
 
-#: ../lib/EditToolbar.php:155
+#: ../lib/EditToolbar.php:159
 msgid "Headline text"
 msgstr "Überschrift"
 
-#: ../lib/EditToolbar.php:156
+#: ../lib/EditToolbar.php:160
 msgid "Level 1 headline"
 msgstr "H1 Überschrift"
 
-#: ../lib/EditToolbar.php:160
+#: ../lib/EditToolbar.php:164
 msgid "Insert non-formatted text here"
 msgstr "Füge unformatierten Text hier ein"
 
-#: ../lib/EditToolbar.php:161
+#: ../lib/EditToolbar.php:165
 msgid "Ignore wiki formatting"
 msgstr "Keine Wiki Formatierung"
 
-#: ../lib/EditToolbar.php:166
+#: ../lib/EditToolbar.php:170
 msgid "Your signature"
 msgstr "Deine Signatur"
 
-#: ../lib/EditToolbar.php:171
+#: ../lib/EditToolbar.php:175
 msgid "Horizontal line"
 msgstr "Horizontale Trennlinie"
 
-#: ../lib/EditToolbar.php:176
+#: ../lib/EditToolbar.php:180
 msgid "Sample table"
 msgstr "Beispieltabelle"
 
-#: ../lib/EditToolbar.php:181
+#: ../lib/EditToolbar.php:185
 msgid "Enumeration"
 msgstr "Num. Liste"
 
-#: ../lib/EditToolbar.php:186
+#: ../lib/EditToolbar.php:190
 msgid "List"
 msgstr "Liste"
 
-#: ../lib/EditToolbar.php:191 ../lib/plugin/CreateToc.php:479
-#: ../lib/plugin/CreateToc.php:494 ../lib/WysiwygEdit/Wikiwyg.php:75
+#: ../lib/EditToolbar.php:195 ../lib/plugin/CreateToc.php:502
+#: ../lib/plugin/CreateToc.php:517 ../lib/WysiwygEdit/Wikiwyg.php:78
 msgid "Table of Contents"
 msgstr "Inhaltsverzeichnis"
 
-#: ../lib/EditToolbar.php:195 ../lib/PageList.php:489
-#: ../lib/plugin/AuthorHistory.php:150 ../lib/plugin/WantedPagesOld.php:143
+#: ../lib/EditToolbar.php:199 ../lib/PageList.php:560
+#: ../lib/plugin/AuthorHistory.php:154 ../lib/plugin/WantedPagesOld.php:147
 msgid "Page Name"
 msgstr "Seitenname"
 
-#: ../lib/EditToolbar.php:196 ../themes/default/templates/redirect.tmpl:16
+#: ../lib/EditToolbar.php:200 ../themes/default/templates/redirect.tmpl:16
 #: ../themes/default/templates/redirect.tmpl:39
 msgid "Redirect"
 msgstr "Weiterleiten"
 
-#: ../lib/EditToolbar.php:200
+#: ../lib/EditToolbar.php:204
 msgid "Template Name"
 msgstr "Vorlagenname"
 
-#: ../lib/EditToolbar.php:201 ../lib/plugin/PopularTags.php:57
-#: ../lib/plugin/Template.php:61
+#: ../lib/EditToolbar.php:205 ../lib/plugin/PopularTags.php:61
+#: ../lib/plugin/Template.php:62
 msgid "Template"
 msgstr "Vorlage"
 
-#: ../lib/EditToolbar.php:233
+#: ../lib/EditToolbar.php:237
 msgid "Click a button to get an example text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:247 ../lib/EditToolbar.php:248
+#: ../lib/EditToolbar.php:251 ../lib/EditToolbar.php:252
 msgid "Undo Search & Replace"
 msgstr "Suchen & Ersetzen rückgängig machen"
 
-#: ../lib/EditToolbar.php:316 ../lib/EditToolbar.php:319
+#: ../lib/EditToolbar.php:321 ../lib/EditToolbar.php:324
 msgid "Insert Categories"
 msgstr "Neue Kategorie"
 
-#: ../lib/EditToolbar.php:321 ../lib/EditToolbar.php:371
-#: ../lib/EditToolbar.php:401 ../lib/EditToolbar.php:439
-#: ../lib/EditToolbar.php:474
+#: ../lib/EditToolbar.php:326 ../lib/EditToolbar.php:377
+#: ../lib/EditToolbar.php:408 ../lib/EditToolbar.php:447
+#: ../lib/EditToolbar.php:483
 msgid "Insert"
 msgstr "Einfügen"
 
-#: ../lib/EditToolbar.php:366 ../lib/EditToolbar.php:367
-#: ../lib/EditToolbar.php:369
+#: ../lib/EditToolbar.php:372 ../lib/EditToolbar.php:373
+#: ../lib/EditToolbar.php:375
 msgid "Insert Plugin"
 msgstr "Zusatzprogramme einfügen"
 
-#: ../lib/EditToolbar.php:396 ../lib/EditToolbar.php:397
-#: ../lib/EditToolbar.php:399
+#: ../lib/EditToolbar.php:403 ../lib/EditToolbar.php:404
+#: ../lib/EditToolbar.php:406
 msgid "Insert PageLink"
 msgstr "SeitenLink einfügen"
 
-#: ../lib/EditToolbar.php:434 ../lib/EditToolbar.php:435
-#: ../lib/EditToolbar.php:437
+#: ../lib/EditToolbar.php:442 ../lib/EditToolbar.php:443
+#: ../lib/EditToolbar.php:445
 msgid "Insert Image or Video"
 msgstr "Bild oder Video einfügen"
 
-#: ../lib/EditToolbar.php:469 ../lib/EditToolbar.php:470
-#: ../lib/EditToolbar.php:472
+#: ../lib/EditToolbar.php:478 ../lib/EditToolbar.php:479
+#: ../lib/EditToolbar.php:481
 msgid "Insert Template"
 msgstr "Vorlage einfügen"
 
-#: ../lib/ErrorManager.php:220
+#: ../lib/ErrorManager.php:231
 #, php-format
 msgid "%s: error while handling error:"
 msgstr "%s: Fehler während der Fehlerbehandlung von:"
 
-#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1143
+#: ../lib/FileFinder.php:199 ../lib/loadsave.php:1158
 #, php-format
 msgid "%s: file not found"
 msgstr "»%s«: Datei nicht gefunden"
 
-#: ../lib/IniConfig.php:994
+#: ../lib/IniConfig.php:1010
 msgid "CategoryGroup"
 msgstr "KategorieGruppen"
 
 # (namenlos=unbenannt; depends on interpretation)
-#: ../lib/IniConfig.php:996
+#: ../lib/IniConfig.php:1012
 msgid "An unnamed PhpWiki"
 msgstr "Unbenanntes PhpWiki"
 
-#: ../lib/IniConfig.php:998 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:1014 ../lib/upgrade.php:73
 #: ../themes/blog/templates/browse-footer.tmpl:3
 #: ../themes/default/templates/userprefs.tmpl:129
 #: ../themes/fusionforge/templates/navbar.tmpl:7
@@ -720,73 +720,73 @@
 msgid "HomePage"
 msgstr "StartSeite"
 
-#: ../lib/InlineParser.php:341
+#: ../lib/InlineParser.php:358
 msgid "Invalid [] syntax ignored"
 msgstr "Ungültige [] syntax ignoriert"
 
-#: ../lib/InlineParser.php:341 ../lib/plugin/ModeratedPage.php:257
-#: ../lib/plugin/ModeratedPage.php:260 ../lib/plugin/ModeratedPage.php:352
-#: ../lib/plugin/SemanticSearch.php:157 ../lib/plugin/SemanticSearch.php:240
-#: ../lib/plugin/SpellCheck.php:178 ../lib/plugin/WikiAdminRename.php:270
-#: ../lib/plugin/WikiAdminRename.php:276
-#: ../lib/plugin/WikiAdminSearchReplace.php:231
-#: ../lib/plugin/WikiAdminSearchReplace.php:235
-#: ../lib/plugin/WikiAdminSetAcl.php:247 ../lib/plugin/WikiAdminSetAcl.php:248
-#: ../lib/plugin/WikiAdminSetAcl.php:250 ../lib/upgrade.php:1104
-#: ../lib/upgrade.php:1112 ../themes/blog/templates/blogform.tmpl:7
+#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:268
+#: ../lib/plugin/ModeratedPage.php:271 ../lib/plugin/ModeratedPage.php:364
+#: ../lib/plugin/SemanticSearch.php:163 ../lib/plugin/SemanticSearch.php:246
+#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/WikiAdminRename.php:277
+#: ../lib/plugin/WikiAdminRename.php:283
+#: ../lib/plugin/WikiAdminSearchReplace.php:240
+#: ../lib/plugin/WikiAdminSearchReplace.php:244
+#: ../lib/plugin/WikiAdminSetAcl.php:253 ../lib/plugin/WikiAdminSetAcl.php:254
+#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
+#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
 #: ../themes/default/templates/blogform.tmpl:7
 #: ../themes/fusionforge/templates/blogform.tmpl:7
-#: ../themes/fusionforge/themeinfo.php:49
+#: ../themes/fusionforge/themeinfo.php:52
 msgid ": "
 msgstr ": "
 
-#: ../lib/InlineParser.php:392 ../lib/main.php:767 ../lib/stdlib.php:969
+#: ../lib/InlineParser.php:409 ../lib/main.php:793 ../lib/stdlib.php:988
 msgid "Page name too long"
 msgstr "Seite Name zu lang"
 
-#: ../lib/InlineParser.php:398 ../lib/main.php:774
+#: ../lib/InlineParser.php:415 ../lib/main.php:800
 #, php-format
 msgid "Illegal character '%s' in page name."
 msgstr "Ungültiges Zeichen '%s' in Seitenname."
 
-#: ../lib/InlineParser.php:920
+#: ../lib/InlineParser.php:979
 #, php-format
 msgid "unknown color %s ignored"
 msgstr "unbekannte Farbe %s ignoriert"
 
-#: ../lib/loadsave.php:71
+#: ../lib/loadsave.php:73
 msgid "ZIP files of database"
 msgstr "Speichern und Archivieren"
 
-#: ../lib/loadsave.php:72
+#: ../lib/loadsave.php:76
 msgid "Dump to directory"
 msgstr "Wiki Seiten als Dateien in lokales Verzeichnis speichern"
 
-#: ../lib/loadsave.php:73 ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../lib/loadsave.php:79 ../themes/fusionforge/templates/navbar.tmpl:17
 #: ../themes/MonoBook/templates/navbar.tmpl:58
 #: ../themes/Sidebar/templates/navbar.tmpl:48
 msgid "Upload File"
 msgstr "Datei Hochladen"
 
-#: ../lib/loadsave.php:74 ../lib/plugin/WikiForm.php:67
+#: ../lib/loadsave.php:82 ../lib/plugin/WikiForm.php:71
 msgid "Load File"
 msgstr "Datei Laden"
 
-#: ../lib/loadsave.php:75
+#: ../lib/loadsave.php:85
 msgid "Upgrade"
 msgstr "Updaten"
 
-#: ../lib/loadsave.php:77
+#: ../lib/loadsave.php:89
 msgid "Dump pages as XHTML"
 msgstr "Seiten als XHTML Dateien speichern"
 
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
-#: ../lib/loadsave.php:83 ../lib/loadsave.php:466 ../lib/loadsave.php:1027
-#: ../lib/loadsave.php:1033 ../lib/loadsave.php:1041 ../lib/main.php:1069
-#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:185
-#: ../lib/PagePerm.php:186 ../lib/plugin/WikiAdminRename.php:144
-#: ../lib/plugin/WikiAdminSelect.php:218
+#: ../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:1229 ../lib/main.php:1242 ../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
@@ -808,30 +808,30 @@
 
 # (Wrong Translation; sorry, but the German term for edit is NOT
 # editieren, but  e d i e r e n).
-#: ../lib/loadsave.php:94 ../lib/MailNotify.php:297
+#: ../lib/loadsave.php:107 ../lib/MailNotify.php:306
 #, php-format
 msgid "Edited by: %s"
 msgstr "Bearbeitet von: %s"
 
-#: ../lib/loadsave.php:96 ../lib/loadsave.php:97
+#: ../lib/loadsave.php:109 ../lib/loadsave.php:110
 msgid "LoadDump"
 msgstr "SeiteLaden"
 
-#: ../lib/loadsave.php:100
+#: ../lib/loadsave.php:114
 #, php-format
 msgid "PageChange Notification of %s sent to %s"
 msgstr "SeitenÄnderung Benachrichtigung von %s an %s gesendet"
 
-#: ../lib/loadsave.php:103
+#: ../lib/loadsave.php:117
 #, php-format
 msgid "PageChange Notification Error: Couldn't send %s to %s"
 msgstr "SeitenÄnderung Benachrichtigung Fehler: Konnte %s nicht an %s senden"
 
-#: ../lib/loadsave.php:111
+#: ../lib/loadsave.php:125
 msgid "Complete."
 msgstr "Fertig."
 
-#: ../lib/loadsave.php:112
+#: ../lib/loadsave.php:126
 #, php-format
 msgid "Return to %s"
 msgstr "Zurück zu %s"
@@ -840,141 +840,141 @@
 # all revisions of all pages (FullDump), or just the most recent
 # revision of each page (LatestSnapshot).
 # VollständigerSpeicherauszug, VolligerSpeicherauszug oder...?
-#: ../lib/loadsave.php:235
+#: ../lib/loadsave.php:251
 msgid "FullDump"
 msgstr "VollSicherung"
 
-#: ../lib/loadsave.php:239
+#: ../lib/loadsave.php:254
 msgid "LatestSnapshot"
 msgstr "LetzeSicherung"
 
-#: ../lib/loadsave.php:309 ../lib/loadsave.php:440
+#: ../lib/loadsave.php:324 ../lib/loadsave.php:457
 msgid "You must specify a directory to dump to"
 msgstr "Sie müssen zum Sichern ein Verzeichnis angeben."
 
-#: ../lib/loadsave.php:314 ../lib/loadsave.php:445
+#: ../lib/loadsave.php:329 ../lib/loadsave.php:462
 #, php-format
 msgid "Cannot create directory '%s'"
 msgstr "Das Verzeichnis »%s« kann nicht erzeugt werden"
 
-#: ../lib/loadsave.php:316 ../lib/loadsave.php:447
+#: ../lib/loadsave.php:331 ../lib/loadsave.php:464
 #, php-format
 msgid "Created directory '%s' for the page dump..."
 msgstr "Ein Verzeichnis »%s« wurde erzeugt, um die Dateien abzulegen..."
 
-#: ../lib/loadsave.php:319 ../lib/loadsave.php:450
+#: ../lib/loadsave.php:334 ../lib/loadsave.php:467
 #, php-format
 msgid "Using directory '%s'"
 msgstr "Das Verzeichnis »%s« wird verwendet"
 
-#: ../lib/loadsave.php:322 ../lib/loadsave.php:452
+#: ../lib/loadsave.php:337 ../lib/loadsave.php:469
 msgid "Dumping Pages"
 msgstr "Die Seiten werden geschrieben"
 
-#: ../lib/loadsave.php:358 ../lib/loadsave.php:621 ../lib/stdlib.php:1026
+#: ../lib/loadsave.php:373 ../lib/loadsave.php:640 ../lib/stdlib.php:1046
 msgid "Skipped."
 msgstr "Ausgelassen."
 
-#: ../lib/loadsave.php:366
+#: ../lib/loadsave.php:381
 #, php-format
 msgid "saved as %s"
 msgstr "gespeichert als %s"
 
-#: ../lib/loadsave.php:376 ../lib/loadsave.php:691
-#: ../lib/plugin/text2png.php:222
+#: ../lib/loadsave.php:391 ../lib/loadsave.php:710
+#: ../lib/plugin/text2png.php:227
 #, php-format
 msgid "couldn't open file '%s' for writing"
 msgstr "Datei »%s« konnte nicht zum Schreiben geöffnet werden"
 
-#: ../lib/loadsave.php:382 ../lib/loadsave.php:701
+#: ../lib/loadsave.php:397 ../lib/loadsave.php:720
 #, php-format
 msgid "%s bytes written"
 msgstr "%s Bytes geschrieben"
 
-#: ../lib/loadsave.php:675 ../lib/loadsave.php:752 ../lib/loadsave.php:787
-#: ../lib/loadsave.php:817
+#: ../lib/loadsave.php:694 ../lib/loadsave.php:771 ../lib/loadsave.php:806
+#: ../lib/loadsave.php:836
 #, php-format
 msgid "... copied to %s"
 msgstr "... kopiert nach %s"
 
-#: ../lib/loadsave.php:678 ../lib/loadsave.php:754 ../lib/loadsave.php:789
-#: ../lib/loadsave.php:819
+#: ../lib/loadsave.php:697 ../lib/loadsave.php:773 ../lib/loadsave.php:808
+#: ../lib/loadsave.php:838
 #, php-format
 msgid "... not copied to %s"
 msgstr "... nicht kopiert nach %s"
 
-#: ../lib/loadsave.php:699
+#: ../lib/loadsave.php:718
 msgid "saved as "
 msgstr "gespeichert als "
 
-#: ../lib/loadsave.php:762 ../lib/loadsave.php:797 ../lib/loadsave.php:828
+#: ../lib/loadsave.php:781 ../lib/loadsave.php:816 ../lib/loadsave.php:847
 msgid "... not found"
 msgstr "... nicht gefunden"
 
-#: ../lib/loadsave.php:887
+#: ../lib/loadsave.php:905
 msgid "Empty pagename!"
 msgstr "Leerer Seitenname!"
 
-#: ../lib/loadsave.php:897 ../lib/WikiTheme.php:686
+#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:701
 #, php-format
 msgid "'%s': Bad page name"
 msgstr "»%s«: Ungültiger Seitenname"
 
-#: ../lib/loadsave.php:903 ../lib/loadsave.php:1543 ../lib/PageType.php:136
-#: ../lib/plugin/InterWikiSearch.php:52 ../lib/plugin/WantedPagesOld.php:73
-#: ../lib/plugin/WantedPages.php:51 ../themes/default/templates/info.tmpl:155
+#: ../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/default/templates/info.tmpl:156
 #: ../themes/MonoBook/templates/info.tmpl:161
 #: ../themes/MonoBook/templates/info.tmpl:162
 msgid "InterWikiMap"
 msgstr "InterWikiListe"
 
-#: ../lib/loadsave.php:960
+#: ../lib/loadsave.php:975
 #, php-format
 msgid "from %s"
 msgstr "von %s"
 
-#: ../lib/loadsave.php:969 ../lib/MailNotify.php:304
-#: ../lib/plugin/RecentChanges.php:137
+#: ../lib/loadsave.php:984 ../lib/MailNotify.php:313
+#: ../lib/plugin/RecentChanges.php:150
 msgid "New page"
 msgstr "Neue Seite"
 
-#: ../lib/loadsave.php:977
+#: ../lib/loadsave.php:992
 msgid "has edit conflicts - overwriting anyway"
 msgstr ""
 "hat unauflösbare Konflikte beim Speichern - wird ungeprüft überschrieben"
 
-#: ../lib/loadsave.php:986
+#: ../lib/loadsave.php:1000
 msgid "keep old"
 msgstr ""
 
-#: ../lib/loadsave.php:988
+#: ../lib/loadsave.php:1002
 msgid "has edit conflicts - skipped"
 msgstr "hat unauflösbare Konflikte beim Speichern - übersprungen"
 
-#: ../lib/loadsave.php:997
+#: ../lib/loadsave.php:1010
 #, php-format
 msgid "content is identical to current version %d - no new revision created"
 msgstr ""
 "Inhalt ist identisch mit der aktuellen Version %d - keine neue Version "
 "erzeugt"
 
-#: ../lib/loadsave.php:1011
+#: ../lib/loadsave.php:1025
 #, php-format
 msgid "- saved to database as version %d"
 msgstr "- in der Datenbank gespeichert als Version %d."
 
-#: ../lib/loadsave.php:1017 ../lib/loadsave.php:1283
+#: ../lib/loadsave.php:1031 ../lib/loadsave.php:1300
 #, php-format
 msgid "MIME file %s"
 msgstr "MIME-Datei %s"
 
-#: ../lib/loadsave.php:1018 ../lib/loadsave.php:1294
+#: ../lib/loadsave.php:1032 ../lib/loadsave.php:1311
 #, php-format
 msgid "Serialized file %s"
 msgstr "Serialisierte Datei %s"
 
-#: ../lib/loadsave.php:1019 ../lib/loadsave.php:1316
+#: ../lib/loadsave.php:1033 ../lib/loadsave.php:1332
 #, php-format
 msgid "plain file %s"
 msgstr "Nur-Text-Datei %s"
@@ -982,188 +982,188 @@
 # This translation gives the general idea of the action to be performed, 
 # but the text must be brief enough to fit inside a button:
 # "widersprechende Änderungen Zusammenfügen und die ergebende Seite Bearbeiten"
-#: ../lib/loadsave.php:1026 ../lib/plugin/SyncWiki.php:268
+#: ../lib/loadsave.php:1040 ../lib/plugin/SyncWiki.php:276
 msgid "Merge Edit"
 msgstr "Zusammenfügen Bearbeiten"
 
-#: ../lib/loadsave.php:1032
+#: ../lib/loadsave.php:1046
 msgid "Restore Anyway"
 msgstr "Ungeprüft überschreiben"
 
-#: ../lib/loadsave.php:1040
+#: ../lib/loadsave.php:1054
 msgid "Overwrite All"
 msgstr ""
 
-#: ../lib/loadsave.php:1047
+#: ../lib/loadsave.php:1061
 msgid " Sorry, cannot merge."
 msgstr " Konnte leider nicht automatisch einpflegen."
 
-#: ../lib/loadsave.php:1070
+#: ../lib/loadsave.php:1084
 #, fuzzy
 msgid "Revert: missing required version argument"
 msgstr "Parameter version muß angegeben werden"
 
-#: ../lib/loadsave.php:1077
+#: ../lib/loadsave.php:1091
 #, fuzzy
 msgid "No revert: no page content"
 msgstr "leerer Seiteninalt"
 
-#: ../lib/loadsave.php:1082
+#: ../lib/loadsave.php:1096
 #, fuzzy
 msgid "No revert: same version page"
 msgstr "selbe Version der Seite"
 
-#: ../lib/loadsave.php:1087
+#: ../lib/loadsave.php:1101
 #, fuzzy
 msgid "Revert cancelled"
 msgstr "Abgebrochen"
 
-#: ../lib/loadsave.php:1096 ../lib/plugin/PasswordReset.php:102
-#: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/UserPreferences.php:116
-#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:141
-#: ../lib/plugin/WikiAdminChown.php:170 ../lib/plugin/WikiAdminMarkup.php:162
-#: ../lib/plugin/WikiAdminPurge.php:144 ../lib/plugin/WikiAdminRemove.php:197
-#: ../lib/plugin/WikiAdminRename.php:210
-#: ../lib/plugin/WikiAdminSearchReplace.php:187
-#: ../lib/plugin/WikiAdminSetAcl.php:197
+#: ../lib/loadsave.php:1110 ../lib/plugin/PasswordReset.php:109
+#: ../lib/plugin/PasswordReset.php:153 ../lib/plugin/UserPreferences.php:120
+#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:148
+#: ../lib/plugin/WikiAdminChown.php:177 ../lib/plugin/WikiAdminMarkup.php:168
+#: ../lib/plugin/WikiAdminPurge.php:151 ../lib/plugin/WikiAdminRemove.php:204
+#: ../lib/plugin/WikiAdminRename.php:215
+#: ../lib/plugin/WikiAdminSearchReplace.php:194
+#: ../lib/plugin/WikiAdminSetAcl.php:204
 #: ../themes/default/templates/info.tmpl:129
 msgid "Yes"
 msgstr "Ja"
 
-#: ../lib/loadsave.php:1098 ../lib/plugin/PasswordReset.php:105
-#: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
-#: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
-#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
-#: ../lib/plugin/WikiAdminChown.php:184 ../lib/plugin/WikiAdminMarkup.php:176
-#: ../lib/plugin/WikiAdminPurge.php:155 ../lib/plugin/WikiAdminRemove.php:220
-#: ../lib/plugin/WikiAdminRename.php:233
-#: ../lib/plugin/WikiAdminSearchReplace.php:199
-#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
-#: ../lib/plugin/WikiAdminSetExternal.php:131
-#: ../lib/plugin/WikiAdminUtils.php:292 ../lib/plugin/WikiFormRich.php:307
-#: ../lib/purgepage.php:25 ../lib/removepage.php:25 ../lib/upgrade.php:791
+#: ../lib/loadsave.php:1112 ../lib/plugin/PasswordReset.php:112
+#: ../lib/plugin/PasswordReset.php:156 ../lib/plugin/TranslateText.php:117
+#: ../lib/plugin/UserPreferences.php:122 ../lib/plugin/WatchPage.php:92
+#: ../lib/plugin/WatchPage.php:97 ../lib/plugin/WikiAdminChmod.php:160
+#: ../lib/plugin/WikiAdminChown.php:190 ../lib/plugin/WikiAdminMarkup.php:181
+#: ../lib/plugin/WikiAdminPurge.php:161 ../lib/plugin/WikiAdminRemove.php:226
+#: ../lib/plugin/WikiAdminRename.php:238
+#: ../lib/plugin/WikiAdminSearchReplace.php:206
+#: ../lib/plugin/WikiAdminSelect.php:152 ../lib/plugin/WikiAdminSetAcl.php:216
+#: ../lib/plugin/WikiAdminSetExternal.php:137
+#: ../lib/plugin/WikiAdminUtils.php:308 ../lib/plugin/WikiFormRich.php:313
+#: ../lib/purgepage.php:25 ../lib/removepage.php:25 ../lib/upgrade.php:803
 #: ../themes/default/templates/login.tmpl:85
 #: ../themes/default/templates/userprefs.tmpl:290
 #: ../themes/fusionforge/templates/userprefs.tmpl:390
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../lib/loadsave.php:1112
+#: ../lib/loadsave.php:1126
 #, php-format
 msgid "revert to version %d"
 msgstr "Speichere Version %d zurück."
 
-#: ../lib/loadsave.php:1119
+#: ../lib/loadsave.php:1133
 #, php-format
 msgid "Revert: %s"
 msgstr "Zurückspeichern: %s"
 
-#: ../lib/loadsave.php:1120
+#: ../lib/loadsave.php:1134
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr "- version %d in der Datenbank gespeichert als Version %d."
 
-#: ../lib/loadsave.php:1138 ../lib/WikiGroup.php:838
+#: ../lib/loadsave.php:1153 ../lib/WikiGroup.php:882
 #, php-format
 msgid "%s: not defined"
 msgstr "%s: nicht definiert"
 
-#: ../lib/loadsave.php:1148
+#: ../lib/loadsave.php:1163
 msgid "Default InterWiki map file not loaded."
 msgstr "Standard-Datei der InterWikiListe nicht geladen."
 
-#: ../lib/loadsave.php:1155 ../lib/PageType.php:298
+#: ../lib/loadsave.php:1170 ../lib/PageType.php:330
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr "Die InterWikiListe wird von der externen Datei %s geladen."
 
-#: ../lib/loadsave.php:1331 ../lib/loadsave.php:1344
+#: ../lib/loadsave.php:1349 ../lib/loadsave.php:1363
 msgid "Skipping"
 msgstr "Übersprungen"
 
-#: ../lib/loadsave.php:1443
+#: ../lib/loadsave.php:1464
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1450
+#: ../lib/loadsave.php:1468
 #, php-format
 msgid "Bad file type: %s"
 msgstr "Ungültiger Dateityp: %s"
 
-#: ../lib/loadsave.php:1467
+#: ../lib/loadsave.php:1482
 #, php-format
 msgid "Loading '%s'"
 msgstr "»%s« wird geladen"
 
-#: ../lib/loadsave.php:1499
+#: ../lib/loadsave.php:1514
 msgid "Loading up virgin wiki"
 msgstr "Lade neue Seiten in das frische Wiki"
 
-#: ../lib/loadsave.php:1555
+#: ../lib/loadsave.php:1569
 msgid "No uploaded file to upload?"
 msgstr "Keine Datei zum Hochladen?"
 
-#: ../lib/loadsave.php:1558
+#: ../lib/loadsave.php:1572
 #, php-format
 msgid "Uploading %s"
 msgstr "%s wird hochgeladen"
 
-#: ../lib/MailNotify.php:202
+#: ../lib/MailNotify.php:210
 #, php-format
 msgid "PageChange Notification of %s"
 msgstr "SeitenÄnderung Benachrichtigung von %s"
 
-#: ../lib/MailNotify.php:243
+#: ../lib/MailNotify.php:251
 #, php-format
 msgid "sent to %s"
 msgstr "an %s gesendet"
 
-#: ../lib/MailNotify.php:249
+#: ../lib/MailNotify.php:257
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "Fehler: Konnte nicht %s an %s senden"
 
-#: ../lib/MailNotify.php:277
+#: ../lib/MailNotify.php:286
 msgid "Page change"
 msgstr "Seiten Änderung"
 
-#: ../lib/MailNotify.php:300
+#: ../lib/MailNotify.php:309
 #, fuzzy
 msgid "Page creation"
 msgstr "Seiten Version"
 
-#: ../lib/MailNotify.php:307
+#: ../lib/MailNotify.php:316
 #, fuzzy, php-format
 msgid "Created by: %s"
 msgstr "Erzeugen: %s"
 
-#: ../lib/MailNotify.php:309
+#: ../lib/MailNotify.php:318
 #, php-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
 
-#: ../lib/MailNotify.php:319
+#: ../lib/MailNotify.php:329
 #, fuzzy, php-format
 msgid "Renamed by: %s"
 msgstr "umbenannt von %s"
 
-#: ../lib/MailNotify.php:320
+#: ../lib/MailNotify.php:330
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "Seite »%s« nach umbenennen »%s«"
 
-#: ../lib/MailNotify.php:356
+#: ../lib/MailNotify.php:368
 #, php-format
 msgid "User %s removed page %s"
 msgstr "Seite gelöscht %s von Benutzer %s"
 
-#: ../lib/MailNotify.php:392 ../lib/plugin/WikiAdminUtils.php:113
-#: ../lib/WikiUserNew.php:1780
+#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
+#: ../lib/WikiUserNew.php:1857
 msgid "E-mail address confirmation"
 msgstr "E-Mail Bestätigung"
 
-#: ../lib/MailNotify.php:395
+#: ../lib/MailNotify.php:409
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1178,277 +1178,277 @@
 "will expire at %s."
 msgstr ""
 
-#: ../lib/main.php:101 ../lib/WikiDB.php:1005
+#: ../lib/main.php:111 ../lib/WikiDB.php:1067
 msgid "Optimizing database"
 msgstr "Datenbank wird optimiert"
 
-#: ../lib/main.php:471
+#: ../lib/main.php:492
 msgid "FORBIDDEN"
 msgstr "VERBOTEN"
 
-#: ../lib/main.php:472 ../lib/main.php:482
+#: ../lib/main.php:493 ../lib/main.php:503
 msgid "ANON"
 msgstr "ANON"
 
-#: ../lib/main.php:473
+#: ../lib/main.php:494
 msgid "BOGO"
 msgstr "BOGO"
 
-#: ../lib/main.php:474
+#: ../lib/main.php:495
 msgid "USER"
 msgstr "BENUTZER"
 
-#: ../lib/main.php:475
+#: ../lib/main.php:496
 msgid "ADMIN"
 msgstr "ADMIN"
 
-#: ../lib/main.php:476
+#: ../lib/main.php:497
 msgid "UNOBTAINABLE"
 msgstr "UNERREICHBAR"
 
-#: ../lib/main.php:504 ../lib/main.php:523
+#: ../lib/main.php:526 ../lib/main.php:545
 #, php-format
 msgid "%s is disallowed on this wiki."
 msgstr "»%s« ist auf diesem Wiki nicht zugelassen."
 
-#: ../lib/main.php:512
+#: ../lib/main.php:534
 msgid "authenticated"
 msgstr "authentifizierten"
 
-#: ../lib/main.php:512
+#: ../lib/main.php:534
 msgid "not authenticated"
 msgstr "nicht authentifizierten"
 
-#: ../lib/main.php:514
+#: ../lib/main.php:536
 msgid "Missing PagePermission:"
 msgstr "Fehlende Zugriffsberechtigung:"
 
 # Missing PagePermission:| access | pagename
-#: ../lib/main.php:513
+#: ../lib/main.php:535
 #, php-format
 msgid "%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."
 msgstr ""
 "%s %s »%s« ist auf diesem Wiki für %s Benutzer »%s« (Level: %s) nicht "
 "zugelassen."
 
-#: ../lib/main.php:531
+#: ../lib/main.php:552
 #, php-format
 msgid "You must sign in to %s."
 msgstr "Sie müssen sich anmelden %s."
 
-#: ../lib/main.php:541
+#: ../lib/main.php:561
 #, php-format
 msgid "Access for you is forbidden to %s."
 msgstr ""
 
-#: ../lib/main.php:543 ../lib/plugin/PluginManager.php:58
+#: ../lib/main.php:562 ../lib/plugin/PluginManager.php:61
 #, php-format
 msgid "You must be an administrator to %s."
 msgstr "Sie müssen Administratorrechte haben %s."
 
-#: ../lib/main.php:557
+#: ../lib/main.php:577
 msgid "view this page"
 msgstr "um diese Seite anzuzeigen"
 
-#: ../lib/main.php:558
+#: ../lib/main.php:578
 msgid "diff this page"
 msgstr "um von dieser Seite die Änderungen anzuzeigen"
 
-#: ../lib/main.php:559
+#: ../lib/main.php:579
 msgid "dump html pages"
 msgstr "um von diesem Wiki HTML-Dateien lokal abzuspeichern"
 
-#: ../lib/main.php:560
+#: ../lib/main.php:580
 msgid "dump serial pages"
 msgstr "um von diesem Wiki die Seiten lokal abzuspeichern"
 
-#: ../lib/main.php:561
+#: ../lib/main.php:581
 msgid "edit this page"
 msgstr "um diese Seite zu bearbeiten"
 
-#: ../lib/main.php:562
+#: ../lib/main.php:582
 msgid "rename this page"
 msgstr "um diese Seite umzubennen"
 
-#: ../lib/main.php:563
+#: ../lib/main.php:583
 msgid "revert to a previous version of this page"
 msgstr "Zurückspeichern einer älteren Version dieser Seite."
 
-#: ../lib/main.php:564
+#: ../lib/main.php:584
 msgid "create this page"
 msgstr "um diese Seite zu erzeugen"
 
-#: ../lib/main.php:565
+#: ../lib/main.php:585
 msgid "load files into this wiki"
 msgstr "um Seiten in dieses Wiki zu laden"
 
-#: ../lib/main.php:566
+#: ../lib/main.php:586
 msgid "lock this page"
 msgstr "um diese Seite zu sperren"
 
-#: ../lib/main.php:567
+#: ../lib/main.php:587
 msgid "purge this page"
 msgstr "um diese Seite endgültig zu löschen"
 
-#: ../lib/main.php:568
+#: ../lib/main.php:588
 msgid "remove this page"
 msgstr "um diese Seite zu löschen"
 
-#: ../lib/main.php:569
+#: ../lib/main.php:589
 msgid "unlock this page"
 msgstr "um diese Seite zu entsperren"
 
-#: ../lib/main.php:570
+#: ../lib/main.php:590
 msgid "upload a zip dump"
 msgstr "um einen ZIP-Speicherauszug in dieses Wiki zu laden"
 
 # (verify=verwirklichen, in die Tat umsetzen, durch- oder ausführen)
-#: ../lib/main.php:571
+#: ../lib/main.php:591
 msgid "verify the current action"
 msgstr "um die gegenwärtige Aktion durchzuführen"
 
-#: ../lib/main.php:572
+#: ../lib/main.php:592
 msgid "view the source of this page"
 msgstr "um den Quelltext dieser Seiten anzusehen"
 
-#: ../lib/main.php:573
+#: ../lib/main.php:593
 msgid "access this wiki via XML-RPC"
 msgstr "um via XML-RPC auf dieses Wiki zuzugreifen"
 
-#: ../lib/main.php:574
+#: ../lib/main.php:594
 msgid "access this wiki via SOAP"
 msgstr "um via SOAP auf dieses Wiki zuzugreifen"
 
-#: ../lib/main.php:575
+#: ../lib/main.php:595
 msgid "download a zip dump from this wiki"
 msgstr "um eine gezippte Sicherung von allen Wiki Seiten herunterzuladen"
 
-#: ../lib/main.php:576
+#: ../lib/main.php:596
 msgid "download a html zip dump from this wiki"
 msgstr "um alle HTML Seiten als Zipdatei von diesem Wiki herunterzuladen"
 
-#: ../lib/main.php:582
+#: ../lib/main.php:602
 msgid "use"
 msgstr "benutze"
 
-#: ../lib/main.php:600
+#: ../lib/main.php:621
 msgid "Browsing pages"
 msgstr "Das Durchblättern der Seiten dieses Wikis"
 
-#: ../lib/main.php:601
+#: ../lib/main.php:622
 msgid "Diffing pages"
 msgstr "Die Inhalts-Differenz-Seiten dieses Wikis"
 
-#: ../lib/main.php:602
+#: ../lib/main.php:623
 msgid "Dumping html pages"
 msgstr "Die Speicherung von Wiki Seiten als HTML-Dateien"
 
-#: ../lib/main.php:603
+#: ../lib/main.php:624
 msgid "Dumping serial pages"
 msgstr "Die Speicherung von Wiki Seiten als Dateien"
 
-#: ../lib/main.php:604
+#: ../lib/main.php:625
 msgid "Editing pages"
 msgstr "Ändern in diesem Wiki"
 
-#: ../lib/main.php:605
+#: ../lib/main.php:626
 msgid "Reverting to a previous version of pages"
 msgstr "Zurückspeichern einer älteren Version"
 
-#: ../lib/main.php:606
+#: ../lib/main.php:627
 msgid "Creating pages"
 msgstr "Neue Seiten erzeugen"
 
-#: ../lib/main.php:607
+#: ../lib/main.php:628
 msgid "Loading files"
 msgstr "Dateien hinaufladen"
 
-#: ../lib/main.php:608
+#: ../lib/main.php:629
 msgid "Locking pages"
 msgstr "Seiten sperren"
 
-#: ../lib/main.php:609
+#: ../lib/main.php:630
 msgid "Purging pages"
 msgstr "Das Durchblättern der Seiten dieses Wikis"
 
-#: ../lib/main.php:610
+#: ../lib/main.php:631
 msgid "Removing pages"
 msgstr "Die Seitenlöschung in diesem Wiki"
 
-#: ../lib/main.php:611
+#: ../lib/main.php:632
 msgid "Unlocking pages"
 msgstr "Die Seitenfreigabe in diesem Wiki"
 
-#: ../lib/main.php:612
+#: ../lib/main.php:633
 msgid "Uploading zip dumps"
 msgstr "Das Hochladen von ZIP-Dumps in diesem Wiki"
 
-#: ../lib/main.php:613
+#: ../lib/main.php:634
 msgid "Verify the current action"
 msgstr "Bestätigen Sie die gegenwärtige Aktion"
 
-#: ../lib/main.php:614
+#: ../lib/main.php:635
 msgid "Viewing the source of pages"
 msgstr "Die Quelltextansicht der Seiten in diesem Wiki"
 
-#: ../lib/main.php:615
+#: ../lib/main.php:636
 msgid "XML-RPC access"
 msgstr "XML-RPC Zugriff"
 
-#: ../lib/main.php:616
+#: ../lib/main.php:637
 msgid "SOAP access"
 msgstr "SOAP-Zugriff"
 
-#: ../lib/main.php:617
+#: ../lib/main.php:638
 msgid "Downloading zip dumps"
 msgstr "Das Herunterladen aller Wiki-Seiten als gezippte Datei"
 
-#: ../lib/main.php:618
+#: ../lib/main.php:639
 msgid "Downloading html zip dumps"
 msgstr ""
 "Das Herunterladen aller Wiki-Seiten als HTML-Dateien in einer Zip-Datei"
 
-#: ../lib/main.php:794
+#: ../lib/main.php:819
 #, php-format
 msgid "%s: action forwarded to a moderator."
 msgstr ""
 
-#: ../lib/main.php:797
+#: ../lib/main.php:822
 msgid "This action requires moderator approval. Please be patient."
 msgstr ""
 
-#: ../lib/main.php:802
+#: ../lib/main.php:827
 msgid "You must wait for moderator approval."
 msgstr "Sie müssen auf die Zustimmung des Moderators warten."
 
-#: ../lib/main.php:822 ../lib/plugin/ModeratedPage.php:309
+#: ../lib/main.php:845 ../lib/plugin/ModeratedPage.php:319
 #, php-format
 msgid "%s: Bad action"
 msgstr "%s: Ungültige Aktion"
 
-#: ../lib/main.php:839
+#: ../lib/main.php:863
 msgid "Fatal PhpWiki Error"
 msgstr "Fataler PhpWiki-Fehler"
 
-#: ../lib/main.php:1090
+#: ../lib/main.php:1119
 msgid "Chown"
 msgstr "Chown"
 
-#: ../lib/main.php:1094
+#: ../lib/main.php:1124
 msgid "SetAcl"
 msgstr "AclSetzen"
 
-#: ../lib/main.php:1098
+#: ../lib/main.php:1129
 msgid "SetAclSimple"
 msgstr ""
 
-#: ../lib/main.php:1102 ../lib/PagePerm.php:185
-#: ../lib/plugin/WikiAdminRename.php:144 ../lib/plugin/WikiAdminRename.php:270
+#: ../lib/main.php:1134 ../lib/PagePerm.php:190
+#: ../lib/plugin/WikiAdminRename.php:147 ../lib/plugin/WikiAdminRename.php:277
 #: ../themes/fusionforge/templates/actionbar.tmpl:118
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: ../lib/main.php:1106 ../lib/main.php:1111 ../lib/plugin/PageDump.php:56
+#: ../lib/main.php:1139 ../lib/main.php:1144 ../lib/plugin/PageDump.php:57
 #: ../themes/Crao/templates/actionbar.tmpl:31
 #: ../themes/default/templates/actionbar.tmpl:37
 #: ../themes/MonoBook/templates/actionbar.tmpl:77
@@ -1460,13 +1460,13 @@
 msgid "PageDump"
 msgstr "SeiteSpeichern"
 
-#: ../lib/main.php:1129 ../lib/plugin/FullTextSearch.php:46
-#: ../lib/plugin/WantedPagesOld.php:126
+#: ../lib/main.php:1164 ../lib/plugin/FullTextSearch.php:47
+#: ../lib/plugin/WantedPagesOld.php:130
 msgid "FullTextSearch"
 msgstr "VolltextSuche"
 
-#: ../lib/main.php:1137 ../lib/plugin/RecentChanges.php:808
-#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1468
+#: ../lib/main.php:1170 ../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
 #: ../themes/Crao/templates/navbar.tmpl:49
@@ -1480,132 +1480,132 @@
 msgid "TitleSearch"
 msgstr "TitelSuche"
 
-#: ../lib/main.php:1311 ../lib/main.php:1324 ../lib/Request.php:821
+#: ../lib/main.php:1366 ../lib/main.php:1379 ../lib/Request.php:870
 #, php-format
 msgid "%s is not writable."
 msgstr "%s is nicht änderbar."
 
-#: ../lib/main.php:1312
+#: ../lib/main.php:1367
 msgid "The session.save_path directory"
 msgstr "Das session.save_path Verzeichnis"
 
-#: ../lib/main.php:1314 ../lib/Request.php:823
+#: ../lib/main.php:1369 ../lib/Request.php:872
 #, 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:1315
+#: ../lib/main.php:1370
 #, php-format
 msgid "the session.save_path directory '%s'"
 msgstr "das session.save_path Verzeichnis »%s«"
 
-#: ../lib/main.php:1319
+#: ../lib/main.php:1374
 #, php-format
 msgid "Attempting to use the directory '%s' instead."
 msgstr "Versuche stattdessen das Verzeichnis »%s« zu verwenden."
 
-#: ../lib/main.php:1326
+#: ../lib/main.php:1381
 msgid "Users will not be able to sign in."
 msgstr "Benutzer werden sich nicht anmelden können."
 
-#: ../lib/main.php:1338
+#: ../lib/main.php:1393
 msgid "Your PHP version is too old. You must have at least PHP 4.3.9"
 msgstr ""
 
-#: ../lib/PageList.php:92
+#: ../lib/PageList.php:98
 #, php-format
 msgid "Sort by %s"
 msgstr "Sortiere nach %s"
 
-#: ../lib/PageList.php:119
+#: ../lib/PageList.php:126
 msgid "reverse"
 msgstr "umdrehen"
 
-#: ../lib/PageList.php:130
+#: ../lib/PageList.php:137
 msgid "Click to reverse sort order"
 msgstr "Klicken Sie um die Reihenfolge umzudrehen"
 
-#: ../lib/PageList.php:137
+#: ../lib/PageList.php:144
 #, php-format
 msgid "Click to sort by %s"
 msgstr "Sortiere nach %s"
 
-#: ../lib/PageList.php:273
+#: ../lib/PageList.php:300
 msgid "Click to de-/select all pages"
 msgstr "Klicken Sie um alle/keine Seiten auszuwählen"
 
-#: ../lib/PageList.php:348 ../lib/plugin/IncludePage.php:193
+#: ../lib/PageList.php:394 ../lib/plugin/IncludePage.php:20...
 
[truncated message content]

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

From: <var...@us...> - 2012-10-10 10:14:08

Revision: 8403
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8403&view=rev
Author:   vargenau
Date:     2012-10-10 10:13:58 +0000 (Wed, 10 Oct 2012)
Log Message:
-----------
Add comment: We should test whether the wiki plugin is disabled globally in the Forge or by the current project.

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

Modified: trunk/g
===================================================================
--- trunk/g	2012-10-09 15:40:38 UTC (rev 8402)
+++ trunk/g	2012-10-10 10:13:58 UTC (rev 8403)
@@ -66,6 +66,9 @@
 if (! isset($group_id) || ! isset($project)) {
     exit_no_group();
 } else if (!($project->usesPlugin("wiki"))) {
+    // We should test whether the wiki plugin is disabled globally
+    // in the Forge or by the current project.
+    // exit_disabled('home');
     exit_project_disabled('home');
 } else {
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8402] trunk/lib/plugin/IncludePage.php

From: <var...@us...> - 2012-10-09 15:40:48

Revision: 8402
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8402&view=rev
Author:   vargenau
Date:     2012-10-09 15:40:38 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
Avoid warning in: <<IncludePages pages=<!plugin-list BackLinks page=CategoryWikiPlugin !> >>

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

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2012-10-08 23:19:11 UTC (rev 8401)
+++ trunk/lib/plugin/IncludePage.php	2012-10-09 15:40:38 UTC (rev 8402)
@@ -69,6 +69,13 @@
         return array(array('linkto' => $page->name, 'relation' => 0));
     }
 
+    // Avoid warning in:
+    // <<IncludePages pages=<!plugin-list BackLinks page=CategoryWikiPlugin !> >>
+    function handle_plugin_args_cruft($argstr, $args)
+    {
+        return;
+    }
+
     function run($dbi, $argstr, &$request, $basepage)
     {
         $args = $this->getArgs($argstr, $request);

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

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

From: <var...@us...> - 2012-10-08 23:19:17

Revision: 8401
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8401&view=rev
Author:   vargenau
Date:     2012-10-08 23:19:11 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
Fix Phpdoc

Modified Paths:
--------------
    trunk/lib/plugin/FoafViewer.php
    trunk/lib/plugin/GraphViz.php
    trunk/lib/plugin/PhotoAlbum.php
    trunk/lib/plugin/Ploticus.php
    trunk/lib/plugin/PopularNearby.php
    trunk/lib/plugin/RateIt.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/plugin/VisualWiki.php

Modified: trunk/lib/plugin/FoafViewer.php
===================================================================
--- trunk/lib/plugin/FoafViewer.php	2012-10-08 09:07:20 UTC (rev 8400)
+++ trunk/lib/plugin/FoafViewer.php	2012-10-08 23:19:11 UTC (rev 8401)
@@ -194,6 +194,8 @@
      *
      * @param $array Source array
      * @param $index Element Index to use.
+     * @param null $dc
+     * @return \RawXml
      * @todo Make sure it can look more than 1 layer deep
      * @todo Pass in dublincore metadata
      */

Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php	2012-10-08 09:07:20 UTC (rev 8400)
+++ trunk/lib/plugin/GraphViz.php	2012-10-08 23:19:11 UTC (rev 8401)
@@ -159,6 +159,9 @@
      * Sets the imagetype according to user wishes and
      * relies on WikiPluginCached to catch illegal image
      * formats.
+     * @param WikiDB $dbi
+     * @param array $argarray
+     * @param Request $request
      * @return string 'png', 'jpeg', 'gif'
      */
     function getImageType($dbi, $argarray, $request)
@@ -352,6 +355,7 @@
      *                                                   'none')
      * @param shape     string  node shape; 'ellipse', 'box', 'circle', 'point'
      * @param label     string  not used anymore
+     * @return array
      */
     function invokeDot($argarray)
     {

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2012-10-08 09:07:20 UTC (rev 8400)
+++ trunk/lib/plugin/PhotoAlbum.php	2012-10-08 23:19:11 UTC (rev 8401)
@@ -555,6 +555,7 @@
      *
      * @param  string $src    path to dir or textfile (local or remote)
      * @param  array  $photos
+     * @param string $webpath
      * @return string Error when bad url or file couldn't be opened
      */
     function fromFile($src, &$photos, $webpath = '')

Modified: trunk/lib/plugin/Ploticus.php
===================================================================
--- trunk/lib/plugin/Ploticus.php	2012-10-08 09:07:20 UTC (rev 8400)
+++ trunk/lib/plugin/Ploticus.php	2012-10-08 23:19:11 UTC (rev 8401)
@@ -142,6 +142,9 @@
      *  this case, because png will definitely have the
      *  best results.)
      *
+     * @param WikiDB $dbi
+     * @param array $argarray
+     * @param Request $request
      * @return string 'png', 'jpeg', 'gif'
      */
     function getImageType($dbi, $argarray, $request)

Modified: trunk/lib/plugin/PopularNearby.php
===================================================================
--- trunk/lib/plugin/PopularNearby.php	2012-10-08 09:07:20 UTC (rev 8400)
+++ trunk/lib/plugin/PopularNearby.php	2012-10-08 23:19:11 UTC (rev 8401)
@@ -105,6 +105,7 @@
      * @param $pages array of WikiDB_Page's or a Page_iterator
      * @param $direction boolean: true if incoming links
      *
+     * @param int $limit
      * @return Array of sorted links
      */
     function sortedLinks($pages, $direction = false, $limit = 5)

Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2012-10-08 09:07:20 UTC (rev 8400)
+++ trunk/lib/plugin/RateIt.php	2012-10-08 23:19:11 UTC (rev 8401)
@@ -309,13 +309,18 @@
      *
      * This needs to be put in the <body> section of the page.
      *
-     * @param pagename    Name of the page to rate
+     * @param Name $pagename
      * @param version     Version of the page to rate (may be "" for current)
-     * @param imgPrefix   Prefix of the names of the images that display the rating
+     * @param Prefix $imgPrefix
+     * @param Id $dimension
+     * @param bool|Makes $small
+     * @return \HtmlElement
+     * @internal param \Name $pagename of the page to rate
+     * @internal param \Prefix $imgPrefix of the names of the images that display the rating
      *                    You can have two widgets for the same page displayed at
      *                    once iff the imgPrefix-s are different.
-     * @param dimension   Id of the dimension to rate
-     * @param small       Makes a smaller ratings widget if non-false
+     * @internal param \Id $dimension of the dimension to rate
+     * @internal param \Makes $small a smaller ratings widget if non-false
      *
      * Limitations: Currently this can only print the current users ratings.
      *              And only the widget, but no value (for buddies) also.

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2012-10-08 09:07:20 UTC (rev 8400)
+++ trunk/lib/plugin/RecentChanges.php	2012-10-08 23:19:11 UTC (rev 8401)
@@ -1108,6 +1108,8 @@
     /** Constructor
      *
      * @param $revisions object a WikiDB_PageRevisionIterator.
+     * @param bool $check_current_revision
+     * @return void
      */
     function NonDeletedRevisionIterator($revisions, $check_current_revision = true)
     {

Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php	2012-10-08 09:07:20 UTC (rev 8400)
+++ trunk/lib/plugin/VisualWiki.php	2012-10-08 23:19:11 UTC (rev 8401)
@@ -150,6 +150,9 @@
     /**
      * Checks options, creates help page if necessary, calls both
      * database access and image map production functions.
+     * @param WikiDB $dbi
+     * @param array $argarray
+     * @param Request $request
      * @return array($map,$html)
      */
     function getMap($dbi, $argarray, $request)
@@ -221,10 +224,13 @@
      * Selects the first (smallest or biggest) WikiPages in
      * a given category.
      *
-     * @param  number   integer  number of page names to be found
-     * @param  category string   attribute of the pages which is used
+     * @param int $number
+     * @param string $category
+     * @param bool $minimum
+     * @internal param int $number number of page names to be found
+     * @internal param string $category attribute of the pages which is used
      *                           to compare them
-     * @param  minimum  boolean  true finds smallest, false finds biggest
+     * @internal param bool $minimum true finds smallest, false finds biggest
      * @return array list of page names found to be the best
      */
     function findbest($number, $category, $minimum)
@@ -273,20 +279,22 @@
      * like size, age, revision number which are used to find the
      * most attractive pages.
      *
-     * @param  dbi         WikiDB   database handle to access all Wiki pages
-     * @param  LARGE       integer  number of largest pages which should
+     * @param WikiDB $dbi
+     * @param $argarray
+     * @internal param \WikiDB $dbi database handle to access all Wiki pages
+     * @internal param int $LARGE number of largest pages which should
      *                              be included
-     * @param  RECENT      integer  number of the youngest pages to be included
-     * @param  REFINED     integer  number of the pages with shortes revision
+     * @internal param int $RECENT number of the youngest pages to be included
+     * @internal param int $REFINED number of the pages with shortes revision
      *                              interval
-     * @param  BACKLINK    integer  number of the pages with most backlinks
-     * @param  EXCLUDELIST string   colon ':' separated list of page names which
+     * @internal param int $BACKLINK number of the pages with most backlinks
+     * @internal param string $EXCLUDELIST colon ':' separated list of page names which
      *                              should not be displayed (like PhpWiki, for
      *                              example)
-     * @param  INCLUDELIST string   colon separated list of pages which are
+     * @internal param string $INCLUDELIST colon separated list of pages which are
      *                              always included (for example your own
      *                              page :)
-     * @param  COLOR       string   'age', 'revtime' or 'none'; Selects which
+     * @internal param string $COLOR 'age', 'revtime' or 'none'; Selects which
      *                              page feature is used to determine the
      *                              filling color of the nodes in the graph.
      * @return void
@@ -417,13 +425,15 @@
      * Creates the text file description of the graph needed to invoke
      * <code>dot</code>.
      *
-     * @param filename  string  name of the dot file to be created
-     * @param width     float   width of the output graph in inches
-     * @param height    float   height of the graph in inches
-     * @param colorby   string  color sceme beeing used ('age', 'revtime',
+     * @param string $filename
+     * @param bool $argarray
+     * @internal param string $filename name of the dot file to be created
+     * @internal param float $width width of the output graph in inches
+     * @internal param float $height height of the graph in inches
+     * @internal param string $colorby color sceme beeing used ('age', 'revtime',
      *                                                   'none')
-     * @param shape     string  node shape; 'ellipse', 'box', 'circle', 'point'
-     * @param label     string  'name': label by name,
+     * @internal param string $shape node shape; 'ellipse', 'box', 'circle', 'point'
+     * @internal param string $label 'name': label by name,
      *                          'number': label by unique number
      * @return boolean error status; true=ok; false=error
      */
@@ -534,14 +544,17 @@
      * called only if debug=static.
      *
      * @access private
-     * @param  url      string  url pointing to the image part of the map
-     * @param  map      string  &lt;area&gt; tags defining active
+     * @param string $url
+     * @param WikiDB $dbi
+     * @param array $argarray
+     * @param  request  Request ???
+     * @internal param string $url url pointing to the image part of the map
+     * @internal param string $map &lt;area&gt; tags defining active
      *                          regions in the map
-     * @param  dbi      WikiDB  database abstraction class
-     * @param  argarray array   complete (!) arguments to produce
+     * @internal param \WikiDB $dbi database abstraction class
+     * @internal param array $argarray complete (!) arguments to produce
      *                          image. It is not necessary to call
      *                          WikiPlugin->getArgs anymore.
-     * @param  request  Request ???
      * @return string html output
      */
     function embedImg($url, &$dbi, $argarray, &$request)
@@ -606,7 +619,8 @@
      * Translates a value from 0.0 to 1.0 into rainbow color.
      * red -&gt; orange -&gt; green -&gt; blue -&gt; gray
      *
-     * @param promille float value between 0.0 and 1.0
+     * @param float $promille
+     * @internal param float $promille value between 0.0 and 1.0
      * @return array(red,green,blue)
      */
     function getColor($promille)
@@ -623,6 +637,9 @@
 /**
  * Linear interpolates a value between two point a and b
  * at a value pos.
+ * @param $a
+ * @param $b
+ * @param $pos
  * @return float  interpolated value
  */
 function interpolate($a, $b, $pos)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8400] trunk/lib/plugin/OldStyleTable.php

From: <var...@us...> - 2012-10-08 09:07:31

Revision: 8400
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8400&view=rev
Author:   vargenau
Date:     2012-10-08 09:07:20 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
Fix comment

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

Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php	2012-10-06 11:05:48 UTC (rev 8399)
+++ trunk/lib/plugin/OldStyleTable.php	2012-10-08 09:07:20 UTC (rev 8400)
@@ -26,7 +26,7 @@
  *
  * Usage:
  * <pre>
- *  <<OldStyleTable border||=0 summary=""
+ *  <<OldStyleTable border||=0
  *  ||  __Name__               |v __Cost__   |v __Notes__
  *  | __First__   | __Last__
  *  |> Jeff       |< Dairiki   |^  Cheap     |< Not worth it

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

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

From: <var...@us...> - 2012-10-06 11:05:57

Revision: 8399
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8399&view=rev
Author:   vargenau
Date:     2012-10-06 11:05:48 +0000 (Sat, 06 Oct 2012)
Log Message:
-----------
Reformat CSS

Modified Paths:
--------------
    trunk/themes/Crao/crao.css
    trunk/themes/Hawaiian/Hawaiian.css
    trunk/themes/MacOSX/MacOSX-topbottombars.css
    trunk/themes/MacOSX/MacOSX.css
    trunk/themes/MonoBook/IE60Fixes.css
    trunk/themes/MonoBook/IE70Fixes.css
    trunk/themes/MonoBook/commonPrint.css
    trunk/themes/MonoBook/main.css
    trunk/themes/MonoBook/rtl.css
    trunk/themes/MonoBook/wikiprintable.css
    trunk/themes/MonoBook/wikistandard.css
    trunk/themes/Portland/portland.css
    trunk/themes/Sidebar/jscalendar/calendar-phpwiki.css
    trunk/themes/Sidebar/jscalendar/calendar-win2k-1.css
    trunk/themes/Sidebar/jscalendar/calendar-win2k-cold-1.css
    trunk/themes/Sidebar/sidebar.css
    trunk/themes/SpaceWiki/SpaceWiki.css
    trunk/themes/Wordpress/Wordpress.css
    trunk/themes/blog/IEFixes.css
    trunk/themes/blog/Kubrick.css
    trunk/themes/default/IEFixes.css
    trunk/themes/default/highlight.css
    trunk/themes/default/phpwiki-modern.css
    trunk/themes/default/phpwiki-printer.css
    trunk/themes/default/phpwiki-topbottombars.css
    trunk/themes/default/phpwiki.css
    trunk/themes/default/toolbar.css
    trunk/themes/fusionforge/fusionforge-autonumbering.css
    trunk/themes/fusionforge/fusionforge-fullscreen.css
    trunk/themes/fusionforge/fusionforge-print.css
    trunk/themes/fusionforge/fusionforge-rereading.css
    trunk/themes/fusionforge/fusionforge.css
    trunk/themes/shamino_com/shamino_com.css
    trunk/themes/smaller/IEFixes.css
    trunk/themes/smaller/phpwiki.css
    trunk/themes/wikilens/wikilens.css

Modified: trunk/themes/Crao/crao.css
===================================================================
--- trunk/themes/Crao/crao.css	2012-10-06 10:28:33 UTC (rev 8398)
+++ trunk/themes/Crao/crao.css	2012-10-06 11:05:48 UTC (rev 8399)
@@ -12,50 +12,62 @@
  */
 
 body {
-  background-color: #ccc;/* MODIFY-color */
-  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;
+    background-color: #ccc; /* MODIFY-color */
+    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;
+    border: 0;
+    vertical-align: middle;
 }
 
 table {
-  border-spacing: 0;
-  /* For Mozilla */
-  empty-cells: show;
+    border-spacing: 0;
+    /* For Mozilla */
+    empty-cells: show;
 }
-a:link, a {/* MODIFY-TXT */
+
+a:link, a {
+    /* MODIFY-TXT */
     color: #33c;
     text-decoration: underline;
     background-color: transparent;
 }
-a:visited {/* MODIFY-TXT */
+
+a:visited {
+    /* MODIFY-TXT */
     color: #33c;
     text-decoration: underline;
     background-color: transparent;
 }
-a:hover {/* MODIFY-TXT */
+
+a:hover {
+    /* MODIFY-TXT */
     color: #03f;
-    text-decoration:underline;
+    text-decoration: underline;
     background-color: transparent;
 }
+
 a.wiki, a.wikiadmin, a.named-wiki {
 }
+
 hr {
-    background-color: #ccc;/* MODIFY-color */
+    background-color: #ccc; /* MODIFY-color */
     height: 1px;
-    border: 1px solid #ccc;    /* MODIFY-color */
+    border: 1px solid #ccc; /* MODIFY-color */
 }
-div.wikitext pre { font-family: monospace; }
+
+div.wikitext pre {
+    font-family: monospace;
+}
+
 p {
     font-size: 1em;
     margin: 0;
@@ -64,19 +76,38 @@
 
 /* generic classes ----------------------------------------------- */
 
-.tt { font-family: monospace; }
-.strike { text-decoration:line-through; }
+.tt {
+    font-family: monospace;
+}
 
-.align-left {text-align: left;}
-.align-right {text-align: right;}
-.align-center {text-align: center;}
-  
-.top {vertical-align: top;}
+.strike {
+    text-decoration: line-through;
+}
 
-.nowrap {white-space: nowrap;}
+.align-left {
+    text-align: left;
+}
 
-.fullwidth { width: 100%; }
+.align-right {
+    text-align: right;
+}
 
+.align-center {
+    text-align: center;
+}
+
+.top {
+    vertical-align: top;
+}
+
+.nowrap {
+    white-space: nowrap;
+}
+
+.fullwidth {
+    width: 100%;
+}
+
 /* --------------------------------------------------------------- */
 
 /*
@@ -84,9 +115,9 @@
  *****LISTES
  ******************************
  */
-ul{
+ul {
     position: relative;
-    padding : 0;
+    padding: 0;
     margin: 0;
     font-family: Helvetica, Verdana, Arial, sans-serif;
     font-size: 100%;
@@ -94,8 +125,9 @@
     list-style: inside;
     background-color: transparent;
 }
-ul ul{
-    position:  relative;
+
+ul ul {
+    position: relative;
     font-family: Helvetica, Verdana, Arial, sans-serif;
     font-size: 100%;
     margin-left: 2em;
@@ -104,48 +136,53 @@
 li.rc-major {
     list-style: none;
     display: block;
-    background-color: #fff;/* MODIFY-color */
+    background-color: #fff; /* MODIFY-color */
     margin: 6px 0;
-    border: 1px #666 dashed;/* MODIFY-color */
-    padding:0.5ex;
+    border: 1px #666 dashed; /* MODIFY-color */
+    padding: 0.5ex;
 }
 
-li.evenrow{
- border: 0;
- padding:1ex;
+li.evenrow {
+    border: 0;
+    padding: 1ex;
 }
-li.oddrow{
- border: 0;
- padding:1ex;
+
+li.oddrow {
+    border: 0;
+    padding: 1ex;
 }
-li strong{
-  font-weight: normal;
-  background-color: transparent;
+
+li strong {
+    font-weight: normal;
+    background-color: transparent;
 }
 
-strong.wiki-summary{
- display: block;
- padding:5px 0;
-  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;
-/*border-left: 1.2em solid #FC0;*/
-/*la puce de dernieres modifs*/
+    display: inline;
 }
+
+li a.wiki-rc-action {
+    border: 0;
+    /*border-left: 1.2em solid #FC0;*/
+    /*la puce de dernieres modifs*/
+}
+
 li.rc-major a.wiki {
-  font-size:  1.2em;
-  font-weight: bold;
+    font-size: 1.2em;
+    font-weight: bold;
 }
+
 li>p {
- display: inline;
+    display: inline;
 }
-p.wiki-rc-action
-{
+
+p.wiki-rc-action {
     text-align: center;
     vertical-align: middle;
     padding: 5px 5px 5px 5px;
@@ -153,10 +190,9 @@
     background-color: transparent;
 }
 
-p a.wiki-rc-action
-{
+p a.wiki-rc-action {
     display: inline;
-    padding:0 10px;
+    padding: 0 10px;
     font-weight: bold;
     background-color: transparent;
 }
@@ -167,25 +203,29 @@
  ******************************
  */
 #header {
-    background-color: #333;/* MODIFY-color */
+    background-color: #333; /* MODIFY-color */
 }
-#logo {/* MODIFY-TXT */
-    color:  #ccc;
+
+#logo {
+    /* MODIFY-TXT */
+    color: #ccc;
     display: inline;
     margin-top: 0;
     margin-left: 0;
     height: 50px;
-    width:auto;
+    width: auto;
     background-color: transparent;
-    font: bolder 67px/50px  Verdana, Arial, Helvetica, sans-serif;
+    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;
+    color: #ccc;
+    font: bolder 67px/50px Arial, Verdana, Helvetica, sans-serif;
     text-decoration: none;
 }
 
@@ -199,7 +239,8 @@
 div.ie-actionbuttons {
     position: relative;
     height: 22px;
-    right: 0; bottom: 0;
+    right: 0;
+    bottom: 0;
     margin: 0;
     background-color: transparent;
     background-image: url(images/BG.png);
@@ -218,7 +259,8 @@
     position: fixed;
     max-width: 30%;
     height: 22px;
-    right: 0; bottom: 0;
+    right: 0;
+    bottom: 0;
     margin: 0;
     background-color: transparent;
     background-image: url(images/BG.png);
@@ -230,7 +272,10 @@
     padding-bottom: 0.5ex;
     border: 0 none;
 }
-#actionbuttons div { }
+
+#actionbuttons div {
+}
+
 #actionbuttons a, #actionbuttons a:link {
     position: relative;
     display: inline;
@@ -248,43 +293,51 @@
  ******************************
  */
 #content {
-    margin-top:    0;
-    margin-left:7%;
+    margin-top: 0;
+    margin-left: 7%;
     margin-right: 7%;
-    margin-bottom:7%;
-    background-color: #f2f2f2;/* MODIFY-color */
-    border: 1px #999 solid;/* MODIFY-color */
+    margin-bottom: 7%;
+    background-color: #f2f2f2; /* MODIFY-color */
+    border: 1px #999 solid; /* MODIFY-color */
     padding-left: 2em;
     padding-right: 15px;
-    padding-top:   15px;
+    padding-top: 15px;
     padding-bottom: 0.5ex;
 }
+
 /* titre */
-div.boxtitrehead {}
-div.boxtitrehead a.backlinks {}
+div.boxtitrehead {
+}
+
+div.boxtitrehead a.backlinks {
+}
+
 div.wikitext {
     font-size: 1em;
     line-height: 130%;
     text-align: left;
 }
+
 blockquote.mail-style-quote {
-    border-left: #FF9933;/* MODIFY-color */
+    border-left: #FF9933; /* MODIFY-color */
     margin: 0;
     margin-bottom: 1em;
-    border: 1px solid #FF9933;/* MODIFY-color */
+    border: 1px solid #FF9933; /* MODIFY-color */
     padding: 0.5em;
 }
+
 .mail-style-quote blockquote.mail-style-quote {
     margin-left: 0.3em;
-    margin-bottom : 0;
+    margin-bottom: 0;
     background-color: transparent;
     border-style: none;
-    border-left: 2px solid #FF9933;/* MODIFY-color */
+    border-left: 2px solid #FF9933; /* MODIFY-color */
     padding: 0;
     padding-left: 0.5em;
 }
+
 blockquote p {
-    margin-top:  0.5ex;
+    margin-top: 0.5ex;
     margin-bottom: 0.5ex;
 }
 
@@ -293,77 +346,96 @@
  *****NAVBAR
  ******************************
  */
-.toolbar, input.button, #signin { font-family:Verdana, Arial, Helvetica, sans-serif; }
+.toolbar, input.button, #signin {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+}
 
-div.toolbar{
-  display:block;
-  background-color:#f2f2f2;/* MODIFY-color */
-  border: 1px #666 solid;/* MODIFY-color */
-  margin: 2% 7%;
+div.toolbar {
+    display: block;
+    background-color: #f2f2f2; /* MODIFY-color */
+    border: 1px #666 solid; /* MODIFY-color */
+    margin: 2% 7%;
 }
+
 .toolbar {
-  padding: 0;
-  margin:  0;
+    padding: 0;
+    margin: 0;
 }
+
 .edit-toolbar {
-  padding: 0;
-  margin:  0;
+    padding: 0;
+    margin: 0;
 }
+
 .edit-toolbar img, .edit-toolbar input {
-  background-color: #fff;
-  border: 1px solid ButtonFace;
+    background-color: #fff;
+    border: 1px solid ButtonFace;
 }
 
 #navbuttons {
     display: inline;
 }
-#navbuttons img{
-    margin:5px 0 5px 10px;
+
+#navbuttons img {
+    margin: 5px 0 5px 10px;
 }
-#navbuttons a:link, #navbuttons a{/* MODIFY-TXT */
+
+#navbuttons a:link, #navbuttons a {
+    /* MODIFY-TXT */
     font-weight: bold;
     padding-left: 1ex;
     padding-right: 1ex;
-    color:#333;
+    color: #333;
 }
-#navbuttons a:visited{}
-#navbuttons a:hover{}
 
+#navbuttons a:visited {
+}
+
+#navbuttons a:hover {
+}
+
 /*
  ******************************
  *****SIGNIN
  ******************************
  */
-#signin{/* MODIFY-TXT */
-    width:  auto;
+#signin {
+    /* MODIFY-TXT */
+    width: auto;
     text-align: right;
     padding-right: 10px;
     background-color: transparent;
-    color:#ccc;
-    font-size:12px;
+    color: #ccc;
+    font-size: 12px;
 }
-#signin form{/* MODIFY-TXT */
-    text-align:  center;
+
+#signin form {
+    /* MODIFY-TXT */
+    text-align: center;
     padding: 1px;
     margin: 0;
     display: inline;
 }
-#signin input{/* MODIFY-TXT */
+
+#signin input {
+    /* MODIFY-TXT */
     padding: 0;
     padding-left: 3px;
     margin: 0;
-    font-family:  Verdana, Arial,  Helvetica, sans-serif ;
-    color:#333;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    color: #333;
     font-size: 12px;
 }
-#signin input.wikisignin{
+
+#signin input.wikisignin {
     padding: 0;
     margin: 0;
     border: 0 none;
 }
 
-#signin a.wiki{/* MODIFY-TXT */
-    color:#FFF;
+#signin a.wiki {
+    /* MODIFY-TXT */
+    color: #FFF;
     background-color: transparent;
 }
 
@@ -378,49 +450,61 @@
     /*padding-right: 10px;*/
     float: right;
 }
-#search form{
-    text-align:  center;
+
+#search form {
+    text-align: center;
     padding: 1px;
     margin: 0;
     display: inline;
 }
-#search input{
+
+#search input {
     padding: 0;
     padding-left: 3px;
     margin: 0;
-    font-family:  Verdana, Arial,  Helvetica, sans-serif;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
     color: #333;
     font-size: 12px;
 }
-#search input.wikiaction{
+
+#search input.wikiaction {
     padding: 0;
     margin: 0;
     border: 0 none;
 }
-.search-context { background: white; font-style: oblique; }
+
+.search-context {
+    background: white;
+    font-style: oblique;
+}
+
 .search-term {
-  background: yellow;
-  font-weight: normal;
+    background: yellow;
+    font-weight: normal;
 }
+
 #livesearch {
-  height: 13px;
-  width: 100px;
+    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;
+    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;
+    background-color: #f08000;
 }
+
 #LSResult .evenrow {
-  background-color: #f0f0f0;
+    background-color: #f0f0f0;
 }
 
 /*
@@ -429,15 +513,22 @@
  ******************************
  */
 body.sidebar {
-  font-size: smaller;
-  margin: 0.5em;
+    font-size: smaller;
+    margin: 0.5em;
 }
+
 body.sidebar div.wikitext {
-  padding: 0.5em;
+    padding: 0.5em;
 }
-body.sidebar  { padding-left: 1em; }
-body.sidebar h2 { margin-top: 0; }
 
+body.sidebar {
+    padding-left: 1em;
+}
+
+body.sidebar h2 {
+    margin-top: 0;
+}
+
 /*
  ******************************
  *****WIKI-FORM
@@ -449,15 +540,24 @@
  * have a class yet, so it must be referenced indirectly
  */
 /*div.wikiaction { background-color: #f2f2f2; }*/
- /*div.wikiadmin { background-color: #fee; } */
-form.wikiadmin div { color: #000; background-color: #f2f2f2; }
+/*div.wikiadmin { background-color: #fee; } */
+form.wikiadmin div {
+    color: #000;
+    background-color: #f2f2f2;
+}
+
 div.wikiaction, form.wikiadmin div {
 }
+
 /* Prevent buttons from overlapping when the toolbar is wrapped. */
-a.wikiaction, a.wikiadmin { line-height: 2.6ex; }
+a.wikiaction, a.wikiadmin {
+    line-height: 2.6ex;
+}
 
 /* Add space between the input field and following buttons, but not after the last button. */
-div.wikiaction input[type=text], div.wikiadmin input[type=text], form.wikiadmin input[type=file] { margin-right: 0.5em; }
+div.wikiaction input[type=text], div.wikiadmin input[type=text], form.wikiadmin input[type=file] {
+    margin-right: 0.5em;
+}
 
 /*
  ******************************
@@ -466,9 +566,14 @@
  */
 
 /* Link icons */
-img.linkicon { vertical-align: middle; }
-img.rssicon  { vertical-align: baseline; }
+img.linkicon {
+    vertical-align: middle;
+}
 
+img.rssicon {
+    vertical-align: baseline;
+}
+
 /*
  ******************************
  *****ADMIN-ACTION
@@ -481,10 +586,13 @@
 
 .wikiunsafe {
     color: #000;
-    background-color: #f2f2f2;/* MODIFY-color */
+    background-color: #f2f2f2; /* MODIFY-color */
 }
 
-input.wikiadmin  {color: #000; background-color: #fff; }
+input.wikiadmin {
+    color: #000;
+    background-color: #fff;
+}
 
 /*
  ******************************
@@ -498,14 +606,15 @@
     font-size: 100%;
     background-color: transparent;
 }
- /* QuestionMark #600 */
+
+/* QuestionMark #600 */
 .wikiunknown a, .named-wikiunknown a {
     color: #FFFFFF;
-    background-color: #000000;/* MODIFY-color */
+    background-color: #000000; /* MODIFY-color */
     text-decoration: none;
     font-weight: normal;
     font-size: 1em;
-    padding:  1px;
+    padding: 1px;
     padding-top: 0;
     padding-bottom: 0;
     border-top: 1px solid #000000;
@@ -520,44 +629,66 @@
     color: #006;
 }
 
-
 /* Interwiki links */
-.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; }
+.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;
+}
+
 /*
  ******************************
  *****HEADING
  ******************************
  */
-h1, h2, h3, h4, h5, h6 { font-family: Arial, Helvetica, sans-serif; }
+h1, h2, h3, h4, h5, h6 {
+    font-family: Arial, Helvetica, sans-serif;
+}
 
-h1 { /* MODIFY-TXT */
-    margin-top:   10px;
+h1 {
+    /* MODIFY-TXT */
+    margin-top: 10px;
     background-color: transparent;
     color: #555;
 }
 
-h1 a.backlinks{ /* MODIFY-TXT */
+h1 a.backlinks {
+    /* MODIFY-TXT */
     color: #777;
-    text-decoration:none;
+    text-decoration: none;
 }
-h1 a.wiki{ /* MODIFY-TXT */
+
+h1 a.wiki {
+    /* MODIFY-TXT */
     color: #777;
-    text-decoration:none;
+    text-decoration: none;
 }
-h1 a.pagetitle{ /* MODIFY-TXT */
+
+h1 a.pagetitle {
+    /* MODIFY-TXT */
     color: #555;
-    text-decoration:none;
+    text-decoration: none;
 }
-h1 a:hover{ /* MODIFY-TXT */
+
+h1 a:hover {
+    /* MODIFY-TXT */
     color: #888;
-    text-decoration:underline;
+    text-decoration: underline;
 }
-h4, h5, h6 {  /* MODIFY-TXT */
-    margin-bottom:   0;
+
+h4, h5, h6 {
+    /* MODIFY-TXT */
+    margin-bottom: 0;
     background-color: transparent;
     color: #111;
 }
@@ -572,15 +703,15 @@
 
 div.rss {
     background-color: #fff;
-    color:#000;
+    color: #000;
     border: 2px solid #ddd;
 }
 
-
 div.feed {
     font-size: 1.4em;
     padding: 0.5em;
 }
+
 .chandesc {
     font-size: 0.9em;
 }
@@ -588,7 +719,7 @@
 div.rssitem {
     display: block;
     background-color: #fff;
-    color:#000;
+    color: #000;
     border-top: 1px solid #ddd;
     padding: 0 0.5em;
 
@@ -599,6 +730,7 @@
     border: 0;
     margin-top: 0.5em;
 }
+
 div.itemdesc {
     font-size: 1em;
     margin-bottom: 0.5em;
@@ -609,57 +741,74 @@
  *****TABLES
  ******************************
  */
-table, td { font-family: Verdana, Arial, Helvetica, sans-serif; }
+table, td {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+}
+
 caption {
     font-family: Verdana, Arial, Helvetica, sans-serif;
     width: auto;
 }
+
 .pagelist {
-    background-color: white;/* MODIFY-color */
-    border:1px #333 dashed;/* MODIFY-color */
+    background-color: white; /* MODIFY-color */
+    border: 1px #333 dashed; /* MODIFY-color */
 
 }
-.pagelist thead, .pagelist thead u {}
-.pagelist tr.evenrow { background-color: white ;}
-.pagelist tr.oddrow  { background-color: white; }
-.pagelist td { padding:3px; }
+
+.pagelist thead, .pagelist thead u {
+}
+
+.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;
+    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;
+    text-decoration: none;
+    font-size: small;
+    font-weight: normal;
+    font-family: Tahoma, Arial, Helvetica, sans-serif;
+    background-color: ThreeDLightShadow;
+    color: black;
 }
 
-.wikilink{
-    display:block;
+.wikilink {
+    display: block;
 }
 
-#revision{
-    font-size:10px;
-    text-align:right;
-    background-color: #f2f2f2;/* MODIFY-color */
+#revision {
+    font-size: 10px;
+    text-align: right;
+    background-color: #f2f2f2; /* MODIFY-color */
     /* "paper" borders */
     padding-left: 2em;
     padding-right: 1em;
-    padding-top:    0.5ex;
+    padding-top: 0.5ex;
     padding-bottom: 0.5ex;
     clear: both;
 }
@@ -670,35 +819,43 @@
     padding: 0;
     padding-top: 0.25ex;
 }
-#xhtml-validator
-{
+
+#xhtml-validator {
     font-size: small;
     text-align: center;
     margin-top: 1em;
 }
 
-
 /*
  ******************************
  *****EDIT-PAGE
  ******************************
  */
-form { margin: 0; }
+form {
+    margin: 0;
+}
+
 input, textarea {
     margin: 0.1em;
     background-color: #FFF;
     vertical-align: middle;
     font-size: 1em;
 }
-input.wikisignin{
+
+input.wikisignin {
     border: 0 none;
-    background-color:#FFF;
+    background-color: #FFF;
 }
-input.wikiaction{
+
+input.wikiaction {
     border: 1px solid black;
-    background-color:#D7FA8C;
+    background-color: #D7FA8C;
 }
-input.numeric { text-align: center; }
+
+input.numeric {
+    text-align: center;
+}
+
 /* Make the textarea the full page width */
 textarea.wikiedit {
     width: 90%;
@@ -714,13 +871,15 @@
     font-size: smaller;
     border: 1px none;
 }
-#editarea-size legend{
+
+#editarea-size legend {
     text-align: right;
     font-size: smaller;
     border: 1px solid #CCC;
     background-color: #ccc;
 }
-.editarea legend{
+
+.editarea legend {
     font-family: Verdana, Helvetica, Arial, sans-serif;
     font-size: 1em;
     line-height: 1em;
@@ -728,19 +887,21 @@
     border: 1px solid #333;
     background-color: #eee;
 }
+
 fieldset.editarea {
-    margin : 1ex;
+    margin: 1ex;
     margin-top: 1em;
     text-align: center;
-    padding : 10px;
+    padding: 10px;
     border: 1px solid #333;
     background-color: #E8E8E5;
 }
+
 fieldset.toolbar {
-    margin : 1ex;
+    margin: 1ex;
     margin-top: 0;
     text-align: center;
-    padding : 3px;
+    padding: 3px;
     border: 1px solid #FFF;
     background-color: #FFF;
 }
@@ -750,50 +911,53 @@
 .transclusion-title {
     text-align: right;
     font-style: oblique;
-    font-size:  smaller;
+    font-size: smaller;
     text-decoration: underline;
     margin-bottom: 0.25ex;
-    margin-right:  0.25em;
+    margin-right: 0.25em;
 }
+
 .transclusion, .wiki-edithelp {
     font-size: smaller;
 }
+
 .transclusion {
-    border: 1px solid gray;/* MODIFY-color */
-    padding-left:  0.8em;
+    border: 1px solid gray; /* MODIFY-color */
+    padding-left: 0.8em;
     padding-right: 0.8em;
-    padding-top:     0;
-    padding-bottom:  0;
-    margin-left:   0.25em;
-    margin-right:  0.25em;
+    padding-top: 0;
+    padding-bottom: 0;
+    margin-left: 0.25em;
+    margin-right: 0.25em;
     margin-bottom: 0.1ex;
 }
+
 .wiki-edithelp {
     background-color: white;
     border: medium solid #fff8dc; /* MODIFY-color */
-    padding-left:  0.5em;
+    padding-left: 0.5em;
     padding-right: 0.5em;
-    padding-top:    0.75ex;
+    padding-top: 0.75ex;
     padding-bottom: 0.75ex;
-    margin-left:  0;
+    margin-left: 0;
     margin-right: 0;
     margin-top: 1ex;
     margin-bottom: 1ex;
 }
+
 .wiki-edithelp .wiki {
     /* color: #5454ff;*/
 }
+
 .wiki-edithelp p {
     font-family: Verdana, Helvetica, Arial, sans-serif;
-    padding-left:  0.5em;
+    padding-left: 0.5em;
     padding-right: 0.5em;
-    padding-top:    0.5ex;
+    padding-top: 0.5ex;
     padding-bottom: 0.5ex;
     margin: 0;
 }
 
-
-
 /*
  ******************************
  *****CALENDAR
@@ -801,14 +965,15 @@
  */
 
 table.cal {
-    float:right;
-    font-size:10px;
+    float: right;
+    font-size: 10px;
     border: 1px solid #333;
-    background-color: #ccc;/* MODIFY-color */
+    background-color: #ccc; /* MODIFY-color */
     margin: 10px;
     padding: 1px;
     /* For Mozilla */
-    empty-cells: hide;}
+    empty-cells: hide;
+}
 
 /* cells */
 table.cal td {
@@ -816,73 +981,98 @@
 }
 
 /* Month-name header */
-table.cal-header { /* MODIFY-TXT */
-font-size: larger;
-background-color: #333;/* MODIFY-color */
-color: #f2f2f2;}
-table.cal-header tr, table.cal-header td { text-align: center; }
-.cal-arrow {/* MODIFY-TXT */
+table.cal-header {
+    /* MODIFY-TXT */
+    font-size: larger;
+    background-color: #333; /* MODIFY-color */
+    color: #f2f2f2;
+}
+
+table.cal-header tr, table.cal-header td {
+    text-align: center;
+}
+
+.cal-arrow {
+    /* MODIFY-TXT */
     font-weight: bold;
     text-decoration: none;
     color: #fff;
 }
-a.cal-arrow {/* MODIFY-TXT */
-    color:#fff;
+
+a.cal-arrow {
+    /* MODIFY-TXT */
+    color: #fff;
 }
 
 /* Day-names header */
-table.cal tbody tr .cal-dayname {  }
+table.cal tbody tr .cal-dayname {
+}
 
 .cal-dayname td {
- text-align: center;
+    text-align: center;
     font-size: smaller;
     text-decoration: none;
-    background-color: #f2f2f2;/* MODIFY-color */
+    background-color: #f2f2f2; /* MODIFY-color */
 }
 
 /* Individual days */
 a.cal-hide {
- font-size: 9px;
-text-decoration: none; }
+    font-size: 9px;
+    text-decoration: none;
+}
 
 /* Today */
- /* cell */
+/* cell */
 table.cal td.cal-today {
     margin: 1px;
-    border: 1px solid #333;/* MODIFY-color */
+    border: 1px solid #333; /* MODIFY-color */
     color: #000;
-    background-color: #f2f2f2;/* MODIFY-color */
+    background-color: #f2f2f2; /* MODIFY-color */
 }
- /* text */
-table.cal td.cal-day a.cal-day {font-size: 9px;
-text-decoration: underline; }
 
+/* text */
+table.cal td.cal-day a.cal-day {
+    font-size: 9px;
+    text-decoration: underline;
+}
+
 /*
  ******************************
  *****DIFF
  ******************************
  */
 
-.diff .block div { position: relative; padding-left: 1.5em; }
-.diff .prefix    { position: absolute; left: 0.5em; top: 0; }
+.diff .block div {
+    position: relative;
+    padding-left: 1.5em;
+}
+
+.diff .prefix {
+    position: absolute;
+    left: 0.5em;
+    top: 0;
+}
+
 /* main box */
 .diff {
-color: #000;
+    color: #000;
     background-color: transparent;
     border: 1px solid black;
 }
+
 .diff .block {
-color: #000;
+    color: #000;
     background-color: #ccc;
     padding-left: 1em;
 }
 
 /* individual blocks */
 .diff .context {
-color: #000;
+    color: #000;
     background-color: transparent;
     border: none;
 }
+
 /* + - line prefix */
 .diff .block tt {
     font-weight: normal;
@@ -892,6 +1082,7 @@
     margin-left: 0;
     border: none;
 }
+
 /* changed words */
 .diff del, .diff ins {
     font-weight: bold;
@@ -901,33 +1092,45 @@
 /* blocks containing deleted or added words */
 .diff .original, .diff .deleted,
 .diff .final, .diff .added {
-color: #000;
+    color: #000;
     background-color: white;
 }
+
 /* blocks containing deleted words */
 .diff .original, .diff .deleted {
-color: #000;
+    color: #000;
     background-color: #fcc;
     border: none;
 }
+
 /* blocks containing added words */
 .diff .final, .diff .added {
-color: #000;
+    color: #000;
     background-color: #cfc;
     border: none;
 }
 
 /* deleted words */
-.diff del {color: #000; background-color: #f99; }
+.diff del {
+    color: #000;
+    background-color: #f99;
+}
+
 /* added words */
-.diff ins {color: #000; background-color: #9f9; }
+.diff ins {
+    color: #000;
+    background-color: #9f9;
+}
 
 /*
  ******************************
  *****INFO-HISTORY
  ******************************
  */
-td.pageinfo { font-weight: bold; }
+td.pageinfo {
+    font-weight: bold;
+}
+
 .pageinfo-minoredit, .pageinfo-authorid {
     font-size: smaller;
     font-style: oblique;
@@ -953,47 +1156,46 @@
  ******************************
  */
 
-#clear
-    {
-    clear                : both;
-    margin                : 0;
-    margin-top            : -7px;
-    padding                : 2px;
-    text-align            : center;
-    color                : #000;
-    background-color    : #FFF;
-    border                : solid 0;
+#clear {
+    clear: both;
+    margin: 0;
+    margin-top: -7px;
+    padding: 2px;
+    text-align: center;
+    color: #000;
+    background-color: #FFF;
+    border: solid 0;
 }
+
 /* reset post NN4 */
 /*/*/
-#clear
-    {
-    margin-top            : 0;
+#clear {
+    margin-top: 0;
 }
 
-
 /*
  ******************************
  *****IMG-HACK
  ******************************
  */
-img.inlineimage{
+img.inlineimage {
     border: 0;
     vertical-align: middle;
-    margin : 0 5px 0 5px;
+    margin: 0 5px 0 5px;
 }
-em > img.inlineimage{
+
+em > img.inlineimage {
     float: left;
     border: 0;
     vertical-align: middle;
-    margin : 5px 15px 15px 0;
+    margin: 5px 15px 15px 0;
 }
 
-strong > img.inlineimage{
+strong > img.inlineimage {
     float: right;
     border: 0;
     vertical-align: middle;
-    margin : 5px 0 15px 15px;
+    margin: 5px 0 15px 15px;
 }
 
 /*
@@ -1005,7 +1207,7 @@
 h2.wikiblog-heading {
     font-size: 2em;
     padding-bottom: 0.5em;
-    border-bottom: 2px solid gray;/* MODIFY-color */
+    border-bottom: 2px solid gray; /* MODIFY-color */
 }
 
 /*
@@ -1014,17 +1216,22 @@
  ******************************
  */
 
-.interwiki-map thead td { text-decoration: underline; }
-.printer { display: none; }
+.interwiki-map thead td {
+    text-decoration: underline;
+}
 
+.printer {
+    display: none;
+}
+
 .error {
     color: black;
     background-color: #eee;
-    margin-top:    1em;
+    margin-top: 1em;
     margin-bottom: 1em;
-    padding-left:  0.8em;
+    padding-left: 0.8em;
     padding-right: 0.8em;
-    padding-top:    0.8ex;
+    padding-top: 0.8ex;
     padding-bottom: 0;
     border: medium solid red;
     clear: both;

Modified: trunk/themes/Hawaiian/Hawaiian.css
===================================================================
--- trunk/themes/Hawaiian/Hawaiian.css	2012-10-06 10:28:33 UTC (rev 8398)
+++ trunk/themes/Hawaiian/Hawaiian.css	2012-10-06 11:05:48 UTC (rev 8399)
@@ -11,41 +11,70 @@
  * General
  */
 img {
-  border: 0;
-  vertical-align: baseline;
+    border: 0;
+    vertical-align: baseline;
 }
 
-form  { margin: 0; }
-input { margin: 0.1em; }
-input.numeric { text-align: right; }
+form {
+    margin: 0;
+}
+
+input {
+    margin: 0.1em;
+}
+
+input.numeric {
+    text-align: right;
+}
+
 table {
-  border-spacing: 1px;
-  /* For Mozilla */
-  empty-cells: show;
+    border-spacing: 1px;
+    /* For Mozilla */
+    empty-cells: show;
 }
+
 caption {
-  caption-side: top;
-  text-align: left;
-  margin-bottom: .5ex;
-  /* Allow the caption to extend to the full page width */
-  width: 100%;
+    caption-side: top;
+    text-align: left;
+    margin-bottom: .5ex;
+    /* Allow the caption to extend to the full page width */
+    width: 100%;
 }
 
 /* generic classes ----------------------------------------------- */
 
-.tt { font-family: monospace; }
-.strike { text-decoration:line-through; }
+.tt {
+    font-family: monospace;
+}
 
-.align-left {text-align: left;}
-.align-right {text-align: right;}
-.align-center {text-align: center;}
-  
-.top {vertical-align: top;}
+.strike {
+    text-decoration: line-through;
+}
 
-.nowrap {white-space: nowrap;}
+.align-left {
+    text-align: left;
+}
 
-.fullwidth { width: 100%; }
+.align-right {
+    text-align: right;
+}
 
+.align-center {
+    text-align: center;
+}
+
+.top {
+    vertical-align: top;
+}
+
+.nowrap {
+    white-space: nowrap;
+}
+
+.fullwidth {
+    width: 100%;
+}
+
 /* --------------------------------------------------------------- */
 
 /**
@@ -54,426 +83,542 @@
 
 /* Main wiki text box */
 body {
-  color: black;
-  background-color: white;
-  background-image: url("images/uhhbackground.jpg");
-  background-repeat: repeat;
-  font-family: Arial, Helvetica, sans-serif;
-  margin: 1ex 0.5em;
+    color: black;
+    background-color: white;
+    background-image: url("images/uhhbackground.jpg");
+    background-repeat: repeat;
+    font-family: Arial, Helvetica, sans-serif;
+    margin: 1ex 0.5em;
 }
+
 body p {
-  margin-left: 1em;
+    margin-left: 1em;
 }
 
 #logo img {
-  border: 1px outset gray;
-  margin-left: 1em;
-  margin-bottom: 1ex;
+    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;
+    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: 0.5ex;
-  padding-left:  0.8em;
-  padding-right: 0.8em;
-  padding-top:    0.5ex;
-  padding-bottom: 0.5ex;
-  clear: both;
+    margin-top: 1ex;
+    margin-bottom: 0.5ex;
+    padding-left: 0.8em;
+    padding-right: 0.8em;
+    padding-top: 0.5ex;
+    padding-bottom: 0.5ex;
+    clear: both;
 }
-div.wikitext hr { height: 1px; }
 
-div.wikitext pre { font-family: monospace; }
+div.wikitext hr {
+    height: 1px;
+}
 
+div.wikitext pre {
+    font-family: monospace;
+}
 
 /* Mozilla RecentChanges Sidebar */
 body.sidebar {
-  font-size: smaller;
-  margin: 0.5em;
+    font-size: smaller;
+    margin: 0.5em;
 }
+
 body.sidebar div.wikitext {
-  padding: 0.5em;
+    padding: 0.5em;
 }
-body.sidebar div.wikitext ul { padding-left: 1em; }
-body.sidebar h2 { margin-top: 0; }
 
+body.sidebar div.wikitext ul {
+    padding-left: 1em;
+}
 
+body.sidebar h2 {
+    margin-top: 0;
+}
+
 /**
  * Link styles
  */
 .wiki, .named-wiki {
-  font-weight: bold;
-  color: #87785c;
+    font-weight: bold;
+    color: #87785c;
 }
-.wiki { text-decoration: none; }
-.named-wiki { text-decoration: underline; }
 
+.wiki {
+    text-decoration: none;
+}
+
+.named-wiki {
+    text-decoration: underline;
+}
+
 /**
  * wikiaction, wikiadmin, wikiunsafe:
  */
-.wikiaction, .wikiadmin, .wiki-rc-action, .backlinks { text-decoration: none; }
-.wikiaction, .wikiadmin { font-weight: bold; }
+.wikiaction, .wikiadmin, .wiki-rc-action, .backlinks {
+    text-decoration: none;
+}
 
-.wikiaction, .wikiaction table, span.wikiaction { color: #4d5a6b; }
-.wikiadmin, .wikiadmin table { color :#ff7e00; }
-.wikiunsafe { }
+.wikiaction, .wikiadmin {
+    font-weight: bold;
+}
 
-.backlinks { color: #1d4fc0; }
-h1 .backlinks { text-decoration: underline; }
+.wikiaction, .wikiaction table, span.wikiaction {
+    color: #4d5a6b;
+}
 
+.wikiadmin, .wikiadmin table {
+    color: #ff7e00;
+}
 
+.wikiunsafe {
+}
+
+.backlinks {
+    color: #1d4fc0;
+}
+
+h1 .backlinks {
+    text-decoration: underline;
+}
+
 /* Unknown links */
-.wikiunknown a, .named-wikiunknown a, .wikiunknown u { color: #a6977a; }
+.wikiunknown a, .named-wikiunknown a, .wikiunknown u {
+    color: #a6977a;
+}
 
 /* Interwiki links */
-.wikipage  { font-weight: bold; }
-.interwiki { text-decoration: none; }
+.wikipage {
+    font-weight: bold;
+}
+
+.interwiki {
+    text-decoration: none;
+}
+
 .interwiki, i.interwiki .wikipage, em .interwiki .wikipage {
-  font-style: oblique;
+    font-style: oblique;
 }
+
 .interwiki .wikipage, i .interwiki, em .interwiki {
-  font-style: normal;
+    font-style: normal;
 }
 
-
 /**
  * headings
  */
-h1, h2, h3, h4, h5, h6 { font-family: Arial, Helvetica, sans-serif; }
+h1, h2, h3, h4, h5, h6 {
+    font-family: Arial, Helvetica, sans-serif;
+}
 
-h1 { margin: 0; }
+h1 {
+    margin: 0;
+}
 
 /**
  * tables
  */
-caption { font-family: Arial, Helvetica, sans-serif; }
+caption {
+    font-family: Arial, Helvetica, sans-serif;
+}
+
 .pagelist {
 }
+
 .pagelist thead, .pagelist thead u {
 }
-.pagelist tr.evenrow { background-color: #eee; }
-.pagelist tr.oddrow  { background-color: white; }
+
+.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;
+    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;
+    text-decoration: none;
+    font-size: small;
+    font-weight: normal;
+    font-family: Tahoma, Arial, Helvetica, sans-serif;
+    background-color: ThreeDLightShadow;
+    color: black;
 }
 
 /**
  * Toolbar
  */
-.toolbar, input.button { font-family: Arial, Helvetica, sans-serif; }
+.toolbar, input.button {
+    font-family: Arial, Helvetica, sans-serif;
+}
 
 .toolbar {
-  padding: 0;
-  margin:  0;
+    padding: 0;
+    margin: 0;
 }
+
 /* Prevent buttons from overlapping when wrapped */
-#navbar, #actionbar { line-height: 140%; }
+#navbar, #actionbar {
+    line-height: 140%;
+}
 
 .editdate {
-  font-family: Arial, Helvetica, sans-serif;
-  margin: 0;
-  padding: 0;
-  padding-top:    0.25ex;
+    font-family: Arial, Helvetica, sans-serif;
+    margin: 0;
+    padding: 0;
+    padding-top: 0.25ex;
 }
 
-
 /**
  * Edit Page & View Source
  */
 
 /* Make the textarea the full page width */
 .wikiedit {
-  width: 100%;
-  margin-bottom: 0.5ex;
-  margin-top:    0.5ex;
-  padding: 2px;
+    width: 100%;
+    margin-bottom: 0.5ex;
+    margin-top: 0.5ex;
+    padding: 2px;
 }
 
-input.button { font-family: Arial, Helvetica, sans-serif; }
+input.button {
+    font-family: Arial, Helvetica, sans-serif;
+}
+
 #editarea-size {
-  margin-top: 1ex;
-  text-align: right;
-  font-size: smaller;
+    margin-top: 1ex;
+    text-align: right;
+    font-size: smaller;
 }
 
 /* IncludePage plugin ================================================= */
 
 .transclusion-title {
-  text-align: right;
-  font-style: oblique;
-  font-size:  smaller;
-  text-decoration: underline;
-  margin-bottom: 0.25ex;
-  margin-right:  0.25em;
+    text-align: right;
+    font-style: oblique;
+    font-size: smaller;
+    text-decoration: underline;
+    margin-bottom: 0.25ex;
+    margin-right: 0.25em;
 }
+
 .transclusion, .wiki-edithelp {
-  font-size: smaller;
+    font-size: smaller;
 }
+
 .transclusion {
-  background: inherit;
-  border: 1px dotted #a6977a;
-  padding-left:  0.8em;
-  padding-right: 0.8em;
-  padding-top:     0;
-  padding-bottom:  0;
-  margin-left:   0.25em;
-  margin-right:  0.25em;
-  margin-bottom: 0.1ex;
+    background: inherit;
+    border: 1px dotted #a6977a;
+    padding-left: 0.8em;
+    padding-right: 0.8em;
+    padding-top: 0;
+    padding-bottom: 0;
+    margin-left: 0.25em;
+    margin-right: 0.25em;
+    margin-bottom: 0.1ex;
 }
+
 .wiki-edithelp {
-  border: medium solid #d8caae;
-  padding-left:  0.5em;
-  padding-right: 0.5em;
-  padding-top:    0.75ex;
-  padding-bottom: 0.75ex;
-  margin-left:  0;
-  margin-right: 0;
-  margin-top: 1ex;
-  margin-bottom: 1ex;
+    border: medium solid #d8caae;
+    padding-left: 0.5em;
+    padding-right: 0.5em;
+    padding-top: 0.75ex;
+    padding-bottom: 0.75ex;
+    margin-left: 0;
+    margin-right: 0;
+    margin-top: 1ex;
+    margin-bottom: 1ex;
 }
+
 .wiki-edithelp .wiki {
-  color: #87785c;
+    color: #87785c;
 }
+
 .wiki-edithelp p {
-  font-family: Arial, Helvetica, sans-serif;
-  padding-left:  0.5em;
-  padding-right: 0.5em;
-  padding-top:    0.5ex;
-  padding-bottom: 0.5ex;
-  margin: 0;
+    font-family: Arial, Helvetica, sans-serif;
+    padding-left: 0.5em;
+    padding-right: 0.5em;
+    padding-top: 0.5ex;
+    padding-bottom: 0.5ex;
+    margin: 0;
 }
 
-
 /**
  * Calendar plugin
  */
 table.cal {
-  border: 1px outset gray;
-  margin: 0.5ex 0.5em;
-  padding: 1px;
-  /* For Mozilla */
-  empty-cells: hide;
+    border: 1px outset gray;
+    margin: 0.5ex 0.5em;
+    padding: 1px;
+    /* For Mozilla */
+    empty-cells: hide;
 }
+
 /* Month-name & arrows area */
 table.cal thead {
 }
+
 table.cal table.cal-header td {
-  padding-top: 110px;
+    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;
+    background-image: url("images/pictures/SteamVolcanoDusk.jpg");
+    background-repeat: no-repeat;
+    background-position: center;
+    font-size: larger;
 }
- /* Month-name & arrows cells */
+
+/* Month-name & arrows cells */
 table.cal table.cal-header td {
-  text-align: center;
-  color: white;
-  background-color: transparent;
-  border: 0;
+    text-align: center;
+    color: white;
+    background-color: transparent;
+    border: 0;
 }
- /* arrow text */
+
+/* arrow text */
 .cal-arrow {
-  text-decoration: none;
-  color: white;
-  font-weight: bold;
+    text-decoration: none;
+    color: white;
+    font-weight: bold;
 }
 
 /* Day-names header */
 table.cal tr .cal-dayname {
-  background: inherit;
+    background: inherit;
 }
+
 .cal-dayname td {
-  text-align: center;
-  font-size: smaller;
-  text-decoration: none;
-  color: black;
-  padding-bottom: 0.5ex;
+    text-align: center;
+    font-size: smaller;
+    text-decoration: none;
+    color: black;
+    padding-bottom: 0.5ex;
 }
 
 /* Individual days */
- /* cells */
+/* cells */
 table.cal tbody td {
-  border: 0.5pt solid #ddd;
-  background-color: white;
-  text-align: right;
+    border: 0.5pt solid #ddd;
+    background-color: white;
+    text-align: right;
 }
- /* text */
+
+/* text */
 a.cal-hide {
-  text-decoration: none;
-  color: black;
-  font-weight: normal;
+    text-decoration: none;
+    color: black;
+    font-weight: normal;
 }
- /* Today */
-  /* cell */
+
+/* Today */
+/* cell */
 table.cal td.cal-today {
-  margin: 1px;
-  background-color: white;
-  border: 0.5pt solid black;
+    margin: 1px;
+    background-color: white;
+    border: 0.5pt solid black;
 }
-  /* text */
+
+/* text */
 table.cal td.cal-today a {
-  color: blue;
+    color: blue;
 }
- /* Day with a data page */
-  /* cell */
+
+/* Day with a data page */
+/* cell */
 table.cal td.cal-day {
-  margin: 1px;
-  background-color: white;
-  border: 0.5pt solid black;
+    margin: 1px;
+    background-color: white;
+    border: 0.5pt solid black;
 }
-  /* text */
+
+/* text */
 table.cal td.cal-day a {
-  color: red;
-  text-decoration: none;
+    color: red;
+    text-decoration: none;
 }
 
-
 /**
  * Diff Output
  */
 
 /* main box */
 .diff .block {
-  background-color: #ccc;
-  padding: 0.5ex 0.5em;
-  margin:  0.5ex 0;
+    background-color: #ccc;
+    padding: 0.5ex 0.5em;
+    margin: 0.5ex 0;
 }
 
 /* individual lines */
-.diff .context { background-color: white; }
+.diff .context {
+    background-color: white;
+}
 
 /* + - line prefix */
-.diff .block tt{
-  font-weight: bold;
-  font-family: monospace;
-  margin-left: -.6em;
-  color: black;
+.diff .block tt {
+    font-weight: bold;
+    font-family: monospace;
+    margin-left: -.6em;
+    color: black;
 }
 
 .diff del, .diff ins {
-  font-weight: bold;
-  text-decoration: none;
+    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; }
+.diff .original, .diff .deleted {
+    background-color: #fcc;
+}
 
+.diff .final, .diff .added {
+    background-color: #cfc;
+}
+
+.diff del {
+    background-color: #f99;
+}
+
+.diff ins {
+    background-color: #9f9;
+}
+
 /**
  * Other
  */
-.printer { display: none; }
+.printer {
+    display: none;
+}
 
 div.error {
-  color: black;
-  border: medium solid #d8caae;
-  margin-top:    1em;
-  margin-bottom: 1em;
-  padding-left:  0.8em;
-  padding-right: 0.8em;
-  padding-top:    0.8ex;
-  padding-bottom: 0;
-  font-size: smaller;
-  clear: both;
+    color: black;
+    border: medium solid #d8caae;
+    margin-top: 1em;
+    margin-bottom: 1em;
+    padding-left: 0.8em;
+    padding-right: 0.8em;
+    padding-top: 0.8ex;
+    padding-bottom: 0;
+    font-size: smaller;
+    clear: both;
 }
 
 /* Debug */
 .debug {
-  color: black;
-  font-family: monospace;
-  margin: 1ex 0;
-  padding: 0.5ex 0.5em;
-  border: medium solid #d8caae;
+    color: black;
+    font-family: monospace;
+    margin: 1ex 0;
+    padding: 0.5ex 0.5em;
+    border: medium solid #d8caae;
 }
 
 .clear-floats {
-  clear: both;
+    clear: both;
 }
 
 /**
  * Search Results
  */
-.search-context { background-color: white; font-style: oblique; }
+.search-context {
+    background-color: white;
+    font-style: oblique;
+}
+
 .search-term {
-  background-color: yellow;
-  font-weight: normal;
+    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;
+    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;
+    background-color: #f08000;
 }
+
 #LSResult .evenrow {
-  background-color: #f0f0f0;
+    background-color: #f0f0f0;
 }
 
-.toolbar, div.toolbar { margin: 0.5ex 0; }
+.toolbar, div.toolbar {
+    margin: 0.5ex 0;
+}
 
 /* Link icons */
-img.linkicon { vertical-align: middle; }
+img.linkicon {
+    vertical-align: middle;
+}
 
 div.wikitext {
-  width: auto;
-  background-image: url("images/tchecker-white.png");
-  background-repeat: repeat;
+    width: auto;
+    background-image: url("images/tchecker-white.png");
+    background-repeat: repeat;
 }
+
 .wiki-edithelp {
-  background-image: url("images/tchecker-sand.png");
-  background-repeat: repeat;
+    background-image: url("images/tchecker-sand.png");
+    background-repeat: repeat;
 }
+
 .wiki-edithelp p {
-  background-image: url("images/tchecker-white.png");
-  background-repeat: repeat;
+    background-image: url("images/tchecker-white.png");
+    background-repeat: repeat;
 }
 
 /**
  * Diff Output
  */
-.diff .block div { position: relative; padding-left: 1.5em; }
-.diff .prefix    { position: absolute; left: 0.5em; top: 0; }
+.diff .block div {
+    position: relative;
+    padding-left: 1.5em;
+}
 
+.diff .prefix {
+    position: absolute;
+    left: 0.5em;
+    top: 0;
+}
+
 /**
  * Other
  */
 .debug {
-  background-image: url("images/tchecker-sand.png");
-  background-repeat: repeat;
+    background-image: url("images/tchecker-sand.png");
+    background-repeat: repeat;
 }
 
 /* WikicreoleTable, MediawikiTable and RichTable plugins ============== */

Modified: trunk/themes/MacOSX/MacOSX-topbottombars.css
===================================================================
--- trunk/themes/MacOSX/MacOSX-topbottombars.css	2012-10-06 10:28:33 UTC (rev 8398)
+++ trunk/themes/MacOSX/MacOSX-topbottombars.css	2012-10-06 11:05:48 UTC (rev 8399)
@@ -4,9 +4,9 @@
  * General settings
  */
 body {
-  /* Odd large top padding is needed for Mozilla */
-  padding-top: 16ex;
-  padding-bottom: 9ex;
+    /* Odd large top padding is needed for Mozilla */
+    padding-top: 16ex;
+    padding-bottom: 9ex;
 }
 
 /**
@@ -15,45 +15,47 @@
  * #navbar and #actionbar, such as in editpage and removepage
  */
 div#header, div#footer {
-  background: white url("images/bgpaper8.png");
-  margin: 0;
-  padding: 0;
-  position: fixed;
-  left:  0;
-  right: 0;
-  padding-top:    0.5ex;
-  padding-bottom: 0.5ex;
-  padding-left:  1em;
-  padding-right: 1em;
+    background: white url("images/bgpaper8.png");
+    margin: 0;
+    padding: 0;
+    position: fixed;
+    left: 0;
+    right: 0;
+    padding-top: 0.5ex;
+    padding-bottom: 0.5ex;
+    padding-left: 1em;
+    padding-right: 1em;
 }
+
 hr.toolbar {
-  display: none;
+    display: none;
 }
 
-
 /**
  * Navbar
  */
 div#header {
-  top: 0;
-  border-bottom: 1px solid #b2b2b2;
+    top: 0;
+    border-bottom: 1px solid #b2b2b2;
 }
+
 div#navbuttons {
-  padding-bottom: 0.25ex;
+    padding-bottom: 0.25ex;
 }
 
 /**
  * Actionbar
  */
 div#footer {
-  border-top: 1px solid #b2b2b2;
-  /* kludge for Mozilla */
-  bottom: -1ex;
-  padding-bottom: 0;
+    border-top: 1px solid #b2b2b2;
+    /* kludge for Mozilla */
+    bottom: -1ex;
+    padding-bottom: 0;
 }
+
 p.editdate {
-  margin-top: 0.75ex;
-  margin-bottom: 0.5ex;
+    margin-top: 0.75ex;
+    margin-bottom: 0.5ex;
 }
 
 /* For emacs users

Modified: trunk/themes/MacOSX/MacOSX.css
===================================================================
--- trunk/themes/MacOSX/MacOSX.css	2012-10-06 10:28:33 UTC (rev 8398)
+++ trunk/themes/MacOSX/MacOSX.css	2012-10-06 11:05:48 UTC (rev 8399)
@@ -23,713 +23,1000 @@
  TODO: Get rid of tables in wikiaction forms.
  */
 
-body { background: #fafafa url("images/bgpaper8.png"); }
-body.edit { background: #fafafa url("images/bggranular.png"); }
+body {
+    background: #fafafa url("images/bgpaper8.png");
+}
 
-body { }
+body.edit {
+    background: #fafafa url("images/bggranular.png");
+}
 
+body {
+}
+
 /* Ensure identical vertical alignment for adjacent form buttons,
    whether image based (Theme buttons) or not */
 input[type=submit],
 input[type=cancel],
-input[type=image] { vertical-align: middle }
+input[type=image] {
+    vertical-align: middle
+}
 
-h1, h2, h3, .toolbar, td { font-family: "Lucida Grande", Helvetica, Arial, sans-serif; }
+h1, h2, h3, .toolbar, td {
+    font-family: "Lucida Grande", Helvetica, Arial, sans-serif;
+}
 
-input.button { font-family: "Lucida Grande", Helvetica, Arial, sans-serif; }
+input.button {
+    font-family: "Lucida Grande", Helvetica, Arial, sans-serif;
+}
 
 input.numeric {
-  text-align: right;
+    text-align: right;
 }
-.wikitext pre { font-family: Monaco, monospace; }
 
+.wikitext pre {
+    font-family: Monaco, monospace;
+}
+
 input[type=text] {
-  border-top:    1px solid #7c7c7c;
-  border-left:   1px solid #c3c3c3;
-  border-bottom: 1px solid #dddddd;
-  border-right:  1px solid #c3c3c3;
+    border-top: 1px solid #7c7c7c;
+    border-left: 1px solid #c3c3c3;
+    border-bottom: 1px solid #dddddd;
+    border-right: 1px solid #c3c3c3;
 }
 
 /* Add space between the input field and following buttons, but not after the last button. */
 div.wikiaction input[type=text],
 div.wikiadmin input[type=text],
 form.wikiadmin input[type=file] {
-  margin-right: 0.5em;
+    margin-right: 0.5em;
 }
 
 /* generic classes ----------------------------------------------- */
 
-.tt { font-family: monospace; }
-.strike { text-decoration:line-through; }
+.tt {
+    font-family: monospace;
+}
 
-.align-left {text-align: left;}
-.align-right {text-align: right;}
-.align-center {text-align: center;}
-  
-.top {vertical-align: top;}
+.strike {
+    text-decoration: line-through;
+}
 
-.nowrap {white-space: nowrap;}
+.align-left {
+    text-align: left;
+}
 
-.fullwidth { width: 100%; }
+.align-right {
+    text-align: right;
+}
 
+.align-center {
+    text-align: center;
+}
+
+.top {
+    vertical-align: top;
+}
+
+.nowrap {
+    white-space: nowrap;
+}
+
+.fullwidth {
+    width: 100%;
+}
+
 /* --------------------------------------------------------------- */
 
 /**
  * Wiki
  */
 div.wikitext {
-  background: white;
-  border-top:    1px solid #7c7c7c;
-  border-left:   1px solid #c3c3c3;
-  border-bottom: 1px solid #dddddd;
-  border-right:  1px solid #c3c3c3;
-  padding-left: 0.8em;
-  padding-right: 0.8em;
-  padding-top: 0.5em;
-  padding-bottom: 0.5em;
-  margin: 0.5ex 0;
-  clear: both;
+    background: white;
+    border-top: 1px solid #7c7c7c;
+    border-left: 1px solid #c3c3c3;
+    border-bottom: 1px solid #dddddd;
+    border-right: 1px solid #c3c3c3;
+    padding-left: 0.8em;
+    padding-right: 0.8em;
+    padding-top: 0.5em;
+    padding-bottom: 0.5em;
+    margin: 0.5ex 0;
+    clear: both;
 }
 
-input.wikitext { margin:0; }
+input.wikitext {
+    margin: 0;
+}
+
 input[type=text] {
-  height: 2.7ex;
-  padding: 0.4ex 0.3ex;
+    height: 2.7ex;
+    padding: 0.4ex 0.3ex;
 }
 
-div.toolbar { margin: 1ex 0; }
+div.toolbar {
+    margin: 1ex 0;
+}
 
 /**
  * PageTypes
  */
 .interwiki-map thead td {
-  background: #e8e8e8;
-  font-weight: bold;
-  font-size: smaller;
+    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; }
 
+.interwiki-map thead td:first-child {
+    text-decoration: underline;
+}
+
+.interwiki-moniker {
+    background: #eee;
+}
+
+.interwiki-url {
+    background: #f8f8f8;
+}
+
 /* Mozilla RecentChanges Sidebar */
 body.sidebar {
-  font-size: smaller;
-  margin: 0.5em;
+    font-size: smaller;
+    margin: 0.5em;
 }
+
 body.sidebar div.wikitext {
-  padding: 0.5em;
+    padding: 0.5em;
 }
-body.sidebar div.wikitext ul { padding-left: 1em; }
-body.sidebar h2 { margin-top: 0; }
 
+body.sidebar div.wikitext ul {
+    padding-left: 1em;
+}
+
+body.sidebar h2 {
+    margin-top: 0;
+}
+
 div.error {
-  background: #eee;
-  border: 1px solid gray;
-  padding-left: 0.8em;
-  padding-right: 0.8em;
-  padding-top: 0.8ex;
-  padding-bottom: 0;
-  margin-top: 1em;
-  clear: both;
-  font-size: smaller;
+    background: #eee;
+    border: 1px solid gray;
+    padding-left: 0.8em;
+    padding-right: 0.8em;
+    padding-top: 0.8ex;
+    padding-bottom: 0;
+    margin-top: 1em;
+    clear: both;
+    font-size: smaller;
 }
 
 /* Debug */
 .debug {
-  color: black;
-  background: white;
-  font-family: monospace;
-  font-size: smaller;
-  margin: 1ex 0;
-  padding: 0.5ex 0.5em;
-  border: 1px solid #eee;
+    color: black;
+    background: white;
+    font-family: monospace;
+    font-size: smaller;
+    margin: 1ex 0;
+    padding: 0.5ex 0.5em;
+    border: 1px solid #eee;
 }
 
 /*
  * Link styles
  */
 /* Wiki Links */
-a.wiki { text-decoration: none; }
-.wiki, .named-wiki { font-weight: bold; color:#1d42be; } /*blue*/
+a.wiki {
+    text-decoration: none;
+}
 
+.wiki, .named-wiki {
+    font-weight: bold;
+    color: #1d42be;
+}
+
+/*blue*/
+
 /* Unknown links */
-.wikiunknown a, .named-wikiunknown a, .wikiunknown U { text-decoration: none; }
+.wikiunknown a, .named-wikiunknown a, .wikiunknown U {
+    text-decoration: none;
+}
 
-.wikiunknown, .named-wikiunknown {color: #555; }
+.wikiunknown, .named-wikiunknown {
+    color: #555;
+}
 
 /* Interwiki links */
-a.interwiki { text-decoration: none; }
-.wikipage   { font-weight: bold; }
+a.interwiki {
+    text-decoration: none;
+}
 
+.wikipage {
+    font-weight: bold;
+}
+
 .interwiki,
-i .interwiki .wikipage, em .interwiki .wikipage { font-style: oblique; }
+i .interwiki .wikipage, em .interwiki .wikipage {
+    font-style: oblique;
+}
 
 .interwiki .wikipage,
-i .interwiki, em .interwiki { font-style: normal; }
+i .interwiki, em .interwiki {
+    font-style: normal;
+}
 
 /*
  * wikiaction, wikiadmin, wikiunsafe:
  */
-a.wikiaction, a.wikiadmin { text-decoration: none; }
+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; }
+img {
+    border: 0;
+}
 
-a.wikiaction { border: 0; }
+img.rssicon {
+    vertical-align: middle;
+}
 
+img.wiki-button {
+    vertical-align: middle;
+}
+
+.wiki-button {
+    border: 0;
+}
+
+a.wikiaction {
+    border: 0;
+}
+
 /* backlinks */
-a.backlinks { color: #006; }
+a.backlinks {
+    color: #006;
+}
 
 /* Make the textarea on the edit page full width */
-textarea.wikiedit { width: 100%; margin-top: 1ex; }
+textarea.wikiedit {
+    width: 100%;
+    margin-top: 1ex;
+}
 
-p.editdate { font-size: smaller; margin-bottom: 0; font-family: "Lucida Grande", Helvetica, Arial, sans-serif; }
+p.editdate {
+    font-size: smaller;
+    margin-bottom: 0;
+    font-family: "Lucida Grande", Helvetica, Arial, sans-serif;
+}
 
 /* Calendar plugin */
 a.cal-hide,
-a.cal-arrow { text-decoration: none; }
-.cal-arrow { font-weight: bold; }
+a.cal-arrow {
+    text-decoration: none;
+}
+
+.cal-arrow {
+    font-weight: bold;
+}
+
 .cal-dayname {
-  font-size: smaller;
-  text-decoration: none;
+    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 #dddddd;
-  border-right:  1px solid #c3c3c3;
+    background: white;
+    border-top: 1px solid #7c7c7c;
+    border-left: 1px solid #c3c3c3;
+    border-bottom: 1px solid #dddddd;
+    border-right: 1px solid #c3c3c3;
 }
+
 table.cal-header td {
-  font-size:  larger;
-  background: white;
-  border: 0;
+    font-size: larger;
+    background: white;
+    border: 0;
 }
-table.cal td.cal-dayname { background: #e8e8e8; }
+
+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 #dddddd;
-  border-right:  1px solid #c3c3c3;
+    background: #f4f4f4;
+    border-top: 1px solid #7c7c7c;
+    border-left: 1px solid #c3c3c3;
+    border-bottom: 1px solid #dddddd;
+    border-right: 1px solid #c3c3c3;
 }
 
 /* IncludePage plugin ================================================= */
 
 .transclusion-title {
-  font-family: "Lucida Grande", Helvetica, Arial, sans-serif;
-  font-size: smaller;
-  text-decoration: underline;
-  text-align: right;
-  font-style: oblique;
-  margin-bottom: 0.25ex;
-  margin-right:  0.25em;
+    font-family: "Lucida Grande", Helvetica, Arial, sans-serif;
+    font-size: smaller;
+    text-decoration: underline;
+    text-align: right;
+    font-style: oblique;
+    margin-bottom: 0.25ex;
+    margin-right: 0.25em;
 }
 
 .transclusion {
-  background: #fdfdfd;
-  border-top:    1px solid #7c7c7c;
-  border-left:   1px solid #c3c3c3;
-  border-bottom: 1px solid #dddddd;
-  border-right:  1px solid #c3c3c3;
-  padding-left:  0.8em;
-  padding-right: 0.8em;
-  padding-top:    0;
-  padding-bottom: 0;
-  margin: 0.5ex ;
-  margin-left:   0.25em;
-  margin-right:  0.25em;
-  margin-bottom: 0.1ex;
-  font-size: smaller;
+    background: #fdfdfd;
+    border-top: 1px solid #7c7c7c;
+    border-left: 1px solid #c3c3c3;
+    border-bottom: 1px solid #dddddd;
+    border-right: 1px solid #c3c3c3;
+    padding-left: 0.8em;
+    padding-right: 0.8em;
+    padding-top: 0;
+    padding-bottom: 0;
+    margin: 0.5ex;
+    margin-left: 0.25em;
+    margin-right: 0.25em;
+    margin-bottom: 0.1ex;
+    font-size: smaller;
 }
 
 /* The transclusion of the TextEditingRules Synopsis on templates/editpage.html */
 .wiki-edithelp .transclusion {
-  font-size: smaller;
-  background: inherit;
-  padding: 0.5ex 0.5em;
-  margin: 0.2ex 5%;
+    font-size: smaller;
+    background: inherit;
+    padding: 0.5ex 0.5em;
+    margin: 0.2ex 5%;
 }
-.wiki-edithelp .transclusion p { margin: 0; }
+
+.wiki-edithelp .transclusion p {
+    margin: 0;
+}
+
 .wiki-edithelp {
-  background: white;
-  border-top:    1px solid #7c7c7c;
-  border-left:   1px solid #c3c3c3;
-  border-bottom: 1px solid #d...
 
[truncated message content]

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

From: <var...@us...> - 2012-10-06 10:28:43

Revision: 8398
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8398&view=rev
Author:   vargenau
Date:     2012-10-06 10:28:33 +0000 (Sat, 06 Oct 2012)
Log Message:
-----------
Reformat code

Modified Paths:
--------------
    trunk/ImageTile.php
    trunk/RPC2.php
    trunk/SOAP.php
    trunk/admin/wiki2public.php
    trunk/configurator.php
    trunk/index.php
    trunk/lib/AccessLog.php
    trunk/lib/ArchiveCleaner.php
    trunk/lib/AtomParser.php
    trunk/lib/BlockParser.php
    trunk/lib/CachedMarkup.php
    trunk/lib/Captcha.php
    trunk/lib/DbSession/ADODB.php
    trunk/lib/DbSession/PDO.php
    trunk/lib/DbSession/SQL.php
    trunk/lib/DbSession/dba.php
    trunk/lib/DbSession.php
    trunk/lib/DbaDatabase.php
    trunk/lib/DbaListSet.php
    trunk/lib/DbaPartition.php
    trunk/lib/EditToolbar.php
    trunk/lib/ErrorManager.php
    trunk/lib/ExternalReferrer.php
    trunk/lib/FileFinder.php
    trunk/lib/Google.php
    trunk/lib/HtmlElement.php
    trunk/lib/HtmlElement5.php
    trunk/lib/HtmlParser.php
    trunk/lib/HttpClient.php
    trunk/lib/IniConfig.php
    trunk/lib/InlineParser.php
    trunk/lib/MailNotify.php
    trunk/lib/PageList.php
    trunk/lib/PagePerm.php
    trunk/lib/PageType.php
    trunk/lib/RSSWriter091.php
    trunk/lib/Request.php
    trunk/lib/RssParser.php
    trunk/lib/RssWriter.php
    trunk/lib/RssWriter2.php
    trunk/lib/SemanticWeb.php
    trunk/lib/SpamBlocklist.php
    trunk/lib/Template.php
    trunk/lib/TextSearchQuery.php
    trunk/lib/Units.php
    trunk/lib/WikiCallback.php
    trunk/lib/WikiDB/ADODB.php
    trunk/lib/WikiDB/PDO.php
    trunk/lib/WikiDB/SQL.php
    trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
    trunk/lib/WikiDB/adodb/adodb-error.inc.php
    trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
    trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
    trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
    trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
    trunk/lib/WikiDB/adodb/adodb-lib.inc.php
    trunk/lib/WikiDB/adodb/adodb-pear.inc.php
    trunk/lib/WikiDB/adodb/adodb-php4.inc.php
    trunk/lib/WikiDB/adodb/adodb-time.inc.php
    trunk/lib/WikiDB/adodb/adodb.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
    trunk/lib/WikiDB/adodb/readme.htm
    trunk/lib/WikiDB/backend/ADODB.php
    trunk/lib/WikiDB/backend/ADODB_mssql.php
    trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
    trunk/lib/WikiDB/backend/ADODB_mysql.php
    trunk/lib/WikiDB/backend/ADODB_oci8po.php
    trunk/lib/WikiDB/backend/ADODB_postgres7.php
    trunk/lib/WikiDB/backend/ADODB_sqlite.php
    trunk/lib/WikiDB/backend/PDO.php
    trunk/lib/WikiDB/backend/PDO_mysql.php
    trunk/lib/WikiDB/backend/PDO_oci8.php
    trunk/lib/WikiDB/backend/PDO_pgsql.php
    trunk/lib/WikiDB/backend/PearDB.php
    trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
    trunk/lib/WikiDB/backend/PearDB_mysql.php
    trunk/lib/WikiDB/backend/PearDB_oci8.php
    trunk/lib/WikiDB/backend/PearDB_pgsql.php
    trunk/lib/WikiDB/backend/PearDB_sqlite.php
    trunk/lib/WikiDB/backend/cvs.php
    trunk/lib/WikiDB/backend/dba.php
    trunk/lib/WikiDB/backend/dbaBase.php
    trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
    trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
    trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
    trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
    trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
    trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
    trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
    trunk/lib/WikiDB/backend/file.php
    trunk/lib/WikiDB/backend/flatfile.php
    trunk/lib/WikiDB/backend.php
    trunk/lib/WikiDB/cvs.php
    trunk/lib/WikiDB/dba.php
    trunk/lib/WikiDB/file.php
    trunk/lib/WikiDB/flatfile.php
    trunk/lib/WikiDB.php
    trunk/lib/WikiGroup.php
    trunk/lib/WikiPlugin.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/WikiTheme.php
    trunk/lib/WikiUser/AdoDb.php
    trunk/lib/WikiUser/BogoLogin.php
    trunk/lib/WikiUser/Db.php
    trunk/lib/WikiUser/EMailConfirm.php
    trunk/lib/WikiUser/Facebook.php
    trunk/lib/WikiUser/File.php
    trunk/lib/WikiUser/Forbidden.php
    trunk/lib/WikiUser/FusionForge.php
    trunk/lib/WikiUser/HttpAuth.php
    trunk/lib/WikiUser/HttpAuthUpper.php
    trunk/lib/WikiUser/IMAP.php
    trunk/lib/WikiUser/LDAP.php
    trunk/lib/WikiUser/LdapUpper.php
    trunk/lib/WikiUser/OpenID.php
    trunk/lib/WikiUser/POP3.php
    trunk/lib/WikiUser/PdoDb.php
    trunk/lib/WikiUser/PearDb.php
    trunk/lib/WikiUser/PersonalPage.php
    trunk/lib/WikiUser/Session.php
    trunk/lib/WikiUser.php
    trunk/lib/WikiUserNew.php
    trunk/lib/WysiwygEdit/FCKeditor.php
    trunk/lib/WysiwygEdit/Wikiwyg.php
    trunk/lib/WysiwygEdit/htmlarea2.php
    trunk/lib/WysiwygEdit/htmlarea3.php
    trunk/lib/WysiwygEdit/spaw.php
    trunk/lib/WysiwygEdit/tinymce.php
    trunk/lib/WysiwygEdit.php
    trunk/lib/XMLRPC/utils.php
    trunk/lib/XMLRPC/xmlrpc.inc
    trunk/lib/XMLRPC/xmlrpc_emu.inc
    trunk/lib/XMLRPC/xmlrpcs.inc
    trunk/lib/XMLRPC/xmlrpcs_emu.inc
    trunk/lib/XmlElement.php
    trunk/lib/XmlParser.php
    trunk/lib/XmlRpcClient.php
    trunk/lib/XmlRpcServer.php
    trunk/lib/config.php
    trunk/lib/diff.php
    trunk/lib/diff3.php
    trunk/lib/difflib.php
    trunk/lib/display.php
    trunk/lib/editpage.php
    trunk/lib/fortune.php
    trunk/lib/fpdf/chinese.php
    trunk/lib/fpdf/courier.php
    trunk/lib/fpdf/helvetica.php
    trunk/lib/fpdf/helveticab.php
    trunk/lib/fpdf/helveticabi.php
    trunk/lib/fpdf/helveticai.php
    trunk/lib/fpdf/japanese.php
    trunk/lib/fpdf/symbol.php
    trunk/lib/fpdf/times.php
    trunk/lib/fpdf/timesb.php
    trunk/lib/fpdf/timesbi.php
    trunk/lib/fpdf/timesi.php
    trunk/lib/fpdf/zapfdingbats.php
    trunk/lib/fpdf.php
    trunk/lib/gif.php
    trunk/lib/imagecache.php
    trunk/lib/imdb.php
    trunk/lib/install.php
    trunk/lib/loadsave.php
    trunk/lib/main.php
    trunk/lib/nusoap/nusoap.php
    trunk/lib/pdf.php
    trunk/lib/plugin/SystemInfo.php
    trunk/lib/prepend.php
    trunk/lib/purgepage.php
    trunk/lib/removepage.php
    trunk/lib/spam_babycart.php
    trunk/lib/stdlib.php
    trunk/lib/wikilens/Buddy.php
    trunk/lib/wikilens/CustomPrefs.php
    trunk/lib/wikilens/PageListColumns.php
    trunk/lib/wikilens/RatingsDb.php
    trunk/lib/wikilens/RatingsUser.php
    trunk/lib/wikilens/Utils.php
    trunk/lib/ziplib.php
    trunk/passencrypt.php
    trunk/themes/Crao/themeinfo.php
    trunk/themes/Hawaiian/lib/random.php
    trunk/themes/Hawaiian/themeinfo.php
    trunk/themes/MacOSX/images/index.php
    trunk/themes/MacOSX/lib/RecentChanges.php
    trunk/themes/MacOSX/themeinfo.php
    trunk/themes/MonoBook/themeinfo.php
    trunk/themes/Portland/lib/RecentChanges.php
    trunk/themes/Portland/themeinfo.php
    trunk/themes/Sidebar/clock.php
    trunk/themes/Sidebar/hyperapplet.php
    trunk/themes/Sidebar/hyperwiki.php
    trunk/themes/Sidebar/themeinfo.php
    trunk/themes/SpaceWiki/lib/RecentChanges.php
    trunk/themes/SpaceWiki/themeinfo.php
    trunk/themes/Wordpress/lib/RecentChanges.php
    trunk/themes/Wordpress/themeinfo.php
    trunk/themes/alphatest.php
    trunk/themes/blog/lib/RecentChanges.php
    trunk/themes/blog/themeinfo.php
    trunk/themes/fusionforge/themeinfo.php
    trunk/themes/shamino_com/themeinfo.php
    trunk/themes/smaller/themeinfo.php
    trunk/themes/wikilens/themeinfo.php
    trunk/uploads/index.php
    trunk/view.php
    trunk/wikiadmin.php
    trunk/wikilist.php

Modified: trunk/ImageTile.php
===================================================================
--- trunk/ImageTile.php	2012-10-05 16:47:39 UTC (rev 8397)
+++ trunk/ImageTile.php	2012-10-06 10:28:33 UTC (rev 8398)
@@ -3,38 +3,38 @@
 require_once 'lib/stdlib.php';
 
 $remove = 0;
-if (preg_match('/^(http|ftp|https):\/\//i',$_REQUEST['url'])) {
+if (preg_match('/^(http|ftp|https):\/\//i', $_REQUEST['url'])) {
 
     $data_path = '';
     list($usec, $sec) = explode(" ", microtime());
 
-    $fp = fopen('config/config.ini','r');
-    while ($config = fgetcsv($fp,1024,';')) {
-        if (preg_match('/DATA_PATH/',$config[0])) {
-            list($key,$value) = explode('=', $config[0]);
-            $data_path = trim($value).'/';
-        break;
+    $fp = fopen('config/config.ini', 'r');
+    while ($config = fgetcsv($fp, 1024, ';')) {
+        if (preg_match('/DATA_PATH/', $config[0])) {
+            list($key, $value) = explode('=', $config[0]);
+            $data_path = trim($value) . '/';
+            break;
+        }
     }
-    }
     fclose($fp);
-    @mkdir($data_path."uploads/thumbs",0775);
-    $file = $data_path."uploads/thumbs/image_" . ((float)$usec + (float)$sec);
+    @mkdir($data_path . "uploads/thumbs", 0775);
+    $file = $data_path . "uploads/thumbs/image_" . ((float)$usec + (float)$sec);
     $source = url_get_contents($_REQUEST['url']);
 
-    @$fp = fopen($file,'w+');
+    @$fp = fopen($file, 'w+');
     if (!$fp) {
-        header ("Content-type: text/html");
+        header("Content-type: text/html");
         echo "<html><head></head><body>ERROR : unable to open $file in write mode</body></html>";
     }
-    fwrite($fp,$source);
+    fwrite($fp, $source);
     $remove = 1;
 
 } else {
-    @$fp = fopen($_REQUEST['url'],"r");
+    @$fp = fopen($_REQUEST['url'], "r");
 
     if (!$fp) {
 
-        header ("Content-type: text/html");
+        header("Content-type: text/html");
         echo "<html><head></head><body>Not an image</body></html>";
         exit();
 
@@ -43,83 +43,83 @@
         fclose($fp);
     }
 }
-list ($a, $b, $type, $attr) = @getimagesize ($file);
+list ($a, $b, $type, $attr) = @getimagesize($file);
 
 if (!$type) {
-    $type = basename ($_REQUEST['url']);
-    $type = preg_split ('/\./',$type);
-    $type = array_pop ($type);
+    $type = basename($_REQUEST['url']);
+    $type = preg_split('/\./', $type);
+    $type = array_pop($type);
 }
 
 switch ($type) {
     case '2':
         if (function_exists("imagecreatefromjpeg"))
-            $img = @imagecreatefromjpeg ($file);
+            $img = @imagecreatefromjpeg($file);
         else
-            show_plain ($file);
+            show_plain($file);
         break;
     case '3':
         if (function_exists("imagecreatefrompng"))
-            $img = @imagecreatefrompng ($file);
+            $img = @imagecreatefrompng($file);
         else
-            show_plain ($file);
+            show_plain($file);
         break;
     case '1':
         if (function_exists("imagecreatefromgif"))
-            $img = @imagecreatefromgif ($file);
+            $img = @imagecreatefromgif($file);
         else
-            show_plain ($file);
+            show_plain($file);
         break;
     case '15':
         if (function_exists("imagecreatefromwbmp"))
-            $img = @imagecreatefromwbmp ($file);
+            $img = @imagecreatefromwbmp($file);
         else
-            show_plain ($file);
+            show_plain($file);
         break;
     case '16':
         if (function_exists("imagecreatefromxbm"))
-            $img = @imagecreatefromxbm ($file);
+            $img = @imagecreatefromxbm($file);
         else
-            show_plain ($file);
+            show_plain($file);
         break;
     case 'xpm':
         if (function_exists("imagecreatefromxpm"))
-            $img = @imagecreatefromxpm ($file);
+            $img = @imagecreatefromxpm($file);
         else
-            show_plain ($file);
+            show_plain($file);
         break;
     case 'gd':
         if (function_exists("imagecreatefromgd"))
-            $img = @imagecreatefromgd ($file);
+            $img = @imagecreatefromgd($file);
         else
-            show_plain ($file);
+            show_plain($file);
         break;
     case 'gd2':
         if (function_exists("imagecreatefromgd2"))
-            $img = @imagecreatefromgd2 ($file);
+            $img = @imagecreatefromgd2($file);
         else
-            show_plain ($file);
+            show_plain($file);
         break;
     default:
         //we are not stupid...
-        header ("Content-type: text/html");
+        header("Content-type: text/html");
         echo "<html><head></head><body>Not an image</body></html>";
         exit();
         break;
 }
 
-$width  = @imagesx($img);
+$width = @imagesx($img);
 $height = @imagesy($img);
 
 $newwidth = $_REQUEST['width'];
 if (empty($newidth)) $newidth = 50;
 
 $newheight = $_REQUEST['height'];
-if (empty($newheight)) $newheight = round($newwidth * ($height / $width)) ;
+if (empty($newheight)) $newheight = round($newwidth * ($height / $width));
 
 // php-4.2.x is stupid enough to define on gd only a stub for imagecopyresampled.
 // So function_exists('imagecopyresampled') will fail.
-if (!extension_loaded('gd2') and (substr(PHP_OS,0,3) != 'WIN'))
+if (!extension_loaded('gd2') and (substr(PHP_OS, 0, 3) != 'WIN'))
     loadPhpExtension('gd2');
 if (extension_loaded('gd2')) {
     $thumb = imagecreatetruecolor($newwidth, $newheight);
@@ -129,14 +129,15 @@
     $img = imagecopyresized($thumb, $img, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
 }
 
-if ($remove == 1) unlink ($file);
+if ($remove == 1) unlink($file);
 
-header ("Content-type: image/png");
+header("Content-type: image/png");
 imagepng($thumb);
 
-function show_plain () {
-    $mime = mime_content_type ($_REQUEST['url']);
-    header ("Content-type: $mime");
+function show_plain()
+{
+    $mime = mime_content_type($_REQUEST['url']);
+    header("Content-type: $mime");
     readfile($_REQUEST['url']);
     exit();
 }

Modified: trunk/RPC2.php
===================================================================
--- trunk/RPC2.php	2012-10-05 16:47:39 UTC (rev 8397)
+++ trunk/RPC2.php	2012-10-06 10:28:33 UTC (rev 8398)
@@ -10,9 +10,8 @@
 
 // Intercept GET requests from confused users.  Only POST is allowed here!
 if (empty($GLOBALS['HTTP_SERVER_VARS']))
-    $GLOBALS['HTTP_SERVER_VARS']  =& $_SERVER;
-if ($HTTP_SERVER_VARS['REQUEST_METHOD'] != "POST")
-{
+    $GLOBALS['HTTP_SERVER_VARS'] =& $_SERVER;
+if ($HTTP_SERVER_VARS['REQUEST_METHOD'] != "POST") {
     die('This is the address of the XML-RPC interface.' .
         '  You must use XML-RPC calls to access information here.');
 }

Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php	2012-10-05 16:47:39 UTC (rev 8397)
+++ trunk/SOAP.php	2012-10-06 10:28:33 UTC (rev 8398)
@@ -37,11 +37,12 @@
 require_once 'lib/WikiGroup.php';
 */
 
-function checkCredentials(&$server, &$credentials, $access, $pagename) {
+function checkCredentials(&$server, &$credentials, $access, $pagename)
+{
     // check the "Authorization: Basic '.base64_encode("$this->username:$this->password").'\r\n'" header
     if (isset($server->header['Authorization'])) {
-        $line = base64_decode(str_replace("Basic ","",trim($server->header['Authorization'])));
-        list($credentials['username'],$credentials['password']) = explode(':',$line);
+        $line = base64_decode(str_replace("Basic ", "", trim($server->header['Authorization'])));
+        list($credentials['username'], $credentials['password']) = explode(':', $line);
     } else {
         if (!isset($_SERVER))
             $_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
@@ -50,8 +51,7 @@
             if (isset($_SERVER['REMOTE_ADDR']))
                 $credentials['username'] = $_SERVER['REMOTE_ADDR'];
             elseif (isset($GLOBALS['REMOTE_ADDR']))
-                $credentials['username'] = $GLOBALS['REMOTE_ADDR'];
-            else
+                $credentials['username'] = $GLOBALS['REMOTE_ADDR']; else
                 $credentials['username'] = $server->host;
         }
     }
@@ -64,9 +64,9 @@
         $request->_user = new WikiUser($request, $credentials['username']);
     }
     $request->_user->AuthCheck(array('userid' => $credentials['username'],
-                                     'passwd' => $credentials['password']));
-    if (! mayAccessPage ($access, $pagename))
-        $server->fault(401,'',"no permission");
+        'passwd' => $credentials['password']));
+    if (!mayAccessPage($access, $pagename))
+        $server->fault(401, '', "no permission");
 }
 
 $GLOBALS['SERVER_NAME'] = SERVER_URL;
@@ -76,22 +76,22 @@
 // Local or external wdsl support is experimental.
 // It works without also. Just the client has to
 // know the wdsl definitions.
-$server = new soap_server(/* 'PhpWiki.wdsl' */);
+$server = new soap_server( /* 'PhpWiki.wdsl' */);
 // Now change the server url to ours, because in the wdsl is the original PhpWiki address
 //   <soap:address location="http://phpwiki.sourceforge.net/phpwiki/SOAP.php" />
 //   <soap:operation soapAction="http://phpwiki.sourceforge.net/phpwiki/SOAP.php" />
 
 $server->ports[$server->currentPort]['location'] = $url;
-$server->bindings[ $server->ports[$server->currentPort]['binding'] ]['endpoint'] = $url;
+$server->bindings[$server->ports[$server->currentPort]['binding']]['endpoint'] = $url;
 $server->soapaction = $url; // soap_transport_http
 
-$actions = array('getPageContent','getPageRevision','getCurrentRevision',
-                 'getPageMeta','doSavePage','getAllPagenames',
-                 'getBackLinks','doTitleSearch','doFullTextSearch',
-                 'getRecentChanges','listLinks','listPlugins',
-                 'getPluginSynopsis','callPlugin','listRelations',
-                 'linkSearch'
-                 );
+$actions = array('getPageContent', 'getPageRevision', 'getCurrentRevision',
+    'getPageMeta', 'doSavePage', 'getAllPagenames',
+    'getBackLinks', 'doTitleSearch', 'doFullTextSearch',
+    'getRecentChanges', 'listLinks', 'listPlugins',
+    'getPluginSynopsis', 'callPlugin', 'listRelations',
+    'linkSearch'
+);
 foreach ($actions as $action) {
     $server->register($actions);
     $server->operations[$actions]['soapaction'] = $url;
@@ -100,9 +100,10 @@
 //todo: check and set credentials
 // requiredAuthorityForPage($action);
 // require 'edit' access
-function doSavePage($pagename,$content,$credentials=false) {
+function doSavePage($pagename, $content, $credentials = false)
+{
     global $server;
-    checkCredentials($server, $credentials,'edit',$pagename);
+    checkCredentials($server, $credentials, 'edit', $pagename);
     $dbi = WikiDB::open($GLOBALS['DBParams']);
     $page = $dbi->getPage($pagename);
     $current = $page->getCurrentRevision();
@@ -113,41 +114,48 @@
 }
 
 // require 'view' access
-function getPageContent($pagename,$credentials=false) {
+function getPageContent($pagename, $credentials = false)
+{
     global $server;
-    checkCredentials($server,$credentials,'view',$pagename);
+    checkCredentials($server, $credentials, 'view', $pagename);
     $dbi = WikiDB::open($GLOBALS['DBParams']);
     $page = $dbi->getPage($pagename);
     $rev = $page->getCurrentRevision();
     $text = $rev->getPackedContent();
     return $text;
 }
+
 // require 'view' access
-function getPageRevision($pagename,$revision,$credentials=false) {
+function getPageRevision($pagename, $revision, $credentials = false)
+{
     global $server;
-    checkCredentials($server,$credentials,'view',$pagename);
+    checkCredentials($server, $credentials, 'view', $pagename);
     $dbi = WikiDB::open($GLOBALS['DBParams']);
     $page = $dbi->getPage($pagename);
     $rev = $page->getCurrentRevision();
     $text = $rev->getPackedContent();
     return $text;
 }
+
 // require 'view' access
-function getCurrentRevision($pagename,$credentials=false) {
+function getCurrentRevision($pagename, $credentials = false)
+{
     global $server;
-    checkCredentials($server,$credentials,'view',$pagename);
-    if (!mayAccessPage ('view',$pagename))
-        $server->fault(401,'',"no permission");
+    checkCredentials($server, $credentials, 'view', $pagename);
+    if (!mayAccessPage('view', $pagename))
+        $server->fault(401, '', "no permission");
     $dbi = WikiDB::open($GLOBALS['DBParams']);
     $page = $dbi->getPage($pagename);
     $rev = $page->getCurrentRevision();
     $version = $current->getVersion();
     return (double)$version;
 }
+
 // require 'change' or 'view' access ?
-function getPageMeta($pagename,$credentials=false) {
+function getPageMeta($pagename, $credentials = false)
+{
     global $server;
-    checkCredentials($server,$credentials,'view',$pagename);
+    checkCredentials($server, $credentials, 'view', $pagename);
     $dbi = WikiDB::open($GLOBALS['DBParams']);
     $page = $dbi->getPage($pagename);
     $rev = $page->getCurrentRevision();
@@ -155,10 +163,12 @@
     //todo: reformat the meta hash
     return $meta;
 }
+
 // require 'view' access to AllPages
-function getAllPagenames($credentials=false) {
+function getAllPagenames($credentials = false)
+{
     global $server;
-    checkCredentials($server,$credentials,'view',_("AllPages"));
+    checkCredentials($server, $credentials, 'view', _("AllPages"));
     $dbi = WikiDB::open($GLOBALS['DBParams']);
     $page_iter = $dbi->getAllPages();
     $pages = array();
@@ -167,13 +177,15 @@
     }
     return $pages;
 }
+
 // require 'view' access
-function getBacklinks($pagename,$credentials=false) {
+function getBacklinks($pagename, $credentials = false)
+{
     global $server;
-    checkCredentials($server,$credentials,'view',$pagename);
+    checkCredentials($server, $credentials, 'view', $pagename);
     $dbi = WikiDB::open($GLOBALS['DBParams']);
     $backend = &$dbi->_backend;
-    $result =  $backend->get_links($pagename);
+    $result = $backend->get_links($pagename);
     $page_iter = new WikiDB_PageIterator($dbi, $result);
     $pages = array();
     while ($page = $page_iter->next()) {
@@ -181,10 +193,12 @@
     }
     return $pages;
 }
+
 // require 'view' access to TitleSearch
-function doTitleSearch($s, $credentials=false) {
+function doTitleSearch($s, $credentials = false)
+{
     global $server;
-    checkCredentials($server,$credentials,'view',_("TitleSearch"));
+    checkCredentials($server, $credentials, 'view', _("TitleSearch"));
     $dbi = WikiDB::open($GLOBALS['DBParams']);
     $query = new TextSearchQuery($s);
     $page_iter = $dbi->titleSearch($query);
@@ -194,10 +208,12 @@
     }
     return $pages;
 }
+
 // require 'view' access to FullTextSearch
-function doFullTextSearch($s, $credentials=false) {
+function doFullTextSearch($s, $credentials = false)
+{
     global $server;
-    checkCredentials($server,$credentials,'view',_("FullTextSearch"));
+    checkCredentials($server, $credentials, 'view', _("FullTextSearch"));
     $dbi = WikiDB::open($GLOBALS['DBParams']);
     $query = new TextSearchQuery($s);
     $page_iter = $dbi->fullSearch($query);
@@ -209,28 +225,31 @@
 }
 
 // require 'view' access to RecentChanges
-function getRecentChanges($limit=false, $since=false, $include_minor=false, $credentials=false) {
+function getRecentChanges($limit = false, $since = false, $include_minor = false, $credentials = false)
+{
     global $server;
-    checkCredentials($server,$credentials,'view',_("RecentChanges"));
+    checkCredentials($server, $credentials, 'view', _("RecentChanges"));
     $dbi = WikiDB::open($GLOBALS['DBParams']);
     $params = array('limit' => $limit, 'since' => $since,
-                    'include_minor_revisions' => $include_minor);
+        'include_minor_revisions' => $include_minor);
     $page_iter = $dbi->mostRecent($params);
     $pages = array();
     while ($page = $page_iter->next()) {
         $pages[] = array('pagename' => $page->getName(),
-                         'lastModified' => $page->get('mtime'),
-                         'author'  => $page->get('author'),
-                         'summary' => $page->get('summary'), // added with 1.3.13
-                         'version' => $page->getVersion()
-                         );
+            'lastModified' => $page->get('mtime'),
+            'author' => $page->get('author'),
+            'summary' => $page->get('summary'), // added with 1.3.13
+            'version' => $page->getVersion()
+        );
     }
     return $pages;
 }
+
 // require 'view' access
-function listLinks($pagename, $credentials=false) {
+function listLinks($pagename, $credentials = false)
+{
     global $server;
-    checkCredentials($server,$credentials,'view',$pagename);
+    checkCredentials($server, $credentials, 'view', $pagename);
     $dbi = WikiDB::open($GLOBALS['DBParams']);
     $page = $dbi->getPage($pagename);
     $linkiterator = $page->getPageLinks();
@@ -241,9 +260,11 @@
     }
     return $links;
 }
-function listPlugins($credentials=false) {
+
+function listPlugins($credentials = false)
+{
     global $server;
-    checkCredentials($server,$credentials,'change',_("HomePage"));
+    checkCredentials($server, $credentials, 'change', _("HomePage"));
     $plugin_dir = 'lib/plugin';
     if (defined('PHPWIKI_DIR'))
         $plugin_dir = PHPWIKI_DIR . "/$plugin_dir";
@@ -266,9 +287,11 @@
     }
     return $RetArray;
 }
-function getPluginSynopsis($pluginname, $credentials=false) {
+
+function getPluginSynopsis($pluginname, $credentials = false)
+{
     global $server;
-    checkCredentials($server,$credentials,'change',"Help/".$pluginname."Plugin");
+    checkCredentials($server, $credentials, 'change', "Help/" . $pluginname . "Plugin");
     require_once 'lib/WikiPlugin.php';
     $w = new WikiPluginLoader;
     $synopsis = '';
@@ -277,21 +300,24 @@
     if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
         $plugin_args = '';
         $desc = $p->getArgumentsDescription();
-        $src = array("\n",'"',"'",'|','[',']','\\');
-        $replace = array('%0A','%22','%27','%7C','%5B','%5D','%5C');
-        $desc = str_replace("<br />",' ',$desc->asXML());
+        $src = array("\n", '"', "'", '|', '[', ']', '\\');
+        $replace = array('%0A', '%22', '%27', '%7C', '%5B', '%5D', '%5C');
+        $desc = str_replace("<br />", ' ', $desc->asXML());
         if ($desc)
-            $plugin_args = '\n'.str_replace($src, $replace, $desc);
-        $synopsis = "<?plugin ".$pluginName.$plugin_args."?>"; // args?
+            $plugin_args = '\n' . str_replace($src, $replace, $desc);
+        $synopsis = "<?plugin " . $pluginName . $plugin_args . "?>"; // args?
     }
     return $synopsis;
 }
+
 // only plugins returning pagelists will return something useful. so omit the html output
-function callPlugin($pluginname, $pluginargs, $credentials=false) {
+function callPlugin($pluginname, $pluginargs, $credentials = false)
+{
     global $server;
-    checkCredentials($server,$credentials,'change',"Help/".$pluginname."Plugin");
+    checkCredentials($server, $credentials, 'change', "Help/" . $pluginname . "Plugin");
 
-    $basepage = '';;
+    $basepage = '';
+    ;
     require_once 'lib/WikiPlugin.php';
     $w = new WikiPluginLoader;
     $p = $w->getPlugin($pluginName, false); // second arg?
@@ -303,6 +329,7 @@
     }
     return $pages;
 }
+
 /**
  * array listRelations([ Integer option = 1 ])
  *
@@ -315,20 +342,23 @@
  *
  * @author: Reini Urban
  */
-function listRelations($option = 1, $credentials=false) {
+function listRelations($option = 1, $credentials = false)
+{
     global $server;
-    checkCredentials($server,$credentials,'view',_("HomePage"));
+    checkCredentials($server, $credentials, 'view', _("HomePage"));
     $also_attributes = $option & 2;
     $only_attributes = $option & 2 and !($option & 1);
     $sorted = !($option & 4);
     return $dbh->listRelations($also_attributes,
-                               $only_attributes,
-                               $sorted);
+        $only_attributes,
+        $sorted);
 }
+
 // some basic semantic search
-function linkSearch($linktype, $search, $pages="*", $relation="*", $credentials=false) {
+function linkSearch($linktype, $search, $pages = "*", $relation = "*", $credentials = false)
+{
     global $server;
-    checkCredentials($server,$credentials,'view',_("HomePage"));
+    checkCredentials($server, $credentials, 'view', _("HomePage"));
     $dbi = WikiDB::open($GLOBALS['DBParams']);
     require_once 'lib/TextSearchQuery.php';
     $pagequery = new TextSearchQuery($pages);

Modified: trunk/admin/wiki2public.php
===================================================================
--- trunk/admin/wiki2public.php	2012-10-05 16:47:39 UTC (rev 8397)
+++ trunk/admin/wiki2public.php	2012-10-06 10:28:33 UTC (rev 8398)
@@ -1,4 +1,4 @@
 <?php
-  // cronjob script to copy pages marked as "public" to a seperate public wiki area.
-  // If ENABLE_PAGE_PUBLIC = true
-  // can only run via localhost for security reasons
+// cronjob script to copy pages marked as "public" to a seperate public wiki area.
+// If ENABLE_PAGE_PUBLIC = true
+// can only run via localhost for security reasons

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2012-10-05 16:47:39 UTC (rev 8397)
+++ trunk/configurator.php	2012-10-06 10:28:33 UTC (rev 8398)
@@ -54,17 +54,17 @@
  */
 
 global $HTTP_SERVER_VARS, $HTTP_POST_VARS, $tdwidth;
-if (empty($_SERVER))         $_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
-if (empty($_GET))         $_GET    =& $GLOBALS['HTTP_GET_VARS'];
-if (empty($_ENV))         $_ENV    =& $GLOBALS['HTTP_ENV_VARS'];
-if (empty($_POST))         $_POST   =& $GLOBALS['HTTP_POST_VARS'];
+if (empty($_SERVER)) $_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
+if (empty($_GET)) $_GET =& $GLOBALS['HTTP_GET_VARS'];
+if (empty($_ENV)) $_ENV =& $GLOBALS['HTTP_ENV_VARS'];
+if (empty($_POST)) $_POST =& $GLOBALS['HTTP_POST_VARS'];
 
 if (empty($configurator))
     $configurator = "configurator.php";
 if (!strstr($_SERVER["SCRIPT_NAME"], $configurator) and defined('DATA_PATH'))
     $configurator = DATA_PATH . "/" . $configurator;
 $scriptname = str_replace('configurator.php', 'index.php', $_SERVER["SCRIPT_NAME"]);
-if (strstr($_SERVER["SCRIPT_NAME"],"/php")) {  // cgi got this different
+if (strstr($_SERVER["SCRIPT_NAME"], "/php")) { // cgi got this different
     if (defined('DATA_PATH'))
         $scriptname = DATA_PATH . "/index.php";
     else
@@ -72,13 +72,14 @@
 }
 
 $tdwidth = 700;
-$config_file = (substr(PHP_OS,0,3) == 'WIN') ? 'config\\config.ini' : 'config/config.ini';
-$fs_config_file = dirname(__FILE__) . (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/') . $config_file;
-if (isset($_POST['create']))  header('Location: '.$configurator.'?show=_part1&create=1#create');
+$config_file = (substr(PHP_OS, 0, 3) == 'WIN') ? 'config\\config.ini' : 'config/config.ini';
+$fs_config_file = dirname(__FILE__) . (substr(PHP_OS, 0, 3) == 'WIN' ? '\\' : '/') . $config_file;
+if (isset($_POST['create'])) header('Location: ' . $configurator . '?show=_part1&create=1#create');
 
 // helpers from lib/WikiUser/HttpAuth.php
 if (!function_exists('_http_user')) {
-    function _http_user() {
+    function _http_user()
+    {
         if (!isset($_SERVER))
             $_SERVER = $GLOBALS['HTTP_SERVER_VARS'];
         if (!empty($_SERVER['PHP_AUTH_USER']))
@@ -87,7 +88,7 @@
             return array($_SERVER['REMOTE_USER'], $_SERVER['PHP_AUTH_PW']);
         if (!empty($GLOBALS['HTTP_ENV_VARS']['REMOTE_USER']))
             return array($GLOBALS['HTTP_ENV_VARS']['REMOTE_USER'],
-                         $GLOBALS['HTTP_ENV_VARS']['PHP_AUTH_PW']);
+                $GLOBALS['HTTP_ENV_VARS']['PHP_AUTH_PW']);
         if (!empty($GLOBALS['REMOTE_USER']))
             return array($GLOBALS['REMOTE_USER'], $GLOBALS['PHP_AUTH_PW']);
 
@@ -96,14 +97,16 @@
             list($userid, $passwd) = explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
             return array($userid, $passwd);
         }
-        return array('','');
+        return array('', '');
     }
-    function _http_logout() {
+
+    function _http_logout()
+    {
         if (!isset($_SERVER))
             $_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
         // maybe we should random the realm to really force a logout. but the next login will fail.
         // better_srand(); $realm = microtime().rand();
-        header('WWW-Authenticate: Basic realm="'.WIKI_NAME.'"');
+        header('WWW-Authenticate: Basic realm="' . WIKI_NAME . '"');
         if (strstr(php_sapi_name(), 'apache'))
             header('HTTP/1.0 401 Unauthorized');
         else
@@ -122,22 +125,21 @@
 if (file_exists($fs_config_file)) {
     // Require admin user
     if (!defined('ADMIN_USER') or !defined('ADMIN_PASSWD')) {
-            if (!function_exists("IniConfig")) {
-                include_once 'lib/prepend.php';
+        if (!function_exists("IniConfig")) {
+            include_once 'lib/prepend.php';
             include_once 'lib/IniConfig.php';
-            }
+        }
         IniConfig($fs_config_file);
     }
     if (!defined('ADMIN_USER') or ADMIN_USER == '') {
         trigger_error("Configuration problem:\nADMIN_USER not defined in \"$fs_config_file\".\n"
-                      . "Cannot continue: You have to fix that manually.", E_USER_ERROR);
+            . "Cannot continue: You have to fix that manually.", E_USER_ERROR);
         exit();
     }
 
     list($admin_user, $admin_pw) = _http_user();
     //$required_user = ADMIN_USER;
-    if (empty($admin_user) or $admin_user != ADMIN_USER)
-    {
+    if (empty($admin_user) or $admin_user != ADMIN_USER) {
         _http_logout();
     }
     // check password
@@ -152,121 +154,167 @@
         include_once 'lib/prepend.php';
         include_once 'lib/IniConfig.php';
     }
-    $def_file = (substr(PHP_OS,0,3) == 'WIN') ? 'config\\config-default.ini' : 'config/config-default.ini';
-    $fs_def_file = dirname(__FILE__) . (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/') . $def_file;
+    $def_file = (substr(PHP_OS, 0, 3) == 'WIN') ? 'config\\config-default.ini' : 'config/config-default.ini';
+    $fs_def_file = dirname(__FILE__) . (substr(PHP_OS, 0, 3) == 'WIN' ? '\\' : '/') . $def_file;
     IniConfig($fs_def_file);
 }
 
-echo '<','?xml version="1.0" encoding="utf-8"?',">\n";
+echo '<', '?xml version="1.0" encoding="utf-8"?', ">\n";
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Configuration tool for PhpWiki <?php echo $config_file ?></title>
-<style type="text/css" media="screen">
-<!--
-/* TABLE { border: thin solid black } */
-body { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 80%; }
-pre { font-size: 120%; }
-td { border: thin solid black }
-tr { border: none }
-div.hint { background-color: #eeeeee; }
-tr.hidden { border: none; display: none; }
-td.part { background-color: #eeeeee; color: inherit; }
-td.instructions { background-color: #ffffee; width: <?php echo $tdwidth ?>px; color: inherit; }
-td.unchangeable-variable-top   { border-bottom: none; background-color: #ffffee; color:inherit; }
-td.unchangeable-variable-left  { border-top: none; background-color: #ffffee; color:inherit; }
--->
-</style>
-<script type="text/javascript">
-<!--
-function update(accepted, error, value, output) {
-  var msg = document.getElementById(output);
-  if (accepted) {
-    /* MSIE 5.0 fails here */
-    if (msg && msg.innerHTML) { msg.innerHTML = "<font color=\"green\">Input accepted.</font>"; }
-  } else {
-    while ((index = error.indexOf("%s")) > -1) {
-      error = error.substring(0, index) + value + error.substring(index+2);
-    }
-    if (msg) { msg.innerHTML = "<font color=\"red\">" + error + "</font>"; }
-  }
-  if (submit = document.getElementById('submit')) submit.disabled = accepted ? false : true;
-}
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>Configuration tool for PhpWiki <?php echo $config_file ?></title>
+    <style type="text/css" media="screen">
+        <!--
+            /* TABLE { border: thin solid black } */
+        body {
+            font-family: Verdana, Arial, Helvetica, sans-serif;
+            font-size: 80%;
+        }
 
-function validate(error, value, output, field) {
-  update(field.value == value, error, field.value, output);
-}
+        pre {
+            font-size: 120%;
+        }
 
-function validate_ereg(error, ereg, output, field) {
-  regex = new RegExp(ereg);
-  update(regex.test(field.value), error, field.value, output);
-}
+        td {
+            border: thin solid black
+        }
 
-function validate_range(error, low, high, empty_ok, output, field) {
-  update((empty_ok == 1 && field.value == "") ||
-         (field.value >= low && field.value <= high),
-         error, field.value, output);
-}
+        tr {
+            border: none
+        }
 
-function toggle_group(id) {
-  var text = document.getElementById(id + "_text");
-  var do_hide = false;
-  if (text.innerHTML == "Hide options.") {
-    do_hide = true;
-    text.innerHTML = "Show options.";
-  } else {
-    text.innerHTML = "Hide options.";
-  }
+        div.hint {
+            background-color: #eeeeee;
+        }
 
-  var rows = document.getElementsByTagName('tr');
-  var i = 0;
-  for (i = 0; i < rows.length; i++) {
-    var tr = rows[i];
-    if (tr.className == 'header' && tr.id == id) {
-      i++;
-      break;
-    }
-  }
-  for (; i < rows.length; i++) {
-    var tr = rows[i];
-    if (tr.className == 'header')
-      break;
-    tr.className = do_hide ? 'hidden': 'nonhidden';
-  }
-}
+        tr.hidden {
+            border: none;
+            display: none;
+        }
 
-function do_init() {
-  // Hide all groups.  We do this via JavaScript to avoid
-  // hiding the groups if JavaScript is not supported...
-  var rows = document.getElementsByTagName('tr');
-  var show = '<?php echo $_GET["show"] ?>';
-  for (var i = 0; i < rows.length; i++) {
-    var tr = rows[i];
-    if (tr.className == 'header')
-        if (!show || tr.id != show)
-            toggle_group(tr.id);
-  }
+        td.part {
+            background-color: #eeeeee;
+            color: inherit;
+        }
 
-  // Select text in textarea upon focus
-  var area = document.getElementById('config-output');
-  if (area) {
-    listener = { handleEvent: function (e) { area.select(); } };
-    area.addEventListener('focus', listener, false);
-  }
-}
+        td.instructions {
+            background-color: #ffffee;
+            width: <?php echo $tdwidth ?>px;
+            color: inherit;
+        }
 
--->
-</script>
+        td.unchangeable-variable-top {
+            border-bottom: none;
+            background-color: #ffffee;
+            color: inherit;
+        }
+
+        td.unchangeable-variable-left {
+            border-top: none;
+            background-color: #ffffee;
+            color: inherit;
+        }
+
+        -->
+    </style>
+    <script type="text/javascript">
+        <
+        !--
+                function update(accepted, error, value, output) {
+                    var msg = document.getElementById(output);
+                    if (accepted) {
+                        /* MSIE 5.0 fails here */
+                        if (msg && msg.innerHTML) {
+                            msg.innerHTML = "<font color=\"green\">Input accepted.</font>";
+                        }
+                    } else {
+                        while ((index = error.indexOf("%s")) > -1) {
+                            error = error.substring(0, index) + value + error.substring(index + 2);
+                        }
+                        if (msg) {
+                            msg.innerHTML = "<font color=\"red\">" + error + "</font>";
+                        }
+                    }
+                    if (submit = document.getElementById('submit')) submit.disabled = accepted ? false : true;
+                }
+
+        function validate(error, value, output, field) {
+            update(field.value == value, error, field.value, output);
+        }
+
+        function validate_ereg(error, ereg, output, field) {
+            regex = new RegExp(ereg);
+            update(regex.test(field.value), error, field.value, output);
+        }
+
+        function validate_range(error, low, high, empty_ok, output, field) {
+            update((empty_ok == 1 && field.value == "") ||
+                    (field.value >= low && field.value <= high),
+                    error, field.value, output);
+        }
+
+        function toggle_group(id) {
+            var text = document.getElementById(id + "_text");
+            var do_hide = false;
+            if (text.innerHTML == "Hide options.") {
+                do_hide = true;
+                text.innerHTML = "Show options.";
+            } else {
+                text.innerHTML = "Hide options.";
+            }
+
+            var rows = document.getElementsByTagName('tr');
+            var i = 0;
+            for (i = 0; i < rows.length; i++) {
+                var tr = rows[i];
+                if (tr.className == 'header' && tr.id == id) {
+                    i++;
+                    break;
+                }
+            }
+            for (; i < rows.length; i++) {
+                var tr = rows[i];
+                if (tr.className == 'header')
+                    break;
+                tr.className = do_hide ? 'hidden' : 'nonhidden';
+            }
+        }
+
+        function do_init() {
+            // Hide all groups.  We do this via JavaScript to avoid
+            // hiding the groups if JavaScript is not supported...
+            var rows = document.getElementsByTagName('tr');
+            var show = '<?php echo $_GET["show"] ?>';
+            for (var i = 0; i < rows.length; i++) {
+                var tr = rows[i];
+                if (tr.className == 'header')
+                    if (!show || tr.id != show)
+                        toggle_group(tr.id);
+            }
+
+            // Select text in textarea upon focus
+            var area = document.getElementById('config-output');
+            if (area) {
+                listener = { handleEvent:function (e) {
+                    area.select();
+                } };
+                area.addEventListener('focus', listener, false);
+            }
+        }
+
+        -- >
+    </script>
 </head>
 <body onload="do_init();">
 
-      <h1>Configuration for PhpWiki <?php echo $config_file ?></h1>
+<h1>Configuration for PhpWiki <?php echo $config_file ?></h1>
 
 <div class="hint">
-    Using this configurator.php is experimental!<br />
+    Using this configurator.php is experimental!<br/>
     On any configuration problems, please edit the resulting config.ini manually.
 </div>
 
@@ -330,121 +378,121 @@
 //   grep \'$x\' configurator.php >/dev/null || echo $x ; done
 
 $properties["Part Zero"] =
-new part('_part0', $SEPARATOR."\n", "
+    new part('_part0', $SEPARATOR . "\n", "
 Part Zero: (optional)
 Latest Development and Tricky Options");
 
 if (defined('INCLUDE_PATH'))
     $include_path = INCLUDE_PATH;
 else {
-  if (substr(PHP_OS,0,3) == 'WIN') {
-      $include_path = dirname(__FILE__) . ';' . ini_get('include_path');
-      if (strchr(ini_get('include_path'),'/'))
-          $include_path = strtr($include_path,'\\','/');
-  } else {
-    $include_path = dirname(__FILE__) . ':' . ini_get('include_path');
-  }
+    if (substr(PHP_OS, 0, 3) == 'WIN') {
+        $include_path = dirname(__FILE__) . ';' . ini_get('include_path');
+        if (strchr(ini_get('include_path'), '/'))
+            $include_path = strtr($include_path, '\\', '/');
+    } else {
+        $include_path = dirname(__FILE__) . ':' . ini_get('include_path');
+    }
 }
 
 $properties["PHP include_path"] =
-new _define('INCLUDE_PATH', $include_path);
+    new _define('INCLUDE_PATH', $include_path);
 
 // TODO: Convert this to a checkbox row as in tests/unit/test.php
 $properties["DEBUG"] =
-new numeric_define_optional('DEBUG', DEBUG);
+    new numeric_define_optional('DEBUG', DEBUG);
 
 $properties["ENABLE_EDIT_TOOLBAR"] =
-new boolean_define_commented_optional('ENABLE_EDIT_TOOLBAR');
+    new boolean_define_commented_optional('ENABLE_EDIT_TOOLBAR');
 
 $properties["JS_SEARCHREPLACE"] =
-new boolean_define_commented_optional('JS_SEARCHREPLACE');
+    new boolean_define_commented_optional('JS_SEARCHREPLACE');
 
 // TESTME: use config-default:  = false
 $properties["ENABLE_DOUBLECLICKEDIT"] =
-new boolean_define_commented_optional('ENABLE_DOUBLECLICKEDIT');
+    new boolean_define_commented_optional('ENABLE_DOUBLECLICKEDIT');
 
 $properties["ENABLE_WYSIWYG"] =
-new boolean_define_commented_optional('ENABLE_WYSIWYG');
+    new boolean_define_commented_optional('ENABLE_WYSIWYG');
 
 $properties["WYSIWYG_BACKEND"] =
-new _define_selection(
-'WYSIWYG_BACKEND',
-array('Wikiwyg'   => 'Wikiwyg',
-      'tinymce'   => 'tinymce',
-      'FCKeditor' => 'FCKeditor',
-      'spaw'      => 'spaw',
-      'htmlarea3' => 'htmlarea3',
-      'htmlarea2' => 'htmlarea2',
-));
+    new _define_selection(
+        'WYSIWYG_BACKEND',
+        array('Wikiwyg' => 'Wikiwyg',
+            'tinymce' => 'tinymce',
+            'FCKeditor' => 'FCKeditor',
+            'spaw' => 'spaw',
+            'htmlarea3' => 'htmlarea3',
+            'htmlarea2' => 'htmlarea2',
+        ));
 
 $properties["WYSIWYG_DEFAULT_PAGETYPE_HTML"] =
-new boolean_define_commented_optional('WYSIWYG_DEFAULT_PAGETYPE_HTML');
+    new boolean_define_commented_optional('WYSIWYG_DEFAULT_PAGETYPE_HTML');
 
 $properties["UPLOAD_USERDIR"] =
-new boolean_define_commented_optional('UPLOAD_USERDIR');
+    new boolean_define_commented_optional('UPLOAD_USERDIR');
 
 $properties["DISABLE_UNITS"] =
-new boolean_define_commented_optional('DISABLE_UNITS');
+    new boolean_define_commented_optional('DISABLE_UNITS');
 
 $properties["UNITS_EXE"] =
-new _define_commented_optional('UNITS_EXE');
+    new _define_commented_optional('UNITS_EXE');
 
 $properties["ENABLE_XHTML_XML"] =
-new boolean_define_commented_optional('ENABLE_XHTML_XML');
+    new boolean_define_commented_optional('ENABLE_XHTML_XML');
 
 $properties["ENABLE_OPEN_GRAPH"] =
-new boolean_define_commented_optional('ENABLE_OPEN_GRAPH');
+    new boolean_define_commented_optional('ENABLE_OPEN_GRAPH');
 
 $properties["ENABLE_SPAMASSASSIN"] =
-new boolean_define_commented_optional('ENABLE_SPAMASSASSIN');
+    new boolean_define_commented_optional('ENABLE_SPAMASSASSIN');
 
 $properties["ENABLE_SPAMBLOCKLIST"] =
-new boolean_define_optional('ENABLE_SPAMBLOCKLIST');
+    new boolean_define_optional('ENABLE_SPAMBLOCKLIST');
 
 $properties["NUM_SPAM_LINKS"] =
-new numeric_define_optional('NUM_SPAM_LINKS');
+    new numeric_define_optional('NUM_SPAM_LINKS');
 
 $properties["GOOGLE_LINKS_NOFOLLOW"] =
-new boolean_define_commented_optional('GOOGLE_LINKS_NOFOLLOW');
+    new boolean_define_commented_optional('GOOGLE_LINKS_NOFOLLOW');
 
 $properties["ENABLE_LIVESEARCH"] =
-new boolean_define_commented_optional('ENABLE_LIVESEARCH');
+    new boolean_define_commented_optional('ENABLE_LIVESEARCH');
 
 $properties["ENABLE_ACDROPDOWN"] =
-new boolean_define_commented_optional('ENABLE_ACDROPDOWN');
+    new boolean_define_commented_optional('ENABLE_ACDROPDOWN');
 
 $properties["ENABLE_DISCUSSION_LINK"] =
-new boolean_define_commented_optional('ENABLE_DISCUSSION_LINK');
+    new boolean_define_commented_optional('ENABLE_DISCUSSION_LINK');
 
 $properties["ENABLE_CAPTCHA"] =
-new boolean_define_commented_optional('ENABLE_CAPTCHA');
+    new boolean_define_commented_optional('ENABLE_CAPTCHA');
 
 $properties["USE_CAPTCHA_RANDOM_WORD"] =
-new boolean_define_commented_optional('USE_CAPTCHA_RANDOM_WORD');
+    new boolean_define_commented_optional('USE_CAPTCHA_RANDOM_WORD');
 
 $properties["USE_SAFE_DBSESSION"] =
-new boolean_define_commented_optional('USE_SAFE_DBSESSION');
+    new boolean_define_commented_optional('USE_SAFE_DBSESSION');
 
 $properties["BLOG_DEFAULT_EMPTY_PREFIX"] =
-new boolean_define_commented_optional('BLOG_DEFAULT_EMPTY_PREFIX');
+    new boolean_define_commented_optional('BLOG_DEFAULT_EMPTY_PREFIX');
 
 $properties["ENABLE_SEARCHHIGHLIGHT"] =
-new boolean_define_commented_optional('ENABLE_SEARCHHIGHLIGHT');
+    new boolean_define_commented_optional('ENABLE_SEARCHHIGHLIGHT');
 
 $properties["Part One"] =
-new part('_part1', $SEPARATOR."\n", "
+    new part('_part1', $SEPARATOR . "\n", "
 Part One: Authentication and security settings. See Part Three for more.");
 
 $properties["Wiki Name"] =
-new _define_optional('WIKI_NAME', WIKI_NAME);
+    new _define_optional('WIKI_NAME', WIKI_NAME);
 
 $properties["Admin Username"] =
-new _define_notempty('ADMIN_USER', ADMIN_USER, "
+    new _define_notempty('ADMIN_USER', ADMIN_USER, "
 You must set this! Username and password of the administrator.",
-"onchange=\"validate_ereg('Sorry, ADMIN_USER cannot be empty.', '^.+$', 'ADMIN_USER', this);\"");
+        "onchange=\"validate_ereg('Sorry, ADMIN_USER cannot be empty.', '^.+$', 'ADMIN_USER', this);\"");
 
 $properties["Admin Password"] =
-new _define_password('ADMIN_PASSWD', ADMIN_PASSWD, "
+    new _define_password('ADMIN_PASSWD', ADMIN_PASSWD, "
 You must set this!
 For heaven's sake pick a good password.
 
@@ -453,74 +501,74 @@
 Use the \"Create Random Password\" button to create a good (random) password.
 
 ADMIN_PASSWD is ignored on HttpAuth",
-"onchange=\"validate_ereg('Sorry, ADMIN_PASSWD must be at least 4 chars long.', '^....+$', 'ADMIN_PASSWD', this);\"");
+        "onchange=\"validate_ereg('Sorry, ADMIN_PASSWD must be at least 4 chars long.', '^....+$', 'ADMIN_PASSWD', this);\"");
 
 $properties["Encrypted Passwords"] =
-new boolean_define
-('ENCRYPTED_PASSWD',
- array('true'  => "true.  use crypt for all passwords",
-       'false' => "false. use plaintest passwords (not recommended)"));
+    new boolean_define
+    ('ENCRYPTED_PASSWD',
+        array('true' => "true.  use crypt for all passwords",
+            'false' => "false. use plaintest passwords (not recommended)"));
 
 $properties["Reverse DNS"] =
-new boolean_define_optional
-('ENABLE_REVERSE_DNS',
- array('true'  => "true. perform additional reverse dns lookups",
-       'false' => "false. just record the address as given by the httpd server"));
+    new boolean_define_optional
+    ('ENABLE_REVERSE_DNS',
+        array('true' => "true. perform additional reverse dns lookups",
+            'false' => "false. just record the address as given by the httpd server"));
 
 $properties["ZIP Dump Authentication"] =
-new boolean_define_optional('ZIPDUMP_AUTH',
-                    array('false' => "false. Everyone may download zip dumps",
-                          'true'  => "true. Only admin may download zip dumps"));
+    new boolean_define_optional('ZIPDUMP_AUTH',
+        array('false' => "false. Everyone may download zip dumps",
+            'true' => "true. Only admin may download zip dumps"));
 
 $properties["Enable RawHtml Plugin"] =
-new boolean_define_commented_optional('ENABLE_RAW_HTML');
+    new boolean_define_commented_optional('ENABLE_RAW_HTML');
 
 $properties["Allow RawHtml Plugin only on locked pages"] =
-new boolean_define_commented_optional('ENABLE_RAW_HTML_LOCKEDONLY');
+    new boolean_define_commented_optional('ENABLE_RAW_HTML_LOCKEDONLY');
 
 $properties["Allow RawHtml Plugin if safe HTML code"] =
-    new boolean_define_commented_optional('ENABLE_RAW_HTML_SAFE','', "
+    new boolean_define_commented_optional('ENABLE_RAW_HTML_SAFE', '', "
 If this is set, all unsafe html code is stripped automatically (experimental!)
 See <a href=\"http://chxo.com/scripts/safe_html-test.php\" target=\"_new\">chxo.com/scripts/safe_html-test.php</a>
 ");
 
 $properties["Maximum Upload Size"] =
-new numeric_define_optional('MAX_UPLOAD_SIZE', MAX_UPLOAD_SIZE);
+    new numeric_define_optional('MAX_UPLOAD_SIZE', MAX_UPLOAD_SIZE);
 
 $properties["Minor Edit Timeout"] =
-new numeric_define_optional('MINOR_EDIT_TIMEOUT', MINOR_EDIT_TIMEOUT);
+    new numeric_define_optional('MINOR_EDIT_TIMEOUT', MINOR_EDIT_TIMEOUT);
 
 $properties["Disabled Actions"] =
-new array_define('DISABLED_ACTIONS', DISABLED_ACTIONS /*array()*/);
+    new array_define('DISABLED_ACTIONS', DISABLED_ACTIONS /*array()*/);
 
 $properties["Moderate all Pagechanges"] =
-new boolean_define_commented_optional('ENABLE_MODERATEDPAGE_ALL');
+    new boolean_define_commented_optional('ENABLE_MODERATEDPAGE_ALL');
 
 $properties["Access Log File"] =
-new _define_commented_optional('ACCESS_LOG', ACCESS_LOG);
+    new _define_commented_optional('ACCESS_LOG', ACCESS_LOG);
 
 $properties["Access Log SQL"] =
-new _define_selection(
-'ACCESS_LOG_SQL',
-array('0' => 'disabled',
-      '1' => 'read only',
-      '2' => 'read + write'));
+    new _define_selection(
+        'ACCESS_LOG_SQL',
+        array('0' => 'disabled',
+            '1' => 'read only',
+            '2' => 'read + write'));
 
 $properties["Compress Output"] =
-new boolean_define_commented_optional
-( 'COMPRESS_OUTPUT',
-  array(''      => 'undefined - GZIP compress when appropriate.',
-        'false' => 'Never compress output.',
-        'true'  => 'Always try to compress output.'));
+    new boolean_define_commented_optional
+    ('COMPRESS_OUTPUT',
+        array('' => 'undefined - GZIP compress when appropriate.',
+            'false' => 'Never compress output.',
+            'true' => 'Always try to compress output.'));
 
 $properties["HTTP Cache Control"] =
-new _define_selection_optional
-('CACHE_CONTROL',
- array('LOOSE' => 'LOOSE',
-       'STRICT' => 'STRICT',
-       'NO_CACHE' => 'NO_CACHE',
-       'ALLOW_STALE' => 'ALLOW_STALE'),
-"
+    new _define_selection_optional
+    ('CACHE_CONTROL',
+        array('LOOSE' => 'LOOSE',
+            'STRICT' => 'STRICT',
+            'NO_CACHE' => 'NO_CACHE',
+            'ALLOW_STALE' => 'ALLOW_STALE'),
+        "
 HTTP CACHE_CONTROL
 
 This controls how PhpWiki sets the HTTP cache control
@@ -559,46 +607,46 @@
 The default is currently LOOSE.");
 
 $properties["HTTP Cache Control Max Age"] =
-new numeric_define_optional('CACHE_CONTROL_MAX_AGE', CACHE_CONTROL_MAX_AGE);
+    new numeric_define_optional('CACHE_CONTROL_MAX_AGE', CACHE_CONTROL_MAX_AGE);
 
 $properties["Markup Caching"] =
-new boolean_define_commented_optional
-('WIKIDB_NOCACHE_MARKUP',
- array('false' => 'Enable markup cache',
-       'true'  => 'Disable markup cache'));
+    new boolean_define_commented_optional
+    ('WIKIDB_NOCACHE_MARKUP',
+        array('false' => 'Enable markup cache',
+            'true' => 'Disable markup cache'));
 
 $properties["COOKIE_EXPIRATION_DAYS"] =
-new numeric_define_optional('COOKIE_EXPIRATION_DAYS', COOKIE_EXPIRATION_DAYS);
+    new numeric_define_optional('COOKIE_EXPIRATION_DAYS', COOKIE_EXPIRATION_DAYS);
 
 $properties["COOKIE_DOMAIN"] =
-new _define_commented_optional('COOKIE_DOMAIN', COOKIE_DOMAIN);
+    new _define_commented_optional('COOKIE_DOMAIN', COOKIE_DOMAIN);
 
 $properties["Path for PHP Session Support"] =
-new _define_optional('SESSION_SAVE_PATH', defined('SESSION_SAVE_PATH') ? SESSION_SAVE_PATH : ini_get('session.save_path'));
+    new _define_optional('SESSION_SAVE_PATH', defined('SESSION_SAVE_PATH') ? SESSION_SAVE_PATH : ini_get('session.save_path'));
 
 $properties["Force PHP Database Sessions"] =
-new boolean_define_commented_optional
-('USE_DB_SESSION',
- array('false' => 'Disable database sessions, use files',
-       'true'  => 'Enable database sessions'));
+    new boolean_define_commented_optional
+    ('USE_DB_SESSION',
+        array('false' => 'Disable database sessions, use files',
+            'true' => 'Enable database sessions'));
 
 ///////// database selection
 
 $properties["Part Two"] =
-new part('_part2', $SEPARATOR."\n", "
+    new part('_part2', $SEPARATOR . "\n", "
 
 Part Two:
 Database Configuration
 ");
 
 $properties["Database Type"] =
-new _define_selection("DATABASE_TYPE",
-              array('dba'   => "dba",
-                    'SQL'   => "SQL PEAR",
-                    'ADODB' => "SQL ADODB",
-                    'PDO'   => "PDO (php5 only)",
-                    'file'   => "flatfile",
-                    'cvs'   => "CVS File handler")/*, "
+    new _define_selection("DATABASE_TYPE",
+        array('dba' => "dba",
+            'SQL' => "SQL PEAR",
+            'ADODB' => "SQL ADODB",
+            'PDO' => "PDO (php5 only)",
+            'file' => "flatfile",
+            'cvs' => "CVS File handler")/*, "
 Select the database backend type:
 Choose dba (default) to use one of the standard UNIX dba libraries. This is the fastest.
 Choose ADODB or SQL to use an SQL database with ADODB or PEAR.
@@ -608,7 +656,7 @@
 Recommended is dba or SQL: PEAR or ADODB."*/);
 
 $properties["SQL DSN Setup"] =
-new unchangeable_variable('_sqldsnstuff', "", "
+    new unchangeable_variable('_sqldsnstuff', "", "
 For SQL based backends, specify the database as a DSN
 The most general form of a DSN looks like:
 <pre>
@@ -632,30 +680,30 @@
 // Choose dba to use one of the standard UNIX dbm libraries.
 
 $properties["SQL Type"] =
-new _variable_selection('_dsn_sqltype',
-              array('mysql'  => "MySQL",
-                    'pgsql'  => "PostgreSQL",
-                    'mssql'  => "Microsoft SQL Server",
-                    'mssqlnative'  => "Microsoft SQL Server (native)",
-                    'oci8'   => "Oracle 8",
-                    'mysqli' => "mysqli (only ADODB)",
-                    'mysqlt' => "mysqlt (only ADODB)",
-                    'ODBC'   => "ODBC (only ADODB or PDO)",
-                    'firebird' => "Firebird (only PDO)",
-                    'oracle'  => "Oracle (only PDO)",
-), "
+    new _variable_selection('_dsn_sqltype',
+        array('mysql' => "MySQL",
+            'pgsql' => "PostgreSQL",
+            'mssql' => "Microsoft SQL Server",
+            'mssqlnative' => "Microsoft SQL Server (native)",
+            'oci8' => "Oracle 8",
+            'mysqli' => "mysqli (only ADODB)",
+            'mysqlt' => "mysqlt (only ADODB)",
+            'ODBC' => "ODBC (only ADODB or PDO)",
+            'firebird' => "Firebird (only PDO)",
+            'oracle' => "Oracle (only PDO)",
+        ), "
 SQL DB types. The DSN hosttype.");
 
 $properties["SQL User"] =
-new _variable('_dsn_sqluser', "wikiuser", "
+    new _variable('_dsn_sqluser', "wikiuser", "
 SQL User Id:");
 
 $properties["SQL Password"] =
-new _variable('_dsn_sqlpass', "", "
+    new _variable('_dsn_sqlpass', "", "
 SQL Password:");
 
 $properties["SQL Database Host"] =
-new _variable('_dsn_sqlhostorsock', "localhost", "
+    new _variable('_dsn_sqlhostorsock', "localhost", "
 SQL Database Hostname:
 
 To connect ov...
 
[truncated message content]

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

From: <var...@us...> - 2012-10-05 16:47:49

Revision: 8397
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8397&view=rev
Author:   vargenau
Date:     2012-10-05 16:47:39 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
Reformat code

Modified Paths:
--------------
    trunk/lib/plugin/AddComment.php
    trunk/lib/plugin/AllPages.php
    trunk/lib/plugin/AllUsers.php
    trunk/lib/plugin/AnalyseAccessLogSql.php
    trunk/lib/plugin/AppendText.php
    trunk/lib/plugin/AsciiMath.php
    trunk/lib/plugin/AsciiSVG.php
    trunk/lib/plugin/AtomFeed.php
    trunk/lib/plugin/AuthorHistory.php
    trunk/lib/plugin/BackLinks.php
    trunk/lib/plugin/BlogArchives.php
    trunk/lib/plugin/BlogJournal.php
    trunk/lib/plugin/BoxRight.php
    trunk/lib/plugin/CacheTest.php
    trunk/lib/plugin/Calendar.php
    trunk/lib/plugin/CalendarList.php
    trunk/lib/plugin/CategoryPage.php
    trunk/lib/plugin/Chart.php
    trunk/lib/plugin/Comment.php
    trunk/lib/plugin/CreateBib.php
    trunk/lib/plugin/CreatePage.php
    trunk/lib/plugin/CreateToc.php
    trunk/lib/plugin/CurrentTime.php
    trunk/lib/plugin/DeadEndPages.php
    trunk/lib/plugin/Diff.php
    trunk/lib/plugin/DynamicIncludePage.php
    trunk/lib/plugin/EditMetaData.php
    trunk/lib/plugin/ExternalSearch.php
    trunk/lib/plugin/FacebookLike.php
    trunk/lib/plugin/FileInfo.php
    trunk/lib/plugin/FoafViewer.php
    trunk/lib/plugin/FrameInclude.php
    trunk/lib/plugin/FullTextSearch.php
    trunk/lib/plugin/FuzzyPages.php
    trunk/lib/plugin/GoTo.php
    trunk/lib/plugin/GoogleMaps.php
    trunk/lib/plugin/GooglePlugin.php
    trunk/lib/plugin/GraphViz.php
    trunk/lib/plugin/HelloWorld.php
    trunk/lib/plugin/HtmlConverter.php
    trunk/lib/plugin/Imdb.php
    trunk/lib/plugin/IncludePage.php
    trunk/lib/plugin/IncludePages.php
    trunk/lib/plugin/IncludeSiteMap.php
    trunk/lib/plugin/IncludeTree.php
    trunk/lib/plugin/InterWikiSearch.php
    trunk/lib/plugin/JabberPresence.php
    trunk/lib/plugin/LdapSearch.php
    trunk/lib/plugin/LikePages.php
    trunk/lib/plugin/LinkDatabase.php
    trunk/lib/plugin/LinkSearch.php
    trunk/lib/plugin/ListPages.php
    trunk/lib/plugin/ListRelations.php
    trunk/lib/plugin/ListSubpages.php
    trunk/lib/plugin/MediawikiTable.php
    trunk/lib/plugin/ModeratedPage.php
    trunk/lib/plugin/MostPopular.php
    trunk/lib/plugin/NewPagesPerUser.php
    trunk/lib/plugin/NoCache.php
    trunk/lib/plugin/OldStyleTable.php
    trunk/lib/plugin/OrphanedPages.php
    trunk/lib/plugin/PageDump.php
    trunk/lib/plugin/PageGroup.php
    trunk/lib/plugin/PageHistory.php
    trunk/lib/plugin/PageInfo.php
    trunk/lib/plugin/PageTrail.php
    trunk/lib/plugin/PasswordReset.php
    trunk/lib/plugin/PhotoAlbum.php
    trunk/lib/plugin/PhpHighlight.php
    trunk/lib/plugin/PhpWeather.php
    trunk/lib/plugin/Ploticus.php
    trunk/lib/plugin/PluginManager.php
    trunk/lib/plugin/PopUp.php
    trunk/lib/plugin/PopularNearby.php
    trunk/lib/plugin/PopularTags.php
    trunk/lib/plugin/PreferenceApp.php
    trunk/lib/plugin/PrevNext.php
    trunk/lib/plugin/Processing.php
    trunk/lib/plugin/RandomPage.php
    trunk/lib/plugin/RateIt.php
    trunk/lib/plugin/RawHtml.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/plugin/RecentChangesCached.php
    trunk/lib/plugin/RecentComments.php
    trunk/lib/plugin/RecentEdits.php
    trunk/lib/plugin/RecentReferrers.php
    trunk/lib/plugin/RedirectTo.php
    trunk/lib/plugin/RelatedChanges.php
    trunk/lib/plugin/RichTable.php
    trunk/lib/plugin/RssFeed.php
    trunk/lib/plugin/SearchHighlight.php
    trunk/lib/plugin/SemanticRelations.php
    trunk/lib/plugin/SemanticSearch.php
    trunk/lib/plugin/SemanticSearchAdvanced.php
    trunk/lib/plugin/SiteMap.php
    trunk/lib/plugin/SpellCheck.php
    trunk/lib/plugin/SqlResult.php
    trunk/lib/plugin/SyncWiki.php
    trunk/lib/plugin/SyntaxHighlighter.php
    trunk/lib/plugin/SystemInfo.php
    trunk/lib/plugin/TeX2png.php
    trunk/lib/plugin/Template.php
    trunk/lib/plugin/TexToPng.php
    trunk/lib/plugin/TitleSearch.php
    trunk/lib/plugin/Transclude.php
    trunk/lib/plugin/TranslateText.php
    trunk/lib/plugin/UnfoldSubpages.php
    trunk/lib/plugin/UpLoad.php
    trunk/lib/plugin/UriResolver.php
    trunk/lib/plugin/UserPreferences.php
    trunk/lib/plugin/UserRatings.php
    trunk/lib/plugin/Video.php
    trunk/lib/plugin/VisualWiki.php
    trunk/lib/plugin/WantedPages.php
    trunk/lib/plugin/WantedPagesOld.php
    trunk/lib/plugin/WatchPage.php
    trunk/lib/plugin/WhoIsOnline.php
    trunk/lib/plugin/WikiAdminChmod.php
    trunk/lib/plugin/WikiAdminChown.php
    trunk/lib/plugin/WikiAdminMarkup.php
    trunk/lib/plugin/WikiAdminPurge.php
    trunk/lib/plugin/WikiAdminRemove.php
    trunk/lib/plugin/WikiAdminRename.php
    trunk/lib/plugin/WikiAdminSearchReplace.php
    trunk/lib/plugin/WikiAdminSelect.php
    trunk/lib/plugin/WikiAdminSetAcl.php
    trunk/lib/plugin/WikiAdminSetAclSimple.php
    trunk/lib/plugin/WikiAdminSetExternal.php
    trunk/lib/plugin/WikiAdminUtils.php
    trunk/lib/plugin/WikiBlog.php
    trunk/lib/plugin/WikiForm.php
    trunk/lib/plugin/WikiFormRich.php
    trunk/lib/plugin/WikiForum.php
    trunk/lib/plugin/WikiPoll.php
    trunk/lib/plugin/WikicreoleTable.php
    trunk/lib/plugin/YouTube.php
    trunk/lib/plugin/_AuthInfo.php
    trunk/lib/plugin/_BackendInfo.php
    trunk/lib/plugin/_GroupInfo.php
    trunk/lib/plugin/_PreferencesInfo.php
    trunk/lib/plugin/_Retransform.php
    trunk/lib/plugin/_WikiTranslation.php
    trunk/lib/plugin/text2png.php

Modified: trunk/lib/plugin/AddComment.php
===================================================================
--- trunk/lib/plugin/AddComment.php	2012-10-05 14:17:00 UTC (rev 8396)
+++ trunk/lib/plugin/AddComment.php	2012-10-05 16:47:39 UTC (rev 8397)
@@ -33,14 +33,16 @@
 include_once 'lib/plugin/WikiBlog.php';
 
 class WikiPlugin_AddComment
-extends WikiPlugin_WikiBlog
+    extends WikiPlugin_WikiBlog
 {
-    function getName () {
+    function getName()
+    {
         return _("AddComment");
     }
 
-    function getDescription () {
-        return sprintf(_("Show and add comments for %s"),'[pagename]');
+    function getDescription()
+    {
+        return sprintf(_("Show and add comments for %s"), '[pagename]');
     }
 
     // Arguments:
@@ -57,17 +59,19 @@
     //  jshide - boolean  - quick javascript expansion of the comments
     //                      and addcomment box
 
-    function getDefaultArguments() {
-        return array('pagename'   => '[pagename]',
-                     'order'      => 'normal',
-                     'mode'       => 'add,show',
-                     'jshide'     => '0',
-                     'noheader'   => false,
-                     //'sortby'     => '-pagename' // oldest first. reverse by order=reverse
-                    );
+    function getDefaultArguments()
+    {
+        return array('pagename' => '[pagename]',
+            'order' => 'normal',
+            'mode' => 'add,show',
+            'jshide' => '0',
+            'noheader' => false,
+            //'sortby'     => '-pagename' // oldest first. reverse by order=reverse
+        );
     }
 
-    function run($dbi, $argstr, &$request, $basepage) {
+    function run($dbi, $argstr, &$request, $basepage)
+    {
         $args = $this->getArgs($argstr, $request);
         if (!$args['pagename']) {
             return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename'));
@@ -89,55 +93,57 @@
         // for new comments
         $html = HTML();
         if ($args['jshide']) {
-            $div = HTML::div(array('id'=>'comments','style'=>'display:none;'));
+            $div = HTML::div(array('id' => 'comments', 'style' => 'display:none;'));
             //$list->setAttr('style','display:none;');
             $div->pushContent(Javascript("
 function togglecomments(a) {
   comments=document.getElementById('comments');
   if (comments.style.display=='none') {
     comments.style.display='block';
-    a.title='"._("Click to hide the comments")."';
+    a.title='" . _("Click to hide the comments") . "';
   } else {
     comments.style.display='none';
-    a.title='"._("Click to display all comments")."';
+    a.title='" . _("Click to display all comments") . "';
   }
 }"));
-            $html->pushContent(HTML::h4(HTML::a(array('name'=>'comment-header',
-                                                      'class'=>'wikiaction',
-                                                      'title'=>_("Click to display"),
-                                                      'onclick'=>"togglecomments(this)"),
-                                                _("Comments"))));
+            $html->pushContent(HTML::h4(HTML::a(array('name' => 'comment-header',
+                    'class' => 'wikiaction',
+                    'title' => _("Click to display"),
+                    'onclick' => "togglecomments(this)"),
+                _("Comments"))));
         } else {
-            $div = HTML::div(array('id'=>'comments'));
+            $div = HTML::div(array('id' => 'comments'));
         }
         foreach (explode(',', $args['mode']) as $show) {
             if (!empty($seen[$show]))
                 continue;
             $seen[$show] = 1;
             switch ($show) {
-            case 'show':
-                $show = $this->showAll($request, $args, 'comment');
-                //if ($args['jshide']) $show->setAttr('style','display:none;');
-                $div->pushContent($show);
-                break;
-            case 'add':
-                global $WikiTheme;
-                if (!$WikiTheme->DUMP_MODE) {
-                    $add = $this->showForm($request, $args, 'addcomment');
-                    //if ($args['jshide']) $add->setAttr('style','display:none;');
-                    $div->pushContent($add);
-                }
-                break;
-            default:
-                return $this->error(sprintf("Bad mode ('%s')", $show));
+                case 'show':
+                    $show = $this->showAll($request, $args, 'comment');
+                    //if ($args['jshide']) $show->setAttr('style','display:none;');
+                    $div->pushContent($show);
+                    break;
+                case 'add':
+                    global $WikiTheme;
+                    if (!$WikiTheme->DUMP_MODE) {
+                        $add = $this->showForm($request, $args, 'addcomment');
+                        //if ($args['jshide']) $add->setAttr('style','display:none;');
+                        $div->pushContent($add);
+                    }
+                    break;
+                default:
+                    return $this->error(sprintf("Bad mode ('%s')", $show));
             }
         }
         $html->pushContent($div);
         return $html;
     }
 
-};
+}
 
+;
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/AllPages.php
===================================================================
--- trunk/lib/plugin/AllPages.php	2012-10-05 14:17:00 UTC (rev 8396)
+++ trunk/lib/plugin/AllPages.php	2012-10-05 16:47:39 UTC (rev 8397)
@@ -28,27 +28,30 @@
  *   AllPagesCreatedByMe, AllPagesOwnedByMe, AllPagesLastAuthoredByMe
  */
 class WikiPlugin_AllPages
-extends WikiPlugin
+    extends WikiPlugin
 {
-    function getName () {
+    function getName()
+    {
         return _("AllPages");
     }
 
-    function getDescription () {
+    function getDescription()
+    {
         return _("List all pages in this wiki.");
     }
 
-    function getDefaultArguments() {
+    function getDefaultArguments()
+    {
         return array_merge
-            (
-             PageList::supportedArgs(),
-             array(
-                   'noheader'      => false,
-                   'include_empty' => false,
-                   'info'          => '',
-                   'debug'         => false,
-                   'userpages'     => false
-                   ));
+        (
+            PageList::supportedArgs(),
+            array(
+                'noheader' => false,
+                'include_empty' => false,
+                'info' => '',
+                'debug' => false,
+                'userpages' => false
+            ));
     }
 
     // info arg allows multiple columns
@@ -57,7 +60,8 @@
     // sortby: [+|-] pagename|mtime|hits
 
     // 2004-07-08 22:05:35 rurban: turned off &$request to prevent from strange bug below
-    function run($dbi, $argstr, $request, $basepage) {
+    function run($dbi, $argstr, $request, $basepage)
+    {
         $args = $this->getArgs($argstr, $request);
 
         $pages = false;
@@ -67,55 +71,55 @@
         }
         $caption = _("All pages in this wiki (%d total):");
 
-        if ( !empty($args['userpages']) ) {
+        if (!empty($args['userpages'])) {
             $pages = PageList::allUserPages($args['include_empty'],
-                                               $args['sortby'], ''
-                                               );
+                $args['sortby'], ''
+            );
             $caption = _("List of user-created pages (%d total):");
             $args['count'] = $request->getArg('count');
-        } elseif ( !empty($args['owner']) ) {
+        } elseif (!empty($args['owner'])) {
             $pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'],
-                                               $args['sortby'], ''
-                                               );
+                $args['sortby'], ''
+            );
             $args['count'] = $request->getArg('count');
             if (!$args['count'])
                 $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']);
             $caption = fmt("List of pages owned by [%s] (%d total):",
-                           WikiLink($args['owner'] == '[]'
-                                    ? $request->_user->getAuthenticatedId()
-                                    : $args['owner'],
-                                    'if_known'), $args['count']);
+                WikiLink($args['owner'] == '[]'
+                        ? $request->_user->getAuthenticatedId()
+                        : $args['owner'],
+                    'if_known'), $args['count']);
             $pages->_options['count'] = $args['count'];
-        } elseif ( !empty($args['author']) ) {
+        } elseif (!empty($args['author'])) {
             $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'],
-                                                $args['sortby'], ''
-                                                );
+                $args['sortby'], ''
+            );
             $args['count'] = $request->getArg('count');
             if (!$args['count'])
                 $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']);
             $caption = fmt("List of pages last edited by [%s] (%d total):",
-                           WikiLink($args['author'] == '[]'
-                                    ? $request->_user->getAuthenticatedId()
-                                    : $args['author'],
-                                    'if_known'), $args['count']);
+                WikiLink($args['author'] == '[]'
+                        ? $request->_user->getAuthenticatedId()
+                        : $args['author'],
+                    'if_known'), $args['count']);
             $pages->_options['count'] = $args['count'];
-        } elseif ( !empty($args['creator']) ) {
+        } elseif (!empty($args['creator'])) {
             $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'],
-                                                 $args['sortby'], ''
-                                                 );
+                $args['sortby'], ''
+            );
             $args['count'] = $request->getArg('count');
             if (!$args['count'])
                 $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']);
             $caption = fmt("List of pages created by [%s] (%d total):",
-                           WikiLink($args['creator'] == '[]'
-                                    ? $request->_user->getAuthenticatedId()
-                                    : $args['creator'],
-                                    'if_known'), $args['count']);
+                WikiLink($args['creator'] == '[]'
+                        ? $request->_user->getAuthenticatedId()
+                        : $args['creator'],
+                    'if_known'), $args['count']);
             $pages->_options['count'] = $args['count'];
-        //} elseif ($pages) {
-        //    $args['count'] = count($pages);
+            //} elseif ($pages) {
+            //    $args['count'] = count($pages);
         } else {
-            if (! $request->getArg('count'))
+            if (!$request->getArg('count'))
                 $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']);
             else
                 $args['count'] = $request->getArg('count');
@@ -132,17 +136,19 @@
         if ($pages !== false)
             $pagelist->addPageList($pages);
         else
-            $pagelist->addPages( $dbi->getAllPages($args['include_empty'], $args['sortby'],
-                                                   $args['limit']) );
+            $pagelist->addPages($dbi->getAllPages($args['include_empty'], $args['sortby'],
+                $args['limit']));
         if (DEBUG && $args['debug']) {
             return HTML($pagelist,
-                        HTML::p(fmt("Elapsed time: %s s", $timer->getStats())));
+                HTML::p(fmt("Elapsed time: %s s", $timer->getStats())));
         } else {
             return $pagelist;
         }
     }
-};
+}
 
+;
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/AllUsers.php
===================================================================
--- trunk/lib/plugin/AllUsers.php	2012-10-05 14:17:00 UTC (rev 8396)
+++ trunk/lib/plugin/AllUsers.php	2012-10-05 16:47:39 UTC (rev 8397)
@@ -31,25 +31,29 @@
  * externally authenticated users with a db users table, if auth_user_exists is defined.
  */
 class WikiPlugin_AllUsers
-extends WikiPlugin
+    extends WikiPlugin
 {
-    function getName () {
+    function getName()
+    {
         return _("AllUsers");
     }
 
-    function getDescription() {
+    function getDescription()
+    {
         return _("List all once authenticated users.");
     }
 
-    function getDefaultArguments() {
+    function getDefaultArguments()
+    {
         return array_merge
-            (
-             PageList::supportedArgs(),
-             array('noheader'      => false,
-                   'include_empty' => true,
-                   'debug'         => false
-                   ));
+        (
+            PageList::supportedArgs(),
+            array('noheader' => false,
+                'include_empty' => true,
+                'debug' => false
+            ));
     }
+
     // info arg allows multiple columns
     // info=mtime,hits,summary,version,author,locked,minor,markup or all
     // exclude arg allows multiple pagenames exclude=WikiAdmin,.SecretUser
@@ -59,7 +63,8 @@
     //
     // sortby: [+|-] pagename|mtime|hits
 
-    function run($dbi, $argstr, &$request, $basepage) {
+    function run($dbi, $argstr, &$request, $basepage)
+    {
         $args = $this->getArgs($argstr, $request);
 
         extract($args);
@@ -68,7 +73,7 @@
         }
 
         $group = $request->getGroup();
-        if (method_exists($group,'_allUsers')) {
+        if (method_exists($group, '_allUsers')) {
             $allusers = $group->_allUsers();
         } else {
             $allusers = array();
@@ -84,7 +89,7 @@
         if (!$pagesize) {
             $pagelist->addPageList($allusers);
         } else {
-            for ($i=$offset; $i < $offset + $pagesize - 1; $i++) {
+            for ($i = $offset; $i < $offset + $pagesize - 1; $i++) {
                 if ($i >= $args['count']) break;
                 $pagelist->addPage(trim($allusers[$i]));
             }
@@ -99,13 +104,15 @@
 
         if (defined('DEBUG') && DEBUG and $debug) {
             return HTML($pagelist,
-                        HTML::p(fmt("Elapsed time: %s s", $timer->getStats())));
+                HTML::p(fmt("Elapsed time: %s s", $timer->getStats())));
         } else {
             return $pagelist;
         }
     }
-};
+}
 
+;
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/AnalyseAccessLogSql.php
===================================================================
--- trunk/lib/plugin/AnalyseAccessLogSql.php	2012-10-05 14:17:00 UTC (rev 8396)
+++ trunk/lib/plugin/AnalyseAccessLogSql.php	2012-10-05 16:47:39 UTC (rev 8397)
@@ -27,7 +27,7 @@
  * To add a new query, see _getQueryString()
  */
 class WikiPlugin_AnalyseAccessLogSql
-extends WikiPlugin
+    extends WikiPlugin
 {
     /**
      * Build the query string
@@ -53,7 +53,8 @@
      *          ."WHERE referer IS NOT NULL "
      *          .$where_conditions
      */
-    function _getQueryString(&$args) {
+    function _getQueryString(&$args)
+    {
         // extract any parametrised conditions from the arguments,
         // in particular, how much history to select
         $where_conditions = $this->_getWhereConditions($args);
@@ -61,202 +62,214 @@
         // get the correct name for the table
         //FIXME is there a more correct way to do this?
         global $DBParams, $request;
-        $accesslog = (!empty($DBParams['prefix']) ? $DBParams['prefix'] : '')."accesslog";
+        $accesslog = (!empty($DBParams['prefix']) ? $DBParams['prefix'] : '') . "accesslog";
 
         $query = '';
         $backend_type = $request->_dbi->_backend->backendType();
         switch ($backend_type) {
-        case 'mysql':
-            $Referring_URL = "left(referer,length(referer)-instr(reverse(referer),'?'))"; break;
-        case 'pgsql':
-        case 'postgres7':
-            $Referring_URL = "substr(referer,0,position('?' in referer))"; break;
-        default:
-            $Referring_URL = "referer";
-        }
-        switch ($args['mode']) {
-        case 'referring_urls':
-            if ($where_conditions<>'')
-                $where_conditions = 'WHERE '.$where_conditions.' ';
-            $query = "SELECT "
-                . "$Referring_URL AS Referring_URL, "
-                . "count(*) AS Referral_Count "
-                . "FROM $accesslog "
-                . $where_conditions
-                . "GROUP BY Referring_URL";
-            break;
-        case 'external_referers':
-            $args['local_referrers'] = 'false';
-            $where_conditions = $this->_getWhereConditions($args);
-            if ($where_conditions<>'')
-                $where_conditions = 'WHERE '.$where_conditions.' ';
-            $query = "SELECT "
-                . "$Referring_URL AS Referring_URL, "
-                . "count(*) AS Referral_Count "
-                . "FROM $accesslog "
-                . $where_conditions
-                . "GROUP BY Referring_URL";
-            break;
-        case 'referring_domains':
-            if ($where_conditions<>'')
-                $where_conditions = 'WHERE '.$where_conditions.' ';
-            switch ($backend_type) {
             case 'mysql':
-                $Referring_Domain = "left(referer, if(locate('/', referer, 8) > 0,locate('/', referer, 8) -1, length(referer)))"; break;
+                $Referring_URL = "left(referer,length(referer)-instr(reverse(referer),'?'))";
+                break;
             case 'pgsql':
             case 'postgres7':
-                $Referring_Domain = "substr(referer,0,8) || regexp_replace(substr(referer,8), '/.*', '')"; break;
-            default:
-                $Referring_Domain = "referer"; break;
-            }
-            $query = "SELECT "
-                . "$Referring_Domain AS Referring_Domain, "
-                . "count(*) AS Referral_Count "
-                . "FROM $accesslog "
-                . $where_conditions
-                . "GROUP BY Referring_Domain";
-            break;
-        case 'remote_hosts':
-            if ($where_conditions<>'')
-                $where_conditions = 'WHERE '.$where_conditions.' ';
-            $query = "SELECT "
-                ."remote_host AS Remote_Host, "
-                ."count(*) AS Access_Count "
-                ."FROM $accesslog "
-                .$where_conditions
-                ."GROUP BY Remote_Host";
-            break;
-        case 'users':
-            if ($where_conditions<>'')
-                $where_conditions = 'WHERE '.$where_conditions.' ';
-            $query = "SELECT "
-                ."remote_user AS User, "
-                ."count(*) AS Access_Count "
-                ."FROM $accesslog "
-                .$where_conditions
-                ."GROUP BY remote_user";
-            break;
-        case 'host_users':
-            if ($where_conditions<>'')
-                $where_conditions = 'WHERE '.$where_conditions.' ';
-            $query = "SELECT "
-                ."remote_host AS Remote_Host, "
-                ."remote_user AS User, "
-                ."count(*) AS Access_Count "
-                ."FROM $accesslog "
-                .$where_conditions
-                ."GROUP BY remote_host, remote_user";
-            break;
-        case "search_bots":
-            // This queries for all entries in the SQL access log table that
-            // have a dns name that I know to be a web search engine crawler and
-            // categorises the results into time buckets as per the list below
-            // 0 - 1 minute - 60
-            // 1 - 1 hour   - 3600     = 60 * 60
-            // 2 - 1 day    - 86400    = 60 * 60 * 24
-            // 3 - 1 week   - 604800   = 60 * 60 * 24 * 7
-            // 4 - 1 month  - 2629800  = 60 * 60 * 24 * 365.25 / 12
-            // 5 - 1 year   - 31557600 = 60 * 60 * 24 * 365.25
-            $now = time();
-            $query = "SELECT "
-                ."CASE WHEN $now-time_stamp<60 THEN '"._("0 - last minute")."' ELSE "
-                  ."CASE WHEN $now-time_stamp<3600 THEN '"._("1 - 1 minute to 1 hour")."' ELSE "
-                    ."CASE WHEN $now-time_stamp<86400 THEN '"._("2 - 1 hour to 1 day")."' ELSE "
-                      ."CASE WHEN $now-time_stamp<604800 THEN '"._("3 - 1 day to 1 week")."' ELSE "
-                        ."CASE WHEN $now-time_stamp<2629800 THEN '"._("4 - 1 week to 1 month")."' ELSE "
-                          ."CASE WHEN $now-time_stamp<31557600 THEN '"._("5 - 1 month to 1 year")."' ELSE "
-                            ."'"._("6 - more than 1 year")."' END END END END END END AS Time_Scale, "
-                ."remote_host AS Remote_Host, "
-                ."count(*) AS Access_Count "
-                ."FROM $accesslog "
-                ."WHERE (remote_host LIKE '%googlebot.com' "
-                ."OR remote_host LIKE '%alexa.com' "
-                ."OR remote_host LIKE '%inktomisearch.com' "
-                ."OR remote_host LIKE '%msnbot.msn.com') "
-                .($where_conditions ? 'AND '.$where_conditions : '')
-                ."GROUP BY Time_Scale, remote_host";
-            break;
-        case "search_bots_hits":
-            // This queries for all entries in the SQL access log table that
-            // have a dns name that I know to be a web search engine crawler and
-            // displays the URI that was hit.
-            // If PHPSESSID appears in the URI, just display the URI to the left of this
-            $sessname = session_name();
-            switch ($backend_type) {
-            case 'mysql':
-                $Request_URI = "IF(instr(request_uri, '$sessname')=0, request_uri,left(request_uri, instr(request_uri, '$sessname')-2))";
+                $Referring_URL = "substr(referer,0,position('?' in referer))";
                 break;
-            case 'pgsql':
-            case 'postgres7':
-                $Request_URI = "regexp_replace(request_uri, '$sessname.*', '')"; break;
             default:
-                $Request_URI = 'request_uri'; break;
-            }
-            $now = time();
-            $query = "SELECT "
-                ."CASE WHEN $now-time_stamp<60 THEN '"._("0 - last minute")."' ELSE "
-                  ."CASE WHEN $now-time_stamp<3600 THEN '"._("1 - 1 minute to 1 hour")."' ELSE "
-                    ."CASE WHEN $now-time_stamp<86400 THEN '"._("2 - 1 hour to 1 day")."' ELSE "
-                      ."CASE WHEN $now-time_stamp<604800 THEN '"._("3 - 1 day to 1 week")."' ELSE "
-                        ."CASE WHEN $now-time_stamp<2629800 THEN '"._("4 - 1 week to 1 month")."' ELSE "
-                          ."CASE WHEN $now-time_stamp<31557600 THEN '"._("5 - 1 month to 1 year")."' ELSE "
-                            ."'"._("6 - more than 1 year")."' END END END END END END AS Time_Scale, "
-                ."remote_host AS Remote_Host, "
-                ."$Request_URI AS Request_URI "
-                ."FROM $accesslog "
-                ."WHERE (remote_host LIKE '%googlebot.com' "
-                ."OR remote_host LIKE '%alexa.com' "
-                ."OR remote_host LIKE '%inktomisearch.com' "
-                ."OR remote_host LIKE '%msnbot.msn.com') "
-                .($where_conditions ? 'AND '.$where_conditions : '')
-                ."ORDER BY time_stamp";
+                $Referring_URL = "referer";
         }
+        switch ($args['mode']) {
+            case 'referring_urls':
+                if ($where_conditions <> '')
+                    $where_conditions = 'WHERE ' . $where_conditions . ' ';
+                $query = "SELECT "
+                    . "$Referring_URL AS Referring_URL, "
+                    . "count(*) AS Referral_Count "
+                    . "FROM $accesslog "
+                    . $where_conditions
+                    . "GROUP BY Referring_URL";
+                break;
+            case 'external_referers':
+                $args['local_referrers'] = 'false';
+                $where_conditions = $this->_getWhereConditions($args);
+                if ($where_conditions <> '')
+                    $where_conditions = 'WHERE ' . $where_conditions . ' ';
+                $query = "SELECT "
+                    . "$Referring_URL AS Referring_URL, "
+                    . "count(*) AS Referral_Count "
+                    . "FROM $accesslog "
+                    . $where_conditions
+                    . "GROUP BY Referring_URL";
+                break;
+            case 'referring_domains':
+                if ($where_conditions <> '')
+                    $where_conditions = 'WHERE ' . $where_conditions . ' ';
+                switch ($backend_type) {
+                    case 'mysql':
+                        $Referring_Domain = "left(referer, if(locate('/', referer, 8) > 0,locate('/', referer, 8) -1, length(referer)))";
+                        break;
+                    case 'pgsql':
+                    case 'postgres7':
+                        $Referring_Domain = "substr(referer,0,8) || regexp_replace(substr(referer,8), '/.*', '')";
+                        break;
+                    default:
+                        $Referring_Domain = "referer";
+                        break;
+                }
+                $query = "SELECT "
+                    . "$Referring_Domain AS Referring_Domain, "
+                    . "count(*) AS Referral_Count "
+                    . "FROM $accesslog "
+                    . $where_conditions
+                    . "GROUP BY Referring_Domain";
+                break;
+            case 'remote_hosts':
+                if ($where_conditions <> '')
+                    $where_conditions = 'WHERE ' . $where_conditions . ' ';
+                $query = "SELECT "
+                    . "remote_host AS Remote_Host, "
+                    . "count(*) AS Access_Count "
+                    . "FROM $accesslog "
+                    . $where_conditions
+                    . "GROUP BY Remote_Host";
+                break;
+            case 'users':
+                if ($where_conditions <> '')
+                    $where_conditions = 'WHERE ' . $where_conditions . ' ';
+                $query = "SELECT "
+                    . "remote_user AS User, "
+                    . "count(*) AS Access_Count "
+                    . "FROM $accesslog "
+                    . $where_conditions
+                    . "GROUP BY remote_user";
+                break;
+            case 'host_users':
+                if ($where_conditions <> '')
+                    $where_conditions = 'WHERE ' . $where_conditions . ' ';
+                $query = "SELECT "
+                    . "remote_host AS Remote_Host, "
+                    . "remote_user AS User, "
+                    . "count(*) AS Access_Count "
+                    . "FROM $accesslog "
+                    . $where_conditions
+                    . "GROUP BY remote_host, remote_user";
+                break;
+            case "search_bots":
+                // This queries for all entries in the SQL access log table that
+                // have a dns name that I know to be a web search engine crawler and
+                // categorises the results into time buckets as per the list below
+                // 0 - 1 minute - 60
+                // 1 - 1 hour   - 3600     = 60 * 60
+                // 2 - 1 day    - 86400    = 60 * 60 * 24
+                // 3 - 1 week   - 604800   = 60 * 60 * 24 * 7
+                // 4 - 1 month  - 2629800  = 60 * 60 * 24 * 365.25 / 12
+                // 5 - 1 year   - 31557600 = 60 * 60 * 24 * 365.25
+                $now = time();
+                $query = "SELECT "
+                    . "CASE WHEN $now-time_stamp<60 THEN '" . _("0 - last minute") . "' ELSE "
+                    . "CASE WHEN $now-time_stamp<3600 THEN '" . _("1 - 1 minute to 1 hour") . "' ELSE "
+                    . "CASE WHEN $now-time_stamp<86400 THEN '" . _("2 - 1 hour to 1 day") . "' ELSE "
+                    . "CASE WHEN $now-time_stamp<604800 THEN '" . _("3 - 1 day to 1 week") . "' ELSE "
+                    . "CASE WHEN $now-time_stamp<2629800 THEN '" . _("4 - 1 week to 1 month") . "' ELSE "
+                    . "CASE WHEN $now-time_stamp<31557600 THEN '" . _("5 - 1 month to 1 year") . "' ELSE "
+                    . "'" . _("6 - more than 1 year") . "' END END END END END END AS Time_Scale, "
+                    . "remote_host AS Remote_Host, "
+                    . "count(*) AS Access_Count "
+                    . "FROM $accesslog "
+                    . "WHERE (remote_host LIKE '%googlebot.com' "
+                    . "OR remote_host LIKE '%alexa.com' "
+                    . "OR remote_host LIKE '%inktomisearch.com' "
+                    . "OR remote_host LIKE '%msnbot.msn.com') "
+                    . ($where_conditions ? 'AND ' . $where_conditions : '')
+                    . "GROUP BY Time_Scale, remote_host";
+                break;
+            case "search_bots_hits":
+                // This queries for all entries in the SQL access log table that
+                // have a dns name that I know to be a web search engine crawler and
+                // displays the URI that was hit.
+                // If PHPSESSID appears in the URI, just display the URI to the left of this
+                $sessname = session_name();
+                switch ($backend_type) {
+                    case 'mysql':
+                        $Request_URI = "IF(instr(request_uri, '$sessname')=0, request_uri,left(request_uri, instr(request_uri, '$sessname')-2))";
+                        break;
+                    case 'pgsql':
+                    case 'postgres7':
+                        $Request_URI = "regexp_replace(request_uri, '$sessname.*', '')";
+                        break;
+                    default:
+                        $Request_URI = 'request_uri';
+                        break;
+                }
+                $now = time();
+                $query = "SELECT "
+                    . "CASE WHEN $now-time_stamp<60 THEN '" . _("0 - last minute") . "' ELSE "
+                    . "CASE WHEN $now-time_stamp<3600 THEN '" . _("1 - 1 minute to 1 hour") . "' ELSE "
+                    . "CASE WHEN $now-time_stamp<86400 THEN '" . _("2 - 1 hour to 1 day") . "' ELSE "
+                    . "CASE WHEN $now-time_stamp<604800 THEN '" . _("3 - 1 day to 1 week") . "' ELSE "
+                    . "CASE WHEN $now-time_stamp<2629800 THEN '" . _("4 - 1 week to 1 month") . "' ELSE "
+                    . "CASE WHEN $now-time_stamp<31557600 THEN '" . _("5 - 1 month to 1 year") . "' ELSE "
+                    . "'" . _("6 - more than 1 year") . "' END END END END END END AS Time_Scale, "
+                    . "remote_host AS Remote_Host, "
+                    . "$Request_URI AS Request_URI "
+                    . "FROM $accesslog "
+                    . "WHERE (remote_host LIKE '%googlebot.com' "
+                    . "OR remote_host LIKE '%alexa.com' "
+                    . "OR remote_host LIKE '%inktomisearch.com' "
+                    . "OR remote_host LIKE '%msnbot.msn.com') "
+                    . ($where_conditions ? 'AND ' . $where_conditions : '')
+                    . "ORDER BY time_stamp";
+        }
         return $query;
     }
 
     /** Honeypot for xgettext. Those strings are translated dynamically.
      */
-    function _locale_dummy() {
+    function _locale_dummy()
+    {
         $dummy = array(
-                       // mode caption
-                       _("referring_urls"),
-                       _("external_referers"),
-                       _("referring_domains"),
-                       _("remote_hosts"),
-                       _("users"),
-                       _("host_users"),
-                       _("search_bots"),
-                       _("search_bots_hits"),
-                       // period header
-                       _("minutes"),
-                       _("hours"),
-                       _("days"),
-                       _("weeks"),
-                       );
+            // mode caption
+            _("referring_urls"),
+            _("external_referers"),
+            _("referring_domains"),
+            _("remote_hosts"),
+            _("users"),
+            _("host_users"),
+            _("search_bots"),
+            _("search_bots_hits"),
+            // period header
+            _("minutes"),
+            _("hours"),
+            _("days"),
+            _("weeks"),
+        );
     }
 
-    function getDefaultArguments() {
+    function getDefaultArguments()
+    {
         return array(
-                     'mode'             => 'referring_domains',
-                     // referring_domains, referring_urls, remote_hosts, users, host_users, search_bots, search_bots_hits
-                     'caption'          => '',
-                     // blank means use the mode as the caption/title for the output
-                     'local_referrers'  => 'true',  // only show external referring sites
-                     'period'           => '',      // the type of period to report:
-                     // may be weeks, days, hours, minutes, or blank for all
-                     'count'            => '0'      // the number of periods to report
-                     );
+            'mode' => 'referring_domains',
+            // referring_domains, referring_urls, remote_hosts, users, host_users, search_bots, search_bots_hits
+            'caption' => '',
+            // blank means use the mode as the caption/title for the output
+            'local_referrers' => 'true', // only show external referring sites
+            'period' => '', // the type of period to report:
+            // may be weeks, days, hours, minutes, or blank for all
+            'count' => '0' // the number of periods to report
+        );
     }
 
-    function getName () {
+    function getName()
+    {
         return _("AnalyseAccessLogSql");
     }
 
-    function getDescription () {
+    function getDescription()
+    {
         return _("Show summary information from the access log table.");
     }
 
-    function run($dbi, $argstr, &$request, $basepage) {
+    function run($dbi, $argstr, &$request, $basepage)
+    {
         // flag that the output may not be cached - i.e. it is dynamic
         $request->setArg('nocache', 1);
 
@@ -274,24 +287,25 @@
 
         $query = $this->_getQueryString($args);
 
-        if ($query=='')
-            return HTML::p(sprintf( _("Unrecognised parameter 'mode=%s'"),
-                                    $args['mode']));
+        if ($query == '')
+            return HTML::p(sprintf(_("Unrecognised parameter 'mode=%s'"),
+                $args['mode']));
 
         // get the data back.
         // Note that this must be done before the final generation ofthe table,
         // otherwise the headers will not be ready
         $tbody = $this->_getQueryResults($query, $dbi);
 
-        return HTML::table(array('border'        => 1,
-                                 'cellspacing'   => 1,
-                                 'cellpadding'   => 1),
-                    HTML::caption(HTML::h1(HTML::br(),$this->_getCaption($args))),
-                    HTML::thead($this->_theadrow),
-                    $tbody);
+        return HTML::table(array('border' => 1,
+                'cellspacing' => 1,
+                'cellpadding' => 1),
+            HTML::caption(HTML::h1(HTML::br(), $this->_getCaption($args))),
+            HTML::thead($this->_theadrow),
+            $tbody);
     }
 
-    function _getQueryResults($query, &$dbi) {
+    function _getQueryResults($query, &$dbi)
+    {
         $queryResult = $dbi->genericSqlIter($query);
         if (!$queryResult) {
             $tbody = HTML::tbody(HTML::tr(HTML::td(_("<empty>"))));
@@ -302,7 +316,7 @@
                 $tr = HTML::tr();
                 foreach ($row as $value) {
                     // output a '-' for empty values, otherwise the table looks strange
-                    $tr->pushContent(HTML::td( empty($value) ? '-' : $value ));
+                    $tr->pushContent(HTML::td(empty($value) ? '-' : $value));
                 }
                 $tbody->pushContent($tr);
             }
@@ -311,7 +325,8 @@
         return $tbody;
     }
 
-    function _setHeaders($row) {
+    function _setHeaders($row)
+    {
         if (!$this->_headerSet) {
             foreach ($row as $key => $value) {
                 $this->_theadrow->pushContent(HTML::th(_($key)));
@@ -320,63 +335,67 @@
         }
     }
 
-    function _getWhereConditions(&$args) {
+    function _getWhereConditions(&$args)
+    {
         $where_conditions = '';
 
-        if ($args['period']<>'') {
+        if ($args['period'] <> '') {
             $since = 0;
-            if ($args['period']=='minutes') {
+            if ($args['period'] == 'minutes') {
                 $since = 60;
-            } elseif ($args['period']=='hours') {
+            } elseif ($args['period'] == 'hours') {
                 $since = 60 * 60;
-            } elseif ($args['period']=='days') {
+            } elseif ($args['period'] == 'days') {
                 $since = 60 * 60 * 24;
-            } elseif ($args['period']=='weeks') {
+            } elseif ($args['period'] == 'weeks') {
                 $since = 60 * 60 * 24 * 7;
             }
             $since = $since * $args['count'];
-            if ($since>0) {
-                if ($where_conditions<>'')
-                    $where_conditions = $where_conditions.' AND ';
+            if ($since > 0) {
+                if ($where_conditions <> '')
+                    $where_conditions = $where_conditions . ' AND ';
                 $since = time() - $since;
-                $where_conditions = $where_conditions."time_stamp > $since";
+                $where_conditions = $where_conditions . "time_stamp > $since";
             }
         }
 
-        if ($args['local_referrers']<>'true') {
+        if ($args['local_referrers'] <> 'true') {
             global $request;
-            if ($where_conditions<>'')
-                $where_conditions = $where_conditions.' AND ';
+            if ($where_conditions <> '')
+                $where_conditions = $where_conditions . ' AND ';
             $localhost = SERVER_URL;
             $len = strlen($localhost);
             $backend_type = $request->_dbi->_backend->backendType();
             switch ($backend_type) {
-            case 'mysql':
-                $ref_localhost = "left(referer,$len)<>'$localhost'"; break;
-            case 'pgsql':
-            case 'postgres7':
-                $ref_localhost = "substr(referer,0,$len)<>'$localhost'"; break;
-            default:
-                $ref_localhost = "";
+                case 'mysql':
+                    $ref_localhost = "left(referer,$len)<>'$localhost'";
+                    break;
+                case 'pgsql':
+                case 'postgres7':
+                    $ref_localhost = "substr(referer,0,$len)<>'$localhost'";
+                    break;
+                default:
+                    $ref_localhost = "";
             }
-            $where_conditions = $where_conditions.$ref_localhost;
+            $where_conditions = $where_conditions . $ref_localhost;
         }
 
         // The assumed contract is that there is a space at the end of the
         // conditions string, so that following SQL clauses (such as GROUP BY)
         // will not cause a syntax error
-        if ($where_conditions<>'')
-            $where_conditions = $where_conditions.' ';
+        if ($where_conditions <> '')
+            $where_conditions = $where_conditions . ' ';
 
         return $where_conditions;
     }
 
-    function _getCaption(&$args) {
+    function _getCaption(&$args)
+    {
         $caption = $args['caption'];
-        if ($caption=='')
+        if ($caption == '')
             $caption = gettext($args['mode']);
-        if ($args['period']<>'' && $args['count'])
-            $caption = $caption." - ".$args['count']." ". gettext($args['period']);
+        if ($args['period'] <> '' && $args['count'])
+            $caption = $caption . " - " . $args['count'] . " " . gettext($args['period']);
         return $caption;
     }
 

Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php	2012-10-05 14:17:00 UTC (rev 8396)
+++ trunk/lib/plugin/AppendText.php	2012-10-05 16:47:39 UTC (rev 8397)
@@ -31,33 +31,38 @@
  * Todo: multiple pages. e.g. AppendText s=~[CategoryINtime~] page=<!plugin TitleSearch intime !>
  */
 class WikiPlugin_AppendText
-extends WikiPlugin
+    extends WikiPlugin
 {
-    function getName() {
+    function getName()
+    {
         return _("AppendText");
     }
 
-    function getDescription() {
+    function getDescription()
+    {
         return _("Append text to any page in this wiki.");
     }
 
-    function getDefaultArguments() {
-        return array('page'     => '[pagename]',
-                     'pages'    => false,
-                     's'        => '',  // Text to append.
-                     'before'   => '',  // Add before (ignores after if defined)
-                     'after'    => '',  // Add after line beginning with this
-                     'redirect' => false // Redirect to modified page
-                     );
+    function getDefaultArguments()
+    {
+        return array('page' => '[pagename]',
+            'pages' => false,
+            's' => '', // Text to append.
+            'before' => '', // Add before (ignores after if defined)
+            'after' => '', // Add after line beginning with this
+            'redirect' => false // Redirect to modified page
+        );
     }
 
-    function _fallback($addtext, $oldtext, $notfound, &$message) {
-        $message->pushContent(sprintf(_("%s not found"), $notfound).". ".
-                              _("Appending at the end.")."\n");
+    function _fallback($addtext, $oldtext, $notfound, &$message)
+    {
+        $message->pushContent(sprintf(_("%s not found"), $notfound) . ". " .
+            _("Appending at the end.") . "\n");
         return $oldtext . "\n" . $addtext;
     }
 
-    function run($dbi, $argstr, &$request, $basepage) {
+    function run($dbi, $argstr, &$request, $basepage)
+    {
 
         $args = $this->getArgs($argstr, $request);
         if (!$args['pages'] or !$request->isPost()) {
@@ -65,7 +70,7 @@
         } else {
             $html = HTML();
             if ($args['page'] != $basepage)
-                $html->pushContent("pages argument overrides page argument. ignored.",HTML::br());
+                $html->pushContent("pages argument overrides page argument. ignored.", HTML::br());
             foreach ($args['pages'] as $pagename) {
                 $html->pushContent($this->_work($pagename, $args, $dbi, $request));
             }
@@ -73,7 +78,8 @@
         }
     }
 
-    function _work($pagename, $args, $dbi, &$request) {
+    function _work($pagename, $args, $dbi, &$request)
+    {
         if (empty($args['s'])) {
             if ($request->isPost()) {
                 if ($pagename != _("AppendText"))
@@ -87,7 +93,7 @@
 
         if (!$page->exists()) { // We might want to create it?
             $message->pushContent(sprintf(_("Page could not be updated. %s doesn't exist!"),
-                                            $pagename));
+                $pagename));
             return $message;
         }
 
@@ -101,16 +107,16 @@
             // Insert before
             $newtext = preg_match("/\n${before}/", $oldtext)
                 ? preg_replace("/(\n${before})/",
-                               "\n" .  preg_quote($text, "/") . "\\1",
-                               $oldtext)
+                    "\n" . preg_quote($text, "/") . "\\1",
+                    $oldtext)
                 : $this->_fallback($text, $oldtext, $args['before'], $message);
         } elseif (!empty($args['after'])) {
             // Insert after
             $after = preg_quote($args['after'], "/");
             $newtext = preg_match("/\n${after}/", $oldtext)
                 ? preg_replace("/(\n${after})/",
-                               "\\1\n" .  preg_quote($text, "/"),
-                               $oldtext)
+                    "\\1\n" . preg_quote($text, "/"),
+                    $oldtext)
                 : $this->_fallback($text, $oldtext, $args['after'], $message);
         } else {
             // Append at the end
@@ -123,18 +129,18 @@
         $meta['summary'] = sprintf(_("AppendText to %s"), $pagename);
         if ($page->save($newtext, $current->getVersion() + 1, $meta)) {
             $message->pushContent(HTML::p(array('class' => 'feedback'),
-                                          _("Page successfully updated.")));
+                _("Page successfully updated.")));
         }
 
         // AppendText has been called from the same page that got modified
         // so we directly show the page.
-        if ( $request->getArg($pagename) == $pagename ) {
+        if ($request->getArg($pagename) == $pagename) {
             // TODO: Just invalidate the cache, if AppendText didn't
             // change anything before.
             //
             return $request->redirect(WikiURL($pagename, false, 'absurl'), false);
 
-        // The user asked to be redirected to the modified page
+            // The user asked to be redirected to the modified page
         } elseif ($args['redirect']) {
             return $request->redirect(WikiURL($pagename, false, 'absurl'), false);
 
@@ -145,8 +151,10 @@
 
         return $message;
     }
-};
+}
 
+;
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/AsciiMath.php
===================================================================
--- trunk/lib/plugin/AsciiMath.php	2012-10-05 14:17:00 UTC (rev 8396)
+++ trunk/lib/plugin/AsciiMath.php	2012-10-05 16:47:39 UTC (rev 8397)
@@ -33,33 +33,39 @@
  * Syntax: http://www1.chapman.edu/~jipsen/mathml/asciimathsyntax.xml
  * Example: "int_-1^1 sqrt(1-x^2)dx = pi/2"
  * => <math xmlns="http://www.w3.org/1998/Math/MathML">
-        <mrow><msubsup><mo>&#8747;</mo><mn>-1</mn><mn>1</mn></msubsup></mrow>
-        <msqrt><mrow><mn>1</mn><mo>-</mo><msup><mi>x</mi><mn>2</mn></msup></mrow></msqrt>
-        <mi>d</mi>
-        <mi>x</mi>
-        <mo>=</mo>
-        <mfrac><mi>&#960;</mi><mo>2</mo></mfrac>
-      </math>
+<mrow><msubsup><mo>&#8747;</mo><mn>-1</mn><mn>1</mn></msubsup></mrow>
+<msqrt><mrow><mn>1</mn><mo>-</mo><msup><mi>x</mi><mn>2</mn></msup></mrow></msqrt>
+<mi>d</mi>
+<mi>x</mi>
+<mo>=</mo>
+<mfrac><mi>&#960;</mi><mo>2</mo></mfrac>
+</math>
  */
 class WikiPlugin_AsciiMath
-extends WikiPlugin
+    extends WikiPlugin
 {
-    function getName() {
+    function getName()
+    {
         return _("AsciiMath");
     }
 
-    function getDescription() {
+    function getDescription()
+    {
         return _("Render ASCII Math as MathML");
     }
 
-    function getDefaultArguments() {
+    function getDefaultArguments()
+    {
         return array();
     }
-    function handle_plugin_args_cruft(&$argstr, &$args) {
+
+    function handle_plugin_args_cruft(&$argstr, &$args)
+    {
         $this->source = $argstr;
     }
 
-    function run($dbi, $argstr, &$request, $basepage) {
+    function run($dbi, $argstr, &$request, $basepage)
+    {
         $args = $this->getArgs($argstr, $request);
         if (empty($this->source)) {
             return HTML::div(array('class' => "error"), "Please provide a formula to AsciiMath plugin");
@@ -74,8 +80,10 @@
         $ascii_math->genMathML();
         return HTML::raw($ascii_math->getMathML());
     }
-};
+}
 
+;
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/AsciiSVG.php
===================================================================
--- trunk/lib/plugin/AsciiSVG.php	2012-10-05 14:17:00 UTC (rev 8396)
+++ trunk/lib/plugin/AsciiSVG.php	2012-10-05 16:47:39 UTC (rev 8397)
@@ -26,28 +26,34 @@
  * Syntax: http://www1.chapman.edu/~jipsen/svg/asciisvgcommands.html
  */
 class WikiPlugin_AsciiSVG
-extends WikiPlugin
+    extends WikiPlugin
 {
-    function getName() {
+    function getName()
+    {
         return _("AsciiSVG");
     }
 
-    function getDescription() {
+    function getDescription()
+    {
         return _("Render inline ASCII SVG");
     }
 
-    function getDefaultArguments() {
-        return array('width'  => 200,
-                     'height' => 200,
-                     'script' => false, // one line script. not very likely
-                     'onmousemove' => false
-                     );
+    function getDefaultArguments()
+    {
+        return array('width' => 200,
+            'height' => 200,
+            'script' => false, // one line script. not very likely
+            'onmousemove' => false
+        );
     }
-    function handle_plugin_args_cruft(&$argstr, &$args) {
+
+    function handle_plugin_args_cruft(&$argstr, &$args)
+    {
         $this->source = $argstr;
     }
 
-    function run($dbi, $argstr, &$request, $basepage) {
+    function run($dbi, $argstr, &$request, $basepage)
+    {
         global $WikiTheme;
         $args = $this->getArgs($argstr, $request);
         if (empty($this->source))
@@ -55,7 +61,7 @@
         $html = HTML();
         if (empty($WikiTheme->_asciiSVG)) {
             $js = JavaScript('', array
-                             ('src' => $WikiTheme->_findData('ASCIIsvg.js')));
+            ('src' => $WikiTheme->_findData('ASCIIsvg.js')));
             if (empty($WikiTheme->_headers_printed))
                 $WikiTheme->addMoreHeaders($js);
             else
@@ -67,10 +73,10 @@
             $this->source = $m[1];
             $args['script'] = $m[2];
         }
-        $embedargs = array('width'  => $args['width'],
-                           'height' => $args['height'],
-                           //'src'    => "d.svg",
-                           'script' => $this->source);
+        $embedargs = array('width' => $args['width'],
+            'height' => $args['height'],
+            //'src'    => "d.svg",
+            'script' => $this->source);
         // additional onmousemove argument
         if ($args['onmousemove']) $embedargs['onmousemove'] = $args['onmousemove'];
         // we need script='data' and not script="data"
@@ -79,10 +85,14 @@
         if ($args['script']) $html->pushContent(JavaScript($args['script']));
         return $html;
     }
-};
+}
 
-class AsciiSVG_HTML extends HtmlElement {
-    function startTag() {
+;
+
+class AsciiSVG_HTML extends HtmlElement
+{
+    function startTag()
+    {
         $start = "<" . $this->_tag;
         $this->_setClasses();
         foreach ($this->_attr as $attr => $val) {

Modified: trunk/lib/plugin/AtomFeed.php
===================================================================
--- trunk/lib/plugin/AtomFeed.php	2012-10-05 14:17:00 UTC (rev 8396)
+++ trunk/lib/plugin/AtomFeed.php	2012-10-05 16:47:39 UTC (rev 8397)
@@ -26,27 +26,31 @@
 require_once 'lib/AtomParser.php';
 
 class WikiPlugin_AtomFeed
-extends WikiPlugin
+    extends WikiPlugin
 {
-    function getName() {
+    function getName()
+    {
         return _('AtomFeed');
     }
 
-    function getDescription() {
+    function getDescription()
+    {
         return _('Atom Aggregator Plugin');
     }
 
-    function getDefaultArguments() {
+    function getDefaultArguments()
+    {
         return array(
-           'feed' => "",
-           'description' => "",
-           'url' => "",
-           'maxitem' => 0,
-           'titleonly' => false
+            'feed' => "",
+            'description' => "",
+            'url' => "",
+            'maxitem' => 0,
+            'titleonly' => false
         );
     }
 
-    function run($dbi, $argstr, &$request, $basepage) {
+    function run($dbi, $argstr, &$request, $basepage)
+    {
         extract($this->getArgs($argstr, $request));
         $parser = new AtomParser();
 
@@ -59,7 +63,7 @@
         foreach ($parser->feed as $feed) {
             $title = HTML::h3(HTML::a(array('href' => $feed["links"]["0"]["href"]), $feed["title"]));
             $counter = 1;
-            foreach($parser->entries as $entry) {
+            foreach ($parser->entries as $entry) {
                 $item = HTML::dt(HTML::a(array('href' => $entry["links"]["0"]["href"]), $entry["title"]));
                 $items->pushContent($item);
 
@@ -75,7 +79,7 @@
                 }
                 $counter++;
             }
-            $html = HTML::div(array('class'=> 'rss'), $title);
+            $html = HTML::div(array('class' => 'rss'), $title);
             $html->pushContent($items);
         }
 

Modified: trunk/lib/plugin/AuthorHistory.php
===================================================================
--- trunk/lib/plugin/AuthorHistory.php	2012-10-05 14:17:00 UTC (rev 8396)
+++ trunk/lib/plugin/AuthorHistory.php	2012-10-05 16:47:39 UTC (rev 8397)
@@ -57,32 +57,37 @@
 require_once 'lib/PageList.php';
 
 class WikiPlugin_AuthorHistory
-extends WikiPlugin
+    extends WikiPlugin
 {
-    function getName() {
+    function getName()
+    {
         return _("AuthorHistory");
     }
 
-    function getDescription() {
+    function getDescription()
+    {
         return sprintf(_("List all page revisions edited by one user with diff links, or show a PageHistory-like list of a single page for only one user."));
     }
 
-    function getDefaultArguments() {
+    function getDefaultArguments()
+    {
         global $request;
-        return array('exclude'      => '',
-                     'noheader'     => false,
-                     'includeminor' => false,
-                     'includedeleted' => false,
-                     'author'       => $request->_user->UserName(),
-                     'page'         => '[pagename]',
-                     'info'         => 'version,minor,author,summary,mtime'
-                     );
+        return array('exclude' => '',
+            'noheader' => false,
+            'includeminor' => false,
+            'includedeleted' => false,
+            'author' => $request->_user->UserName(),
+            'page' => '[pagename]',
+            'info' => 'version,minor,author,summary,mtime'
+        );
     }
+
     // info arg allows multiple columns
     // info=mtime,hits,summary,version,author,locked,minor
     // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges
 
- ...
 
[truncated message content]

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

From: <var...@us...> - 2012-10-05 14:17:09

Revision: 8396
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8396&view=rev
Author:   vargenau
Date:     2012-10-05 14:17:00 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
Use CSS

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

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2012-10-05 13:53:50 UTC (rev 8395)
+++ trunk/lib/upgrade.php	2012-10-05 14:17:00 UTC (rev 8396)
@@ -197,11 +197,11 @@
     {
         echo sprintf(_("rename %s to %s"), $oldname, $pagename), " ...";
         if ($this->dbi->isWikiPage($oldname) and !$this->dbi->isWikiPage($pagename)) {
-            if ($this->dbi->_backend->rename_page($oldname, $pagename))
+            if ($this->dbi->_backend->rename_page($oldname, $pagename)) {
                 echo _("OK"), " <br />\n";
-            else
-                echo " <b><font color=\"red\">", _("FAILED"), "</font></b>",
-                " <br />\n";
+            } else {
+                echo ' <span style="color: red; font-weight: bold;">' . _("FAILED") . "</span><br />\n";
+            }
         } else {
             echo _(" Skipped"), " <br />\n";
         }
@@ -543,8 +543,8 @@
                         $this->dbi->genericSqlQuery("FLUSH PRIVILEGES");
                         echo "mysql.user user='$username'", _("fixed"), "<br />\n";
                     } elseif (!$row) {
-                        echo " <b><font color=\"red\">", _("FAILED"), "</font></b>: ",
-                            "Neither mysql.db nor mysql.user has a user='$username'"
+                        echo ' <span style="color: red; font-weight: bold;">' . _("FAILED") . "</span>"
+                            . " Neither mysql.db nor mysql.user has a user='$username'"
                             . " or the lock_tables_priv field",
                         "<br />\n";
                     } else {
@@ -581,7 +581,7 @@
                             . " id INT NOT NULL AUTO_INCREMENT");
                         $fields = mysql_list_fields($database, $page_tbl);
                         if (!strstr(strtolower(mysql_field_flags($fields, $i)), "auto_increment"))
-                            echo " <b><font color=\"red\">", _("FAILED"), "</font></b><br />\n";
+                            echo ' <span style="color: red; font-weight: bold;">' . _("FAILED") . "</span><br />\n";
                         else
                             echo _("OK"), "<br />\n";
                     } else {
@@ -1133,7 +1133,7 @@
 
     function fail()
     {
-        echo " <b><font color=\"red\">", _("FAILED"), "</font></b>";
+        echo '<span style="color: red; font-weight: bold; ">' . _("FAILED") . "</span>";
         if (isset($this->reason))
             echo _(": "), $this->reason;
         echo "<br />\n";

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

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

From: <var...@us...> - 2012-10-05 13:54:00

Revision: 8395
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8395&view=rev
Author:   vargenau
Date:     2012-10-05 13:53:50 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
Be consistent in return

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

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2012-10-05 13:50:15 UTC (rev 8394)
+++ trunk/lib/upgrade.php	2012-10-05 13:53:50 UTC (rev 8395)
@@ -821,7 +821,7 @@
     function _upgrade_cached_html($verbose = true)
     {
         global $DBParams;
-        if (!$this->isSQL) return;
+        if (!$this->isSQL) return 0;
         $count = 0;
         if ($this->phpwiki_version >= 1030.10) {
             if ($verbose)
@@ -861,7 +861,7 @@
     function _convert_cached_html()
     {
         global $DBParams;
-        if (!$this->isSQL) return;
+        if (!$this->isSQL) return 0;
         //if (!in_array(DATABASE_TYPE, array('SQL','ADODB'))) return;
 
         $pages = $this->dbi->getAllPages();

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

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

From: <var...@us...> - 2012-10-05 13:50:24

Revision: 8394
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8394&view=rev
Author:   vargenau
Date:     2012-10-05 13:50:15 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
Be consistent in return

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

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2012-10-05 13:26:27 UTC (rev 8393)
+++ trunk/lib/upgrade.php	2012-10-05 13:50:15 UTC (rev 8394)
@@ -770,8 +770,9 @@
                     return;
             }
         } elseif (DBADMIN_USER) {
-            if ($this->_try_dbadmin_user(DBADMIN_USER, DBADMIN_PASSWD))
-                return true;
+            if ($this->_try_dbadmin_user(DBADMIN_USER, DBADMIN_PASSWD)) {
+                return;
+            }
         }
         // Check if the privileges are enough. Need CREATE and ALTER perms.
         // And on windows: SELECT FROM mysql, possibly: UPDATE mysql.

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8393] trunk/themes/MacOSX/buttons/index.php

From: <var...@us...> - 2012-10-05 13:26:36

Revision: 8393
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8393&view=rev
Author:   vargenau
Date:     2012-10-05 13:26:27 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
Add semi-colon to please "php -l"

Modified Paths:
--------------
    trunk/themes/MacOSX/buttons/index.php

Modified: trunk/themes/MacOSX/buttons/index.php
===================================================================
--- trunk/themes/MacOSX/buttons/index.php	2012-10-05 11:53:09 UTC (rev 8392)
+++ trunk/themes/MacOSX/buttons/index.php	2012-10-05 13:26:27 UTC (rev 8393)
@@ -1 +1,2 @@
-<?php include("../images/index.php")
\ No newline at end of file
+<?php
+include("../images/index.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:[8392] trunk/lib/upgrade.php

From: <var...@us...> - 2012-10-05 11:53:17

Revision: 8392
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8392&view=rev
Author:   vargenau
Date:     2012-10-05 11:53:09 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
Reformat code

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

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2012-10-02 14:59:08 UTC (rev 8391)
+++ trunk/lib/upgrade.php	2012-10-05 11:53:09 UTC (rev 8392)
@@ -42,110 +42,115 @@
  *  5. Check for changed theme variables. (hard, not yet)
  *  6. Convert the single-request upgrade to a class-based multi-page
  *     version. (hard)
-
+ *
  * Done: overwrite=1 link on edit conflicts at first occurence "Overwrite all".
  *
  * @author: Reini Urban
  */
 require_once 'lib/loadsave.php';
 
-class Upgrade {
+class Upgrade
+{
 
-    function Upgrade (&$request) {
-    $this->request =& $request;
-    $this->dbi =& $request->_dbi; // no reference for dbadmin ?
-    $this->phpwiki_version = $this->current_db_version = phpwiki_version();
-    //$this->current_db_version = 1030.13; // should be stored in the db. should be phpwiki_version
+    function Upgrade(&$request)
+    {
+        $this->request =& $request;
+        $this->dbi =& $request->_dbi; // no reference for dbadmin ?
+        $this->phpwiki_version = $this->current_db_version = phpwiki_version();
+        //$this->current_db_version = 1030.13; // should be stored in the db. should be phpwiki_version
 
-    $this->db_version = $this->dbi->get_db_version();
-    $this->isSQL = $this->dbi->_backend->isSQL();
+        $this->db_version = $this->dbi->get_db_version();
+        $this->isSQL = $this->dbi->_backend->isSQL();
     }
 
     /**
      * TODO: check for the pgsrc_version number, not the revision mtime only
      */
-    function doPgsrcUpdate($pagename, $path, $filename) {
-    // don't ever update the HomePage
-    if ((defined(HOME_PAGE) and ($pagename == HOME_PAGE))
-        or ($pagename == _("HomePage"))
-        or ($pagename == "HomePage")) {
-        echo "$path/$pagename: ",_("always skip the HomePage."),
-        _(" Skipped"),".<br />\n";
+    function doPgsrcUpdate($pagename, $path, $filename)
+    {
+        // don't ever update the HomePage
+        if ((defined(HOME_PAGE) and ($pagename == HOME_PAGE))
+            or ($pagename == _("HomePage"))
+            or ($pagename == "HomePage")
+        ) {
+            echo "$path/$pagename: ", _("always skip the HomePage."),
+            _(" Skipped"), ".<br />\n";
             return;
-    }
+        }
 
-    $page = $this->dbi->getPage($pagename);
-    if ($page->exists()) {
-        // check mtime: update automatically if pgsrc is newer
-        $rev = $page->getCurrentRevision();
-        $page_mtime = $rev->get('mtime');
-        $data  = implode("", file($path."/".$filename));
-        if (($parts = ParseMimeifiedPages($data))) {
-        usort($parts, 'SortByPageVersion');
-        reset($parts);
-        $pageinfo = $parts[0];
-        $stat  = stat($path."/".$filename);
-        $new_mtime = 0;
-        if (isset($pageinfo['versiondata']['mtime']))
-            $new_mtime = $pageinfo['versiondata']['mtime'];
-        if (!$new_mtime and isset($pageinfo['versiondata']['lastmodified']))
-            $new_mtime = $pageinfo['versiondata']['lastmodified'];
-        if (!$new_mtime and isset($pageinfo['pagedata']['date']))
-            $new_mtime = $pageinfo['pagedata']['date'];
-        if (!$new_mtime)
-            $new_mtime = $stat[9];
-        if ($new_mtime > $page_mtime) {
-            echo "$path/$pagename: ",_("newer than the existing page."),
-            _(" replace "),"($new_mtime &gt; $page_mtime)","<br />\n";
-            LoadAny($this->request, $path."/".$filename);
+        $page = $this->dbi->getPage($pagename);
+        if ($page->exists()) {
+            // check mtime: update automatically if pgsrc is newer
+            $rev = $page->getCurrentRevision();
+            $page_mtime = $rev->get('mtime');
+            $data = implode("", file($path . "/" . $filename));
+            if (($parts = ParseMimeifiedPages($data))) {
+                usort($parts, 'SortByPageVersion');
+                reset($parts);
+                $pageinfo = $parts[0];
+                $stat = stat($path . "/" . $filename);
+                $new_mtime = 0;
+                if (isset($pageinfo['versiondata']['mtime']))
+                    $new_mtime = $pageinfo['versiondata']['mtime'];
+                if (!$new_mtime and isset($pageinfo['versiondata']['lastmodified']))
+                    $new_mtime = $pageinfo['versiondata']['lastmodified'];
+                if (!$new_mtime and isset($pageinfo['pagedata']['date']))
+                    $new_mtime = $pageinfo['pagedata']['date'];
+                if (!$new_mtime)
+                    $new_mtime = $stat[9];
+                if ($new_mtime > $page_mtime) {
+                    echo "$path/$pagename: ", _("newer than the existing page."),
+                    _(" replace "), "($new_mtime &gt; $page_mtime)", "<br />\n";
+                    LoadAny($this->request, $path . "/" . $filename);
+                    echo "<br />\n";
+                } else {
+                    echo "$path/$pagename: ", _("older than the existing page."),
+                    _(" Skipped"), ".<br />\n";
+                }
+            } else {
+                echo "$path/$pagename: ", _("unknown format."),
+                _(" Skipped"), ".<br />\n";
+            }
+        } else {
+            echo sprintf(_("%s does not exist"), $pagename), "<br />\n";
+            LoadAny($this->request, $path . "/" . $filename);
             echo "<br />\n";
-        } else {
-            echo "$path/$pagename: ",_("older than the existing page."),
-            _(" Skipped"),".<br />\n";
         }
-        } else {
-        echo "$path/$pagename: ",_("unknown format."),
-                    _(" Skipped"),".<br />\n";
-        }
-    } else {
-        echo sprintf(_("%s does not exist"),$pagename),"<br />\n";
-        LoadAny($this->request, $path."/".$filename);
-        echo "<br />\n";
     }
-    }
 
-    function CheckActionPageUpdate() {
-    echo "<h3>",sprintf(_("Check for necessary %s updates"),
-                _("ActionPage")),"</h3>\n";
-    // 1.3.13 before we pull in all missing pages, we rename existing ones
-    $this->_rename_page_helper(_("_AuthInfo"), _("DebugAuthInfo"));
-    // this is in some templates. so we keep the old name
-    //$this->_rename_page_helper($this->dbi, _("DebugInfo"), _("DebugBackendInfo"));
-    $this->_rename_page_helper(_("_GroupInfo"), _("GroupAuthInfo")); //never officially existed
-    $this->_rename_page_helper("InterWikiKarte", "InterWikiListe"); // german only
+    function CheckActionPageUpdate()
+    {
+        echo "<h2>", sprintf(_("Check for necessary %s updates"),
+            _("ActionPage")), "</h2>\n";
+        // 1.3.13 before we pull in all missing pages, we rename existing ones
+        $this->_rename_page_helper(_("_AuthInfo"), _("DebugAuthInfo"));
+        // this is in some templates. so we keep the old name
+        //$this->_rename_page_helper($this->dbi, _("DebugInfo"), _("DebugBackendInfo"));
+        $this->_rename_page_helper(_("_GroupInfo"), _("GroupAuthInfo")); //never officially existed
+        $this->_rename_page_helper("InterWikiKarte", "InterWikiListe"); // german only
 
-    $path = FindFile('pgsrc');
-    $pgsrc = new fileSet($path);
-    // most actionpages have the same name as the plugin
-    $loc_path = FindLocalizedFile('pgsrc');
-    foreach ($pgsrc->getFiles() as $filename) {
-        if (substr($filename,-1,1) == '~') continue;
-        if (substr($filename,-5,5) == '.orig') continue;
-        $pagename = urldecode($filename);
-        if (isActionPage($pagename)) {
-        $translation = gettext($pagename);
-        if ($translation == $pagename)
-            $this->doPgsrcUpdate($pagename, $path, $filename);
-        elseif (FindLocalizedFile('pgsrc/'.urlencode($translation),1))
-            $this->doPgsrcUpdate($translation, $loc_path, urlencode($translation));
-        else
-            $this->doPgsrcUpdate($pagename, $path, $filename);
+        $path = FindFile('pgsrc');
+        $pgsrc = new fileSet($path);
+        // most actionpages have the same name as the plugin
+        $loc_path = FindLocalizedFile('pgsrc');
+        foreach ($pgsrc->getFiles() as $filename) {
+            if (substr($filename, -1, 1) == '~') continue;
+            if (substr($filename, -5, 5) == '.orig') continue;
+            $pagename = urldecode($filename);
+            if (isActionPage($pagename)) {
+                $translation = gettext($pagename);
+                if ($translation == $pagename)
+                    $this->doPgsrcUpdate($pagename, $path, $filename);
+                elseif (FindLocalizedFile('pgsrc/' . urlencode($translation), 1))
+                    $this->doPgsrcUpdate($translation, $loc_path, urlencode($translation)); else
+                    $this->doPgsrcUpdate($pagename, $path, $filename);
+            }
         }
     }
-    }
 
     // see loadsave.php for saving new pages.
-    function CheckPgsrcUpdate() {
+    function CheckPgsrcUpdate()
+    {
         // Check some theme specific pgsrc files (blog, wikilens, fusionforge, custom).
         // We check theme specific pgsrc first in case the page is present in both
         // theme specific and global pgsrc
@@ -155,27 +160,27 @@
         // Notice: Unable to open directory 'themes/MonoBook/pgsrc' for reading
         $pgsrc = new fileSet($path);
         if ($pgsrc->getFiles()) {
-            echo "<h3>",sprintf(_("Check for necessary theme %s updates"),
-                                "pgsrc"),"</h3>\n";
+            echo "<h2>", sprintf(_("Check for necessary theme %s updates"),
+                "pgsrc"), "</h2>\n";
             foreach ($pgsrc->getFiles() as $filename) {
-                if (substr($filename,-1,1) == '~') continue;
-                if (substr($filename,-5,5) == '.orig') continue;
+                if (substr($filename, -1, 1) == '~') continue;
+                if (substr($filename, -5, 5) == '.orig') continue;
                 $pagename = urldecode($filename);
-                $this->doPgsrcUpdate($pagename,$path,$filename);
+                $this->doPgsrcUpdate($pagename, $path, $filename);
             }
         }
 
-        echo "<h3>",sprintf(_("Check for necessary %s updates"),
-                            "pgsrc"),"</h3>\n";
+        echo "<h2>", sprintf(_("Check for necessary %s updates"),
+            "pgsrc"), "</h2>\n";
         if ($this->db_version < 1030.12200612) {
-            echo "<h4>",_("rename to Help: pages"),"</h4>\n";
+            echo "<h4>", _("rename to Help: pages"), "</h4>\n";
         }
         $path = FindLocalizedFile(WIKI_PGSRC);
         $pgsrc = new fileSet($path);
         // fixme: verification, ...
         foreach ($pgsrc->getFiles() as $filename) {
-            if (substr($filename,-1,1) == '~') continue;
-            if (substr($filename,-5,5) == '.orig') continue;
+            if (substr($filename, -1, 1) == '~') continue;
+            if (substr($filename, -5, 5) == '.orig') continue;
             $pagename = urldecode($filename);
             if (!isActionPage($filename)) {
                 // There're a lot of now unneeded pages around.
@@ -183,29 +188,31 @@
                 if ($this->db_version < 1030.12200612) {
                     $this->_rename_to_help_page($pagename);
                 }
-                $this->doPgsrcUpdate($pagename,$path,$filename);
+                $this->doPgsrcUpdate($pagename, $path, $filename);
             }
         }
     }
 
-    function _rename_page_helper($oldname, $pagename) {
-    echo sprintf(_("rename %s to %s"), $oldname, $pagename)," ...";
-    if ($this->dbi->isWikiPage($oldname) and !$this->dbi->isWikiPage($pagename)) {
-        if ($this->dbi->_backend->rename_page($oldname, $pagename))
-        echo _("OK")," <br />\n";
-        else
-        echo " <b><font color=\"red\">", _("FAILED"), "</font></b>",
-            " <br />\n";
-    } else {
-        echo _(" Skipped")," <br />\n";
+    function _rename_page_helper($oldname, $pagename)
+    {
+        echo sprintf(_("rename %s to %s"), $oldname, $pagename), " ...";
+        if ($this->dbi->isWikiPage($oldname) and !$this->dbi->isWikiPage($pagename)) {
+            if ($this->dbi->_backend->rename_page($oldname, $pagename))
+                echo _("OK"), " <br />\n";
+            else
+                echo " <b><font color=\"red\">", _("FAILED"), "</font></b>",
+                " <br />\n";
+        } else {
+            echo _(" Skipped"), " <br />\n";
+        }
     }
-    }
 
-    function _rename_to_help_page($pagename) {
-    $newprefix = _("Help") . "/";
-    if (substr($pagename,0,strlen($newprefix)) != $newprefix) return;
-    $oldname = substr($pagename,strlen($newprefix));
-    $this->_rename_page_helper($oldname, $pagename);
+    function _rename_to_help_page($pagename)
+    {
+        $newprefix = _("Help") . "/";
+        if (substr($pagename, 0, strlen($newprefix)) != $newprefix) return;
+        $oldname = substr($pagename, strlen($newprefix));
+        $this->_rename_page_helper($oldname, $pagename);
     }
 
     /**
@@ -213,26 +220,27 @@
      *       and create it.
      * Supported: mysql and generic SQL, for ADODB and PearDB.
      */
-    function installTable($table, $backend_type) {
-    global $DBParams;
-    if (!$this->isSQL) return;
-    echo _("MISSING")," ... \n";
-    $backend = &$this->dbi->_backend->_dbh;
-    /*
-      $schema = findFile("schemas/${backend_type}.sql");
-      if (!$schema) {
-      echo "  ",_("FAILED"),": ",sprintf(_("no schema %s found"),
-      "schemas/${backend_type}.sql")," ... <br />\n";
-      return false;
-      }
-    */
-    extract($this->dbi->_backend->_table_names);
-    $prefix = isset($DBParams['prefix']) ? $DBParams['prefix'] : '';
-    switch ($table) {
-    case 'session':
-        assert($session_tbl);
-        if ($backend_type == 'mysql') {
-        $this->dbi->genericSqlQuery("
+    function installTable($table, $backend_type)
+    {
+        global $DBParams;
+        if (!$this->isSQL) return;
+        echo _("MISSING"), " ... \n";
+        $backend = &$this->dbi->_backend->_dbh;
+        /*
+          $schema = findFile("schemas/${backend_type}.sql");
+          if (!$schema) {
+          echo "  ",_("FAILED"),": ",sprintf(_("no schema %s found"),
+          "schemas/${backend_type}.sql")," ... <br />\n";
+          return false;
+          }
+        */
+        extract($this->dbi->_backend->_table_names);
+        $prefix = isset($DBParams['prefix']) ? $DBParams['prefix'] : '';
+        switch ($table) {
+            case 'session':
+                assert($session_tbl);
+                if ($backend_type == 'mysql') {
+                    $this->dbi->genericSqlQuery("
 CREATE TABLE $session_tbl (
         sess_id     CHAR(32) NOT NULL DEFAULT '',
         sess_data     BLOB NOT NULL,
@@ -241,63 +249,63 @@
         PRIMARY KEY (sess_id),
     INDEX (sess_date)
 )");
-        } else {
-        $this->dbi->genericSqlQuery("
+                } else {
+                    $this->dbi->genericSqlQuery("
 CREATE TABLE $session_tbl (
     sess_id     CHAR(32) NOT NULL DEFAULT '',
-        sess_data     ".($backend_type == 'pgsql'?'TEXT':'BLOB')." NOT NULL,
+        sess_data     " . ($backend_type == 'pgsql' ? 'TEXT' : 'BLOB') . " NOT NULL,
         sess_date     INT,
         sess_ip     CHAR(15) NOT NULL
 )");
-        $this->dbi->genericSqlQuery("CREATE UNIQUE INDEX sess_id ON $session_tbl (sess_id)");
-        }
-        $this->dbi->genericSqlQuery("CREATE INDEX sess_date on session (sess_date)");
-        echo "  ",_("CREATED");
-        break;
-    case 'pref':
-        $pref_tbl = $prefix.'pref';
-        if ($backend_type == 'mysql') {
-        $this->dbi->genericSqlQuery("
+                    $this->dbi->genericSqlQuery("CREATE UNIQUE INDEX sess_id ON $session_tbl (sess_id)");
+                }
+                $this->dbi->genericSqlQuery("CREATE INDEX sess_date on session (sess_date)");
+                echo "  ", _("CREATED");
+                break;
+            case 'pref':
+                $pref_tbl = $prefix . 'pref';
+                if ($backend_type == 'mysql') {
+                    $this->dbi->genericSqlQuery("
 CREATE TABLE $pref_tbl (
       userid     CHAR(48) BINARY NOT NULL UNIQUE,
       prefs      TEXT NULL DEFAULT '',
       PRIMARY KEY (userid)
 )");
-        } else {
-        $this->dbi->genericSqlQuery("
+                } else {
+                    $this->dbi->genericSqlQuery("
 CREATE TABLE $pref_tbl (
       userid     CHAR(48) NOT NULL,
       prefs      TEXT NULL DEFAULT ''
 )");
-        $this->dbi->genericSqlQuery("CREATE UNIQUE INDEX userid ON $pref_tbl (userid)");
-        }
-        echo "  ",_("CREATED");
-        break;
-    case 'member':
-        $member_tbl = $prefix.'member';
-        if ($backend_type == 'mysql') {
-        $this->dbi->genericSqlQuery("
+                    $this->dbi->genericSqlQuery("CREATE UNIQUE INDEX userid ON $pref_tbl (userid)");
+                }
+                echo "  ", _("CREATED");
+                break;
+            case 'member':
+                $member_tbl = $prefix . 'member';
+                if ($backend_type == 'mysql') {
+                    $this->dbi->genericSqlQuery("
 CREATE TABLE $member_tbl (
     userid    CHAR(48) BINARY NOT NULL,
        groupname CHAR(48) BINARY NOT NULL DEFAULT 'users',
        INDEX (userid),
        INDEX (groupname)
 )");
-        } else {
-        $this->dbi->genericSqlQuery("
+                } else {
+                    $this->dbi->genericSqlQuery("
 CREATE TABLE $member_tbl (
     userid    CHAR(48) NOT NULL,
        groupname CHAR(48) NOT NULL DEFAULT 'users'
 )");
-        $this->dbi->genericSqlQuery("CREATE INDEX userid ON $member_tbl (userid)");
-        $this->dbi->genericSqlQuery("CREATE INDEX groupname ON $member_tbl (groupname)");
-        }
-        echo "  ",_("CREATED");
-        break;
-    case 'rating':
-        $rating_tbl = $prefix.'rating';
-        if ($backend_type == 'mysql') {
-        $this->dbi->genericSqlQuery("
+                    $this->dbi->genericSqlQuery("CREATE INDEX userid ON $member_tbl (userid)");
+                    $this->dbi->genericSqlQuery("CREATE INDEX groupname ON $member_tbl (groupname)");
+                }
+                echo "  ", _("CREATED");
+                break;
+            case 'rating':
+                $rating_tbl = $prefix . 'rating';
+                if ($backend_type == 'mysql') {
+                    $this->dbi->genericSqlQuery("
 CREATE TABLE $rating_tbl (
         dimension INT(4) NOT NULL,
         raterpage INT(11) NOT NULL,
@@ -307,8 +315,8 @@
         tstamp TIMESTAMP(14) NOT NULL,
         PRIMARY KEY (dimension, raterpage, rateepage)
 )");
-        } else {
-        $this->dbi->genericSqlQuery("
+                } else {
+                    $this->dbi->genericSqlQuery("
 CREATE TABLE $rating_tbl (
         dimension INT(4) NOT NULL,
         raterpage INT(11) NOT NULL,
@@ -317,38 +325,38 @@
         rateeversion INT(11) NOT NULL,
         tstamp TIMESTAMP(14) NOT NULL
 )");
-        $this->dbi->genericSqlQuery("CREATE UNIQUE INDEX rating"
-                      ." ON $rating_tbl (dimension, raterpage, rateepage)");
-        }
-        echo "  ",_("CREATED");
-        break;
-    case 'accesslog':
-        $log_tbl = $prefix.'accesslog';
-        // fields according to http://www.outoforder.cc/projects/apache/mod_log_sql/docs-2.0/#id2756178
-        /*
-          A    User Agent agent    varchar(255)    Mozilla/4.0 (compat; MSIE 6.0; Windows)
-          a    CGi request arguments    request_args    varchar(255)    user=Smith&cart=1231&item=532
-          b    Bytes transfered    bytes_sent    int unsigned    32561
-          c???    Text of cookie    cookie    varchar(255)    Apache=sdyn.fooonline.net 1300102700823
-          f    Local filename requested    request_file    varchar(255)    /var/www/html/books-cycroad.html
-          H    HTTP request_protocol    request_protocol    varchar(10)    HTTP/1.1
-          h    Name of remote host    remote_host    varchar(50)    blah.foobar.com
-          I    Request ID (from modd_unique_id)    id    char(19)    POlFcUBRH30AAALdBG8
-          l    Ident user info    remote_logname    varcgar(50)    bobby
-          M    Machine ID???    machine_id    varchar(25)    web01
-          m    HTTP request method    request_method    varchar(10)    GET
-          P    httpd cchild PID    child_pid    smallint unsigned    3215
-          p    http port    server_port    smallint unsigned    80
-          R    Referer    referer    varchar(255)    http://www.biglinks4u.com/linkpage.html
-          r    Request in full form    request_line    varchar(255)    GET /books-cycroad.html HTTP/1.1
-          S    Time of request in UNIX time_t format    time_stamp    int unsigned    1005598029
-          T    Seconds to service request    request_duration    smallint unsigned    2
-          t    Time of request in human format    request_time    char(28)    [02/Dec/2001:15:01:26 -0800]
-          U    Request in simple form    request_uri    varchar(255)    /books-cycroad.html
-          u    User info from HTTP auth    remote_user    varchar(50)    bobby
-          v    Virtual host servicing the request    virtual_host    varchar(255)
-        */
-        $this->dbi->genericSqlQuery("
+                    $this->dbi->genericSqlQuery("CREATE UNIQUE INDEX rating"
+                        . " ON $rating_tbl (dimension, raterpage, rateepage)");
+                }
+                echo "  ", _("CREATED");
+                break;
+            case 'accesslog':
+                $log_tbl = $prefix . 'accesslog';
+                // fields according to http://www.outoforder.cc/projects/apache/mod_log_sql/docs-2.0/#id2756178
+                /*
+                  A    User Agent agent    varchar(255)    Mozilla/4.0 (compat; MSIE 6.0; Windows)
+                  a    CGi request arguments    request_args    varchar(255)    user=Smith&cart=1231&item=532
+                  b    Bytes transfered    bytes_sent    int unsigned    32561
+                  c???    Text of cookie    cookie    varchar(255)    Apache=sdyn.fooonline.net 1300102700823
+                  f    Local filename requested    request_file    varchar(255)    /var/www/html/books-cycroad.html
+                  H    HTTP request_protocol    request_protocol    varchar(10)    HTTP/1.1
+                  h    Name of remote host    remote_host    varchar(50)    blah.foobar.com
+                  I    Request ID (from modd_unique_id)    id    char(19)    POlFcUBRH30AAALdBG8
+                  l    Ident user info    remote_logname    varcgar(50)    bobby
+                  M    Machine ID???    machine_id    varchar(25)    web01
+                  m    HTTP request method    request_method    varchar(10)    GET
+                  P    httpd cchild PID    child_pid    smallint unsigned    3215
+                  p    http port    server_port    smallint unsigned    80
+                  R    Referer    referer    varchar(255)    http://www.biglinks4u.com/linkpage.html
+                  r    Request in full form    request_line    varchar(255)    GET /books-cycroad.html HTTP/1.1
+                  S    Time of request in UNIX time_t format    time_stamp    int unsigned    1005598029
+                  T    Seconds to service request    request_duration    smallint unsigned    2
+                  t    Time of request in human format    request_time    char(28)    [02/Dec/2001:15:01:26 -0800]
+                  U    Request in simple form    request_uri    varchar(255)    /books-cycroad.html
+                  u    User info from HTTP auth    remote_user    varchar(50)    bobby
+                  v    Virtual host servicing the request    virtual_host    varchar(255)
+                */
+                $this->dbi->genericSqlQuery("
 CREATE TABLE $log_tbl (
         time_stamp    int unsigned,
     remote_host   varchar(100),
@@ -364,13 +372,13 @@
     agent         varchar(255),
     request_duration float
 )");
-        $this->dbi->genericSqlQuery("CREATE INDEX log_time ON $log_tbl (time_stamp)");
-        $this->dbi->genericSqlQuery("CREATE INDEX log_host ON $log_tbl (remote_host)");
-        echo "  ",_("CREATED");
-        break;
+                $this->dbi->genericSqlQuery("CREATE INDEX log_time ON $log_tbl (time_stamp)");
+                $this->dbi->genericSqlQuery("CREATE INDEX log_host ON $log_tbl (remote_host)");
+                echo "  ", _("CREATED");
+                break;
+        }
+        echo "<br />\n";
     }
-    echo "<br />\n";
-    }
 
     /**
      * Update from ~1.3.4 to current.
@@ -378,20 +386,21 @@
      * jeffs-hacks database api (around 1.3.2) later:
      *   people should export/import their pages if using that old versions.
      */
-    function CheckDatabaseUpdate() {
-    global $DBAuthParams, $DBParams;
+    function CheckDatabaseUpdate()
+    {
+        global $DBAuthParams, $DBParams;
 
-    echo "<h3>",sprintf(_("Check for necessary %s updates"),
-                _("database")),
-        " - ", DATABASE_TYPE,"</h3>\n";
-    $dbadmin = $this->request->getArg('dbadmin');
-    if ($this->isSQL) {
-        $this->_db_init();
-        if (isset($dbadmin['cancel'])) {
-        echo _("CANCEL")," <br />\n";
-        return;
+        echo "<h2>", sprintf(_("Check for necessary %s updates"),
+            _("database")),
+        " - ", DATABASE_TYPE, "</h2>\n";
+        $dbadmin = $this->request->getArg('dbadmin');
+        if ($this->isSQL) {
+            $this->_db_init();
+            if (isset($dbadmin['cancel'])) {
+                echo _("CANCEL"), " <br />\n";
+                return;
+            }
         }
-    }
         echo "db version: we want ", $this->current_db_version, "\n<br />";
         echo "db version: we have ", $this->db_version, "\n<br />";
         if ($this->db_version >= $this->current_db_version) {
@@ -399,301 +408,300 @@
             return;
         }
 
-    $backend_type = $this->dbi->_backend->backendType();
-    if ($this->isSQL) {
-        echo "<h4>",_("Backend type: "),$backend_type,"</h4>\n";
-        $prefix = isset($DBParams['prefix']) ? $DBParams['prefix'] : '';
-        $tables = $this->dbi->_backend->listOfTables();
-        foreach (explode(':','session:pref:member') as $table) {
-        echo sprintf(_("Check for table %s"), $table)," ...";
-        if (!in_array($prefix.$table, $tables)) {
-            $this->installTable($table, $backend_type);
-        } else {
-            echo _("OK")," <br />\n";
+        $backend_type = $this->dbi->_backend->backendType();
+        if ($this->isSQL) {
+            echo "<h4>", _("Backend type: "), $backend_type, "</h4>\n";
+            $prefix = isset($DBParams['prefix']) ? $DBParams['prefix'] : '';
+            $tables = $this->dbi->_backend->listOfTables();
+            foreach (explode(':', 'session:pref:member') as $table) {
+                echo sprintf(_("Check for table %s"), $table), " ...";
+                if (!in_array($prefix . $table, $tables)) {
+                    $this->installTable($table, $backend_type);
+                } else {
+                    echo _("OK"), " <br />\n";
+                }
+            }
         }
-        }
-    }
 
-    if ($this->phpwiki_version >= 1030.12200612 and $this->db_version < 1030.13) {
-        if ($this->isSQL and preg_match("/(pgsql|postgres)/", $backend_type)) {
-        trigger_error("You need to upgrade to schema/psql-initialize.sql manually!",
-                  E_USER_WARNING);
-            // $this->_upgrade_psql_tsearch2();
+        if ($this->phpwiki_version >= 1030.12200612 and $this->db_version < 1030.13) {
+            if ($this->isSQL and preg_match("/(pgsql|postgres)/", $backend_type)) {
+                trigger_error("You need to upgrade to schema/psql-initialize.sql manually!",
+                    E_USER_WARNING);
+                // $this->_upgrade_psql_tsearch2();
+            }
+            $this->_upgrade_relation_links();
         }
-        $this->_upgrade_relation_links();
-    }
 
-    if (ACCESS_LOG_SQL and $this->isSQL) {
-        $table = "accesslog";
-        echo sprintf(_("Check for table %s"), $table)," ...";
-        if (!in_array($prefix.$table, $tables)) {
-        $this->installTable($table, $backend_type);
-        } else {
-        echo _("OK")," <br />\n";
+        if (ACCESS_LOG_SQL and $this->isSQL) {
+            $table = "accesslog";
+            echo sprintf(_("Check for table %s"), $table), " ...";
+            if (!in_array($prefix . $table, $tables)) {
+                $this->installTable($table, $backend_type);
+            } else {
+                echo _("OK"), " <br />\n";
+            }
         }
-    }
-    if ($this->isSQL and (class_exists("RatingsUserFactory") or $this->dbi->isWikiPage(_("RateIt")))) {
-        $table = "rating";
-        echo sprintf(_("Check for table %s"), $table)," ...";
-        if (!in_array($prefix.$table, $tables)) {
-        $this->installTable($table, $backend_type);
-        } else {
-        echo _("OK")," <br />\n";
+        if ($this->isSQL and (class_exists("RatingsUserFactory") or $this->dbi->isWikiPage(_("RateIt")))) {
+            $table = "rating";
+            echo sprintf(_("Check for table %s"), $table), " ...";
+            if (!in_array($prefix . $table, $tables)) {
+                $this->installTable($table, $backend_type);
+            } else {
+                echo _("OK"), " <br />\n";
+            }
         }
-    }
-    $backend = &$this->dbi->_backend->_dbh;
-    if ($this->isSQL)
-        extract($this->dbi->_backend->_table_names);
+        $backend = &$this->dbi->_backend->_dbh;
+        if ($this->isSQL)
+            extract($this->dbi->_backend->_table_names);
 
-    // 1.3.8 added session.sess_ip
-    if ($this->isSQL and $this->phpwiki_version >= 1030.08 and USE_DB_SESSION
-        and isset($this->request->_dbsession))
-    {
-        echo _("Check for new session.sess_ip column")," ... ";
-        $database = $this->dbi->_backend->database();
-        assert(!empty($DBParams['db_session_table']));
-        $session_tbl = $prefix . $DBParams['db_session_table'];
-        $sess_fields = $this->dbi->_backend->listOfFields($database, $session_tbl);
-        if (!$sess_fields) {
-        echo _("SKIP");
-        } elseif (!strstr(strtolower(join(':', $sess_fields)), "sess_ip")) {
-        // TODO: postgres test (should be able to add columns at the end, but not in between)
-        echo "<b>",_("ADDING"),"</b>"," ... ";
-        $this->dbi->genericSqlQuery("ALTER TABLE $session_tbl ADD sess_ip CHAR(15) NOT NULL");
-        $this->dbi->genericSqlQuery("CREATE INDEX sess_date ON $session_tbl (sess_date)");
-        } else {
-        echo _("OK");
-        }
-        echo "<br />\n";
-        if (substr($backend_type,0,5) == 'mysql') {
-        // upgrade to 4.1.8 destroyed my session table:
-        // sess_id => varchar(10), sess_data => varchar(5). For others obviously also.
-        echo _("Check for mysql session.sess_id sanity")," ... ";
-        $result = $this->dbi->genericSqlQuery("DESCRIBE $session_tbl");
-        if (DATABASE_TYPE == 'SQL') {
-            $iter = new WikiDB_backend_PearDB_generic_iter($backend, $result);
-        } elseif (DATABASE_TYPE == 'ADODB') {
-            $iter = new WikiDB_backend_ADODB_generic_iter($backend, $result,
-                                  array("Field", "Type", "Null", "Key", "Default", "Extra"));
-        } elseif (DATABASE_TYPE == 'PDO') {
-            $iter = new WikiDB_backend_PDO_generic_iter($backend, $result);
-        }
-        while ($col = $iter->next()) {
-            if ($col["Field"] == 'sess_id' and !strstr(strtolower($col["Type"]), 'char(32)')) {
-            $this->dbi->genericSqlQuery("ALTER TABLE $session_tbl CHANGE sess_id"
-                          ." sess_id CHAR(32) NOT NULL");
-            echo "sess_id ", $col["Type"], " ", _("fixed"), " =&gt; CHAR(32) ";
+        // 1.3.8 added session.sess_ip
+        if ($this->isSQL and $this->phpwiki_version >= 1030.08 and USE_DB_SESSION
+            and isset($this->request->_dbsession)
+        ) {
+            echo _("Check for new session.sess_ip column"), " ... ";
+            $database = $this->dbi->_backend->database();
+            assert(!empty($DBParams['db_session_table']));
+            $session_tbl = $prefix . $DBParams['db_session_table'];
+            $sess_fields = $this->dbi->_backend->listOfFields($database, $session_tbl);
+            if (!$sess_fields) {
+                echo _("SKIP");
+            } elseif (!strstr(strtolower(join(':', $sess_fields)), "sess_ip")) {
+                // TODO: postgres test (should be able to add columns at the end, but not in between)
+                echo "<b>", _("ADDING"), "</b>", " ... ";
+                $this->dbi->genericSqlQuery("ALTER TABLE $session_tbl ADD sess_ip CHAR(15) NOT NULL");
+                $this->dbi->genericSqlQuery("CREATE INDEX sess_date ON $session_tbl (sess_date)");
+            } else {
+                echo _("OK");
             }
-            if ($col["Field"] == 'sess_ip' and !strstr(strtolower($col["Type"]), 'char(15)')) {
-            $this->dbi->genericSqlQuery("ALTER TABLE $session_tbl CHANGE sess_ip"
-                          ." sess_ip CHAR(15) NOT NULL");
-            echo "sess_ip ", $col["Type"], " ", _("fixed"), " =&gt; CHAR(15) ";
+            echo "<br />\n";
+            if (substr($backend_type, 0, 5) == 'mysql') {
+                // upgrade to 4.1.8 destroyed my session table:
+                // sess_id => varchar(10), sess_data => varchar(5). For others obviously also.
+                echo _("Check for mysql session.sess_id sanity"), " ... ";
+                $result = $this->dbi->genericSqlQuery("DESCRIBE $session_tbl");
+                if (DATABASE_TYPE == 'SQL') {
+                    $iter = new WikiDB_backend_PearDB_generic_iter($backend, $result);
+                } elseif (DATABASE_TYPE == 'ADODB') {
+                    $iter = new WikiDB_backend_ADODB_generic_iter($backend, $result,
+                        array("Field", "Type", "Null", "Key", "Default", "Extra"));
+                } elseif (DATABASE_TYPE == 'PDO') {
+                    $iter = new WikiDB_backend_PDO_generic_iter($backend, $result);
+                }
+                while ($col = $iter->next()) {
+                    if ($col["Field"] == 'sess_id' and !strstr(strtolower($col["Type"]), 'char(32)')) {
+                        $this->dbi->genericSqlQuery("ALTER TABLE $session_tbl CHANGE sess_id"
+                            . " sess_id CHAR(32) NOT NULL");
+                        echo "sess_id ", $col["Type"], " ", _("fixed"), " =&gt; CHAR(32) ";
+                    }
+                    if ($col["Field"] == 'sess_ip' and !strstr(strtolower($col["Type"]), 'char(15)')) {
+                        $this->dbi->genericSqlQuery("ALTER TABLE $session_tbl CHANGE sess_ip"
+                            . " sess_ip CHAR(15) NOT NULL");
+                        echo "sess_ip ", $col["Type"], " ", _("fixed"), " =&gt; CHAR(15) ";
+                    }
+                }
+                echo _("OK"), "<br />\n";
             }
         }
-        echo _("OK"), "<br />\n";
-        }
-    }
 
-    /* TODO:
-       ALTER TABLE link ADD relation INT DEFAULT 0;
-       CREATE INDEX linkrelation ON link (relation);
-    */
+        /* TODO:
+           ALTER TABLE link ADD relation INT DEFAULT 0;
+           CREATE INDEX linkrelation ON link (relation);
+        */
 
-    // mysql >= 4.0.4 requires LOCK TABLE privileges
-    if (substr($backend_type,0,5) == 'mysql') {
-        echo _("Check for mysql LOCK TABLE privilege")," ...";
-        $mysql_version = $this->dbi->_backend->_serverinfo['version'];
-        if ($mysql_version > 400.40) {
-        if (!empty($this->dbi->_backend->_parsedDSN))
-            $parseDSN = $this->dbi->_backend->_parsedDSN;
-        elseif (function_exists('parseDSN')) // ADODB or PDO
-            $parseDSN = parseDSN($DBParams['dsn']);
-        else                  // pear
-            $parseDSN = DB::parseDSN($DBParams['dsn']);
-        $username = $this->dbi->_backend->qstr($parseDSN['username']);
-        // on db level
-        $query = "SELECT lock_tables_priv FROM mysql.db WHERE user='$username'";
-        //mysql_select_db("mysql", $this->dbi->_backend->connection());
-        $db_fields = $this->dbi->_backend->listOfFields("mysql", "db");
-        if (!strstr(strtolower(join(':', $db_fields)), "lock_tables_priv")) {
-            echo join(':', $db_fields);
-            die("lock_tables_priv missing. The DB Admin must run mysql_fix_privilege_tables");
-        }
-        $row = $this->dbi->_backend->getRow($query);
-        if (isset($row[0]) and $row[0] == 'N') {
-            $this->dbi->genericSqlQuery("UPDATE mysql.db SET lock_tables_priv='Y'"
-                      ." WHERE mysql.user='$username'");
-            $this->dbi->genericSqlQuery("FLUSH PRIVILEGES");
-            echo "mysql.db user='$username'", _("fixed"), "<br />\n";
-        } elseif (!$row) {
-            // or on user level
-            $query = "SELECT lock_tables_priv FROM mysql.user WHERE user='$username'";
-            $row = $this->dbi->_backend->getRow($query);
-            if ($row and $row[0] == 'N') {
-            $this->dbi->genericSqlQuery("UPDATE mysql.user SET lock_tables_priv='Y'"
-                          ." WHERE mysql.user='$username'");
-            $this->dbi->genericSqlQuery("FLUSH PRIVILEGES");
-            echo "mysql.user user='$username'", _("fixed"), "<br />\n";
-            } elseif (!$row) {
-            echo " <b><font color=\"red\">", _("FAILED"), "</font></b>: ",
-                "Neither mysql.db nor mysql.user has a user='$username'"
-                ." or the lock_tables_priv field",
-                "<br />\n";
+        // mysql >= 4.0.4 requires LOCK TABLE privileges
+        if (substr($backend_type, 0, 5) == 'mysql') {
+            echo _("Check for mysql LOCK TABLE privilege"), " ...";
+            $mysql_version = $this->dbi->_backend->_serverinfo['version'];
+            if ($mysql_version > 400.40) {
+                if (!empty($this->dbi->_backend->_parsedDSN))
+                    $parseDSN = $this->dbi->_backend->_parsedDSN;
+                elseif (function_exists('parseDSN')) // ADODB or PDO
+                    $parseDSN = parseDSN($DBParams['dsn']); else // pear
+                    $parseDSN = DB::parseDSN($DBParams['dsn']);
+                $username = $this->dbi->_backend->qstr($parseDSN['username']);
+                // on db level
+                $query = "SELECT lock_tables_priv FROM mysql.db WHERE user='$username'";
+                //mysql_select_db("mysql", $this->dbi->_backend->connection());
+                $db_fields = $this->dbi->_backend->listOfFields("mysql", "db");
+                if (!strstr(strtolower(join(':', $db_fields)), "lock_tables_priv")) {
+                    echo join(':', $db_fields);
+                    die("lock_tables_priv missing. The DB Admin must run mysql_fix_privilege_tables");
+                }
+                $row = $this->dbi->_backend->getRow($query);
+                if (isset($row[0]) and $row[0] == 'N') {
+                    $this->dbi->genericSqlQuery("UPDATE mysql.db SET lock_tables_priv='Y'"
+                        . " WHERE mysql.user='$username'");
+                    $this->dbi->genericSqlQuery("FLUSH PRIVILEGES");
+                    echo "mysql.db user='$username'", _("fixed"), "<br />\n";
+                } elseif (!$row) {
+                    // or on user level
+                    $query = "SELECT lock_tables_priv FROM mysql.user WHERE user='$username'";
+                    $row = $this->dbi->_backend->getRow($query);
+                    if ($row and $row[0] == 'N') {
+                        $this->dbi->genericSqlQuery("UPDATE mysql.user SET lock_tables_priv='Y'"
+                            . " WHERE mysql.user='$username'");
+                        $this->dbi->genericSqlQuery("FLUSH PRIVILEGES");
+                        echo "mysql.user user='$username'", _("fixed"), "<br />\n";
+                    } elseif (!$row) {
+                        echo " <b><font color=\"red\">", _("FAILED"), "</font></b>: ",
+                            "Neither mysql.db nor mysql.user has a user='$username'"
+                            . " or the lock_tables_priv field",
+                        "<br />\n";
+                    } else {
+                        echo _("OK"), "<br />\n";
+                    }
+                } else {
+                    echo _("OK"), "<br />\n";
+                }
+                //mysql_select_db($this->dbi->_backend->database(), $this->dbi->_backend->connection());
             } else {
-            echo _("OK"), "<br />\n";
+                echo sprintf(_("version <em>%s</em> not affected"), $mysql_version), "<br />\n";
             }
-        } else {
-            echo _("OK"), "<br />\n";
         }
-        //mysql_select_db($this->dbi->_backend->database(), $this->dbi->_backend->connection());
-        } else {
-        echo sprintf(_("version <em>%s</em> not affected"), $mysql_version),"<br />\n";
-        }
-    }
 
-    // 1.3.10 mysql requires page.id auto_increment
-    // mysql, mysqli or mysqlt
-    if ($this->phpwiki_version >= 1030.099 and substr($backend_type,0,5) == 'mysql'
-        and DATABASE_TYPE != 'PDO')
-        {
-        echo _("Check for mysql page.id auto_increment flag")," ...";
-        assert(!empty($page_tbl));
-        $database = $this->dbi->_backend->database();
-        $fields = mysql_list_fields($database, $page_tbl, $this->dbi->_backend->connection());
-        $columns = mysql_num_fields($fields);
-        for ($i = 0; $i < $columns; $i++) {
-        if (mysql_field_name($fields, $i) == 'id') {
-            $flags = mysql_field_flags($fields, $i);
-            //DONE: something was wrong with ADODB here.
-            if (!strstr(strtolower($flags), "auto_increment")) {
-            echo "<b>",_("ADDING"),"</b>"," ... ";
-            // MODIFY col_def valid since mysql 3.22.16,
-            // older mysql's need CHANGE old_col col_def
-            $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE id"
-                            ." id INT NOT NULL AUTO_INCREMENT");
-            $fields = mysql_list_fields($database, $page_tbl);
-            if (!strstr(strtolower(mysql_field_flags($fields, $i)), "auto_increment"))
-                echo " <b><font color=\"red\">", _("FAILED"), "</font></b><br />\n";
-            else
-                echo _("OK"), "<br />\n";
-            } else {
-            echo _("OK"), "<br />\n";
+        // 1.3.10 mysql requires page.id auto_increment
+        // mysql, mysqli or mysqlt
+        if ($this->phpwiki_version >= 1030.099 and substr($backend_type, 0, 5) == 'mysql'
+            and DATABASE_TYPE != 'PDO'
+        ) {
+            echo _("Check for mysql page.id auto_increment flag"), " ...";
+            assert(!empty($page_tbl));
+            $database = $this->dbi->_backend->database();
+            $fields = mysql_list_fields($database, $page_tbl, $this->dbi->_backend->connection());
+            $columns = mysql_num_fields($fields);
+            for ($i = 0; $i < $columns; $i++) {
+                if (mysql_field_name($fields, $i) == 'id') {
+                    $flags = mysql_field_flags($fields, $i);
+                    //DONE: something was wrong with ADODB here.
+                    if (!strstr(strtolower($flags), "auto_increment")) {
+                        echo "<b>", _("ADDING"), "</b>", " ... ";
+                        // MODIFY col_def valid since mysql 3.22.16,
+                        // older mysql's need CHANGE old_col col_def
+                        $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE id"
+                            . " id INT NOT NULL AUTO_INCREMENT");
+                        $fields = mysql_list_fields($database, $page_tbl);
+                        if (!strstr(strtolower(mysql_field_flags($fields, $i)), "auto_increment"))
+                            echo " <b><font color=\"red\">", _("FAILED"), "</font></b><br />\n";
+                        else
+                            echo _("OK"), "<br />\n";
+                    } else {
+                        echo _("OK"), "<br />\n";
+                    }
+                    break;
+                }
             }
-            break;
+            mysql_free_result($fields);
         }
-        }
-        mysql_free_result($fields);
-    }
 
-    // Check for mysql 4.1.x/5.0.0a binary search problem.
-    //   http://bugs.mysql.com/bug.php?id=4398
-    // "select * from page where LOWER(pagename) like '%search%'" does not apply LOWER!
-    // Confirmed for 4.1.0alpha,4.1.3-beta,5.0.0a; not yet tested for 4.1.2alpha,
-    // On windows only, though utf8 would be useful elsewhere also.
-    // Illegal mix of collations (latin1_bin,IMPLICIT) and
-    // (utf8_general_ci, COERCIBLE) for operation '='])
-    if (isWindows() and substr($backend_type,0,5) == 'mysql') {
-        echo _("Check for mysql 4.1.x/5.0.0 binary search on windows problem")," ...";
-        $mysql_version = $this->dbi->_backend->_serverinfo['version'];
-        if ($mysql_version < 401.0) {
-        echo sprintf(_("version <em>%s</em>"), $mysql_version)," ",
-            _("not affected"),"<br />\n";
-        } elseif ($mysql_version >= 401.6) { // FIXME: since which version?
-        $row = $this->dbi->_backend->getRow("SHOW CREATE TABLE $page_tbl");
-        $result = join(" ", $row);
-        if (strstr(strtolower($result), "character set")
-            and strstr(strtolower($result), "collate"))
-            {
-            echo _("OK"), "<br />\n";
-            } else {
-            //SET CHARACTER SET latin1
-            $charset = CHARSET;
-            if ($charset == 'iso-8859-1') $charset = 'latin1';
-            $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE pagename "
-                      ."pagename VARCHAR(100) "
-                      ."CHARACTER SET '$charset' COLLATE '$charset"."_bin' NOT NULL");
-            echo sprintf(_("version <em>%s</em>"), $mysql_version),
-            " <b>",_("FIXED"),"</b>",
-            "<br />\n";
-        }
-        } elseif (DATABASE_TYPE != 'PDO') {
-        // check if already fixed
-        extract($this->dbi->_backend->_table_names);
-        assert(!empty($page_tbl));
-        $database = $this->dbi->_backend->database();
-        $fields = mysql_list_fields($database, $page_tbl, $this->dbi->_backend->connection());
-        $columns = mysql_num_fields($fields);
-        for ($i = 0; $i < $columns; $i++) {
-            if (mysql_field_name($fields, $i) == 'pagename') {
-            $flags = mysql_field_flags($fields, $i);
-            // I think it was fixed with 4.1.6, but I tested it only with 4.1.8
-            if ($mysql_version > 401.0 and $mysql_version < 401.6) {
-                // remove the binary flag
-                if (strstr(strtolower($flags), "binary")) {
-                // FIXME: on duplicate pagenames this will fail!
-                $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE pagename"
-                              ." pagename VARCHAR(100) NOT NULL");
-                echo sprintf(_("version <em>%s</em>"), $mysql_version),
-                    "<b>",_("FIXED"),"</b>"
-                    ,"<br />\n";
+        // Check for mysql 4.1.x/5.0.0a binary search problem.
+        //   http://bugs.mysql.com/bug.php?id=4398
+        // "select * from page where LOWER(pagename) like '%search%'" does not apply LOWER!
+        // Confirmed for 4.1.0alpha,4.1.3-beta,5.0.0a; not yet tested for 4.1.2alpha,
+        // On windows only, though utf8 would be useful elsewhere also.
+        // Illegal mix of collations (latin1_bin,IMPLICIT) and
+        // (utf8_general_ci, COERCIBLE) for operation '='])
+        if (isWindows() and substr($backend_type, 0, 5) == 'mysql') {
+            echo _("Check for mysql 4.1.x/5.0.0 binary search on windows problem"), " ...";
+            $mysql_version = $this->dbi->_backend->_serverinfo['version'];
+            if ($mysql_version < 401.0) {
+                echo sprintf(_("version <em>%s</em>"), $mysql_version), " ",
+                _("not affected"), "<br />\n";
+            } elseif ($mysql_version >= 401.6) { // FIXME: since which version?
+                $row = $this->dbi->_backend->getRow("SHOW CREATE TABLE $page_tbl");
+                $result = join(" ", $row);
+                if (strstr(strtolower($result), "character set")
+                    and strstr(strtolower($result), "collate")
+                ) {
+                    echo _("OK"), "<br />\n";
+                } else {
+                    //SET CHARACTER SET latin1
+                    $charset = CHARSET;
+                    if ($charset == 'iso-8859-1') $charset = 'latin1';
+                    $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE pagename "
+                        . "pagename VARCHAR(100) "
+                        . "CHARACTER SET '$charset' COLLATE '$charset" . "_bin' NOT NULL");
+                    echo sprintf(_("version <em>%s</em>"), $mysql_version),
+                    " <b>", _("FIXED"), "</b>",
+                    "<br />\n";
                 }
+            } elseif (DATABASE_TYPE != 'PDO') {
+                // check if already fixed
+                extract($this->dbi->_backend->_table_names);
+                assert(!empty($page_tbl));
+                $database = $this->dbi->_backend->database();
+                $fields = mysql_list_fields($database, $page_tbl, $this->dbi->_backend->connection());
+                $columns = mysql_num_fields($fields);
+                for ($i = 0; $i < $columns; $i++) {
+                    if (mysql_field_name($fields, $i) == 'pagename') {
+                        $flags = mysql_field_flags($fields, $i);
+                        // I think it was fixed with 4.1.6, but I tested it only with 4.1.8
+                        if ($mysql_version > 401.0 and $mysql_version < 401.6) {
+                            // remove the binary flag
+                            if (strstr(strtolower($flags), "binary")) {
+                                // FIXME: on duplicate pagenames this will fail!
+                                $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE pagename"
+                                    . " pagename VARCHAR(100) NOT NULL");
+                                echo sprintf(_("version <em>%s</em>"), $mysql_version),
+                                "<b>", _("FIXED"), "</b>"
+                                , "<br />\n";
+                            }
+                        }
+                        break;
+                    }
+                }
             }
-            break;
+        }
+        if ($this->isSQL and ACCESS_LOG_SQL & 2) {
+            echo _("Check for ACCESS_LOG_SQL passwords in POST requests"), " ...";
+            // Don't display passwords in POST requests (up to 2005-02-04 12:03:20)
+            $res = $this->dbi->genericSqlIter("SELECT time_stamp, remote_host, " .
+                "request_args FROM ${prefix}accesslog WHERE request_args LIKE " .
+                "'%s:6:\"passwd\"%' AND request_args NOT LIKE '%s:6:\"passwd\";" .
+                "s:15:\"<not displayed>\"%'");
+            $count = 0;
+            while ($row = $res->next()) {
+                $args = preg_replace("/(s:6:\"passwd\";s:15:\").*(\")/",
+                    "$1<not displayed>$2", $row["request_args"]);
+                $ts = $row["time_stamp"];
+                $rh = $row["remote_host"];
+                $this->dbi->genericSqlQuery("UPDATE ${prefix}accesslog SET " .
+                    "request_args='$args' WHERE time_stamp=$ts AND " .
+                    "remote_host='$rh'");
+                $count++;
             }
-        }
-        }
-    }
-    if ($this->isSQL and ACCESS_LOG_SQL & 2) {
-        echo _("Check for ACCESS_LOG_SQL passwords in POST requests")," ...";
-        // Don't display passwords in POST requests (up to 2005-02-04 12:03:20)
-        $res = $this->dbi->genericSqlIter("SELECT time_stamp, remote_host, " .
-                    "request_args FROM ${prefix}accesslog WHERE request_args LIKE " .
-                    "'%s:6:\"passwd\"%' AND request_args NOT LIKE '%s:6:\"passwd\";" .
-                    "s:15:\"<not displayed>\"%'");
-        $count = 0;
-        while ($row = $res->next()) {
-        $args = preg_replace("/(s:6:\"passwd\";s:15:\").*(\")/",
-                     "$1<not displayed>$2", $row["request_args"]);
-        $ts = $row["time_stamp"];
-        $rh = $row["remote_host"];
-        $this->dbi->genericSqlQuery("UPDATE ${prefix}accesslog SET " .
-                      "request_args='$args' WHERE time_stamp=$ts AND " .
-                      "remote_host='$rh'");
-        $count++;
-        }
-        if ($count > 0)
-        echo "<b>",_("FIXED"),"</b>", "<br />\n";
-        else
-        echo _("OK"),"<br />\n";
+            if ($count > 0)
+                echo "<b>", _("FIXED"), "</b>", "<br />\n";
+            else
+                echo _("OK"), "<br />\n";
 
-        if ($this->phpwiki_version >= 1030.13) {
-        echo _("Check for ACCESS_LOG_SQL remote_host varchar(50)")," ...";
-        $database = $this->dbi->_backend->database();
-        $accesslog_tbl = $prefix . 'accesslog';
-        $fields = $this->dbi->_backend->listOfFields($database, $accesslog_tbl);
-        if (!$fields) {
-            echo _("SKIP");
-        } elseif (strstr(strtolower(join(':', $sess_fields)), "remote_host")) {
-            // TODO: how to check size, already done?
-            echo "<b>",_("FIXING"),"remote_host</b>"," ... ";
-            $this->dbi->genericSqlQuery("ALTER TABLE $accesslog_tbl CHANGE remote_host VARCHAR(100)");
-        } else {
-            echo _("FAILED");
+            if ($this->phpwiki_version >= 1030.13) {
+                echo _("Check for ACCESS_LOG_SQL remote_host varchar(50)"), " ...";
+                $database = $this->dbi->_backend->database();
+                $accesslog_tbl = $prefix . 'accesslog';
+                $fields = $this->dbi->_backend->listOfFields($database, $accesslog_tbl);
+                if (!$fields) {
+                    echo _("SKIP");
+                } elseif (strstr(strtolower(join(':', $sess_fields)), "remote_host")) {
+                    // TODO: how to check size, already done?
+                    echo "<b>", _("FIXING"), "remote_host</b>", " ... ";
+                    $this->dbi->genericSqlQuery("ALTER TABLE $accesslog_tbl CHANGE remote_host VARCHAR(100)");
+                } else {
+                    echo _("FAILED");
+                }
+                echo "<br />\n";
+            }
         }
-        echo "<br />\n";
-        }
-    }
-    $this->_upgrade_cached_html();
+        $this->_upgrade_cached_html();
 
-    if ($this->db_version < $this->current_db_version) {
-        $this->dbi->set_db_version($this->current_db_version);
-        $this->db_version = $this->dbi->get_db_version();
-            echo "db version: upgrade to ", $this->db_version,"  ";
+        if ($this->db_version < $this->current_db_version) {
+            $this->dbi->set_db_version($this->current_db_version);
+            $this->db_version = $this->dbi->get_db_version();
+            echo "db version: upgrade to ", $this->db_version, "  ";
             echo _("OK"), "<br />\n";
             flush();
-    }
+        }
 
-    return;
+        return;
     }
 
     /**
@@ -703,100 +711,103 @@
      * @see _is_false_error, ErrorManager
      * @access private
      */
-    function _dbpermission_filter($err) {
-    if  ( $err->isWarning() ) {
-        global $ErrorManager;
-        $this->error_caught = 1;
-        $ErrorManager->_postponed_errors[] = $err;
-        return true;
+    function _dbpermission_filter($err)
+    {
+        if ($err->isWarning()) {
+            global $ErrorManager;
+            $this->error_caught = 1;
+            $ErrorManager->_postponed_errors[] = $err;
+            return true;
+        }
+        return false;
     }
-    return false;
-    }
 
-    function _try_dbadmin_user ($user, $passwd) {
-    global $DBParams, $DBAuthParams;
-    $AdminParams = $DBParams;
-    if (DATABASE_TYPE == 'SQL')
-        $dsn = DB::parseDSN($AdminParams['dsn']);
-    else {
-        $dsn = parseDSN($AdminParams['dsn']);
+    function _try_dbadmin_user($user, $passwd)
+    {
+        global $DBParams, $DBAuthParams;
+        $AdminParams = $DBParams;
+        if (DATABASE_TYPE == 'SQL')
+            $dsn = DB::parseDSN($AdminParams['dsn']);
+        else {
+            $dsn = parseDSN($AdminParams['dsn']);
+        }
+        $AdminParams['dsn'] = sprintf("%s://%s:%s@%s/%s",
+            $dsn['phptype'],
+            $user,
+            $passwd,
+            $dsn['hostspec'],
+            $dsn['database']);
+        $AdminParams['_tryroot_from_upgrade'] = 1;
+        // add error handler to warn about missing permissions for DBADMIN_USER
+        global $ErrorManager;
+        $ErrorManager->pushErrorHandler(new WikiMethodCb($this, '_dbpermission_filter'));
+        $this->error_caught = 0;
+        $this->dbi = WikiDB::open($AdminParams);
+        if (!$this->error_caught) return true;
+        // FAILED: redo our connection with the wikiuser
+        $this->dbi = WikiDB::open($DBParams);
+        $ErrorManager->flushPostponedErrors();
+        $ErrorManager->popErrorHandler();
+        return false;
     }
-    $AdminParams['dsn'] = sprintf("%s://%s:%s@%s/%s",
-                      $dsn['phptype'],
-                      $user,
-                      $passwd,
-                      $dsn['hostspec'],
-                      $dsn['database']);
-    $AdminParams['_tryroot_from_upgrade'] = 1;
-    // add error handler to warn about missing permissions for DBADMIN_USER
-    global $ErrorManager;
-    $ErrorManager->pushErrorHandler(new WikiMethodCb($this, '_dbpermission_filter'));
-    $this->error_caught = 0;
-    $this->dbi = WikiDB::open($AdminParams);
-    if (!$this->error_caught) return true;
-    // FAILED: redo our connection with the wikiuser
-    $this->dbi = WikiDB::open($DBParams);
-    $ErrorManager->flushPostponedErrors();
-    $ErrorManager->popErrorHandler();
-    return false;
-    }
 
-    function _db_init () {
-    if (!$this->isSQL) return;
+    function _db_init()
+    {
+        if (!$this->isSQL) return;
 
-    /* SQLite never needs admin params */
-    $backend_type = $this->dbi->_backend->backendType();
-    if (substr($backend_type,0,6)=="sqlite") {
-        return;
-    }
-    $dbadmin_user = 'root';
-    if ($dbadmin = $this->request->getArg('dbadmin')) {
-        $dbadmin_user = $dbadmin['user'];
-        if (isset($dbadmin['cancel'])) {
-        return;
-        } elseif (!empty($dbadmin_user)) {
-        if ($this->_try_dbadmin_user($dbadmin['user'], $dbadmin['passwd']))
+        /* SQLite never needs admin params */
+        $backend_type = $this->dbi->_backend->backendType();
+        if (substr($backend_type, 0, 6) == "sqlite") {
             return;
         }
-    } elseif (DBADMIN_USER) {
-        if ($this->_try_dbadmin_user(DBADMIN_USER, DBADMIN_PASSWD))
-        return true;
+        $dbadmin_user = 'root';
+        if ($dbadmin = $this->request->getArg('dbadmin')) {
+            $dbadmin_user = $dbadmin['user'];
+            if (isset($dbadmin['cancel'])) {
+                return;
+            } elseif (!empty($dbadmin_user)) {
+                if ($this->_try_dbadmin_user($dbadmin['user'], $dbadmin['passwd']))
+                    return;
+            }
+        } elseif (DBADMIN_USER) {
+            if ($this->_try_dbadmin_user(DBADMIN_USER, DBADMIN_PASSWD))
+                return true;
+        }
+        // Check if the privileges are enough. Need CREATE and ALTER perms.
+        // And on windows: SELECT FROM mysql, possibly: UPDATE mysql.
+        $form = HTML::form(array("method" => "post",
+                "action" => $this->request->getPostURL(),
+                "accept-charset" => $GLOBALS['charset']),
+            HTML::p(_("Upgrade requir...
 
[truncated message content]

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

From: <var...@us...> - 2012-10-02 14:59:18

Revision: 8391
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8391&view=rev
Author:   vargenau
Date:     2012-10-02 14:59:08 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
Remove svn:keywords

Modified Paths:
--------------
    trunk/admin/.htaccess
    trunk/config/.htaccess
    trunk/lib/.htaccess
    trunk/locale/.htaccess
    trunk/locale/ja/pgsrc/.htaccess
    trunk/pgsrc/.htaccess
    trunk/schemas/.htaccess
    trunk/tests/.htaccess

Property Changed:
----------------
    trunk/admin/.htaccess
    trunk/config/.htaccess
    trunk/lib/.htaccess
    trunk/locale/.htaccess
    trunk/locale/ja/pgsrc/.htaccess
    trunk/pgsrc/.htaccess
    trunk/schemas/.htaccess
    trunk/tests/.htaccess
    trunk/themes/wikilens/pgsrc/LeftbarContent

Modified: trunk/admin/.htaccess
===================================================================
--- trunk/admin/.htaccess	2012-10-02 14:46:33 UTC (rev 8390)
+++ trunk/admin/.htaccess	2012-10-02 14:59:08 UTC (rev 8391)
@@ -1,3 +1,2 @@
-# $Id$
 order allow,deny
 Deny from all


Property changes on: trunk/admin/.htaccess
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: trunk/config/.htaccess
===================================================================
--- trunk/config/.htaccess	2012-10-02 14:46:33 UTC (rev 8390)
+++ trunk/config/.htaccess	2012-10-02 14:59:08 UTC (rev 8391)
@@ -1,3 +1,2 @@
-# $Id$
 order allow,deny
 Deny from all


Property changes on: trunk/config/.htaccess
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: trunk/lib/.htaccess
===================================================================
--- trunk/lib/.htaccess	2012-10-02 14:46:33 UTC (rev 8390)
+++ trunk/lib/.htaccess	2012-10-02 14:59:08 UTC (rev 8391)
@@ -1,3 +1,2 @@
-# $Id$
 order allow,deny
 Deny from all


Property changes on: trunk/lib/.htaccess
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: trunk/locale/.htaccess
===================================================================
--- trunk/locale/.htaccess	2012-10-02 14:46:33 UTC (rev 8390)
+++ trunk/locale/.htaccess	2012-10-02 14:59:08 UTC (rev 8391)
@@ -1,3 +1,2 @@
-# $Id$
 order allow,deny
 Deny from all


Property changes on: trunk/locale/.htaccess
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: trunk/locale/ja/pgsrc/.htaccess
===================================================================
--- trunk/locale/ja/pgsrc/.htaccess	2012-10-02 14:46:33 UTC (rev 8390)
+++ trunk/locale/ja/pgsrc/.htaccess	2012-10-02 14:59:08 UTC (rev 8391)
@@ -1,3 +1,2 @@
-# $Id$
 order allow,deny
 Deny from all


Property changes on: trunk/locale/ja/pgsrc/.htaccess
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: trunk/pgsrc/.htaccess
===================================================================
--- trunk/pgsrc/.htaccess	2012-10-02 14:46:33 UTC (rev 8390)
+++ trunk/pgsrc/.htaccess	2012-10-02 14:59:08 UTC (rev 8391)
@@ -1,3 +1,2 @@
-# $Id$
 order allow,deny
 Deny from all


Property changes on: trunk/pgsrc/.htaccess
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: trunk/schemas/.htaccess
===================================================================
--- trunk/schemas/.htaccess	2012-10-02 14:46:33 UTC (rev 8390)
+++ trunk/schemas/.htaccess	2012-10-02 14:59:08 UTC (rev 8391)
@@ -1,3 +1,2 @@
-# $Id$
 order allow,deny
 Deny from all


Property changes on: trunk/schemas/.htaccess
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: trunk/tests/.htaccess
===================================================================
--- trunk/tests/.htaccess	2012-10-02 14:46:33 UTC (rev 8390)
+++ trunk/tests/.htaccess	2012-10-02 14:59:08 UTC (rev 8391)
@@ -1,4 +1,3 @@
-# $Id$
 Order Deny,Allow
 Deny from all
 Allow from localhost 192.168.1.0/24


Property changes on: trunk/tests/.htaccess
___________________________________________________________________
Deleted: svn:keywords
   - Id


Property changes on: trunk/themes/wikilens/pgsrc/LeftbarContent
___________________________________________________________________
Deleted: svn:keywords
   - Id

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

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

From: <var...@us...> - 2012-10-02 14:46:46

Revision: 8390
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8390&view=rev
Author:   vargenau
Date:     2012-10-02 14:46:33 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
dos2unix

Modified Paths:
--------------
    trunk/themes/default/ASCIIsvg.js
    trunk/themes/default/moacdropdown.js

Modified: trunk/themes/default/ASCIIsvg.js
===================================================================
--- trunk/themes/default/ASCIIsvg.js	2012-10-02 14:41:17 UTC (rev 8389)
+++ trunk/themes/default/ASCIIsvg.js	2012-10-02 14:46:33 UTC (rev 8390)
@@ -1,1093 +1,1093 @@
-/* ASCIIsvg.js
-==============
-JavaScript routines to dynamically generate Scalable Vector Graphics
-using a mathematical xy-coordinate system (y increases upwards) and
-very intuitive JavaScript commands (no programming experience required).
-ASCIIsvg.js is good for learning math and illustrating online math texts.
-Works with Internet Explorer+Adobe SVGviewer and SVG enabled Mozilla/Firefox.
-
-Ver 1.2.7 Oct 13, 2005 (c) Peter Jipsen http://www.chapman.edu/~jipsen
-Latest version at http://www.chapman.edu/~jipsen/svg/ASCIIsvg.js
-If you use it on a webpage, please send the URL to ji...@ch...
-
-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.*/
-
-var checkIfSVGavailable = true;
-var notifyIfNoSVG = true;
-var alertIfNoSVG = false;
-var xunitlength = 20;  // pixels
-var yunitlength = 20;  // pixels
-var origin = [0,0];   // in pixels (default is bottom left corner)
-var defaultwidth = 300; defaultheight = 200; defaultborder = 0;
-var border = defaultborder;
-var strokewidth, strokedasharray, stroke, fill;
-var fontstyle, fontfamily, fontsize, fontweight, fontstroke, fontfill;
-var markerstrokewidth = "1";
-var markerstroke = "black";
-var markerfill = "yellow";
-var marker = "none";
-var arrowfill = stroke;
-var dotradius = 4;
-var ticklength = 4;
-var axesstroke = "black";
-var gridstroke = "grey";
-var pointerpos = null;
-var coordinates = null;
-var above = "above";
-var below = "below";
-var left = "left";
-var right = "right";
-var aboveleft = "aboveleft";
-var aboveright = "aboveright";
-var belowleft = "belowleft";
-var belowright = "belowright";
-var cpi = "\u03C0", ctheta = "\u03B8";
-var pi = Math.PI, ln = Math.log, e = Math.E;
-var arcsin = Math.asin, arccos = Math.acos, arctan = Math.atan;
-var sec = function(x) { return 1/Math.cos(x) };
-var csc = function(x) { return 1/Math.sin(x) };
-var cot = function(x) { return 1/Math.tan(x) };
-var xmin, xmax, ymin, ymax, xscl, yscl, 
-    xgrid, ygrid, xtick, ytick, initialized;
-var isIE = document.createElementNS==null;
-var picture, svgpicture, doc, width, height, a, b, c, d, i, n, p, t, x, y;
-var arcsec = function(x) { return arccos(1/x) };
-var arccsc = function(x) { return arcsin(1/x) };
-var arccot = function(x) { return arctan(1/x) };
-var sinh = function(x) { return (Math.exp(x)-Math.exp(-x))/2 };
-var cosh = function(x) { return (Math.exp(x)+Math.exp(-x))/2 };
-var tanh = 
-  function(x) { return (Math.exp(x)-Math.exp(-x))/(Math.exp(x)+Math.exp(-x)) };
-var sech = function(x) { return 1/cosh(x) };
-var csch = function(x) { return 1/sinh(x) };
-var coth = function(x) { return 1/tanh(x) };
-var arcsinh = function(x) { return ln(x+Math.sqrt(x*x+1)) };
-var arccosh = function(x) { return ln(x+Math.sqrt(x*x-1)) };
-var arctanh = function(x) { return ln((1+x)/(1-x))/2 };
-var sech = function(x) { return 1/cosh(x) };
-var csch = function(x) { return 1/sinh(x) };
-var coth = function(x) { return 1/tanh(x) };
-var arcsech = function(x) { return arccosh(1/x) };
-var arccsch = function(x) { return arcsinh(1/x) };
-var arccoth = function(x) { return arctanh(1/x) };
-var sign = function(x) { return (x==0?0:(x<0?-1:1)) };
-
-function factorial(x,n) {
-  if (n==null) n=1;
-  for (var i=x-n; i>0; i-=n) x*=i;
-  return (x<0?NaN:(x==0?1:x));
-}
-
-function C(x,k) {
-  var res=1;
-  for (var i=0; i<k; i++) res*=(x-i)/(k-i);
-  return res;
-}
-
-function chop(x,n) {
-  if (n==null) n=0;
-  return Math.floor(x*Math.pow(10,n))/Math.pow(10,n);
-}
-
-function ran(a,b,n) {
-  if (n==null) n=0;
-  return chop((b+Math.pow(10,-n)-a)*Math.random()+a,n);
-}
-
-function myCreateElementXHTML(t) {
-  if (isIE) return document.createElement(t);
-  else return document.createElementNS("http://www.w3.org/1999/xhtml",t);
-}
-
-function isSVGavailable() {
-  var ua = navigator.userAgent;
-  if (ua.match("AppleWebKit")) {
-      return null;
-  }
-  if (navigator.appName.slice(0,5)=="Opera") {
-      return null;
-  }
-  var nd = myCreateElementXHTML("center");
-  nd.appendChild(document.createTextNode("To view the "));
-  var an = myCreateElementXHTML("a");
-  an.appendChild(document.createTextNode("ASCIIsvg"));
-  an.setAttribute("href","http://www.chapman.edu/~jipsen/asciisvg.html");
-  nd.appendChild(an);
-  nd.appendChild(document.createTextNode(" images use Internet Explorer 6+"));
-  an = myCreateElementXHTML("a");
-  an.appendChild(document.createTextNode("Adobe SVGviewer 3.02"));
-  an.setAttribute("href","http://www.adobe.com/svg");
-  nd.appendChild(an);
-  nd.appendChild(document.createTextNode(" or "));
-  an = myCreateElementXHTML("a");
-  an.appendChild(document.createTextNode("SVG enabled Mozilla/Firefox"));
-  an.setAttribute("href",
-    "http://www.chapman.edu/~jipsen/svg/svgenabledmozillafirefox.html");
-  nd.appendChild(an);
-  if (navigator.appName.slice(0,8)=="Netscape") 
-    if (window['SVGElement']) return null;
-    else return nd;
-  else if (navigator.appName.slice(0,9)=="Microsoft")
-    try	{
-      var oSVG=eval("new ActiveXObject('Adobe.SVGCtl.3');");
-        return null;
-    } catch (e) {
-        return nd;
-    }
-  else return nd;
-}
-
-
-function less(x,y) { return x < y }  // used for scripts in XML files
-                                     // since IE does not handle CDATA well
-function setText(st,id) { 
-  var node = document.getElementById(id);
-  if (node!=null)
-    if (node.childNodes.length!=0) node.childNodes[0].nodeValue = st;
-    else node.appendChild(document.createTextNode(st));
-}
-
-function myCreateElementSVG(t) {
-  if (isIE) return doc.createElement(t);
-  else return doc.createElementNS("http://www.w3.org/2000/svg",t);
-}
-
-function getX() {
-  return (doc.getElementById("pointerpos").getAttribute("cx")-origin[0])/xunitlength;
-}
-
-function getY() {
-  return (height-origin[1]-doc.getElementById("pointerpos").getAttribute("cy"))/yunitlength;
-}
-
-function mousemove_listener(evt) {
-  if (svgpicture.getAttribute("xbase")!=null)
-    pointerpos.cx.baseVal.value = evt.clientX-svgpicture.getAttribute("xbase");
-  if (svgpicture.getAttribute("ybase")!=null)
-    pointerpos.cy.baseVal.value = evt.clientY-svgpicture.getAttribute("ybase");
-}
-
-function top_listener(evt) {
-  svgpicture.setAttribute("ybase",evt.clientY);
-}
-
-function bottom_listener(evt) { 
-  svgpicture.setAttribute("ybase",evt.clientY-height+1);
-}
-
-function left_listener(evt) {
-  svgpicture.setAttribute("xbase",evt.clientX);
-}
-
-function right_listener(evt) {
-  svgpicture.setAttribute("xbase",evt.clientX-width+1);
-}
-
-function drawPictures() { // main routine; called after webpage has loaded
-  var src, id, dsvg, onmov, nd, node, ht, index;
-  var pictures = document.getElementsByTagName("textarea");
-  for (index = 0; index<pictures.length; index++)
-    if (pictures[index].className=="ASCIIsvg"){
-      pictures[index].style.display="none";  // hide the textarea
-    }
-  pictures = document.getElementsByTagName("embed");
-  var len = pictures.length;
- if (checkIfSVGavailable) {
-  nd = isSVGavailable();
-  if (nd != null && notifyIfNoSVG && len>0)
-    if (alertIfNoSVG)
-      alert("To view the SVG pictures in Internet Explorer\n\
-download the free Adobe SVGviewer from www.adobe.com/svg or\n\
-use Firefox 1.5 preview (called Deerpark)");
-    else {
-    var ASbody = document.getElementsByTagName("body")[0];
-    ASbody.insertBefore(nd,ASbody.childNodes[0]);
-  }
- }
- if (nd == null) {
-  for (index = 0; index < len; index++) {
-    xmin = null; xmax = null; ymin = null; ymax = null;
-    xscl = null; xgrid = null; yscl = null; ygrid = null;
-    initialized = false;
-    picture = (isIE ? pictures[index] : pictures[0]);
-    src = picture.getAttribute("script");
-    if (src==null) src = "";
-    ht = picture.getAttribute("height");
-    if (ht==null) ht ="";
-   if (ht!="") defaultborder = 25;
-   if (ht=="" || src=="") 
-    if (document.getElementById("picture"+(index+1)+"input")==null) {
-      if (isIE && src.indexOf("nobutton()")==-1)
-        picture.parentNode.insertBefore(myCreateElementXHTML("br"),picture);
-      node = myCreateElementXHTML("textarea");
-      node.setAttribute("rows","10");
-      node.setAttribute("cols","60");
-//      node.setAttribute("style","display:block");
-      if (isIE) src = src.replace(/([^\r])\n/g,"$1\r").slice(1);
-      node.appendChild(document.createTextNode(src));
-      if (src.indexOf("showcode()")==-1) node.style.display = "none";
-      node.setAttribute("id","picture"+(index+1)+"input");
-      picture.parentNode.insertBefore(node,picture);
-
-      if (src.indexOf("nobutton()")==-1) {
-        picture.parentNode.insertBefore(myCreateElementXHTML("br"),picture);
-
-        node = myCreateElementXHTML("button");
-        if (isIE) node.onclick = function() { showHideCode(this) };
-        else node.setAttribute("onclick","showHideCode(this)");
-        node.appendChild(document.createTextNode("Show/Hide"));
-        picture.parentNode.insertBefore(node,picture);
-
-        node = myCreateElementXHTML("button");
-        if (isIE) node.onclick = ASfn[index];
-        else node.setAttribute("onclick","updatePicture("+index+")");
-        node.appendChild(document.createTextNode("Update"));
-        if (src.indexOf("showCode()")==-1) node.style.display = "none";
-        picture.parentNode.insertBefore(node,picture);
-
-/*      node = myCreateElementXHTML("span");
-//      node.setAttribute("id","AScoord"+index);
-        node.appendChild(document.createTextNode("(x,y)"));
-        picture.parentNode.insertBefore(node,picture);
-*/
-        picture.parentNode.insertBefore(myCreateElementXHTML("br"),picture);
-      }
-      if (isIE) picture.onmousemove = ASupdateCoords[index];
-      else picture.setAttribute("onmousemove","updateCoords"+index+"()");
-    } else src = document.getElementById("picture"+(index+1)+"input").value;
-    src = src.replace(/plot\(\x20*([^\"f\[][^\n\r]+?)\,/g,"plot\(\"$1\",");
-    src = src.replace(/plot\(\x20*([^\"f\[][^\n\r]+)\)/g,"plot(\"$1\")");
-    src = src.replace(/([0-9])([a-zA-Z])/g,"$1*$2");
-    src = src.replace(/\)([\(0-9a-zA-Z])/g,"\)*$1");
-//    eval(src.replace(/\s\s/g,";")); //for XML version
-    id = picture.getAttribute("id");
-    dsvg = picture.getAttribute("src");
-    onmov = picture.getAttribute("onmousemove");
-    if (id == null || id == "") {
-      id = "picture"+(index+1);
-      picture.setAttribute("id",id);
-    }
-    try {
-      with (Math) eval(src);
-    } catch(err) {alert(err+"\n"+src)}
-    if (isIE) src = src.replace(/([^\r])\n/g,"$1\r");
-    setText("<embed width=\""+width+"\" height=\""+height+"\" src=\""+
-            dsvg+"\" "+(onmov!=null?"onmousemove=\""+onmov+"\"":"")+
-            (isIE?"\r":"\n")+"script=\'"+src+"\'>",id+"script");
-//    setText(src.replace(/\s\s/g,"\r"),id+"script"); //for XML version
-  }
- }
-}
-
-function switchTo(id) {
-//alert(id);
-  picture = document.getElementById(id);
-  width = picture.getAttribute("width")-0;
-  height = picture.getAttribute("height")-0;
-  strokewidth = "1" // pixel
-  stroke = "black"; // default line color
-  fill = "none";    // default fill color
-  marker = "none";
-  if ((picture.nodeName == "EMBED" || picture.nodeName == "embed") && isIE) {
-    svgpicture = picture.getSVGDocument().getElementById("root");
-    doc = picture.getSVGDocument();
-  } else {
-    picture.setAttribute("onmousemove","updateCoords"+(id.slice(id.length-1)-1)+"()");
-//alert(picture.getAttribute("onmousemove")+"***");
-    svgpicture = picture;
-    doc = document;
-  }
-  xunitlength = svgpicture.getAttribute("xunitlength")-0;
-  yunitlength = svgpicture.getAttribute("yunitlength")-0;
-  xmin = svgpicture.getAttribute("xmin")-0;
-  xmax = svgpicture.getAttribute("xmax")-0;
-  ymin = svgpicture.getAttribute("ymin")-0;
-  ymax = svgpicture.getAttribute("ymax")-0;
-  origin = [svgpicture.getAttribute("ox")-0,svgpicture.getAttribute("oy")-0];
-}
-
-function updatePicture(obj) {
-//alert(typeof obj)
-  var src = document.getElementById((typeof obj=="string"?
-              obj:"picture"+(obj+1)+"input")).value;
-  xmin = null; xmax = null; ymin = null; ymax = null;
-  xscl = null; xgrid = null; yscl = null; ygrid = null;
-  initialized = false;
-  switchTo((typeof obj=="string"?obj.slice(0,8):"picture"+(obj+1)));
-  src = src.replace(/plot\(\x20*([^\"f\[][^\n\r]+?)\,/g,"plot\(\"$1\",");
-  src = src.replace(/plot\(\x20*([^\"f\[][^\n\r]+)\)/g,"plot(\"$1\")");
-  src = src.replace(/([0-9])([a-zA-Z])/g,"$1*$2");
-  src = src.replace(/\)([\(0-9a-zA-Z])/g,"\)*$1");
-//alert(src);
-  try {
-    with (Math) eval(src);
-  } catch(err) {alert(err+"\n"+src)}
-}
-
-function showHideCode(obj) {
-  var node = obj.nextSibling;
-  while (node != null && node.nodeName != "BUTTON" && 
-    node.nodeName != "button") node = node.nextSibling;
-  if (node.style.display == "none") node.style.display = "";
-  else node.style.display = "none";
-  while (node != null && node.nodeName != "TEXTAREA" && 
-    node.nodeName != "textarea") node = node.previousSibling;
-  if (node.style.display == "none") node.style.display = "";
-  else node.style.display = "none";
-//  updatePicture(node.getAttribute("id"));
-}
-
-function hideCode() { //do nothing
-}
-
-function showcode() { //do nothing
-}
-
-function nobutton() { //do nothing
-}
-
-function setBorder(x) { border = x }
-
-function initPicture(x_min,x_max,y_min,y_max) {
- if (!initialized) {
-  strokewidth = "1"; // pixel
-  strokedasharray = null;
-  stroke = "black"; // default line color
-  fill = "none";    // default fill color
-  fontstyle = "italic"; // default shape for text labels
-  fontfamily = "times"; // default font
-  fontsize = "16";      // default size
-  fontweight = "normal";
-  fontstroke = "none";  // default font outline color
-  fontfill = "none";    // default font color
-  marker = "none";
-  initialized = true;
-  if (x_min!=null) xmin = x_min;
-  if (x_max!=null) xmax = x_max;
-  if (y_min!=null) ymin = y_min;
-  if (y_max!=null) ymax = y_max;
-  if (xmin==null) xmin = -5;
-  if (xmax==null) xmax = 5;
- if (typeof xmin != "number" || typeof xmax != "number" || xmin >= xmax) 
-   alert("Picture requires at least two numbers: xmin < xmax");
- else if (y_max != null && (typeof y_min != "number" || 
-          typeof y_max != "number" || y_min >= y_max))
-   alert("initPicture(xmin,xmax,ymin,ymax) requires numbers ymin < ymax");
- else {
-  if (width==null) width = picture.getAttribute("width");
-  else picture.setAttribute("width",width);
-  if (width==null || width=="") width=defaultwidth;
-  if (height==null) height = picture.getAttribute("height");
-  else picture.setAttribute("height",height);
-  if (height==null || height=="") height=defaultheight;
-  xunitlength = (width-2*border)/(xmax-xmin);
-  yunitlength = xunitlength;
-//alert(xmin+" "+xmax+" "+ymin+" "+ymax)
-  if (ymin==null) {
-    origin = [-xmin*xunitlength+border,height/2];
-    ymin = -(height-2*border)/(2*yunitlength);
-    ymax = -ymin;
-  } else {
-    if (ymax!=null) yunitlength = (height-2*border)/(ymax-ymin);
-    else ymax = (height-2*border)/yunitlength + ymin;
-    origin = [-xmin*xunitlength+border,-ymin*yunitlength+border];
-  }
-//  if (true ||picture.nodeName == "EMBED" || picture.nodeName == "embed") {
-    if (isIE) {
-      svgpicture = picture.getSVGDocument().getElementById("root");
-      while (svgpicture.childNodes.length()>5) 
-        svgpicture.removeChild(svgpicture.lastChild); 
-      svgpicture.setAttribute("width",width);
-      svgpicture.setAttribute("height",height);
-      doc = picture.getSVGDocument();
-    } else {
-      var qnode = document.createElementNS("http://www.w3.org/2000/svg","svg");
-      qnode.setAttribute("id",picture.getAttribute("id"));
-      qnode.setAttribute("style","display:inline");
-      qnode.setAttribute("width",picture.getAttribute("width"));
-      qnode.setAttribute("height",picture.getAttribute("height"));
-      if (picture.parentNode!=null)
-        picture.parentNode.replaceChild(qnode,picture);
-      else
-        svgpicture.parentNode.replaceChild(qnode,svgpicture);
-      svgpicture = qnode;
-      doc = document;
-      pointerpos = doc.getElementById("pointerpos");
-      if (pointerpos==null) {
-        pointerpos = myCreateElementSVG("circle");
-        pointerpos.setAttribute("id","pointerpos");
-        pointerpos.setAttribute("cx",0);
-        pointerpos.setAttribute("cy",0);
-        pointerpos.setAttribute("r",0.5);
-        pointerpos.setAttribute("fill","red");
-        svgpicture.appendChild(pointerpos);
-      }
-    }
-//  } else {
-//    svgpicture = picture;
-//    doc = document;
-//  }
-  svgpicture.setAttribute("xunitlength",xunitlength);
-  svgpicture.setAttribute("yunitlength",yunitlength);
-  svgpicture.setAttribute("xmin",xmin);
-  svgpicture.setAttribute("xmax",xmax);
-  svgpicture.setAttribute("ymin",ymin);
-  svgpicture.setAttribute("ymax",ymax);
-  svgpicture.setAttribute("ox",origin[0]);
-  svgpicture.setAttribute("oy",origin[1]);
-  var node = myCreateElementSVG("rect");
-  node.setAttribute("x","0");
-  node.setAttribute("y","0");
-  node.setAttribute("width",width);
-  node.setAttribute("height",height);
-  node.setAttribute("style","stroke-width:1;fill:white");
-  svgpicture.appendChild(node);
-  if (!isIE && picture.getAttribute("onmousemove")!=null) {
-    svgpicture.addEventListener("mousemove", mousemove_listener, true);
-    var st = picture.getAttribute("onmousemove");
-    svgpicture.addEventListener("mousemove", eval(st.slice(0,st.indexOf("("))), true);
-    node = myCreateElementSVG("polyline");
-    node.setAttribute("points","0,0 "+width+",0");
-    node.setAttribute("style","stroke:white; stroke-width:3");
-    node.addEventListener("mousemove", top_listener, true);
-    svgpicture.appendChild(node);
-    node = myCreateElementSVG("polyline");
-    node.setAttribute("points","0,"+height+" "+width+","+height);
-    node.setAttribute("style","stroke:white; stroke-width:3");
-    node.addEventListener("mousemove", bottom_listener, true);
-    svgpicture.appendChild(node);
-    node = myCreateElementSVG("polyline");
-    node.setAttribute("points","0,0 0,"+height);
-    node.setAttribute("style","stroke:white; stroke-width:3");
-    node.addEventListener("mousemove", left_listener, true);
-    svgpicture.appendChild(node);
-    node = myCreateElementSVG("polyline");
-    node.setAttribute("points",(width-1)+",0 "+(width-1)+","+height);
-    node.setAttribute("style","stroke:white; stroke-width:3");
-    node.addEventListener("mousemove", right_listener, true);
-    svgpicture.appendChild(node);
-  }
-  border = defaultborder;
- }
- }
-}
-
-function line(p,q,id) { // segment connecting points p,q (coordinates in units)
-  var node;
-  if (id!=null) node = doc.getElementById(id);
-  if (node==null) {
-    node = myCreateElementSVG("path");
-    node.setAttribute("id", id);
-    svgpicture.appendChild(node);
-  }
-  node.setAttribute("d","M"+(p[0]*xunitlength+origin[0])+","+
-    (height-p[1]*yunitlength-origin[1])+" "+
-    (q[0]*xunitlength+origin[0])+","+(height-q[1]*yunitlength-origin[1]));
-  node.setAttribute("stroke-width", strokewidth);
-  if (strokedasharray!=null) 
-    node.setAttribute("stroke-dasharray", strokedasharray);
-  node.setAttribute("stroke", stroke);
-  node.setAttribute("fill", fill);
-  if (marker=="dot" || marker=="arrowdot") {
-    ASdot(p,4,markerstroke,markerfill);
-    if (marker=="arrowdot") arrowhead(p,q);
-    ASdot(q,4,markerstroke,markerfill);
-  } else if (marker=="arrow") arrowhead(p,q);
-}
-
-function path(plist,id,c) {
-  if (c==null) c="";
-  var node, st, i;
-  if (id!=null) node = doc.getElementById(id);
-  if (node==null) {
-    node = myCreateElementSVG("path");
-    node.setAttribute("id", id);
-    svgpicture.appendChild(node);
-  }
-  if (typeof plist == "string") st = plist;
-  else {
-    st = "M";
-    st += (plist[0][0]*xunitlength+origin[0])+","+
-          (height-plist[0][1]*yunitlength-origin[1])+" "+c;
-    for (i=1; i<plist.length; i++)
-      st += (plist[i][0]*xunitlength+origin[0])+","+
-            (height-plist[i][1]*yunitlength-origin[1])+" ";
-  }
-  node.setAttribute("d", st);
-  node.setAttribute("stroke-width", strokewidth);
-  if (strokedasharray!=null) 
-    node.setAttribute("stroke-dasharray", strokedasharray);
-  node.setAttribute("stroke", stroke);
-  node.setAttribute("fill", fill);
-  if (marker=="dot" || marker=="arrowdot")
-    for (i=0; i<plist.length; i++)
-      if (c!="C" && c!="T" || i!=1 && i!=2)
-        ASdot(plist[i],4,markerstroke,markerfill);
-}
-
-function curve(plist,id) {
-  path(plist,id,"T");
-}
-
-function circle(center,radius,id) { // coordinates in units
-  var node;
-  if (id!=null) node = doc.getElementById(id);
-  if (node==null) {
-    node = myCreateElementSVG("circle");
-    node.setAttribute("id", id);
-    svgpicture.appendChild(node);
-  }
-  node.setAttribute("cx",center[0]*xunitlength+origin[0]);
-  node.setAttribute("cy",height-center[1]*yunitlength-origin[1]);
-  node.setAttribute("r",radius*xunitlength);
-  node.setAttribute("stroke-width", strokewidth);
-  node.setAttribute("stroke", stroke);
-  node.setAttribute("fill", fill);
-}
-
-function loop(p,d,id) { 
-// d is a direction vector e.g. [1,0] means loop starts in that direction
-  if (d==null) d=[1,0];
-  path([p,[p[0]+d[0],p[1]+d[1]],[p[0]-d[1],p[1]+d[0]],p],id,"C");
-  if (marker=="arrow" || marker=="arrowdot") 
-    arrowhead([p[0]+Math.cos(1.4)*d[0]-Math.sin(1.4)*d[1],
-               p[1]+Math.sin(1.4)*d[0]+Math.cos(1.4)*d[1]],p);
-}
-
-function arc(start,end,radius,id) { // coordinates in units
-  var node, v;
-//alert([fill, stroke, origin, xunitlength, yunitlength, height])
-  if (id!=null) node = doc.getElementById(id);
-  if (radius==null) {
-    v=[end[0]-start[0],end[1]-start[1]];
-    radius = Math.sqrt(v[0]*v[0]+v[1]*v[1]);
-  }
-  if (node==null) {
-    node = myCreateElementSVG("path");
-    node.setAttribute("id", id);
-    svgpicture.appendChild(node);
-  }
-  node.setAttribute("d","M"+(start[0]*xunitlength+origin[0])+","+
-    (height-start[1]*yunitlength-origin[1])+" A"+radius*xunitlength+","+
-     radius*yunitlength+" 0 0,0 "+(end[0]*xunitlength+origin[0])+","+
-    (height-end[1]*yunitlength-origin[1]));
-  node.setAttribute("stroke-width", strokewidth);
-  node.setAttribute("stroke", stroke);
-  node.setAttribute("fill", fill);
-  if (marker=="arrow" || marker=="arrowdot") {
-    u = [(end[1]-start[1])/4,(start[0]-end[0])/4];
-    v = [(end[0]-start[0])/2,(end[1]-start[1])/2];
-//alert([u,v])
-    v = [start[0]+v[0]+u[0],start[1]+v[1]+u[1]];
-  } else v=[start[0],start[1]];
-  if (marker=="dot" || marker=="arrowdot") {
-    ASdot(start,4,markerstroke,markerfill);
-    if (marker=="arrowdot") arrowhead(v,end);
-    ASdot(end,4,markerstroke,markerfill);
-  } else if (marker=="arrow") arrowhead(v,end);
-}
-
-function ellipse(center,rx,ry,id) { // coordinates in units
-  var node;
-  if (id!=null) node = doc.getElementById(id);
-  if (node==null) {
-    node = myCreateElementSVG("ellipse");
-    node.setAttribute("id", id);
-    svgpicture.appendChild(node);
-  }
-  node.setAttribute("cx",center[0]*xunitlength+origin[0]);
-  node.setAttribute("cy",height-center[1]*yunitlength-origin[1]);
-  node.setAttribute("rx",rx*xunitlength);
-  node.setAttribute("ry",ry*yunitlength);
-  node.setAttribute("stroke-width", strokewidth);
-  node.setAttribute("stroke", stroke);
-  node.setAttribute("fill", fill);
-}
-
-function rect(p,q,id,rx,ry) { // opposite corners in units, rounded by radii
-  var node;
-  if (id!=null) node = doc.getElementById(id);
-  if (node==null) {
-    node = myCreateElementSVG("rect");
-    node.setAttribute("id", id);
-    svgpicture.appendChild(node);
-  }
-  node.setAttribute("x",p[0]*xunitlength+origin[0]);
-  node.setAttribute("y",height-q[1]*yunitlength-origin[1]);
-  node.setAttribute("width",(q[0]-p[0])*xunitlength);
-  node.setAttribute("height",(q[1]-p[1])*yunitlength);
-  if (rx!=null) node.setAttribute("rx",rx*xunitlength);
-  if (ry!=null) node.setAttribute("ry",ry*yunitlength);
-  node.setAttribute("stroke-width", strokewidth);
-  node.setAttribute("stroke", stroke);
-  node.setAttribute("fill", fill);
-}
-
-function text(p,st,pos,id,fontsty) {
-  var textanchor = "middle";
-  var dx = 0; var dy = fontsize/3;
-  if (pos!=null) {
-    if (pos.slice(0,5)=="above") dy = -fontsize/2;
-    if (pos.slice(0,5)=="below") dy = fontsize-0;
-    if (pos.slice(0,5)=="right" || pos.slice(5,10)=="right") {
-      textanchor = "start";
-      dx = fontsize/2;
-    }
-    if (pos.slice(0,4)=="left" || pos.slice(5,9)=="left") {
-      textanchor = "end";
-      dx = -fontsize/2;
-    }
-  }
-  var node;
-  if (id!=null) node = doc.getElementById(id);
-  if (node==null) {
-    node = myCreateElementSVG("text");
-    node.setAttribute("id", id);
-    svgpicture.appendChild(node);
-    node.appendChild(doc.createTextNode(st));
-  }
-  node.lastChild.nodeValue = st;
-  node.setAttribute("x",p[0]*xunitlength+origin[0]+dx);
-  node.setAttribute("y",height-p[1]*yunitlength-origin[1]+dy);
-  node.setAttribute("font-style",(fontsty!=null?fontsty:fontstyle));
-  node.setAttribute("font-family",fontfamily);
-  node.setAttribute("font-size",fontsize);
-  node.setAttribute("font-weight",fontweight);
-  node.setAttribute("text-anchor",textanchor);
-  if (fontstroke!="none") node.setAttribute("stroke",fontstroke);
-  if (fontfill!="none") node.setAttribute("fill",fontfill);
-  return p;
-}
-
-function ASdot(center,radius,s,f) { // coordinates in units, radius in pixel
-  if (s==null) s = stroke; if (f==null) f = fill;
-  var node = myCreateElementSVG("circle");
-  node.setAttribute("cx",center[0]*xunitlength+origin[0]);
-  node.setAttribute("cy",height-center[1]*yunitlength-origin[1]);
-  node.setAttribute("r",radius);
-  node.setAttribute("stroke-width", strokewidth);
-  node.setAttribute("stroke", s);
-  node.setAttribute("fill", f);
-  svgpicture.appendChild(node);
-}
-
-function dot(center, typ, label, pos, id) {
-  var node;
-  var cx = center[0]*xunitlength+origin[0];
-  var cy = height-center[1]*yunitlength-origin[1];
-  if (id!=null) node = doc.getElementById(id);
-  if (typ=="+" || typ=="-" || typ=="|") {
-    if (node==null) {
-      node = myCreateElementSVG("path");
-      node.setAttribute("id", id);
-      svgpicture.appendChild(node);
-    }
-    if (typ=="+") {
-      node.setAttribute("d",
-        " M "+(cx-ticklength)+" "+cy+" L "+(cx+ticklength)+" "+cy+
-        " M "+cx+" "+(cy-ticklength)+" L "+cx+" "+(cy+ticklength));
-      node.setAttribute("stroke-width", .5);
-      node.setAttribute("stroke", axesstroke);
-    } else {
-      if (typ=="-") node.setAttribute("d",
-        " M "+(cx-ticklength)+" "+cy+" L "+(cx+ticklength)+" "+cy);
-      else node.setAttribute("d",
-        " M "+cx+" "+(cy-ticklength)+" L "+cx+" "+(cy+ticklength));
-      node.setAttribute("stroke-width", strokewidth);
-      node.setAttribute("stroke", stroke);
-    }
-  } else {
-    if (node==null) {
-      node = myCreateElementSVG("circle");
-      node.setAttribute("id", id);
-      svgpicture.appendChild(node);
-    }
-    node.setAttribute("cx",cx);
-    node.setAttribute("cy",cy);
-    node.setAttribute("r",dotradius);
-    node.setAttribute("stroke-width", strokewidth);
-    node.setAttribute("stroke", stroke);
-    node.setAttribute("fill", (typ=="open"?"white":stroke));
-  }
-  if (label!=null) 
-    text(center,label,(pos==null?"below":pos),(id==null?id:id+"label"))
-}
-
-function arrowhead(p,q) { // draw arrowhead at q (in units)
-  var up;
-  var v = [p[0]*xunitlength+origin[0],height-p[1]*yunitlength-origin[1]];
-  var w = [q[0]*xunitlength+origin[0],height-q[1]*yunitlength-origin[1]];
-  var u = [w[0]-v[0],w[1]-v[1]];
-  var d = Math.sqrt(u[0]*u[0]+u[1]*u[1]);
-  if (d > 0.00000001) {
-    u = [u[0]/d, u[1]/d];
-    up = [-u[1],u[0]];
-    var node = myCreateElementSVG("path");
-    node.setAttribute("d","M "+(w[0]-15*u[0]-4*up[0])+" "+
-      (w[1]-15*u[1]-4*up[1])+" L "+(w[0]-3*u[0])+" "+(w[1]-3*u[1])+" L "+
-      (w[0]-15*u[0]+4*up[0])+" "+(w[1]-15*u[1]+4*up[1])+" z");
-    node.setAttribute("stroke-width", markerstrokewidth);
-    node.setAttribute("stroke", stroke); /*was markerstroke*/
-    node.setAttribute("fill", stroke); /*was arrowfill*/
-    svgpicture.appendChild(node);    
-  }
-}
-
-function chopZ(st) {
-  var k = st.indexOf(".");
-  if (k==-1) return st;
-  for (var i=st.length-1; i>k && st.charAt(i)=="0"; i--);
-  if (i==k) i--;
-  return st.slice(0,i+1);
-}
-
-function grid(dx,dy) { // for backward compatibility
-  axes(dx,dy,null,dx,dy)
-}
-
-function noaxes() {
-  if (!initialized) initPicture();
-}
-
-function axes(dx,dy,labels,gdx,gdy) {
-//xscl=x is equivalent to xtick=x; xgrid=x; labels=true;
-  var x, y, ldx, ldy, lx, ly, lxp, lyp, pnode, st;
-  if (!initialized) initPicture();
-  if (typeof dx=="string") { labels = dx; dx = null; }
-  if (typeof dy=="string") { gdx = dy; dy = null; }
-  if (xscl!=null) {dx = xscl; gdx = xscl; labels = dx}
-  if (yscl!=null) {dy = yscl; gdy = yscl}
-  if (xtick!=null) {dx = xtick}
-  if (ytick!=null) {dy = ytick}
-//alert(null)
-  dx = (dx==null?xunitlength:dx*xunitlength);
-  dy = (dy==null?dx:dy*yunitlength);
-  fontsize = Math.min(dx/2,dy/2,16);//alert(fontsize)
-  ticklength = fontsize/4;
-  if (xgrid!=null) gdx = xgrid;
-  if (ygrid!=null) gdy = ygrid;
-  if (gdx!=null) {
-    gdx = (typeof gdx=="string"?dx:gdx*xunitlength);
-    gdy = (gdy==null?dy:gdy*yunitlength);
-    pnode = myCreateElementSVG("path");
-    st="";
-    for (x = origin[0]; x<width; x = x+gdx)
-      st += " M"+x+",0"+" "+x+","+height;
-    for (x = origin[0]-gdx; x>0; x = x-gdx)
-      st += " M"+x+",0"+" "+x+","+height;
-    for (y = height-origin[1]; y<height; y = y+gdy)
-      st += " M0,"+y+" "+width+","+y;
-    for (y = height-origin[1]-gdy; y>0; y = y-gdy)
-      st += " M0,"+y+" "+width+","+y;
-    pnode.setAttribute("d",st);
-    pnode.setAttribute("stroke-width", .5);
-    pnode.setAttribute("stroke", gridstroke);
-    pnode.setAttribute("fill", fill);
-    svgpicture.appendChild(pnode);
-  }
-  pnode = myCreateElementSVG("path");
-  st="M0,"+(height-origin[1])+" "+width+","+
-    (height-origin[1])+" M"+origin[0]+",0 "+origin[0]+","+height;
-  for (x = origin[0]+dx; x<width; x = x+dx)
-    st += " M"+x+","+(height-origin[1]+ticklength)+" "+x+","+
-           (height-origin[1]-ticklength);
-  for (x = origin[0]-dx; x>0; x = x-dx)
-    st += " M"+x+","+(height-origin[1]+ticklength)+" "+x+","+
-           (height-origin[1]-ticklength);
-  for (y = height-origin[1]+dy; y<height; y = y+dy)
-    st += " M"+(origin[0]+ticklength)+","+y+" "+(origin[0]-ticklength)+","+y;
-  for (y = height-origin[1]-dy; y>0; y = y-dy)
-    st += " M"+(origin[0]+ticklength)+","+y+" "+(origin[0]-ticklength)+","+y;
-  if (labels!=null) with (Math) {
-    ldx = dx/xunitlength;
-    ldy = dy/yunitlength;
-    lx = (xmin>0 || xmax<0?xmin:0);
-    ly = (ymin>0 || ymax<0?ymin:0);
-    lxp = (ly==0?"below":"above");
-    lyp = (lx==0?"left":"right");
-    var ddx = floor(1.1-log(ldx)/log(10))+1;
-    var ddy = floor(1.1-log(ldy)/log(10))+1;
-    for (x = ldx; x<=xmax; x = x+ldx)
-      text([x,ly],chopZ(x.toFixed(ddx)),lxp);
-    for (x = -ldx; xmin<=x; x = x-ldx)
-      text([x,ly],chopZ(x.toFixed(ddx)),lxp);
-    for (y = ldy; y<=ymax; y = y+ldy)
-      text([lx,y],chopZ(y.toFixed(ddy)),lyp);
-    for (y = -ldy; ymin<=y; y = y-ldy)
-      text([lx,y],chopZ(y.toFixed(ddy)),lyp);
-  }
-  pnode.setAttribute("d",st);
-  pnode.setAttribute("stroke-width", .5);
-  pnode.setAttribute("stroke", axesstroke);
-  pnode.setAttribute("fill", fill);
-  svgpicture.appendChild(pnode);
-}
-
-function mathjs(st) {
-  //translate a math formula to js function notation
-  // a^b --> pow(a,b)
-  // na --> n*a
-  // (...)d --> (...)*d
-  // n! --> factorial(n)
-  // sin^-1 --> arcsin etc.
-  //while ^ in string, find term on left and right
-  //slice and concat new formula string
-  st = st.replace(/\s/g,"");
-  if (st.indexOf("^-1")!=-1) {
-    st = st.replace(/sin\^-1/g,"arcsin");
-    st = st.replace(/cos\^-1/g,"arccos");
-    st = st.replace(/tan\^-1/g,"arctan");
-    st = st.replace(/sec\^-1/g,"arcsec");
-    st = st.replace(/csc\^-1/g,"arccsc");
-    st = st.replace(/cot\^-1/g,"arccot");
-    st = st.replace(/sinh\^-1/g,"arcsinh");
-    st = st.replace(/cosh\^-1/g,"arccosh");
-    st = st.replace(/tanh\^-1/g,"arctanh");
-    st = st.replace(/sech\^-1/g,"arcsech");
-    st = st.replace(/csch\^-1/g,"arccsch");
-    st = st.replace(/coth\^-1/g,"arccoth");
-  }
-  st = st.replace(/^e$/g,"(E)");
-  st = st.replace(/^e([^a-zA-Z])/g,"(E)$1");
-  st = st.replace(/([^a-zA-Z])e([^a-zA-Z])/g,"$1(E)$2");
-  st = st.replace(/([0-9])([\(a-zA-Z])/g,"$1*$2");
-  st = st.replace(/\)([\(0-9a-zA-Z])/g,"\)*$1");
-  var i,j,k, ch, nested;
-  while ((i=st.indexOf("^"))!=-1) {
-    //find left argument
-    if (i==0) return "Error: missing argument";
-    j = i-1;
-    ch = st.charAt(j);
-    if (ch>="0" && ch<="9") {// look for (decimal) number
-      j--;
-      while (j>=0 && (ch=st.charAt(j))>="0" && ch<="9") j--;
-      if (ch==".") {
-        j--;
-        while (j>=0 && (ch=st.charAt(j))>="0" && ch<="9") j--;
-      }
-    } else if (ch==")") {// look for matching opening bracket and function name
-      nested = 1;
-      j--;
-      while (j>=0 && nested>0) {
-        ch = st.charAt(j);
-        if (ch=="(") nested--;
-        else if (ch==")") nested++;
-        j--;
-      }
-      while (j>=0 && (ch=st.charAt(j))>="a" && ch<="z" || ch>="A" && ch<="Z")
-        j--;
-    } else if (ch>="a" && ch<="z" || ch>="A" && ch<="Z") {// look for variable
-      j--;
-      while (j>=0 && (ch=st.charAt(j))>="a" && ch<="z" || ch>="A" && ch<="Z")
-        j--;
-    } else { 
-      return "Error: incorrect syntax in "+st+" at position "+j;
-    }
-    //find right argument
-    if (i==st.length-1) return "Error: missing argument";
-    k = i+1;
-    ch = st.charAt(k);
-    if (ch>="0" && ch<="9" || ch=="-") {// look for signed (decimal) number
-      k++;
-      while (k<st.length && (ch=st.charAt(k))>="0" && ch<="9") k++;
-      if (ch==".") {
-        k++;
-        while (k<st.length && (ch=st.charAt(k))>="0" && ch<="9") k++;
-      }
-    } else if (ch=="(") {// look for matching closing bracket and function name
-      nested = 1;
-      k++;
-      while (k<st.length && nested>0) {
-        ch = st.charAt(k);
-        if (ch=="(") nested++;
-        else if (ch==")") nested--;
-        k++;
-      }
-    } else if (ch>="a" && ch<="z" || ch>="A" && ch<="Z") {// look for variable
-      k++;
-      while (k<st.length && (ch=st.charAt(k))>="a" && ch<="z" ||
-               ch>="A" && ch<="Z") k++;
-    } else { 
-      return "Error: incorrect syntax in "+st+" at position "+k;
-    }
-    st = st.slice(0,j+1)+"pow("+st.slice(j+1,i)+","+st.slice(i+1,k)+")"+
-           st.slice(k);
-  }
-  while ((i=st.indexOf("!"))!=-1) {
-    //find left argument
-    if (i==0) return "Error: missing argument";
-    j = i-1;
-    ch = st.charAt(j);
-    if (ch>="0" && ch<="9") {// look for (decimal) number
-      j--;
-      while (j>=0 && (ch=st.charAt(j))>="0" && ch<="9") j--;
-      if (ch==".") {
-        j--;
-        while (j>=0 && (ch=st.charAt(j))>="0" && ch<="9") j--;
-      }
-    } else if (ch==")") {// look for matching opening bracket and function name
-      nested = 1;
-      j--;
-      while (j>=0 && nested>0) {
-        ch = st.charAt(j);
-        if (ch=="(") nested--;
-        else if (ch==")") nested++;
-        j--;
-      }
-      while (j>=0 && (ch=st.charAt(j))>="a" && ch<="z" || ch>="A" && ch<="Z")
-        j--;
-    } else if (ch>="a" && ch<="z" || ch>="A" && ch<="Z") {// look for variable
-      j--;
-      while (j>=0 && (ch=st.charAt(j))>="a" && ch<="z" || ch>="A" && ch<="Z")
-        j--;
-    } else { 
-      return "Error: incorrect syntax in "+st+" at position "+j;
-    }
-    st = st.slice(0,j+1)+"factorial("+st.slice(j+1,i)+")"+st.slice(i+1);
-  }
-  return st;
-}
-
-function plot(fun,x_min,x_max,points,id) {
-  var pth = [];
-  var f = function(x) { return x }, g = fun;
-  var name = null;
-  if (typeof fun=="string") 
-    eval("g = function(x){ with(Math) return "+mathjs(fun)+" }");
-  else if (typeof fun=="object") {
-    eval("f = function(t){ with(Math) return "+mathjs(fun[0])+" }");
-    eval("g = function(t){ with(Math) return "+mathjs(fun[1])+" }");
-  }
-  if (typeof x_min=="string") { name = x_min; x_min = xmin }
-  else name = id;
-  var min = (x_min==null?xmin:x_min);
-  var max = (x_max==null?xmax:x_max);
-  var inc = max-min-0.000001*(max-min);
-  inc = (points==null?inc/200:inc/points);
-  var gt;
-//alert(typeof g(min))
-  for (var t = min; t <= max; t += inc) {
-    gt = g(t);
-    if (!(isNaN(gt)||Math.abs(gt)=="Infinity")) pth[pth.length] = [f(t), gt];
-  }
-  path(pth,name)
-  return p;
-}
-
-function slopefield(fun,dx,dy) {
-  var g = fun;
-  if (typeof fun=="string") 
-    eval("g = function(x,y){ with(Math) return "+mathjs(fun)+" }");
-  var gxy,x,y,u,v,dz;
-  if (dx==null) dx=1;
-  if (dy==null) dy=1;
-  dz = Math.sqrt(dx*dx+dy*dy)/6;
-  var x_min = Math.ceil(xmin/dx);
-  var y_min = Math.ceil(ymin/dy);
-  for (x = x_min; x <= xmax; x += dx)
-    for (y = y_min; y <= ymax; y += dy) {
-      gxy = g(x,y);
-      if (!isNaN(gxy)) {
-        if (Math.abs(gxy)=="Infinity") {u = 0; v = dz;}
-        else {u = dz/Math.sqrt(1+gxy*gxy); v = gxy*u;}
-        line([x-u,y-v],[x+u,y+v]);
-      }
-    }
-}
-
-function updateCoords(ind) {
-  switchTo("picture"+(ind+1));
-  var gx=getX(), gy=getY();
-  if ((xmax-gx)*xunitlength > 6*fontsize || (gy-ymin)*yunitlength > 2*fontsize)
-    text([xmax,ymin],"("+gx.toFixed(2)+", "+gy.toFixed(2)+")",
-         "aboveleft","AScoord"+ind,"");
-  else text([xmax,ymin]," ","aboveleft","AScoord"+ind,"");
-}
-
-function updateCoords0() {updateCoords(0)}
-function updateCoords1() {updateCoords(1)}
-function updateCoords2() {updateCoords(2)}
-function updateCoords3() {updateCoords(3)}
-function updateCoords4() {updateCoords(4)}
-function updateCoords5() {updateCoords(5)}
-function updateCoords6() {updateCoords(6)}
-function updateCoords7() {updateCoords(7)}
-function updateCoords8() {updateCoords(8)}
-function updateCoords9() {updateCoords(9)}
-ASfn = [function() {updatePicture(0)},
-  function() {updatePicture(1)},
-  function() {updatePicture(2)},
-  function() {updatePicture(3)},
-  function() {updatePicture(4)},
-  function() {updatePicture(5)},
-  function() {updatePicture(6)},
-  function() {updatePicture(7)},
-  function() {updatePicture(8)},
-  function() {updatePicture(9)}];
-ASupdateCoords = [function() {updateCoords(0)},
-  function() {updateCoords(1)},
-  function() {updateCoords(2)},
-  function() {updateCoords(3)},
-  function() {updateCoords(4)},
-  function() {updateCoords(5)},
-  function() {updateCoords(6)},
-  function() {updateCoords(7)},
-  function() {updateCoords(8)},
-  function() {updateCoords(9)}];
-
-// GO1.1 Generic onload by Brothercake 
-// http://www.brothercake.com/
-//onload function
-function generic()
-{
-  drawPictures();
-};
-//setup onload function
-if(typeof window.addEventListener != 'undefined')
-{
-  //.. gecko, safari, konqueror and standard
-  window.addEventListener('load', generic, false);
-}
-else if(typeof document.addEventListener != 'undefined')
-{
-  //.. opera 7
-  document.addEventListener('load', generic, false);
-}
-else if(typeof window.attachEvent != 'undefined')
-{
-  //.. win/ie
-  window.attachEvent('onload', generic);
-}
-//** remove this condition to degrade older browsers
-else
-{
-  //.. mac/ie5 and anything else that gets this far
-  //if there's an existing onload function
-  if(typeof window.onload == 'function')
-  {
-    //store it
-    var existing = onload;
-    //add new onload handler
-    window.onload = function()
-    {
-      //call existing onload function
-      existing();
-      //call generic onload function
-      generic();
-    };
-  }
-  else
-  {
-    //setup onload function
-    window.onload = generic;
-  }
-}
+/* ASCIIsvg.js
+==============
+JavaScript routines to dynamically generate Scalable Vector Graphics
+using a mathematical xy-coordinate system (y increases upwards) and
+very intuitive JavaScript commands (no programming experience required).
+ASCIIsvg.js is good for learning math and illustrating online math texts.
+Works with Internet Explorer+Adobe SVGviewer and SVG enabled Mozilla/Firefox.
+
+Ver 1.2.7 Oct 13, 2005 (c) Peter Jipsen http://www.chapman.edu/~jipsen
+Latest version at http://www.chapman.edu/~jipsen/svg/ASCIIsvg.js
+If you use it on a webpage, please send the URL to ji...@ch...
+
+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.*/
+
+var checkIfSVGavailable = true;
+var notifyIfNoSVG = true;
+var alertIfNoSVG = false;
+var xunitlength = 20;  // pixels
+var yunitlength = 20;  // pixels
+var origin = [0,0];   // in pixels (default is bottom left corner)
+var defaultwidth = 300; defaultheight = 200; defaultborder = 0;
+var border = defaultborder;
+var strokewidth, strokedasharray, stroke, fill;
+var fontstyle, fontfamily, fontsize, fontweight, fontstroke, fontfill;
+var markerstrokewidth = "1";
+var markerstroke = "black";
+var markerfill = "yellow";
+var marker = "none";
+var arrowfill = stroke;
+var dotradius = 4;
+var ticklength = 4;
+var axesstroke = "black";
+var gridstroke = "grey";
+var pointerpos = null;
+var coordinates = null;
+var above = "above";
+var below = "below";
+var left = "left";
+var right = "right";
+var aboveleft = "aboveleft";
+var aboveright = "aboveright";
+var belowleft = "belowleft";
+var belowright = "belowright";
+var cpi = "\u03C0", ctheta = "\u03B8";
+var pi = Math.PI, ln = Math.log, e = Math.E;
+var arcsin = Math.asin, arccos = Math.acos, arctan = Math.atan;
+var sec = function(x) { return 1/Math.cos(x) };
+var csc = function(x) { return 1/Math.sin(x) };
+var cot = function(x) { return 1/Math.tan(x) };
+var xmin, xmax, ymin, ymax, xscl, yscl, 
+    xgrid, ygrid, xtick, ytick, initialized;
+var isIE = document.createElementNS==null;
+var picture, svgpicture, doc, width, height, a, b, c, d, i, n, p, t, x, y;
+var arcsec = function(x) { return arccos(1/x) };
+var arccsc = function(x) { return arcsin(1/x) };
+var arccot = function(x) { return arctan(1/x) };
+var sinh = function(x) { return (Math.exp(x)-Math.exp(-x))/2 };
+var cosh = function(x) { return (Math.exp(x)+Math.exp(-x))/2 };
+var tanh = 
+  function(x) { return (Math.exp(x)-Math.exp(-x))/(Math.exp(x)+Math.exp(-x)) };
+var sech = function(x) { return 1/cosh(x) };
+var csch = function(x) { return 1/sinh(x) };
+var coth = function(x) { return 1/tanh(x) };
+var arcsinh = function(x) { return ln(x+Math.sqrt(x*x+1)) };
+var arccosh = function(x) { return ln(x+Math.sqrt(x*x-1)) };
+var arctanh = function(x) { return ln((1+x)/(1-x))/2 };
+var sech = function(x) { return 1/cosh(x) };
+var csch = function(x) { return 1/sinh(x) };
+var coth = function(x) { return 1/tanh(x) };
+var arcsech = function(x) { return arccosh(1/x) };
+var arccsch = function(x) { return arcsinh(1/x) };
+var arccoth = function(x) { return arctanh(1/x) };
+var sign = function(x) { return (x==0?0:(x<0?-1:1)) };
+
+function factorial(x,n) {
+  if (n==null) n=1;
+  for (var i=x-n; i>0; i-=n) x*=i;
+  return (x<0?NaN:(x==0?1:x));
+}
+
+function C(x,k) {
+  var res=1;
+  for (var i=0; i<k; i++) res*=(x-i)/(k-i);
+  return res;
+}
+
+function chop(x,n) {
+  if (n==null) n=0;
+  return Math.floor(x*Math.pow(10,n))/Math.pow(10,n);
+}
+
+function ran(a,b,n) {
+  if (n==null) n=0;
+  return chop((b+Math.pow(10,-n)-a)*Math.random()+a,n);
+}
+
+function myCreateElementXHTML(t) {
+  if (isIE) return document.createElement(t);
+  else return document.createElementNS("http://www.w3.org/1999/xhtml",t);
+}
+
+function isSVGavailable() {
+  var ua = navigator.userAgent;
+  if (ua.match("AppleWebKit")) {
+      return null;
+  }
+  if (navigator.appName.slice(0,5)=="Opera") {
+      return null;
+  }
+  var nd = myCreateElementXHTML("center");
+  nd.appendChild(document.createTextNode("To view the "));
+  var an = myCreateElementXHTML("a");
+  an.appendChild(document.createTextNode("ASCIIsvg"));
+  an.setAttribute("href","http://www.chapman.edu/~jipsen/asciisvg.html");
+  nd.appendChild(an);
+  nd.appendChild(document.createTextNode(" images use Internet Explorer 6+"));
+  an = myCreateElementXHTML("a");
+  an.appendChild(document.createTextNode("Adobe SVGviewer 3.02"));
+  an.setAttribute("href","http://www.adobe.com/svg");
+  nd.appendChild(an);
+  nd.appendChild(document.createTextNode(" or "));
+  an = myCreateElementXHTML("a");
+  an.appendChild(document.createTextNode("SVG enabled Mozilla/Firefox"));
+  an.setAttribute("href",
+    "http://www.chapman.edu/~jipsen/svg/svgenabledmozillafirefox.html");
+  nd.appendChild(an);
+  if (navigator.appName.slice(0,8)=="Netscape") 
+    if (window['SVGElement']) return null;
+    else return nd;
+  else if (navigator.appName.slice(0,9)=="Microsoft")
+    try	{
+      var oSVG=eval("new ActiveXObject('Adobe.SVGCtl.3');");
+        return null;
+    } catch (e) {
+        return nd;
+    }
+  else return nd;
+}
+
+
+function less(x,y) { return x < y }  // used for scripts in XML files
+                                     // since IE does not handle CDATA well
+function setText(st,id) { 
+  var node = document.getElementById(id);
+  if (node!=null)
+    if (node.childNodes.length!=0) node.childNodes[0].nodeValue = st;
+    else node.appendChild(document.createTextNode(st));
+}
+
+function myCreateElementSVG(t) {
+  if (isIE) return doc.createElement(t);
+  else return doc.createElementNS("http://www.w3.org/2000/svg",t);
+}
+
+function getX() {
+  return (doc.getElementById("pointerpos").getAttribute("cx")-origin[0])/xunitlength;
+}
+
+function getY() {
+  return (height-origin[1]-doc.getElementById("pointerpos").getAttribute("cy"))/yunitlength;
+}
+
+function mousemove_listener(evt) {
+  if (svgpicture.getAttribute("xbase")!=null)
+    pointerpos.cx.baseVal.value = evt.clientX-svgpicture.getAttribute("xbase");
+  if (svgpicture.getAttribute("ybase")!=null)
+    pointerpos.cy.baseVal.value = evt.clientY-svgpicture.getAttribute("ybase");
+}
+
+function top_listener(evt) {
+  svgpicture.setAttribute("ybase",evt.clientY);
+}
+
+function bottom_listener(evt) { 
+  svgpicture.setAttribute("ybase",evt.clientY-height+1);
+}
+
+function left_listener(evt) {
+  svgpicture.setAttribute("xbase",evt.clientX);
+}
+
+function right_listener(evt) {
+  svgpicture.setAttribute("xbase",evt.clientX-width+1);
+}
+
+function drawPictures() { // main routine; called after webpage has loaded
+  var src, id, dsvg, onmov, nd, node, ht, index;
+  var pictures = document.getElementsByTagName("textarea");
+  for (index = 0; index<pictures.length; index++)
+    if (pictures[index].className=="ASCIIsvg"){
+      pictures[index].style.display="none";  // hide the textarea
+    }
+  pictures = document.getElementsByTagName("embed");
+  var len = pictures.length;
+ if (checkIfSVGavailable) {
+  nd = isSVGavailable();
+  if (nd != null && notifyIfNoSVG && len>0)
+    if (alertIfNoSVG)
+      alert("To view the SVG pictures in Internet Explorer\n\
+download the free Adobe SVGviewer from www.adobe.com/svg or\n\
+use Firefox 1.5 preview (called Deerpark)");
+    else {
+    var ASbody = document.getElementsByTagName("body")[0];
+    ASbody.insertBefore(nd,ASbody.childNodes[0]);
+  }
+ }
+ if (nd == null) {
+  for (index = 0; index < len; index++) {
+    xmin = null; xmax = null; ymin = null; ymax = null;
+    xscl = null; xgrid = null; yscl = null; ygrid = null;
+    initialized = false;
+    picture = (isIE ? pictures[index] : pictures[0]);
+    src = picture.getAttribute("script");
+    if (src==null) src = "";
+    ht = picture.getAttribute("height");
+    if (ht==null) ht ="";
+   if (ht!="") defaultborder = 25;
+   if (ht=="" || src=="") 
+    if (document.getElementById("picture"+(index+1)+"input")==null) {
+      if (isIE && src.indexOf("nobutton()")==-1)
+        picture.parentNode.insertBefore(myCreateElementXHTML("br"),picture);
+      node = myCreateElementXHTML("textarea");
+      node.setAttribute("rows","10");
+      node.setAttribute("cols","60");
+//      node.setAttribute("style","display:block");
+      if (isIE) src = src.replace(/([^\r])\n/g,"$1\r").slice(1);
+      node.appendChild(document.createTextNode(src));
+      if (src.indexOf("showcode()")==-1) node.style.display = "none";
+      node.setAttribute("id","picture"+(index+1)+"input");
+      picture.parentNode.insertBefore(node,picture);
+
+      if (src.indexOf("nobutton()")==-1) {
+        picture.parentNode.insertBefore(myCreateElementXHTML("br"),picture);
+
+        node = myCreateElementXHTML("button");
+        if (isIE) node.onclick = function() { showHideCode(this) };
+        else node.setAttribute("onclick","showHideCode(this)");
+        node.appendChild(document.createTextNode("Show/Hide"));
+        picture.parentNode.insertBefore(node,picture);
+
+        node = myCreateElementXHTML("button");
+        if (isIE) node.onclick = ASfn[index];
+        else node.setAttribute("onclick","updatePicture("+index+")");
+        node.appendChild(document.createTextNode("Update"));
+        if (src.indexOf("showCode()")==-1) node.style.display = "none";
+        picture.parentNode.insertBefore(node,picture);
+
+/*      node = myCreateElementXHTML("span");
+//      node.setAttribute("id","AScoord"+index);
+        node.appendChild(document.createTextNode("(x,y)"));
+        picture.parentNode.insertBefore(node,picture);
+*/
+        picture.parentNode.insertBefore(myCreateElementXHTML("br"),picture);
+      }
+      if (isIE) picture.onmousemove = ASupdateCoords[index];
+      else picture.setAttribute("onmousemove","updateCoords"+index+"()");
+    } else src = document.getElementById("picture"+(index+1)+"input").value;
+    src = src.replace(/plot\(\x20*([^\"f\[][^\n\r]+?)\,/g,"plot\(\"$1\",");
+    src = src.replace(/plot\(\x20*([^\"f\[][^\n\r]+)\)/g,"plot(\"$1\")");
+    src = src.replace(/([0-9])([a-zA-Z])/g,"$1*$2");
+    src = src.replace(/\)([\(0-9a-zA-Z])/g,"\)*$1");
+//    eval(src.replace(/\s\s/g,";")); //for XML version
+    id = picture.getAttribute("id");
+    dsvg = picture.getAttribute("src");
+    onmov = picture.getAttribute("onmousemove");
+    if (id == null || id == "") {
+      id = "picture"+(index+1);
+      picture.setAttribute("id",id);
+    }
+    try {
+      with (Math) eval(src);
+    } catch(err) {alert(err+"\n"+src)}
+    if (isIE) src = src.replace(/([^\r])\n/g,"$1\r");
+    setText("<embed width=\""+width+"\" height=\""+height+"\" src=\""+
+            dsvg+"\" "+(onmov!=null?"onmousemove=\""+onmov+"\"":"")+
+            (isIE?"\r":"\n")+"script=\'"+src+"\'>",id+"script");
+//    setText(src.replace(/\s\s/g,"\r"),id+"script"); //for XML version
+  }
+ }
+}
+
+function switchTo(id) {
+//alert(id);
+  picture = document.getElementById(id);
+  width = picture.getAttribute("width")-0;
+  height = picture.getAttribute("height")-0;
+  strokewidth = "1" // pixel
+  stroke = "black"; // default line color
+  fill = "none";    // default fill color
+  marker = "none";
+  if ((picture.nodeName == "EMBED" || picture.nodeName == "embed") && isIE) {
+    svgpicture = picture.getSVGDocument().getElementById("root");
+    doc = picture.getSVGDocument();
+  } else {
+    picture.setAttribute("onmousemove","updateCoords"+(id.slice(id.length-1)-1)+"()");
+//alert(picture.getAttribute("onmousemove")+"***");
+    svgpicture = picture;
+    doc = document;
+  }
+  xunitlength = svgpicture.getAttribute("xunitlength")-0;
+  yunitlength = svgpicture.getAttribute("yunitlength")-0;
+  xmin = svgpicture.getAttribute("xmin")-0;
+  xmax = svgpicture.getAttribute("xmax")-0;
+  ymin = svgpicture.getAttribute("ymin")-0;
+  ymax = svgpicture.getAttribute("ymax")-0;
+  origin = [svgpicture.getAttribute("ox")-0,svgpicture.getAttribute("oy")-0];
+}
+
+function updatePicture(obj) {
+//alert(typeof obj)
+  var src = document.getElementById((typeof obj=="string"?
+              obj:"picture"+(obj+1)+"input")).value;
+  xmin = null; xmax = null; ymin = null; ymax = null;
+  xscl = null; xgrid = null; yscl = null; ygrid = null;
+  initialized = false;
+  switchTo((typeof obj=="string"?obj.slice(0,8):"picture"+(obj+1)));
+  src = src.replace(/plot\(\x20*([^\"f\[][^\n\r]+?)\,/g,"plot\(\"$1\",");
+  src = src.replace(/plot\(\x20*([^\"f\[][^\n\r]+)\)/g,"plot(\"$1\")");
+  src = src.replace(/([0-9])([a-zA-Z])/g,"$1*$2");
+  src = src.replace(/\)([\(0-9a-zA-Z])/g,"\)*$1");
+//alert(src);
+  try {
+    with (Math) eval(src);
+  } catch(err) {alert(err+"\n"+src)}
+}
+
+function showHideCode(obj) {
+  var node = obj.nextSibling;
+  while (node != null && node.nodeName != "BUTTON" && 
+    node.nodeName != "button") node = node.nextSibling;
+  if (node.style.display == "none") node.style.display = "";
+  else node.style.display = "none";
+  while (node != null && node.nodeName != "TEXTAREA" && 
+    node.nodeName != "textarea") node = node.previousSibling;
+  if (node.style.display == "none") node.style.display = "";
+  else node.style.display = "none";
+//  updatePicture(node.getAttribute("id"));
+}
+
+function hideCode() { //do nothing
+}
+
+function showcode() { //do nothing
+}
+
+function nobutton() { //do nothing
+}
+
+function setBorder(x) { border = x }
+
+function initPicture(x_min,x_max,y_min,y_max) {
+ if (!initialized) {
+  strokewidth = "1"; // pixel
+  strokedasharray = null;
+  stroke = "black"; // default line color
+  fill = "none";    // default fill color
+  fontstyle = "italic"; // default shape for text labels
+  fontfamily = "times"; // default font
+  fontsize = "16";      // default size
+  fontweight = "normal";
+  fontstroke = "none";  // default font outline color
+  fontfill = "none";    // default font color
+  marker = "none";
+  initialized = true;
+  if (x_min!=null) xmin = x_min;
+  if (x_max!=null) xmax = x_max;
+  if (y_min!=null) ymin = y_min;
+  if (y_max!=null) ymax = y_max;
+  if (xmin==null) xmin = -5;
+  if (xmax==null) xmax = 5;
+ if (typeof xmin != "number" || typeof xmax != "number" || xmin >= xmax) 
+   alert("Picture requires at least two numbers: xmin < xmax");
+ else if (y_max != null && (typeof y_min != "number" || 
+          typeof y_max != "number" || y_min >= y_max))
+   alert("initPicture(xmin,xmax,ymin,ymax) requires numbers ymin < ymax");
+ else {
+  if (width==null) width = picture.getAttribute("width");
+  else picture.setAttribute("width",width);
+  if (width==null || width=="") width=defaultwidth;
+  if (height==null) height = picture.getAttribute("height");
+  else picture.setAttribute("height",height);
+  if (height==null || height=="") height=defaultheight;
+  xunitlength = (width-2*border)/(xmax-xmin);
+  yunitlength = xunitlength;
+//alert(xmin+" "+xmax+" "+ymin+" "+ymax)
+  if (ymin==null) {
+    origin = [-xmin*xunitlength+border,height/2];
+    ymin = -(height-2*border)/(2*yunitlength);
+    ymax = -ymin;
+  } else {
+    if (ymax!=null) yunitlength = (height-2*border)/(ymax-ymin);
+    else ymax = (height-2*border)/yunitlength + ymin;
+    origin = [-xmin*xunitlength+border,-ymin*yunitlength+border];
+  }
+//  if (true ||picture.nodeName == "EMBED" || picture.nodeName == "embed") {
+    if (isIE) {
+      svgpicture = picture.getSVGDocument().getElementById("root");
+      while (svgpicture.childNodes.length()>5) 
+        svgpicture.removeChild(svgpicture.lastChild); 
+      svgpicture.setAttribute("width",width);
+      svgpicture.setAttribute("height",height);
+      doc = picture.getSVGDocument();
+    } else {
+      var qnode = document.createElementNS("http://www.w3.org/2000/svg","svg");
+      qnode.setAttribute("id",picture.getAttribute("id"));
+      qnode.setAttribute("style","display:inline");
+      qnode.setAttribute("width",picture.getAttribute("width"));
+      qnode.setAttribute("height",picture.getAttribute("height"));
+      if (picture.parentNode!=null)
+        picture.parentNode.replaceChild(qnode,picture);
+      else
+        svgpicture.parentNode.replaceChild(qnode,svgpicture);
+      svgpicture = qnode;
+      doc = document;
+      pointerpos = doc.getElementById("pointerpos");
+      if (pointerpos==null) {
+        pointerpos = myCreateElementSVG("circle");
+        pointerpos.setAttribute("id","pointerpos");
+        pointerpos.setAttribute("cx",0);
+        pointerpos.setAttribute("cy",0);
+        pointerpos.setAttribute("r",0.5);
+        pointerpos.setAttribute("fill","red");
+        svgpicture.appendChild(pointerpos);
+      }
+    }
+//  } else {
+//    svgpicture = picture;
+//    doc = document;
+//  }
+  svgpicture.setAttribute("xunitlength",xunitlength);
+  svgpicture.setAttribute("yunitlength",yunitlength);
+  svgpicture.setAttribute("xmin",xmin);
+  svgpicture.setAttribute("xmax",xmax);
+  svgpicture.setAttribute("ymin",ymin);
+  svgpicture.setAttribute("ymax",ymax);
+  svgpicture.setAttribute("ox",origin[0]);
+  svgpicture.setAttribute("oy",origin[1]);
+  var node = myCreateElementSVG("rect");
+  node.setAttribute("x","0");
+  node.setAttribute("y","0");
+  node.setAttribute("width",width);
+  node.setAttribute("height",height);
+  node.setAttribute("style","stroke-width:1;fill:white");
+  svgpicture.appendChild(node);
+  if (!isIE && picture.getAttribute("onmousemove")!=null) {
+    svgpicture.addEventListener("mousemove", mousemove_listener, true);
+    var st = picture.getAttribute("onmousemove");
+    svgpicture.addEventListener("mousemove", eval(st.slice(0,st.indexOf("("))), true);
+    node = myCreateElementSVG("polyline");
+    node.setAttribute("points","0,0 "+width+",0");
+    node.setAttribute("style","stroke:white; stroke-width:3");
+    node.addEventListener("mousemove", top_listener, true);
+    svgpicture.appendChild(node);
+    node = myCreateElementSVG("polyline");
+    node.setAttribute("points","0,"+height+" "+width+","+height);
+    node.setAttribute("style","stroke:white; stroke-width:3");
+    node.addEventListener("mousemove", bottom_listener, true);
+    svgpicture.appendChild(node);
+    node = myCreateElementSVG("polyline");
+    node.setAttribute("points","0,0 0,"+height);
+    node.setAttribute("style","stroke:white; stroke-width:3");
+    node.addEventListener("mousemove", left_listener, true);
+    svgpicture.appendChild(node);
+    node = myCreateElementSVG("polyline");
+    node.setAttribute("points",(width-1)+",0 "+(width-1)+","+height);
+    node.setAttribute("style","stroke:white; stroke-width:3");
+    node.addEventListener("mousemove", right_listener, true);
+    svgpicture.appendChild(node);
+  }
+  border = defaultborder;
+ }
+ }
+}
+
+function line(p,q,id) { // segment connecting points p,q (coordinates in units)
+  var node;
+  if (id!=null) node = doc.getElementById(id);
+  if (node==null) {
+    node = myCreateElementSVG("path");
+    node.setAttribute("id", id);
+    svgpicture.appendChild(node);
+  }
+  node.setAttribute("d","M"+(p[0]*xunitlength+origin[0])+","+
+    (heig...
 
[truncated message content]

286 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 110 111 112 113 114 .. 538 > >> (Page 112 of 538)