phpwiki-checkins Mailing List for PhpWiki (Page 157)

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

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

You can subscribe to this list here.

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

Flat | Threaded

<< < 1 .. 155 156 157 158 159 .. 538 > >> (Page 157 of 538)

[phpwiki-checkins] SF.net SVN: phpwiki:[7292] trunk/themes/gforge/gforge.css

From: <var...@us...> - 2010-01-22 15:27:06

Revision: 7292
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7292&view=rev
Author:   vargenau
Date:     2010-01-22 15:26:58 +0000 (Fri, 22 Jan 2010)

Log Message:
-----------
Fix caption centering problem

Modified Paths:
--------------
    trunk/themes/gforge/gforge.css

Modified: trunk/themes/gforge/gforge.css
===================================================================
--- trunk/themes/gforge/gforge.css	2010-01-22 15:16:55 UTC (rev 7291)
+++ trunk/themes/gforge/gforge.css	2010-01-22 15:26:58 UTC (rev 7292)
@@ -151,7 +151,6 @@
   caption-side: top;
   text-align: left;
   margin-bottom: .5ex;
-  width: 100%;
 }
 
 /**


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

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

From: <var...@us...> - 2010-01-22 15:17:02

Revision: 7291
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7291&view=rev
Author:   vargenau
Date:     2010-01-22 15:16:55 +0000 (Fri, 22 Jan 2010)

Log Message:
-----------
Add AUTHOR and PUBDATE in RSS feed

Modified Paths:
--------------
    trunk/lib/RssParser.php
    trunk/lib/plugin/RssFeed.php

Modified: trunk/lib/RssParser.php
===================================================================
--- trunk/lib/RssParser.php	2010-01-22 15:12:23 UTC (rev 7290)
+++ trunk/lib/RssParser.php	2010-01-22 15:16:55 UTC (rev 7291)
@@ -45,6 +45,8 @@
 extends XmlParser {
 
     var $title = "";
+    var $author = "";
+    var $pubDate = "";
     var $link  = "";
     var $description = "";
     var $inside_item = false;
@@ -81,6 +83,8 @@
                 $GLOBALS['rss_parser_items'] =& $this->items;
             }
             $this->items[] = array("title"       => $this->item['TITLE'],
+                                   "author"      => $this->item['AUTHOR'],
+                                   "pubDate"     => $this->item['PUBDATE'],
                                    "description" => @$this->item['DESCRIPTION'],
                                    "link"        => $this->item['LINK']);
             $this->item = array("TITLE"       => "",

Modified: trunk/lib/plugin/RssFeed.php
===================================================================
--- trunk/lib/plugin/RssFeed.php	2010-01-22 15:12:23 UTC (rev 7290)
+++ trunk/lib/plugin/RssFeed.php	2010-01-22 15:16:55 UTC (rev 7291)
@@ -98,6 +98,11 @@
                                         HTML::a(array('href'=>$item['link']),
                                                 HTML::raw($item['title'])));
                 $cell->pushContent($cell_title);
+                $cell_author = HTML::raw($item['author']);
+                $cell_pubDate = HTML::raw($item['pubDate']);
+                $cell_authordate = HTML::div(array('class'=> 'authordate'), 
+                                             $cell_author, HTML::raw(" - "), $cell_pubDate);
+                $cell->pushContent($cell_authordate);
                 if (!empty($item['description']))
                     $cell->pushContent(HTML::div(array('class'=> 'itemdesc'),
                                                  HTML::raw($item['description'])));


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7290] trunk/lib/pear/DB/common.php

From: <var...@us...> - 2010-01-22 15:12:29

Revision: 7290
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7290&view=rev
Author:   vargenau
Date:     2010-01-22 15:12:23 +0000 (Fri, 22 Jan 2010)

Log Message:
-----------
Fix notice when editing a wiki page

Modified Paths:
--------------
    trunk/lib/pear/DB/common.php

Modified: trunk/lib/pear/DB/common.php
===================================================================
--- trunk/lib/pear/DB/common.php	2010-01-22 14:59:22 UTC (rev 7289)
+++ trunk/lib/pear/DB/common.php	2010-01-22 15:12:23 UTC (rev 7290)
@@ -1137,7 +1137,7 @@
             if (DB::isError($sth)) {
                 return $sth;
             }
-            $ret =& $this->execute($sth, $params);
+            $ret = $this->execute($sth, $params);
             $this->freePrepared($sth);
             return $ret;
         } else {


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

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

From: <var...@us...> - 2010-01-22 14:59:37

Revision: 7289
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7289&view=rev
Author:   vargenau
Date:     2010-01-22 14:59:22 +0000 (Fri, 22 Jan 2010)

Log Message:
-----------
Add summary in e-mail notification

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

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2010-01-22 14:54:05 UTC (rev 7288)
+++ trunk/lib/MailNotify.php	2010-01-22 14:59:22 UTC (rev 7289)
@@ -287,8 +287,9 @@
             $content .= $wikitext;
         }
         $editedby = sprintf(_("Edited by: %s"), $this->from);
+        $summary = sprintf(_("Summary: %s"), $meta['summary']);
         $this->sendMail($subject, 
-                        $editedby."\n".$difflink."\n\n".$content);
+                        $editedby."\n".$summary."\n".$difflink."\n\n".$content);
     }
 
     /** 


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

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

From: <var...@us...> - 2010-01-22 14:54:43

Revision: 7288
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7288&view=rev
Author:   vargenau
Date:     2010-01-22 14:54:05 +0000 (Fri, 22 Jan 2010)

Log Message:
-----------
New Fusion Forge syntax; WikiConfig for Fusion Forge

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

Modified: trunk/g
===================================================================
--- trunk/g	2010-01-22 14:40:20 UTC (rev 7287)
+++ trunk/g	2010-01-22 14:54:05 UTC (rev 7288)
@@ -47,7 +47,9 @@
 // Disable compression, seems needed to get all the messages.
 $no_gz_buffer=true;
 
-require_once('pre.php');
+require_once('../env.inc.php');
+require_once $gfwww.'include/pre.php';
+require_once $gfplugins.'wiki/include/wikiconfig.class.php';
 
 if (!$group_id || !$project) {
     exit_error("Invalid Project", "Invalid Project");
@@ -59,6 +61,8 @@
     $group_public_name = $project->getPublicName();
     $is_external = $project->getIsExternal();
 
+    $wc = new WikiConfig($group_id);
+
     define('VIRTUAL_PATH', '/wiki/g/'.$group_name);
     define('PAGE_PREFIX', '_g'.$group_id.'_');
 
@@ -79,6 +83,10 @@
 
     define('WIKI_NAME', $group_name);
 
+    define('DISABLE_MARKUP_WIKIWORD', $wc->getWikiConfig('DISABLE_MARKUP_WIKIWORD'));
+
+    define('NUM_SPAM_LINKS', 20 * ($wc->getWikiConfig('NUM_SPAM_LINKS')));
+
     define('UPLOAD_FILE_PATH', '/opt/groups/'.WIKI_NAME.'/www/uploads/');
     // define('UPLOAD_DATA_PATH', SERVER_URL . '/www/'.WIKI_NAME.'/uploads/');
     define('UPLOAD_DATA_PATH', '/www/'.WIKI_NAME.'/uploads/');
@@ -101,7 +109,7 @@
     define('DEBUG', ($sys_install_type != 'production'));
     // define('_DEBUG_LOGIN', true);
 
-    // Postgesql
+    // Postgresql
     define('DATABASE_TYPE', 'SQL');
     // Dummy value (to avoid warning in SystemInfo plugin)
     define('DATABASE_DSN', 'pgsql://localhost/user_phpwiki');
@@ -109,7 +117,9 @@
     // Disable VACUUM (they are performed every night)
     define('DATABASE_OPTIMISE_FREQUENCY', 0);
 
-    define('ADMIN_USER', 'ACOS Forge Administrator');
+    // TBD: the name should be taken from Gforge
+    // define('ADMIN_USER', 'ACOS Forge Administrator');
+    define('ADMIN_USER', 'The PhpWiki programming team');
     // Dummy value
     define('ADMIN_PASSWD', 'xxx');
 
@@ -258,7 +268,7 @@
     }
 
     // Load the default configuration.
-    include "index.php";
+    include dirname(__FILE__).'/index.php';
 
     // Override the default configuration for VARIABLES after index.php:
     // E.g. Use another DB:
@@ -269,7 +279,7 @@
     $DBParams['prefix'] = "plugin_wiki_";
 
     // Start the wiki
-    include "lib/main.php";
+    include dirname(__FILE__).'/lib/main.php';
 }
 
 /**


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7287] trunk/themes/gforge/gforge-print.css

From: <var...@us...> - 2010-01-22 14:40:26

Revision: 7287
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7287&view=rev
Author:   vargenau
Date:     2010-01-22 14:40:20 +0000 (Fri, 22 Jan 2010)

Log Message:
-----------
Do not print date of last edition

Modified Paths:
--------------
    trunk/themes/gforge/gforge-print.css

Modified: trunk/themes/gforge/gforge-print.css
===================================================================
--- trunk/themes/gforge/gforge-print.css	2010-01-22 14:06:31 UTC (rev 7286)
+++ trunk/themes/gforge/gforge-print.css	2010-01-22 14:40:20 UTC (rev 7287)
@@ -51,6 +51,9 @@
 /* Do not print main wiki browse banner */
 .browsebanner { display: none; }
 
+/* Do not print date of last edition */
+.editdate { display: none; }
+
 /* Print links in black */
 a { color: black; }
 


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

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

From: <var...@us...> - 2010-01-22 14:07:01

Revision: 7286
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7286&view=rev
Author:   vargenau
Date:     2010-01-22 14:06:31 +0000 (Fri, 22 Jan 2010)

Log Message:
-----------
Process log messages of type 'E_DEPRECATED' as warnings (for PHP 5.3 migration)

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

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2010-01-22 13:58:31 UTC (rev 7285)
+++ trunk/lib/ErrorManager.php	2010-01-22 14:06:31 UTC (rev 7286)
@@ -12,9 +12,9 @@
     error_reporting(E_ALL & ~E_STRICT);
 }
 */
-define ('EM_FATAL_ERRORS', E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | ~2048);
+define ('EM_FATAL_ERRORS', E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | ~2048 & ((check_php_version(5,3)) ? ~E_DEPRECATED : ~0));
 define ('EM_WARNING_ERRORS',
-	E_WARNING | E_CORE_WARNING | E_COMPILE_WARNING | E_USER_WARNING);
+	E_WARNING | E_CORE_WARNING | E_COMPILE_WARNING | E_USER_WARNING | ((check_php_version(5,3)) ? E_DEPRECATED : 0));
 define ('EM_NOTICE_ERRORS', E_NOTICE | E_USER_NOTICE);
 
 /* It is recommended to leave assertions on. 

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2010-01-22 13:58:31 UTC (rev 7285)
+++ trunk/lib/main.php	2010-01-22 14:06:31 UTC (rev 7286)
@@ -2,6 +2,8 @@
 rcs_id('$Id$');
 /*
  * Copyright 1999-2008 $ThePhpWikiProgrammingTeam
+ * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright (C) 2009 Roger Guignard, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -1330,7 +1332,7 @@
     // Postpone warnings
     global $ErrorManager;
     if (defined('E_STRICT')) // and (E_ALL & E_STRICT)) // strict php5?
-        $ErrorManager->setPostponedErrorMask(E_NOTICE|E_USER_NOTICE|E_USER_WARNING|E_WARNING|E_STRICT);
+        $ErrorManager->setPostponedErrorMask(E_NOTICE|E_USER_NOTICE|E_USER_WARNING|E_WARNING|E_STRICT|((check_php_version(5,3)) ? E_DEPRECATED : 0));
     else
         $ErrorManager->setPostponedErrorMask(E_NOTICE|E_USER_NOTICE|E_USER_WARNING|E_WARNING);
     $request = new WikiRequest();


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

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

From: <var...@us...> - 2010-01-22 13:58:38

Revision: 7285
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7285&view=rev
Author:   vargenau
Date:     2010-01-22 13:58:31 +0000 (Fri, 22 Jan 2010)

Log Message:
-----------
Replace 'split' function (deprecated in PHP5.3) by 'explode' function (for PHP 5.3 migration)

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

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2010-01-22 13:52:52 UTC (rev 7284)
+++ trunk/lib/CachedMarkup.php	2010-01-22 13:58:31 UTC (rev 7285)
@@ -682,7 +682,7 @@
     }
 
     function getPagename($basepage) {
-        list ($moniker, $page) = split (":", $this->_link, 2);
+        list ($moniker, $page) = explode (":", $this->_link, 2);
 	$page = new WikiPageName($page, $basepage);
 	if ($page->isValid()) return $page->name;
 	else return false;

Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2010-01-22 13:52:52 UTC (rev 7284)
+++ trunk/lib/PageType.php	2010-01-22 13:58:31 UTC (rev 7285)
@@ -170,7 +170,7 @@
 
     function link ($link, $linktext = false) {
 	global $WikiTheme;
-        list ($moniker, $page) = split (":", $link, 2);
+        list ($moniker, $page) = explode (":", $link, 2);
         
         if (!isset($this->_map[$moniker])) {
             return HTML::span(array('class' => 'bad-interwiki'),

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2010-01-22 13:52:52 UTC (rev 7284)
+++ trunk/lib/stdlib.php	2010-01-22 13:58:31 UTC (rev 7285)
@@ -425,7 +425,7 @@
     if (empty($alt)) $alt = "";
 
     // Extract URL
-    $arr = split(' ',$url);
+    $arr = explode(' ',$url);
     if (!empty($arr)) $url = $arr[0];
     if (! IsSafeURL($url)) {
         $link = HTML::span(array('class' => 'error'), _("BAD URL -- remove all of <, >, \""));
@@ -633,7 +633,7 @@
             $img->setAttr('src', false);
         }
     } else {
-        $args = split(' ', $url);
+        $args = explode(' ', $url);
         if (count($args) >= 1) {
           $url = array_shift($args);
           $found = array();
@@ -716,7 +716,7 @@
 function SplitQueryArgs ($query_args = '') 
 {
     // FIXME: use the arg-seperator which might not be &
-    $split_args = split('&', $query_args);
+    $split_args = explode('&', $query_args);
     $args = array();
     while (list($key, $val) = each($split_args))
         if (preg_match('/^ ([^=]+) =? (.*) /x', $val, $m))
@@ -827,7 +827,7 @@
         if (is_string($name)) {
             $this->shortName = $name;
             if (strstr($name, ':')) {
-                list($moniker, $shortName) = split (":", $name, 2);
+                list($moniker, $shortName) = explode (":", $name, 2);
 	  	$map = getInterwikiMap(); // allow overrides to custom maps
                 if (isset($map->_map[$moniker])) {
                     $url = $map->_map[$moniker];
@@ -846,7 +846,7 @@
                         $name = $url;
                     }
                     if (strstr($shortName, '?')) {
-                        list($shortName, $dummy) = split("\?", $shortName, 2);
+                        list($shortName, $dummy) = explode("\?", $shortName, 2);
 		    }
                     $this->shortName = $shortName;
                 }
@@ -1212,7 +1212,7 @@
  * @return string
  */
 function expand_tabs($str, $tab_width = 8) {
-    $split = split("\t", $str);
+    $split = explode("\t", $str);
     $tail = array_pop($split);
     $expanded = "\n";
     foreach ($split as $hunk) {


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7284] trunk/lib/XmlElement.php

From: <var...@us...> - 2010-01-22 13:53:53

Revision: 7284
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7284&view=rev
Author:   vargenau
Date:     2010-01-22 13:52:52 +0000 (Fri, 22 Jan 2010)

Log Message:
-----------
Verify that a parameter is an object before attempting to get his class (for PHP 5 migration)

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

Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php	2010-01-18 19:13:06 UTC (rev 7283)
+++ trunk/lib/XmlElement.php	2010-01-22 13:52:52 UTC (rev 7284)
@@ -40,7 +40,7 @@
     }
 
     function _pushContent ($item) {
-        if (strtolower(get_class($item)) == 'xmlcontent')
+        if (is_object($item) && strtolower(get_class($item)) == 'xmlcontent')
             array_splice($this->_content, count($this->_content), 0,
                          $item->_content);
         else


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7283] trunk/lib/WikiUserNew.php

