From 917555784cbf16dac6bbdc959ded9e8bfd3ef76a Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Thu, 4 Mar 2010 10:48:07 +0000
Subject: [PATCH] Replace tabs by spaces; remove EOL spaces

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@7302 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/plugin/AddComment.php             |  20 +-
 lib/plugin/AllPages.php               |  68 +--
 lib/plugin/AllUsers.php               |   6 +-
 lib/plugin/AnalyseAccessLogSql.php    |  36 +-
 lib/plugin/AppendText.php             |  42 +-
 lib/plugin/AsciiMath.php              |  14 +-
 lib/plugin/AsciiSVG.php               |  32 +-
 lib/plugin/BackLinks.php              | 110 ++--
 lib/plugin/BlogArchives.php           |  24 +-
 lib/plugin/BlogJournal.php            |  14 +-
 lib/plugin/BoxRight.php               |   4 +-
 lib/plugin/CacheTest.php              |   2 +-
 lib/plugin/Calendar.php               |  22 +-
 lib/plugin/CalendarList.php           |  58 +--
 lib/plugin/Chart.php                  |  14 +-
 lib/plugin/CreateBib.php              |  28 +-
 lib/plugin/CreatePage.php             |  76 +--
 lib/plugin/CreateToc.php              | 130 ++---
 lib/plugin/Diff.php                   |  18 +-
 lib/plugin/DynamicIncludePage.php     |  20 +-
 lib/plugin/EditMetaData.php           | 106 ++--
 lib/plugin/ExternalSearch.php         |  36 +-
 lib/plugin/FileInfo.php               | 336 ++++++-------
 lib/plugin/FoafViewer.php             |  40 +-
 lib/plugin/FrameInclude.php           |   6 +-
 lib/plugin/FullTextSearch.php         |  26 +-
 lib/plugin/GoTo.php                   |   8 +-
 lib/plugin/GoogleMaps.php             |  62 +--
 lib/plugin/GooglePlugin.php           |  10 +-
 lib/plugin/GraphViz.php               |  86 ++--
 lib/plugin/HtmlConverter.php          | 200 ++++----
 lib/plugin/Imdb.php                   |   4 +-
 lib/plugin/IncludePage.php            |  12 +-
 lib/plugin/IncludePages.php           |  18 +-
 lib/plugin/IncludeSiteMap.php         |   4 +-
 lib/plugin/InterWikiSearch.php        |  12 +-
 lib/plugin/JabberPresence.php         |  16 +-
 lib/plugin/LdapSearch.php             | 126 ++---
 lib/plugin/LinkDatabase.php           |  42 +-
 lib/plugin/LinkSearch.php             | 212 ++++----
 lib/plugin/ListPages.php              |  20 +-
 lib/plugin/ListRelations.php          |  10 +-
 lib/plugin/MediawikiTable.php         |  38 +-
 lib/plugin/ModeratedPage.php          | 264 +++++-----
 lib/plugin/MostPopular.php            |   6 +-
 lib/plugin/NewPagesPerUser.php        | 128 ++---
 lib/plugin/NoCache.php                |   4 +-
 lib/plugin/OldStyleTable.php          |  16 +-
 lib/plugin/OrphanedPages.php          |   4 +-
 lib/plugin/PageDump.php               |  14 +-
 lib/plugin/PageGroup.php              |   6 +-
 lib/plugin/PageHistory.php            |  54 +-
 lib/plugin/PageInfo.php               |   2 +-
 lib/plugin/PageTrail.php              |   2 +-
 lib/plugin/PasswordReset.php          | 226 ++++-----
 lib/plugin/PhotoAlbum.php             | 136 ++---
 lib/plugin/PhpWeather.php             |   2 +-
 lib/plugin/Ploticus.php               |  94 ++--
 lib/plugin/PluginManager.php          |  10 +-
 lib/plugin/PopUp.php                  |  64 +--
 lib/plugin/PopularNearby.php          |  22 +-
 lib/plugin/PopularTags.php            |  54 +-
 lib/plugin/PreferenceApp.php          |  88 ++--
 lib/plugin/Processing.php             |  32 +-
 lib/plugin/RandomPage.php             |   4 +-
 lib/plugin/RateIt.php                 | 172 +++----
 lib/plugin/RawHtml.php                |  28 +-
 lib/plugin/RecentChanges.php          | 276 +++++-----
 lib/plugin/RecentChangesCached.php    |  32 +-
 lib/plugin/RecentComments.php         |  22 +-
 lib/plugin/RecentReferrers.php        |   6 +-
 lib/plugin/RedirectTo.php             |   2 +-
 lib/plugin/RelatedChanges.php         |   6 +-
 lib/plugin/RichTable.php              |  20 +-
 lib/plugin/RssFeed.php                |  26 +-
 lib/plugin/SearchHighlight.php        |  18 +-
 lib/plugin/SemanticRelations.php      |  46 +-
 lib/plugin/SemanticSearch.php         | 696 +++++++++++++-------------
 lib/plugin/SemanticSearchAdvanced.php | 244 ++++-----
 lib/plugin/SiteMap.php                |  18 +-
 lib/plugin/SpellCheck.php             |  92 ++--
 lib/plugin/SqlResult.php              |  42 +-
 lib/plugin/SyncWiki.php               | 526 +++++++++----------
 lib/plugin/SyntaxHighlighter.php      |  12 +-
 lib/plugin/SystemInfo.php             |  24 +-
 lib/plugin/TeX2png.php                |  66 +--
 lib/plugin/Template.php               |  52 +-
 lib/plugin/TexToPng.php               |  88 ++--
 lib/plugin/TitleSearch.php            |  18 +-
 lib/plugin/Transclude.php             |  14 +-
 lib/plugin/TranslateText.php          |   6 +-
 lib/plugin/UnfoldSubpages.php         |  58 +--
 lib/plugin/UpLoad.php                 |  64 +--
 lib/plugin/UriResolver.php            |  18 +-
 lib/plugin/UserPreferences.php        |  24 +-
 lib/plugin/UserRatings.php            |  52 +-
 lib/plugin/VisualWiki.php             |  28 +-
 lib/plugin/WantedPages.php            |  54 +-
 lib/plugin/WatchPage.php              |  68 +--
 lib/plugin/WhoIsOnline.php            |  40 +-
 lib/plugin/WikiAdminChmod.php         |  20 +-
 lib/plugin/WikiAdminChown.php         |  16 +-
 lib/plugin/WikiAdminMarkup.php        |  16 +-
 lib/plugin/WikiAdminPurge.php         |   6 +-
 lib/plugin/WikiAdminRemove.php        |  12 +-
 lib/plugin/WikiAdminRename.php        |  84 ++--
 lib/plugin/WikiAdminSearchReplace.php |  52 +-
 lib/plugin/WikiAdminSelect.php        |  10 +-
 lib/plugin/WikiAdminSetAcl.php        |  44 +-
 lib/plugin/WikiAdminSetExternal.php   |   8 +-
 lib/plugin/WikiAdminUtils.php         | 104 ++--
 lib/plugin/WikiBlog.php               | 102 ++--
 lib/plugin/WikiForm.php               |   2 +-
 lib/plugin/WikiFormRich.php           | 288 +++++------
 lib/plugin/WikiForum.php              |   6 +-
 lib/plugin/WikiPoll.php               | 116 ++---
 lib/plugin/WikicreoleTable.php        |  24 +-
 lib/plugin/YouTube.php                | 268 +++++-----
 lib/plugin/_AuthInfo.php              |  24 +-
 lib/plugin/_BackendInfo.php           |  60 +--
 lib/plugin/_GroupInfo.php             |   2 +-
 lib/plugin/_Retransform.php           |  32 +-
 lib/plugin/_WikiTranslation.php       |  96 ++--
 lib/plugin/text2png.php               |  70 +--
 124 files changed, 3910 insertions(+), 3910 deletions(-)

diff --git a/lib/plugin/AddComment.php b/lib/plugin/AddComment.php
index bf93c215d..cb3d966f2 100644
--- a/lib/plugin/AddComment.php
+++ b/lib/plugin/AddComment.php
@@ -2,7 +2,7 @@
 rcs_id('$Id$');
 /*
  * Copyright (C) 2004 $ThePhpWikiProgrammingTeam
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -59,7 +59,7 @@ extends WikiPlugin_WikiBlog
     //         'add'      - only show entry box for new comment
     //         'show,add' - show old comments, then entry box
     //         'add,show' - show entry box followed by list of comments
-    //  jshide - boolean  - quick javascript expansion of the comments 
+    //  jshide - boolean  - quick javascript expansion of the comments
     //                      and addcomment box
 
     function getDefaultArguments() {
@@ -80,7 +80,7 @@ extends WikiPlugin_WikiBlog
         // Get our form args.
         $comment = $request->getArg("comment");
         $request->setArg('comment', false);
-            
+
         if ($request->isPost() and !empty($comment['addcomment'])) {
             $this->add($request, $comment, 'comment'); // noreturn
         }
@@ -125,12 +125,12 @@ function togglecomments(a) {
                 $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);
-		}
+                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));
@@ -139,7 +139,7 @@ function togglecomments(a) {
         $html->pushContent($div);
         return $html;
     }
-   
+
 };
 
 // For emacs users
diff --git a/lib/plugin/AllPages.php b/lib/plugin/AllPages.php
index 65fd2fa9f..496ede37a 100644
--- a/lib/plugin/AllPages.php
+++ b/lib/plugin/AllPages.php
@@ -56,7 +56,7 @@ extends WikiPlugin
                    'userpages'     => false
                    ));
     }
-    
+
     // info arg allows multiple columns
     // info=mtime,hits,summary,version,author,locked,minor,markup or all
     // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges
@@ -72,53 +72,53 @@ extends WikiPlugin
             $timer = new DebugTimer;
         }
         $caption = _("All pages in this wiki ({total} total):");
-        
+
         if ( !empty($args['userpages']) ) {
             $pages = PageList::allUserPages($args['include_empty'],
                                                $args['sortby'], ''
-					       );
-	    $caption = _("List of user-created pages ({total} total):");
-	    $args['count'] = $request->getArg('count');
+                                               );
+            $caption = _("List of user-created pages ({total} total):");
+            $args['count'] = $request->getArg('count');
         } elseif ( !empty($args['owner']) ) {
             $pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'],
                                                $args['sortby'], ''
-					       );
-	    $caption = fmt("List of pages owned by [%s] ({total} total):", 
-			   WikiLink($args['owner'] == '[]' 
-				    ? $request->_user->getAuthenticatedId() 
-				    : $args['owner'], 
-				    'if_known'));
-	    $args['count'] = $request->getArg('count');
-	    $pages->_options['count'] = $args['count'];
+                                               );
+            $caption = fmt("List of pages owned by [%s] ({total} total):",
+                           WikiLink($args['owner'] == '[]'
+                                    ? $request->_user->getAuthenticatedId()
+                                    : $args['owner'],
+                                    'if_known'));
+            $args['count'] = $request->getArg('count');
+            $pages->_options['count'] = $args['count'];
         } elseif ( !empty($args['author']) ) {
             $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'],
-                                                $args['sortby'], '' 
-						);
-	    $caption = fmt("List of pages last edited by [%s] ({total} total):", 
-			   WikiLink($args['author'] == '[]' 
-				    ? $request->_user->getAuthenticatedId() 
-				    : $args['author'], 
-				    'if_known'));
-	    $args['count'] = $request->getArg('count');
-	    $pages->_options['count'] = $args['count'];
+                                                $args['sortby'], ''
+                                                );
+            $caption = fmt("List of pages last edited by [%s] ({total} total):",
+                           WikiLink($args['author'] == '[]'
+                                    ? $request->_user->getAuthenticatedId()
+                                    : $args['author'],
+                                    'if_known'));
+            $args['count'] = $request->getArg('count');
+            $pages->_options['count'] = $args['count'];
         } elseif ( !empty($args['creator']) ) {
             $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'],
                                                  $args['sortby'], ''
-						 );
-	    $caption = fmt("List of pages created by [%s] ({total} total):", 
-			   WikiLink($args['creator'] == '[]' 
-				    ? $request->_user->getAuthenticatedId() 
-				    : $args['creator'],
-				    'if_known'));
-	    $args['count'] = $request->getArg('count');
-	    $pages->_options['count'] = $args['count'];
+                                                 );
+            $caption = fmt("List of pages created by [%s] ({total} total):",
+                           WikiLink($args['creator'] == '[]'
+                                    ? $request->_user->getAuthenticatedId()
+                                    : $args['creator'],
+                                    'if_known'));
+            $args['count'] = $request->getArg('count');
+            $pages->_options['count'] = $args['count'];
         //} 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');
+            else
+                $args['count'] = $request->getArg('count');
         }
         if (empty($args['count']) and !empty($pages))
             $args['count'] = count($pages);
@@ -132,7 +132,7 @@ extends WikiPlugin
         if ($pages !== false)
             $pagelist->addPageList($pages);
         else
-            $pagelist->addPages( $dbi->getAllPages($args['include_empty'], $args['sortby'], 
+            $pagelist->addPages( $dbi->getAllPages($args['include_empty'], $args['sortby'],
                                                    $args['limit']) );
         if (defined('DEBUG') && DEBUG && $args['debug']) {
             return HTML($pagelist,
diff --git a/lib/plugin/AllUsers.php b/lib/plugin/AllUsers.php
index 68c80186e..c9d8631b6 100644
--- a/lib/plugin/AllUsers.php
+++ b/lib/plugin/AllUsers.php
@@ -25,9 +25,9 @@ require_once('lib/PageList.php');
 /**
  * Based on AllPages and WikiGroup.
  *
- * We list all users, 
- * either homepage users (prefs stored in a page), 
- * users with db prefs and 
+ * We list all users,
+ * either homepage users (prefs stored in a page),
+ * users with db prefs and
  * externally authenticated users with a db users table, if auth_user_exists is defined.
  */
 class WikiPlugin_AllUsers
diff --git a/lib/plugin/AnalyseAccessLogSql.php b/lib/plugin/AnalyseAccessLogSql.php
index 89ce6801d..a7ba89630 100644
--- a/lib/plugin/AnalyseAccessLogSql.php
+++ b/lib/plugin/AnalyseAccessLogSql.php
@@ -66,12 +66,12 @@ extends WikiPlugin
         $query = '';
         $backend_type = $request->_dbi->_backend->backendType();
         switch ($backend_type) {
-        case 'mysql': 
+        case 'mysql':
             $Referring_URL = "left(referer,length(referer)-instr(reverse(referer),'?'))"; break;
-        case 'pgsql': 
-        case 'postgres7': 
+        case 'pgsql':
+        case 'postgres7':
             $Referring_URL = "substr(referer,0,position('?' in referer))"; break;
-        default: 
+        default:
             $Referring_URL = "referer";
         }
         switch ($args['mode']) {
@@ -101,12 +101,12 @@ extends WikiPlugin
             if ($where_conditions<>'')
                 $where_conditions = 'WHERE '.$where_conditions.' ';
             switch ($backend_type) {
-            case 'mysql': 
+            case 'mysql':
                 $Referring_Domain = "left(referer, if(locate('/', referer, 8) > 0,locate('/', referer, 8) -1, length(referer)))"; break;
-            case 'pgsql': 
-            case 'postgres7': 
+            case 'pgsql':
+            case 'postgres7':
                 $Referring_Domain = "substr(referer,0,8) || regexp_replace(substr(referer,8), '/.*', '')"; break;
-            default: 
+            default:
                 $Referring_Domain = "referer"; break;
             }
             $query = "SELECT "
@@ -183,13 +183,13 @@ extends WikiPlugin
             // If PHPSESSID appears in the URI, just display the URI to the left of this
             $sessname = session_name();
             switch ($backend_type) {
-            case 'mysql': 
+            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': 
+            case 'pgsql':
+            case 'postgres7':
                 $Request_URI = "regexp_replace(request_uri, '$sessname.*', '')"; break;
-            default: 
+            default:
                 $Request_URI = 'request_uri'; break;
             }
             $now = time();
@@ -239,7 +239,7 @@ extends WikiPlugin
         return array(
                      'mode'             => 'referring_domains',
                      // referring_domains, referring_urls, remote_hosts, users, host_users, search_bots, search_bots_hits
-                     'caption'          => '', 
+                     '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:
@@ -356,19 +356,19 @@ extends WikiPlugin
             $len = strlen($localhost);
             $backend_type = $request->_dbi->_backend->backendType();
             switch ($backend_type) {
-            case 'mysql': 
+            case 'mysql':
                 $ref_localhost = "left(referer,$len)<>'$localhost'"; break;
-            case 'pgsql': 
-            case 'postgres7': 
+            case 'pgsql':
+            case 'postgres7':
                 $ref_localhost = "substr(referer,0,$len)<>'$localhost'"; break;
-            default: 
+            default:
                 $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) 
+        // conditions string, so that following SQL clauses (such as GROUP BY)
         // will not cause a syntax error
         if ($where_conditions<>'')
             $where_conditions = $where_conditions.' ';
diff --git a/lib/plugin/AppendText.php b/lib/plugin/AppendText.php
index 16df53df1..b5f4548a0 100644
--- a/lib/plugin/AppendText.php
+++ b/lib/plugin/AppendText.php
@@ -28,7 +28,7 @@ rcs_id('$Id$');
  * See http://sourceforge.net/mailarchive/message.php?msg_id=10141823
  * why not to use "text" as parameter. Nasty mozilla bug with mult. radio rows.
  *
- * Todo: multiple pages. e.g. AppendText s=~[CategoryINtime~] page=<!plugin TitleSearch intime !> 
+ * Todo: multiple pages. e.g. AppendText s=~[CategoryINtime~] page=<!plugin TitleSearch intime !>
  */
 class WikiPlugin_AppendText
 extends WikiPlugin
@@ -48,7 +48,7 @@ extends WikiPlugin
 
     function getDefaultArguments() {
         return array('page'     => '[pagename]',
-		     'pages'    => false,
+                     'pages'    => false,
                      's'        => '',  // Text to append.
                      'before'   => '',  // Add before (ignores after if defined)
                      'after'    => '',  // Add after line beginning with this
@@ -65,17 +65,17 @@ extends WikiPlugin
     function run($dbi, $argstr, &$request, $basepage) {
 
         $args = $this->getArgs($argstr, $request);
-	if (!$args['pages'] or !$request->isPost()) {
-	    return $this->_work($args['page'], $args, $dbi, $request);
-	} else {
-	    $html = HTML();
-	    if ($args['page'] != $basepage)
-		$html->pushContent("pages argument overrides page argument. ignored.",HTML::br());
-	    foreach ($args['pages'] as $pagename) {
-		$html->pushContent($this->_work($pagename, $args, $dbi, $request));
-	    }
-	    return $html;
-	}
+        if (!$args['pages'] or !$request->isPost()) {
+            return $this->_work($args['page'], $args, $dbi, $request);
+        } else {
+            $html = HTML();
+            if ($args['page'] != $basepage)
+                $html->pushContent("pages argument overrides page argument. ignored.",HTML::br());
+            foreach ($args['pages'] as $pagename) {
+                $html->pushContent($this->_work($pagename, $args, $dbi, $request));
+            }
+            return $html;
+        }
     }
 
     function _work($pagename, $args, $dbi, &$request) {
@@ -95,7 +95,7 @@ extends WikiPlugin
                                             $pagename));
             return $message;
         }
-            
+
         $current = $page->getCurrentRevision();
         $oldtext = $current->getPackedContent();
         $text = $args['s'];
@@ -104,15 +104,15 @@ extends WikiPlugin
         if (!empty($args['before'])) {
             $before = preg_quote($args['before'], "/");
             // Insert before
-            $newtext = preg_match("/\n${before}/", $oldtext) 
+            $newtext = preg_match("/\n${before}/", $oldtext)
                 ? preg_replace("/(\n${before})/",
                                "\n" .  preg_quote($text, "/") . "\\1",
-                               $oldtext) 
+                               $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) 
+            $newtext = preg_match("/\n${after}/", $oldtext)
                 ? preg_replace("/(\n${after})/",
                                "\\1\n" .  preg_quote($text, "/"),
                                $oldtext)
@@ -129,19 +129,19 @@ extends WikiPlugin
         if ($page->save($newtext, $current->getVersion() + 1, $meta)) {
             $message->pushContent(_("Page successfully updated."), HTML::br());
         }
-        
+
         // AppendText has been called from the same page that got modified
         // so we directly show the page.
         if ( $request->getArg($pagename) == $pagename ) {
-            // TODO: Just invalidate the cache, if AppendText didn't 
+            // 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
         } elseif ($args['redirect']) {
             return $request->redirect(WikiURL($pagename, false, 'absurl'), false);
-            
+
         } else {
             $link = HTML::em(WikiLink($pagename));
             $message->pushContent(HTML::Raw(sprintf(_("Go to %s."), $link->asXml())));
diff --git a/lib/plugin/AsciiMath.php b/lib/plugin/AsciiMath.php
index 4e1c4634f..781dfc2f7 100644
--- a/lib/plugin/AsciiMath.php
+++ b/lib/plugin/AsciiMath.php
@@ -27,19 +27,19 @@ if (phpversion() >= '5') {
     require_once("lib/ASCIIMathPHP/ASCIIMathPHP.class.php");
 }
 
-/** 
+/**
  * Render ASCII math as MathML
  * Requires ENABLE_XHTML_XML = true
  * See http://www.jcphysics.com/ASCIIMath/
  * 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>
+        <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
diff --git a/lib/plugin/AsciiSVG.php b/lib/plugin/AsciiSVG.php
index 8821763bd..07a37e77d 100644
--- a/lib/plugin/AsciiSVG.php
+++ b/lib/plugin/AsciiSVG.php
@@ -44,8 +44,8 @@ extends WikiPlugin
     function getDefaultArguments() {
         return array('width'  => 200,
                      'height' => 200,
-		     'script' => false, // one line script. not very likely
-		     'onmousemove' => false
+                     'script' => false, // one line script. not very likely
+                     'onmousemove' => false
                      );
     }
     function handle_plugin_args_cruft(&$argstr, &$args) {
@@ -67,21 +67,21 @@ extends WikiPlugin
                 $html->pushContent($js);
             $WikiTheme->_asciiSVG = 1; // prevent duplicates
         }
-	// extract <script>
-	if (preg_match("/^(.*)<script>(.*)<\/script>/ism", $this->source, $m)) {
-	    $this->source = $m[1];
-	    $args['script'] = $m[2];
-	}
-	$embedargs = array('width'  => $args['width'],
-			   'height' => $args['height'],
-			   //'src'    => "d.svg",
-			   'script' => $this->source);
-	// additional onmousemove argument
-	if ($args['onmousemove']) $embedargs['onmousemove'] = $args['onmousemove'];
+        // extract <script>
+        if (preg_match("/^(.*)<script>(.*)<\/script>/ism", $this->source, $m)) {
+            $this->source = $m[1];
+            $args['script'] = $m[2];
+        }
+        $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"
         $embed = new AsciiSVG_HTML("embed", $embedargs);
         $html->pushContent($embed);
-	if ($args['script']) $html->pushContent(JavaScript($args['script']));
+        if ($args['script']) $html->pushContent(JavaScript($args['script']));
         return $html;
     }
 };
@@ -89,7 +89,7 @@ extends WikiPlugin
 class AsciiSVG_HTML extends HtmlElement {
     function startTag() {
         $start = "<" . $this->_tag;
-	$this->_setClasses();
+        $this->_setClasses();
         foreach ($this->_attr as $attr => $val) {
             if (is_bool($val)) {
                 if (!$val)
@@ -98,7 +98,7 @@ class AsciiSVG_HTML extends HtmlElement {
             }
             $qval = str_replace("\"", '&quot;', $this->_quote((string)$val));
             if ($attr == 'script')
-		// note the ' not "
+                // note the ' not "
                 $start .= " $attr='$qval'";
             else
                 $start .= " $attr=\"$qval\"";
diff --git a/lib/plugin/BackLinks.php b/lib/plugin/BackLinks.php
index 4ad4be08b..845faebb3 100644
--- a/lib/plugin/BackLinks.php
+++ b/lib/plugin/BackLinks.php
@@ -30,16 +30,16 @@ extends WikiPlugin
     function getName() {
         return _("BackLinks");
     }
-    
+
     function getDescription() {
         return sprintf(_("List all pages which link to %s."), '[pagename]');
     }
-    
+
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
                             "\$Revision$");
     }
-    
+
     function getDefaultArguments() {
         return array_merge
             (
@@ -47,8 +47,8 @@ extends WikiPlugin
              array('include_self' => false,
                    'noheader'     => false,
                    'page'         => '[pagename]',
-		   'linkmore'     => '',  // If count>0 and limit>0 display a link with 
-		     // the number of all results, linked to the given pagename.
+                   'linkmore'     => '',  // If count>0 and limit>0 display a link with
+                     // the number of all results, linked to the given pagename.
                    ));
     }
 
@@ -70,39 +70,39 @@ extends WikiPlugin
         if ($info) {
             $info = explode(",", $info);
             if (in_array('count',$info))
-                $args['types']['count'] = 
+                $args['types']['count'] =
                     new _PageList_Column_BackLinks_count('count', _("#"), 'center');
         }
-	if (!empty($limit))
-	    $args['limit'] = $limit;
+        if (!empty($limit))
+            $args['limit'] = $limit;
         $args['dosort'] = !empty($args['sortby']); // override DB sort (??)
         $pagelist = new PageList($info, $exclude, $args);
 
         // support logical AND: page1,page2
-	$pages = explodePageList($page);
-	$count = count($pages);
-	if (count($pages) > 1) {
-	    // AND: the intersection of all these pages
-	    $bl = array();
-	    foreach ($pages as $p) {
-		$dp = $dbi->getPage($p);
-		$bi = $dp->getBackLinks(false, $sortby, 0, $exclude);
-		while ($b = $bi->next()) {
-		    $name = $b->getName();
-	            if (isset($bl[$name]))
-	                $bl[$name]++;
-	            else 
-	                $bl[$name] = 1;   
-                } 
-	    }
-	    foreach ($bl as $b => $v)
-	        if ($v == $count)
-	            $pagelist->addPage($b);
-	} else {
-	    $p = $dbi->getPage($page);
-	    $pagelist->addPages($p->getBackLinks(false, $sortby, 0, $exclude));
-	}
-	$total = $pagelist->getTotal();
+        $pages = explodePageList($page);
+        $count = count($pages);
+        if (count($pages) > 1) {
+            // AND: the intersection of all these pages
+            $bl = array();
+            foreach ($pages as $p) {
+                $dp = $dbi->getPage($p);
+                $bi = $dp->getBackLinks(false, $sortby, 0, $exclude);
+                while ($b = $bi->next()) {
+                    $name = $b->getName();
+                    if (isset($bl[$name]))
+                        $bl[$name]++;
+                    else
+                        $bl[$name] = 1;
+                }
+            }
+            foreach ($bl as $b => $v)
+                if ($v == $count)
+                    $pagelist->addPage($b);
+        } else {
+            $p = $dbi->getPage($page);
+            $pagelist->addPages($p->getBackLinks(false, $sortby, 0, $exclude));
+        }
+        $total = $pagelist->getTotal();
 
         // Localization note: In English, the differences between the
         // various phrases spit out here may seem subtle or negligible
@@ -112,8 +112,8 @@ extends WikiPlugin
         // distinction as it does with English in this case. :)
         if (!$noheader) {
             if ($page == $request->getArg('pagename')
-                and !$dbi->isWikiPage($page)) 
-	    {
+                and !$dbi->isWikiPage($page))
+            {
                     // BackLinks plugin is more than likely being called
                     // upon for an empty page on said page, while either
                     // 'browse'ing, 'create'ing or 'edit'ing.
@@ -122,10 +122,10 @@ extends WikiPlugin
                     // the Un~WikiLink~ified (plain) name of the uncreated
                     // page currently being viewed.
                     $pagelink = $page;
-                    
+
                     if ($pagelist->isEmpty())
                         return HTML::p(fmt("No other page links to %s yet.", $pagelink));
-                    
+
                     if ($total == 1)
                         $pagelist->setCaption(fmt("One page would link to %s:",
                                                   $pagelink));
@@ -140,21 +140,21 @@ extends WikiPlugin
                                                   $total, $pagelink));
             }
             else {
-		if ($count) {
-		    $tmp_pages = $pages;
-		    $p = array_shift($tmp_pages);
-		    $pagelink = HTML(WikiLink($p, 'auto'));
-		    foreach ($tmp_pages as $p)
-		        $pagelink->pushContent(" ",_("AND")," ",WikiLink($p, 'auto')); 
-		} else
-            	    // BackLinks plugin is being displayed on a normal page.
+                if ($count) {
+                    $tmp_pages = $pages;
+                    $p = array_shift($tmp_pages);
+                    $pagelink = HTML(WikiLink($p, 'auto'));
+                    foreach ($tmp_pages as $p)
+                        $pagelink->pushContent(" ",_("AND")," ",WikiLink($p, 'auto'));
+                } else
+                        // BackLinks plugin is being displayed on a normal page.
                     $pagelink = WikiLink($page, 'auto');
-                
+
                 if ($pagelist->isEmpty())
                     return HTML::p(fmt("No page links to %s.", $pagelink));
-                
+
                 //trigger_error("DEBUG: " . $pagelist->getTotal());
-                
+
                 if ($total == 1)
                     $pagelist->setCaption(fmt("One page links to %s:",
                                               $pagelink));
@@ -166,18 +166,18 @@ extends WikiPlugin
                 //                               $pagelink));
                 else
                     $pagelist->setCaption(fmt("%s pages link to %s:",
-                                              $limit > 0 ? $total : _("Those"), 
-					      $pagelink));
+                                              $limit > 0 ? $total : _("Those"),
+                                              $pagelink));
             }
         }
-	if (!empty($args['linkmore']) 
-	    and $dbi->isWikiPage($args['linkmore'])
-	    and $limit > 0 and $total > $limit
-	    )
-	    $pagelist->addCaption(WikiLink($args['linkmore'], "auto", _("More...")));
+        if (!empty($args['linkmore'])
+            and $dbi->isWikiPage($args['linkmore'])
+            and $limit > 0 and $total > $limit
+            )
+            $pagelist->addCaption(WikiLink($args['linkmore'], "auto", _("More...")));
         return $pagelist;
     }
-    
+
 };
 
 // how many links from this backLink to other pages
diff --git a/lib/plugin/BlogArchives.php b/lib/plugin/BlogArchives.php
index 85c1cc29f..25810d561 100644
--- a/lib/plugin/BlogArchives.php
+++ b/lib/plugin/BlogArchives.php
@@ -2,7 +2,7 @@
 rcs_id('$Id$');
 /*
  * Copyright (C) 2004 $ThePhpWikiProgrammingTeam
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@ rcs_id('$Id$');
 require_once('lib/plugin/WikiBlog.php');
 
 /**
- * BlogArchives - List monthly links for the current users blog if signed, 
+ * BlogArchives - List monthly links for the current users blog if signed,
  * or the ADMIN_USER's Blog if not.
  * On month=... list the blog titles per month.
  *
@@ -51,7 +51,7 @@ extends WikiPlugin_WikiBlog
     function getDefaultArguments() {
         return //array_merge
                //(
-               //PageList::supportedArgs(), 
+               //PageList::supportedArgs(),
              array('user'     => '',
                    'order'    => 'reverse',        // latest first
                    'info'     => 'month,numpages', // ignored
@@ -77,9 +77,9 @@ extends WikiPlugin_WikiBlog
         }
         if (!$args['user'] or $args['user'] == ADMIN_USER) {
             if (BLOG_DEFAULT_EMPTY_PREFIX)
-                $args['user'] = ''; 	    // "Blogs/day" pages 
+                $args['user'] = '';             // "Blogs/day" pages
             else
-                $args['user'] = ADMIN_USER; // "Admin/Blogs/day" pages 
+                $args['user'] = ADMIN_USER; // "Admin/Blogs/day" pages
         }
         $parent = (empty($args['user']) ? '' : $args['user'] . SUBPAGE_SEPARATOR);
 
@@ -87,15 +87,15 @@ extends WikiPlugin_WikiBlog
         //$pagelist = new PageList($args['info'], $args['exclude'], $args);
         //if (!is_array('pagename'), explode(',', $info))
         //    unset($pagelist->_columns['pagename']);
-        
+
         $sp = HTML::Raw('&middot; ');
         if (!empty($args['month'])) {
             $prefix = $parent . $this->_blogPrefix('wikiblog') . SUBPAGE_SEPARATOR . $args['month'];
             $pages = $dbi->titleSearch(new TextSearchQuery("^".$prefix, true, 'posix'));
             $html = HTML::ul();
             while ($page = $pages->next()) {
-            	$rev = $page->getCurrentRevision(false);
-            	if ($rev->get('pagetype') != 'wikiblog') continue;
+                    $rev = $page->getCurrentRevision(false);
+                    if ($rev->get('pagetype') != 'wikiblog') continue;
                 $blog = $this->_blog($rev);
                 $html->pushContent(HTML::li(WikiLink($page, 'known', $rev->get('summary'))));
             }
@@ -117,13 +117,13 @@ extends WikiPlugin_WikiBlog
             $months = array();
             foreach ($blogs as $rev) {
                 $blog = $this->_blog($rev);
-            	$mon = $blog['month'];
+                    $mon = $blog['month'];
                 if (empty($months[$mon]))
-                    $months[$mon] = 
+                    $months[$mon] =
                         array('title' => $this->_monthTitle($mon),
                               'num'   => 1,
                               'month' => $mon,
-                              'link'  => WikiURL($basepage, 
+                              'link'  => WikiURL($basepage,
                                          $this->_nonDefaultArgs(array('month' => $mon))));
                 else
                     $months[$mon]['num']++;
@@ -137,7 +137,7 @@ extends WikiPlugin_WikiBlog
                 return HTML(HTML::h3(_("Blog Archives:")), $html);
             else
                 return $html;
-        } else 
+        } else
             return '';
     }
 
diff --git a/lib/plugin/BlogJournal.php b/lib/plugin/BlogJournal.php
index b07a57447..79f0527e1 100644
--- a/lib/plugin/BlogJournal.php
+++ b/lib/plugin/BlogJournal.php
@@ -2,7 +2,7 @@
 rcs_id('$Id$');
 /*
  * Copyright (C) 2005 $ThePhpWikiProgrammingTeam
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -23,10 +23,10 @@ rcs_id('$Id$');
 require_once('lib/plugin/WikiBlog.php');
 
 /**
- * BlogJournal - Include the latest blog entries for the current users blog if signed, 
+ * BlogJournal - Include the latest blog entries for the current users blog if signed,
  *               or the ADMIN_USER's Blog if not.
  * UnfoldSubpages for blogs.
- * Rui called this plugin "JournalLast", but this was written completely independent, 
+ * Rui called this plugin "JournalLast", but this was written completely independent,
  * without having seen the src.
  *
  * @author: Reini Urban
@@ -73,9 +73,9 @@ extends WikiPlugin_WikiBlog
         }
         if (!$args['user'] or $args['user'] == ADMIN_USER) {
             if (BLOG_DEFAULT_EMPTY_PREFIX) {
-                $args['user'] = ''; 	    // "Blogs/day" pages 
+                $args['user'] = '';             // "Blogs/day" pages
             } else {
-                $args['user'] = ADMIN_USER; // "Admin/Blogs/day" pages 
+                $args['user'] = ADMIN_USER; // "Admin/Blogs/day" pages
             }
         }
         $parent = (empty($args['user']) ? '' : $args['user'] . SUBPAGE_SEPARATOR);
@@ -96,8 +96,8 @@ extends WikiPlugin_WikiBlog
         }
         if ($args['user'] == $user->UserName() or $args['user'] == '')
             $html->pushContent(Button(array('action'=>'WikiBlog',
-					    'mode'=>'add'), 
-				      _("New entry"), $base));
+                                            'mode'=>'add'),
+                                      _("New entry"), $base));
         if (!$i)
             return HTML(HTML::h3(_("No Blog Entries")), $html);
         if (!$args['noheader'])
diff --git a/lib/plugin/BoxRight.php b/lib/plugin/BoxRight.php
index 4ea5a75b7..eed036576 100644
--- a/lib/plugin/BoxRight.php
+++ b/lib/plugin/BoxRight.php
@@ -49,13 +49,13 @@ extends WikiPlugin
         // validators have already been handled by displayPage.
         return true;
     }
-    
+
     function run($dbi, $argstr, &$request, $basepage) {
         if (!$basepage) {
             return $this->error("$basepage unset?");
         }
         include_once("lib/BlockParser.php");
-	$page = $request->getPage($basepage);
+        $page = $request->getPage($basepage);
         return HTML::div(array('class'=>'boxright'), TransformText($argstr));
     }
 
diff --git a/lib/plugin/CacheTest.php b/lib/plugin/CacheTest.php
index a3321c934..8ecf16218 100644
--- a/lib/plugin/CacheTest.php
+++ b/lib/plugin/CacheTest.php
@@ -2,7 +2,7 @@
 rcs_id('$Id$');
 /*
  * Copyright (C) 2002 Johannes Große
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
diff --git a/lib/plugin/Calendar.php b/lib/plugin/Calendar.php
index 6b96898c2..e75954e5c 100644
--- a/lib/plugin/Calendar.php
+++ b/lib/plugin/Calendar.php
@@ -59,21 +59,21 @@ extends WikiPlugin
                      'month_format'     => '%B %Y',
                      'wday_format'      => '%a',
                      'start_wday'       => '1', // start now with Monday
-		     'display_weeknum'  => 0);
+                     'display_weeknum'  => 0);
     }
 
     /**
-     * return links (static only as of action=edit) 
+     * return links (static only as of action=edit)
      *
      * @param string $argstr The plugin argument string.
      * @param string $basepage The pagename the plugin is invoked from.
      * @return array List of pagenames linked to (or false).
      */
     function getWikiPageLinks ($argstr, $basepage) {
-        if (isset($this->_links)) 
+        if (isset($this->_links))
             return $this->_links;
         else {
-            global $request;	
+            global $request;
             $this->run($request->_dbi, $argstr, $request, $basepage);
             return $this->_links;
         }
@@ -126,7 +126,7 @@ extends WikiPlugin
         $fs = $this->args['wday_format'];
         $row = HTML::tr();
         $row->setattr('class', 'cal-dayname');
-	if ($this->args['display_weeknum'])
+        if ($this->args['display_weeknum'])
             $row->pushContent(HTML::td(array('class' => 'cal-dayname',
                                              'align' => 'center'),
                                        _("Wk")));
@@ -197,7 +197,7 @@ extends WikiPlugin
                        1,                                      // mday (1-31)
                        $args['year']);
 
-	$colnum = $args['display_weeknum'] ? 8 : 7;
+        $colnum = $args['display_weeknum'] ? 8 : 7;
         $cal = HTML::table(array('cellspacing' => 0,
                                  'cellpadding' => 2,
                                  'class'       => 'cal'),
@@ -216,9 +216,9 @@ extends WikiPlugin
         $tbody = HTML::tbody();
         $row = HTML::tr();
 
-	if ($args['display_weeknum'])
+        if ($args['display_weeknum'])
             $row->pushContent(HTML::td(array('class' => 'cal-weeknum'),
-				       ((int)strftime("%U", $time))+1)); // %U problem. starts with 0
+                                       ((int)strftime("%U", $time))+1)); // %U problem. starts with 0
         $col = (7 + $t['tm_wday'] - $args['start_wday']) % 7;
         if ($col > 0)
             $row->pushContent(HTML::td(array('colspan' => $col)));
@@ -235,9 +235,9 @@ extends WikiPlugin
             $time += SECONDS_PER_DAY;
             $t     = localtime($time, 1);
             $done  = $t['tm_mday'] == 1;
-	    if (!$col and !$done and $args['display_weeknum'])
-		$row->pushContent(HTML::td(array('class' => 'cal-weeknum'),
-					   ((int)strftime("%U", $time))+1)); // starts with 0
+            if (!$col and !$done and $args['display_weeknum'])
+                $row->pushContent(HTML::td(array('class' => 'cal-weeknum'),
+                                           ((int)strftime("%U", $time))+1)); // starts with 0
         }
 
         if ($row->getContent()) {
diff --git a/lib/plugin/CalendarList.php b/lib/plugin/CalendarList.php
index a02b1e5fa..9e9927ba3 100644
--- a/lib/plugin/CalendarList.php
+++ b/lib/plugin/CalendarList.php
@@ -22,19 +22,19 @@ rcs_id('$Id$');
  */
 
 // if not defined in config.ini
-if (!defined('PLUGIN_CALENDARLIST_ORDER'))	
-  define('PLUGIN_CALENDARLIST_ORDER',	'normal');
+if (!defined('PLUGIN_CALENDARLIST_ORDER'))
+  define('PLUGIN_CALENDARLIST_ORDER',        'normal');
 if (!defined('PLUGIN_CALENDARLIST_NEXT_N_DAYS'))
   define('PLUGIN_CALENDARLIST_NEXT_N_DAYS','');
-if (!defined('PLUGIN_CALENDARLIST_NEXT_N'))	
-  define('PLUGIN_CALENDARLIST_NEXT_N',	 '');
+if (!defined('PLUGIN_CALENDARLIST_NEXT_N'))
+  define('PLUGIN_CALENDARLIST_NEXT_N',         '');
 if (!defined('PLUGIN_CALENDARLIST_LAST_N_DAYS'))
   define('PLUGIN_CALENDARLIST_LAST_N_DAYS','');
-if (!defined('PLUGIN_CALENDARLIST_LAST_N'))	
-  define('PLUGIN_CALENDARLIST_LAST_N',	 '');
+if (!defined('PLUGIN_CALENDARLIST_LAST_N'))
+  define('PLUGIN_CALENDARLIST_LAST_N',         '');
 
 /**
- * This is a list of calendar appointments. 
+ * This is a list of calendar appointments.
  * Same arguments as Calendar, so no one is confused
  * Uses <dl><dd>DATE<dt>page contents...
  * Derived from Calendar.php by Martin Norbäck <martin@safelogic.se>
@@ -66,16 +66,16 @@ extends WikiPlugin
     function getDefaultArguments() {
         return array('prefix'       => '[pagename]',
                      'date_format'  => '%Y-%m-%d',
-                     'order' 	    => PLUGIN_CALENDARLIST_ORDER, // normal or reverse (report sequence)
+                     'order'             => PLUGIN_CALENDARLIST_ORDER, // normal or reverse (report sequence)
                      'year'         => '',
                      'month'        => '',
                      'month_offset' => 0,
                      //support ranges: next n days/events
-                     'next_n_days'  => PLUGIN_CALENDARLIST_NEXT_N_DAYS,	// one or the other, not both
-                     'next_n'	    => PLUGIN_CALENDARLIST_NEXT_N,
+                     'next_n_days'  => PLUGIN_CALENDARLIST_NEXT_N_DAYS,        // one or the other, not both
+                     'next_n'            => PLUGIN_CALENDARLIST_NEXT_N,
                      // last n days/entries:
-                     'last_n_days'  => PLUGIN_CALENDARLIST_LAST_N_DAYS,	// one or the other, not both
-                     'last_n'	    => PLUGIN_CALENDARLIST_LAST_N,
+                     'last_n_days'  => PLUGIN_CALENDARLIST_LAST_N_DAYS,        // one or the other, not both
+                     'last_n'            => PLUGIN_CALENDARLIST_LAST_N,
 
                      'month_format' => '%B %Y',
                      'wday_format'  => '%a',
@@ -83,40 +83,40 @@ extends WikiPlugin
     }
 
     /**
-     * return links (static only as of action=edit) 
+     * return links (static only as of action=edit)
      *
      * @param string $argstr The plugin argument string.
      * @param string $basepage The pagename the plugin is invoked from.
      * @return array List of pagenames linked to (or false).
      */
     function getWikiPageLinks ($argstr, $basepage) {
-        if (isset($this->_links)) 
+        if (isset($this->_links))
             return $this->_links;
         else {
-            global $request;	
+            global $request;
             $this->run($request->_dbi, $argstr, $request, $basepage);
             return $this->_links;
         }
     }
 
     function _count_events($dbi, $n = 7, $direction = 1) {
-        //	This is used by the last_n/next_n options to determine the date that
-        //	accounts for the number of N events in the past/future.
-        //	RETURNS: date of N-th event or the last item found
-        $args = &$this->args;				// gather the args array
-        $timeTMP = time();				// start with today's date
-        $t = $timeTMP;					// init the control date variable to now
-        
-        for ($i=0; $i<=180; $i++) {			// loop thru 180 days, past or future
+        //        This is used by the last_n/next_n options to determine the date that
+        //        accounts for the number of N events in the past/future.
+        //        RETURNS: date of N-th event or the last item found
+        $args = &$this->args;                                // gather the args array
+        $timeTMP = time();                                // start with today's date
+        $t = $timeTMP;                                        // init the control date variable to now
+
+        for ($i=0; $i<=180; $i++) {                        // loop thru 180 days, past or future
             $date_string = strftime($args['date_format'], $t);
             $page_for_date = $args['prefix'] . SUBPAGE_SEPARATOR . $date_string;
             if ($dbi->isWikiPage($page_for_date)) { // if this date has any comments/events
-                $timeTMP = $t;			    //  capture the date of this event for return
-                if ($n-- <= 0) break;		    //  if we reached the limit, return the date
+                $timeTMP = $t;                            //  capture the date of this event for return
+                if ($n-- <= 0) break;                    //  if we reached the limit, return the date
             }
-            $t += 24 * 3600 * $direction;	    // advance one day back or forward
+            $t += 24 * 3600 * $direction;            // advance one day back or forward
         }
-        
+
         // return the date of the N-th or last, most past/future event in the range
         return $timeTMP;
     }
@@ -168,7 +168,7 @@ extends WikiPlugin
         }
         $base = mktime(0, 0, 0, // h, m, s
                        $args['month'],     // month 1-12
-                       $args['mday'],      
+                       $args['mday'],
                        $args['year']);     // must have base 1900
 
         // ***************************************************
@@ -223,7 +223,7 @@ extends WikiPlugin
         for ($i = $start; ($step > 0) ? $i < $end : $i > $end; $i += $step) {
             $cal->pushContent($this->_date($dbi, $i));
         }
-        //	end of Plugin CalendarList display logic
+        //        end of Plugin CalendarList display logic
         // ***************************************************
 
         return $cal;
diff --git a/lib/plugin/Chart.php b/lib/plugin/Chart.php
index fb652518f..b331ae79c 100644
--- a/lib/plugin/Chart.php
+++ b/lib/plugin/Chart.php
@@ -62,12 +62,12 @@ extends WikiPlugin
     function getDefaultArguments() {
         return array('width'  => 200,
                      'height' => 200,
-		     'type' => 'line', // or 'area', 'bar', 'pie'
+                     'type' => 'line', // or 'area', 'bar', 'pie'
                      // 'xlabel' => 'x', // TODO
                      // 'ylabel' => 'y', // TODO
-		     'color' => 'green',
-		     // 'legend' => false, // TODO
-		     'data' => false // mandatory
+                     'color' => 'green',
+                     // 'legend' => false, // TODO
+                     'data' => false // mandatory
                      );
     }
     function handle_plugin_args_cruft(&$argstr, &$args) {
@@ -140,9 +140,9 @@ extends WikiPlugin
             }
         }
 
-	$embedargs = array('width'  => $args['width'],
-			   'height' => $args['height'],
-			   'script' => $source);
+        $embedargs = array('width'  => $args['width'],
+                           'height' => $args['height'],
+                           'script' => $source);
         $embed = new SVG_HTML("embed", $embedargs);
         $html->pushContent($embed);
         return $html;
diff --git a/lib/plugin/CreateBib.php b/lib/plugin/CreateBib.php
index b2559a326..d33b2d647 100644
--- a/lib/plugin/CreateBib.php
+++ b/lib/plugin/CreateBib.php
@@ -23,9 +23,9 @@ rcs_id('$Id$');
 /**
  * CreateBib:  Automatically create a BibTex file from page
  *
- * Usage:   
+ * Usage:
  *  <?plugin CreateBib pagename||=whatever ?>
- *                     
+ *
  * @author:  Lea Viljanen
  */
 
@@ -52,18 +52,18 @@ extends WikiPlugin
 
     function preg_quote ($heading) {
         return str_replace(array("/",".","?","*"),
-    		           array('\/','\.','\?','\*'), $heading);
+                               array('\/','\.','\?','\*'), $heading);
     }
-    
+
 
     // Have to include the $starttag and $endtag to the regexps...
-    function extractBibTeX (&$content, $starttag, $endtag) 
+    function extractBibTeX (&$content, $starttag, $endtag)
     {
         $bib = array();
 
         $start = false;
         $stop = false;
-        for ($i=0; $i<count($content); $i++) 
+        for ($i=0; $i<count($content); $i++)
         {
             // $starttag shows when to start
             if (preg_match('/^@/',$content[$i],$match)) {
@@ -87,7 +87,7 @@ extends WikiPlugin
         $articles = array();
         for ($i=0; $i<count($content); $i++) {
             // Should match "* [WikiPageName] whatever"
-            //if (preg_match('/^\s*\*\s+(\[.+\])/',$content[$i],$match)) 
+            //if (preg_match('/^\s*\*\s+(\[.+\])/',$content[$i],$match))
             if (preg_match('/^\s*\*\s+\[(.+)\]/',$content[$i],$match))
             {
                 $articles[] = $match[1];
@@ -95,7 +95,7 @@ extends WikiPlugin
         }
         return $articles;
     }
-                
+
 
     function dumpFile(&$thispage, $filename) {
       include_once("lib/loadsave.php");
@@ -126,14 +126,14 @@ extends WikiPlugin
         $current = $page->getCurrentRevision();
         $content = $current->getContent();
 
-	// Prepare the button to trigger dumping
-	$dump_url = $request->getURLtoSelf(array("file" => "tube.bib"));
+        // Prepare the button to trigger dumping
+        $dump_url = $request->getURLtoSelf(array("file" => "tube.bib"));
         global $WikiTheme;
-        $dump_button = $WikiTheme->makeButton("To File", 
-					  $dump_url , 'foo');
+        $dump_button = $WikiTheme->makeButton("To File",
+                                          $dump_url , 'foo');
 
         $html = HTML::div(array('class' => 'bib','align' => 'left'));
-	$html->pushContent($dump_button, ' ');
+        $html->pushContent($dump_button, ' ');
         $list = HTML::pre(array('id'=>'biblist', 'class' => 'bib'));
 
         // Let's find the subpages
@@ -162,7 +162,7 @@ extends WikiPlugin
             $c = $p->getCurrentRevision();
             $pagedata = $c->getContent();
             $this->dumpFile($pagedata, $request->getArg('file'));
-	}
+        }
 
         return $html;
     }
diff --git a/lib/plugin/CreatePage.php b/lib/plugin/CreatePage.php
index 23e0f7b32..57f5404a5 100644
--- a/lib/plugin/CreatePage.php
+++ b/lib/plugin/CreatePage.php
@@ -21,12 +21,12 @@ rcs_id('$Id$');
  */
 
 /**
- * This allows you to create a page getting the new pagename from a 
- * forms-based interface, and optionally with the initial content from 
- * some template, plus expansion of some variables via %%variable%% statements 
+ * This allows you to create a page getting the new pagename from a
+ * forms-based interface, and optionally with the initial content from
+ * some template, plus expansion of some variables via %%variable%% statements
  * in the template.
  *
- * Put <?plugin-form CreatePage ?> at some page, browse this page, 
+ * Put <?plugin-form CreatePage ?> at some page, browse this page,
  * enter the name of the page to create, then click the button.
  *
  * Usage: <?plugin-form CreatePage template=SomeTemplatePage vars="year=2004&name=None" ?>
@@ -69,45 +69,45 @@ extends WikiPlugin_Template
         $s = trim($s);
         if (!$s) {
             return $this->error(_("Cannot create page with empty name!"));
-	}
-	// TODO: javascript warning if "/" or SUBPAGE_SEPARATOR in s
-	if ($verify) {
-	    $head = _("CreatePage failed");
-	    if ($dbi->isWikiPage($verify)) {
-		$msg = _("Do you really want to create the page '%s'?");
-	    } else {
-		$msg = _("Do you really want to create the page '%s'?");
-	    }
-	    if (isSubPage($s)) {
-		$main = subPageSlice(0);
-		if (!$dbi->isWikiPage(subPageSlice(0))) {
-		    $msg .= "\n" . _("The new page you want to create will be a subpage.")
-			 .  "\n" . _("Subpages cannot be created unless the parent page exists.");
-		    return alert($head, $msg);
-		} else {
-		    $msg .= "\n" . _("The new page you want to create will be a subpage.");
-		}
-	    }
-	    if (strpos($s, " \/")) {
-		$msg .= "\n" . _("Subpages with ending space are not allowed as directory name on Windows.");
-		return alert($head, $msg);
-	    }
-	}
+        }
+        // TODO: javascript warning if "/" or SUBPAGE_SEPARATOR in s
+        if ($verify) {
+            $head = _("CreatePage failed");
+            if ($dbi->isWikiPage($verify)) {
+                $msg = _("Do you really want to create the page '%s'?");
+            } else {
+                $msg = _("Do you really want to create the page '%s'?");
+            }
+            if (isSubPage($s)) {
+                $main = subPageSlice(0);
+                if (!$dbi->isWikiPage(subPageSlice(0))) {
+                    $msg .= "\n" . _("The new page you want to create will be a subpage.")
+                         .  "\n" . _("Subpages cannot be created unless the parent page exists.");
+                    return alert($head, $msg);
+                } else {
+                    $msg .= "\n" . _("The new page you want to create will be a subpage.");
+                }
+            }
+            if (strpos($s, " \/")) {
+                $msg .= "\n" . _("Subpages with ending space are not allowed as directory name on Windows.");
+                return alert($head, $msg);
+            }
+        }
 
         $param = array('action' => 'edit');
         if ($template and $dbi->isWikiPage($template)) {
             $param['template'] = $template;
-        } elseif (!empty($initial_content)) { 
+        } elseif (!empty($initial_content)) {
             // Warning! Potential URI overflow here on the GET redirect. Better use template.
             $param['initial_content'] = $initial_content;
         }
-        // If the initial_content is too large, pre-save the content in the page 
+        // If the initial_content is too large, pre-save the content in the page
         // and redirect without that argument.
         // URI length limit:
         //   http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.2.1
         $url = WikiURL($s, $param, 'absurl');
         // FIXME: expand vars in templates here.
-        if (strlen($url) > 255 
+        if (strlen($url) > 255
             or ($param['template'])
             or preg_match('/%%\w+%%/', $initial_content)) // need variable expansion
         {
@@ -116,7 +116,7 @@ extends WikiPlugin_Template
             $page = $dbi->getPage($s);
             $current = $page->getCurrentRevision();
             $version = $current->getVersion();
-	    // overwrite empty (deleted) pages
+            // overwrite empty (deleted) pages
             if ($version and !$current->hasDefaultContents() and !$overwrite) {
                 return $this->error(fmt("%s already exists", WikiLink($s)));
             } else {
@@ -129,15 +129,15 @@ extends WikiPlugin_Template
                     $initial_content = $currenttmpl->getPackedContent();
                     $meta['markup'] = $currenttmpl->_data['markup'];
 
-		    if (preg_match('/<noinclude>.+<\/noinclude>/s', $initial_content)) {
-			$initial_content = preg_replace("/<noinclude>.+?<\/noinclude>/s", "", 
-							$initial_content);
-		    }
+                    if (preg_match('/<noinclude>.+<\/noinclude>/s', $initial_content)) {
+                        $initial_content = preg_replace("/<noinclude>.+?<\/noinclude>/s", "",
+                                                        $initial_content);
+                    }
                 }
                 $meta['summary'] = _("Created by CreatePage");
-		$content = $this->doVariableExpansion($initial_content, $vars, $s, $request);
+                $content = $this->doVariableExpansion($initial_content, $vars, $s, $request);
 
-		if ($content !== $initial_content) {
+                if ($content !== $initial_content) {
                     // need to destroy the template so that editpage doesn't overwrite it.
                     unset($param['template']);
                     $url = WikiURL($s, $param, 'absurl');
diff --git a/lib/plugin/CreateToc.php b/lib/plugin/CreateToc.php
index 3af7cf756..e45d42b2f 100644
--- a/lib/plugin/CreateToc.php
+++ b/lib/plugin/CreateToc.php
@@ -130,7 +130,7 @@ extends WikiPlugin
 
     function preg_quote ($heading) {
         return str_replace(array("/",".","?","*"),
-    		           array('\/','\.','\?','\*'), $heading);
+                               array('\/','\.','\?','\*'), $heading);
     }
 
     // Get HTML header corresponding to current level (level is set of ! or =)
@@ -173,55 +173,55 @@ extends WikiPlugin
                            $level, &$hstart, &$hend, $basepage=false) {
         $hstart = 0;
         $hend = 0;
-    	$h = $this->_getHeader($level);
+            $h = $this->_getHeader($level);
         $qheading = $this->_quote($heading);
-    	for ($j=$start_index; $j < count($content); $j++) {
+            for ($j=$start_index; $j < count($content); $j++) {
             if (is_string($content[$j])) {
-    		if (preg_match("/<$h>$qheading<\/$h>/",
-    		               $content[$j]))
-    		    return $j;
+                    if (preg_match("/<$h>$qheading<\/$h>/",
+                                   $content[$j]))
+                        return $j;
             }
             elseif (isa($content[$j], 'cached_link'))
             {
-		if (method_exists($content[$j],'asXML')) {
-		    $content[$j]->_basepage = $basepage;
-		    $content[$j] = $content[$j]->asXML();
-		} else
-		    $content[$j] = $content[$j]->asString();
-		// shortcut for single wikiword or link headers
-		if ($content[$j] == $heading
-		    and substr($content[$j-1],-4,4) == "<$h>"
-		    and substr($content[$j+1],0,5) == "</$h>")
-		{
-		    $hstart = $j-1;
-		    $hend = $j+1;
-		    return $j; // single wikiword
-		}
-		elseif (TOC_FULL_SYNTAX) {
-		    //DONE: To allow "!! WikiWord link" or !! http://anylink/
-		    // Check against joined content (after cached_plugininvocation).
-		    // The first link is the anchor then.
-		    if (preg_match("/<$h>(?!.*<\/$h>)/", $content[$j-1])) {
-			$hstart = $j-1;
-			$joined = '';
-			for ($k=max($j-1,$start_index);$k<count($content);$k++) {
-			    if (is_string($content[$k]))
-			        $joined .= $content[$k];
-			    elseif (method_exists($content[$k],'asXML'))
-		                $joined .= $content[$k]->asXML();
-			    else
-		                $joined .= $content[$k]->asString();
-			    if (preg_match("/<$h>$qheading<\/$h>/",$joined)) {
-				$hend=$k;
-				return $k;
-			    }
-			}
-		    }
+                if (method_exists($content[$j],'asXML')) {
+                    $content[$j]->_basepage = $basepage;
+                    $content[$j] = $content[$j]->asXML();
+                } else
+                    $content[$j] = $content[$j]->asString();
+                // shortcut for single wikiword or link headers
+                if ($content[$j] == $heading
+                    and substr($content[$j-1],-4,4) == "<$h>"
+                    and substr($content[$j+1],0,5) == "</$h>")
+                {
+                    $hstart = $j-1;
+                    $hend = $j+1;
+                    return $j; // single wikiword
+                }
+                elseif (TOC_FULL_SYNTAX) {
+                    //DONE: To allow "!! WikiWord link" or !! http://anylink/
+                    // Check against joined content (after cached_plugininvocation).
+                    // The first link is the anchor then.
+                    if (preg_match("/<$h>(?!.*<\/$h>)/", $content[$j-1])) {
+                        $hstart = $j-1;
+                        $joined = '';
+                        for ($k=max($j-1,$start_index);$k<count($content);$k++) {
+                            if (is_string($content[$k]))
+                                $joined .= $content[$k];
+                            elseif (method_exists($content[$k],'asXML'))
+                                $joined .= $content[$k]->asXML();
+                            else
+                                $joined .= $content[$k]->asString();
+                            if (preg_match("/<$h>$qheading<\/$h>/",$joined)) {
+                                $hend=$k;
+                                return $k;
+                            }
+                        }
+                    }
+                }
                 }
-    	    }
-    	}
-    	trigger_error("Heading <$h> $heading </$h> not found\n", E_USER_NOTICE);
-    	return 0;
+            }
+            trigger_error("Heading <$h> $heading </$h> not found\n", E_USER_NOTICE);
+            return 0;
     }
 
     /** prevent from duplicate anchors,
@@ -308,9 +308,9 @@ extends WikiPlugin
                                                  $markup->_basepage);
                         if ($j and isset($markup->_content[$j])) {
                             $x = $markup->_content[$j];
-			    $qheading = $this->_quote($s);
-			    if ($counter)
-				 $counterString = $this->_getCounter($tocCounter, $level, $firstlevelstyle);
+                            $qheading = $this->_quote($s);
+                            if ($counter)
+                                 $counterString = $this->_getCounter($tocCounter, $level, $firstlevelstyle);
                             if (($hstart === 0) && is_string($markup->_content[$j])) {
                                 if ($backlink) {
                                     if ($counter)
@@ -387,18 +387,18 @@ extends WikiPlugin
 
         // Check if user is allowed to get the Page.
         if (!mayAccessPage ('view', $pagename)) {
-        	return $this->error(sprintf(_("Illegal access to page %s: no read access"),
-        	$pagename));
+                return $this->error(sprintf(_("Illegal access to page %s: no read access"),
+                $pagename));
         }
 
         $page = $dbi->getPage($pagename);
         $current = $page->getCurrentRevision();
         //FIXME: I suspect this only to crash with Apache2
         if (!$current->get('markup') or $current->get('markup') < 2) {
-	    if (in_array(php_sapi_name(),array('apache2handler','apache2filter'))) {
+            if (in_array(php_sapi_name(),array('apache2handler','apache2filter'))) {
                 trigger_error(_("CreateToc disabled for old markup"), E_USER_WARNING);
                 return '';
-	    }
+            }
         }
         $content = $current->getContent();
         $html = HTML::div(array('class' => 'toc', 'id'=> GenerateId("toc")));
@@ -445,17 +445,17 @@ extends WikiPlugin
                        (str_repeat($indentstr,$indent)),$li));
             }
         }
-	$list->setAttr('style','display:'.($jshide?'none;':'block;'));
+        $list->setAttr('style','display:'.($jshide?'none;':'block;'));
         $open = DATA_PATH.'/'.$WikiTheme->_findFile("images/folderArrowOpen.png");
         $close = DATA_PATH.'/'.$WikiTheme->_findFile("images/folderArrowClosed.png");
       if ($noheader) {
       } else {
         $toctoggleid = GenerateId("toctoggle");
-	if ($extracollapse)
-	    $toclink = HTML(_("Table of Contents"),
-			    " ",
+        if ($extracollapse)
+            $toclink = HTML(_("Table of Contents"),
+                            " ",
                             HTML::a(array('name'=>'TOC')),
-			    HTML::img(array(
+                            HTML::img(array(
                                             'id'=>$toctoggleid,
                                             'class'=>'wikiaction',
                                             'title'=>_("Click to display to TOC"),
@@ -463,15 +463,15 @@ extends WikiPlugin
                                             'border' => 0,
                                             'alt' => 'toctoggle',
                                             'src' => $jshide ? $close : $open )));
-	else
-	    $toclink = HTML::a(array('name'=>'TOC',
-				     'class'=>'wikiaction',
-				     'title'=>_("Click to display"),
-				     'onclick'=>"toggletoc(this, '".$open."', '".$close."', '".$toclistid."')"),
-			       _("Table of Contents"),
-			       HTML::span(array('style'=>'display:none',
-						'id'=>$toctoggleid)," "));
-	$html->pushContent(HTML::p(array('class'=>'toctitle'), $toclink));
+        else
+            $toclink = HTML::a(array('name'=>'TOC',
+                                     'class'=>'wikiaction',
+                                     'title'=>_("Click to display"),
+                                     'onclick'=>"toggletoc(this, '".$open."', '".$close."', '".$toclistid."')"),
+                               _("Table of Contents"),
+                               HTML::span(array('style'=>'display:none',
+                                                'id'=>$toctoggleid)," "));
+        $html->pushContent(HTML::p(array('class'=>'toctitle'), $toclink));
       }
       $html->pushContent($list);
       if (count($headers) == 0) {
diff --git a/lib/plugin/Diff.php b/lib/plugin/Diff.php
index dbab7a857..1710ac5ba 100644
--- a/lib/plugin/Diff.php
+++ b/lib/plugin/Diff.php
@@ -20,7 +20,7 @@ rcs_id('$Id$');
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 /**
- * lib/diff.php converted to a plugin by electrawn, 
+ * lib/diff.php converted to a plugin by electrawn,
  * plugin cleaned up by rurban,
  * code by dairiki
  *
@@ -67,7 +67,7 @@ extends WikiPlugin {
 
             $iswikipage = (isWikiWord($author) && $dbi->isWikiPage($author));
             $authorlink = $iswikipage ? WikiLink($author) : $author;
-            
+
             $linked_version = WikiLink($rev, 'existing', $rev->getVersion());
             $row->pushContent(HTML::td(fmt("version %s", $linked_version)),
                               HTML::td($WikiTheme->getLastModifiedMessage($rev,
@@ -78,7 +78,7 @@ extends WikiPlugin {
         }
         return $row;
     }
-    
+
     function run($dbi, $argstr, &$request, $basepage) {
         extract($this->getArgs($argstr, $request));
         if (is_array($versions)) {
@@ -89,10 +89,10 @@ extends WikiPlugin {
 
         // Check if user is allowed to get the Page.
         if (!mayAccessPage ('view', $pagename)) {
-        	return $this->error(sprintf(_("Illegal access to page %s: no read access"),
+                return $this->error(sprintf(_("Illegal access to page %s: no read access"),
                                         $pagename));
         }
-        
+
         // abort if page doesn't exist
         $page = $request->getPage($pagename);
         $current = $page->getCurrentRevision();
@@ -147,11 +147,11 @@ extends WikiPlugin {
                 break;
             }
         }
-        
+
         $new_link = WikiLink($new, '', $new_version);
         $old_link = $old ? WikiLink($old, '', $old_version) : $old_version;
         $page_link = WikiLink($page);
-        
+
         $html = HTML(HTML::p(fmt("Differences between %s and %s of %s.",
                                  $new_link, $old_link, $page_link)));
 
@@ -171,7 +171,7 @@ extends WikiPlugin {
         }
         $html->pushContent($otherdiffs);
 
-        
+
         if ($old and $old->getVersion() == 0)
             $old = false;
 
@@ -182,7 +182,7 @@ extends WikiPlugin {
 
         if ($new && $old) {
             $diff = new Diff($old->getContent(), $new->getContent());
-            
+
             if ($diff->isEmpty()) {
                 $html->pushContent(HTML::hr(),
                                    HTML::p(_("Content of versions "), $old->getVersion(),
diff --git a/lib/plugin/DynamicIncludePage.php b/lib/plugin/DynamicIncludePage.php
index 1f85234b5..c9f16eaf5 100644
--- a/lib/plugin/DynamicIncludePage.php
+++ b/lib/plugin/DynamicIncludePage.php
@@ -45,15 +45,15 @@ extends WikiPlugin_IncludePage
     }
 
     function getDefaultArguments() {
-    	return array_merge
+            return array_merge
             (WikiPlugin_IncludePage::getDefaultArguments(),
-             array( 
+             array(
                    'state'   => false, // initial state: false <=> [+], true <=> [-]
                   ));
     }
-                
+
     function run($dbi, $argstr, &$request, $basepage) {
-    	global $WikiTheme;
+            global $WikiTheme;
         $args = $this->getArgs($argstr, $request, false);
         $page =& $args['page'];
         if (ENABLE_AJAX) {
@@ -74,15 +74,15 @@ extends WikiPlugin_IncludePage
         $png = $WikiTheme->_findData('images/folderArrow'.
                                     ($args['state'] ? 'Open' : 'Closed').
                                     '.png');
-	$icon = HTML::img(array('id'  => $id.'-img',
+        $icon = HTML::img(array('id'  => $id.'-img',
                                 'src' => $png,
                                 'onclick' => ENABLE_AJAX
-                                  ? "showHideAsync('".$ajaxuri."','$id')" 
+                                  ? "showHideAsync('".$ajaxuri."','$id')"
                                   : "showHideFolder('$id')",
                                 'border' => 0,
-                                'alt' => _("Click to hide/show"), 
-                                'title'  => _("Click to hide/show"))); 
-        $header = HTML::p(array('class' => 'transclusion-title', 
+                                'alt' => _("Click to hide/show"),
+                                'title'  => _("Click to hide/show")));
+        $header = HTML::p(array('class' => 'transclusion-title',
                                 'style' => "text-decoration: none;"),
                           $icon,
                           fmt(" %s :", WikiLink($page)));
@@ -93,7 +93,7 @@ extends WikiPlugin_IncludePage
             $body->setAttr('style', 'display:none');
             if (ENABLE_AJAX)
                 return HTML($header, $body); // async (load in background and insert)
-            else    
+            else
                 return HTML($header, $body); // sync (load but display:none)
         }
     }
diff --git a/lib/plugin/EditMetaData.php b/lib/plugin/EditMetaData.php
index ab6b64929..2d17b8dfe 100644
--- a/lib/plugin/EditMetaData.php
+++ b/lib/plugin/EditMetaData.php
@@ -41,7 +41,7 @@ rcs_id('$Id$');
 
 require_once('lib/plugin/_BackendInfo.php');
 
-class WikiPlugin_EditMetaData 
+class WikiPlugin_EditMetaData
 extends WikiPlugin__BackendInfo
 {
     function getName () {
@@ -74,68 +74,68 @@ extends WikiPlugin__BackendInfo
         $p = $dbi->getPage($page);
         $pagemeta = $p->getMetaData();
         $this->chunk_split = false;
-        
+
         // Look at arguments to see if submit was entered. If so,
         // process this request before displaying.
         //
-        if ($request->isPost() 
-	    and $request->_user->isAdmin() 
-	    and $request->getArg('metaedit')) 
-	{
+        if ($request->isPost()
+            and $request->_user->isAdmin()
+            and $request->getArg('metaedit'))
+        {
             $metafield = trim($request->getArg('metafield'));
             $metavalue = trim($request->getArg('metavalue'));
             $meta = $request->getArg('meta');
             $changed = 0;
             // meta[__global[_upgrade][name]] => 1030.13
             foreach ($meta as $key => $val) {
-            	if ($val != $pagemeta[$key] 
-		    and !in_array($key, $this->readonly_pagemeta)) 
-		{
-            	    $changed++;
+                    if ($val != $pagemeta[$key]
+                    and !in_array($key, $this->readonly_pagemeta))
+                {
+                        $changed++;
                     $p->set($key, $val);
                 }
             }
             if ($metafield and !in_array($metafield, $this->readonly_pagemeta)) {
-            	// __global[_upgrade][name] => 1030.13
+                    // __global[_upgrade][name] => 1030.13
                 if (preg_match('/^(.*?)\[(.*?)\]$/', $metafield, $matches)) {
                     list(, $array_field, $array_key) = $matches;
                     $array_value = $pagemeta[$array_field];
                     $array_value[$array_key] = $metavalue;
                     if ($pagemeta[$array_field] != $array_value) {
-	            	$changed++;
-                    	$p->set($array_field, $array_value);
+                            $changed++;
+                            $p->set($array_field, $array_value);
                     }
                 } elseif ($pagemeta[$metafield] != $metavalue) {
-	            $changed++;
+                    $changed++;
                     $p->set($metafield, $metavalue);
                 }
             }
             if ($changed) {
                 $dbi->touch();
-		$url = $request->getURLtoSelf(false, 
+                $url = $request->getURLtoSelf(false,
                                           array('meta','metaedit','metafield','metavalue'));
-		$request->redirect($url);
-		// The rest of the output will not be seen due to the
-		// redirect.
-		return '';
-	    }
+                $request->redirect($url);
+                // The rest of the output will not be seen due to the
+                // redirect.
+                return '';
+            }
         }
 
         // Now we show the meta data and provide entry box for new data.
         $html = HTML();
         //$html->pushContent(HTML::h3(fmt("Existing page-level metadata for %s:",
-	//				$page)));
-	//$dl = $this->_display_values('', $pagemeta);
+        //                                $page)));
+        //$dl = $this->_display_values('', $pagemeta);
         //$html->pushContent($dl);
         if (!$pagemeta) {
             // FIXME: invalid HTML
             $html->pushContent(HTML::p(fmt("No metadata for %s", $page)));
-	    $table = HTML();
+            $table = HTML();
         }
         else {
-	    $table = HTML::table(array('border' => 1,
-				       'cellpadding' => 2,
-				       'cellspacing' => 0));
+            $table = HTML::table(array('border' => 1,
+                                       'cellpadding' => 2,
+                                       'cellspacing' => 0));
             $this->_fixupData($pagemeta);
             $table->pushContent($this->_showhash("MetaData('$page')", $pagemeta));
         }
@@ -151,9 +151,9 @@ extends WikiPlugin__BackendInfo
                                      'method' => 'post',
                                      'accept-charset' => $GLOBALS['charset']),
                                $hiddenfield,
-			       // edit existing fields
-			       $table,
-			       // add new ones
+                               // edit existing fields
+                               $table,
+                               // add new ones
                                $instructions, HTML::br(),
                                $keyfield, ' => ', $valfield,
                                HTML::raw('&nbsp;'), $button
@@ -167,31 +167,31 @@ extends WikiPlugin__BackendInfo
     }
 
     function _showvalue ($key, $val, $prefix='') {
-    	if (is_array($val) or is_object($val)) return $val;
-	if (in_array($key, $this->hidden_pagemeta)) return '';
-	if ($prefix) {
-	    $fullkey = $prefix . '[' . $key . ']';
-	    if (substr($fullkey,0,1) == '[') {
-	    	$meta = "meta".$fullkey;
-	    	$fullkey = preg_replace("/\]\[/", "[", substr($fullkey, 1), 1);
-	    } else {
-		$meta = preg_replace("/^([^\[]+)\[/", "meta[$1][", $fullkey, 1);
-	    }
-	} else {
-	    $fullkey = $key;
-	    $meta = "meta[".$key."]";
-	}
-	//$meta = "meta[".$fullkey."]";
+            if (is_array($val) or is_object($val)) return $val;
+        if (in_array($key, $this->hidden_pagemeta)) return '';
+        if ($prefix) {
+            $fullkey = $prefix . '[' . $key . ']';
+            if (substr($fullkey,0,1) == '[') {
+                    $meta = "meta".$fullkey;
+                    $fullkey = preg_replace("/\]\[/", "[", substr($fullkey, 1), 1);
+            } else {
+                $meta = preg_replace("/^([^\[]+)\[/", "meta[$1][", $fullkey, 1);
+            }
+        } else {
+            $fullkey = $key;
+            $meta = "meta[".$key."]";
+        }
+        //$meta = "meta[".$fullkey."]";
         $arr = array('name' => $meta, 'value' => $val);
-	if (strlen($val) > 20)
-	    $arr['size'] = strlen($val);
-	if (in_array($key, $this->readonly_pagemeta)) {
-	    $arr['readonly'] = 'readonly';
-	    return HTML::input($arr);
-	} else {
-	    return HTML(HTML::em($fullkey), HTML::br(),
-	    		HTML::input($arr));
-	}
+        if (strlen($val) > 20)
+            $arr['size'] = strlen($val);
+        if (in_array($key, $this->readonly_pagemeta)) {
+            $arr['readonly'] = 'readonly';
+            return HTML::input($arr);
+        } else {
+            return HTML(HTML::em($fullkey), HTML::br(),
+                            HTML::input($arr));
+        }
     }
 };
 
diff --git a/lib/plugin/ExternalSearch.php b/lib/plugin/ExternalSearch.php
index bebe0c356..2ea90e68c 100644
--- a/lib/plugin/ExternalSearch.php
+++ b/lib/plugin/ExternalSearch.php
@@ -72,8 +72,8 @@ extends WikiPlugin
                      'width'    => false,
                      'height'   => false,
                      'debug'    => false,
-		     'button_position' => EXTERNALSEARCH_DEFAULT_BUTTON_POSITION,
-		     // 'left' or 'right'
+                     'button_position' => EXTERNALSEARCH_DEFAULT_BUTTON_POSITION,
+                     // 'left' or 'right'
                      );
     }
 
@@ -114,10 +114,10 @@ extends WikiPlugin
         $form->pushContent(HTML::input(array('type' => 'hidden',
                                              'name'  => 'url',
                                              'value' => $this->_url)));
-	$s = HTML::input(array('type' => 'text',
-			       'value' => $this->_s,
-			       'name'  => 's',
-			       'size'  => $formsize));
+        $s = HTML::input(array('type' => 'text',
+                               'value' => $this->_s,
+                               'name'  => 's',
+                               'size'  => $formsize));
         if (!empty($args["useimage"])) {
             //FIXME: This does not work with Gecko
             $button = HTML::img(array('src' => $useimage, 'alt' => 'imagebutton'));
@@ -126,29 +126,29 @@ extends WikiPlugin
             if (!empty($height))
                 $button->setAttr('height',$height);
             // on button_position => none display no input form
-	    if ($button_position == 'right')
-		$form->pushContent($s);
+            if ($button_position == 'right')
+                $form->pushContent($s);
             $form->pushContent(HTML::button(array('type' => 'button',
                                                   'class' => 'button',
                                                   'value' => $this->_name,
                                                   ),
                                             $button));
-	    if ($button_position == 'left')
-		$form->pushContent($s);
+            if ($button_position == 'left')
+                $form->pushContent($s);
         } else {
             if ($button_position != 'left' and $button_position != 'right')
-                return $this->error(fmt("Invalid argument: %s=%s", 
+                return $this->error(fmt("Invalid argument: %s=%s",
                                         'button_position', $button_position));
             $button = HTML::input(array('type' => 'submit',
                                         'class' => 'button',
                                         'value' => $this->_name));
-	    if ($button_position == 'left') {
-		$form->pushContent($button);
-		$form->pushContent($s);
-	    } elseif ($button_position == 'right') {
-		$form->pushContent($s);
-		$form->pushContent($button);
-	    }
+            if ($button_position == 'left') {
+                $form->pushContent($button);
+                $form->pushContent($s);
+            } elseif ($button_position == 'right') {
+                $form->pushContent($s);
+                $form->pushContent($button);
+            }
         }
         return $form;
     }
diff --git a/lib/plugin/FileInfo.php b/lib/plugin/FileInfo.php
index c678e7b7c..00474b58c 100644
--- a/lib/plugin/FileInfo.php
+++ b/lib/plugin/FileInfo.php
@@ -3,7 +3,7 @@ rcs_id('$Id$');
 /*
  * Copyright 2005,2007 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -27,7 +27,7 @@ rcs_id('$Id$');
  *
  * Usage:
  *   <?plugin FileInfo file=Upload:setup.exe display=version,date ?>
- *   <?plugin FileInfo file=Upload:setup.exe display=name,version,date 
+ *   <?plugin FileInfo file=Upload:setup.exe display=name,version,date
  *                     format="%s (version: %s, date: %s)" ?>
  *
  * @author: ReiniUrban
@@ -53,14 +53,14 @@ extends WikiPlugin
         return array(
                      'file'      => false, // relative path from PHPWIKI_DIR. (required)
                      'display'   => false, // version,phonysize,size,date,mtime,owner,name,path,dirname,link.  (required)
-                     'format'    => false, // printf format string with %s only, all display modes 
-		     'quiet'     => false  // print no error if file not found
-		     			   // from above vars return strings (optional)
+                     'format'    => false, // printf format string with %s only, all display modes
+                     'quiet'     => false  // print no error if file not found
+                                                // from above vars return strings (optional)
                     );
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-    	$args = $this->getArgs($argstr, $request);
+            $args = $this->getArgs($argstr, $request);
         extract($args);
         if (!$file)
             return $this->error(sprintf(_("A required argument '%s' is missing."), 'file'));
@@ -74,96 +74,96 @@ extends WikiPlugin
         if (defined('PHPWIKI_DIR')) {
             chdir(PHPWIKI_DIR);
         }
-	if (!file_exists($file)) {
-	    if ($quiet) {
-		return HTML::raw('');
-	    } else {
+        if (!file_exists($file)) {
+            if ($quiet) {
+                return HTML::raw('');
+            } else {
                 return $this->error(sprintf(_("File '%s' not found."), $file));
-	    }
-	}
-	// sanify $file name
-	$realfile = realpath($file);
-	// Hmm, allow ADMIN to check a local file? Only if its locked
-	if (string_starts_with($realfile, realpath(getUploadDataPath()))) {
-	    $isuploaded = 1;
-	} else {
-	    $page = $dbi->getPage($basepage);
-	    $user = $request->getUser();
-	    if ($page->getOwner() != ADMIN_USER or !$page->get('locked')) {
-		// For convenience we warn the admin
-		if ($quiet and $user->isAdmin())
-		    return HTML::span(array('title' => _("Output suppressed. FileInfoPlugin with local files require a locked page.")),
-				      HTML::em(_("page not locked")));
-		else
-		    return $this->error("Invalid path \"$file\". Only ADMIN can allow local paths, and the page must be locked.");
-	    }
-	}
-	$s = array();
-	$modes = explode(",", $display);
-	foreach ($modes as $mode) {
-	    switch ($mode) {
-	    case 'version':  $s[] = $this->exeversion($file); break;
-	    case 'size':     $s[] = filesize($file); break;
-	    case 'phonysize':$s[] = $this->phonysize(filesize($file)); break;
-	    case 'date':     $s[] = strftime("%x %X", filemtime($file)); break;
-	    case 'mtime':    $s[] = filemtime($file); break;
-	    case 'owner':    $o = posix_getpwuid(fileowner($file)); $s[] = $o['name']; break;
-	    case 'group':    $o = posix_getgrgid(filegroup($file)); $s[] = $o['name']; break;
-	    case 'name':     $s[] = basename($file); break;
-	    case 'path':     $s[] = $file; break;
-	    case 'dirname':  $s[] = dirname($file); break;
-	    case 'magic':    $s[] = $this->magic($file); break;
-	    case 'mime-typ': $s[] = $this->mime_type($file); break;
-	    case 'link':    
-		if ($is_Upload) {
-		    $s[] = " [".$args['file'] . "]"; 
-		} elseif ($isuploaded) {
-		    // will fail with user uploads
-		    $s[] = " [Upload:".basename($file)."]"; 
-		} else {
-		    $s[] = " [".basename($file)."] "; 
-		}
-		break;
-	    default:
-		if (!$quiet) {
-		    return $this->error(sprintf(_("Unsupported argument: %s=%s"), 'display', $mode)); 
-		} else {
+            }
+        }
+        // sanify $file name
+        $realfile = realpath($file);
+        // Hmm, allow ADMIN to check a local file? Only if its locked
+        if (string_starts_with($realfile, realpath(getUploadDataPath()))) {
+            $isuploaded = 1;
+        } else {
+            $page = $dbi->getPage($basepage);
+            $user = $request->getUser();
+            if ($page->getOwner() != ADMIN_USER or !$page->get('locked')) {
+                // For convenience we warn the admin
+                if ($quiet and $user->isAdmin())
+                    return HTML::span(array('title' => _("Output suppressed. FileInfoPlugin with local files require a locked page.")),
+                                      HTML::em(_("page not locked")));
+                else
+                    return $this->error("Invalid path \"$file\". Only ADMIN can allow local paths, and the page must be locked.");
+            }
+        }
+        $s = array();
+        $modes = explode(",", $display);
+        foreach ($modes as $mode) {
+            switch ($mode) {
+            case 'version':  $s[] = $this->exeversion($file); break;
+            case 'size':     $s[] = filesize($file); break;
+            case 'phonysize':$s[] = $this->phonysize(filesize($file)); break;
+            case 'date':     $s[] = strftime("%x %X", filemtime($file)); break;
+            case 'mtime':    $s[] = filemtime($file); break;
+            case 'owner':    $o = posix_getpwuid(fileowner($file)); $s[] = $o['name']; break;
+            case 'group':    $o = posix_getgrgid(filegroup($file)); $s[] = $o['name']; break;
+            case 'name':     $s[] = basename($file); break;
+            case 'path':     $s[] = $file; break;
+            case 'dirname':  $s[] = dirname($file); break;
+            case 'magic':    $s[] = $this->magic($file); break;
+            case 'mime-typ': $s[] = $this->mime_type($file); break;
+            case 'link':
+                if ($is_Upload) {
+                    $s[] = " [".$args['file'] . "]";
+                } elseif ($isuploaded) {
+                    // will fail with user uploads
+                    $s[] = " [Upload:".basename($file)."]";
+                } else {
+                    $s[] = " [".basename($file)."] ";
+                }
+                break;
+            default:
+                if (!$quiet) {
+                    return $this->error(sprintf(_("Unsupported argument: %s=%s"), 'display', $mode));
+                } else {
                     return HTML::raw('');
                 }
-		break;
-	    }
-	}
+                break;
+            }
+        }
         chdir($dir);
-	if (!$format) {
-	    $format = '';
-	    foreach ($s as $x) { $format .= " %s"; }
-	}
-	array_unshift($s, $format);
-	// $x, array($i,$j) => sprintf($x, $i, $j)
+        if (!$format) {
+            $format = '';
+            foreach ($s as $x) { $format .= " %s"; }
+        }
+        array_unshift($s, $format);
+        // $x, array($i,$j) => sprintf($x, $i, $j)
         $result = call_user_func_array("sprintf", $s);
-	if (in_array('link', $modes)) {
-	    require_once("lib/InlineParser.php");
-	    return TransformInline($result, 2, $basepage);
-	} else {
-	    return HTML::raw($result);
-	}
+        if (in_array('link', $modes)) {
+            require_once("lib/InlineParser.php");
+            return TransformInline($result, 2, $basepage);
+        } else {
+            return HTML::raw($result);
+        }
     }
 
     function magic($file) {
-	if (function_exists('finfo_file') or loadPhpExtension('fileinfo')) {
-	    // Valid finfo_open (i.e. libmagic) options:
-	    // FILEINFO_NONE | FILEINFO_SYMLINK | FILEINFO_MIME | FILEINFO_COMPRESS | FILEINFO_DEVICES |
-	    // FILEINFO_CONTINUE | FILEINFO_PRESERVE_ATIME | FILEINFO_RAW
-	    $f = finfo_open(/*FILEINFO_MIME*/);
-	    $result = finfo_file(realpath($file));
-	    finfo_close($res);
-	    return $result;
-	}
-	return '';
+        if (function_exists('finfo_file') or loadPhpExtension('fileinfo')) {
+            // Valid finfo_open (i.e. libmagic) options:
+            // FILEINFO_NONE | FILEINFO_SYMLINK | FILEINFO_MIME | FILEINFO_COMPRESS | FILEINFO_DEVICES |
+            // FILEINFO_CONTINUE | FILEINFO_PRESERVE_ATIME | FILEINFO_RAW
+            $f = finfo_open(/*FILEINFO_MIME*/);
+            $result = finfo_file(realpath($file));
+            finfo_close($res);
+            return $result;
+        }
+        return '';
     }
 
     function mime_type($file) {
-	return '';
+        return '';
     }
 
     function _formatsize ($n, $factor, $suffix = '') {
@@ -190,28 +190,28 @@ extends WikiPlugin
     }
 
     function exeversion($file) {
-    	if (!isWindows()) return "?";
-	if (class_exists('ffi') or loadPhpExtension('ffi'))
-	    return $this->exeversion_ffi($file);
-	if (function_exists('res_list_type') or loadPhpExtension('win32std'))
-	    return $this->exeversion_resopen($file);
-	return exeversion_showver($file);
-	return '';
+            if (!isWindows()) return "?";
+        if (class_exists('ffi') or loadPhpExtension('ffi'))
+            return $this->exeversion_ffi($file);
+        if (function_exists('res_list_type') or loadPhpExtension('win32std'))
+            return $this->exeversion_resopen($file);
+        return exeversion_showver($file);
+        return '';
     }
 
     // http://www.codeproject.com/dll/showver.asp
     function exeversion_showver($file) {
-	$path = realpath($file);
-	$result = `showver $path`; 
-    	return "?";
+        $path = realpath($file);
+        $result = `showver $path`;
+            return "?";
     }
 
     function exeversion_ffi($file) {
-	if (!DEBUG)
-	    return "?"; // not yet stable
-    	
-	if (function_exists('ffi') or loadPhpExtension('ffi')) {
-	    $win32_idl = "
+        if (!DEBUG)
+            return "?"; // not yet stable
+
+        if (function_exists('ffi') or loadPhpExtension('ffi')) {
+            $win32_idl = "
 struct VS_FIXEDFILEINFO {
         DWORD dwSignature;
         DWORD dwStrucVersion;
@@ -228,88 +228,88 @@ struct VS_FIXEDFILEINFO {
         DWORD dwFileDateLS;
 };
 struct VS_VERSIONINFO { struct VS_VERSIONINFO
-  WORD  wLength; 
-  WORD  wValueLength; 
-  WORD  wType; 
-  WCHAR szKey[1]; 
-  WORD  Padding1[1]; 
-  VS_FIXEDFILEINFO Value; 
-  WORD  Padding2[1]; 
-  WORD  Children[1]; 
+  WORD  wLength;
+  WORD  wValueLength;
+  WORD  wType;
+  WCHAR szKey[1];
+  WORD  Padding1[1];
+  VS_FIXEDFILEINFO Value;
+  WORD  Padding2[1];
+  WORD  Children[1];
 };
 [lib='kernel32.dll'] DWORD GetFileVersionInfoSizeA(char *szFileName, DWORD *dwVerHnd);
 [lib='kernel32.dll'] int GetFileVersionInfoA(char *sfnFile, DWORD dummy, DWORD size, struct VS_VERSIONINFO *pVer);
 ";
             $ffi = new ffi($win32_idl);
             $dummy = 0; // &DWORD
- 	    $size = $ffi->GetFileVersionInfoSizeA($file, $dummy);
-	    //$pVer = str_repeat($size+1);
-	    $pVer = new ffi_struct($ffi, "VS_VERSIONINFO");
-	    if ($ffi->GetFileVersionInfoA($file, 0, $size, $pVer) 
-	        and $pVer->wValueLength) {
-		// analyze the VS_FIXEDFILEINFO(Value);
-		// $pValue = new ffi_struct($ffi, "VS_FIXEDFILEINFO");
-		$pValue =& $pVer->Value;
-		return sprintf("%d.%d.%d.%d",
-			       $pValue->dwFileVersionMS >> 16,
-			       $pValue->dwFileVersionMS & 0xFFFF,
-			       $pValue->dwFileVersionLS >> 16, 
-			       $pValue->dwFileVersionLS & 0xFFFF);
-	    }
-	}
+             $size = $ffi->GetFileVersionInfoSizeA($file, $dummy);
+            //$pVer = str_repeat($size+1);
+            $pVer = new ffi_struct($ffi, "VS_VERSIONINFO");
+            if ($ffi->GetFileVersionInfoA($file, 0, $size, $pVer)
+                and $pVer->wValueLength) {
+                // analyze the VS_FIXEDFILEINFO(Value);
+                // $pValue = new ffi_struct($ffi, "VS_FIXEDFILEINFO");
+                $pValue =& $pVer->Value;
+                return sprintf("%d.%d.%d.%d",
+                               $pValue->dwFileVersionMS >> 16,
+                               $pValue->dwFileVersionMS & 0xFFFF,
+                               $pValue->dwFileVersionLS >> 16,
+                               $pValue->dwFileVersionLS & 0xFFFF);
+            }
+        }
     }
 
     // Read "RT_VERSION/VERSIONINFO" exe/dll resource info for MSWin32 binaries
     // The "win32std" extension is not ready yet to pass back a VERSIONINFO struct
     function exeversion_resopen($file) {
-	if (function_exists('res_list_type') or loadPhpExtension('win32std')) {
-	    // See http://msdn.microsoft.com/workshop/networking/predefined/res.asp
-	    $v = file_get_contents('res://'.realpath($file).urlencode('/RT_VERSION/#1'));
-	    if ($v) {
-	    	// This is really a binary VERSIONINFO block, with lots of
-	    	// nul bytes (widechar) which cannot be transported as string.
-	    	return "$v";
-	    }
+        if (function_exists('res_list_type') or loadPhpExtension('win32std')) {
+            // See http://msdn.microsoft.com/workshop/networking/predefined/res.asp
+            $v = file_get_contents('res://'.realpath($file).urlencode('/RT_VERSION/#1'));
+            if ($v) {
+                    // This is really a binary VERSIONINFO block, with lots of
+                    // nul bytes (widechar) which cannot be transported as string.
+                    return "$v";
+            }
             else {
-		$h = res_open(realpath($file));
-		$v = res_get($h, 'RT_VERSION', 'FileVersion');
-		res_close($h);
-		if ($v) return $v;
+                $h = res_open(realpath($file));
+                $v = res_get($h, 'RT_VERSION', 'FileVersion');
+                res_close($h);
+                if ($v) return $v;
+
+                $h = res_open(realpath($file));
+                $v = res_get($h, '#1', 'RT_VERSION', 1);
+                res_close($h);
+                if ($v) return $v;
+            }
+
+            /* The version consists of two 32-bit integers, defined by four 16-bit integers.
+               For example, "FILEVERSION 3,10,0,61" is translated into two doublewords:
+               0x0003000a and 0x0000003d, in that order. */
+/*
+        $h = res_open(realpath($file));
+
+        echo "Res list of '$file': \n";
+        $list= res_list_type($h, true);
+        if( $list===FALSE ) err( "Can't list type" );
 
-		$h = res_open(realpath($file));
-		$v = res_get($h, '#1', 'RT_VERSION', 1);
-		res_close($h);
-		if ($v) return $v;
-	    }
-	      
-	    /* The version consists of two 32-bit integers, defined by four 16-bit integers. 
-	       For example, "FILEVERSION 3,10,0,61" is translated into two doublewords: 
-	       0x0003000a and 0x0000003d, in that order. */
-/*	    
-	$h = res_open(realpath($file));
-	    
-	echo "Res list of '$file': \n";
-	$list= res_list_type($h, true);
-	if( $list===FALSE ) err( "Can't list type" );
-	
-	for( $i= 0; $i<count($list); $i++ ) {
-		echo $list[$i]."\n";
-		$res= res_list($h, $list[$i]);
-		for( $j= 0; $j<count($res); $j++ ) {
-			echo "\t".$res[$j]."\n";
-		}
-	}
-	echo "Res get: ".res_get( $h, 'A_TYPE', 'A_RC_NAME' )."\n\n";
-	res_close( $h );	    
+        for( $i= 0; $i<count($list); $i++ ) {
+                echo $list[$i]."\n";
+                $res= res_list($h, $list[$i]);
+                for( $j= 0; $j<count($res); $j++ ) {
+                        echo "\t".$res[$j]."\n";
+                }
+        }
+        echo "Res get: ".res_get( $h, 'A_TYPE', 'A_RC_NAME' )."\n\n";
+        res_close( $h );
 */
-	    if ($v)
-	        return "$v";
-	    else 
-	        return "";
-	} else {
-	    return "";
-	}
-	
+            if ($v)
+                return "$v";
+            else
+                return "";
+        } else {
+            return "";
+        }
+
     }
 };
 
diff --git a/lib/plugin/FoafViewer.php b/lib/plugin/FoafViewer.php
index 73e684320..ec2877e0c 100644
--- a/lib/plugin/FoafViewer.php
+++ b/lib/plugin/FoafViewer.php
@@ -2,7 +2,7 @@
 rcs_id('$Id$');
 /*
  * Copyright (C) 2004 $ThePhpWikiProgrammingTeam
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -32,7 +32,7 @@ rcs_id('$Id$');
 * @author Davey Shafik <http://pear.php.net/user/davey>
 * @date 2004-06-07
 * @version 0.0.2
-* @bug XML_FOAF 0.2 has problems with named RDF nodes (ie, http://www.ahsonline.com.au/dod/FOAF.rdf). 
+* @bug XML_FOAF 0.2 has problems with named RDF nodes (ie, http://www.ahsonline.com.au/dod/FOAF.rdf).
 *      Davey knows, will be fixing this soon.
 * @todo "Friends" component
 * @todo Named URLs (DC metadata)
@@ -44,10 +44,10 @@ rcs_id('$Id$');
  * FoafViewer:  Parse an RDF FOAF file and extract information to render as HTML
  * usage:   &lt;?plugin FoafViewer foaf=http://www.ahsonline.com.au/dod/rawksuga.rdf original=true?&gt;
  * author:  Daniel O'Connor <http://www.ahsonline.com.au/dod/FOAF.rdf>
- * 
+ *
  * phpwiki version based on version 0.0.2 by Daniel O'Connor
  *
- * TODO: 
+ * TODO:
  *  - use a template.
  *  - use the phpwiki internal user foaf data (stored by a UserPreferences extension)
  *  - fix the pear FOAF Parser or we'll write our own (based on our XmlParser)
@@ -55,7 +55,7 @@ rcs_id('$Id$');
 class WikiPlugin_FoafViewer
 extends WikiPlugin
 {
-    // The handler is handled okay. The only problem is that it still 
+    // The handler is handled okay. The only problem is that it still
     // throws a fatal.
     function _error_handler($error) {
         if (strstr($error->errstr,"Failed opening required 'XML/FOAF/Parser.php'"))
@@ -84,7 +84,7 @@ extends WikiPlugin
                       'original' => false
                       );
     }
-                
+
     function run($dbi, $argstr, &$request, $basepage) {
 
         /* ignore fatal on loading */
@@ -123,11 +123,11 @@ extends WikiPlugin
             if (substr($foaf,0,7) != "http://") {
                 return $this->error(_("foaf must be a URI starting with http://"));
             }
-	    // Start of output
-   	    if (!empty($original)) {
+            // Start of output
+               if (!empty($original)) {
                 $request->redirect($foaf);
-	    }
-	    else {
+            }
+            else {
                 $foaffile = url_get_contents($foaf);
                 if (!$foaffile) {
                     //TODO: get errormsg
@@ -138,29 +138,29 @@ extends WikiPlugin
                 // Parser FOAF into $foaffile
                 $parser->parseFromMem($foaffile);
                 $a = $parser->toArray();
-			
+
                 $html = HTML(HTML::h1(@$a[0]["name"]),
                             HTML::table(
                                         HTML::thead(),
                                         HTML::tbody(
-                                                    @$a[0]["title"] ? 
+                                                    @$a[0]["title"] ?
                                                         HTML::tr(HTML::td(_("Title")),
                                                                  HTML::td($a[0]["title"])) : null,
-                                                    (@$a[0]["homepage"][0]) ? 
+                                                    (@$a[0]["homepage"][0]) ?
                                                         $this->iterateHTML($a[0],"homepage",$a["dc"]) : null,
                                                     (@$a[0]["weblog"][0]) ?
                                                         $this->iterateHTML($a[0],"weblog",$a["dc"]) : null,
                                                     //This seems broken?
                                                     /*
                                                      HTML::tr(HTML::td("Full Name"),
-							               (@$a[0]["name"][0]) ?					
+                                                                       (@$a[0]["name"][0]) ?
                                                                        HTML::td(@$a[0]["name"]) :
                                                                        (@$a[0]["firstname"][0] && @$a[0]["surname"][0]) ?
                                                                        HTML::td(@$a[0]["firstname"][0] . " " . @$a[0]["surname"][0])
                                                                        : null
                                                     */
                                                     HTML::tr(HTML::td("Full Name"),
-                                                             (@$a[0]["name"][0]) ?					
+                                                             (@$a[0]["name"][0]) ?
                                                              HTML::td(@$a[0]["name"]) : null
                                                              ),
                                                     (@$a[0]["nick"][0]) ?
@@ -208,12 +208,12 @@ extends WikiPlugin
                 $string = '<a href="http://beta.plink.org/profile/' . $array[$index][$i] . '">'
                     .'<img src="http://beta.plink.org/images/plink.png" alt="Plink - ' . $array[$index][$i] . '" /></a>';
             }
-            else if ($index == "depiction") { 
+            else if ($index == "depiction") {
                 $string = '<img src="' . $array[$index][$i] . '" />';
             }
-            else if ((substr($array[$index][$i],0,7) == "http://") || (substr($array[$index][$i],0,7) == "mailto:")) { 
+            else if ((substr($array[$index][$i],0,7) == "http://") || (substr($array[$index][$i],0,7) == "mailto:")) {
                 $string = '<a href="' . $array[$index][$i] . '"';
-				
+
                 if (@$dc["description"][$array[$index][$i]]) {
                     $string .= ' title="' . $dc["description"][$array[$index][$i]] . '"';
                 }
@@ -223,12 +223,12 @@ extends WikiPlugin
                 }
                 else {
                     $string .= $array[$index][$i];
-                }				
+                }
                 $string .= '</a>';
             }
             @$html .= "<tr><td>" . $index . "</td><td>" . $string . "</td></tr>";
         }
-	
+
         return HTML::raw($html);
     }
 }
diff --git a/lib/plugin/FrameInclude.php b/lib/plugin/FrameInclude.php
index 22b933a7b..a69fb4f81 100644
--- a/lib/plugin/FrameInclude.php
+++ b/lib/plugin/FrameInclude.php
@@ -87,7 +87,7 @@ extends WikiPlugin
             return $this->disabled("(action != 'browse')");
         if (! $request->isGetOrHead())
             return $this->disabled("(method != 'GET')");
-        
+
         if (!$src and $page) {
             if ($page == $request->get('pagename')) {
                 return $this->error(sprintf(_("recursive inclusion of page %s"),
@@ -129,12 +129,12 @@ extends WikiPlugin
                                    'scrolling' => (string)$scrolling,
                                    'noresize' => (bool)$noresize,
                                    ));
-        
+
         if ($marginwidth)
             $frame->setArg('marginwidth', $marginwidth);
         if ($marginheight)
             $frame->setArg('marginheight', $marginheight);
-        
+
         $tokens = array('CONTENT_FRAME' => $frame,
                         'ROWS' => $rows,
                         'COLS' => $cols,
diff --git a/lib/plugin/FullTextSearch.php b/lib/plugin/FullTextSearch.php
index 26a8a939a..954dc76b2 100644
--- a/lib/plugin/FullTextSearch.php
+++ b/lib/plugin/FullTextSearch.php
@@ -30,8 +30,8 @@ require_once("lib/PageList.php");
  *
  * See also:
  *   Hooks to search in external documents: ExternalTextSearch
- *   Only uploaded: textfiles, PDF, HTML, DOC, XLS, ... or 
- *   External apps: xapian-omages seems to be the better than lucene, 
+ *   Only uploaded: textfiles, PDF, HTML, DOC, XLS, ... or
+ *   External apps: xapian-omages seems to be the better than lucene,
  *   lucene.net, swish, nakamazu, ...
  *
  * See http://sf.net/tracker/index.php?aid=927395&group_id=6121&atid=106121
@@ -63,7 +63,7 @@ extends WikiPlugin
                    'hilight'  => true,
                    'case_exact' => false,
                    'regex'    => 'auto',
-		   'sortby'   => '-hi_content',
+                   'sortby'   => '-hi_content',
                    'noheader' => false,
                    'exclude'  => false,   // comma-seperated list of glob
                    'quiet'    => true));  // be less verbose
@@ -87,8 +87,8 @@ extends WikiPlugin
         if ($quiet) { // see how easy it is with PageList...
             unset($args['info']);
             $args['listtype'] = 'dl';
-	    $args['types'] = array(new _PageList_Column_content
-	      ('rev:hi_content', _("Content"), "left", $s, $hilight_re));
+            $args['types'] = array(new _PageList_Column_content
+              ('rev:hi_content', _("Content"), "left", $s, $hilight_re));
             $list = new PageList(false, $exclude, $args);
             $list->setCaption(fmt("Full text search results for '%s'", $s));
             while ($page = $pages->next()) {
@@ -104,7 +104,7 @@ extends WikiPlugin
         if (!$limit or !is_int($limit))
             $limit = 0;
         // expand all page wildcards to a list of pages which should be ignored
-        if ($exclude) $exclude = explodePageList($exclude); 
+        if ($exclude) $exclude = explodePageList($exclude);
         while ($page = $pages->next() and (!$limit or ($count < $limit))) {
             $name = $page->getName();
             if ($exclude and in_array($name,$exclude)) continue;
@@ -120,8 +120,8 @@ extends WikiPlugin
             $list->pushContent(HTML::dd(_("<no matches>")));
 
         if (!empty($pages->stoplisted))
-            $list = HTML(HTML::p(fmt(_("Ignored stoplist words '%s'"), 
-                                     join(', ', $pages->stoplisted))), 
+            $list = HTML(HTML::p(fmt(_("Ignored stoplist words '%s'"),
+                                     join(', ', $pages->stoplisted))),
                          $list);
         if ($noheader)
             return $list;
@@ -161,11 +161,11 @@ class _PageList_Column_hilight extends _PageList_Column {
         $this->_PageList_Column($params[0],$params[1],$params[2]);
     }
     function _getValue(&$page, $revision_handle) {
-    	$html = false;
-	$pagename = $page->getName();
-	$count = count($this->parentobj->_wpagelist[$pagename]);
-        return LinkURL(WikiURL($page, array('action' => 'BackLinks'), false), 
-			fmt("(%d Links)", $count));
+            $html = false;
+        $pagename = $page->getName();
+        $count = count($this->parentobj->_wpagelist[$pagename]);
+        return LinkURL(WikiURL($page, array('action' => 'BackLinks'), false),
+                        fmt("(%d Links)", $count));
     }
 }
 
diff --git a/lib/plugin/GoTo.php b/lib/plugin/GoTo.php
index e1482bdd6..b25d8e7c2 100644
--- a/lib/plugin/GoTo.php
+++ b/lib/plugin/GoTo.php
@@ -2,7 +2,7 @@
 rcs_id('$Id$');
 /*
  * Copyright (C) 2004 $ThePhpWikiProgrammingTeam
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -67,13 +67,13 @@ extends WikiPlugin
             $request->redirect($url);
             // User should see nothing after redirect
             return '';
-        } 
+        }
 
         $action = $request->getURLtoSelf();
         $form = HTML::form(array('action'=>$action,
                                  'method'=>'post'
                           ));
- 
+
         $form->pushContent(HiddenInputs($request->getArgs()));
 
         $textfield = HTML::input(array('type' => 'text',
@@ -95,5 +95,5 @@ extends WikiPlugin
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End:   
+// End:
 ?>
diff --git a/lib/plugin/GoogleMaps.php b/lib/plugin/GoogleMaps.php
index 97df98108..7e61ea09d 100644
--- a/lib/plugin/GoogleMaps.php
+++ b/lib/plugin/GoogleMaps.php
@@ -27,12 +27,12 @@ rcs_id('$Id$');
 
  * Hint: You need to sign up for a Google Maps API key!
  *         http://www.google.com/apis/maps/signup.html
- *       Then enter the key in config/config.ini under GOOGLE_LICENSE_KEY= 
+ *       Then enter the key in config/config.ini under GOOGLE_LICENSE_KEY=
  *
  * Usage:
  *  <?plugin GoogleMaps
  *           Latitude=53.053
- *	     Longitude=7.803
+ *             Longitude=7.803
  *           ZoomFactor=10
  *           Marker=true
  *           InfoText=
@@ -47,7 +47,7 @@ rcs_id('$Id$');
  * @see plugin/GooglePlugin
  *      http://www.giswiki.de/index.php/Google_Maps_Extensions
  *      http://www.google.com/apis/maps/, http://maps.google.com/
- *      http://libgmail.sourceforge.net/googlemaps.html 
+ *      http://libgmail.sourceforge.net/googlemaps.html
  *
  * NOT YET SUPPORTED:
  *   Search for keywords (search=)
@@ -73,16 +73,16 @@ extends WikiPlugin
     }
 
     function getDefaultArguments() {
-        return array( 
-		     'Longitude' => 	'',
-		     'Latitude'  => 	'',
-		     'ZoomFactor'=>	5,
-		     'Marker'    =>	true,
-		     'InfoText'  => 	'',
-		     'MapType'   =>  	'Hybrid', // Map|Satellite|Hybrid,
-		     'SmallMapControl' => false,  // large or small
-		     'width'     =>	'500px',
-		     'height'    =>	'400px',
+        return array(
+                     'Longitude' =>         '',
+                     'Latitude'  =>         '',
+                     'ZoomFactor'=>        5,
+                     'Marker'    =>        true,
+                     'InfoText'  =>         '',
+                     'MapType'   =>          'Hybrid', // Map|Satellite|Hybrid,
+                     'SmallMapControl' => false,  // large or small
+                     'width'     =>        '500px',
+                     'height'    =>        '400px',
                     );
     }
 
@@ -99,21 +99,21 @@ extends WikiPlugin
             return $this->error(fmt("%s parameter missing", "'Latitude'"));
         }
 
-	$maps = JavaScript('',array('src'=>"http://maps.google.com/maps?file=api&v=1&key=" . GOOGLE_LICENSE_KEY));
-	$id = GenerateId("googlemap");
-	switch ($MapType) {
-	case "Satellite": $type = "_SATELLITE_TYPE"; break;
-	case "Map":       $type = "_MAP_TYPE"; break;
-	case "Hybrid":    $type = "_HYBRID_TYPE"; break;
-	default: return $this->error(sprintf(_("invalid argument %s"), $MapType));
-	}
-	$div = HTML::div(array('id'=>$id,'style'=>'width: '.$width.'; height: '.$height));
+        $maps = JavaScript('',array('src'=>"http://maps.google.com/maps?file=api&v=1&key=" . GOOGLE_LICENSE_KEY));
+        $id = GenerateId("googlemap");
+        switch ($MapType) {
+        case "Satellite": $type = "_SATELLITE_TYPE"; break;
+        case "Map":       $type = "_MAP_TYPE"; break;
+        case "Hybrid":    $type = "_HYBRID_TYPE"; break;
+        default: return $this->error(sprintf(_("invalid argument %s"), $MapType));
+        }
+        $div = HTML::div(array('id'=>$id,'style'=>'width: '.$width.'; height: '.$height));
 
         // TODO: Check for multiple markers or polygons
-        if (!$InfoText) 
+        if (!$InfoText)
             $Marker = false;
         // Create a marker whose info window displays the given text
-	if ($Marker) {
+        if ($Marker) {
             if ($InfoText) {
                 include_once("lib/BlockParser.php");
                 $page = $dbi->getPage($request->getArg('pagename'));
@@ -121,26 +121,26 @@ extends WikiPlugin
                 $markup = $rev->get('markup');
                 $markertext = TransformText($InfoText, $markup, $basepage);
             }
-	    $markerjs = JavaScript("
+            $markerjs = JavaScript("
 function createMarker(point, text) {
   var marker = new GMarker(point);
-  var html = text + \"<br><br><font size='-1'>[" . 
+  var html = text + \"<br><br><font size='-1'>[" .
                                                _("new&nbsp;window") .
                                                "]</font>\";
   GEvent.addListener(marker, \"click\", function() {marker.openInfoWindowHtml(html);});
   return marker;
 }");
-	}
+        }
 
-	$run = JavaScript("
+        $run = JavaScript("
 var map = new GMap(document.getElementById('".$id."'));\n" .
-($SmallMapControl 
+($SmallMapControl
  ? "map.addControl(new GSmallMapControl());\n"
  : "map.addControl(new GLargeMapControl());\n") . "
 map.addControl(new GMapTypeControl());
 map.centerAndZoom(new GPoint(".$Longitude.", ".$Latitude."), ".$ZoomFactor.");
-map.setMapType(".$type.");" . 
-($Marker 
+map.setMapType(".$type.");" .
+($Marker
  ? "
 var point = new GPoint(".$Longitude.",".$Latitude.");
 var marker = createMarker(point, '".$markertext->asXml()."'); map.addOverlay(marker);"
diff --git a/lib/plugin/GooglePlugin.php b/lib/plugin/GooglePlugin.php
index 93492380c..6879c5b33 100644
--- a/lib/plugin/GooglePlugin.php
+++ b/lib/plugin/GooglePlugin.php
@@ -23,7 +23,7 @@ rcs_id('$Id$');
 require_once("lib/Google.php");
 
 /**
- * This module is a wrapper for the Google Web APIs. It allows you to do Google searches, 
+ * This module is a wrapper for the Google Web APIs. It allows you to do Google searches,
  * retrieve pages from the Google cache, and ask Google for spelling suggestions.
  *
  * Note: You must first obtain a license key at http://www.google.com/apis/
@@ -79,7 +79,7 @@ extends WikiPlugin
                 case 'cache':  $result = $google->doGetCachedPage($q); break;
                 case 'spell':  $result = $google->doSpellingSuggestion($q); break;
                 default:
-                	trigger_error("Invalid mode");
+                        trigger_error("Invalid mode");
             }
             if (isa($result,'HTML'))
                 $html->pushContent($result);
@@ -88,13 +88,13 @@ extends WikiPlugin
                 if (!empty($result->resultElements)) {
                     $list = HTML::ol();
                     foreach ($result->resultElements as $res) {
-                    	$li = HTML::li(LinkURL($res['URL'],$res['directoryTitle']),HTML::br(),
-                    	               $res['directoryTitle'] ? HTML(HTML::raw('&nbsp;&nbsp;'),HTML::em($res['summary']),' -- ',LinkURL($res['URL'])) : '');
+                            $li = HTML::li(LinkURL($res['URL'],$res['directoryTitle']),HTML::br(),
+                                           $res['directoryTitle'] ? HTML(HTML::raw('&nbsp;&nbsp;'),HTML::em($res['summary']),' -- ',LinkURL($res['URL'])) : '');
                         $list->pushContent($li);
                     }
                     $html->pushContent($list);
                 }
-                else 
+                else
                     return _("Nothing found");
             }
             if (is_string($result)) {
diff --git a/lib/plugin/GraphViz.php b/lib/plugin/GraphViz.php
index 29e5dd325..417a79b02 100644
--- a/lib/plugin/GraphViz.php
+++ b/lib/plugin/GraphViz.php
@@ -26,8 +26,8 @@ rcs_id('$Id$');
  *
  * @Author: Reini Urban
  *
- * Note: 
- * - We support only images supported by GD so far (PNG most likely). 
+ * Note:
+ * - We support only images supported by GD so far (PNG most likely).
  *   EPS, PS, SWF, SVG or SVGZ and imagemaps need to be tested.
  *
  * Usage:
@@ -37,7 +37,7 @@ rcs_id('$Id$');
 
  * See also: VisualWiki, which depends on GraphViz and WikiPluginCached.
  *
- * TODO: 
+ * TODO:
  * - neato binary ?
  * - expand embedded <!plugin-list pagelist !> within the digraph script.
  */
@@ -61,7 +61,7 @@ elseif (isWindows()) {
     if (!defined("GRAPHVIZ_EXE"))
         define('GRAPHVIZ_EXE','/home/groups/p/ph/phpwiki/bin/dot');
     if (!defined('VISUALWIKIFONT'))
-        define('VISUALWIKIFONT', 'luximr'); 
+        define('VISUALWIKIFONT', 'luximr');
 } else { // other os
     if (!defined("GRAPHVIZ_EXE"))
         define('GRAPHVIZ_EXE','/usr/local/bin/dot');
@@ -75,14 +75,14 @@ elseif (isWindows()) {
     //$fontpath = "/usr/share/fonts/default/TrueType/";
 }
 
-require_once "lib/WikiPluginCached.php"; 
+require_once "lib/WikiPluginCached.php";
 
 class WikiPlugin_GraphViz
 extends WikiPluginCached
 {
 
     function _mapTypes() {
-    	return array("imap", "cmapx", "ismap", "cmap");
+            return array("imap", "cmapx", "ismap", "cmap");
     }
 
     /**
@@ -95,20 +95,20 @@ extends WikiPluginCached
         if ($type == $this->_args['imgtype'])
             return PLUGIN_CACHED_IMG_INLINE;
         $device = strtolower($this->_args['imgtype']);
-    	if (in_array($device, $this->_mapTypes()))
-    	    return PLUGIN_CACHED_MAP;
-    	if (in_array($device, array('svg','swf','svgz','eps','ps'))) {
+            if (in_array($device, $this->_mapTypes()))
+                return PLUGIN_CACHED_MAP;
+            if (in_array($device, array('svg','swf','svgz','eps','ps'))) {
             switch ($this->_args['imgtype']) {
-            	case 'svg':
-            	case 'svgz':
+                    case 'svg':
+                    case 'svgz':
                    return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_SVG_PNG;
-            	case 'swf':
+                    case 'swf':
                    return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_SWF;
-                default: 
+                default:
                    return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_HTML;
             }
         }
-    	else
+            else
             return PLUGIN_CACHED_IMG_INLINE; // normal cached libgd image handles
     }
     function getName () {
@@ -213,8 +213,8 @@ extends WikiPluginCached
             $source = "digraph GraphViz {\n";  // }
             foreach ($argarray['pages'] as $name) { // support <!plugin-list !> pagelists
                 // allow Page/SubPage
-                $url = str_replace(urlencode(SUBPAGE_SEPARATOR), SUBPAGE_SEPARATOR, 
-				   rawurlencode($name));
+                $url = str_replace(urlencode(SUBPAGE_SEPARATOR), SUBPAGE_SEPARATOR,
+                                   rawurlencode($name));
                 $source .= "  \"$name\" [URL=\"$url\"];\n";
             }
             // {
@@ -234,7 +234,7 @@ extends WikiPluginCached
              $source = $src;
         }
         */
-	return $source;
+        return $source;
     }
 
     function createDotFile($tempfile='', $argarray=false) {
@@ -259,7 +259,7 @@ extends WikiPluginCached
         if (in_array($gif, array("imap", "cmapx", "ismap", "cmap"))) {
             $this->_mapfile = "$tempfiles.map";
             $gif = $this->decideImgType($argarray['imgtype']);
-	    if ($gif == $argarray['imgtype']) $gif = 'png';
+            if ($gif == $argarray['imgtype']) $gif = 'png';
         }
 
         $ImageCreateFromFunc = "ImageCreateFrom$gif";
@@ -291,39 +291,39 @@ extends WikiPluginCached
           sleep(0.1);
         }
         if (! file_exists($outfile) ) {
-            $this->complain(sprintf(_("%s error: outputfile '%s' not created"), 
+            $this->complain(sprintf(_("%s error: outputfile '%s' not created"),
                                     "GraphViz", $outfile));
             $this->complain("\ncmd-line: $cmdline");
             return false;
         }
         if (function_exists($ImageCreateFromFunc)) {
             $img = $ImageCreateFromFunc( $outfile );
-	    // clean up tempfiles
-	    @unlink($tempfiles);
-	    if (empty($argarray['debug']))
-		foreach (array(".$gif",'.dot') as $ext) {
-		    //if (file_exists($tempfiles.$ext))
-		    @unlink($tempfiles.$ext);
-		}
-	    return $img;
-	}
+            // clean up tempfiles
+            @unlink($tempfiles);
+            if (empty($argarray['debug']))
+                foreach (array(".$gif",'.dot') as $ext) {
+                    //if (file_exists($tempfiles.$ext))
+                    @unlink($tempfiles.$ext);
+                }
+            return $img;
+        }
         return $outfile;
     }
-    
+
     // which argument must be set to 'png', for the fallback image when svg will fail on the client.
     // type: SVG_PNG
     function pngArg() {
-    	return 'imgtype';
+            return 'imgtype';
     }
-    
+
     function getMap($dbi, $argarray, $request) {
-    	$result = $this->invokeDot($argarray);
+            $result = $this->invokeDot($argarray);
         if (isa($result, 'HtmlElement'))
             return array(false, $result);
         else
             return $result;
         // $img = $this->getImage($dbi, $argarray, $request);
-    	//return array($this->_mapfile, $img);
+            //return array($this->_mapfile, $img);
     }
 
     /**
@@ -355,24 +355,24 @@ extends WikiPluginCached
             $this->complain("No dot graph given");
             return array(false, $this->GetError());
         }
-	//$ok = $ok and $this->createDotFile($tempfiles.'.dot', $argarray);
+        //$ok = $ok and $this->createDotFile($tempfiles.'.dot', $argarray);
 
         $args = "-T$gif $tempfiles.dot -o $outfile";
         $cmdline1 = "$dotbin $args";
         if ($debug) $cmdline1 .= " > $tempout";
-	$ok = $ok and $this->filterThroughCmd($source, $cmdline1);
-	//$ok = $this->execute("$dotbin -T$gif $tempfiles.dot -o $outfile" . 
-	//		     ($debug ? " > $tempout 2>&1" : " 2>&1"), $outfile)
+        $ok = $ok and $this->filterThroughCmd($source, $cmdline1);
+        //$ok = $this->execute("$dotbin -T$gif $tempfiles.dot -o $outfile" .
+        //                     ($debug ? " > $tempout 2>&1" : " 2>&1"), $outfile)
 
         $args = "-Timap $tempfiles.dot -o $tempfiles.map";
         $cmdline2 = "$dotbin $args";
         if ($debug) $cmdline2 .= " > $tempout";
         $ok = $ok and $this->filterThroughCmd($source, $cmdline2);
-	// $this->execute("$dotbin -Timap $tempfiles.dot -o ".$tempfiles.".map" . 
+        // $this->execute("$dotbin -Timap $tempfiles.dot -o ".$tempfiles.".map" .
         //                    ($debug ? " > $tempout 2>&1" : " 2>&1"), $tempfiles.".map")
-	$ok = $ok and file_exists( $outfile );
-	$ok = $ok and file_exists( $tempfiles.'.map' );
-	$ok = $ok and ($img = $ImageCreateFromFunc($outfile));
+        $ok = $ok and file_exists( $outfile );
+        $ok = $ok and file_exists( $tempfiles.'.map' );
+        $ok = $ok and ($img = $ImageCreateFromFunc($outfile));
         $ok = $ok and ($fp = fopen($tempfiles.'.map', 'r'));
 
         $map = HTML();
@@ -389,7 +389,7 @@ extends WikiPluginCached
                 $map = $tempdir . "/".$this->getName().".map";
             $img = $ImageCreateFromFunc($img);
             $fp = fopen($map, 'r');
-            $map = HTML();	
+            $map = HTML();
             $ok = true;
         }
         if ($ok and $fp) {
@@ -433,7 +433,7 @@ extends WikiPluginCached
         @unlink($tempfiles);
         if ($ok and !$argarray['debug'])
             foreach (array('',".$gif",'.map','.dot') as $ext) {
-		@unlink($tempfiles.$ext);
+                @unlink($tempfiles.$ext);
             }
 
         if ($ok)
diff --git a/lib/plugin/HtmlConverter.php b/lib/plugin/HtmlConverter.php
index fb9c9e802..fdd12de7c 100644
--- a/lib/plugin/HtmlConverter.php
+++ b/lib/plugin/HtmlConverter.php
@@ -55,8 +55,8 @@ class WikiPlugin_HtmlConverter extends WikiPlugin
         /* plugin not yet has arguments - save for later (copied from UpLoad)
         $args = $this->getArgs($argstr, $request);
         extract($args);
-		*/
-		
+                */
+
         $form = HTML::form(array('action' => $request->getPostURL(),
                                  'enctype' => 'multipart/form-data',
                                  'method' => 'post'));
@@ -82,9 +82,9 @@ class WikiPlugin_HtmlConverter extends WikiPlugin
             if ( !preg_match("/(\.html|\.htm)$/i", $userfile_name)) {
                 $message->pushContent(_("Only files with extension HTML are allowed"),HTML::br(),HTML::br());
             } else {
-            	$message->pushContent( _("Processed $userfile_name"), HTML::br(), HTML::br());
-            	$message->pushContent( _("Copy the output below and paste it into your Wiki page."), HTML::br());
-            	$message->pushContent( $this->_process( $userfile_tmpname));
+                    $message->pushContent( _("Processed $userfile_name"), HTML::br(), HTML::br());
+                    $message->pushContent( _("Copy the output below and paste it into your Wiki page."), HTML::br());
+                    $message->pushContent( $this->_process( $userfile_tmpname));
             }
         } else {
             $message->pushContent(HTML::br(),HTML::br());
@@ -96,102 +96,102 @@ class WikiPlugin_HtmlConverter extends WikiPlugin
         return $result;
     }
 
-	function _processA(&$file) {
-
-	    $file = eregi_replace(
-	    "<a([[:space:]]+)href([[:space:]]*)=([[:space:]]*)\"([-/.a-zA-Z0-9_~#@%$?&=:\200-\377\(\)[:space:]]+)\"([^>]*)>", "{{\\4}}", $file);
-	
-		$file = eregi_replace("{{([-/a-zA-Z0-9._~#@%$?&=:\200-\377\(\)[:space:]]+)}}([^<]+)</a>", "[ \\2 | \\1 ]", $file);
-	}
-
-	function _processIMG(&$file) {
-	
-		$img_regexp = "_<img\s+src\s*=\s*\"([-/.a-zA-Z0-9\_~#@%$?&=:\200-\377\(\)\s]+)\"[^>]*>_";
-	
-	    $file = preg_replace( $img_regexp, "\n\n[Upload:\\1]", $file);
-	}
-	
-	function _processUL( &$file) {
-	
-		// put any <li>-Tag in a new line to indent correctly and strip trailing white space (including new-lines)
-		$file = str_replace( "<li", "\n<li", $file);
-		$file = preg_replace( "/<li>\s*/", "<li>", $file);
-		
-		$enclosing_regexp = "_(.*)<ul\s?[^>]*>((?U).*)</ul>(.*)_is";
-		$indent_tag = "<li";
-		$embedded_fragment_array = array();
-		$found = preg_match( $enclosing_regexp, $file, $embedded_fragment_array);
-		while ( $found) {
-			$indented = str_replace( $indent_tag, "\t".$indent_tag, $embedded_fragment_array[2]);
-			// string the file together again with the indented part in the middle.
-			// a <p> is inserted instead of the erased <ul> tags to have a paragraph generated at the end of the script
-			$file = $embedded_fragment_array[1] . "<p>" . $indented . $embedded_fragment_array[3];
-			$found = preg_match( $enclosing_regexp, $file, $embedded_fragment_array);
-		}
-	}
-
-	function _process( $file_name) {
-		$result = HTML();
-	    $file = file_get_contents( $file_name); 
-		$file = html_entity_decode( $file);
-		
-		$ascii  =  '[\x00-\x7F]';  
-		$euc  =  '[\xA1-\xFE][\xA1-\xFE]';  
-		$character  =  "$ascii|$euc";  
-	
-		$this->_processA( $file);
-		$this->_processIMG( $file);
-		$this->_processUL( $file);
-		
-		$file = str_replace ("\r\n", "\n", $file);
-		
-		$file = eregi_replace ("<h1[[:space:]]?[^>]*>", "\n\n!!!!", $file);
-		
-		$file = eregi_replace ("<h2[[:space:]]?[^>]*>", "\n\n!!!", $file);
-		
-		$file = eregi_replace ("<h3[[:space:]]?[^>]*>", "\n\n!!", $file);
-		
-		$file = eregi_replace ("<h4[[:space:]]?[^>]*>", "\n\n!", $file);
-		
-		$file = eregi_replace ("<h5[[:space:]]?[^>]*>", "\n\n__", $file);
-		
-		$file = eregi_replace ("</h1>", "\n\n", $file);
-		
-		$file = eregi_replace ("</h2>", "\n\n", $file);
-		
-		$file = eregi_replace ("</h3>", "\n\n", $file);
-		
-		$file = eregi_replace ("</h4>", "\n\n", $file);
-		
-		$file = eregi_replace ("</h5>", "__\n\n", $file);
-		
-		$file = eregi_replace ("<hr[[:space:]]?[^>]*>", "\n----\n", $file);
-	
-		$file = eregi_replace ("<li[[:space:]]?[^>]*>", "* ", $file);
-
-		// strip all tags, except for <pre>, which is supported by wiki
-		// and <p>'s which will be converted after compression.		
-		$file = strip_tags($file, "<pre><p>");
-		// strip </p> end tags with trailing white space
-		$file = preg_replace ("_</p>\s*_i", "", $file);    
-
-		// get rid of all blank lines
-		$file = preg_replace( "/\n\s*\n/", "\n", $file);
-
-		// finally only add paragraphs where defined by inserting double new-lines
-		// be sure to only catch <p> or <p[space]...> and not <pre>!
-		// Actually <p> tags with all white space and one new-line before
-		// and after around are replaced
-		$file = preg_replace ("_\n?[^\S\n]*<p(\s[^>]*|)>[^\S\n]*\n?_i", "\n\n", $file);    
-	
-		// strip attributes from <pre>-Tags and add a new-line before
-		$file = preg_replace ("_<pre(\s[^>]*|)>_iU", "\n<pre>", $file);    
+        function _processA(&$file) {
+
+            $file = eregi_replace(
+            "<a([[:space:]]+)href([[:space:]]*)=([[:space:]]*)\"([-/.a-zA-Z0-9_~#@%$?&=:\200-\377\(\)[:space:]]+)\"([^>]*)>", "{{\\4}}", $file);
+
+                $file = eregi_replace("{{([-/a-zA-Z0-9._~#@%$?&=:\200-\377\(\)[:space:]]+)}}([^<]+)</a>", "[ \\2 | \\1 ]", $file);
+        }
+
+        function _processIMG(&$file) {
+
+                $img_regexp = "_<img\s+src\s*=\s*\"([-/.a-zA-Z0-9\_~#@%$?&=:\200-\377\(\)\s]+)\"[^>]*>_";
+
+            $file = preg_replace( $img_regexp, "\n\n[Upload:\\1]", $file);
+        }
+
+        function _processUL( &$file) {
+
+                // put any <li>-Tag in a new line to indent correctly and strip trailing white space (including new-lines)
+                $file = str_replace( "<li", "\n<li", $file);
+                $file = preg_replace( "/<li>\s*/", "<li>", $file);
+
+                $enclosing_regexp = "_(.*)<ul\s?[^>]*>((?U).*)</ul>(.*)_is";
+                $indent_tag = "<li";
+                $embedded_fragment_array = array();
+                $found = preg_match( $enclosing_regexp, $file, $embedded_fragment_array);
+                while ( $found) {
+                        $indented = str_replace( $indent_tag, "\t".$indent_tag, $embedded_fragment_array[2]);
+                        // string the file together again with the indented part in the middle.
+                        // a <p> is inserted instead of the erased <ul> tags to have a paragraph generated at the end of the script
+                        $file = $embedded_fragment_array[1] . "<p>" . $indented . $embedded_fragment_array[3];
+                        $found = preg_match( $enclosing_regexp, $file, $embedded_fragment_array);
+                }
+        }
+
+        function _process( $file_name) {
+                $result = HTML();
+            $file = file_get_contents( $file_name);
+                $file = html_entity_decode( $file);
+
+                $ascii  =  '[\x00-\x7F]';
+                $euc  =  '[\xA1-\xFE][\xA1-\xFE]';
+                $character  =  "$ascii|$euc";
+
+                $this->_processA( $file);
+                $this->_processIMG( $file);
+                $this->_processUL( $file);
+
+                $file = str_replace ("\r\n", "\n", $file);
+
+                $file = eregi_replace ("<h1[[:space:]]?[^>]*>", "\n\n!!!!", $file);
+
+                $file = eregi_replace ("<h2[[:space:]]?[^>]*>", "\n\n!!!", $file);
+
+                $file = eregi_replace ("<h3[[:space:]]?[^>]*>", "\n\n!!", $file);
+
+                $file = eregi_replace ("<h4[[:space:]]?[^>]*>", "\n\n!", $file);
+
+                $file = eregi_replace ("<h5[[:space:]]?[^>]*>", "\n\n__", $file);
+
+                $file = eregi_replace ("</h1>", "\n\n", $file);
+
+                $file = eregi_replace ("</h2>", "\n\n", $file);
+
+                $file = eregi_replace ("</h3>", "\n\n", $file);
+
+                $file = eregi_replace ("</h4>", "\n\n", $file);
+
+                $file = eregi_replace ("</h5>", "__\n\n", $file);
+
+                $file = eregi_replace ("<hr[[:space:]]?[^>]*>", "\n----\n", $file);
+
+                $file = eregi_replace ("<li[[:space:]]?[^>]*>", "* ", $file);
+
+                // strip all tags, except for <pre>, which is supported by wiki
+                // and <p>'s which will be converted after compression.
+                $file = strip_tags($file, "<pre><p>");
+                // strip </p> end tags with trailing white space
+                $file = preg_replace ("_</p>\s*_i", "", $file);
+
+                // get rid of all blank lines
+                $file = preg_replace( "/\n\s*\n/", "\n", $file);
+
+                // finally only add paragraphs where defined by inserting double new-lines
+                // be sure to only catch <p> or <p[space]...> and not <pre>!
+                // Actually <p> tags with all white space and one new-line before
+                // and after around are replaced
+                $file = preg_replace ("_\n?[^\S\n]*<p(\s[^>]*|)>[^\S\n]*\n?_i", "\n\n", $file);
+
+                // strip attributes from <pre>-Tags and add a new-line before
+                $file = preg_replace ("_<pre(\s[^>]*|)>_iU", "\n<pre>", $file);
 
         $outputArea = HTML::textarea(array('rows' => '30', 'cols' => '80'));
-		
-		$outputArea->pushContent( _($file));
-		$result->pushContent( $outputArea);
-		return $result;
-	}
+
+                $outputArea->pushContent( _($file));
+                $result->pushContent( $outputArea);
+                return $result;
+        }
 }
 ?>
diff --git a/lib/plugin/Imdb.php b/lib/plugin/Imdb.php
index 47331552d..c534d6ab3 100644
--- a/lib/plugin/Imdb.php
+++ b/lib/plugin/Imdb.php
@@ -2,7 +2,7 @@
 rcs_id('$Id$');
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
- * 
+ *
  * This file is (not yet) part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -72,7 +72,7 @@ extends WikiPlugin_SqlResult
                      'title'       => false, // custom filter for the query
                      'name'        => false, // custom filter for the query
                      'sortby'      => false, // for paging, default none
-                     'limit'       => false, // for paging, default: only the first 50 
+                     'limit'       => false, // for paging, default: only the first 50
                     );
     }
 
diff --git a/lib/plugin/IncludePage.php b/lib/plugin/IncludePage.php
index 635bbeac4..20db4a5aa 100644
--- a/lib/plugin/IncludePage.php
+++ b/lib/plugin/IncludePage.php
@@ -69,7 +69,7 @@ extends WikiPlugin
             return false;
         return array(array('linkto' => $page->name, 'relation' => 0));
     }
-                
+
     function run($dbi, $argstr, &$request, $basepage) {
         $args = $this->getArgs($argstr, $request);
         extract($args);
@@ -100,7 +100,7 @@ extends WikiPlugin
             return $this->error(sprintf(_("Illegal inclusion of page %s: no read access"),
                                         $page));
         }
-        
+
         $p = $dbi->getPage($page);
         if ($rev) {
             $r = $p->getRevision($rev);
@@ -112,7 +112,7 @@ extends WikiPlugin
             $r = $p->getCurrentRevision();
         }
         $c = $r->getContent();
-        
+
         // follow redirects
         if ((preg_match('/<'.'\?plugin\s+RedirectTo\s+page=(\S+)\s*\?'.'>/', implode("\n", $c), $m))
           or (preg_match('/<'.'\?plugin\s+RedirectTo\s+page=(.*?)\s*\?'.'>/', implode("\n", $c), $m))
@@ -160,8 +160,8 @@ extends WikiPlugin
                     HTML::div(array('class' => 'transclusion'),
                               false, $content));
     }
-    
-    /** 
+
+    /**
      * handles the arguments: section, sectionhead, lines, words, bytes,
      * for UnfoldSubpages, IncludePage, ...
      */
@@ -169,7 +169,7 @@ extends WikiPlugin
         extract($args);
 
         if ($section) {
-            if ($sections) { 
+            if ($sections) {
                 $c = extractSection($section, $c, $pagename, $quiet, 1);
             } else {
                 $c = extractSection($section, $c, $pagename, $quiet, $sectionhead);
diff --git a/lib/plugin/IncludePages.php b/lib/plugin/IncludePages.php
index 74435b8a0..51c47c27c 100644
--- a/lib/plugin/IncludePages.php
+++ b/lib/plugin/IncludePages.php
@@ -27,7 +27,7 @@ rcs_id('$Id$');
  */
 
 include_once("lib/plugin/IncludePage.php");
- 
+
 class WikiPlugin_IncludePages
 extends WikiPlugin_IncludePage
 {
@@ -45,20 +45,20 @@ extends WikiPlugin_IncludePage
     }
 
     function getDefaultArguments() {
-    	return array_merge(
+            return array_merge(
                            array( 'pages'   => false,  // the pages to include
                                   'exclude' => false), // the pages to exclude
                            WikiPlugin_IncludePage::getDefaultArguments()
                            );
     }
-                
+
     function run($dbi, $argstr, &$request, $basepage) {
         $args = $this->getArgs($argstr, $request);
-    	$html = HTML();
+            $html = HTML();
         if (empty($args['pages']))
             return $html;
         $include = new WikiPlugin_IncludePage();
-        
+
         if (is_string($args['exclude']) and !empty($args['exclude'])) {
             $args['exclude'] = explodePageList($args['exclude']);
             $argstr = preg_replace("/exclude=\S*\s/", "", $argstr);
@@ -67,16 +67,16 @@ extends WikiPlugin_IncludePage
         }
         if (is_string($args['pages']) and !empty($args['pages'])) {
             $args['pages'] = explodePageList($args['pages']);
-            $argstr = preg_replace("/pages=\S*\s/", "", $argstr);	
+            $argstr = preg_replace("/pages=\S*\s/", "", $argstr);
         } elseif (is_array($args['pages'])) {
             $argstr = preg_replace("/pages=<\?plugin-list.*?\>/", "", $argstr);
         }
-        
-    	foreach ($args['pages'] as $page) {
+
+            foreach ($args['pages'] as $page) {
             if (empty($args['exclude']) or !in_array($page, $args['exclude'])) {
                 $html = HTML($html, $include->run($dbi, "page='$page' ".$argstr, $request, $basepage));
             }
-    	}
+            }
         return $html;
     }
 };
diff --git a/lib/plugin/IncludeSiteMap.php b/lib/plugin/IncludeSiteMap.php
index 5dcc87596..1c05b7ef6 100644
--- a/lib/plugin/IncludeSiteMap.php
+++ b/lib/plugin/IncludeSiteMap.php
@@ -28,7 +28,7 @@ rcs_id('$Id$');
  *
  * This is a quick mod of BackLinks to do the job recursively. If your
  * site is categorized correctly, and all the categories are listed in
- * CategoryCategory, then a RecBackLinks there will produce one BIG(!) 
+ * CategoryCategory, then a RecBackLinks there will produce one BIG(!)
  * contents page for the entire site.
  * The list is as deep as the recursion level ('reclimit').
  *
@@ -54,7 +54,7 @@ extends WikiPlugin_SiteMap
 
   function getDescription () {
     return sprintf(_("Include recursively all linked pages starting at %s"),
-		   $this->_pagename);
+                   $this->_pagename);
   }
 
   function getVersion() {
diff --git a/lib/plugin/InterWikiSearch.php b/lib/plugin/InterWikiSearch.php
index 233507948..4f86a5092 100644
--- a/lib/plugin/InterWikiSearch.php
+++ b/lib/plugin/InterWikiSearch.php
@@ -43,7 +43,7 @@ extends WikiPlugin
     function getDefaultArguments() {
         return array('s' => '',
                      'formsize' => 30,
-        	    );
+                    );
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
@@ -70,17 +70,17 @@ extends WikiPlugin
  * @desc
  */
 if (defined('DEBUG') && DEBUG) {
-class PageFormatter_searchableInterWikiMap 
+class PageFormatter_searchableInterWikiMap
 extends PageFormatter_interwikimap {}
 
 class PageType_searchableInterWikiMap
 extends PageType_interwikimap
 {
     function format($text) {
-	return HTML::div(array('class' => 'wikitext'),
-			 $this->_transform($this->_getHeader($text)),
-			 $this->_formatMap(),
-			 $this->_transform($this->_getFooter($text)));
+        return HTML::div(array('class' => 'wikitext'),
+                         $this->_transform($this->_getHeader($text)),
+                         $this->_formatMap(),
+                         $this->_transform($this->_getFooter($text)));
     }
 
     function _formatMap() {
diff --git a/lib/plugin/JabberPresence.php b/lib/plugin/JabberPresence.php
index 911c9bb2a..1120cc516 100644
--- a/lib/plugin/JabberPresence.php
+++ b/lib/plugin/JabberPresence.php
@@ -2,7 +2,7 @@
 rcs_id('$Id$');
 /*
  * Copyright (C) 2004 $ThePhpWikiProgrammingTeam
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@ rcs_id('$Id$');
  * http://edgar.netflint.net/howto.php
  *
  * Usage:
- *  <?plugin JabberPresence scripturl=http://edgar.netflint.net/status.php 
+ *  <?plugin JabberPresence scripturl=http://edgar.netflint.net/status.php
  *                          jid=yourid@jabberserver type=html iconset=phpbb ?>
  *
  * @author: Arnaud Fontaine
@@ -57,7 +57,7 @@ extends WikiPlugin
     function getDefaultArguments() {
         return array('scripturl' => "http://edgar.netflint.net/status.php",
                      'jid'       => MY_JABBER_ID,
-		     'type'      => 'image',
+                     'type'      => 'image',
                      'iconset'   => "gabber");
     }
 
@@ -66,12 +66,12 @@ extends WikiPlugin
         // Any text that is returned will not be further transformed,
         // so use html where necessary.
         if (empty($jid))
-	    $html = HTML();
+            $html = HTML();
         else
-	  $html = HTML::img(array('src' => urlencode($scripturl).
-				  '&jid='.urlencode($jid).
-				  '&type='.urlencode($type).
-				  '&iconset='.($iconset),
+          $html = HTML::img(array('src' => urlencode($scripturl).
+                                  '&jid='.urlencode($jid).
+                                  '&type='.urlencode($type).
+                                  '&iconset='.($iconset),
                                   'alt' =>""));
         return $html;
     }
diff --git a/lib/plugin/LdapSearch.php b/lib/plugin/LdapSearch.php
index d86b130a6..c15166e86 100644
--- a/lib/plugin/LdapSearch.php
+++ b/lib/plugin/LdapSearch.php
@@ -33,15 +33,15 @@
            host="localhost"
            port=389
            basedn=""
- 	   filter="(cn=*)"
-           attributes=""  
+            filter="(cn=*)"
+           attributes=""
   ?>
-  <?plugin LdapSearch host=ldap.example.com filter="(ou=web-team)" 
+  <?plugin LdapSearch host=ldap.example.com filter="(ou=web-team)"
                       attributes="sn cn telephonenumber" ?>
   <?plugin LdapSearch host="ldap.itd.umich.edu" basedn="" filter="(sn=jensen)" attributes="cn drink" ?>
   <?plugin LdapSearch host=ldap.example.com attributes="cn sn telephonenumber" ?>
   <?plugin LdapSearch host=bugs.debian.org port=10101 basedn="dc=current,dc=bugs,dc=debian,dc=org"
-                      filter="(debbugsPackage=phpwiki)" 
+                      filter="(debbugsPackage=phpwiki)"
                       attributes="debbugsSeverity debbugsState debbugsTitle" ?>
 
  * @author John Lines
@@ -62,11 +62,11 @@ extends WikiPlugin
                             "\$Revision$");
     }
     function getDefaultArguments() {
-        return array('host' 	=> "", 		// default: LDAP_AUTH_HOST
-		     'port' 	=> 389,		// ignored if host = full uri
-		     'basedn' 	=> "",		// LDAP_BASE_DN
+        return array('host'         => "",                 // default: LDAP_AUTH_HOST
+                     'port'         => 389,                // ignored if host = full uri
+                     'basedn'         => "",                // LDAP_BASE_DN
                      'filter'   => "(cn=*)",
-		     'attributes' => "",
+                     'attributes' => "",
                      'user'     => '',
                      'password' => '',
                      'options'   => "",
@@ -95,7 +95,7 @@ extends WikiPlugin
             if (strstr($host, '://'))
                 $port = null;
         }
-	$html = HTML();
+        $html = HTML();
         if (is_null($port))
             $connect = ldap_connect($host);
         else
@@ -113,7 +113,7 @@ extends WikiPlugin
                     $this->error(_("Failed to set LDAP $key $value"));
             }
         }
-	
+
         // special convenience: if host = LDAP_AUTH_HOST
         // then take user and password from config.ini also
         if ($user) {
@@ -126,77 +126,77 @@ extends WikiPlugin
             if (LDAP_AUTH_USER)
                 if (LDAP_AUTH_PASSWORD)
                     // Windows Active Directory Server is strict
-                    $r = ldap_bind($connect, LDAP_AUTH_USER, LDAP_AUTH_PASSWORD); 
+                    $r = ldap_bind($connect, LDAP_AUTH_USER, LDAP_AUTH_PASSWORD);
                 else
-                    $r = ldap_bind($connect, LDAP_AUTH_USER); 
+                    $r = ldap_bind($connect, LDAP_AUTH_USER);
             else // anonymous bind
                 $bind = ldap_bind($connect);
         } else { // other anonymous bind
             $bind = ldap_bind($connect);
         }
         if (!$bind) return $this->error(_("Failed to bind LDAP host"));
-	if (!$basedn) $basedn = LDAP_BASE_DN;
-	$attr_array = array("");
-	if (!$attributes) {
+        if (!$basedn) $basedn = LDAP_BASE_DN;
+        $attr_array = array("");
+        if (!$attributes) {
             $res = ldap_search($connect, $basedn, $filter);
         } else {
             $attr_array = split (" ",$attributes);
             $res = ldap_search($connect, $basedn, $filter, $attr_array);
         }
-	$entries = ldap_get_entries($connect, $res);
- 
+        $entries = ldap_get_entries($connect, $res);
+
         // If we were given attributes then we return them in the order given
-	// else take all 
+        // else take all
         if ( !$attributes ) {
-	    $attr_array = array();
+            $attr_array = array();
             for ($ii=0; $ii < $entries[0]["count"]; $ii++) {
                     $data = $entries[0][$ii];
-		    $attr_array[] = $data;
-	    }
-	}
-	for ($i=0; $i < count($attr_array) ; $i++) { $attrcols[$i] = 0; }
-	// Work out how many columns we need for each attribute. objectclass has more
+                    $attr_array[] = $data;
+            }
+        }
+        for ($i=0; $i < count($attr_array) ; $i++) { $attrcols[$i] = 0; }
+        // Work out how many columns we need for each attribute. objectclass has more
         for ($i=0; $i<$entries[0]["count"]; $i++) {
-		$data = $entries[0][$i];
-		$datalen = $entries[0][$data]["count"];
-		if ($attrcols[$i] < $datalen) {
-		    $attrcols[$i] = $datalen;
-		}
-	}
-	// Print the headers
-	$row = HTML::tr(); 
-	for ($i=0; $i < count($attr_array) ; $i++) {
-	    // span subcolumns, like objectclass
-	    if ($attrcols[$i] > 1)
-		$row->pushContent(HTML::th(array('colspan' => $attrcols[$i]), $attr_array[$i]));
-	    else
-		$row->pushContent(HTML::th(array(), $attr_array[$i]));
-	}
-	$html->pushContent($row);
+                $data = $entries[0][$i];
+                $datalen = $entries[0][$data]["count"];
+                if ($attrcols[$i] < $datalen) {
+                    $attrcols[$i] = $datalen;
+                }
+        }
+        // Print the headers
+        $row = HTML::tr();
+        for ($i=0; $i < count($attr_array) ; $i++) {
+            // span subcolumns, like objectclass
+            if ($attrcols[$i] > 1)
+                $row->pushContent(HTML::th(array('colspan' => $attrcols[$i]), $attr_array[$i]));
+            else
+                $row->pushContent(HTML::th(array(), $attr_array[$i]));
+        }
+        $html->pushContent($row);
 
-	// Print the data rows
-	for ($currow = 0; $currow < $entries["count"]; $currow++) {
-	    $row = HTML::tr(); $nc=0;
-	    // columns
-	    for ($i=0; $i < count($attr_array); $i++){
-	    	$colname = $attr_array[$i];
-		$data = @$entries[$currow][$colname];
-		if ($data and $data["count"] > 0) {
-		    // subcolumns, e.g. for objectclass
-		    for ($iii=0; $iii < $data["count"]; $iii++) {
-		      $row->pushContent(HTML::td($data[$iii])); $nc++;
-		    }
-		} else {
-		    $row->pushContent(HTML::td("")); $nc++;
-		}
-		// Make up some blank cells if required to pad this row
-		/*for ( $j=0 ; $j < ($attrcols[$ii] - $nc); $j++ ) {
-		    $row->pushContent(HTML::td(""));
-		}*/
-	    }
-	    $html->pushContent($row);
-	}
-	return HTML::table(array('cellpadding' => 1,'cellspacing' => 1, 'border' => 1), $html);
+        // Print the data rows
+        for ($currow = 0; $currow < $entries["count"]; $currow++) {
+            $row = HTML::tr(); $nc=0;
+            // columns
+            for ($i=0; $i < count($attr_array); $i++){
+                    $colname = $attr_array[$i];
+                $data = @$entries[$currow][$colname];
+                if ($data and $data["count"] > 0) {
+                    // subcolumns, e.g. for objectclass
+                    for ($iii=0; $iii < $data["count"]; $iii++) {
+                      $row->pushContent(HTML::td($data[$iii])); $nc++;
+                    }
+                } else {
+                    $row->pushContent(HTML::td("")); $nc++;
+                }
+                // Make up some blank cells if required to pad this row
+                /*for ( $j=0 ; $j < ($attrcols[$ii] - $nc); $j++ ) {
+                    $row->pushContent(HTML::td(""));
+                }*/
+            }
+            $html->pushContent($row);
+        }
+        return HTML::table(array('cellpadding' => 1,'cellspacing' => 1, 'border' => 1), $html);
     }
 };
 
diff --git a/lib/plugin/LinkDatabase.php b/lib/plugin/LinkDatabase.php
index 456464b09..09ac0570e 100644
--- a/lib/plugin/LinkDatabase.php
+++ b/lib/plugin/LinkDatabase.php
@@ -28,10 +28,10 @@ require_once('lib/WikiPluginCached.php');
  *   Only via a static text file yet. (format=text)
  * - Or the Hypergraph applet (format=xml)
  *   http://hypergraph.sourceforge.net/
- *   So far also only for a static xml file, but I'll fix the applet and test 
+ *   So far also only for a static xml file, but I'll fix the applet and test
  *   the RPC2 interface.
  *
- * TODO: Currently the meta-head tags disturb the touchgraph java browser a bit. 
+ * TODO: Currently the meta-head tags disturb the touchgraph java browser a bit.
  * Maybe add a theme without that much header tags.
  * DONE: Convert " " to %20
  */
@@ -71,44 +71,44 @@ extends WikiPluginCached
     function getHtml($dbi, $argarray, $request, $basepage) {
         $this->run($dbi, WikiPluginCached::glueArgs($argarray), $request, $basepage);
     }
-    
+
     function run($dbi, $argstr, $request, $basepage) {
         global $WikiTheme;
         $args = $this->getArgs($argstr, $request);
 
         $caption = _("All pages with all links in this wiki (%d total):");
-        
+
         if ( !empty($args['owner']) ) {
             $pages = PageList::allPagesByOwner($args['owner'],$args['include_empty'],
                                                $args['sortby'],$args['limit']);
             if ($args['owner'])
-                $caption = fmt("List of pages owned by [%s] (%d total):", 
+                $caption = fmt("List of pages owned by [%s] (%d total):",
                                WikiLink($args['owner'], 'if_known'),
                                count($pages));
         } elseif ( !empty($args['author']) ) {
             $pages = PageList::allPagesByAuthor($args['author'],$args['include_empty'],
                                                 $args['sortby'],$args['limit']);
             if ($args['author'])
-                $caption = fmt("List of pages last edited by [%s] (%d total):", 
-                               WikiLink($args['author'], 'if_known'), 
+                $caption = fmt("List of pages last edited by [%s] (%d total):",
+                               WikiLink($args['author'], 'if_known'),
                                count($pages));
         } elseif ( !empty($args['creator']) ) {
             $pages = PageList::allPagesByCreator($args['creator'],$args['include_empty'],
                                                  $args['sortby'],$args['limit']);
             if ($args['creator'])
-                $caption = fmt("List of pages created by [%s] (%d total):", 
-                               WikiLink($args['creator'], 'if_known'), 
+                $caption = fmt("List of pages created by [%s] (%d total):",
+                               WikiLink($args['creator'], 'if_known'),
                                count($pages));
         } else {
-            if (! $request->getArg('count'))  
+            if (! $request->getArg('count'))
                 $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude_from']);
-            else 
+            else
                 $args['count'] = $request->getArg('count');
-            $pages = $dbi->getAllPages($args['include_empty'], $args['sortby'], 
+            $pages = $dbi->getAllPages($args['include_empty'], $args['sortby'],
                                        $args['limit'], $args['exclude_from']);
         }
         if ($args['format'] == 'html') {
-            $args['types']['links'] = 
+            $args['types']['links'] =
                 new _PageList_Column_LinkDatabase_links('links', _("Links"), 'left');
             $pagelist = new PageList($args['info'], $args['exclude_from'], $args);
             //$pagelist->_addColumn("links");
@@ -123,7 +123,7 @@ extends WikiPluginCached
             $request->checkValidators();
             while ($page = $pages->next()) {
                 echo preg_replace("/ /","%20",$page->getName());
-                $links = $page->getPageLinks(false, $args['sortby'], $args['limit'], 
+                $links = $page->getPageLinks(false, $args['sortby'], $args['limit'],
                                              $args['exclude']);
                 while ($link = $links->next()) {
                     echo " ", preg_replace("/ /","%20",$link->getName());
@@ -146,13 +146,13 @@ extends WikiPluginCached
             echo "<?xml version=\"1.0\" encoding=\"$charset\"?>";
             // As applet it prefers only "GraphXML.dtd", but then we must copy it to the webroot.
             $dtd = $WikiTheme->_findData("GraphXML.dtd");
-	    echo "<!DOCTYPE GraphXML SYSTEM \"$dtd\">\n";
-	    echo "<GraphXML xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n";
-	    echo "<graph id=\"",MangleXmlIdentifier(WIKI_NAME),"\">\n";
+            echo "<!DOCTYPE GraphXML SYSTEM \"$dtd\">\n";
+            echo "<GraphXML xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n";
+            echo "<graph id=\"",MangleXmlIdentifier(WIKI_NAME),"\">\n";
             echo '<style><line tag="node" class="main" colour="#ffffff"/><line tag="node" class="child" colour="blue"/><line tag="node" class="relation" colour="green"/></style>',"\n\n";
             while ($page = $pages->next()) {
-            	$pageid = MangleXmlIdentifier($page->getName());
-            	$pagename = $page->getName();
+                    $pageid = MangleXmlIdentifier($page->getName());
+                    $pagename = $page->getName();
                 echo "<node name=\"$pageid\"";
                 if ($pagename == $currpage) echo " class=\"main\"";
                 echo "><label>$pagename</label>";
@@ -164,8 +164,8 @@ extends WikiPluginCached
                 }
                 echo "\n";
             }
-	    echo "</graph>\n";
-	    echo "</GraphXML>\n";
+            echo "</graph>\n";
+            echo "</GraphXML>\n";
             if (empty($WikiTheme->DUMP_MODE)) {
                 unset($GLOBALS['ErrorManager']->_postponed_errors);
                 $request->finish();
diff --git a/lib/plugin/LinkSearch.php b/lib/plugin/LinkSearch.php
index 394f520a5..e339da29a 100644
--- a/lib/plugin/LinkSearch.php
+++ b/lib/plugin/LinkSearch.php
@@ -25,7 +25,7 @@ require_once('lib/PageList.php');
 
 /**
  * Similar to SemanticSearch, just for ordinary in- or outlinks.
- * 
+ *
  * @author: Reini Urban
  */
 class WikiPlugin_LinkSearch
@@ -41,143 +41,143 @@ extends WikiPlugin
         return preg_replace("/[Revision: $]/", '',
                             "\$Revision$");
     }
-    function getDefaultArguments() { 
+    function getDefaultArguments() {
         return array_merge
             (
              PageList::supportedArgs(), // paging and more.
-	     array(
-		   's'          => "", // linkvalue query string
-		   'page'       => "*", // which pages (glob allowed), default: all
-		   'direction'  => "out", // or in
-		   'case_exact' => false,
-		   'regex'      => 'auto',
-		   'noform'     => false, // don't show form with results.
-		   'noheader'   => false  // no caption
-		   ));
+             array(
+                   's'          => "", // linkvalue query string
+                   'page'       => "*", // which pages (glob allowed), default: all
+                   'direction'  => "out", // or in
+                   'case_exact' => false,
+                   'regex'      => 'auto',
+                   'noform'     => false, // don't show form with results.
+                   'noheader'   => false  // no caption
+                   ));
     }
 
     function showForm (&$dbi, &$request, $args) {
-	$action = $request->getPostURL();
-	$hiddenfield = HiddenInputs($request->getArgs(),'',
-				    array('action','page','s','direction'));
-	$pagefilter = HTML::input(array('name' => 'page',
-					'value' => $args['page'],
-					'title' => _("Search only in these pages. With autocompletion."),
-					'class' => 'dropdown', 
-					'acdropdown' => 'true', 
-					'autocomplete_complete' => 'true',
-					'autocomplete_matchsubstring' => 'false', 
-					'autocomplete_list' => 'xmlrpc:wiki.titleSearch ^[S] 4'
-					), '');
-	$query = HTML::input(array('name' => 's', 
-				   'value' => $args['s'],
-				   'title' => _("Filter by this link. These are pagenames. With autocompletion."),
-				   'class' => 'dropdown', 
-				   'acdropdown' => 'true', 
-				   'autocomplete_complete' => 'true', 
-				   'autocomplete_matchsubstring' => 'true', 
-				   'autocomplete_list' => 'xmlrpc:wiki.titleSearch ^[S] 4'
-				   ), '');
-	$dirsign_switch = JavaScript("
+        $action = $request->getPostURL();
+        $hiddenfield = HiddenInputs($request->getArgs(),'',
+                                    array('action','page','s','direction'));
+        $pagefilter = HTML::input(array('name' => 'page',
+                                        'value' => $args['page'],
+                                        'title' => _("Search only in these pages. With autocompletion."),
+                                        'class' => 'dropdown',
+                                        'acdropdown' => 'true',
+                                        'autocomplete_complete' => 'true',
+                                        'autocomplete_matchsubstring' => 'false',
+                                        'autocomplete_list' => 'xmlrpc:wiki.titleSearch ^[S] 4'
+                                        ), '');
+        $query = HTML::input(array('name' => 's',
+                                   'value' => $args['s'],
+                                   'title' => _("Filter by this link. These are pagenames. With autocompletion."),
+                                   'class' => 'dropdown',
+                                   'acdropdown' => 'true',
+                                   'autocomplete_complete' => 'true',
+                                   'autocomplete_matchsubstring' => 'true',
+                                   'autocomplete_list' => 'xmlrpc:wiki.titleSearch ^[S] 4'
+                                   ), '');
+        $dirsign_switch = JavaScript("
 function dirsign_switch() {
   var d = document.getElementById('dirsign')
   d.innerHTML = (d.innerHTML == ' =&gt; ') ? ' &lt;= ' : ' =&gt; '
 }
 ");
-	$dirsign = " => ";
-	$in = $out = array('name' => 'direction', 'type'=>'radio', 'onChange' => 'dirsign_switch()');
-	$out['value'] = 'out';
-	$out['id'] = 'dir_out';
-	if ($args['direction']=='out') $out['checked'] = 'checked';
-	$in['value'] = 'in';
-	$in['id'] = 'dir_in';
-	if ($args['direction']=='in') {
-	    $in['checked'] = 'checked';
-	    $dirsign = " <= ";
-	}
-	$direction = HTML(HTML::input($out), HTML::label(array('for'=>'dir_out'),_("outgoing")),
-			  HTML::input($in), HTML::label(array('for'=>'dir_in'),_("incoming")));
-	/*
-	$direction = HTML::select(array('name'=>'direction',
-					'onChange' => 'dirsign_switch()'));
-	$out = array('value' => 'out');
-	if ($args['direction']=='out') $out['selected'] = 'selected';
-	$in = array('value' => 'in');
-	if ($args['direction']=='in') {
-	    $in['selected'] = 'selected';
-	    $dirsign = " <= ";
-	}
-	$direction->pushContent(HTML::option($out, _("outgoing")));
-	$direction->pushContent(HTML::option($in, _("incoming")));
-	*/
-	$submit = Button('submit:search',  _("LinkSearch"), false);
-	$instructions = _("Search in pages for links with the matching name.");
-	$form = HTML::form(array('action' => $action,
-				 'method' => 'GET',
-				 'accept-charset' => $GLOBALS['charset']),
-			   $dirsign_switch,
-			   $hiddenfield,
-			   $instructions, HTML::br(),
-			   $pagefilter, 
-			   HTML::strong(HTML::tt(array('id'=>'dirsign'), $dirsign)), 
-			   $query,
-			   HTML::raw('&nbsp;'), $direction, 
-			   HTML::raw('&nbsp;'), $submit);
-	return $form;
+        $dirsign = " => ";
+        $in = $out = array('name' => 'direction', 'type'=>'radio', 'onChange' => 'dirsign_switch()');
+        $out['value'] = 'out';
+        $out['id'] = 'dir_out';
+        if ($args['direction']=='out') $out['checked'] = 'checked';
+        $in['value'] = 'in';
+        $in['id'] = 'dir_in';
+        if ($args['direction']=='in') {
+            $in['checked'] = 'checked';
+            $dirsign = " <= ";
+        }
+        $direction = HTML(HTML::input($out), HTML::label(array('for'=>'dir_out'),_("outgoing")),
+                          HTML::input($in), HTML::label(array('for'=>'dir_in'),_("incoming")));
+        /*
+        $direction = HTML::select(array('name'=>'direction',
+                                        'onChange' => 'dirsign_switch()'));
+        $out = array('value' => 'out');
+        if ($args['direction']=='out') $out['selected'] = 'selected';
+        $in = array('value' => 'in');
+        if ($args['direction']=='in') {
+            $in['selected'] = 'selected';
+            $dirsign = " <= ";
+        }
+        $direction->pushContent(HTML::option($out, _("outgoing")));
+        $direction->pushContent(HTML::option($in, _("incoming")));
+        */
+        $submit = Button('submit:search',  _("LinkSearch"), false);
+        $instructions = _("Search in pages for links with the matching name.");
+        $form = HTML::form(array('action' => $action,
+                                 'method' => 'GET',
+                                 'accept-charset' => $GLOBALS['charset']),
+                           $dirsign_switch,
+                           $hiddenfield,
+                           $instructions, HTML::br(),
+                           $pagefilter,
+                           HTML::strong(HTML::tt(array('id'=>'dirsign'), $dirsign)),
+                           $query,
+                           HTML::raw('&nbsp;'), $direction,
+                           HTML::raw('&nbsp;'), $submit);
+        return $form;
     }
- 
-    function run ($dbi, $argstr, &$request, $basepage) { 
+
+    function run ($dbi, $argstr, &$request, $basepage) {
         global $WikiTheme;
         $args = $this->getArgs($argstr, $request);
 
         if (empty($args['page']))
             $args['page'] = "*";
-	$form = $this->showForm($dbi, $request, $args);
+        $form = $this->showForm($dbi, $request, $args);
         extract($args);
-	if (empty($s))
-	    return $form;
+        if (empty($s))
+            return $form;
         $pagequery = new TextSearchQuery($page, $args['case_exact'], $args['regex']);
         $linkquery = new TextSearchQuery($s, $args['case_exact'], $args['regex']);
-	$links = $dbi->linkSearch($pagequery, $linkquery, $direction == 'in' ? 'linkfrom' : 'linkto');
-	$pagelist = new PageList($args['info'], $args['exclude'], $args);
-	$pagelist->_links = array();
-	while ($link = $links->next()) {
-	    $pagelist->addPage($link['pagename']);
-	    $pagelist->_links[] = $link;
-	}
-	$pagelist->addColumnObject
-	    (new _PageList_Column_LinkSearch_link('link', _("Link"), $pagelist));
+        $links = $dbi->linkSearch($pagequery, $linkquery, $direction == 'in' ? 'linkfrom' : 'linkto');
+        $pagelist = new PageList($args['info'], $args['exclude'], $args);
+        $pagelist->_links = array();
+        while ($link = $links->next()) {
+            $pagelist->addPage($link['pagename']);
+            $pagelist->_links[] = $link;
+        }
+        $pagelist->addColumnObject
+            (new _PageList_Column_LinkSearch_link('link', _("Link"), $pagelist));
 
-	if (!$noheader) {
-	    // We put the form into the caption just to be able to return one pagelist object, 
-	    // and to still have the convenience form at the top. we could workaround this by 
-	    // putting the form as WikiFormRich into the actionpage. but thid doesnt look as 
-	    // nice as this here.
-	    $pagelist->setCaption
-	    (   // on mozilla the form doesn't fit into the caption very well.
-		HTML($noform ? '' : HTML($form,HTML::hr()),
-	             fmt("LinkSearch result for \"%s\" in pages \"%s\", direction %s", $s, $page, $direction)));
-	}
-	return $pagelist;
+        if (!$noheader) {
+            // We put the form into the caption just to be able to return one pagelist object,
+            // and to still have the convenience form at the top. we could workaround this by
+            // putting the form as WikiFormRich into the actionpage. but thid doesnt look as
+            // nice as this here.
+            $pagelist->setCaption
+            (   // on mozilla the form doesn't fit into the caption very well.
+                HTML($noform ? '' : HTML($form,HTML::hr()),
+                     fmt("LinkSearch result for \"%s\" in pages \"%s\", direction %s", $s, $page, $direction)));
+        }
+        return $pagelist;
     }
 };
 
 // FIXME: sortby errors with this column
-class _PageList_Column_LinkSearch_link 
-extends _PageList_Column 
+class _PageList_Column_LinkSearch_link
+extends _PageList_Column
 {
     function _PageList_Column_LinkSearch_link ($field, $heading, &$pagelist) {
-	$this->_field = $field;
+        $this->_field = $field;
         $this->_heading = $heading;
-	$this->_need_rev = false;
-	$this->_iscustom = true;
-	$this->_pagelist =& $pagelist;
+        $this->_need_rev = false;
+        $this->_iscustom = true;
+        $this->_pagelist =& $pagelist;
     }
     function _getValue(&$page, $revision_handle) {
-	if (is_object($page)) $text = $page->getName();
+        if (is_object($page)) $text = $page->getName();
         else $text = $page;
         $link = $this->_pagelist->_links[$this->current_row];
-	return WikiLink($link['linkvalue'],'if_known');
+        return WikiLink($link['linkvalue'],'if_known');
     }
 }
 
diff --git a/lib/plugin/ListPages.php b/lib/plugin/ListPages.php
index c727dd530..b278430cd 100644
--- a/lib/plugin/ListPages.php
+++ b/lib/plugin/ListPages.php
@@ -26,7 +26,7 @@ require_once('lib/PageList.php');
  * ListPages - List pages that are explicitly given as the pages argument.
  *
  * Mainly used to see some ratings and recommendations.
- * But also possible to list some Categories or Users, or as generic 
+ * But also possible to list some Categories or Users, or as generic
  * frontend for plugin-list page lists.
  *
  * @author: Dan Frankowski
@@ -60,7 +60,7 @@ extends WikiPlugin
 
     // info arg allows multiple columns
     // info=mtime,hits,summary,version,author,locked,minor
-    // additional info args: 
+    // additional info args:
     //   top3recs      : recommendations
     //   numbacklinks  : number of backlinks (links to the given page)
     //   numpagelinks  : number of forward links (links at the given page)
@@ -69,10 +69,10 @@ extends WikiPlugin
         $args = $this->getArgs($argstr, $request);
 
         extract($args);
-        // If the ratings table does not exist, or on dba it will break otherwise. 
+        // If the ratings table does not exist, or on dba it will break otherwise.
         // Check if WikiTheme isa 'wikilens'
-	if ($info == 'pagename' and isa($GLOBALS['WikiTheme'], 'wikilens'))
-	    $info .= ",top3recs";
+        if ($info == 'pagename' and isa($GLOBALS['WikiTheme'], 'wikilens'))
+            $info .= ",top3recs";
         if ($info)
             $info = split(',', $info);
         else
@@ -89,10 +89,10 @@ extends WikiPlugin
             if (!isset($userids) || !is_array($userids) || !count($userids)) {
                 // TKL: moved getBuddies call inside if statement because it was
                 // causing the userids[] parameter to be ignored
-                if (is_string($active_userid) 
-		    and strlen($active_userid) 
-		    and $active_user->isSignedIn()) 
-		{
+                if (is_string($active_userid)
+                    and strlen($active_userid)
+                    and $active_user->isSignedIn())
+                {
                     $userids = getBuddies($active_userid, $dbi);
                 } else {
                     $userids = array();
@@ -112,7 +112,7 @@ extends WikiPlugin
                 // out is... odd)
                 unset($user);
             }
-            $options = array('dimension' => $dimension, 
+            $options = array('dimension' => $dimension,
                              'users' => $allowed_users);
             $args = array_merge($options, $args);
         }
diff --git a/lib/plugin/ListRelations.php b/lib/plugin/ListRelations.php
index 667aa8de2..0ad94ffd2 100644
--- a/lib/plugin/ListRelations.php
+++ b/lib/plugin/ListRelations.php
@@ -40,19 +40,19 @@ extends WikiPlugin
         return preg_replace("/[Revision: $]/", '',
                             "\$Revision$");
     }
-    function getDefaultArguments() { 
+    function getDefaultArguments() {
         return array_merge
             (
              PageList::supportedArgs(), // paging and more.
-	     array(
-		   'mode' => "relations" // or "attributes" or "all"
-		   ));
+             array(
+                   'mode' => "relations" // or "attributes" or "all"
+                   ));
     }
     function run ($dbi, $argstr, &$request, $basepage) {
         $args = $this->getArgs($argstr, $request);
         extract($args);
         $pagelist = new PageList($info, $exclude, $args);
-	// should attributes be listed as pagename here? 
+        // should attributes be listed as pagename here?
         $pagelist->addPageList($dbi->listRelations($mode == 'all', $mode == 'attributes', !empty($sortby)));
         return $pagelist;
     }
diff --git a/lib/plugin/MediawikiTable.php b/lib/plugin/MediawikiTable.php
index 80f8a9ab7..90bdb7141 100644
--- a/lib/plugin/MediawikiTable.php
+++ b/lib/plugin/MediawikiTable.php
@@ -25,22 +25,22 @@ rcs_id('$Id$');
 /*
  * Standard Alcatel-Lucent disclaimer for contributing to open source
  *
- * "The MediawikiTablePlugin ("Contribution") has not been tested and/or 
+ * "The MediawikiTablePlugin ("Contribution") has not been tested and/or
  * validated for release as or in products, combinations with products or
- * other commercial use. Any use of the Contribution is entirely made at 
+ * other commercial use. Any use of the Contribution is entirely made at
  * the user's own responsibility and the user can not rely on any features,
- * functionalities or performances Alcatel-Lucent has attributed to the 
+ * functionalities or performances Alcatel-Lucent has attributed to the
  * Contribution.
  *
- * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY 
- * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE 
+ * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
+ * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
  * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
- * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE 
- * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL 
- * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN 
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
- * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER 
- * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND 
+ * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
+ * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
+ * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
  * ALONE BASIS."
  */
 
@@ -129,12 +129,12 @@ extends WikiPlugin
                         unset($cell);
                     }
                     if (isset($thead)) {
-                    	$thead->pushContent($row);
-                    	$table->pushContent($thead);
-                    	unset($thead);
-                    	$tbody = HTML::tbody();
+                            $thead->pushContent($row);
+                            $table->pushContent($thead);
+                            unset($thead);
+                            $tbody = HTML::tbody();
                     } else {
-                    	$tbody->pushContent($row);
+                            $tbody->pushContent($row);
                     }
                 }
                 $row = HTML::tr();
@@ -191,7 +191,7 @@ extends WikiPlugin
                 if (substr($line,0,1) == "!") {
                     $cell = HTML::th();   // Header
                     $thead = HTML::thead();
-                } else { 
+                } else {
                     $cell = HTML::td();
                     if (!isset($tbody)) $tbody = HTML::tbody();
                 }
@@ -201,9 +201,9 @@ extends WikiPlugin
                 // (before the "|") is made of attributes.
                 // The end of the line (after the "|") is the cell content
                 // This is not true if the pipe is inside [], {{}} or {{{}}}
-                // | [foo|bar] 
+                // | [foo|bar]
                 // The following cases must work:
-                // | foo    
+                // | foo
                 // | [foo|bar]
                 // | class="xxx" | foo
                 // | class="xxx" | [foo|bar]
diff --git a/lib/plugin/ModeratedPage.php b/lib/plugin/ModeratedPage.php
index e5ec8a9e2..bdd9f7c56 100644
--- a/lib/plugin/ModeratedPage.php
+++ b/lib/plugin/ModeratedPage.php
@@ -3,7 +3,7 @@ rcs_id('$Id$');
 /*
  * Copyright 2004,2005 $ThePhpWikiProgrammingTeam
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@ rcs_id('$Id$');
 
 /**
  * This plugin requires an action page (default: ModeratedPage)
- * and provides delayed execution of restricted actions, 
+ * and provides delayed execution of restricted actions,
  * after a special moderators request. Usually by email.
  *   http://mywiki/SomeModeratedPage?action=ModeratedPage&id=kdclcr78431zr43uhrn&pass=approve
  *
@@ -65,20 +65,20 @@ extends WikiPlugin
         if (!empty($args['id']) and !empty($args['pass'])) {
             if (!$args['page'])
                 return $this->error("No page specified");
-	    $page = $dbi->getPage($args['page']);
+            $page = $dbi->getPage($args['page']);
             if ($moderated = $page->get("moderated")) {
                 if (array_key_exists($args['id'], $moderated['data'])) {
                     $moderation = $moderated['data'][$args['id']];
                     // handle defaults:
                     //   approve or reject
                     if ($request->isPost()) {
-                    	$button = $request->getArg('ModeratedPage');
-                    	if (isset($button['reject']))
-                    	    return $this->reject($request, $args, $moderation);
-                    	elseif (isset($button['approve']))
-                    	    return $this->approve($request, $args, $moderation);
-                    	else  
-                    	    return $this->error("Wrong button pressed");   
+                            $button = $request->getArg('ModeratedPage');
+                            if (isset($button['reject']))
+                                return $this->reject($request, $args, $moderation);
+                            elseif (isset($button['approve']))
+                                return $this->approve($request, $args, $moderation);
+                            else
+                                return $this->error("Wrong button pressed");
                     }
                     if ($args['pass'] == 'approve')
                         return $this->approve($request, $args, $moderation);
@@ -104,9 +104,9 @@ extends WikiPlugin
             $admins = $group->getSpecialMembersOf(GROUP_ADMIN);
             // email or usernames?
             $args['moderators'] = array_merge($admins, array(ADMIN_USER));
-        } else { 
+        } else {
             // resolve possible group names
-            $moderators = explode(',', $args['moderators']); 
+            $moderators = explode(',', $args['moderators']);
             for ($i=0; $i < count($moderators); $i++) {
                 $members = $group->getMembersOf($moderators[$i]);
                 if (!empty($members)) {
@@ -124,8 +124,8 @@ extends WikiPlugin
         }
         require_once("lib/MailNotify.php");
         $mail = new MailNotify($page->getName());
-        
-        list($args['emails'], $args['moderators']) = 
+
+        list($args['emails'], $args['moderators']) =
             $mail->getPageChangeEmails(array($page->getName() => $users));
 
         if (!empty($args['require_access'])) {
@@ -141,7 +141,7 @@ extends WikiPlugin
         unset($args['pass']);
         return $args;
     }
-    
+
     /**
      * Handle client-side moderation change request.
      * Hook called on the lock action, if moderation metadata already exists.
@@ -151,18 +151,18 @@ extends WikiPlugin
         $status = $this->getSiteStatus($request, $action_page);
         if (is_array($status)) {
             if (empty($status['emails'])) {
-                trigger_error(_("ModeratedPage: No emails for the moderators defined"), 
+                trigger_error(_("ModeratedPage: No emails for the moderators defined"),
                               E_USER_WARNING);
                 return false;
             }
             $page->set('moderation', array('status' => $status));
             return $this->notice(
-                       fmt("ModeratedPage status update:\n  Moderators: '%s'\n  require_access: '%s'", 
+                       fmt("ModeratedPage status update:\n  Moderators: '%s'\n  require_access: '%s'",
                        join(',', $status['moderators']), $status['require_access']));
         } else {
             $page->set('moderation', false);
             return $this->notice(HTML($status,
-                        fmt("'%s' is no ModeratedPage anymore.", $page->getName()))); 
+                        fmt("'%s' is no ModeratedPage anymore.", $page->getName())));
         }
     }
 
@@ -175,23 +175,23 @@ extends WikiPlugin
         $status = $this->getSiteStatus($request, $action_page);
         if (is_array($status)) {
             if (empty($status['emails'])) {
-            	// We really should present such warnings prominently.
-                trigger_error(_("ModeratedPage: No emails for the moderators defined"), 
+                    // We really should present such warnings prominently.
+                trigger_error(_("ModeratedPage: No emails for the moderators defined"),
                               E_USER_WARNING);
                 return false;
             }
             $page->set('moderation', array('status' => $status));
             return $this->notice(
-                       fmt("ModeratedPage status update: '%s' is now a ModeratedPage.\n  Moderators: '%s'\n  require_access: '%s'", 
+                       fmt("ModeratedPage status update: '%s' is now a ModeratedPage.\n  Moderators: '%s'\n  require_access: '%s'",
                        $page->getName(), join(',', $status['moderators']), $status['require_access']));
         }
         else { // error
             return $status;
         }
     }
-    
+
     function notice($msg) {
-    	return HTML::div(array('class' => 'wiki-edithelp'), $msg);
+            return HTML::div(array('class' => 'wiki-edithelp'), $msg);
     }
 
     function generateId() {
@@ -205,101 +205,101 @@ extends WikiPlugin
         return substr(base64_encode($s),3,$len);
     }
 
-    /** 
+    /**
      * Handle client-side POST moderation request on any moderated page.
      *   if ($page->get('moderation')) WikiPlugin_ModeratedPage::handler(...);
      * return false if not handled (pass through), true if handled and displayed.
      */
     function handler(&$request, &$page) {
-    	$action = $request->getArg('action');
-    	$moderated = $page->get('moderated');
-    	// cached version, need re-lock of each page to update moderators
-    	if (!empty($moderated['status'])) 
-    	    $status = $moderated['status'];
-    	else {
+            $action = $request->getArg('action');
+            $moderated = $page->get('moderated');
+            // cached version, need re-lock of each page to update moderators
+            if (!empty($moderated['status']))
+                $status = $moderated['status'];
+            else {
             $action_page = $request->getPage(_("ModeratedPage"));
             $status = $this->getSiteStatus($request, $action_page);
             $moderated['status'] = $status;
-    	}
+            }
         if (empty($status['emails'])) {
             trigger_error(_("ModeratedPage: No emails for the moderators defined"),
                           E_USER_WARNING);
             return true;
         }
         // which action?
-        if (!empty($status['require_access']) 
+        if (!empty($status['require_access'])
             and !in_array(action2access($action), $status['require_access']))
             return false; // allow and fall through, not moderated
-        if (!empty($status['require_level']) 
+        if (!empty($status['require_level'])
             and $request->_user->_level >= $status['require_level'])
             return false; // allow and fall through, not moderated
         // else all post actions are moderated by default
-    	if (1) /* or in_array($action, array('edit','remove','rename')*/ {
-    	    $id = $this->generateId();
-    	    while (!empty($moderated['data'][$id])) $id = $this->generateId(); // avoid duplicates
-    	    $moderated['id'] = $id; 		// overwrite current id
-    	    $tempuser = $request->_user;
-	    if (isset($tempuser->_HomePagehandle))
-		unset($tempuser->_HomePagehandle);
-    	    $moderated['data'][$id] = array( 	// add current request
-    	                                    'timestamp' => time(),
-    	    	          		    'userid' => $request->_user->getId(),
+            if (1) /* or in_array($action, array('edit','remove','rename')*/ {
+                $id = $this->generateId();
+                while (!empty($moderated['data'][$id])) $id = $this->generateId(); // avoid duplicates
+                $moderated['id'] = $id;                 // overwrite current id
+                $tempuser = $request->_user;
+            if (isset($tempuser->_HomePagehandle))
+                unset($tempuser->_HomePagehandle);
+                $moderated['data'][$id] = array(         // add current request
+                                                'timestamp' => time(),
+                                                      'userid' => $request->_user->getId(),
                                             'args'   => $request->getArgs(),
                                             'user'   => serialize( $tempuser ),
                                             );
-            $this->_tokens['CONTENT'] = 
+            $this->_tokens['CONTENT'] =
                 HTML::div(array('class' => 'wikitext'),
-                          fmt("%s: action forwarded to moderator %s", 
-                              $action, 
+                          fmt("%s: action forwarded to moderator %s",
+                              $action,
                               join(", ", $status['moderators'])
                               ));
-	    // Send email
-	    require_once("lib/MailNotify.php");
+            // Send email
+            require_once("lib/MailNotify.php");
             $pagename = $page->getName();
-	    $mailer = new MailNotify($pagename);
+            $mailer = new MailNotify($pagename);
             $subject = "[".WIKI_NAME.'] '.$action.': '._("ModeratedPage").' '.$pagename;
-            $content = 	"You are approved as Moderator of the ".WIKI_NAME. " wiki.\n".
-		     "Someone wanted to edit a moderated page, which you have to approve or reject.\n\n".
+            $content =         "You are approved as Moderator of the ".WIKI_NAME. " wiki.\n".
+                     "Someone wanted to edit a moderated page, which you have to approve or reject.\n\n".
                      $action.': '._("ModeratedPage").' '.$pagename."\n"
                      //. serialize($moderated['data'][$id])
-                     ."\n<".WikiURL($pagename, array('action' => _("ModeratedPage"), 
+                     ."\n<".WikiURL($pagename, array('action' => _("ModeratedPage"),
                                                      'id' => $id, 'pass' => 'approve'), 1).">"
-                     ."\n<".WikiURL($pagename, array('action' => _("ModeratedPage"), 
+                     ."\n<".WikiURL($pagename, array('action' => _("ModeratedPage"),
                                                      'id' => $id, 'pass' => 'reject'), 1).">\n";
-	    $mailer->emails = $mailer->userids = $status['emails'];
-	    $mailer->from = $request->_user->_userid;
+            $mailer->emails = $mailer->userids = $status['emails'];
+            $mailer->from = $request->_user->_userid;
             if ($mailer->sendMail($subject, $content, "Moderation notice")) {
                 $page->set('moderated', $moderated);
                 return false; // pass thru
             } else {
                 //DELETEME!
                 $page->set('moderated', $moderated);
-            	//FIXME: This msg gets lost on the edit redirect
-                trigger_error(_("ModeratedPage Notification Error: Couldn't send email"), 
+                    //FIXME: This msg gets lost on the edit redirect
+                trigger_error(_("ModeratedPage Notification Error: Couldn't send email"),
                               E_USER_ERROR);
                 return true;
             }
-    	}
+            }
         return false;
     }
 
-    /** 
+    /**
      * Handle admin-side moderation resolve.
-     * We might have to convert the GET to a POST request to continue 
+     * We might have to convert the GET to a POST request to continue
      * with the left-over stored request.
      * Better we display a post form for verification.
      */
     function approve(&$request, $args, &$moderation) {
         if ($request->isPost()) {
-	    // this is unsafe because we dont know if it will succeed. but we tried.
-	    $this->cleanup_and_notify($request, $args, $moderation);
+            // this is unsafe because we dont know if it will succeed. but we tried.
+            $this->cleanup_and_notify($request, $args, $moderation);
             // start from scratch, dispatch the action as in lib/main to the action handler
-	    $request->discardOutput();
-            $oldargs = $request->args;	
-            $olduser = $request->_user;	
+            $request->discardOutput();
+            $oldargs = $request->args;
+            $olduser = $request->_user;
             $request->args = $moderation['args'];
             $request->_user->_userid = $moderation['userid']; // keep current perms but fake the id.
-	    // TODO: fake author ip also
+            // TODO: fake author ip also
             extract($request->args);
             $method = "action_$action";
             if (method_exists($request, $method)) {
@@ -311,116 +311,116 @@ extends WikiPlugin
             else {
                 $this->finish(fmt("%s: Bad action", $action));
             }
-	    // now we are gone and nobody brings us back here.
+            // now we are gone and nobody brings us back here.
 
-	    //$moderated['data'][$id]->args->action+edit(array)+...
-	    //                              timestamp,user(obj)+userid
-	    // handle $moderated['data'][$id]['args']['action']
+            //$moderated['data'][$id]->args->action+edit(array)+...
+            //                              timestamp,user(obj)+userid
+            // handle $moderated['data'][$id]['args']['action']
         } else {
             return $this->_approval_form($request, $args, $moderation, 'approve');
         }
     }
 
-    /** 
+    /**
      * Handle admin-side moderation resolve.
      */
     function reject(&$request, $args, &$moderation) {
         // check id, delete action
         if ($request->isPost()) {
-	    // clean up and notify the requestor. Mabye: store and revert to have a diff later on?
-	    $this->cleanup_and_notify($request, $args, $moderation);
+            // clean up and notify the requestor. Mabye: store and revert to have a diff later on?
+            $this->cleanup_and_notify($request, $args, $moderation);
         } else {
             return $this->_approval_form($request, $args, $moderation, 'reject');
         }
     }
 
     function cleanup_and_notify (&$request, $args, &$moderation) {
-	$pagename = $moderation['args']['pagename'];
-	$page = $request->_dbi->getPage($pagename);
-	$pass = $args['pass'];     // accept or reject
-	$reason = $args['reason']; // summary why
-	$user = $moderation['args']['user'];
-	$action = $moderation['args']['action'];
-	$id = $args['id'];
-	unset($moderation['data'][$id]);
-	unset($moderation['id']);
-	$page->set('moderation', $moderation);
+        $pagename = $moderation['args']['pagename'];
+        $page = $request->_dbi->getPage($pagename);
+        $pass = $args['pass'];     // accept or reject
+        $reason = $args['reason']; // summary why
+        $user = $moderation['args']['user'];
+        $action = $moderation['args']['action'];
+        $id = $args['id'];
+        unset($moderation['data'][$id]);
+        unset($moderation['id']);
+        $page->set('moderation', $moderation);
 
-	// TODO: Notify the user, only if the user has an email:
-	if ($email = $user->getPref('email')) {
-	    $action_page = $request->getPage(_("ModeratedPage"));
-	    $status = $this->getSiteStatus($request, $action_page);
-	    require_once("lib/MailNotify.php");
-	    $mailer = new MailNotify($pagename);
-	    $subject = "[".WIKI_NAME."] $pass $action "._("ModeratedPage").': '.$pagename;
-	    $mailer->from = $request->_user->UserFrom();
-	    $content = sprintf(_("%s approved your wiki action from %s"),
-				 $mailer->from,CTime($moderation['timestamp']))
-		."\n\n"
-		."Decision: ".$pass
-		."Reason: ".$reason
-		."\n<".WikiURL($pagename).">\n";
-	    $mailer->emails = $mailer->userids = $email;
-	    $mailer->sendMail($subject, $content, "Approval notice");
-	}
+        // TODO: Notify the user, only if the user has an email:
+        if ($email = $user->getPref('email')) {
+            $action_page = $request->getPage(_("ModeratedPage"));
+            $status = $this->getSiteStatus($request, $action_page);
+            require_once("lib/MailNotify.php");
+            $mailer = new MailNotify($pagename);
+            $subject = "[".WIKI_NAME."] $pass $action "._("ModeratedPage").': '.$pagename;
+            $mailer->from = $request->_user->UserFrom();
+            $content = sprintf(_("%s approved your wiki action from %s"),
+                                 $mailer->from,CTime($moderation['timestamp']))
+                ."\n\n"
+                ."Decision: ".$pass
+                ."Reason: ".$reason
+                ."\n<".WikiURL($pagename).">\n";
+            $mailer->emails = $mailer->userids = $email;
+            $mailer->sendMail($subject, $content, "Approval notice");
+        }
     }
 
     function _approval_form(&$request, $args, $moderation, $pass='approve') {
         $header = HTML::h3(_("Please approve or reject this request:"));
-        
+
         $loader = new WikiPluginLoader();
         $BackendInfo = $loader->getPlugin("_BackendInfo");
         $table = HTML::table(array('border' => 1,
                                      'cellpadding' => 2,
                                      'cellspacing' => 0));
         $content = $table;
-	$diff = '';
-	if ($moderation['args']['action'] == 'edit') {
-	    $pagename = $moderation['args']['pagename'];
-	    $p = $request->_dbi->getPage($pagename);
-	    $rev = $p->getCurrentRevision(true);
-	    $curr_content = $rev->getPackedContent();
-	    $new_content = $moderation['args']['edit']['content'];
-	    include_once("lib/difflib.php");
-	    $diff2 = new Diff($curr_content, $new_content);
-	    $fmt = new UnifiedDiffFormatter(/*$context_lines*/);
-	    $diff  = $pagename . " Current Version " . 
-		Iso8601DateTime($p->get('mtime')) . "\n";
-	    $diff .= $pagename . " Edited Version " .  
-		Iso8601DateTime($moderation['timestamp']) . "\n";
-	    $diff .= $fmt->format($diff2);
-	}
-        $content->pushContent($BackendInfo->_showhash("Request", 
-        		array('User'      => $moderation['userid'],
-        		      'When'      => CTime($moderation['timestamp']),
-        		      'Pagename'  => $pagename,
-        		      'Action'    => $moderation['args']['action'],
-        		      'Diff'      => HTML::pre($diff))));                            
+        $diff = '';
+        if ($moderation['args']['action'] == 'edit') {
+            $pagename = $moderation['args']['pagename'];
+            $p = $request->_dbi->getPage($pagename);
+            $rev = $p->getCurrentRevision(true);
+            $curr_content = $rev->getPackedContent();
+            $new_content = $moderation['args']['edit']['content'];
+            include_once("lib/difflib.php");
+            $diff2 = new Diff($curr_content, $new_content);
+            $fmt = new UnifiedDiffFormatter(/*$context_lines*/);
+            $diff  = $pagename . " Current Version " .
+                Iso8601DateTime($p->get('mtime')) . "\n";
+            $diff .= $pagename . " Edited Version " .
+                Iso8601DateTime($moderation['timestamp']) . "\n";
+            $diff .= $fmt->format($diff2);
+        }
+        $content->pushContent($BackendInfo->_showhash("Request",
+                        array('User'      => $moderation['userid'],
+                              'When'      => CTime($moderation['timestamp']),
+                              'Pagename'  => $pagename,
+                              'Action'    => $moderation['args']['action'],
+                              'Diff'      => HTML::pre($diff))));
         $content_dbg = $table;
-	$myargs  = $args;
+        $myargs  = $args;
         $BackendInfo->_fixupData($myargs);
         $content_dbg->pushContent($BackendInfo->_showhash("raw request args", $myargs));
         $BackendInfo->_fixupData($moderation);
         $content_dbg->pushContent($BackendInfo->_showhash("raw moderation data", $moderation));
         $reason = HTML::div(_("Reason: "), HTML::textarea(array('name' => 'reason')));
-        $approve = Button('submit:ModeratedPage[approve]', _("Approve"), 
+        $approve = Button('submit:ModeratedPage[approve]', _("Approve"),
                           $pass == 'approve' ? 'wikiadmin' : 'button');
         $reject  = Button('submit:ModeratedPage[reject]', _("Reject"),
                           $pass == 'reject' ? 'wikiadmin' : 'button');
-	$args['action'] = _("ModeratedPage");
+        $args['action'] = _("ModeratedPage");
         return HTML::form(array('action' => $request->getPostURL(),
                                 'method' => 'post'),
                           $header,
                           $content, HTML::p(""), $content_dbg,
-			  $reason,
-                          ENABLE_PAGEPERM 
+                          $reason,
+                          ENABLE_PAGEPERM
                             ? ''
                             : HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN)),
                           HiddenInputs($args),
-                          $pass == 'approve' ? HTML::p($approve, $reject) 
-                          		     : HTML::p($reject, $approve));
+                          $pass == 'approve' ? HTML::p($approve, $reject)
+                                               : HTML::p($reject, $approve));
     }
-    
+
     /**
      * Get the side-wide ModeratedPage status, reading the action-page args.
      * Who are the moderators? What actions should be moderated?
@@ -444,7 +444,7 @@ extends WikiPlugin
                                         $action_page->getName()));
         }
     }
-    
+
 };
 
 // For emacs users
diff --git a/lib/plugin/MostPopular.php b/lib/plugin/MostPopular.php
index f64069560..093d0bfbc 100644
--- a/lib/plugin/MostPopular.php
+++ b/lib/plugin/MostPopular.php
@@ -52,14 +52,14 @@ extends WikiPlugin
                    //'paging'   => 'auto'
                    ));
     }
-    
+
     // info arg allows multiple columns
     // info=mtime,hits,summary,version,author,locked,minor
     // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges
     // sortby: only pagename or hits. mtime not!
 
     function run($dbi, $argstr, &$request, $basepage) {
-    	$args = $this->getArgs($argstr, $request);
+            $args = $this->getArgs($argstr, $request);
         extract($args);
         if (strstr($sortby,'mtime')) {
             trigger_error(_("sortby=mtime not supported with MostPopular"),
@@ -68,7 +68,7 @@ extends WikiPlugin
         }
         $columns = $info ? explode(",", $info) : array();
         array_unshift($columns, 'hits');
-        
+
         if (! $request->getArg('count')) {
             //$args['count'] = $dbi->numPages(false,$exclude);
             $allpages = $dbi->mostPopular(0, $sortby);
diff --git a/lib/plugin/NewPagesPerUser.php b/lib/plugin/NewPagesPerUser.php
index dfb4e5911..67d063484 100644
--- a/lib/plugin/NewPagesPerUser.php
+++ b/lib/plugin/NewPagesPerUser.php
@@ -2,7 +2,7 @@
 rcs_id('$Id$');
 /*
  * Copyright (C) 2007 AVL
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -46,54 +46,54 @@ extends WikiPlugin
 
     function getDefaultArguments() {
         return array('userid'   => '',
-		     'month'    => 0,
-		     'since'    => 0,
-		     'until'    => 0,
-		     'comments' => 0,
-		     'links'    => 1,
-		     'debug'    => 0,
+                     'month'    => 0,
+                     'since'    => 0,
+                     'until'    => 0,
+                     'comments' => 0,
+                     'links'    => 1,
+                     'debug'    => 0,
                    );
     }
-    
+
     function run($dbi, $argstr, &$request, $basepage) {
-    	global $WikiTheme;
-    	$args = $this->getArgs($argstr, $request);
+            global $WikiTheme;
+            $args = $this->getArgs($argstr, $request);
         extract($args);
-	if ($since) 
-	    $since = strtotime($since);
-	if ($month) {
-	    $since = strtotime($month);
-	    $since = mktime(0,0,0,date("m",$since),1,date("Y",$since));
-	    $until = mktime(23,59,59,date("m",$since)+1,0,date("Y",$since));
-	} else
-	    $until = 0;
+        if ($since)
+            $since = strtotime($since);
+        if ($month) {
+            $since = strtotime($month);
+            $since = mktime(0,0,0,date("m",$since),1,date("Y",$since));
+            $until = mktime(23,59,59,date("m",$since)+1,0,date("Y",$since));
+        } else
+            $until = 0;
 
-	$iter = $dbi->getAllPages(false,'-mtime');
-	$pages = array();
+        $iter = $dbi->getAllPages(false,'-mtime');
+        $pages = array();
 
         while ($page = $iter->next()) {
-	    $pagename = $page->getName();
-	    if (!$page->exists()) continue;
-	    $rev = $page->getRevision(1, false);
-	    $date = $rev->get('mtime');
-	    //$author = $rev->get('author_id');
-	    $author = $page->getOwner();
+            $pagename = $page->getName();
+            if (!$page->exists()) continue;
+            $rev = $page->getRevision(1, false);
+            $date = $rev->get('mtime');
+            //$author = $rev->get('author_id');
+            $author = $page->getOwner();
             if (defined('DEBUG') && DEBUG && $debug) {
-	        echo "<i>$pagename, ",strftime("%Y-%m-%d %h:%m:%s", $date),", $author</i><br />\n";
+                echo "<i>$pagename, ",strftime("%Y-%m-%d %h:%m:%s", $date),", $author</i><br />\n";
             }
-	    if ($userid and (!preg_match("/".$userid."/", $author))) continue;
-	    if ($since and $date < $since) continue;
-	    if ($until and $date > $until) continue;
-	    if (!$comments and preg_match("/\/Comment/", $pagename)) continue;
-	    $monthnum = strftime("%Y%m", $date);
-	    if (!isset($pages[$monthnum]))
-	        $pages[$monthnum] = array('author' => array(), 
-	                                  'month' => strftime("%B, %Y", $date));
-	    if (!isset($pages[$monthnum]['author'][$author]))
-	        $pages[$monthnum]['author'][$author] = array('count' => 0, 
-							     'pages' => array());
-	    $pages[$monthnum]['author'][$author]['count']++;
-	    $pages[$monthnum]['author'][$author]['pages'][] = $pagename;
+            if ($userid and (!preg_match("/".$userid."/", $author))) continue;
+            if ($since and $date < $since) continue;
+            if ($until and $date > $until) continue;
+            if (!$comments and preg_match("/\/Comment/", $pagename)) continue;
+            $monthnum = strftime("%Y%m", $date);
+            if (!isset($pages[$monthnum]))
+                $pages[$monthnum] = array('author' => array(),
+                                          'month' => strftime("%B, %Y", $date));
+            if (!isset($pages[$monthnum]['author'][$author]))
+                $pages[$monthnum]['author'][$author] = array('count' => 0,
+                                                             'pages' => array());
+            $pages[$monthnum]['author'][$author]['count']++;
+            $pages[$monthnum]['author'][$author]['pages'][] = $pagename;
         }
         $iter->free();
         $html = HTML::table(HTML::col(array('span' => 2,'align'=> 'left')));
@@ -103,35 +103,35 @@ extends WikiPlugin
            $html->pushContent(HTML::tr(HTML::td(array('colspan' => 2),
                                                 HTML::strong($parr['month']))));
            uasort($parr['author'], 'cmp_by_count');
-	   foreach ($parr['author'] as $user => $authorarr) {
-	       $count = $authorarr['count'];
-	       $id = preg_replace("/ /","_",'pages-'.$monthname.'-'.$user);
+           foreach ($parr['author'] as $user => $authorarr) {
+               $count = $authorarr['count'];
+               $id = preg_replace("/ /","_",'pages-'.$monthname.'-'.$user);
                $html->pushContent
-		   (HTML::tr(HTML::td($nbsp,$nbsp,
-				      HTML::img(array('id'  => "$id-img",
-						      'src' => $WikiTheme->_findData("images/folderArrowClosed.png"),
-						      'onclick'=> "showHideFolder('$id')",
+                   (HTML::tr(HTML::td($nbsp,$nbsp,
+                                      HTML::img(array('id'  => "$id-img",
+                                                      'src' => $WikiTheme->_findData("images/folderArrowClosed.png"),
+                                                      'onclick'=> "showHideFolder('$id')",
                                                        'alt'  => _("Click to hide/show"),
                                                        'title'  => _("Click to hide/show"))),
                                       $nbsp,
-				      $user),
-			     HTML::td($count)
-			     ));
-	       if ($links) {
-		   $pagelist = HTML();
-		   foreach ($authorarr['pages'] as $p)
-		       $pagelist->pushContent(WikiLink($p),', ');
-	       } else {
-		   $pagelist = join(', ',$authorarr['pages']);
-	       }
+                                      $user),
+                             HTML::td($count)
+                             ));
+               if ($links) {
+                   $pagelist = HTML();
+                   foreach ($authorarr['pages'] as $p)
+                       $pagelist->pushContent(WikiLink($p),', ');
+               } else {
+                   $pagelist = join(', ',$authorarr['pages']);
+               }
                $html->pushContent
-		   (HTML::tr(array('id' => $id.'-body',
-				   'style'=>'display:none; background-color: #eee;'),
-			     HTML::td(array('colspan' => 2,
-					    'style' => 'font-size:smaller'),
-				      $pagelist
-				      )));
-	   }
+                   (HTML::tr(array('id' => $id.'-body',
+                                   'style'=>'display:none; background-color: #eee;'),
+                             HTML::td(array('colspan' => 2,
+                                            'style' => 'font-size:smaller'),
+                                      $pagelist
+                                      )));
+           }
         }
         return $html;
     }
diff --git a/lib/plugin/NoCache.php b/lib/plugin/NoCache.php
index d07cf7b13..cb607e20a 100644
--- a/lib/plugin/NoCache.php
+++ b/lib/plugin/NoCache.php
@@ -22,11 +22,11 @@ rcs_id('$Id$');
  */
 
 /**
- * Don't cache the following page. Mostly used for plugins, which 
+ * Don't cache the following page. Mostly used for plugins, which
  * display dynamic content.
  *
  * Usage:
- *   <?plugin NoCache ?> 
+ *   <?plugin NoCache ?>
  * or to delete the whole cache for this page:
  *   <?plugin NoCache nocache||=purge ?>
  *
diff --git a/lib/plugin/OldStyleTable.php b/lib/plugin/OldStyleTable.php
index ba06737a1..f007d7a6a 100644
--- a/lib/plugin/OldStyleTable.php
+++ b/lib/plugin/OldStyleTable.php
@@ -87,9 +87,9 @@ extends WikiPlugin
         $lines = preg_split('/\s*?\n\s*/', $argstr);
         $table_args = array();
         $default_args = array_keys($default);
-        foreach ($default_args as $arg) { 
-            if ($args[$arg] == '' and $default[$arg] == '')  
-                continue;			// ignore '' arguments
+        foreach ($default_args as $arg) {
+            if ($args[$arg] == '' and $default[$arg] == '')
+                continue;                        // ignore '' arguments
             if ($arg == 'caption')
                 $caption = $args[$arg];
             else
@@ -98,18 +98,18 @@ extends WikiPlugin
         $table = HTML::table($table_args);
         if (!empty($caption))
             $table->pushContent(HTML::caption($caption));
-        if (preg_match("/^\s*(cellpadding|cellspacing|border|caption|summary)/", $lines[0])) 
+        if (preg_match("/^\s*(cellpadding|cellspacing|border|caption|summary)/", $lines[0]))
             $lines[0] = '';
         foreach ($lines as $line) {
             if (!$line)
                 continue;
             if (strstr($line,"=")) {
-            	$tmp = explode("=",$line);
-            	if (in_array(trim($tmp[0]),$default_args))
+                    $tmp = explode("=",$line);
+                    if (in_array(trim($tmp[0]),$default_args))
                     continue;
             }
             if ($line[0] != '|') {
-            	// bogus error if argument
+                    // bogus error if argument
                 trigger_error(sprintf(_("Line %s does not begin with a '|'."), $line), E_USER_WARNING);
             } else {
                 $table->pushContent($this->_parse_row($line, $basepage));
@@ -122,7 +122,7 @@ extends WikiPlugin
     function _parse_row ($line, $basepage) {
         $brkt_link = "\\[ .*? [^]\s] .*? \\]";
         $cell_content  = "(?: [^[] | ".ESCAPE_CHAR."\\[ | $brkt_link )*?";
-        
+
         preg_match_all("/(\\|+) (v*) ([<>^]?) \s* ($cell_content) \s* (?=\\||\$)/x",
                        $line, $matches, PREG_SET_ORDER);
 
diff --git a/lib/plugin/OrphanedPages.php b/lib/plugin/OrphanedPages.php
index 821fdd65a..54115dfa5 100644
--- a/lib/plugin/OrphanedPages.php
+++ b/lib/plugin/OrphanedPages.php
@@ -67,7 +67,7 @@ extends WikiPlugin
         // tailored SQL query via the backend, but this does the job
 
         $allpages_iter = $dbi->getAllPages($include_empty);
-	$pages = array();
+        $pages = array();
         while ($page = $allpages_iter->next()) {
             $links_iter = $page->getBackLinks();
             // Test for absence of backlinks. If a page is linked to
@@ -91,7 +91,7 @@ extends WikiPlugin
         if (!$pagesize) $pagelist->addPageList($pages);
         else {
             for ($i=$offset; $i < $offset + $pagesize - 1; $i++) {
-            	if ($i >= $args['count']) break;
+                    if ($i >= $args['count']) break;
                 $pagelist->addPage($pages[$i]);
             }
         }
diff --git a/lib/plugin/PageDump.php b/lib/plugin/PageDump.php
index 08d20aa9a..d0b752504 100644
--- a/lib/plugin/PageDump.php
+++ b/lib/plugin/PageDump.php
@@ -2,7 +2,7 @@
 rcs_id('$Id$');
 /*
  * Copyright (C) 2003 $ThePhpWikiProgrammingTeam
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -24,7 +24,7 @@ rcs_id('$Id$');
  * PhpWikiPlugin for PhpWiki developers to generate single page dumps
  * for checking into cvs, or for users or the admin to produce a
  * downloadable page dump of a single page.
- * 
+ *
  * This plugin will also be useful to (semi-)automatically sync pages
  * directly between two wikis. First the LoadFile function of
  * PhpWikiAdministration needs to be updated to handle URLs again, and
@@ -87,10 +87,10 @@ extends WikiPlugin
 
         // Check if user is allowed to get the Page.
         if (!mayAccessPage ('view', $page)) {
-        	return $this->error(sprintf(_("Illegal access to page %s: no read access"),
+                return $this->error(sprintf(_("Illegal access to page %s: no read access"),
                                         $page));
         }
-        
+
         $p = $dbi->getPage($page);
         include_once("lib/loadsave.php");
         $mailified = MailifyPage($p, ($format == 'backup') ? 99 : 1);
@@ -113,7 +113,7 @@ extends WikiPlugin
             $this->fixup_headers($mailified);
 
         if ($download) {
-            // TODO: we need a way to hook into the generated headers, to override 
+            // TODO: we need a way to hook into the generated headers, to override
             // Content-Type, Set-Cookie, Cache-control, ...
             $request->discardOutput(); // Hijack the http request from PhpWiki.
             ob_end_clean();            // clean up after hijacking $request
@@ -128,7 +128,7 @@ extends WikiPlugin
             if (!$charset) $charset = $GLOBALS['charset'];
             // We generate 3 Content-Type headers! first in loadsave,
             // then here and the mimified string $mailified also has it!
-	    // This one is correct and overwrites the others.
+            // This one is correct and overwrites the others.
             Header("Content-Type: application/octet-stream; name=\""
                    . $filename . "\"; charset=\"" . $charset
                    . "\"");
@@ -136,7 +136,7 @@ extends WikiPlugin
             // let $request provide last modified & etag
             Header("Content-Id: <" . $this->MessageId . ">");
             // be nice to http keepalive~s
-            Header("Content-Length: " . strlen($mailified)); 
+            Header("Content-Length: " . strlen($mailified));
 
             // Here comes our prepared mime file
             echo $mailified;
diff --git a/lib/plugin/PageGroup.php b/lib/plugin/PageGroup.php
index 5dcdfa08f..d7d362ab7 100644
--- a/lib/plugin/PageGroup.php
+++ b/lib/plugin/PageGroup.php
@@ -73,15 +73,15 @@ extends WikiPlugin
                        . "  (?= ^\\1 | \\Z)/xm", // sec header (same or higher level) (or EOF)
                        implode("\n", $content),
                        $match)) {
-            $result = array();           	
+            $result = array();
             //FIXME: return list of Wiki_Pagename objects
             foreach (explode("\n", $match[2]) as $line) {
-            	$text = trim($line);
+                    $text = trim($line);
                 // Strip trailing blanks lines and ---- <hr>s
                 $text = preg_replace("/\\s*^-{4,}\\s*$/", "", $text);
                 // Strip leading list chars: * or #
                 $text = preg_replace("/^[\*#]+\s*(\S.+)$/", "\\1", $text);
-                // Strip surrounding [] 
+                // Strip surrounding []
                 // FIXME: parse [ name | link ]
                 $text = preg_replace("/^\[\s*(\S.+)\s*\]$/", "\\1", $text);
                 if (!empty($text))
diff --git a/lib/plugin/PageHistory.php b/lib/plugin/PageHistory.php
index 1ba57ba05..ae62d82fe 100644
--- a/lib/plugin/PageHistory.php
+++ b/lib/plugin/PageHistory.php
@@ -92,9 +92,9 @@ extends _RecentChanges_HtmlFormatter
                          WikiLink($this->_args['page'])),
                      "\n",
                      $this->rss_icon(),
-		     $this->rss2_icon(),
-		     $this->atom_icon(),
-		     $this->rdf_icon());
+                     $this->rss2_icon(),
+                     $this->atom_icon(),
+                     $this->rdf_icon());
     }
 
     function title() {
@@ -125,8 +125,8 @@ extends _RecentChanges_HtmlFormatter
         $pagename = $this->_args['page'];
 
         $fmt = _RecentChanges_HtmlFormatter::format($changes);
-	$fmt->action = _("PageHistory");
-	$html[] = $fmt;
+        $fmt->action = _("PageHistory");
+        $html[] = $fmt;
 
         $html[] = HTML::input(array('type'  => 'hidden',
                                     'name'  => 'action',
@@ -177,7 +177,7 @@ extends _RecentChanges_HtmlFormatter
     }
 
     function format_revision ($rev) {
-	global $WikiTheme;
+        global $WikiTheme;
         $class = 'rc-' . $this->importance($rev);
 
         $time = $this->time($rev);
@@ -191,26 +191,26 @@ extends _RecentChanges_HtmlFormatter
             $minor_flag = '';
         }
         $line = HTML::li(array('class' => $class));
-	if (isa($WikiTheme,'WikiTheme_MonoBook')) {
-	    $line->pushContent(
-			       $this->diffLink($rev), ' ',
-			       $this->pageLink($rev), ' ',
-			       $time,' ',$this->date($rev), ' . . ',
-			       $this->authorLink($rev),' ',
-			       $this->authorContribs($rev),' ',
-			       $this->summaryAsHTML($rev),' ',
-			       $minor_flag);
-	} else {
-	    $line->pushContent(
-			       $this->diffLink($rev), ' ',
-			       $this->pageLink($rev), ' ',
-			       $time, ' ',
-			       $this->summaryAsHTML($rev),
-			       ' ... ',
-			       $this->authorLink($rev),
-			       $minor_flag);
-	}
-	return $line;
+        if (isa($WikiTheme,'WikiTheme_MonoBook')) {
+            $line->pushContent(
+                               $this->diffLink($rev), ' ',
+                               $this->pageLink($rev), ' ',
+                               $time,' ',$this->date($rev), ' . . ',
+                               $this->authorLink($rev),' ',
+                               $this->authorContribs($rev),' ',
+                               $this->summaryAsHTML($rev),' ',
+                               $minor_flag);
+        } else {
+            $line->pushContent(
+                               $this->diffLink($rev), ' ',
+                               $this->pageLink($rev), ' ',
+                               $time, ' ',
+                               $this->summaryAsHTML($rev),
+                               ' ... ',
+                               $this->authorLink($rev),
+                               $minor_flag);
+        }
+        return $line;
     }
 }
 
@@ -320,7 +320,7 @@ extends WikiPlugin_RecentChanges
         }
 
         $fmt = new $fmt_class($args);
-	$fmt->action = _("PageHistory");
+        $fmt->action = _("PageHistory");
         return $fmt->format($changes);
     }
 
diff --git a/lib/plugin/PageInfo.php b/lib/plugin/PageInfo.php
index 926a61ef5..98fba44d9 100644
--- a/lib/plugin/PageInfo.php
+++ b/lib/plugin/PageInfo.php
@@ -54,7 +54,7 @@ extends WikiPlugin
         $pagename = $page;
         $page = $request->getPage();
         $current = $page->getCurrentRevision();
-        
+
         if ($current->getVersion() < 1)
             return fmt("I'm sorry, there is no such page as %s.",
                        WikiLink($pagename, 'unknown'));
diff --git a/lib/plugin/PageTrail.php b/lib/plugin/PageTrail.php
index 6d0667002..c82328754 100644
--- a/lib/plugin/PageTrail.php
+++ b/lib/plugin/PageTrail.php
@@ -86,7 +86,7 @@ extends WikiPlugin
             $html->pushContent(WikiLink($Pages[$numberlinks-1], 'auto'));
             for ($i = $numberlinks - 2; $i >= 0; $i--) {
                 if (!empty($Pages[$i]))
-                    $html->pushContent(PAGETRAIL_ARROW, 
+                    $html->pushContent(PAGETRAIL_ARROW,
                                        WikiLink($Pages[$i], 'auto'));
             }
             return $html;
diff --git a/lib/plugin/PasswordReset.php b/lib/plugin/PasswordReset.php
index ee19f3aa1..ab9fac943 100644
--- a/lib/plugin/PasswordReset.php
+++ b/lib/plugin/PasswordReset.php
@@ -24,12 +24,12 @@ rcs_id('$Id$');
  * 1. User forgot password but has email in the prefs.
  *    => action=email&user=username will send the password per email in plaintext.
  *
- *    If no email is stored, because user might not exist, 
+ *    If no email is stored, because user might not exist,
  *    => "No email stored for user %s.
  *        You need to ask an Administrator to reset this password."
  *       Problem: How to contact Admin? Present a link to ADMIN_USER
  *
- *    If no email exists but is not verified, 
+ *    If no email exists but is not verified,
  *    => "Warning: This users email address is unverified!"
  *
  * 2. Admin may reset any users password, with verification.
@@ -52,69 +52,69 @@ extends WikiPlugin
     }
 
     function getDefaultArguments() {
-	return array('user' => '');
+        return array('user' => '');
     }
 
     /* reset password, verified */
     function doReset($userid) {
- 
-	$user = WikiUser($userid);
-	$prefs = $user->getPreferences();
-	$prefs->set('passwd','');
-	if ($user->setPreferences($prefs)) {
-	    $alert = new Alert(_("Message"),
-			       fmt("The password for user %s has been deleted.", $userid));
-	} else {
-	    $alert = new Alert(_("Error"),
-			       fmt("The password for user %s could not be deleted.", $userid));
-	}
-	$alert->show();
+
+        $user = WikiUser($userid);
+        $prefs = $user->getPreferences();
+        $prefs->set('passwd','');
+        if ($user->setPreferences($prefs)) {
+            $alert = new Alert(_("Message"),
+                               fmt("The password for user %s has been deleted.", $userid));
+        } else {
+            $alert = new Alert(_("Error"),
+                               fmt("The password for user %s could not be deleted.", $userid));
+        }
+        $alert->show();
     }
 
     function doEmail(&$request, $userid) {
- 
-	$thisuser = WikiUser($userid);
-	$prefs = $thisuser->getPreferences();
-	$email = $prefs->get('email');
-	$passwd = $prefs->get('passwd'); // plain?
-	$from = $request->_user->getId() . '@' .  $request->get('REMOTE_HOST');
-	if (mail($email,
-		 "[".WIKI_NAME."] PasswortReset", 
-		 "PasswortReset requested by $from\r\n".
-		 "Password for ".WIKI_NAME.": $passwd",
-		 "From: $from"))
-	    $alert = new Alert(_("Message"),
-			       fmt("Email sent to the stored email address for user %s", $userid));
-	else
-	    $alert = new Alert(_("Error"),
-			       fmt("Error sending email with password for user %s.", $userid));
-	$alert->show();
+
+        $thisuser = WikiUser($userid);
+        $prefs = $thisuser->getPreferences();
+        $email = $prefs->get('email');
+        $passwd = $prefs->get('passwd'); // plain?
+        $from = $request->_user->getId() . '@' .  $request->get('REMOTE_HOST');
+        if (mail($email,
+                 "[".WIKI_NAME."] PasswortReset",
+                 "PasswortReset requested by $from\r\n".
+                 "Password for ".WIKI_NAME.": $passwd",
+                 "From: $from"))
+            $alert = new Alert(_("Message"),
+                               fmt("Email sent to the stored email address for user %s", $userid));
+        else
+            $alert = new Alert(_("Error"),
+                               fmt("Error sending email with password for user %s.", $userid));
+        $alert->show();
     }
 
-    function doForm(&$request, $userid='', $header = '', $footer = '') { 
-	$post_args = $request->getArg('admin_reset');
-	if (!$header) {
-	    $header = HTML::p(_("Reset password of user: "),
-			      HTML::Raw('&nbsp;'),
-			      HTML::input(array('type' => 'text',
-						'name' => "user",
-						'value' => $userid))
-			      );
-	}
-	if (!$footer) {
-	    $isadmin = $request->_user->isAdmin();
-	    $footer = HTML::p(Button('submit:admin_reset[reset]', 
-				      $isadmin ? _("Yes") : _("Send email"), 
-				      $isadmin ? 'wikiadmin' : 'button'),
-			       HTML::Raw('&nbsp;'),
-			       Button('submit:admin_reset[cancel]', _("Cancel"), 'button'));
-	}
+    function doForm(&$request, $userid='', $header = '', $footer = '') {
+        $post_args = $request->getArg('admin_reset');
+        if (!$header) {
+            $header = HTML::p(_("Reset password of user: "),
+                              HTML::Raw('&nbsp;'),
+                              HTML::input(array('type' => 'text',
+                                                'name' => "user",
+                                                'value' => $userid))
+                              );
+        }
+        if (!$footer) {
+            $isadmin = $request->_user->isAdmin();
+            $footer = HTML::p(Button('submit:admin_reset[reset]',
+                                      $isadmin ? _("Yes") : _("Send email"),
+                                      $isadmin ? 'wikiadmin' : 'button'),
+                               HTML::Raw('&nbsp;'),
+                               Button('submit:admin_reset[cancel]', _("Cancel"), 'button'));
+        }
         return HTML::form(array('action' => $request->getPostURL(),
                                 'method' => 'post'),
                           $header,
                           HiddenInputs($request->getArgs(), false, array('admin_reset', 'user')),
                           ENABLE_PAGEPERM ? '' : HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN)),
-			  $footer );
+                          $footer );
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
@@ -123,71 +123,71 @@ extends WikiPlugin
             return '';
 
         $user =& $request->_user;
-	$post_args = $request->getArg('admin_reset');
-	$userid = $args['user'];
+        $post_args = $request->getArg('admin_reset');
+        $userid = $args['user'];
         if (!$userid) $userid = $request->getArg('user');
-	$isadmin = $user->isAdmin();
-	if ($request->isPost()) {
+        $isadmin = $user->isAdmin();
+        if ($request->isPost()) {
             @$reset = $post_args['reset'];
             if (empty($reset))
-		return $this->doForm($request, $userid);
-	    if (!$userid) {
-		$alert = new Alert(_("Warning:"),
-				   _("You need to specify the userid!"));
-		$alert->show();
-		return $this->doForm($request);
-	    }
-	    if ($userid and !empty($post_args['verify'])) {
-		if ($user->isAdmin()) {
-		    return $this->doReset($userid);
-		} else {
-		    return $this->doEmail($request, $userid);
-		}
-	    } elseif (empty($post_args['verify'])) {
-		//TODO: verify should check if the user exists, his prefs can be read/safed 
-		//      and the email is verified, even if admin.
-		$buttons = HTML::p(Button('submit:admin_reset[reset]', 
-					  $isadmin ? _("Yes") : _("Send email"), 
-					  $isadmin ? 'wikiadmin' : 'button'),
-				   HTML::Raw('&nbsp;'),
-				   Button('submit:admin_reset[cancel]', _("Cancel"), 'button'));
-		$header = HTML::strong("Verify");
-		if (!$user->isAdmin()) {
-		    // check for email
-		    if ($userid == $user->UserName() and $user->isAuthenticated()) {
-			$alert = new Alert(_("Already logged in"),
-					   HTML(fmt("Changing passwords is done at "), WikiLink(_("UserPreferences"))));
-			$alert->show();
-			return;
-		    }
-		    $thisuser = WikiUser($userid);
-		    $prefs = $thisuser->getPreferences();
-		    $email = $prefs->get('email');
-		    if (!$email) {
-			$alert = new Alert(_("Error"),
-					   HTML(fmt("No email stored for user %s.", $userid),
-						HTML::br(),
-						fmt("You need to ask an Administrator to reset this password. See below: "),
-						HTML::br(), WikiLink(ADMIN_USER)));
-			$alert->show();
-			return;
-		    }
-		    $verified = $thisuser->_prefs->_prefs['email']->getraw('emailVerified');
-		    if (!$verified)
-			$header->pushContent(HTML::br(), "Warning: This users email address is unverified!");
-		}
-		return $this->doForm($request, $userid,
-				     $header,
-				     HTML(HTML::hr(),
-					  fmt("Do you really want to reset the password of user %s?", $userid),
-					  $isadmin ? '' : _("An email will be sent."),
-					  HiddenInputs(array('admin_reset[verify]' => 1, 'user' => $userid)),
-					  $buttons));
-	    } else { // verify ok, but no userid
-		return $this->doForm($request, $userid);
-	    }
-	} else {
-	    return $this->doForm($request, $userid);
+                return $this->doForm($request, $userid);
+            if (!$userid) {
+                $alert = new Alert(_("Warning:"),
+                                   _("You need to specify the userid!"));
+                $alert->show();
+                return $this->doForm($request);
+            }
+            if ($userid and !empty($post_args['verify'])) {
+                if ($user->isAdmin()) {
+                    return $this->doReset($userid);
+                } else {
+                    return $this->doEmail($request, $userid);
+                }
+            } elseif (empty($post_args['verify'])) {
+                //TODO: verify should check if the user exists, his prefs can be read/safed
+                //      and the email is verified, even if admin.
+                $buttons = HTML::p(Button('submit:admin_reset[reset]',
+                                          $isadmin ? _("Yes") : _("Send email"),
+                                          $isadmin ? 'wikiadmin' : 'button'),
+                                   HTML::Raw('&nbsp;'),
+                                   Button('submit:admin_reset[cancel]', _("Cancel"), 'button'));
+                $header = HTML::strong("Verify");
+                if (!$user->isAdmin()) {
+                    // check for email
+                    if ($userid == $user->UserName() and $user->isAuthenticated()) {
+                        $alert = new Alert(_("Already logged in"),
+                                           HTML(fmt("Changing passwords is done at "), WikiLink(_("UserPreferences"))));
+                        $alert->show();
+                        return;
+                    }
+                    $thisuser = WikiUser($userid);
+                    $prefs = $thisuser->getPreferences();
+                    $email = $prefs->get('email');
+                    if (!$email) {
+                        $alert = new Alert(_("Error"),
+                                           HTML(fmt("No email stored for user %s.", $userid),
+                                                HTML::br(),
+                                                fmt("You need to ask an Administrator to reset this password. See below: "),
+                                                HTML::br(), WikiLink(ADMIN_USER)));
+                        $alert->show();
+                        return;
+                    }
+                    $verified = $thisuser->_prefs->_prefs['email']->getraw('emailVerified');
+                    if (!$verified)
+                        $header->pushContent(HTML::br(), "Warning: This users email address is unverified!");
+                }
+                return $this->doForm($request, $userid,
+                                     $header,
+                                     HTML(HTML::hr(),
+                                          fmt("Do you really want to reset the password of user %s?", $userid),
+                                          $isadmin ? '' : _("An email will be sent."),
+                                          HiddenInputs(array('admin_reset[verify]' => 1, 'user' => $userid)),
+                                          $buttons));
+            } else { // verify ok, but no userid
+                return $this->doForm($request, $userid);
+            }
+        } else {
+            return $this->doForm($request, $userid);
         }
     }
 };
diff --git a/lib/plugin/PhotoAlbum.php b/lib/plugin/PhotoAlbum.php
index 3816768a9..90f686bf5 100644
--- a/lib/plugin/PhotoAlbum.php
+++ b/lib/plugin/PhotoAlbum.php
@@ -3,7 +3,7 @@ rcs_id('$Id$');
 /*
  * Copyright 2003,2004,2005,2007 $ThePhpWikiProgrammingTeam
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -50,7 +50,7 @@ rcs_id('$Id$');
  *     christmas.gif; Merry Christmas!
  *
  *     Inside textfile, filenames and optional descriptions are seperated by
- *     semi-colon on each line. Listed files must be in same directory as textfile 
+ *     semi-colon on each line. Listed files must be in same directory as textfile
  *     itself, so don't use relative paths inside textfile.
  *
  * "url": defines the the webpath to the srcdir directory (formerly called weblocation)
@@ -75,7 +75,7 @@ class ImageTile extends HtmlElement
     function image_tile (/*...*/) {
         $el = new HTML ('img');
         $tag = func_get_args();
-	$path = DATA_PATH . "/ImageTile.php";
+        $path = DATA_PATH . "/ImageTile.php";
         $params = "<img src=\"$path?url=". $tag[0]['src'];
         if (!@empty($tag[0]['width']))
             $params .= "&width=" . $tag[0]['width'];
@@ -85,7 +85,7 @@ class ImageTile extends HtmlElement
             $params .= '" width="' . $tag[0]['width'];
         if (!@empty($tag[0]['height']))
             $params .= '" height="' . $tag[0]['height'];
-        
+
         $params .= '" alt="' . $tag[0]['alt'] . '" />';
         return $el->raw ($params);
     }
@@ -131,21 +131,21 @@ extends WikiPlugin
                          // "desc"   - Only description (from textfile) shown
                          // "both"     - If no description found, then filename will be used
                      'link'    => true,     // show link to original sized photo
-                         // If true, each image will be hyperlinked to a page where the single 
+                         // If true, each image will be hyperlinked to a page where the single
                          // photo will be shown full-size. Only works when mode != 'normal'
                      'attrib'    => '',        // 'sort, nowrap, alt'
                          // attrib arg allows multiple attributes: attrib=sort,nowrap,alt
                          // 'sort' sorts alphabetically, 'nowrap' for cells, 'alt' to use
                         // descs instead of filenames in image ALT-tags
-                     'bgcolor'  => '#eae8e8',	// cell bgcolor (lightgrey)
-                     'hlcolor'	=> '#c0c0ff',	// highlight color (lightblue)
-                     'align'	=> 'center',	// alignment of table
-                     'height'   => 'auto',	// image height (auto|75|100%)
-                     'width'    => 'auto',	// image width (auto|75|100%)
+                     'bgcolor'  => '#eae8e8',        // cell bgcolor (lightgrey)
+                     'hlcolor'        => '#c0c0ff',        // highlight color (lightblue)
+                     'align'        => 'center',        // alignment of table
+                     'height'   => 'auto',        // image height (auto|75|100%)
+                     'width'    => 'auto',        // image width (auto|75|100%)
                      // Size of shown photos. Either absolute value (e.g. "50") or
                      // HTML style percentage (e.g. "75%") or "auto" for no special
                      // action.
-                     'cellwidth'=> 'image',	// cell (auto|equal|image|75|100%)
+                     'cellwidth'=> 'image',        // cell (auto|equal|image|75|100%)
                      // Width of cells in table. Either absolute value in pixels, HTML
                      // style percentage, "auto" (no special action), "equal" (where
                      // all columns are equally sized) or "image" (take height and
@@ -160,7 +160,7 @@ extends WikiPlugin
     // descriptions (instead of filenames) for image alt-tags
 
     function run($dbi, $argstr, &$request, $basepage) {
-    
+
         extract($this->getArgs($argstr, $request));
 
         $attributes = $attrib ? explode(",", $attrib) : array();
@@ -188,11 +188,11 @@ extends WikiPlugin
 
         if (in_array("sort", $attributes))
             sort($photos);
-        
+
         if ($p) {
             $mode = "normal";
         }
-    
+
         if ($mode == "column") {
             $mode="normal";
             $numcols="1";
@@ -203,13 +203,13 @@ extends WikiPlugin
             $attributes = array_merge($attributes, "alt");
             $attributes = array_merge($attributes, "nowrap");
             $cellwidth  = 'auto'; // else cell won't nowrap
-	    if ($width == 'auto') $width = 70;
+            if ($width == 'auto') $width = 70;
         } elseif ($mode == 'list') {
             $numcols    = 1;
             $cellwidth  = "auto";
-	    if ($width == 'auto') $width = 50;
+            if ($width == 'auto') $width = 50;
         } elseif ($mode == 'slide' ) {
-            $tableheight = 0; 
+            $tableheight = 0;
             $cell_width = 0;
             $numcols = count($photos);
             $keep = $photos;
@@ -224,10 +224,10 @@ extends WikiPlugin
             $photos = $keep;
             unset ($x,$y,$s,$t,$key,$value,$keep);
         }
-    
+
         $row = HTML();
         $duration = 1000 * $duration;
-        if ($mode == 'slide') 
+        if ($mode == 'slide')
             $row->pushContent(JavaScript("
 i = 0;
 function display_slides() {
@@ -258,9 +258,9 @@ display_slides();"));
                             'src_tile' => $value["name_tile"],
                             'border' => "0",
                             'alt'    => ($value["desc"] != "" and in_array("alt", $attributes))
-                            		? $value["desc"]
-    		                        : basename($value["name"]));
-            if (!@empty($value['location'])) 
+                                            ? $value["desc"]
+                                            : basename($value["name"]));
+            if (!@empty($value['location']))
                 $params = array_merge($params, array("location" => $value['location']));
             // check description
             switch ($showdesc) {
@@ -276,14 +276,14 @@ display_slides();"));
                 if (!$value["desc"]) $value["desc"] = basename($value["name"]);
                 break;
             }
-    
+
             // FIXME: get getimagesize to work with names with spaces in it.
             // convert $value["name"] from webpath to local path
             $size = @getimagesize($value["name"]); // try " " => "\\ "
             if (!$size and !empty($value["src"])) {
                 $size = @getimagesize($value["src"]);
                 if (!$size) {
-                    trigger_error("Unable to getimagesize(".$value["name"].")", 
+                    trigger_error("Unable to getimagesize(".$value["name"].")",
                                   E_USER_NOTICE);
                 }
             }
@@ -294,22 +294,22 @@ display_slides();"));
             if (($mode == 'thumbs' || $mode == 'tiles' || $mode == 'list')) {
                 if (!empty($size[0])) {
                     $newheight = round ($newwidth * $size[1] / $size[0]);
-		    $params['width'] = $newwidth;
-		    $params['height'] = $newheight;
-		} else  $newheight = '';
+                    $params['width'] = $newwidth;
+                    $params['height'] = $newheight;
+                } else  $newheight = '';
                 if ($height == 'auto') $height=150;
             }
             else {
                 $newheight = $this->newSize($size[1], $height);
-		if ($height != 'auto' && $newheight > 0) {
-		    $params = array_merge($params, array("height" => $newheight));
-		}
-	    }
-    
+                if ($height != 'auto' && $newheight > 0) {
+                    $params = array_merge($params, array("height" => $newheight));
+                }
+            }
+
             // cell operations
             $cell = array('align'   => "center",
                           'valign'  => "top",
-			  'class'   => 'photoalbum cell',
+                          'class'   => 'photoalbum cell',
                           'bgcolor' => "$color");
             if ($cellwidth != 'auto') {
                 if ($cellwidth == 'equal') {
@@ -326,26 +326,26 @@ display_slides();"));
             }
             //create url to display single larger version of image on page
             $url = WikiURL($request->getPage(),
-			   array("p" => basename($value["name"])))
+                           array("p" => basename($value["name"])))
                 . "#"
                 . basename($value["name"]);
- 
+
             $b_url = WikiURL($request->getPage(),
-			     array("h" => basename($value["name"])))
+                             array("h" => basename($value["name"])))
                 . "#"
                 . basename($value["name"]);
-            $url_text = $link 
-                ? HTML::a(array("href" => "$url"), basename($value["desc"])) 
+            $url_text = $link
+                ? HTML::a(array("href" => "$url"), basename($value["desc"]))
                 : basename($value["name"]);
             if (! $p) {
                 if ($mode == 'normal' || $mode == 'slide') {
                     if(!@empty($params['location'])) $params['src'] = $params['location'];
                     unset ($params['location'],$params['src_tile']);
-                    $url_image = $link ? HTML::a(array("id" => basename($value["name"]), 
+                    $url_image = $link ? HTML::a(array("id" => basename($value["name"]),
                                                        "href" => "$url"), HTML::img($params))
                                        : HTML::img($params);
                 } else {
-                    $keep = $params; 
+                    $keep = $params;
                     if (!@empty ($params['src_tile']))
                         $params['src'] = $params['src_tile'] ;
                     unset ($params['location'],$params['src_tile']);
@@ -364,23 +364,23 @@ display_slides();"));
                                    : HTML::img($params);
             }
             if ($mode == 'list')
-		$url_text = HTML::a(array("id" => basename($value["name"])),
+                $url_text = HTML::a(array("id" => basename($value["name"])),
                                       $url_text);
             // here we use different modes
             if ($mode == 'tiles') {
                 $row->pushContent(
                     HTML::td($cell,
-			     HTML::div(array('valign' => 'top'), $url_image),
-			     HTML::div(array('valign' => 'bottom'),
-				       HTML::div(array('class'=>'boldsmall'),
-						  ($url_text)),
-				       HTML::br(),
-				       HTML::div(array('class'=>'gensmall'),
-						  ($size[0].
-						   " x ".
-						   $size[1].
-						   " pixels"))))
-		    );
+                             HTML::div(array('valign' => 'top'), $url_image),
+                             HTML::div(array('valign' => 'bottom'),
+                                       HTML::div(array('class'=>'boldsmall'),
+                                                  ($url_text)),
+                                       HTML::br(),
+                                       HTML::div(array('class'=>'gensmall'),
+                                                  ($size[0].
+                                                   " x ".
+                                                   $size[1].
+                                                   " pixels"))))
+                    );
             } elseif ($mode == 'list') {
                 $desc = ($showdesc != 'none') ? $value["desc"] : '';
                 $row->pushContent(
@@ -397,14 +397,14 @@ display_slides();"));
                                                " x ".
                                                $size[1].
                                                " pixels"))));
-    
+
                 if ($desc != '')
                     $row->pushContent(
                         HTML::td(array("valign"  => "top",
                                        "nowrap"  => 0,
                                        "bgcolor" => $color),
                                        HTML::div(array('class'=>'gensmall'),$desc)));
-    
+
             } elseif ($mode == 'thumbs') {
                 $desc = ($showdesc != 'none') ?
                             HTML::p(HTML::a(array("href" => "$url"),
@@ -426,9 +426,9 @@ display_slides();"));
                                   HTML::div(array('class'=>'gensmall'),$desc)
                                   )));
             } elseif ($mode == 'slide') {
-                if ($newwidth == 'auto' || !$newwidth) 
+                if ($newwidth == 'auto' || !$newwidth)
                     $newwidth = $this->newSize($size[0],$width);
-                if ($newwidth == 'auto' || !$newwidth) 
+                if ($newwidth == 'auto' || !$newwidth)
                     $newwidth = $size[0];
                 if ($newheight != 'auto') $newwidth = round($size[0] *  $newheight / $size[1]);
                 $desc = ($showdesc != 'none') ? HTML::p($value["desc"]) : '';
@@ -471,8 +471,8 @@ display_slides();"));
             } elseif ($mode == 'row') {
                 $desc = ($showdesc != 'none') ? HTML::p($value["desc"]) : '';
                 $row->pushContent(
-				  HTML::table(array("style" => "display: inline", 
-						    'class' > "photoalbum row"),
+                                  HTML::table(array("style" => "display: inline",
+                                                    'class' > "photoalbum row"),
                               HTML::tr(HTML::td($url_image)),
                               HTML::tr(HTML::td(array("class" => "gensmall",
                                                       "style" => "text-align: center; "
@@ -482,7 +482,7 @@ display_slides();"));
             } else {
                 return $this->error(fmt("Invalid argument: %s=%s", 'mode', $mode));
             }
-    
+
             // no more images in one row as defined by $numcols
             if ( ($key + 1) % $numcols == 0 ||
                  ($key + 1) == count($photos) ||
@@ -499,9 +499,9 @@ display_slides();"));
         $table_attributes = array("border"      => 0,
                                   "cellpadding" => 5,
                                   "cellspacing" => 2,
-				  "class"       => "photoalbum",
+                                  "class"       => "photoalbum",
                                   "width"       => $tablewidth ? $tablewidth : "100%");
-        
+
         if (!empty($tableheight))
             $table_attributes = array_merge($table_attributes,
                                             array("height"  => $tableheight));
@@ -536,14 +536,14 @@ display_slides();"));
     * @return string Error if fixed location is not allowed
     */
     function fromLocation($src, &$photos) {
-    	/*if (!allow_album_location) {
-    	    return $this->error(_("Fixed album location is not allowed. Please specify parameter src."));
+            /*if (!allow_album_location) {
+                return $this->error(_("Fixed album location is not allowed. Please specify parameter src."));
         }*/
         //FIXME!
         if (! IsSafeURL($src)) {
             return $this->error(_("Bad url in src: remove all of <, >, \""));
         }
-    	$photos[] = array ("name" => $src, //album_location."/$src".album_default_extension,
+            $photos[] = array ("name" => $src, //album_location."/$src".album_default_extension,
                            "desc" => "");
     }
 
@@ -632,7 +632,7 @@ display_slides();"));
                 return $this->error(fmt("Unable to read src='%s'", $src));
             }
             while ($data = fgetcsv($fp, 1024, ';')) {
-                if (count($data) == 0 || empty($data[0]) 
+                if (count($data) == 0 || empty($data[0])
                                       || preg_match('/^#/',$data[0])
                                       || preg_match('/^[[:space:]]*$/',$data[0]))
                     continue;
@@ -643,14 +643,14 @@ display_slides();"));
                                    "name_tile" => dirname($src)."/".trim($data[0]));
             }
             fclose ($fp);
-        
+
         } elseif ($web_location == 1) {
             //TODO: check if the file is an image
             $contents = preg_split('/\n/',$contents);
             while (list($key,$value) = each($contents)) {
                 $data = preg_split('/\;/',$value);
-                if (count($data) == 0 || empty($data[0]) 
-                                      || preg_match('/^#/',$data[0]) 
+                if (count($data) == 0 || empty($data[0])
+                                      || preg_match('/^#/',$data[0])
                                       || preg_match('/^[[:space:]]*$/',$data[0]))
                     continue;
                 if (empty($data[1])) $data[1] = '';
diff --git a/lib/plugin/PhpWeather.php b/lib/plugin/PhpWeather.php
index 61c74e8e9..2a5bfb3c2 100644
--- a/lib/plugin/PhpWeather.php
+++ b/lib/plugin/PhpWeather.php
@@ -43,7 +43,7 @@ rcs_id('$Id PhpWeather.php 2002-08-26 15:30:13 rurban$');
  * both_metric, or both_imperial.
  */
 
-// We require the base class from PHP Weather. Try some default directories. 
+// We require the base class from PHP Weather. Try some default directories.
 // Better define PHPWEATHER_BASE_DIR to the directory on your server:
 if (!defined('PHPWEATHER_BASE_DIR')) {
     /* PhpWeather has not been loaded before. We include the base
diff --git a/lib/plugin/Ploticus.php b/lib/plugin/Ploticus.php
index d3fb1c1da..92c81214e 100644
--- a/lib/plugin/Ploticus.php
+++ b/lib/plugin/Ploticus.php
@@ -21,18 +21,18 @@ rcs_id('$Id$');
  */
 
 /**
- * The Ploticus plugin passes all its arguments to the ploticus 
+ * The Ploticus plugin passes all its arguments to the ploticus
  * binary and displays the result as PNG, GIF, EPS, SVG or SWF.
- * Ploticus is a free, GPL, non-interactive software package 
+ * Ploticus is a free, GPL, non-interactive software package
  * for producing plots, charts, and graphics from data.
  * See http://ploticus.sourceforge.net/doc/welcome.html
  *
  * @Author: Reini Urban
  *
- * Note: 
- * - For windows you need either a gd library with GIF support or 
+ * Note:
+ * - For windows you need either a gd library with GIF support or
  *   a ploticus with PNG support. This comes e.g. with the cygwin build.
- * - We support only images supported by GD so far (PNG most likely). 
+ * - We support only images supported by GD so far (PNG most likely).
  *   No EPS, PS, SWF, SVG or SVGZ support yet, due to limitations in WikiPluginCached.
  *   This will be fixed soon.
  *
@@ -55,7 +55,7 @@ if (!defined("PLOTICUS_EXE"))
     define('PLOTICUS_EXE','/usr/local/bin/pl');
 //TODO: check $_ENV['PLOTICUS_PREFABS'] and default directory
 
-require_once "lib/WikiPluginCached.php"; 
+require_once "lib/WikiPluginCached.php";
 
 class WikiPlugin_Ploticus
 extends WikiPluginCached
@@ -66,27 +66,27 @@ extends WikiPluginCached
      * or IMG_INLINE if device = png, gif or jpeg
      */
     function getPluginType() {
-    	if (!empty($this->_args['-csmap']))
-    	    return PLUGIN_CACHED_MAP; // not yet tested
-        // produce these on-demand so far, uncached. 
+            if (!empty($this->_args['-csmap']))
+                return PLUGIN_CACHED_MAP; // not yet tested
+        // produce these on-demand so far, uncached.
         // will get better support in WikiPluginCached soon.
         // FIXME: html also? what about ''?
         $type = $this->decideImgType($this->_args['device']);
         if ($type == $this->_args['device'])
             return PLUGIN_CACHED_IMG_INLINE;
         $device = strtolower($this->_args['device']);
-    	if (in_array($device, array('svg','swf','svgz','eps','ps','pdf','html'))) {
+            if (in_array($device, array('svg','swf','svgz','eps','ps','pdf','html'))) {
             switch ($this->_args['device']) {
-            	case 'svg':
-            	case 'svgz':
+                    case 'svg':
+                    case 'svgz':
                    return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_SVG_PNG;
-            	case 'swf':
+                    case 'swf':
                    return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_SWF;
-                default: 
+                default:
                    return PLUGIN_CACHED_STATIC | PLUGIN_CACHED_HTML;
             }
         }
-    	else
+            else
             return PLUGIN_CACHED_IMG_INLINE; // normal cached libgd image handles
     }
     function getName () {
@@ -161,7 +161,7 @@ extends WikiPluginCached
         //unset ($other_imgtypes[$def['imgtype']]);
         $helparr = array(
             '<?plugin Ploticus ' .
-            'device'           => ' = "' . $def['device'] . "(default)|" 
+            'device'           => ' = "' . $def['device'] . "(default)|"
                                   . join('|',$GLOBALS['PLUGIN_CACHED_IMGTYPES']).'"',
             'data'             => ' <!plugin-list !>: pagelist as input',
             'alt'              => ' = "alternate text"',
@@ -187,7 +187,7 @@ extends WikiPluginCached
     function withShellCommand($script) {
         $findme  = 'shell';
         $pos = strpos($script, $findme); // uppercase?
-        if ($pos === false) 
+        if ($pos === false)
             return 0;
         return 1;
     }
@@ -219,67 +219,67 @@ extends WikiPluginCached
             $gif = $argarray['device'];
             $args = "-$gif -o $tempfile.$gif";
             if (!empty($argarray['-csmap'])) {
-            	$args .= " -csmap -mapfile $tempfile.map";
-            	$this->_mapfile = "$tempfile.map";
+                    $args .= " -csmap -mapfile $tempfile.map";
+                    $this->_mapfile = "$tempfile.map";
             }
             if (!empty($argarray['-prefab'])) {
-            	//check $_ENV['PLOTICUS_PREFABS'] and default directory
+                    //check $_ENV['PLOTICUS_PREFABS'] and default directory
                 global $HTTP_ENV_VARS;
                 if (empty($HTTP_ENV_VARS['PLOTICUS_PREFABS'])) {
                     if (file_exists("/usr/share/ploticus"))
                         $HTTP_ENV_VARS['PLOTICUS_PREFABS'] = "/usr/share/ploticus";
-		    elseif (defined('PLOTICUS_PREFABS'))
+                    elseif (defined('PLOTICUS_PREFABS'))
                         $HTTP_ENV_VARS['PLOTICUS_PREFABS'] = constant('PLOTICUS_PREFABS');
                 }
-            	$args .= (" -prefab " . $argarray['-prefab']);
+                    $args .= (" -prefab " . $argarray['-prefab']);
+            }
+            if (isWindows()) {
+                $fp = fopen("$tempfile.plo", "w");
+                fwrite ($fp, $source);
+                fclose($fp);
+                $code = $this->execute(PLOTICUS_EXE . " $tempfile.plo $args", $tempfile.".$gif");
+            } else {
+                $code = $this->filterThroughCmd($source, PLOTICUS_EXE . " -stdin $args");
+                sleep(1);
             }
-	    if (isWindows()) {
-		$fp = fopen("$tempfile.plo", "w");
-		fwrite ($fp, $source);
-		fclose($fp);
-		$code = $this->execute(PLOTICUS_EXE . " $tempfile.plo $args", $tempfile.".$gif");
-	    } else {
-		$code = $this->filterThroughCmd($source, PLOTICUS_EXE . " -stdin $args");
-		sleep(1);
-	    }
             //if (empty($code))
             //    return $this->error(fmt("Couldn't start commandline '%s'", $commandLine));
             if (! file_exists($tempfile.".$gif") ) {
-                $this->_errortext .= sprintf(_("%s error: outputfile '%s' not created"), 
+                $this->_errortext .= sprintf(_("%s error: outputfile '%s' not created"),
                                              "Ploticus", "$tempfile.$gif");
                 if (isWindows())
                     $this->_errortext .= ("\ncmd-line: " .PLOTICUS_EXE . " $tempfile.plo $args");
-                else    
-                    $this->_errortext .= ("\ncmd-line: cat script | ".PLOTICUS_EXE . " $args");    
+                else
+                    $this->_errortext .= ("\ncmd-line: cat script | ".PLOTICUS_EXE . " $args");
                 @unlink("$tempfile.pl");
-		@unlink("$tempfile");
+                @unlink("$tempfile");
                 return false;
             }
             $ImageCreateFromFunc = "ImageCreateFrom$gif";
             if (function_exists($ImageCreateFromFunc)) {
                 $handle = $ImageCreateFromFunc( "$tempfile.$gif" );
-		if ($handle) {
-		    @unlink("$tempfile.$gif");
-		    @unlink("$tempfile.plo");
-		    @unlink("$tempfile");
-		    return $handle;
-		}    
-	    }
+                if ($handle) {
+                    @unlink("$tempfile.$gif");
+                    @unlink("$tempfile.plo");
+                    @unlink("$tempfile");
+                    return $handle;
+                }
+            }
             return "$tempfile.$gif";
         } else {
             return $this->error(fmt("empty source"));
         }
     }
-    
+
     // which argument must be set to 'png', for the fallback image when svg will fail on the client.
     // type: SVG_PNG
     function pngArg() {
-    	return 'device';
+            return 'device';
     }
-    
+
     function getMap($dbi, $argarray, $request) {
-    	$img = $this->getImage($dbi, $argarray, $request);
-    	return array($this->_mapfile, $img);
+            $img = $this->getImage($dbi, $argarray, $request);
+            return array($this->_mapfile, $img);
     }
 };
 
diff --git a/lib/plugin/PluginManager.php b/lib/plugin/PluginManager.php
index 8a2f8f88f..aad119b8e 100644
--- a/lib/plugin/PluginManager.php
+++ b/lib/plugin/PluginManager.php
@@ -135,17 +135,17 @@ extends WikiPlugin
                     $localizedPluginName = _($pluginName);
                 if($localizedPluginName && $dbi->isWikiPage($localizedPluginName))
                     $pluginDocPageNamelink = WikiLink($localizedPluginName,'if_known');
-                
+
                 if (_($pluginDocPageName) != $pluginDocPageName)
                     $localizedPluginDocPageName = _($pluginDocPageName);
-                if($localizedPluginDocPageName && 
+                if($localizedPluginDocPageName &&
                    $dbi->isWikiPage($localizedPluginDocPageName))
-                    $pluginDocPageNamelink = 
-			WikiLink($localizedPluginDocPageName, 'if_known');
+                    $pluginDocPageNamelink =
+                        WikiLink($localizedPluginDocPageName, 'if_known');
             }
             else {
                 $pluginNamelink = WikiLink($pluginName, 'if_known');
-                
+
                 if ($dbi->isWikiPage($pluginDocPageName))
                     $pluginDocPageNamelink = WikiLink($pluginDocPageName,'if_known');
             }
diff --git a/lib/plugin/PopUp.php b/lib/plugin/PopUp.php
index 943fe739d..9276f05e6 100644
--- a/lib/plugin/PopUp.php
+++ b/lib/plugin/PopUp.php
@@ -59,43 +59,43 @@ extends WikiPlugin
     }
     function getDefaultArguments() {
         return array('link'        => "HomePage",
-	             'title'       => "",
-	             'text'        => "",
-		     'width'       => "500",
-		     'height'      => "400",
-		     'resizable'   => "no",
-		     'scrollbars'  => "no",
-		     'toolbar'     => "no",
-		     'location'    => "no",
-		     'directories' => "no",
-		     'status'      => "no",
-		     'menubar'     => "no",
-		     'copyhistory' => "no",
-		     'close'       => "no",
-		    );
+                     'title'       => "",
+                     'text'        => "",
+                     'width'       => "500",
+                     'height'      => "400",
+                     'resizable'   => "no",
+                     'scrollbars'  => "no",
+                     'toolbar'     => "no",
+                     'location'    => "no",
+                     'directories' => "no",
+                     'status'      => "no",
+                     'menubar'     => "no",
+                     'copyhistory' => "no",
+                     'close'       => "no",
+                    );
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
         extract($this->getArgs($argstr, $request));
         return HTML::a(array('href' => WikiURL($link),
-	                      'target' => "_blank",
-	                      'onclick' => ($close == "yes" ? "window.close()" : ("window.open('" .
-			          WikiURL($link) . "', '" .
-				  ($title == "" ? ($text == "" ? $link : $text) : $title) . "', '" .
-				  "width=$width," .
-				  "height=$height," .
-				  "resizable=$resizable," .
-				  "scrollbars=$scrollbars," .
-				  "toolbar=$toolbar," .
-				  "location=$location," .
-				  "directories=$directories," .
-				  "status=$status," .
-				  "menubar=$menubar," .
-				  "copyhistory=$copyhistory')"
-				  )) . ";return false;"
-	                     ),
-		        ($text == "" ? ($close == "yes" ? "Close window" : $link) : $text)
-		       );
+                              'target' => "_blank",
+                              'onclick' => ($close == "yes" ? "window.close()" : ("window.open('" .
+                                  WikiURL($link) . "', '" .
+                                  ($title == "" ? ($text == "" ? $link : $text) : $title) . "', '" .
+                                  "width=$width," .
+                                  "height=$height," .
+                                  "resizable=$resizable," .
+                                  "scrollbars=$scrollbars," .
+                                  "toolbar=$toolbar," .
+                                  "location=$location," .
+                                  "directories=$directories," .
+                                  "status=$status," .
+                                  "menubar=$menubar," .
+                                  "copyhistory=$copyhistory')"
+                                  )) . ";return false;"
+                             ),
+                        ($text == "" ? ($close == "yes" ? "Close window" : $link) : $text)
+                       );
     }
 };
 
diff --git a/lib/plugin/PopularNearby.php b/lib/plugin/PopularNearby.php
index aa36835ab..c5d978c98 100644
--- a/lib/plugin/PopularNearby.php
+++ b/lib/plugin/PopularNearby.php
@@ -20,7 +20,7 @@ rcs_id('$Id$');
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/** Re-implement the classic phpwiki-1.2 feature of the 
+/** Re-implement the classic phpwiki-1.2 feature of the
  *  popular nearby pages, specific to the from/to links:
  *    5 best incoming links: xx, xx, xx, ...
  *    5 best outgoing links: xx, xx, xx, ...
@@ -33,7 +33,7 @@ rcs_id('$Id$');
 * <small><?plugin PopularNearby mode=nearby ?></small>
 
 */
- 
+
 
 require_once('lib/PageList.php');
 
@@ -61,26 +61,26 @@ extends WikiPlugin
                      'noheader' => 0,
                     );
     }
-    
+
     function run($dbi, $argstr, &$request, $basepage) {
-    	$args = $this->getArgs($argstr, $request);
+            $args = $this->getArgs($argstr, $request);
         extract($args);
         $header = '';
         $page = $dbi->getPage($pagename);
         switch ($mode) {
         case 'incoming': // not the hits, but the number of links
             if (! $noheader )
-                $header = sprintf(_("%d best incoming links: "),$limit); 
+                $header = sprintf(_("%d best incoming links: "),$limit);
             $links = $this->sortedLinks($page->getLinks("reversed"),"reversed",$limit);
             break;
         case 'outgoing': // not the hits, but the number of links
             if (! $noheader )
-                $header = sprintf(_("%d best outgoing links: "),$limit); 
+                $header = sprintf(_("%d best outgoing links: "),$limit);
             $links = $this->sortedLinks($page->getLinks(),false,$limit);
             break;
-        case 'nearby':  // all linksfrom and linksto, sorted by hits 
+        case 'nearby':  // all linksfrom and linksto, sorted by hits
             if (! $noheader )
-                $header = sprintf(_("%d most popular nearby: "),$limit); 
+                $header = sprintf(_("%d most popular nearby: "),$limit);
             $inlinks = $page->getLinks();
             $outlinks = $page->getLinks('reversed');
             // array_merge doesn't sort out duplicate page objects here.
@@ -106,11 +106,11 @@ extends WikiPlugin
      *
      * @param $pages array of WikiDB_Page's or a Page_iterator
      * @param $direction boolean: true if incoming links
-     * 
+     *
      * @return Array of sorted links
      */
     function sortedLinks($pages, $direction=false, $limit=5) {
-    	$links = array();
+            $links = array();
         if (is_array($pages)) {
             $already = array(); // need special duplicate check
             foreach ($pages as $page) {
@@ -125,7 +125,7 @@ extends WikiPlugin
             }
         } else {
             while ($page = $pages->next()) {
-                // different score algorithm: 
+                // different score algorithm:
                 //   the number of links to/from the page
                 $l = $page->getLinks(!$direction);
                 $score = $l->count();
diff --git a/lib/plugin/PopularTags.php b/lib/plugin/PopularTags.php
index c9207c81e..497e2bfa2 100644
--- a/lib/plugin/PopularTags.php
+++ b/lib/plugin/PopularTags.php
@@ -50,38 +50,38 @@ extends WikiPlugin
                      'noheader' => 0,
                     );
     }
-    
+
 
     function run($dbi, $argstr, &$request, $basepage) {
-    	$args = $this->getArgs($argstr, $request);
+            $args = $this->getArgs($argstr, $request);
         extract($args);
 
-	$maincat = $dbi->getPage(_("CategoryCategory"));
-	$bi = $maincat->getBackLinks(false);
-	$bl = array();
-	while ($b = $bi->next()) {
-	    $name = $b->getName();
-	    if (preg_match("/^"._("Template")."/", $name)) continue;
-	    $pages = $b->getBackLinks(false);
-	    $bl[] = array('name' => $name,
-			  'count' => $pages->count());
-	}
+        $maincat = $dbi->getPage(_("CategoryCategory"));
+        $bi = $maincat->getBackLinks(false);
+        $bl = array();
+        while ($b = $bi->next()) {
+            $name = $b->getName();
+            if (preg_match("/^"._("Template")."/", $name)) continue;
+            $pages = $b->getBackLinks(false);
+            $bl[] = array('name' => $name,
+                          'count' => $pages->count());
+        }
 
-	usort($bl, 'cmp_by_count');
-	$html = HTML::ul(); $i = 0;
-	foreach ($bl as $b) {
-	    $i++;
-	    $name  = $b['name'];
-	    $count = $b['count'];
-	    if ($count < $mincount) break;
-	    if ($i > $limit) break;
-	    $wo = preg_replace("/^("._("Category")."|"
-			       ._("Topic").")/", "", $name);
-	    $wo = HTML(HTML::span($wo),HTML::raw("&nbsp;"),HTML::small("(".$count.")"));
-	    $link = WikiLink($name, 'auto', $wo);
-	    $html->pushContent(HTML::li($link));
-	}
-	return $html;
+        usort($bl, 'cmp_by_count');
+        $html = HTML::ul(); $i = 0;
+        foreach ($bl as $b) {
+            $i++;
+            $name  = $b['name'];
+            $count = $b['count'];
+            if ($count < $mincount) break;
+            if ($i > $limit) break;
+            $wo = preg_replace("/^("._("Category")."|"
+                               ._("Topic").")/", "", $name);
+            $wo = HTML(HTML::span($wo),HTML::raw("&nbsp;"),HTML::small("(".$count.")"));
+            $link = WikiLink($name, 'auto', $wo);
+            $html->pushContent(HTML::li($link));
+        }
+        return $html;
     }
 }
 
diff --git a/lib/plugin/PreferenceApp.php b/lib/plugin/PreferenceApp.php
index 24a63cf9a..d19faeace 100644
--- a/lib/plugin/PreferenceApp.php
+++ b/lib/plugin/PreferenceApp.php
@@ -23,13 +23,13 @@ rcs_id('$Id$');
 /**
  * PreferenceApp is used to analyze a category of items that a group
  * of people have rated.  A user is grouped to be analyzed in the group by
- * 1) having rated at least one item in the database and 2) matching the optional 
- * criteria for declaring a budget on their homepage.  
+ * 1) having rated at least one item in the database and 2) matching the optional
+ * criteria for declaring a budget on their homepage.
  *
  * An example of a budget decleration would be "TotalSoda: 50" on my homepage.
  *
- * PreferenceApp will output a matrix style table shows "how much" fractionally 
- * a group of people prefer an item over other items.  For example, if my soda 
+ * PreferenceApp will output a matrix style table shows "how much" fractionally
+ * a group of people prefer an item over other items.  For example, if my soda
  * budget is 100 then PreferenceApp might assign 20 units of my budget to Moutain Dew.
  *
  * Author: mcassano circa April 2004
@@ -70,14 +70,14 @@ extends WikiPlugin
                      'group' => null,
                      'roundCalc' => "true",
                      'neutralRating' => "3",
-                     'declareBudget' => "true");            
+                     'declareBudget' => "true");
     }
     // info arg allows multiple columns
     // info=mtime,hits,summary,version,author,locked,minor
     // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges
 
     function run($dbi, $argstr, &$request, $basepage) {
-    	
+
         extract($this->getArgs($argstr, $request));
         if($pageTextLabel == null && $category != null && $group == null){
             $group = $category;
@@ -85,19 +85,19 @@ extends WikiPlugin
         if($category == null || $pageTextLabel == null){
                 return HTML::div(array('class' => "error"), "PreferencesApp Error: You must declare at least parameters category and pageTextLabel.");
         }
-      	
+
         $dbi = $request->getDbh();
         $rdbi = RatingsDb::getTheRatingsDb();
-        
+
         $CATEGORY = $category;
         $PAGE_TEXT_LABEL = $pageTextLabel;
         $NEUTRAL_RATING = (int)$neutralRating;
-        
+
         $active_user   = $request->getUser();
         $active_userid = $active_user->_userid;
         $html = HTML();
         $html->pushContent("");
-		
+
         //Load participating Users
         $users_array = array();
         if($group != null){
@@ -105,7 +105,7 @@ extends WikiPlugin
         } else {
             $people_iter = $rdbi->sql_get_users_rated();
             while($people_array = $people_iter->next()){
-                $users_array[] = $people_array['pagename'];	
+                $users_array[] = $people_array['pagename'];
             }
         }
         $people = array();
@@ -119,11 +119,11 @@ extends WikiPlugin
                     } else {
                         $canBudget[$person_indv] = 0;
                     }
-                    $people[] = $person_indv;	
-                }	
+                    $people[] = $person_indv;
+                }
             } else {
                 $canBudget[$person_indv] = $lockedBudget;
-                $people[] = $person_indv;	
+                $people[] = $person_indv;
             }
         }
         if(count($people) < 1){
@@ -138,32 +138,32 @@ extends WikiPlugin
         }
         $ratingTotals = array();
         foreach ($people as $person){
-    		$ratings_iter = $rdbi->sql_get_rating(0, $person, $pageids);
-    		$ratingTotals[$person] = 0;
+                    $ratings_iter = $rdbi->sql_get_rating(0, $person, $pageids);
+                    $ratingTotals[$person] = 0;
                 while($ratings_array = $ratings_iter->next()){
                     $can_rating = $ratings_array['ratingvalue'];
                     if($can_rating >= $NEUTRAL_RATING){
                         $ratingTotals[$person] += $can_rating;
                     }
-                }		
+                }
         }
-		
+
         //Generate numbers
         $canTotals = array();
         $peopleTotals = array();
         foreach($pageids as $soda){
-            $canTotals[$soda] = 0;	
+            $canTotals[$soda] = 0;
         }
         foreach($people as $person){
             foreach($pageids as $soda){
                 $peopleTotals[$person][$soda] = 0;
-            }	
+            }
         }
         foreach($people as $person){
             foreach($pageids as $page){
                 $can_rating_iter = $rdbi->sql_get_rating(0, $person, $page);
                 $can_rating_array = $can_rating_iter->next();
-                $can_rating = $can_rating_array['ratingvalue'];	
+                $can_rating = $can_rating_array['ratingvalue'];
                 if($can_rating >= $NEUTRAL_RATING){
                     $calc = (($can_rating / $ratingTotals[$person]) * $canBudget[$person]);
                     if($roundCalc == "true"){
@@ -172,7 +172,7 @@ extends WikiPlugin
                         $adjustedCans = round($calc, 2);
                     }
                     $peopleTotals[$person][$page] = $adjustedCans;
-                    
+
                     $canTotals[$page] = $canTotals[$page] + $adjustedCans;
                 }
             }
@@ -183,13 +183,13 @@ extends WikiPlugin
                 $outputArray[$person][$page] = 0;
             }
         }
-	
+
         $table = HTML::table(array('cellpadding' => '5', 'cellspacing' => '1', 'border' => '0'));
         $tr = HTML::tr();
         $td = HTML::td(array('bgcolor' => '#FFFFFF'));
         $td->pushContent(" ");
         $tr->pushContent($td);
-		
+
         foreach($people as $person){
             $td = HTML::td(array('bgcolor' => '#FFFFFF'));
             $td->pushContent(HTML::a(array('href' => WikiURL($person),
@@ -197,16 +197,16 @@ extends WikiPlugin
                                            ),
                                      SplitPagename($person)));
             //$td->pushContent(WikiLink(" $person "));
-            $tr->pushContent($td);	
+            $tr->pushContent($td);
         }
         $td = HTML::td(array('bgcolor' => '#FFFFFF'));
         $td->pushContent(_("Total Units"));
-        $tr->pushContent($td);	
+        $tr->pushContent($td);
         $td = HTML::td(array('bgcolor' => '#FFFFFF'));
         $td->pushContent(_("Total Voters"));
-        $tr->pushContent($td);	
+        $tr->pushContent($td);
         $table->pushContent($tr);
-		
+
         for($i = 0; $i < count($pageids); $i++){
             $total_cans = 0;
             for($j = 0; $j < count($people); $j++){
@@ -214,10 +214,10 @@ extends WikiPlugin
                 $cans_per_soda = $peopleTotals[$people[$j]][$pageids[$i]];
                 $total_cans = $total_cans + $cans_per_soda;
                 $outputArray[$people[$j]][$pageids[$i]] = $cans_per_soda;
-            }			
+            }
         }
-	
-		
+
+
         foreach($people as $person){
             $min_soda = "";
             $min_cans = 9999999; //9 million, serving as "infinity"
@@ -229,7 +229,7 @@ extends WikiPlugin
                     $min_soda = $page;
                 }
                 $total_cans = $total_cans + $cur_soda_cans;
-            }	
+            }
             if($total_cans != $canBudget[$person] && $total_cans > 0){
                 $diff = $canBudget[$person] - $total_cans;
                 $outputArray[$person][$min_soda] = $outputArray[$person][$min_soda] + $diff;
@@ -256,22 +256,22 @@ extends WikiPlugin
                 }
                 $td->pushContent($output);
                 $tr->pushContent($td);
-            }	
+            }
             if($total_cans == ""){
-                $total_cans = "-";	
+                $total_cans = "-";
             }
             if($total_voters == ""){
-                $total_voters = "-";	
+                $total_voters = "-";
             }
             $td = HTML::td(array('align' => 'right'));
-            $td->pushContent($total_cans); 
-            $tr->pushContent($td);	
+            $td->pushContent($total_cans);
+            $tr->pushContent($td);
             $td = HTML::td(array('align' => 'right'));
-            $td->pushContent($total_voters); 
-            $tr->pushContent($td);	
-            $table->pushContent($tr);	
+            $td->pushContent($total_voters);
+            $tr->pushContent($td);
+            $table->pushContent($tr);
         }
-		
+
         $tr = HTML::tr();
         $td = HTML::td(array('align' => 'left'));
         $td->pushContent(HTML::strong(_("Total Budget")));
@@ -301,14 +301,14 @@ extends WikiPlugin
         $td->pushContent(HTML::strong($total_voters));
         $tr->pushContent($td);
         $table->pushContent($tr);
-		
+
         $table2 = HTML::table(array('bgcolor' => '#dedfdf'));
         $table2->pushContent(HTML::tr(HTML::td($table)));
         $html->pushContent($table2);
-		
+
         return $html;
     }
-    
+
 };
 
 // Local Variables:
diff --git a/lib/plugin/Processing.php b/lib/plugin/Processing.php
index a37d1de81..644f82866 100644
--- a/lib/plugin/Processing.php
+++ b/lib/plugin/Processing.php
@@ -43,8 +43,8 @@ extends WikiPlugin
     function getDefaultArguments() {
         return array('width'  => 200,
                      'height' => 200,
-		     'script' => false, // one line script. not very likely
-		     'onmousemove' => false
+                     'script' => false, // one line script. not very likely
+                     'onmousemove' => false
                      );
     }
     function handle_plugin_args_cruft(&$argstr, &$args) {
@@ -66,21 +66,21 @@ extends WikiPlugin
                 $html->pushContent($js);
             $WikiTheme->_processing = 1; // prevent duplicates
         }
-	// extract <script>
-	if (preg_match("/^(.*)<script>(.*)<\/script>/ism", $this->source, $m)) {
-	    $this->source = $m[1];
-	    $args['script'] = $m[2];
-	}
-	$embedargs = array('width'  => $args['width'],
-			   'height' => $args['height'],
-			   //'src'    => "d.svg",
-			   'script' => $this->source);
-	// additional onmousemove argument
-	if ($args['onmousemove']) $embedargs['onmousemove'] = $args['onmousemove'];
+        // extract <script>
+        if (preg_match("/^(.*)<script>(.*)<\/script>/ism", $this->source, $m)) {
+            $this->source = $m[1];
+            $args['script'] = $m[2];
+        }
+        $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"
         $embed = new Processing_HTML("embed", $embedargs);
         $html->pushContent($embed);
-	if ($args['script']) $html->pushContent(JavaScript($args['script']));
+        if ($args['script']) $html->pushContent(JavaScript($args['script']));
         return $html;
     }
 };
@@ -88,7 +88,7 @@ extends WikiPlugin
 class Processing_HTML extends HtmlElement {
     function startTag() {
         $start = "<" . $this->_tag;
-	$this->_setClasses();
+        $this->_setClasses();
         foreach ($this->_attr as $attr => $val) {
             if (is_bool($val)) {
                 if (!$val)
@@ -97,7 +97,7 @@ class Processing_HTML extends HtmlElement {
             }
             $qval = str_replace("\"", '&quot;', $this->_quote((string)$val));
             if ($attr == 'script')
-		// note the ' not "
+                // note the ' not "
                 $start .= " $attr='$qval'";
             else
                 $start .= " $attr=\"$qval\"";
diff --git a/lib/plugin/RandomPage.php b/lib/plugin/RandomPage.php
index 8347b1b1f..306eb8d8a 100644
--- a/lib/plugin/RandomPage.php
+++ b/lib/plugin/RandomPage.php
@@ -62,7 +62,7 @@ extends WikiPlugin
         if (is_integer($pages)) {
             $numpages = $pages;
             $pages = false;
-        // fix new pages handling in arg preprozessor.    
+        // fix new pages handling in arg preprozessor.
         } elseif (is_array($pages)) {
             $numpages = (int)$pages[0];
             if ($numpages > 0 and !$dbi->isWikiPage($numpages)) $pages = false;
@@ -92,7 +92,7 @@ extends WikiPlugin
                 if (isset($pagearray[$i])) $pagelist->addPage($pagearray[$i]);
         } else { // if $numpages = 1
              if (isset($pagearray[$shuffle]))
-	         $pagelist->addPage($pagearray[$shuffle]);
+                 $pagelist->addPage($pagearray[$shuffle]);
         }
         return $pagelist;
     }
diff --git a/lib/plugin/RateIt.php b/lib/plugin/RateIt.php
index 45b268f5b..66050459e 100644
--- a/lib/plugin/RateIt.php
+++ b/lib/plugin/RateIt.php
@@ -32,7 +32,7 @@ rcs_id('$Id$');
  * be (and will be!) many ratings per page (ratee): different raters
  * (users), in different dimensions. Are those stored per page
  * (ratee)? Then what if I wish to access the ratings per rater
- * (user)? 
+ * (user)?
  * wikilens plans several user-centered applications like:
  * a) show my ratings
  * b) show my buddies' ratings
@@ -51,12 +51,12 @@ rcs_id('$Id$');
  * rating. Finally, the movie domain has an unusually small number of
  * items-- I'd expect a lot more in music, for example.
  *
- * For a simple rating system one can also store the rating in the page 
+ * For a simple rating system one can also store the rating in the page
  * metadata (default).
  *
  * Recommender Engines:
  * Recommendation/Prediction is a special field of "Data Mining"
- * For a list of (also free) software see 
+ * For a list of (also free) software see
  *  http://www.the-data-mine.com/bin/view/Software/WebIndex
  * - movielens: (Java Server) will be gpl'd in summer 2004 (weighted)
  * - suggest: is free for non-commercial use, available as compiled library
@@ -74,7 +74,7 @@ rcs_id('$Id$');
  *
  * @author:  Dan Frankowski (wikilens author), Reini Urban (as plugin)
  *
- * TODO: 
+ * TODO:
  * - finish mysuggest.c (external engine with data from mysql)
  */
 
@@ -110,8 +110,8 @@ extends WikiPlugin
 var rateit_action = '".urlencode("RateIt")."';
 ";
         $WikiTheme->addMoreHeaders
-        	(JavaScript('', 
-        	            array('src' => $WikiTheme->_findData('themes/wikilens/wikilens.js'))));
+                (JavaScript('',
+                            array('src' => $WikiTheme->_findData('themes/wikilens/wikilens.js'))));
         return JavaScript($js_globals);
     }
 
@@ -159,30 +159,30 @@ var msg_rating_deleted = '"._("Rating deleted!")."';
 
     function displayActionImg ($mode) {
         global $WikiTheme, $request;
-	if (!empty($request->_is_buffering_output))
-	    ob_end_clean();  // discard any previous output
-	// delete the cache
-	$page = $request->getPage();
-	//$page->set('_cached_html', false);
-	$request->cacheControl('MUST-REVALIDATE');
-	$dbi = $request->getDbh();
-	$dbi->touch();
-	//fake validators without args
-	$request->appendValidators(array('wikiname' => WIKI_NAME,
+        if (!empty($request->_is_buffering_output))
+            ob_end_clean();  // discard any previous output
+        // delete the cache
+        $page = $request->getPage();
+        //$page->set('_cached_html', false);
+        $request->cacheControl('MUST-REVALIDATE');
+        $dbi = $request->getDbh();
+        $dbi->touch();
+        //fake validators without args
+        $request->appendValidators(array('wikiname' => WIKI_NAME,
                                          'args'     => wikihash('')));
-	$request->discardOutput();
-	$actionImg = $WikiTheme->_path . $this->actionImgPath();
-	if (file_exists($actionImg)) {
-	    header('Content-type: image/png');
-	    readfile($actionImg);
-	} else {
-	    header('Content-type: image/png');
-	    echo '‰PNG
+        $request->discardOutput();
+        $actionImg = $WikiTheme->_path . $this->actionImgPath();
+        if (file_exists($actionImg)) {
+            header('Content-type: image/png');
+            readfile($actionImg);
+        } else {
+            header('Content-type: image/png');
+            echo '‰PNG
 
- 
-IHDR   
   
   ĉ   IDATx^	   Â0ízçX	
ÿ7-`    IEND®B`‚';
-	}
-	exit;
+
+IHDR   
   
   ĉ   IDATx^           Â0ízçX        
ÿ7-`    IEND®B`‚';
+        }
+        exit;
     }
 
     // Only for signed users done in template only yet.
@@ -223,15 +223,15 @@ IHDR   
   
   ĉ   IDATx^
             //if (!$user->isSignedIn()) return $this->error(_("You must sign in"));
             $this->rating = $request->getArg('rating');
             $rdbi->addRating($this->rating, $this->userid, $this->pagename, $this->dimension);
-	    $this->displayActionImg('add');
+            $this->displayActionImg('add');
 
         } elseif ($args['mode'] === 'delete') {
             //if (!$user->isSignedIn()) return $this->error(_("You must sign in"));
             $rdbi->deleteRating($this->userid, $this->pagename, $this->dimension);
             unset($this->rating);
-	    $this->displayActionImg('delete');
+            $this->displayActionImg('delete');
         } elseif (! $args['show'] ) {
-            return $this->RatingWidgetHtml($args['pagename'], $args['version'], $args['imgPrefix'], 
+            return $this->RatingWidgetHtml($args['pagename'], $args['version'], $args['imgPrefix'],
                                            $args['dimension'], $args['small']);
         } else {
             //if (!$user->isSignedIn()) return $this->error(_("You must sign in"));
@@ -246,28 +246,28 @@ IHDR   
   
   ĉ   IDATx^
                             sprintf(_("Rating: %.1f (%d votes)"),
                                     $this->avg, $this->numusers)));
             if ($args['show'] == 'top') {
-		if (ENABLE_PAGE_PUBLIC) {
-		    $page = $dbi->getPage($this->pagename);
-		    if ($page->get('public'))
-			$html->setAttr('class', "public");
-		}
-		$html->setAttr('id', "rateit-widget-top");
+                if (ENABLE_PAGE_PUBLIC) {
+                    $page = $dbi->getPage($this->pagename);
+                    if ($page->get('public'))
+                        $html->setAttr('class', "public");
+                }
+                $html->setAttr('id', "rateit-widget-top");
                 $html->pushContent(HTML::br(),
-                                   $this->RatingWidgetHtml($args['pagename'], $args['version'], 
-                                                           $args['imgPrefix'], 
+                                   $this->RatingWidgetHtml($args['pagename'], $args['version'],
+                                                           $args['imgPrefix'],
                                                            $args['dimension'], $args['small']));
             } elseif ($args['show'] == 'text') {
-		if (!$WikiTheme->DUMP_MODE)
-		    $html->pushContent(HTML::br(),
-				       sprintf(_("Your rating was %.1f"),
-					       $this->rating));
+                if (!$WikiTheme->DUMP_MODE)
+                    $html->pushContent(HTML::br(),
+                                       sprintf(_("Your rating was %.1f"),
+                                               $this->rating));
             } elseif ($this->rating) {
                 $html->pushContent(HTML::br(),
                                    sprintf(_("Your rating was %.1f"),
                                            $this->rating));
             } else {
-            	$this->pred = $rdbi->getPrediction($this->userid, $this->pagename, $this->dimension);
-            	if (is_string($this->pred))
+                    $this->pred = $rdbi->getPrediction($this->userid, $this->pagename, $this->dimension);
+                    if (is_string($this->pred))
                     $html->pushContent(HTML::br(),
                                        sprintf(_("Prediction: %s"),
                                                $this->pred));
@@ -318,24 +318,24 @@ IHDR   
   
   ĉ   IDATx^
 
         $dbi =& $request->_dbi;
         $version = $dbi->_backend->get_latest_version($pagename);
-	$pageid = sprintf("%u",crc32($pagename)); // MangleXmlIdentifier($pagename)
+        $pageid = sprintf("%u",crc32($pagename)); // MangleXmlIdentifier($pagename)
         $imgId = 'RateIt' . $pageid;
         $actionImgName = 'RateIt'.$pageid.'Action';
-       
+
         //$rdbi =& $this->_rdbi;
         $rdbi = RatingsDb::getTheRatingsDb();
-	
+
         // check if the imgPrefix icons exist.
         if (! $WikiTheme->_findData("images/RateIt".$imgPrefix."Nk0.png", true))
             $imgPrefix = '';
-        
+
         // Protect against \'s, though not \r or \n
         $reImgPrefix = $this->_javascript_quote_string($imgPrefix);
         $reImgId     = $this->_javascript_quote_string($imgId);
         $reActionImgName = $this->_javascript_quote_string($actionImgName);
         $rePagename      = $this->_javascript_quote_string($pagename);
         //$dimension = $args['pagename'] . "rat";
-    
+
         $html = HTML::span(array("class" => "rateit-widget", "id" => $imgId));
         for ($i=0; $i < 2; $i++) {
             $ok[$i] = $WikiTheme->_findData("images/RateIt".$imgPrefix."Ok".$i.".png"); // empty
@@ -353,54 +353,54 @@ IHDR   
   
   ĉ   IDATx^
                 $this->pred = $rdbi->getPrediction($this->userid, $pagename, $dimension);
             }
         }
-        
-	for ($i = 1; $i <= 10; $i++) {
-	    $j = $i / 2;
+
+        for ($i = 1; $i <= 10; $i++) {
+            $j = $i / 2;
             $a1 = HTML::a(array('href' => "javascript:clickRating('$reImgPrefix','$rePagename','$version',"
-				."'$reImgId','$dimension',$j)"));
+                                ."'$reImgId','$dimension',$j)"));
             $img_attr = array();
             $img_attr['src'] = $nk[$i%2];
             if ($this->rating) {
                 $img_attr['src'] = $ok[$i%2];
-		$img_attr['onMouseOver'] = "displayRating('$reImgId','$reImgPrefix',$j,0,1)";
-		$img_attr['onMouseOut']  = "displayRating('$reImgId','$reImgPrefix',$this->rating,0,1)";
-	    }
+                $img_attr['onMouseOver'] = "displayRating('$reImgId','$reImgPrefix',$j,0,1)";
+                $img_attr['onMouseOut']  = "displayRating('$reImgId','$reImgPrefix',$this->rating,0,1)";
+            }
             else if (!$this->rating and $this->pred) {
                 $img_attr['src'] = $rk[$i%2];
-		$img_attr['onMouseOver'] = "displayRating('$reImgId','$reImgPrefix',$j,1,1)";
-		$img_attr['onMouseOut']  = "displayRating('$reImgId','$reImgPrefix',$this->pred,1,1)";
-	    }
+                $img_attr['onMouseOver'] = "displayRating('$reImgId','$reImgPrefix',$j,1,1)";
+                $img_attr['onMouseOut']  = "displayRating('$reImgId','$reImgPrefix',$this->pred,1,1)";
+            }
             else {
-		$img_attr['onMouseOver'] = "displayRating('$reImgId','$reImgPrefix',$j,0,1)";
-		$img_attr['onMouseOut']  = "displayRating('$reImgId','$reImgPrefix',0,0,1)";
-	    }
-	    //$imgName = 'RateIt'.$reImgId.$i;
+                $img_attr['onMouseOver'] = "displayRating('$reImgId','$reImgPrefix',$j,0,1)";
+                $img_attr['onMouseOut']  = "displayRating('$reImgId','$reImgPrefix',0,0,1)";
+            }
+            //$imgName = 'RateIt'.$reImgId.$i;
             $img_attr['name'] = $imgId . $i;
             $img_attr['alt'] = $img_attr['name'];
             $img_attr['border'] = 0;
             $a1->pushContent(HTML::img($img_attr));
             //$a1->addToolTip(_("Rate the topic of this page"));
             $html->pushContent($a1);
-            
+
             //This adds a space between the rating smilies:
             //if (($i%2) == 0) $html->pushContent("\n");
         }
-	$html->pushContent(HTML::Raw("&nbsp;"));
-       
-	$a0 = HTML::a(array('href' => "javascript:clickRating('$reImgPrefix','$rePagename','$version',"
-			    ."'$reImgId','$dimension','X')"));
-	$msg = _("Cancel your rating");
-	$imgprops = array('src'   => $WikiTheme->getImageUrl("RateIt".$imgPrefix."Cancel"),
-			  'name'  => $imgId.$imgPrefix.'Cancel',
-			  'border'=> 0,
-			  'alt'   => $msg,
-			  'title' => $msg);
-	if (!$this->rating)
-	    $imgprops['style'] = 'display:none';
-	$a0->pushContent(HTML::img($imgprops));
-	$a0->addToolTip($msg);
-	$html->pushContent($a0);
-	
+        $html->pushContent(HTML::Raw("&nbsp;"));
+
+        $a0 = HTML::a(array('href' => "javascript:clickRating('$reImgPrefix','$rePagename','$version',"
+                            ."'$reImgId','$dimension','X')"));
+        $msg = _("Cancel your rating");
+        $imgprops = array('src'   => $WikiTheme->getImageUrl("RateIt".$imgPrefix."Cancel"),
+                          'name'  => $imgId.$imgPrefix.'Cancel',
+                          'border'=> 0,
+                          'alt'   => $msg,
+                          'title' => $msg);
+        if (!$this->rating)
+            $imgprops['style'] = 'display:none';
+        $a0->pushContent(HTML::img($imgprops));
+        $a0->addToolTip($msg);
+        $html->pushContent($a0);
+
         /*} elseif ($pred) {
             $msg = _("No opinion");
             $html->pushContent(HTML::img(array('src' => $WikiTheme->getImageUrl("RateItCancelN"),
@@ -418,7 +418,7 @@ IHDR   
   
   ĉ   IDATx^
         $img_attr['width'] = 20;
         $html->pushContent(HTML::img($img_attr));
 
-        // Display your current rating if there is one, or the current prediction 
+        // Display your current rating if there is one, or the current prediction
         // or the empty widget.
         $pred = empty($this->pred) ? 0 : $this->pred;
         $js = '';
@@ -427,16 +427,16 @@ IHDR   
   
   ĉ   IDATx^
         if ($this->rating) {
             $js .= "rating['$reImgId']=$this->rating; prediction['$reImgId']=$pred;\n";
             $html->pushContent(JavaScript($js
-            	."displayRating('$reImgId','$reImgPrefix',$this->rating,0,1);"));
+                    ."displayRating('$reImgId','$reImgPrefix',$this->rating,0,1);"));
         } elseif (!empty($this->pred)) {
             $js .= "rating['$reImgId']=0; prediction['$reImgId']=$this->pred;\n";
             $html->pushContent(JavaScript($js
-            	."displayRating('$reImgId','$reImgPrefix',$this->pred,1,1);"));
+                    ."displayRating('$reImgId','$reImgPrefix',$this->pred,1,1);"));
         } else {
             $js .= "rating['$reImgId']=0; prediction['$reImgId']=0;\n";
             $html->pushContent(JavaScript($js
-            	."displayRating('$reImgId','$reImgPrefix',0,0,1);"));
-	}
+                    ."displayRating('$reImgId','$reImgPrefix',0,0,1);"));
+        }
         return $html;
     }
 
diff --git a/lib/plugin/RawHtml.php b/lib/plugin/RawHtml.php
index f4f47ff95..718973d2f 100644
--- a/lib/plugin/RawHtml.php
+++ b/lib/plugin/RawHtml.php
@@ -21,7 +21,7 @@ rcs_id('$Id$');
  */
 
 // Moved to IniConfig and config-default.ini
-// Define ENABLE_RAW_HTML to false (in config.ini) to disable the RawHtml 
+// Define ENABLE_RAW_HTML to false (in config.ini) to disable the RawHtml
 // plugin completely
 /*
 if (!defined('ENABLE_RAW_HTML'))
@@ -32,7 +32,7 @@ if (!defined('ENABLE_RAW_HTML_LOCKEDONLY'))
 // sanitize to safe html code
 if (!defined('ENABLE_RAW_HTML_SAFE'))
     define('ENABLE_RAW_HTML_SAFE', true);
-*/    
+*/
 
 /** We defined a better policy when to allow RawHtml:
  *   ENABLE_RAW_HTML_LOCKEDONLY:
@@ -72,7 +72,7 @@ extends WikiPlugin
         // validators have already been handled by displayPage.
         return true;
     }
-    
+
     function run($dbi, $argstr, &$request, $basepage) {
         if (!defined('ENABLE_RAW_HTML') || ! ENABLE_RAW_HTML) {
             return $this->disabled(_("Raw HTML is disabled in this wiki."));
@@ -80,7 +80,7 @@ extends WikiPlugin
         if (!$basepage) {
             return $this->error("$basepage unset?");
         }
-        
+
         $page = $request->getPage($basepage);
         if (ENABLE_RAW_HTML_LOCKEDONLY) {
             if (! $page->get('locked')) {
@@ -112,7 +112,7 @@ extends WikiPlugin
 /*
 Copyright 2003 Chris Snyder. All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, 
+Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
    1. Redistributions of source code must retain the above copyright
@@ -132,7 +132,7 @@ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA, OR PROFITS;
 OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 /*
@@ -154,7 +154,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             unset($attrs);
             $attrs= $array;
         }
-        
+
         foreach ($attrs AS $attribute) {
             // once for ", once for ', s makes the dot match linebreaks, too.
             $search[]= "/".$attribute.'\s*=\s*".+"/Uis';
@@ -163,7 +163,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             $search[]= "/".$attribute."\s*=\s*\S+/i";
         }
         $html= preg_replace($search, "", $html);
-    
+
         // check for additional matches and strip all tags if found
         foreach ($search AS $pattern) {
             if (preg_match($pattern, $html)) {
@@ -177,7 +177,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
     function safe_html ($html, $allowedtags="") {
         $version= "safe_html.php/0.4";
-    
+
         // anything with ="javascript: is right out -- strip all tags and return if found
         $pattern= "/=\s*\S+script:\S+/Ui";
         if (preg_match($pattern, $html)) {
@@ -187,8 +187,8 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
         // setup -- $allowedtags is an array of $tag=>$closeit pairs, where $tag is an HTML tag to allow and $closeit is 1 if the tag requires a matching, closing tag
         if ($allowedtags=="") {
-            $allowedtags= array ( "p"=>1, "br"=>0, "a"=>1, "img"=>0, "li"=>1, 
-                "ol"=>1, "ul"=>1, "b"=>1, "i"=>1, "em"=>1, "strong"=>1, "del"=>1, "ins"=>1, 
+            $allowedtags= array ( "p"=>1, "br"=>0, "a"=>1, "img"=>0, "li"=>1,
+                "ol"=>1, "ul"=>1, "b"=>1, "i"=>1, "em"=>1, "strong"=>1, "del"=>1, "ins"=>1,
                 "sub"=>1, "sup"=>1, "u"=>1, "blockquote"=>1, "pre"=>1, "hr"=>0,
                 "table"=>1, "thead"=>1, "tfoot"=>1, "tbody"=>1, "tr"=>1, "td"=>1, "th"=>1,
                 );
@@ -198,14 +198,14 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             unset($allowedtags);
             $allowedtags= $array;
         }
-        
+
         // there's some debate about this.. is strip_tags() better than rolling your own regex?
         // note: a bug in PHP 4.3.1 caused improper handling of ! in tag attributes when using strip_tags()
         $stripallowed= "";
         foreach ($allowedtags AS $tag=>$closeit) {
             $stripallowed.= "<$tag>";
         }
-    
+
         //print "Stripallowed: $stripallowed -- ".print_r($allowedtags,1);
         $html= strip_tags($html, $stripallowed);
 
@@ -224,7 +224,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                 $html.= str_repeat("</$tag>", ($totalopen - $totalclose));
             }
         }
-        
+
         // close any open <!--'s and identify version just in case
         $html.= "<!-- $version -->";
         return $html;
diff --git a/lib/plugin/RecentChanges.php b/lib/plugin/RecentChanges.php
index 0d23c09ac..a9ffb81bb 100644
--- a/lib/plugin/RecentChanges.php
+++ b/lib/plugin/RecentChanges.php
@@ -41,7 +41,7 @@ class _RecentChanges_Formatter
     }
 
     function title () {
-	global $request;
+        global $request;
         extract($this->_args);
         if ($author) {
             $title = $author;
@@ -65,7 +65,7 @@ class _RecentChanges_Formatter
             $title = $category;
         elseif (!empty($pagematch))
             $title .= ":$pagematch";
-	return $title;
+        return $title;
     }
 
     function include_versions_in_URLs() {
@@ -204,32 +204,32 @@ extends _RecentChanges_Formatter
 
     /* Link to all users contributions (contribs and owns) */
     function authorContribs ($rev) {
-	$author = $rev->get('author');
-	if (preg_match("/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/", $author)) return '';
+        $author = $rev->get('author');
+        if (preg_match("/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/", $author)) return '';
         return HTML('(',
-		    Button(array('action' => _("RecentChanges"), 
-				 'format' => 'contribs',
-				 'author' => $author,
-				 'days' => 360),
-			   _("contribs"),
-			   $author),
-		    ' | ',
-		    Button(array('action' => _("RecentChanges"), 
-				 'format' => 'contribs',
-				 'owner' => $author,
-				 'days' => 360),
-			   _("new pages"),
-			   $author),
-		    ')');
+                    Button(array('action' => _("RecentChanges"),
+                                 'format' => 'contribs',
+                                 'author' => $author,
+                                 'days' => 360),
+                           _("contribs"),
+                           $author),
+                    ' | ',
+                    Button(array('action' => _("RecentChanges"),
+                                 'format' => 'contribs',
+                                 'owner' => $author,
+                                 'days' => 360),
+                           _("new pages"),
+                           $author),
+                    ')');
     }
 
     function summaryAsHTML ($rev) {
         if ( !($summary = $this->summary($rev)) )
             return '';
         return  HTML::span( array('class' => 'wiki-summary'),
-			    "(",
-			    TransformLinks($summary, $rev->get('markup'), $rev->getPageName()),
-			    ")");
+                            "(",
+                            TransformLinks($summary, $rev->get('markup'), $rev->getPageName()),
+                            ")");
     }
 
     function format_icon ($format, $filter = array()) {
@@ -240,9 +240,9 @@ extends _RecentChanges_Formatter
         unset($args['difflinks']);
         unset($args['historylinks']);
         $rss_url = $request->getURLtoSelf
-        	(array_merge($args,
-        		     array('action' => $this->action, 'format' => $format), 
-        	             $filter));
+                (array_merge($args,
+                             array('action' => $this->action, 'format' => $format),
+                             $filter));
         return $WikiTheme->makeButton($format, $rss_url, 'rssicon');
     }
 
@@ -255,11 +255,11 @@ extends _RecentChanges_Formatter
 
     function grazr_icon ($args = array()) {
         global $request, $WikiTheme;
-	if (is_localhost()) return '';
-	if (SERVER_PROTOCOL == "https") return '';
-	$our_url = WikiURL($request->getArg('pagename'),
-		    array_merge(array('action' => $this->action, 'format' => 'rss2'), $args), 
-		    true);
+        if (is_localhost()) return '';
+        if (SERVER_PROTOCOL == "https") return '';
+        $our_url = WikiURL($request->getArg('pagename'),
+                    array_merge(array('action' => $this->action, 'format' => 'rss2'), $args),
+                    true);
         $rss_url = 'http://grazr.com/gzpanel.html?' . $our_url;
         return $WikiTheme->makeButton("grazr", $rss_url, 'rssicon');
     }
@@ -275,27 +275,27 @@ extends _RecentChanges_Formatter
             $edits = _("minor edits");
         if (isset($caption) and $caption == _("Recent Comments"))
             $edits = _("comments");
-	if (!empty($only_new)) {
+        if (!empty($only_new)) {
             $edits = _("created new pages");
-	}
-	if (!empty($author)) {
+        }
+        if (!empty($author)) {
             global $request;
             if ($author == '[]')
                 $author = $request->_user->getID();
             $edits .= sprintf(_(" for pages changed by %s"), $author);
-	}
-	if (!empty($owner)) {
+        }
+        if (!empty($owner)) {
             global $request;
             if ($owner == '[]')
                 $owner = $request->_user->getID();
             $edits .= sprintf(_(" for pages owned by %s"), $owner);
-	}
-	if (!empty($category)) {
+        }
+        if (!empty($category)) {
             $edits .= sprintf(_(" for all pages linking to %s"), $category);
-	}
-	if (!empty($pagematch)) {
+        }
+        if (!empty($pagematch)) {
             $edits .= sprintf(_(" for all pages matching '%s'"), $pagematch);
-	}
+        }
         if ($timespan = $days > 0) {
             if (intval($days) != $days)
                 $days = sprintf("%.1f", $days);
@@ -316,7 +316,7 @@ extends _RecentChanges_Formatter
          * fr: 1 jour   "Les %d %s les plus récentes pendant [le dernier (d'une] jour) sont énumérées ci-dessous."
          * fr: %s jours "Les %d %s les plus récentes pendant [les derniers (%s] jours) sont énumérées ci-dessous."
          */
-	if ($limit > 0) {
+        if ($limit > 0) {
             if ($timespan) {
                 if (intval($days) == 1)
                     $desc = fmt("The %d most recent %s during the past day are listed below.",
@@ -353,7 +353,7 @@ extends _RecentChanges_Formatter
                 $desc = fmt("All %s are listed below.", $edits);
         }
         return $desc;
-    }    
+    }
 
     function description() {
         return HTML::p(false, $this->pre_description());
@@ -364,23 +364,23 @@ extends _RecentChanges_Formatter
         extract($this->_args);
         return array($this->title(),
                      ' ',
-                     $this->rss_icon(), 
-		     $this->rss2_icon(),
-		     $this->atom_icon(),
-		     $this->rdf_icon(),
-		     /*$this->rdfs_icon(),
-		       $this->owl_icon(),*/
-		     $this->grazr_icon(),
+                     $this->rss_icon(),
+                     $this->rss2_icon(),
+                     $this->atom_icon(),
+                     $this->rdf_icon(),
+                     /*$this->rdfs_icon(),
+                       $this->owl_icon(),*/
+                     $this->grazr_icon(),
                      $this->sidebar_link());
     }
 
     function empty_message() {
         if (isset($this->_args['caption']) and $this->_args['caption'] == _("Recent Comments"))
             return _("No comments found");
-        else 
+        else
             return _("No changes found");
     }
-        
+
     function sidebar_link() {
         extract($this->_args);
         $pagetitle = $show_minor ? _("RecentEdits") : _("RecentChanges");
@@ -396,7 +396,7 @@ extends _RecentChanges_Formatter
         $jsf = JavaScript($addsidebarjsfunc);
 
         global $WikiTheme;
-        $sidebar_button = $WikiTheme->makeButton("sidebar", 'javascript:addPanel();', 'sidebaricon', 
+        $sidebar_button = $WikiTheme->makeButton("sidebar", 'javascript:addPanel();', 'sidebaricon',
                                                  array('title' => _("Click to add this feed to your sidebar"),
                                                        'style' => 'font-size:9pt;font-weight:normal; vertical-align:middle;'));
         $addsidebarjsclick = asXML($sidebar_button);
@@ -411,11 +411,11 @@ extends _RecentChanges_Formatter
 
     function format ($changes) {
         include_once('lib/InlineParser.php');
-        
+
         $html = HTML(HTML::h2(false, $this->headline()));
         if (($desc = $this->description()))
             $html->pushContent($desc);
-        
+
         if ($this->_args['daylist']) {
             $html->pushContent(new OptionsButtonBars($this->_args));
         }
@@ -428,7 +428,7 @@ extends _RecentChanges_Formatter
             if (($date = $this->date($rev)) != $last_date) {
                 if ($lines)
                     $html->pushContent($lines);
-		// for user contributions no extra date line
+                // for user contributions no extra date line
                 $html->pushContent(HTML::h3($date));
                 $lines = HTML::ul();
                 $last_date = $date;
@@ -452,7 +452,7 @@ extends _RecentChanges_Formatter
             $html->pushContent(HTML::p(array('class' => 'rc-empty'),
                                        $this->empty_message()));
         }
-        
+
         return $html;
     }
 
@@ -487,22 +487,22 @@ extends _RecentChanges_Formatter
             $linkorname = $this->pageLink($rev);
         }
 
-	if ((isa($WikiTheme, 'WikiTheme_MonoBook')) or (isa($WikiTheme, 'WikiTheme_gforge'))) {
-	    $line->pushContent(
-			       $args['historylinks'] ? '' : $this->historyLink($rev),
-			       ' . . ', $linkorname, '; ',
-			       $time, ' . . ',
-			       $this->authorLink($rev),' ',
-			       $this->authorContribs($rev),' ',
+        if ((isa($WikiTheme, 'WikiTheme_MonoBook')) or (isa($WikiTheme, 'WikiTheme_gforge'))) {
+            $line->pushContent(
+                               $args['historylinks'] ? '' : $this->historyLink($rev),
+                               ' . . ', $linkorname, '; ',
+                               $time, ' . . ',
+                               $this->authorLink($rev),' ',
+                               $this->authorContribs($rev),' ',
                                $this->summaryAsHTML($rev),' ',
                                $minor_flag);
-	} else {
-	    $line->pushContent($linkorname, ' ',
-			       $time, ' ',
-			       $this->summaryAsHTML($rev),
-			       ' ... ',
-			       $this->authorLink($rev));
-	}
+        } else {
+            $line->pushContent($linkorname, ' ',
+                               $time, ' ',
+                               $this->summaryAsHTML($rev),
+                               ' ... ',
+                               $this->authorLink($rev));
+        }
         return $line;
     }
 
@@ -515,27 +515,27 @@ class _RecentChanges_UserContribsFormatter
 extends _RecentChanges_HtmlFormatter
 {
     function headline () {
-	global $request;
+        global $request;
         extract($this->_args);
-	if ($author == '[]') $author = $request->_user->getID();
-	if ($owner  == '[]') $owner = $request->_user->getID();
-	$author_args = $owner
-	    ? array('owner' => $owner)
-	    : array('author' => $author);
+        if ($author == '[]') $author = $request->_user->getID();
+        if ($owner  == '[]') $owner = $request->_user->getID();
+        $author_args = $owner
+            ? array('owner' => $owner)
+            : array('author' => $author);
         return array(_("UserContribs"),":",$owner ? $owner : $author,
                      ' ',
-                     $this->rss_icon($author_args), 
-		     $this->rss2_icon($author_args),
-		     $this->atom_icon($author_args),
-		     $this->rdf_icon($author_args),
-		     $this->grazr_icon($author_args));
+                     $this->rss_icon($author_args),
+                     $this->rss2_icon($author_args),
+                     $this->atom_icon($author_args),
+                     $this->rdf_icon($author_args),
+                     $this->grazr_icon($author_args));
     }
 
     function format ($changes) {
         include_once('lib/InlineParser.php');
-        
+
         $html = HTML(HTML::h2(false, $this->headline()));
-	$lines = HTML::ol();
+        $lines = HTML::ol();
         $first = true; $count = 0;
         while ($rev = $changes->next()) {
             if (mayAccessPage('view', $rev->_pagename)) {
@@ -555,9 +555,9 @@ extends _RecentChanges_HtmlFormatter
         if ($first)
             $html->pushContent(HTML::p(array('class' => 'rc-empty'),
                                        $this->empty_message()));
-        else                               
+        else
             $html->pushContent($lines);
-        
+
         return $html;
     }
 
@@ -570,12 +570,12 @@ extends _RecentChanges_HtmlFormatter
 
         $line = HTML::li(array('class' => $class));
 
-	$line->pushContent($this->time($rev),", ");
-	$line->pushContent($this->date($rev)," ");
-	$line->pushContent($this->diffLink($rev), ' ');
-	$line->pushContent($this->historyLink($rev), ' ');
-	$line->pushContent($this->pageLink($rev), ' ',
-			   $this->summaryAsHTML($rev));
+        $line->pushContent($this->time($rev),", ");
+        $line->pushContent($this->date($rev)," ");
+        $line->pushContent($this->diffLink($rev), ' ');
+        $line->pushContent($this->historyLink($rev), ' ');
+        $line->pushContent($this->pageLink($rev), ' ',
+                           $this->summaryAsHTML($rev));
         return $line;
     }
 }
@@ -647,9 +647,9 @@ extends _RecentChanges_HtmlFormatter
         if ( !($summary = $this->summary($rev)) )
             return '';
         return HTML::span(array('class' => 'wiki-summary'),
-			  "[",
-			  /*TransformLinks(*/$summary,/* $rev->get('markup')),*/
-			  "]");
+                          "[",
+                          /*TransformLinks(*/$summary,/* $rev->get('markup')),*/
+                          "]");
     }
 
 
@@ -659,7 +659,7 @@ extends _RecentChanges_HtmlFormatter
         $html = HTML::div(array('class' => 'wikitext'), $html);
         global $request;
         $request->discardOutput();
-        
+
         printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", $GLOBALS['charset']);
         printf('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"');
         printf('  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');
@@ -718,8 +718,8 @@ extends _RecentChanges_HtmlFormatter
         while ($rev = $changes->next()) {
             // enforce view permission
             if (mayAccessPage('view',$rev->_pagename)) {
-            	if ($link = $this->pageLink($rev)) // some entries may be empty 
-                    				   // (/Blog/.. interim pages)
+                    if ($link = $this->pageLink($rev)) // some entries may be empty
+                                                       // (/Blog/.. interim pages)
                     $html->pushContent($sp, $link, HTML::br());
                 if ($first)
                     $this->setValidators($rev);
@@ -747,7 +747,7 @@ extends _RecentChanges_Formatter
     }
 
     function format ($changes) {
-        
+
         include_once('lib/RssWriter.php');
         $rss = new RssWriter;
         $rss->channel($this->channel_properties());
@@ -772,7 +772,7 @@ extends _RecentChanges_Formatter
         global $request;
         $request->discardOutput();
         $rss->finish();
-	//header("Content-Type: application/rss+xml; charset=" . $GLOBALS['charset']);
+        //header("Content-Type: application/rss+xml; charset=" . $GLOBALS['charset']);
         printf("\n<!-- Generated by PhpWiki-%s:\n%s-->\n", PHPWIKI_VERSION, $GLOBALS['RCS_IDS']);
 
         // Flush errors in comment, otherwise it's invalid XML.
@@ -807,12 +807,12 @@ extends _RecentChanges_Formatter
 
         $rc_url = WikiURL($request->getArg('pagename'), false, 'absurl');
         extract($this->_args);
-	$title = WIKI_NAME;
+        $title = WIKI_NAME;
         $description = $this->title();
         if ($category)
-	    $title = $category;
+            $title = $category;
         elseif ($pagematch)
-	    $title = $pagematch;
+            $title = $pagematch;
         return array('title' => $title,
                      'link' => $rc_url,
                      'description' => $description,
@@ -886,7 +886,7 @@ extends _RecentChanges_RssFormatter {
         global $request;
         $request->discardOutput();
         $rss->finish();
-	//header("Content-Type: application/rss+xml; charset=" . $GLOBALS['charset']);
+        //header("Content-Type: application/rss+xml; charset=" . $GLOBALS['charset']);
         printf("\n<!-- Generated by PhpWiki-%s:\n%s-->\n", PHPWIKI_VERSION, $GLOBALS['RCS_IDS']);
         // Flush errors in comment, otherwise it's invalid XML.
         global $ErrorManager;
@@ -908,7 +908,7 @@ extends _RecentChanges_RssFormatter {
     }
 
     // xml-rpc registerProcedure not yet implemented
-    function cloud_properties () { return false; } 
+    function cloud_properties () { return false; }
     function cloud_properties_test () {
         return array('protocol' => 'xml-rpc', // xml-rpc or soap or http-post
                      'registerProcedure' => 'wiki.rssPleaseNotify',
@@ -929,29 +929,29 @@ extends _RecentChanges_RssFormatter {
         include_once('lib/RssWriter.php');
         $rss = new AtomFeed;
 
-	// "channel" is called "feed" in atom
+        // "channel" is called "feed" in atom
         $rc_url = WikiURL($request->getArg('pagename'), false, 'absurl');
         extract($this->_args);
-	$title = WIKI_NAME;
+        $title = WIKI_NAME;
         $description = $this->title();
         if ($category)
-	    $title = $category;
+            $title = $category;
         elseif ($pagematch)
-	    $title = $pagematch;
+            $title = $pagematch;
         $feed_props = array('title' => $description,
-			    'link' => array('rel'=>"alternate",
-			    		    'type'=>"text/html",
-			                    'href' => $rc_url),
-			    'id' => md5($rc_url),                
-			    'modified' => Iso8601DateTime(time()),
-			    'generator' => 'PhpWiki-'.PHPWIKI_VERSION,
-			    'tagline' => '');
+                            'link' => array('rel'=>"alternate",
+                                                'type'=>"text/html",
+                                            'href' => $rc_url),
+                            'id' => md5($rc_url),
+                            'modified' => Iso8601DateTime(time()),
+                            'generator' => 'PhpWiki-'.PHPWIKI_VERSION,
+                            'tagline' => '');
         $rss->feed($feed_props);
         $first = true;
         while ($rev = $changes->next()) {
             // enforce view permission
             if (mayAccessPage('view', $rev->_pagename)) {
-		$props = $this->item_properties($rev);
+                $props = $this->item_properties($rev);
                 $rss->addItem($props,
                               false,
                               $this->pageURI($rev));
@@ -963,7 +963,7 @@ extends _RecentChanges_RssFormatter {
 
         $request->discardOutput();
         $rss->finish();
-	//header("Content-Type: application/atom; charset=" . $GLOBALS['charset']);
+        //header("Content-Type: application/atom; charset=" . $GLOBALS['charset']);
         printf("\n<!-- Generated by PhpWiki-%s:\n%s-->\n", PHPWIKI_VERSION, $GLOBALS['RCS_IDS']);
         // Flush errors in comment, otherwise it's invalid XML.
         global $ErrorManager;
@@ -978,8 +978,8 @@ extends _RecentChanges_RssFormatter {
         $pagename = $page->getName();
         return array( 'title'           => $pagename,
                       'link'            => array('rel' => 'alternate',
-						 'type' => 'text/html',
-						 'href' => $this->pageURL($rev)),
+                                                 'type' => 'text/html',
+                                                 'href' => $this->pageURL($rev)),
                       'summary'         => $this->summary($rev),
                       'modified'        => $this->time($rev)."Z",
                       'issued'          => $this->time($rev),
@@ -1054,8 +1054,8 @@ class LinkRevisionIterator extends WikiDB_PageRevisionIterator
         $this->_revisions = $revisions;
         if (preg_match("/[\?\.\*]/", $category)) {
           $backlinkiter = $this->_revisions->_wikidb->linkSearch
-            (new TextSearchQuery("*", true), 
-             new TextSearchQuery($category, true), 
+            (new TextSearchQuery("*", true),
+             new TextSearchQuery($category, true),
              "linkfrom");
         } else {
           $basepage = $GLOBALS['request']->getPage($category);
@@ -1138,7 +1138,7 @@ class OwnerPageRevisionIterator extends WikiDB_PageRevisionIterator
 
     function next () {
         while (($rev = $this->_revisions->next())) {
-	    $page = $rev->getPage();
+            $page = $rev->getPage();
             if ($page->getOwner() == $this->_owner)
                 return $rev;
         }
@@ -1177,19 +1177,19 @@ extends WikiPlugin
 
         // Nevertheless, for now, I leave this here, mostly as an
         // example for how to use appendValidators() and managesValidators().
-        
+
         return true;
     }
-            
+
     function getDefaultArguments() {
         return array('days'         => 2,
                      'show_minor'   => false,
                      'show_major'   => true,
                      'show_all'     => false,
                      'show_deleted' => 'sometimes',
-		     'only_new'     => false,
-		     'author'       => false,
-		     'owner'        => false,
+                     'only_new'     => false,
+                     'author'       => false,
+                     'owner'        => false,
                      'limit'        => false,
                      'format'       => false,
                      'daylist'      => false,
@@ -1202,7 +1202,7 @@ extends WikiPlugin
     }
 
     function getArgs ($argstr, $request, $defaults = false) {
-    	if (!$defaults) $defaults = $this->getDefaultArguments();
+            if (!$defaults) $defaults = $this->getDefaultArguments();
         $args = WikiPlugin::getArgs($argstr, $request, $defaults);
 
         $action = $request->getArg('action');
@@ -1221,8 +1221,8 @@ extends WikiPlugin
     }
 
     function getMostRecentParams (&$args) {
-    	$show_all = false; $show_minor = false; $show_major = false;
-    	$limit = false;
+            $show_all = false; $show_minor = false; $show_major = false;
+            $limit = false;
         extract($args);
 
         $params = array('include_minor_revisions' => $show_minor,
@@ -1319,12 +1319,12 @@ extends WikiPlugin
         $args['days'] = min($args['days'], 365000);
 
         // Within Categories just display Category Backlinks
-	if (empty($args['category']) and empty($args['pagematch'])
-	    and preg_match("/^Category/", $request->getArg('pagename'))) 
-	{
-	    $args['category'] = $request->getArg('pagename');
-	}
-        
+        if (empty($args['category']) and empty($args['pagematch'])
+            and preg_match("/^Category/", $request->getArg('pagename')))
+        {
+            $args['category'] = $request->getArg('pagename');
+        }
+
         // Hack alert: format() is a NORETURN for rss formatters.
         return $this->format($this->getChanges($dbi, $args), $args);
     }
@@ -1353,8 +1353,8 @@ class OptionsButtonBars extends HtmlElement {
     function OptionsButtonBars ($plugin_args) {
         $this->__construct('fieldset', array('class' => 'wiki-rc-action'));
 
-    	// Add ShowHideFolder button
-	$icon = $GLOBALS['WikiTheme']->_findData('images/folderArrowOpen.png');
+            // Add ShowHideFolder button
+        $icon = $GLOBALS['WikiTheme']->_findData('images/folderArrowOpen.png');
         $img = HTML::img(array('id' => 'rc-action-img',
                                'src' => $icon,
                                'onclick' => "showHideFolder('rc-action')",
@@ -1440,7 +1440,7 @@ class OptionsButtonBars extends HtmlElement {
         if ($url == $selfurl) {
             return HTML::td(array('colspan'=>3, 'class'=>'tdselected'), $label);
         }
-        return HTML::td(array('colspan'=>3, 'class'=>'tdunselected'), 
+        return HTML::td(array('colspan'=>3, 'class'=>'tdunselected'),
                         HTML::a(array('href'  => $url, 'class' => 'wiki-rc-action'), $label));
     }
 
diff --git a/lib/plugin/RecentChangesCached.php b/lib/plugin/RecentChangesCached.php
index 237104f38..32f65f4ef 100644
--- a/lib/plugin/RecentChangesCached.php
+++ b/lib/plugin/RecentChangesCached.php
@@ -60,20 +60,20 @@ extends WikiPluginCached
         return '+900'; // 15 minutes
     }
 
-    // We don't go through pi parsing, instead we go directly to the 
+    // We don't go through pi parsing, instead we go directly to the
     // better plugin methods.
     function getHtml($dbi, $args, $request, $basepage) {
-	$plugin = new WikiPlugin_RecentChanges();
-	$changes = $plugin->getChanges($dbi, $args);
-	return $plugin->format($changes, $args);
-	/*
+        $plugin = new WikiPlugin_RecentChanges();
+        $changes = $plugin->getChanges($dbi, $args);
+        return $plugin->format($changes, $args);
+        /*
         $loader = new WikiPluginLoader;
         return $loader->expandPI('<?plugin RecentChanges '
             . WikiPluginCached::glueArgs($argarray)
                                  . ' ?>', $request, $this, $basepage);
         */
     }
-    
+
     // ->box is used to display a fixed-width, narrow version with common header.
     // Just a limited list of pagenames, without date.
     // This does not use ->run, to avoid pi construction and deconstruction
@@ -86,7 +86,7 @@ extends WikiPluginCached
         $args['show_deleted'] = 'sometimes';
         $args['show_all'] = false;
         $args['days'] = 90;
-        
+
         $cache = $this->newCache();
         if (is_array($args))
             ksort($args);
@@ -98,7 +98,7 @@ extends WikiPluginCached
 
         /* OLD: */
         //list($id, $url) = $this->genUrl($cache, $args);
-        
+
         /* NEW: This cache entry needs an update on major changes.
          * So we should rather use an unique ID, because there will only be
          * one global cached box.
@@ -106,11 +106,11 @@ extends WikiPluginCached
         $id = $cache->generateId(serialize(array("RecentChangesCachedBox", $argscopy)));
         $content = $cache->get($id, 'imagecache');
         if ($do_save || !$content || !$content['html']) {
-	    $this->resetError();
-	    $plugin = new WikiPlugin_RecentChanges();
-	    $title = WikiLink($this->getName(), '', SplitPagename($this->getName()));
-	    $changes = $plugin->getChanges($request->_dbi, $args);
-            $content['html'] = 
+            $this->resetError();
+            $plugin = new WikiPlugin_RecentChanges();
+            $title = WikiLink($this->getName(), '', SplitPagename($this->getName()));
+            $changes = $plugin->getChanges($request->_dbi, $args);
+            $content['html'] =
                       $this->makeBox($title,
                                      $plugin->format($changes, $args));
             if ($errortext = $this->getError()) {
@@ -131,10 +131,10 @@ extends WikiPluginCached
 
     // force box cache update on major changes.
     function box_update($args = false, $request = false, $basepage = false) {
-    	$this->box($args, $request, $basepage, true);
+            $this->box($args, $request, $basepage, true);
     }
-    
-    
+
+
 } // WikiPlugin_RecentChangesCached
 
 // For emacs users
diff --git a/lib/plugin/RecentComments.php b/lib/plugin/RecentComments.php
index 856809a56..4d7721242 100644
--- a/lib/plugin/RecentComments.php
+++ b/lib/plugin/RecentComments.php
@@ -46,8 +46,8 @@ extends WikiPlugin_RecentChanges
     }
 
     function getDefaultArguments() {
-    	//php-4.0.4pl1 breaks at the parent:: line even if the 
-    	// code doesn't reach this line
+            //php-4.0.4pl1 breaks at the parent:: line even if the
+            // code doesn't reach this line
         //if (!check_php_version(4,0,6))
         $args = WikiPlugin_RecentChanges::getDefaultArguments();
         //else $args = parent::getDefaultArguments();
@@ -59,7 +59,7 @@ extends WikiPlugin_RecentChanges
 
     function format ($changes, $args) {
         $fmt = new _RecentChanges_CommentFormatter($args);
-	$fmt->action = _("RecentComments");
+        $fmt->action = _("RecentComments");
         return $fmt->format($changes);
     }
 
@@ -96,9 +96,9 @@ extends _RecentChanges_HtmlFormatter {
     }
 
     function format_revision ($rev) {
-    	static $doublettes = array();
-    	if (isset($doublettes[$rev->getPageName()])) return;
-    	$doublettes[$rev->getPageName()] = 1;
+            static $doublettes = array();
+            if (isset($doublettes[$rev->getPageName()])) return;
+            $doublettes[$rev->getPageName()] = 1;
         $args = &$this->_args;
         $class = 'rc-' . $this->importance($rev);
         $time = $this->time($rev);
@@ -134,13 +134,13 @@ class RecentCommentsRevisionIterator extends WikiDB_PageRevisionIterator
     }
 
     function next () {
-    	if (!empty($this->comments) and $this->_current) {
+            if (!empty($this->comments) and $this->_current) {
             if (isset($this->comments[$this->_current])) {
                 return $this->comments[$this->_current++];
             } else {
-            	$this->_current = 0;
+                    $this->_current = 0;
+            }
             }
-    	}
         while (($rev = $this->_revisions->next())) {
             $this->comments = $this->_blog->findBlogs($this->_wikidb, $rev->getPageName(), 'comment');
             if ($this->comments) {
@@ -152,9 +152,9 @@ class RecentCommentsRevisionIterator extends WikiDB_PageRevisionIterator
                     return $this->comments[$this->_current++];
                 }
             } else {
-		$this->_current = 0;
+                $this->_current = 0;
+            }
             }
-    	}
         $this->free();
         return false;
     }
diff --git a/lib/plugin/RecentReferrers.php b/lib/plugin/RecentReferrers.php
index e97b7e8d4..90585dd73 100644
--- a/lib/plugin/RecentReferrers.php
+++ b/lib/plugin/RecentReferrers.php
@@ -47,16 +47,16 @@ class WikiPlugin_RecentReferrers extends WikiPlugin
             (
              PageList::supportedArgs(),
              array(
-                   'limit' 	   => 15,
+                   'limit'            => 15,
                    'noheader'      => false,
                    ));
     }
 
-    function run($dbi, $argstr, &$request, $basepage) { 
+    function run($dbi, $argstr, &$request, $basepage) {
         if (!ACCESS_LOG) {
             return HTML::div(array('class' => "error"), "Error: no ACCESS_LOG");
         }
-        $args = $this->getArgs($argstr, $request); 
+        $args = $this->getArgs($argstr, $request);
         $table = HTML::table(array('cellpadding' => 1,
                                    'cellspacing' => 2,
                                    'border'      => 0,
diff --git a/lib/plugin/RedirectTo.php b/lib/plugin/RedirectTo.php
index d72b2796b..d8804b395 100644
--- a/lib/plugin/RedirectTo.php
+++ b/lib/plugin/RedirectTo.php
@@ -107,7 +107,7 @@ extends WikiPlugin
                 return $this->disabled(_("Viewing redirecting page."));
             }
         }
-        
+
         return $request->redirect($url);
     }
 };
diff --git a/lib/plugin/RelatedChanges.php b/lib/plugin/RelatedChanges.php
index 11ebc1393..6a952d044 100644
--- a/lib/plugin/RelatedChanges.php
+++ b/lib/plugin/RelatedChanges.php
@@ -56,8 +56,8 @@ extends WikiPlugin_RecentChanges
     }
 
     function getDefaultArguments() {
-    	//php-4.0.4pl1 breaks at the parent:: line even if the 
-    	// code doesn't reach this line
+            //php-4.0.4pl1 breaks at the parent:: line even if the
+            // code doesn't reach this line
         //if (!check_php_version(4,0,6))
         $args = WikiPlugin_RecentChanges::getDefaultArguments();
         //else $args = parent::getDefaultArguments();
@@ -118,7 +118,7 @@ extends WikiPlugin_RecentChanges
             else
                 $fmt_class = '_RelatedChanges_HtmlFormatter';
         }
-  
+
         $fmt = new $fmt_class($args);
         return $fmt->format($changes);
     }
diff --git a/lib/plugin/RichTable.php b/lib/plugin/RichTable.php
index 88da60792..4dca55163 100644
--- a/lib/plugin/RichTable.php
+++ b/lib/plugin/RichTable.php
@@ -1,6 +1,6 @@
 <?php // -*-php-*-
 rcs_id('$Id$');
-/* 
+/*
  * Copyright (C) 2003 Sameer D. Sahasrabuddhe
  * Copyright (C) 2005 $ThePhpWikiProgrammingTeam
  * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -11,12 +11,12 @@ rcs_id('$Id$');
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * PhpWiki is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with PhpWiki; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -48,14 +48,14 @@ extends WikiPlugin
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-    	global $WikiTheme;
+            global $WikiTheme;
         include_once("lib/BlockParser.php");
         // RichTablePlugin markup is new.
-        $markup = 2.0; 
+        $markup = 2.0;
 
         $lines = preg_split('/\n/', $argstr);
         $table = HTML::table();
- 
+
         if ($lines[0][0] == '*') {
             $line = substr(array_shift($lines),1);
             $attrs = parse_attributes($line);
@@ -68,7 +68,7 @@ extends WikiPlugin
                 }
             }
         }
-        
+
         foreach ($lines as $line){
             if (substr($line,0,1) == "-") {
                 if (isset($row)) {
@@ -85,7 +85,7 @@ extends WikiPlugin
                         unset($cell);
                     }
                     $table->pushContent($row);
-                }	
+                }
                 $row = HTML::tr();
                 $attrs = parse_attributes(substr($line,1));
                 foreach ($attrs as $key => $value) {
@@ -120,8 +120,8 @@ extends WikiPlugin
                         }
                     }
                     continue;
-                } 
-            } 
+                }
+            }
             if (isset($row) and isset($cell)) {
                 $line = str_replace("?\>", "?>", $line);
                 $line = str_replace("\~", "~", $line);
diff --git a/lib/plugin/RssFeed.php b/lib/plugin/RssFeed.php
index 3aee349ce..63301e7aa 100644
--- a/lib/plugin/RssFeed.php
+++ b/lib/plugin/RssFeed.php
@@ -44,11 +44,11 @@ extends WikiPlugin
 
     // Establish default values for each of this plugin's arguments.
     function getDefaultArguments() {
-        return array('feed' 		=> "",
-                     'description' 	=> "",
-                     'url' 		=> "", //"http://phpwiki.org/RecentChanges?format=rss",
-                     'maxitem' 		=> 0,
-                     'debug' 		=> false,
+        return array('feed'                 => "",
+                     'description'         => "",
+                     'url'                 => "", //"http://phpwiki.org/RecentChanges?format=rss",
+                     'maxitem'                 => 0,
+                     'debug'                 => false,
                      );
    }
 
@@ -56,22 +56,22 @@ extends WikiPlugin
         extract($this->getArgs($argstr, $request));
 
         if (defined('CHARSET'))
-        	$rss_parser = new RSSParser(CHARSET);
+                $rss_parser = new RSSParser(CHARSET);
         else
-        	$rss_parser = new RSSParser();
-        
+                $rss_parser = new RSSParser();
+
         if (!empty($url))
             $rss_parser->parse_url( $url, $debug );
 
         if (!empty($rss_parser->channel['title'])) $feed = $rss_parser->channel['title'];
         if (!empty($rss_parser->channel['link']))  $url  = $rss_parser->channel['link'];
-        if (!empty($rss_parser->channel['description'])) 
+        if (!empty($rss_parser->channel['description']))
             $description = $rss_parser->channel['description'];
-        
+
         if (!empty($feed)) {
             if (!empty($url)) {
                 $titre = HTML::span(HTML::a(array('href'=>$rss_parser->channel['link']),
-                                            $rss_parser->channel['title'])); 
+                                            $rss_parser->channel['title']));
             } else {
                 $titre = HTML::span($rss_parser->channel['title']);
             }
@@ -86,7 +86,7 @@ extends WikiPlugin
         if (!empty($rss_parser->channel['date']))
             $th->pushContent(HTML::raw("<!--".$rss_parser->channel['date']."-->"));
         $html = HTML::div(array('class'=> 'rss'), $th);
-        if ($rss_parser->items) { 
+        if ($rss_parser->items) {
             // only maxitem's
             if ( $maxitem > 0 )
                 $rss_parser->items = array_slice($rss_parser->items, 0, $maxitem);
@@ -100,7 +100,7 @@ extends WikiPlugin
                 $cell->pushContent($cell_title);
                 $cell_author = HTML::raw($item['author']);
                 $cell_pubDate = HTML::raw($item['pubDate']);
-                $cell_authordate = HTML::div(array('class'=> 'authordate'), 
+                $cell_authordate = HTML::div(array('class'=> 'authordate'),
                                              $cell_author, HTML::raw(" - "), $cell_pubDate);
                 $cell->pushContent($cell_authordate);
                 if (!empty($item['description']))
diff --git a/lib/plugin/SearchHighlight.php b/lib/plugin/SearchHighlight.php
index 4ebc47063..d62549a9f 100644
--- a/lib/plugin/SearchHighlight.php
+++ b/lib/plugin/SearchHighlight.php
@@ -2,19 +2,19 @@
 rcs_id('$Id$');
 /*
  * Copyright 2004,2007 $ThePhpWikiProgrammingTeam
- * 
+ *
  * This file is NOT part of PhpWiki.
- * 
+ *
  * PhpWiki is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * PhpWiki is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with PhpWiki; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -23,7 +23,7 @@ rcs_id('$Id$');
 require_once("lib/TextSearchQuery.php");
 require_once("lib/PageList.php");
 
-/** 
+/**
  * When someone is referred from a search engine like Google, Yahoo
  * or our own fulltextsearch, the terms they search for are highlighted.
  * See http://wordpress.org/about/shots/1.2/plugins.png
@@ -70,9 +70,9 @@ extends WikiPlugin
         if (!$noheader and isset($request->_searchhighlight)) {
             $engine = $request->_searchhighlight['engine'];
             $html->pushContent(HTML::div(array('class' => 'search-context'),
-            				 fmt("%s: Found %s through %s", 
-            				     $basepage,
-                                             $request->_searchhighlight['query'], 
+                                             fmt("%s: Found %s through %s",
+                                                 $basepage,
+                                             $request->_searchhighlight['query'],
                                              $engine)));
         }
         if ($hits) {
@@ -102,7 +102,7 @@ extends WikiPlugin
         while (preg_match("/^(.*?)($hilight_re)/i", $line, $m)) {
             $line = substr($line, strlen($m[0]));
             // prematch + match
-            $html->pushContent($m[1], HTML::strong(array('class' => 'search-term'), $m[2])); 
+            $html->pushContent($m[1], HTML::strong(array('class' => 'search-term'), $m[2]));
         }
         $html->pushContent($line);       // postmatch
         return $html;
diff --git a/lib/plugin/SemanticRelations.php b/lib/plugin/SemanticRelations.php
index e9babe6cb..981b03e76 100644
--- a/lib/plugin/SemanticRelations.php
+++ b/lib/plugin/SemanticRelations.php
@@ -41,7 +41,7 @@ extends WikiPlugin
         return preg_replace("/[Revision: $]/", '',
                             "\$Revision$");
     }
-    function getDefaultArguments() { 
+    function getDefaultArguments() {
         return array(
                      'page'       => "[pagename]", // which pages (glob allowed), default: current
                      'relations'  => '', // which relations. default all
@@ -51,21 +51,21 @@ extends WikiPlugin
                      'nohelp'     => false
                      );
     }
-    function run ($dbi, $argstr, &$request, $basepage) { 
+    function run ($dbi, $argstr, &$request, $basepage) {
         global $WikiTheme;
         $args = $this->getArgs($argstr, $request);
         extract($args);
         if (empty($page))
             $page = $request->getArg('pagename');
         $relhtml = HTML();
-	if ($args['relations'] != '') {
+        if ($args['relations'] != '') {
             $relfilter = explode(",", $args['relations']);
-	} else 
-	    $relfilter = array();
+        } else
+            $relfilter = array();
         if ($args['attributes'] != '') {
             $attfilter = explode(",", $args['attributes']);
         } else
-	    $attfilter = array();
+            $attfilter = array();
         foreach (explodePageList($page) as $pagename) {
             $p = $dbi->getPage($pagename);
             if ($args['relations'] != '0') {
@@ -74,16 +74,16 @@ extends WikiPlugin
               while ($object = $links->next()) {
                 if ($related = $object->get('linkrelation')) { // a page name
                     if ($relfilter and !in_array($related, $relfilter)) {
-                    	 continue;
+                             continue;
                     }
                     $rellink = WikiLink($related, false, $related);
                     $rellink->setAttr('class', $rellink->getAttr('class').' relation');
                     $relhtml->pushContent
                         ($pagename . " ",
                          // Link to a special "Relation:" InterWiki link?
-                         $rellink, 
+                         $rellink,
                          HTML::span(array('class'=>'relation-symbol'), "::"), // use spaces?
-                         WikiLink($object->_pagename), 
+                         WikiLink($object->_pagename),
                          " ",
                          // Link to SemanticSearch
                          $WikiTheme->makeActionButton(array('relation' => $related,
@@ -106,24 +106,24 @@ extends WikiPlugin
                     $rellink = WikiLink($att, false, $att);
                     $rellink->setAttr('class', $rellink->getAttr('class').' relation');
                     $searchlink = $WikiTheme->makeActionButton
-			(array('attribute' => $att,
-			       's'         => $val),
-			 $val,
-			 _("SemanticSearch"));
-	            $searchlink->setAttr('class', $searchlink->getAttr('class').' attribute');
+                        (array('attribute' => $att,
+                               's'         => $val),
+                         $val,
+                         _("SemanticSearch"));
+                    $searchlink->setAttr('class', $searchlink->getAttr('class').' attribute');
                     if (!$noheader)
                         $atthtml->pushContent("$pagename  ");
-		    $atthtml->pushContent(HTML::span(array('class' => 'attribute '.$att),
-		                                     $rellink, 
-						     HTML::span(array('class'=>'relation-symbol'), 
-								":="), 
-						     $searchlink),
-					  (count($attfilter) > 3 ? HTML::br() : " "));
+                    $atthtml->pushContent(HTML::span(array('class' => 'attribute '.$att),
+                                                     $rellink,
+                                                     HTML::span(array('class'=>'relation-symbol'),
+                                                                ":="),
+                                                     $searchlink),
+                                          (count($attfilter) > 3 ? HTML::br() : " "));
                 }
                 if (!$noheader)
                     $relhtml = HTML($relhtml,
                                     HTML::hr(),
-                                    HTML::h3(fmt("Attributes of %s", $pagename)), 
+                                    HTML::h3(fmt("Attributes of %s", $pagename)),
                                     $atthtml);
                 else
                     $relhtml = HTML($relhtml, $atthtml);
@@ -131,8 +131,8 @@ extends WikiPlugin
            }
         }
         if ($nohelp) return $relhtml;
-        return HTML($relhtml, 
-                    HTML::hr(), 
+        return HTML($relhtml,
+                    HTML::hr(),
                     WikiLink(_("Help/SemanticRelations"), false,
                              HTML::em(_("Help/SemanticRelations"))),
                     " - ",
diff --git a/lib/plugin/SemanticSearch.php b/lib/plugin/SemanticSearch.php
index 1b2bc19b2..261bb9e2f 100644
--- a/lib/plugin/SemanticSearch.php
+++ b/lib/plugin/SemanticSearch.php
@@ -29,26 +29,26 @@ require_once("lib/SemanticWeb.php");
 /**
  * Search for relations/attributes and its values.
  * page - relation::object. e.g list all cities: is_a::city => relation=is_a&s=city
- * We search for both a relation and if the search is valid for attributes also, 
+ * We search for both a relation and if the search is valid for attributes also,
  * and OR combine the result.
  *
- * An attribute has just a value, which is a number, and which is for sure no pagename, 
+ * An attribute has just a value, which is a number, and which is for sure no pagename,
  * and its value goes through some units unification. (not yet)
- * We can also do numerical comparison and unit lifting with attributes. 
- *   population > 1000000 
+ * We can also do numerical comparison and unit lifting with attributes.
+ *   population > 1000000
  *   population > 1 million
  *
- * Limitation: 
- * - The backends can already do simple AND/OR combination of multiple 
+ * Limitation:
+ * - The backends can already do simple AND/OR combination of multiple
  *   relations and attributes to search for. Just the UI not. TODO: implement the AND/OR buttons.
  *     population < 1 million AND area > 50 km2
- * - Due to attribute internals a relation search with matching attribute names will also 
+ * - Due to attribute internals a relation search with matching attribute names will also
  *   find those attribute names, but not the values. You must explicitly search for attributes then.
  *
- * The Advanced query can do a freeform query expression with multiple comparison and nesting. 
+ * The Advanced query can do a freeform query expression with multiple comparison and nesting.
  *   "is_a::city and population > 1.000.000 and population < 10.000.000"
  *   "(is_a::city or is_a::country) and population < 10.000.000"
- * 
+ *
  * @author: Reini Urban
  */
 class WikiPlugin_SemanticSearch
@@ -64,400 +64,400 @@ extends WikiPlugin
         return preg_replace("/[Revision: $]/", '',
                             "\$Revision$");
     }
-    function getDefaultArguments() { 
+    function getDefaultArguments() {
         return array_merge
             (
              PageList::supportedArgs(),  // paging and more.
-	     array(
-		   's'          => "*",  // linkvalue query string
-		   'page'       => "*",  // which pages (glob allowed), default: all
-		   'relation'   => '',   // linkname. which relations. default all
-		   'attribute'  => '',   // linkname. which attributes. default all
-		   'attr_op'    => ':=', // a funny written way for equality for pure aesthetic pleasure 
-		   			 // "All attributes which have this value set"
-		   'units'      => '',   // ?
-		   'case_exact' => true,
-		   'regex'      => 'auto',// is different here. 
-		    // no word splitting, if no regex op is present, defaults to exact match
-		   'noform'     => false, // don't show form with results.
-		   'noheader'   => false, // no caption
-		   'info'       => false  // valid: pagename,relation,linkto,attribute,value and all other pagelist columns
-		   ));
+             array(
+                   's'          => "*",  // linkvalue query string
+                   'page'       => "*",  // which pages (glob allowed), default: all
+                   'relation'   => '',   // linkname. which relations. default all
+                   'attribute'  => '',   // linkname. which attributes. default all
+                   'attr_op'    => ':=', // a funny written way for equality for pure aesthetic pleasure
+                                            // "All attributes which have this value set"
+                   'units'      => '',   // ?
+                   'case_exact' => true,
+                   'regex'      => 'auto',// is different here.
+                    // no word splitting, if no regex op is present, defaults to exact match
+                   'noform'     => false, // don't show form with results.
+                   'noheader'   => false, // no caption
+                   'info'       => false  // valid: pagename,relation,linkto,attribute,value and all other pagelist columns
+                   ));
     }
 
     function showForm (&$dbi, &$request, $args) {
-    	global $WikiTheme;
-	$action = $request->getPostURL();
-	$hiddenfield = HiddenInputs($request->getArgs(),'',
-				    array('action','page','s','semsearch',
-					  'relation','attribute'));
-	$pagefilter = HTML::input(array('name' => 'page',
-					'value' => $args['page'],
-					'title' => _("Search only in these pages. With autocompletion."),
-					'class' => 'dropdown', 
-					'acdropdown' => 'true', 
-					'autocomplete_complete' => 'true',
-					'autocomplete_matchsubstring' => 'false', 
-					'autocomplete_list' => 'xmlrpc:wiki.titleSearch ^[S] 4'
-					), '');
-	$allrelations = $dbi->listRelations(false,false,true);
-	$svalues = empty($allrelations) ? "" : join("','", $allrelations);
-	$reldef = JavaScript("var semsearch_relations = new Array('".$svalues."')");
-	$relation = HTML::input(array('name' => 'relation', 
-				      'value' => $args['relation'],
-				      'title' => _("Filter by this relation. With autocompletion."),
-				      'class' => 'dropdown', 
-				      'style' => 'width:10em',
-				      'acdropdown' => 'true', 
-				      'autocomplete_assoc' => 'false', 
-				      'autocomplete_complete' => 'true', 
-				      'autocomplete_matchsubstring' => 'true', 
-				      'autocomplete_list' => 'array:semsearch_relations'
-				      ), '');
-	$queryrel = HTML::input(array('name' => 's', 
-				      'value' => $args['s'],
-				      'title' => _("Filter by this link. These are pagenames. With autocompletion."),
-				      'class' => 'dropdown', 
-				      'acdropdown' => 'true', 
-				      'autocomplete_complete' => 'true', 
-				      'autocomplete_matchsubstring' => 'true', 
-				      'autocomplete_list' => 'xmlrpc:wiki.titleSearch ^[S] 4'
-				      ), '');
-	$relsubmit = Button('submit:semsearch[relations]',  _("Relations"), false);
-	// just testing some dhtml... not yet done
-	$enhancements = HTML();
-	$nbsp = HTML::raw('&nbsp;');
-	$this_uri = $_SERVER['REQUEST_URI'].'#';
-	$andbutton = new Button(_("AND"),$this_uri,'wikiaction',
-				array(
-				      'onclick' => "addquery('rel', 'and')",
-				      'title' => _("Add an AND query")));
-	$orbutton = new Button(_("OR"),$this_uri,'wikiaction',
-				array(
-				      'onclick' => "addquery('rel', 'or')",
-				      'title' => _("Add an OR query")));
-	if (DEBUG)
-	    $enhancements = HTML::span($andbutton, $nbsp, $orbutton);  
-	$instructions = _("Search in pages for a relation with that value (a pagename).");
-	$form1 = HTML::form(array('action' => $action,
-				  'method' => 'post',
-				  'accept-charset' => $GLOBALS['charset']),
-			    $reldef,
-			    $hiddenfield, HiddenInputs(array('attribute'=>'')),
-			    $instructions, HTML::br(),
-			    HTML::table
-			    (array('border' => 0,'cellspacing' => 2),
-			     HTML::colgroup(array('span' => 6)),
-			     HTML::thead
-			     (HTML::tr(
+            global $WikiTheme;
+        $action = $request->getPostURL();
+        $hiddenfield = HiddenInputs($request->getArgs(),'',
+                                    array('action','page','s','semsearch',
+                                          'relation','attribute'));
+        $pagefilter = HTML::input(array('name' => 'page',
+                                        'value' => $args['page'],
+                                        'title' => _("Search only in these pages. With autocompletion."),
+                                        'class' => 'dropdown',
+                                        'acdropdown' => 'true',
+                                        'autocomplete_complete' => 'true',
+                                        'autocomplete_matchsubstring' => 'false',
+                                        'autocomplete_list' => 'xmlrpc:wiki.titleSearch ^[S] 4'
+                                        ), '');
+        $allrelations = $dbi->listRelations(false,false,true);
+        $svalues = empty($allrelations) ? "" : join("','", $allrelations);
+        $reldef = JavaScript("var semsearch_relations = new Array('".$svalues."')");
+        $relation = HTML::input(array('name' => 'relation',
+                                      'value' => $args['relation'],
+                                      'title' => _("Filter by this relation. With autocompletion."),
+                                      'class' => 'dropdown',
+                                      'style' => 'width:10em',
+                                      'acdropdown' => 'true',
+                                      'autocomplete_assoc' => 'false',
+                                      'autocomplete_complete' => 'true',
+                                      'autocomplete_matchsubstring' => 'true',
+                                      'autocomplete_list' => 'array:semsearch_relations'
+                                      ), '');
+        $queryrel = HTML::input(array('name' => 's',
+                                      'value' => $args['s'],
+                                      'title' => _("Filter by this link. These are pagenames. With autocompletion."),
+                                      'class' => 'dropdown',
+                                      'acdropdown' => 'true',
+                                      'autocomplete_complete' => 'true',
+                                      'autocomplete_matchsubstring' => 'true',
+                                      'autocomplete_list' => 'xmlrpc:wiki.titleSearch ^[S] 4'
+                                      ), '');
+        $relsubmit = Button('submit:semsearch[relations]',  _("Relations"), false);
+        // just testing some dhtml... not yet done
+        $enhancements = HTML();
+        $nbsp = HTML::raw('&nbsp;');
+        $this_uri = $_SERVER['REQUEST_URI'].'#';
+        $andbutton = new Button(_("AND"),$this_uri,'wikiaction',
+                                array(
+                                      'onclick' => "addquery('rel', 'and')",
+                                      'title' => _("Add an AND query")));
+        $orbutton = new Button(_("OR"),$this_uri,'wikiaction',
+                                array(
+                                      'onclick' => "addquery('rel', 'or')",
+                                      'title' => _("Add an OR query")));
+        if (DEBUG)
+            $enhancements = HTML::span($andbutton, $nbsp, $orbutton);
+        $instructions = _("Search in pages for a relation with that value (a pagename).");
+        $form1 = HTML::form(array('action' => $action,
+                                  'method' => 'post',
+                                  'accept-charset' => $GLOBALS['charset']),
+                            $reldef,
+                            $hiddenfield, HiddenInputs(array('attribute'=>'')),
+                            $instructions, HTML::br(),
+                            HTML::table
+                            (array('border' => 0,'cellspacing' => 2),
+                             HTML::colgroup(array('span' => 6)),
+                             HTML::thead
+                             (HTML::tr(
                                        HTML::th('Pagefilter'),
                                        HTML::th('Relation'),
                                        HTML::th(),
                                        HTML::th('Links'),
                                        HTML::th()
                                       )),
-			     HTML::tbody
-			     (HTML::tr(
-				       HTML::td($pagefilter, ": "),
-				       HTML::td($relation),
-				       HTML::td(HTML::strong(HTML::tt('  ::  '))), 
-				       HTML::td($queryrel),
-				       HTML::td($nbsp, $relsubmit, $nbsp, $enhancements)))));
+                             HTML::tbody
+                             (HTML::tr(
+                                       HTML::td($pagefilter, ": "),
+                                       HTML::td($relation),
+                                       HTML::td(HTML::strong(HTML::tt('  ::  '))),
+                                       HTML::td($queryrel),
+                                       HTML::td($nbsp, $relsubmit, $nbsp, $enhancements)))));
 
-	$allattrs = $dbi->listRelations(false,true,true);
-	if (empty($allrelations) and empty($allattrs)) // be nice to the dummy.
-	    $this->_norelations_warning = 1;
-	$svalues = empty($allattrs) ? "" : join("','", $allattrs);
-	$attdef = JavaScript("var semsearch_attributes = new Array('".$svalues."')\n"
-	                    ."var semsearch_op = new Array('"
-	                          .join("','", $this->_supported_operators)
-	                          ."')");
-        // TODO: We want some more tricks: Autofill the base unit of the selected 
+        $allattrs = $dbi->listRelations(false,true,true);
+        if (empty($allrelations) and empty($allattrs)) // be nice to the dummy.
+            $this->_norelations_warning = 1;
+        $svalues = empty($allattrs) ? "" : join("','", $allattrs);
+        $attdef = JavaScript("var semsearch_attributes = new Array('".$svalues."')\n"
+                            ."var semsearch_op = new Array('"
+                                  .join("','", $this->_supported_operators)
+                                  ."')");
+        // TODO: We want some more tricks: Autofill the base unit of the selected
         // attribute into the s area.
-	$attribute = HTML::input(array('name' => 'attribute', 
-				       'value' => $args['attribute'],
-				       'title' => _("Filter by this attribute name. With autocompletion."),
-				       'class' => 'dropdown', 
-				       'style' => 'width:10em',
-				       'acdropdown' => 'true', 
-				       'autocomplete_complete' => 'true', 
-				       'autocomplete_matchsubstring' => 'true', 
-				       'autocomplete_assoc' => 'false', 
-				       'autocomplete_list' => 'array:semsearch_attributes'
-				       /* 'autocomplete_onselect' => 'check_unit' */
-				      ), '');
-	$attr_op = HTML::input(array('name' => 'attr_op', 
-				        'value' => $args['attr_op'],
-				        'title' => _("Comparison operator. With autocompletion."),
-				        'class' => 'dropdown', 
-				        'style' => 'width:2em',
-				        'acdropdown' => 'true', 
-				        'autocomplete_complete' => 'true', 
-				        'autocomplete_matchsubstring' => 'true', 
-				        'autocomplete_assoc' => 'false', 
-				        'autocomplete_list' => 'array:semsearch_op'
-				      ), '');
-	$queryatt = HTML::input(array('name' => 's', 
-				      'value' => $args['s'],
-				      'title' => _("Filter by this numeric attribute value. With autocompletion."), //?
-				      'class' => 'dropdown', 
-				      'acdropdown' => 'false',
-				      'autocomplete_complete' => 'true', 
-				      'autocomplete_matchsubstring' => 'false', 
-				      'autocomplete_assoc' => 'false',
-				      'autocomplete_list' => 'plugin:SemanticSearch page='.$args['page'].' attribute=^[S] attr_op==~'
-				      ), '');
-	$andbutton = new Button(_("AND"),$this_uri,'wikiaction',
-				array(
-				      'onclick' => "addquery('attr', 'and')",
-				      'title' => _("Add an AND query")));
-	$orbutton = new Button(_("OR"),$this_uri,'wikiaction',
-				array(
-				      'onclick' => "addquery('attr', 'or')",
-				      'title' => _("Add an OR query")));
-	if (DEBUG)
-	    $enhancements = HTML::span($andbutton, $nbsp, $orbutton);
-	$attsubmit = Button('submit:semsearch[attributes]', _("Attributes"), false);
-	$instructions = HTML::span(_("Search in pages for an attribute with that numeric value."),"\n");
-	if (DEBUG)
-	    $instructions->pushContent
-		(HTML(" ", new Button(_("Advanced..."),_("SemanticSearchAdvanced"))));
-	$form2 = HTML::form(array('action' => $action,
-				  'method' => 'post',
-				  'accept-charset' => $GLOBALS['charset']),
-			    $attdef, 
-			    $hiddenfield, HiddenInputs(array('relation'=>'')),
-			    $instructions, HTML::br(),
-			    HTML::table
-			    (array('border' => 0,'cellspacing' => 2),
-			     HTML::colgroup(array('span' => 6)),
-			     HTML::thead
-			     (HTML::tr(
+        $attribute = HTML::input(array('name' => 'attribute',
+                                       'value' => $args['attribute'],
+                                       'title' => _("Filter by this attribute name. With autocompletion."),
+                                       'class' => 'dropdown',
+                                       'style' => 'width:10em',
+                                       'acdropdown' => 'true',
+                                       'autocomplete_complete' => 'true',
+                                       'autocomplete_matchsubstring' => 'true',
+                                       'autocomplete_assoc' => 'false',
+                                       'autocomplete_list' => 'array:semsearch_attributes'
+                                       /* 'autocomplete_onselect' => 'check_unit' */
+                                      ), '');
+        $attr_op = HTML::input(array('name' => 'attr_op',
+                                        'value' => $args['attr_op'],
+                                        'title' => _("Comparison operator. With autocompletion."),
+                                        'class' => 'dropdown',
+                                        'style' => 'width:2em',
+                                        'acdropdown' => 'true',
+                                        'autocomplete_complete' => 'true',
+                                        'autocomplete_matchsubstring' => 'true',
+                                        'autocomplete_assoc' => 'false',
+                                        'autocomplete_list' => 'array:semsearch_op'
+                                      ), '');
+        $queryatt = HTML::input(array('name' => 's',
+                                      'value' => $args['s'],
+                                      'title' => _("Filter by this numeric attribute value. With autocompletion."), //?
+                                      'class' => 'dropdown',
+                                      'acdropdown' => 'false',
+                                      'autocomplete_complete' => 'true',
+                                      'autocomplete_matchsubstring' => 'false',
+                                      'autocomplete_assoc' => 'false',
+                                      'autocomplete_list' => 'plugin:SemanticSearch page='.$args['page'].' attribute=^[S] attr_op==~'
+                                      ), '');
+        $andbutton = new Button(_("AND"),$this_uri,'wikiaction',
+                                array(
+                                      'onclick' => "addquery('attr', 'and')",
+                                      'title' => _("Add an AND query")));
+        $orbutton = new Button(_("OR"),$this_uri,'wikiaction',
+                                array(
+                                      'onclick' => "addquery('attr', 'or')",
+                                      'title' => _("Add an OR query")));
+        if (DEBUG)
+            $enhancements = HTML::span($andbutton, $nbsp, $orbutton);
+        $attsubmit = Button('submit:semsearch[attributes]', _("Attributes"), false);
+        $instructions = HTML::span(_("Search in pages for an attribute with that numeric value."),"\n");
+        if (DEBUG)
+            $instructions->pushContent
+                (HTML(" ", new Button(_("Advanced..."),_("SemanticSearchAdvanced"))));
+        $form2 = HTML::form(array('action' => $action,
+                                  'method' => 'post',
+                                  'accept-charset' => $GLOBALS['charset']),
+                            $attdef,
+                            $hiddenfield, HiddenInputs(array('relation'=>'')),
+                            $instructions, HTML::br(),
+                            HTML::table
+                            (array('border' => 0,'cellspacing' => 2),
+                             HTML::colgroup(array('span' => 6)),
+                             HTML::thead
+                             (HTML::tr(
                                        HTML::th('Pagefilter'),
                                        HTML::th('Attribute'),
                                        HTML::th('Op'),
                                        HTML::th('Value'),
                                        HTML::th()
                                       )),
-			     HTML::tbody
-			     (HTML::tr(
-				       HTML::td($pagefilter, ": "),
-				       HTML::td($attribute), 
-				       HTML::td($attr_op),
-				       HTML::td($queryatt),
-				       HTML::td($nbsp, $attsubmit, $nbsp, $enhancements)))));
-	
-	return HTML($form1, $form2);
+                             HTML::tbody
+                             (HTML::tr(
+                                       HTML::td($pagefilter, ": "),
+                                       HTML::td($attribute),
+                                       HTML::td($attr_op),
+                                       HTML::td($queryatt),
+                                       HTML::td($nbsp, $attsubmit, $nbsp, $enhancements)))));
+
+        return HTML($form1, $form2);
     }
 
     function regex_query ($string, $case_exact, $regex) {
-    	if ($string != '*' and $regex == 'auto') {
-	    if (strcspn($string, ".+*?^$\"") == strlen($string)) {
-	    	// performance hack: construct an exact query w/o parsing. pcre is fastest.
-	        $q = new TextSearchQuery($string, $case_exact, 'pcre');
-	        // and now override the fields
-	        unset ($q->_stoplist);
-	        $q->_regex = TSQ_REGEX_NONE;
-	        if ($case_exact)
-	            $q->_tree = new TextSearchQuery_node_exact($string); // hardcode this string
-	        else    
-	            $q->_tree = new TextSearchQuery_node_word($string);
-	        return $q;
-	        //$string = "\"" . $string ."\"";
-		//$regex = 'none'; // EXACT or WORD match
-	    }
-	}
-	return new TextSearchQuery($string, $case_exact, $regex);
+            if ($string != '*' and $regex == 'auto') {
+            if (strcspn($string, ".+*?^$\"") == strlen($string)) {
+                    // performance hack: construct an exact query w/o parsing. pcre is fastest.
+                $q = new TextSearchQuery($string, $case_exact, 'pcre');
+                // and now override the fields
+                unset ($q->_stoplist);
+                $q->_regex = TSQ_REGEX_NONE;
+                if ($case_exact)
+                    $q->_tree = new TextSearchQuery_node_exact($string); // hardcode this string
+                else
+                    $q->_tree = new TextSearchQuery_node_word($string);
+                return $q;
+                //$string = "\"" . $string ."\"";
+                //$regex = 'none'; // EXACT or WORD match
+            }
+        }
+        return new TextSearchQuery($string, $case_exact, $regex);
     }
-    
-    function run ($dbi, $argstr, &$request, $basepage) { 
+
+    function run ($dbi, $argstr, &$request, $basepage) {
         global $WikiTheme;
-	                          
-	$this->_supported_operators = array(':=','<','<=','>','>=','!=','==','=~'); 
+
+        $this->_supported_operators = array(':=','<','<=','>','>=','!=','==','=~');
         $this->_text_operators = array(':=','==','=~','!=');
         $args = $this->getArgs($argstr, $request);
         if (empty($args['page']))
             $args['page'] = "*";
         if (!isset($args['s'])) // it might be (integer) 0
             $args['s'] = "*";
-	$posted = $request->getArg("semsearch");
-	$form = $this->showForm($dbi, $request, $args);
-	if (isset($this->_norelations_warning))
-	    $form->pushContent
-		(HTML::div(array('class' => 'warning'),
-			   _("Warning:"),HTML::br(),
-			   _("No relations nor attributes in the whole wikidb defined!") 
-			   ,"\n"
-			   ,fmt("See %s",WikiLink(_("Help:SemanticRelations")))));
+        $posted = $request->getArg("semsearch");
+        $form = $this->showForm($dbi, $request, $args);
+        if (isset($this->_norelations_warning))
+            $form->pushContent
+                (HTML::div(array('class' => 'warning'),
+                           _("Warning:"),HTML::br(),
+                           _("No relations nor attributes in the whole wikidb defined!")
+                           ,"\n"
+                           ,fmt("See %s",WikiLink(_("Help:SemanticRelations")))));
         extract($args);
-	// for convenience and harmony we allow GET requests also.
-	if (!$request->isPost()) {
-	    if ($relation or $attribute) // check for good GET request
-	        ;
-	    else     
-	        return $form; // nobody called us, so just display our supadupa form
-	}
+        // for convenience and harmony we allow GET requests also.
+        if (!$request->isPost()) {
+            if ($relation or $attribute) // check for good GET request
+                ;
+            else
+                return $form; // nobody called us, so just display our supadupa form
+        }
         $pagequery = $this->regex_query($page, $args['case_exact'], $args['regex']);
         // we might want to check for semsearch['relations'] and semsearch['attributes'] also
-	if (empty($relation) and empty($attribute)) {
-	    // so we just clicked without selecting any relation. 
-	    // hmm. check which button we clicked, before we do the massive alltogether search.
-	    if (isset($posted['relations']) and $posted['relations'])
-		$relation = '*';
-	    elseif (isset($posted['attributes']) and $posted['attributes']) {
-		$attribute = '*';
-		// here we have to check for invalid text operators. ignore it then
-		if (!in_array($attr_op, $this->_text_operators))
-		    $attribute = '';
-	    }
-	}
-	$searchtype = "Text";
-	if (!empty($relation)) {
-	    $querydesc = $relation."::".$s;
-	    $linkquery =  $this->regex_query($s, $args['case_exact'], $args['regex']);
-	    $relquery = $this->regex_query($relation, $args['case_exact'], $args['regex']);
-	    $links = $dbi->linkSearch($pagequery, $linkquery, 'relation', $relquery);
-	    $pagelist = new PageList($info, $exclude, $args);
-	    $pagelist->_links = array();
-	    while ($link = $links->next()) {
-	        $pagelist->addPage($link['pagename']);
-	        $pagelist->_links[] = $link;
-	    }
-	    // default (=empty info) wants all three. but we want to be able to override this.
-	    // $pagelist->_columns_seen is the exploded info
-	    if (!$info or ($info and isset($pagelist->_columns_seen['relation'])))
-	        $pagelist->addColumnObject
-		    (new _PageList_Column_SemanticSearch_relation('relation', _("Relation"), $pagelist));
-	    if (!$args['info'] or ($args['info'] and isset($pagelist->_columns_seen['linkto'])))
-	        $pagelist->addColumnObject
-		    (new _PageList_Column_SemanticSearch_link('linkto', _("Link"), $pagelist));
-	}
-	// can we merge two different pagelist?
-	if (!empty($attribute)) {
-	    $relquery =  $this->regex_query($attribute, $args['case_exact'], $args['regex']);
-	    if (!in_array($attr_op, $this->_supported_operators)) {
-		return HTML($form, $this->error(fmt("Illegal operator: %s",
-					            HTML::tt($attr_op))));
-	    }
-	    $s_base = preg_replace("/,/","", $s);
-	    $units = new Units();
-	    if (!is_numeric($s_base)) {
-	        $s_base = $units->basevalue($s_base);
-	        $is_numeric = is_numeric($s_base);
-	    } else {
-	        $is_numeric = true;
-	    }
-	    // check which type to search with:
-	    // at first check if forced text matcher
-	    if ($attr_op == '=~') {
-		if ($s == '*') $s = '.*'; // help the poor user. we need pcre syntax.	
-		$linkquery = new TextSearchQuery("$s", $args['case_exact'], 'pcre');
-		$querydesc = "$attribute $attr_op $s";
-	    } elseif ($is_numeric) { // do comparison with numbers 
-		/* We want to search for multiple attributes also. linkSearch can do this. 
-		 * But we have to construct the query somehow. (that's why we try the AND OR dhtml)
-		 *     population < 1 million AND area > 50 km2
-		 * Here we check only for one attribute per page.  
-		 * See SemanticSearchAdvanced for the full expression.
-		 */
-		// it might not be the best idea to use '*' as variable to expand. hmm.
-		if ($attribute == '*') $attribute = '_star_'; 
-		$searchtype = "Numeric";
-		$query = $attribute." ".$attr_op." ".$s_base;
-		$linkquery = new SemanticAttributeSearchQuery($query, $attribute, 
-							      $units->baseunit($s));
-		if ($attribute == '_star_') $attribute = '*'; 
-		$querydesc = $attribute." ".$attr_op." ".$s;
+        if (empty($relation) and empty($attribute)) {
+            // so we just clicked without selecting any relation.
+            // hmm. check which button we clicked, before we do the massive alltogether search.
+            if (isset($posted['relations']) and $posted['relations'])
+                $relation = '*';
+            elseif (isset($posted['attributes']) and $posted['attributes']) {
+                $attribute = '*';
+                // here we have to check for invalid text operators. ignore it then
+                if (!in_array($attr_op, $this->_text_operators))
+                    $attribute = '';
+            }
+        }
+        $searchtype = "Text";
+        if (!empty($relation)) {
+            $querydesc = $relation."::".$s;
+            $linkquery =  $this->regex_query($s, $args['case_exact'], $args['regex']);
+            $relquery = $this->regex_query($relation, $args['case_exact'], $args['regex']);
+            $links = $dbi->linkSearch($pagequery, $linkquery, 'relation', $relquery);
+            $pagelist = new PageList($info, $exclude, $args);
+            $pagelist->_links = array();
+            while ($link = $links->next()) {
+                $pagelist->addPage($link['pagename']);
+                $pagelist->_links[] = $link;
+            }
+            // default (=empty info) wants all three. but we want to be able to override this.
+            // $pagelist->_columns_seen is the exploded info
+            if (!$info or ($info and isset($pagelist->_columns_seen['relation'])))
+                $pagelist->addColumnObject
+                    (new _PageList_Column_SemanticSearch_relation('relation', _("Relation"), $pagelist));
+            if (!$args['info'] or ($args['info'] and isset($pagelist->_columns_seen['linkto'])))
+                $pagelist->addColumnObject
+                    (new _PageList_Column_SemanticSearch_link('linkto', _("Link"), $pagelist));
+        }
+        // can we merge two different pagelist?
+        if (!empty($attribute)) {
+            $relquery =  $this->regex_query($attribute, $args['case_exact'], $args['regex']);
+            if (!in_array($attr_op, $this->_supported_operators)) {
+                return HTML($form, $this->error(fmt("Illegal operator: %s",
+                                                    HTML::tt($attr_op))));
+            }
+            $s_base = preg_replace("/,/","", $s);
+            $units = new Units();
+            if (!is_numeric($s_base)) {
+                $s_base = $units->basevalue($s_base);
+                $is_numeric = is_numeric($s_base);
+            } else {
+                $is_numeric = true;
+            }
+            // check which type to search with:
+            // at first check if forced text matcher
+            if ($attr_op == '=~') {
+                if ($s == '*') $s = '.*'; // help the poor user. we need pcre syntax.
+                $linkquery = new TextSearchQuery("$s", $args['case_exact'], 'pcre');
+                $querydesc = "$attribute $attr_op $s";
+            } elseif ($is_numeric) { // do comparison with numbers
+                /* We want to search for multiple attributes also. linkSearch can do this.
+                 * But we have to construct the query somehow. (that's why we try the AND OR dhtml)
+                 *     population < 1 million AND area > 50 km2
+                 * Here we check only for one attribute per page.
+                 * See SemanticSearchAdvanced for the full expression.
+                 */
+                // it might not be the best idea to use '*' as variable to expand. hmm.
+                if ($attribute == '*') $attribute = '_star_';
+                $searchtype = "Numeric";
+                $query = $attribute." ".$attr_op." ".$s_base;
+                $linkquery = new SemanticAttributeSearchQuery($query, $attribute,
+                                                              $units->baseunit($s));
+                if ($attribute == '_star_') $attribute = '*';
+                $querydesc = $attribute." ".$attr_op." ".$s;
+
+            // no number or unit: check other text matchers or '*' MATCH_ALL
+            } elseif (in_array($attr_op, $this->_text_operators)) {
+                if ($attr_op == '=~') {
+                    if ($s == '*') $s = '.*'; // help the poor user. we need pcre syntax.
+                    $linkquery = new TextSearchQuery("$s", $args['case_exact'], 'pcre');
+                }
+                else
+                    $linkquery =  $this->regex_query($s, $args['case_exact'], $args['regex']);
+                $querydesc = "$attribute $attr_op $s";
 
-	    // no number or unit: check other text matchers or '*' MATCH_ALL
-	    } elseif (in_array($attr_op, $this->_text_operators)) {
-		if ($attr_op == '=~') {
-		    if ($s == '*') $s = '.*'; // help the poor user. we need pcre syntax.
-		    $linkquery = new TextSearchQuery("$s", $args['case_exact'], 'pcre');
-		}
-		else		                                 
-	            $linkquery =  $this->regex_query($s, $args['case_exact'], $args['regex']);
-		$querydesc = "$attribute $attr_op $s";
+            // should we fail or skip when the user clicks on Relations?
+            } elseif (isset($posted['relations']) and $posted['relations'])  {
+                $linkquery = false; // skip
+            } else {
+                $querydesc = $attribute." ".$attr_op." ".$s;
+                return HTML($form, $this->error(fmt("Only text operators can be used with strings: %s",
+                                                    HTML::tt($querydesc))));
 
-	    // should we fail or skip when the user clicks on Relations?
-	    } elseif (isset($posted['relations']) and $posted['relations'])  {
-		$linkquery = false; // skip
-	    } else {
-		$querydesc = $attribute." ".$attr_op." ".$s;
-		return HTML($form, $this->error(fmt("Only text operators can be used with strings: %s",
-						    HTML::tt($querydesc))));
-		
-	    }
-	    if ($linkquery) {
-		$links = $dbi->linkSearch($pagequery, $linkquery, 'attribute', $relquery);
-		if (empty($relation)) {
-		    $pagelist = new PageList($args['info'], $args['exclude'], $args);
-		    $pagelist->_links = array();
-		}
-		while ($link = $links->next()) {
-		    $pagelist->addPage($link['pagename']);
-		    $pagelist->_links[] = $link;
-		}
-	        // default (=empty info) wants all three. but we want to override this.
-	        if (!$args['info'] or 
-	            ($args['info'] and isset($pagelist->_columns_seen['attribute'])))
-		    $pagelist->addColumnObject
-		        (new _PageList_Column_SemanticSearch_relation('attribute', 
-		        	_("Attribute"), $pagelist));
-	        if (!$args['info'] or
-	            ($args['info'] and isset($pagelist->_columns_seen['value'])))
-		    $pagelist->addColumnObject
-		        (new _PageList_Column_SemanticSearch_link('value', 
-		        	_("Value"), $pagelist));
-	    }
-	}
-	if (!isset($pagelist)) {
-	    $querydesc = _("<empty>");
-	    $pagelist = new PageList();
-	}
-	if (!$noheader) {
-	// We put the form into the caption just to be able to return one pagelist object, 
-	// and to still have the convenience form at the top. we could workaround this by 
-	// putting the form as WikiFormRich into the actionpage. but thid doesnt look as 
-	// nice as this here.
-	    $pagelist->setCaption
-	    (   // on mozilla the form doesn't fit into the caption very well.
-		HTML($noform ? '' : HTML($form,HTML::hr()),
-	             fmt("Semantic %s Search Result for \"%s\" in pages \"%s\"",
-	             	 $searchtype, $querydesc, $page)));
-	}
-	return $pagelist;
+            }
+            if ($linkquery) {
+                $links = $dbi->linkSearch($pagequery, $linkquery, 'attribute', $relquery);
+                if (empty($relation)) {
+                    $pagelist = new PageList($args['info'], $args['exclude'], $args);
+                    $pagelist->_links = array();
+                }
+                while ($link = $links->next()) {
+                    $pagelist->addPage($link['pagename']);
+                    $pagelist->_links[] = $link;
+                }
+                // default (=empty info) wants all three. but we want to override this.
+                if (!$args['info'] or
+                    ($args['info'] and isset($pagelist->_columns_seen['attribute'])))
+                    $pagelist->addColumnObject
+                        (new _PageList_Column_SemanticSearch_relation('attribute',
+                                _("Attribute"), $pagelist));
+                if (!$args['info'] or
+                    ($args['info'] and isset($pagelist->_columns_seen['value'])))
+                    $pagelist->addColumnObject
+                        (new _PageList_Column_SemanticSearch_link('value',
+                                _("Value"), $pagelist));
+            }
+        }
+        if (!isset($pagelist)) {
+            $querydesc = _("<empty>");
+            $pagelist = new PageList();
+        }
+        if (!$noheader) {
+        // We put the form into the caption just to be able to return one pagelist object,
+        // and to still have the convenience form at the top. we could workaround this by
+        // putting the form as WikiFormRich into the actionpage. but thid doesnt look as
+        // nice as this here.
+            $pagelist->setCaption
+            (   // on mozilla the form doesn't fit into the caption very well.
+                HTML($noform ? '' : HTML($form,HTML::hr()),
+                     fmt("Semantic %s Search Result for \"%s\" in pages \"%s\"",
+                              $searchtype, $querydesc, $page)));
+        }
+        return $pagelist;
     }
 };
 
-class _PageList_Column_SemanticSearch_relation 
-extends _PageList_Column 
+class _PageList_Column_SemanticSearch_relation
+extends _PageList_Column
 {
     function _PageList_Column_SemanticSearch_relation ($field, $heading, &$pagelist) {
-	$this->_field = $field;
+        $this->_field = $field;
         $this->_heading = $heading;
-	$this->_need_rev = false;
-	$this->_iscustom = true;
-	$this->_pagelist =& $pagelist;
+        $this->_need_rev = false;
+        $this->_iscustom = true;
+        $this->_pagelist =& $pagelist;
     }
     function _getValue(&$page, $revision_handle) {
-	if (is_object($page)) $text = $page->getName();
+        if (is_object($page)) $text = $page->getName();
         else $text = $page;
         $link = $this->_pagelist->_links[$this->current_row];
         return WikiLink($link['linkname'],'if_known');
     }
 }
-class _PageList_Column_SemanticSearch_link 
-extends _PageList_Column_SemanticSearch_relation 
+class _PageList_Column_SemanticSearch_link
+extends _PageList_Column_SemanticSearch_relation
 {
     function _getValue(&$page, $revision_handle) {
-	if (is_object($page)) $text = $page->getName();
+        if (is_object($page)) $text = $page->getName();
         else $text = $page;
         $link = $this->_pagelist->_links[$this->current_row];
         if ($this->_field != 'value')
             return WikiLink($link['linkvalue'],'if_known');
-        else    
-	    return $link['linkvalue'];
+        else
+            return $link['linkvalue'];
     }
 }
 
diff --git a/lib/plugin/SemanticSearchAdvanced.php b/lib/plugin/SemanticSearchAdvanced.php
index f388a3b43..a4d6f4114 100644
--- a/lib/plugin/SemanticSearchAdvanced.php
+++ b/lib/plugin/SemanticSearchAdvanced.php
@@ -24,12 +24,12 @@ require_once('lib/plugin/SemanticSearch.php');
 
 /**
  * Advanced search for relations/attributes and its values.
- * Parse the query string, which can contain full mathematical expressions 
+ * Parse the query string, which can contain full mathematical expressions
  * and various logical and mathematical functions and operators.
- * Support subqueries (for _pagename ...) and temporary variables 
+ * Support subqueries (for _pagename ...) and temporary variables
  * starting with _
  *
- * Are multiple variables valid for one page only, or is the result 
+ * Are multiple variables valid for one page only, or is the result
  * constructed as list of all matches? We'll stick with one page for now.
  * This the only way I can see semantic meaning for now.
  *
@@ -44,13 +44,13 @@ require_once('lib/plugin/SemanticSearch.php');
  *
  *    "works_at::_organization
  *       and (for _organization
- *             (located_in::_city 
- *             and (for _city is_a::City 
+ *             (located_in::_city
+ *             and (for _city is_a::City
  *                   and population>1000000))
- *          or (located_in::_country 
+ *          or (located_in::_country
  *               and (for _country is_a::Country and population>5000000)))
  *
- * Relation links may contain wildcards. For relation and attribute names I'm not sure yet. 
+ * Relation links may contain wildcards. For relation and attribute names I'm not sure yet.
  *
  * @author: Reini Urban
  */
@@ -68,129 +68,129 @@ extends WikiPlugin_SemanticSearch
         return preg_replace("/[Revision: $]/", '',
                             "\$Revision$");
     }
-    function getDefaultArguments() { 
+    function getDefaultArguments() {
         return array_merge
             (
              PageList::supportedArgs(),  // paging and more.
-	     array(
-		   's'          => "",   // query expression
-		   'page'       => "*",  // which pages (glob allowed), default: all
-		   'case_exact' => false,
-		   'regex'      => 'auto', // hmm
-		   'noform'     => false, // don't show form with results.
-		   'noheader'   => false  // no caption
-		   ));
+             array(
+                   's'          => "",   // query expression
+                   'page'       => "*",  // which pages (glob allowed), default: all
+                   'case_exact' => false,
+                   'regex'      => 'auto', // hmm
+                   'noform'     => false, // don't show form with results.
+                   'noheader'   => false  // no caption
+                   ));
     }
 
     function showForm (&$dbi, &$request, $args, $allrelations) {
-    	global $WikiTheme;
-	$action = $request->getPostURL();
-	$hiddenfield = HiddenInputs($request->getArgs(),'',
-				    array('action','page','s'));
-	$pagefilter = HTML::input(array('name' => 'page',
-					'value' => $args['page'],
-					'title' => _("Search only in these pages. With autocompletion."),
-					'class' => 'dropdown', 
-					'acdropdown' => 'true', 
-					'autocomplete_complete' => 'true',
-					'autocomplete_matchsubstring' => 'false', 
-					'autocomplete_list' => 'xmlrpc:wiki.titleSearch ^[S] 4'
-					), '');
-	$help = Button('submit:semsearch[help]', "?", false);
-	$svalues = empty($allrelations) ? "" : join("','", $allrelations);
-	$reldef = JavaScript("var semsearch_relations = new Array('".$svalues."')");
+            global $WikiTheme;
+        $action = $request->getPostURL();
+        $hiddenfield = HiddenInputs($request->getArgs(),'',
+                                    array('action','page','s'));
+        $pagefilter = HTML::input(array('name' => 'page',
+                                        'value' => $args['page'],
+                                        'title' => _("Search only in these pages. With autocompletion."),
+                                        'class' => 'dropdown',
+                                        'acdropdown' => 'true',
+                                        'autocomplete_complete' => 'true',
+                                        'autocomplete_matchsubstring' => 'false',
+                                        'autocomplete_list' => 'xmlrpc:wiki.titleSearch ^[S] 4'
+                                        ), '');
+        $help = Button('submit:semsearch[help]', "?", false);
+        $svalues = empty($allrelations) ? "" : join("','", $allrelations);
+        $reldef = JavaScript("var semsearch_relations = new Array('".$svalues."')");
         $querybox = HTML::textarea(array('name' => 's',
-					 'title' => _("Enter a valid query expression"),
-					 'rows' => 4,
-					 'acdropdown' => 'true', 
-					 'autocomplete_complete' => 'true', 
-					 'autocomplete_assoc' => 'false', 
-					 'autocomplete_matchsubstring' => 'true', 
-					 'autocomplete_list' => 'array:semsearch_relations'
-				      ), $args['s']);
-	$submit = Button('submit:semsearch[relations]',  _("Search"), false, 
-			 array('title' => 'Move to help page. No seperate window'));
-	$instructions = _("Search in all specified pages for the expression.");
-	$form = HTML::form(array('action' => $action,
-				  'method' => 'post',
-				  'accept-charset' => $GLOBALS['charset']),
-			   $reldef,
-			   $hiddenfield, HiddenInputs(array('attribute'=>'')),
-			   $instructions, HTML::br(),
-			   HTML::table(array('border'=>'0','width' =>'100%'),
-				       HTML::tr(HTML::td(_("Pagename(s): "), $pagefilter),
-						HTML::td(array('align' => 'right'), 
-							 $help)),
-				       HTML::tr(HTML::td(array('colspan' => 2), 
-							 $querybox))), 
-			   HTML::br(),
-			   HTML::div(array('align'=>'center'),$submit));
-	return $form;
+                                         'title' => _("Enter a valid query expression"),
+                                         'rows' => 4,
+                                         'acdropdown' => 'true',
+                                         'autocomplete_complete' => 'true',
+                                         'autocomplete_assoc' => 'false',
+                                         'autocomplete_matchsubstring' => 'true',
+                                         'autocomplete_list' => 'array:semsearch_relations'
+                                      ), $args['s']);
+        $submit = Button('submit:semsearch[relations]',  _("Search"), false,
+                         array('title' => 'Move to help page. No seperate window'));
+        $instructions = _("Search in all specified pages for the expression.");
+        $form = HTML::form(array('action' => $action,
+                                  'method' => 'post',
+                                  'accept-charset' => $GLOBALS['charset']),
+                           $reldef,
+                           $hiddenfield, HiddenInputs(array('attribute'=>'')),
+                           $instructions, HTML::br(),
+                           HTML::table(array('border'=>'0','width' =>'100%'),
+                                       HTML::tr(HTML::td(_("Pagename(s): "), $pagefilter),
+                                                HTML::td(array('align' => 'right'),
+                                                         $help)),
+                                       HTML::tr(HTML::td(array('colspan' => 2),
+                                                         $querybox))),
+                           HTML::br(),
+                           HTML::div(array('align'=>'center'),$submit));
+        return $form;
     }
- 
-    function run ($dbi, $argstr, &$request, $basepage) { 
+
+    function run ($dbi, $argstr, &$request, $basepage) {
         global $WikiTheme;
 
-	$this->_supported_operators = array(':=','<','<=','>','>=','!=','==','=~'); 
+        $this->_supported_operators = array(':=','<','<=','>','>=','!=','==','=~');
         $args = $this->getArgs($argstr, $request);
         $posted = $request->getArg('semsearch');
         $request->setArg('semsearch', false);
-	if ($request->isPost() and isset($posted['help'])) {
-	    $request->redirect(WikiURL(_("Help/SemanticSearchAdvancedPlugin"),
-				       array('redirectfrom' => $basepage), true));
-	}
-	$allrelations = $dbi->listRelations();
-	$form = $this->showForm($dbi, $request, $args, $allrelations);
-	if (isset($this->_norelations_warning))
-	    $form->pushContent(HTML::div(array('class' => 'warning'),
-	                                 _("Warning:").$this->_norelations_warning));
+        if ($request->isPost() and isset($posted['help'])) {
+            $request->redirect(WikiURL(_("Help/SemanticSearchAdvancedPlugin"),
+                                       array('redirectfrom' => $basepage), true));
+        }
+        $allrelations = $dbi->listRelations();
+        $form = $this->showForm($dbi, $request, $args, $allrelations);
+        if (isset($this->_norelations_warning))
+            $form->pushContent(HTML::div(array('class' => 'warning'),
+                                         _("Warning:").$this->_norelations_warning));
         extract($args);
-	// For convenience, peace and harmony we allow GET requests also.
-	if (!$args['s']) // check for good GET request
-	    return $form; // nobody called us, so just display our form
+        // For convenience, peace and harmony we allow GET requests also.
+        if (!$args['s']) // check for good GET request
+            return $form; // nobody called us, so just display our form
 
-	// In reality we have to iterate over all found pages.
-	// To makes things shorter extract the next AND required expr and 
-	// iterate only over this, then recurse into the next AND expr.
-	// => Split into an AND and OR expression tree.
+        // In reality we have to iterate over all found pages.
+        // To makes things shorter extract the next AND required expr and
+        // iterate only over this, then recurse into the next AND expr.
+        // => Split into an AND and OR expression tree.
 
-	$parsed_relations = $this->detectRelationsAndAttributes($args['s']);
-	$regex = '';
-	if ($parsed_relations)
-	    $regex = preg_grep("/[\*\?]/", $parsed_relations);
-	// Check that all those do exist.
-	else
-	    $this->error("Invalid query: No relations or attributes in the query $s found");
-	$pagelist = new PageList($args['info'], $args['exclude'], $args);
-	if (!$noheader) {
-	    $pagelist->setCaption
-		(HTML($noform ? '' : HTML($form,HTML::hr()),
-		      fmt("Semantic %s Search Result for \"%s\" in pages \"%s\"",
-			  '',$s,$page)));
-	}
-	if (!$regex and $missing = array_diff($parsed_relations, $allrelations))
-	    return $pagelist;
-	$relquery = new TextSearchQuery(join(" ",$parsed_relations));
-	if (!$relquery->match(join(" ",$allrelations)))
-	    return $pagelist;
+        $parsed_relations = $this->detectRelationsAndAttributes($args['s']);
+        $regex = '';
+        if ($parsed_relations)
+            $regex = preg_grep("/[\*\?]/", $parsed_relations);
+        // Check that all those do exist.
+        else
+            $this->error("Invalid query: No relations or attributes in the query $s found");
+        $pagelist = new PageList($args['info'], $args['exclude'], $args);
+        if (!$noheader) {
+            $pagelist->setCaption
+                (HTML($noform ? '' : HTML($form,HTML::hr()),
+                      fmt("Semantic %s Search Result for \"%s\" in pages \"%s\"",
+                          '',$s,$page)));
+        }
+        if (!$regex and $missing = array_diff($parsed_relations, $allrelations))
+            return $pagelist;
+        $relquery = new TextSearchQuery(join(" ",$parsed_relations));
+        if (!$relquery->match(join(" ",$allrelations)))
+            return $pagelist;
         $pagequery = new TextSearchQuery($page, $args['case_exact'], $args['regex']);
-	// if we have only numeric or text ops we can optimize.
-	//$parsed_attr_ops = $this->detectAttrOps($args['s']);
+        // if we have only numeric or text ops we can optimize.
+        //$parsed_attr_ops = $this->detectAttrOps($args['s']);
 
-	//TODO: writeme
-	$linkquery = new TextSearchQuery($s, $args['case_exact'], $args['regex']);
-	$links = $dbi->linkSearch($pagequery, $linkquery, 'relation', $relquery);
-	$pagelist->_links = array();
-	while ($link = $links->next()) {
-	    $pagelist->addPage($link['pagename']);
-	    $pagelist->_links[] = $link;
-	}
-	$pagelist->addColumnObject
-	    (new _PageList_Column_SemanticSearch_relation('relation', _("Relation"), $pagelist));
-	$pagelist->addColumnObject
-	    (new _PageList_Column_SemanticSearch_link('link', _("Link"), $pagelist));
+        //TODO: writeme
+        $linkquery = new TextSearchQuery($s, $args['case_exact'], $args['regex']);
+        $links = $dbi->linkSearch($pagequery, $linkquery, 'relation', $relquery);
+        $pagelist->_links = array();
+        while ($link = $links->next()) {
+            $pagelist->addPage($link['pagename']);
+            $pagelist->_links[] = $link;
+        }
+        $pagelist->addColumnObject
+            (new _PageList_Column_SemanticSearch_relation('relation', _("Relation"), $pagelist));
+        $pagelist->addColumnObject
+            (new _PageList_Column_SemanticSearch_link('link', _("Link"), $pagelist));
 
-	return $pagelist;
+        return $pagelist;
     }
 
     // ... (for _variable subquery) ...
@@ -201,17 +201,17 @@ extends WikiPlugin_SemanticSearch
     // => is_a population
     // Do we support wildcards in relation names also? is_*::city
     function detectRelationsAndAttributes($subquery) {
-	$relations = array();
-	// relations are easy
-	//$reltoken = preg_grep("/::/", preg_split("/\s+/", $query));
-	//$relations = array_map(create_function('$a','list($f,$b)=split("::",$a); return $f'), 
-	//		       $reltoken);
-	foreach (preg_split("/\s+/", $query) as $whitetok) {
-	    if (preg_match("/^([\w\*\?]+)::/", $whitetok))
-		$relations[] = $m[1];
-	}
-	return $relations;
-	// for attributes we might use the tokenizer. All non-numerics excl. units and non-ops
+        $relations = array();
+        // relations are easy
+        //$reltoken = preg_grep("/::/", preg_split("/\s+/", $query));
+        //$relations = array_map(create_function('$a','list($f,$b)=split("::",$a); return $f'),
+        //                       $reltoken);
+        foreach (preg_split("/\s+/", $query) as $whitetok) {
+            if (preg_match("/^([\w\*\?]+)::/", $whitetok))
+                $relations[] = $m[1];
+        }
+        return $relations;
+        // for attributes we might use the tokenizer. All non-numerics excl. units and non-ops
     }
 };
 
diff --git a/lib/plugin/SiteMap.php b/lib/plugin/SiteMap.php
index abc4f60f3..09217c9f3 100644
--- a/lib/plugin/SiteMap.php
+++ b/lib/plugin/SiteMap.php
@@ -80,7 +80,7 @@ extends WikiPlugin
     // info=mtime,hits,summary,version,author,locked,minor
     // exclude arg allows multiple pagenames
     // exclude=HomePage,RecentChanges
-    
+
     // Fixme: overcome limitation if two SiteMap plugins are in the same page!
     // static $VisitedPages still holds it
     function recursivelyGetBackLinks($startpage, $pagearr, $level = '*',
@@ -126,7 +126,7 @@ extends WikiPlugin
         $pagelinks = $startpage->getLinks($reversed);
         while ($link = $pagelinks->next()) {
             $linkpagename = $link->getName();
-            if (($linkpagename != $startpagename) and 
+            if (($linkpagename != $startpagename) and
                 (!$this->ExcludedPages or !preg_match("/$this->ExcludedPages/", $linkpagename)))
             {
                 if (!$this->excludeunknown or $this->dbi->isWikiPage($linkpagename)) {
@@ -143,7 +143,7 @@ extends WikiPlugin
 
     function run($dbi, $argstr, &$request, $basepage) {
         include_once('lib/BlockParser.php');
-        
+
         $args = $this->getArgs($argstr, $request, false);
         extract($args);
         if (!$page)
@@ -188,7 +188,7 @@ extends WikiPlugin
         }
 
         reset($pagearr);
-        if (!empty($includepages)) { 
+        if (!empty($includepages)) {
             // disallow direct usage, only via child class IncludeSiteMap
             if (!isa($this,"WikiPlugin_IncludeSiteMap") and !isa($this,"WikiPlugin_IncludeTree"))
                 $includepages = '';
@@ -198,7 +198,7 @@ extends WikiPlugin
             $plugin = $loader->getPlugin($dtree ? 'DynamicIncludePage' : 'IncludePage', false);
             $nothing = '';
         }
-        
+
         while (list($key, $link) = each($pagearr)) {
             if (!empty($includepages)) {
                 $a = substr_count($key, '*');
@@ -207,8 +207,8 @@ extends WikiPlugin
                 // quote linkname, by Stefan Schorn
                 $plugin_args = 'page=\'' . $link->getName() . '\' ' . $includepages;
                 $pagehtml = $plugin->run($dbi, $plugin_args, $request, $basepage);
-                $html->pushContent($pagehtml); 
-                //$html->pushContent( HTML(TransformText($indenter, 1.0, $page), $pagehtml)); 
+                $html->pushContent($pagehtml);
+                //$html->pushContent( HTML(TransformText($indenter, 1.0, $page), $pagehtml));
                 //$out .= $indenter . $pagehtml . "\n";
             }
             else {
@@ -216,9 +216,9 @@ extends WikiPlugin
             }
         }
         if (empty($includepages)) {
-            return TransformText($out, 2.0, $page); 
+            return TransformText($out, 2.0, $page);
         } else {
-            return $html; 
+            return $html;
         }
     }
 };
diff --git a/lib/plugin/SpellCheck.php b/lib/plugin/SpellCheck.php
index 904234158..3761c05fa 100644
--- a/lib/plugin/SpellCheck.php
+++ b/lib/plugin/SpellCheck.php
@@ -28,11 +28,11 @@ rcs_id('$Id$');
  * The pspell extension is better, because it's easier to store corrections.
  * Enchant looks more promising, because it supports multiple speller backends.
  *
- * Currently we do use aspell (via pspell or cmdline) in ispell mode. 
+ * Currently we do use aspell (via pspell or cmdline) in ispell mode.
  * Maybe enchant later.
  * cmdline preparation:
   do autosplit wikiwords && sed s,^,\^^, $pagename | aspell --lang=$LANG -a
-    or 
+    or
   sed s,^,\^^, $pagename | aspell --lang=$LANG -a -C
 =>
   & phpwiki 62 30: pipework, paprika, Popek, Phip, Pike, Viki, pike, ...
@@ -55,10 +55,10 @@ if (!function_exists('pspell_new_config')) {
     // new library interface through the pspell extension:
     // "/var/dictionaries/custom.pws"
     if (!defined('PSPELL_PWL'))
-	define('PSPELL_PWL', '');  // phpwiki-special wordlist
+        define('PSPELL_PWL', '');  // phpwiki-special wordlist
     // "/var/dictionaries/custom.repl"
     if (!defined('PSPELL_REPL'))
-	define('PSPELL_REPL', ''); // phpwiki-special replacement list (persistent replacements)
+        define('PSPELL_REPL', ''); // phpwiki-special replacement list (persistent replacements)
 }
 
 class WikiPlugin_SpellCheck
@@ -88,7 +88,7 @@ extends WikiPlugin
         $words = preg_split('/[\W]+?/', $text);
 
         $misspelled = $return = array();
-        $pspell_config = pspell_config_create($lang, "", "", $charset, 
+        $pspell_config = pspell_config_create($lang, "", "", $charset,
                                               PSPELL_NORMAL|PSPELL_RUN_TOGETHER);
         //pspell_config_runtogether($pspell_config, true);
         if (PSPELL_PWL)
@@ -116,73 +116,73 @@ extends WikiPlugin
     function run($dbi, $argstr, &$request, $basepage) {
         extract($this->getArgs($argstr, $request));
         $page = $dbi->getPage($pagename);
-        $current = $page->getCurrentRevision(); 
+        $current = $page->getCurrentRevision();
         $source = $current->getPackedContent();
 
         if (empty($source))
             return $this->error(fmt("empty source"));
-	if ($basepage == _("SpellCheck"))
+        if ($basepage == _("SpellCheck"))
             return $this->error(fmt("Cannot SpellCheck myself"));
-	$lang = $page->get('lang');
-	if (empty($lang)) $lang = $GLOBALS['LANG'];
-	$html = HTML();
+        $lang = $page->get('lang');
+        if (empty($lang)) $lang = $GLOBALS['LANG'];
+        $html = HTML();
         if (!function_exists('pspell_new_config')) {
-	    // use the aspell commandline interface
+            // use the aspell commandline interface
             include_once("lib/WikiPluginCached.php");
             $args = "";
             $source = preg_replace("/^/m", "^", $source);
             if (ASPELL_DATA_DIR)
                 $args .= " --data-dir=" . ASPELL_DATA_DIR;
-	    // MAYBE TODO: do we have the language dictionary?
-	    $args .= " --lang=" . $lang;
+            // MAYBE TODO: do we have the language dictionary?
+            $args .= " --lang=" . $lang;
             // use -C or autosplit wikiwords in the text
             $commandLine = ASPELL_EXE . " -a -C $args ";
             $cache = new WikiPluginCached;
             $code = $cache->filterThroughCmd($source, $commandLine);
             if (empty($code))
                 return $this->error(fmt("Couldn't start commandline '%s'",$commandLine));
-	    $sugg = array();
-	    foreach (preg_split("/\n/", $code) as $line) {
-		if (preg_match("/^& (\w+) \d+ \d+: (.+)$/", $line, $m)) {
-		    $sugg[$m[1]] = preg_split("/, /", $m[2]);
-		}
-	    }
+            $sugg = array();
+            foreach (preg_split("/\n/", $code) as $line) {
+                if (preg_match("/^& (\w+) \d+ \d+: (.+)$/", $line, $m)) {
+                    $sugg[$m[1]] = preg_split("/, /", $m[2]);
+                }
+            }
             /*$pre = HTML::pre(HTML::raw($code));
             $html->pushContent($pre);*/
         } else {
             $sugg = pspell_check($source, $lang);
         }
-	//$html->pushContent(HTML::hr(),HTML::h1(_("Spellcheck")));
-	$page = $request->getPage();
-	if ($version) {
-	    $revision = $page->getRevision($version);
-	    if (!$revision)
-		NoSuchRevision($request, $page, $version);
-	}
-	else {
-	    $revision = $page->getCurrentRevision();
-	}
-	$GLOBALS['request']->setArg('suggestions', $sugg);
+        //$html->pushContent(HTML::hr(),HTML::h1(_("Spellcheck")));
+        $page = $request->getPage();
+        if ($version) {
+            $revision = $page->getRevision($version);
+            if (!$revision)
+                NoSuchRevision($request, $page, $version);
+        }
+        else {
+            $revision = $page->getCurrentRevision();
+        }
+        $GLOBALS['request']->setArg('suggestions', $sugg);
         include_once("lib/BlockParser.php");
-	$ori_html = TransformText($revision, $revision->get('markup'), $page);
-	$GLOBALS['request']->setArg('suggestions', false);
+        $ori_html = TransformText($revision, $revision->get('markup'), $page);
+        $GLOBALS['request']->setArg('suggestions', false);
 
         $html->pushContent($ori_html, HTML::hr(), HTML::h1(_("SpellCheck result")));
 
-	$list = HTML::ul();
-	foreach ($sugg as $word => $suggs) {
-	    $w = HTML::span(array('class' => 'spell-wrong'), $word);
-	    // TODO: optional replace-link. jscript or request button with word replace.
-	    $r = HTML();
-	    foreach ($suggs as $s) {
-		$r->pushContent(HTML::a(array('class' => 'spell-sugg',
-					      'href' => "javascript:do_replace('$word','$s')"), 
-					$s),", ");
-	    }
-	    $list->pushContent(HTML::li($w, ": ", $r));
-	}
-	$html->pushContent($list);
-	return $html;
+        $list = HTML::ul();
+        foreach ($sugg as $word => $suggs) {
+            $w = HTML::span(array('class' => 'spell-wrong'), $word);
+            // TODO: optional replace-link. jscript or request button with word replace.
+            $r = HTML();
+            foreach ($suggs as $s) {
+                $r->pushContent(HTML::a(array('class' => 'spell-sugg',
+                                              'href' => "javascript:do_replace('$word','$s')"),
+                                        $s),", ");
+            }
+            $list->pushContent(HTML::li($w, ": ", $r));
+        }
+        $html->pushContent($list);
+        return $html;
     }
 };
 
diff --git a/lib/plugin/SqlResult.php b/lib/plugin/SqlResult.php
index f4bd56240..0bd3deb7c 100644
--- a/lib/plugin/SqlResult.php
+++ b/lib/plugin/SqlResult.php
@@ -2,7 +2,7 @@
 rcs_id('$Id$');
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -21,9 +21,9 @@ rcs_id('$Id$');
  */
 
 /**
- * This plugin displays results of arbitrary SQL select statements 
+ * This plugin displays results of arbitrary SQL select statements
  * in table form.
- * The database definition, the DSN, must be defined in the local file 
+ * The database definition, the DSN, must be defined in the local file
  * config/SqlResult.ini
  *   A simple textfile with alias = dsn lines.
  *
@@ -37,9 +37,9 @@ rcs_id('$Id$');
  *                   PASSWORD('xx')
  *   ?>
  *   <?plugin SqlResult alias=videos template=videos
- *            SELECT rating,title,date 
- *                   FROM video 
- *                   ORDER BY rating DESC 
+ *            SELECT rating,title,date
+ *                   FROM video
+ *                   ORDER BY rating DESC
  *                   LIMIT 5
  *   ?>
  *   <?plugin SqlResult alias=imdb template=imdbmovies where||="Davies, Jeremy%"
@@ -61,8 +61,8 @@ require_once("lib/PageList.php");
 class WikiPlugin_SqlResult
 extends WikiPlugin
 {
-    var $_args;	
-    
+    var $_args;
+
     function getName () {
         return _("SqlResult");
     }
@@ -83,7 +83,7 @@ extends WikiPlugin
                      'template'    => false, // use a custom <theme>/template.tmpl
                      'where'       => false, // custom filter for the query
                      'sortby'      => false, // for paging, default none
-                     'limit'       => "0,50", // for paging, default: only the first 50 
+                     'limit'       => "0,50", // for paging, default: only the first 50
                     );
     }
 
@@ -95,17 +95,17 @@ extends WikiPlugin
     /** Get the SQL statement from the rest of the lines
      */
     function handle_plugin_args_cruft($argstr, $args) {
-    	$this->_sql = str_replace("\n"," ",$argstr);
+            $this->_sql = str_replace("\n"," ",$argstr);
         return;
     }
-   
+
     function run($dbi, $argstr, &$request, $basepage) {
         global $DBParams;
-    	//$request->setArg('nocache','1');
+            //$request->setArg('nocache','1');
         extract($this->getArgs($argstr, $request));
         if (!$alias)
             return $this->error(_("No DSN alias for SqlResult.ini specified"));
-	$sql = $this->_sql;
+        $sql = $this->_sql;
 
         // apply custom filters
         if ($where and strstr($sql, "%%where%%"))
@@ -137,23 +137,23 @@ extends WikiPlugin
         if (!$inidsn)
             return $this->error(sprintf(_("No DSN for alias %s in SqlResult.ini found"),
                                         $alias));
-        // adodb or pear? adodb as default, since we distribute per default it. 
+        // adodb or pear? adodb as default, since we distribute per default it.
         // for pear there may be overrides.
         // TODO: native PDO support (for now we use ADODB)
         if ($DBParams['dbtype'] == 'SQL') {
             $dbh = DB::connect($inidsn);
             $all = $dbh->getAll($sql);
             if (DB::isError($all)) {
-            	return $this->error($all->getMessage(). ' ' . $all->userinfo);
+                    return $this->error($all->getMessage(). ' ' . $all->userinfo);
             }
         } else { // unless PearDB use the included ADODB, regardless if dba, file or PDO, ...
             if ($DBParams['dbtype'] != 'ADODB') {
                 require_once('lib/WikiDB/backend/ADODB.php');
             }
             $parsed = parseDSN($inidsn);
-            $dbh = &ADONewConnection($parsed['phptype']); 
-            $conn = $dbh->Connect($parsed['hostspec'],$parsed['username'], 
-                                  $parsed['password'], $parsed['database']); 
+            $dbh = &ADONewConnection($parsed['phptype']);
+            $conn = $dbh->Connect($parsed['hostspec'],$parsed['username'],
+                                  $parsed['password'], $parsed['database']);
             if (!$conn)
                 return $this->error($dbh->errorMsg());
             $GLOBALS['ADODB_FETCH_MODE'] = ADODB_FETCH_ASSOC;
@@ -175,11 +175,11 @@ extends WikiPlugin
         if ($template) {
             $args = array_merge(
                       array('SqlResult' => $all,   // the resulting array of rows
-                            'ordered' => $ordered, // whether to display as <ul>/<dt> or <ol> 
+                            'ordered' => $ordered, // whether to display as <ul>/<dt> or <ol>
                             'where'   => $where,
-                            'sortby'  => $sortby,  
+                            'sortby'  => $sortby,
                             'limit'   => $limit),
-                      $args);		// paging params override given params
+                      $args);                // paging params override given params
             return Template($template, $args);
         } else {
             if ($ordered) {
diff --git a/lib/plugin/SyncWiki.php b/lib/plugin/SyncWiki.php
index b15631d2a..68f284070 100644
--- a/lib/plugin/SyncWiki.php
+++ b/lib/plugin/SyncWiki.php
@@ -23,7 +23,7 @@ rcs_id('$Id$');
 /**
  * required argument:  url = <rpc interface to main wiki>
  * optional arguments: noimport, noexport, noupload
- *	
+ *
  * 1. check RPC2 interface or admin url (lang?) of external wiki
  *    get external pagelist, only later than our last mergepoint
  * 2. Download all externally changed sources:
@@ -31,7 +31,7 @@ rcs_id('$Id$');
  *    If local page does not exist (deleted?), and there is no revision, import it.
  *    Else we deleted it. Skip the import, but don't delete the external. Should be added to conflict.
  *    If local page is newer than the mergepoint, then add it to the conflict pages.
- * 3. check our to_delete, to_add, to_merge 
+ * 3. check our to_delete, to_add, to_merge
  * 4. get our pagelist of pages only later than our last mergepoint
  * 5. check external to_delete, to_add, to_merge
  * 6. store log (where, how?)
@@ -57,303 +57,303 @@ extends WikiPlugin_WikiAdminUtils
 
     function getDefaultArguments() {
         return array('url'    => '',
-		     'noimport' => 0,
-		     'noexport' => 0,
-		     'noupload' => 0,
-		     'label'  => $this->getName(),
-		     //'userid' => false,
-		     'passwd' => false,
-		     'sid'    => false,
-		     );
+                     'noimport' => 0,
+                     'noexport' => 0,
+                     'noupload' => 0,
+                     'label'  => $this->getName(),
+                     //'userid' => false,
+                     'passwd' => false,
+                     'sid'    => false,
+                     );
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
         $args = $this->getArgs($argstr, $request);
         $args['action'] = 'syncwiki';
-	extract($args);
-	if (empty($args['url']))
-	    return $this->error(fmt("A required argument '%s' is missing.", "url"));
+        extract($args);
+        if (empty($args['url']))
+            return $this->error(fmt("A required argument '%s' is missing.", "url"));
         if ($request->getArg('action') != 'browse')
             return $this->disabled("(action != 'browse')");
-	$posted = $request->getArg('wikiadminutils');
-	if ($request->isPost() 
-	    and $posted['action'] == $action 
-	    and $posted['url'] == $url) // multiple buttons
-	{
-	    return $this->_do_syncwiki($request, $posted);
-	}
+        $posted = $request->getArg('wikiadminutils');
+        if ($request->isPost()
+            and $posted['action'] == $action
+            and $posted['url'] == $url) // multiple buttons
+        {
+            return $this->_do_syncwiki($request, $posted);
+        }
         return $this->_makeButton($request, $args, $label);
     }
 
     function _do_syncwiki(&$request, $args) {
-	global $charset;
-	longer_timeout(240);
+        global $charset;
+        longer_timeout(240);
 
-	if (!function_exists('wiki_xmlrpc_post')) {
-	    include_once("lib/XmlRpcClient.php");
-	}
-	$userid = $request->_user->_userid;
-	$dbh = $request->getDbh();
-	$merge_point = $dbh->get('mergepoint');
-	if (empty($merge_point)) {
-	    $page = $dbh->getPage("ReleaseNotes"); // this is usually the latest official page
-	    $last = $page->getCurrentRevision(false);
-	    $merge_point = $last->get("mtime");    // for testing: 1160396075
-	    $dbh->set('mergepoint', $merge_point);
-	}
-	//TODO: remote auth, set session cookie
-	$pagelist = wiki_xmlrpc_post('wiki.getRecentChanges', 
-				     iso8601_encode($merge_point,1), 
-				     $args['url'], $args);
-	$html = HTML();
-	//$html->pushContent(HTML::div(HTML::em("check RPC2 interface...")));
-	if (gettype($pagelist) === "array") {
-	    //$request->_deferredPageChangeNotification = array();
-	    $request->discardOutput();
-	    StartLoadDump($request, _("Syncing this PhpWiki"));
-	    PrintXML(HTML::strong(fmt("Download all externally changed sources.")));
-	    echo "<br />\n";
-	    PrintXML(fmt("Retrieving from external url %s wiki.getRecentChanges(%s)...", 
-	             $args['url'], iso8601_encode($merge_point,1)));
-	    echo "<br />\n";
-	    $ouriter = $dbh->mostRecent(array('since' => $merge_point));
-	    //$ol = HTML::ol();
-	    $done = array();
-	    foreach ($pagelist as $ext) {
-		$reaction = _("<unknown>");
-		// compare existance and dates with local page
-		$extdate = iso8601_decode($ext['lastModified']->scalar,1);
-		// TODO: urldecode ???
-		$name = utf8_decode($ext['name']);
-		$our = $dbh->getPage($name);
-		$done[$name] = 1;
-		$ourrev  = $our->getCurrentRevision(false);
-		$rel = '<=>';
-		if (!$our->exists()) {
-		    // we might have deleted or moved it on purpose?
-		    // check date of latest revision if there's one, and > mergepoint
-		    if (($ourrev->getVersion() > 1) and ($ourrev->get('mtime') > $merge_point)) {
-			// our was deleted after sync, and changed after last sync.
-			$this->_addConflict('delete', $args, $our, $extdate);
-			$reaction = (_(" skipped")." ("."locally deleted or moved".")");
-		    } else {
-			$reaction = $this->_import($args, $our, $extdate);
-		    }
-		} else {
-		    $ourdate = $ourrev->get('mtime');
-		    if ($extdate > $ourdate and $ourdate < $merge_point) {
-		    	$rel = '>';
-			$reaction = $this->_import($args, $our, $extdate);
-		    } elseif ($extdate > $ourdate and $ourdate >= $merge_point) {
-		    	$rel = '>';
-			// our is older then external but newer than last sync
-			$reaction = $this->_addConflict('import', $args, $our, $extdate);
-		    } elseif ($extdate < $ourdate and $extdate < $merge_point) {
-		    	$rel = '>';
-			$reaction = $this->_export($args, $our);
-		    } elseif ($extdate < $ourdate and $extdate >= $merge_point) {
-		    	$rel = '>';
-			// our is newer and external is also newer
-			$reaction = $this->_addConflict('export', $args, $our, $extdate);
-		    } else {
-		    	$rel = '==';
-			$reaction = _("same date");
-		    }
-		}
-		/*$ol->pushContent(HTML::li(HTML::strong($name)," ",
-					  $extdate,"<=>",$ourdate," ",
-					  HTML::strong($reaction))); */
-		PrintXML(HTML::strong($name)," ",
-			 $extdate," $rel ",$ourdate," ",
-			 HTML::strong($reaction),
-			 HTML::br());
-		$request->chunkOutput();
-	    }
-	    //$html->pushContent($ol);
-	} else {
-	    $html->pushContent("xmlrpc error:  wiki.getRecentChanges returned "
-	                  ."(".gettype($pagelist).") ".$pagelist);
-	    trigger_error("xmlrpc error:  wiki.getRecentChanges returned "
-	                  ."(".gettype($pagelist).") ".$pagelist, E_USER_WARNING);
-	    EndLoadDump($request);
+        if (!function_exists('wiki_xmlrpc_post')) {
+            include_once("lib/XmlRpcClient.php");
+        }
+        $userid = $request->_user->_userid;
+        $dbh = $request->getDbh();
+        $merge_point = $dbh->get('mergepoint');
+        if (empty($merge_point)) {
+            $page = $dbh->getPage("ReleaseNotes"); // this is usually the latest official page
+            $last = $page->getCurrentRevision(false);
+            $merge_point = $last->get("mtime");    // for testing: 1160396075
+            $dbh->set('mergepoint', $merge_point);
+        }
+        //TODO: remote auth, set session cookie
+        $pagelist = wiki_xmlrpc_post('wiki.getRecentChanges',
+                                     iso8601_encode($merge_point,1),
+                                     $args['url'], $args);
+        $html = HTML();
+        //$html->pushContent(HTML::div(HTML::em("check RPC2 interface...")));
+        if (gettype($pagelist) === "array") {
+            //$request->_deferredPageChangeNotification = array();
+            $request->discardOutput();
+            StartLoadDump($request, _("Syncing this PhpWiki"));
+            PrintXML(HTML::strong(fmt("Download all externally changed sources.")));
+            echo "<br />\n";
+            PrintXML(fmt("Retrieving from external url %s wiki.getRecentChanges(%s)...",
+                     $args['url'], iso8601_encode($merge_point,1)));
+            echo "<br />\n";
+            $ouriter = $dbh->mostRecent(array('since' => $merge_point));
+            //$ol = HTML::ol();
+            $done = array();
+            foreach ($pagelist as $ext) {
+                $reaction = _("<unknown>");
+                // compare existance and dates with local page
+                $extdate = iso8601_decode($ext['lastModified']->scalar,1);
+                // TODO: urldecode ???
+                $name = utf8_decode($ext['name']);
+                $our = $dbh->getPage($name);
+                $done[$name] = 1;
+                $ourrev  = $our->getCurrentRevision(false);
+                $rel = '<=>';
+                if (!$our->exists()) {
+                    // we might have deleted or moved it on purpose?
+                    // check date of latest revision if there's one, and > mergepoint
+                    if (($ourrev->getVersion() > 1) and ($ourrev->get('mtime') > $merge_point)) {
+                        // our was deleted after sync, and changed after last sync.
+                        $this->_addConflict('delete', $args, $our, $extdate);
+                        $reaction = (_(" skipped")." ("."locally deleted or moved".")");
+                    } else {
+                        $reaction = $this->_import($args, $our, $extdate);
+                    }
+                } else {
+                    $ourdate = $ourrev->get('mtime');
+                    if ($extdate > $ourdate and $ourdate < $merge_point) {
+                            $rel = '>';
+                        $reaction = $this->_import($args, $our, $extdate);
+                    } elseif ($extdate > $ourdate and $ourdate >= $merge_point) {
+                            $rel = '>';
+                        // our is older then external but newer than last sync
+                        $reaction = $this->_addConflict('import', $args, $our, $extdate);
+                    } elseif ($extdate < $ourdate and $extdate < $merge_point) {
+                            $rel = '>';
+                        $reaction = $this->_export($args, $our);
+                    } elseif ($extdate < $ourdate and $extdate >= $merge_point) {
+                            $rel = '>';
+                        // our is newer and external is also newer
+                        $reaction = $this->_addConflict('export', $args, $our, $extdate);
+                    } else {
+                            $rel = '==';
+                        $reaction = _("same date");
+                    }
+                }
+                /*$ol->pushContent(HTML::li(HTML::strong($name)," ",
+                                          $extdate,"<=>",$ourdate," ",
+                                          HTML::strong($reaction))); */
+                PrintXML(HTML::strong($name)," ",
+                         $extdate," $rel ",$ourdate," ",
+                         HTML::strong($reaction),
+                         HTML::br());
+                $request->chunkOutput();
+            }
+            //$html->pushContent($ol);
+        } else {
+            $html->pushContent("xmlrpc error:  wiki.getRecentChanges returned "
+                          ."(".gettype($pagelist).") ".$pagelist);
+            trigger_error("xmlrpc error:  wiki.getRecentChanges returned "
+                          ."(".gettype($pagelist).") ".$pagelist, E_USER_WARNING);
+            EndLoadDump($request);
             return $this->error($html);
-	}
+        }
 
-	if (empty($args['noexport'])) {
-	    PrintXML(HTML::strong(fmt("Now upload all locally newer pages.")));
-	    echo "<br />\n";
-	    PrintXML(fmt("Checking all local pages newer than %s...", 
-	             iso8601_encode($merge_point,1)));
-	    echo "<br />\n";
-	    while ($our = $ouriter->next()) {
-		$name = $our->getName();
-		if ($done[$name]) continue;
-		$reaction = _(" skipped");
-		$ext = wiki_xmlrpc_post('wiki.getPageInfo', $name, $args['url']);
-		if (is_array($ext)) {
-		    $extdate = iso8601_decode($ext['lastModified']->scalar,1);
-		    $ourdate = $our->get('mtime');
-		    if ($extdate < $ourdate and $extdate < $merge_point) {
-			$reaction = $this->_export($args, $our);
-		    } elseif ($extdate < $ourdate and $extdate >= $merge_point) {
-			// our newer and external newer
-			$reaction = $this->_addConflict($args, $our, $extdate);
-		    }
-		} else {
-		    $reaction = 'xmlrpc error';
-		}
-		PrintXML(HTML::strong($name)," ",
-			 $extdate," < ",$ourdate," ",
-			 HTML::strong($reaction),
-			 HTML::br());
-		$request->chunkOutput();
-	    }
+        if (empty($args['noexport'])) {
+            PrintXML(HTML::strong(fmt("Now upload all locally newer pages.")));
+            echo "<br />\n";
+            PrintXML(fmt("Checking all local pages newer than %s...",
+                     iso8601_encode($merge_point,1)));
+            echo "<br />\n";
+            while ($our = $ouriter->next()) {
+                $name = $our->getName();
+                if ($done[$name]) continue;
+                $reaction = _(" skipped");
+                $ext = wiki_xmlrpc_post('wiki.getPageInfo', $name, $args['url']);
+                if (is_array($ext)) {
+                    $extdate = iso8601_decode($ext['lastModified']->scalar,1);
+                    $ourdate = $our->get('mtime');
+                    if ($extdate < $ourdate and $extdate < $merge_point) {
+                        $reaction = $this->_export($args, $our);
+                    } elseif ($extdate < $ourdate and $extdate >= $merge_point) {
+                        // our newer and external newer
+                        $reaction = $this->_addConflict($args, $our, $extdate);
+                    }
+                } else {
+                    $reaction = 'xmlrpc error';
+                }
+                PrintXML(HTML::strong($name)," ",
+                         $extdate," < ",$ourdate," ",
+                         HTML::strong($reaction),
+                         HTML::br());
+                $request->chunkOutput();
+            }
 
-	    PrintXML(HTML::strong(fmt("Now upload all locally newer uploads.")));
-	    echo "<br />\n";
-	    PrintXML(fmt("Checking all local uploads newer than %s...", 
-	             iso8601_encode($merge_point,1)));
-	    echo "<br />\n";
-	    $this->_fileList = array();
-	    $prefix = getUploadFilePath();
-	    $this->_dir($prefix);
-	    $len = strlen($prefix);
-	    foreach ($this->_fileList as $path) {
-		// strip prefix
-		$file = substr($path,$len);
-		$ourdate = filemtime($path);
-		$oursize = filesize($path);
-		$reaction = _(" skipped");
-		$ext = wiki_xmlrpc_post('wiki.getUploadedFileInfo', $file, $args['url']);
-		if (is_array($ext)) {
-		    $extdate = iso8601_decode($ext['lastModified']->scalar,1);
-		    $extsize = $ext['size'];
-		    if (empty($extsize) or $extdate < $ourdate) {
-			$timeout = $oursize * 0.0002;  // assume 50kb/sec upload speed
-			$reaction = $this->_upload($args, $path, $timeout);
-		    }
-		} else {
-		    $reaction = 'xmlrpc error wiki.getUploadedFileInfo not supported';
-		}
-		PrintXML(HTML::strong($name)," ",
-			 "$extdate ($extsize) < $ourdate ($oursize)",
-			 HTML::strong($reaction),
-			 HTML::br());
-		$request->chunkOutput();
-	    }
-	}
+            PrintXML(HTML::strong(fmt("Now upload all locally newer uploads.")));
+            echo "<br />\n";
+            PrintXML(fmt("Checking all local uploads newer than %s...",
+                     iso8601_encode($merge_point,1)));
+            echo "<br />\n";
+            $this->_fileList = array();
+            $prefix = getUploadFilePath();
+            $this->_dir($prefix);
+            $len = strlen($prefix);
+            foreach ($this->_fileList as $path) {
+                // strip prefix
+                $file = substr($path,$len);
+                $ourdate = filemtime($path);
+                $oursize = filesize($path);
+                $reaction = _(" skipped");
+                $ext = wiki_xmlrpc_post('wiki.getUploadedFileInfo', $file, $args['url']);
+                if (is_array($ext)) {
+                    $extdate = iso8601_decode($ext['lastModified']->scalar,1);
+                    $extsize = $ext['size'];
+                    if (empty($extsize) or $extdate < $ourdate) {
+                        $timeout = $oursize * 0.0002;  // assume 50kb/sec upload speed
+                        $reaction = $this->_upload($args, $path, $timeout);
+                    }
+                } else {
+                    $reaction = 'xmlrpc error wiki.getUploadedFileInfo not supported';
+                }
+                PrintXML(HTML::strong($name)," ",
+                         "$extdate ($extsize) < $ourdate ($oursize)",
+                         HTML::strong($reaction),
+                         HTML::br());
+                $request->chunkOutput();
+            }
+        }
 
-	$dbh->set('mergepoint', time());
-	EndLoadDump($request);
-	return ''; //$html;
+        $dbh->set('mergepoint', time());
+        EndLoadDump($request);
+        return ''; //$html;
     }
 
     /* path must have ending slash */
     function _dir($path) {
-	$dh = @opendir($path);
-	while ($filename = readdir($dh)) {
-	    if ($filename[0] == '.')
-		continue;
-	    $ft = filetype($path . $filename);
-	    if ($ft == 'file')
-		array_push($this->_fileList, $path . $filename);
-	    else if ($ft == 'dir')
-		$this->_dir($path . $filename . "/");
-	}
-	closedir($dh);
+        $dh = @opendir($path);
+        while ($filename = readdir($dh)) {
+            if ($filename[0] == '.')
+                continue;
+            $ft = filetype($path . $filename);
+            if ($ft == 'file')
+                array_push($this->_fileList, $path . $filename);
+            else if ($ft == 'dir')
+                $this->_dir($path . $filename . "/");
+        }
+        closedir($dh);
     }
 
     function _addConflict($what, $args, $our, $extdate = null) {
-	$pagename = $our->getName();
-	$meb = Button(array('action' => $args['action'],
-			    'merge'=> true,
-			    'source'=> $f),
-		      _("Merge Edit"),
-		      $args['pagename'],
-		      'wikiadmin');
-	$owb = Button(array('action' => $args['action'],
-			    'overwrite'=> true,
-			    'source'=> $f),
-		      sprintf(_("%s force"), strtoupper(substr($what, 0, 1)).substr($what, 1)),
-		      $args['pagename'],
-		      'wikiunsafe');
-	$this->_conflicts[] = $pagename;
-	return HTML(fmt(_("Postponed %s for %s."), $what, $pagename), " ", $meb, " ", $owb);
+        $pagename = $our->getName();
+        $meb = Button(array('action' => $args['action'],
+                            'merge'=> true,
+                            'source'=> $f),
+                      _("Merge Edit"),
+                      $args['pagename'],
+                      'wikiadmin');
+        $owb = Button(array('action' => $args['action'],
+                            'overwrite'=> true,
+                            'source'=> $f),
+                      sprintf(_("%s force"), strtoupper(substr($what, 0, 1)).substr($what, 1)),
+                      $args['pagename'],
+                      'wikiunsafe');
+        $this->_conflicts[] = $pagename;
+        return HTML(fmt(_("Postponed %s for %s."), $what, $pagename), " ", $meb, " ", $owb);
     }
 
     // TODO: store log or checkpoint for restauration?
     function _import($args, $our, $extdate = null) {
-	global $request;
-	$reaction = 'import ';
-	if ($args['noimport']) return ($reaction._("skipped"));
-	//$userid = $request->_user->_userid;
-	$name = $our->getName();
-	$pagedata = wiki_xmlrpc_post('wiki.getPage', $name, $args['url']);
-	if (is_object($pagedata)) {
-	    $pagedata = $pagedata->scalar;
-	    $ourrev  = $our->getCurrentRevision(true);
-	    $content = $ourrev->getPackedContent();
-	    if ($pagedata == $content)
-	    	return $reaction . _("skipped").' '._("same content");
-	    if (is_null($extdate))
-	        $extdate = time();	
-	    $our->save(utf8_decode($pagedata), -1, array('author' => $userid,
-	    						 'mtime' => $extdate));
-	    $reaction .= _("OK");
-	} else 
-	      $reaction .= (_("FAILED").' ('.gettype($pagedata).')');
-	return $reaction;
+        global $request;
+        $reaction = 'import ';
+        if ($args['noimport']) return ($reaction._("skipped"));
+        //$userid = $request->_user->_userid;
+        $name = $our->getName();
+        $pagedata = wiki_xmlrpc_post('wiki.getPage', $name, $args['url']);
+        if (is_object($pagedata)) {
+            $pagedata = $pagedata->scalar;
+            $ourrev  = $our->getCurrentRevision(true);
+            $content = $ourrev->getPackedContent();
+            if ($pagedata == $content)
+                    return $reaction . _("skipped").' '._("same content");
+            if (is_null($extdate))
+                $extdate = time();
+            $our->save(utf8_decode($pagedata), -1, array('author' => $userid,
+                                                             'mtime' => $extdate));
+            $reaction .= _("OK");
+        } else
+              $reaction .= (_("FAILED").' ('.gettype($pagedata).')');
+        return $reaction;
     }
 
     // TODO: store log or checkpoint for restauration?
     function _export($args, $our) {
-	global $request;
-	$reaction = 'export ';
-	if ($args['noexport']) return ($reaction._("skipped"));
-	$userid  = $request->_user->_userid;
-	$name    = $our->getName();
-	$ourrev  = $our->getCurrentRevision(true);
-	$content = $ourrev->getPackedContent();
-	$extdata = wiki_xmlrpc_post('wiki.getPage', $name, $args['url']);
-	if (is_object($extdata)) {
-	    $extdata = $extdata->scalar;
-	    if ($extdata == $content)
-	    	return $reaction . _("skipped").' '._("same content");
-	}
-	$mypass  = $request->getPref('passwd'); // this usually fails
-	$success = wiki_xmlrpc_post('wiki.putPage',
-				    array($name, $content, $userid, $mypass), $args['url']);
-	if (is_array($success)) {
-	    if ($success['code'] == 200)
-	        $reaction .= (_("OK").' '.$success['code']." ".$success['message']);
-	    else
-	        $reaction .= (_("FAILED").' '.$success['code']." ".$success['message']);
-	} else 
-	    $reaction .= (_("FAILED"));
-	return $reaction;
+        global $request;
+        $reaction = 'export ';
+        if ($args['noexport']) return ($reaction._("skipped"));
+        $userid  = $request->_user->_userid;
+        $name    = $our->getName();
+        $ourrev  = $our->getCurrentRevision(true);
+        $content = $ourrev->getPackedContent();
+        $extdata = wiki_xmlrpc_post('wiki.getPage', $name, $args['url']);
+        if (is_object($extdata)) {
+            $extdata = $extdata->scalar;
+            if ($extdata == $content)
+                    return $reaction . _("skipped").' '._("same content");
+        }
+        $mypass  = $request->getPref('passwd'); // this usually fails
+        $success = wiki_xmlrpc_post('wiki.putPage',
+                                    array($name, $content, $userid, $mypass), $args['url']);
+        if (is_array($success)) {
+            if ($success['code'] == 200)
+                $reaction .= (_("OK").' '.$success['code']." ".$success['message']);
+            else
+                $reaction .= (_("FAILED").' '.$success['code']." ".$success['message']);
+        } else
+            $reaction .= (_("FAILED"));
+        return $reaction;
     }
 
     // TODO: store log or checkpoint for restauration?
     function _upload($args, $path, $timeout) {
-	global $request;
-	$reaction = 'upload ';
-	if ($args['noupload']) return ($reaction._("skipped"));
+        global $request;
+        $reaction = 'upload ';
+        if ($args['noupload']) return ($reaction._("skipped"));
 
-	//$userid  = $request->_user->_userid;
-	$url = $args['url'];
-	$url = str_replace("/RPC2.php","/index.php", $url);
-	$server = parse_url($url);
-	$http = new HttpClient($server['host'], $server['port']);
-	$http->timeout = $timeout + 5;
-	$success = $http->postfile($server['url'], $path);
-	if ($success) {
-	    if ($http->getStatus() == 200)
-	        $reaction .= _("OK");
-	    else
-	        $reaction .= (_("FAILED").' '.$http->getStatus());
-	} else
-	    $reaction .= (_("FAILED").' '.$http->getStatus()." ".$http->errormsg);
-	return $reaction;
+        //$userid  = $request->_user->_userid;
+        $url = $args['url'];
+        $url = str_replace("/RPC2.php","/index.php", $url);
+        $server = parse_url($url);
+        $http = new HttpClient($server['host'], $server['port']);
+        $http->timeout = $timeout + 5;
+        $success = $http->postfile($server['url'], $path);
+        if ($success) {
+            if ($http->getStatus() == 200)
+                $reaction .= _("OK");
+            else
+                $reaction .= (_("FAILED").' '.$http->getStatus());
+        } else
+            $reaction .= (_("FAILED").' '.$http->getStatus()." ".$http->errormsg);
+        return $reaction;
     }
 };
 
diff --git a/lib/plugin/SyntaxHighlighter.php b/lib/plugin/SyntaxHighlighter.php
index de1c2c335..d24778525 100644
--- a/lib/plugin/SyntaxHighlighter.php
+++ b/lib/plugin/SyntaxHighlighter.php
@@ -21,17 +21,17 @@ rcs_id('$Id$');
  */
 
 /**
- * The SyntaxHighlighter plugin passes all its arguments through a C++ 
+ * The SyntaxHighlighter plugin passes all its arguments through a C++
  * highlighter called "highlight" (available at http://www.andre-simon.de/).
  *
  * @author: alecthomas
- * 
+ *
  * syntax: See http://www.andre-simon.de/doku/highlight/highlight.html
  * style = ["ansi", "gnu", "kr", "java", "linux"]
- 
+
 <?plugin SyntaxHighlighter syntax=c style=kr color=emacs
  #include <stdio.h>
- 
+
  int main() {
  printf("Lalala\n");
  }
@@ -52,7 +52,7 @@ if (!defined('HIGHLIGHT_EXE'))
 //define('HIGHLIGHT_EXE','/home/groups/p/ph/phpwiki/bin/highlight');
 
 // highlight requires two subdirs themes and langDefs somewhere.
-// Best by highlight.conf in $HOME, but the webserver user usually 
+// Best by highlight.conf in $HOME, but the webserver user usually
 // doesn't have a $HOME
 if (!defined('HIGHLIGHT_DATA_DIR'))
     if (isWindows())
@@ -167,7 +167,7 @@ extends WikiPlugin
             $commandLine = HIGHLIGHT_EXE . "$args -q -X -f -S $syntax";
             if (check_php_version(4,3,0))
                 $code = $this->newFilterThroughCmd($source, $commandLine);
-            else 
+            else
                 $code = $this->oldFilterThroughCmd($source, $commandLine);
             if (empty($code))
                 return $this->error(fmt("Couldn't start commandline '%s'",$commandLine));
diff --git a/lib/plugin/SystemInfo.php b/lib/plugin/SystemInfo.php
index 4c7534bd0..cf98e29b3 100644
--- a/lib/plugin/SystemInfo.php
+++ b/lib/plugin/SystemInfo.php
@@ -234,7 +234,7 @@ extends WikiPluginCached
                      'treshold'    => $treshold,
                      'nmin'        => $nmin,
                      'mintreshold' => $mintreshold,
-                     'nmax'        => $nmax, 
+                     'nmax'        => $nmax,
                      'maxtreshold' => $maxtreshold);
     }
 
@@ -319,22 +319,22 @@ extends WikiPluginCached
             $stats['sum']['major'] += $stats['page']['major'];
             $stats['sum']['minor'] += $stats['page']['minor'];
             $stats['page'] = array();
-*/            
+*/
         }
         $page_iter->free();
         $stats['numpages'] = $stats['latest']['major'] + $stats['latest']['minor'];
         $stats['latest']['major_perc'] = $stats['latest']['major'] * 100.0 / $stats['numpages'];
         $stats['latest']['minor_perc'] = $stats['latest']['minor'] * 100.0 / $stats['numpages'];
-        $empty = sprintf("empty pages: %d (%02.1f%%) / %d (100%%)\n", 
+        $empty = sprintf("empty pages: %d (%02.1f%%) / %d (100%%)\n",
                          $stats['empty'], $stats['empty'] * 100.0 / $stats['numpages'],
                          $stats['numpages']);
-        $latest = sprintf("latest revision: major %d (%02.1f%%) / minor %d (%02.1f%%) / all %d (100%%)\n", 
-                          $stats['latest']['major'], $stats['latest']['major_perc'], 
+        $latest = sprintf("latest revision: major %d (%02.1f%%) / minor %d (%02.1f%%) / all %d (100%%)\n",
+                          $stats['latest']['major'], $stats['latest']['major_perc'],
                           $stats['latest']['minor'], $stats['latest']['minor_perc'], $stats['numpages']);
-/*                          
+/*
         $stats['sum']['major_perc'] = $stats['sum']['major'] * 100.0 / $stats['sum']['all'];
         $stats['sum']['minor_perc'] = $stats['sum']['minor'] * 100.0 / $stats['sum']['all'];
-        $sum = sprintf("number of revisions: major %d (%02.1f%%) / minor %d (%02.1f%%) / all %d (100%%)\n", 
+        $sum = sprintf("number of revisions: major %d (%02.1f%%) / minor %d (%02.1f%%) / all %d (100%%)\n",
                        $stats['sum']['major'], $stats['sum']['major_perc'],
                        $stats['sum']['minor'], $stats['sum']['minor_perc'], $stats['sum']['all']);
 
@@ -344,7 +344,7 @@ extends WikiPluginCached
         $stats['perpage']['minor_perc'] = 100 - $stats['perpage']['major_perc'];
         $stats['perpage_minor']['sum']  = $stats['perpage']['sum'] - $stats['perpage_major']['sum'];
         $stats['perpage_minor']['mean'] = $stats['perpage_minor']['sum'] / ($stats['perpage']['n'] - $stats['perpage_major']['n']);
-        $perpage = sprintf("revisions per page: all %d, mean %02.1f / major %d (%02.1f%%) / minor %d (%02.1f%%)\n", 
+        $perpage = sprintf("revisions per page: all %d, mean %02.1f / major %d (%02.1f%%) / minor %d (%02.1f%%)\n",
                            $stats['perpage']['sum'], $stats['perpage']['mean'],
                            $stats['perpage_major']['mean'], $stats['perpage']['major_perc'],
                            $stats['perpage_minor']['mean'], $stats['perpage']['minor_perc']);
@@ -357,12 +357,12 @@ extends WikiPluginCached
         $content = $empty . $latest;
 
         // regenerate cache every 30 minutes
-        $cache->save($id, $content, '+1800', $cachedir); 
+        $cache->save($id, $content, '+1800', $cachedir);
         return $content;
     }
     // Size of databases/files/cvs are possible plus the known size of the app.
-    // Cache this costly operation. 
-    // Even if the whole plugin call is stored internally, we cache this 
+    // Cache this costly operation.
+    // Even if the whole plugin call is stored internally, we cache this
     // seperately with a seperate key.
     function discspace() {
         global $DBParams, $request;
@@ -396,7 +396,7 @@ extends WikiPluginCached
             $content = array('appsize' => $appsize,
                              'pagesize' => $pagesize);
             // regenerate cache every 30 minutes
-            $cache->save($id, $content, '+1800', $cachedir); 
+            $cache->save($id, $content, '+1800', $cachedir);
         } else {
             $appsize = $content['appsize'];
             $pagesize = $content['pagesize'];
diff --git a/lib/plugin/TeX2png.php b/lib/plugin/TeX2png.php
index 13558ab95..b20290533 100644
--- a/lib/plugin/TeX2png.php
+++ b/lib/plugin/TeX2png.php
@@ -2,7 +2,7 @@
 rcs_id('$Id$');
 /*
  * Copyright (C) Copyright 2004 Pierrick Meignen
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@ rcs_id('$Id$');
  */
 
 /**
- * This is a simple version of the original TexToPng plugin which uses 
+ * This is a simple version of the original TexToPng plugin which uses
  * the powerful plugincached mechanism.
  * TeX2png uses its own much simplier static cache in images/tex.
  *
@@ -44,20 +44,20 @@ extends WikiPlugin
     function getName () {
         return _("TeX2png");
     }
-    
+
     function getDescription () {
         return _("Convert Tex mathematicals expressions to cached png files." .
-		 " This is for small text");
+                 " This is for small text");
     }
-    
+
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',"\$Revision$");
     }
-    
+
     function getDefaultArguments() {
         return array('text' => "$$(a + b)^2 = a^2 + 2 ab + b^2$$");
     }
-    
+
     function parseArgStr($argstr) {
         // modified from WikiPlugin.php
         $arg_p = '\w+';
@@ -69,14 +69,14 @@ extends WikiPlugin
         $q_p  = "' ( (?:[^'\\\\]|\\\\.)* ) '";
         $gt_p = "_\\( $opt_ws $qq_p $opt_ws \\)";
         $argspec_p = "($arg_p) $opt_ws ($op_p) $opt_ws (?: $qq_p|$q_p|$gt_p|($word_p))";
-        
+
         $args = array();
         $defaults = array();
-        
+
         while (preg_match("/^$opt_ws $argspec_p $opt_ws/x", $argstr, $m)) {
             @ list(,$arg,$op,$qq_val,$q_val,$gt_val,$word_val) = $m;
             $argstr = substr($argstr, strlen($m[0]));
-            
+
             // Remove quotes from string values.
             if ($qq_val)
                 // we don't remove backslashes in tex formulas
@@ -88,7 +88,7 @@ extends WikiPlugin
                 $val = _(stripslashes($gt_val));
             else
                 $val = $word_val;
-            
+
             if ($op == '=') {
                 $args[$arg] = $val;
             }
@@ -103,14 +103,14 @@ extends WikiPlugin
                 $defaults[$arg] = $val;
             }
         }
-        
+
         if ($argstr) {
             $this->handle_plugin_args_cruft($argstr, $args);
         }
-        
+
         return array($args, $defaults);
     }
-    
+
     function createTexFile($texfile, $text) {
         // this is the small latex file
         // which contains only the mathematical
@@ -119,8 +119,8 @@ extends WikiPlugin
         $str = "\documentclass{article}\n";
         $str .= "\usepackage{amsfonts}\n";
         $str .= "\usepackage{amssymb}\n";
-        // Here tou can add some package in order 
-        // to produce more sophisticated output 
+        // Here tou can add some package in order
+        // to produce more sophisticated output
         $str .= "\pagestyle{empty}\n";
         $str .= "\begin{document}\n";
         $str .= $text . "\n";
@@ -154,7 +154,7 @@ extends WikiPlugin
         unlink("$imagepath/temp.log");
         return 0;
     }
-    
+
     function isMathExp(&$text) {
         // this function returns
         // 0 : text is too long or not a mathematical expression
@@ -168,8 +168,8 @@ extends WikiPlugin
             return 0;
         } elseif(strpos($text, '$', 1) == $last)
             return 1;
-        elseif($last > 3 && 
-               strpos($text, '$', 1) == 1 && 
+        elseif($last > 3 &&
+               strpos($text, '$', 1) == 1 &&
                strpos($text, '$', 2) == $last - 1)
             return 2;
         return 0;
@@ -183,7 +183,7 @@ extends WikiPlugin
         if(!file_exists($url)){
             if(is_writable($this->imagepath)){
                 $texfile = $this->imagepath . "/temp.tex";
-                $this->createTexFile($texfile, $text);     
+                $this->createTexFile($texfile, $text);
                 $this->createPngFile($this->imagepath, $imagename);
             } else {
                 $error_html = _("TeX imagepath not writable.");
@@ -193,33 +193,33 @@ extends WikiPlugin
 
         // there is always something in the html page
         // even if the tex directory doesn't exist
-        // or mathematical expression is wrong      
+        // or mathematical expression is wrong
         switch($this->isMathExp($text)) {
         case 0: // not a mathematical expression
-            $html = HTML::tt(array('class'=>'tex', 
-                                   'style'=>'color:red;'), $text); 
+            $html = HTML::tt(array('class'=>'tex',
+                                   'style'=>'color:red;'), $text);
             break;
         case 1: // an inlined mathematical expression
-            $html = HTML::img(array('class'=>'tex', 
-                                    'src' => $url, 
-                                    'alt' => $text)); 
+            $html = HTML::img(array('class'=>'tex',
+                                    'src' => $url,
+                                    'alt' => $text));
             break;
         case 2: // mathematical expression on separate line
-            $html = HTML::img(array('class'=>'tex', 
-                                    'src' => $url, 
+            $html = HTML::img(array('class'=>'tex',
+                                    'src' => $url,
                                     'alt' => $text));
-            $html = HTML::div(array('align' => 'center'), $html); 
+            $html = HTML::div(array('align' => 'center'), $html);
             break;
-        default: 
+        default:
             break;
         }
-        
+
         return $html;
     }
-    
+
     function run($dbi, $argstr, &$request, $basepage) {
         // from text2png.php
-        if ((function_exists('ImageTypes') and (ImageTypes() & IMG_PNG)) 
+        if ((function_exists('ImageTypes') and (ImageTypes() & IMG_PNG))
             or function_exists("ImagePNG"))
         {
             // we have gd & png so go ahead.
diff --git a/lib/plugin/Template.php b/lib/plugin/Template.php
index ac4d7418d..7cb7db831 100644
--- a/lib/plugin/Template.php
+++ b/lib/plugin/Template.php
@@ -32,7 +32,7 @@ rcs_id('$Id$');
  *
  * Parameter expansion:
  *   vars="var1=value1&var2=value2"
- * We only support named parameters, not numbered ones as in mediawiki, and 
+ * We only support named parameters, not numbered ones as in mediawiki, and
  * the placeholder is %%var%% and not {{{var}}} as in mediawiki.
  *
  * The following predefined uppercase variables are automatically expanded if existing:
@@ -40,17 +40,17 @@ rcs_id('$Id$');
  *   MTIME     - last modified date + time
  *   CTIME     - creation date + time
  *   AUTHOR    - last author
- *   OWNER     
+ *   OWNER
  *   CREATOR   - first author
  *   SERVER_URL, DATA_PATH, SCRIPT_NAME, PHPWIKI_BASE_URL and BASE_URL
  *
  * <noinclude> .. </noinclude>     is stripped from the template expansion.
- * <includeonly> .. </includeonly> is only expanded in pages using the template, 
+ * <includeonly> .. </includeonly> is only expanded in pages using the template,
  *                                 not in the template itself.
  *
- *   We support a mediawiki-style syntax extension which maps 
+ *   We support a mediawiki-style syntax extension which maps
  *     {{TemplateFilm|title=Some Good Film|year=1999}}
- *   to 
+ *   to
  *     <?plugin Template page=TemplateFilm vars="title=Some Good Film&year=1999" ?>
  */
 
@@ -71,7 +71,7 @@ extends WikiPlugin
     }
 
     function getDefaultArguments() {
-        return array( 
+        return array(
                      'page'    => false, // the page to include
                      'vars'    => false, // TODO: get rid of this, all remaining args should be vars
                      'rev'     => false, // the revision (defaults to most recent)
@@ -80,15 +80,15 @@ extends WikiPlugin
                      );
     }
     function allow_undeclared_arg($name, $value) {
-    	// either just allow it or you can store it here away also. 
-    	$this->vars[$name] = $value;
-    	return $name != 'action';
+            // either just allow it or you can store it here away also.
+            $this->vars[$name] = $value;
+            return $name != 'action';
     }
 
-    // TODO: check if page can really be pulled from the args, or if it is just the basepage. 
+    // TODO: check if page can really be pulled from the args, or if it is just the basepage.
     function getWikiPageLinks($argstr, $basepage) {
         $args = $this->getArgs($argstr);
-	$page = @$args['page'];
+        $page = @$args['page'];
         if ($page) {
             // Expand relative page names.
             $page = new WikiPageName($page, $basepage);
@@ -97,9 +97,9 @@ extends WikiPlugin
             return false;
         return array(array('linkto' => $page->name, 'relation' => 0));
     }
-                
+
     function run($dbi, $argstr, &$request, $basepage) {
-    	$this->vars = array();
+            $this->vars = array();
         $args = $this->getArgs($argstr, $request);
         $vars = $args['vars'] ? $args['vars'] : $this->vars;
         $page = $args['page'];
@@ -135,10 +135,10 @@ extends WikiPlugin
 
         // Check if user is allowed to get the Page.
         if (!mayAccessPage ('view', $page)) {
-        	return $this->error(sprintf(_("Illegal inclusion of page %s: no read access"),
+                return $this->error(sprintf(_("Illegal inclusion of page %s: no read access"),
                                         $page));
         }
-        
+
         $p = $dbi->getPage($page);
         if ($args['rev']) {
             $r = $p->getRevision($args['rev']);
@@ -159,7 +159,7 @@ extends WikiPlugin
           or (preg_match('/<<\s*RedirectTo\s+page="(.*?)"\s*>>/', implode("\n", $content), $m)))
         {
             // Strip quotes (simple or double) from page name if any
-            if ((string_starts_with($m[1], "'")) 
+            if ((string_starts_with($m[1], "'"))
               or (string_starts_with($m[1], "\""))) {
                 $m[1] = substr($m[1], 1, -1);
             }
@@ -179,15 +179,15 @@ extends WikiPlugin
             $c = extractSection($args['section'], $c, $page, $quiet, $args['sectionhead']);
             $initial_content = implode("\n", $c);
         }
-	// exclude from expansion
+        // exclude from expansion
         if (preg_match('/<noinclude>.+<\/noinclude>/s', $initial_content)) {
-            $initial_content = preg_replace("/<noinclude>.+?<\/noinclude>/s", "", 
+            $initial_content = preg_replace("/<noinclude>.+?<\/noinclude>/s", "",
                                             $initial_content);
         }
-	// only in expansion
-	$initial_content = preg_replace("/<includeonly>(.+)<\/includeonly>/s", "\\1",
-					$initial_content);
-	$this->doVariableExpansion($initial_content, $vars, $basepage, $request);
+        // only in expansion
+        $initial_content = preg_replace("/<includeonly>(.+)<\/includeonly>/s", "\\1",
+                                        $initial_content);
+        $this->doVariableExpansion($initial_content, $vars, $basepage, $request);
 
         array_push($included_pages, $page);
 
@@ -220,13 +220,13 @@ extends WikiPlugin
                     $var[$key] = $val;
                 }
             } elseif (is_array($vars)) {
-		$var =& $vars;
-	    }
+                $var =& $vars;
+            }
             $thispage = $dbi->getPage($basepage);
             // pagename and userid are not overridable
             $var['PAGENAME'] = $thispage->getName();
             if (preg_match('/%%USERID%%/', $content))
-		$var['USERID'] = $request->_user->getId();
+                $var['USERID'] = $request->_user->getId();
             if (empty($var['MTIME']) and preg_match('/%%MTIME%%/', $content)) {
                 $thisrev  = $thispage->getCurrentRevision(false);
                 $var['MTIME'] = $GLOBALS['WikiTheme']->formatDateTime($thisrev->get('mtime'));
@@ -254,7 +254,7 @@ extends WikiPlugin
                 $content = str_replace("%%".$key."%%", $val, $content);
             }
         }
-	return $content;
+        return $content;
     }
 };
 
diff --git a/lib/plugin/TexToPng.php b/lib/plugin/TexToPng.php
index bb935df4d..52dd59679 100644
--- a/lib/plugin/TexToPng.php
+++ b/lib/plugin/TexToPng.php
@@ -41,32 +41,32 @@ $texbin = '/usr/bin/tex';
 $dvipsbin = '/usr/bin/dvips';
 $pstoimgbin = '/usr/bin/pstoimg';
 
-// output mere debug messages (should be set to false in a stable 
+// output mere debug messages (should be set to false in a stable
 // version)
-   define('TexToPng_debug', false);                                          
+   define('TexToPng_debug', false);
 
 /*-----------------------------------------------------------------------
- | OPTION DEFAULTS                                                      
- *----------------------------------------------------------------------*/ 
+ | OPTION DEFAULTS
+ *----------------------------------------------------------------------*/
 /*----
  | use antialias for rendering;
  | anitalias: blurs, _looks better_, needs twice space, renders slowlier
- |                                                                      */  
-   define('TexToPng_antialias', true);    
+ |                                                                      */
+   define('TexToPng_antialias', true);
 
 /*----
- | Use transparent background; dont combine with antialias on a dark 
- | background. Seems to have a bug: produces strange effects for some 
- | ps-files (almost non readable,blurred output) even when directly 
+ | Use transparent background; dont combine with antialias on a dark
+ | background. Seems to have a bug: produces strange effects for some
+ | ps-files (almost non readable,blurred output) even when directly
  | invoked from shell. So its probably a pstoimg bug.
- |                                                                      */  
+ |                                                                      */
    define('TexToPng_transparent', false);
 
 /*----
  | default value for rescaling
- | allowed range: 0 - 5 (integer) 
- |                                                                      */  
-   define('TexToPng_magstep', 3);            
+ | allowed range: 0 - 5 (integer)
+ |                                                                      */
+   define('TexToPng_magstep', 3);
 
 
 /*-----------------------------------------------------------------------
@@ -88,13 +88,13 @@ $pstoimgbin = '/usr/bin/pstoimg';
 require_once "lib/WikiPluginCached.php";
 
 class WikiPlugin_TexToPng extends WikiPluginCached
-{   
-    /* --------- overwrite virtual or abstract methods ---------------- */ 
+{
+    /* --------- overwrite virtual or abstract methods ---------------- */
 
     function getPluginType() {
         return PLUGIN_CACHED_IMG_ONDEMAND;
     }
- 
+
     function getName() {
         return "TexToPng";
     }
@@ -102,7 +102,7 @@ class WikiPlugin_TexToPng extends WikiPluginCached
     function getDescription() {
         return _("Converts TeX to an image. May be used to embed formulas in PhpWiki.");
     }
-    
+
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
                             "\$Revision$");
@@ -114,7 +114,7 @@ class WikiPlugin_TexToPng extends WikiPluginCached
                      'img'          => 'png',
                      'subslash'     => 'off',
                      'antialias'    => TexToPng_antialias   ? 'on' : 'off',
-                     'transparent'  => TexToPng_transparent ? 'on' : 'off', 
+                     'transparent'  => TexToPng_transparent ? 'on' : 'off',
                      'center'       => 'off');
     }
 
@@ -134,15 +134,15 @@ class WikiPlugin_TexToPng extends WikiPluginCached
     }
 
     function getAlt($dbi, $argarray, $request) {
-        extract($argarray); 
-        return $tex; 
+        extract($argarray);
+        return $tex;
     }
 
     function embedImg($url,$dbi,$argarray,$request) {
-        $html = HTML::img( array( 
+        $html = HTML::img( array(
             'src'   => $url,
             'alt'   => htmlspecialchars($this->getAlt($dbi,$argarray,$request))
-            )); 
+            ));
         if ($argarray['center']=='on')
             return HTML::div( array('style' => 'text-align:center;'), $html);
         return $html;
@@ -156,7 +156,7 @@ class WikiPlugin_TexToPng extends WikiPluginCached
             $this->complain( $out."\n" );
         } else {
             if (!$this->_errortext) {
-                // yeah, I've been told to be quiet, but obviously 
+                // yeah, I've been told to be quiet, but obviously
                 // an error occured. So at least complain silently.
                 $this->complain(' ');
             }
@@ -169,7 +169,7 @@ class WikiPlugin_TexToPng extends WikiPluginCached
     function helptext() {
         $aa= TexToPng_antialias  ?'on(default)$|$off':'on$|$off(default)';
         $tp= TexToPng_transparent?'on(default)$|$off':'on$|$off(default)';
-        $help = 
+        $help =
           '/settabs/+/indent&$<$?plugin /bf{Tex} & [{/tt transparent}] & = "png(default)$|$jpeg$|$gif"& /cr'."\n".
           '/+&$<$?plugin /bf{TexToPng} & /hfill {/tt tex}           & = "/TeX/  commands"& /cr'."\n".
           '/+&                         & /hfill [{/tt img}]         & = "png(default)$|$jpeg$|$gif"& /cr'."\n".
@@ -178,12 +178,12 @@ class WikiPlugin_TexToPng extends WikiPluginCached
           '/+&                         & /hfill [{/tt subslash}]    & = "on$|$off(default)"& /cr'."\n".
           '/+&                         & /hfill [{/tt antialias}]   & = "'.$aa.'"& /cr'."\n".
           '/+&                         & /hfill [{/tt transparent}] & = "'.$tp.'"&?$>$ /cr'."\n";
-      
+
         return strtr($help, '/', '\\' );
-    } // helptext    
+    } // helptext
 
 
-    function checkParams( &$tex, &$magstep, $subslash, &$aalias, &$transp ) {  
+    function checkParams( &$tex, &$magstep, $subslash, &$aalias, &$transp ) {
 
         if ($subslash=='on') {
             // WORKAROUND for backslashes
@@ -197,7 +197,7 @@ class WikiPlugin_TexToPng extends WikiPluginCached
 
         if ($magstep < 0 || $magstep > 5 ) { $magstep = $def["magstep"]; }
         // calculate magnification factor
-        $magstep = floor(10*pow(1.2,$magstep))/10; 
+        $magstep = floor(10*pow(1.2,$magstep))/10;
 
         $aalias = $aalias != 'off';
         $transp = $transp != 'off';
@@ -209,16 +209,16 @@ class WikiPlugin_TexToPng extends WikiPluginCached
     function execute($cmd,$complainvisibly=false) {
         exec($cmd, $errortxt, $returnval);
         $ok = $returnval == 0;
-        
+
         if (!$ok) {
             if (!$complainvisibly) {
-                 $this->dbg('Error during execution of '.$cmd );                         
+                 $this->dbg('Error during execution of '.$cmd );
             };
             while (list($key,$value)=each($errortxt)) {
-                if ($complainvisibly) { 
+                if ($complainvisibly) {
                     $this->complain( $value."\n" );
                 } else {
-                    $this->dbg( $value );             
+                    $this->dbg( $value );
                 }
             }
         }
@@ -230,16 +230,16 @@ class WikiPlugin_TexToPng extends WikiPluginCached
     function createTexFile($texfile,$texstr) {
         if ($ok=($fp=fopen($texfile, 'w'))!=0 ) {
             // prepare .tex file
-            $texcommands = 
+            $texcommands =
                 '\nopagenumbers'   . "\n" .
                 '\hoffset=0cm'     . "\n" .
-                '\voffset=0cm'     . "\n" . 
+                '\voffset=0cm'     . "\n" .
             //    '\hsize=20cm'    . "\n" .
             //    '\vsize=10ex'    . "\n" .
                 $texstr            . "\n" .
                 '\vfill\eject'     . "\n" .
                 '\end'             . "\n\n";
-            
+
             $ok = fwrite($fp, $texcommands);
             $ok = fclose($fp) && $ok;  // close anyway
         }
@@ -249,26 +249,26 @@ class WikiPlugin_TexToPng extends WikiPluginCached
         return $ok;
     } // createTexFile
 
-    /* ---------------------------------------------------------------- */            
+    /* ---------------------------------------------------------------- */
 
     function TexToImg($texstr, $scale, $aalias, $transp) {
-        //$cacheparams = $GLOBALS['CacheParams'];        
+        //$cacheparams = $GLOBALS['CacheParams'];
         $tempfiles = $this->tempnam('TexToPng');
         $img = 0; // $size = 0;
 
         // procuce options for pstoimg
-        $options = 
+        $options =
            ($aalias ? '-aaliastext -color 8 ' : '-color 1 ') .
            ($transp ? '-transparent ' : '') .
            '-scale ' . $scale . ' ' .
            '-type png -crop btlr -geometry 600x150 -margins 0,0';
 
-        // rely on intelligent bool interpretation 
+        // rely on intelligent bool interpretation
         $ok= $tempfiles &&
              $this->createTexFile($tempfiles.'.tex',$texstr) &&
              $this->execute('cd '.$cacheparams['cache_dir'].'; '.
-                            "$texbin ".$tempfiles.'.tex',true) &&                  
-             $this->execute("$dvipsbin -o".$tempfiles.'.ps '.$tempfiles.'.dvi') &&  
+                            "$texbin ".$tempfiles.'.tex',true) &&
+             $this->execute("$dvipsbin -o".$tempfiles.'.ps '.$tempfiles.'.dvi') &&
              $this->execute("$pstoimgbin $options"
                             .' -out '.$tempfiles.'.png '.
                             $tempfiles.'.ps'               ) &&
@@ -278,7 +278,7 @@ class WikiPlugin_TexToPng extends WikiPluginCached
             if (!($img = ImageCreateFromPNG( $tempfiles.'.png' ))) {
                 $this->dbg("Could not open just created image file: $tempfiles");
                 $ok = false;
-            }     
+            }
         }
 
         // clean up tmpdir; in debug mode only if no error occured
@@ -286,7 +286,7 @@ class WikiPlugin_TexToPng extends WikiPluginCached
         if ( !TexToPng_debug || (TexToPng_debug && $ok))  {
             if ($tempfiles) {
                 unlink($tempfiles);
-                unlink($tempfiles . '.ps');        
+                unlink($tempfiles . '.ps');
                 unlink($tempfiles . '.tex');
                 //unlink($tempfiles . '.aux');
                 unlink($tempfiles . '.dvi');
@@ -296,7 +296,7 @@ class WikiPlugin_TexToPng extends WikiPluginCached
         }
 
         if ($ok) {
-            return $img; 
+            return $img;
         }
         return false;
     } // TexToImg
diff --git a/lib/plugin/TitleSearch.php b/lib/plugin/TitleSearch.php
index 8e2274a19..7de860950 100644
--- a/lib/plugin/TitleSearch.php
+++ b/lib/plugin/TitleSearch.php
@@ -25,16 +25,16 @@ require_once('lib/TextSearchQuery.php');
 require_once('lib/PageList.php');
 
 /**
- * Display results of pagename search. 
+ * Display results of pagename search.
  * Provides no own input box, just <?plugin-form TitleSearch ?> is enough.
  * Fancier Inputforms can be made using WikiForm Rich, to support regex and case_exact args.
  *
- * If only one pages is found and auto_redirect is true, this page is displayed immediatly, 
+ * If only one pages is found and auto_redirect is true, this page is displayed immediatly,
  * otherwise the found pagelist is displayed.
- * The workhorse TextSearchQuery converts the query string from google-style words 
+ * The workhorse TextSearchQuery converts the query string from google-style words
  * to the required DB backend expression.
  *   (word and word) OR word, -word, "two words"
- * regex=auto tries to detect simple glob-style wildcards and expressions, 
+ * regex=auto tries to detect simple glob-style wildcards and expressions,
  * like xx*, *xx, ^xx, xx$, ^word$.
  */
 class WikiPlugin_TitleSearch
@@ -63,8 +63,8 @@ extends WikiPlugin
                    'exclude'       => false,
                    'info'          => false,
                    'case_exact'    => false,
-                   'regex'     	   => 'auto',
-                   'format'    	   => false,
+                   'regex'                => 'auto',
+                   'format'               => false,
                    ));
     }
     // info arg allows multiple columns
@@ -77,14 +77,14 @@ extends WikiPlugin
             return HTML();
         }
 
-        // ^S != S*   ^  matches only beginning of phrase, not of word. 
+        // ^S != S*   ^  matches only beginning of phrase, not of word.
         //            x* matches any word beginning with x
         $query = new TextSearchQuery($args['s'], $args['case_exact'], $args['regex']);
         $pages = $dbi->titleSearch($query,$args['sortby'],$args['limit'],$args['exclude']);
 
         $pagelist = new PageList($args['info'], $args['exclude'], $args);
         $pagelist->addPages($pages);
-	// this hack will go away
+        // this hack will go away
         if ($args['format'] == 'livesearch') {
             $request->discardOutput();
             $request->buffer_output(false);
@@ -105,7 +105,7 @@ extends WikiPlugin
                 $s = WikiLink($args['s'], 'auto');
             }
             if ($total) {
-            	$pagelist->setCaption(fmt("Title search results for '%s' (%d total)", $s, $total));
+                    $pagelist->setCaption(fmt("Title search results for '%s' (%d total)", $s, $total));
             } else {
                 $pagelist->setCaption(fmt("Title search results for '%s'", $s));
             }
diff --git a/lib/plugin/Transclude.php b/lib/plugin/Transclude.php
index 73fcf5d85..83c760e14 100644
--- a/lib/plugin/Transclude.php
+++ b/lib/plugin/Transclude.php
@@ -77,15 +77,15 @@ extends WikiPlugin
         if (!$src) {
             return $this->error(fmt("%s parameter missing", "'src'"));
         }
-	// Expand possible interwiki link for src
-	if (strstr($src,':')
+        // Expand possible interwiki link for src
+        if (strstr($src,':')
             and (!strstr($src,'://'))
-            and ($intermap = getInterwikiMap()) 
-            and preg_match("/^" . $intermap->getRegexp() . ":/", $src)) 
+            and ($intermap = getInterwikiMap())
+            and preg_match("/^" . $intermap->getRegexp() . ":/", $src))
         {
-	    $link = $intermap->link($src);
-	    $src = $link->getAttr('href');
-	}
+            $link = $intermap->link($src);
+            $src = $link->getAttr('href');
+        }
 
         // FIXME: Better recursion detection.
         // FIXME: Currently this doesnt work at all.
diff --git a/lib/plugin/TranslateText.php b/lib/plugin/TranslateText.php
index 78359f046..d07fdd2e6 100644
--- a/lib/plugin/TranslateText.php
+++ b/lib/plugin/TranslateText.php
@@ -54,7 +54,7 @@ extends WikiPlugin__WikiTranslation
     }
 
     function getDefaultArguments() {
-        return 
+        return
             array( 'lang'      => false,
                    'pagename'  => '[pagename]',
                    'translate' => false,
@@ -67,7 +67,7 @@ extends WikiPlugin__WikiTranslation
             return $this->error(
                 _("This internal action page cannot viewed.")."\n".
                 _("You can only use it via the _WikiTranslation plugin."));
-           
+
         $this->lang = $lang;
         //action=save
         if (!empty($translate) and isset($translate['submit']) and $request->isPost()) {
@@ -101,7 +101,7 @@ extends WikiPlugin__WikiTranslation
                 $page->save($text, $version + 1, $meta);
                 // TODO: admin notification
                 return HTML(HTML::h2(_("Thanks for adding this translation!")),
-                            HTML::p(fmt("Your translated text doesn't yet appear in this %s, but the Administrator will pick it up and add to the installation.", 
+                            HTML::p(fmt("Your translated text doesn't yet appear in this %s, but the Administrator will pick it up and add to the installation.",
                                        WIKI_NAME)),
                             fmt("Your translation is stored in %s",WikiLink($transpagename)));
             }
diff --git a/lib/plugin/UnfoldSubpages.php b/lib/plugin/UnfoldSubpages.php
index ba716507d..1385bfd73 100644
--- a/lib/plugin/UnfoldSubpages.php
+++ b/lib/plugin/UnfoldSubpages.php
@@ -24,7 +24,7 @@ rcs_id('$Id$');
  * UnfoldSubpages:  Lists the content of all SubPages of the current page.
  *   This is e.g. useful for the CalendarPlugin, to see all entries at once.
  *   Warning: Better don't use it with non-existant sections!
- *	      The section extractor is currently quite unstable.
+ *              The section extractor is currently quite unstable.
  * Usage:   <?plugin UnfoldSubpages sortby=-mtime words=50 maxpages=5 ?>
  * Author:  Reini Urban <rurban@x-ray.at>
  */
@@ -60,46 +60,46 @@ extends WikiPlugin_IncludePage
                    'sortby'   => '',    // [+|-]pagename, [+|-]mtime, [+|-]hits
                    'maxpages' => false, // maximum number of pages to include (== limit)
                    'smalltitle' => false, // if set, hide transclusion-title,
-                   			//  just have a small link at the start of 
-            				//  the page.
-                   'words'   => false, 	// maximum number of words
-                                	//  per page to include
-                   'lines'   => false, 	// maximum number of lines
-                                	//  per page to include
-                   'bytes'   => false, 	// maximum number of bytes
-                                	//  per page to include
+                                           //  just have a small link at the start of
+                                            //  the page.
+                   'words'   => false,         // maximum number of words
+                                        //  per page to include
+                   'lines'   => false,         // maximum number of lines
+                                        //  per page to include
+                   'bytes'   => false,         // maximum number of bytes
+                                        //  per page to include
                    'sections' => false, // maximum number of sections per page to include
-                   'section' => false, 	// this named section per page only
+                   'section' => false,         // this named section per page only
                    'sectionhead' => false // when including a named
-                   			//  section show the heading
+                                           //  section show the heading
                    ));
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
         static $included_pages = false;
         if (!$included_pages) $included_pages = array($basepage);
-        
+
         $args = $this->getArgs($argstr, $request);
         extract($args);
         $query = new TextSearchQuery($pagename . SUBPAGE_SEPARATOR . '*', true, 'glob');
         $subpages = $dbi->titleSearch($query, $sortby, $limit, $exclude);
         //if ($sortby)
         //    $subpages = $subpages->applyFilters(array('sortby' => $sortby, 'limit' => $limit, 'exclude' => $exclude));
-        //$subpages = explodePageList($pagename . SUBPAGE_SEPARATOR . '*', false, 
+        //$subpages = explodePageList($pagename . SUBPAGE_SEPARATOR . '*', false,
         //                            $sortby, $limit, $exclude);
-	if (is_string($exclude) and !is_array($exclude))
+        if (is_string($exclude) and !is_array($exclude))
             $exclude = PageList::explodePageList($exclude, false, false, $limit);
         $content = HTML();
 
         include_once('lib/BlockParser.php');
-	$i = 0;
+        $i = 0;
         while ($page = $subpages->next()) {
             $cpagename = $page->getName();
-     	    if ($maxpages and ($i++ > $maxpages)) {
+                 if ($maxpages and ($i++ > $maxpages)) {
                 return $content;
             }
             if (in_array($cpagename, $exclude))
-            	continue;
+                    continue;
             // A page cannot include itself. Avoid doublettes.
             if (in_array($cpagename, $included_pages)) {
                 $content->pushContent(HTML::p(sprintf(_("recursive inclusion of page %s ignored"),
@@ -109,8 +109,8 @@ extends WikiPlugin_IncludePage
 
             // Check if user is allowed to get the Page.
             if (!mayAccessPage ('view', $cpagename)) {
-            	return $this->error(sprintf(_("Illegal inclusion of page %s: no read access"),
-            	$cpagename));
+                    return $this->error(sprintf(_("Illegal inclusion of page %s: no read access"),
+                    $cpagename));
             }
 
             // trap any remaining nonexistant subpages
@@ -130,21 +130,21 @@ extends WikiPlugin_IncludePage
                     }
                     // trap recursive redirects
                     if (in_array($m[1], $included_pages)) {
-                    	if (!$quiet)
+                            if (!$quiet)
                             $content->pushContent(
                                 HTML::p(sprintf(_("recursive inclusion of page %s ignored"),
                                                 $cpagename.' => '.$m[1])));
                         continue;
                     }
-	                $cpagename = $m[1];
-	            
-            		// Check if user is allowed to get the Page.
-            		if (!mayAccessPage ('view', $cpagename)) {
-            			return $this->error(sprintf(_("Illegal inclusion of page %s: no read access"),
-            			$cpagename));
-            		}
-
-	                $page = $dbi->getPage($cpagename);
+                        $cpagename = $m[1];
+
+                            // Check if user is allowed to get the Page.
+                            if (!mayAccessPage ('view', $cpagename)) {
+                                    return $this->error(sprintf(_("Illegal inclusion of page %s: no read access"),
+                                    $cpagename));
+                            }
+
+                        $page = $dbi->getPage($cpagename);
                     $r = $page->getCurrentRevision();
                     $c = $r->getContent();   // array of lines
                 }
diff --git a/lib/plugin/UpLoad.php b/lib/plugin/UpLoad.php
index fe4918441..95c3faa18 100644
--- a/lib/plugin/UpLoad.php
+++ b/lib/plugin/UpLoad.php
@@ -55,13 +55,13 @@ extends WikiPlugin
 
     function getDefaultArguments() {
         return array('logfile'  => 'phpwiki-upload.log',
-        	     // add a link of the fresh file automatically to the 
-        	     // end of the page (or current page)
-        	     'autolink' => true, 
-        	     'page'     => '[pagename]',
-        	     'size'     => 50,
-        	     'mode'     => 'actionpage', // or edit
-        	     );
+                     // add a link of the fresh file automatically to the
+                     // end of the page (or current page)
+                     'autolink' => true,
+                     'page'     => '[pagename]',
+                     'size'     => 50,
+                     'mode'     => 'actionpage', // or edit
+                     );
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
@@ -198,65 +198,65 @@ ws[cfh]");
                 return $result;
             }
         }
-        
+
         $userfile = $request->getUploadedFile('userfile');
         if ($userfile) {
             $userfile_name = $userfile->getName();
             $userfile_name = trim(basename($userfile_name));
-	    if (UPLOAD_USERDIR) {
-		$file_dir .= $request->_user->_userid;
-		if (!file_exists($file_dir))
-		    mkdir($file_dir, 0775);
-		$file_dir .= "/";
-		$u_userfile = $request->_user->_userid . "/" . $userfile_name;
-	    } else {
-		$u_userfile = $userfile_name;
-	    }
-	    $u_userfile = preg_replace("/ /", "%20", $u_userfile);
+            if (UPLOAD_USERDIR) {
+                $file_dir .= $request->_user->_userid;
+                if (!file_exists($file_dir))
+                    mkdir($file_dir, 0775);
+                $file_dir .= "/";
+                $u_userfile = $request->_user->_userid . "/" . $userfile_name;
+            } else {
+                $u_userfile = $userfile_name;
+            }
+            $u_userfile = preg_replace("/ /", "%20", $u_userfile);
             $userfile_tmpname = $userfile->getTmpName();
-	    $err_header = HTML::div(array('class' => 'error'),
+            $err_header = HTML::div(array('class' => 'error'),
                                 HTML::p(fmt("ERROR uploading '%s'", $userfile_name)));
             if (preg_match("/(\." . join("|\.", $this->disallowed_extensions) . ")(\.|\$)/i",
                            $userfile_name))
             {
-            	$message->pushContent($err_header);
+                    $message->pushContent($err_header);
                 $message->pushContent(HTML::p(fmt("Files with extension %s are not allowed.",
                                               join(", ", $this->disallowed_extensions))));
             }
-            elseif (! DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS and 
-                    ! preg_match("/(\." . join("|\.", $this->allowed_extensions) . ")\$/i", 
+            elseif (! DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS and
+                    ! preg_match("/(\." . join("|\.", $this->allowed_extensions) . ")\$/i",
                                $userfile_name))
             {
-            	$message->pushContent($err_header);
+                    $message->pushContent($err_header);
                 $message->pushContent(HTML::p(fmt("Only files with the extension %s are allowed.",
                                               join(", ", $this->allowed_extensions))));
             }
             elseif (preg_match("/[^._a-zA-Z0-9- ]/", strip_accents($userfile_name)))
             {
-            	$message->pushContent($err_header);
+                    $message->pushContent($err_header);
                 $message->pushContent(HTML::p(_("Invalid filename. File names may only contain alphanumeric characters and dot, underscore, space or dash.")));
             }
             elseif (file_exists($file_dir . $userfile_name)) {
-            	$message->pushContent($err_header);
+                    $message->pushContent($err_header);
                 $message->pushContent(HTML::p(fmt("There is already a file with name %s uploaded.",
                                                   $u_userfile)));
             }
             elseif ($userfile->getSize() > (MAX_UPLOAD_SIZE)) {
-            	$message->pushContent($err_header);
+                    $message->pushContent($err_header);
                 $message->pushContent(HTML::p(_("Sorry but this file is too big.")));
             }
             elseif (move_uploaded_file($userfile_tmpname, $file_dir . $userfile_name) or
                     (IsWindows() and rename($userfile_tmpname, $file_dir . $userfile_name))
                     )
             {
-            	$interwiki = new PageType_interwikimap();
-		$link = $interwiki->link("Upload:$u_userfile");
+                    $interwiki = new PageType_interwikimap();
+                $link = $interwiki->link("Upload:$u_userfile");
                 $message->pushContent(HTML::div(array('class' => 'feedback'),
                                                 HTML::p(_("File successfully uploaded.")),
                                                 HTML::p($link)));
 
                 // the upload was a success and we need to mark this event in the "upload log"
-                if ($logfile) { 
+                if ($logfile) {
                     $upload_log = $file_dir . basename($logfile);
                     $this->log($userfile, $upload_log, $message);
                 }
@@ -274,7 +274,7 @@ ws[cfh]");
                     }
                 }
             } else {
-            	$message->pushContent($err_header);
+                    $message->pushContent($err_header);
                 $message->pushContent(HTML::br(),_("Uploading failed."),HTML::br());
             }
         }
@@ -290,8 +290,8 @@ ws[cfh]");
     }
 
     function log ($userfile, $upload_log, &$message) {
-    	global $WikiTheme;
-    	$user = $GLOBALS['request']->_user;
+            global $WikiTheme;
+            $user = $GLOBALS['request']->_user;
         if (file_exists($upload_log) and (!is_writable($upload_log))) {
             trigger_error(_("The upload logfile exists but is not writable."), E_USER_WARNING);
         }
diff --git a/lib/plugin/UriResolver.php b/lib/plugin/UriResolver.php
index 8692ab232..d5a4efde4 100644
--- a/lib/plugin/UriResolver.php
+++ b/lib/plugin/UriResolver.php
@@ -21,7 +21,7 @@ rcs_id('$Id$');
  */
 
 /**
- * UriResolver/uri => xml-id 
+ * UriResolver/uri => xml-id
  *   This function transforms a valid url-encoded URI into a string
  *   that can be used as an XML-ID. The mapping should be injective.
  * Inverse to RdfWriter::makeURIfromXMLExportId()
@@ -50,17 +50,17 @@ extends WikiPlugin
     }
 
     function allow_undeclared_arg() {
-	return true;
+        return true;
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-	$args = $request->getArgs();
-	unset($args['pagename']);
-	unset($args['action']);
-	unset($args['start_debug']);
-	// FIXME: ?Test=1 => Test
-	$arg = join("/",array_keys($args));
-	$xmlid = RdfWriter::makeXMLExportId($arg);
+        $args = $request->getArgs();
+        unset($args['pagename']);
+        unset($args['action']);
+        unset($args['start_debug']);
+        // FIXME: ?Test=1 => Test
+        $arg = join("/",array_keys($args));
+        $xmlid = RdfWriter::makeXMLExportId($arg);
         return $xmlid;
     }
 };
diff --git a/lib/plugin/UserPreferences.php b/lib/plugin/UserPreferences.php
index 39f77aa8d..33c413d60 100644
--- a/lib/plugin/UserPreferences.php
+++ b/lib/plugin/UserPreferences.php
@@ -24,10 +24,10 @@ rcs_id('$Id$');
 /**
  * Plugin to allow any user to adjust his own preferences.
  * This must be used in the page "UserPreferences".
- * Prefs are stored in metadata in the current session, 
+ * Prefs are stored in metadata in the current session,
  *  within the user's home page or in a database.
  *
- * WikiTheme extension: WikiThemes are able to extend the predefined list 
+ * WikiTheme extension: WikiThemes are able to extend the predefined list
  * of preferences.
  */
 class WikiPlugin_UserPreferences
@@ -52,8 +52,8 @@ extends WikiPlugin
         global $request;
         $pagename = $request->getArg('pagename');
         $user = $request->getUser();
-        if ( isset($user->_prefs) and 
-             isset($user->_prefs->_prefs) and 
+        if ( isset($user->_prefs) and
+             isset($user->_prefs->_prefs) and
              isset($user->_prefs->_method) ) {
             $pref =& $user->_prefs;
         } else {
@@ -78,8 +78,8 @@ extends WikiPlugin
                                  _("Error: You are not logged in, cannot display UserPreferences."));
             }
         }
-        if ((!$request->isActionPage($request->getArg('pagename')) 
-             and (!isset($user->_prefs->_method) 
+        if ((!$request->isActionPage($request->getArg('pagename'))
+             and (!isset($user->_prefs->_method)
                   or !in_array($user->_prefs->_method, array('ADODB','SQL','PDO'))))
             or (in_array($request->getArg('action'), array('zip','ziphtml','dumphtml')))
             or (isa($user,'_ForbiddenUser')))
@@ -89,7 +89,7 @@ extends WikiPlugin
 //            foreach ($no_args as $key => $value) {
 //                $no_args[$value] = false;
 //            }
-            $no_args['errmsg'] = HTML::div(array('class' => 'errors'), 
+            $no_args['errmsg'] = HTML::div(array('class' => 'errors'),
                                            _("Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."));
             $no_args['isForm'] = false;
             return Template('userprefs', $no_args);
@@ -101,9 +101,9 @@ extends WikiPlugin
             $pref = &$request->_prefs;
             $args['isForm'] = true;
             //trigger_error("DEBUG: reading prefs from getPreferences".print_r($pref));
- 
+
             if ($request->isPost()) {
-            	$errmsg = '';
+                    $errmsg = '';
                 $delete = $request->getArg('delete');
                 if ($delete and $request->getArg('verify')) {
                     // deleting prefs, verified
@@ -161,12 +161,12 @@ extends WikiPlugin
                             $errmsg .= " " ._("No changes.");
                         } else {
                             $request->_setUser($user);
-                            $pref = $user->_prefs;	
+                            $pref = $user->_prefs;
                             if ($num == 1) {
                                 $errmsg .= _("One UserPreferences field successfully updated.");
-                            } else { 
+                            } else {
                             $errmsg .= sprintf(_("%d UserPreferences fields successfully updated."), $num);
-                        }  
+                        }
                     }
                     }
                     $args['errmsg'] = HTML::div(array('class' => 'feedback'), HTML::p($errmsg));
diff --git a/lib/plugin/UserRatings.php b/lib/plugin/UserRatings.php
index 7d5ed929f..4d97b1cce 100644
--- a/lib/plugin/UserRatings.php
+++ b/lib/plugin/UserRatings.php
@@ -58,7 +58,7 @@ extends WikiPlugin
 
     function getDefaultArguments() {
         return array('dimension' => '0',
-                     // array of userids to display ratings for; null/empty for 
+                     // array of userids to display ratings for; null/empty for
                      // active user only
                      'userids'  => null,
                      // array of pageids to display ratings for; null for all
@@ -90,7 +90,7 @@ extends WikiPlugin
 
         $active_user   = $request->getUser();
         $active_userid = $active_user->_userid;
-        
+
         // check for request to display a category's ratings
         if(isset($category) && is_string($category) && strlen($category))
         {
@@ -101,10 +101,10 @@ extends WikiPlugin
             {
                 array_push($pageids, $item->getName());
             }
-            // XXX: is there a way to retrieve the preferred plural 
+            // XXX: is there a way to retrieve the preferred plural
             // representation of a category name?
             // XXX: should the category text be a link?  can it be one easily?
-            
+
             $caption = sprintf(_("Showing all %ss (%%d):"), $category);
         }
         // if null is passed as the pageids argument and no category was passed,
@@ -112,13 +112,13 @@ extends WikiPlugin
         elseif(!isset($pageids) || !is_array($pageids))
         {
             // XXX: need support for sorted ratings
-            // bug: pages excluded from the PageList via the "exclude" argument 
+            // bug: pages excluded from the PageList via the "exclude" argument
             // count toward the limit!
             $pageids = array();
-            
+
             $active_user_ratings_user = & RatingsUserFactory::getUser($active_user->getId());
             $current_user_ratings = $active_user_ratings_user->get_ratings();
-            
+
             if ($userPage){
                 //we're on a user's homepage, get *their* ratings
                 $this_page_user = & RatingsUserFactory::getUser($userPage);
@@ -127,9 +127,9 @@ extends WikiPlugin
             } else {
                 $caption = _("Here are your %d page ratings:");
                 $ratings = $current_user_ratings;
-            }    
-            
-            
+            }
+
+
             $i = 0;
             foreach($ratings as $pagename => $page_ratings)
             {
@@ -160,13 +160,13 @@ extends WikiPlugin
                     $userids = getBuddies($active_userid, $dbi, $category_page->getName());
                 } else {
                    $userids = getBuddies($active_userid, $dbi);
-                } 
+                }
             }
             elseif ($userPage)
             {
                 //we're on a user page, show that user's ratings as the only column
                 $userids = array();
-                array_push($userids, $userPage);   
+                array_push($userids, $userPage);
             }
             else
             {
@@ -177,7 +177,7 @@ extends WikiPlugin
         }
 
         // find out which users we should show ratings for
-        
+
         // users allowed in the prediction calculation
         $allowed_users = array();
         // users actually allowed to be shown to the user
@@ -196,22 +196,22 @@ extends WikiPlugin
             unset($user);
         }
         // if no buddies, use allusers in prediction calculation
-        
+
         if (count($userids) == 0 || $userPage){
            $allowed_users = array();
            //$people_iter = $dbi->get_users_rated();
             $people_dbi = RatingsDb::getTheRatingsDb();
             $people_iter = $people_dbi->sql_get_users_rated();
             while ($people_array = $people_iter->next()) {
-		if (isset($people_array['pagename'])) {
-		    $userid = $people_array['pagename']; 
-		    $user = & RatingsUserFactory::getUser($userid);
-		    array_push($allowed_users, $user);
-		}
+                if (isset($people_array['pagename'])) {
+                    $userid = $people_array['pagename'];
+                    $user = & RatingsUserFactory::getUser($userid);
+                    array_push($allowed_users, $user);
+                }
             }
-            
+
          }
-        
+
 
         $columns = $info ? explode(",", $info) : array();
         // build our table...
@@ -221,11 +221,11 @@ extends WikiPlugin
         //$preds = new _PageList_Column_prediction('prediction', _("Pred"), 'right', $dimension, $allowed_users);
         $preds = array('_PageList_column_prediction','custom:prediction', _("Pred"),'right',' ' , $allowed_users);
         $pagelist->addColumnObject($preds);
-        
-        //$widget = new _PageList_Column_ratingwidget('ratingwidget', _("Rate"), 'left', $dimension);        
+
+        //$widget = new _PageList_Column_ratingwidget('ratingwidget', _("Rate"), 'left', $dimension);
         $widget = array('_PageList_column_ratingwidget','custom:ratingwidget', _("Rate"), 'center');
         $pagelist->addColumnObject($widget);
-        
+
         $noRatingUsers = array();
         if (!$nobuds){
             foreach($allowed_users_toshow as $idx => $user) {
@@ -243,11 +243,11 @@ extends WikiPlugin
             // addPage can deal with cases where it is passed a string
             $pagelist->addPage($pagename);
         }
-        
+
         if (! $noheader) {
             $pagelist->setCaption(_($caption));
         }
-        
+
 
         return $pagelist;
     }
diff --git a/lib/plugin/VisualWiki.php b/lib/plugin/VisualWiki.php
index 44152a6e2..5e2b33b48 100644
--- a/lib/plugin/VisualWiki.php
+++ b/lib/plugin/VisualWiki.php
@@ -41,8 +41,8 @@ extends WikiPlugin_GraphViz
      * Sets plugin type to map production
      */
     function getPluginType() {
-        return ($GLOBALS['request']->getArg('debug')) ? PLUGIN_CACHED_IMG_ONDEMAND 
-	    					      : PLUGIN_CACHED_MAP;
+        return ($GLOBALS['request']->getArg('debug')) ? PLUGIN_CACHED_IMG_ONDEMAND
+                                                          : PLUGIN_CACHED_MAP;
     }
 
     /**
@@ -162,7 +162,7 @@ extends WikiPlugin_GraphViz
         $this->extract_wikipages($dbi, $argarray);
         /* ($dbi,  $large, $recent, $refined, $backlink,
             $neighbour, $excludelist, $includelist, $color); */
-    	$result = $this->invokeDot($argarray);
+            $result = $this->invokeDot($argarray);
         if (isa($result, 'HtmlElement'))
             return array(false, $result);
         else
@@ -299,9 +299,9 @@ extends WikiPlugin_GraphViz
 
         // remove INCLUDED from EXCLUDED, includes override excludes.
         if ($exclude_list and $include_list) {
-        	$diff = array_diff($exclude_list, $include_list);
-        	if ($diff)
-        	    $exclude_list = $diff;
+                $diff = array_diff($exclude_list, $include_list);
+                if ($diff)
+                    $exclude_list = $diff;
         }
 
         // collect all pages
@@ -313,7 +313,7 @@ extends WikiPlugin_GraphViz
 
             // skip excluded pages
             if (in_array($name, $exclude_list)) {
-            	$page->free();	
+                    $page->free();
                 continue;
             }
 
@@ -508,7 +508,7 @@ extends WikiPlugin_GraphViz
                 $legend[] = $name;
             }
             $dot .= '        '. join(' -> ', $legend)
-		. ";\n    }\n";
+                . ";\n    }\n";
         }
 
         // {
@@ -522,8 +522,8 @@ extends WikiPlugin_GraphViz
     }
 
 
-    /** 
-     * static workaround on broken Cache or broken dot executable, 
+    /**
+     * static workaround on broken Cache or broken dot executable,
      * called only if debug=static.
      *
      * @access private
@@ -531,10 +531,10 @@ extends WikiPlugin_GraphViz
      * @param  map      string  &lt;area&gt; tags defining active
      *                          regions in the map
      * @param  dbi      WikiDB  database abstraction class
-     * @param  argarray array   complete (!) arguments to produce 
-     *                          image. It is not necessary to call 
+     * @param  argarray array   complete (!) arguments to produce
+     *                          image. It is not necessary to call
      *                          WikiPlugin->getArgs anymore.
-     * @param  request  Request ??? 
+     * @param  request  Request ???
      * @return          string  html output
      */
     function embedImg($url,&$dbi,$argarray,&$request) {
@@ -551,7 +551,7 @@ extends WikiPlugin_GraphViz
         $file_dir = getUploadFilePath();
         $upload_dir = getUploadDataPath();
         $tmpfile = tempnam($file_dir,"VisualWiki").".".$argarray['imgtype'];
-        WikiPluginCached::writeImage($argarray['imgtype'], $imagehandle, $tmpfile);             
+        WikiPluginCached::writeImage($argarray['imgtype'], $imagehandle, $tmpfile);
         ImageDestroy($imagehandle);
         return WikiPluginCached::embedMap(1,$upload_dir.basename($tmpfile),$content['html'],
                                           $dbi,$argarray,$request);
diff --git a/lib/plugin/WantedPages.php b/lib/plugin/WantedPages.php
index 8dc60a719..9b24bf38d 100644
--- a/lib/plugin/WantedPages.php
+++ b/lib/plugin/WantedPages.php
@@ -2,7 +2,7 @@
 rcs_id('$Id$');
 /*
  * Copyright (C) 2002, 2004 $ThePhpWikiProgrammingTeam
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -50,7 +50,7 @@ extends WikiPlugin
             (
              PageList::supportedArgs(),
              array('page'     => '[pagename]', // just for a single page.
-		   'withlinks' => 0,
+                   'withlinks' => 0,
                    'noheader' => false,
                    'exclude_from'  => _("PgsrcTranslation").','._("InterWikiMap"),
                    'limit'    => '100',
@@ -64,7 +64,7 @@ extends WikiPlugin
         $args = $this->getArgs($argstr, $request);
         if (!empty($args['exclude_from']))
             $args['exclude_from'] = is_string($args['exclude_from'])
-                ? explodePageList($args['exclude_from']) 
+                ? explodePageList($args['exclude_from'])
                 : $args['exclude_from']; // <! plugin-list !>
         extract($args);
         if ($page == _("WantedPages")) $page = "";
@@ -77,16 +77,16 @@ extends WikiPlugin
         if (!$page and $withlinks) {
             $GLOBALS['WikiTheme']->addPageListColumn(
                 array('wanted' => array('_PageList_Column_WantedPages_wanted', 'custom:wanted', _("Wanted From"), 'left')));
-	    $info = "pagename,wanted";
-	} elseif ($page) {
+            $info = "pagename,wanted";
+        } elseif ($page) {
             //only get WantedPages links for one page
-	    $info = "";
-	} else {
+            $info = "";
+        } else {
             // just link to links
             $GLOBALS['WikiTheme']->addPageListColumn(
                 array('links' => array('_PageList_Column_WantedPages_links', 'custom:links', _("Links"), 'left')));
-	    $info = "pagename,links";
-	}
+            $info = "pagename,links";
+        }
         $pagelist = new PageList($info, $exclude, $args); // search button?
         $pagelist->_wpagelist = array();
 
@@ -94,15 +94,15 @@ extends WikiPlugin
             list($offset, $maxcount) = $pagelist->limit($limit);
             $wanted_iter = $dbi->wantedPages($exclude_from, $exclude, $sortby, $limit);
             while ($row = $wanted_iter->next()) {
-            	$wantedfrom = $row['pagename'];
-            	$wanted = $row['wantedfrom'];
-            	// ignore duplicates:
-            	if (empty($pagelist->_wpagelist[$wanted]))
-            	    $pagelist->addPage($wanted);
-            	if (!isset($pagelist->_wpagelist[$wanted]))
-            	    $pagelist->_wpagelist[$wanted][] = $wantedfrom;
-            	elseif (!in_array($wantedfrom, $pagelist->_wpagelist[$wanted]))
-            	    $pagelist->_wpagelist[$wanted][] = $wantedfrom;
+                    $wantedfrom = $row['pagename'];
+                    $wanted = $row['wantedfrom'];
+                    // ignore duplicates:
+                    if (empty($pagelist->_wpagelist[$wanted]))
+                        $pagelist->addPage($wanted);
+                    if (!isset($pagelist->_wpagelist[$wanted]))
+                        $pagelist->_wpagelist[$wanted][] = $wantedfrom;
+                    elseif (!in_array($wantedfrom, $pagelist->_wpagelist[$wanted]))
+                        $pagelist->_wpagelist[$wanted][] = $wantedfrom;
             }
             $wanted_iter->free();
             unset($wanted_iter);
@@ -133,7 +133,7 @@ extends WikiPlugin
                 $pagelist->setCaption(sprintf(_("Wanted Pages in this wiki:")));
         }
         // reference obviously doesn't work, so force an update to add _wpagelist to parentobj
-        if (isset($pagelist->_columns[1]) 
+        if (isset($pagelist->_columns[1])
             and in_array($pagelist->_columns[1]->_field, array('wanted','links')))
             $pagelist->_columns[1]->parentobj =& $pagelist;
         return $pagelist;
@@ -147,12 +147,12 @@ class _PageList_Column_WantedPages_wanted extends _PageList_Column {
         $this->_PageList_Column($params[0],$params[1],$params[2]);
     }
     function _getValue(&$page, $revision_handle) {
-    	$html = false;
-	$pagename = $page->getName();
+            $html = false;
+        $pagename = $page->getName();
         foreach ($this->parentobj->_wpagelist[$pagename] as $page) {
             if ($html)
                 $html->pushContent(', ', WikiLink($page));
-            else 
+            else
                 $html = HTML(WikiLink($page));
         }
         return $html;
@@ -168,11 +168,11 @@ class _PageList_Column_WantedPages_links extends _PageList_Column {
         $this->_PageList_Column($params[0],$params[1],$params[2]);
     }
     function _getValue(&$page, $revision_handle) {
-    	$html = false;
-	$pagename = $page->getName();
-	$count = count($this->parentobj->_wpagelist[$pagename]);
-        return LinkURL(WikiURL($page, array('action' => 'BackLinks'), false), 
-			fmt("(%d Links)", $count));
+            $html = false;
+        $pagename = $page->getName();
+        $count = count($this->parentobj->_wpagelist[$pagename]);
+        return LinkURL(WikiURL($page, array('action' => 'BackLinks'), false),
+                        fmt("(%d Links)", $count));
     }
 }
 
diff --git a/lib/plugin/WatchPage.php b/lib/plugin/WatchPage.php
index 1a5d855fc..858e6a5dc 100644
--- a/lib/plugin/WatchPage.php
+++ b/lib/plugin/WatchPage.php
@@ -26,7 +26,7 @@ rcs_id('$Id$');
  * mode = add or edit
  * pagename = pagename to be added
  *
- * Prefs are stored in metadata in the current session, 
+ * Prefs are stored in metadata in the current session,
  *  within the user's home page or in a database.
  */
 class WikiPlugin_WatchPage
@@ -47,14 +47,14 @@ extends WikiPlugin
 
     function getDefaultArguments() {
         return array('page' => '[pagename]',
-		     'mode'   => 'add',
-		     );
+                     'mode'   => 'add',
+                     );
     }
 
     function contains($pagelist, $page) {
-	if (!isset($this->_explodePageList))
-	    $this->_explodePageList = explodePageList($pagelist);
-	return in_array($page, $this->_explodePageList);
+        if (!isset($this->_explodePageList))
+            $this->_explodePageList = explodePageList($pagelist);
+        return in_array($page, $this->_explodePageList);
     }
 
     // This could be expanded as in Mediawiki to a list of each page with a remove button.
@@ -73,29 +73,29 @@ extends WikiPlugin
     }
 
     function showNotify(&$request, $messages, $page, $pagelist, $verified) {
-	$isNecessary = ! $this->contains($pagelist, $page);
+        $isNecessary = ! $this->contains($pagelist, $page);
         $form = HTML::form(array('action' => $request->getPostURL(),
-		                 'method' => 'post'),
-	     HiddenInputs(array('verify' => 1)),
-	     HiddenInputs($request->getArgs(),false,array('verify')),
-	     $messages,
-	     HTML::p(_("Your current watchlist: "), $this->showWatchList($pagelist)));
-	if ($isNecessary) {
-	    $form->pushContent(HTML::p(_("New watchlist: "), 
-	                               $this->showWatchList($this->addpagelist($page, $pagelist))),
-	                       HTML::p(sprintf(_("Do you %s want to add this page \"%s\" to your WatchList?"), 
+                                 'method' => 'post'),
+             HiddenInputs(array('verify' => 1)),
+             HiddenInputs($request->getArgs(),false,array('verify')),
+             $messages,
+             HTML::p(_("Your current watchlist: "), $this->showWatchList($pagelist)));
+        if ($isNecessary) {
+            $form->pushContent(HTML::p(_("New watchlist: "),
+                                       $this->showWatchList($this->addpagelist($page, $pagelist))),
+                               HTML::p(sprintf(_("Do you %s want to add this page \"%s\" to your WatchList?"),
                                                ($verified ? _("really") : ""), $page)),
-			       HTML::p(Button('submit:add', _("Yes")),
-				       HTML::Raw('&nbsp;'),
-				       Button('submit:cancel', _("Cancel"))));
-	} else {
+                               HTML::p(Button('submit:add', _("Yes")),
+                                       HTML::Raw('&nbsp;'),
+                                       Button('submit:cancel', _("Cancel"))));
+        } else {
             $form->pushContent(HTML::p(fmt("The page %s is already watched!", $page)),
                                HTML::p(Button('submit:edit', _("Edit")),
                                        HTML::Raw('&nbsp;'),
                                        Button('submit:cancel', _("Cancel"))));
-	}
+        }
         $fieldset = HTML::fieldset(HTML::legend("Watch Page"), $form);
-	return $fieldset;
+        return $fieldset;
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
@@ -119,11 +119,11 @@ extends WikiPlugin
             $pref = &$request->_prefs;
             $messages = "";
             if (!defined('GFORGE') or !GFORGE) {
-	        $email = $pref->get("email");
+                $email = $pref->get("email");
                 if (empty($email)) {
                     return HTML::div(
                              array('class' => 'errors'),
-                             _("ERROR: No email defined! You need to do this in your "), 
+                             _("ERROR: No email defined! You need to do this in your "),
                              WikiLink(_("UserPreferences")));
                 }
                 $emailVerified = $pref->get("emailVerified");
@@ -133,24 +133,24 @@ extends WikiPlugin
                                 HTML::p("EmailNotifications currently disabled. <TODO>"));
                 }
             }
-	    $pagelist = $pref->get("notifyPages");
+            $pagelist = $pref->get("notifyPages");
             if (! $request->isPost() ) {
-		return $this->showNotify($request, $messages, $page, $pagelist, false);
+                return $this->showNotify($request, $messages, $page, $pagelist, false);
             } else { // POST
-            	$errmsg = '';
+                    $errmsg = '';
                 if ($request->getArg('cancel')) {
-		    $request->redirect(WikiURL($request->getArg('pagename'), 
+                    $request->redirect(WikiURL($request->getArg('pagename'),
                                                false, 'absolute_url')); // noreturn
-		    return;
-		}
+                    return;
+                }
                 if ($request->getArg('edit')) {
-		    $request->redirect(WikiURL(_("UserPreferences"), 
+                    $request->redirect(WikiURL(_("UserPreferences"),
                                                false, 'absolute_url')); // noreturn
-		    return;
-		}
+                    return;
+                }
                 $add = $request->getArg('add');
                 if ($add and !$request->getArg('verify')) {
-		    return $this->showNotify($request, $messages, $page, $pagelist, true); 
+                    return $this->showNotify($request, $messages, $page, $pagelist, true);
                 }
                 elseif ($add and $request->getArg('verify')) { // this is not executed so far.
                     // add page to watchlist, verified
diff --git a/lib/plugin/WhoIsOnline.php b/lib/plugin/WhoIsOnline.php
index bb1f1c1be..d7dd4dac4 100644
--- a/lib/plugin/WhoIsOnline.php
+++ b/lib/plugin/WhoIsOnline.php
@@ -2,7 +2,7 @@
 rcs_id('$Id$');
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@ rcs_id('$Id$');
 
 /**
  * Show summary information of the current user sessions.
- * We support two modes: summary and detail. The optional page argument 
+ * We support two modes: summary and detail. The optional page argument
  * links to the page with the other mode.
  *
  * Formatting and idea borrowed from postnuke. Requires USE_DB_SESSION.
@@ -50,7 +50,7 @@ extends WikiPlugin
     function getDefaultArguments() {
         // two modes: summary and detail, page links to the page with the other mode
         return array(
-                     'mode' 	    => 'summary',    // or "detail"
+                     'mode'             => 'summary',    // or "detail"
                      'pagename'     => '[pagename]', // refer to the page with the other mode
                      'allow_detail' => false,        // if false, page is ignored
                      'dispose_admin' => false,
@@ -69,7 +69,7 @@ extends WikiPlugin
                                    'alt' => $this->getName(),
                                    'border' => 0));
         else $img = '';
-        $other = array(); 
+        $other = array();
         $other['ONLINE_ICON'] = $img;
         return new Template('online', $request, array_merge($args, $stats, $other));
     }
@@ -102,8 +102,8 @@ extends WikiPlugin
         $num_online = 0; $num_guests = 0; $num_registered = 0;
         $registered = array(); $guests = array();
         $admins = array(); $uniquenames = array();
-	$sess_time = ini_get('session.gc_maxlifetime'); // in seconds
-	if (!$sess_time) $sess_time = 24*60;
+        $sess_time = ini_get('session.gc_maxlifetime'); // in seconds
+        if (!$sess_time) $sess_time = 24*60;
         if (isset($request->_dbsession)) { // only ADODB and SQL backends
             $dbsession =& $request->_dbsession;
             if (method_exists($dbsession->_backend, "gc"))
@@ -116,7 +116,7 @@ extends WikiPlugin
                 $date = $row['date'];
                 //Todo: Security issue: Expose REMOTE_ADDR?
                 //      Probably only to WikiAdmin
-                $ip   = $row['ip'];  
+                $ip   = $row['ip'];
                 if (empty($date)) continue;
                 $num_online++;
                 $user = @unserialize($data);
@@ -127,8 +127,8 @@ extends WikiPlugin
                     if ($mode == 'summary' and in_array($userid, $uniquenames)) continue;
                     $uniquenames[] = $userid;
                     $page = _("<unknown>");  // where is he?
-	            $action = 'browse';
-	            $objvars = array_keys(get_object_vars($user));
+                    $action = 'browse';
+                    $objvars = array_keys(get_object_vars($user));
                     if (in_array('action',$objvars))
                         $action = @$user->action;
                     if (in_array('page',$objvars))
@@ -184,18 +184,18 @@ extends WikiPlugin
             $dbi->set('stats',$stats);
         }
         return array('SESSDATA_BOOL'    => !empty($dbsession),
-                     'NUM_PAGES' 	=> $num_pages,
-                     'NUM_USERS'  	=> $num_users,
-                     'NUM_ONLINE' 	=> $num_online,
-                     'NUM_REGISTERED' 	=> $num_registered,
-                     'NUM_GUESTS'	=> $num_guests,
-                     'NEWEST_USER' 	=> '', // todo
-                     'MAX_ONLINE_NUM' 	=> $stats['max_online_num'],
-                     'MAX_ONLINE_TIME' 	=> $stats['max_online_time'],
-                     'REGISTERED' 	=> $registered,
-                     'ADMINS' 	        => $admins,
+                     'NUM_PAGES'         => $num_pages,
+                     'NUM_USERS'          => $num_users,
+                     'NUM_ONLINE'         => $num_online,
+                     'NUM_REGISTERED'         => $num_registered,
+                     'NUM_GUESTS'        => $num_guests,
+                     'NEWEST_USER'         => '', // todo
+                     'MAX_ONLINE_NUM'         => $stats['max_online_num'],
+                     'MAX_ONLINE_TIME'         => $stats['max_online_time'],
+                     'REGISTERED'         => $registered,
+                     'ADMINS'                 => $admins,
                      'GUESTS'           => $guests,
-                     'SESSION_TIME' 	=> sprintf(_("%d minutes"),$sess_time / 60),
+                     'SESSION_TIME'         => sprintf(_("%d minutes"),$sess_time / 60),
                      );
     }
 };
diff --git a/lib/plugin/WikiAdminChmod.php b/lib/plugin/WikiAdminChmod.php
index d5e6f4758..2cd70d480 100644
--- a/lib/plugin/WikiAdminChmod.php
+++ b/lib/plugin/WikiAdminChmod.php
@@ -22,7 +22,7 @@ rcs_id('$Id$');
  */
 
 /**
- * Set individual PagePermissions, simplifying effective ACLs to 
+ * Set individual PagePermissions, simplifying effective ACLs to
  * unix-like rwxr--r--+ permissions. (as in cygwin)
  *
  * Usage:   <?plugin WikiAdminChmod ?> or called via WikiAdminSelect
@@ -55,14 +55,14 @@ extends WikiPlugin_WikiAdminSelect
             (
              PageList::supportedArgs(),
              array(
-                   's' 		=> false,
-                   'perm' 	=> false,
+                   's'                 => false,
+                   'perm'         => false,
                    /* Columns to include in listing */
                    'info'     => 'pagename,perm,mtime,author',
                    ));
     }
 
-    // todo: change permstring to some kind of default ACL hash. 
+    // todo: change permstring to some kind of default ACL hash.
     // See PagePermission class
     function chmodHelper($permstring) {
         $perm = array();
@@ -94,11 +94,11 @@ extends WikiPlugin_WikiAdminSelect
                         HTML::p(fmt("No pages changed.")));
         }
     }
-    
+
     function run($dbi, $argstr, &$request, $basepage) {
         if (!DEBUG)
             return $this->disabled("WikiAdminChmod not yet enabled. Set DEBUG to try it.");
-        
+
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;
         $this->preSelectS($args, $request);
@@ -120,7 +120,7 @@ extends WikiPlugin_WikiAdminSelect
 
             if ($post_args['action'] == 'verify') {
                 // Real action
-                return $this->chmodPages($dbi, $request, array_keys($p), 
+                return $this->chmodPages($dbi, $request, array_keys($p),
                                           $post_args['perm']);
             }
             if ($post_args['action'] == 'select') {
@@ -187,9 +187,9 @@ extends WikiPlugin_WikiAdminSelect
                                       'value' => 1));
         if (!empty($post_args['updatechildren']))  $checkbox->setAttr('checked','checked');
         $header->pushContent($checkbox, HTML::raw("&nbsp;"),
-        	_("Propagate new permissions to all subpages?"),
-        	HTML::raw("&nbsp;&nbsp;"),
-        	HTML::em(_("(disable individual page permissions, enable inheritance)?")));
+                _("Propagate new permissions to all subpages?"),
+                HTML::raw("&nbsp;&nbsp;"),
+                HTML::em(_("(disable individual page permissions, enable inheritance)?")));
         $header->pushContent(HTML::hr(),HTML::p());
         return $header;
     }
diff --git a/lib/plugin/WikiAdminChown.php b/lib/plugin/WikiAdminChown.php
index 414f70f4c..9e9eba85f 100644
--- a/lib/plugin/WikiAdminChown.php
+++ b/lib/plugin/WikiAdminChown.php
@@ -48,11 +48,11 @@ extends WikiPlugin_WikiAdminSelect
     }
 
     function getDefaultArguments() {
-        return array_merge 
+        return array_merge
             (
              WikiPlugin_WikiAdminSelect::getDefaultArguments(),
              array(
-                   'user' 	=> false,
+                   'user'         => false,
                    /* Columns to include in listing */
                    'info'     => 'pagename,owner,mtime',
                    ));
@@ -65,7 +65,7 @@ extends WikiPlugin_WikiAdminSelect
         foreach ($pages as $name) {
             $page = $dbi->getPage($name);
             $current = $page->getCurrentRevision();
-            if ( ($owner = $page->getOwner()) and 
+            if ( ($owner = $page->getOwner()) and
                  $newowner != $owner ) {
                 if (!mayAccessPage('change', $name)) {
                     $ul->pushContent(HTML::li(fmt("Access denied to change page '%s'.",
@@ -85,7 +85,7 @@ extends WikiPlugin_WikiAdminSelect
                                                       WikiLink($name), WikiLink($newowner))));
                         $count++;
                     } else {
-                        $ul->pushContent(HTML::li(fmt("Could not change owner of page '%s' to '%s'.", 
+                        $ul->pushContent(HTML::li(fmt("Could not change owner of page '%s' to '%s'.",
                                                       WikiLink($name), $newowner)));
                     }
                 }
@@ -107,12 +107,12 @@ extends WikiPlugin_WikiAdminSelect
             return $result;
         }
     }
-    
+
     function run($dbi, $argstr, &$request, $basepage) {
         if ($request->getArg('action') != 'browse')
             if (!$request->getArg('action') == _("PhpWikiAdministration/Chown"))
                 return $this->disabled("(action != 'browse')");
-        
+
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;
         if (empty($args['user']))
@@ -142,7 +142,7 @@ extends WikiPlugin_WikiAdminSelect
             // DONE: error message if not allowed.
             if ($post_args['action'] == 'verify') {
                 // Real action
-                return $this->chownPages($dbi, $request, array_keys($p), 
+                return $this->chownPages($dbi, $request, array_keys($p),
                                           trim($post_args['user']));
             }
             if ($post_args['action'] == 'select') {
@@ -155,7 +155,7 @@ extends WikiPlugin_WikiAdminSelect
         }
         if ($next_action == 'select' and empty($pages)) {
             // List all pages to select from.
-            $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], 
+            $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'],
                                          $args['exclude']);
         }
         /* // let the user decide which info
diff --git a/lib/plugin/WikiAdminMarkup.php b/lib/plugin/WikiAdminMarkup.php
index e8c3e0875..d3be9a55c 100644
--- a/lib/plugin/WikiAdminMarkup.php
+++ b/lib/plugin/WikiAdminMarkup.php
@@ -48,11 +48,11 @@ extends WikiPlugin_WikiAdminSelect
     }
 
     function getDefaultArguments() {
-        return array_merge 
+        return array_merge
             (
              WikiPlugin_WikiAdminSelect::getDefaultArguments(),
              array(
-                   'markup' 	=> 2,
+                   'markup'         => 2,
                    /* Columns to include in listing */
                    'info'     => 'pagename,markup,mtime',
                    ));
@@ -88,7 +88,7 @@ extends WikiPlugin_WikiAdminSelect
                                                       WikiLink($name), $newmarkup)));
                         $count++;
                     } else {
-                        $ul->pushContent(HTML::li(fmt("Couldn't change page '%s' to markup type '%s'.", 
+                        $ul->pushContent(HTML::li(fmt("Couldn't change page '%s' to markup type '%s'.",
                                                       WikiLink($name), $newmarkup)));
                     }
                 }
@@ -110,12 +110,12 @@ extends WikiPlugin_WikiAdminSelect
             return $result;
         }
     }
-    
+
     function run($dbi, $argstr, &$request, $basepage) {
         if ($request->getArg('action') != 'browse')
             if (!$request->getArg('action') == _("PhpWikiAdministration/Markup"))
                 return $this->disabled("(action != 'browse')");
-        
+
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;
         $this->preSelectS($args, $request);
@@ -139,7 +139,7 @@ extends WikiPlugin_WikiAdminSelect
             // DONE: error message if not allowed.
             if ($post_args['action'] == 'verify') {
                 // Real action
-                return $this->chmarkupPages($dbi, $request, array_keys($p), 
+                return $this->chmarkupPages($dbi, $request, array_keys($p),
                                             $post_args['markup']);
             }
             if ($post_args['action'] == 'select') {
@@ -151,10 +151,10 @@ extends WikiPlugin_WikiAdminSelect
             }
         }
         if ($next_action == 'select' and empty($pages)) {
-            $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], 
+            $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'],
                                          $args['exclude']);
         }
-    
+
         if ($next_action == 'select') {
             $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $args);
         } else {
diff --git a/lib/plugin/WikiAdminPurge.php b/lib/plugin/WikiAdminPurge.php
index 60eb469e2..6a0ce2135 100644
--- a/lib/plugin/WikiAdminPurge.php
+++ b/lib/plugin/WikiAdminPurge.php
@@ -43,7 +43,7 @@ extends WikiPlugin_WikiAdminSelect
                             "\$Revision$");
     }
 
-    /* getDefaultArguments() is inherited from WikiAdminSelect class */ 
+    /* getDefaultArguments() is inherited from WikiAdminSelect class */
 
     function collectPages(&$list, &$dbi, $sortby, $limit=0) {
 
@@ -72,7 +72,7 @@ extends WikiPlugin_WikiAdminSelect
                 $ul->pushContent(HTML::li(fmt("Purged page '%s' successfully.", $name)));
                 $count++;
             } else {
-            	$ul->pushContent(HTML::li(fmt("Didn't purge page '%s'. Access denied.", $name)));
+                    $ul->pushContent(HTML::li(fmt("Didn't purge page '%s'. Access denied.", $name)));
             }
         }
         if ($count) {
@@ -96,7 +96,7 @@ extends WikiPlugin_WikiAdminSelect
         if ($request->getArg('action') != 'browse')
             if ($request->getArg('action') != _("PhpWikiAdministration/Purge"))
                 return $this->disabled("(action != 'browse')");
-        
+
         $args = $this->getArgs($argstr, $request);
         $this->_args =& $args;
         $this->preSelectS($args, $request);
diff --git a/lib/plugin/WikiAdminRemove.php b/lib/plugin/WikiAdminRemove.php
index d289186b0..d936ef8bd 100644
--- a/lib/plugin/WikiAdminRemove.php
+++ b/lib/plugin/WikiAdminRemove.php
@@ -80,7 +80,7 @@ extends WikiPlugin_WikiAdminSelect
         extract($this->_args);
 
         $now = time();
-        
+
         $allPages = $dbi->getAllPages('include_empty',$sortby,$limit);
         while ($pagehandle = $allPages->next()) {
             $pagename = $pagehandle->getName();
@@ -117,7 +117,7 @@ extends WikiPlugin_WikiAdminSelect
                 $ul->pushContent(HTML::li(fmt("Removed page '%s' successfully.", $name)));
                 $count++;
             } else {
-            	$ul->pushContent(HTML::li(fmt("Didn't remove page '%s'. Access denied.", $name)));
+                    $ul->pushContent(HTML::li(fmt("Didn't remove page '%s'. Access denied.", $name)));
             }
         }
         if ($count) {
@@ -136,12 +136,12 @@ extends WikiPlugin_WikiAdminSelect
             return $result;
         }
     }
-    
+
     function run($dbi, $argstr, &$request, $basepage) {
         if ($request->getArg('action') != 'browse')
             if ($request->getArg('action') != _("PhpWikiAdministration/Remove"))
                 return $this->disabled("(action != 'browse')");
-        
+
         $args = $this->getArgs($argstr, $request);
         if (!is_numeric($args['min_age']))
             $args['min_age'] = -1;
@@ -190,8 +190,8 @@ extends WikiPlugin_WikiAdminSelect
             // List all pages to select from.
             $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], $args['exclude']);
         }
-        $pagelist = new PageList_Selectable($args['info'], $args['exclude'], 
-                                            array('types' => 
+        $pagelist = new PageList_Selectable($args['info'], $args['exclude'],
+                                            array('types' =>
                                                   array('remove'
                                                         => new _PageList_Column_remove('remove', _("Remove")))));
         $pagelist->addPageList($pages);
diff --git a/lib/plugin/WikiAdminRename.php b/lib/plugin/WikiAdminRename.php
index 9326e8584..f4424d66e 100644
--- a/lib/plugin/WikiAdminRename.php
+++ b/lib/plugin/WikiAdminRename.php
@@ -52,34 +52,34 @@ extends WikiPlugin_WikiAdminSelect
             (
              WikiPlugin_WikiAdminSelect::getDefaultArguments(),
              array(
-		   /* Columns to include in listing */
-		   'info'     => 'pagename,mtime',
-		   'updatelinks' => 0,
-		   'createredirect' => 0
-		   ));
+                   /* Columns to include in listing */
+                   'info'     => 'pagename,mtime',
+                   'updatelinks' => 0,
+                   'createredirect' => 0
+                   ));
     }
 
     function renameHelper($name, $from, $to, $options = false) {
-    	if ($options['regex'])
-    	    return preg_replace('/'.$from.'/'.($options['icase']?'i':''), $to, $name);
-    	elseif ($options['icase'])
-    	    return str_ireplace($from, $to, $name);
-    	else
+            if ($options['regex'])
+                return preg_replace('/'.$from.'/'.($options['icase']?'i':''), $to, $name);
+            elseif ($options['icase'])
+                return str_ireplace($from, $to, $name);
+            else
             return str_replace($from, $to, $name);
     }
 
-    function renamePages(&$dbi, &$request, $pages, $from, $to, $updatelinks=false, 
-                         $createredirect=false) 
+    function renamePages(&$dbi, &$request, $pages, $from, $to, $updatelinks=false,
+                         $createredirect=false)
     {
         $result = HTML::div();
         $ul = HTML::ul();
         $count = 0;
         $post_args = $request->getArg('admin_rename');
-        $options = 
+        $options =
           array('regex' => isset($post_args['regex']) ? $post_args['regex'] : null,
                 'icase' => isset($post_args['icase']) ? $post_args['icase'] : null);
         foreach ($pages as $name) {
-            if ( ($newname = $this->renameHelper($name, $from, $to, $options)) 
+            if ( ($newname = $this->renameHelper($name, $from, $to, $options))
                  and $newname != $name )
             {
                 if ($dbi->isWikiPage($newname))
@@ -103,7 +103,7 @@ extends WikiPlugin_WikiAdminSelect
                     if ($createredirect) {
                         $page = $dbi->getPage($name);
                         $text = "<<RedirectTo page=\"" . $newname . "\">>";
-                        $meta['summary'] = 
+                        $meta['summary'] =
                             sprintf(_("Renaming created redirect page from '%s' to '%s'"),
                                     $name, $newname);
                         $meta['is_minor_edit'] = 0;
@@ -114,11 +114,11 @@ extends WikiPlugin_WikiAdminSelect
                                                   $name, WikiLink($newname))));
                     $count++;
                 } else {
-                    $ul->pushContent(HTML::li(fmt("Couldn't rename page '%s' to '%s'.", 
+                    $ul->pushContent(HTML::li(fmt("Couldn't rename page '%s' to '%s'.",
                                                   $name, $newname)));
                 }
             } else {
-                $ul->pushContent(HTML::li(fmt("Couldn't rename page '%s' to '%s'.", 
+                $ul->pushContent(HTML::li(fmt("Couldn't rename page '%s' to '%s'.",
                                               $name, $newname)));
             }
         }
@@ -143,8 +143,8 @@ extends WikiPlugin_WikiAdminSelect
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-    	$action = $request->getArg('action');
-        if ($action != 'browse' and $action != 'rename' 
+            $action = $request->getArg('action');
+        if ($action != 'browse' and $action != 'rename'
                                 and $action != _("PhpWikiAdministration")."/"._("Rename"))
             return $this->disabled("(action != 'browse')");
 
@@ -178,8 +178,8 @@ extends WikiPlugin_WikiAdminSelect
             // DONE: error message if not allowed.
             if ($post_args['action'] == 'verify') {
                 // Real action
-                return $this->renamePages($dbi, $request, array_keys($p), 
-                                          $post_args['from'], $post_args['to'], 
+                return $this->renamePages($dbi, $request, array_keys($p),
+                                          $post_args['from'], $post_args['to'],
                                           !empty($post_args['updatelinks']),
                                           !empty($post_args['createredirect']));
             }
@@ -202,7 +202,7 @@ extends WikiPlugin_WikiAdminSelect
         $pagelist = new PageList_Selectable
             (
              $args['info'], $args['exclude'],
-             array('types' => 
+             array('types' =>
                    array('renamed_pagename'
                          => new _PageList_Column_renamed_pagename('rename', _("Rename to")),
                          )));
@@ -238,7 +238,7 @@ extends WikiPlugin_WikiAdminSelect
         if ($singlepage === false) {
             $list = $pagelist->getContent();
         } else {
-            $list = ""; 
+            $list = "";
         }
         return HTML::form(array('action' => $request->getPostURL(),
                                 'method' => 'post'),
@@ -258,8 +258,8 @@ extends WikiPlugin_WikiAdminSelect
     }
 
     function checkBox (&$post_args, $name, $msg) {
-    	$id = 'admin_rename-'.$name;
-    	$checkbox = HTML::input(array('type' => 'checkbox',
+            $id = 'admin_rename-'.$name;
+            $checkbox = HTML::input(array('type' => 'checkbox',
                                       'name' => 'admin_rename['.$name.']',
                                       'id'   => $id,
                                       'value' => 1));
@@ -271,25 +271,25 @@ extends WikiPlugin_WikiAdminSelect
     function renameForm(&$header, $post_args, $singlepage) {
         $table = HTML::table();
         $this->_tablePush($table, _("Rename"). " ". _("from").': ',
-			  HTML::input(array('name' => 'admin_rename[from]',
-					    'size' => 90,
-					    'value' => $post_args['from'])));
+                          HTML::input(array('name' => 'admin_rename[from]',
+                                            'size' => 90,
+                                            'value' => $post_args['from'])));
         $this->_tablePush($table, _("to").': ',
-			  HTML::input(array('name' => 'admin_rename[to]',
-					    'size' => 90,
-					    'value' => $post_args['to'])));
+                          HTML::input(array('name' => 'admin_rename[to]',
+                                            'size' => 90,
+                                            'value' => $post_args['to'])));
         if ($singlepage === false) {
-	    $this->_tablePush($table, '', 
+            $this->_tablePush($table, '',
                               $this->checkBox($post_args, 'regex', _("Regex?")));
-            $this->_tablePush($table, '', 
+            $this->_tablePush($table, '',
                               $this->checkBox($post_args, 'icase', _("Case insensitive?")));
         }
-	if (defined('EXPERIMENTAL') and EXPERIMENTAL) // not yet stable
-	    $this->_tablePush($table, '', 
-                              $this->checkBox($post_args, 'updatelinks', 
+        if (defined('EXPERIMENTAL') and EXPERIMENTAL) // not yet stable
+            $this->_tablePush($table, '',
+                              $this->checkBox($post_args, 'updatelinks',
                                 _("Change pagename in all linked pages also?")));
-	$this->_tablePush($table, '', 
-                          $this->checkBox($post_args, 'createredirect', 
+        $this->_tablePush($table, '',
+                          $this->checkBox($post_args, 'createredirect',
                                           _("Create redirect from old to new name?")));
         $header->pushContent($table);
         return $header;
@@ -307,13 +307,13 @@ class _PageList_Column_renamed_pagename extends _PageList_Column {
         $post_args = $request->getArg('admin_rename');
         $options = array('regex' => @$post_args['regex'],
                          'icase' => @$post_args['icase']);
-                         
-        $value = $post_args 
+
+        $value = $post_args
             ? WikiPlugin_WikiAdminRename::renameHelper
-                ($page_handle->getName(), 
+                ($page_handle->getName(),
                  $post_args['from'], $post_args['to'],
                  $options)
-            : $page_handle->getName();                              
+            : $page_handle->getName();
         $div = HTML::div(" => ",HTML::input(array('type' => 'text',
                                                   'name' => 'rename[]',
                                                   'value' => $value)));
diff --git a/lib/plugin/WikiAdminSearchReplace.php b/lib/plugin/WikiAdminSearchReplace.php
index b41ce4b90..66b71e6b6 100644
--- a/lib/plugin/WikiAdminSearchReplace.php
+++ b/lib/plugin/WikiAdminSearchReplace.php
@@ -99,9 +99,9 @@ extends WikiPlugin_WikiAdminSelect
         $regex = !empty($post_args['regex']);
         foreach ($pages as $pagename) {
             if (!mayAccessPage('edit', $pagename)) {
-		$ul->pushContent(HTML::li(fmt("Access denied to change page '%s'.",$pagename)));
+                $ul->pushContent(HTML::li(fmt("Access denied to change page '%s'.",$pagename)));
             } elseif ($this->replaceHelper($dbi, $request, $pagename, $from, $to, $case_exact, $regex)) {
-                $ul->pushContent(HTML::li(fmt("Replaced '%s' with '%s' in page '%s'.", 
+                $ul->pushContent(HTML::li(fmt("Replaced '%s' with '%s' in page '%s'.",
                                               $from, $to, WikiLink($pagename))));
                 $count++;
             }
@@ -121,15 +121,15 @@ extends WikiPlugin_WikiAdminSelect
         }
         return $result;
     }
-    
+
     function run($dbi, $argstr, &$request, $basepage) {
-    	// no action=replace support yet
+            // no action=replace support yet
         if ($request->getArg('action') != 'browse')
             return $this->disabled("(action != 'browse')");
-        
+
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;
-            
+
         //TODO: support p from <!plugin-list !>
         $this->preSelectS($args, $request);
 
@@ -150,7 +150,7 @@ extends WikiPlugin_WikiAdminSelect
 
             if ($post_args['action'] == 'verify' and !empty($post_args['from'])) {
                 // Real action
-                return $this->searchReplacePages($dbi, $request, array_keys($p), 
+                return $this->searchReplacePages($dbi, $request, array_keys($p),
                                                  $post_args['from'], $post_args['to']);
             }
             if ($post_args['action'] == 'select') {
@@ -164,7 +164,7 @@ extends WikiPlugin_WikiAdminSelect
         if ($next_action == 'select' and empty($pages)) {
             // List all pages to select from.
             //TODO: check for permissions and list only the allowed
-            $pages = $this->collectPages($pages, $dbi, $args['sortby'], 
+            $pages = $this->collectPages($pages, $dbi, $args['sortby'],
                                          $args['limit'], $args['exclude']);
         }
 
@@ -174,14 +174,14 @@ extends WikiPlugin_WikiAdminSelect
             $args['info'] = "checkbox,pagename,hi_content,mtime,author";
         }
         $pagelist = new PageList_Selectable
-	    ($args['info'], $args['exclude'],
-	     array_merge
-	     (
-	      $args,
-	      array('types' => array
-		    (
-		     'hi_content' // with highlighted search for SearchReplace
-		     => new _PageList_Column_content('rev:hi_content', _("Content"))))));
+            ($args['info'], $args['exclude'],
+             array_merge
+             (
+              $args,
+              array('types' => array
+                    (
+                     'hi_content' // with highlighted search for SearchReplace
+                     => new _PageList_Column_content('rev:hi_content', _("Content"))))));
 
         $pagelist->addPageList($pages);
 
@@ -219,8 +219,8 @@ extends WikiPlugin_WikiAdminSelect
     }
 
     function checkBox (&$post_args, $name, $msg) {
-    	$id = 'admin_replace-'.$name;
-    	$checkbox = HTML::input(array('type' => 'checkbox',
+            $id = 'admin_replace-'.$name;
+            $checkbox = HTML::input(array('type' => 'checkbox',
                                       'name' => 'admin_replace['.$name.']',
                                       'id'   => $id,
                                       'value' => 1));
@@ -235,15 +235,15 @@ extends WikiPlugin_WikiAdminSelect
                              HTML::br());
         $table = HTML::table();
         $this->_tablePush($table, _("Replace").": ",
-			  HTML::input(array('name' => 'admin_replace[from]',
-					    'size' => 90,
-					    'value' => $post_args['from'])));
+                          HTML::input(array('name' => 'admin_replace[from]',
+                                            'size' => 90,
+                                            'value' => $post_args['from'])));
         $this->_tablePush($table, _("by").': ',
-			  HTML::input(array('name' => 'admin_replace[to]',
-					    'size' => 90,
-					    'value' => $post_args['to'])));
+                          HTML::input(array('name' => 'admin_replace[to]',
+                                            'size' => 90,
+                                            'value' => $post_args['to'])));
         $this->_tablePush($table, '', $this->checkBox($post_args, 'case_exact', _("Case exact?")));
-	$this->_tablePush($table, '', $this->checkBox($post_args, 'regex', _("Regex?")));
+        $this->_tablePush($table, '', $this->checkBox($post_args, 'regex', _("Regex?")));
         $header->pushContent($table);
         return $header;
     }
@@ -252,7 +252,7 @@ extends WikiPlugin_WikiAdminSelect
 function stri_replace($find,$replace,$string) {
     if (!is_array($find)) $find = array($find);
     if (!is_array($replace))  {
-        if (!is_array($find)) 
+        if (!is_array($find))
             $replace = array($replace);
         else {
             // this will duplicate the string into an array the size of $find
diff --git a/lib/plugin/WikiAdminSelect.php b/lib/plugin/WikiAdminSelect.php
index 6f021eb74..0111bae50 100644
--- a/lib/plugin/WikiAdminSelect.php
+++ b/lib/plugin/WikiAdminSelect.php
@@ -175,7 +175,7 @@ extends WikiPlugin
             // $form->pushContent(Button('submit:cancel', _("Cancel"), 'button'));
         }
 
-        if ($request->isPost() 
+        if ($request->isPost()
             && ! $request->getArg('wikiadmin')
             && !empty($p)) {
             $this->_list = array();
@@ -185,7 +185,7 @@ extends WikiPlugin
             }
         }
         elseif ($request->isPost()
-        	and $request->_user->isAdmin()
+                and $request->_user->isAdmin()
                 and !empty($p)
                 //and $request->getArg('verify')
                 and ($request->getArg('action') == 'WikiAdminSelect')
@@ -243,9 +243,9 @@ extends WikiPlugin
 
     function _tablePush(&$table, $first, $second) {
         $table->pushContent(
-			    HTML::tr(
-				     HTML::td($first),
-				     HTML::td($second)));
+                            HTML::tr(
+                                     HTML::td($first),
+                                     HTML::td($second)));
     }
 
 }
diff --git a/lib/plugin/WikiAdminSetAcl.php b/lib/plugin/WikiAdminSetAcl.php
index 57970c4ec..e1161357d 100644
--- a/lib/plugin/WikiAdminSetAcl.php
+++ b/lib/plugin/WikiAdminSetAcl.php
@@ -30,8 +30,8 @@ rcs_id('$Id$');
  * KNOWN ISSUES:
  * Requires PHP 4.2 so far.
  *
- * TODO: UI to add custom group/username. 
- * Currently it's easier to dump a page, fix it manually and 
+ * TODO: UI to add custom group/username.
+ * Currently it's easier to dump a page, fix it manually and
  * import it, than use Setacl
  */
 require_once('lib/PageList.php');
@@ -67,21 +67,21 @@ extends WikiPlugin_WikiAdminSelect
     function setaclPages(&$request, $pages, $acl) {
         $result = HTML::div();
         $count = 0;
-        $dbi =& $request->_dbi; 
+        $dbi =& $request->_dbi;
         // check new_group and new_perm
         if (isset($acl['_add_group'])) {
-	    //add groups with perm
+            //add groups with perm
             foreach ($acl['_add_group'] as $access => $dummy) {
-	        $group = $acl['_new_group'][$access];
+                $group = $acl['_new_group'][$access];
                 $acl[$access][$group] = isset($acl['_new_perm'][$access]) ? 1 : 0;
             }
-	    unset($acl['_add_group']); 
+            unset($acl['_add_group']);
         }
         unset($acl['_new_group']); unset($acl['_new_perm']);
         if (isset($acl['_del_group'])) {
-	    //del groups with perm
+            //del groups with perm
             foreach ($acl['_del_group'] as $access => $del) {
-                while (list($group,$dummy) = each($del)) 
+                while (list($group,$dummy) = each($del))
                     unset($acl[$access][$group]);
             }
             unset($acl['_del_group']);
@@ -89,12 +89,12 @@ extends WikiPlugin_WikiAdminSelect
         if ($perm = new PagePermission($acl)) {
             $perm->sanify();
             foreach ($pages as $pagename) {
-            	// check if unchanged? we need a deep array_equal
-            	$page = $dbi->getPage($pagename);
-            	$oldperm = getPagePermissions($page);
+                    // check if unchanged? we need a deep array_equal
+                    $page = $dbi->getPage($pagename);
+                    $oldperm = getPagePermissions($page);
                 if ($oldperm)
                     $oldperm->sanify();
-            	if ($oldperm and $perm->equal($oldperm->perm)) {
+                    if ($oldperm and $perm->equal($oldperm->perm)) {
                     $result->setAttr('class', 'error');
                     $result->pushContent(HTML::p(fmt("ACL not changed for page '%s'.",$pagename)));
                 } elseif (mayAccessPage('change', $pagename)) {
@@ -112,7 +112,7 @@ extends WikiPlugin_WikiAdminSelect
                     $version = $current->getVersion();
                     $meta = $current->_data;
                     $text = $current->getPackedContent();
-                    $meta['summary'] = sprintf(_("ACL changed for page '%s' from '%s' to '%s'."), 
+                    $meta['summary'] = sprintf(_("ACL changed for page '%s' from '%s' to '%s'."),
                                                $pagename,
                                                $oldperm ? $oldperm->asAclGroupLines() : "None",
                                                $perm->asAclGroupLines());
@@ -142,7 +142,7 @@ extends WikiPlugin_WikiAdminSelect
         }
         return $result;
     }
-    
+
     function run($dbi, $argstr, &$request, $basepage) {
         //if (!DEBUG)
         //    return $this->disabled("WikiAdminSetAcl not yet enabled. Set DEBUG to try it.");
@@ -151,7 +151,7 @@ extends WikiPlugin_WikiAdminSelect
                 return $this->disabled("(action != 'browse')");
         if (!ENABLE_PAGEPERM)
             return $this->disabled("ENABLE_PAGEPERM = false");
-        
+
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;
         $this->preSelectS($args, $request);
@@ -191,7 +191,7 @@ extends WikiPlugin_WikiAdminSelect
         if ($next_action == 'verify') {
             $args['info'] = "checkbox,pagename,perm,mtime,owner,author";
         }
-        $pagelist = new PageList_Selectable($args['info'], 
+        $pagelist = new PageList_Selectable($args['info'],
                                             $args['exclude'],
                                             array('types' => array(
                                                   'perm'
@@ -236,7 +236,7 @@ extends WikiPlugin_WikiAdminSelect
         //FIXME: find intersection of all pages perms, not just from the last pagename
         $pages = array();
         foreach ($pagehash as $name => $checked) {
-	   if ($checked) $pages[] = $name;
+           if ($checked) $pages[] = $name;
         }
         $perm_tree = pagePermissions($name);
         $table = pagePermissionsAclFormat($perm_tree, !empty($pages));
@@ -253,7 +253,7 @@ extends WikiPlugin_WikiAdminSelect
             $type = _("default page permission");
         $header->pushContent(HTML::strong(_("Type").': '), HTML::tt($type),HTML::br());
         $header->pushContent(HTML::strong(_("ACL").': '), HTML::tt($perm->asAclGroupLines()),HTML::br());
-        
+
         $header->pushContent(HTML::p(HTML::strong(_("Description").': '),
                                      _("Selected Grant checkboxes allow access, unselected checkboxes deny access."),
                                      _("To ignore delete the line."),
@@ -263,8 +263,8 @@ extends WikiPlugin_WikiAdminSelect
         //
         // display array of checkboxes for existing perms
         // and a dropdown for user/group to add perms.
-        // disabled if inherited, 
-        // checkbox to disable inheritance, 
+        // disabled if inherited,
+        // checkbox to disable inheritance,
         // another checkbox to progate new permissions to all childs (if there exist some)
         //Todo:
         // warn if more pages are selected and they have different perms
@@ -277,8 +277,8 @@ extends WikiPlugin_WikiAdminSelect
                                         'value' => 1));
           if (!empty($post_args['updatechildren']))  $checkbox->setAttr('checked','checked');
           $header->pushContent($checkbox,
-          	  _("Propagate new permissions to all subpages?"),
-        	  HTML::raw("&nbsp;&nbsp;"),
+                    _("Propagate new permissions to all subpages?"),
+                  HTML::raw("&nbsp;&nbsp;"),
                   HTML::em(_("(disable individual page permissions, enable inheritance)?")),
                   HTML::br(),HTML::em(_("(Currently not working)"))
                                );
diff --git a/lib/plugin/WikiAdminSetExternal.php b/lib/plugin/WikiAdminSetExternal.php
index 0b0eb7b3b..e064a6d81 100644
--- a/lib/plugin/WikiAdminSetExternal.php
+++ b/lib/plugin/WikiAdminSetExternal.php
@@ -45,11 +45,11 @@ extends WikiPlugin_WikiAdminSelect
     }
 
     function getDefaultArguments() {
-        return array_merge 
+        return array_merge
             (
              WikiPlugin_WikiAdminSelect::getDefaultArguments(),
              array(
-                   'external' 	=> 1,
+                   'external'         => 1,
                    /* Columns to include in listing */
                    'info'     => 'pagename,external,mtime',
                    ));
@@ -94,12 +94,12 @@ extends WikiPlugin_WikiAdminSelect
             return $result;
         }
     }
-    
+
     function run($dbi, $argstr, &$request, $basepage) {
         if ($request->getArg('action') != 'browse')
             if (!$request->getArg('action') == _("PhpWikiAdministration/SetExternal"))
                 return $this->disabled("(action != 'browse')");
-        
+
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;
         $this->preSelectS($args, $request);
diff --git a/lib/plugin/WikiAdminUtils.php b/lib/plugin/WikiAdminUtils.php
index 3ac1b9224..8a85cedaa 100644
--- a/lib/plugin/WikiAdminUtils.php
+++ b/lib/plugin/WikiAdminUtils.php
@@ -22,7 +22,7 @@ rcs_id('$Id$');
  */
 
 /**
-  valid actions: 
+  valid actions:
         purge-cache
         purge-bad-pagenames
         purge-empty-pages
@@ -50,7 +50,7 @@ extends WikiPlugin
 
     function getDefaultArguments() {
         return array('action'           => '',
-                     'label'		=> '',
+                     'label'                => '',
                      );
     }
 
@@ -58,7 +58,7 @@ extends WikiPlugin
         $args = $this->getArgs($argstr, $request);
         $args['action'] = strtolower($args['action']);
         extract($args);
-        
+
         if (!$action)
             $this->error("No action specified");
         if (!($default_label = $this->_getLabel($action))) {
@@ -66,7 +66,7 @@ extends WikiPlugin
         }
         if ($request->getArg('action') != 'browse')
             return $this->disabled("(action != 'browse')");
-        
+
         $posted = $request->getArg('wikiadminutils');
 
         if ($request->isPost() and $posted['action'] == $action) { // a different form. we might have multiple
@@ -93,7 +93,7 @@ extends WikiPlugin
                                              WIKIAUTH_ADMIN)),
                           HiddenInputs($request->getArgs(),false,array('action')));
     }
-    
+
     function do_action(&$request, $args) {
         $method = strtolower('_do_' . str_replace('-', '_', $args['action']));
         if (!method_exists($this, $method))
@@ -109,14 +109,14 @@ extends WikiPlugin
     }
 
     function _getLabel($action) {
-        $labels = array('purge-cache' 		=> _("Purge Markup Cache"),
-                        'purge-bad-pagenames' 	=> _("Purge all Pages With Invalid Names"),
-                        'purge-empty-pages' 	=> _("Purge all empty, unreferenced Pages"),
-                        'access-restrictions' 	=> _("Access Restrictions"),
-                        'email-verification' 	=> _("Email Verification"),
-                        'convert-cached-html' 	=> _("Convert cached_html"),
-                        'db-check' 		=> _("DB Check"),
-                        'db-rebuild' 		=> _("Db Rebuild")
+        $labels = array('purge-cache'                 => _("Purge Markup Cache"),
+                        'purge-bad-pagenames'         => _("Purge all Pages With Invalid Names"),
+                        'purge-empty-pages'         => _("Purge all empty, unreferenced Pages"),
+                        'access-restrictions'         => _("Access Restrictions"),
+                        'email-verification'         => _("Email Verification"),
+                        'convert-cached-html'         => _("Convert cached_html"),
+                        'db-check'                 => _("DB Check"),
+                        'db-rebuild'                 => _("Db Rebuild")
                         );
         return @$labels[$action];
     }
@@ -154,7 +154,7 @@ extends WikiPlugin
         }
     }
 
-    /** 
+    /**
      * Purge all non-referenced empty pages. Mainly those created by bad link extraction.
      */
     function _do_purge_empty_pages(&$request, $args) {
@@ -163,8 +163,8 @@ extends WikiPlugin
         $list = HTML::ol(array('align'=>'left'));
         $pages = $dbi->getAllPages('include_empty');
         while (($page = $pages->next())) {
-            if (!$page->exists() 
-                and ($links = $page->getBackLinks('include_empty')) 
+            if (!$page->exists()
+                and ($links = $page->getBackLinks('include_empty'))
                      and !$links->next())
             {
                 $pagename = $page->getName();
@@ -184,8 +184,8 @@ extends WikiPlugin
         else
             return HTML(fmt("Deleted %s unreferenced pages:", $count),
                         HTML::div(array('align'=>'left'), $list),
-                        ($notpurgable ? 
-        fmt("The %d not-purgable pages/links are links in some page(s). You might want to edit them.", 
+                        ($notpurgable ?
+        fmt("The %d not-purgable pages/links are links in some page(s). You might want to edit them.",
             $notpurgable)
                                       : ''));
     }
@@ -208,25 +208,25 @@ extends WikiPlugin
     }
 
     function _do_db_check(&$request, $args) {
-	longer_timeout(180);
+        longer_timeout(180);
         $dbh = $request->getDbh();
-	//FIXME: display result.
+        //FIXME: display result.
         return $dbh->_backend->check($args);
     }
 
     function _do_db_rebuild(&$request, $args) {
-	longer_timeout(240);
+        longer_timeout(240);
         $dbh = $request->getDbh();
-	//FIXME: display result.
+        //FIXME: display result.
         return $dbh->_backend->rebuild($args);
     }
 
     //TODO: We need a seperate plugin for this.
     //      Too many options.
     function _do_access_restrictions(&$request, &$args) {
-    	return _("Sorry. Access Restrictions not yet implemented");
+            return _("Sorry. Access Restrictions not yet implemented");
     }
-    
+
     // pagelist with enable/disable button
     function _do_email_verification(&$request, &$args) {
         $dbi = $request->getDbh();
@@ -235,44 +235,44 @@ extends WikiPlugin
         $email = new _PageList_Column_email('email',_("E-Mail"),'left');
         $emailVerified = new _PageList_Column_emailVerified('emailVerified',
                                                             _("Verification Status"),'center');
-        $pagelist->_columns[0]->_heading = _("Username");                                                    
+        $pagelist->_columns[0]->_heading = _("Username");
         $pagelist->_columns[] = $email;
         $pagelist->_columns[] = $emailVerified;
         //This is the best method to find all users (Db and PersonalPage)
         $current_user = $request->_user;
-	if (empty($args['verify'])) {
+        if (empty($args['verify'])) {
             $group = $request->getGroup();
-	    $allusers = $group->_allUsers();
-	} else {
+            $allusers = $group->_allUsers();
+        } else {
             if (!empty($args['user']))
                 $allusers = array_keys($args['user']);
-            else 
+            else
                 $allusers = array();
-	}
+        }
         foreach ($allusers as $username) {
             if (ENABLE_USER_NEW)
                 $user = WikiUser($username);
-            else 
+            else
                 $user = new WikiUser($request, $username);
             $prefs = $user->getPreferences();
             if ($prefs->get('email')) {
-            	if (!$prefs->get('userid'))
-            	    $prefs->set('userid',$username);
+                    if (!$prefs->get('userid'))
+                        $prefs->set('userid',$username);
                 if (!empty($pagelist->_rows))
                     $group = (int)(count($pagelist->_rows) / $pagelist->_group_rows);
-                else 
+                else
                     $group = 0;
                 $class = ($group % 2) ? 'oddrow' : 'evenrow';
                 $row = HTML::tr(array('class' => $class));
                 $page_handle = $dbi->getPage($username);
-                $row->pushContent($pagelist->_columns[0]->format($pagelist, 
+                $row->pushContent($pagelist->_columns[0]->format($pagelist,
                                                                  $page_handle, $page_handle));
                 $row->pushContent($email->format($pagelist, $prefs, $page_handle));
-		if (!empty($args['verify'])) {
-		    $prefs->_prefs['email']->set('emailVerified', 
+                if (!empty($args['verify'])) {
+                    $prefs->_prefs['email']->set('emailVerified',
                                                  empty($args['verified'][$username]) ? 0 : true);
-		    $user->setPreferences($prefs);
-		}
+                    $user->setPreferences($prefs);
+                }
                 $row->pushContent($emailVerified->format($pagelist, $prefs, $args['verify']));
                 $pagelist->_rows[] = $row;
             }
@@ -282,15 +282,15 @@ extends WikiPlugin
             return HTML($pagelist->_generateTable(false));
         } elseif (!empty($pagelist->_rows)) {
             $args['verify'] = 1;
-	    $args['return_url'] = $request->getURLtoSelf();
+            $args['return_url'] = $request->getURLtoSelf();
             return HTML::form(array('action' => $request->getPostURL(),
                                     'method' => 'post'),
                           HiddenInputs($args, 'wikiadminutils'),
                           HiddenInputs(array('require_authority_for_post' =>
                                              WIKIAUTH_ADMIN)),
                           HiddenInputs($request->getArgs()),
-                          $pagelist->_generateTable(false),                   
-                          HTML::p(Button('submit:', _("Change Verification Status"), 
+                          $pagelist->_generateTable(false),
+                          HTML::p(Button('submit:', _("Change Verification Status"),
                                          'wikiadmin'),
                                   HTML::Raw('&nbsp;'),
                                   Button('cancel', _("Cancel")))
@@ -301,7 +301,7 @@ extends WikiPlugin
 
 require_once("lib/PageList.php");
 
-class _PageList_Column_email 
+class _PageList_Column_email
 extends _PageList_Column {
     function _getValue (&$prefs, $dummy) {
         return $prefs->get('email');
@@ -311,15 +311,15 @@ extends _PageList_Column {
 class _PageList_Column_emailVerified
 extends _PageList_Column {
     function _getValue (&$prefs, $status) {
-    	$name = $prefs->get('userid');
-    	$input = HTML::input(array('type' => 'checkbox',
-    	                           'name' => 'wikiadminutils[verified]['.$name.']',
-    	                           'value' => 1));
-    	if ($prefs->get('emailVerified'))
-    	    $input->setAttr('checked','1');
-	if ($status)
-    	    $input->setAttr('disabled','1');
-    	return HTML($input, HTML::input
+            $name = $prefs->get('userid');
+            $input = HTML::input(array('type' => 'checkbox',
+                                       'name' => 'wikiadminutils[verified]['.$name.']',
+                                       'value' => 1));
+            if ($prefs->get('emailVerified'))
+                $input->setAttr('checked','1');
+        if ($status)
+                $input->setAttr('disabled','1');
+            return HTML($input, HTML::input
                     (array('type' => 'hidden',
                            'name' => 'wikiadminutils[user]['.$name.']',
                            'value' => $name)));
diff --git a/lib/plugin/WikiBlog.php b/lib/plugin/WikiBlog.php
index 4f5842085..8e8ae58db 100644
--- a/lib/plugin/WikiBlog.php
+++ b/lib/plugin/WikiBlog.php
@@ -2,7 +2,7 @@
 rcs_id('$Id$');
 /*
  * Copyright 2002,2003,2007,2009 $ThePhpWikiProgrammingTeam
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -31,10 +31,10 @@ require_once('lib/TextSearchQuery.php');
  * particular page and provides an input form for adding a new blog.
  *
  * USAGE:
- * Add <?plugin WikiBlog ?> at your PersonalPage and BlogArchive and 
+ * Add <?plugin WikiBlog ?> at your PersonalPage and BlogArchive and
  * BlogJournal will find the Blog entries automatically.
  *
- * Now it is also the base class for all attachable pagetypes: 
+ * Now it is also the base class for all attachable pagetypes:
  *    "wikiblog", "comment" and "wikiforum"
  *
  * HINTS/COMMENTS:
@@ -47,9 +47,9 @@ require_once('lib/TextSearchQuery.php');
  *
  * To have the main ADMIN_USER Blog appear under Blog and not under WikiBlog/Blog
  * or UserName/Blog as for other users blogs,
- * define BLOG_DEFAULT_EMPTY_PREFIX=true 
+ * define BLOG_DEFAULT_EMPTY_PREFIX=true
  * use the page Blog as basepage
- * and user="" (as default for ADMIN or current user) and pagename="Blog" 
+ * and user="" (as default for ADMIN or current user) and pagename="Blog"
  * in the various blog plugins (BlogArchives, BlogJournal)
  *
  * TODO:
@@ -134,11 +134,11 @@ extends WikiPlugin
         // Get our form args.
         $blog = $request->getArg("edit");
         $request->setArg("edit", false);
-            
+
         if ($request->isPost() and !empty($blog['save'])) {
             $this->add($request, $blog, 'wikiblog', $basepage); // noreturn
         }
-	//TODO: preview
+        //TODO: preview
 
         // Now we display previous comments and/or provide entry box
         // for new comments
@@ -147,7 +147,7 @@ extends WikiPlugin
             if (!empty($seen[$show]))
                 continue;
             $seen[$show] = 1;
-                
+
             switch ($show) {
             case 'show':
                 $html->pushContent($this->showAll($request, $args));
@@ -166,23 +166,23 @@ extends WikiPlugin
      * posted: required: pagename, content. optional: summary
      */
     function add (&$request, $posted, $type='wikiblog') {
-	// This is similar to editpage. Shouldn't we use just this for preview?
+        // This is similar to editpage. Shouldn't we use just this for preview?
         $parent = $posted['pagename'];
         if (empty($parent)) {
             $prefix = "";   // allow empty parent for default "Blog/day"
             $parent = HOME_PAGE;
         } elseif (($parent == 'Blog' or $parent == 'WikiBlog') and $type == 'wikiblog')
-	{ // avoid Blog/Blog/2003-01-11/14:03:02+00:00
+        { // avoid Blog/Blog/2003-01-11/14:03:02+00:00
             $prefix = "";
-	    $parent = ''; // 'Blog';
+            $parent = ''; // 'Blog';
         } elseif ($parent == 'Comment' and $type == "comment")
-	{
+        {
             $prefix = "";
-	    $parent = ''; // 'Comment';
+            $parent = ''; // 'Comment';
         } elseif ($parent == 'Forum' and $type == "wikiforum")
-	{
+        {
             $prefix = "";
-	    $parent = ''; // 'Forum';
+            $parent = ''; // 'Forum';
         } else {
             $prefix = $parent . SUBPAGE_SEPARATOR;
         }
@@ -191,7 +191,7 @@ extends WikiPlugin
         $now = time();
         $dbi = $request->getDbh();
         $user = $request->getUser();
-        
+
         /*
          * Page^H^H^H^H Blog meta-data
          * This method is reused for all attachable pagetypes: wikiblog, comment and wikiforum
@@ -209,7 +209,7 @@ extends WikiPlugin
                            'creator'    => $user->getId(),
                            'creator_id' => $user->getAuthenticatedId(),
                            );
-        
+
 
         // Version meta-data
         $summary = trim($posted['summary']);
@@ -232,29 +232,29 @@ extends WikiPlugin
         $body = trim($posted['content']);
 
         $saved = false;
-	if ($type != 'wikiforum')
-	    $pagename = $this->_blogPrefix($type);
-	else {
-	    $pagename = substr($summary,0,12);
-	    if (empty($pagename)) {
-		$saved = true;
-		trigger_error("Empty title", E_USER_WARNING);
-	    }
-	}
+        if ($type != 'wikiforum')
+            $pagename = $this->_blogPrefix($type);
+        else {
+            $pagename = substr($summary,0,12);
+            if (empty($pagename)) {
+                $saved = true;
+                trigger_error("Empty title", E_USER_WARNING);
+            }
+        }
         while (!$saved) {
             // Generate the page name.  For now, we use the format:
             //   Rootname/Blog/2003-01-11/14:03:02+00:00
-	    // Rootname = $prefix, Blog = $pagename, 
+            // Rootname = $prefix, Blog = $pagename,
             // This gives us natural chronological order when sorted
             // alphabetically. "Rootname/" is optional.
-	    // Esp. if Rootname is named Blog, it is omitted.
+            // Esp. if Rootname is named Blog, it is omitted.
 
             $time = Iso8601DateTime();
             // Check intermediate pages. If not existing they should RedirectTo the parent page.
             // Maybe add the BlogArchives plugin instead for the new interim subpage.
             $redirected = $prefix . $pagename;
             if (!$dbi->isWikiPage($redirected)) {
-            	if (!$parent) $parent = HOME_PAGE;
+                    if (!$parent) $parent = HOME_PAGE;
                 require_once('lib/loadsave.php');
                 $pageinfo = array('pagename' => $redirected,
                                   'content'  => '<?plugin RedirectTo page="'.$parent.'" ?>',
@@ -265,7 +265,7 @@ extends WikiPlugin
             }
             $redirected = $prefix . $pagename . SUBPAGE_SEPARATOR . preg_replace("/T.*/", "", "$time");
             if (!$dbi->isWikiPage($redirected)) {
-            	if (!$parent) $parent = HOME_PAGE;
+                    if (!$parent) $parent = HOME_PAGE;
                 require_once('lib/loadsave.php');
                 $pageinfo = array('pagename' => $redirected,
                                   'content'  => '<?plugin RedirectTo page="'.$parent.'" ?>',
@@ -275,7 +275,7 @@ extends WikiPlugin
                 SavePage($request, $pageinfo, '', '');
             }
 
-            $p = $dbi->getPage($prefix . $pagename . SUBPAGE_SEPARATOR 
+            $p = $dbi->getPage($prefix . $pagename . SUBPAGE_SEPARATOR
                                . str_replace("T", SUBPAGE_SEPARATOR, "$time"));
             $pr = $p->getCurrentRevision();
 
@@ -295,7 +295,7 @@ extends WikiPlugin
 
             $now++;
         }
-        
+
         $dbi->touch();
         $request->setArg("mode", "show");
         $request->redirect($request->getURLtoSelf()); // noreturn
@@ -310,9 +310,9 @@ extends WikiPlugin
         // get results, so results are in alphabetical order.
         // When PageTypes fully implemented, could have smarter
         // blogSearch implementation / naming scheme.
-        
+
         $dbi = $request->getDbh();
-	$basepage = $args['pagename'];
+        $basepage = $args['pagename'];
         $blogs = $this->findBlogs($dbi, $basepage, $type);
         $html = HTML();
         if ($blogs) {
@@ -336,12 +336,12 @@ extends WikiPlugin
                 }
                 $html->pushContent($content);
             }
-            
+
         }
         return $html;
     }
 
-    // Subpage for the basepage. All Blogs/Forum/Comment entries are 
+    // Subpage for the basepage. All Blogs/Forum/Comment entries are
     // Subpages under this pagename, to find them faster.
     function _blogPrefix($type='wikiblog') {
         if ($type == 'wikiblog')
@@ -349,8 +349,8 @@ extends WikiPlugin
         elseif ($type == 'comment')
             $basepage = "Comment";
         elseif ($type == 'wikiforum')
-	    $basepage = substr($summary,0,12);
-	    //$basepage = _("Message"); // FIXME: we use now the first 12 chars of the summary
+            $basepage = substr($summary,0,12);
+            //$basepage = _("Message"); // FIXME: we use now the first 12 chars of the summary
         return $basepage;
     }
 
@@ -367,9 +367,9 @@ extends WikiPlugin
     }
 
     function findBlogs (&$dbi, $basepage='', $type='wikiblog') {
-        $prefix = (empty($basepage) 
-		   ? "" 
-		   :  $basepage . SUBPAGE_SEPARATOR) . $this->_blogPrefix($type);
+        $prefix = (empty($basepage)
+                   ? ""
+                   :  $basepage . SUBPAGE_SEPARATOR) . $this->_blogPrefix($type);
         $pages = $dbi->titleSearch(new TextSearchQuery('"'.$prefix.'"', true, 'none'));
 
         $blogs = array();
@@ -388,30 +388,30 @@ extends WikiPlugin
         return(strcmp($a->get('mtime'),
                       $b->get('mtime')));
     }
-    
+
     function showForm (&$request, $args, $template='blogform') {
         // Show blog-entry form.
-	$args = array('PAGENAME' => $args['pagename'],
-		      'HIDDEN_INPUTS' => 
-		      HiddenInputs($request->getArgs()));
-	if (ENABLE_EDIT_TOOLBAR and !ENABLE_WYSIWYG and ($template != 'addcomment')) {
+        $args = array('PAGENAME' => $args['pagename'],
+                      'HIDDEN_INPUTS' =>
+                      HiddenInputs($request->getArgs()));
+        if (ENABLE_EDIT_TOOLBAR and !ENABLE_WYSIWYG and ($template != 'addcomment')) {
             include_once("lib/EditToolbar.php");
             $toolbar = new EditToolbar();
             $args = array_merge($args, $toolbar->getTokens());
-	}
-	return new Template($template, $request, $args);
+        }
+        return new Template($template, $request, $args);
     }
 
     // "2004-12" => "December 2004"
     function _monthTitle($month){
-    	if (!$month) $month = strftime("%Y-%m");
+            if (!$month) $month = strftime("%Y-%m");
         //list($year,$mon) = explode("-",$month);
         return strftime("%B %Y", strtotime($month."-01"));
     }
 
     // "UserName/Blog/2004-12-13/12:28:50+01:00" => array('month' => "2004-12", ...)
     function _blog($rev_or_page) {
-    	$pagename = $rev_or_page->getName();
+            $pagename = $rev_or_page->getName();
         if (preg_match("/^(.*Blog)\/(\d\d\d\d-\d\d)-(\d\d)\/(.*)/", $pagename, $m))
             list(,$prefix,$month,$day,$time) = $m;
         return array('pagename' => $pagename,
@@ -425,7 +425,7 @@ extends WikiPlugin
     }
 
     function _nonDefaultArgs($args) {
-    	return array_diff_assoc($args, $this->getDefaultArguments());
+            return array_diff_assoc($args, $this->getDefaultArguments());
     }
 
 };
diff --git a/lib/plugin/WikiForm.php b/lib/plugin/WikiForm.php
index 6036fa52b..5a6f2a96b 100644
--- a/lib/plugin/WikiForm.php
+++ b/lib/plugin/WikiForm.php
@@ -22,7 +22,7 @@ rcs_id('$Id$');
 
 /**
  * This is a replacement for MagicPhpWikiURL forms.
- * Just a few old actions are supported, which where previously 
+ * Just a few old actions are supported, which where previously
  * encoded with the phpwiki: syntax.
  *
  * See WikiFormMore for the more generic version.
diff --git a/lib/plugin/WikiFormRich.php b/lib/plugin/WikiFormRich.php
index 12e052735..c5991e644 100644
--- a/lib/plugin/WikiFormRich.php
+++ b/lib/plugin/WikiFormRich.php
@@ -25,18 +25,18 @@ rcs_id('$Id$');
  * Previously encoded with the "phpwiki:" syntax.
  *
  * Enhanced WikiForm to be more generic:
- * - editbox[] 		name=.. value=.. text=.. autocomplete=1
- * - checkbox[] 	name=.. value=0|1 checked text=..
- * - radio[] 	        name=.. value=.. text=..
- * - pulldown[]		name=.. value=.. selected=.. text=.. autocomplete=1
- * - combobox[]		name=.. value=.. text=.. method=.. args=.. 
- * - hidden[]		name=.. value=..
+ * - editbox[]                 name=.. value=.. text=.. autocomplete=1
+ * - checkbox[]         name=.. value=0|1 checked text=..
+ * - radio[]                 name=.. value=.. text=..
+ * - pulldown[]                name=.. value=.. selected=.. text=.. autocomplete=1
+ * - combobox[]                name=.. value=.. text=.. method=.. args=..
+ * - hidden[]                name=.. value=..
  * - submit[]
  * - action, submit buttontext, optional cancel button (bool)
  * - method=get or post, Default: post.
- 
+
  * Valid arguments for pulldown and editbox: autocomplete=1, Default: 0
- * If autocomplete=1, additional arguments method and args may be used. 
+ * If autocomplete=1, additional arguments method and args may be used.
  * If no method is given, value will be used to fill in the valid values.
  * method="xmlrpc:server:name" or "url:http://server/wiki/method" or "array:jsvariable"
  * or "plugin:pluginname"
@@ -46,54 +46,54 @@ rcs_id('$Id$');
  * @Author: Reini Urban
 
  * Values which are constants are evaluated.
- * The cancel button must be supported by the action. 
+ * The cancel button must be supported by the action.
  *   (just some wikiadmin actions so far)
  * improve layout by: nobr=1
  * some allow values as list from from <!plugin-list !>
 
  Samples:
-   <?plugin WikiFormRich action=dumpserial method=get 
-            checkbox[] name=include value="all" 
+   <?plugin WikiFormRich action=dumpserial method=get
+            checkbox[] name=include value="all"
             editbox[] name=directory value=DEFAULT_DUMP_DIR
             editbox[] name=pages value=*
             editbox[] name=exclude value="" ?>
-   <?plugin WikiFormRich action=dumphtml method=get 
+   <?plugin WikiFormRich action=dumphtml method=get
             editbox[] name=directory value=HTML_DUMP_DIR
             editbox[] name=pages value="*"
             editbox[] name=exclude value="" ?>
-   <?plugin WikiFormRich action=loadfile method=get 
+   <?plugin WikiFormRich action=loadfile method=get
             editbox[]  name=source value=DEFAULT_WIKI_PGSRC
             checkbox[] name=overwrite value=1
             editbox[]  name=exclude value="" ?>
   <?plugin WikiFormRich action=TitleSearch method=get class=wikiadmin nobr=1
-  	   editbox[] name=s text=""
+             editbox[] name=s text=""
            submit[]
-  	   checkbox[] name=case_exact
-  	   checkbox[] name=regex ?>
+             checkbox[] name=case_exact
+             checkbox[] name=regex ?>
   <?plugin WikiFormRich action=FullTextSearch method=get class=wikiadmin nobr=1
-  	   editbox[] name=s text=""
+             editbox[] name=s text=""
            submit[]
-  	   checkbox[] name=case_exact
-  	   checkbox[] name=regex ?>
+             checkbox[] name=case_exact
+             checkbox[] name=regex ?>
   <?plugin WikiFormRich action=FuzzyPages method=get class=wikiadmin nobr=1
-  	   editbox[] name=s text=""
+             editbox[] name=s text=""
            submit[]
-  	   checkbox[] name=case_exact ?>
+             checkbox[] name=case_exact ?>
   <?plugin WikiFormRich action=AppendText buttontext="AddPlugin"
-  	   radio[] name=s value=<!plugin-list BackLinks page=WikiPlugin limit=10 !>
-  	   ?>
+             radio[] name=s value=<!plugin-list BackLinks page=WikiPlugin limit=10 !>
+             ?>
   <?plugin WikiFormRich action=AppendText buttontext="AddPlugin"
-  	   pulldown[] name=s text="Plugins: " value=<!plugin-list BackLinks page=WikiPlugin !>
-  	   ?>
+             pulldown[] name=s text="Plugins: " value=<!plugin-list BackLinks page=WikiPlugin !>
+             ?>
   <?plugin WikiFormRich action=AppendText buttontext="AddCategory"
-  	   pulldown[] name=s text="Categories: " value=<!plugin-list TitleSearch s=Category !>
-  	   ?>
+             pulldown[] name=s text="Categories: " value=<!plugin-list TitleSearch s=Category !>
+             ?>
   <?plugin WikiFormRich action=SemanticSearch buttontext="AddRelation"
-  	   combobox[] name=relation text="Relation: " method=listRelations
-  	   ?>
+             combobox[] name=relation text="Relation: " method=listRelations
+             ?>
   <?plugin WikiFormRich action=AppendText buttontext="InsertTemplate"
-  	   combobox[] name=s text="Template: " method=titleSearch args="Template/"
-  	   ?>
+             combobox[] name=s text="Template: " method=titleSearch args="Template/"
+             ?>
 */
 
 class WikiPlugin_WikiFormRich
@@ -122,20 +122,20 @@ extends WikiPlugin
     /* TODO: support better block alignment: <br>, tables, indent
      */
     function handle_plugin_args_cruft($argstr, $args) {
-    	$allowed = array("editbox", "hidden", "checkbox", "radiobutton"/*deprecated*/,
-    			 "radio", "pulldown", "submit", "reset", "combobox");
-    	// no editbox[] = array(...) allowed (space)
-    	$arg_array = preg_split("/\n/", $argstr);
-    	// for security we should check this better
+            $allowed = array("editbox", "hidden", "checkbox", "radiobutton"/*deprecated*/,
+                             "radio", "pulldown", "submit", "reset", "combobox");
+            // no editbox[] = array(...) allowed (space)
+            $arg_array = preg_split("/\n/", $argstr);
+            // for security we should check this better
         $arg = '';
-    	for ($i = 0; $i < count($arg_array); $i++) {
-    	    //TODO: we require an name=value pair here, but submit may go without also.
-    	    if (preg_match("/^\s*(".join("|",$allowed).")\[\](.*)$/", $arg_array[$i], $m)) {
-    	    	$name = $m[1]; // one of the allowed input types
+            for ($i = 0; $i < count($arg_array); $i++) {
+                //TODO: we require an name=value pair here, but submit may go without also.
+                if (preg_match("/^\s*(".join("|",$allowed).")\[\](.*)$/", $arg_array[$i], $m)) {
+                        $name = $m[1]; // one of the allowed input types
                 $this->inputbox[][$name] = array(); $j = count($this->inputbox) - 1;
                 $curargs = trim($m[2]);
                 // must match name=NAME and also value=<!plugin-list name !>
-                while (preg_match("/^(\w+?)=((?:\".*?\")|(?:\w+)|(?:\"?<!plugin-list.+?!>\"?))\s*/", 
+                while (preg_match("/^(\w+?)=((?:\".*?\")|(?:\w+)|(?:\"?<!plugin-list.+?!>\"?))\s*/",
                                   $curargs, $m)) {
                     $attr = $m[1]; $value = $m[2];
                     $curargs = substr($curargs, strlen($m[0]));
@@ -143,31 +143,31 @@ extends WikiPlugin
                         $value = $m[1];
                     if (in_array($name, array("pulldown","checkbox","radio","radiobutton","combobox"))
                             and preg_match('/^<!plugin-list.+!>$/', $value, $m))
-            	    // like pulldown[] name=test value=<!plugin-list BackLinks page=HomePage!>
+                        // like pulldown[] name=test value=<!plugin-list BackLinks page=HomePage!>
                     {
-            		$loader = new WikiPluginLoader();
-            		$markup = null;
-            		$basepage = null;
-            		$plugin_str = preg_replace(array("/^<!/","/!>$/"),array("<?","?>"), $value);
-            		// will return a pagelist object! pulldown,checkbox,radiobutton
-            		$value = $loader->expandPI($plugin_str, $GLOBALS['request'], $markup, $basepage);
-            		if (isa($value, 'PageList')) 
-            		    $value = $value->pageNames(); // apply limit
-            		elseif (!is_array($value))
-    	    		    trigger_error(sprintf("Invalid argument %s ignored", htmlentities($arg_array[$i])), 
-    	    	                          E_USER_WARNING);
+                            $loader = new WikiPluginLoader();
+                            $markup = null;
+                            $basepage = null;
+                            $plugin_str = preg_replace(array("/^<!/","/!>$/"),array("<?","?>"), $value);
+                            // will return a pagelist object! pulldown,checkbox,radiobutton
+                            $value = $loader->expandPI($plugin_str, $GLOBALS['request'], $markup, $basepage);
+                            if (isa($value, 'PageList'))
+                                $value = $value->pageNames(); // apply limit
+                            elseif (!is_array($value))
+                                    trigger_error(sprintf("Invalid argument %s ignored", htmlentities($arg_array[$i])),
+                                                  E_USER_WARNING);
                     }
                     elseif (defined($value))
                         $value = constant($value);
                     $this->inputbox[$j][$name][$attr] = $value;
                 }
-    	    	//trigger_error("not yet finished");
+                        //trigger_error("not yet finished");
                 //eval('$this->inputbox[]["'.$m[1].'"]='.$m[2].';');
             } else {
-    	    	trigger_error(sprintf("Invalid argument %s ignored", htmlentities($arg_array[$i])), 
-    	    	              E_USER_WARNING);
+                        trigger_error(sprintf("Invalid argument %s ignored", htmlentities($arg_array[$i])),
+                                      E_USER_WARNING);
+            }
             }
-    	}
         return;
     }
 
@@ -196,7 +196,7 @@ extends WikiPlugin
                   $text = $input['text'];
                   unset($input['text']);
               }
-	      switch($inputtype) {
+              switch($inputtype) {
               case 'checkbox': // text right
               case 'radio':
                 if (empty($input['value'])) $input['value'] = 1;
@@ -210,7 +210,7 @@ extends WikiPlugin
                         if ($request->getArg($name)) {
                             if ($request->getArg($name) == $val)
                                 $input['checked'] = 'checked';
-                            else 
+                            else
                                 unset($input['checked']);
                         }
                         $div->pushContent(HTML::input($input), $nbsp, $val, $nbsp, "\n");
@@ -235,22 +235,22 @@ extends WikiPlugin
                   $input['type'] = 'text';
                   if (empty($input['value']) and ($s = $request->getArg($input['name'])))
                       $input['value'] = $s;
-		  if (!empty($input['autocomplete']))
-		      $this->_doautocomplete($form, $inputtype, $input, $input['value']);
+                  if (!empty($input['autocomplete']))
+                      $this->_doautocomplete($form, $inputtype, $input, $input['value']);
                   if ($nobr)
                       $form->pushContent($text, $nbsp, HTML::input($input));
                   else
                       $form->pushContent(HTML::div(array('class' => $class), $text, $nbsp, HTML::input($input)));
                   break;
               case 'combobox': // text left
-		  $input['autocomplete'] = 1;
+                  $input['autocomplete'] = 1;
               case 'pulldown':
                   $values = @$input['value'];
                   unset($input['value']);
                   unset($input['type']);
                   if (is_string($values)) $values = explode(",", $values);
-		  if (!empty($input['autocomplete']))
-		      $this->_doautocomplete($form, $inputtype, $input, $values);
+                  if (!empty($input['autocomplete']))
+                      $this->_doautocomplete($form, $inputtype, $input, $values);
                   $select = HTML::select($input);
                   if (empty($values) and ($s = $request->getArg($input['name']))) {
                       $select->pushContent(HTML::option(array('value'=> $s), $s));
@@ -269,8 +269,8 @@ extends WikiPlugin
                           $select->pushContent(HTML::option($input, $val));
                       }
                   } else { // force empty option
-		      $select->pushContent(HTML::option(array(), ''));
-		  }
+                      $select->pushContent(HTML::option(array(), ''));
+                  }
                   $form->pushContent($text, $nbsp, $select);
                   break;
               case 'reset':
@@ -306,7 +306,7 @@ extends WikiPlugin
             if ($cancel) {
                 $form->pushContent(HTML::span
                                    (array('class' => $class),
-                                    $submit, 
+                                    $submit,
                                     Button('submit:cancel', _("Cancel"), $class)));
             } else {
                 $form->pushContent(HTML::span(array('class' => $class),
@@ -317,83 +317,83 @@ extends WikiPlugin
     }
 
     function _doautocomplete(&$form, $inputtype, &$input, &$values) {
-	global $request;
-	$input['class'] = "dropdown";
-	$input['acdropdown'] = "true"; 
-	//$input['autocomplete'] = "OFF";
-	$input['autocomplete_complete'] = "true";
-	// only match begin: autocomplete_matchbegin, or
-	$input['autocomplete_matchsubstring'] = "true";
-	if (empty($values)) {
-	    if ($input['method']) {
-		if (empty($input['args'])) {
-		    if (preg_match("/^(.*?) (.*)$/",$input['method'],$m)) {
-		        $input['method'] = $m[1];
-		        $input['args'] = $m[2];
-		    } else 
-		        $input['args'] = null;
-		}
-		static $tmpArray = 'tmpArray00';
-		// deferred remote xmlrpc call
-		if (string_starts_with($input['method'], "dynxmlrpc:")) {
-		    // how is server + method + args encoding parsed by acdropdown? 
-		    $input['autocomplete_list'] = substr($input['method'],3);
-		    if ($input['args']) 
-		        $input['autocomplete_list'] .= (" ".$input['args']);
-		// static xmlrpc call, local only
-		} elseif (string_starts_with($input['method'], "xmlrpc:")) {
-		    include_once("lib/XmlRpcClient.php");
-		    $values = wiki_xmlrpc_post(substr($input['method'],7), $input['args']);
-		} elseif (string_starts_with($input['method'], "url:")) {
-		    include_once("lib/HttpClient.php");
-		    $html = HttpClient::quickGet(substr($input['method'],4));
-		    //TODO: how to parse the HTML result into a list?
-		} elseif (string_starts_with($input['method'], "dynurl:")) {
-		    $input['autocomplete_list'] = substr($input['method'],3);
-		} elseif (string_starts_with($input['method'], "plugin:")) {
-		    $dbi = $request->getDbh();
-		    $pluginName = substr($input['method'],7);
-		    $basepage = '';
-		    require_once("lib/WikiPlugin.php");
-		    $w = new WikiPluginLoader;
-		    $p = $w->getPlugin($pluginName, false); // second arg?
-		    if (!is_object($p))
-			trigger_error("invalid input['method'] ".$input['method'], E_USER_WARNING);
-		    $pagelist = $p->run($dbi, @$input['args'], $request, $basepage);
-		    $values = array();
-		    if (is_object($pagelist) and isa($pagelist, 'PageList')) {
-			foreach ($pagelist->_pages as $page) {
-			    if (is_object($page))
-			        $values[] = $page->getName();
-			    else
-			        $values[] = (string)$page;
-			}
-		    }
-		} elseif (string_starts_with($input['method'], "array:")) {
-		    // some predefined values (e.g. in a template or themeinfo.php)
-		    $input['autocomplete_list'] = $input['method'];
-		} else {
-		    trigger_error("invalid input['method'] ".$input['method'], E_USER_WARNING);
-		}
-		if (empty($input['autocomplete_list'])) 
-		{
-		    $tmpArray++;
-		    $input['autocomplete_list']="array:".$tmpArray;
-		    $svalues = empty($values) ? "" : join("','", $values);
-		    $form->pushContent(JavaScript("var $tmpArray = new Array('".$svalues."')"));
-		}
-		if (count($values) == 1)
-		    $input['value'] = $values[0];
-		else
-		    $input['value'] = "";    
-		unset($input['method']);
-		unset($input['args']);
-		//unset($input['autocomplete']);
-	    }
-	    elseif ($s = $request->getArg($input['name']))
-		$input['value'] = $s;
-	}
-	return true;
+        global $request;
+        $input['class'] = "dropdown";
+        $input['acdropdown'] = "true";
+        //$input['autocomplete'] = "OFF";
+        $input['autocomplete_complete'] = "true";
+        // only match begin: autocomplete_matchbegin, or
+        $input['autocomplete_matchsubstring'] = "true";
+        if (empty($values)) {
+            if ($input['method']) {
+                if (empty($input['args'])) {
+                    if (preg_match("/^(.*?) (.*)$/",$input['method'],$m)) {
+                        $input['method'] = $m[1];
+                        $input['args'] = $m[2];
+                    } else
+                        $input['args'] = null;
+                }
+                static $tmpArray = 'tmpArray00';
+                // deferred remote xmlrpc call
+                if (string_starts_with($input['method'], "dynxmlrpc:")) {
+                    // how is server + method + args encoding parsed by acdropdown?
+                    $input['autocomplete_list'] = substr($input['method'],3);
+                    if ($input['args'])
+                        $input['autocomplete_list'] .= (" ".$input['args']);
+                // static xmlrpc call, local only
+                } elseif (string_starts_with($input['method'], "xmlrpc:")) {
+                    include_once("lib/XmlRpcClient.php");
+                    $values = wiki_xmlrpc_post(substr($input['method'],7), $input['args']);
+                } elseif (string_starts_with($input['method'], "url:")) {
+                    include_once("lib/HttpClient.php");
+                    $html = HttpClient::quickGet(substr($input['method'],4));
+                    //TODO: how to parse the HTML result into a list?
+                } elseif (string_starts_with($input['method'], "dynurl:")) {
+                    $input['autocomplete_list'] = substr($input['method'],3);
+                } elseif (string_starts_with($input['method'], "plugin:")) {
+                    $dbi = $request->getDbh();
+                    $pluginName = substr($input['method'],7);
+                    $basepage = '';
+                    require_once("lib/WikiPlugin.php");
+                    $w = new WikiPluginLoader;
+                    $p = $w->getPlugin($pluginName, false); // second arg?
+                    if (!is_object($p))
+                        trigger_error("invalid input['method'] ".$input['method'], E_USER_WARNING);
+                    $pagelist = $p->run($dbi, @$input['args'], $request, $basepage);
+                    $values = array();
+                    if (is_object($pagelist) and isa($pagelist, 'PageList')) {
+                        foreach ($pagelist->_pages as $page) {
+                            if (is_object($page))
+                                $values[] = $page->getName();
+                            else
+                                $values[] = (string)$page;
+                        }
+                    }
+                } elseif (string_starts_with($input['method'], "array:")) {
+                    // some predefined values (e.g. in a template or themeinfo.php)
+                    $input['autocomplete_list'] = $input['method'];
+                } else {
+                    trigger_error("invalid input['method'] ".$input['method'], E_USER_WARNING);
+                }
+                if (empty($input['autocomplete_list']))
+                {
+                    $tmpArray++;
+                    $input['autocomplete_list']="array:".$tmpArray;
+                    $svalues = empty($values) ? "" : join("','", $values);
+                    $form->pushContent(JavaScript("var $tmpArray = new Array('".$svalues."')"));
+                }
+                if (count($values) == 1)
+                    $input['value'] = $values[0];
+                else
+                    $input['value'] = "";
+                unset($input['method']);
+                unset($input['args']);
+                //unset($input['autocomplete']);
+            }
+            elseif ($s = $request->getArg($input['name']))
+                $input['value'] = $s;
+        }
+        return true;
     }
 };
 
diff --git a/lib/plugin/WikiForum.php b/lib/plugin/WikiForum.php
index 9ee719c6b..5de2085f9 100644
--- a/lib/plugin/WikiForum.php
+++ b/lib/plugin/WikiForum.php
@@ -2,7 +2,7 @@
 rcs_id('$Id$');
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@ rcs_id('$Id$');
 
 /**
  * This plugin handles a threaded list of comments/news associated with a
- * particular page (one page per topic) and provides an input form for 
+ * particular page (one page per topic) and provides an input form for
  * adding a new message.
  *
  *   <?plugin WikiForum ?>
@@ -90,7 +90,7 @@ extends WikiPlugin_WikiBlog
             if (!empty($seen[$show]))
                 continue;
             $seen[$show] = 1;
-                
+
             switch ($show) {
             case 'summary': // main page: list of all titles
                 $html->pushContent($this->showTopics($request, $args));
diff --git a/lib/plugin/WikiPoll.php b/lib/plugin/WikiPoll.php
index 9216c2c7a..27497a8ce 100644
--- a/lib/plugin/WikiPoll.php
+++ b/lib/plugin/WikiPoll.php
@@ -3,7 +3,7 @@ rcs_id('$Id$');
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  * Copyright 2008 Marc-Etienne Vargenau, Alcatel-lucent
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -54,8 +54,8 @@ rcs_id('$Id$');
 class WikiPlugin_WikiPoll
 extends WikiPlugin
 {
-    var $_args;	
-    
+    var $_args;
+
     function getName () {
         return _("WikiPoll");
     }
@@ -91,7 +91,7 @@ extends WikiPlugin
                   $args['answer'][$i] = $array;
           }
         }
-        
+
         if (!empty($defaults))
           foreach ($defaults as $arg => $default_val) {
             if (isset($argstr_args[$arg]))
@@ -118,31 +118,31 @@ extends WikiPlugin
 
         return $args;
     }
-    
+
     function handle_plugin_args_cruft($argstr, $args) {
-    	$argstr = str_replace("\n"," ",$argstr);
-    	$argstr = str_replace(array("[","]"),array("_",""),$argstr);
-    	$this->_args = $this->getArgs($argstr, $GLOBALS['request']);
+            $argstr = str_replace("\n"," ",$argstr);
+            $argstr = str_replace(array("[","]"),array("_",""),$argstr);
+            $this->_args = $this->getArgs($argstr, $GLOBALS['request']);
         return;
     }
 
     function str2array($var, $obarray=false) {
-    	if (!$obarray) $obarray = $GLOBALS;
-    	$i = 0; $array = array();
-    	$name = sprintf("%s_%d",$var,$i);
-    	if (isset($obarray[$name])) $array[$i] = $obarray[$name];
-    	do {
+            if (!$obarray) $obarray = $GLOBALS;
+            $i = 0; $array = array();
+            $name = sprintf("%s_%d",$var,$i);
+            if (isset($obarray[$name])) $array[$i] = $obarray[$name];
+            do {
           $i++;
           $name = sprintf("%s_%d",$var,$i);
           if (isset($obarray[$name])) $array[$i] = $obarray[$name];
-    	} while (isset($obarray[$name]));
-    	return $array;
+            } while (isset($obarray[$name]));
+            return $array;
     }
-    
+
     function run($dbi, $argstr, &$request, $basepage) {
         if (!isset($_SERVER))
             $_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
-    	$request->setArg('nocache','purge');
+            $request->setArg('nocache','purge');
         $args = $this->getArgs($argstr, $request);
         if (!$args['page'])
             return $this->error("No page specified");
@@ -150,8 +150,8 @@ extends WikiPlugin
             // reset statistics
             return $this->doPollAdmin($dbi, $request, $page);
         }
-	extract($this->_args);
-	$page = $dbi->getPage($args['page']);
+        extract($this->_args);
+        $page = $dbi->getPage($args['page']);
         // check ip and last visit
         $poll = $page->get("poll");
         $ip = $_SERVER['REMOTE_ADDR'];
@@ -163,7 +163,7 @@ extends WikiPlugin
             $html->pushContent($this->doPoll($page, $request, $request->getArg('answer'),true));
             return $html;
         }
-            
+
         $poll['ip'][$ip] = time();
         // purge older ip's
         foreach ($poll['ip'] as $ip => $time) {
@@ -178,7 +178,7 @@ extends WikiPlugin
             if ($request->getArg('answer') and (
                  ($args['require_all'] and
                   count($request->getArg('answer')) == count($question))
-                 or 
+                 or
                  ($args['require_least'] and
                   count($request->getArg('answer')) >= $args['require_least']))) {
                 $page->set("poll", $poll);
@@ -188,14 +188,14 @@ extends WikiPlugin
                 $html->pushContent(HTML::p(HTML::strong(_("Not enough questions answered!"))));
             }
         }
-       
+
         $init = isset($question[0]) ? 0 : 1;
         for ($i = $init; $i <= count($question); $i++) {
             if (!isset($question[$i])) break;
-            $q = $question[$i]; 
+            $q = $question[$i];
             if (!isset($answer[$i]))
-            	trigger_error(fmt("Missing %s for %s","answer"."[$i]","question"."[$i]"),
-            	              E_USER_ERROR);
+                    trigger_error(fmt("Missing %s for %s","answer"."[$i]","question"."[$i]"),
+                                  E_USER_ERROR);
             $a = $answer[$i];
             if (! is_array($a)) {
                 // a simple checkbox
@@ -220,13 +220,13 @@ extends WikiPlugin
         }
         if (!$disable_submit)
             $html->pushContent(HTML::p(
-        	HTML::input(array('type' => 'submit',
+                HTML::input(array('type' => 'submit',
                                   'name' => "WikiPoll",
                                   'value' => _("OK"))),
-        	HTML::input(array('type' => 'reset',
+                HTML::input(array('type' => 'reset',
                                   'name' => "reset",
                                   'value' => _("Reset")))));
-        else 
+        else
              $html->pushContent(HTML::p(),HTML::strong(
                  _("Sorry! You must wait at least 20 minutes until you can vote again!")));
         return $html;
@@ -245,18 +245,18 @@ extends WikiPlugin
     }
 
     function doPoll($page, $request, $answers, $readonly = false) {
-    	$question = $this->_args['question'];
-    	$answer   = $this->_args['answer'];
+            $question = $this->_args['question'];
+            $answer   = $this->_args['answer'];
         $html = HTML::table(array('cellspacing' => 2));
         $init = isset($question[0]) ? 0 : 1;
         for ($i = $init; $i <= count($question); $i++) {
             if (!isset($question[$i])) break;
             $poll = $page->get('poll');
             @$poll['data']['all'][$i]++;
-            $q = $question[$i]; 
+            $q = $question[$i];
             if (!isset($answer[$i]))
-            	trigger_error(fmt("Missing %s for %s","answer"."[$i]","question"."[$i]"),
-            	              E_USER_ERROR);
+                    trigger_error(fmt("Missing %s for %s","answer"."[$i]","question"."[$i]"),
+                                  E_USER_ERROR);
             if (!$readonly)
                 $page->set('poll',$poll);
             $a = $answer[$i];
@@ -267,15 +267,15 @@ extends WikiPlugin
                                               'value' => $a));
                 if ($result >= 0)
                     $checkbox->setAttr('checked', "checked");
-	        if (!$readonly)
+                if (!$readonly)
                     list($percent,$count,$all) = $this->storeResult($page, $i, $result ? 1 : 0);
-                else 
+                else
                     list($percent,$count,$all) = $this->getResult($page, $i, 1);
                 $print = sprintf(_("  %d%% (%d/%d)"), $percent, $count, $all);
                 $html->pushContent(HTML::tr(HTML::th(array('colspan' => 4,'align'=>'left'),$q)));
                 $html->pushContent(HTML::tr(HTML::td($checkbox),
                                             HTML::td($a),
-                       		            HTML::td($this->bar($percent)),
+                                                   HTML::td($this->bar($percent)),
                                             HTML::td($print)));
             } else {
                 $html->pushContent(HTML::tr(HTML::th(array('colspan' => 4,'align'=>'left'),$q)));
@@ -284,7 +284,7 @@ extends WikiPlugin
                     $this->storeResult($page, $i, $answers[$i]);
                 for ($j=0; $j <= count($a); $j++) {
                     if (isset($a[$j])) {
-                    	list($percent,$count,$all) = $this->getResult($page,$i,$j);
+                            list($percent,$count,$all) = $this->getResult($page,$i,$j);
                         $print = sprintf(_("  %d%% (%d/%d)"), $percent, $count, $all);
                         $radio = HTML::input(array('type' => 'radio',
                                                    'name' => "answer[$i]",
@@ -292,8 +292,8 @@ extends WikiPlugin
                         if ($result == $j)
                             $radio->setAttr('checked', "checked");
                         $row->pushContent(HTML::tr(HTML::td($radio),
-                        		           HTML::td($a[$j]),
-                        		           HTML::td($this->bar($percent)),
+                                                   HTML::td($a[$j]),
+                                                   HTML::td($this->bar($percent)),
                                                    HTML::td($print)));
                     }
                 }
@@ -302,30 +302,30 @@ extends WikiPlugin
         }
         if (!$readonly)
             return HTML(HTML::h3(_("The result of this poll so far:")),$html,HTML::p(_("Thanks for participating!")));
-        else  
+        else
             return HTML(HTML::h3(_("The result of this poll so far:")),$html);
-  
+
     }
-    
+
     function getResult($page,$i,$j) {
-    	$poll = $page->get("poll");
-    	@$count = $poll['data']['count'][$i][$j];
-    	@$all = $poll['data']['all'][$i];
-    	$percent = sprintf("%d", $count * 100.0 / $all);
-    	return array($percent,$count,$all);
+            $poll = $page->get("poll");
+            @$count = $poll['data']['count'][$i][$j];
+            @$all = $poll['data']['all'][$i];
+            $percent = sprintf("%d", $count * 100.0 / $all);
+            return array($percent,$count,$all);
     }
-    
+
     function storeResult($page, $i, $j) {
-    	$poll = $page->get("poll");
-    	if (!$poll) {
-    	    $poll = array('data' => array('count' => array(),
-    	    				  'all'   => array()));
-    	}
-    	@$poll['data']['count'][$i][$j]++;
-    	//@$poll['data']['all'][$i];
-    	$page->set("poll",$poll);
-  	$percent = sprintf("%d", $poll['data']['count'][$i][$j] * 100.0 / $poll['data']['all'][$i]);
-	return array($percent,$poll['data']['count'][$i][$j],$poll['data']['all'][$i]);
+            $poll = $page->get("poll");
+            if (!$poll) {
+                $poll = array('data' => array('count' => array(),
+                                                  'all'   => array()));
+            }
+            @$poll['data']['count'][$i][$j]++;
+            //@$poll['data']['all'][$i];
+            $page->set("poll",$poll);
+          $percent = sprintf("%d", $poll['data']['count'][$i][$j] * 100.0 / $poll['data']['all'][$i]);
+        return array($percent,$poll['data']['count'][$i][$j],$poll['data']['all'][$i]);
     }
 
 };
diff --git a/lib/plugin/WikicreoleTable.php b/lib/plugin/WikicreoleTable.php
index 4073dd87e..813b60ea8 100644
--- a/lib/plugin/WikicreoleTable.php
+++ b/lib/plugin/WikicreoleTable.php
@@ -23,22 +23,22 @@ rcs_id('$Id$');
 /*
  * Standard Alcatel-Lucent disclaimer for contributing to open source
  *
- * "The WikicreoleTablePlugin ("Contribution") has not been tested and/or 
+ * "The WikicreoleTablePlugin ("Contribution") has not been tested and/or
  * validated for release as or in products, combinations with products or
- * other commercial use. Any use of the Contribution is entirely made at 
+ * other commercial use. Any use of the Contribution is entirely made at
  * the user's own responsibility and the user can not rely on any features,
- * functionalities or performances Alcatel-Lucent has attributed to the 
+ * functionalities or performances Alcatel-Lucent has attributed to the
  * Contribution.
  *
- * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY 
- * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE 
+ * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
+ * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
  * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
- * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE 
- * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL 
- * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN 
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
- * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER 
- * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND 
+ * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
+ * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
+ * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
  * ALONE BASIS."
  */
 
@@ -134,7 +134,7 @@ extends WikiPlugin
     function _parse_row ($line, $basepage) {
         $brkt_link = "\\[ .*? [^]\s] .*? \\]";
         $cell_content  = "(?: [^[] | ".ESCAPE_CHAR."\\[ | $brkt_link )*?";
-        
+
         preg_match_all("/(\\|+) \s* ($cell_content) \s* (?=\\||\$)/x",
                        $line, $matches, PREG_SET_ORDER);
 
diff --git a/lib/plugin/YouTube.php b/lib/plugin/YouTube.php
index 26a661840..08498ed5c 100644
--- a/lib/plugin/YouTube.php
+++ b/lib/plugin/YouTube.php
@@ -3,7 +3,7 @@ rcs_id('$Id$');
 /*
  * Copyright 2007 Reini Urban
  * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -27,8 +27,8 @@ rcs_id('$Id$');
  * Browse: Daily pick, Most Recent, Most Viewed, Top Rated, Most Discussed, Top Favorites, Most Linked,
  *         Recently Featured, Most Responded, Watch on Mobile
  * Time:   Today, This Week, This Month, All Time
- * Category: All, Autos & Vehicles, Comedy, Entertainment, Film & Animation, 
- *         Gadgets & Games, Howto & DIY, Music, News & Politics, People & Blogs, Pets & Animals, 
+ * Category: All, Autos & Vehicles, Comedy, Entertainment, Film & Animation,
+ *         Gadgets & Games, Howto & DIY, Music, News & Politics, People & Blogs, Pets & Animals,
  *         Sports, Travel & Places
  * Language: All, English, Spanish, Japanese, German, Chinese, French
  * @author: Reini Urban
@@ -40,151 +40,151 @@ extends WikiPlugin
     function getName () {
         return _("YouTube");
     }
-    
+
     function getDescription () {
         return _("Embed YouTube videos");
     }
-    
+
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',"\$Revision$");
     }
-    
+
     function getDefaultArguments() {
         return array('v' => "",
-		     'browse' => '',      // see above
-		     'time'   => '',      // only if browse
-		     'category' => '',    // only if browse
-		     'language' => '',    // only if browse
-		     'index'    => 0,     // only if browse
-		     'style' => 'inline', // or link. link links to youtube.
-		     'size'  => 'medium', // or large, medium or small
-		     'autoplay' => 0,
-		     'width' => "425",
-		     'height' => "350");
+                     'browse' => '',      // see above
+                     'time'   => '',      // only if browse
+                     'category' => '',    // only if browse
+                     'language' => '',    // only if browse
+                     'index'    => 0,     // only if browse
+                     'style' => 'inline', // or link. link links to youtube.
+                     'size'  => 'medium', // or large, medium or small
+                     'autoplay' => 0,
+                     'width' => "425",
+                     'height' => "350");
     }
-   
+
     function run($dbi, $argstr, &$request, $basepage) {
-	$args = $this->getArgs($argstr, $request);
-	extract($args);
-	if (empty($args['v'])) {
-	    if (empty($args['browse']))
-		return $this->error(fmt("Required argument %s missing", "v"));
-	    $this->_browse = array("Most Recent"   => "mr",
-	    			   "Most Viewed"   => "mp",
-	    			   "Top Rated"     => "tr",
-	    			   "Most Discussed"=> "md",
-				   "Top Favorites" => "mf",
-				   "Most Linked"   => "mrd",
-				   "Recently Featured"=> "rf",
-				   "Most Responded"   => "ms",
-				   "Watch on Mobile"  => "mv");
-	    $this->browse   = array_keys($this->_browse);
-	    array_unshift($this->browse, "Daily Pick");
-	    $this->_time    = array("Today" => "t",
-				    "This Week" => "w",
-				    "This Month" => "m",
-				    "All Time" => "a");
-	    $this->_category = array("All" 		=> "0",
-				     "Autos & Vehicles" => "2",
-				     "Comedy" 		=> "23",
-				     "Entertainment" 	=> "24",
-				     "Film & Animation" => "1",
-				     "Gadgets & Games" 	=> "20",
-				     "Howto & DIY" 	=> "26",
-				     "Music" 		=> "10",
-				     "News & Politics" 	=> "25",
-				     "People & Blogs" 	=> "22",
-				     "Pets & Animals" 	=> "15",
-				     "Sports" 		=> "17",
-				     "Travel & Places" 	=> "19");
-	    $this->_language = array("All"     => "",
-				     "English" => "EN",
-				     "Spanish" => "ES",
-				     "Japanese"=> "JA",
-				     "German"  => "DE",
-				     "Chinese" => "CN",
-				     "French"  => "FR");
-	    if (!in_array($browse,$this->browse))
-		return $this->error(fmt("Invalid argument %s", "browse"));
-	    if ($time and !in_array($time,array_keys($this->_time)))
-		return $this->error(fmt("Invalid argument %s", "time"));
-	    if ($category and !in_array($category,$this->category)) 
-		return $this->error(fmt("Invalid argument %s", "category"));
-	    if ($language and !in_array($language,$this->language)) 
-		return $this->error(fmt("Invalid argument %s", "language"));
-	    if ($browse == "Daily Pick")
-		$v = $this->Daily_pick();
-	    else {
-		$s = $this->_browse[$browse];
-		$t = $time ? $this->_time[$time] : 't';
-		$c = $category ? $this->_category[$category] : '0';
-		$l = $language ? $this->_language[$language] : '';
-	    	$url = "http://www.youtube.com/browse?s=$s&t=$t&c=$c&l=$l";
-		$m = array('','');
-		if ($xml = url_get_contents($url)) {
-		    if ($index) {
-			if (preg_match_all('/<div class="vtitle">.*?\n.*?<a href="\/watch\?v=(\w+)" onclick=/s', $xml, $m))
-			    $v = $m[1][$index];
-		    }
-		    else {
-			if (preg_match('/<div class="vtitle">.*?\n.*?<a href="\/watch\?v=(\w+)" onclick=/s', $xml, $m))
-			    $v = $m[1];
-		    }
-		}
-	    }
-	}
-	// sanify check
-	if (strlen($v) < 10 or strlen($v) > 12)
-	    return $this->error(fmt("Invalid argument %s", "v"));
-	if (strcspn($v,"-_0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"))
-	    return $this->error(fmt("Invalid argument %s", "v"));
-	$url = "http://www.youtube.com/v/" . $v;
-	if ($autoplay)
-	    $url .= "?autoplay=1";
-	if ($size != 'medium') {
-	    if ($size == 'large') { $width = 640; $height = 526; }
-	    elseif ($size == 'small') { $width = 240; $height = 200; }
-	}
-	unset($args['size']);
-	unset($args['style']);
-	$args['src'] = $v;
-	unset($args['v']);
-	if ($style == 'link') {
-	    if ($size == 'medium') { $width = 130; $height = 97; }
-	    elseif ($size == 'large') { $width = 320; $height = 240; }
-	    elseif ($size == 'small') { $width = 90; $height = 60; }
-	    // img: http://img.youtube.com/vi/KKTDRqQtPO8/2.jpg or 0.jpg
-	    $link = HTML::a(array('href' => $url),
-			    HTML::img(array('src' => "http://img.youtube.com/vi/".
-					    $v."/".(($size == 'large')?"0":"2").".jpg",
-					    'width' => $width,
-					    'height' => $height,
+        $args = $this->getArgs($argstr, $request);
+        extract($args);
+        if (empty($args['v'])) {
+            if (empty($args['browse']))
+                return $this->error(fmt("Required argument %s missing", "v"));
+            $this->_browse = array("Most Recent"   => "mr",
+                                       "Most Viewed"   => "mp",
+                                       "Top Rated"     => "tr",
+                                       "Most Discussed"=> "md",
+                                   "Top Favorites" => "mf",
+                                   "Most Linked"   => "mrd",
+                                   "Recently Featured"=> "rf",
+                                   "Most Responded"   => "ms",
+                                   "Watch on Mobile"  => "mv");
+            $this->browse   = array_keys($this->_browse);
+            array_unshift($this->browse, "Daily Pick");
+            $this->_time    = array("Today" => "t",
+                                    "This Week" => "w",
+                                    "This Month" => "m",
+                                    "All Time" => "a");
+            $this->_category = array("All"                 => "0",
+                                     "Autos & Vehicles" => "2",
+                                     "Comedy"                 => "23",
+                                     "Entertainment"         => "24",
+                                     "Film & Animation" => "1",
+                                     "Gadgets & Games"         => "20",
+                                     "Howto & DIY"         => "26",
+                                     "Music"                 => "10",
+                                     "News & Politics"         => "25",
+                                     "People & Blogs"         => "22",
+                                     "Pets & Animals"         => "15",
+                                     "Sports"                 => "17",
+                                     "Travel & Places"         => "19");
+            $this->_language = array("All"     => "",
+                                     "English" => "EN",
+                                     "Spanish" => "ES",
+                                     "Japanese"=> "JA",
+                                     "German"  => "DE",
+                                     "Chinese" => "CN",
+                                     "French"  => "FR");
+            if (!in_array($browse,$this->browse))
+                return $this->error(fmt("Invalid argument %s", "browse"));
+            if ($time and !in_array($time,array_keys($this->_time)))
+                return $this->error(fmt("Invalid argument %s", "time"));
+            if ($category and !in_array($category,$this->category))
+                return $this->error(fmt("Invalid argument %s", "category"));
+            if ($language and !in_array($language,$this->language))
+                return $this->error(fmt("Invalid argument %s", "language"));
+            if ($browse == "Daily Pick")
+                $v = $this->Daily_pick();
+            else {
+                $s = $this->_browse[$browse];
+                $t = $time ? $this->_time[$time] : 't';
+                $c = $category ? $this->_category[$category] : '0';
+                $l = $language ? $this->_language[$language] : '';
+                    $url = "http://www.youtube.com/browse?s=$s&t=$t&c=$c&l=$l";
+                $m = array('','');
+                if ($xml = url_get_contents($url)) {
+                    if ($index) {
+                        if (preg_match_all('/<div class="vtitle">.*?\n.*?<a href="\/watch\?v=(\w+)" onclick=/s', $xml, $m))
+                            $v = $m[1][$index];
+                    }
+                    else {
+                        if (preg_match('/<div class="vtitle">.*?\n.*?<a href="\/watch\?v=(\w+)" onclick=/s', $xml, $m))
+                            $v = $m[1];
+                    }
+                }
+            }
+        }
+        // sanify check
+        if (strlen($v) < 10 or strlen($v) > 12)
+            return $this->error(fmt("Invalid argument %s", "v"));
+        if (strcspn($v,"-_0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"))
+            return $this->error(fmt("Invalid argument %s", "v"));
+        $url = "http://www.youtube.com/v/" . $v;
+        if ($autoplay)
+            $url .= "?autoplay=1";
+        if ($size != 'medium') {
+            if ($size == 'large') { $width = 640; $height = 526; }
+            elseif ($size == 'small') { $width = 240; $height = 200; }
+        }
+        unset($args['size']);
+        unset($args['style']);
+        $args['src'] = $v;
+        unset($args['v']);
+        if ($style == 'link') {
+            if ($size == 'medium') { $width = 130; $height = 97; }
+            elseif ($size == 'large') { $width = 320; $height = 240; }
+            elseif ($size == 'small') { $width = 90; $height = 60; }
+            // img: http://img.youtube.com/vi/KKTDRqQtPO8/2.jpg or 0.jpg
+            $link = HTML::a(array('href' => $url),
+                            HTML::img(array('src' => "http://img.youtube.com/vi/".
+                                            $v."/".(($size == 'large')?"0":"2").".jpg",
+                                            'width' => $width,
+                                            'height' => $height,
                                             'alt' => "YouTube video $v")));
-	    return $link;
-	}
-	$object = HTML::object(array('class' => 'inlineobject',
-				     'width' => $width,
-				     'height' => $height,
-				     ));
-	$attrs = array('data' => $url,
-		       'type' => 'application/x-shockwave-flash', 
-		       'width' => $width,
-		       'height' => $height);
-	if (isBrowserSafari()) {
-	    return HTML::object($attrs);
-	}
-	$object->pushContent(HTML::param(array('name' => 'movie', 'value' => $url)));
-	$object->pushContent(HTML::param(array('name' => 'wmode', 'value' => 'transparent')));
-	$object->pushContent(HTML::object($attrs));
-	return $object;
+            return $link;
+        }
+        $object = HTML::object(array('class' => 'inlineobject',
+                                     'width' => $width,
+                                     'height' => $height,
+                                     ));
+        $attrs = array('data' => $url,
+                       'type' => 'application/x-shockwave-flash',
+                       'width' => $width,
+                       'height' => $height);
+        if (isBrowserSafari()) {
+            return HTML::object($attrs);
+        }
+        $object->pushContent(HTML::param(array('name' => 'movie', 'value' => $url)));
+        $object->pushContent(HTML::param(array('name' => 'wmode', 'value' => 'transparent')));
+        $object->pushContent(HTML::object($attrs));
+        return $object;
     }
 
     function Daily_pick() {
-	if ($xml = url_get_contents("http://www.youtube.com/categories")) {
-	    if (preg_match('/<div class="heading"><b>Pick of The Day<\/b><\/div>.*?<a href="\/watch\?v=(\w+)">/s', $xml, $m))
-	        return $m[1];
-	}
-	return '';
+        if ($xml = url_get_contents("http://www.youtube.com/categories")) {
+            if (preg_match('/<div class="heading"><b>Pick of The Day<\/b><\/div>.*?<a href="\/watch\?v=(\w+)">/s', $xml, $m))
+                return $m[1];
+        }
+        return '';
     }
 };
 
diff --git a/lib/plugin/_AuthInfo.php b/lib/plugin/_AuthInfo.php
index 461a80023..6d3a96b1e 100644
--- a/lib/plugin/_AuthInfo.php
+++ b/lib/plugin/_AuthInfo.php
@@ -23,7 +23,7 @@ rcs_id('$Id$');
 require_once('lib/Template.php');
 /**
  * Used to debug auth problems and settings.
- * This plugin is only testing purposes. 
+ * This plugin is only testing purposes.
  * if DEBUG is false, only admin can call it, which is of no real use.
  *
  * Warning! This may display db and user passwords in cleartext.
@@ -66,23 +66,23 @@ extends WikiPlugin
         $table = HTML::table(array('border' => 1,
                                   'cellpadding' => 2,
                                   'cellspacing' => 0));
-        $table->pushContent($this->_showhash("AUTH DEFINES", 
+        $table->pushContent($this->_showhash("AUTH DEFINES",
                                 $this->_buildConstHash(
                                     array("ENABLE_USER_NEW","ALLOW_ANON_USER",
                                           "ALLOW_ANON_EDIT","ALLOW_BOGO_LOGIN",
                                           "REQUIRE_SIGNIN_BEFORE_EDIT","ALLOW_USER_PASSWORDS",
                                           "PASSWORD_LENGTH_MINIMUM","USE_DB_SESSION"))));
         if ((defined('ALLOW_LDAP_LOGIN') && ALLOW_LDAP_LOGIN) or in_array("LDAP",$GLOBALS['USER_AUTH_ORDER']))
-            $table->pushContent($this->_showhash("LDAP DEFINES", 
+            $table->pushContent($this->_showhash("LDAP DEFINES",
                                                  $this->_buildConstHash(array("LDAP_AUTH_HOST","LDAP_BASE_DN"))));
         if ((defined('ALLOW_IMAP_LOGIN') && ALLOW_IMAP_LOGIN) or in_array("IMAP",$GLOBALS['USER_AUTH_ORDER']))
             $table->pushContent($this->_showhash("IMAP DEFINES", array("IMAP_AUTH_HOST" => IMAP_AUTH_HOST)));
         if (defined('AUTH_USER_FILE') or in_array("File",$GLOBALS['USER_AUTH_ORDER']))
-            $table->pushContent($this->_showhash("AUTH_USER_FILE", 
+            $table->pushContent($this->_showhash("AUTH_USER_FILE",
                                     $this->_buildConstHash(array("AUTH_USER_FILE",
                                                                  "AUTH_USER_FILE_STORABLE"))));
         if (defined('GROUP_METHOD'))
-            $table->pushContent($this->_showhash("GROUP_METHOD", 
+            $table->pushContent($this->_showhash("GROUP_METHOD",
                                     $this->_buildConstHash(array("GROUP_METHOD","AUTH_GROUP_FILE","GROUP_LDAP_QUERY"))));
         $table->pushContent($this->_showhash("\$USER_AUTH_ORDER[]", $GLOBALS['USER_AUTH_ORDER']));
         $table->pushContent($this->_showhash("USER_AUTH_POLICY", array("USER_AUTH_POLICY"=>USER_AUTH_POLICY)));
@@ -107,9 +107,9 @@ extends WikiPlugin
             //$table->pushContent(HTML::tr(HTML::td(array('colspan' => 2))));
             $userdata = obj2hash($user, array('_dbi','_request', 'password', 'passwd'));
             if (isa($user, "_FilePassUser")) {
-            	foreach ($userdata['_file']->users as $u => $p) {
-            	    $userdata['_file']->users[$u] = "<hidden>";
-            	}
+                    foreach ($userdata['_file']->users as $u => $p) {
+                        $userdata['_file']->users[$u] = "<hidden>";
+                    }
             }
             $table->pushContent($this->_showhash("User: Object of ".get_class($user), $userdata));
             if (ENABLE_USER_NEW) {
@@ -132,12 +132,12 @@ extends WikiPlugin
     }
 
     function _showhash ($heading, $hash, $depth = 0) {
-    	static $seen = array();
-    	static $maxdepth = 0;
+            static $seen = array();
+            static $maxdepth = 0;
         $rows = array();
         $maxdepth++;
         if ($maxdepth > 35) return $heading;
-        
+
         if ($heading)
             $rows[] = HTML::tr(array('bgcolor' => '#ffcccc',
                                      'style' => 'color:#000000'),
@@ -190,7 +190,7 @@ extends WikiPlugin
         }
         return $rows;
     }
-    
+
     function _buildConstHash($constants) {
         $hash = array();
         foreach ($constants as $c) {
diff --git a/lib/plugin/_BackendInfo.php b/lib/plugin/_BackendInfo.php
index 50bcf05b1..3116fc487 100644
--- a/lib/plugin/_BackendInfo.php
+++ b/lib/plugin/_BackendInfo.php
@@ -41,7 +41,7 @@ extends WikiPlugin
 
     function getDefaultArguments() {
         return array('page' => '[pagename]',
-		     'notallversions' => 0);
+                     'notallversions' => 0);
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
@@ -70,25 +70,25 @@ extends WikiPlugin
             $this->_fixupData($pagedata);
             $table->pushContent($this->_showhash("get_pagedata('$page')", $pagedata));
         }
-	if (!$notallversions) {
-	    $version = $backend->get_latest_version($page);
-	    $vdata = $backend->get_versiondata($page, $version, true);
-	    $this->_fixupData($vdata);
-	    $table->pushContent(HTML::tr(HTML::td(array('colspan' => 2))));
-	    $table->pushContent($this->_showhash("get_versiondata('$page',$version)",
-						 $vdata));
-	} else {
-	    for ($version = $backend->get_latest_version($page);
-		 $version;
-		 $version = $backend->get_previous_version($page, $version))
-		{
-		    $vdata = $backend->get_versiondata($page, $version, true);
-		    $this->_fixupData($vdata);
-		    $table->pushContent(HTML::tr(HTML::td(array('colspan' => 2))));
-		    $table->pushContent($this->_showhash("get_versiondata('$page',$version)",
-							 $vdata));
-		}
-	}
+        if (!$notallversions) {
+            $version = $backend->get_latest_version($page);
+            $vdata = $backend->get_versiondata($page, $version, true);
+            $this->_fixupData($vdata);
+            $table->pushContent(HTML::tr(HTML::td(array('colspan' => 2))));
+            $table->pushContent($this->_showhash("get_versiondata('$page',$version)",
+                                                 $vdata));
+        } else {
+            for ($version = $backend->get_latest_version($page);
+                 $version;
+                 $version = $backend->get_previous_version($page, $version))
+                {
+                    $vdata = $backend->get_versiondata($page, $version, true);
+                    $this->_fixupData($vdata);
+                    $table->pushContent(HTML::tr(HTML::td(array('colspan' => 2))));
+                    $table->pushContent($this->_showhash("get_versiondata('$page',$version)",
+                                                         $vdata));
+                }
+        }
 
         $linkdata = $backend->get_links($page, false);
         if ($linkdata->count())
@@ -112,14 +112,14 @@ extends WikiPlugin
      * also used in plugin/EditMetaData
      */
     function _fixupData(&$data, $prefix='') {
-	if (!is_array($data)) return;
-	
+        if (!is_array($data)) return;
+
         global $request;
         $user = $request->getUser();
         foreach ($data as $key => $val) {
             $fullkey = $prefix . '[' . $key . ']';
             if (is_integer($key)) {
-            	;
+                    ;
             } elseif ($key == 'passwd' and !$user->isAdmin()) {
                 $data[$key] = $val ? _("<not displayed>") : _("<empty>");
             } elseif ($key and $key == '_cached_html') {
@@ -130,11 +130,11 @@ extends WikiPlugin
                 ob_end_clean();
             }
             elseif (is_bool($val)) {
-            	$data[$key] = $this->_showvalue($key, $val ? "true" : "false", $prefix);
+                    $data[$key] = $this->_showvalue($key, $val ? "true" : "false", $prefix);
             }
-            elseif (is_string($val) && ((substr($val, 0, 2) == 'a:' 
-					 or (substr($val, 0, 2) == 'O:')))) 
-	    {
+            elseif (is_string($val) && ((substr($val, 0, 2) == 'a:'
+                                         or (substr($val, 0, 2) == 'O:'))))
+            {
                 // how to indent this table?
                 $val = unserialize($val);
                 $this->_fixupData($val, $fullkey);
@@ -181,10 +181,10 @@ extends WikiPlugin
                                HTML::td(array('colspan' => 2,
                                               'style' => 'color:#000000'),
                                         $heading));
-	if (!is_array($hash)) return array();
+        if (!is_array($hash)) return array();
         ksort($hash);
         foreach ($hash as $key => $val) {
-            if ($this->chunk_split and is_string($val)) $val = chunk_split($val);	
+            if ($this->chunk_split and is_string($val)) $val = chunk_split($val);
             $rows[] = HTML::tr(HTML::td(array('align' => 'right',
                                               'bgcolor' => '#cccccc',
                                               'style' => 'color:#000000'),
@@ -200,7 +200,7 @@ extends WikiPlugin
 
     /* also used in plugin/EditMetaData */
     function _showvalue ($key, $val, $prefix='') {
-	return $val ? $val : HTML::raw('&nbsp;');
+        return $val ? $val : HTML::raw('&nbsp;');
     }
 
 };
diff --git a/lib/plugin/_GroupInfo.php b/lib/plugin/_GroupInfo.php
index faef05686..d318b4fe7 100644
--- a/lib/plugin/_GroupInfo.php
+++ b/lib/plugin/_GroupInfo.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 rcs_id('$Id$');
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
diff --git a/lib/plugin/_Retransform.php b/lib/plugin/_Retransform.php
index b5649d9b7..4bea75974 100644
--- a/lib/plugin/_Retransform.php
+++ b/lib/plugin/_Retransform.php
@@ -41,7 +41,7 @@ extends WikiPlugin
 
     function getDefaultArguments() {
         return array('page' => '[pagename]',
-		     );
+                     );
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
@@ -53,36 +53,36 @@ extends WikiPlugin
         $html = HTML(HTML::h3(fmt("Retransform page '%s'",
                                   $page)));
 
-	// bypass WikiDB and cache, go directly through the backend.
+        // bypass WikiDB and cache, go directly through the backend.
         $backend = &$dbi->_backend;
         //$pagedata = $backend->get_pagedata($page);
         $version = $backend->get_latest_version($page);
         $vdata = $backend->get_versiondata($page, $version, true);
 
         include_once('lib/PageType.php');
-	$formatted = new TransformedText($dbi->getPage($page), $vdata['%content'], $vdata);
-	$content =& $formatted->_content;
-	$html->pushContent($this->_DebugPrintArray($content));
-	$links = $formatted->getWikiPageLinks();
+        $formatted = new TransformedText($dbi->getPage($page), $vdata['%content'], $vdata);
+        $content =& $formatted->_content;
+        $html->pushContent($this->_DebugPrintArray($content));
+        $links = $formatted->getWikiPageLinks();
         if (count($links) > 0) {
-          $html->pushContent(HTML::h3("Links"));	
-	  $html->pushContent($this->_DebugPrintArray($links));
+          $html->pushContent(HTML::h3("Links"));
+          $html->pushContent($this->_DebugPrintArray($links));
         }
-        return $html;	
+        return $html;
     }
 
     function _DebugPrintArray(&$array) {
-    	$html = HTML();
-    	foreach ($array as $line) {
-  	  ob_start();
+            $html = HTML();
+            foreach ($array as $line) {
+            ob_start();
           print_r($line);
           $s = HTML::pre(ob_get_contents());
           ob_end_clean();
-	  $html->pushContent($s);
-	}
-	return $html;
+          $html->pushContent($s);
+        }
+        return $html;
     }
-    
+
 };
 
 // (c-file-style: "gnu")
diff --git a/lib/plugin/_WikiTranslation.php b/lib/plugin/_WikiTranslation.php
index 6606068e4..129978fbe 100644
--- a/lib/plugin/_WikiTranslation.php
+++ b/lib/plugin/_WikiTranslation.php
@@ -22,7 +22,7 @@ rcs_id('$Id$');
 
 /**
  * _WikiTranslation:  Display pagenames and other strings in various languages.
- * Can also be used to let a favorite translation service translate a whole page. 
+ * Can also be used to let a favorite translation service translate a whole page.
  * Current favorite: translate.google.com if from_lang = en or fr
  *
  * Examples:
@@ -43,7 +43,7 @@ rcs_id('$Id$');
  */
 
 /* Container for untranslated pagenames. Needed to show up in locale/po/phpwiki.pot */
-$pgsrc_container = 
+$pgsrc_container =
     _("AddCommentPlugin")  .','.
     _("AddingPages")  .','.
     _("AllPagesCreatedByMe")  .','.
@@ -121,7 +121,7 @@ $pgsrc_container =
     _("WikiBlogPlugin") .','.
     _("WikiPlugin") .','.
     _("WikiWikiWeb");
- 
+
 require_once('lib/PageList.php');
 
 class WikiPlugin__WikiTranslation
@@ -146,7 +146,7 @@ extends WikiPlugin
             (
              PageList::supportedArgs(),
              array( 'languages'  => '',  // comma delimited string of de,en,sv,...
-                    'string'     => '',  
+                    'string'     => '',
                     'page'       => '',  // use a translation service
                     'what'       => 'pages', // or 'buttons', 'plugins' or 'wikiwords'
 
@@ -156,10 +156,10 @@ extends WikiPlugin
                     //'exclude'       => '',
                     //'sortby'        => '',
                     //'limit'         => 0,
-                    'nolinks'       => false,  // don't display any links 
-                    			       // (for development only)
-                    'noT'           => false   // don't display the T link 
-                   			       // (for development only)
+                    'nolinks'       => false,  // don't display any links
+                                                   // (for development only)
+                    'noT'           => false   // don't display the T link
+                                                  // (for development only)
                     ));
     }
 
@@ -167,11 +167,11 @@ extends WikiPlugin
         if ($lang != $this->lang)
             update_locale($lang);
         if ($lang == 'en') {
-            // Hack alert! we need hash for stepping through it, even if it's 
+            // Hack alert! we need hash for stepping through it, even if it's
             // in the wrong language
             include (FindFile("locale/de/LC_MESSAGES/phpwiki.php", 0,'reinit'));
             foreach ($locale as $en => $de) {
-            	$locale[$en] = $en;
+                    $locale[$en] = $en;
             }
         // gettext module loaded: must load the LC_MESSAGES php hash
         } elseif (function_exists ('bindtextdomain')) {
@@ -186,7 +186,7 @@ extends WikiPlugin
         $this->_locales[$lang] = $locale;
     }
 
-    // reverse translation: 
+    // reverse translation:
     function translate_to_en($text, $lang=false) {
         if (!$lang) $lang = $this->lang; // current locale
         if ($lang == 'en') return $text;
@@ -208,8 +208,8 @@ extends WikiPlugin
             return $text;
         }
     }
-    
-    /** 
+
+    /**
      * setlocale() switching with the gettext extension is by far too slow.
      * So use the hash regardless if gettext is loaded or not.
      */
@@ -223,8 +223,8 @@ extends WikiPlugin
             // get reverse gettext: translate to english
             $text = $this->translate_to_en($text, $from_lang);
         }
-        return !empty($this->_locales[$to_lang][$text]) 
-                 ? $this->_locales[$to_lang][$text] 
+        return !empty($this->_locales[$to_lang][$text])
+                 ? $this->_locales[$to_lang][$text]
                  : $text;
     }
 
@@ -256,7 +256,7 @@ extends WikiPlugin
         }
         return $result;
     }
-                
+
     function run($dbi, $argstr, &$request, $basepage) {
         $this->args = $this->getArgs($argstr, $request);
         extract($this->args);
@@ -275,21 +275,21 @@ extends WikiPlugin
             if (in_array($from_lang, $available_languages))
                 $languages = $available_languages;
             else
-            	$languages = array_merge($available_languages, array($from_lang));
+                    $languages = array_merge($available_languages, array($from_lang));
         } elseif (strstr($languages,',')) {
             $languages = explode(',', $languages);
         } else {
             $languages = array($languages);
         }
         if (in_array('zh', $languages) or in_array('ja', $languages)) {
-        	
+
             // If the current charset != utf-8 the text will not be displayed correctly.
-            // But here we cannot change the header anymore. So we can decide to ignore them, 
+            // But here we cannot change the header anymore. So we can decide to ignore them,
             // or display them with all the errors.
             //FIXME: do iconv the ob
             if ($GLOBALS['charset'] != 'utf-8' and !defined('NEED_ICONV_TO')) {
-            	define('NEED_ICONV_TO', 'utf-8');
-            	//either the extension or external 
+                    define('NEED_ICONV_TO', 'utf-8');
+                    //either the extension or external
                 //$GLOBALS['charset'] = 'utf-8';
             }
         }
@@ -300,25 +300,25 @@ extends WikiPlugin
         if (!empty($page)) {
             $pagename = $page;
             if ($dbi->isWikiPage($pagename)) {
-            	$url = '';
-            	// google can only translate from english and french
-            	if (in_array($from_lang, array('en', 'fr'))) {
+                    $url = '';
+                    // google can only translate from english and french
+                    if (in_array($from_lang, array('en', 'fr'))) {
                     $url = "http://translate.google.com/translate";
                     $url .= "?langpair=" . urlencode($from_lang."|".$to_lang);
                     $url .= "&u=" . urlencode(WikiURL($pagename, false, true));
-            	}
-            	// redirect or transclude?
-	        if ($url) {
-	            return $request->redirect($url);
-	        }
-            	return HTML(fmt("TODO: Google can only translate from english and french. Find a translation service for %s to language %s",
-            	                WikiURL($pagename, false, true),
-            	                $to_lang));
+                    }
+                    // redirect or transclude?
+                if ($url) {
+                    return $request->redirect($url);
+                }
+                    return HTML(fmt("TODO: Google can only translate from english and french. Find a translation service for %s to language %s",
+                                    WikiURL($pagename, false, true),
+                                    $to_lang));
             } else {
                 return $this->error(fmt("%s is empty",$pagename));
             }
         }
-        
+
         $pagelist = new PageList('', $exclude, $this->args);
         $pagelist->_columns[0]->_heading = "$from_lang";
         foreach ($languages as $lang) {
@@ -333,21 +333,21 @@ extends WikiPlugin
         }
         switch ($what) {
         case 'allpages':
-            $pagelist->addPages( $dbi->getAllPages($include_empty, $sortby, 
+            $pagelist->addPages( $dbi->getAllPages($include_empty, $sortby,
                                                    $limit, $exclude) );
             break;
         case 'pages':
             // not all pages, only the pgsrc pages
             if (!is_array($exclude))
-                $exclude = $pagelist->explodePageList($exclude, false, $sortby, 
+                $exclude = $pagelist->explodePageList($exclude, false, $sortby,
                                                       $limit, $exclude);
             $path = FindLocalizedFile(WIKI_PGSRC);
             $pgsrc = new fileSet($path);
             foreach ($pgsrc->getFiles($exclude, $sortby, $limit) as $pagename) {
                 $pagename = urldecode($pagename);
                 if (substr($pagename,-1,1) == '~') continue;
-	        if (in_array($pagename, $exclude))
-        	    continue;             // exclude page.
+                if (in_array($pagename, $exclude))
+                    continue;             // exclude page.
                 if ($match != '*' and !glob_match($match, $pagename))
                     continue;
                 $page_handle = $dbi->getPage($pagename);
@@ -373,12 +373,12 @@ extends WikiPlugin
             }
             break;
         // all Button texts, which need a localized .png
-        // where to get them from? templates/*.tmpl: Button() 
+        // where to get them from? templates/*.tmpl: Button()
         // and WikiLink(?,'button')
         // navbar links, actionpages, and admin requests
         case 'buttons':
             $buttons = $GLOBALS['AllActionPages'];
-            $fileset = new FileSet(FindFile("themes/MacOSX/buttons/en"), 
+            $fileset = new FileSet(FindFile("themes/MacOSX/buttons/en"),
                                    "*.png");
             foreach ($fileset->getFiles() as $file) {
                 $b = urldecode(substr($file, 0, -4));
@@ -411,30 +411,30 @@ class _PageList_Column_customlang extends _PageList_Column {
         $this->dbi = &$GLOBALS['request']->getDbh();
         $this->_PageList_Column_base($this->_field);
     }
-    
+
     function _getValue($page, &$revision_handle) {
-    	if (is_object($page)) $text = $page->getName();
+            if (is_object($page)) $text = $page->getName();
         else $text = $page;
-    	$trans = $this->_plugin->fast_translate($text, $this->_field, 
+            $trans = $this->_plugin->fast_translate($text, $this->_field,
                                                 $this->_from_lang);
         // how to markup untranslated words and not existing pages?
         // untranslated: (TODO) link to translation editor
         if ($trans == $text or // untranslated
-            (($this->_from_lang != 'en') and 
+            (($this->_from_lang != 'en') and
              ($this->_field != 'en') and
-             ($trans == $this->_plugin->fast_translate($text, 'en', 
+             ($trans == $this->_plugin->fast_translate($text, 'en',
                                                        $this->_from_lang))
              ))
-        {    
+        {
             global $WikiTheme;
             $link = $WikiTheme->linkUnknownWikiWord($trans);
-            if (!($this->_noT or $this->_nolinks) 
-                and $this->dbi->isWikiPage($trans)) 
+            if (!($this->_noT or $this->_nolinks)
+                and $this->dbi->isWikiPage($trans))
             {
                 $url = WikiURL($trans, array('action' => 'TranslateText',
                                              'lang' => $this->_field));
                 $button = $WikiTheme->makeButton('T', $url);
-                $button->addTooltip(sprintf(_("Define the translation for %s in %s"), 
+                $button->addTooltip(sprintf(_("Define the translation for %s in %s"),
                                             $trans, $this->_field));
                 $link = HTML::span($button);
                 $link->setAttr('class', 'wikiunknown');
diff --git a/lib/plugin/text2png.php b/lib/plugin/text2png.php
index b5730635e..edfacf6a5 100644
--- a/lib/plugin/text2png.php
+++ b/lib/plugin/text2png.php
@@ -26,10 +26,10 @@ rcs_id('$Id$');
  * image was saved to or loaded from the cache and what the path is.
  *
  * Convert text into a png image using GD without using [WikiPluginCached|Help:WikiPlugin].
- * The images are stored in a private <PHPWIKI_DIR>/images/<LANG> subdirectory instead, 
+ * The images are stored in a private <PHPWIKI_DIR>/images/<LANG> subdirectory instead,
  * which are not timestamp checked at all. Delete the .png file(s) if you change anything.
- * 
- * This is a really simple and stupid plugin, which needs some work. 
+ *
+ * This is a really simple and stupid plugin, which needs some work.
  * No size and color options, no change check.
  *
  * We'd need a ButtonCreator for the MacOSX theme buttons also.
@@ -64,15 +64,15 @@ extends WikiPlugin
 
     function getDefaultArguments() {
         global $LANG;
-	// TODO: add fixed size and center.
+        // TODO: add fixed size and center.
         return array('text'    => "text2png testtext",
-                     'lang'    => $LANG, 
+                     'lang'    => $LANG,
                      '_force'      => 0,
-		     'fontsize'    => 18, // with GD1 it's the pixelsize, with GD2 the pointsize
-		     'with_shadow' => 1,
-		     'fontcolor'   => '#000000',
-		     'shadowcolor' => '#AFAFAF',
-		     'backcolor'   => '#ffffff');
+                     'fontsize'    => 18, // with GD1 it's the pixelsize, with GD2 the pointsize
+                     'with_shadow' => 1,
+                     'fontcolor'   => '#000000',
+                     'shadowcolor' => '#AFAFAF',
+                     'backcolor'   => '#ffffff');
         }
 
     function run($dbi, $argstr, &$request, $basepage) {
@@ -89,24 +89,24 @@ extends WikiPlugin
             return;
         }
     }
-    
+
    /**
     * Parse hexcolor into ordinal rgb array.
     * '#000'    => array(0,0,0)
     * '#000000' => array(0,0,0)
     */
     function hexcolor($h, $default=false) {
-	if ($h[0] != '#') return $default;
-	$rgb = substr($h,1);
-	if (strlen($rgb) == 3)
-	    return array(hexdec($rgb{0}),hexdec($rgb{1}),hexdec($rgb{2}));
-	elseif (strlen($rgb) == 6)
-	    return array(hexdec(substr($rgb,0,2)),hexdec(substr($rgb,2,2)),hexdec(substr($rgb,4,2)));
-	return $default;
+        if ($h[0] != '#') return $default;
+        $rgb = substr($h,1);
+        if (strlen($rgb) == 3)
+            return array(hexdec($rgb{0}),hexdec($rgb{1}),hexdec($rgb{2}));
+        elseif (strlen($rgb) == 6)
+            return array(hexdec(substr($rgb,0,2)),hexdec(substr($rgb,2,2)),hexdec(substr($rgb,4,2)));
+        return $default;
     }
 
     function text2png($args) {
-	extract ($args);
+        extract ($args);
         /**
          * Basic image creation and caching
          *
@@ -127,7 +127,7 @@ extends WikiPlugin
         } else {
             $l = urlencode ($l); // who on earth forgot his?
         }
-	$basedir = "text2png-image";
+        $basedir = "text2png-image";
         $filepath = getUploadFilePath() . "$basedir/$l";
         if ($_force or !file_exists($filepath.$filename)) {
             if (!file_exists($filepath)) {
@@ -145,17 +145,17 @@ extends WikiPlugin
              *        width and height
              */
 
-	    // got this logic from GraphViz
-	    if (defined('TTFONT'))
-		$ttfont = TTFONT;
-	    elseif (PHP_OS == "Darwin") // Mac OS X
-		$ttfont   = "/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts/LucidaSansRegular.ttf";
-	    elseif (isWindows()) {
-		$ttfont = $_ENV['windir'].'\Fonts\Arial.ttf';
-	    } else {
-		$ttfont = 'luximr'; // This is the only what sourceforge offered.
-		//$ttfont = 'Helvetica';
-	    }
+            // got this logic from GraphViz
+            if (defined('TTFONT'))
+                $ttfont = TTFONT;
+            elseif (PHP_OS == "Darwin") // Mac OS X
+                $ttfont   = "/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts/LucidaSansRegular.ttf";
+            elseif (isWindows()) {
+                $ttfont = $_ENV['windir'].'\Fonts\Arial.ttf';
+            } else {
+                $ttfont = 'luximr'; // This is the only what sourceforge offered.
+                //$ttfont = 'Helvetica';
+            }
 
             /* http://download.php.net/manual/en/function.imagettftext.php
              * array imagettftext (int im, int size, int angle, int x, int y,
@@ -163,7 +163,7 @@ extends WikiPlugin
              */
 
             // get ready to draw
-	    $s = ImageTTFBBox($fontsize, 0, $ttfont, $text);
+            $s = ImageTTFBBox($fontsize, 0, $ttfont, $text);
             $im = @ImageCreate(abs($s[4])+20, abs($s[7])+10);
             if (empty($im)) {
                 $error_html = _("PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details.");
@@ -174,16 +174,16 @@ extends WikiPlugin
                 trigger_error( $error_html, E_USER_NOTICE );
                 return;
             }
-	    $rgb = $this->hexcolor($backcolor, array(255,255,255));
+            $rgb = $this->hexcolor($backcolor, array(255,255,255));
             $bg_color = ImageColorAllocate($im, $rgb[0], $rgb[1], $rgb[2]);
             if ($with_shadow) {
-	        $rgb = $this->hexcolor($shadowcolor, array(175,175,175));
+                $rgb = $this->hexcolor($shadowcolor, array(175,175,175));
                 $text_color = ImageColorAllocate($im, $rgb[0], $rgb[1], $rgb[2]);
                 // shadow is 1 pixel down and 2 pixels right
                 ImageTTFText($im, $fontsize, 0, 12, abs($s[7])+6, $text_color, $ttfont, $text);
             }
             // draw text
-	    $rgb = $this->hexcolor($fontcolor, array(0,0,0));
+            $rgb = $this->hexcolor($fontcolor, array(0,0,0));
             $text_color = ImageColorAllocate($im, $rgb[0], $rgb[1], $rgb[2]);
             ImageTTFText($im, $fontsize, 0, 10, abs($s[7])+5, $text_color, $ttfont, $text);
 
-- 
2.45.0