phpwiki-checkins Mailing List for PhpWiki (Page 159)

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 .. 157 158 159 160 161 .. 538 > >> (Page 159 of 538)

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

From: <var...@us...> - 2009-10-29 08:59:37

Revision: 7242
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7242&view=rev
Author:   vargenau
Date:     2009-10-29 08:59:30 +0000 (Thu, 29 Oct 2009)

Log Message:
-----------
Include "%" in width and height when size=xx%

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

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2009-10-28 17:22:54 UTC (rev 7241)
+++ trunk/lib/stdlib.php	2009-10-29 08:59:30 UTC (rev 7242)
@@ -467,7 +467,7 @@
         // We allow size=50% and size=20x30
         // We replace this with "width" and "height" HTML attributes
         elseif ($attr == "size") {
-            if (preg_match('/(\d+)%/', $value, $m)) {
+            if (preg_match('/(\d+%)/', $value, $m)) {
                 $link->setAttr('width',$m[1]);
                 $link->setAttr('height',$m[1]);
             } elseif (preg_match('/(\d+)x(\d+)/', $value, $m)) {


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

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

From: <var...@us...> - 2009-10-28 17:23:03

Revision: 7241
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7241&view=rev
Author:   vargenau
Date:     2009-10-28 17:22:54 +0000 (Wed, 28 Oct 2009)

Log Message:
-----------
Use interwiki to access guide

Modified Paths:
--------------
    trunk/themes/gforge/interwiki.map
    trunk/themes/gforge/pgsrc/UpLoad

Modified: trunk/themes/gforge/interwiki.map
===================================================================
--- trunk/themes/gforge/interwiki.map	2009-10-28 17:14:18 UTC (rev 7240)
+++ trunk/themes/gforge/interwiki.map	2009-10-28 17:22:54 UTC (rev 7241)
@@ -1,6 +1,7 @@
 Status Status
 Category Category
 Help /wiki/g/help/Help/
+Guide /help/guide/
 Relation SearchRelations?s=
 Talk %s/Discussion
 User %s

Modified: trunk/themes/gforge/pgsrc/UpLoad
===================================================================
--- trunk/themes/gforge/pgsrc/UpLoad	2009-10-28 17:14:18 UTC (rev 7240)
+++ trunk/themes/gforge/pgsrc/UpLoad	2009-10-28 17:22:54 UTC (rev 7241)
@@ -1,4 +1,4 @@
-Date: Thu, 26 Mar 2009 11:43:14 +0000
+Date: Wed, 28 Oct 2009 15:51:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20070828)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -16,7 +16,7 @@
 
 The uploaded files will be publicly accessible. They are stored in the Webdav subdirectory **www/uploads**. They can be used in the wiki, in the project web site and in blocks.
 
-If you want to delete an uploaded file, you have to access the Web DAV from your file browser (not your web browser). See [[http://acos.alcatel-lucent.com/help/guide/ug_extensions_webdav.html|explanations]].
+If you want to delete an uploaded file, you have to access the Web DAV from your file browser (not your web browser). See [[Guide:ug_extensions.html|explanations]].
 
 A link to the uploaded file will be displayed on this page. You can edit the page to remove the link if you like.
 


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

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

From: <var...@us...> - 2009-10-28 17:14:29

Revision: 7240
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7240&view=rev
Author:   vargenau
Date:     2009-10-28 17:14:18 +0000 (Wed, 28 Oct 2009)

Log Message:
-----------
Fix problem between MediawikiTable and CreateToc plugins

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

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2009-10-28 17:08:09 UTC (rev 7239)
+++ trunk/lib/plugin/CreateToc.php	2009-10-28 17:14:18 UTC (rev 7240)
@@ -2,7 +2,7 @@
 rcs_id('$Id$');
 /*
  Copyright 2004,2005 $ThePhpWikiProgrammingTeam
- Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent
+ Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
 
  This file is part of PhpWiki.
 
@@ -24,16 +24,18 @@
 /**
  * CreateToc:  Create a Table of Contents and automatically link to headers
  *
- * Usage:   
- *  <?plugin CreateToc arguments ?>
+ * Usage:
+ *  <<CreateToc arguments>>
  * @author:  Reini Urban, Marc-Etienne Vargenau
  *
- * Known problems: 
+ * Known problems:
  * - MacIE will not work with jshide.
  * - it will crash with old markup and Apache2 (?)
- * - Certain corner-edges will not work with TOC_FULL_SYNTAX. 
+ * - Certain corner-edges will not work with TOC_FULL_SYNTAX.
  *   I believe I fixed all of them now, but who knows?
  * - bug #969495 "existing labels not honored" seems to be fixed.
+ * - some constructs might incorrectly be recognized as a header
+ *   (e.g. lines starting with "!!!" or "==" inside <verbatim>)
  */
 
 if (!defined('TOC_FULL_SYNTAX'))
@@ -130,7 +132,7 @@
         return str_replace(array("/",".","?","*"),
     		           array('\/','\.','\?','\*'), $heading);
     }
-    
+
     // Get HTML header corresponding to current level (level is set of ! or =)
     function _getHeader($level) {
 
@@ -156,18 +158,18 @@
             $theading = TransformInline($heading);
             if ($theading)
                 return preg_quote($theading->asXML(), "/");
-            else 
+            else
                 return XmlContent::_quote(preg_quote($heading, "/"));
         } else {
             return XmlContent::_quote(preg_quote($heading, "/"));
         }
     }
-    
+
     /*
      * @param $hstart id (in $content) of heading start
      * @param $hend   id (in $content) of heading end
      */
-    function searchHeader ($content, $start_index, $heading, 
+    function searchHeader ($content, $start_index, $heading,
                            $level, &$hstart, &$hend, $basepage=false) {
         $hstart = 0;
         $hend = 0;
@@ -175,7 +177,7 @@
         $qheading = $this->_quote($heading);
     	for ($j=$start_index; $j < count($content); $j++) {
             if (is_string($content[$j])) {
-    		if (preg_match("/<$h>$qheading<\/$h>/", 
+    		if (preg_match("/<$h>$qheading<\/$h>/",
     		               $content[$j]))
     		    return $j;
             }
@@ -188,19 +190,19 @@
 		    $content[$j] = $content[$j]->asString();
 		// shortcut for single wikiword or link headers
 		if ($content[$j] == $heading
-		    and substr($content[$j-1],-4,4) == "<$h>" 
-		    and substr($content[$j+1],0,5) == "</$h>") 
+		    and substr($content[$j-1],-4,4) == "<$h>"
+		    and substr($content[$j+1],0,5) == "</$h>")
 		{
 		    $hstart = $j-1;
 		    $hend = $j+1;
 		    return $j; // single wikiword
-		} 
+		}
 		elseif (TOC_FULL_SYNTAX) {
 		    //DONE: To allow "!! WikiWord link" or !! http://anylink/
 		    // Check against joined content (after cached_plugininvocation).
 		    // The first link is the anchor then.
 		    if (preg_match("/<$h>(?!.*<\/$h>)/", $content[$j-1])) {
-			$hstart = $j-1;    	    	    
+			$hstart = $j-1;
 			$joined = '';
 			for ($k=max($j-1,$start_index);$k<count($content);$k++) {
 			    if (is_string($content[$k]))
@@ -237,18 +239,38 @@
         $anchors[$anchor] = $i;
         return $anchor;
     }
-    
+
+    // We have to find headers in both:
+    // - classic Phpwiki syntax (lines starting with "!", "!!" or "!!!")
+    // - Wikicreole syntax (lines starting with "==", "===", etc.)
+    // We must omit lines starting with "!" if inside a Mediawiki table
+    // (they represent a table header)
+    // Some constructs might incorrectly be recognized as a header
+    // (e.g. lines starting with "!!!" or "==" inside <verbatim>)
     // Feature request: proper nesting; multiple levels (e.g. 1,3)
-    function extractHeaders (&$content, &$markup, $backlink=0, 
+    function extractHeaders (&$content, &$markup, $backlink=0,
                              $counter=0, $levels=false, $firstlevelstyle='number', $basepage='')
     {
+
         if (!$levels) $levels = array(1,2);
-        $tocCounter = $this->_initTocCounter();        
+        $tocCounter = $this->_initTocCounter();
         reset($levels);
         sort($levels);
         $headers = array();
         $j = 0;
+        $insidetable = false;
         for ($i=0; $i<count($content); $i++) {
+            if (preg_match('/^\s*{\|/', $content[$i])) {
+               $insidetable = true;
+               continue;
+            }
+            if (preg_match('/^\s*\|}/', $content[$i])) {
+               $insidetable = false;
+               continue;
+            }
+            if ($insidetable) {
+               continue;
+            }
             foreach ($levels as $level) {
                 if ($level < 1 or $level > 5) continue;
                 $phpwikiclassiclevel = 4 -$level;
@@ -257,7 +279,7 @@
                 if ((preg_match('/^\s*(!{'.$phpwikiclassiclevel.','.$phpwikiclassiclevel.'})([^!].*)$/', $content[$i], $match))
                  or (preg_match('/^\s*(={'.$wikicreolelevel.','.$wikicreolelevel.'})([^=].*)$/', $content[$i], $match)) )
                 {
-                    $this->_tocCounter($tocCounter, $level);                	
+                    $this->_tocCounter($tocCounter, $level);
                     if (!strstr($content[$i],'#[')) {
                         $s = trim($match[2]);
                         // If it is Wikicreole syntax, remove '='s at the end
@@ -271,8 +293,8 @@
                         if($counter) {
                             $texts = $this->_getCounter($tocCounter, $level, $firstlevelstyle).' '.$s;
                         }
-                        $headers[] = array('text' => $texts, 
-                                           'anchor' => $anchor, 
+                        $headers[] = array('text' => $texts,
+                                           'anchor' => $anchor,
                                            'level' => $level);
                         // Change original wikitext, but that is useless art...
                         $content[$i] = $match[1]." #[|$manchor][$s|#TOC]";
@@ -280,8 +302,9 @@
                         // Search <hn>$s</hn> line in markup
                         /* Url for backlink */
                         $url = WikiURL(new WikiPageName($basepage,false,"TOC"));
-                        $j = $this->searchHeader($markup->_content, $j, $s, 
-                                                 $match[1], $hstart, $hend, 
+
+                        $j = $this->searchHeader($markup->_content, $j, $s,
+                                                 $match[1], $hstart, $hend,
                                                  $markup->_basepage);
                         if ($j and isset($markup->_content[$j])) {
                             $x = $markup->_content[$j];
@@ -313,9 +336,9 @@
                                 $h = $this->_getHeader($match[1]);
 
                                 if ($backlink) {
-                                    if ($counter)
+                                    if ($counter) {
                                         $anchorString = "\$1<a href=\"$url\" name=\"$manchor\">$counterString</a> - ";
-                                    else {
+                                    } else {
                                         /* Not possible to make a backlink on a
                                          * title with a WikiWord */
                                         $anchorString = "\$1<a name=\"$manchor\"></a>";
@@ -326,10 +349,10 @@
                                     if ($counter)
                                         $anchorString .= "$counterString - ";
                                 }
-                                $x = preg_replace("/(<$h>)(?!.*<\/$h>)/", 
+                                $x = preg_replace("/(<$h>)(?!.*<\/$h>)/",
                                                   $anchorString, $x, 1);
                                 if ($backlink) {
-                                    $x =  preg_replace("/(<$h>)(?!.*<\/$h>)/", 
+                                    $x =  preg_replace("/(<$h>)(?!.*<\/$h>)/",
                                                       $anchorString,
                                                       $markup->_content[$hstart],1);
                                 }
@@ -342,7 +365,7 @@
         }
         return $headers;
     }
-                
+
     function run($dbi, $argstr, &$request, $basepage) {
         global $WikiTheme;
         extract($this->getArgs($argstr, $request));
@@ -388,7 +411,7 @@
         $toclistid = GenerateId("toclist");
         $list = HTML::div(array('id'=>$toclistid, 'class'=>'toclist'));
         if (!strstr($headers,",")) {
-            $headers = array($headers);	
+            $headers = array($headers);
         } else {
             $headers = explode(",",$headers);
         }
@@ -406,8 +429,8 @@
         }
         if (TOC_FULL_SYNTAX)
             require_once("lib/InlineParser.php");
-        if ($headers = $this->extractHeaders($content, $dbi->_markup, 
-                                             $with_toclink, $with_counter, 
+        if ($headers = $this->extractHeaders($content, $dbi->_markup,
+                                             $with_toclink, $with_counter,
                                              $levels, $firstlevelstyle, $basepage))
         {
             foreach ($headers as $h) {
@@ -416,6 +439,8 @@
                 $indent = $level - 1;
                 $link = new WikiPageName($pagename,$page,$h['anchor']);
                 $li = WikiLink($link,'known',$h['text']);
+                // Hack to suppress pagename before #
+                // $li->_attr["href"] = strstr($li->_attr["href"], '#');
                 $list->pushContent(HTML::p(HTML::raw
                        (str_repeat($indentstr,$indent)),$li));
             }


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7239] trunk/lib/CachedMarkup.php

From: <var...@us...> - 2009-10-28 17:08:17

Revision: 7239
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7239&view=rev
Author:   vargenau
Date:     2009-10-28 17:08:09 +0000 (Wed, 28 Oct 2009)

Log Message:
-----------
Use "error" class, "baduri" class does not exist

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

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2009-10-28 09:48:52 UTC (rev 7238)
+++ trunk/lib/CachedMarkup.php	2009-10-28 17:08:09 UTC (rev 7239)
@@ -532,9 +532,7 @@
     function _expandurl($url) {
         $m = array();
         if (!preg_match('/^ ([^:]+) (:[:=]) (.+) $/x', $url, $m)) {
-            return HTML::strong(array('class' => 'rawurl'),
-                                HTML::u(array('class' => 'baduri'),
-                                        _("BAD semantic relation link")));
+            return HTML::span(array('class' => 'error'), _("BAD semantic relation link"));
         }
 	$this->_relation = urldecode($m[1]);
         $is_attribute = ($m[2] == ':=');


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

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

From: <var...@us...> - 2009-10-28 09:49:00

Revision: 7238
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7238&view=rev
Author:   vargenau
Date:     2009-10-28 09:48:52 +0000 (Wed, 28 Oct 2009)

Log Message:
-----------
Allow "height" and "width" attributes for images

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

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2009-10-25 19:05:17 UTC (rev 7237)
+++ trunk/lib/stdlib.php	2009-10-28 09:48:52 UTC (rev 7238)
@@ -460,7 +460,7 @@
             $link->setAttr($attr, $value);
         }
         // These attributes take a number (pixels) or a percentage: height, width
-        elseif ((($attr == "border") || ($attr == "hspace") || ($attr == "vspace"))
+        elseif ((($attr == "height") || ($attr == "width"))
            && (preg_match('/\d+[%p]?x?/', $value))) {
             $link->setAttr($attr, $value);
         }


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

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

From: <var...@us...> - 2009-10-25 19:05:26

Revision: 7237
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7237&view=rev
Author:   vargenau
Date:     2009-10-25 19:05:17 +0000 (Sun, 25 Oct 2009)

Log Message:
-----------
plugin-head and plugin-link are dead

Modified Paths:
--------------
    trunk/lib/CachedMarkup.php
    trunk/lib/InlineParser.php
    trunk/lib/WikiPlugin.php
    trunk/locale/fr/pgsrc/Aide%2FPluginWiki

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2009-10-25 18:02:28 UTC (rev 7236)
+++ trunk/lib/CachedMarkup.php	2009-10-25 19:05:17 UTC (rev 7237)
@@ -761,7 +761,7 @@
 	$this->_pi = $pi;
 	$loader = $this->_getLoader();
         if (is_array($plugin_cmdline = $loader->parsePI($pi)) and $plugin_cmdline[1]) {
-            $this->pi_name = $plugin_cmdline[0]; // plugin, plugin-form, plugin-list, plugin-link
+            $this->pi_name = $plugin_cmdline[0]; // plugin, plugin-form, plugin-list
             $this->name = $plugin_cmdline[1]->getName();
             $this->args = $plugin_cmdline[2];
         }

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2009-10-25 18:02:28 UTC (rev 7236)
+++ trunk/lib/InlineParser.php	2009-10-25 19:05:17 UTC (rev 7237)
@@ -1107,8 +1107,6 @@
 }
 
 // FIXME: Do away with magic phpwiki forms.  (Maybe phpwiki: links too?)
-// FIXME: Do away with plugin-links.  They seem not to be used.
-//Plugin link
 
 class InlineTransformer
 {

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2009-10-25 18:02:28 UTC (rev 7236)
+++ trunk/lib/WikiPlugin.php	2009-10-25 19:05:17 UTC (rev 7237)
@@ -266,29 +266,6 @@
                      'class'       => 'wikiaction');
     }
 
-    function makeLink($argstr, $request) {
-        $defaults = $this->getDefaultArguments();
-        $link_defaults = $this->getDefaultLinkArguments();
-        $defaults = array_merge($defaults, $link_defaults);
-    
-        $args = $this->getArgs($argstr, $request, $defaults);
-        $plugin = $this->getName();
-    
-        $query_args = array();
-        foreach ($args as $arg => $val) {
-            if (isset($link_defaults[$arg]))
-                continue;
-            if ($val != $defaults[$arg])
-                $query_args[$arg] = $val;
-        }
-    
-        $link = Button($query_args, $args['linktext'], $args['targetpage']);
-        if (!empty($args['description']))
-            $link->addTooltip($args['description']);
-    
-        return $link;
-    }
-    
     function getDefaultFormArguments() {
         return array('targetpage' => $this->getName(),
                      'buttontext' => $this->getName(),
@@ -449,7 +426,7 @@
         list($pi_name, $plugin, $plugin_args) = $ppi;
 
         if (!is_object($plugin)) {
-            return new HtmlElement($pi_name == 'plugin-link' ? 'span' : 'p',
+            return new HtmlElement('p',
                                    array('class' => 'plugin-error'),
                                    $this->getErrorDetail());
         }
@@ -482,8 +459,6 @@
                 return $plugin->run($dbi, $plugin_args, $request, $basepage);
             case 'plugin-list':
                 return $plugin->makeList($plugin_args, $request, $basepage);
-            case 'plugin-link':
-                return $plugin->makeLink($plugin_args, $request);
             case 'plugin-form':
                 return $plugin->makeForm($plugin_args, $request);
         }

Modified: trunk/locale/fr/pgsrc/Aide%2FPluginWiki
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FPluginWiki	2009-10-25 18:02:28 UTC (rev 7236)
+++ trunk/locale/fr/pgsrc/Aide%2FPluginWiki	2009-10-25 19:05:17 UTC (rev 7237)
@@ -76,11 +76,6 @@
   *plugin-form* est utilisé pour afficher une boîte input type=text box 
    comme argument par défaut.
 
-  *plugin-head* n'existe plus !
-
-  *plugin-link* peut être utilisé pour changer les liens sortants pour 
-  cette page.
-
 {{{
 <<PluginName [args...] >>
 }}}
@@ -89,17 +84,6 @@
 <?plugin-form PluginName [args...] ?>
 }}}
 
-{{{
-<?plugin-link PluginName [args...] ?>
-}}}
-;:Ce n'est pas utilisé.
-
-{{{
-<?plugin-head PluginName [args...] ?>
-}}}
-;:Ce n'est plus utilisé.
-
-
 == Plugins existants :
 
 Voir GestionDesPlugins pour la liste actuelle. La plupart des plugins ont leur 


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7236] trunk/configurator.php

From: <var...@us...> - 2009-10-25 18:02:37

Revision: 7236
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7236&view=rev
Author:   vargenau
Date:     2009-10-25 18:02:28 +0000 (Sun, 25 Oct 2009)

Log Message:
-----------
Add ENABLE_AUTH_OPENID

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

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2009-10-25 17:36:31 UTC (rev 7235)
+++ trunk/configurator.php	2009-10-25 18:02:28 UTC (rev 7236)
@@ -905,6 +905,9 @@
   USER_AUTH_ORDER = 'BogoLogin : PersonalPage'
 </pre>");
 
+$properties["ENABLE_AUTH_OPENID"] =
+new boolean_define('ENABLE_AUTH_OPENID');
+
 $properties["PASSWORD_LENGTH_MINIMUM"] =
 new numeric_define('PASSWORD_LENGTH_MINIMUM', PASSWORD_LENGTH_MINIMUM);
 


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7235] trunk/themes/default/templates/login.tmpl

From: <var...@us...> - 2009-10-25 17:36:43

Revision: 7235
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7235&view=rev
Author:   vargenau
Date:     2009-10-25 17:36:31 +0000 (Sun, 25 Oct 2009)

Log Message:
-----------
Put fieldset inside table so that fieldset does not extend 100%

Modified Paths:
--------------
    trunk/themes/default/templates/login.tmpl

Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl	2009-10-25 12:42:49 UTC (rev 7234)
+++ trunk/themes/default/templates/login.tmpl	2009-10-25 17:36:31 UTC (rev 7235)
@@ -70,6 +70,9 @@
   <p><?= _("New users may use an empty password.") ?></p>
 <?php } ?>
 <form method="post" action="<?= $request->getPostURL() ?>" accept-charset="<?=CHARSET?>" name="login">
+<table>
+<tr>
+<td>
 <fieldset>
 <legend>Sign In</legend>
 <table cellspacing="4">
@@ -97,6 +100,9 @@
 <input type="hidden" name="auth[login]" value="1" />
 <?= HiddenInputs($request->getArgs(), false, array('auth')) ?>
 </fieldset>
+</td>
+</tr>
+</table>
 </form>
 
 <script language="JavaScript" type="text/javascript">


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7234] trunk/themes/default/templates/login.tmpl

From: <var...@us...> - 2009-10-25 12:43:00

Revision: 7234
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7234&view=rev
Author:   vargenau
Date:     2009-10-25 12:42:49 +0000 (Sun, 25 Oct 2009)

Log Message:
-----------
Add fieldset

Modified Paths:
--------------
    trunk/themes/default/templates/login.tmpl

Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl	2009-10-23 15:35:29 UTC (rev 7233)
+++ trunk/themes/default/templates/login.tmpl	2009-10-25 12:42:49 UTC (rev 7234)
@@ -70,6 +70,8 @@
   <p><?= _("New users may use an empty password.") ?></p>
 <?php } ?>
 <form method="post" action="<?= $request->getPostURL() ?>" accept-charset="<?=CHARSET?>" name="login">
+<fieldset>
+<legend>Sign In</legend>
 <table cellspacing="4">
 <tr>
   <td align="right"><?= _("UserId:") ?></td>
@@ -94,6 +96,7 @@
 <input type="hidden" name="auth[require_level]" value="<?=$require_level?>" />
 <input type="hidden" name="auth[login]" value="1" />
 <?= HiddenInputs($request->getArgs(), false, array('auth')) ?>
+</fieldset>
 </form>
 
 <script language="JavaScript" type="text/javascript">


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

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

From: <var...@us...> - 2009-10-23 15:35:40

Revision: 7233
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7233&view=rev
Author:   vargenau
Date:     2009-10-23 15:35:29 +0000 (Fri, 23 Oct 2009)

Log Message:
-----------
Do not load "sortable.js" for Gforge (already done by Gforge)

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

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2009-10-23 11:15:47 UTC (rev 7232)
+++ trunk/lib/WikiTheme.php	2009-10-23 15:35:29 UTC (rev 7233)
@@ -223,7 +223,10 @@
             return;
         }
         $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("wikicommon.js"))));
-        $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("sortable.js"))));
+        if (! defined('GFORGE') or !GFORGE) {
+            // Gforge already loads this
+            $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("sortable.js"))));
+        }
         // by pixels
         if ((is_object($GLOBALS['request']) // guard against unittests
              and $GLOBALS['request']->getPref('doubleClickEdit'))


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7232] trunk/themes/gforge/themeinfo.php

From: <var...@us...> - 2009-10-23 11:15:56

Revision: 7232
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7232&view=rev
Author:   vargenau
Date:     2009-10-23 11:15:47 +0000 (Fri, 23 Oct 2009)

Log Message:
-----------
css and pagename params are not needed

Modified Paths:
--------------
    trunk/themes/gforge/themeinfo.php

Modified: trunk/themes/gforge/themeinfo.php
===================================================================
--- trunk/themes/gforge/themeinfo.php	2009-10-21 09:55:59 UTC (rev 7231)
+++ trunk/themes/gforge/themeinfo.php	2009-10-23 11:15:47 UTC (rev 7232)
@@ -24,10 +24,12 @@
             session_require(array('group'=>'1'));
         }
 
-        $HTML->header(array('title'=> $group_public_name.': '.htmlspecialchars($pagename) ,
-            'pagename'=> $pagename, 'group' => $group_id, 'toptab' => 'wiki',
-            'css' => 'gforge.css" />'."\n".'    <base href="'.PHPWIKI_BASE_URL,
-            'submenu' => $submenu->asXML()));
+        $HTML->header(array('title'=> $group_public_name.': '.htmlspecialchars($pagename),
+                            'group' => $group_id, 
+                            'toptab' => 'wiki',
+                            'submenu' => $submenu->asXML()
+                           )
+                     );
 
         // Display a warning banner for internal users when the wiki is opened
         // to external users.


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

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

From: <var...@us...> - 2009-10-21 09:56:10

Revision: 7231
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7231&view=rev
Author:   vargenau
Date:     2009-10-21 09:55:59 +0000 (Wed, 21 Oct 2009)

Log Message:
-----------
Normalize headers

Modified Paths:
--------------
    trunk/themes/Crao/templates/actionbar.tmpl
    trunk/themes/Crao/templates/body.tmpl
    trunk/themes/Crao/templates/bottom.tmpl
    trunk/themes/Crao/templates/browse.tmpl
    trunk/themes/Crao/templates/editpage.tmpl
    trunk/themes/Crao/templates/head.tmpl
    trunk/themes/Crao/templates/htmldump.tmpl
    trunk/themes/Crao/templates/navbar.tmpl
    trunk/themes/Crao/templates/signin.tmpl
    trunk/themes/Crao/templates/top.tmpl
    trunk/themes/Crao/templates/wikiblog.tmpl
    trunk/themes/MonoBook/templates/actionbar.tmpl
    trunk/themes/MonoBook/templates/body.tmpl
    trunk/themes/MonoBook/templates/browse-footer.tmpl
    trunk/themes/MonoBook/templates/browse.tmpl
    trunk/themes/MonoBook/templates/editpage.tmpl
    trunk/themes/MonoBook/templates/info.tmpl
    trunk/themes/MonoBook/templates/logo.tmpl
    trunk/themes/MonoBook/templates/navbar.tmpl
    trunk/themes/MonoBook/templates/tags.tmpl
    trunk/themes/MonoBook/templates/top.tmpl
    trunk/themes/MonoBook/templates/viewsource.tmpl
    trunk/themes/Portland/templates/actionbar.tmpl
    trunk/themes/Portland/templates/body.tmpl
    trunk/themes/Portland/templates/browse.tmpl
    trunk/themes/Portland/templates/debug.tmpl
    trunk/themes/Portland/templates/editpage.tmpl
    trunk/themes/Portland/templates/navbar.tmpl
    trunk/themes/Portland/templates/viewsource.tmpl
    trunk/themes/Sidebar/templates/actionbar.tmpl
    trunk/themes/Sidebar/templates/browse.tmpl
    trunk/themes/Sidebar/templates/content.tmpl
    trunk/themes/Sidebar/templates/debug.tmpl
    trunk/themes/Sidebar/templates/dump-footer.tmpl
    trunk/themes/Sidebar/templates/frame-left.tmpl
    trunk/themes/Sidebar/templates/frameset.tmpl
    trunk/themes/Sidebar/templates/html.tmpl
    trunk/themes/Sidebar/templates/htmldump.tmpl
    trunk/themes/Sidebar/templates/navbar.tmpl
    trunk/themes/Sidebar/templates/signin.tmpl
    trunk/themes/Wordpress/templates/actionbar.tmpl
    trunk/themes/Wordpress/templates/body.tmpl
    trunk/themes/Wordpress/templates/browse.tmpl
    trunk/themes/Wordpress/templates/editpage.tmpl
    trunk/themes/Wordpress/templates/navbar.tmpl
    trunk/themes/Wordpress/templates/viewsource.tmpl
    trunk/themes/blog/templates/actionbar.tmpl
    trunk/themes/blog/templates/blogform.tmpl
    trunk/themes/blog/templates/body.tmpl
    trunk/themes/blog/templates/bottom.tmpl
    trunk/themes/blog/templates/browse-footer.tmpl
    trunk/themes/blog/templates/browse.tmpl
    trunk/themes/blog/templates/debug.tmpl
    trunk/themes/blog/templates/info.tmpl
    trunk/themes/blog/templates/sidebar.tmpl
    trunk/themes/blog/templates/top.tmpl
    trunk/themes/blog/templates/viewsource.tmpl
    trunk/themes/default/templates/addcomment.tmpl
    trunk/themes/default/templates/blogform.tmpl
    trunk/themes/default/templates/body.tmpl
    trunk/themes/default/templates/bottom.tmpl
    trunk/themes/default/templates/browse-footer.tmpl
    trunk/themes/default/templates/browse.tmpl
    trunk/themes/default/templates/categorypage.tmpl
    trunk/themes/default/templates/content.tmpl
    trunk/themes/default/templates/debug.tmpl
    trunk/themes/default/templates/dialog.tmpl
    trunk/themes/default/templates/editpage.tmpl
    trunk/themes/default/templates/forumadd.tmpl
    trunk/themes/default/templates/frameset.tmpl
    trunk/themes/default/templates/head.tmpl
    trunk/themes/default/templates/html.tmpl
    trunk/themes/default/templates/htmldump.tmpl
    trunk/themes/default/templates/info.tmpl
    trunk/themes/default/templates/login.tmpl
    trunk/themes/default/templates/navbar.tmpl
    trunk/themes/default/templates/nochanges.tmpl
    trunk/themes/default/templates/online.tmpl
    trunk/themes/default/templates/pagelink.tmpl
    trunk/themes/default/templates/redirect.tmpl
    trunk/themes/default/templates/savepage.tmpl
    trunk/themes/default/templates/top.tmpl
    trunk/themes/default/templates/userprefs.tmpl
    trunk/themes/default/templates/viewsource.tmpl
    trunk/themes/default/templates/wikiforum.tmpl
    trunk/themes/gforge/templates/blogform.tmpl
    trunk/themes/gforge/templates/login.tmpl
    trunk/themes/shamino_com/templates/actionbar.tmpl
    trunk/themes/shamino_com/templates/browse-footer.tmpl
    trunk/themes/shamino_com/templates/debug.tmpl
    trunk/themes/shamino_com/templates/info.tmpl
    trunk/themes/shamino_com/templates/top.tmpl
    trunk/themes/smaller/templates/info.tmpl
    trunk/themes/smaller/templates/navbar.tmpl
    trunk/themes/wikilens/templates/categorypage.tmpl
    trunk/themes/wikilens/templates/head.tmpl
    trunk/themes/wikilens/templates/navbar.tmpl
    trunk/themes/wikilens/templates/newuserwelcomepage.tmpl

Property Changed:
----------------
    trunk/themes/MonoBook/templates/editpage.tmpl
    trunk/themes/MonoBook/templates/logo.tmpl
    trunk/themes/blog/templates/info.tmpl
    trunk/themes/default/templates/MAP.pdf
    trunk/themes/default/templates/search.tmpl
    trunk/themes/shamino_com/templates/info.tmpl
    trunk/themes/smaller/templates/info.tmpl

Modified: trunk/themes/Crao/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/actionbar.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Crao/templates/actionbar.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-  rcs_id('$Id$');
+rcs_id('$Id$');
   if (!$page->get('locked') || $user->isAdmin() and $revision)
       $EditB = Button("edit",
                       $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"));

Modified: trunk/themes/Crao/templates/body.tmpl
===================================================================
--- trunk/themes/Crao/templates/body.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Crao/templates/body.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php // -*-html-*-
+<?php // -*-php-*-
 rcs_id('$Id$');
 ?>
 <body<?= $WikiTheme->getMoreAttr('body') ?>>

Modified: trunk/themes/Crao/templates/bottom.tmpl
===================================================================
--- trunk/themes/Crao/templates/bottom.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Crao/templates/bottom.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
-<?php // -*-html-*-
-  rcs_id('$Id$');
+<?php // -*-php-*-
+rcs_id('$Id$');
 ?>
 
 <!-- Add your Disclaimer here -->

Modified: trunk/themes/Crao/templates/browse.tmpl
===================================================================
--- trunk/themes/Crao/templates/browse.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Crao/templates/browse.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<?php // -*-html-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 
 <?php if ($revision and !$revision->isCurrent()) { ?>
   <p><strong><?=_("Note:")?></strong>

Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Crao/templates/editpage.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<!-- -*-html-*- -->
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?php if (isset($PREVIEW_CONTENT)) { ?>
   <p><strong><?=_("Preview only!  Changes not saved.")?></strong>
 <!-- FIXME: it would be nice to put a link to the #editarea anchor below,

Modified: trunk/themes/Crao/templates/head.tmpl
===================================================================
--- trunk/themes/Crao/templates/head.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Crao/templates/head.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
-<?php  // -*-html-*-
-  rcs_id('$Id$');
+<?php // -*-php-*-
+rcs_id('$Id$');
 ?>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?=CHARSET?>" />

Modified: trunk/themes/Crao/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Crao/templates/htmldump.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Crao/templates/htmldump.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php  // -*-html-*-
+<?php  // -*-php-*-
 rcs_id('$Id$');
 /*
  * This template is used only for html file dumps, and is responsible

Modified: trunk/themes/Crao/templates/navbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/navbar.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Crao/templates/navbar.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<?php // -*-html-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <!-- The top navigation/search bar -->
 <form action="<?= WikiURL(_("TitleSearch"))?>" target="_top"
       method="get" accept-charset="<?=$charset?>" id="searchform" name="searchform">

Modified: trunk/themes/Crao/templates/signin.tmpl
===================================================================
--- trunk/themes/Crao/templates/signin.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Crao/templates/signin.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php // -*-html-*-
+<?php // -*-php-*-
 rcs_id('$Id$');
 
 if (empty($FORMNAME))

Modified: trunk/themes/Crao/templates/top.tmpl
===================================================================
--- trunk/themes/Crao/templates/top.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Crao/templates/top.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php // -*-html-*-
+<?php // -*-php-*-
 rcs_id('$Id$');
 
 global $HIDE_TOOLBARS;

Modified: trunk/themes/Crao/templates/wikiblog.tmpl
===================================================================
--- trunk/themes/Crao/templates/wikiblog.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Crao/templates/wikiblog.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,6 @@
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?php
 $CDATE = $WikiTheme->formatDateTime($BLOG_CTIME);
 

Modified: trunk/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/actionbar.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/MonoBook/templates/actionbar.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<?php // -*-php-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?php
   //$p = $WikiTheme->tooltipAccessKeyPrefix();
   $dbh = $request->getDbh();

Modified: trunk/themes/MonoBook/templates/body.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/body.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/MonoBook/templates/body.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php // -*-html-*-
+<?php // -*-php-*-
 rcs_id('$Id$');
 // Todo: set the body attr dynamically. here class="ns-2" for mozilla
 ?>

Modified: trunk/themes/MonoBook/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/browse-footer.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/MonoBook/templates/browse-footer.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-  rcs_id('$Id$');
+rcs_id('$Id$');
 ?>
 <?php // <hr class="printer" noshade="noshade" /> ?>
     <div class="visualClear"></div>

Modified: trunk/themes/MonoBook/templates/browse.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/browse.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/MonoBook/templates/browse.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php // -*-html-*-
+<?php // -*-php-*-
 rcs_id('$Id$');
 ?>
 

Modified: trunk/themes/MonoBook/templates/editpage.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/editpage.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/MonoBook/templates/editpage.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,2 +1,5 @@
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <div id="contentSub"></div>
 <?= Template("default/editpage") ?>


Property changes on: trunk/themes/MonoBook/templates/editpage.tmpl
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/themes/MonoBook/templates/info.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/info.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/MonoBook/templates/info.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<?php // -*-php-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?php
 if (empty($revision)) $revision = $page->getCurrentRevision(false);
 $modifed = $WikiTheme->formatDateTime($revision->get('mtime'));

Modified: trunk/themes/MonoBook/templates/logo.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/logo.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/MonoBook/templates/logo.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,3 +1,6 @@
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <div class="portlet" id="p-logo"><a class="wikilink" href="<?=WikiURL(HOME_PAGE)?>" target="_top"><img src="<?= $WikiTheme->getImageURL('logo') ?>" id="logo-img" border="0" alt="<?=
 fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" /></a></div>
 <div id="img-logo-right" />


Property changes on: trunk/themes/MonoBook/templates/logo.tmpl
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/themes/MonoBook/templates/navbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/navbar.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/MonoBook/templates/navbar.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<?php // -*-php-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?php
 // With MonoBook it is similar to Sidebar, named boxes at the left.
 // actionbuttons, navigation, search, toolbox

Modified: trunk/themes/MonoBook/templates/tags.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/tags.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/MonoBook/templates/tags.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,6 +1,6 @@
-<?php // -*-php-*- 
+<?php // -*-php-*-
+rcs_id('$Id$');
 ?>
-<!-- $Id$ -->
 <!-- list of most popular categories -->
 <div class="portlet" id="p-tags">
   <h5><?= _("Favorite Categories") ?></h5>

Modified: trunk/themes/MonoBook/templates/top.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/top.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/MonoBook/templates/top.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php // -*-html-*-
+<?php // -*-php-*-
 rcs_id('$Id$');
 ?>
 <!-- Page title -->

Modified: trunk/themes/MonoBook/templates/viewsource.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/viewsource.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/MonoBook/templates/viewsource.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,6 +1,6 @@
-<?php // -*-html-*- ?>
-<!-- $Id$ -->
-
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?php if ($page->get('locked') && !$user->isAdmin()) { ?>
   <p><strong><?=_("Note:")?></strong>
   <?=_("This page has been locked by the administrator and cannot be edited.")?>

Modified: trunk/themes/Portland/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Portland/templates/actionbar.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Portland/templates/actionbar.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<?php // -*-php-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?php
   if ($revision and (!$page->get('locked') || $user->isAdmin()))
       $EditB = Button("edit",

Modified: trunk/themes/Portland/templates/body.tmpl
===================================================================
--- trunk/themes/Portland/templates/body.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Portland/templates/body.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<?php // -*-html-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <body<?= $WikiTheme->getMoreAttr('body') ?>>
 <!-- Page title and logo -->
 <h1><a class="wikilink"
@@ -14,4 +15,4 @@
 <?= $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
 
 <?php if (defined('DEBUG') && DEBUG) { ?><?= Template('debug') ?><?php } ?>
-</body>
\ No newline at end of file
+</body>

Modified: trunk/themes/Portland/templates/browse.tmpl
===================================================================
--- trunk/themes/Portland/templates/browse.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Portland/templates/browse.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,6 +1,5 @@
-<?php // -*-html-*- ?>
-<!-- $Id$ -->
-<?php
+<?php // -*-php-*-
+rcs_id('$Id$');
 ?>
 
 <br clear="all" class="clear-floats" />

Modified: trunk/themes/Portland/templates/debug.tmpl
===================================================================
--- trunk/themes/Portland/templates/debug.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Portland/templates/debug.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
-<?php // -*-html-*-
-  rcs_id('$Id$');
+<?php // -*-php-*-
+rcs_id('$Id$');
 ?>
 <?php global $RUNTIMER; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">

Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Portland/templates/editpage.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<!-- -*-html-*- -->
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?php /*
  * FIXME: Hack!
  * The funky URL used for the form action parameter is bogus.

Modified: trunk/themes/Portland/templates/navbar.tmpl
===================================================================
--- trunk/themes/Portland/templates/navbar.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Portland/templates/navbar.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<?php // -*-html-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <!-- The bottom navigation/search bar -->
 
     <?= WikiLink(_("FindPage"), "button") ?> by searching
@@ -30,4 +31,4 @@
   <td align="right">
     <?= Template('signin') ?>
   </td>
-</tr></table>
\ No newline at end of file
+</tr></table>

Modified: trunk/themes/Portland/templates/viewsource.tmpl
===================================================================
--- trunk/themes/Portland/templates/viewsource.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Portland/templates/viewsource.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<!-- -*-html-*- -->
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 
 <?php if ($page->get('locked') && !$user->isAdmin()) { ?>
   <p><strong><?=_("Note:")?></strong>

Modified: trunk/themes/Sidebar/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/actionbar.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Sidebar/templates/actionbar.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-  rcs_id('$Id$');
+rcs_id('$Id$');
   $dbh = $request->getDbh();
   $isAdmin = $user->isAdmin();
   $pagename = $page->getName();

Modified: trunk/themes/Sidebar/templates/browse.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/browse.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Sidebar/templates/browse.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php // -*-html-*-
+<?php // -*-php-*-
 rcs_id('$Id$');
 ?>
 

Modified: trunk/themes/Sidebar/templates/content.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/content.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Sidebar/templates/content.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
-<?php // -*-html-*-
-  rcs_id('$Id$');
+<?php // -*-php-*-
+rcs_id('$Id$');
 ?>
 <?= $CONTENT ?>
 </body>

Modified: trunk/themes/Sidebar/templates/debug.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/debug.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Sidebar/templates/debug.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
-<?php // -*-html-*-
-  rcs_id('$Id$');
+<?php // -*-php-*-
+rcs_id('$Id$');
 ?>
 <?php global $RUNTIMER; ?>
 <table width="%100" border="0" cellpadding="0" cellspacing="0">

Modified: trunk/themes/Sidebar/templates/dump-footer.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/dump-footer.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Sidebar/templates/dump-footer.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-  rcs_id('$Id$');
+rcs_id('$Id$');
   if (empty($revision)) $revision = $page->getCurrentRevision();
 ?>
 <hr class="printer" noshade="noshade" />

Modified: trunk/themes/Sidebar/templates/frame-left.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/frame-left.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Sidebar/templates/frame-left.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,6 +1,7 @@
-<?php  // -*-html-*-
-/* $Id$
- *
+<?php // -*-php-*-
+rcs_id('$Id$');
+
+/* 
  * This template is responsible mainly for the outer level <html> stuff.
  */
 printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);

Modified: trunk/themes/Sidebar/templates/frameset.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/frameset.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Sidebar/templates/frameset.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,6 +1,7 @@
-<?php  // -*-html-*-
-/* $Id$
- *
+<?php // -*-php-*-
+rcs_id('$Id$');
+
+/*
  * This template is used for the FrameInclude plugin.
  */
 

Modified: trunk/themes/Sidebar/templates/html.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/html.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Sidebar/templates/html.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php  // -*-html-*-
+<?php  // -*-php-*-
 rcs_id('$Id$');
 /*
  * This template is responsible mainly for the outer level <html> stuff.

Modified: trunk/themes/Sidebar/templates/htmldump.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/htmldump.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Sidebar/templates/htmldump.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php  // -*-html-*-
+<?php  // -*-php-*-
 rcs_id('$Id$');
 /*
  * This template is used only for html file dumps, and is responsible

Modified: trunk/themes/Sidebar/templates/navbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/navbar.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Sidebar/templates/navbar.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<?php // -*-php-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?php
 // With MonoBook it is similar to Sidebar, named boxes at the left.
 // actionbuttons, navigation, search, toolbox

Modified: trunk/themes/Sidebar/templates/signin.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/signin.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Sidebar/templates/signin.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<!-- -*-php-*- -->
-<?php rcs_id('$Id$'); ?>
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <div class="portlet" id="p-personal"><div class="pBody"><ul>
 <?php if ($user->isAuthenticated()) {
      $sp = HTML::Raw("&nbsp;"); $id = $user->getAuthenticatedId(); ?>

Modified: trunk/themes/Wordpress/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/actionbar.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Wordpress/templates/actionbar.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,7 @@
-<?php // -*-php-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
+
 <div id="actionbar">
 
 <?php

Modified: trunk/themes/Wordpress/templates/body.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/body.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Wordpress/templates/body.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,7 @@
-<?php // -*-html-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
+
 <body<?= $WikiTheme->getMoreAttr('body') ?>>
 
 <!-- Page title -->
@@ -19,4 +21,4 @@
 
 <?= $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
 
-</body>
\ No newline at end of file
+</body>

Modified: trunk/themes/Wordpress/templates/browse.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/browse.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Wordpress/templates/browse.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,6 +1,5 @@
-<?php // -*-html-*- ?>
-<!-- $Id$ -->
-<?php
+<?php // -*-php-*-
+rcs_id('$Id$');
 ?>
 
 <br clear="all" class="clear-floats" />

Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Wordpress/templates/editpage.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,12 +1,13 @@
-<!-- -*-html-*- -->
-<!-- $Id$ -->
-<?php /*
+<?php // -*-php-*-
+rcs_id('$Id$');
+/*
  * FIXME: Hack!
  * The funky URL used for the form action parameter is bogus.
  * This is needed, otherwise the redirect to the real browser
  * page won't work with some browsers. (NS4 and Mozilla 0.97 won't accept
  * a redirect from a page to itself.)
- */ ?>
+ */
+?>
 
 <div class="wikitext" id="editform">
 <form method="post" name="editpage" id="editpage"
@@ -107,4 +108,4 @@
 // -->
 </script>
 
-<hr />
\ No newline at end of file
+<hr />

Modified: trunk/themes/Wordpress/templates/navbar.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/navbar.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Wordpress/templates/navbar.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<?php // -*-html-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?php
   $Sep = $WikiTheme->getButtonSeparator();
 ?>

Modified: trunk/themes/Wordpress/templates/viewsource.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/viewsource.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/Wordpress/templates/viewsource.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<!-- -*-html-*- -->
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 
 <div class="wikitext" id="viewform">
 

Modified: trunk/themes/blog/templates/actionbar.tmpl
===================================================================
--- trunk/themes/blog/templates/actionbar.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/blog/templates/actionbar.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-  rcs_id('$Id$');
+rcs_id('$Id$');
 ?>
 <table summary="Toolbar: Mani Navigation"
        width="100%" cellpadding="0" cellspacing="0" border="0">

Modified: trunk/themes/blog/templates/blogform.tmpl
===================================================================
--- trunk/themes/blog/templates/blogform.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/blog/templates/blogform.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
 <?php // -*- php -*-
-  rcs_id('$Id$');
+rcs_id('$Id$');
 ?>
 <div class="wikiblog wikiblog-form">
 <form action="<?=$request->getPostURL()?>" method="post" name="editpage"

Modified: trunk/themes/blog/templates/body.tmpl
===================================================================
--- trunk/themes/blog/templates/body.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/blog/templates/body.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php // -*-html-*-
+<?php // -*-php-*-
 rcs_id('$Id$');
 ?>
 <body <?= $WikiTheme->getMoreAttr('body') ?>>

Modified: trunk/themes/blog/templates/bottom.tmpl
===================================================================
--- trunk/themes/blog/templates/bottom.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/blog/templates/bottom.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
-<?php // -*-html-*-
-  rcs_id('$Id$');
+<?php // -*-php-*-
+rcs_id('$Id$');
 ?>
 <!--span id="bottom" style="margin-left: 25px"-->
 <!-- Add your Disclaimer here -->

Modified: trunk/themes/blog/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/blog/templates/browse-footer.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/blog/templates/browse-footer.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
-<?php // -*-html-*-
-  rcs_id('$Id$');
+<?php // -*-php-*-
+rcs_id('$Id$');
 ?>
 <!--{{{ Edit Date-->
 <p class="editdate">

Modified: trunk/themes/blog/templates/browse.tmpl
===================================================================
--- trunk/themes/blog/templates/browse.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/blog/templates/browse.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php // -*-html-*-
+<?php // -*-php-*-
 rcs_id('$Id$');
 ?>
 

Modified: trunk/themes/blog/templates/debug.tmpl
===================================================================
--- trunk/themes/blog/templates/debug.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/blog/templates/debug.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
-<?php // -*-html-*-
-  rcs_id('$Id$');
+<?php // -*-php-*-
+rcs_id('$Id$');
 ?>
 <?php global $RUNTIMER; ?>
 <p align="center" id="xhtml-validator"><a href="http://validator.w3.org/check/referer" target="_top">Valid XHTML 1.0</a>  <a href="http://jigsaw.w3.org/css-validator/check/referer" target="_top">Valid CSS!</a>

Modified: trunk/themes/blog/templates/info.tmpl
===================================================================
--- trunk/themes/blog/templates/info.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/blog/templates/info.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,3 +1,6 @@
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?= Template("default/info") ?>
 <div class="actionbuttons">
   <?=$SEP?><?= Button("AuthorHistory", _("AuthorHistory")) ?>
@@ -8,4 +11,4 @@
 <br />
 <div class="actionbuttons">
   <?= Template("default/actionbar") ?>
-</div>
\ No newline at end of file
+</div>


Property changes on: trunk/themes/blog/templates/info.tmpl
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/themes/blog/templates/sidebar.tmpl
===================================================================
--- trunk/themes/blog/templates/sidebar.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/blog/templates/sidebar.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php // -*-html-*-
+<?php // -*-php-*-
 rcs_id('$Id$');
 $id = isBrowserIE() ? 'sidebar' : 'moz-sidebar';
 ?>

Modified: trunk/themes/blog/templates/top.tmpl
===================================================================
--- trunk/themes/blog/templates/top.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/blog/templates/top.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php // -*-html-*-
+<?php // -*-php-*-
 rcs_id('$Id$');
 ?>
 <div id="header">

Modified: trunk/themes/blog/templates/viewsource.tmpl
===================================================================
--- trunk/themes/blog/templates/viewsource.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/blog/templates/viewsource.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<?php // -*-html-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?php 
 if (empty($revision)) $revision = $page->getCurrentRevision(false);
 if ($page->get('locked') && !$user->isAdmin()) { ?>


Property changes on: trunk/themes/default/templates/MAP.pdf
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/themes/default/templates/addcomment.tmpl
===================================================================
--- trunk/themes/default/templates/addcomment.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/addcomment.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
 <?php // -*- php -*-
-  rcs_id('$Id$');
+rcs_id('$Id$');
   $request->setArg('action',false);
 ?>
 <div class="wikicomment wikicomment-form">

Modified: trunk/themes/default/templates/blogform.tmpl
===================================================================
--- trunk/themes/default/templates/blogform.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/blogform.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
 <?php // -*- php -*-
-  rcs_id('$Id$');
+rcs_id('$Id$');
 ?>
 <div class="wikiblog wikiblog-form">
 <form action="<?=$request->getPostURL()?>" method="post" name="editpage"

Modified: trunk/themes/default/templates/body.tmpl
===================================================================
--- trunk/themes/default/templates/body.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/body.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php // -*-html-*-
+<?php // -*-php-*-
 rcs_id('$Id$');
 ?>
 <body<?= $WikiTheme->getMoreAttr('body') ?>>

Modified: trunk/themes/default/templates/bottom.tmpl
===================================================================
--- trunk/themes/default/templates/bottom.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/bottom.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
-<?php // -*-html-*-
-  rcs_id('$Id$');
+<?php // -*-php-*-
+rcs_id('$Id$');
 ?>
 <!-- Add your Disclaimer here -->
 <?php if (!$WikiTheme->DUMP_MODE) { ?>

Modified: trunk/themes/default/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/default/templates/browse-footer.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/browse-footer.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
-<?php // -*-html-*-
-  rcs_id('$Id$');
+<?php // -*-php-*-
+rcs_id('$Id$');
 ?>
 <hr class="printer" noshade="noshade" />
 <p class="editdate"><?= $WikiTheme->getOwnerMessage($page) ?>  <?= $WikiTheme->getLastModifiedMessage($revision) ?> <?= $WikiTheme->getAuthorMessage($revision) ?></p>

Modified: trunk/themes/default/templates/browse.tmpl
===================================================================
--- trunk/themes/default/templates/browse.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/browse.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php // -*-html-*-
+<?php // -*-php-*-
 rcs_id('$Id$');
 ?>
 

Modified: trunk/themes/default/templates/categorypage.tmpl
===================================================================
--- trunk/themes/default/templates/categorypage.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/categorypage.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
 <?php
-  rcs_id('$Id$');
+rcs_id('$Id$');
   // This template is used for the CategoryPage plugin.
 ?>
 <div class="categorypage categorypage-form">

Modified: trunk/themes/default/templates/content.tmpl
===================================================================
--- trunk/themes/default/templates/content.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/content.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
-<?php // -*-html-*-
-  rcs_id('$Id$');
+<?php // -*-php-*-
+rcs_id('$Id$');
 ?>
 <?= $CONTENT ?>
 <?= Template('bottom') ?>

Modified: trunk/themes/default/templates/debug.tmpl
===================================================================
--- trunk/themes/default/templates/debug.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/debug.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
-<?php // -*-html-*-
-  rcs_id('$Id$');
+<?php // -*-php-*-
+rcs_id('$Id$');
 ?>
 <?php global $RUNTIMER; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">

Modified: trunk/themes/default/templates/dialog.tmpl
===================================================================
--- trunk/themes/default/templates/dialog.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/dialog.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php // -*-html-*-
+<?php // -*-php-*-
 rcs_id('$Id$');
 /* 
  * A "popup" dialog.  (Though it doesn't pop up yet.)

Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/editpage.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<!-- -*-html-*- -->
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?php if (isset($PREVIEW_CONTENT)) { ?>
   <p><strong><?=_("Preview only!  Changes not saved.")?></strong>
 <!-- FIXME: it would be nice to put a link to the #editarea anchor below,

Modified: trunk/themes/default/templates/forumadd.tmpl
===================================================================
--- trunk/themes/default/templates/forumadd.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/forumadd.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
 <?php
-  rcs_id('$Id$');
+rcs_id('$Id$');
   // This template is used for the WikiForum plugin.
 ?>
 <div class="wikiforum wikiforum-reply">

Modified: trunk/themes/default/templates/frameset.tmpl
===================================================================
--- trunk/themes/default/templates/frameset.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/frameset.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,13 +1,10 @@
-<?php  // -*-html-*-
-/* $Id$
- *
- * This template is used for the FrameInclude plugin.
- */
+<?php // -*-php-*-
+rcs_id('$Id$');
+// This template is used for the FrameInclude plugin.
 
 $topurl = $request->getURLtoSelf(array('frame' => 'header'));
 $boturl = $request->getURLtoSelf(array('frame' => 'footer'));
 
-
 printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
 ?>
 <!DOCTYPE html   PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"

Modified: trunk/themes/default/templates/head.tmpl
===================================================================
--- trunk/themes/default/templates/head.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/head.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
-<?php  // -*-html-*-
-  rcs_id('$Id$');
+<?php  // -*-php-*-
+rcs_id('$Id$');
 ?>
 <head>
 <?php if (ENABLE_XHTML_XML and strstr($request->get('HTTP_ACCEPT'),'application/xhtml+xml')) { ?>

Modified: trunk/themes/default/templates/html.tmpl
===================================================================
--- trunk/themes/default/templates/html.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/html.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php  // -*-html-*-
+<?php  // -*-php-*-
 rcs_id('$Id$');
 /*
  * This template is responsible mainly for the outer level <html> stuff.

Modified: trunk/themes/default/templates/htmldump.tmpl
===================================================================
--- trunk/themes/default/templates/htmldump.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/htmldump.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php  // -*-html-*-
+<?php  // -*-php-*-
 rcs_id('$Id$');
 /*
  * This template is used only for html file dumps, and is responsible

Modified: trunk/themes/default/templates/info.tmpl
===================================================================
--- trunk/themes/default/templates/info.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/info.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<?php // -*-php-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?php
 if (empty($revision)) $revision = $page->getCurrentRevision(false);
 $modifed = $WikiTheme->formatDateTime($revision->get('mtime'));

Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/login.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,6 +1,6 @@
-<?php // -*-php-*- ?>
-<!-- $Id$ -->
-<!-- The login form -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?php if ($fail_message) { ?>
   <p><strong><?=$fail_message?></strong></p>
   <hr noshade="noshade" />

Modified: trunk/themes/default/templates/navbar.tmpl
===================================================================
--- trunk/themes/default/templates/navbar.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/navbar.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-  rcs_id('$Id$');
+rcs_id('$Id$');
 ?>
 <!-- The top navigation/search bar -->
 <div id="navbuttons">

Modified: trunk/themes/default/templates/nochanges.tmpl
===================================================================
--- trunk/themes/default/templates/nochanges.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/nochanges.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<?php // -*-html-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <p><strong><?=_("Edit aborted.")?></strong>
 <?=_("You have not made any changes so no new version has been saved.")?></p>
 <?php if (!empty($LOCK_CHANGED_MSG)) { ?>

Modified: trunk/themes/default/templates/online.tmpl
===================================================================
--- trunk/themes/default/templates/online.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/online.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<?php // -*-php-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?php
 // Formatting and idea borrowed from postnuke.
 

Modified: trunk/themes/default/templates/pagelink.tmpl
===================================================================
--- trunk/themes/default/templates/pagelink.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/pagelink.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,8 +1,9 @@
-<?php
+<?php // -*-php-*-
+rcs_id('$Id$');
+
 /**
  * Themable paging "|<< <<   - i/sum - >> >>|" links
  *
- * $Id$ -->
  * Variables: PREV, NEXT, PREV_LINK, NEXT_LINK,
  * COUNT, OFFSET, SIZE
  * More ideas: FIRST, LAST, ...

Modified: trunk/themes/default/templates/redirect.tmpl
===================================================================
--- trunk/themes/default/templates/redirect.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/redirect.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -9,7 +9,6 @@
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<!-- $Id$ -->
 <meta http-equiv="Content-Type" content="text/html; charset=<?=CHARSET?>" />
 <meta name="robots" content="noindex, nofollow" />
 <meta name="generator" content="PhpWiki" />

Modified: trunk/themes/default/templates/savepage.tmpl
===================================================================
--- trunk/themes/default/templates/savepage.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/savepage.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<?php // -*-html-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?php
     $signatureURL = $WikiTheme->getImageURL('signature');
 ?>


Property changes on: trunk/themes/default/templates/search.tmpl
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/themes/default/templates/top.tmpl
===================================================================
--- trunk/themes/default/templates/top.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/top.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php // -*-html-*-
+<?php // -*-php-*-
 rcs_id('$Id$');
 
 global $HIDE_TOOLBARS;

Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/userprefs.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<?php // -*-html-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?php
 // Todo: Move the logic and code to the plugin
 // This is very experimental and the read-only part an ugly hack so far.

Modified: trunk/themes/default/templates/viewsource.tmpl
===================================================================
--- trunk/themes/default/templates/viewsource.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/viewsource.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<?php // -*-html-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 
 <?php if ($page->get('locked') && !$user->isAdmin()) { ?>
   <p><strong><?=_("Note:")?></strong>

Modified: trunk/themes/default/templates/wikiforum.tmpl
===================================================================
--- trunk/themes/default/templates/wikiforum.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/default/templates/wikiforum.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
 <?php // -*- php -*-
-  rcs_id('$Id$');
+rcs_id('$Id$');
 /* 
 navigation headline: "MainForum / SubPage / ThisTopic" comes for free
 

Modified: trunk/themes/gforge/templates/blogform.tmpl
===================================================================
--- trunk/themes/gforge/templates/blogform.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/gforge/templates/blogform.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
 <?php // -*- php -*-
-  rcs_id('$Id$');
+rcs_id('$Id$');
 ?>
 <div class="wikiblog wikiblog-form">
 <form action="<?=$request->getPostURL()?>" method="post" name="editpage"

Modified: trunk/themes/gforge/templates/login.tmpl
===================================================================
--- trunk/themes/gforge/templates/login.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/gforge/templates/login.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<?php // -*-php-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?php if ($fail_message) { ?>
   <div class="error"><p><?=$fail_message?></p></div>
 <?php } ?>

Modified: trunk/themes/shamino_com/templates/actionbar.tmpl
===================================================================
--- trunk/themes/shamino_com/templates/actionbar.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/shamino_com/templates/actionbar.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,7 +1,9 @@
 <?php // -*-php-*-
+rcs_id('$Id$');
+?>
+<?php
 if (empty($revision)) $revision = $page->getCurrentRevision(false);
 ?>
-<!-- $Id$ -->
 <?= Button(array('action'=>'PageInfo'),_("PageInfo"),$page->getName()) ?>
 <?=$SEP?><?= Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) ?>
 <?php if ($user->isAdmin() or mayAccessPage('change',$page->getName())) { ?>

Modified: trunk/themes/shamino_com/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/shamino_com/templates/browse-footer.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/shamino_com/templates/browse-footer.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
-<?php // -*-html-*-
-  rcs_id('$Id$');
+<?php // -*-php-*-
+rcs_id('$Id$');
 ?>
 <div class="toolbar">
 <?php if (empty($GLOBALS['HIDE_TOOLBARS'])) { ?>

Modified: trunk/themes/shamino_com/templates/debug.tmpl
===================================================================
--- trunk/themes/shamino_com/templates/debug.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/shamino_com/templates/debug.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
-<?php // -*-html-*-
-  rcs_id('$Id$');
+<?php // -*-php-*-
+rcs_id('$Id$');
 ?>
 <!-- shamino.com debug -->
 <div class="debug">

Modified: trunk/themes/shamino_com/templates/info.tmpl
===================================================================
--- trunk/themes/shamino_com/templates/info.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/shamino_com/templates/info.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,2 +1,5 @@
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <?= Template("default/info") ?>
 <?= Template("actionbar") ?>


Property changes on: trunk/themes/shamino_com/templates/info.tmpl
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/themes/shamino_com/templates/top.tmpl
===================================================================
--- trunk/themes/shamino_com/templates/top.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/shamino_com/templates/top.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,4 @@
-<?php // -*-html-*-
+<?php // -*-php-*-
 rcs_id('$Id$');
 ?>
 <!-- The logo -->

Modified: trunk/themes/smaller/templates/info.tmpl
===================================================================
--- trunk/themes/smaller/templates/info.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/smaller/templates/info.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,4 +1,7 @@
-<?php // -*-php-*- ?>
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
+
 <?= Template("default/info") ?>
 
 <div id="actionbuttons">


Property changes on: trunk/themes/smaller/templates/info.tmpl
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/themes/smaller/templates/navbar.tmpl
===================================================================
--- trunk/themes/smaller/templates/navbar.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/smaller/templates/navbar.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,6 @@
-<?php // -*-html-*- ?>
-<!-- $Id$ -->
+<?php // -*-php-*-
+rcs_id('$Id$');
+?>
 <!-- The top navigation/search bar -->
 <form action="<?= WikiURL(_("TitleSearch"))?>"
       method="get" accept-charset="<?=$charset?>">
@@ -22,4 +23,4 @@
      <?=$SEP?><?= WikiLink(_("UserPreferences"), "","Preferences") ?>
     <?php } ?>
   </div>
-</form>
\ No newline at end of file
+</form>

Modified: trunk/themes/wikilens/templates/categorypage.tmpl
===================================================================
--- trunk/themes/wikilens/templates/categorypage.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/wikilens/templates/categorypage.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
 <?php
-  rcs_id('$Id$');
+rcs_id('$Id$');
 ?>
 <div class="categorypage categorypage-form">
 

Modified: trunk/themes/wikilens/templates/head.tmpl
===================================================================
--- trunk/themes/wikilens/templates/head.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/wikilens/templates/head.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
-<?php  // -*-html-*-
-  rcs_id('$Id$');
+<?php  // -*-php-*-
+rcs_id('$Id$');
 ?>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?=CHARSET?>" />

Modified: trunk/themes/wikilens/templates/navbar.tmpl
===================================================================
--- trunk/themes/wikilens/templates/navbar.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/wikilens/templates/navbar.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-  rcs_id('$Id$');
+rcs_id('$Id$');
   $NSEP = HTML::br();
 ?>
 <!-- The left navigation/search bar -->

Modified: trunk/themes/wikilens/templates/newuserwelcomepage.tmpl
===================================================================
--- trunk/themes/wikilens/templates/newuserwelcomepage.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
+++ trunk/themes/wikilens/templates/newuserwelcomepage.tmpl	2009-10-21 09:55:59 UTC (rev 7231)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-  rcs_id('$Id$');
+rcs_id('$Id$');
   $dbi = $request->getDbh();
 ?>
 <div>


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

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

From: <var...@us...> - 2009-10-21 08:50:30

Revision: 7230
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7230&view=rev
Author:   vargenau
Date:     2009-10-21 08:50:16 +0000 (Wed, 21 Oct 2009)

Log Message:
-----------
No login banner for Gforge

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

Added Paths:
-----------
    trunk/themes/gforge/templates/login.tmpl

Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php	2009-10-21 06:19:58 UTC (rev 7229)
+++ trunk/lib/plugin/WatchPage.php	2009-10-21 08:50:16 UTC (rev 7230)
@@ -109,8 +109,12 @@
         $page = $args['page'];
         if (!$user->isAuthenticated() or empty($userid)) {
             // wrong or unauthenticated user
+            if (defined('GFORGE') and GFORGE) {
+                // No login banner for Gforge
+                return HTML::div(array('class' => 'error'),
+                                 HTML::p(_("You must sign in to watch pages.")));
+            }
             return $request->_notAuthorized(WIKIAUTH_BOGO);
-            //return $user->PrintLoginForm ($request, $args, false, false);
         } else {
             $pref = &$request->_prefs;
             $messages = "";

Added: trunk/themes/gforge/templates/login.tmpl
===================================================================
--- trunk/themes/gforge/templates/login.tmpl	                        (rev 0)
+++ trunk/themes/gforge/templates/login.tmpl	2009-10-21 08:50:16 UTC (rev 7230)
@@ -0,0 +1,5 @@
+<?php // -*-php-*- ?>
+<!-- $Id$ -->
+<?php if ($fail_message) { ?>
+  <div class="error"><p><?=$fail_message?></p></div>
+<?php } ?>


Property changes on: trunk/themes/gforge/templates/login.tmpl
___________________________________________________________________
Added: svn:keywords
   + Id


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

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

From: <var...@us...> - 2009-10-21 06:20:06

Revision: 7229
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7229&view=rev
Author:   vargenau
Date:     2009-10-21 06:19:58 +0000 (Wed, 21 Oct 2009)

Log Message:
-----------
Use GFORGE instead of $WikiTheme

Modified Paths:
--------------
    trunk/lib/CachedMarkup.php
    trunk/lib/plugin/PluginManager.php
    trunk/lib/plugin/UpLoad.php

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2009-10-21 05:57:01 UTC (rev 7228)
+++ trunk/lib/CachedMarkup.php	2009-10-21 06:19:58 UTC (rev 7229)
@@ -42,8 +42,7 @@
         // a single quote is entered in the Summary box:
         // - the history is wrong (user and comment missing)
         // - the table of contents plugin no longer works
-        global $WikiTheme;
-        if (isa($WikiTheme, 'WikiTheme_gforge')) {
+        if (defined('GFORGE') and GFORGE) {
             return serialize($this);
         }
 

Modified: trunk/lib/plugin/PluginManager.php
===================================================================
--- trunk/lib/plugin/PluginManager.php	2009-10-21 05:57:01 UTC (rev 7228)
+++ trunk/lib/plugin/PluginManager.php	2009-10-21 06:19:58 UTC (rev 7229)
@@ -86,8 +86,6 @@
 
     function _generateTableBody(&$info, &$dbi, &$request, &$table) {
 
-        global $WikiTheme;
-
         $plugin_dir = 'lib/plugin';
         if (defined('PHPWIKI_DIR'))
             $plugin_dir = PHPWIKI_DIR . "/$plugin_dir";
@@ -124,7 +122,7 @@
             // make a link if an actionpage exists
             $pluginNamelink = $pluginName;
             $pluginDocPageName = _("Help")."/" . $pluginName . "Plugin";
-            if (isa($WikiTheme, 'WikiTheme_gforge')) {
+            if (defined('GFORGE') and GFORGE) {
                 $pluginDocPageName = _("Help").":" . $pluginName . "Plugin";
             }
 
@@ -152,7 +150,7 @@
                     $pluginDocPageNamelink = WikiLink($pluginDocPageName,'if_known');
             }
 
-            if (isa($WikiTheme, 'WikiTheme_gforge')) {
+            if (defined('GFORGE') and GFORGE) {
                 $pluginDocPageNamelink = WikiLink($pluginDocPageName, 'known');
             }
 

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2009-10-21 05:57:01 UTC (rev 7228)
+++ trunk/lib/plugin/UpLoad.php	2009-10-21 06:19:58 UTC (rev 7229)
@@ -178,8 +178,7 @@
             // Make sure that the user is logged in.
             $user = $request->getUser();
             if (!$user->isAuthenticated()) {
-                global $WikiTheme;
-                if (isa($WikiTheme, 'WikiTheme_gforge')) {
+                if (defined('GFORGE') and GFORGE) {
                     $message->pushContent(HTML::div(array('class' => 'error'),
                                             HTML::p(_("You cannot upload files.")),
                                             HTML::ul(


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7228] trunk/admin/README

From: <var...@us...> - 2009-10-21 05:57:09

Revision: 7228
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7228&view=rev
Author:   vargenau
Date:     2009-10-21 05:57:01 +0000 (Wed, 21 Oct 2009)

Log Message:
-----------
Update for last version of converter:
- centered text and right-aligned text now work,
- five levels of titles are supported,
- <nowiki> and </nowiki> tags are supported.

Modified Paths:
--------------
    trunk/admin/README

Modified: trunk/admin/README
===================================================================
--- trunk/admin/README	2009-10-20 18:26:02 UTC (rev 7227)
+++ trunk/admin/README	2009-10-21 05:57:01 UTC (rev 7228)
@@ -53,40 +53,34 @@
   </form>
 
   This displays the result not in a wiki layout. However the omega layout can be tuned.
+== Open Office to Phpwiki converter
 
-!!! Open Office to Phpwiki converter
-
 Convert Open Office 2.3 (or later), Star Office, MS Word or MS Office Documents to Phpwiki.
 
-!! Installation
+=== Installation
 
 You first have to install (once for all) the Open Office to Phpwiki converter.
 
 To install the export filter:
-* Start Open Office 2.3 (or above)
-* From Tool choose "XML Filter Settings"
-* Choose "New" and in "General" fill the form with the following data:
-** Filter name: "Phpwiki"
-** Application: ~OpenOffice.org Writer (.odt)
-** Name of file type: "Phpwiki"
-** File extention: txt
-* Choose Transformation and fill the form with the following data:
-** XSLT for Export: put the full path to <strong>phpwiki/admin/odt2phpwiki.xsl</strong>
+* Start Open Office 2.3 (or later)
+* From //Tool// choose //XML Filter Settings//
+* Choose //New// and in //General// fill the form with the following data:
+** Filter name: //Phpwiki//
+** Application: //~OpenOffice.org Writer (.odt)//
+** Name of file type: //Phpwiki//
+** File extention: //txt//
+* Choose //Transformation// and fill the form with the following data:
+** //XSLT for Export//: put the full path to **phpwiki/admin/odt2phpwiki.xsl**
 
-!! Open Office Converter Usage
+=== Open Office Converter Usage
 
-Open your Word document in Open Office 2.3.
+Open your Word document in Open Office.
 
-Select ''Export...'' in the ''File'' menu, then select ''Phpwiki'' in ''File format'' menu.
+Select //Export...// in the //File// menu, then select //Phpwiki// in //File format// menu.
 
-You will get a text file (.txt). Copy and paste the content of this file in your wiki page.
+You will get a text file ({{{.txt}}}). Copy and paste the content of this file in your wiki page.
 
-Everything should work, except:
-* centered text and right-aligned text (will be left-aligned),
-* the wiki only supports 3 levels of titles,
-* tables will always be bordered (class="bordered"), regardless they are or not in Word; you might want to change this in the generated content,
-* some <nowiki> and </nowiki> tags might remain in the code.
-
-If there was a table of contents in your Word file, you can delete it and replace it with the ~CreateToc plugin (use the TOC button from the Edit Toolbar).
-
-You should also upload the images in your document.
+Please note the following:
+* Tables will always be bordered ({{{class="bordered"}}}), regardless they are or not in Word; you might want to change this in the generated content.
+* If there was a table of contents in your Word file, you can delete it and replace it with the ~CreateToc plugin (use the TOC button from the Edit Toolbar).
+* If there were images in your document, you should also upload them in the wiki.


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7227] trunk/lib/plugin/Video.php

From: <var...@us...> - 2009-10-20 18:26:17

Revision: 7227
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7227&view=rev
Author:   vargenau
Date:     2009-10-20 18:26:02 +0000 (Tue, 20 Oct 2009)

Log Message:
-----------
Upgrade Flowplayer to 3.1.4

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

Modified: trunk/lib/plugin/Video.php
===================================================================
--- trunk/lib/plugin/Video.php	2009-10-20 07:51:38 UTC (rev 7226)
+++ trunk/lib/plugin/Video.php	2009-10-20 18:26:02 UTC (rev 7227)
@@ -98,7 +98,7 @@
         if (preg_match("/'/", $url))
             return $this->error(fmt("Invalid argument %s", "url"));
 
-        $params = array("data" => SERVER_URL . $WikiTheme->_findData('flowplayer-3.1.3.swf'),
+        $params = array("data" => SERVER_URL . $WikiTheme->_findData('flowplayer-3.1.4.swf'),
                         "type"              => "application/x-shockwave-flash",
                         "width"             => $width,
                         "height"            => $height,


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

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

From: <var...@us...> - 2009-10-20 07:51:46

Revision: 7226
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7226&view=rev
Author:   vargenau
Date:     2009-10-20 07:51:38 +0000 (Tue, 20 Oct 2009)

Log Message:
-----------
Upgrade Flowplayer to 3.1.4

Added Paths:
-----------
    trunk/themes/default/flowplayer-3.1.4.swf
    trunk/themes/default/flowplayer.controls-3.1.4.swf

Removed Paths:
-------------
    trunk/themes/default/flowplayer-3.1.3.swf
    trunk/themes/default/flowplayer.controls-3.1.3.swf

Deleted: trunk/themes/default/flowplayer-3.1.3.swf
===================================================================
(Binary files differ)

Copied: trunk/themes/default/flowplayer-3.1.4.swf (from rev 7225, trunk/themes/default/flowplayer-3.1.3.swf)
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/flowplayer-3.1.4.swf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream
Added: svn:mergeinfo
   + 

Deleted: trunk/themes/default/flowplayer.controls-3.1.3.swf
===================================================================
(Binary files differ)

Copied: trunk/themes/default/flowplayer.controls-3.1.4.swf (from rev 7225, trunk/themes/default/flowplayer.controls-3.1.3.swf)
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/flowplayer.controls-3.1.4.swf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream
Added: svn:mergeinfo
   + 


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

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

From: <var...@us...> - 2009-10-19 19:25:43

Revision: 7225
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7225&view=rev
Author:   vargenau
Date:     2009-10-19 19:25:31 +0000 (Mon, 19 Oct 2009)

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

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

Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2009-10-19 19:20:22 UTC (rev 7224)
+++ trunk/locale/Makefile	2009-10-19 19:25:31 UTC (rev 7225)
@@ -18,7 +18,7 @@
 ${POT_FILE} : # dependencies are auto-generated by 'make depend' , see below
 	cp -f $@ $@~
 	xgettext -L PHP --from-code=iso-8859-1 -k_ -k__printf -k__sprintf -k__vsprintf -kfmt -o $@.extracted $^
-	sed -e's,; charset=CHARSET,; charset=iso-8859-1,' -i $@.extracted
+	sed -e's,; charset=CHARSET,; charset=iso-8859-1,' $@.extracted
 	msgmerge -o $@ $@~ $@.extracted && rm -f $@.extracted 
 
 # merge in place to keep unchanged timestamps
@@ -307,6 +307,7 @@
 ${POT_FILE}: ../lib/plugin/UriResolver.php
 ${POT_FILE}: ../lib/plugin/UserPreferences.php
 ${POT_FILE}: ../lib/plugin/UserRatings.php
+${POT_FILE}: ../lib/plugin/Video.php
 ${POT_FILE}: ../lib/plugin/VisualWiki.php
 ${POT_FILE}: ../lib/plugin/WantedPages.php
 ${POT_FILE}: ../lib/plugin/WantedPagesOld.php
@@ -397,14 +398,22 @@
 ${POT_FILE}: ../themes/Sidebar/hyperwiki.php
 ${POT_FILE}: ../themes/Sidebar/templates/actionbar.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/body.tmpl
-${POT_FILE}: ../themes/Sidebar/templates/browse-footer.tmpl
+${POT_FILE}: ../themes/Sidebar/templates/browse.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/calendar.tmpl
-${POT_FILE}: ../themes/Sidebar/templates/frame-footer.tmpl
-${POT_FILE}: ../themes/Sidebar/templates/frame-header.tmpl
+${POT_FILE}: ../themes/Sidebar/templates/content.tmpl
+${POT_FILE}: ../themes/Sidebar/templates/debug.tmpl
+${POT_FILE}: ../themes/Sidebar/templates/dump-footer.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/frame-left.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/frameset.tmpl
+${POT_FILE}: ../themes/Sidebar/templates/html.tmpl
+${POT_FILE}: ../themes/Sidebar/templates/htmldump.tmpl
+${POT_FILE}: ../themes/Sidebar/templates/logo.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/navbar.tmpl
+${POT_FILE}: ../themes/Sidebar/templates/ratings.tmpl
+${POT_FILE}: ../themes/Sidebar/templates/rc.tmpl
+${POT_FILE}: ../themes/Sidebar/templates/search.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/signin.tmpl
+${POT_FILE}: ../themes/Sidebar/templates/tags.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/top.tmpl
 ${POT_FILE}: ../themes/Sidebar/themeinfo.php
 ${POT_FILE}: ../themes/SpaceWiki/lib/RecentChanges.php
@@ -448,8 +457,6 @@
 ${POT_FILE}: ../themes/default/templates/dialog.tmpl
 ${POT_FILE}: ../themes/default/templates/editpage.tmpl
 ${POT_FILE}: ../themes/default/templates/forumadd.tmpl
-${POT_FILE}: ../themes/default/templates/frame-footer.tmpl
-${POT_FILE}: ../themes/default/templates/frame-header.tmpl
 ${POT_FILE}: ../themes/default/templates/frameset.tmpl
 ${POT_FILE}: ../themes/default/templates/head.tmpl
 ${POT_FILE}: ../themes/default/templates/homepage.tmpl
@@ -465,7 +472,6 @@
 ${POT_FILE}: ../themes/default/templates/savepage.tmpl
 ${POT_FILE}: ../themes/default/templates/search.tmpl
 ${POT_FILE}: ../themes/default/templates/signin.tmpl
-${POT_FILE}: ../themes/default/templates/toc.tmpl
 ${POT_FILE}: ../themes/default/templates/top.tmpl
 ${POT_FILE}: ../themes/default/templates/userprefs.tmpl
 ${POT_FILE}: ../themes/default/templates/viewsource.tmpl
@@ -473,14 +479,15 @@
 ${POT_FILE}: ../themes/default/templates/wikiforum.tmpl
 ${POT_FILE}: ../themes/default/themeinfo.php
 ${POT_FILE}: ../themes/gforge/templates/actionbar.tmpl
+${POT_FILE}: ../themes/gforge/templates/blogform.tmpl
 ${POT_FILE}: ../themes/gforge/templates/body.tmpl
+${POT_FILE}: ../themes/gforge/templates/bottom.tmpl
 ${POT_FILE}: ../themes/gforge/templates/browse-footer.tmpl
 ${POT_FILE}: ../themes/gforge/templates/browse.tmpl
+${POT_FILE}: ../themes/gforge/templates/debug.tmpl
 ${POT_FILE}: ../themes/gforge/templates/editpage.tmpl
-${POT_FILE}: ../themes/gforge/templates/head.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/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php	2009-10-19 19:20:22 UTC (rev 7224)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2009-10-19 19:25:31 UTC (rev 7225)
@@ -78,6 +78,8 @@
    "%s ist leer";
 $locale["%s is empty."] =
    "%s ist leer.";
+$locale["%s is listed at %s with %s"] =
+   "%s ist gelistet auf %s mit %s";
 $locale["%s is missing"] =
    "%s Argument fehlt";
 $locale["%s is not locked!"] =
@@ -142,6 +144,8 @@
    "»%s«: Datei korrumpiert";
 $locale["'s %d page ratings:"] =
    "s %d Seiten Bewertungen:";
+$locale["(%d Links)"] =
+   "(%d Verweise)";
 $locale["(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)"] =
    "(Kopieren Sie Ihre Veränderungen in die Zwischenablage. Sie können versuchen eine andere Seite zu edieren oder Ihr Text in einem Texteditor speichern.)";
 $locale["(Currently not working)"] =
@@ -296,6 +300,8 @@
    "Anwendungsname";
 $locale["Application size: %d Kb"] =
    "Anwendungsplatzbedarf: %d KB";
+$locale["Apply changes"] =
+   "Änderungen anwenden";
 $locale["Approve"] =
    "Akzeptieren";
 $locale["Are you sure you want to permanently change the markup type of the selected files?"] =
@@ -304,16 +310,18 @@
    "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?";
 $locale["Are you sure you want to permanently remove the selected files?"] =
    "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?";
-$locale["Are you sure you want to permanently search & replace text in the selected files?"] =
-   "Sind Sie sicher, dass Sie alle Wörter in den angegebenen Seiten ersetzen wollen?";
-$locale["Are you sure?"] =
-   "Sind Sie sicher?";
 $locale["Argument '%s' not declared by plugin."] =
    "Argument »%s« nicht im Zusatzprogramm deklariert.";
 $locale["Arguments"] =
    "Parameter";
 $locale["Attempting to use the directory '%s' instead."] =
    "Versuche stattdessen das Verzeichnis »%s« zu verwenden.";
+$locale["Attribute"] =
+   "Attribut";
+$locale["Attribute %s, base value: %s"] =
+   "Attribut %s, Basis: %s";
+$locale["Attribute %s, value: %s"] =
+   "Attribut %s, Wert: %s";
 $locale["Attributes of %s"] =
    "Attribute für %s";
 $locale["Auth Level"] =
@@ -372,6 +380,8 @@
    "Bogo Benutzer";
 $locale["Bold text"] =
    "Fetter Text";
+$locale["Bold text [alt-b]"] =
+   "Fetter Text [alt-f]";
 $locale["Browsing pages"] =
    "Das Durchblättern der Seiten dieses Wikis";
 $locale["CANCEL"] =
@@ -404,6 +414,8 @@
    "Abgebrochen";
 $locale["Cannot create directory '%s'"] =
    "Das Verzeichnis »%s« kann nicht erzeugt werden";
+$locale["Cannot create page with empty name!"] =
+   "Kann Seite mit leerem Namen nicht erzeugen";
 $locale["Cannot open AUTH_GROUP_FILE %s"] =
    "Kann AUTH_GROUP_FILE %s nicht öffnen";
 $locale["Case insensitive?"] =
@@ -456,6 +468,8 @@
    "Klicken um anzuzeigen";
 $locale["Click to display all comments"] =
    "Klicken um Kommentare anzuzeigen";
+$locale["Click to display to TOC"] =
+   "Klicken um TOC anzuzeigen";
 $locale["Click to hide the comments"] =
    "Klicken um Kommentare zu verstecken";
 $locale["Click to reverse sort order"] =
@@ -464,6 +478,10 @@
    "Sortiere nach %s";
 $locale["Close"] =
    "Schließen";
+$locale["Color"] =
+   "Farbe";
+$locale["Color text"] =
+   "Farbiger Text";
 $locale["Columns: %s."] =
    "Spalten: %s.";
 $locale["Comment"] =
@@ -498,6 +516,8 @@
    "(La)TeX-Dokument nach ein Bild erstellen. Dadurch konnte eine Formel in PhpWiki eingebettet worden.";
 $locale["Copyrights"] =
    "Urheberrechte";
+$locale["Could not connect to LDAP host %s"] =
+   "Kann nicht zu LDAP host »%s« verbinden";
 $locale["Couldn't change page '%s' to markup type '%s'."] =
    "Konnte die Formatierung der Seite '%s' nicht auf '%s' ändern.";
 $locale["Couldn't chmod page '%s' to '%s'."] =
@@ -531,7 +551,7 @@
 $locale["Created directory '%s' for the page dump..."] =
    "Ein Verzeichnis »%s« wurde erzeugt, um die Dateien abzulegen...";
 $locale["Creating pages"] =
-   "Das Seitenerzeugung in diesem Wiki";
+   "Neue Seiten erzeugen";
 $locale["Creator"] =
    "Erzeuger";
 $locale["Current Language"] =
@@ -542,6 +562,8 @@
    "Ihre Sprache: »%s«";
 $locale["Current theme: '%s'"] =
    "Ihre Benutzeroberfläche: »%s«";
+$locale["CurrentTime"] =
+   "AktuelleZeit";
 $locale["DB admin password:"] =
    "DB Admin passwort:";
 $locale["DB admin user:"] =
@@ -618,6 +640,8 @@
    "Für CVS herunterladen.";
 $locale["Download for backup"] =
    "Für Backup herunterladen";
+$locale["Download page contents"] =
+   "Runterladen der Seite";
 $locale["Downloading html zip dumps"] =
    "Das Herunterladen aller Wiki-Seiten als HTML-Dateien in einer Zip-Datei";
 $locale["Downloading zip dumps"] =
@@ -694,14 +718,20 @@
    "Liste aller Seiten durch Leerzeichen oder Komma getrennt. Reguläre Ausdrücke (fileglobbing) erlaubt.";
 $locale["Enter your UserId to sign in"] =
    "Tragen Sie bitte für die Anmeldung im Wiki Ihren Benutzernamen ein";
+$locale["Enumeration"] =
+   "Num. Liste";
 $locale["Error sending email with password for user %s."] =
    "Fehler beim Versenden der E-Mail mit dem neuen Passwort für Benutzer %s.";
+$locale["Error: Couldn't send %s to %s"] =
+   "Fehler: Konnte nicht %s an %s senden";
 $locale["Error: Empty search string."] =
    "Fehler: Leeres Suchwort.";
 $locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] =
    "Fehler: Ihre Homepage Seite muß ein gültiges WikiWord sein. Die BenutzerEinstellungen können deshalb leider nicht gespeichert werden.";
 $locale["Every"] =
    "Jeder";
+$locale["Exit toolbar"] =
+   "Beende Werkzeugleiste";
 $locale["External Links"] =
    "Externe Links";
 $locale["External link (remember http:// prefix)"] =
@@ -716,8 +746,14 @@
    "AUSGEBESSERT";
 $locale["FORBIDDEN"] =
    "VERBOTEN";
+$locale["Failed to bind LDAP host"] =
+   "Konnte nicht mit LDAP Host verbinden";
+$locale["Failed to connect to LDAP host"] =
+   "LDAP Server nicht gefunden";
 $locale["Fatal PhpWiki Error"] =
    "Fataler PhpWiki-Fehler";
+$locale["File '%s' not found."] =
+   "Datei '%s' nicht gefunden";
 $locale["File successfully uploaded."] =
    "Datei erfolgreich hochgeladen.";
 $locale["FileInfo"] =
@@ -732,6 +768,8 @@
    "FoafBetrachter";
 $locale["FoafViewerPlugin"] =
    "FoafViewerPlugin";
+$locale["Found by "] =
+   "Gefunden von ";
 $locale["FrameInclude"] =
    "FrameEinbetten";
 $locale["FrameIncludePlugin"] =
@@ -906,14 +944,20 @@
    "Ungültige Farbe: %s";
 $locale["Invalid image size"] =
    "Ungültige Bildgröße";
+$locale["Invalid pagename!"] =
+   "Ungültiger Seitenname!";
 $locale["Invalid password or userid."] =
    "Ungültiges Passwort oder falscher Benutzername.";
 $locale["Invalid password."] =
    "Ungültiges Passwort.";
+$locale["Invalid username '%s' for LDAP Auth"] =
+   "Ungültiger Benutzername »%s« für LDAP Auth";
 $locale["Invalid username."] =
    "Ungültiger Benutzername.";
 $locale["Italic text"] =
    "Kursiver Text";
+$locale["Italic text [alt-i]"] =
+   "Kursiver Text [alt-k]";
 $locale["JabberPresence"] =
    "JabberAnwesend";
 $locale["Keep up to %d major edits, but keep them no longer than %d days."] =
@@ -952,16 +996,24 @@
    "ÄhnlicheSeiten";
 $locale["Line %s does not begin with a '|'."] =
    "Zeile %s beginnt nicht mit '|'.";
+$locale["Link"] =
+   "Verweis";
 $locale["Link to page"] =
    "Link auf Seite";
 $locale["LinkDatabase"] =
    "LinkDatenbank";
 $locale["LinkIcons"] =
    "LinksIcons";
+$locale["LinkSearch"] =
+   "LinkSuche";
 $locale["Links"] =
    "Links";
+$locale["List"] =
+   "Liste";
 $locale["List PageHistory for %s"] =
    "Das Änderungsprotokoll für %s auflisten";
+$locale["List all new pages per month per user"] =
+   "Liste aller neuen Seiten pro Monat und Benutzer";
 $locale["List all once authenticated users."] =
    "Liste alle eingetragenen Benutzer.";
 $locale["List all page revisions edited by one user with diff links, or show a PageHistory-like list of a single page for only one user."] =
@@ -990,8 +1042,10 @@
    "Auflistung aller Seiten und Unterseiten";
 $locale["ListPages"] =
    "ListeSeiten";
+$locale["ListRelations"] =
+   "ListeRelationen";
 $locale["ListSubpages"] =
-   "UnterseitenListe";
+   "ListeUnterseiten";
 $locale["Lists referenced page names which do not exist yet."] =
    "Zeige verlinkte Seiten, die noch nicht bearbeitet bzw. erzeugt wurden.";
 $locale["Lists the names of all SubPages of the current page."] =
@@ -1007,7 +1061,7 @@
 $locale["Loading InterWikiMap from external file %s."] =
    "Die InterWikiListe wird von der externen Datei %s geladen.";
 $locale["Loading files"] =
-   "Das Dateienladen in diesem Wiki";
+   "Dateien hinaufladen";
 $locale["Loading up virgin wiki"] =
    "Lade neue Seiten in das frische Wiki";
 $locale["Lock"] =
@@ -1019,7 +1073,7 @@
 $locale["Locked"] =
    "Gesperrt";
 $locale["Locking pages"] =
-   "Das Seitensperrung in diesem Wiki";
+   "Seiten sperren";
 $locale["Login"] =
    "Anmelden";
 $locale["MIME file %s"] =
@@ -1054,6 +1108,8 @@
    "Fehlender %s für %s";
 $locale["Missing PagePermission:"] =
    "Fehlende Zugriffsberechtigung:";
+$locale["Missing ldap extension"] =
+   "Fehlende php LDAP extension";
 $locale["ModeratedPage"] =
    "ModerierteSeite";
 $locale["ModeratedPage Notification Error: Couldn't send email"] =
@@ -1078,6 +1134,8 @@
    "Neues Thema";
 $locale["New comment."] =
    "Neuer Kommentar.";
+$locale["New entry"] =
+   "Neuer Eintrag";
 $locale["New page"] =
    "Neue Seite";
 $locale["New password"] =
@@ -1102,6 +1160,8 @@
    "Keine Kommentare gefunden.";
 $locale["No empty, unreferenced pages were found."] =
    "Keine leeren, unverlinkten Seiten gefunden.";
+$locale["No metadata for %s"] =
+   "Keine Meta-Daten für %s";
 $locale["No or not enough GROUP_DB SQL statements defined"] =
    "Keine oder zu wenige GROUP_DB SQL Statements definiert";
 $locale["No or unsupported GROUP_METHOD defined"] =
@@ -1208,10 +1268,12 @@
    "Seitennamen mit Endwort »%s«";
 $locale["Page now locked."] =
    "Seite jetzt gesperrt.";
+$locale["Page now not-public."] =
+   "Seite jetzt nicht mehr öffentlich freigegeben.";
+$locale["Page now public."] =
+   "Seite jetzt öffentlich freigegeben.";
 $locale["Page now unlocked."] =
    "Seite jetzt freigegeben.";
-$locale["Page removed %s"] =
-   "Seite gelöscht %s";
 $locale["Page rename %s to %s"] =
    "Seite »%s« nach umbenennen »%s«";
 $locale["Page statistics"] =
@@ -1220,6 +1282,8 @@
    "Datei erfolgreich geändert.";
 $locale["PageChange Notification Error: Couldn't send %s to %s"] =
    "SeitenÄnderung Benachrichtigung Fehler: Konnte %s nicht an %s senden";
+$locale["PageChange Notification of %s"] =
+   "SeitenÄnderung Benachrichtigung von %s";
 $locale["PageChange Notification of %s sent to %s"] =
    "SeitenÄnderung Benachrichtigung von %s an %s gesendet";
 $locale["PageDump"] =
@@ -1244,6 +1308,8 @@
    "Verlaufsprotokoll für Seite %s";
 $locale["PageInfo"] =
    "SeitenInfo";
+$locale["PageName|optional label"] =
+   "SeitenName|optionaler Name";
 $locale["PageTrail Plugin"] =
    "PageTrail Plugin";
 $locale["Pagedata size: %d Kb"] =
@@ -1382,12 +1448,18 @@
    "Gespeicherten HTML Cache dieser Seite löschen und beim nächsten Aufruf neu generieren.";
 $locale["Purge Markup Cache"] =
    "HTML-Cachedatei Säubern";
+$locale["Purge Page"] =
+   "Seiten endgültig löschen";
 $locale["Purge all Pages With Invalid Names"] =
    "Alle Seiten mit ungültigen Namen endgültig entfernen";
 $locale["Purge all empty, unreferenced Pages"] =
    "Alle leeren Seiten endgültig entfernen, die nicht verlinkt sind.";
+$locale["Purge this page"] =
+   "Lösche diese Seite endgültig";
 $locale["PurgeHtmlCache"] =
    "HtmlCacheSäubern";
+$locale["Purging pages"] =
+   "Das Durchblättern der Seiten dieses Wikis";
 $locale["Querying backend directly for '%s'"] =
    "DB Debug Informationen von der Seite »%s«";
 $locale["Quick Search"] =
@@ -1408,6 +1480,8 @@
    "HTML-Befehle sind in diesem Wiki außer Kraft gesetzt.";
 $locale["RawHtmlPlugin"] =
    "RawHtmlPlugin";
+$locale["Reason: "] =
+   "Grund: ";
 $locale["Recent Comments"] =
    "Neueste Kommentare";
 $locale["Recent Edits"] =
@@ -1426,16 +1500,12 @@
    "Alle BackLinks für %s (rekursiv)";
 $locale["Redirect"] =
    "Weiterleiten";
-$locale["Redirect to an external url"] =
-   "Weiterleitung zu einer externen Webseite";
 $locale["RedirectTo"] =
    "WeiterLeiten";
 $locale["RedirectToPlugin"] =
    "WeiterLeitenPlugin";
 $locale["Redirects to an external web site based on form input"] =
    "Weiterleitung der Suche zu einer externen Webseite aufgrund einer Formulareingabe";
-$locale["Redirects to another url or page."] =
-   "Weiterleitung zu einer externen Webseite oder localer Seite.";
 $locale["References"] =
    "Fußnoten";
 $locale["Regex?"] =
@@ -1452,6 +1522,10 @@
    "Verwandte Links";
 $locale["RelatedChanges"] =
    "VerlinkteÄnderungen";
+$locale["Relation %s to page %s"] =
+   "Relation %s zu Seite %s";
+$locale["Relations"] =
+   "Relationen";
 $locale["Remove"] =
    "Löschen";
 $locale["Remove Page"] =
@@ -1460,20 +1534,22 @@
    "Ausgewählte Seiten löschen";
 $locale["Remove this page"] =
    "Löschen der Seite";
-$locale["Removed by: %s"] =
-   "Gelöscht von: %s";
 $locale["Removed page '%s' successfully."] =
    "Seite »%s« erfolgreich gelöscht.";
 $locale["Removing pages"] =
    "Die Seitenlöschung in diesem Wiki";
 $locale["Rename"] =
    "Umbenennen";
+$locale["Rename Page"] =
+   "Seite Umbenennen";
 $locale["Rename selected pages"] =
    "Ausgewählte Seiten umbenennen";
 $locale["Rename to"] =
    "Umbennen zu";
 $locale["Renamed page '%s' to '%s'."] =
    "Seite '%s' auf '%s' umbenannt.";
+$locale["Replace"] =
+   "Ersetze";
 $locale["Replace all occurences of the given string in the content of all pages."] =
    "Ersetze alle Wörter in den angegebenen Seiten.";
 $locale["Replace with"] =
@@ -1506,6 +1582,8 @@
    "ErweiterteTabellenPlugin";
 $locale["SOAP access"] =
    "SOAP-Zugriff";
+$locale["Sample table"] =
+   "Beispieltabelle";
 $locale["SandBox"] =
    "SandKasten";
 $locale["Save"] =
@@ -1526,10 +1604,10 @@
    "Durchsuche ein LDAP Verzeichnis";
 $locale["Search and replace text in selected wiki pages."] =
    "Suche und ersetze Text in den gewählten Seiten.";
+$locale["Search for"] =
+   "Suche nach";
 $locale["Search for page titles similar to %s."] =
    "Suche nach Seitentitel die ähnlich klingen wie %s.";
-$locale["Search string '%s' not found in content of page '%s'."] =
-   "Das Suchwort '%s' wurde nicht in der Seite '%s' gefunden.";
 $locale["Search the content of all pages in this wiki."] =
    "Den Text aller Seiten dieses Wikis durchsuchen.";
 $locale["Search the titles of all pages in this wiki."] =
@@ -1650,6 +1728,10 @@
    "Statistik über %s.";
 $locale["Status:"] =
    "Gültigkeit:";
+$locale["Strike"] =
+   "Durchstreichen";
+$locale["Strike-through text"] =
+   "Durchgestrichen";
 $locale["String \"%s\" not found."] =
    "Zeichenkette \"%s\" nicht gefunden.";
 $locale["SubPages of %s:"] =
@@ -1662,6 +1744,8 @@
    "Land eingeben";
 $locale["Subpage"] =
    "Unterseite";
+$locale["Substring \"\\1\" found \\2 times. Replace with \"\\3\"?"] =
+   "Substring \"\\1\" \\2 mal gefunden. Ersetze mit \"\\3\"?";
 $locale["Summary"] =
    "Zusammenfassung";
 $locale["Supplanted on:"] =
@@ -1684,8 +1768,14 @@
    "Keine Syntax angegeben.";
 $locale["SyntaxHighlighter"] =
    "SyntaxHervorhebung";
+$locale["Table of Contents"] =
+   "Inhaltsverzeichnis";
+$locale["Table of content"] =
+   "Inhaltsverzeichnis";
 $locale["Template"] =
-   "Benutzeroberfläche";
+   "Vorlage";
+$locale["Template Name"] =
+   "Vorlagenname";
 $locale["TermsOfUse"] =
    "BenutzungsBedingungen";
 $locale["TextFormattingRules"] =
@@ -1766,10 +1856,18 @@
    "Diese Seite wurde vom Systemadministrator gesperrt und kann nicht bearbeitet werden.";
 $locale["This page has been locked by the administrator so your changes can not be saved."] =
    "Diese Seite wurde vom Administrator für die allgemeine Bearbeitung gesperrt. Ihre Änderungen können deshalb nicht gespeichert werden.";
+$locale["Those"] =
+   "Diese";
 $locale["Time Zone"] =
    "Zeitzone";
 $locale["Title"] =
    "Titel";
+$locale["Title 1"] =
+   "Titel 1";
+$locale["Title 2"] =
+   "Titel 2";
+$locale["Title 3"] =
+   "Titel 3";
 $locale["Title Search"] =
    "TitelSuche";
 $locale["Title search results for '%s'"] =
@@ -1888,6 +1986,8 @@
    "Das Hochladen von ZIP-Dumps in diesem Wiki";
 $locale["Use old markup"] =
    "Alte Formatierungssyntax verwenden";
+$locale["User not found in LDAP"] =
+   "Benutzer in LDAP nicht gefunden";
 $locale["User page"] =
    "Benutzer Seite";
 $locale["User statistics"] =
@@ -2016,8 +2116,12 @@
    "Wikiname regexp";
 $locale["With the current offset, this would be reported as %s."] =
    "Mit dem eingegebenen Zeit-Unterschied, würde die Zeit %s angezeigt.";
+$locale["Wk"] =
+   "Cw";
 $locale["Wrong password. Try again."] =
    "Falsches Password. Noch einmal eingeben.";
+$locale["Wrong password: "] =
+   "Falsches Password: ";
 $locale["XML-RPC access"] =
    "XML-RPC Zugriff";
 $locale["Yes"] =
@@ -2180,6 +2284,10 @@
    "Start Seite";
 $locale["hours"] =
    "Stunden";
+$locale["http://www.example.com|optional label"] =
+   "http://www.example.com|optionaler Name";
+$locale["incoming"] =
+   "eingehend";
 $locale["invalid %s ignored"] =
    "ungültiges %s ignoriert";
 $locale["invalid argument %s"] =
@@ -2234,6 +2342,10 @@
    "älter als die bestehende Seite.";
 $locale["only %d pages displayed"] =
    "nur %d Seiten angezeigt";
+$locale["outgoing"] =
+   "ausgehend";
+$locale["page not locked"] =
+   "Seite nicht gesperrt";
 $locale["page permission inherited from %s"] =
    "Zugriffsrecht geerbt von %s";
 $locale["plain file %s"] =
@@ -2242,6 +2354,8 @@
    "Vorgänger zur vorherigen größeren Änderung";
 $locale["previous revision"] =
    "vorige Neubearbeitung";
+$locale["purge this page"] =
+   "um diese Seite endgültig zu löschen";
 $locale["recursive inclusion of page %s"] =
    "Fehler beim Einbetten der Seite %s: Rekursiver Selbstaufruf der Seite";
 $locale["recursive inclusion of page %s ignored"] =
@@ -2250,8 +2364,12 @@
    "Fehler beim Aufruf der Seite %s: Rekursion (sich selbst aufrufend)";
 $locale["remove this page"] =
    "um diese Seite zu löschen";
+$locale["rename this page"] =
+   "um diese Seite umzubennen";
 $locale["renamed from %s"] =
    "umbenannt von %s";
+$locale["reverse"] =
+   "umdrehen";
 $locale["revert to a previous version of this page"] =
    "Zurückspeichern einer älteren Version dieser Seite.";
 $locale["revert to version %d"] =
@@ -2264,6 +2382,8 @@
    "gespeichert als ";
 $locale["saved as %s"] =
    "gespeichert als %s";
+$locale["sent to %s"] =
+   "an %s gesendet";
 $locale["stddev: %2.3f"] =
    "Standardabweichung: %2.3f";
 $locale["the file '%s'"] =
@@ -2288,6 +2408,8 @@
    "um einen ZIP-Speicherauszug in dieses Wiki zu laden";
 $locale["uploaded %s"] =
    "%s wurde hochgeladen";
+$locale["use"] =
+   "benutze";
 $locale["use this plugin"] =
    "um diese Zusatzprogramme zu verwenden";
 $locale["users"] =

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

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/es/LC_MESSAGES/phpwiki.php	2009-10-19 19:20:22 UTC (rev 7224)
+++ trunk/locale/es/LC_MESSAGES/phpwiki.php	2009-10-19 19:25:31 UTC (rev 7225)
@@ -392,6 +392,8 @@
    "Contraseña o userid inválida.";
 $locale["Invalid password."] =
    "Contraseña inválido.";
+$locale["Invalid username '%s' for LDAP Auth"] =
+   "Username inválido ' %s' para LDAP Auth";
 $locale["Invalid username."] =
    "Username inválido.";
 $locale["Italic text"] =
@@ -538,8 +540,6 @@
    "Página bloqueada.";
 $locale["Page now unlocked."] =
    "Página desbloquear.";
-$locale["Page removed %s"] =
-   "Página borrar %s";
 $locale["Page rename %s to %s"] =
    "La página retitula %s a %s";
 $locale["Page successfully updated."] =
@@ -624,8 +624,6 @@
    "Borrar Página";
 $locale["Remove this page"] =
    "Quite esta página";
-$locale["Removed by: %s"] =
-   "Borrar par: %s";
 $locale["Removed page '%s' successfully."] =
    "Página '%s' borrada satisfactoriamente.";
 $locale["Removing pages"] =

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

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2009-10-19 19:20:22 UTC (rev 7224)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2009-10-19 19:25:31 UTC (rev 7225)
@@ -258,8 +258,6 @@
    "AjouterDesCommentaires";
 $locale["AddCommentPlugin"] =
    "AjoutDesCommentaires";
-$locale["AddImage"] =
-   "Ajouter l'image";
 $locale["AddPageLink"] =
    "AjouterDesPagesLien";
 $locale["AddPlugin"] =
@@ -324,10 +322,6 @@
    "Supprimer la page maintenant";
 $locale["Are you sure you want to permanently remove the selected files?"] =
    "Êtes-vous certain de vouloir supprimer définitivement les fichiers sélectionnés ?";
-$locale["Are you sure you want to permanently search & replace text in the selected files?"] =
-   "Etes-vous sur de vouloir rechercher et remplacer dans les fichiers sélectionnées ?";
-$locale["Are you sure?"] =
-   "Êtes-vous sûr ?";
 $locale["Argument '%s' not declared by plugin."] =
    "argument '%s' non déclaré par le plugin.";
 $locale["Arguments"] =
@@ -680,6 +674,8 @@
    "Adresse électronique";
 $locale["E-mail Notification"] =
    "Courriel de notification";
+$locale["ERROR: No email defined! You need to do this in your "] =
+   "ERREUR : pas d'adresse électronique definie! Vous devez le faire dans vos ";
 $locale["Easy navigation buttons for %s"] =
    "Boutons de navigation rapide pour %s";
 $locale["Edit"] =
@@ -958,6 +954,8 @@
    "Mot de passe ou identifiant d'utilisateur invalide.";
 $locale["Invalid password."] =
    "Mauvais mot de passe.";
+$locale["Invalid username '%s' for LDAP Auth"] =
+   "Mot de identifiant d'utilisateur '%s' pour LDAP Auth invalide.";
 $locale["Invalid username."] =
    "Identifiant d'utilisateur invalide.";
 $locale["Italic text"] =
@@ -1320,8 +1318,6 @@
    "La page est maintenant déverrouillée.";
 $locale["Page once only"] =
    "Une seule fois la page";
-$locale["Page removed %s"] =
-   "Page enlevée %s";
 $locale["Page rename %s to %s"] =
    "retitrez la page de '%s' à '%s'";
 $locale["Page statistics"] =
@@ -1568,16 +1564,12 @@
    "Obtenir récursivement des RétroLiens ou liens";
 $locale["Redirect"] =
    "Redirection";
-$locale["Redirect to an external url"] =
-   "Redirige vers une url d'un site extérieur";
 $locale["RedirectTo"] =
    "RedirigerVers";
 $locale["RedirectToPlugin"] =
    "PluginRedirection";
 $locale["Redirects to an external web site based on form input"] =
    "Redirige vers un site externe basé sur un formulaire";
-$locale["Redirects to another url or page."] =
-   "Redirige vers une autre url ou page.";
 $locale["References"] =
    "Références";
 $locale["Regex?"] =
@@ -1608,8 +1600,6 @@
    "Supprimer les pages sélectionnées";
 $locale["Remove this page"] =
    "Supprimer la page";
-$locale["Removed by: %s"] =
-   "Enlevé près : %s";
 $locale["Removed page '%s' successfully."] =
    "Page '%s' supprimée avec succès.";
 $locale["Removing pages"] =
@@ -1678,8 +1668,6 @@
    "Chercher";
 $locale["Search for page titles similar to %s."] =
    "Rechercher le titre de page similaire à %s.";
-$locale["Search string '%s' not found in content of page '%s'."] =
-   "La chaîne '%s' ne se trouve pas dans la page '%s'.";
 $locale["Search the content of all pages in this wiki."] =
    "Rechercher le contenu de toutes les pages de ce wiki.";
 $locale["Search the titles of all pages in this wiki."] =
@@ -2346,8 +2334,6 @@
    "récupération des pages HTML";
 $locale["dump serial pages"] =
    "récupération des pages sérialisées";
-$locale["e-mail address confirmation"] =
-   "Vérification de l'adresse électronique";
 $locale["edit area"] =
    "Zone d'édition";
 $locale["edit this page"] =

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

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/it/LC_MESSAGES/phpwiki.php	2009-10-19 19:20:22 UTC (rev 7224)
+++ trunk/locale/it/LC_MESSAGES/phpwiki.php	2009-10-19 19:25:31 UTC (rev 7225)
@@ -272,8 +272,6 @@
    "Pagina bloccata.";
 $locale["Page now unlocked."] =
    "Pagina sbloccata.";
-$locale["Page removed %s"] =
-   "Pagina rimosso %s";
 $locale["Page rename %s to %s"] =
    "La pagina cambia titolo %s a %s";
 $locale["PageChange Notification Error: Couldn't send %s to %s"] =
@@ -328,8 +326,6 @@
    "Cancella la Pagina";
 $locale["Remove this page"] =
    "Rimuovi la pagina";
-$locale["Removed by: %s"] =
-   "Rimosso vicino: %s";
 $locale["Removed page '%s' successfully."] =
    "La pagina '%s' è stata rimossa correttamente.";
 $locale["Removing pages"] =

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

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

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/nl/LC_MESSAGES/phpwiki.php	2009-10-19 19:20:22 UTC (rev 7224)
+++ trunk/locale/nl/LC_MESSAGES/phpwiki.php	2009-10-19 19:25:31 UTC (rev 7225)
@@ -94,8 +94,6 @@
    "Sidan är Låst";
 $locale["Page Name"] =
    "Pagina Naam";
-$locale["Page removed %s"] =
-   "Verwijder %s";
 $locale["PageHistory"] =
    "PaginaGeschiedenis";
 $locale["PhpWikiAdministration"] =
@@ -124,8 +122,6 @@
    "UitgaveNoten";
 $locale["Remove Page"] =
    "Verwijder Pagina";
-$locale["Removed by: %s"] =
-   "Verwijder von: %s";
 $locale["Removed page '%s' successfully."] =
    "Pagina '%s' verwijderd.";
 $locale["Return to %s"] =

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2009-10-19 19:20:22 UTC (rev 7224)
+++ trunk/locale/po/de.po	2009-10-19 19:25:31 UTC (rev 7225)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-04 01:30+0200\n"
+"POT-Creation-Date: 2009-10-19 21:20+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -16,26 +16,26 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/CachedMarkup.php:537
+#: ../lib/CachedMarkup.php:538
 msgid "BAD semantic relation link"
 msgstr ""
 
-#: ../lib/CachedMarkup.php:505
+#: ../lib/CachedMarkup.php:570
 #, php-format
 msgid "Attribute %s, base value: %s"
 msgstr "Attribut %s, Basis: %s"
 
-#: ../lib/CachedMarkup.php:506
+#: ../lib/CachedMarkup.php:571
 #, php-format
 msgid "Attribute %s, value: %s"
 msgstr "Attribut %s, Wert: %s"
 
-#: ../lib/CachedMarkup.php:514
+#: ../lib/CachedMarkup.php:579
 #, php-format
 msgid "Relation %s to page %s"
 msgstr "Relation %s zu Seite %s"
 
-#: ../lib/CachedMarkup.php:633
+#: ../lib/CachedMarkup.php:634
 msgid "Found by "
 msgstr "Gefunden von "
 
@@ -89,7 +89,7 @@
 msgstr "Zeichenkette \"%s\" nicht gefunden."
 
 #: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:258
-#: ../lib/EditToolbar.php:259 ../lib/plugin/WikiAdminSearchReplace.php:204
+#: ../lib/EditToolbar.php:259 ../lib/plugin/WikiAdminSearchReplace.php:199
 msgid "Search & Replace"
 msgstr "Suchen & Ersetzen"
 
@@ -115,7 +115,7 @@
 
 #: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:325
 #: ../lib/EditToolbar.php:372 ../lib/EditToolbar.php:402
-#: ../lib/EditToolbar.php:436 ../lib/EditToolbar.php:471
+#: ../lib/EditToolbar.php:434 ../lib/EditToolbar.php:469
 msgid "Close"
 msgstr "Schließen"
 
@@ -209,7 +209,7 @@
 msgstr "Inhaltsverzeichnis"
 
 #: ../lib/EditToolbar.php:197 ../lib/PageList.php:511
-#: ../lib/plugin/AuthorHistory.php:162 ../lib/plugin/WantedPagesOld.php:151
+#: ../lib/plugin/AuthorHistory.php:157 ../lib/plugin/WantedPagesOld.php:151
 msgid "Page Name"
 msgstr "Seitenname"
 
@@ -223,7 +223,7 @@
 msgstr "Vorlagenname"
 
 #: ../lib/EditToolbar.php:203 ../lib/plugin/PopularTags.php:64
-#: ../lib/plugin/Template.php:62
+#: ../lib/plugin/Template.php:61
 msgid "Template"
 msgstr "Vorlage"
 
@@ -254,8 +254,8 @@
 msgstr "Kategorien einfügen (Doppelklick)"
 
 #: ../lib/EditToolbar.php:324 ../lib/EditToolbar.php:371
-#: ../lib/EditToolbar.php:401 ../lib/EditToolbar.php:435
-#: ../lib/EditToolbar.php:470
+#: ../lib/EditToolbar.php:401 ../lib/EditToolbar.php:433
+#: ../lib/EditToolbar.php:468
 msgid "Insert"
 msgstr "Einfügen"
 
@@ -275,19 +275,21 @@
 msgid "Insert PageLink (double-click)"
 msgstr "SeitenLink einfügen (Doppelklick)"
 
-#: ../lib/EditToolbar.php:430 ../lib/EditToolbar.php:431
-msgid "AddImage"
+#: ../lib/EditToolbar.php:428 ../lib/EditToolbar.php:429
+#, fuzzy
+msgid "Add Image or Video"
 msgstr "Bild einfügen"
 
-#: ../lib/EditToolbar.php:433
-msgid "Insert Image (double-click)"
+#: ../lib/EditToolbar.php:431
+#, fuzzy
+msgid "Insert Image or Video (double-click)"
 msgstr "Bild einfügen (Doppelklick)"
 
-#: ../lib/EditToolbar.php:465 ../lib/EditToolbar.php:466
+#: ../lib/EditToolbar.php:463 ../lib/EditToolbar.php:464
 msgid "AddTemplate"
 msgstr "NeueVorlage"
 
-#: ../lib/EditToolbar.php:468
+#: ../lib/EditToolbar.php:466
 msgid "Insert Template (double-click)"
 msgstr "Vorlage einfügen (Doppelklick)"
 
@@ -296,25 +298,25 @@
 msgid "%s: error while handling error:"
 msgstr "%s: Fehler während der Fehlerbehandlung von:"
 
-#: ../lib/FileFinder.php:191 ../lib/loadsave.php:1150
+#: ../lib/FileFinder.php:191 ../lib/loadsave.php:1154
 #, php-format
 msgid "%s: file not found"
 msgstr "»%s«: Datei nicht gefunden"
 
-#: ../lib/IniConfig.php:860
+#: ../lib/IniConfig.php:859
 msgid "CategoryGroup"
 msgstr "KategorieGruppen"
 
 # (namenlos=unbenannt; depends on interpretation)
-#: ../lib/IniConfig.php:862
+#: ../lib/IniConfig.php:861
 msgid "An unnamed PhpWiki"
 msgstr "Unbenanntes PhpWiki"
 
-#: ../lib/IniConfig.php:864 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:863 ../lib/upgrade.php:70
 #: ../themes/Wordpress/templates/actionbar.tmpl:19
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:132
-#: ../themes/gforge/templates/navbar.tmpl:9
+#: ../themes/gforge/templates/navbar.tmpl:8
 msgid "HomePage"
 msgstr "StartSeite"
 
@@ -322,64 +324,58 @@
 msgid "Invalid [] syntax ignored"
 msgstr "Ungültige [] syntax ignoriert"
 
-#: ../lib/InlineParser.php:891
+#: ../lib/InlineParser.php:890
 #, php-format
 msgid "unknown color %s ignored"
 msgstr "unbekannte Farbe %s ignoriert"
 
-#: ../lib/MailNotify.php:194
+#: ../lib/MailNotify.php:196
 #, php-format
 msgid "PageChange Notification of %s"
 msgstr "SeitenÄnderung Benachrichtigung von %s"
 
-#: ../lib/MailNotify.php:227
+#: ../lib/MailNotify.php:230
 #, php-format
 msgid "sent to %s"
 msgstr "an %s gesendet"
 
-#: ../lib/MailNotify.php:233
+#: ../lib/MailNotify.php:236
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "Fehler: Konnte nicht %s an %s senden"
 
-#: ../lib/MailNotify.php:255
+#: ../lib/MailNotify.php:258
 msgid "Page change"
 msgstr "Seiten Änderung"
 
-#: ../lib/MailNotify.php:282 ../lib/loadsave.php:966
+#: ../lib/MailNotify.php:285 ../lib/loadsave.php:972
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Neue Seite"
 
 # (Wrong Translation; sorry, but the German term for edit is NOT
 # editieren, but  e d i e r e n).
-#: ../lib/MailNotify.php:286 ../lib/MailNotify.php:304 ../lib/loadsave.php:96
+#: ../lib/MailNotify.php:289 ../lib/MailNotify.php:305 ../lib/loadsave.php:96
 #, php-format
 msgid "Edited by: %s"
 msgstr "Bearbeitet von: %s"
 
-#: ../lib/MailNotify.php:305
+#: ../lib/MailNotify.php:306
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "Seite »%s« nach umbenennen »%s«"
 
-# (Wrong Translation; sorry, but the German term for edit is NOT
-# editieren, but  e d i e r e n).
-#: ../lib/MailNotify.php:342
-#, php-format
-msgid "Removed by: %s"
-msgstr "Gelöscht von: %s"
-
-#: ../lib/MailNotify.php:344
-#, php-format
-msgid "Page removed %s"
+#: ../lib/MailNotify.php:343
+#, fuzzy, php-format
+msgid "User %s removed page %s"
 msgstr "Seite gelöscht %s"
 
-#: ../lib/MailNotify.php:393
-msgid "e-mail address confirmation"
+#: ../lib/MailNotify.php:379
+#, fuzzy
+msgid "E-Mail address confirmation"
 msgstr "E-Mail Bestätigung"
 
-#: ../lib/MailNotify.php:396
+#: ../lib/MailNotify.php:382
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -416,7 +412,7 @@
 msgid "Click to de-/select all pages"
 msgstr "Klicken Sie um alle/keine Seiten auszuwählen"
 
-#: ../lib/PageList.php:385 ../lib/plugin/IncludePage.php:178
+#: ../lib/PageList.php:385 ../lib/plugin/IncludePage.php:187
 #, php-format
 msgid " ... first %d bytes"
 msgstr " ... erste %d Bytes"
@@ -431,12 +427,12 @@
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
-#: ../lib/PageList.php:649 ../lib/plugin/FullTextSearch.php:119
+#: ../lib/PageList.php:649 ../lib/plugin/FullTextSearch.php:120
 msgid "<no matches>"
 msgstr "<nichts gefunden>"
 
-#: ../lib/PageList.php:1145 ../lib/plugin/FullTextSearch.php:90
-#: ../lib/plugin/WikiAdminSearchReplace.php:188
+#: ../lib/PageList.php:1145 ../lib/plugin/FullTextSearch.php:91
+#: ../lib/plugin/WikiAdminSearchReplace.php:184
 msgid "Content"
 msgstr "Inhalt"
 
@@ -456,7 +452,7 @@
 #: ../lib/PageList.php:1169 ../themes/Crao/templates/editpage.tmpl:37
 #: ../themes/Wordpress/templates/editpage.tmpl:38
 #: ../themes/default/templates/editpage.tmpl:39
-#: ../themes/gforge/templates/editpage.tmpl:39
+#: ../themes/gforge/templates/editpage.tmpl:35
 msgid "Size"
 msgstr "Größe"
 
@@ -465,8 +461,8 @@
 msgid "Last Summary"
 msgstr "Letzte Zusammenfassung"
 
-#: ../lib/PageList.php:1174 ../lib/plugin/AuthorHistory.php:121
-#: ../lib/plugin/AuthorHistory.php:164 ../lib/plugin/PluginManager.php:78
+#: ../lib/PageList.php:1174 ../lib/plugin/AuthorHistory.php:116
+#: ../lib/plugin/AuthorHistory.php:159 ../lib/plugin/PluginManager.php:78
 msgid "Version"
 msgstr "Version"
 
@@ -488,7 +484,7 @@
 #: ../themes/Wordpress/templates/editpage.tmpl:61
 #: ../themes/default/templates/editpage.tmpl:80
 #: ../themes/default/templates/info.tmpl:128
-#: ../themes/gforge/templates/editpage.tmpl:66
+#: ../themes/gforge/templates/editpage.tmpl:62
 msgid "Locked"
 msgstr "Gesperrt"
 
@@ -496,7 +492,7 @@
 msgid "locked"
 msgstr "gesperrt"
 
-#: ../lib/PageList.php:1190 ../themes/gforge/templates/editpage.tmpl:71
+#: ../lib/PageList.php:1190 ../themes/gforge/templates/editpage.tmpl:67
 #, fuzzy
 msgid "External"
 msgstr "Externe Links"
@@ -518,7 +514,12 @@
 msgid "Markup"
 msgstr "Quelltext"
 
-#: ../lib/PageList.php:1476 ../lib/plugin/WantedPagesOld.php:178
+#: ../lib/PageList.php:1365 ../lib/PageList.php:1372 ../lib/PageList.php:1378
+#: ../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
 #, php-format
 msgid "Columns: %s."
 msgstr "Spalten: %s."
@@ -526,11 +527,11 @@
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
 #: ../lib/PagePerm.php:190 ../lib/PagePerm.php:191 ../lib/loadsave.php:85
-#: ../lib/loadsave.php:459 ../lib/loadsave.php:1027 ../lib/loadsave.php:1033
-#: ../lib/loadsave.php:1041 ../lib/main.php:1052 ../lib/main.php:1164
-#: ../lib/main.php:1176 ../lib/plugin/WikiAdminRename.php:142
-#: ../lib/plugin/WikiAdminSelect.php:222 ../themes/Crao/templates/head.tmpl:79
-#: ../themes/Crao/templates/head.tmpl:80
+#: ../lib/loadsave.php:465 ../lib/loadsave.php:1033 ../lib/loadsave.php:1039
+#: ../lib/loadsave.php:1047 ../lib/main.php:1056 ../lib/main.php:1174
+#: ../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
@@ -540,9 +541,7 @@
 #: ../themes/default/templates/head.tmpl:88
 #: ../themes/default/templates/head.tmpl:89
 #: ../themes/default/templates/navbar.tmpl:42
-#: ../themes/gforge/templates/head.tmpl:86
-#: ../themes/gforge/templates/head.tmpl:87
-#: ../themes/gforge/templates/navbar.tmpl:21
+#: ../themes/gforge/templates/navbar.tmpl:20
 #: ../themes/shamino_com/templates/actionbar.tmpl:18
 #: ../themes/smaller/templates/navbar.tmpl:19
 #: ../themes/wikilens/templates/head.tmpl:78
@@ -551,96 +550,96 @@
 msgid "PhpWikiAdministration"
 msgstr "PhpWikiSystemverwalten"
 
-#: ../lib/PagePerm.php:190 ../lib/main.php:1075
-#: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:265
+#: ../lib/PagePerm.php:190 ../lib/main.php:1085
+#: ../lib/plugin/WikiAdminRename.php:148 ../lib/plugin/WikiAdminRename.php:273
 #: ../themes/gforge/templates/actionbar.tmpl:114
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminSearchReplace.php:243
+#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminSearchReplace.php:237
 msgid "Replace"
 msgstr "Ersetze"
 
-#: ../lib/PagePerm.php:313
+#: ../lib/PagePerm.php:321
 msgid "List this page and all subpages"
 msgstr "Auflistung aller Seiten und Unterseiten"
 
-#: ../lib/PagePerm.php:314
+#: ../lib/PagePerm.php:322
 msgid "View this page and all subpages"
 msgstr "Anzeige aller Seiten und Unterseiten"
 
-#: ../lib/PagePerm.php:315
+#: ../lib/PagePerm.php:323
 msgid "Edit this page and all subpages"
 msgstr "Bearbeiten aller Seiten und Unterseiten"
 
 # Erzeugen??
-#: ../lib/PagePerm.php:316
+#: ../lib/PagePerm.php:324
 msgid "Create a new (sub)page"
 msgstr "Erzeuge eine neue (Unter)Seite"
 
-#: ../lib/PagePerm.php:317
+#: ../lib/PagePerm.php:325
 msgid "Download page contents"
 msgstr "Runterladen der Seite"
 
-#: ../lib/PagePerm.php:318
+#: ../lib/PagePerm.php:326
 msgid "Change page attributes"
 msgstr "Ändern von Eigenschaften"
 
-#: ../lib/PagePerm.php:319
+#: ../lib/PagePerm.php:327
 msgid "Remove this page"
 msgstr "Löschen der Seite"
 
-#: ../lib/PagePerm.php:320
+#: ../lib/PagePerm.php:328
 msgid "Purge this page"
 msgstr "Lösche diese Seite endgültig"
 
-#: ../lib/PagePerm.php:369
+#: ../lib/PagePerm.php:377
 #, php-format
 msgid "Unsupported ACL access type %s ignored."
 msgstr "Nicht unterstützter ACL Zugiffsmodus %s ignoriert."
 
-#: ../lib/PagePerm.php:597
+#: ../lib/PagePerm.php:605
 msgid "Access"
 msgstr "Zugriff"
 
-#: ../lib/PagePerm.php:599
+#: ../lib/PagePerm.php:607
 msgid "Group/User"
 msgstr "Gruppe/Benutzer"
 
-#: ../lib/PagePerm.php:600
+#: ../lib/PagePerm.php:608
 msgid "Grant"
 msgstr "Erlaube"
 
-#: ../lib/PagePerm.php:601
+#: ../lib/PagePerm.php:609
 msgid "Del/+"
 msgstr "Lö/+"
 
-#: ../lib/PagePerm.php:602 ../lib/plugin/PluginManager.php:78
-#: ../lib/plugin/WikiAdminSetAcl.php:258
+#: ../lib/PagePerm.php:610 ../lib/plugin/PluginManager.php:78
+#: ../lib/plugin/WikiAdminSetAcl.php:257
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../lib/PagePerm.php:623
+#: ../lib/PagePerm.php:631
 msgid "Add this ACL"
 msgstr "Füge diese ACL hinzu"
 
-#: ../lib/PagePerm.php:647
+#: ../lib/PagePerm.php:655
 msgid "Allow / Deny"
 msgstr "Erlaube / Sperre"
 
-#: ../lib/PagePerm.php:659
+#: ../lib/PagePerm.php:667
 msgid "Delete this ACL"
 msgstr "Lösche diese ACL"
 
-#: ../lib/PagePerm.php:685
+#: ../lib/PagePerm.php:693
 msgid "add "
 msgstr "hinzufügen "
 
-#: ../lib/PagePerm.php:689
+#: ../lib/PagePerm.php:697
 msgid "Check to add this ACL"
 msgstr "Anklicken um diese ACL hinzuzufügen"
 
-#: ../lib/PageType.php:136 ../lib/loadsave.php:902 ../lib/loadsave.php:1553
+#: ../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
@@ -654,7 +653,7 @@
 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:784
+#: ../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
@@ -668,7 +667,7 @@
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../lib/PageType.php:298 ../lib/loadsave.php:1162
+#: ../lib/PageType.php:298 ../lib/loadsave.php:1166
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr "Die InterWikiListe wird von der externen Datei %s geladen."
@@ -684,11 +683,11 @@
 # (Im Wortsinne heißt das eigentlich: "jüngste = eben gemachte
 # Änderungen"; in terms of newspapers or journalism it's traditionally
 # "NeuesteNachrichten" or much more better "DasNeueste").
-#: ../lib/RSSWriter091.php:113 ../lib/display.php:145 ../lib/display.php:375
-#: ../lib/loadsave.php:1572 ../lib/plugin/RecentChanges.php:62
+#: ../lib/RSSWriter091.php:113 ../lib/display.php:148 ../lib/display.php:383
+#: ../lib/loadsave.php:1578 ../lib/plugin/RecentChanges.php:62
 #: ../lib/plugin/RecentChanges.php:210 ../lib/plugin/RecentChanges.php:217
-#: ../lib/plugin/RecentChanges.php:386 ../lib/plugin/RecentChanges.php:668
-#: ../lib/plugin/RecentChanges.php:1147 ../themes/Crao/templates/head.tmpl:63
+#: ../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
@@ -699,8 +698,7 @@
 #: ../themes/default/templates/head.tmpl:69
 #: ../themes/default/templates/head.tmpl:71
 #: ../themes/default/templates/navbar.tmpl:16
-#: ../themes/gforge/templates/head.tmpl:69
-#: ../themes/gforge/templates/navbar.tmpl:10
+#: ../themes/gforge/templates/navbar.tmpl:9
 #: ../themes/shamino_com/templates/top.tmpl:20
 #: ../themes/smaller/templates/navbar.tmpl:7
 #: ../themes/wikilens/templates/head.tmpl:60
@@ -708,39 +706,39 @@
 msgid "RecentChanges"
 msgstr "NeuesteÄnderungen"
 
-#: ../lib/Request.php:716 ../lib/Request.php:719
+#: ../lib/Request.php:717 ../lib/Request.php:720
 msgid "Upload error: file too big"
 msgstr ""
 
-#: ../lib/Request.php:722
+#: ../lib/Request.php:723
 msgid "Upload error: file only partially received"
 msgstr ""
 
-#: ../lib/Request.php:725
+#: ../lib/Request.php:726
 msgid "Upload error: no file selected"
 msgstr ""
 
-#: ../lib/Request.php:728
+#: ../lib/Request.php:729
 msgid "Upload error: unknown error #"
 msgstr ""
 
-#: ../lib/Request.php:837 ../lib/main.php:1287 ../lib/main.php:1300
+#: ../lib/Request.php:838 ../lib/main.php:1297 ../lib/main.php:1310
 #, php-format
 msgid "%s is not writable."
 msgstr "%s is nicht änderbar."
 
-#: ../lib/Request.php:837
+#: ../lib/Request.php:838
 msgid "The PhpWiki access log file"
 msgstr "Die PhpWiki Zugriffslog Datei"
 
-#: ../lib/Request.php:839 ../lib/main.php:1290
+#: ../lib/Request.php:840 ../lib/main.php:1300
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
 "Bitte überprüfen Sie, dass %s änderbar ist, oder ändern Sie %s in config/"
 "config.ini."
 
-#: ../lib/Request.php:840
+#: ../lib/Request.php:841
 #, php-format
 msgid "the file '%s'"
 msgstr "die Datei %s"
@@ -763,8 +761,8 @@
 msgid "%4d  %s\n"
 msgstr "%4d  %s\n"
 
-#: ../lib/TextSearchQuery.php:115 ../lib/display.php:182
-#: ../lib/display.php:413 ../lib/plugin/FileInfo.php:129
+#: ../lib/TextSearchQuery.php:115 ../lib/display.php:185
+#: ../lib/display.php:422 ../lib/plugin/FileInfo.php:129
 #, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr "Nicht unterstütztes Argument: %s=%s"
@@ -773,31 +771,31 @@
 msgid "(A|An|And|But|By|For|From|In|Is|It|Of|On|Or|The|To|With)"
 msgstr ""
 
-#: ../lib/WikiDB.php:560
+#: ../lib/WikiDB.php:569
 #, php-format
 msgid "renamed from %s"
 msgstr "umbenannt von %s"
 
-#: ../lib/WikiDB.php:569
+#: ../lib/WikiDB.php:578
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr "WikiDB::renamePage() für dieses Backend noch nicht implementiert"
 
-#: ../lib/WikiDB.php:942
+#: ../lib/WikiDB.php:955
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr "%s: Datum dieser aktuellen Neubearbeitung ist %s"
 
-#: ../lib/WikiDB.php:1014 ../lib/main.php:98
+#: ../lib/WikiDB.php:1028 ../lib/main.php:99
 msgid "Optimizing database"
 msgstr "Datenbank wird optimiert"
 
-#: ../lib/WikiDB.php:1654 ../lib/WikiDB.php:1658
+#: ../lib/WikiDB.php:1679 ../lib/WikiDB.php:1683
 #: ../themes/default/templates/homepage.tmpl:7
 #, php-format
 msgid "Describe %s here."
 msgstr "Beschreiben Sie %s hier."
 
-#: ../lib/WikiDB.php:1693
+#: ../lib/WikiDB.php:1718
 #, php-format
 msgid "Oops! Revision %s of %s seems to have been deleted!"
 msgstr "Hoppla! Es scheint, die Version %s von %s wurde gelöscht!"
@@ -885,7 +883,7 @@
 msgid "No or not enough GROUP_DB SQL statements defined"
 msgstr "Keine oder zu wenige GROUP_DB SQL Statements definiert"
 
-#: ../lib/WikiGroup.php:838 ../lib/loadsave.php:1145
+#: ../lib/WikiGroup.php:838 ../lib/loadsave.php:1149
 #, php-format
 msgid "%s: not defined"
 msgstr "%s: nicht definiert"
@@ -960,95 +958,94 @@
 msgid "Image map expired. Reload wiki page to recreate its html part."
 msgstr ""
 
-#: ../lib/WikiTheme.php:438
+#: ../lib/WikiTheme.php:443
 msgid "Never edited"
 msgstr "Noch nie bearbeitet."
 
-#: ../lib/WikiTheme.php:445
+#: ../lib/WikiTheme.php:450
 #, php-format
 msgid "%s at %s"
 msgstr "%s um %s"
 
-#: ../lib/WikiTheme.php:449
+#: ../lib/WikiTheme.php:454
 #, 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:451
+#: ../lib/WikiTheme.php:456
 #, php-format
 msgid "Last edited %s"
 msgstr "Zuletzt geändert %s"
 
-#: ../lib/WikiTheme.php:460
+#: ../lib/WikiTheme.php:465
 #, php-format
 msgid "Version %s, saved on %s"
 msgstr "Version %s. gespeichert am %s"
 
-#: ../lib/WikiTheme.php:462
+#: ../lib/WikiTheme.php:467
 #, php-format
 msgid "Last edited on %s"
 msgstr "Zuletzt bearbeitet am %s"
 
-#: ../lib/WikiTheme.php:478
+#: ../lib/WikiTheme.php:483
 msgid "today"
 msgstr "heute"
 
-#: ../lib/WikiTheme.php:485
+#: ../lib/WikiTheme.php:490
 msgid "yesterday"
 msgstr "gestern"
 
-#: ../lib/WikiTheme.php:506 ../lib/WikiTheme.php:508
+#: ../lib/WikiTheme.php:511 ../lib/WikiTheme.php:513
 #, php-format
 msgid "Owner: %s"
 msgstr "Besitzer: %s"
 
-#: ../lib/WikiTheme.php:521 ../lib/WikiTheme.php:523 ../lib/diff.php:261
+#: ../lib/WikiTheme.php:526 ../lib/WikiTheme.php:528 ../lib/diff.php:261
 #: ../lib/plugin/Diff.php:75
 #, php-format
 msgid "by %s"
 msgstr "von %s"
 
-#: ../lib/WikiTheme.php:615
+#: ../lib/WikiTheme.php:620
 #, php-format
 msgid "Empty link to: %s"
 msgstr "Leerer Link zu: %s"
 
-#: ../lib/WikiTheme.php:630 ../themes/MacOSX/themeinfo.php:71
+#: ../lib/WikiTheme.php:635 ../themes/MacOSX/themeinfo.php:71
 #, php-format
 msgid "Create: %s"
 msgstr "Erzeugen: %s"
 
-#: ../lib/WikiTheme.php:649
+#: ../lib/WikiTheme.php:654
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:674
+#: ../lib/WikiTheme.php:679
 #, php-format
 msgid "'%s': Bad page name"
 msgstr "»%s«: Ungültiger Seitenname"
 
-#: ../lib/WikiTheme.php:1024 ../lib/plugin/WatchPage.php:93
+#: ../lib/WikiTheme.php:1029 ../lib/plugin/WatchPage.php:93
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/MonoBook/templates/actionbar.tmpl:34
 #: ../themes/Sidebar/templates/actionbar.tmpl:20
 #: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:60
-#: ../themes/default/templates/actionbar.tmpl:19
-#: ../themes/default/templates/actionbar.tmpl:20
+#: ../themes/default/templates/actionbar.tmpl:16
 #: ../themes/gforge/templates/actionbar.tmpl:54
 #: ../themes/shamino_com/templates/actionbar.tmpl:6
 #: ../themes/smaller/templates/actionbar.tmpl:18
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../lib/WikiTheme.php:1025 ../lib/plugin/Diff.php:37
+#: ../lib/WikiTheme.php:1030 ../lib/plugin/Diff.php:37
 #: ../themes/blog/themeinfo.php:61
 msgid "Diff"
 msgstr "Diff"
 
-#: ../lib/WikiTheme.php:1026 ../themes/Crao/templates/signin.tmpl:14
+#: ../lib/WikiTheme.php:1031 ../themes/Crao/templates/signin.tmpl:14
 #: ../themes/Crao/templates/signin.tmpl:30
 #: ../themes/Wordpress/templates/signin.tmpl:17
 #: ../themes/Wordpress/templates/signin.tmpl:33
@@ -1061,66 +1058,66 @@
 msgid "Sign Out"
 msgstr "Abmelden"
 
-#: ../lib/WikiTheme.php:1027 ../lib/WikiUser.php:228
-#: ../lib/WikiUserNew.php:503 ../themes/Crao/templates/signin.tmpl:53
-#: ../themes/default/templates/login.tmpl:80
+#: ../lib/WikiTheme.php:1032 ../lib/WikiUser.php:228
+#: ../lib/WikiUserNew.php:504 ../themes/Crao/templates/signin.tmpl:53
+#: ../themes/default/templates/login.tmpl:87
 #: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr "Anmelden"
 
-#: ../lib/WikiTheme.php:1028
+#: ../lib/WikiTheme.php:1033
 msgid "Rename Page"
 msgstr "Seite Umbenennen"
 
-#: ../lib/WikiTheme.php:1029 ../themes/MacOSX/themeinfo.php:133
+#: ../lib/WikiTheme.php:1034 ../themes/MacOSX/themeinfo.php:133
 msgid "Lock Page"
 msgstr "Seite Sperren"
 
-#: ../lib/WikiTheme.php:1030 ../themes/MacOSX/themeinfo.php:134
+#: ../lib/WikiTheme.php:1035 ../themes/MacOSX/themeinfo.php:134
 msgid "Unlock Page"
 msgstr "Seite Freigeben"
 
-#: ../lib/WikiTheme.php:1031 ../lib/removepage.php:22 ../lib/removepage.php:59
+#: ../lib/WikiTheme.php:1036 ../lib/removepage.php:22 ../lib/removepage.php:56
 msgid "Remove Page"
 msgstr "Seite Löschen"
 
-#: ../lib/WikiTheme.php:1032 ../lib/purgepage.php:22 ../lib/purgepage.php:59
+#: ../lib/WikiTheme.php:1037 ../lib/purgepage.php:22 ../lib/purgepage.php:56
 msgid "Purge Page"
 msgstr "Seiten endgültig löschen"
 
-#: ../lib/WikiTheme.php:1197
+#: ../lib/WikiTheme.php:1202
 msgid ""
 "Some action(page) wanted to add more headers, but they were already printed."
 msgstr ""
 
-#: ../lib/WikiTheme.php:1279 ../themes/Hawaiian/themeinfo.php:28
-#: ../themes/MacOSX/themeinfo.php:102 ../themes/MonoBook/themeinfo.php:132
+#: ../lib/WikiTheme.php:1284 ../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
 #: ../themes/wikilens/themeinfo.php:26
 msgid "Printer"
 msgstr "Drucker"
 
-#: ../lib/WikiTheme.php:1280 ../themes/MacOSX/themeinfo.php:103
-#: ../themes/MonoBook/themeinfo.php:133 ../themes/shamino_com/themeinfo.php:55
+#: ../lib/WikiTheme.php:1285 ../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:1281 ../themes/Hawaiian/themeinfo.php:29
-#: ../themes/MonoBook/themeinfo.php:134 ../themes/Portland/themeinfo.php:59
+#: ../lib/WikiTheme.php:1286 ../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:1446 ../lib/main.php:1110
-#: ../lib/plugin/RecentChanges.php:795 ../lib/plugin/TitleSearch.php:44
+#: ../lib/WikiTheme.php:1453 ../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/Sidebar/templates/search.tmpl:9
+#: ../themes/Sidebar/templates/search.tmpl:12
 #: ../themes/default/templates/search.tmpl:3
 #: ../themes/default/templates/search.tmpl:9
 #: ../themes/default/templates/search.tmpl:33
@@ -1129,50 +1126,49 @@
 msgid "TitleSearch"
 msgstr "TitelSuche"
 
-#: ../lib/WikiTheme.php:1498 ../lib/WikiUser.php:478
+#: ../lib/WikiTheme.php:1505 ../lib/WikiUser.php:478
 #: ../lib/plugin/Calendar.php:41 ../lib/plugin/Calendar.php:45
-#: ../themes/Crao/templates/head.tmpl:89
+#: ../themes/Crao/templates/head.tmpl:90
 #: ../themes/Crao/templates/navbar.tmpl:28
 #: ../themes/Wordpress/templates/actionbar.tmpl:32
 #: ../themes/blog/templates/sidebar.tmpl:16
 #: ../themes/default/templates/head.tmpl:98
 #: ../themes/default/templates/homepage.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:32
-#: ../themes/gforge/templates/head.tmpl:96
 #: ../themes/wikilens/templates/head.tmpl:89
 #: ../themes/wikilens/templates/navbar.tmpl:25
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../lib/WikiTheme.php:1777
+#: ../lib/WikiTheme.php:1784
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Zusatzprogramm %s: undefiniert"
 
-#: ../lib/WikiTheme.php:1800
+#: ../lib/WikiTheme.php:1807
 msgid "Related Links"
 msgstr "Verwandte Links"
 
-#: ../lib/WikiTheme.php:1821
+#: ../lib/WikiTheme.php:1828
 msgid "External Links"
 msgstr "Externe Links"
 
 #: ../lib/WikiUser.php:195 ../lib/WikiUser.php:275
 #: ../lib/WikiUser/AdoDb.php:31 ../lib/WikiUser/AdoDb.php:188
 #: ../lib/WikiUser/Db.php:43 ../lib/WikiUser/File.php:58
-#: ../lib/WikiUser/IMAP.php:18 ../lib/WikiUser/LDAP.php:124
+#: ../lib/WikiUser/IMAP.php:18 ../lib/WikiUser/LDAP.php:125
 #: ../lib/WikiUser/POP3.php:17 ../lib/WikiUser/PdoDb.php:30
 #: ../lib/WikiUser/PdoDb.php:105 ../lib/WikiUser/PearDb.php:27
-#: ../lib/WikiUser/PearDb.php:117 ../lib/WikiUserNew.php:613
+#: ../lib/WikiUser/PearDb.php:117 ../lib/WikiUserNew.php:614
 msgid "Invalid username."
 msgstr "Ungültiger Benutzername."
 
-#: ../lib/WikiUser.php:199 ../lib/WikiUserNew.php:654
+#: ../lib/WikiUser.php:199 ../lib/WikiUserNew.php:656
 msgid "Invalid password or userid."
 msgstr "Ungültiges Passwort oder falscher Benutzername."
 
 # (wörtlich=unzureichende Erlaubnisse)
-#: ../lib/WikiUser.php:201 ../lib/WikiUserNew.php:670
+#: ../lib/WikiUser.php:201 ../lib/WikiUserNew.php:672
 msgid "Insufficient permissions."
 msgstr "Keine ausreichenden Zugangsrechte."
 
@@ -1211,7 +1207,6 @@
 msgstr "KategorieHomepage"
 
 #:...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[7224] trunk/locale/po/de.po

From: <var...@us...> - 2009-10-19 19:20:30

Revision: 7224
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7224&view=rev
Author:   vargenau
Date:     2009-10-19 19:20:22 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
Repair broken UTF-8 characters

Modified Paths:
--------------
    trunk/locale/po/de.po

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2009-10-19 15:11:50 UTC (rev 7223)
+++ trunk/locale/po/de.po	2009-10-19 19:20:22 UTC (rev 7224)
@@ -277,11 +277,11 @@
 
 #: ../lib/EditToolbar.php:430 ../lib/EditToolbar.php:431
 msgid "AddImage"
-msgstr "Bild einf\xFCgen"
+msgstr "Bild einfügen"
 
 #: ../lib/EditToolbar.php:433
 msgid "Insert Image (double-click)"
-msgstr "Bild einf\xFCgen (Doppelklick)"
+msgstr "Bild einfügen (Doppelklick)"
 
 #: ../lib/EditToolbar.php:465 ../lib/EditToolbar.php:466
 msgid "AddTemplate"
@@ -330,7 +330,7 @@
 #: ../lib/MailNotify.php:194
 #, php-format
 msgid "PageChange Notification of %s"
-msgstr "Seiten\xC4nderung Benachrichtigung von %s"
+msgstr "SeitenÄnderung Benachrichtigung von %s"
 
 #: ../lib/MailNotify.php:227
 #, php-format
@@ -592,7 +592,7 @@
 
 #: ../lib/PagePerm.php:320
 msgid "Purge this page"
-msgstr "L\xF6sche diese Seite endg\xFCltig"
+msgstr "Lösche diese Seite endgültig"
 
 #: ../lib/PagePerm.php:369
 #, php-format
@@ -1086,7 +1086,7 @@
 
 #: ../lib/WikiTheme.php:1032 ../lib/purgepage.php:22 ../lib/purgepage.php:59
 msgid "Purge Page"
-msgstr "Seiten endg\xFCltig l\xF6schen"
+msgstr "Seiten endgültig löschen"
 
 #: ../lib/WikiTheme.php:1197
 msgid ""
@@ -1284,7 +1284,7 @@
 #: ../lib/WikiUser/LDAP.php:197
 #, php-format
 msgid "Could not connect to LDAP host %s"
-msgstr "Kann nicht zu LDAP host \xBB%s\xAB verbinden"
+msgstr "Kann nicht zu LDAP host »%s« verbinden"
 
 #: ../lib/WikiUser/POP3.php:61
 #, php-format
@@ -1395,7 +1395,7 @@
 
 #: ../lib/WysiwygEdit/Wikiwyg.php:69
 msgid "Apply changes"
-msgstr "\xC4nderungen anwenden"
+msgstr "Änderungen anwenden"
 
 #: ../lib/WysiwygEdit/Wikiwyg.php:70
 msgid "Exit toolbar"
@@ -1647,11 +1647,11 @@
 
 #: ../lib/editpage.php:259
 msgid "Page now public."
-msgstr "Seite jetzt \xF6ffentlich freigegeben."
+msgstr "Seite jetzt öffentlich freigegeben."
 
 #: ../lib/editpage.php:260
 msgid "Page now not-public."
-msgstr "Seite jetzt nicht mehr \xF6ffentlich freigegeben."
+msgstr "Seite jetzt nicht mehr öffentlich freigegeben."
 
 #: ../lib/editpage.php:269
 #, fuzzy
@@ -1973,7 +1973,7 @@
 
 #: ../lib/loadsave.php:896
 msgid "Invalid pagename!"
-msgstr "Ung\xFCltiger Seitenname!"
+msgstr "Ungültiger Seitenname!"
 
 #: ../lib/loadsave.php:959
 #, php-format
@@ -2257,7 +2257,7 @@
 
 #: ../lib/main.php:563
 msgid "purge this page"
-msgstr "um diese Seite endg\xFCltig zu l\xF6schen"
+msgstr "um diese Seite endgültig zu löschen"
 
 #: ../lib/main.php:564
 msgid "remove this page"
@@ -2499,7 +2499,7 @@
 #: ../lib/plugin/AllPages.php:95
 #, fuzzy, php-format
 msgid "List of pages last edited by [%s] ({total} total):"
-msgstr "Liste der Seiten zuletzt ge\xE4ndert von [%s] (%d insgesamt):"
+msgstr "Liste der Seiten zuletzt geändert von [%s] (%d insgesamt):"
 
 #: ../lib/plugin/AllPages.php:106
 #, fuzzy, php-format
@@ -3018,7 +3018,7 @@
 #: ../lib/plugin/EditMetaData.php:132
 #, php-format
 msgid "No metadata for %s"
-msgstr "Keine Meta-Daten f\xFCr %s"
+msgstr "Keine Meta-Daten für %s"
 
 #: ../lib/plugin/EditMetaData.php:146
 msgid ""


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

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

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

Revision: 7223
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7223&view=rev
Author:   vargenau
Date:     2009-10-19 15:11:50 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
Add template usage

Modified Paths:
--------------
    trunk/themes/default/templates/categorypage.tmpl
    trunk/themes/default/templates/forumadd.tmpl

Modified: trunk/themes/default/templates/categorypage.tmpl
===================================================================
--- trunk/themes/default/templates/categorypage.tmpl	2009-10-19 14:37:50 UTC (rev 7222)
+++ trunk/themes/default/templates/categorypage.tmpl	2009-10-19 15:11:50 UTC (rev 7223)
@@ -1,5 +1,6 @@
 <?php
   rcs_id('$Id$');
+  // This template is used for the CategoryPage plugin.
 ?>
 <div class="categorypage categorypage-form">
 

Modified: trunk/themes/default/templates/forumadd.tmpl
===================================================================
--- trunk/themes/default/templates/forumadd.tmpl	2009-10-19 14:37:50 UTC (rev 7222)
+++ trunk/themes/default/templates/forumadd.tmpl	2009-10-19 15:11:50 UTC (rev 7223)
@@ -1,7 +1,7 @@
 <?php
   rcs_id('$Id$');
+  // This template is used for the WikiForum plugin.
 ?>
-
 <div class="wikiforum wikiforum-reply">
 <form action="<?=$request->getPostURL()?>" method="post" class="wikiaction"
       accept-charset="<?=CHARSET?>">
@@ -25,4 +25,3 @@
   </table>
 </form>
 </div>
-


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

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

From: <var...@us...> - 2009-10-19 14:38:00

Revision: 7222
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7222&view=rev
Author:   vargenau
Date:     2009-10-19 14:37:50 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
Remove unused templates

Removed Paths:
-------------
    trunk/themes/Sidebar/templates/frame-footer.tmpl
    trunk/themes/Sidebar/templates/frame-header.tmpl
    trunk/themes/default/templates/frame-footer.tmpl
    trunk/themes/default/templates/frame-header.tmpl
    trunk/themes/default/templates/toc.tmpl

Deleted: trunk/themes/Sidebar/templates/frame-footer.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/frame-footer.tmpl	2009-10-19 13:56:46 UTC (rev 7221)
+++ trunk/themes/Sidebar/templates/frame-footer.tmpl	2009-10-19 14:37:50 UTC (rev 7222)
@@ -1,17 +0,0 @@
-<?php  // -*-html-*-
-/* $Id$
- *
- * This template is responsible mainly for the outer level <html> stuff.
- */
-printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<?= Template('head') ?>
-<body>
-<hr class="printer" noshade="noshade" />
-<p class="editdate"><?= $WikiTheme->getLastModifiedMessage($revision) ?></p>
-<?= Template('bottom') ?>
-</body>
-</html>
\ No newline at end of file

Deleted: trunk/themes/Sidebar/templates/frame-header.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/frame-header.tmpl	2009-10-19 13:56:46 UTC (rev 7221)
+++ trunk/themes/Sidebar/templates/frame-header.tmpl	2009-10-19 14:37:50 UTC (rev 7222)
@@ -1,22 +0,0 @@
-<?php  // -*-html-*-
-/* $Id$
- *
- * This template is responsible mainly for the outer level <html> stuff.
- */
-printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<?= Template('head') ?>
-<body>
-<div align="right" id="logo"><a class="wikilink"
-                  href="<?=WikiURL(HOME_PAGE)?>" target="_top"
-                  ><img src="<?=$WikiTheme->getImageURL('logo')?>" id="logo-img"
-                        border="0" alt="<?=fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>"
-                        align="right" /></a></div>
-
-<!-- Page title -->
-<h1><?= $HEADER ?></h1>
-</body>
-</html>
\ No newline at end of file

Deleted: trunk/themes/default/templates/frame-footer.tmpl
===================================================================
--- trunk/themes/default/templates/frame-footer.tmpl	2009-10-19 13:56:46 UTC (rev 7221)
+++ trunk/themes/default/templates/frame-footer.tmpl	2009-10-19 14:37:50 UTC (rev 7222)
@@ -1,16 +0,0 @@
-<?php  // -*-html-*-
-/* $Id$
- *
- * This template is responsible mainly for the outer level <html> stuff.
- */
-printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<?= Template('head') ?>
-<body>
-<?= Template('browse-footer') ?>
-<?= Template('bottom') ?>
-</body>
-</html>

Deleted: trunk/themes/default/templates/frame-header.tmpl
===================================================================
--- trunk/themes/default/templates/frame-header.tmpl	2009-10-19 13:56:46 UTC (rev 7221)
+++ trunk/themes/default/templates/frame-header.tmpl	2009-10-19 14:37:50 UTC (rev 7222)
@@ -1,13 +0,0 @@
-<?php  // -*-html-*-
-/* $Id$
- *
- * This template is responsible mainly for the outer level <html> stuff.
- */
-printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<?= Template('head') ?>
-<body><?= Template('top') ?></body>
-</html>

Deleted: trunk/themes/default/templates/toc.tmpl
===================================================================
--- trunk/themes/default/templates/toc.tmpl	2009-10-19 13:56:46 UTC (rev 7221)
+++ trunk/themes/default/templates/toc.tmpl	2009-10-19 14:37:50 UTC (rev 7222)
@@ -1 +0,0 @@
-<table class="toc"><tr><th class="toc">Table of Contents <script type="text/javascript">showTocToggle("+","-")</script></th></tr><tr id="tocinside"><td class="toc"><div class="toc1">&middot;<a href="#dokuwiki" class="toc">DokuWiki</a></div><div class="toc2">&middot;<a href="#download" class="toc">Download</a></div><div class="toc2">&middot;<a href="#read_more" class="toc">Read More</a></div><div class="toc2">&middot;<a href="#copyright" class="toc">Copyright</a></div></td></tr></table>


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7221] trunk/themes/gforge/templates/info.tmpl

From: <var...@us...> - 2009-10-19 13:56:53

Revision: 7221
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7221&view=rev
Author:   vargenau
Date:     2009-10-19 13:56:46 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
Allow DebugInfo only if DEBUG is true

Modified Paths:
--------------
    trunk/themes/gforge/templates/info.tmpl

Modified: trunk/themes/gforge/templates/info.tmpl
===================================================================
--- trunk/themes/gforge/templates/info.tmpl	2009-10-19 12:57:39 UTC (rev 7220)
+++ trunk/themes/gforge/templates/info.tmpl	2009-10-19 13:56:46 UTC (rev 7221)
@@ -11,7 +11,7 @@
     <?=$SEP?><?= Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?>
     <?=$SEP?><?= Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?>
     <?=$SEP?><?= Button("PageDump", _("PageDump")) ?>
-  <?php if ((defined('DEBUG') && DEBUG) || $user->isAdmin()) { ?>
+  <?php if (defined('DEBUG') && DEBUG) { ?>
     <?=$SEP?><?= Button("DebugInfo", _("DebugInfo")) ?>
 <?php
     $PurgeCache = Button(array('nocache' => 'purge'),


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7220] trunk/themes/gforge/themeinfo.php

From: <var...@us...> - 2009-10-19 12:57:51

Revision: 7220
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7220&view=rev
Author:   vargenau
Date:     2009-10-19 12:57:39 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
removed global code setters, switched to $WikiTheme->load() in main

Modified Paths:
--------------
    trunk/themes/gforge/themeinfo.php

Modified: trunk/themes/gforge/themeinfo.php
===================================================================
--- trunk/themes/gforge/themeinfo.php	2009-10-19 08:01:01 UTC (rev 7219)
+++ trunk/themes/gforge/themeinfo.php	2009-10-19 12:57:39 UTC (rev 7220)
@@ -6,12 +6,12 @@
 class WikiTheme_gforge extends WikiTheme {
 
     function header() {
-        global $HTML, $group_id, $group_public_name, $request, $project, $Language;
+        global $HTML, $group_id, $group_public_name, $request, $project;
 
         $pagename = $request->getArg('pagename');
 
         $submenu = Template('navbar');
-        
+
         //group is private
         if (!$project->isPublic()) {
             //if it's a private group, you must be a member of that group
@@ -40,87 +40,75 @@
         	if (!$external_user) {
 	        	$page = $request->getPage();
 	        	if ($page->get('external')) {
-	    			$external_msg = 'This page is external.';
+	    			$external_msg = _("This page is external.");
 	    		}
-	    		echo $HTML->warning_msg($Language->getText('project_admin','external_project') .
+	    		echo $HTML->warning_msg(_("This project is shared with third-party users (non Alcatel-Lucent users).") .
 	    								(isset($external_msg) ? ' ' . $external_msg : ''));
 			}
         }
     }
-    
+
     function footer() {
         global $HTML;
-        
+
         $HTML->footer(array());
-        
+
     }
-}
 
-$WikiTheme = new WikiTheme_gforge('gforge');
-// CSS file defines fonts, colors and background images for this style.
+    function load() {
 
-/**
- * The logo image appears on every page and links to the HomePage.
- */
-$WikiTheme->addImageAlias('logo', WIKI_NAME . 'Logo.png');
+        $this->initGlobals();
 
-/**
- * The Signature image is shown after saving an edited page. If this
- * is set to false then the "Thank you for editing..." screen will
- * be omitted.
- */
+        /**
+         * The Signature image is shown after saving an edited page. If this
+         * is set to false then the "Thank you for editing..." screen will
+         * be omitted.
+         */
 
-$WikiTheme->addImageAlias('signature', WIKI_NAME . "Signature.png");
-// Uncomment this next line to disable the signature.
-$WikiTheme->addImageAlias('signature', false);
+        $this->addImageAlias('signature', WIKI_NAME . "Signature.png");
+        // Uncomment this next line to disable the signature.
+        $this->addImageAlias('signature', false);
 
-/*
- * Link icons.
- */
-// $WikiTheme->setLinkIconAttr('after');
-$WikiTheme->setLinkIcon('http');
-$WikiTheme->setLinkIcon('https');
-$WikiTheme->setLinkIcon('ftp');
-$WikiTheme->setLinkIcon('mailto');
-//$WikiTheme->setLinkIcon('interwiki');
-//$WikiTheme->setLinkIcon('wikiuser');
-//$WikiTheme->setLinkIcon('*', 'url');
+        /*
+         * Link icons.
+         */
+        $this->setLinkIcon('http');
+        $this->setLinkIcon('https');
+        $this->setLinkIcon('ftp');
+        $this->setLinkIcon('mailto');
 
-$WikiTheme->setButtonSeparator("\n | ");
+        $this->setButtonSeparator("");
 
-/**
- * WikiWords can automatically be split by inserting spaces between
- * the words. The default is to leave WordsSmashedTogetherLikeSo.
- */
-$WikiTheme->setAutosplitWikiWords(false);
+        /**
+         * WikiWords can automatically be split by inserting spaces between
+         * the words. The default is to leave WordsSmashedTogetherLikeSo.
+         */
+        $this->setAutosplitWikiWords(false);
 
-/**
- * Layout improvement with dangling links for mostly closed wiki's:
- * If false, only users with edit permissions will be presented the 
- * special wikiunknown class with "?" and Tooltip.
- * If true (default), any user will see the ?, but will be presented 
- * the PrintLoginForm on a click.
- */
-$WikiTheme->setAnonEditUnknownLinks(false);
+        /**
+         * Layout improvement with dangling links for mostly closed wiki's:
+         * If false, only users with edit permissions will be presented the
+         * special wikiunknown class with "?" and Tooltip.
+         * If true (default), any user will see the ?, but will be presented
+         * the PrintLoginForm on a click.
+         */
+        $this->setAnonEditUnknownLinks(false);
 
-/*
- * You may adjust the formats used for formatting dates and times
- * below.  (These examples give the default formats.)
- * Formats are given as format strings to PHP strftime() function See
- * http://www.php.net/manual/en/function.strftime.php for details.
- * Do not include the server's zone (%Z), times are converted to the
- * user's time zone.
- */
-$WikiTheme->setDateFormat("%d %B %Y");
-$WikiTheme->setTimeFormat("%H:%M");
+        /*
+         * You may adjust the formats used for formatting dates and times
+         * below.  (These examples give the default formats.)
+         * Formats are given as format strings to PHP strftime() function See
+         * http://www.php.net/manual/en/function.strftime.php for details.
+         * Do not include the server's zone (%Z), times are converted to the
+         * user's time zone.
+         */
+        $this->setDateFormat("%d %B %Y");
+        $this->setTimeFormat("%H:%M");
+    }
+}
 
-/*
- * To suppress times in the "Last edited on" messages, give a
- * give a second argument of false:
- */
-//$WikiTheme->setDateFormat("%B %d, %Y", false); 
+$WikiTheme = new WikiTheme_gforge('gforge');
 
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // (c-file-style: "gnu")
 // Local Variables:
@@ -129,5 +117,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End:   
+// End:
 ?>


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

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

From: <var...@us...> - 2009-10-19 08:01:12

Revision: 7219
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7219&view=rev
Author:   vargenau
Date:     2009-10-19 08:01:01 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
Less action pages for Gforge

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

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2009-10-19 07:46:27 UTC (rev 7218)
+++ trunk/lib/IniConfig.php	2009-10-19 08:01:01 UTC (rev 7219)
@@ -601,7 +601,7 @@
      */
     $AllActionPages = explode(':',
       'AllPages:AllUsers:AppendText:AuthorHistory:'
-      .'BackLinks:BlogArchives:BlogJournal:'
+      .'BackLinks:'
       .'CreatePage:'
       .'FindPage:FullTextSearch:FuzzyPages:'
       .'LikePages:LinkDatabase:LinkSearch:ListRelations:'
@@ -609,11 +609,11 @@
       .'NewPagesPerUser:'
       .'OrphanedPages:'
       .'PageDump:PageHistory:PageInfo:PluginManager:'
-      .'RandomPage:RecentChanges:RecentComments:RelatedChanges:'
+      .'RandomPage:RecentChanges:RelatedChanges:'
       .'SearchHighlight:SemanticRelations:SemanticSearch:SystemInfo:'
       .'TitleSearch:'
       .'UpLoad:UserPreferences:'
-      .'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect:WikiBlog:'
+      .'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect:'
       // plus some derivations
       .'AllPagesCreatedByMe:AllPagesLastEditedByMe:AllPagesOwnedByMe:AllUserPages:'
       .'FullRecentChanges:'
@@ -621,7 +621,6 @@
       .'MyRecentEdits:MyRecentChanges:'
       .'PhpWikiAdministration:'
       .'PhpWikiAdministration/Chown:'
-      .'PhpWikiAdministration/Markup:'
       .'PhpWikiAdministration/Purge:'
       .'PhpWikiAdministration/Remove:'
       .'PhpWikiAdministration/Rename:'
@@ -639,12 +638,17 @@
           $AllActionPages[] = 'SpellCheck'; // SpellCheck does not work
           $AllActionPages[] = 'PhpWikiAdministration/Chmod';
        }
+       $AllActionPages[] = 'BlogArchives';
+       $AllActionPages[] = 'BlogJournal';
        $AllActionPages[] = 'InterWikiSearch';
        $AllActionPages[] = 'LdapSearch';
        $AllActionPages[] = 'PasswordReset';
+       $AllActionPages[] = 'PhpWikiAdministration/Markup';
        $AllActionPages[] = 'RateIt'; // RateIt works only in wikilens derived themes
+       $AllActionPages[] = 'RecentComments';
        $AllActionPages[] = 'TranslateText';
        $AllActionPages[] = 'UriResolver';
+       $AllActionPages[] = 'WikiBlog';
     }
     if (defined('GFORGE') and GFORGE) {
        if (defined('ENABLE_EXTERNAL_PAGES') and ENABLE_EXTERNAL_PAGES) {


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

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

From: <var...@us...> - 2009-10-19 07:46:38

Revision: 7218
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7218&view=rev
Author:   vargenau
Date:     2009-10-19 07:46:27 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
Get the maximum upload filesize from PHP config

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

Modified: trunk/g
===================================================================
--- trunk/g	2009-10-17 15:45:24 UTC (rev 7217)
+++ trunk/g	2009-10-19 07:46:27 UTC (rev 7218)
@@ -89,6 +89,9 @@
     // Use black list of extensions instead of white list
     define('DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS', true);
 
+    // Get the maximum upload filesize from PHP config
+    define('MAX_UPLOAD_SIZE', octets(ini_get('upload_max_filesize')));
+
     // GForge is UTF-8, so use the same.
     define('CHARSET', 'UTF-8');
 
@@ -203,12 +206,11 @@
 
     define('STRICT_MAILABLE_PAGEDUMPS', false);
 
-    define('DEFAULT_DUMP_DIR', "/tmp/wikidump");
-    define('HTML_DUMP_DIR', "/tmp/wikidumphtml");
+    // Perhaps propose Web DAV location ?
+    define('DEFAULT_DUMP_DIR', "");
+    define('HTML_DUMP_DIR', "");
     define('HTML_DUMP_SUFFIX', ".html");
 
-    define('MAX_UPLOAD_SIZE', 16777216);
-
     define('MINOR_EDIT_TIMEOUT', 604800);
 
     define('COMPRESS_OUTPUT', false);
@@ -263,4 +265,22 @@
     // Start the wiki
     include "lib/main.php";
 }
+
+/**
+ * Return a number of octets from a string like "300M"
+ */
+function octets($val) {
+    $val = trim($val);
+    $last = strtolower($val[strlen($val)-1]);
+    switch($last) {
+        // The 'G' modifier is available since PHP 5.1.0
+        case 'g':
+            $val *= 1024;
+        case 'm':
+            $val *= 1024;
+        case 'k':
+            $val *= 1024;
+    }
+    return $val;
+}
 ?>


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 .. 157 158 159 160 161 .. 538 > >> (Page 159 of 538)