From: <var...@us...> - 2010-01-18 19:13:13

Revision: 7283
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7283&view=rev
Author:   vargenau
Date:     2010-01-18 19:13:06 +0000 (Mon, 18 Jan 2010)

Log Message:
-----------
Make saving preferences work in PHP 5

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

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2009-12-04 17:08:19 UTC (rev 7282)
+++ trunk/lib/WikiUserNew.php	2010-01-18 19:13:06 UTC (rev 7283)
@@ -2,6 +2,7 @@
 rcs_id('$Id$');
 /* Copyright (C) 2004,2005,2006,2007,2009 $ThePhpWikiProgrammingTeam
  * Copyright (C) 2009 Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright (C) 2009 Roger Guignard, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  * 
@@ -1175,33 +1176,15 @@
                 // FIXME: strange why this should be needed...
                 include_once("lib/WikiUser/Db.php");
                 include_once("lib/WikiUser/AdoDb.php");
-                if (check_php_version(5)) {
-                    $user = new _AdoDbPassUser($this->_userid, $this->_prefs);
-                    return $user->getPreferences();
-                } else {
-                    _AdoDbPassUser::_AdoDbPassUser($this->_userid, $this->_prefs);
-                    return _AdoDbPassUser::getPreferences();
-                }
+                return _AdoDbPassUser::getPreferences();
             } elseif ($this->_prefs->_method == 'SQL') {
                 include_once("lib/WikiUser/Db.php");
                 include_once("lib/WikiUser/PearDb.php");
-                if (check_php_version(5)) {
-                    $user = new _PearDbPassUser($this->_userid, $this->_prefs);
-                    return $user->getPreferences();
-                } else {
-                    _PearDbPassUser::_PearDbPassUser($this->_userid, $this->_prefs);
-                    return _PearDbPassUser::getPreferences();
-                }
+                return _PearDbPassUser::getPreferences();
             } elseif ($this->_prefs->_method == 'PDO') {
                 include_once("lib/WikiUser/Db.php");
                 include_once("lib/WikiUser/PdoDb.php");
-                if (check_php_version(5)) {
-                    $user = new _PdoDbPassUser($this->_userid, $this->_prefs);
-                    return $user->getPreferences();
-                } else {
-                    _PdoDbPassUser::_PdoDbPassUser($this->_userid, $this->_prefs);
-                    return _PdoDbPassUser::getPreferences();
-                }
+                return _PdoDbPassUser::getPreferences();
             }
         }
 
@@ -1228,35 +1211,17 @@
                 // FIXME: strange why this should be needed...
                 include_once("lib/WikiUser/Db.php");
                 include_once("lib/WikiUser/AdoDb.php");
-                if (check_php_version(5)) {
-                    $user = new _AdoDbPassUser($this->_userid, $prefs);
-                    return $user->setPreferences($prefs, $id_only);
-                } else {
-                    _AdoDbPassUser::_AdoDbPassUser($this->_userid, $prefs);
-                    return _AdoDbPassUser::setPreferences($prefs, $id_only);
-                }
+                return _AdoDbPassUser::setPreferences($prefs, $id_only);
             }
             elseif ($this->_prefs->_method == 'SQL') {
                 include_once("lib/WikiUser/Db.php");
                 include_once("lib/WikiUser/PearDb.php");
-                if (check_php_version(5)) {
-                    $user = new _PearDbPassUser($this->_userid, $prefs);
-                    return $user->setPreferences($prefs, $id_only);
-                } else {
-                    _PearDbPassUser::_PearDbPassUser($this->_userid, $prefs);
-                    return _PearDbPassUser::setPreferences($prefs, $id_only);
-                }
+                return _PearDbPassUser::setPreferences($prefs, $id_only);
             }
             elseif ($this->_prefs->_method == 'PDO') {
                 include_once("lib/WikiUser/Db.php");
                 include_once("lib/WikiUser/PdoDb.php");
-                if (check_php_version(5)) {
-                    $user = new _PdoDbPassUser($this->_userid, $prefs);
-                    return $user->setPreferences($prefs, $id_only);
-                } else {
-                    _PdoDbPassUser::_PdoDbPassUser($this->_userid, $prefs);
-                    return _PdoDbPassUser::setPreferences($prefs, $id_only);
-                }
+                return _PdoDbPassUser::setPreferences($prefs, $id_only);
             }
         }
         if ($updated = _AnonUser::setPreferences($prefs, $id_only)) {


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7282] trunk/lib/WikiTheme.php

From: <var...@us...> - 2009-12-04 17:08:29

Revision: 7282
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7282&view=rev
Author:   vargenau
Date:     2009-12-04 17:08:19 +0000 (Fri, 04 Dec 2009)

Log Message:
-----------
Strip leading zeros from date elements as in French "09 mai 2009"

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

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2009-12-04 15:33:47 UTC (rev 7281)
+++ trunk/lib/WikiTheme.php	2009-12-04 17:08:19 UTC (rev 7282)
@@ -309,7 +309,7 @@
     //
     ////////////////////////////////////////////////////////////////
 
-    // Note:  Windows' implemetation of strftime does not include certain
+    // Note:  Windows' implementation of strftime does not include certain
 	// format specifiers, such as %e (for date without leading zeros).  In
 	// general, see:
 	// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_crt_strftime.2c_.wcsftime.asp
@@ -355,11 +355,12 @@
      */
     function formatDate ($time_t) {
         global $request;
-        
+
         $offset_time = $time_t + 3600 * $request->getPref('timeOffset');
-        // strip leading zeros from date elements (ie space followed by zero)
-        return preg_replace('/ 0/', ' ', 
-                            strftime($this->_dateFormat, $offset_time));
+        // strip leading zeros from date elements (ie space followed by zero
+        // or leading 0 as in French "09 mai 2009")
+        return preg_replace('/ 0/', ' ', preg_replace('/^0/', ' ',
+                            strftime($this->_dateFormat, $offset_time)));
     }
 
     /**


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

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

From: <var...@us...> - 2009-12-04 15:34:02

Revision: 7281
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7281&view=rev
Author:   vargenau
Date:     2009-12-04 15:33:47 +0000 (Fri, 04 Dec 2009)

Log Message:
-----------
Define DATABASE_DSN to avoid warning in SystemInfo plugin

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

Modified: trunk/g
===================================================================
--- trunk/g	2009-11-26 14:44:49 UTC (rev 7280)
+++ trunk/g	2009-12-04 15:33:47 UTC (rev 7281)
@@ -103,11 +103,14 @@
 
     // Postgesql
     define('DATABASE_TYPE', 'SQL');
+    // Dummy value (to avoid warning in SystemInfo plugin)
+    define('DATABASE_DSN', 'pgsql://localhost/user_phpwiki');
 
     // Disable VACUUM (they are performed every night)
     define('DATABASE_OPTIMISE_FREQUENCY', 0);
 
     define('ADMIN_USER', 'ACOS Forge Administrator');
+    // Dummy value
     define('ADMIN_PASSWD', 'xxx');
 
     // Allow ".svg" as extension
@@ -134,7 +137,7 @@
 
     // Disable public pages
     define('ENABLE_PAGE_PUBLIC', false);
-    
+
     // Enable external pages
     define('ENABLE_EXTERNAL_PAGES', $is_external);
 
@@ -194,7 +197,7 @@
     define('USE_BYTEA', true);
 
     define('ENABLE_SPAMBLOCKLIST', false);
-    
+
     define('ENCRYPTED_PASSWD', true);
 
     define('ENABLE_REVERSE_DNS', true);
@@ -233,8 +236,8 @@
     define('DISABLE_GETIMAGESIZE', true);
 
     if (isset($sys_use_selenium) && $sys_use_selenium) {
-    	// Temporary disabled for selenium based tests.
-    	define('ENABLE_EDIT_TOOLBAR', false);
+        // Temporary disabled for selenium based tests.
+        define('ENABLE_EDIT_TOOLBAR', false);
     }
 
     // If the user is logged in, let the Wiki know


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7280] trunk/config/config-dist.ini

From: <var...@us...> - 2009-11-26 14:45:04

Revision: 7280
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7280&view=rev
Author:   vargenau
Date:     2009-11-26 14:44:49 +0000 (Thu, 26 Nov 2009)

Log Message:
-----------
[[pagename]]

Modified Paths:
--------------
    trunk/config/config-dist.ini

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2009-11-21 19:09:41 UTC (rev 7279)
+++ trunk/config/config-dist.ini	2009-11-26 14:44:49 UTC (rev 7280)
@@ -1041,7 +1041,7 @@
 ;ENABLE_MARKUP_COLOR = false
 
 ; Disable automatic linking of camelcase (wiki-)words to pages. 
-; Internal page links must be forced with [ pagename ] then.
+; Internal page links must be forced with [[pagename]] then.
 ; Default: false
 ;DISABLE_MARKUP_WIKIWORD = true
 


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7279] trunk/locale/fr/pgsrc/ Aide%2FPageTestNouvellesMarques

From: <var...@us...> - 2009-11-21 19:09:51

Revision: 7279
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7279&view=rev
Author:   vargenau
Date:     2009-11-21 19:09:41 +0000 (Sat, 21 Nov 2009)

Log Message:
-----------
Suppression du "?\195?\160" dans le nom de lien qui pose probl?\195?\168me

Modified Paths:
--------------
    trunk/locale/fr/pgsrc/Aide%2FPageTestNouvellesMarques

Modified: trunk/locale/fr/pgsrc/Aide%2FPageTestNouvellesMarques
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FPageTestNouvellesMarques	2009-11-21 18:47:35 UTC (rev 7278)
+++ trunk/locale/fr/pgsrc/Aide%2FPageTestNouvellesMarques	2009-11-21 19:09:41 UTC (rev 7279)
@@ -1,4 +1,4 @@
-Date: Fri,  3 Jul 2009 22:21:47 +0000
+Date: Sat, 21 Nov 2009 20:08:10 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.10)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -98,7 +98,7 @@
 # un [[Lien] produit un [Lien]
 # un [Lien] ressemble à ceci : [[Lien]
 # [%%%] est un lien vers un changement de ligne
-# aussi cette page [[n'est pas liée à], et celle-ci est !PasLiéeÀ et celle-là !http://not.linked.to/ non plus.
+# aussi cette page [[n'est pas liée],  celle-ci n'est !PasLiée et celle-là !http://not.linked.to/ non plus.
   * WikiName - WikiNameSameStem -- !!WikiName - !!WikiNameSameStem
   * !!WikiName - !!WikiNameSameStem -- WikiName - WikiNameSameStem
   * WikiNameSameStem - WikiName -- !!WikiNameSameStem - !!WikiName
@@ -132,7 +132,7 @@
 c'est un texte simple avec <br>%%%
 une nouvelle ligne
 
-Aller voir <a href="http://phpwiki.sourceforge.net/">les marquess</a>
+Aller voir <a href="http://phpwiki.sourceforge.net/">les marques</a>
 
 vous ne pouvez pas utiliser &, < ou >
 


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

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

From: <var...@us...> - 2009-11-21 18:47:43

Revision: 7278
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7278&view=rev
Author:   vargenau
Date:     2009-11-21 18:47:35 +0000 (Sat, 21 Nov 2009)

Log Message:
-----------
Update locale

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

Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2009-11-21 15:19:00 UTC (rev 7277)
+++ trunk/locale/Makefile	2009-11-21 18:47:35 UTC (rev 7278)
@@ -487,7 +487,7 @@
 ${POT_FILE}: ../themes/gforge/templates/debug.tmpl
 ${POT_FILE}: ../themes/gforge/templates/editpage.tmpl
 ${POT_FILE}: ../themes/gforge/templates/html.tmpl
-${POT_FILE}: ../themes/gforge/templates/info.tmpl
+${POT_FILE}: ../themes/gforge/templates/login.tmpl
 ${POT_FILE}: ../themes/gforge/templates/navbar.tmpl
 ${POT_FILE}: ../themes/gforge/templates/pagelink.tmpl
 ${POT_FILE}: ../themes/gforge/templates/userprefs.tmpl

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

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

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

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

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

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

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2009-11-21 15:19:00 UTC (rev 7277)
+++ trunk/locale/po/de.po	2009-11-21 18:47:35 UTC (rev 7278)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-19 21:20+0200\n"
+"POT-Creation-Date: 2009-11-21 19:44+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -16,26 +16,26 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/CachedMarkup.php:538
+#: ../lib/CachedMarkup.php:535
 msgid "BAD semantic relation link"
 msgstr ""
 
-#: ../lib/CachedMarkup.php:570
+#: ../lib/CachedMarkup.php:567
 #, php-format
 msgid "Attribute %s, base value: %s"
 msgstr "Attribut %s, Basis: %s"
 
-#: ../lib/CachedMarkup.php:571
+#: ../lib/CachedMarkup.php:568
 #, php-format
 msgid "Attribute %s, value: %s"
 msgstr "Attribut %s, Wert: %s"
 
-#: ../lib/CachedMarkup.php:579
+#: ../lib/CachedMarkup.php:576
 #, php-format
 msgid "Relation %s to page %s"
 msgstr "Relation %s zu Seite %s"
 
-#: ../lib/CachedMarkup.php:634
+#: ../lib/CachedMarkup.php:631
 msgid "Found by "
 msgstr "Gefunden von "
 
@@ -203,18 +203,18 @@
 msgid "List"
 msgstr "Liste"
 
-#: ../lib/EditToolbar.php:193 ../lib/plugin/CreateToc.php:430
-#: ../lib/plugin/CreateToc.php:446
+#: ../lib/EditToolbar.php:193 ../lib/plugin/CreateToc.php:455
+#: ../lib/plugin/CreateToc.php:471
 msgid "Table of Contents"
 msgstr "Inhaltsverzeichnis"
 
-#: ../lib/EditToolbar.php:197 ../lib/PageList.php:511
-#: ../lib/plugin/AuthorHistory.php:157 ../lib/plugin/WantedPagesOld.php:151
+#: ../lib/EditToolbar.php:197 ../lib/PageList.php:530
+#: ../lib/plugin/AuthorHistory.php:157 ../lib/plugin/WantedPagesOld.php:148
 msgid "Page Name"
 msgstr "Seitenname"
 
-#: ../lib/EditToolbar.php:198 ../themes/default/templates/redirect.tmpl:19
-#: ../themes/default/templates/redirect.tmpl:42
+#: ../lib/EditToolbar.php:198 ../themes/default/templates/redirect.tmpl:18
+#: ../themes/default/templates/redirect.tmpl:41
 msgid "Redirect"
 msgstr "Weiterleiten"
 
@@ -228,12 +228,12 @@
 msgstr "Vorlage"
 
 #: ../lib/EditToolbar.php:205 ../lib/EditToolbar.php:207
-#: ../lib/WysiwygEdit/Wikiwyg.php:80 ../lib/editpage.php:711
+#: ../lib/WysiwygEdit/Wikiwyg.php:80 ../lib/editpage.php:712
 msgid "Save"
 msgstr "Speichern"
 
 #: ../lib/EditToolbar.php:212 ../lib/EditToolbar.php:214
-#: ../lib/WysiwygEdit/Wikiwyg.php:79 ../lib/editpage.php:704
+#: ../lib/WysiwygEdit/Wikiwyg.php:79 ../lib/editpage.php:705
 msgid "Preview"
 msgstr "Vorschau"
 
@@ -313,18 +313,18 @@
 msgstr "Unbenanntes PhpWiki"
 
 #: ../lib/IniConfig.php:863 ../lib/upgrade.php:70
-#: ../themes/Wordpress/templates/actionbar.tmpl:19
+#: ../themes/Wordpress/templates/actionbar.tmpl:21
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:132
 #: ../themes/gforge/templates/navbar.tmpl:8
 msgid "HomePage"
 msgstr "StartSeite"
 
-#: ../lib/InlineParser.php:345
+#: ../lib/InlineParser.php:344
 msgid "Invalid [] syntax ignored"
 msgstr "Ungültige [] syntax ignoriert"
 
-#: ../lib/InlineParser.php:890
+#: ../lib/InlineParser.php:889
 #, php-format
 msgid "unknown color %s ignored"
 msgstr "unbekannte Farbe %s ignoriert"
@@ -412,114 +412,114 @@
 msgid "Click to de-/select all pages"
 msgstr "Klicken Sie um alle/keine Seiten auszuwählen"
 
-#: ../lib/PageList.php:385 ../lib/plugin/IncludePage.php:187
+#: ../lib/PageList.php:388 ../lib/plugin/IncludePage.php:192
 #, php-format
 msgid " ... first %d bytes"
 msgstr " ... erste %d Bytes"
 
-#: ../lib/PageList.php:392
+#: ../lib/PageList.php:395
 #, php-format
 msgid " ... around %s"
 msgstr "... cirka %s"
 
-#: ../lib/PageList.php:434 ../lib/plugin/AppendText.php:60
+#: ../lib/PageList.php:453 ../lib/plugin/AppendText.php:60
 #, php-format
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
-#: ../lib/PageList.php:649 ../lib/plugin/FullTextSearch.php:120
+#: ../lib/PageList.php:668 ../lib/plugin/FullTextSearch.php:120
 msgid "<no matches>"
 msgstr "<nichts gefunden>"
 
-#: ../lib/PageList.php:1145 ../lib/plugin/FullTextSearch.php:91
+#: ../lib/PageList.php:1170 ../lib/plugin/FullTextSearch.php:91
 #: ../lib/plugin/WikiAdminSearchReplace.php:184
 msgid "Content"
 msgstr "Inhalt"
 
-#: ../lib/PageList.php:1161
+#: ../lib/PageList.php:1186
 msgid "All"
 msgstr ""
 
-#: ../lib/PageList.php:1165 ../themes/MonoBook/templates/info.tmpl:71
-#: ../themes/default/templates/info.tmpl:56
+#: ../lib/PageList.php:1190 ../themes/MonoBook/templates/info.tmpl:72
+#: ../themes/default/templates/info.tmpl:57
 msgid "Last Modified"
 msgstr "Zuletzt geändert"
 
-#: ../lib/PageList.php:1167
+#: ../lib/PageList.php:1192
 msgid "Hits"
 msgstr "Treffer"
 
-#: ../lib/PageList.php:1169 ../themes/Crao/templates/editpage.tmpl:37
-#: ../themes/Wordpress/templates/editpage.tmpl:38
-#: ../themes/default/templates/editpage.tmpl:39
+#: ../lib/PageList.php:1194 ../themes/Crao/templates/editpage.tmpl:38
+#: ../themes/Wordpress/templates/editpage.tmpl:39
+#: ../themes/default/templates/editpage.tmpl:40
 #: ../themes/gforge/templates/editpage.tmpl:35
 msgid "Size"
 msgstr "Größe"
 
-#: ../lib/PageList.php:1172 ../themes/MonoBook/templates/info.tmpl:73
-#: ../themes/default/templates/info.tmpl:58
+#: ../lib/PageList.php:1197 ../themes/MonoBook/templates/info.tmpl:74
+#: ../themes/default/templates/info.tmpl:59
 msgid "Last Summary"
 msgstr "Letzte Zusammenfassung"
 
-#: ../lib/PageList.php:1174 ../lib/plugin/AuthorHistory.php:116
+#: ../lib/PageList.php:1199 ../lib/plugin/AuthorHistory.php:116
 #: ../lib/plugin/AuthorHistory.php:159 ../lib/plugin/PluginManager.php:78
 msgid "Version"
 msgstr "Version"
 
-#: ../lib/PageList.php:1177 ../themes/MonoBook/templates/info.tmpl:72
-#: ../themes/default/templates/info.tmpl:57
+#: ../lib/PageList.php:1202 ../themes/MonoBook/templates/info.tmpl:73
+#: ../themes/default/templates/info.tmpl:58
 msgid "Last Author"
 msgstr "Letzter Autor"
 
-#: ../lib/PageList.php:1179 ../lib/WikiGroup.php:36
+#: ../lib/PageList.php:1204 ../lib/WikiGroup.php:36
 msgid "Owner"
 msgstr "Besitzer"
 
-#: ../lib/PageList.php:1181 ../lib/WikiGroup.php:37
+#: ../lib/PageList.php:1206 ../lib/WikiGroup.php:37
 msgid "Creator"
 msgstr "Erzeuger"
 
-#: ../lib/PageList.php:1187 ../themes/Crao/templates/editpage.tmpl:61
-#: ../themes/MonoBook/templates/info.tmpl:142
-#: ../themes/Wordpress/templates/editpage.tmpl:61
-#: ../themes/default/templates/editpage.tmpl:80
-#: ../themes/default/templates/info.tmpl:128
+#: ../lib/PageList.php:1212 ../themes/Crao/templates/editpage.tmpl:62
+#: ../themes/MonoBook/templates/info.tmpl:143
+#: ../themes/Wordpress/templates/editpage.tmpl:62
+#: ../themes/default/templates/editpage.tmpl:81
+#: ../themes/default/templates/info.tmpl:129
 #: ../themes/gforge/templates/editpage.tmpl:62
 msgid "Locked"
 msgstr "Gesperrt"
 
-#: ../lib/PageList.php:1188
+#: ../lib/PageList.php:1213
 msgid "locked"
 msgstr "gesperrt"
 
-#: ../lib/PageList.php:1190 ../themes/gforge/templates/editpage.tmpl:67
+#: ../lib/PageList.php:1215 ../themes/gforge/templates/editpage.tmpl:67
 #, fuzzy
 msgid "External"
 msgstr "Externe Links"
 
-#: ../lib/PageList.php:1191
+#: ../lib/PageList.php:1216
 #, fuzzy
 msgid "external"
 msgstr "Externe Links"
 
-#: ../lib/PageList.php:1194
+#: ../lib/PageList.php:1219
 msgid "Minor Edit"
 msgstr "Kleinere Änderung"
 
-#: ../lib/PageList.php:1194
+#: ../lib/PageList.php:1219
 msgid "minor"
 msgstr "kleinere"
 
-#: ../lib/PageList.php:1196
+#: ../lib/PageList.php:1221
 msgid "Markup"
 msgstr "Quelltext"
 
-#: ../lib/PageList.php:1365 ../lib/PageList.php:1372 ../lib/PageList.php:1378
+#: ../lib/PageList.php:1390 ../lib/PageList.php:1397 ../lib/PageList.php:1403
 #: ../lib/WikiDB/backend.php:530 ../lib/WikiDB/backend.php:536
 msgid "Illegal 'limit' argument: must be numeric"
 msgstr ""
 
-#: ../lib/PageList.php:1491 ../lib/plugin/WantedPagesOld.php:178
+#: ../lib/PageList.php:1517 ../lib/plugin/WantedPagesOld.php:175
 #, php-format
 msgid "Columns: %s."
 msgstr "Spalten: %s."
@@ -532,18 +532,18 @@
 #: ../lib/main.php:1186 ../lib/plugin/WikiAdminRename.php:148
 #: ../lib/plugin/WikiAdminSelect.php:223 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/head.tmpl:81
-#: ../themes/Crao/templates/navbar.tmpl:37
-#: ../themes/MonoBook/templates/navbar.tmpl:57
-#: ../themes/Portland/templates/navbar.tmpl:27
-#: ../themes/Sidebar/templates/navbar.tmpl:70
-#: ../themes/Wordpress/templates/actionbar.tmpl:26
+#: ../themes/Crao/templates/navbar.tmpl:38
+#: ../themes/MonoBook/templates/navbar.tmpl:58
+#: ../themes/Portland/templates/navbar.tmpl:28
+#: ../themes/Sidebar/templates/navbar.tmpl:71
+#: ../themes/Wordpress/templates/actionbar.tmpl:28
 #: ../themes/blog/templates/navbar.tmpl:14
 #: ../themes/default/templates/head.tmpl:88
 #: ../themes/default/templates/head.tmpl:89
 #: ../themes/default/templates/navbar.tmpl:42
 #: ../themes/gforge/templates/navbar.tmpl:20
-#: ../themes/shamino_com/templates/actionbar.tmpl:18
-#: ../themes/smaller/templates/navbar.tmpl:19
+#: ../themes/shamino_com/templates/actionbar.tmpl:20
+#: ../themes/smaller/templates/navbar.tmpl:20
 #: ../themes/wikilens/templates/head.tmpl:78
 #: ../themes/wikilens/templates/head.tmpl:79
 #: ../themes/wikilens/templates/navbar.tmpl:32
@@ -641,11 +641,11 @@
 
 #: ../lib/PageType.php:136 ../lib/loadsave.php:908 ../lib/loadsave.php:1559
 #: ../lib/plugin/InterWikiSearch.php:57 ../lib/plugin/WantedPages.php:55
-#: ../lib/plugin/WantedPagesOld.php:81
-#: ../themes/MonoBook/templates/info.tmpl:167
+#: ../lib/plugin/WantedPagesOld.php:78
 #: ../themes/MonoBook/templates/info.tmpl:168
-#: ../themes/default/templates/info.tmpl:159
+#: ../themes/MonoBook/templates/info.tmpl:169
 #: ../themes/default/templates/info.tmpl:160
+#: ../themes/default/templates/info.tmpl:161
 msgid "InterWikiMap"
 msgstr "InterWikiListe"
 
@@ -653,10 +653,10 @@
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
 msgstr "ACHTUNG: Die InterWikiListe Seite ist ungesperrt. Ignoriert."
 
-#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:841
-#: ../themes/MonoBook/templates/actionbar.tmpl:21
-#: ../themes/MonoBook/templates/actionbar.tmpl:25
-#: ../themes/MonoBook/templates/actionbar.tmpl:31
+#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:842
+#: ../themes/MonoBook/templates/actionbar.tmpl:22
+#: ../themes/MonoBook/templates/actionbar.tmpl:26
+#: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/default/templates/navbar.tmpl:8
 #: ../themes/default/templates/navbar.tmpl:10
 #: ../themes/gforge/templates/actionbar.tmpl:29
@@ -688,19 +688,19 @@
 #: ../lib/plugin/RecentChanges.php:210 ../lib/plugin/RecentChanges.php:217
 #: ../lib/plugin/RecentChanges.php:386 ../lib/plugin/RecentChanges.php:675
 #: ../lib/plugin/RecentChanges.php:1154 ../themes/Crao/templates/head.tmpl:63
-#: ../themes/Crao/templates/navbar.tmpl:13
-#: ../themes/MonoBook/templates/navbar.tmpl:15
-#: ../themes/Portland/templates/navbar.tmpl:25
-#: ../themes/Sidebar/templates/navbar.tmpl:44
+#: ../themes/Crao/templates/navbar.tmpl:14
+#: ../themes/MonoBook/templates/navbar.tmpl:16
+#: ../themes/Portland/templates/navbar.tmpl:26
+#: ../themes/Sidebar/templates/navbar.tmpl:45
 #: ../themes/Sidebar/templates/rc.tmpl:6
-#: ../themes/Wordpress/templates/actionbar.tmpl:22
+#: ../themes/Wordpress/templates/actionbar.tmpl:24
 #: ../themes/blog/templates/actionbar.tmpl:14
 #: ../themes/default/templates/head.tmpl:69
 #: ../themes/default/templates/head.tmpl:71
 #: ../themes/default/templates/navbar.tmpl:16
 #: ../themes/gforge/templates/navbar.tmpl:9
 #: ../themes/shamino_com/templates/top.tmpl:20
-#: ../themes/smaller/templates/navbar.tmpl:7
+#: ../themes/smaller/templates/navbar.tmpl:8
 #: ../themes/wikilens/templates/head.tmpl:60
 #: ../themes/wikilens/templates/navbar.tmpl:17
 msgid "RecentChanges"
@@ -921,27 +921,27 @@
 msgid "Argument '%s' not declared by plugin."
 msgstr "Argument »%s« nicht im Zusatzprogramm deklariert."
 
-#: ../lib/WikiPlugin.php:387
+#: ../lib/WikiPlugin.php:364
 #, php-format
 msgid "Plugin %s failed."
 msgstr "Zusatzprogramm %s fehlgeschlagen."
 
-#: ../lib/WikiPlugin.php:393
+#: ../lib/WikiPlugin.php:370
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Zusatzprogramm %s deaktiviert."
 
-#: ../lib/WikiPlugin.php:529
+#: ../lib/WikiPlugin.php:504
 #, php-format
 msgid "Include of '%s' failed."
 msgstr "Das Einfügen von »%s« ist fehlgeschlagen."
 
-#: ../lib/WikiPlugin.php:531
+#: ../lib/WikiPlugin.php:506
 #, php-format
 msgid "%s: no such class"
 msgstr "Unbekannte Klasse: »%s«"
 
-#: ../lib/WikiPlugin.php:537
+#: ../lib/WikiPlugin.php:512
 #, php-format
 msgid "%s: not a subclass of WikiPlugin."
 msgstr "%s scheint kein WikiPlugin zu sein."
@@ -958,94 +958,94 @@
 msgid "Image map expired. Reload wiki page to recreate its html part."
 msgstr ""
 
-#: ../lib/WikiTheme.php:443
+#: ../lib/WikiTheme.php:446
 msgid "Never edited"
 msgstr "Noch nie bearbeitet."
 
-#: ../lib/WikiTheme.php:450
+#: ../lib/WikiTheme.php:453
 #, php-format
 msgid "%s at %s"
 msgstr "%s um %s"
 
-#: ../lib/WikiTheme.php:454
+#: ../lib/WikiTheme.php:457
 #, php-format
 msgid "Version %s, saved %s"
 msgstr "Version %s. %s gespeichert"
 
 # (Usually a verb, never a noun; siehe nächste Reihe:
 # saved=gespeichert nicht "Speicherung am.")
-#: ../lib/WikiTheme.php:456
+#: ../lib/WikiTheme.php:459
 #, php-format
 msgid "Last edited %s"
 msgstr "Zuletzt geändert %s"
 
-#: ../lib/WikiTheme.php:465
+#: ../lib/WikiTheme.php:468
 #, php-format
 msgid "Version %s, saved on %s"
 msgstr "Version %s. gespeichert am %s"
 
-#: ../lib/WikiTheme.php:467
+#: ../lib/WikiTheme.php:470
 #, php-format
 msgid "Last edited on %s"
 msgstr "Zuletzt bearbeitet am %s"
 
-#: ../lib/WikiTheme.php:483
+#: ../lib/WikiTheme.php:486
 msgid "today"
 msgstr "heute"
 
-#: ../lib/WikiTheme.php:490
+#: ../lib/WikiTheme.php:493
 msgid "yesterday"
 msgstr "gestern"
 
-#: ../lib/WikiTheme.php:511 ../lib/WikiTheme.php:513
+#: ../lib/WikiTheme.php:514 ../lib/WikiTheme.php:516
 #, php-format
 msgid "Owner: %s"
 msgstr "Besitzer: %s"
 
-#: ../lib/WikiTheme.php:526 ../lib/WikiTheme.php:528 ../lib/diff.php:261
+#: ../lib/WikiTheme.php:529 ../lib/WikiTheme.php:531 ../lib/diff.php:261
 #: ../lib/plugin/Diff.php:75
 #, php-format
 msgid "by %s"
 msgstr "von %s"
 
-#: ../lib/WikiTheme.php:620
+#: ../lib/WikiTheme.php:623
 #, php-format
 msgid "Empty link to: %s"
 msgstr "Leerer Link zu: %s"
 
-#: ../lib/WikiTheme.php:635 ../themes/MacOSX/themeinfo.php:71
+#: ../lib/WikiTheme.php:638 ../themes/MacOSX/themeinfo.php:71
 #, php-format
 msgid "Create: %s"
 msgstr "Erzeugen: %s"
 
-#: ../lib/WikiTheme.php:654
+#: ../lib/WikiTheme.php:657
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:679
+#: ../lib/WikiTheme.php:682
 #, php-format
 msgid "'%s': Bad page name"
 msgstr "»%s«: Ungültiger Seitenname"
 
-#: ../lib/WikiTheme.php:1029 ../lib/plugin/WatchPage.php:93
+#: ../lib/WikiTheme.php:1032 ../lib/plugin/WatchPage.php:93
 #: ../themes/Crao/templates/actionbar.tmpl:5
-#: ../themes/MonoBook/templates/actionbar.tmpl:34
+#: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/Sidebar/templates/actionbar.tmpl:20
 #: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:60
 #: ../themes/default/templates/actionbar.tmpl:16
 #: ../themes/gforge/templates/actionbar.tmpl:54
-#: ../themes/shamino_com/templates/actionbar.tmpl:6
+#: ../themes/shamino_com/templates/actionbar.tmpl:8
 #: ../themes/smaller/templates/actionbar.tmpl:18
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../lib/WikiTheme.php:1030 ../lib/plugin/Diff.php:37
+#: ../lib/WikiTheme.php:1033 ../lib/plugin/Diff.php:37
 #: ../themes/blog/themeinfo.php:61
 msgid "Diff"
 msgstr "Diff"
 
-#: ../lib/WikiTheme.php:1031 ../themes/Crao/templates/signin.tmpl:14
+#: ../lib/WikiTheme.php:1034 ../themes/Crao/templates/signin.tmpl:14
 #: ../themes/Crao/templates/signin.tmpl:30
 #: ../themes/Wordpress/templates/signin.tmpl:17
 #: ../themes/Wordpress/templates/signin.tmpl:33
@@ -1058,39 +1058,39 @@
 msgid "Sign Out"
 msgstr "Abmelden"
 
-#: ../lib/WikiTheme.php:1032 ../lib/WikiUser.php:228
+#: ../lib/WikiTheme.php:1035 ../lib/WikiUser.php:228
 #: ../lib/WikiUserNew.php:504 ../themes/Crao/templates/signin.tmpl:53
-#: ../themes/default/templates/login.tmpl:87
+#: ../themes/default/templates/login.tmpl:92
 #: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr "Anmelden"
 
-#: ../lib/WikiTheme.php:1033
+#: ../lib/WikiTheme.php:1036
 msgid "Rename Page"
 msgstr "Seite Umbenennen"
 
-#: ../lib/WikiTheme.php:1034 ../themes/MacOSX/themeinfo.php:133
+#: ../lib/WikiTheme.php:1037 ../themes/MacOSX/themeinfo.php:133
 msgid "Lock Page"
 msgstr "Seite Sperren"
 
-#: ../lib/WikiTheme.php:1035 ../themes/MacOSX/themeinfo.php:134
+#: ../lib/WikiTheme.php:1038 ../themes/MacOSX/themeinfo.php:134
 msgid "Unlock Page"
 msgstr "Seite Freigeben"
 
-#: ../lib/WikiTheme.php:1036 ../lib/removepage.php:22 ../lib/removepage.php:56
+#: ../lib/WikiTheme.php:1039 ../lib/removepage.php:22 ../lib/removepage.php:56
 msgid "Remove Page"
 msgstr "Seite Löschen"
 
-#: ../lib/WikiTheme.php:1037 ../lib/purgepage.php:22 ../lib/purgepage.php:56
+#: ../lib/WikiTheme.php:1040 ../lib/purgepage.php:22 ../lib/purgepage.php:56
 msgid "Purge Page"
 msgstr "Seiten endgültig löschen"
 
-#: ../lib/WikiTheme.php:1202
+#: ../lib/WikiTheme.php:1205
 msgid ""
 "Some action(page) wanted to add more headers, but they were already printed."
 msgstr ""
 
-#: ../lib/WikiTheme.php:1284 ../themes/Hawaiian/themeinfo.php:28
+#: ../lib/WikiTheme.php:1287 ../themes/Hawaiian/themeinfo.php:28
 #: ../themes/MacOSX/themeinfo.php:102 ../themes/MonoBook/themeinfo.php:128
 #: ../themes/Portland/themeinfo.php:58 ../themes/SpaceWiki/themeinfo.php:42
 #: ../themes/Wordpress/themeinfo.php:60 ../themes/shamino_com/themeinfo.php:54
@@ -1098,39 +1098,39 @@
 msgid "Printer"
 msgstr "Drucker"
 
-#: ../lib/WikiTheme.php:1285 ../themes/MacOSX/themeinfo.php:103
+#: ../lib/WikiTheme.php:1288 ../themes/MacOSX/themeinfo.php:103
 #: ../themes/MonoBook/themeinfo.php:129 ../themes/shamino_com/themeinfo.php:55
 #: ../themes/wikilens/themeinfo.php:27
 msgid "Top & bottom toolbars"
 msgstr "Obere u. untere Werkzeugleisten"
 
-#: ../lib/WikiTheme.php:1286 ../themes/Hawaiian/themeinfo.php:29
+#: ../lib/WikiTheme.php:1289 ../themes/Hawaiian/themeinfo.php:29
 #: ../themes/MonoBook/themeinfo.php:130 ../themes/Portland/themeinfo.php:59
 #: ../themes/SpaceWiki/themeinfo.php:43 ../themes/Wordpress/themeinfo.php:61
 #: ../themes/shamino_com/themeinfo.php:56 ../themes/wikilens/themeinfo.php:28
 msgid "Modern"
 msgstr "Modern"
 
-#: ../lib/WikiTheme.php:1453 ../lib/main.php:1120
+#: ../lib/WikiTheme.php:1456 ../lib/main.php:1120
 #: ../lib/plugin/RecentChanges.php:802 ../lib/plugin/TitleSearch.php:44
-#: ../themes/Crao/templates/navbar.tmpl:4
-#: ../themes/Crao/templates/navbar.tmpl:8
-#: ../themes/Crao/templates/navbar.tmpl:51
-#: ../themes/MonoBook/templates/navbar.tmpl:33
+#: ../themes/Crao/templates/navbar.tmpl:5
+#: ../themes/Crao/templates/navbar.tmpl:9
+#: ../themes/Crao/templates/navbar.tmpl:52
+#: ../themes/MonoBook/templates/navbar.tmpl:34
 #: ../themes/Sidebar/templates/search.tmpl:12
 #: ../themes/default/templates/search.tmpl:3
 #: ../themes/default/templates/search.tmpl:9
 #: ../themes/default/templates/search.tmpl:33
 #: ../themes/shamino_com/templates/top.tmpl:18
-#: ../themes/smaller/templates/navbar.tmpl:4
+#: ../themes/smaller/templates/navbar.tmpl:5
 msgid "TitleSearch"
 msgstr "TitelSuche"
 
-#: ../lib/WikiTheme.php:1505 ../lib/WikiUser.php:478
+#: ../lib/WikiTheme.php:1508 ../lib/WikiUser.php:478
 #: ../lib/plugin/Calendar.php:41 ../lib/plugin/Calendar.php:45
 #: ../themes/Crao/templates/head.tmpl:90
-#: ../themes/Crao/templates/navbar.tmpl:28
-#: ../themes/Wordpress/templates/actionbar.tmpl:32
+#: ../themes/Crao/templates/navbar.tmpl:29
+#: ../themes/Wordpress/templates/actionbar.tmpl:34
 #: ../themes/blog/templates/sidebar.tmpl:16
 #: ../themes/default/templates/head.tmpl:98
 #: ../themes/default/templates/homepage.tmpl:15
@@ -1140,16 +1140,16 @@
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../lib/WikiTheme.php:1784
+#: ../lib/WikiTheme.php:1787
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Zusatzprogramm %s: undefiniert"
 
-#: ../lib/WikiTheme.php:1807
+#: ../lib/WikiTheme.php:1810
 msgid "Related Links"
 msgstr "Verwandte Links"
 
-#: ../lib/WikiTheme.php:1828
+#: ../lib/WikiTheme.php:1831
 msgid "External Links"
 msgstr "Externe Links"
 
@@ -1206,8 +1206,8 @@
 msgid "CategoryHomepage"
 msgstr "KategorieHomepage"
 
-#: ../lib/WikiUser.php:488 ../themes/Crao/templates/navbar.tmpl:23
-#: ../themes/Sidebar/templates/navbar.tmpl:51
+#: ../lib/WikiUser.php:488 ../themes/Crao/templates/navbar.tmpl:24
+#: ../themes/Sidebar/templates/navbar.tmpl:52
 #: ../themes/default/templates/navbar.tmpl:27
 #: ../themes/shamino_com/templates/top.tmpl:28
 #: ../themes/wikilens/templates/navbar.tmpl:23
@@ -1437,7 +1437,7 @@
 msgid "Warning: This Wikiwyg editor has only Beta quality!"
 msgstr ""
 
-#: ../lib/XmlElement.php:491 ../lib/stdlib.php:1530
+#: ../lib/XmlElement.php:491 ../lib/stdlib.php:1531
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr "Kann »%s« Typ-Formatzeichenketten nicht mit »%s« vermischen."
@@ -1549,10 +1549,10 @@
 #: ../lib/plugin/HelloWorld.php:70 ../lib/plugin/PageGroup.php:164
 #: ../lib/plugin/PageGroup.php:175 ../lib/plugin/PageGroup.php:191
 #: ../lib/plugin/PageGroup.php:198 ../lib/plugin/PageHistory.php:238
-#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:47
-#: ../themes/MonoBook/templates/logo.tmpl:2
-#: ../themes/Portland/templates/body.tmpl:8
-#: ../themes/Wordpress/templates/body.tmpl:13
+#: ../lib/plugin/UnfoldSubpages.php:159 ../themes/Crao/templates/head.tmpl:47
+#: ../themes/MonoBook/templates/logo.tmpl:5
+#: ../themes/Portland/templates/body.tmpl:9
+#: ../themes/Wordpress/templates/body.tmpl:15
 #: ../themes/default/templates/head.tmpl:53
 #: ../themes/default/templates/top.tmpl:11
 #: ../themes/shamino_com/templates/top.tmpl:8
@@ -1569,10 +1569,10 @@
 
 #: ../lib/display.php:253 ../lib/display.php:260
 #: ../lib/plugin/BackLinks.php:31 ../lib/plugin/_WikiTranslation.php:53
-#: ../themes/Crao/templates/navbar.tmpl:17
+#: ../themes/Crao/templates/navbar.tmpl:18
 #: ../themes/blog/templates/navbar.tmpl:11
 #: ../themes/default/templates/navbar.tmpl:21
-#: ../themes/smaller/templates/navbar.tmpl:16
+#: ../themes/smaller/templates/navbar.tmpl:17
 #: ../themes/wikilens/templates/navbar.tmpl:22
 msgid "BackLinks"
 msgstr "BackLinks"
@@ -1598,11 +1598,11 @@
 msgid "SandBox"
 msgstr "SandKasten"
 
-#: ../lib/editpage.php:163 ../lib/editpage.php:585
+#: ../lib/editpage.php:163 ../lib/editpage.php:586
 msgid "Your version"
 msgstr "Ihre Version"
 
-#: ../lib/editpage.php:163 ../lib/editpage.php:586
+#: ../lib/editpage.php:163 ../lib/editpage.php:587
 msgid "Other version"
 msgstr "Andere Version"
 
@@ -1663,45 +1663,45 @@
 msgid "Saved: %s"
 msgstr "Gespeichert: %s"
 
-#: ../lib/editpage.php:432
+#: ../lib/editpage.php:433
 msgid "Too many external links."
 msgstr "Zu viele externe Links."
 
-#: ../lib/editpage.php:445
+#: ../lib/editpage.php:446
 msgid "SpamAssassin reports: "
 msgstr "SpamAssassin sagt: "
 
-#: ../lib/editpage.php:472
+#: ../lib/editpage.php:473
 msgid "External links contain blocked domains:"
 msgstr ""
 
-#: ../lib/editpage.php:473
+#: ../lib/editpage.php:474
 #, php-format
 msgid "%s is listed at %s with %s"
 msgstr "%s ist gelistet auf %s mit %s"
 
-#: ../lib/editpage.php:497
+#: ../lib/editpage.php:498
 msgid "Spam Prevention"
 msgstr "AntiSpam"
 
-#: ../lib/editpage.php:498
+#: ../lib/editpage.php:499
 msgid "This page edit seems to contain spam and was therefore not saved."
 msgstr "Diese Bearbeitung scheint Spam beinzuhalten und wurde ignoriert."
 
-#: ../lib/editpage.php:500 ../lib/editpage.php:561
+#: ../lib/editpage.php:501 ../lib/editpage.php:562
 msgid "Sorry for the inconvenience."
 msgstr ""
 "Entschuldigen Sie bitte die hiermit für Sie verbundenen Unannehmlichkeiten."
 
-#: ../lib/editpage.php:525
+#: ../lib/editpage.php:526
 msgid "Versions are identical"
 msgstr "Versionen sind identisch"
 
-#: ../lib/editpage.php:558 ../themes/MacOSX/themeinfo.php:135
+#: ../lib/editpage.php:559 ../themes/MacOSX/themeinfo.php:135
 msgid "Page Locked"
 msgstr "Seite Gesperrt"
 
-#: ../lib/editpage.php:559
+#: ../lib/editpage.php:560
 msgid ""
 "This page has been locked by the administrator so your changes can not be "
 "saved."
@@ -1709,7 +1709,7 @@
 "Diese Seite wurde vom Administrator für die allgemeine Bearbeitung gesperrt. "
 "Ihre Änderungen können deshalb nicht gespeichert werden."
 
-#: ../lib/editpage.php:560
+#: ../lib/editpage.php:561
 msgid ""
 "(Copy your changes to the clipboard. You can try editing a different page or "
 "save your text in a text editor.)"
@@ -1717,7 +1717,7 @@
 "(Kopieren Sie Ihre Veränderungen in die Zwischenablage. Sie können versuchen "
 "eine andere Seite zu edieren oder Ihr Text in einem Texteditor speichern.)"
 
-#: ../lib/editpage.php:569 ../lib/editpage.php:570 ../lib/main.php:786
+#: ../lib/editpage.php:570 ../lib/editpage.php:571 ../lib/main.php:786
 #: ../lib/main.php:1156 ../lib/plugin/ModeratedPage.php:42
 #: ../lib/plugin/ModeratedPage.php:150 ../lib/plugin/ModeratedPage.php:220
 #: ../lib/plugin/ModeratedPage.php:260 ../lib/plugin/ModeratedPage.php:263
@@ -1727,20 +1727,20 @@
 msgid "ModeratedPage"
 msgstr "ModerierteSeite"
 
-#: ../lib/editpage.php:570
+#: ../lib/editpage.php:571
 #, php-format
 msgid ""
 "You can edit away, but your changes will have to be approved by the defined "
 "moderators at the definition in %s"
 msgstr ""
 
-#: ../lib/editpage.php:572 ../lib/plugin/PasswordReset.php:159
-#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:123
-#: ../lib/plugin/WatchPage.php:143 ../themes/Crao/templates/head.tmpl:86
+#: ../lib/editpage.php:573 ../lib/plugin/PasswordReset.php:159
+#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:127
+#: ../lib/plugin/WatchPage.php:147 ../themes/Crao/templates/head.tmpl:86
 #: ../themes/Crao/templates/head.tmpl:87
-#: ../themes/Crao/templates/navbar.tmpl:23
+#: ../themes/Crao/templates/navbar.tmpl:24
 #: ../themes/MonoBook/templates/signin.tmpl:11
-#: ../themes/Sidebar/templates/navbar.tmpl:51
+#: ../themes/Sidebar/templates/navbar.tmpl:52
 #: ../themes/blog/templates/navbar.tmpl:17
 #: ../themes/default/templates/head.tmpl:94
 #: ../themes/default/templates/head.tmpl:95
@@ -1748,21 +1748,21 @@
 #: ../themes/default/templates/navbar.tmpl:27
 #: ../themes/gforge/templates/navbar.tmpl:23
 #: ../themes/shamino_com/templates/top.tmpl:28
-#: ../themes/smaller/templates/navbar.tmpl:22
+#: ../themes/smaller/templates/navbar.tmpl:23
 #: ../themes/wikilens/templates/head.tmpl:85
 #: ../themes/wikilens/templates/head.tmpl:86
 #: ../themes/wikilens/templates/navbar.tmpl:23
 msgid "UserPreferences"
 msgstr "BenutzerEinstellungen"
 
-#: ../lib/editpage.php:571
+#: ../lib/editpage.php:572
 #, php-format
 msgid ""
 "The approval has a grace period of 5 days. If you have your E-Mail defined "
 "in your %s, you will get a notification of approval or rejection."
 msgstr ""
 
-#: ../lib/editpage.php:584 ../lib/editpage.php:951
+#: ../lib/editpage.php:585 ../lib/editpage.php:952
 #, php-format
 msgid ""
 "Some of the changes could not automatically be combined.  Please look for "
@@ -1774,15 +1774,15 @@
 "enden. Sie müssen diese Teile von Hand bearbeiten, bevor Sie auf Speichern "
 "klicken."
 
-#: ../lib/editpage.php:588 ../lib/editpage.php:954
+#: ../lib/editpage.php:589 ../lib/editpage.php:955
 msgid "Please check it through before saving."
 msgstr "Bitte überprüfen Sie erst alles, bevor Sie es abspeichern."
 
-#: ../lib/editpage.php:599
+#: ../lib/editpage.php:600
 msgid "Conflicting Edits!"
 msgstr "Widersprechende Änderungen!"
 
-#: ../lib/editpage.php:600
+#: ../lib/editpage.php:601
 msgid ""
 "In the time since you started editing this page, another user has saved a "
 "new version of it."
@@ -1790,7 +1790,7 @@
 "Während der Zeit, seit Sie mit der Bearbeitung dieser Seite begonnen haben, "
 "hat ein anderer Benutzer bereits eine neuere Version gespeichert."
 
-#: ../lib/editpage.php:601
+#: ../lib/editpage.php:602
 msgid ""
 "Your changes can not be saved as they are, since doing so would overwrite "
 "the other author's changes. So, your changes and those of the other author "
@@ -1801,40 +1801,40 @@
 "überschrieben. Deshalb sind Ihre und die Änderungen des anderen Autors "
 "miteinander kombiniert worden. Das Ergebnis sehen Sie unten."
 
-#: ../lib/editpage.php:675 ../lib/plugin/HtmlConverter.php:71
+#: ../lib/editpage.php:676 ../lib/plugin/HtmlConverter.php:71
 msgid "Convert"
 msgstr "Konvertieren"
 
-#: ../lib/editpage.php:715
+#: ../lib/editpage.php:716
 msgid "Changes"
 msgstr "Änderungen"
 
-#: ../lib/editpage.php:719 ../lib/plugin/UpLoad.php:166
-#: ../lib/plugin/UpLoad.php:171 ../lib/plugin/WikiForm.php:107
+#: ../lib/editpage.php:720 ../lib/plugin/UpLoad.php:167
+#: ../lib/plugin/UpLoad.php:172 ../lib/plugin/WikiForm.php:107
 msgid "Upload"
 msgstr "Hochladen"
 
-#: ../lib/editpage.php:722
+#: ../lib/editpage.php:723
 msgid "Spell Check"
 msgstr ""
 
-#: ../lib/editpage.php:745 ../themes/Portland/templates/editpage.tmpl:38
-#: ../themes/Wordpress/templates/editpage.tmpl:52
+#: ../lib/editpage.php:746 ../themes/Portland/templates/editpage.tmpl:39
+#: ../themes/Wordpress/templates/editpage.tmpl:53
 #, php-format
 msgid "Author will be logged as %s."
 msgstr "%s wird als Autor aufgenommen."
 
-#: ../lib/editpage.php:906
+#: ../lib/editpage.php:907
 msgid "Keep old"
 msgstr ""
 
-#: ../lib/editpage.php:909
+#: ../lib/editpage.php:910
 msgid "Overwrite with new"
 msgstr ""
 
 # (Wrong Translation; sorry, but the German term for edit is NOT
 # editieren, but  e d i e r e n).
-#: ../lib/editpage.php:919
+#: ../lib/editpage.php:920
 #, php-format
 msgid "Merge and Edit: %s"
 msgstr "Zusammenfügen und Bearbeiten: %s"
@@ -1921,7 +1921,7 @@
 msgid "Dumping Pages"
 msgstr "Die Seiten werden geschrieben"
 
-#: ../lib/loadsave.php:357 ../lib/loadsave.php:620 ../lib/stdlib.php:1027
+#: ../lib/loadsave.php:357 ../lib/loadsave.php:620 ../lib/stdlib.php:1028
 msgid "Skipped."
 msgstr "Ausgelassen."
 
@@ -2034,12 +2034,12 @@
 msgstr " Konnte leider nicht automatisch einpflegen."
 
 #: ../lib/loadsave.php:1073 ../lib/loadsave.php:1083 ../lib/loadsave.php:1090
-#: ../lib/loadsave.php:1097 ../themes/MonoBook/templates/actionbar.tmpl:72
+#: ../lib/loadsave.php:1097 ../themes/MonoBook/templates/actionbar.tmpl:73
 #: ../themes/Sidebar/templates/actionbar.tmpl:47
-#: ../themes/Wordpress/templates/actionbar.tmpl:58
+#: ../themes/Wordpress/templates/actionbar.tmpl:60
 #: ../themes/default/templates/actionbar.tmpl:31
 #: ../themes/gforge/templates/actionbar.tmpl:71
-#: ../themes/gforge/templates/userprefs.tmpl:256
+#: ../themes/gforge/templates/userprefs.tmpl:255
 #: ../themes/smaller/templates/actionbar.tmpl:31
 msgid "Revert"
 msgstr "Zurückspeichern"
@@ -2061,20 +2061,20 @@
 msgstr "Abgebrochen"
 
 #: ../lib/loadsave.php:1108 ../lib/plugin/PasswordReset.php:107
-#: ../lib/plugin/PasswordReset.php:150 ../lib/plugin/UserPreferences.php:119
+#: ../lib/plugin/PasswordReset.php:150 ../lib/plugin/UserPreferences.php:126
 #: ../lib/plugin/WatchPage.php:88 ../lib/plugin/WikiAdminChmod.php:147
 #: ../lib/plugin/WikiAdminChown.php:175 ../lib/plugin/WikiAdminMarkup.php:167
 #: ../lib/plugin/WikiAdminPurge.php:147 ../lib/plugin/WikiAdminRemove.php:201
 #: ../lib/plugin/WikiAdminRename.php:213
 #: ../lib/plugin/WikiAdminSearchReplace.php:193
 #: ../lib/plugin/WikiAdminSetAcl.php:204
-#: ../themes/default/templates/info.tmpl:133
+#: ../themes/default/templates/info.tmpl:134
 msgid "Yes"
 msgstr "Ja"
 
 #: ../lib/loadsave.php:1110 ../lib/plugin/PasswordReset.php:110
 #: ../lib/plugin/PasswordReset.php:153 ../lib/plugin/TranslateText.php:118
-#: ../lib/plugin/UserPreferences.php:121 ../lib/plugin/WatchPage.php:90
+#: ../lib/plugin/UserPreferences.php:128 ../lib/plugin/WatchPage.php:90
 #: ../lib/plugin/WatchPage.php:95 ../lib/plugin/WikiAdminChmod.php:160
 #: ../lib/plugin/WikiAdminChown.php:188 ../lib/plugin/WikiAdminMarkup.php:180
 #: ../lib/plugin/WikiAdminPurge.php:157 ../lib/plugin/WikiAdminRemove.php:223
@@ -2084,9 +2084,9 @@
 #: ../lib/plugin/WikiAdminSetExternal.php:134
 #: ../lib/plugin/WikiAdminUtils.php:296 ../lib/plugin/WikiFormRich.php:310
 #: ../lib/purgepage.php:23 ../lib/removepage.php:23 ../lib/upgrade.php:801
-#: ../themes/default/templates/login.tmpl:89
+#: ../themes/default/templates/login.tmpl:94
 #: ../themes/default/templates/userprefs.tmpl:278
-#: ../themes/gforge/templates/userprefs.tmpl:370
+#: ../themes/gforge/templates/userprefs.tmpl:369
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -2397,21 +2397,20 @@
 msgid "SetAcl"
 msgstr "AclSetzen"
 
-#: ../lib/main.php:1089 ../lib/main.php:1094 ../lib/plugin/PageDump.php:36
+#: ../lib/main.php:1089 ../lib/main.php:1094 ../lib/plugin/PageDump.php:56
 #: ../themes/Crao/templates/actionbar.tmpl:32
-#: ../themes/MonoBook/templates/actionbar.tmpl:79
+#: ../themes/MonoBook/templates/actionbar.tmpl:80
 #: ../themes/Sidebar/templates/actionbar.tmpl:61
-#: ../themes/Wordpress/templates/actionbar.tmpl:76
+#: ../themes/Wordpress/templates/actionbar.tmpl:78
 #: ../themes/default/templates/actionbar.tmpl:40
-#: ../themes/gforge/templates/info.tmpl:13
-#: ../themes/shamino_com/templates/actionbar.tmpl:22
+#: ../themes/shamino_com/templates/actionbar.tmpl:24
 #: ../themes/smaller/templates/actionbar.tmpl:41
-#: ../themes/smaller/templates/info.tmpl:11
+#: ../themes/smaller/templates/info.tmpl:14
 msgid "PageDump"
 msgstr "SeiteSpeichern"
 
 #: ../lib/main.php:1112 ../lib/plugin/FullTextSearch.php:46
-#: ../lib/plugin/WantedPagesOld.php:134
+#: ../lib/plugin/WantedPagesOld.php:131
 msgid "FullTextSearch"
 msgstr "VolltextSuche"
 
@@ -2454,7 +2453,7 @@
 msgid "Click to display all comments"
 msgstr "Klicken um Kommentare anzuzeigen"
 
-#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:444
+#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:469
 msgid "Click to display"
 msgstr "Klicken um anzuzeigen"
 
@@ -2462,8 +2461,8 @@
 msgid "Comments"
 msgstr "Kommentare"
 
-#: ../lib/plugin/AllPages.php:34 ../themes/MonoBook/templates/navbar.tmpl:77
-#: ../themes/Sidebar/templates/navbar.tmpl:68
+#: ../lib/plugin/AllPages.php:34 ../themes/MonoBook/templates/navbar.tmpl:78
+#: ../themes/Sidebar/templates/navbar.tmpl:69
 msgid "AllPages"
 msgstr "AlleSeiten"
 
@@ -2676,11 +2675,11 @@
 msgstr ""
 
 #: ../lib/plugin/AuthorHistory.php:65
-#: ../themes/MonoBook/templates/actionbar.tmpl:77
-#: ../themes/MonoBook/templates/info.tmpl:186
+#: ../themes/MonoBook/templates/actionbar.tmpl:78
+#: ../themes/MonoBook/templates/info.tmpl:187
 #: ../themes/Sidebar/templates/actionbar.tmpl:57
-#: ../themes/blog/templates/info.tmpl:3
-#: ../themes/smaller/templates/info.tmpl:7
+#: ../themes/blog/templates/info.tmpl:6
+#: ../themes/smaller/templates/info.tmpl:10
 msgid "AuthorHistory"
 msgstr "AutorenProtokoll"
 
@@ -2698,19 +2697,19 @@
 msgstr "kleinere"
 
 #: ../lib/plugin/AuthorHistory.php:118
-#: ../themes/MonoBook/templates/info.tmpl:77
-#: ../themes/default/templates/info.tmpl:62
+#: ../themes/MonoBook/templates/info.tmpl:78
+#: ../themes/default/templates/info.tmpl:63
 #: ../themes/default/templates/wikiforum.tmpl:22
 msgid "Author"
 msgstr "Autor"
 
 #: ../lib/plugin/AuthorHistory.php:119 ../lib/plugin/AuthorHistory.php:161
-#: ../themes/Crao/templates/editpage.tmpl:48
-#: ../themes/MonoBook/templates/info.tmpl:78
-#: ../themes/Portland/templates/editpage.tmpl:36
-#: ../themes/Wordpress/templates/editpage.tmpl:46
-#: ../themes/default/templates/editpage.tmpl:50
-#: ../themes/default/templates/info.tmpl:63
+#: ../themes/Crao/templates/editpage.tmpl:49
+#: ../themes/MonoBook/templates/info.tmpl:79
+#: ../themes/Portland/templates/editpage.tmpl:37
+#: ../themes/Wordpress/templates/editpage.tmpl:47
+#: ../themes/default/templates/editpage.tmpl:51
+#: ../themes/default/templates/info.tmpl:64
 #: ../themes/gforge/templates/editpage.tmpl:42
 msgid "Summary"
 msgstr "Zusammenfassung"
@@ -2785,42 +2784,42 @@
 msgid "More..."
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:24 ../lib/plugin/BlogArchives.php:134
+#: ../lib/plugin/BlogArchives.php:39 ../lib/plugin/BlogArchives.php:149
 #: ../themes/blog/templates/actionbar.tmpl:11
 msgid "Archives"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:28
+#: ../lib/plugin/BlogArchives.php:43
 msgid "List blog months links for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:88 ../lib/plugin/BlogJournal.php:88
+#: ../lib/plugin/BlogArchives.php:103 ../lib/plugin/BlogJournal.php:104
 #, php-format
 msgid "Blog Entries for %s:"
 msgstr "Blog-Einträge für %s:"
 
-#: ../lib/plugin/BlogArchives.php:96
+#: ../lib/plugin/BlogArchives.php:111
 #: ../themes/blog/templates/actionbar.tmpl:11
 msgid "BlogArchives"
 msgstr "BlogArchiv"
 
-#: ../lib/plugin/BlogArchives.php:122
+#: ../lib/plugin/BlogArchives.php:137
 msgid "Blog Archives:"
 msgstr "Blog-Archive:"
 
-#: ../lib/plugin/BlogJournal.php:22
+#: ../lib/plugin/BlogJournal.php:38
 msgid "BlogJournal"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:26
+#: ../lib/plugin/BlogJournal.php:42
 msgid "Include latest blog entries for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:84
+#: ../lib/plugin/BlogJournal.php:100
 msgid "New entry"
 msgstr "Neuer Eintrag"
 
-#: ../lib/plugin/BlogJournal.php:86
+#: ../lib/plugin/BlogJournal.php:102
 msgid "No Blog Entries"
 msgstr "Keine Blog-Einträge"
 
@@ -2865,11 +2864,11 @@
 msgid "Render SVG charts"
 msgstr ""
 
-#: ../lib/plugin/Comment.php:45
+#: ../lib/plugin/Comment.php:43
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../lib/plugin/Comment.php:49
+#: ../lib/plugin/Comment.php:47
 msgid "Embed hidden comments in WikiPages."
 msgstr "Kommentar in WikiText verstecken."
 
@@ -2881,7 +2880,7 @@
 msgid "Automatically create a Bibtex file from linked pages"
 msgstr ""
 
-#: ../lib/plugin/CreateBib.php:121 ../lib/plugin/CreateToc.php:355
+#: ../lib/plugin/CreateBib.php:121 ../lib/plugin/CreateToc.php:378
 #: ../lib/plugin/IncludePage.php:82 ../lib/plugin/RateIt.php:215
 #: ../lib/plugin/Template.php:112
 msgid "no page specified"
@@ -2932,25 +2931,25 @@
 msgid "Created by CreatePage"
 msgstr "Erzeugt von NeueSeite"
 
-#: ../lib/plugin/CreateToc.php:46
+#: ../lib/plugin/CreateToc.php:48
 msgid "CreateToc"
 msgstr "InhaltsVerzeichnis"
 
-#: ../lib/plugin/CreateToc.php:50
+#: ../lib/plugin/CreateToc.php:52
 msgid "Create a Table of Contents and automatically link to headers"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:367 ../lib/plugin/Diff.php:92
-#: ../lib/plugin/PageDump.php:70
+#: ../lib/plugin/CreateToc.php:390 ../lib/plugin/Diff.php:92
+#: ../lib/plugin/PageDump.php:90
 #, php-format
 msgid "Illegal access to page %s: no read access"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:376
+#: ../lib/plugin/CreateToc.php:399
 msgid "CreateToc disabled for old markup"
 msgstr "InhaltsVerzeichnis deaktiviert für altes Markup"
 
-#: ../lib/plugin/CreateToc.php:436
+#: ../lib/plugin/CreateToc.php:461
 msgid "Click to display to TOC"
 msgstr "Klicken um TOC anzuzeigen"
 
@@ -2989,7 +2988,7 @@
 
 #: ../lib/plugin/DynamicIncludePage.php:83
 #: ../lib/plugin/DynamicIncludePage.php:84
-#: ../lib/plugin/NewPagesPerUser.php:98 ../lib/plugin/NewPagesPerUser.php:99
+#: ../lib/plugin/NewPagesPerUser.php:114 ../lib/plugin/NewPagesPerUser.php:115
 #: ../lib/plugin/RecentChanges.php:1361 ../lib/plugin/RecentChanges.php:1362
 #: ../themes/Sidebar/themeinfo.php:45 ../themes/Sidebar/themeinfo.php:46
 #, fuzzy
@@ -3068,39 +3067,39 @@
 msgid "page not locked"
 msgstr "Seite nicht gesperrt"
 
-#: ../lib/plugin/FoafViewer.php:52
+#: ../lib/plugin/FoafViewer.php:69
 msgid "FoafViewer"
 msgstr "FoafBetrachter"
 
-#: ../lib/plugin/FoafViewer.php:56
+#: ../lib/plugin/FoafViewer.php:73
 msgid "Parse an RDF FOAF file and extract information to render as HTML"
 msgstr ""
 
-#: ../lib/plugin/FoafViewer.php:84
+#: ../lib/plugin/FoafViewer.php:101
 msgid "required pear library XML/FOAF/Parser.php not found in include_path"
 msgstr ""
 
-#: ../lib/plugin/FoafViewer.php:90
+#: ../lib/plugin/FoafViewer.php:107
 msgid "FOAF File URI"
 msgstr ""
 
-#: ../lib/plugin/FoafViewer.php:94
+#: ../lib/plugin/FoafViewer.php:111
 msgid "Pretty HTML"
 msgstr ""
 
-#: ../lib/plugin/FoafViewer.php:96
+#: ../lib/plugin/FoafViewer.php:113
 msgid "Original URL (Redirect)"
 msgstr ""
 
-#: ../lib/plugin/FoafViewer.php:98
+#: ../lib/plugin/FoafViewer.php:115
 msgid "Parse FOAF"
 msgstr ""
 
-#: ../lib/plugin/FoafViewer.php:107
+#: ../lib/plugin/FoafViewer.php:124
 msgid "foaf must be a URI starting with http://"
 msgstr ""
 
-#: ../lib/plugin/FoafViewer.php:130
+#: ../lib/plugin/FoafViewer.php:147
 msgid "Title"
 msgstr "Titel"
 
@@ -3134,7 +3133,7 @@
 msgstr "Fehler beim Aufruf der Seite %s: Rekursion (sich selbst aufrufend)"
 
 #: ../lib/plugin/FrameInclude.php:112 ../lib/plugin/SemanticSearch.php:291
-#: ../lib/plugin/TeX2png.php:216 ../lib/plugin/text2png.php:87
+#: ../lib/plugin/TeX2png.php:232 ../lib/plugin/text2png.php:87
 #: ../lib/plugin/text2png.php:173
 #, php-format
 msgid "See %s"
@@ -3199,17 +3198,17 @@
 msgid "Sound Score"
 msgstr "Aussprachliche"
 
-#: ../lib/plugin/GoTo.php:18
+#: ../lib/plugin/GoTo.php:37
 msgid "GoTo"
 msgstr "GeheZu"
 
-#: ../lib/plugin/GoTo.php:22
+#: ../lib/plugin/GoTo.php:41
 msgid "Go to or create page."
 msgstr "Gehe zu oder erzeuge diese Seite."
 
-#: ../lib/plugin/GoTo.php:64 ../lib/plugin/WikiAdminSelect.php:135
+#: ../lib/plugin/GoTo.php:83 ../lib/plugin/WikiAdminSelect.php:135
 #: ../lib/plugin/WikiAdminSelect.php:146
-#: ../themes/MonoBook/templates/navbar.tmpl:32
+#: ../themes/MonoBook/templates/navbar.tmpl:33
 msgid "Go"
 msgstr "Los"
 
@@ -3313,40 +3312,45 @@
 msgid "Include text from another wiki page."
 msgstr "Text von einer andere Seite einfügen."
 
-#: ../lib/plugin/IncludePage.php:89 ../lib/plugin/IncludePage.php:124
-#: ../lib/plugin/ListSubpages.php:99 ../lib/plugin/Template.php:163
-#: ../lib/plugin/UnfoldSubpages.php:107 ../lib/plugin/UnfoldSubpages.php:130
+#: ../lib/plugin/IncludePage.php:89 ../lib/plugin/IncludePage.php:129
+#: ../lib/plugin/ListSubpages.php:99 ../lib/plugin/Template.php:168
+#: ../lib/plugin/UnfoldSubpages.php:105 ../lib/plugin/UnfoldSubpages.php:135
 #, php-format
 msgid "recursive inclusion of page %s ignored"
 msgstr "Fehler beim Einfügen der Seite %s: rekursiver Selbstaufruf ignoriert"
 
 #: ../lib/plugin/IncludePage.php:95 ../lib/plugin/Template.php:133
-#: ../lib/plugin/UnfoldSubpages.php:114 ../lib/plugin/UnfoldSubpages.php:138
 #, fuzzy, php-format
+msgid "Page '%s' does not exist"
+msgstr "Gruppenseite »%s« existiert nicht"
+
+#: ../lib/plugin/IncludePage.php:100 ../lib/plugin/Template.php:138
+#: ../lib/plugin/UnfoldSubpages.php:112 ../lib/plugin/UnfoldSubpages.php:143
+#, fuzzy, php-format
 msgid "Illegal inclusion of page %s: no read access"
 msgstr "Fehler beim Einfügen der Seite %s: rekursiver Selbstaufruf ignoriert"
 
-#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/PageGroup.php:129
-#: ../lib/plugin/Template.php:141
+#: ../lib/plugin/IncludePage.php:108 ../lib/plugin/PageGroup.php:129
+#: ../lib/plugin/Template.php:146
 #, php-format
 msgid "%s(%d): no such revision"
 msgstr "%s(%d): keine solche Version"
 
-#: ../lib/plugin/IncludePage.php:153
+#: ../lib/plugin/IncludePage.php:158
 #, php-format
 msgid "Included from %s"
 msgstr "Eingefügter Text von %s"
 
-#: ../lib/plugin/IncludePage.php:178
+#: ../lib/plugin/IncludePage.php:183
 #, php-format
 msgid " ... first %d lines"
 msgstr " ... erste %d Zeilen"
 
-#: ../lib/plugin/IncludePages.php:37
+#: ../lib/plugin/IncludePages.php:35
 msgid "IncludePages"
 msgstr "SeitenEinfügen"
 
-#: ../lib/plugin/IncludePages.php:41
+#: ../lib/plugin/IncludePages.php:39
 msgid "Include multiple pages."
 msgstr "Füge mehrere Seiten ein."
 
@@ -3383,11 +3387,11 @@
 
 #: ../lib/plugin/InterWikiSearch.php:93 ../lib/plugin/RecentChanges.php:799
 #: ../lib/plugin/SemanticSearchAdvanced.php:111
-#: ../themes/Crao/templates/navbar.tmpl:42
-#: ../themes/Crao/templates/navbar.tmpl:44
-#: ../themes/Crao/templates/navbar.tmpl:48
-#: ../themes/MonoBook/templates/navbar.tmpl:26
-#: ../themes/Sidebar/templates/navbar.tmpl:32
+#: ../themes/Crao/templates/navbar.tmpl:43
+#: ../themes/Crao/templates/navbar.tmpl:45
+#: ../themes/Crao/templates/navbar.tmpl:49
+#: ../themes/MonoBook/templates/navbar.tmpl:27
+#: ../themes/Sidebar/templates/navbar.tmpl:33
 #: ../themes/Sidebar/templates/search.tmpl:9
 #: ../themes/Sidebar/templates/search.tmpl:18
 #: ../themes/Sidebar/templates/search.tmpl:30
@@ -3397,11 +3401,11 @@
 msgid "Search"
 msgstr "Suche"
 
-#: ../lib/plugin/JabberPresence.php:23
+#: ../lib/plugin/JabberPresence.php:43
 msgid "JabberPresence"
 msgstr "JabberAnwesend"
 
-#: ../lib/plugin/JabberPresence.php:27
+#: ../lib/plugin/JabberPresence.php:47
 msgid "Simple jabber presence plugin"
 msgstr "Einfaches Jabber-Anwesenheits Zusatzprogramm"
 
@@ -3428,11 +3432,11 @@
 # "ÄhnlicheSeiten" (LikePages sind keine SamePages; die korrekte
 # deutsche Übersetzung ist "ÄhnlicheSeiten" which would be the best.
 # Or in case "Ä" doesn't work as a WikiWord, then use "VergleichbareSeiten".
-#: ../lib/plugin/LikePages.php:32 ../themes/Crao/templates/navbar.tmpl:16
-#: ../themes/Portland/templates/navbar.tmpl:7
-#: ../themes/Wordpress/templates/actionbar.tmpl:91
+#: ../lib/plugin/LikePages.php:32 ../themes/Crao/templates/navbar.tmpl:17
+#: ../themes/Portland/templates/navbar.tmpl:8
+#: ../themes/Wordpress/templates/actionbar.tmpl:93
 #: ../themes/default/templates/navbar.tmpl:20
-#: ../themes/smaller/templates/navbar.tmpl:15
+#: ../themes/smaller/templates/navbar.tmpl:16
 #: ../themes/wikilens/templates/navbar.tmpl:21
 msgid "LikePages"
 msgstr "ÄhnlicheSeiten"
@@ -3681,11 +3685,11 @@
 msgid "Visited pages on this wiki, ordered by popularity:"
 msgstr "Die besuchten Seiten dieses Wikis, nach Popularität geordnet:"
 
-#: ../lib/plugin/NewPagesPerUser.php:19
+#: ../lib/plugin/NewPagesPerUser.php:35
 msgid "NewPagesPerUser"
 msgstr ""
 
-#: ../lib/plugin/NewPagesPerUser.php:23
+#: ../lib/plugin/NewPagesPerUser.php:39
 msgid "List all new pages per month per user"
 msgstr "Liste aller neuen Seiten pro Monat und Benutzer"
 
@@ -3725,16 +3729,16 @@
 msgid "Orphaned Pages in this wiki (%d total):"
 msgstr "Verwaiste Seiten in diesem Wiki (%d gesamt):"
 
-#: ../lib/plugin/PageDump.php:39
+#: ../lib/plugin/PageDump.php:59
 msgid "View a single page dump online."
 msgstr "Betrachte das interne Speicherformat einer einzelnen Seite."
 
-#: ../lib/plugin/PageDump.php:65
+#: ../lib/plugin/PageDump.php:85
 #, php-format
 msgid "Page %s not found."
 msgstr "Seite %s nicht gefunden."
 
-#: ../lib/plugin/PageDump.php:134
+#: ../lib/plugin/PageDump.php:154
 msgid "Download for CVS"
 msgstr "Für CVS herunterladen."
 
@@ -3749,7 +3753,7 @@
 # formatted for general backup purposes.
 # English text is poor here but it must be concise enough to fit
 # inside a button.
-#: ../lib/plugin/PageDump.php:139
+#: ../lib/plugin/PageDump.php:159
 msgid "Download for backup"
 msgstr "Für Backup herunterladen"
 
@@ -3764,43 +3768,43 @@
 # formatted for general backup purposes.
 # English text is poor here but it must be concise enough to fit
 # inside a button.
-#: ../lib/plugin/PageDump.php:145
+#: ../lib/plugin/PageDump.php:165
 msgid "Download all revisions for backup"
 msgstr "Alle Versionen für Backup herunterladen"
 
 # "Page dump" (Speicherauszug?) den WikiQuelltext von (Seitenname)
-#: ../lib/plugin/PageDump.php:148
+#: ../lib/plugin/PageDump.php:168
 #, php-format
 msgid "Preview: Page dump of %s"
 msgstr "Vorschau: Seitendump von %s"
 
-#: ../lib/plugin/PageDump.php:155
+#: ../lib/plugin/PageDump.php:175
 msgid ""
 "(formatted for PhpWiki developers as pgsrc template, not for backing up)"
 msgstr ""
 "(formatiert für die PhpWiki Entwickler als pgsrc Vorlage, nicht zum Backup)"
 
-#: ../lib/plugin/PageDump.php:158 ../lib/plugin/PageDump.php:178
+#: ../lib/plugin/PageDump.php:178 ../lib/plugin/PageDump.php:198
 msgid "Preview as normal format"
 msgstr "Vorschau als normales Format"
 
-#: ../lib/plugin/PageDump.php:164 ../lib/plugin/PageDump.php:191
+#: ../lib/plugin/PageDump.php:184 ../lib/plugin/PageDump.php:211
 msgid "Preview as backup format"
 msgstr "Vorschau als Backupformat"
 
-#: ../lib/plugin/PageDump.php:168
+#: ../lib/plugin/PageDump.php:188
 msgid "(formatted for backing up: all revisions)"
 msgstr "(formatiert zum Backup: Alle Versionen)"
 
-#: ../lib/plugin/PageDump.php:172 ../lib/plugin/PageDump.php:185
+#: ../lib/plugin/PageDump.php:192 ../lib/plugin/PageDump.php:205
 msgid "Preview as developer format"
 msgstr "Vorschau im Entwickler Format"
 
-#: ../lib/plugin/PageDump.php:181
+#: ../lib/plugin/PageDump.php:201
 msgid "(normal formatting: latest revision only)"
 msgstr "(Normales Format: Nur aktuelle Version)"
 
-#: ../lib/plugin/PageDump.php:195
+#: ../lib/plugin/PageDump.php:215
 msgid ""
 "Please use one of the downloadable versions rather than copying and pasting "
 "from the above preview."
@@ -3808,19 +3812,19 @@
 "Verwenden Sie bitte eine der herunterladbaren Versionen als von der obigen "
 "Vorschau zu Kopieren und Einzufügen."
 
-#: ../lib/plugin/PageDump.php:197
+#: ../lib/plugin/PageDump.php:217
 msgid ""
 "The wordwrap of the preview doesn't take nested markup or list indentation "
 "into consideration!"
 msgstr ""
 
-#: ../lib/plugin/PageDump.php:200
+#: ../lib/plugin/PageDump.php:220
 msgid ""
 "PhpWiki developers should manually inspect the downloaded file for nested "
 "markup before rewrapping with emacs and checking into CVS."
 msgstr ""
 
-#: ../lib/plugin/PageDump.php:208 ../lib/plugin/PasswordReset.php:135
+#: ../lib/plugin/PageDump.php:228 ../lib/plugin/PasswordReset.php:135
 #: ../lib/plugin/SemanticSearch.php:288
 #: ../lib/plugin/SemanticSearchAdvanced.php:146
 msgid "Warning:"
@@ -3840,7 +3844,7 @@
 msgid "Contents"
 msgstr "Inhalt"
 
-#: ../lib/plugin/PageGroup.php:92 ../lib/stdlib.php:2185
+#: ../lib/plugin/PageGroup.php:92 ../lib/stdlib.php:2186
 #, php-format
 msgid "<%s: no such section>"
 msgstr "<%s: unbekannte Sektion>"
@@ -3886,19 +3890,18 @@
 #: ../lib/plugin/PageHistory.php:128 ../lib/plugin/PageHistory.php:269
 #: ../lib/plugin/PageHistory.php:323 ../lib/plugin/RecentChanges.php:95
 #: ../themes/Crao/templates/actionbar.tmpl:26
-#: ../themes/MonoBook/templates/actionbar.tmpl:42
-#: ../themes/MonoBook/templates/info.tmpl:185
-#: ../themes/Portland/templates/actionbar.tmpl:14
-#: ../themes/Portland/templates/viewsource.tmpl:25
+#: ../themes/MonoBook/templates/actionbar.tmpl:43
+#: ../themes/MonoBook/templates/info.tmpl:186
+#: ../themes/Portland/templates/actionbar.tmpl:15
+#: ../themes/Portland/templates/viewsource.tmpl:26
 #: ../themes/Sidebar/templates/actionbar.tmpl:27
 #: ../themes/Sidebar/templates/actionbar.tmpl:58
-#: ../themes/Wordpress/templates/actionbar.tmpl:70
-#: ../themes/Wordpress/templates/viewsource.tmpl:29
+#: ../themes/Wordpress/templates/actionbar.tmpl:72
+#: ../themes/Wordpress/templates/viewsource.tmpl:30
 #: ../themes/default/templates/actionbar.tmpl:34
-#: ../themes/gforge/templates/info.tmpl:9
-#: ../themes/shamino_com/templates/actionbar.tmpl:20
+#: ../themes/shamino_com/templates/actionbar.tmpl:22
 #: ../themes/smaller/templates/actionbar.tmpl:39
-#: ../themes/smaller/templates/info.tmpl:6
+#: ../themes/smaller/templates/info.tmpl:9
 msgid "PageHistory"
 msgstr "SeitenProtokoll"
 
@@ -3909,13 +3912,13 @@
 
 #: ../lib/plugin/PageHistory.php:187 ../lib/plugin/RecentChanges.php:469
 #: ../themes/MacOSX/lib/RecentChanges.php:34
-#: ../themes/MonoBook/templates/info.tmpl:19
-#: ../themes/MonoBook/templates/info.tmpl:23
+#: ../themes/MonoBook/templates/info.tmpl:20
+#: ../themes/MonoBook/templates/info.tmpl:24
 #: ../themes/Portland/lib/RecentChanges.php:14
 #: ../themes/SpaceWiki/lib/RecentChanges.php:35
 #: ../themes/Wordpress/lib/RecentChanges.php:14
-#: ../themes/default/templates/info.tmpl:17
-#: ../themes/default/templates/info.tmpl:21
+#: ../themes/default/templates/info.tmpl:18
+#: ../themes/default/templates/info.tmpl:22
 msgid "minor edit"
 msgstr "geringfügige"
 
@@ -3929,12 +3932,12 @@
 msgstr "Das Änderungsprotokoll für %s auflisten"
 
 #: ../lib/plugin/PageInfo.php:32 ../themes/Crao/templates/actionbar.tmpl:28
-#: ../themes/MonoBook/templates/actionbar.tmpl:76
-#: ../themes/Portland/templates/actionbar.tmpl:15
+#: ../themes/MonoBook/templates/actionbar.tmpl:77
+#: ../themes/Portland/templates/actionbar.tmpl:16
 #: ../themes/Sidebar/templates/actionbar.tmpl:56
-#: ../themes/Wordpress/templates/actionbar.tmpl:72
+#: ../themes/Wordpress/templates/actionbar.tmpl:74
 #: ../themes/default/templates/actionbar.tmpl:36
-#: ../themes/shamino_com/templates/actionbar.tmpl:5
+#: ../themes/shamino_com/templates/actionbar.tmpl:7
 msgid "PageInfo"
 msgstr "SeitenInfo"
 
@@ -4152,13 +4155,13 @@
 msgid "Arguments"
 msgstr "Parameter"
 
-#: ../lib/plugin/PluginManager.php:114
+#: ../lib/plugin/PluginManager.php:112
 #, php-format
 msgid "%s does not appear to be a WikiPlugin."
 msgstr "%s scheint kein Zusatzprogramm zu sein."
 
-#: ../lib/plugin/PluginManager.php:126 ../lib/plugin/PluginManager.php:128
-#: ../lib/upgrade.php:215 ../themes/MonoBook/templates/navbar.tmpl:20
+#: ../lib/plugin/PluginManager.php:124 ../lib/plugin/PluginManager.php:126
+#: ../lib/upgrade.php:215 ../themes/MonoBook/templates/navbar.tmpl:21
 msgid "Help"
 msgstr "Hilfe"
 
@@ -4215,31 +4218,31 @@
 msgid "Topic"
 msgstr "Thema"
 
-#: ../lib/plugin/PreferenceApp.php:34
+#: ../lib/plugin/PreferenceApp.php:53
 #, fuzzy
 msgid "PreferenceApp"
 msgstr "Voreinstellungen"
 
-#: ../lib/plugin/PreferenceApp.php:38
+#: ../lib/plugin/PreferenceApp.php:57
 msgid "Analyzes preferences based on voting budget and ratings."
 msgstr "Analysiere Empfehlungen auf Grund von Bewertungen."
 
-#: ../lib/plugin/PreferenceApp.php:111
+#: ../lib/plugin/PreferenceApp.php:130
 #, php-format
 msgid "Nobody has used %s on their homepage"
 msgstr ""
 
-#: ../lib/plugin/PreferenceApp.php:184
+#: ../lib/plugin/PreferenceApp.php:203
 #, fuzzy
 msgid "Total Units"
 msgstr "Anzahl aller Seitenaufrufe %d"
 
-#: ../lib/plugin/PreferenceApp.php:187
+#: ../lib/plugin/PreferenceApp.php:206
 #, fuzzy
 msgid "Total Voters"
 msgstr "%d Benutzeroberfläche gesamt: "
 
-#: ../lib/plugin/PreferenceApp.php:258
+#: ../lib/plugin/PreferenceApp.php:277
 msgid "Total Budget"
 msgstr ""
 
@@ -4270,7 +4273,7 @@
 msgstr ""
 
 #: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:82
-#: ../themes/MonoBook/templates/navbar.tmpl:19
+#: ../themes/MonoBook/templates/navbar.tmpl:20
 #: ../themes/gforge/templates/navbar.tmpl:13
 msgid "RandomPage"
 msgstr "ZufallsSeite"
@@ -4383,18 +4386,18 @@
 # Änderungen"; in terms of newspapers or journalism it's traditionally
 # "NeuesteNachrichten" or much more better "DasNeueste").
 #: ../lib/plugin/RecentChanges.php:59
-#: ../themes/MonoBook/templates/navbar.tmpl:17
-#: ../themes/Sidebar/templates/navbar.tmpl:45
+#: ../themes/MonoBook/templates/navbar.tmpl:18
+#: ../themes/Sidebar/templates/navbar.tmpl:46
 #, fuzzy
 msgid "RecentNewPages"
 msgstr "NeuesteÄnderungen"
 
 # KleineÄnderungen?
 #: ../lib/plugin/RecentChanges.php:61 ../lib/plugin/RecentChanges.php:386
-#: ../lib/plugin/RecentChanges.php:675 ../lib/plugin/RecentEdits.php:10
-#: ../lib/plugin/RecentEdits.php:40 ../lib/plugin/RelatedChanges.php:27
-#: ../themes/Portland/templates/editpage.tmpl:42
-#: ../themes/Wordpress/templates/editpage.tmpl:57
+#: ../lib/plugin/RecentChanges.php:675 ../lib/plugin/RecentEdits.php:29
+#: ../lib/plugin/RecentEdits.php:59 ../lib/plugin/RelatedChanges.php:46
+#: ../themes/Portland/templates/editpage.tmpl:43
+#: ../themes/Wordpress/templates/editpage.tmpl:58
 msgid "RecentEdits"
 msgstr "GeringfügigeÄnderungen"
 
@@ -4435,7 +4438,7 @@
 msgstr "Kleinere Änderungen"
 
 #: ../lib/plugin/RecentChanges.php:276 ../lib/plugin/RecentChanges.php:378
-#: ../lib/plugin/RecentComments.php:37
+#: ../lib/plugin/RecentComments.php:56
 msgid "Recent Comments"
 msgstr "Neueste Kommentare"
 
@@ -4516,7 +4519,7 @@
 msgid "All %s are listed below."
 msgstr "Alle %s sind unten aufgelistet."
 
-#: ../lib/plugin/RecentChanges.php:379 ../lib/plugin/RecentComments.php:72
+#: ../lib/plugin/RecentChanges.php:379 ../lib/plugin/RecentComments.php:91
 msgid "No comments found"
 msgstr "Keine Kommentare gefunden."
 
@@ -4564,7 +4567,7 @@
 msgstr ""
 
 #: ../lib/plugin/RecentChanges.php:1451
-#: ../themes/MonoBook/templates/navbar.tmpl:77
+#: ../themes/MonoBook/templates/navbar.tmpl:78
 #, fuzzy
 msgid "All pages"
 msgstr "Alle Seiten"
@@ -4606,34 +4609,34 @@
 msgid "New pages only"
 msgstr "Neue Seite"
 
-#: ../lib/plugin/RecentComments.php:17 ../lib/plugin/RecentComments.php:43
-#: ../themes/MonoBook/templates/navbar.tmpl:16
+#: ../lib/plugin/RecentComments.php:36 ../lib/plugin/RecentComments.php:62
+#: ../themes/MonoBook/templates/navbar.tmpl:17
 msgid "RecentComments"
 msgstr "NeuesteKommentare"
 
-#: ../lib/plugin/RecentComments.php:21
+#: ../lib/plugin/RecentComments.php:40
 msgid "List basepages with recently added comments."
 msgstr ""
 
-#: ../lib/plugin/RecentComments.php:98
+#: ../lib/plugin/RecentComments.php:117
 msgid "latest comment by "
 msgstr "Letzter Kommentar von "
 
-#: ../lib/plugin/RecentEdits.php:14
+#: ../lib/plugin/RecentEdits.php:33
 #, fuzzy
 msgid "List all recent edits in this wiki."
 msgstr "Alle Seiten in diesem Wiki auflisten."
 
 # KleineÄnderungen?
-#: ../lib/plugin/RecentEdits.php:40
+#: ../lib/plugin/RecentEdits.php:59
 msgid "Recent Edits"
 msgstr "Geringfügige Änderungen"
 
-#: ../lib/plugin/RecentReferrers.php:14
+#: ../lib/plugin/RecentReferrers.php:33
 msgid "RecentReferrers"
 msgstr ""
 
-#: ../lib/plugin/RecentReferrers.php:18
+#: ../lib/plugin/RecentReferrers.php:37
 msgid...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[7277] trunk/lib/plugin/IncludePages.php

From: <var...@us...> - 2009-11-21 15:19:11

Revision: 7277
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7277&view=rev
Author:   vargenau
Date:     2009-11-21 15:19:00 +0000 (Sat, 21 Nov 2009)

Log Message:
-----------
RedirectTo is done

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

Modified: trunk/lib/plugin/IncludePages.php
===================================================================
--- trunk/lib/plugin/IncludePages.php	2009-11-21 15:18:27 UTC (rev 7276)
+++ trunk/lib/plugin/IncludePages.php	2009-11-21 15:19:00 UTC (rev 7277)
@@ -24,8 +24,6 @@
  * IncludePages: Include a list of multiple pages, based on IncludePage.
  * usage:   <?plugin IncludePages pages=<!plugin-list BackLinks !> ?>
  * author:  ReiniUrban
- * 
- * Todo: follow RedirectTo
  */
 
 include_once("lib/plugin/IncludePage.php");


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7276] trunk/lib/plugin/UnfoldSubpages.php

From: <var...@us...> - 2009-11-21 15:18:39

Revision: 7276
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7276&view=rev
Author:   vargenau
Date:     2009-11-21 15:18:27 +0000 (Sat, 21 Nov 2009)

Log Message:
-----------
Follow redirects even when page name contains spaces

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

Modified: trunk/lib/plugin/UnfoldSubpages.php
===================================================================
--- trunk/lib/plugin/UnfoldSubpages.php	2009-11-21 15:02:06 UTC (rev 7275)
+++ trunk/lib/plugin/UnfoldSubpages.php	2009-11-21 15:18:27 UTC (rev 7276)
@@ -27,8 +27,6 @@
  *	      The section extractor is currently quite unstable.
  * Usage:   <?plugin UnfoldSubpages sortby=-mtime words=50 maxpages=5 ?>
  * Author:  Reini Urban <ru...@x-...>
- * 
- * Todo: follow RedirectTo
  */
 
 require_once("lib/PageList.php");
@@ -120,9 +118,16 @@
                 $r = $page->getCurrentRevision();
                 $c = $r->getContent();   // array of lines
                 // follow redirects
-                if (preg_match('/<'.'\?plugin\s+RedirectTo\s+page=(\w+)\s+\?'.'>/', 
-                               implode("\n", $c), $m)) 
+                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))
+                  or (preg_match('/<<\s*RedirectTo\s+page=(\S+)\s*>>/', implode("\n", $c), $m))
+                  or (preg_match('/<<\s*RedirectTo\s+page="(.*?)"\s*>>/', implode("\n", $c), $m)))
                 {
+                    // Strip quotes (simple or double) from page name if any
+                    if ((string_starts_with($m[1], "'"))
+                      or (string_starts_with($m[1], "\""))) {
+                        $m[1] = substr($m[1], 1, -1);
+                    }
                     // trap recursive redirects
                     if (in_array($m[1], $included_pages)) {
                     	if (!$quiet)


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7275] trunk/lib/plugin/UnfoldSubpages.php

From: <var...@us...> - 2009-11-21 15:02:24

Revision: 7275
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7275&view=rev
Author:   vargenau
Date:     2009-11-21 15:02:06 +0000 (Sat, 21 Nov 2009)

Log Message:
-----------
Avoid "Undefined variable" notice

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

Modified: trunk/lib/plugin/UnfoldSubpages.php
===================================================================
--- trunk/lib/plugin/UnfoldSubpages.php	2009-11-20 17:50:59 UTC (rev 7274)
+++ trunk/lib/plugin/UnfoldSubpages.php	2009-11-21 15:02:06 UTC (rev 7275)
@@ -170,7 +170,7 @@
                                                      false, $ct)));
             }
         }
-        if (! $cpagename ) {
+        if (! isset($cpagename)) {
             return $this->error(sprintf(_("%s has no subpages defined."), $pagename));
         }
         return $content;


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

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

From: <var...@us...> - 2009-11-20 17:51:07

Revision: 7274
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7274&view=rev
Author:   vargenau
Date:     2009-11-20 17:50:59 +0000 (Fri, 20 Nov 2009)

Log Message:
-----------
Add Wikicreole syntax for extractSections

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

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2009-11-20 17:34:19 UTC (rev 7273)
+++ trunk/lib/stdlib.php	2009-11-20 17:50:59 UTC (rev 7274)
@@ -2194,7 +2194,7 @@
 
     while ($sections > 0) {
 
-        if (preg_match("/ ^(!{1,})\\s*(.*)\\n"   // section header
+        if (preg_match("/ ^(!{1,}|={2,})\\s*(.*)\\n"   // section header
                        . "  \\s*$\\n?"           // possible blank lines
                        . "  ( (?: ^.*\\n? )*? )" // some lines
                        . "  ( ^\\1 (.|\\n)* | \\Z)/xm", // sec header (same or higher level) (or EOF)


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

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

From: <var...@us...> - 2009-11-20 17:34:29

Revision: 7273
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7273&view=rev
Author:   vargenau
Date:     2009-11-20 17:34:19 +0000 (Fri, 20 Nov 2009)

Log Message:
-----------
Wikicreole syntax

Modified Paths:
--------------
    trunk/pgsrc/HomePageAlias

Modified: trunk/pgsrc/HomePageAlias
===================================================================
--- trunk/pgsrc/HomePageAlias	2009-11-20 17:32:02 UTC (rev 7272)
+++ trunk/pgsrc/HomePageAlias	2009-11-20 17:34:19 UTC (rev 7273)
@@ -1,4 +1,4 @@
-Date: Thu, 26 Mar 2009 11:34:32 +0000
+Date: Fri, 20 Nov 2009 18:33:12 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -10,4 +10,4 @@
 
 <<RedirectTo page=HomePage>>
 
-(This is a demonstration of the [RedirectTo|Help:RedirectToPlugin] plugin.)
+(This is a demonstration of the [[Help:RedirectToPlugin|RedirectTo]] plugin.)


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

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

From: <var...@us...> - 2009-11-20 17:32:15

Revision: 7272
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7272&view=rev
Author:   vargenau
Date:     2009-11-20 17:32:02 +0000 (Fri, 20 Nov 2009)

Log Message:
-----------
Update "Known bugs" section

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

Modified: trunk/pgsrc/Help%2FIncludePagePlugin
===================================================================
--- trunk/pgsrc/Help%2FIncludePagePlugin	2009-11-20 17:09:23 UTC (rev 7271)
+++ trunk/pgsrc/Help%2FIncludePagePlugin	2009-11-20 17:32:02 UTC (rev 7272)
@@ -1,4 +1,4 @@
-Date: Mon,  1 Jun 2009 15:05:05 +0000
+Date: Fri, 20 Nov 2009 18:30:13 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -82,9 +82,9 @@
 
 == Known bugs
 
-* [[Help:RedirectToPlugin|~RedirectTo]] plugin is not handled correctly.
 * Line and word limit doesn't work if the included page itself includes a plugin.
-* "sections" parameter does not work if sections to include are in Wikicreole syntax
+* "sections" parameter does not work if sections to include are in Wikicreole syntax.
+* "section" parameter does not always work if sections to include use both Wikicreole/Mediawiki and classic Phpwiki syntax.
 
 == Authors
 


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

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

From: <var...@us...> - 2009-11-20 17:09:36

Revision: 7271
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7271&view=rev
Author:   vargenau
Date:     2009-11-20 17:09:23 +0000 (Fri, 20 Nov 2009)

Log Message:
-----------
Make extractSection work with Mediawiki syntax (trailing ='s)

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

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2009-11-20 16:58:11 UTC (rev 7270)
+++ trunk/lib/stdlib.php	2009-11-20 17:09:23 UTC (rev 7271)
@@ -2167,7 +2167,7 @@
 function extractSection ($section, $content, $page, $quiet = false, $sectionhead = false) {
     $qsection = preg_replace('/\s+/', '\s+', preg_quote($section, '/'));
 
-    if (preg_match("/ ^(!{1,}|={2,})\\s*$qsection" // section header
+    if (preg_match("/ ^(!{1,}|={2,})\\s*$qsection\s*=*" // section header
                    . "  \\s*$\\n?"           // possible blank lines
                    . "  ( (?: ^.*\\n? )*? )" // some lines
                    . "  (?= ^\\1 | \\Z)/xm", // sec header (same or higher level) (or EOF)


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

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

From: <var...@us...> - 2009-11-20 16:58:17

Revision: 7270
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7270&view=rev
Author:   vargenau
Date:     2009-11-20 16:58:11 +0000 (Fri, 20 Nov 2009)

Log Message:
-----------
Check if page to include exists

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

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2009-11-20 16:37:58 UTC (rev 7269)
+++ trunk/lib/plugin/IncludePage.php	2009-11-20 16:58:11 UTC (rev 7270)
@@ -90,9 +90,14 @@
                                         $page));
         }
 
+        // Check if page exists
+        if (!($dbi->isWikiPage($page))) {
+            return $this->error(sprintf(_("Page '%s' does not exist"), $page));
+        }
+
         // 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));
         }
         
@@ -124,8 +129,8 @@
                 return $this->error(sprintf(_("recursive inclusion of page %s ignored"),
                                                 $page.' => '.$m[1]));
             }
-	    $page = $m[1];
-	    $p = $dbi->getPage($page);
+            $page = $m[1];
+            $p = $dbi->getPage($page);
             $r = $p->getCurrentRevision();
             $c = $r->getContent();   // array of lines
         }

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2009-11-20 16:37:58 UTC (rev 7269)
+++ trunk/lib/plugin/Template.php	2009-11-20 16:58:11 UTC (rev 7270)
@@ -128,6 +128,11 @@
                                         $page));
         }
 
+        // Check if page exists
+        if (!($dbi->isWikiPage($page))) {
+            return $this->error(sprintf(_("Page '%s' does not exist"), $page));
+        }
+
         // 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"),


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

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

From: <var...@us...> - 2009-11-20 16:38:08

Revision: 7269
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7269&view=rev
Author:   vargenau
Date:     2009-11-20 16:37:58 +0000 (Fri, 20 Nov 2009)

Log Message:
-----------
Follow redirects even when page name contains spaces

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

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2009-11-20 12:09:00 UTC (rev 7268)
+++ trunk/lib/plugin/IncludePage.php	2009-11-20 16:37:58 UTC (rev 7269)
@@ -109,10 +109,10 @@
         $c = $r->getContent();
         
         // follow redirects
-        if ((preg_match('/<'.'\?plugin\s+RedirectTo\s+page=(\S+)\s*\?'.'>/', 
-                       implode("\n", $c), $m))
-          or (preg_match('/<<\s*RedirectTo\s+page=(\S+)\s*>>/',
-                       implode("\n", $c), $m)))
+        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))
+          or (preg_match('/<<\s*RedirectTo\s+page=(\S+)\s*>>/', implode("\n", $c), $m))
+          or (preg_match('/<<\s*RedirectTo\s+page="(.*?)"\s*>>/', implode("\n", $c), $m)))
         {
             // Strip quotes (simple or double) from page name if any
             if ((string_starts_with($m[1], "'"))

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2009-11-20 12:09:00 UTC (rev 7268)
+++ trunk/lib/plugin/Template.php	2009-11-20 16:37:58 UTC (rev 7269)
@@ -148,10 +148,10 @@
 
         $content = $r->getContent();
         // follow redirects
-        if ((preg_match('/<'.'\?plugin\s+RedirectTo\s+page=(\S+)\s*\?'.'>/',
-                       implode("\n", $content), $m))
-          or (preg_match('/<<\s*RedirectTo\s+page=(\S+)\s*>>/',
-                       implode("\n", $content), $m)))
+        if ((preg_match('/<'.'\?plugin\s+RedirectTo\s+page=(\S+)\s*\?'.'>/', implode("\n", $content), $m))
+          or (preg_match('/<'.'\?plugin\s+RedirectTo\s+page=(.*?)\s*\?'.'>/', implode("\n", $content), $m))
+          or (preg_match('/<<\s*RedirectTo\s+page=(\S+)\s*>>/', implode("\n", $content), $m))
+          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], "'")) 


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

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

From: <var...@us...> - 2009-11-20 12:09:11

Revision: 7268
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7268&view=rev
Author:   vargenau
Date:     2009-11-20 12:09:00 +0000 (Fri, 20 Nov 2009)

Log Message:
-----------
Setting NUM_SPAM_LINKS to 0 will disable the check

Modified Paths:
--------------
    trunk/config/config-dist.ini
    trunk/lib/editpage.php

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2009-11-12 08:47:58 UTC (rev 7267)
+++ trunk/config/config-dist.ini	2009-11-20 12:09:00 UTC (rev 7268)
@@ -96,6 +96,7 @@
 
 ; If more than this number of external links appear on non-authenticated 
 ; edits it will be rejected as spam.
+; Setting NUM_SPAM_LINKS to 0 will disable the check.
 ;NUM_SPAM_LINKS = 20
 
 ; By setting DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS to true, you get

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2009-11-12 08:47:58 UTC (rev 7267)
+++ trunk/lib/editpage.php	2009-11-20 12:09:00 UTC (rev 7268)
@@ -407,7 +407,8 @@
      * Need to check dynamically some blacklist wikipage settings 
      * (plugin WikiAccessRestrictions) and some static blacklist.
      * DONE: 
-     *   Always: More then 20 new external links
+     *   More than NUM_SPAM_LINKS (default: 20) new external links. 
+     *        Disabled if NUM_SPAM_LINKS is 0
      *   ENABLE_SPAMASSASSIN:  content patterns by babycart (only php >= 4.3 for now)
      *   ENABLE_SPAMBLOCKLIST: content domain blacklist
      */
@@ -422,8 +423,8 @@
         // FIXME: in longer texts the NUM_SPAM_LINKS number should be increased.
         //        better use a certain text : link ratio.
 
-        // 1. Not more then 20 new external links
-        if ($newlinks >= NUM_SPAM_LINKS)
+        // 1. Not more than NUM_SPAM_LINKS (default: 20) new external links
+        if ((NUM_SPAM_LINKS > 0) and ($newlinks >= NUM_SPAM_LINKS))
         {
             // Allow strictly authenticated users?
             // TODO: mail the admin?


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

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

Flat | Threaded

<< < 1 .. 155 156 157 158 159 .. 538 > >> (Page 157 of 538)