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

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

[<ru...@us...>]

Revision: 7466
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7466&view=rev
Author:   rurban
Date:     2010-06-07 08:12:29 +0000 (Mon, 07 Jun 2010)

Log Message:
-----------
- Atom Parser and Feed Plugin
  with unit tests by S?\195?\169bastien Le Callonnec
  patches ID 3012033
- HtmlElement5.php split up for php-5.3

Modified Paths:
--------------
    trunk/lib/HtmlElement.php
    trunk/lib/IniConfig.php
    trunk/lib/XmlParser.php
    trunk/tests/unit/test.php

Added Paths:
-----------
    trunk/lib/AtomParser.php
    trunk/lib/HtmlElement5.php
    trunk/lib/plugin/AtomFeed.php
    trunk/tests/unit/lib/AtomParserTest.php
    trunk/tests/unit/lib/plugin/AtomFeedTest.php
    trunk/tests/unit/lib/plugin/atom-example.xml

Added: trunk/lib/AtomParser.php
===================================================================
--- trunk/lib/AtomParser.php	                        (rev 0)
+++ trunk/lib/AtomParser.php	2010-06-07 08:12:29 UTC (rev 7466)
@@ -0,0 +1,257 @@
+<?php // -*-php-*-
+// $Id$
+/*
+ * Copyright 2010 Sébastien Le Callonnec
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PhpWiki; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+/**
+ * This class is a poor-man Atom parser, it does no validation of the feed.
+ * The content of an entry ("payload") is not parsed but rather returned "as-is",
+ * as its format can be text, html or xhtml.
+ * 
+ * @author: Sébastien Le Callonnec
+ */
+require_once('lib/XmlParser.php');
+
+class AtomParser
+extends XmlParser
+{
+    // Feed
+    var $feed = array();
+    var $feed_title = '';
+    var $feed_links = array();
+    var $feed_subtitle = '';
+    var $feed_id = '';
+    var $feed_updated = '';
+    var $feed_authors = array();
+    var $feed_contributors = array();
+    var $generator = '';
+    var $icon = '';
+    var $rights = '';
+    var $logo = '';
+    
+    var $categories = array();
+
+    var $authors = array();
+    var $contributors = array();
+
+    // Author, Contributor
+    var $name = '';
+    var $email = '';
+    var $uri = '';
+
+    // Entries
+    var $entries = array();
+    var $inside_entry = false;
+    var $title = '';
+    var $updated = '';
+    var $published = '';
+    var $id = '';
+    var $links = array();
+    var $summary = '';
+    
+    var $inside_content = false;
+    var $content = '';
+
+    function tag_open($parser, $name, $attrs='') {
+        global $current_tag, $current_attrs;
+
+        $current_tag = $name;
+        $current_attrs = $attrs;
+
+        if ($name == "ENTRY") {
+            $this->inside_entry = true;
+        } elseif ($this->inside_content) {
+            $this->content .= $this->serialize_tag(strtolower($name), $attrs);
+        } elseif ($name == "CONTENT") {
+            $this->inside_content = true;
+        }
+    }
+
+    function tag_close($parser, $name, $attrs='') {
+        if ($name == "AUTHOR") {
+            $an_author = $this->trim_data(array(
+                "name" => $this->name,
+                "email" => $this->email,
+                "uri" => $this->uri
+            ));
+            if ($this->inside_entry) {
+                $this->authors[] = $an_author;
+            } else {
+                $this->feed_authors[] = $an_author;
+            }
+            $this->name = '';
+            $this->email = '';
+            $this->uri = '';
+        } elseif ($name == "FEED") {
+            $this->feed[] = $this->trim_data(array(
+                "id" => $this->feed_id,
+                "title" => $this->feed_title,
+                "links" => $this->feed_links,
+                "subtitle" => $this->feed_subtitle,
+                "updated" => $this->feed_updated,
+                "generator" => $this->generator,
+                "icon" => $this->icon,
+                "rights" => $this->rights,
+                "logo" => $this->logo,
+                "authors" => $this->feed_authors,
+                "contributors" => $this->feed_contributors
+            ));
+            $this->feed_title = '';
+            $this->feed_id = '';
+            $this->feed_links = array();
+            $this->feed_subtitle = '';
+            $this->feed_updated = '';
+            $this->feed_authors = array();
+            $this->feed_contributors = array();
+            $this->generator = '';
+            $this->icon = '';
+            $this->rights = '';
+            $this->logo = '';
+        } elseif ($name == "ENTRY") {
+            $this->entries[] = $this->trim_data(array(
+                "id" => $this->id,
+                "title" => $this->title,
+                "updated" => $this->updated,
+                "links" => $this->links,
+                "published" => $this->published,
+                "content" => $this->content,
+                "summary" => $this->summary,
+                "authors" => $this->authors,
+                "contributors" => $this->contributors
+            ));
+            $this->id = '';
+            $this->title = '';
+            $this->updated = '';
+            $this->links = '';
+            $this->published = '';
+            $this->content = '';
+            $this->authors = array();
+            $this->contributors = array();
+            $this->inside_entry = false;
+        } elseif ($name == "CONTENT") {
+            $this->inside_content = false;
+        } elseif ($name == "CONTRIBUTOR") {
+            $a_contributor = $this->trim_data(array(
+                "name" => $this->name,
+                "email" => $this->email
+            ));
+            if ($this->inside_entry) {
+                $this->contributors[] = $a_contributor;
+            } else {
+                $this->feed_contributors[] = $a_contributor;
+            }
+            $this->name = '';
+            $this->email = '';
+        } elseif ($this->inside_content) {
+            $this->content .= "</" . strtolower($name) . ">";
+        }
+    }
+
+    function cdata($parser, $data) {
+        global $current_tag, $current_attrs;
+        
+        if ($this->inside_content) {
+            $this->content .= $data;
+        } else {
+            switch ($current_tag) {
+                case "ID":
+                    if ($this->inside_entry)
+                        $this->id .= $data;
+                    else
+                        $this->feed_id .= $data;
+                    break;
+                case "LINK":
+                    $a_link = array();
+                    foreach ($current_attrs as $k => $v) {
+                        $a_link[strtolower($k)] = $v;
+                    }
+                    if ($this->inside_entry) {
+                        $this->links[] = $a_link;
+                    } else {
+                        $this->feed_links[] = $a_link;
+                    }
+                    break;
+                case "NAME":
+                    $this->name .= $data;
+                    break;
+                case "EMAIL":
+                    $this->email .= $data;
+                    break;
+                case "TITLE" :
+                    if ($this->inside_entry)
+                        $this->title .= $data;
+                    else
+                        $this->feed_title .= $data;
+                    break;
+                case "UPDATED":
+                    if ($this->inside_entry)
+                        $this->updated .= $data;
+                    else
+                        $this->feed_updated .= $data;
+                    break;
+                case "SUBTITLE":
+                    $this->feed_subtitle .= $data;
+                    break;
+                case "PUBLISHED":
+                    $this->published .= $data;
+                    break;
+                case "SUMMARY":
+                    $this->summary .= $data;
+                    break;
+                case "URI":
+                    $this->uri .= $data;
+                    break;
+                case "GENERATOR":
+                    $this->generator .= $data;
+                    break;
+                case "ICON":
+                    $this->icon .= $data;
+                    break;
+                case "LOGO":
+                    $this->logo .= $data;
+                    break;
+                case "RIGHTS":
+                    $this->rights .= $data;
+                    break;
+            }
+        }
+    }
+
+    private function trim_data($array) {
+        return array_map(array("self", "trim_element"), $array);
+    }
+
+    private function trim_element($element) {
+        if (is_array($element)) {
+            return $this->trim_data($element);
+        } elseif (is_string($element)) {
+            return trim($element);
+        }
+    }
+    
+    private function serialize_tag($tag_name, $attributes) {
+        $tag = "<" . $tag_name;
+        foreach ($attributes as $k => $v) {
+            $tag .= " " . strtolower($k). "=\"$v\"";
+        }
+        $tag .= ">";
+        return $tag;
+    }
+}
+?>


Property changes on: trunk/lib/AtomParser.php
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php	2010-06-04 14:46:09 UTC (rev 7465)
+++ trunk/lib/HtmlElement.php	2010-06-07 08:12:29 UTC (rev 7466)
@@ -87,12 +87,17 @@
         if (!empty($this->_attr['title'])) {
 	    if (preg_match("/\[(alt-)?(.)\]$/", $this->_attr['title'], $m))
 	    {
-		$this->_attr['title'] = preg_replace("/\[(alt-)?(.)\]$/", "[".$WikiTheme->tooltipAccessKeyPrefix()."-\\2]", $this->_attr['title']);
+		$this->_attr['title'] = preg_replace
+                    ("/\[(alt-)?(.)\]$/", 
+                     "[".$WikiTheme->tooltipAccessKeyPrefix()."-\\2]", 
+                     $this->_attr['title']);
 	    } else  {
-		$this->_attr['title'] .= " [".$WikiTheme->tooltipAccessKeyPrefix()."-$key]";
+		$this->_attr['title'] .= 
+                    " [".$WikiTheme->tooltipAccessKeyPrefix()."-$key]";
 	    }
 	} else {
-	    $this->_attr['title'] = "[".$WikiTheme->tooltipAccessKeyPrefix()."-$key]";
+	    $this->_attr['title'] = 
+                "[".$WikiTheme->tooltipAccessKeyPrefix()."-$key]";
 	}
     }
 
@@ -142,39 +147,43 @@
 
     //
     // Shell script to generate the following static methods:
-    //
-    // #!/bin/sh
-    // function mkfuncs () {
-    //     for tag in "$@"
-    //     do
-    //         echo "    function $tag (/*...*/) {"
-    //         echo "        \$el = new HtmlElement('$tag');"
-    //         echo "        return \$el->_init2(func_get_args());"
-    //         echo "    }"
-    //     done
-    // }
-    // d='
-    //     /****************************************/'
-    // mkfuncs link meta style script noscript
-    // echo "$d"
-    // mkfuncs a img br span
-    // echo "$d"
-    // mkfuncs h1 h2 h3 h4 h5 h6
-    // echo "$d"
-    // mkfuncs hr div p pre blockquote
-    // echo "$d"
-    // mkfuncs em strong small
-    // echo "$d"
-    // mkfuncs tt u sup sub
-    // echo "$d"
-    // mkfuncs ul ol dl li dt dd
-    // echo "$d"
-    // mkfuncs table caption thead tbody tfoot tr td th colgroup col
-    // echo "$d"
-    // mkfuncs form input option select textarea
-    // echo "$d"
-    // mkfuncs area map frame frameset iframe nobody
+/*
 
+#!/bin/sh
+mkfuncs () {
+    for tag in "$@"
+    do
+        echo "    public static function $tag (/*...*/) {"
+        echo "        \$el = new HtmlElement('$tag');"
+        echo "        return \$el->_init2(func_get_args());"
+        echo "    }"
+    done
+}
+d='
+    /****************************************/'
+mkfuncs link meta style script noscript
+echo "$d"
+mkfuncs a img br span
+echo "$d"
+mkfuncs h1 h2 h3 h4 h5 h6
+echo "$d"
+mkfuncs hr div p pre blockquote
+echo "$d"
+mkfuncs em strong small
+echo "$d"
+mkfuncs tt u sup sub
+echo "$d"
+mkfuncs ul ol dl li dt dd
+echo "$d"
+mkfuncs table caption thead tbody tfoot tr td th colgroup col
+echo "$d"
+mkfuncs form input option select textarea label fieldset legend
+echo "$d"
+mkfuncs area map frame frameset iframe nobody object embed param
+echo "$d"
+mkfuncs video
+*/
+
     function link (/*...*/) {
         $el = new HtmlElement('link');
         return $el->_init2(func_get_args());

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


Property changes on: trunk/lib/HtmlElement5.php
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2010-06-04 14:46:09 UTC (rev 7465)
+++ trunk/lib/IniConfig.php	2010-06-07 08:12:29 UTC (rev 7466)
@@ -154,7 +154,7 @@
          'PLUGIN_CACHED_DATABASE', 'PLUGIN_CACHED_FILENAME_PREFIX',
          'PLUGIN_CACHED_HIGHWATER', 'PLUGIN_CACHED_LOWWATER', 'PLUGIN_CACHED_MAXLIFETIME',
          'PLUGIN_CACHED_MAXARGLEN', 'PLUGIN_CACHED_IMGTYPES',
-         'WYSIWYG_BACKEND',
+         'WYSIWYG_BACKEND', 'PLUGIN_MARKUP_MAP',
          // extra logic:
          'SERVER_NAME','SERVER_PORT','SCRIPT_NAME', 'DATA_PATH', 'PHPWIKI_DIR', 'VIRTUAL_PATH',
 	 'EXTERNAL_HTML2PDF_PAGELIST', 'PLUGIN_CACHED_CACHE_DIR'
@@ -196,7 +196,8 @@
          'BLOG_DEFAULT_EMPTY_PREFIX', 'DATABASE_PERSISTENT',
          'ENABLE_DISCUSSION_LINK', 'ENABLE_CAPTCHA',
          'ENABLE_WYSIWYG', 'WYSIWYG_DEFAULT_PAGETYPE_HTML',
-         'DISABLE_MARKUP_WIKIWORD', 'ENABLE_MARKUP_COLOR',
+         'DISABLE_MARKUP_WIKIWORD', 'ENABLE_MARKUP_COLOR', 'ENABLE_MARKUP_TEMPLATE',
+         'ENABLE_MARKUP_MEDIAWIKI_TABLE',
          'ENABLE_MARKUP_DIVSPAN', 'USE_BYTEA', 'UPLOAD_USERDIR', 'DISABLE_UNITS',
 	 'ENABLE_SEARCHHIGHLIGHT', 'DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS',
          'ENABLE_AUTH_OPENID', 'INSECURE_ACTIONS_LOCALHOST_ONLY',
@@ -418,6 +419,18 @@
                in_array(DATABASE_TYPE, array('SQL','ADODB','PDO')) ? 2 : 0);
     }
 
+    global $PLUGIN_MARKUP_MAP;
+    $PLUGIN_MARKUP_MAP = array();
+    if (defined('PLUGIN_MARKUP_MAP') and trim(PLUGIN_MARKUP_MAP) != "") {
+	$_map = preg_split('/\s+/', PLUGIN_MARKUP_MAP);
+	foreach ($_map as $v) {
+	    list($xml,$plugin) = split(':', $v);
+	    if (!empty($xml) and !empty($plugin))
+	        $PLUGIN_MARKUP_MAP[$xml] = $plugin;
+	}
+	unset($_map); unset($xml); unset($plugin); unset($v);
+    }
+
     if (empty($rs['TEMP_DIR'])) {
 	$rs['TEMP_DIR'] = "/tmp";
 	if (getenv("TEMP"))
@@ -633,6 +646,7 @@
     $AllAllowedPlugins = $ActionPages;
     // Add plugins that have no corresponding action page
     $AllAllowedPlugins[] = 'AsciiSVG';
+    $AllAllowedPlugins[] = 'AtomFeed';
     $AllAllowedPlugins[] = 'BoxRight';
     $AllAllowedPlugins[] = 'CalendarList';
     $AllAllowedPlugins[] = 'Calendar';

Modified: trunk/lib/XmlParser.php
===================================================================
--- trunk/lib/XmlParser.php	2010-06-04 14:46:09 UTC (rev 7465)
+++ trunk/lib/XmlParser.php	2010-06-07 08:12:29 UTC (rev 7466)
@@ -56,8 +56,10 @@
             $this->_parser = xml_parser_create($encoding);
         else
             $this->_parser = xml_parser_create(); 
-	xml_parser_set_option($this->_parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['charset']);
-        //xml_set_object($this->_parser, &$this);
+
+        if (isset($GLOBALS['charset']))
+            xml_parser_set_option($this->_parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['charset']);
+
         xml_set_element_handler($this->_parser,
                                 array(&$this, 'tag_open'),
                                 array(&$this, 'tag_close' ));

Added: trunk/lib/plugin/AtomFeed.php
===================================================================
--- trunk/lib/plugin/AtomFeed.php	                        (rev 0)
+++ trunk/lib/plugin/AtomFeed.php	2010-06-07 08:12:29 UTC (rev 7466)
@@ -0,0 +1,85 @@
+<?php // -*-php-*-
+// $Id$
+/*
+ * Copyright 2010 Sébastien Le Callonnec
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PhpWiki; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+/**
+ * @author: Sébastien Le Callonnec
+ */
+require_once('lib/WikiPlugin.php');
+require_once('lib/AtomParser.php');
+
+class WikiPlugin_AtomFeed
+extends WikiPlugin
+{
+    function getName() {
+        return _('AtomFeed');
+    }
+    
+    function getDescription() {
+        return _('Atom Aggregator Plugin');
+    }
+    
+    function getDefaultArguments() {
+        return array(
+           'feed' => "",
+           'description' => "",
+           'url' => "",
+           'maxitem' => 0,
+           'titleonly' => false
+        );
+    }
+   
+    function run($dbi, $argstr, &$request, $basepage) {
+        extract($this->getArgs($argstr, $request));
+        $parser = new AtomParser();
+        
+        assert(!empty($url));
+        $parser->parse_url($url);
+        
+        $html = '';
+        
+        $items = HTML::dl();
+        foreach ($parser->feed as $feed) {
+            $title = HTML::h3(HTML::a(array('href' => $feed["links"]["0"]["href"]), $feed["title"]));
+            $counter = 1;
+            foreach($parser->entries as $entry) {
+                $item = HTML::dt(HTML::a(array('href' => $entry["links"]["0"]["href"]), $entry["title"]));
+                $items->pushContent($item);
+                
+                if (!$titleonly) {
+                    $description = HTML::dd(HTML::raw(html_entity_decode($entry["content"])));
+                } else {
+                    $description = HTML::dd();
+                }
+                $items->pushContent($description);
+                
+                if ($maxitem > 0 && $counter >= $maxitem) {
+                    break;
+                }
+                $counter++;
+            }
+            $html = HTML::div(array('class'=> 'rss'), $title);
+            $html->pushContent($items);
+        }
+
+        return $html;
+    }
+}
+?>
\ No newline at end of file


Property changes on: trunk/lib/plugin/AtomFeed.php
___________________________________________________________________
Added: svn:keywords
   + Id

Added: trunk/tests/unit/lib/AtomParserTest.php
===================================================================
--- trunk/tests/unit/lib/AtomParserTest.php	                        (rev 0)
+++ trunk/tests/unit/lib/AtomParserTest.php	2010-06-07 08:12:29 UTC (rev 7466)
@@ -0,0 +1,220 @@
+<?php
+// $Id$
+/*
+ * Copyright 2010 Sébastien Le Callonnec
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PhpWiki; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+/**
+ * @author: Sébastien Le Callonnec
+ */
+require_once('lib/AtomParser.php');
+require_once('PHPUnit/Framework.php');
+
+class AtomParserTest
+extends phpwiki_TestCase
+{
+    function testSimpleAtomFileParsing() {
+        $fake_atom_file = <<<ATOM
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"
+      xmlns:georss="http://www.georss.org/georss" >
+    <link href="http://www.phpwiki.org/fakeurl" rel="self" type="application/atom+xml" />
+    <title>This is a fake feed</title>
+    <updated>2010-05-15T01:00:00Z</updated>
+    <id>http://www.phpwiki.org/fakeurl</id>
+    <subtitle>Cool feed</subtitle>
+    <author>
+        <name>Sébastien Le Callonnec</name>
+        <email>sl...@ya...</email>
+    </author>
+
+    <entry>
+      <title>Foobar Éire</title>
+      <link href="http://maps.google.com/maps?f=q&amp;sll=53.125728,-6.068907&amp;ie=UTF8"/>
+      <content type="xhtml">
+        <div xmlns="http://www.w3.org/1999/xhtml">Millenium Spire, Dublin
+          <div class="geo">Geo coordinates: 
+            <abbr class="latitude" title="53.349441">53.349441</abbr>
+            <abbr class="longitude" title="-6.260282">-6.260282</abbr>
+          </div>
+        </div>
+      </content>
+      <updated>2010-05-15T01:00:00Z</updated>
+      <published>2010-05-15T01:00:00Z</published>
+      <georss:box>53.349441 -6.26234 53.35078 -6.260282</georss:box>
+      <id>tag:www.phpwiki.org,2010-05-15:/fakeurl/20100515223621</id>
+    </entry>
+
+</feed>
+ATOM;
+        $parser = new AtomParser();
+        $parser->parse($fake_atom_file);
+
+        $this->assertFalse(count($parser->feed) == 0);
+        
+        $current_feed = $parser->feed[0];
+        $this->assertEquals("This is a fake feed", $current_feed["title"]);
+        
+        $this->assertFalse(count($current_feed["links"]) == 0);
+        $this->assertEquals("http://www.phpwiki.org/fakeurl", $current_feed["links"][0]["href"]);
+        $this->assertEquals("Cool feed", $current_feed["subtitle"]);
+        $this->assertEquals("2010-05-15T01:00:00Z", $current_feed["updated"]);
+        
+        $this->assertFalse(count($current_feed["authors"]) == 0);
+        
+        $current_author = $current_feed["authors"][0];
+        $this->assertEquals("Sébastien Le Callonnec", $current_author["name"]);
+        $this->assertEquals("sl...@ya...", $current_author["email"]);
+        
+        $this->assertFalse(count($parser->entries) == 0);
+        
+        $current_entry = $parser->entries[0];
+        $this->assertEquals("Foobar Éire", $current_entry["title"]);
+        $this->assertEquals("http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8", $current_entry["links"][0]["href"]);
+        $this->assertEquals("2010-05-15T01:00:00Z", $current_entry["updated"]);
+        $this->assertEquals("2010-05-15T01:00:00Z", $current_entry["published"]);
+        $this->assertEquals("tag:www.phpwiki.org,2010-05-15:/fakeurl/20100515223621", $current_entry["id"]);
+        
+        $payload =<<<CONTENT
+<div xmlns="http://www.w3.org/1999/xhtml">Millenium Spire, Dublin
+          <div class="geo">Geo coordinates: 
+            <abbr class="latitude" title="53.349441">53.349441</abbr>
+            <abbr class="longitude" title="-6.260282">-6.260282</abbr>
+          </div>
+        </div>
+CONTENT;
+        $this->assertEquals($payload, $current_entry["content"]);
+    }
+    
+    function testExtensiveAtomExampleFromRFC4287() {
+        $fake_atom_file = <<<ATOM
+<?xml version="1.0" encoding="utf-8"?>
+
+<feed xmlns="http://www.w3.org/2005/Atom">
+  <title type="text">dive into mark</title>
+  <subtitle type="html">
+    A &lt;em&gt;lot&lt;/em&gt; of effort
+    went into making this effortless
+  </subtitle>
+
+  <updated>2005-07-31T12:29:29Z</updated>
+  <id>tag:example.org,2003:3</id>
+  <link rel="alternate" type="text/html" 
+   hreflang="en" href="http://example.org/"/>
+  <link rel="self" type="application/atom+xml" 
+   href="http://example.org/feed.atom"/>
+  <rights>Copyright (c) 2003, Mark Pilgrim</rights>
+
+  <generator uri="http://www.example.com/" version="1.0">
+    Example Toolkit
+  </generator>
+  <entry>
+    <title>Atom draft-07 snapshot</title>
+    <link rel="alternate" type="text/html" 
+     href="http://example.org/2005/04/02/atom"/>
+
+    <link rel="enclosure" type="audio/mpeg" length="1337"
+     href="http://example.org/audio/ph34r_my_podcast.mp3"/>
+    <id>tag:example.org,2003:3.2397</id>
+    <updated>2005-07-31T12:29:29Z</updated>
+    <published>2003-12-13T08:29:29-04:00</published>
+
+    <author>
+      <name>Mark Pilgrim</name>
+      <uri>http://example.org/</uri>
+      <email>f8...@ex...</email>
+
+    </author>
+    <contributor>
+      <name>Sam Ruby</name>
+    </contributor>
+    <contributor>
+
+      <name>Joe Gregorio</name>
+    </contributor>
+    <content type="xhtml" xml:lang="en" 
+     xml:base="http://diveintomark.org/">
+      <div xmlns="http://www.w3.org/1999/xhtml">
+        <p><i>[Update: The Atom draft is finished.]</i></p>
+
+      </div>
+    </content>
+  </entry>
+</feed>
+ATOM;
+        $parser = new AtomParser();
+        $parser->parse($fake_atom_file);
+
+        $this->assertFalse(count($parser->feed) == 0);
+        
+        $current_feed = $parser->feed[0];
+        $this->assertEquals("dive into mark", $current_feed["title"]);
+        $this->assertEquals("Copyright (c) 2003, Mark Pilgrim", $current_feed["rights"]);
+        $this->assertEquals("A <em>lot</em> of effort\n    went into making this effortless", $current_feed["subtitle"]);
+        $this->assertEquals("2005-07-31T12:29:29Z", $current_feed["updated"]);
+        $this->assertEquals("tag:example.org,2003:3", $current_feed["id"]);
+        $this->assertEquals("Example Toolkit", $current_feed["generator"]);
+        
+        $this->assertTrue(count($current_feed["authors"]) == 0);
+        $this->assertTrue(count($current_feed["contributors"]) == 0);
+
+        
+        $this->assertFalse(count($parser->entries) == 0);
+        
+        $current_entry = $parser->entries[0];
+        $this->assertEquals("Atom draft-07 snapshot", $current_entry["title"]);
+        $this->assertEquals("2005-07-31T12:29:29Z", $current_entry["updated"]);
+        $this->assertEquals("2003-12-13T08:29:29-04:00", $current_entry["published"]);
+        $this->assertEquals("tag:example.org,2003:3.2397", $current_entry["id"]);
+        $this->assertEquals(2, count($current_entry["links"]));
+        
+        $this->assertTrue(count($current_entry["authors"]) == 1);
+        $this->assertTrue(count($current_entry["contributors"]) == 2);
+        
+        $current_author = $current_entry["authors"][0];
+        $this->assertEquals("Mark Pilgrim", $current_author["name"]);
+        $this->assertEquals("f8...@ex...", $current_author["email"]);
+        
+        $first_contributor = $current_entry["contributors"][0];
+        $second_contributor = $current_entry["contributors"][1];
+        
+        $this->assertEquals("Sam Ruby", $first_contributor["name"]);
+        $this->assertEquals("Joe Gregorio", $second_contributor["name"]);
+        
+        $first_link = $current_entry["links"][0];
+        $this->assertEquals("alternate", $first_link["rel"]);
+        $this->assertEquals("text/html", $first_link["type"]);
+        $this->assertEquals("http://example.org/2005/04/02/atom", $first_link["href"]);
+        
+        $second_link = $current_entry["links"][1];
+        $this->assertEquals("enclosure", $second_link["rel"]);
+        $this->assertEquals("audio/mpeg", $second_link["type"]);
+        $this->assertEquals("1337", $second_link["length"]);
+        $this->assertEquals("http://example.org/audio/ph34r_my_podcast.mp3", $second_link["href"]);
+        
+        $payload = <<<CONTENT
+<div xmlns="http://www.w3.org/1999/xhtml">
+        <p><i>[Update: The Atom draft is finished.]</i></p>
+
+      </div>
+CONTENT;
+
+        $this->assertEquals($payload, $current_entry["content"]);
+    }
+}
+?>
\ No newline at end of file


Property changes on: trunk/tests/unit/lib/AtomParserTest.php
___________________________________________________________________
Added: svn:keywords
   + Id

Added: trunk/tests/unit/lib/plugin/AtomFeedTest.php
===================================================================
--- trunk/tests/unit/lib/plugin/AtomFeedTest.php	                        (rev 0)
+++ trunk/tests/unit/lib/plugin/AtomFeedTest.php	2010-06-07 08:12:29 UTC (rev 7466)
@@ -0,0 +1,80 @@
+<?php
+// $Id$
+/*
+ * Copyright 2010 Sébastien Le Callonnec
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PhpWiki; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+/**
+ * @author: Sébastien Le Callonnec
+ */
+require_once('lib/plugin/AtomFeed.php');
+require_once('lib/AtomParser.php');
+require_once('lib/HtmlElement.php');
+
+class AtomFeedTest
+extends phpwiki_TestCase
+{
+    var $atom_feed_plugin;
+    
+    public function setUp() {
+        parent::setUp();
+        $this->atom_feed_plugin = new WikiPlugin_AtomFeed();
+    }
+    
+    public function testRunMaxItem() {
+        global $request;
+        $expected_html = <<<EXPECTED
+<div class="rss"><h3><a href="http://www.phpwiki.org/fakeurl">This is a fake feed</a></h3>
+<dl>
+<dt><a href="http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8">Foobar Éire</a></dt>
+<dd><div xmlns="http://www.w3.org/1999/xhtml">Millenium Spire, Dublin
+          <div class="geo">Geo coordinates: 
+            <abbr class="latitude" title="53.349441">53.349441</abbr>
+            <abbr class="longitude" title="-6.260282">-6.260282</abbr>
+          </div>
+        </div></dd>
+</dl>
+</div>
+EXPECTED;
+        $html = $this->atom_feed_plugin->run(null, 'url=file://' . dirname(__FILE__) . '/atom-example.xml maxitem=1', $request, '.');
+        $this->assertEquals($expected_html, trim(html_entity_decode($html->asXML())));
+    }
+    
+    public function testRunTitleOnly() {
+        global $request;
+        $expected_html = <<<EXPECTED
+<div class="rss"><h3><a href="http://www.phpwiki.org/fakeurl">This is a fake feed</a></h3>
+<dl>
+<dt><a href="http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8">Foobar Éire</a></dt>
+<dd></dd>
+<dt><a href="http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8">Foobar Éire 2</a></dt>
+<dd></dd>
+<dt><a href="http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8">Foobar Éire 3</a></dt>
+<dd></dd>
+<dt><a href="http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8">Foobar Éire 4</a></dt>
+<dd></dd>
+<dt><a href="http://maps.google.com/maps?f=q&sll=53.125728,-6.068907&ie=UTF8">Foobar Éire 5</a></dt>
+<dd></dd>
+</dl>
+</div>
+EXPECTED;
+        $html = $this->atom_feed_plugin->run(null, 'url=file://' . dirname(__FILE__) . '/atom-example.xml titleonly=true', $request, '.');
+        $this->assertEquals($expected_html, trim(html_entity_decode($html->asXML())));
+    }
+}
+?>
\ No newline at end of file


Property changes on: trunk/tests/unit/lib/plugin/AtomFeedTest.php
___________________________________________________________________
Added: svn:keywords
   + Id

Added: trunk/tests/unit/lib/plugin/atom-example.xml
===================================================================
--- trunk/tests/unit/lib/plugin/atom-example.xml	                        (rev 0)
+++ trunk/tests/unit/lib/plugin/atom-example.xml	2010-06-07 08:12:29 UTC (rev 7466)
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"
+      xmlns:georss="http://www.georss.org/georss" >
+    <link href="http://www.phpwiki.org/fakeurl" rel="self" type="application/atom+xml" />
+    <title>This is a fake feed</title>
+    <updated>2010-05-15T01:00:00Z</updated>
+    <id>http://www.phpwiki.org/fakeurl</id>
+    <subtitle>Cool feed</subtitle>
+    <author>
+        <name>Sébastien Le Callonnec</name>
+        <email>sl...@ya...</email>
+    </author>
+
+    <entry>
+      <title>Foobar Éire</title>
+      <link href="http://maps.google.com/maps?f=q&amp;sll=53.125728,-6.068907&amp;ie=UTF8"/>
+      <content type="xhtml">
+        <div xmlns="http://www.w3.org/1999/xhtml">Millenium Spire, Dublin
+          <div class="geo">Geo coordinates: 
+            <abbr class="latitude" title="53.349441">53.349441</abbr>
+            <abbr class="longitude" title="-6.260282">-6.260282</abbr>
+          </div>
+        </div>
+      </content>
+      <updated>2010-05-15T01:00:00Z</updated>
+      <published>2010-05-15T01:00:00Z</published>
+      <georss:box>53.349441 -6.26234 53.35078 -6.260282</georss:box>
+      <id>tag:www.phpwiki.org,2010-05-15:/fakeurl/20100515223621</id>
+    </entry>
+    <entry>
+      <title>Foobar Éire 2</title>
+      <link href="http://maps.google.com/maps?f=q&amp;sll=53.125728,-6.068907&amp;ie=UTF8"/>
+      <content type="xhtml">
+        <div xmlns="http://www.w3.org/1999/xhtml">Again Millenium Spire, Dublin
+          <div class="geo">Geo coordinates: 
+            <abbr class="latitude" title="53.349441">53.349441</abbr>
+            <abbr class="longitude" title="-6.260282">-6.260282</abbr>
+          </div>
+        </div>
+      </content>
+      <updated>2010-05-15T01:00:00Z</updated>
+      <published>2010-05-15T01:00:00Z</published>
+      <georss:box>53.349441 -6.26234 53.35078 -6.260282</georss:box>
+      <id>tag:www.phpwiki.org,2010-05-15:/fakeurl/20100515223622</id>
+    </entry>
+    <entry>
+      <title>Foobar Éire 3</title>
+      <link href="http://maps.google.com/maps?f=q&amp;sll=53.125728,-6.068907&amp;ie=UTF8"/>
+      <content type="xhtml">
+        <div xmlns="http://www.w3.org/1999/xhtml">Still Millenium Spire, Dublin
+          <div class="geo">Geo coordinates: 
+            <abbr class="latitude" title="53.349441">53.349441</abbr>
+            <abbr class="longitude" title="-6.260282">-6.260282</abbr>
+          </div>
+        </div>
+      </content>
+      <updated>2010-05-15T01:00:00Z</updated>
+      <published>2010-05-15T01:00:00Z</published>
+      <georss:box>53.349441 -6.26234 53.35078 -6.260282</georss:box>
+      <id>tag:www.phpwiki.org,2010-05-15:/fakeurl/20100515223623</id>
+    </entry>
+    <entry>
+      <title>Foobar Éire 4</title>
+      <link href="http://maps.google.com/maps?f=q&amp;sll=53.125728,-6.068907&amp;ie=UTF8"/>
+      <content type="xhtml">
+        <div xmlns="http://www.w3.org/1999/xhtml">Yet Again Millenium Spire, Dublin
+          <div class="geo">Geo coordinates: 
+            <abbr class="latitude" title="53.349441">53.349441</abbr>
+            <abbr class="longitude" title="-6.260282">-6.260282</abbr>
+          </div>
+        </div>
+      </content>
+      <updated>2010-05-15T01:00:00Z</updated>
+      <published>2010-05-15T01:00:00Z</published>
+      <georss:box>53.349441 -6.26234 53.35078 -6.260282</georss:box>
+      <id>tag:www.phpwiki.org,2010-05-15:/fakeurl/20100515223624</id>
+    </entry>
+    <entry>
+      <title>Foobar Éire 5</title>
+      <link href="http://maps.google.com/maps?f=q&amp;sll=53.125728,-6.068907&amp;ie=UTF8"/>
+      <content type="xhtml">
+        <div xmlns="http://www.w3.org/1999/xhtml">Yes, yes Millenium Spire, Dublin
+          <div class="geo">Geo coordinates: 
+            <abbr class="latitude" title="53.349441">53.349441</abbr>
+            <abbr class="longitude" title="-6.260282">-6.260282</abbr>
+          </div>
+        </div>
+      </content>
+      <updated>2010-05-15T01:00:00Z</updated>
+      <published>2010-05-15T01:00:00Z</published>
+      <georss:box>53.349441 -6.26234 53.35078 -6.260282</georss:box>
+      <id>tag:www.phpwiki.org,2010-05-15:/fakeurl/20100515223625</id>
+    </entry>
+</feed>
\ No newline at end of file


Property changes on: trunk/tests/unit/lib/plugin/atom-example.xml
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/tests/unit/test.php
===================================================================
--- trunk/tests/unit/test.php	2010-06-04 14:46:09 UTC (rev 7465)
+++ trunk/tests/unit/test.php	2010-06-07 08:12:29 UTC (rev 7466)
@@ -400,6 +400,7 @@
                   /* valid tests only with clean virgin setup */
                   'AllPagesTest','AllUsersTest','OrphanedPagesTest',
                   'WantedPagesTest','TextSearchTest','IncludePageTest',
+                  'AtomParserTest','AtomFeedTest',
                   /* final tests which require all valid pages and consumes > 32MB */
                   'DumpHtml');
 // support db=file db=dba test=SetupWiki test=DumpHtml debug=num -dconstant=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:[7465] trunk/lib/EditToolbar.php

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

Revision: 7465
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7465&view=rev
Author:   vargenau
Date:     2010-06-04 14:46:09 +0000 (Fri, 04 Jun 2010)

Log Message:
-----------
Remove "double-click", window too small

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

Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php	2010-06-04 14:45:22 UTC (rev 7464)
+++ trunk/lib/EditToolbar.php	2010-06-04 14:46:09 UTC (rev 7465)
@@ -319,7 +319,7 @@
                                             'title'=>_("AddCategory"),
                                             'alt'=>"AddCategory", // to detect this at js
                                             'onclick'=>"showPulldown('".
-                                            _("Insert Categories (double-click)")
+                                            _("Insert Categories")
                                             ."',[".join(",",$categories)."],'"
                                             ._("Insert")."','"
                                             ._("Close")."','tb-categories')"));
@@ -369,7 +369,7 @@
                                             'title'=>_("AddPlugin"),
                                             'alt'=>_("AddPlugin"),
                                             'onclick'=>"showPulldown('".
-                                            _("Insert Plugin (double-click)")
+                                            _("Insert Plugin")
                                             ."',[".$plugin_js."],'"
                                             ._("Insert")."','"
                                             ._("Close")."','tb-plugins')"));
@@ -399,7 +399,7 @@
                                               'title'=>_("AddPageLink"),
                                               'alt'=>_("AddPageLink"),
                                               'onclick'=>"showPulldown('".
-                                              _("Insert PageLink (double-click)")
+                                              _("Insert PageLink")
                                               ."',[".join(",",$pages)."],'"
                                               ._("Insert")."','"
                                               ._("Close")."','tb-pages')")));
@@ -431,7 +431,7 @@
                                             'title'=>_("Add Image or Video"),
                                             'alt'=>_("Add Image or Video"),
                                             'onclick'=>"showPulldown('".
-                                            _("Insert Image or Video (double-click)")
+                                            _("Insert Image or Video")
                                             ."',[".$image_js."],'"
                                             ._("Insert")."','"
                                             ._("Close")."','tb-images')"));
@@ -466,7 +466,7 @@
                                    'title'=>_("AddTemplate"),
                                    'alt'=>_("AddTemplate"),
                                    'onclick'=>"showPulldown('".
-                                   _("Insert Template (double-click)")
+                                   _("Insert Template")
                                    ."',[".$pages_js."],'"
                                    ._("Insert")."','"
                                    ._("Close")."','tb-templates')")));


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7464] trunk/lib/main.php

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

Revision: 7464
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7464&view=rev
Author:   vargenau
Date:     2010-06-04 14:45:22 +0000 (Fri, 04 Jun 2010)

Log Message:
-----------
Check illegal characters in page names

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

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2010-06-04 14:15:43 UTC (rev 7463)
+++ trunk/lib/main.php	2010-06-04 14:45:22 UTC (rev 7464)
@@ -757,6 +757,17 @@
     
     // [574ms] mainly template:printexpansion: 393ms and template::expandsubtemplate [100+70+60ms]
     function handleAction () {
+        // Check illegal characters in page names: <>[]{}|"
+        require_once("lib/Template.php");
+        $page = $this->getPage();
+        $pagename = $page->getName();
+        if (preg_match("/[<\[\{\|\"\}\]>]/", $pagename, $matches) > 0) {
+            $CONTENT = HTML::div(
+                         array('class' => 'error'),
+                         _("Illegal character '"). $matches[0] . _("' in page name."));
+            GeneratePage($CONTENT, $pagename);
+            $this->finish();
+        }
         $action = $this->getArg('action');
         if ($this->isPost()  
             and !$this->_user->isAdmin()
@@ -764,7 +775,6 @@
             and $action != 'wikitohtml' 
             )
         {
-            $page = $this->getPage();
             if ( $page->get('moderation') ) {
                 require_once("lib/WikiPlugin.php");
                 $loader = new WikiPluginLoader();
@@ -784,7 +794,6 @@
                              _("You must wait for moderator approval."));
                     else
                         $plugin->_tokens['CONTENT'] = $CONTENT;
-            	    require_once("lib/Template.php");
             	    $title = WikiLink($page->getName());
             	    $title->pushContent(' : ', WikiLink(_("ModeratedPage")));
 	            GeneratePage(Template('browse', $plugin->_tokens), 


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

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

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

Revision: 7463
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7463&view=rev
Author:   vargenau
Date:     2010-06-04 14:15:43 +0000 (Fri, 04 Jun 2010)

Log Message:
-----------
Add paragraph about forbidden characters in page names

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

Modified: trunk/pgsrc/Help%2FAddingPages
===================================================================
--- trunk/pgsrc/Help%2FAddingPages	2010-06-02 10:39:33 UTC (rev 7462)
+++ trunk/pgsrc/Help%2FAddingPages	2010-06-04 14:15:43 UTC (rev 7463)
@@ -1,4 +1,4 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
+Date: Fri,  4 Jun 2010 16:06:47 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -14,6 +14,14 @@
 Then you can go ahead and click the question mark at the end of your new
 hyperlink, and the Wiki will give you a window for making the new page.
 
+The page name can contain any character, except:
+* angle brackets (<>),
+* square brackets ([]),
+* curly brackets ({}),
+* double quotes ("),
+* pipe (|),
+* and hash sign (#) that is used for anchors.
+
 If you wish to add documents with complex markup to the wiki, you
 might be better off providing a URL to it than trying to add the text
 of the document here, like so:


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7462] trunk/tests/unit/runme_all

[<ru...@us...>]

Revision: 7462
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7462&view=rev
Author:   rurban
Date:     2010-06-02 10:39:33 +0000 (Wed, 02 Jun 2010)

Log Message:
-----------
Fixed #3010043 by S?\195?\169bastien Le Callonnec (slecallonnec)
  bash syntax error

Modified Paths:
--------------
    trunk/tests/unit/runme_all

Modified: trunk/tests/unit/runme_all
===================================================================
--- trunk/tests/unit/runme_all	2010-06-01 15:08:17 UTC (rev 7461)
+++ trunk/tests/unit/runme_all	2010-06-02 10:39:33 UTC (rev 7462)
@@ -8,7 +8,7 @@
 
 for db in file dba SQL ADODB cvs \
     PearDB_mysql PearDB_pgsql PearDB_sqlite \
-    ADODB_mysql ADODB_postgres7 ADODB_sqlite
+    ADODB_mysql ADODB_postgres7 ADODB_sqlite \
     PDO_mysql PDO_pgsql PDO_sqlite
 do
     php -Cq -d register_argc_argv=1 test.php debug=1 level=10 db=$db | \


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

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

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

Revision: 7461
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7461&view=rev
Author:   vargenau
Date:     2010-06-01 15:08:17 +0000 (Tue, 01 Jun 2010)

Log Message:
-----------
Escape links

Modified Paths:
--------------
    trunk/pgsrc/Help%2FPageList
    trunk/pgsrc/Help%2FPagePermissions
    trunk/pgsrc/ReleaseNotes

Modified: trunk/pgsrc/Help%2FPageList
===================================================================
--- trunk/pgsrc/Help%2FPageList	2010-06-01 15:04:26 UTC (rev 7460)
+++ trunk/pgsrc/Help%2FPageList	2010-06-01 15:08:17 UTC (rev 7461)
@@ -1,4 +1,4 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
+Date: Tue,  1 Jun 2010 17:01:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -16,7 +16,7 @@
 * LikePages,
 * MostPopular,
 * TitleSearch,
-- WikiAdmin* and more.
+- ~WikiAdmin* and more.
 
 It also allows dynamic expansion of those plugins to include more columns in their output.
 
@@ -112,7 +112,7 @@
 |= checkbox  | Selectable checkbox at the left
 |= content   | Page content
 
-Special, custom columns, either theme or plugin (WikiAdmin*) specific:
+Special, custom columns, either theme or plugin (~WikiAdmin*) specific:
 |= remove              | Remove
 |= perm                | Permission Mask
 |= acl                 | ACL

Modified: trunk/pgsrc/Help%2FPagePermissions
===================================================================
--- trunk/pgsrc/Help%2FPagePermissions	2010-06-01 15:04:26 UTC (rev 7460)
+++ trunk/pgsrc/Help%2FPagePermissions	2010-06-01 15:08:17 UTC (rev 7461)
@@ -1,4 +1,4 @@
-Date: Wed, 19 May 2010 18:15:54 +0000
+Date: Tue,  1 Jun 2010 17:01:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -62,7 +62,7 @@
 
 == Groups - definition of group membership ==
 
-See WikiGroup how to enable and where to store user-specific group membership.
+See ~WikiGroup how to enable and where to store user-specific group membership.
 Group methods: database, file, ldap, wikipage, none
 
 To do: _explain better._

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2010-06-01 15:04:26 UTC (rev 7460)
+++ trunk/pgsrc/ReleaseNotes	2010-06-01 15:08:17 UTC (rev 7461)
@@ -1,4 +1,4 @@
-Date: Wed, 19 May 2010 18:15:54 +0000
+Date: Tue,  1 Jun 2010 17:01:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -51,7 +51,7 @@
 * fix Bug#1992172 Interwiki link does not work in ~RichTable (vargenau)
 * fix Bug#2010748 Missing image
 * fix Bug#1831881 Fatal database error when sorting columns (vargenau)
-* fix PageList prev/next links on multi-columns lists, improve handling of ordered lists
+* fix ~PageList prev/next links on multi-columns lists, improve handling of ordered lists
 * allow single "0" as not-empty page content
 * fix action=rename, support new optional argument to=newpagename
 
@@ -431,11 +431,11 @@
 
 Lots of bugfixes, and some feature and performance enhancements.
 
-A new EDIT_TOOLBAR from mediawiki, more page permission enhancements,
+A new EDIT_TOOLBAR from Mediawiki, more page permission enhancements,
 reduced memory usage for pagelists which need no page content,
 related improvement for ~OldMarkup crashes because of PCRE memory exhaustion.
 
-New <!plugin-list !> syntax and PhpWiki:PageListLibrary args.
+New <!plugin-list !> syntax and ~PhpWiki:~PageListLibrary args.
 
 Because of SQL changes you'd need to ?action=upgrade to update for SQL.
 


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

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

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

Revision: 7460
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7460&view=rev
Author:   vargenau
Date:     2010-06-01 15:04:26 +0000 (Tue, 01 Jun 2010)

Log Message:
-----------
Remove nonexistent link

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

Modified: trunk/pgsrc/Help%2FSemanticRelations
===================================================================
--- trunk/pgsrc/Help%2FSemanticRelations	2010-06-01 15:03:21 UTC (rev 7459)
+++ trunk/pgsrc/Help%2FSemanticRelations	2010-06-01 15:04:26 UTC (rev 7460)
@@ -1,4 +1,4 @@
-Date: Wed, 19 May 2010 18:15:54 +0000
+Date: Tue,  1 Jun 2010 17:01:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -76,7 +76,7 @@
 
 == See Also ==
 * [[PhpWiki:SemanticWeb]]
-* [[SemanticRelations]], [[ListRelations]], [[SemanticSearch]], [[SemanticSearchAdvanced]]
+* [[SemanticRelations]], [[ListRelations]], [[SemanticSearch]]
 * [[Help:SemanticRelationsPlugin|SemanticRelationsPlugin]], [[Help:SemanticSearchPlugin|SemanticSearchPlugin]]
 * [[PhpWiki:ImportRdf]], [[PhpWiki:ImportRdfs]], [[PhpWiki:ImportOwl]]
 * [[PhpWiki:ExportRdf]], [[PhpWiki:ExportRdfs]], [[PhpWiki:ExportOwl]]


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

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

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

Revision: 7459
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7459&view=rev
Author:   vargenau
Date:     2010-06-01 15:03:21 +0000 (Tue, 01 Jun 2010)

Log Message:
-----------
Add link to MovieLens

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

Modified: trunk/pgsrc/Help%2FRateItPlugin
===================================================================
--- trunk/pgsrc/Help%2FRateItPlugin	2010-06-01 13:58:01 UTC (rev 7458)
+++ trunk/pgsrc/Help%2FRateItPlugin	2010-06-01 15:03:21 UTC (rev 7459)
@@ -1,4 +1,4 @@
-Date: Fri,  7 May 2010 15:13:31 +0000
+Date: Tue,  1 Jun 2010 17:01:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -8,10 +8,10 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-RateIt: A recommender system, based on MovieLens and "suggest".
+RateIt: A recommender system, based on [[http://www.movielens.org/|MovieLens]] and "suggest".
 
 Store user ratings per pagename. The wikilens theme displays a navbar image bar
-with some nice javascript magic and this plugin shows various recommendations.
+with some nice Javascript magic and this plugin shows various recommendations.
 
 There should be two methods to store ratings:
 * In a SQL database as in wikilens http://dickens.cs.umn.edu/dfrankow/wikilens


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7458] trunk/lib/EditToolbar.php

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

Revision: 7458
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7458&view=rev
Author:   vargenau
Date:     2010-06-01 13:58:01 +0000 (Tue, 01 Jun 2010)

Log Message:
-----------
Present only allowed plugins

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

Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php	2010-05-31 13:23:56 UTC (rev 7457)
+++ trunk/lib/EditToolbar.php	2010-06-01 13:58:01 UTC (rev 7458)
@@ -331,6 +331,7 @@
     // result is cached. Esp. the args are expensive
     function pluginPulldown() {
         global $WikiTheme;
+        global $AllAllowedPlugins;
 
         $plugin_dir = 'lib/plugin';
         if (defined('PHPWIKI_DIR'))
@@ -345,18 +346,20 @@
             $w = new WikiPluginLoader;
             foreach ($plugins as $plugin) {
                 $pluginName = str_replace(".php", "", $plugin);
-                $p = $w->getPlugin($pluginName, false); // second arg?
-                // trap php files which aren't WikiPlugin~s
-                if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
-                    $plugin_args = '';
-                    $desc = $p->getArgumentsDescription();
-                    $src = array("\n",'"',"'",'|','[',']','\\');
-                    $replace = array('%0A','%22','%27','%7C','%5B','%5D','%5C');
-                    $desc = str_replace("<br />",' ',$desc->asXML());
-                    if ($desc)
-                        $plugin_args = ' '.str_replace($src, $replace, $desc);
-                    $toinsert = "%0A<<".$pluginName.$plugin_args.">>"; // args?
-                    $plugin_js .= ",['$pluginName','$toinsert']";
+                if (in_array($pluginName, $AllAllowedPlugins)) {
+                    $p = $w->getPlugin($pluginName, false); // second arg?
+                    // trap php files which aren't WikiPlugin~s
+                    if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
+                        $plugin_args = '';
+                        $desc = $p->getArgumentsDescription();
+                        $src = array("\n",'"',"'",'|','[',']','\\');
+                        $replace = array('%0A','%22','%27','%7C','%5B','%5D','%5C');
+                        $desc = str_replace("<br />",' ',$desc->asXML());
+                        if ($desc)
+                            $plugin_args = ' '.str_replace($src, $replace, $desc);
+                        $toinsert = "%0A<<".$pluginName.$plugin_args.">>"; // args?
+                        $plugin_js .= ",['$pluginName','$toinsert']";
+                    }
                 }
             }
             $plugin_js = substr($plugin_js, 1);


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

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

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

Revision: 7457
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7457&view=rev
Author:   vargenau
Date:     2010-05-31 13:23:56 +0000 (Mon, 31 May 2010)

Log Message:
-----------
Remove pcre_fix_posix_classes function

Modified Paths:
--------------
    trunk/lib/CachedMarkup.php
    trunk/lib/IniConfig.php
    trunk/lib/config.php
    trunk/lib/stdlib.php

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2010-05-31 13:15:22 UTC (rev 7456)
+++ trunk/lib/CachedMarkup.php	2010-05-31 13:23:56 UTC (rev 7457)
@@ -176,9 +176,9 @@
     function _glean_description($text) {
         static $two_sentences;
         if (!$two_sentences) {
-            $two_sentences = pcre_fix_posix_classes("[.?!][\")]*\s+[\"(]*[[:upper:])]"
-                                                    . ".*"
-                                                    . "[.?!][\")]*\s*[\"(]*([[:upper:])]|$)");
+            $two_sentences = "[.?!][\")]*\s+[\"(]*[[:upper:])]"
+                           . ".*"
+                           . "[.?!][\")]*\s*[\"(]*([[:upper:])]|$)";
         }
         
         if (!isset($this->_description) and preg_match("/$two_sentences/sx", $text))

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2010-05-31 13:15:22 UTC (rev 7456)
+++ trunk/lib/IniConfig.php	2010-05-31 13:23:56 UTC (rev 7457)
@@ -56,8 +56,7 @@
  *
  * - Get rid of WikiNameRegexp and KeywordLinkRegexp as globals by finding
  *   everywhere that uses them as variables and modify the code to use
- *   them as constants. Will involve hacking around
- *   pcre_fix_posix_classes (probably with redefines()).
+ *   them as constants.
  */
 
 include_once (dirname(__FILE__)."/config.php");
@@ -969,8 +968,6 @@
     }
 
     // language dependent updates:
-    $WikiNameRegexp = pcre_fix_posix_classes($WikiNameRegexp);
-    //if ($KeywordLinkRegexp) $KeywordLinkRegexp = pcre_fix_posix_classes($KeywordLinkRegexp);
     if (!defined('CATEGORY_GROUP_PAGE'))
         define('CATEGORY_GROUP_PAGE',_("CategoryGroup"));
     if (!defined('WIKI_NAME'))

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2010-05-31 13:15:22 UTC (rev 7456)
+++ trunk/lib/config.php	2010-05-31 13:23:56 UTC (rev 7457)
@@ -277,10 +277,6 @@
     return $loc;
 }
 
-function pcre_fix_posix_classes ($regexp) {
-    return $regexp;
-}
-
 function deduce_script_name() {
     $s = &$GLOBALS['HTTP_SERVER_VARS'];
     $script = @$s['SCRIPT_NAME'];

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2010-05-31 13:15:22 UTC (rev 7456)
+++ trunk/lib/stdlib.php	2010-05-31 13:23:56 UTC (rev 7457)
@@ -1280,7 +1280,7 @@
         $RE[] = "/(${sep})([^${sep}]+)/";
         
         foreach ($RE as $key)
-            $RE[$key] = pcre_fix_posix_classes($key);
+            $RE[$key] = $key;
     }
 
     foreach ($RE as $regexp) {


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7456] trunk/lib/config.php

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

Revision: 7456
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7456&view=rev
Author:   vargenau
Date:     2010-05-31 13:15:22 +0000 (Mon, 31 May 2010)

Log Message:
-----------
Simplify pcre_fix_posix_classes

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

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2010-05-31 13:06:40 UTC (rev 7455)
+++ trunk/lib/config.php	2010-05-31 13:15:22 UTC (rev 7456)
@@ -29,15 +29,6 @@
             @preg_match('/CGI/',$GLOBALS['HTTP_ENV_VARS']['GATEWAY_INTERFACE']));
 }
 
-/*
-// copy some $_ENV vars to $_SERVER for CGI compatibility. php does it automatically since when?
-if (isCGI()) {
-    foreach (explode(':','SERVER_SOFTWARE:SERVER_NAME:GATEWAY_INTERFACE:SERVER_PROTOCOL:SERVER_PORT:REQUEST_METHOD:HTTP_ACCEPT:PATH_INFO:PATH_TRANSLATED:SCRIPT_NAME:QUERY_STRING:REMOTE_HOST:REMOTE_ADDR:REMOTE_USER:AUTH_TYPE:CONTENT_TYPE:CONTENT_LENGTH') as $key) {
-        $GLOBALS['HTTP_SERVER_VARS'][$key] = &$GLOBALS['HTTP_ENV_VARS'][$key];
-    }
-}
-*/
-
 // essential internal stuff
 if (!check_php_version(6))
     set_magic_quotes_runtime(0);
@@ -45,12 +36,6 @@
 /**
  * Browser Detection Functions
  *
- * Current Issues:
- *  NS/IE < 4.0 doesn't accept < ? xml version="1.0" ? >
- *  NS/IE < 4.0 cannot display PNG
- *  NS/IE < 4.0 cannot display all XHTML tags
- *  NS < 5.0 needs textarea wrap=virtual
- *  IE55 has problems with transparent PNG's
  * @author: ReiniUrban
  */
 function browserAgent() {
@@ -114,23 +99,6 @@
     if (!$languages) {
     	// make this faster
     	$languages = array("en","de","es","fr","it","ja","zh","nl","sv");
-        // ignore possible "_<territory>" and codeset "ja.utf8"
-        /*
-        require_once("lib/WikiTheme.php");
-        $languages = listAvailableLanguages();
-        if (defined('DEFAULT_LANGUAGE') and in_array(DEFAULT_LANGUAGE, $languages))
-        {
-            // remove duplicates
-            if ($i = array_search(DEFAULT_LANGUAGE, $languages) !== false) {
-                array_splice($languages, $i, 1);
-            }
-            array_unshift($languages, DEFAULT_LANGUAGE);
-            foreach ($languages as $lang) {
-                $arr = FileFinder::locale_versions($lang);
-                $languages = array_merge($languages, $arr);
-            }
-        }
-        */
     }
 
     $accept = false; 
@@ -309,78 +277,8 @@
     return $loc;
 }
 
-/** string pcre_fix_posix_classes (string $regexp)
-*
-* Older version (pre 3.x?) of the PCRE library do not support
-* POSIX named character classes (e.g. [[:alnum:]]).
-*
-* This is a helper function which can be used to convert a regexp
-* which contains POSIX named character classes to one that doesn't.
-*
-* All instances of strings like '[:<class>:]' are replaced by the equivalent
-* enumerated character class.
-*
-* Implementation Notes:
-*
-* Currently we use hard-coded values which are valid only for
-* ISO-8859-1.  Also, currently on the classes [:alpha:], [:alnum:],
-* [:upper:] and [:lower:] are implemented.  (The missing classes:
-* [:blank:], [:cntrl:], [:digit:], [:graph:], [:print:], [:punct:],
-* [:space:], and [:xdigit:] could easily be added if needed.)
-*
-* This is a hack.  I tried to generate these classes automatically
-* using ereg(), but discovered that in my PHP, at least, ereg() is
-* slightly broken w.r.t. POSIX character classes.  (It includes
-* "\xaa" and "\xba" in [:alpha:].)
-*
-* So for now, this will do.  --Jeff <da...@da...> 14 Mar, 2001
-*/
 function pcre_fix_posix_classes ($regexp) {
-    global $charset;
-
-    if (defined('GFORGE') and GFORGE) {
-        return $regexp;
-    }
-
-    if (!isset($charset))
-        $charset = CHARSET; // get rid of constant. pref is dynamic and language specific
-    if (in_array($GLOBALS['LANG'], array('zh')))
-        $charset = 'utf-8';
-    if (strstr($GLOBALS['LANG'],'.utf-8'))
-        $charset = 'utf-8';
-    elseif (strstr($GLOBALS['LANG'],'.euc-jp'))
-        $charset = 'euc-jp';
-    elseif (strstr($GLOBALS['LANG'], 'ja'))
-        $charset = 'euc-jp';
-
-    if (strtolower($charset) == 'utf-8') { // thanks to John McPherson
-        // until posix class names/pcre work with utf-8
-	if (preg_match('/[[:upper:]]/', '\xc4\x80'))
-            return $regexp;    
-        // utf-8 non-ascii chars: most common (eg western) latin chars are 0xc380-0xc3bf
-        // we currently ignore other less common non-ascii characters
-        // (eg central/east european) latin chars are 0xc432-0xcdbf and 0xc580-0xc5be
-        // and indian/cyrillic/asian languages
-        
-        // this replaces [[:lower:]] with utf-8 match (Latin only)
-        $regexp = preg_replace('/\[\[\:lower\:\]\]/','(?:[a-z]|\xc3[\x9f-\xbf]|\xc4[\x81\x83\x85\x87])',
-                               $regexp);
-        // this replaces [[:upper:]] with utf-8 match (Latin only)
-        $regexp = preg_replace('/\[\[\:upper\:\]\]/','(?:[A-Z]|\xc3[\x80-\x9e]|\xc4[\x80\x82\x84\x86])',
-                               $regexp);
-    } elseif (preg_match('/[[:upper:]]/', 'Ä')) {
-        // First check to see if our PCRE lib supports POSIX character
-        // classes.  If it does, there's nothing to do.
-        return $regexp;
-    }
-    static $classes = array(
-                            'alnum' => "0-9A-Za-z\xc0-\xd6\xd8-\xf6\xf8-\xff",
-                            'alpha' => "A-Za-z\xc0-\xd6\xd8-\xf6\xf8-\xff",
-                            'upper' => "A-Z\xc0-\xd6\xd8-\xde",
-                            'lower' => "a-z\xdf-\xf6\xf8-\xff"
-                            );
-    $keys = join('|', array_keys($classes));
-    return preg_replace("/\[:($keys):]/e", '$classes["\1"]', $regexp);
+    return $regexp;
 }
 
 function deduce_script_name() {


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7455] trunk/lib/config.php

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

Revision: 7455
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7455&view=rev
Author:   vargenau
Date:     2010-05-31 13:06:40 +0000 (Mon, 31 May 2010)

Log Message:
-----------
Remove unused function isBrowserNetscape

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

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2010-05-31 13:02:02 UTC (rev 7454)
+++ trunk/lib/config.php	2010-05-31 13:06:40 UTC (rev 7455)
@@ -83,14 +83,6 @@
     return (browserDetect('Mozilla/') and 
             browserDetect('MSIE'));
 }
-// old Netscape prior to Mozilla
-function isBrowserNetscape($version = false) {
-    $agent = (browserDetect('Mozilla/') and 
-            ! browserDetect('Gecko/') and
-            ! browserDetect('MSIE'));
-    if ($version) return $agent and browserVersion() >= $version; 
-    else return $agent;
-}
 // must omit display alternate stylesheets: konqueror 3.1.4
 // http://sourceforge.net/tracker/index.php?func=detail&aid=945154&group_id=6121&atid=106121
 function isBrowserKonqueror($version = false) {


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7454] trunk/lib/WysiwygEdit/htmlarea2.php

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

Revision: 7454
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7454&view=rev
Author:   vargenau
Date:     2010-05-31 13:02:02 +0000 (Mon, 31 May 2010)

Log Message:
-----------
Remove unused code

Modified Paths:
--------------
    trunk/lib/WysiwygEdit/htmlarea2.php

Modified: trunk/lib/WysiwygEdit/htmlarea2.php
===================================================================
--- trunk/lib/WysiwygEdit/htmlarea2.php	2010-05-31 12:59:14 UTC (rev 7453)
+++ trunk/lib/WysiwygEdit/htmlarea2.php	2010-05-31 13:02:02 UTC (rev 7454)
@@ -16,8 +16,6 @@
 class WysiwygEdit_htmlarea2 extends WysiwygEdit {
 
     function Head($name='edit[content]') {
-	//if (isBrowserIE() and browserVersion() >= 5.5) return $this->Head_IEonly();
-
         return JavaScript("
 _editor_url = \"".DATA_PATH."/themes/default/htmlarea2/\";
 var win_ie_ver = parseFloat(navigator.appVersion.split(\"MSIE\")[1]);
@@ -39,26 +37,11 @@
     // version 2
     function Textarea($textarea,$wikitext,$name='edit[content]') {
         $out = HTML($textarea);
-        // some more custom links 
-        //$out->pushContent(HTML::a(array('href'=>"javascript:editor_insertHTML('".$name."',\"<font style='background-color: yellow'>\",'</font>',1)"),_("Highlight selected text")));
-        //$out->pushContent(HTML("\n"));
         $out->pushContent(JavaScript("editor_generate('".$name."');",
                                      array('version' => 'JavaScript1.2',
                                            'defer' => 1)));
         return $out;
-        //return "\n".'<script language="JavaScript1.2" defer> editor_generate(\'CONTENT\'); </script>'."\n";
     }
-
-    // for testing only
-    function Head_IEonly() {
-        return HTML(JavaScript("_editor_url = \"".DATA_PATH."/themes/default/htmlarea2/\""),
-                    "\n",
-                    JavaScript("",
-                               array('version' => 'JavaScript1.2',
-                                     'type' => 'text/javascript',
-                                     'src' => DATA_PATH."/themes/default/htmlarea2/editor.js")));
-    }
-
 }
 
 // Local Variables:


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7453] trunk/lib/config.php

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

Revision: 7453
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7453&view=rev
Author:   vargenau
Date:     2010-05-31 12:59:14 +0000 (Mon, 31 May 2010)

Log Message:
-----------
Remove unused function isBrowserIE55

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

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2010-05-31 12:55:25 UTC (rev 7452)
+++ trunk/lib/config.php	2010-05-31 12:59:14 UTC (rev 7453)
@@ -83,11 +83,6 @@
     return (browserDetect('Mozilla/') and 
             browserDetect('MSIE'));
 }
-// problem with transparent PNG's
-function isBrowserIE55() {
-    return (isBrowserIE() and 
-            browserVersion() > 5.1 and browserVersion() < 6.0);
-}
 // old Netscape prior to Mozilla
 function isBrowserNetscape($version = false) {
     $agent = (browserDetect('Mozilla/') and 
@@ -115,7 +110,6 @@
     return browserDetect('Opera/');
 }
 
-
 /**
  * If $LANG is undefined:
  * Smart client language detection, based on our supported languages


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7452] trunk/lib/config.php

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

Revision: 7452
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7452&view=rev
Author:   vargenau
Date:     2010-05-31 12:55:25 +0000 (Mon, 31 May 2010)

Log Message:
-----------
Let's assume PHP >= 4.2

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

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2010-05-31 12:50:50 UTC (rev 7451)
+++ trunk/lib/config.php	2010-05-31 12:55:25 UTC (rev 7452)
@@ -423,27 +423,6 @@
     return preg_match("%^${requri}[^/]*$%", $GLOBALS['HTTP_SERVER_VARS']['SCRIPT_NAME']);
 }
 
-// >= php-4.1.0
-if (!function_exists('array_key_exists')) { // lib/IniConfig.php, sqlite, adodb, ...
-    function array_key_exists($item, $array) {
-        return isset($array[$item]);
-    }
-}
-
-// => php-4.0.5
-if (!function_exists('is_scalar')) { // lib/stdlib.php:wikihash()
-    function is_scalar($x) {
-        return is_numeric($x) or is_string($x) or is_float($x) or is_bool($x); 
-    }
-}
-
-// => php-4.2.0. pear wants to break old php's! DB uses it now.
-if (!function_exists('is_a')) {
-    function is_a($item,$class) {
-        return isa($item,$class); 
-    }
-}
-
 // needed < php5
 // by bradhuizenga at softhome dot net from the php docs
 if (!function_exists('str_ireplace')) {


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

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

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

Revision: 7451
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7451&view=rev
Author:   vargenau
Date:     2010-05-31 12:50:50 +0000 (Mon, 31 May 2010)

Log Message:
-----------
RIP Netscape 3 & 4

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

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2010-05-31 12:44:46 UTC (rev 7450)
+++ trunk/lib/config.php	2010-05-31 12:50:50 UTC (rev 7451)
@@ -96,14 +96,6 @@
     if ($version) return $agent and browserVersion() >= $version; 
     else return $agent;
 }
-// NS3 or less
-function isBrowserNS3() {
-    return (isBrowserNetscape() and browserVersion() < 4.0);
-}
-// NS4 or less
-function isBrowserNS4() {
-    return (isBrowserNetscape() and browserVersion() < 5.0);
-}
 // must omit display alternate stylesheets: konqueror 3.1.4
 // http://sourceforge.net/tracker/index.php?func=detail&aid=945154&group_id=6121&atid=106121
 function isBrowserKonqueror($version = false) {

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2010-05-31 12:44:46 UTC (rev 7450)
+++ trunk/lib/editpage.php	2010-05-31 12:50:50 UTC (rev 7451)
@@ -624,11 +624,6 @@
                                          'cols' => $request->getPref('editWidth'),
                                          'readonly' => (bool) $readonly),
                                    $this->_content);
-        /** <textarea wrap="virtual"> is not valid XHTML but Netscape 4 requires it
-         * to wrap long lines.
-         */
-        if (isBrowserNS4())
-            $textarea->setAttr('wrap', 'virtual');
         if (ENABLE_WYSIWYG) {
             return $this->WysiwygEdit->Textarea($textarea, $this->_wikicontent, 
                                                 $textarea->getAttr('name'));


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

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

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

Revision: 7450
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7450&view=rev
Author:   vargenau
Date:     2010-05-31 12:44:46 +0000 (Mon, 31 May 2010)

Log Message:
-----------
Remove safe_wordwrap, use standard PHP wordwrap

Modified Paths:
--------------
    trunk/lib/config.php
    trunk/lib/plugin/PageDump.php

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2010-05-31 12:38:21 UTC (rev 7449)
+++ trunk/lib/config.php	2010-05-31 12:44:46 UTC (rev 7450)
@@ -518,10 +518,6 @@
     }
 }
 
-function safe_wordwrap($str, $width=80, $break="\n", $cut=false) {
-    return wordwrap($str, $width, $break, $cut);
-}
-
 function getUploadFilePath() {
 
     if (defined('UPLOAD_FILE_PATH')) {

Modified: trunk/lib/plugin/PageDump.php
===================================================================
--- trunk/lib/plugin/PageDump.php	2010-05-31 12:38:21 UTC (rev 7449)
+++ trunk/lib/plugin/PageDump.php	2010-05-31 12:44:46 UTC (rev 7450)
@@ -140,7 +140,7 @@
         }
         // We are displaing inline preview in a WikiPage, so wrap the
         // text if it is too long--unless quoted-printable (TODO).
-        $mailified = safe_wordwrap($mailified, 70);
+        $mailified = wordwrap($mailified, 70);
 
         $dlcvs = Button(array(//'page' => $page,
                               'action' => $this->getName(),


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

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

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

Revision: 7449
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7449&view=rev
Author:   vargenau
Date:     2010-05-31 12:38:21 +0000 (Mon, 31 May 2010)

Log Message:
-----------
Let's assume PHP >= 4.2

Modified Paths:
--------------
    trunk/lib/AccessLog.php
    trunk/lib/DbSession.php
    trunk/lib/IniConfig.php
    trunk/lib/Request.php
    trunk/lib/config.php
    trunk/lib/loadsave.php
    trunk/lib/plugin/PhpHighlight.php
    trunk/lib/prepend.php
    trunk/themes/default/templates/login.tmpl

Modified: trunk/lib/AccessLog.php
===================================================================
--- trunk/lib/AccessLog.php	2010-05-31 12:01:38 UTC (rev 7448)
+++ trunk/lib/AccessLog.php	2010-05-31 12:38:21 UTC (rev 7449)
@@ -357,10 +357,7 @@
             //$log_tbl =& $this->_accesslog->logtable;
             if ($request->get('REQUEST_METHOD') == "POST") {
                 // strangely HTTP_POST_VARS doesn't contain all posted vars.
-          	if (check_php_version(4,2))
-                    $args = $_POST; // copy not ref. clone not needed on hashes
-                else
-                    $args = $GLOBALS['HTTP_POST_VARS'];
+                $args = $_POST; // copy not ref. clone not needed on hashes
                 // garble passwords
                 if (!empty($args['auth']['passwd']))    $args['auth']['passwd'] = '<not displayed>';
                 if (!empty($args['dbadmin']['passwd'])) $args['dbadmin']['passwd'] = '<not displayed>';

Modified: trunk/lib/DbSession.php
===================================================================
--- trunk/lib/DbSession.php	2010-05-31 12:01:38 UTC (rev 7448)
+++ trunk/lib/DbSession.php	2010-05-31 12:38:21 UTC (rev 7449)
@@ -28,15 +28,6 @@
         // Check for existing DbSession handler
         $db_type = $dbh->getParam('dbtype');
         if (isa($dbh, 'WikiDB')) {
-            // will fail with php4 and case-sensitive filesystem
-            //$db_type = substr(get_class($dbh),7); 
-            
-            // < 4.1.2 crash on dba sessions at session_write_close(). 
-            // (Tested with 4.1.1 and 4.1.2)
-            // Didn't try postgres sessions.
-            if (!check_php_version(4,1,2) and $db_type == 'dba')
-                return false;
-
             @include_once("lib/DbSession/".$db_type.".php");
             
             $class = "DbSession_".$db_type;

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2010-05-31 12:01:38 UTC (rev 7448)
+++ trunk/lib/IniConfig.php	2010-05-31 12:38:21 UTC (rev 7449)
@@ -337,12 +337,8 @@
     // USE_DB_SESSION default logic:
     if (!defined('USE_DB_SESSION')) {
         if ($DBParams['db_session_table']
-            and in_array($DBParams['dbtype'], array('SQL','ADODB','PDO'))) {
+            and in_array($DBParams['dbtype'], array('SQL','ADODB','PDO','dba'))) {
             define('USE_DB_SESSION', true);
-        } elseif ($DBParams['dbtype'] == 'dba' and check_php_version(4,1,2)) {
-            define('USE_DB_SESSION', true); // Depends on db handler as well. 
-            				    // BerkeleyDB on older php has problems 
-            				    // with multiple db handles.
         } else {
             define('USE_DB_SESSION', false);
         }

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2010-05-31 12:01:38 UTC (rev 7448)
+++ trunk/lib/Request.php	2010-05-31 12:38:21 UTC (rev 7449)
@@ -331,8 +331,6 @@
             if (!COMPRESS_OUTPUT)
                 $compress = false;
         }
-        elseif (!check_php_version(4,2,3))
-            $compress = false;
         elseif (isCGI()) // necessary?
             $compress = false;
             
@@ -443,17 +441,6 @@
         }
         
         if (!empty($this->_is_buffering_output)) {
-            /* This cannot work because it might destroy xml markup */
-            /*
-            if (0 and $GLOBALS['SearchHighLightQuery'] and check_php_version(4,2)) {
-                $html = str_replace($GLOBALS['SearchHighLightQuery'],
-                                    '<span class="search-term">'.$GLOBALS['SearchHighLightQuery'].'</span>',
-                                    ob_get_contents());
-                ob_clean();
-                header(sprintf("Content-Length: %d", strlen($html)));
-                echo $html;
-            } else {
-            */
             // if _is_compressing_output then ob_get_length() returns 
             // the uncompressed length, not the gzip'ed as required.
 	    if (!headers_sent() and !$this->_is_compressing_output) {
@@ -1137,10 +1124,7 @@
             //$log_tbl =& $this->_accesslog->logtable;
             if ($request->get('REQUEST_METHOD') == "POST") {
                 // strangely HTTP_POST_VARS doesn't contain all posted vars.
-          	if (check_php_version(4,2))
-                    $args = $_POST; // copy not ref. clone not needed on hashes
-                else
-                    $args = $GLOBALS['HTTP_POST_VARS'];
+                $args = $_POST; // copy not ref. clone not needed on hashes
                 // garble passwords
                 if (!empty($args['auth']['passwd']))    $args['auth']['passwd'] = '<not displayed>';
                 if (!empty($args['dbadmin']['passwd'])) $args['dbadmin']['passwd'] = '<not displayed>';

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2010-05-31 12:01:38 UTC (rev 7448)
+++ trunk/lib/config.php	2010-05-31 12:38:21 UTC (rev 7449)
@@ -7,14 +7,8 @@
  */
 
 if (!defined("LC_ALL")) {
-    // Backward compatibility (for PHP < 4.0.5)
-    if (!check_php_version(4,0,5)) {
-        define("LC_ALL",   "LC_ALL");
-        define("LC_CTYPE", "LC_CTYPE");
-    } else {
-        define("LC_ALL",   0);
-        define("LC_CTYPE", 2);
-    }
+    define("LC_ALL",   0);
+    define("LC_CTYPE", 2);
 }
 // debug flags:
 define ('_DEBUG_VERBOSE',   1); // verbose msgs and add validator links on footer
@@ -524,69 +518,8 @@
     }
 }
 
-/** 
- * wordwrap() might crash between 4.1.2 and php-4.3.0RC2, fixed in 4.3.0
- * See http://bugs.php.net/bug.php?id=20927 and 
- * http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2002-1396
- * Improved version of wordwrap2() in the comments at http://www.php.net/wordwrap
- */
 function safe_wordwrap($str, $width=80, $break="\n", $cut=false) {
-    if (check_php_version(4,3))
-        return wordwrap($str, $width, $break, $cut);
-    elseif (!check_php_version(4,1,2))
-        return wordwrap($str, $width, $break, $cut);
-    else {
-        $len = strlen($str);
-        $tag = 0; $result = ''; $wordlen = 0;
-        for ($i = 0; $i < $len; $i++) {
-            $chr = $str[$i];
-            // don't break inside xml tags
-            if ($chr == '<') {
-                $tag++;
-            } elseif ($chr == '>') {
-                $tag--;
-            } elseif (!$tag) {
-                if (!function_exists('ctype_space')) {
-                    if (preg_match('/^\s$/', $chr))
-                        $wordlen = 0;
-                    else
-                        $wordlen++;
-                }
-                elseif (ctype_space($chr)) {
-                    $wordlen = 0;
-                } else {
-                    $wordlen++;
-                }
-            }
-            if ((!$tag) && ($wordlen) && (!($wordlen % $width))) {
-                $chr .= $break;
-            }
-            $result .= $chr;
-        }
-        return $result;
-        /*
-        if (isset($str) && isset($width)) {
-            $ex = explode(" ", $str); // wrong: must use preg_split \s+
-            $rp = array();
-            for ($i=0; $i<count($ex); $i++) {
-                // $word_array = preg_split('//', $ex[$i], -1, PREG_SPLIT_NO_EMPTY);
-                // delete #&& !is_numeric($ex[$i])# if you want force it anyway
-                if (strlen($ex[$i]) > $width && !is_numeric($ex[$i])) {
-                    $where = 0;
-                    $rp[$i] = "";
-                    for($b=0; $b < (ceil(strlen($ex[$i]) / $width)); $b++) {
-                        $rp[$i] .= substr($ex[$i], $where, $width).$break;
-                        $where += $width;
-                    }
-                } else {
-                    $rp[$i] = $ex[$i];
-                }
-            }
-            return implode(" ",$rp);
-        }
-        return $text;
-        */
-    }
+    return wordwrap($str, $width, $break, $cut);
 }
 
 function getUploadFilePath() {

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2010-05-31 12:01:38 UTC (rev 7448)
+++ trunk/lib/loadsave.php	2010-05-31 12:38:21 UTC (rev 7449)
@@ -225,6 +225,7 @@
  */
 function MakeWikiZip (&$request)
 {
+    global $ErrorManager;
     if ($request->getArg('include') == 'all') {
         $zipname         = WIKI_NAME . _("FullDump") . date('Ymd-Hi') . '.zip';
         $include_archive = true;
@@ -241,10 +242,7 @@
     $zip = new ZipWriter("Created by PhpWiki " . PHPWIKI_VERSION, $zipname);
 
     /* ignore fatals in plugins */
-    if (check_php_version(4,1)) {
-        global $ErrorManager;
-        $ErrorManager->pushErrorHandler(new WikiFunctionCb('_dump_error_handler'));
-    }
+    $ErrorManager->pushErrorHandler(new WikiFunctionCb('_dump_error_handler'));
 
     $dbi =& $request->_dbi;
     $thispage = $request->getArg('pagename'); // for "Return to ..."
@@ -293,10 +291,8 @@
                               $content, $attrib);
     }
     $zip->finish();
-    if (check_php_version(4,1)) {
-        global $ErrorManager;
-        $ErrorManager->popErrorHandler();
-    }
+
+    $ErrorManager->popErrorHandler();
 }
 
 function DumpToDir (&$request)
@@ -518,7 +514,7 @@
  */
 function _DumpHtmlToDir ($target, $page_iter, $exclude = false)
 {
-    global $WikiTheme, $request;
+    global $WikiTheme, $request, $ErrorManager;
     $silent = true; $zip = false; $directory = false;
     if ($WikiTheme->DUMP_MODE == 'HTML') {
 	$directory = $target;
@@ -549,10 +545,7 @@
     $_bodyAttr = @$WikiTheme->_MoreAttr['body'];
     unset($WikiTheme->_MoreAttr['body']);
 
-    if (check_php_version(4,1)) {
-        global $ErrorManager;
-        $ErrorManager->pushErrorHandler(new WikiFunctionCb('_dump_error_handler'));
-    }
+    $ErrorManager->pushErrorHandler(new WikiFunctionCb('_dump_error_handler'));
 
     // check if the dumped file will be accessible from outside
     $doc_root = $request->get("DOCUMENT_ROOT");
@@ -862,10 +855,7 @@
 	}
     }
 
-    if (check_php_version(4,1)) {
-        global $ErrorManager;
-        $ErrorManager->popErrorHandler();
-    }
+    $ErrorManager->popErrorHandler();
 
     $WikiTheme->HTML_DUMP_SUFFIX = '';
     $WikiTheme->DUMP_MODE = false;

Modified: trunk/lib/plugin/PhpHighlight.php
===================================================================
--- trunk/lib/plugin/PhpHighlight.php	2010-05-31 12:01:38 UTC (rev 7448)
+++ trunk/lib/plugin/PhpHighlight.php	2010-05-31 12:38:21 UTC (rev 7449)
@@ -95,14 +95,7 @@
                                   array('<?php', '?>'), $source);
         }
 
-        if (!check_php_version(4,2,0)) {
-            ob_start();
-            highlight_string($source);
-            $str = ob_get_contents();
-            ob_end_clean();
-        } else {
-            $str = highlight_string($source, true);
-        }
+        $str = highlight_string($source, true);
 
         if ($wrap)
             /* Remove "<?php\n" and "\n?>" again: */

Modified: trunk/lib/prepend.php
===================================================================
--- trunk/lib/prepend.php	2010-05-31 12:01:38 UTC (rev 7448)
+++ trunk/lib/prepend.php	2010-05-31 12:38:21 UTC (rev 7449)
@@ -10,7 +10,7 @@
 
 /** 
  * Returns true if current php version is at mimimum a.b.c 
- * Called: check_php_version(4,1)
+ * Called: check_php_version(5,2)
  */
 function check_php_version ($a = '0', $b = '0', $c = '0') {
     static $PHP_VERSION;

Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl	2010-05-31 12:01:38 UTC (rev 7448)
+++ trunk/themes/default/templates/login.tmpl	2010-05-31 12:38:21 UTC (rev 7449)
@@ -41,12 +41,7 @@
 if (ALLOW_BOGO_LOGIN && $require_level <= WIKIAUTH_BOGO) {
   require_once("lib/BlockParser.php");
   // This iso-8859-1 sample covers French, Spanish, Italian, German, and probably others
-  if (check_php_version(4,3))
-    $examplechars = htmlentities("ÀñíçéàÖãæôßøü", ENT_QUOTES, $charset);
-  elseif (check_php_version(4,0,3))
-    $examplechars = htmlentities("ÀñíçéàÖãæôßøü", ENT_QUOTES);
-  else
-    $examplechars = htmlentities("ÀñíçéàÖãæôßøü");
+  $examplechars = htmlentities("ÀñíçéàÖãæôßøü", ENT_QUOTES, $charset);
   // Japanese login requires utf-8 and ALLOW_NONWIKIWORD_LOGINS
   if (($charset == 'utf-8') && defined('ALLOW_NONWIKIWORD_LOGINS') && ALLOW_NONWIKIWORD_LOGINS) {
     //sample Japanese login name in unicode


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

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

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

Revision: 7448
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7448&view=rev
Author:   vargenau
Date:     2010-05-31 12:01:38 +0000 (Mon, 31 May 2010)

Log Message:
-----------
Let's assume PHP >= 4.2

Modified Paths:
--------------
    trunk/lib/Request.php
    trunk/lib/WikiCallback.php
    trunk/lib/WikiUserNew.php
    trunk/lib/difflib.php
    trunk/lib/plugin/PhpHighlight.php
    trunk/lib/plugin/WikiAdminChmod.php
    trunk/lib/plugin/WikiAdminChown.php
    trunk/lib/plugin/WikiAdminMarkup.php
    trunk/lib/plugin/WikiAdminRemove.php
    trunk/lib/plugin/WikiAdminRename.php
    trunk/lib/plugin/WikiAdminSearchReplace.php
    trunk/lib/plugin/WikiAdminSetAcl.php

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2010-05-31 11:29:39 UTC (rev 7447)
+++ trunk/lib/Request.php	2010-05-31 12:01:38 UTC (rev 7448)
@@ -20,14 +20,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-// backward compatibility for PHP < 4.2.0
-if (!function_exists('ob_clean')) {
-    function ob_clean() {
-        ob_end_clean();
-        ob_start();
-    }
-}
-
 class Request {
         
     function Request() {

Modified: trunk/lib/WikiCallback.php
===================================================================
--- trunk/lib/WikiCallback.php	2010-05-31 11:29:39 UTC (rev 7447)
+++ trunk/lib/WikiCallback.php	2010-05-31 12:01:38 UTC (rev 7448)
@@ -119,37 +119,7 @@
 
     function call_array ($args) {
         $method = &$this->methodName;
-        //$obj = &$this->object;
-
-        // This should work, except PHP's before 4.0.5 (which includes mine)
-        // don't have 'call_user_method_array'.
-        if (check_php_version(4,0,5)) {
-            return call_user_func_array(array(&$this->object, $method), $args);
-        }
-
-        // This should work, but doesn't.  At least in my PHP, the object seems
-        // to get passed by value, rather than reference, so any changes to the
-        // object made by the called method get lost.
-        /*
-        switch (count($args)) {
-        case 0: return call_user_method($method, $obj);
-        case 1: return call_user_method($method, $obj, $args[0]);
-        case 2: return call_user_method($method, $obj, $args[0], $args[1]);
-        case 3: return call_user_method($method, $obj, $args[0], $args[1], $args[2]);
-        case 4: return call_user_method($method, $obj, $args[0], $args[1], $args[2], $args[3]);
-        default: trigger_error("Too many arguments to method callback", E_USER_ERROR);
-        }
-        */
-
-        // This seems to work, at least for me (so far):
-        switch (count($args)) {
-        case 0: return $this->object->$method();
-        case 1: return $this->object->$method($args[0]);
-        case 2: return $this->object->$method($args[0], $args[1]);
-        case 3: return $this->object->$method($args[0], $args[1], $args[2]);
-        case 4: return $this->object->$method($args[0], $args[1], $args[2], $args[3]);
-        default: trigger_error("Too many arguments to method callback", E_USER_ERROR);
-        }
+        return call_user_func_array(array(&$this->object, $method), $args);
     }
 
     function toPearCb() {

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2010-05-31 11:29:39 UTC (rev 7447)
+++ trunk/lib/WikiUserNew.php	2010-05-31 12:01:38 UTC (rev 7448)
@@ -1080,7 +1080,7 @@
                 $dbh = $request->getDbh(); // use phpwiki database 
             } elseif ($dbh->getAuthParam('auth_dsn') == $dbh->getParam('dsn')) {
                 $dbh = $request->getDbh(); // same phpwiki database 
-            } else { // use another external database handle. needs PHP >= 4.1
+            } else { // use another external database handle.
                 $local_params = array_merge($GLOBALS['DBParams'],$GLOBALS['DBAuthParams']);
                 $local_params['dsn'] = $local_params['auth_dsn'];
                 $dbh = WikiDB::open($local_params);

Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php	2010-05-31 11:29:39 UTC (rev 7447)
+++ trunk/lib/difflib.php	2010-05-31 12:01:38 UTC (rev 7448)
@@ -11,7 +11,6 @@
 
 // FIXME: possibly remove assert()'s for production version?
 
-// PHP3 does not have assert()
 define('USE_ASSERTS', function_exists('assert'));
 
 class _DiffOp {

Modified: trunk/lib/plugin/PhpHighlight.php
===================================================================
--- trunk/lib/plugin/PhpHighlight.php	2010-05-31 11:29:39 UTC (rev 7447)
+++ trunk/lib/plugin/PhpHighlight.php	2010-05-31 12:01:38 UTC (rev 7448)
@@ -41,8 +41,6 @@
  *
  * Author: Martin Geisler <gim...@gi...>.
  *
- * Added compatibility for PHP < 4.2.0, where the highlight_string()
- * function has no second argument.
  * Added ability to override colors defined in php.ini --Carsten Klapp
  *
  * Known Problems:

Modified: trunk/lib/plugin/WikiAdminChmod.php
===================================================================
--- trunk/lib/plugin/WikiAdminChmod.php	2010-05-31 11:29:39 UTC (rev 7447)
+++ trunk/lib/plugin/WikiAdminChmod.php	2010-05-31 12:01:38 UTC (rev 7448)
@@ -28,8 +28,6 @@
  * Usage:   <<WikiAdminChmod >> or called via WikiAdminSelect
  * Author:  Reini Urban <ru...@x-...>
  *
- * KNOWN ISSUES:
- * Requires PHP 4.2 so far.
  */
 require_once('lib/PageList.php');
 require_once('lib/plugin/WikiAdminSelect.php');

Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php	2010-05-31 11:29:39 UTC (rev 7447)
+++ trunk/lib/plugin/WikiAdminChown.php	2010-05-31 12:01:38 UTC (rev 7448)
@@ -25,8 +25,6 @@
  * Usage:   <<WikiAdminChown s||=* >> or called via WikiAdminSelect
  * @author:  Reini Urban <ru...@x-...>
  *
- * KNOWN ISSUES:
- * Requires PHP 4.2 so far.
  */
 require_once('lib/PageList.php');
 require_once('lib/plugin/WikiAdminSelect.php');

Modified: trunk/lib/plugin/WikiAdminMarkup.php
===================================================================
--- trunk/lib/plugin/WikiAdminMarkup.php	2010-05-31 11:29:39 UTC (rev 7447)
+++ trunk/lib/plugin/WikiAdminMarkup.php	2010-05-31 12:01:38 UTC (rev 7448)
@@ -25,8 +25,6 @@
  * Usage:   <<WikiAdminMarkup s||=* >> or called via WikiAdminSelect
  * @author:  Reini Urban <ru...@x-...>
  *
- * KNOWN ISSUES:
- * Requires PHP 4.2 so far.
  */
 require_once('lib/PageList.php');
 require_once('lib/plugin/WikiAdminSelect.php');

Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php	2010-05-31 11:29:39 UTC (rev 7447)
+++ trunk/lib/plugin/WikiAdminRemove.php	2010-05-31 12:01:38 UTC (rev 7448)
@@ -28,7 +28,6 @@
  * KNOWN ISSUES:
  * Currently we must be Admin.
  * Future versions will support PagePermissions.
- * requires PHP 4.2 so far.
  */
 // maybe display more attributes with this class...
 require_once('lib/PageList.php');

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2010-05-31 11:29:39 UTC (rev 7447)
+++ trunk/lib/plugin/WikiAdminRename.php	2010-05-31 12:01:38 UTC (rev 7448)
@@ -25,8 +25,6 @@
  * Usage:   <<WikiAdminRename >> or called via WikiAdminSelect
  * @author:  Reini Urban <ru...@x-...>
  *
- * KNOWN ISSUES:
- *   Requires PHP 4.2 at least.
  */
 require_once('lib/PageList.php');
 require_once('lib/plugin/WikiAdminSelect.php');

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2010-05-31 11:29:39 UTC (rev 7447)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2010-05-31 12:01:38 UTC (rev 7448)
@@ -25,8 +25,6 @@
  * Usage:   <<WikiAdminSearchReplace >> or called via WikiAdminSelect
  * Author:  Reini Urban <ru...@x-...>
  *
- * KNOWN ISSUES:
- *   Requires PHP 4.2 so far.
  */
 require_once('lib/PageList.php');
 require_once('lib/plugin/WikiAdminSelect.php');

Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php	2010-05-31 11:29:39 UTC (rev 7447)
+++ trunk/lib/plugin/WikiAdminSetAcl.php	2010-05-31 12:01:38 UTC (rev 7448)
@@ -27,9 +27,6 @@
  * Usage:   <<WikiAdminSetAcl >> or called via WikiAdminSelect
  * Author:  Reini Urban <ru...@x-...>
  *
- * KNOWN ISSUES:
- * Requires PHP 4.2 so far.
- *
  * TODO: UI to add custom group/username.
  * Currently it's easier to dump a page, fix it manually and
  * import it, than use Setacl


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

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

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

Revision: 7447
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7447&view=rev
Author:   vargenau
Date:     2010-05-31 11:29:39 +0000 (Mon, 31 May 2010)

Log Message:
-----------
Use Wikicreole syntax for plugins in comments

Modified Paths:
--------------
    trunk/lib/plugin/CacheTest.php
    trunk/lib/plugin/CalendarList.php
    trunk/lib/plugin/CreateBib.php
    trunk/lib/plugin/CurrentTime.php
    trunk/lib/plugin/DynamicIncludePage.php
    trunk/lib/plugin/FileInfo.php
    trunk/lib/plugin/FrameInclude.php
    trunk/lib/plugin/GoTo.php
    trunk/lib/plugin/GoogleMaps.php
    trunk/lib/plugin/GraphViz.php
    trunk/lib/plugin/HelloWorld.php
    trunk/lib/plugin/HtmlConverter.php
    trunk/lib/plugin/Imdb.php
    trunk/lib/plugin/IncludePage.php
    trunk/lib/plugin/IncludePages.php
    trunk/lib/plugin/JabberPresence.php
    trunk/lib/plugin/LdapSearch.php
    trunk/lib/plugin/ListSubpages.php
    trunk/lib/plugin/ModeratedPage.php
    trunk/lib/plugin/NoCache.php
    trunk/lib/plugin/OldStyleTable.php
    trunk/lib/plugin/PageDump.php
    trunk/lib/plugin/PageGroup.php
    trunk/lib/plugin/PageTrail.php
    trunk/lib/plugin/PhotoAlbum.php
    trunk/lib/plugin/PhpHighlight.php
    trunk/lib/plugin/PhpWeather.php
    trunk/lib/plugin/Ploticus.php
    trunk/lib/plugin/PopUp.php
    trunk/lib/plugin/PopularNearby.php
    trunk/lib/plugin/PopularTags.php
    trunk/lib/plugin/PrevNext.php
    trunk/lib/plugin/RateIt.php
    trunk/lib/plugin/RedirectTo.php
    trunk/lib/plugin/SqlResult.php
    trunk/lib/plugin/SyntaxHighlighter.php
    trunk/lib/plugin/SystemInfo.php
    trunk/lib/plugin/Template.php
    trunk/lib/plugin/Transclude.php
    trunk/lib/plugin/TranslateText.php
    trunk/lib/plugin/UnfoldSubpages.php
    trunk/lib/plugin/UpLoad.php
    trunk/lib/plugin/UserRatings.php
    trunk/lib/plugin/VisualWiki.php
    trunk/lib/plugin/WikiAdminChmod.php
    trunk/lib/plugin/WikiAdminChown.php
    trunk/lib/plugin/WikiAdminMarkup.php
    trunk/lib/plugin/WikiAdminPurge.php
    trunk/lib/plugin/WikiAdminRemove.php
    trunk/lib/plugin/WikiAdminRename.php
    trunk/lib/plugin/WikiAdminSearchReplace.php
    trunk/lib/plugin/WikiAdminSelect.php
    trunk/lib/plugin/WikiAdminSetAcl.php
    trunk/lib/plugin/WikiBlog.php
    trunk/lib/plugin/WikiFormRich.php
    trunk/lib/plugin/WikiForum.php
    trunk/lib/plugin/WikiPoll.php
    trunk/lib/plugin/_WikiTranslation.php

Modified: trunk/lib/plugin/CacheTest.php
===================================================================
--- trunk/lib/plugin/CacheTest.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/CacheTest.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -36,7 +36,7 @@
  |
  | You may call this plugin as follows:
  |
- |        <?plugin CacheTest text="What a wonderful test!" ?>
+ |        <<CacheTest text="What a wonderful test!" >>
  |
 
 /*-----------------------------------------------------------------------

Modified: trunk/lib/plugin/CalendarList.php
===================================================================
--- trunk/lib/plugin/CalendarList.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/CalendarList.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -40,8 +40,8 @@
  * Derived from Calendar.php by Martin Norbäck <ma...@sa...>
  *
  * Insert this plugin into your Calendar page, for example in WikiUser/Calendar:
- *   <?plugin Calendar ?>
- *   <?plugin CalendarList ?>
+ *   <<Calendar >>
+ *   <<CalendarList >>
  *
  * Honors now year + month args as start base - together with Calendar navigation.
  * The behaviour before 2007 with last/next_n_days was to start now.

Modified: trunk/lib/plugin/CreateBib.php
===================================================================
--- trunk/lib/plugin/CreateBib.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/CreateBib.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -24,7 +24,7 @@
  * CreateBib:  Automatically create a BibTex file from page
  *
  * Usage:
- *  <?plugin CreateBib pagename||=whatever ?>
+ *  <<CreateBib pagename||=whatever >>
  *
  * @author:  Lea Viljanen
  */

Modified: trunk/lib/plugin/CurrentTime.php
===================================================================
--- trunk/lib/plugin/CurrentTime.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/CurrentTime.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -46,8 +46,8 @@
  * A simple plugin that displays current time and date.
  *
  * Usage:
- * <?plugin CurrentTime?>
- * <?plugin CurrentTime format=XXX ?>
+ * <<CurrentTime>>
+ * <<CurrentTime format=XXX >>
  */
 
 class WikiPlugin_CurrentTime

Modified: trunk/lib/plugin/DynamicIncludePage.php
===================================================================
--- trunk/lib/plugin/DynamicIncludePage.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/DynamicIncludePage.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -22,7 +22,7 @@
 
 /**
  * DynamicIncludePage - Include wikipage asynchronously. Icon to show/hide.
- * Usage:   <?plugin DynamicIncludePage page=OtherPage state=true ...?>
+ * Usage:   <<DynamicIncludePage page=OtherPage state=true ...>>
  * Author:  Reini Urban
  */
 

Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/FileInfo.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -26,9 +26,9 @@
  * Only files relative and below to the uploads path can be handled.
  *
  * Usage:
- *   <?plugin FileInfo file=Upload:setup.exe display=version,date ?>
- *   <?plugin FileInfo file=Upload:setup.exe display=name,version,date
- *                     format="%s (version: %s, date: %s)" ?>
+ *   <<FileInfo file=Upload:setup.exe display=version,date >>
+ *   <<FileInfo file=Upload:setup.exe display=name,version,date
+ *                     format="%s (version: %s, date: %s)" >>
  *
  * @author: ReiniUrban
  */

Modified: trunk/lib/plugin/FrameInclude.php
===================================================================
--- trunk/lib/plugin/FrameInclude.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/FrameInclude.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -24,8 +24,8 @@
  * FrameInclude:  Displays a url or page in a seperate frame inside our body.
  *
  * Usage:
- *  <?plugin FrameInclude src=http://www.internet-technology.de/fourwins_de.htm ?>
- *  <?plugin FrameInclude page=OtherPage ?>
+ *  <<FrameInclude src=http://www.internet-technology.de/fourwins_de.htm >>
+ *  <<FrameInclude page=OtherPage >>
  *  at the VERY BEGINNING in the content!
  *
  * Author:  Reini Urban <ru...@x-...>, rewrite by Jeff Dairiki <da...@da...>

Modified: trunk/lib/plugin/GoTo.php
===================================================================
--- trunk/lib/plugin/GoTo.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/GoTo.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -26,7 +26,7 @@
  *  that page; if not, edit (create) that page.
  *  Note: pagenames are absolute, not relative to the actual subpage.
  *
- *  Usage: <?plugin GoTo ?>
+ *  Usage: <<GoTo >>
  *  @author: Michael van Dam
  */
 

Modified: trunk/lib/plugin/GoogleMaps.php
===================================================================
--- trunk/lib/plugin/GoogleMaps.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/GoogleMaps.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -30,7 +30,7 @@
  *       Then enter the key in config/config.ini under GOOGLE_LICENSE_KEY=
  *
  * Usage:
- *  <?plugin GoogleMaps
+ *  <<GoogleMaps
  *           Latitude=53.053
  *             Longitude=7.803
  *           ZoomFactor=10
@@ -40,7 +40,7 @@
  *           MapType=Map|Satellite|Hybrid
  *           width=500px
  *           height=400px
- *  ?>
+ *  >>
  *
  * @author Reini Urban
  *

Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/GraphViz.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -31,9 +31,9 @@
  *   EPS, PS, SWF, SVG or SVGZ and imagemaps need to be tested.
  *
  * Usage:
-<?plugin GraphViz [options...]
+<<GraphViz [options...]
    multiline dot script ...
-?>
+>>
 
  * See also: VisualWiki, which depends on GraphViz and WikiPluginCached.
  *
@@ -176,7 +176,7 @@
         $imgtypes = $GLOBALS['PLUGIN_CACHED_IMGTYPES'];
         $imgtypes = array_merge($imgtypes, array("svg", "svgz", "ps"), $this->_mapTypes());
         $helparr = array(
-            '<?plugin GraphViz ' .
+            '<<GraphViz ' .
             'imgtype'          => ' = "' . $def['imgtype'] . "(default)|" . join('|',$imgtypes).'"',
             'alt'              => ' = "alternate image text"',
             'pages'            => ' = "pagenames,*" or <!plugin-list !> pagelist as input',

Modified: trunk/lib/plugin/HelloWorld.php
===================================================================
--- trunk/lib/plugin/HelloWorld.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/HelloWorld.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -24,13 +24,13 @@
  * A simple demonstration WikiPlugin.
  *
  * Usage:
- * <?plugin HelloWorld?>
- * <?plugin HelloWorld
+ * <<HelloWorld?>
+ * <<HelloWorld
  *          salutation="Greetings, "
  *          name=Wikimeister
- * ?>
- * <?plugin HelloWorld salutation=Hi ?>
- * <?plugin HelloWorld name=WabiSabi ?>
+ * >>
+ * <<HelloWorld salutation=Hi >>
+ * <<HelloWorld name=WabiSabi >>
  */
 
 // Constants are defined before the class.

Modified: trunk/lib/plugin/HtmlConverter.php
===================================================================
--- trunk/lib/plugin/HtmlConverter.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/HtmlConverter.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -26,7 +26,7 @@
  *          copied and pasted into a wiki page.
  *          Credit to an unknown programmer, who has provided the first
  *          version 0.01 on http://www.gpgstudy.com/striphtml.phps
- * Usage:   <?plugin HtmlConverter ?>
+ * Usage:   <<HtmlConverter >>
  * Author:  HendrikScheider <hen...@wi...>
  */
 

Modified: trunk/lib/plugin/Imdb.php
===================================================================
--- trunk/lib/plugin/Imdb.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/Imdb.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -26,11 +26,11 @@
  * "imdb = mysql://user:pass@localhost/imdb" in lib/plugin/SqlResult.ini
  *
  * Queries:
- * <?plugin Imdb query=movie_main title||="Sample Movie (2002)" ?>
- * <?plugin Imdb query=movie_combined title||="Sample Movie (2002)" ?>
- * <?plugin Imdb query=movie_full title||="Sample Movie (2002)" ?>
- * <?plugin Imdb query=movie_company_credits title||="Sample Movie (2002)" ?>
- * <?plugin Imdb query=name name||="Lastname, Firstname (I)" ?>
+ * <<Imdb query=movie_main title||="Sample Movie (2002)" >>
+ * <<Imdb query=movie_combined title||="Sample Movie (2002)" >>
+ * <<Imdb query=movie_full title||="Sample Movie (2002)" >>
+ * <<Imdb query=movie_company_credits title||="Sample Movie (2002)" >>
+ * <<Imdb query=name name||="Lastname, Firstname (I)" >>
  * More title queries:
  *  business, moviebudgets, colorinfo, mpaaratingsreasons,
  *  akatitles, alternateversions, miscellaneouscompanies, moviecountries,

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/IncludePage.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -23,7 +23,7 @@
 
 /**
  * IncludePage:  include text from another wiki page in this one
- * usage:   <?plugin IncludePage page=OtherPage rev=6 quiet=1 words=50 lines=6?>
+ * usage:   <<IncludePage page=OtherPage rev=6 quiet=1 words=50 lines=6>>
  * author:  Joe Edelman <jo...@or...>
  */
 

Modified: trunk/lib/plugin/IncludePages.php
===================================================================
--- trunk/lib/plugin/IncludePages.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/IncludePages.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -22,7 +22,7 @@
 
 /**
  * IncludePages: Include a list of multiple pages, based on IncludePage.
- * usage:   <?plugin IncludePages pages=<!plugin-list BackLinks !> ?>
+ * usage:   <<IncludePages pages=<!plugin-list BackLinks !> >>
  * author:  ReiniUrban
  */
 

Modified: trunk/lib/plugin/JabberPresence.php
===================================================================
--- trunk/lib/plugin/JabberPresence.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/JabberPresence.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -26,8 +26,8 @@
  * http://edgar.netflint.net/howto.php
  *
  * Usage:
- *  <?plugin JabberPresence scripturl=http://edgar.netflint.net/status.php
- *                          jid=yourid@jabberserver type=html iconset=phpbb ?>
+ *  <<JabberPresence scripturl=http://edgar.netflint.net/status.php
+ *                          jid=yourid@jabberserver type=html iconset=phpbb >>
  *
  * @author: Arnaud Fontaine
  */

Modified: trunk/lib/plugin/LdapSearch.php
===================================================================
--- trunk/lib/plugin/LdapSearch.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/LdapSearch.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -28,21 +28,21 @@
  * TODO: Return a pagelist on certain attributes
  *
  * Usage Samples:
-  <?plugin LdapSearch?>
-  <?plugin LdapSearch
+  <<LdapSearch>>
+  <<LdapSearch
            host="localhost"
            port=389
            basedn=""
             filter="(cn=*)"
            attributes=""
-  ?>
-  <?plugin LdapSearch host=ldap.example.com filter="(ou=web-team)"
-                      attributes="sn cn telephonenumber" ?>
-  <?plugin LdapSearch host="ldap.itd.umich.edu" basedn="" filter="(sn=jensen)" attributes="cn drink" ?>
-  <?plugin LdapSearch host=ldap.example.com attributes="cn sn telephonenumber" ?>
-  <?plugin LdapSearch host=bugs.debian.org port=10101 basedn="dc=current,dc=bugs,dc=debian,dc=org"
+  >>
+  <<LdapSearch host=ldap.example.com filter="(ou=web-team)"
+                      attributes="sn cn telephonenumber" >>
+  <<LdapSearch host="ldap.itd.umich.edu" basedn="" filter="(sn=jensen)" attributes="cn drink" >>
+  <<LdapSearch host=ldap.example.com attributes="cn sn telephonenumber" >>
+  <<LdapSearch host=bugs.debian.org port=10101 basedn="dc=current,dc=bugs,dc=debian,dc=org"
                       filter="(debbugsPackage=phpwiki)"
-                      attributes="debbugsSeverity debbugsState debbugsTitle" ?>
+                      attributes="debbugsSeverity debbugsState debbugsTitle" >>
 
  * @author John Lines
  */

Modified: trunk/lib/plugin/ListSubpages.php
===================================================================
--- trunk/lib/plugin/ListSubpages.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/ListSubpages.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -23,7 +23,7 @@
 /**
  * ListSubpages:  Lists the names of all SubPages of the current page.
  *                Based on UnfoldSubpages.
- * Usage:   <?plugin ListSubpages noheader=1 info=pagename,hits,mtime ?>
+ * Usage:   <<ListSubpages noheader=1 info=pagename,hits,mtime >>
  */
 require_once('lib/PageList.php');
 

Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/ModeratedPage.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -429,14 +429,14 @@
         if ($parsed = $loader->parsePI($pi)) {
             $plugin =& $parsed[1];
             if ($plugin->getName() != _("ModeratedPage"))
-                return $this->error(sprintf(_("<?plugin ModeratedPage ... ?> not found in first line of %s"),
+                return $this->error(sprintf(_("<<ModeratedPage ... >> not found in first line of %s"),
                                             $action_page->getName()));
             if (!$action_page->get('locked'))
                 return $this->error(sprintf(_("%s is not locked!"),
                                             $action_page->getName()));
             return $plugin->resolve_argstr($request, $parsed[2]);
         } else {
-            return $this->error(sprintf(_("<?plugin ModeratedPage ... ?> not found in first line of %s"),
+            return $this->error(sprintf(_("<<ModeratedPage ... >> not found in first line of %s"),
                                         $action_page->getName()));
         }
     }

Modified: trunk/lib/plugin/NoCache.php
===================================================================
--- trunk/lib/plugin/NoCache.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/NoCache.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -26,9 +26,9 @@
  * display dynamic content.
  *
  * Usage:
- *   <?plugin NoCache ?>
+ *   <<NoCache >>
  * or to delete the whole cache for this page:
- *   <?plugin NoCache nocache||=purge ?>
+ *   <<NoCache nocache||=purge >>
  *
  * Author:  Reini Urban <ru...@x-...>
  *

Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/OldStyleTable.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -26,12 +26,12 @@
  *
  * Usage:
  * <pre>
- *  <?plugin OldStyleTable border||=0 summary=""
+ *  <<OldStyleTable border||=0 summary=""
  *  ||  __Name__               |v __Cost__   |v __Notes__
  *  | __First__   | __Last__
  *  |> Jeff       |< Dairiki   |^  Cheap     |< Not worth it
  *  |> Marco      |< Polo      | Cheaper     |< Not available
- *  ?>
+ *  >>
  * </pre>
  *
  * Note that multiple <code>|</code>'s lead to spanned columns,

Modified: trunk/lib/plugin/PageDump.php
===================================================================
--- trunk/lib/plugin/PageDump.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/PageDump.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -40,9 +40,9 @@
  *   http://...phpwiki/index.php?PageDump&page=HomePage
  *   http://...phpwiki/index.php?PageDump&page=HomePage&download=1
  *  Static:
- *   <?plugin PageDump page=HomePage?>
+ *   <<PageDump page=HomePage>>
  *  Dynamic form (put both on the page):
- *   <?plugin PageDump?>
+ *   <<PageDump>>
  *   <?plugin-form PageDump?>
  *  Typical usage: as actionbar button
  */

Modified: trunk/lib/plugin/PageGroup.php
===================================================================
--- trunk/lib/plugin/PageGroup.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/PageGroup.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -24,16 +24,16 @@
 /**
  * Usage:
  *
- * <?plugin PageGroup parent=MyTableOfContents ?>
+ * <<PageGroup parent=MyTableOfContents >>
  *
- * <?plugin PageGroup
+ * <<PageGroup
  *          parent=MyTableOfContents
  *          label="Visit more pages in MyTableOfContents"
- * ?>
+ * >>
  *
- * <?plugin PageGroup parent=MyTableOfContents section=PartTwo loop=true ?>
+ * <<PageGroup parent=MyTableOfContents section=PartTwo loop=true >>
  *
- * <?plugin PageGroup parent=MyTableOfContents loop=1 ?>
+ * <<PageGroup parent=MyTableOfContents loop=1 >>
  *
  *
  * Updated to use new HTML(). It mostly works, but it's still a giant hackish mess.

Modified: trunk/lib/plugin/PageTrail.php
===================================================================
--- trunk/lib/plugin/PageTrail.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/PageTrail.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -27,9 +27,9 @@
  * But Cache should be turned off then.
  *
  * Usage:
- * <?plugin PageTrail?>
- * <?plugin PageTrail numberlinks=5?>
- * <?plugin PageTrail invisible=1?>
+ * <<PageTrail>>
+ * <<PageTrail numberlinks=5>>
+ * <<PageTrail invisible=1>>
  */
 
 if (!defined('PAGETRAIL_ARROW'))

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/PhotoAlbum.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -29,7 +29,7 @@
  *          Thomas Harding (slides mode, real thumbnails)
  *
  * Usage:
- * <?plugin PhotoAlbum
+ * <<PhotoAlbum
  *          src="http://server/textfile" or localfile or localdir
  *          mode=[normal|column|row|thumbs|tiles|list|slide]
  *          desc=true
@@ -39,7 +39,7 @@
  *          thumbswidth=80
  *          align=[center|left|right]
  *          duration=6
- * ?>
+ * >>
  *
  * "src": textfile of images or directory of images or a single image (local or remote)
  *      Local or remote e.g. http://myserver/images/MyPhotos.txt or http://myserver/images/

Modified: trunk/lib/plugin/PhpHighlight.php
===================================================================
--- trunk/lib/plugin/PhpHighlight.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/PhpHighlight.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -26,9 +26,9 @@
  * arguments to pretty-print PHP code.
  *
  * Usage:
- * <?plugin PhpHighlight default='#FF0000' comment='#0000CC'
+ * <<PhpHighlight default='#FF0000' comment='#0000CC'
  * code that should be highlighted
- * ?>
+ * >>
  *
  * You do not have to add '<?php' and '?>' to the code - the plugin
  * does this automatically if you do not set wrap to 0.
@@ -46,10 +46,10 @@
  * Added ability to override colors defined in php.ini --Carsten Klapp
  *
  * Known Problems:
- *   <?plugin PhpHighlight
+ *   <<PhpHighlight
  *   testing[somearray];
  *   testing~[badworkaround~];
- *   ?>
+ *   >>
  * will swallow "[somearray]"
  */
 

Modified: trunk/lib/plugin/PhpWeather.php
===================================================================
--- trunk/lib/plugin/PhpWeather.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/PhpWeather.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -28,12 +28,12 @@
  *
  * Usage:
  *
- * <?plugin PhpWeather ?>
- * <?plugin PhpWeather menu=true ?>
- * <?plugin PhpWeather icao=KJFK ?>
- * <?plugin PhpWeather language=en ?>
- * <?plugin PhpWeather units=only_metric ?>
- * <?plugin PhpWeather icao||=CYYZ cc||=CA language||=en menu=true ?>
+ * <<PhpWeather >>
+ * <<PhpWeather menu=true >>
+ * <<PhpWeather icao=KJFK >>
+ * <<PhpWeather language=en >>
+ * <<PhpWeather units=only_metric >>
+ * <<PhpWeather icao||=CYYZ cc||=CA language||=en menu=true >>
  *
  * If you want a menu, and you also want to change the default station
  * or language, then you have to use the ||= form, or else the user

Modified: trunk/lib/plugin/Ploticus.php
===================================================================
--- trunk/lib/plugin/Ploticus.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/Ploticus.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -37,11 +37,11 @@
  *   This will be fixed soon.
  *
  * Usage:
-<?plugin Ploticus device=png [ploticus options...]
+<<Ploticus device=png [ploticus options...]
    multiline ploticus script ...
-?>
+>>
  * or without any script: (not tested)
-<?plugin Ploticus -prefab vbars data=myfile.dat delim=tab y=1 clickmapurl="http://mywiki.url/wiki/?pagename=@2" clickmaplabel="@3" -csmap ?>
+<<Ploticus -prefab vbars data=myfile.dat delim=tab y=1 clickmapurl="http://mywiki.url/wiki/?pagename=@2" clickmaplabel="@3" -csmap >>
  *
  * TODO: PloticusSql - create intermediate data from SQL. Similar to SqlResult, just in graphic form.
  * For example to produce nice looking pagehit statistics or ratings statistics.
@@ -156,7 +156,7 @@
         //$other_imgtypes = $GLOBALS['PLUGIN_CACHED_IMGTYPES'];
         //unset ($other_imgtypes[$def['imgtype']]);
         $helparr = array(
-            '<?plugin Ploticus ' .
+            '<<Ploticus ' .
             'device'           => ' = "' . $def['device'] . "(default)|"
                                   . join('|',$GLOBALS['PLUGIN_CACHED_IMGTYPES']).'"',
             'data'             => ' <!plugin-list !>: pagelist as input',
@@ -165,7 +165,7 @@
             'help'             => ' bool: displays this screen',
             '...'              => ' all further lines below the first plugin line ',
             ''                 => ' and inside the tags are the ploticus script.',
-            "\n  ?>"
+            "\n  >>"
             );
         $length = 0;
         foreach($helparr as $alignright => $alignleft) {

Modified: trunk/lib/plugin/PopUp.php
===================================================================
--- trunk/lib/plugin/PopUp.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/PopUp.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -25,7 +25,7 @@
  * Display a page in a clickable popup link.
  *
  * Usage:
- * <?plugin PopUp
+ * <<PopUp
  *     link="HomePage"
  *     title="PopUpped HomePage"
  *     text="Click here to popup the HomePage"
@@ -39,8 +39,8 @@
  *     status=no
  *     menubar=no
  *     copyhistory=no
- * ?>
- * <?plugin PopUp close=yes ?>
+ * >>
+ * <<PopUp close=yes >>
  */
 
 class WikiPlugin_PopUp

Modified: trunk/lib/plugin/PopularNearby.php
===================================================================
--- trunk/lib/plugin/PopularNearby.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/PopularNearby.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -28,9 +28,9 @@
  */
 /* Usage:
 
-* <small><?plugin PopularNearby mode=incoming ?></small>
-* <small><?plugin PopularNearby mode=outgoing ?></small>
-* <small><?plugin PopularNearby mode=nearby ?></small>
+* <<PopularNearby mode=incoming >>
+* <<PopularNearby mode=outgoing >>
+* <<PopularNearby mode=nearby >>
 
 */
 

Modified: trunk/lib/plugin/PopularTags.php
===================================================================
--- trunk/lib/plugin/PopularTags.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/PopularTags.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -21,8 +21,7 @@
  */
 
 /* Usage:
- * template tags.tmpl:
- *   <?plugin PopularTags ?>
+ *   <<PopularTags >>
  */
 
 require_once('lib/PageList.php');

Modified: trunk/lib/plugin/PrevNext.php
===================================================================
--- trunk/lib/plugin/PrevNext.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/PrevNext.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -22,7 +22,7 @@
  */
 
 /**
- * Usage: <?plugin PrevNext prev=PrevLink next=NextLink ?>
+ * Usage: <<PrevNext prev=PrevLink next=NextLink >>
  * See also PageGroup which automatically tries to extract the various links
  *
  */

Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/RateIt.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -64,13 +64,13 @@
  * - Autoclass: simple public domain C library
  * - MLC++: C++ library http://www.sgi.com/tech/mlc/
  *
- * Usage:    <?plugin RateIt ?>          just the widget without text
+ * Usage:    <<RateIt >>          just the widget without text
  *   Note: The wikilens theme or any derivate must be enabled, to enable this plugin!
- *           <?plugin RateIt show=top ?> text plus widget below
- *           <?plugin RateIt show=ratings ?> to show my ratings
- *   TODO:   <?plugin RateIt show=buddies ?> to show my buddies
- *           <?plugin RateIt show=ratings dimension=1 ?>
- *   TODO:   <?plugin RateIt show=text ?> just text, no widget, for dumps
+ *           <<RateIt show=top >> text plus widget below
+ *           <<RateIt show=ratings >> to show my ratings
+ *   TODO:   <<RateIt show=buddies >> to show my buddies
+ *           <<RateIt show=ratings dimension=1 >>
+ *   TODO:   <<RateIt show=text >> just text, no widget, for dumps
  *
  * @author:  Dan Frankowski (wikilens author), Reini Urban (as plugin)
  *

Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/RedirectTo.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -23,8 +23,8 @@
 /**
  * Redirect to another page or external uri. Kind of PageAlias.
  * Usage:
- * <?plugin RedirectTo href="http://www.internet-technology.de/fourwins_de.htm" ?>
- *      or  <?plugin RedirectTo page=AnotherPage ?>
+ * <<RedirectTo href="http://www.internet-technology.de/fourwins_de.htm" >>
+ *      or  <<RedirectTo page=AnotherPage >>
  * at the VERY FIRST LINE in the content! Otherwise it will be ignored.
  *
  * Author:  Reini Urban <ru...@x-...>
@@ -65,7 +65,7 @@
         if ($href) {
             /*
              * Use quotes on the href argument value, like:
-             *   <?plugin RedirectTo href="http://funky.com/a b \" c.htm" ?>
+             *   <<RedirectTo href="http://funky.com/a b \" c.htm" ?>
              *
              * Do we want some checking on href to avoid malicious
              * uses of the plugin? Like stripping tags or hexcode.

Modified: trunk/lib/plugin/SqlResult.php
===================================================================
--- trunk/lib/plugin/SqlResult.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/SqlResult.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -32,17 +32,17 @@
  * TODO: paging
  *
  * Usage:
- *   <?plugin SqlResult alias=mysql
+ *   <<SqlResult alias=mysql
  *            SELECT 'mysql password for string "xx":',
  *                   PASSWORD('xx')
- *   ?>
- *   <?plugin SqlResult alias=videos template=videos
+ *   >>
+ *   <<SqlResult alias=videos template=videos
  *            SELECT rating,title,date
  *                   FROM video
  *                   ORDER BY rating DESC
  *                   LIMIT 5
- *   ?>
- *   <?plugin SqlResult alias=imdb template=imdbmovies where||="Davies, Jeremy%"
+ *   >>
+ *   <<SqlResult alias=imdb template=imdbmovies where||="Davies, Jeremy%"
  *   SELECT m.title, m.date, n.name, c.role
  *     FROM movies as m, names as n, jobs as j, characters as c
  *     WHERE n.name LIKE "%%where%%"
@@ -51,7 +51,7 @@
  *     AND c.job_id = j.job_id
  *     AND j.description = 'Actor'
  *     ORDER BY m.date DESC
- *   ?>
+ *   >>
  *
  * @author: ReiniUrban
  */

Modified: trunk/lib/plugin/SyntaxHighlighter.php
===================================================================
--- trunk/lib/plugin/SyntaxHighlighter.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/SyntaxHighlighter.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -29,13 +29,13 @@
  * syntax: See http://www.andre-simon.de/doku/highlight/highlight.html
  * style = ["ansi", "gnu", "kr", "java", "linux"]
 
-<?plugin SyntaxHighlighter syntax=c style=kr color=emacs
+<<SyntaxHighlighter syntax=c style=kr color=emacs
  #include <stdio.h>
 
  int main() {
  printf("Lalala\n");
  }
-?>
+>>
 
  I did not use beautifier, because it used up more than 8M of memory on
  my system and PHP killed it. I'm not sure whether this is a problem

Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/SystemInfo.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -22,11 +22,11 @@
  */
 
 /**
- * Usage: <?plugin SystemInfo all ?>
- *        or <?plugin SystemInfo pagestats cachestats discspace hitstats ?>
- *        or <?plugin SystemInfo version ?>
- *        or <?plugin SystemInfo current_theme ?>
- *        or <?plugin SystemInfo PHPWIKI_DIR ?>
+ * Usage: <<SystemInfo all >>
+ *        or <<SystemInfo pagestats cachestats discspace hitstats >>
+ *        or <<SystemInfo version >>
+ *        or <<SystemInfo current_theme >>
+ *        or <<SystemInfo PHPWIKI_DIR >>
  *
  * Provide access to phpwiki's lower level system information.
  *
@@ -70,7 +70,7 @@
     }
     function getHtml($dbi, $argarray, $request, $basepage) {
         $loader = new WikiPluginLoader;
-        return $loader->expandPI('<?plugin SystemInfo '
+        return $loader->expandPI('<<SystemInfo '
                                  . WikiPluginCached::glueArgs($argarray) // all
                                  . ' ?>', $request, $this, $basepage);
     }

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/Template.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -26,7 +26,7 @@
  *    Include text from a wiki page and replace certain placeholders by parameters.
  *    Similiar to CreatePage with the template argument, but at run-time.
  *    Similiar to the mediawiki templates but not with the "|" parameter seperator.
- * Usage:   <?plugin Template page=TemplateFilm vars="title=rurban&year=1999" ?>
+ * Usage:   <<Template page=TemplateFilm vars="title=rurban&year=1999" >>
  * Author:  Reini Urban
  * See also: http://meta.wikimedia.org/wiki/Help:Template
  *
@@ -51,7 +51,7 @@
  *   We support a mediawiki-style syntax extension which maps
  *     {{TemplateFilm|title=Some Good Film|year=1999}}
  *   to
- *     <?plugin Template page=TemplateFilm vars="title=Some Good Film&year=1999" ?>
+ *     <<Template page=TemplateFilm vars="title=Some Good Film&year=1999" >>
  */
 
 class WikiPlugin_Template

Modified: trunk/lib/plugin/Transclude.php
===================================================================
--- trunk/lib/plugin/Transclude.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/Transclude.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -24,9 +24,9 @@
  * Transclude:  Include an external web page within the body of a wiki page.
  *
  * Usage:
- *  <?plugin Transclude
+ *  <<Transclude
  *           src=http://www.internet-technology.de/fourwins_de.htm
- *  ?>
+ *  >>
  *
  * @author Geoffrey T. Dairiki
  *

Modified: trunk/lib/plugin/TranslateText.php
===================================================================
--- trunk/lib/plugin/TranslateText.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/TranslateText.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -24,9 +24,9 @@
  * TranslateText:  Translation helper
  * The (bogus) pagename is the text to be translated.
  * One required argument: lang
- * Requires that an action page with the <?plugin TranslateText ?> line exists.
+ * Requires that an action page with the <<TranslateText >> line exists.
  *
- * Usually called from <?plugin _WikiTranslation ?>
+ * Usually called from <<_WikiTranslation >>
  * Contributed translation are stored in UsersPage/ContributedTranslations
  *
  * Examples:

Modified: trunk/lib/plugin/UnfoldSubpages.php
===================================================================
--- trunk/lib/plugin/UnfoldSubpages.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/UnfoldSubpages.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -25,7 +25,7 @@
  *   This is e.g. useful for the CalendarPlugin, to see all entries at once.
  *   Warning: Better don't use it with non-existant sections!
  *              The section extractor is currently quite unstable.
- * Usage:   <?plugin UnfoldSubpages sortby=-mtime words=50 maxpages=5 ?>
+ * Usage:   <<UnfoldSubpages sortby=-mtime words=50 maxpages=5 >>
  * Author:  Reini Urban <ru...@x-...>
  */
 

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/UpLoad.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -25,7 +25,7 @@
 /**
  * UpLoad:  Allow Administrator to upload files to a special directory,
  *          which should preferably be added to the InterWikiMap
- * Usage:   <?plugin UpLoad ?>
+ * Usage:   <<UpLoad >>
  * Author:  NathanGass <ga...@io...>
  * Changes: ReiniUrban <ru...@x-...>,
  *          qubit <rt...@da...>

Modified: trunk/lib/plugin/UserRatings.php
===================================================================
--- trunk/lib/plugin/UserRatings.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/UserRatings.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -32,7 +32,7 @@
 /**
  * Show a user's ratings in a table, using PageList.
  * Usage:
- * <?plugin UserRatings ?>
+ * <<UserRatings >>
  *
  * This only works with the "wikilens" theme.
  */

Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/VisualWiki.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -176,7 +176,7 @@
         $other_imgtypes = $GLOBALS['PLUGIN_CACHED_IMGTYPES'];
         unset ($other_imgtypes[$def['imgtype']]);
         $helparr = array(
-            '<?plugin '.$this->getName() .
+            '<<'.$this->getName() .
             ' img'             => ' = "' . $def['imgtype'] . "(default)|" . join('|',$GLOBALS['PLUGIN_CACHED_IMGTYPES']).'"',
             'width'            => ' = "width in inches"',
             'height'           => ' = "height in inches"',
@@ -192,7 +192,7 @@
             'backlink_nb'      => ' = "number of pages with most backlinks"',
             'neighbour_list'   => ' = "find pages linked from and to these pages"',
             'exclude_list'     => ' = "colon separated list of pages to be excluded"',
-            'include_list'     => ' = "colon separated list"     ?>'
+            'include_list'     => ' = "colon separated list"     >>'
             );
         $length = 0;
         foreach($helparr as $alignright => $alignleft) {

Modified: trunk/lib/plugin/WikiAdminChmod.php
===================================================================
--- trunk/lib/plugin/WikiAdminChmod.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/WikiAdminChmod.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -25,7 +25,7 @@
  * Set individual PagePermissions, simplifying effective ACLs to
  * unix-like rwxr--r--+ permissions. (as in cygwin)
  *
- * Usage:   <?plugin WikiAdminChmod ?> or called via WikiAdminSelect
+ * Usage:   <<WikiAdminChmod >> or called via WikiAdminSelect
  * Author:  Reini Urban <ru...@x-...>
  *
  * KNOWN ISSUES:

Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/WikiAdminChown.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -22,7 +22,7 @@
  */
 
 /**
- * Usage:   <?plugin WikiAdminChown s||=* ?> or called via WikiAdminSelect
+ * Usage:   <<WikiAdminChown s||=* >> or called via WikiAdminSelect
  * @author:  Reini Urban <ru...@x-...>
  *
  * KNOWN ISSUES:

Modified: trunk/lib/plugin/WikiAdminMarkup.php
===================================================================
--- trunk/lib/plugin/WikiAdminMarkup.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/WikiAdminMarkup.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -22,7 +22,7 @@
  */
 
 /**
- * Usage:   <?plugin WikiAdminMarkup s||=* ?> or called via WikiAdminSelect
+ * Usage:   <<WikiAdminMarkup s||=* >> or called via WikiAdminSelect
  * @author:  Reini Urban <ru...@x-...>
  *
  * KNOWN ISSUES:

Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/WikiAdminPurge.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -22,7 +22,7 @@
  */
 
 /**
- * Usage:   <?plugin WikiAdminPurge?>
+ * Usage:   <<WikiAdminPurge>>
  */
 require_once('lib/PageList.php');
 require_once('lib/plugin/WikiAdminSelect.php');

Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/WikiAdminRemove.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -22,7 +22,7 @@
  */
 
 /**
- * Usage:   <?plugin WikiAdminRemove?>
+ * Usage:   <<WikiAdminRemove>>
  * Author:  Reini Urban <ru...@x-...>
  *
  * KNOWN ISSUES:

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/WikiAdminRename.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -22,7 +22,7 @@
  */
 
 /**
- * Usage:   <?plugin WikiAdminRename ?> or called via WikiAdminSelect
+ * Usage:   <<WikiAdminRename >> or called via WikiAdminSelect
  * @author:  Reini Urban <ru...@x-...>
  *
  * KNOWN ISSUES:

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -22,7 +22,7 @@
  */
 
 /**
- * Usage:   <?plugin WikiAdminSearchReplace ?> or called via WikiAdminSelect
+ * Usage:   <<WikiAdminSearchReplace >> or called via WikiAdminSelect
  * Author:  Reini Urban <ru...@x-...>
  *
  * KNOWN ISSUES:

Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/WikiAdminSelect.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -25,7 +25,7 @@
  * Allows selection of multiple pages which get passed to other
  * WikiAdmin plugins then. Then do Rename, Remove, Chmod, Chown, ...
  *
- * Usage:   <?plugin WikiAdminSelect?>
+ * Usage:   <<WikiAdminSelect>>
  * Author:  Reini Urban <ru...@x-...>
  *
  * This is the base class for most WikiAdmin* classes, using

Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/WikiAdminSetAcl.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -24,7 +24,7 @@
 /**
  * Set individual PagePermissions
  *
- * Usage:   <?plugin WikiAdminSetAcl ?> or called via WikiAdminSelect
+ * Usage:   <<WikiAdminSetAcl >> or called via WikiAdminSelect
  * Author:  Reini Urban <ru...@x-...>
  *
  * KNOWN ISSUES:

Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/WikiBlog.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -31,7 +31,7 @@
  * particular page and provides an input form for adding a new blog.
  *
  * USAGE:
- * Add <?plugin WikiBlog ?> at your PersonalPage and BlogArchive and
+ * Add <<WikiBlog >> at your PersonalPage and BlogArchive and
  * BlogJournal will find the Blog entries automatically.
  *
  * Now it is also the base class for all attachable pagetypes:
@@ -41,9 +41,9 @@
  *
  * To have the blog show up on a seperate page:
  * On TopPage, use
- *   <?plugin WikiBlog mode=add?>
+ *   <<WikiBlog mode=add>>
  * Create TopPage/Blog with this page as actionpage:
- *   <?plugin WikiBlog pagename=TopPage mode=show?>
+ *   <<WikiBlog pagename=TopPage mode=show>>
  *
  * To have the main ADMIN_USER Blog appear under Blog and not under WikiBlog/Blog
  * or UserName/Blog as for other users blogs,

Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/WikiFormRich.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -52,46 +52,46 @@
  * some allow values as list from from <!plugin-list !>
 
  Samples:
-   <?plugin WikiFormRich action=dumpserial method=get
+   <<WikiFormRich action=dumpserial method=get
             checkbox[] name=include value="all"
             editbox[] name=directory value=DEFAULT_DUMP_DIR
             editbox[] name=pages value=*
-            editbox[] name=exclude value="" ?>
-   <?plugin WikiFormRich action=dumphtml method=get
+            editbox[] name=exclude value="" >>
+   <<WikiFormRich action=dumphtml method=get
             editbox[] name=directory value=HTML_DUMP_DIR
             editbox[] name=pages value="*"
-            editbox[] name=exclude value="" ?>
-   <?plugin WikiFormRich action=loadfile method=get
+            editbox[] name=exclude value="" >>
+   <<WikiFormRich action=loadfile method=get
             editbox[]  name=source value=DEFAULT_WIKI_PGSRC
             checkbox[] name=overwrite value=1
-            editbox[]  name=exclude value="" ?>
-  <?plugin WikiFormRich action=TitleSearch method=get class=wikiadmin nobr=1
+            editbox[]  name=exclude value="" >>
+  <<WikiFormRich action=TitleSearch method=get class=wikiadmin nobr=1
              editbox[] name=s text=""
            submit[]
              checkbox[] name=case_exact
-             checkbox[] name=regex ?>
-  <?plugin WikiFormRich action=FullTextSearch method=get class=wikiadmin nobr=1
+             checkbox[] name=regex >>
+  <<WikiFormRich action=FullTextSearch method=get class=wikiadmin nobr=1
              editbox[] name=s text=""
            submit[]
              checkbox[] name=case_exact
-             checkbox[] name=regex ?>
-  <?plugin WikiFormRich action=FuzzyPages method=get class=wikiadmin nobr=1
+             checkbox[] name=regex >>
+  <<WikiFormRich action=FuzzyPages method=get class=wikiadmin nobr=1
              editbox[] name=s text=""
            submit[]
              checkbox[] name=case_exact ?>
-  <?plugin WikiFormRich action=AppendText buttontext="AddPlugin"
+  <<WikiFormRich action=AppendText buttontext="AddPlugin"
              radio[] name=s value=<!plugin-list BackLinks page=WikiPlugin limit=10 !>
              ?>
-  <?plugin WikiFormRich action=AppendText buttontext="AddPlugin"
+  <<WikiFormRich action=AppendText buttontext="AddPlugin"
              pulldown[] name=s text="Plugins: " value=<!plugin-list BackLinks page=WikiPlugin !>
              ?>
-  <?plugin WikiFormRich action=AppendText buttontext="AddCategory"
+  <<WikiFormRich action=AppendText buttontext="AddCategory"
              pulldown[] name=s text="Categories: " value=<!plugin-list TitleSearch s=Category !>
              ?>
-  <?plugin WikiFormRich action=SemanticSearch buttontext="AddRelation"
+  <<WikiFormRich action=SemanticSearch buttontext="AddRelation"
              combobox[] name=relation text="Relation: " method=listRelations
              ?>
-  <?plugin WikiFormRich action=AppendText buttontext="InsertTemplate"
+  <<WikiFormRich action=AppendText buttontext="InsertTemplate"
              combobox[] name=s text="Template: " method=titleSearch args="Template/"
              ?>
 */

Modified: trunk/lib/plugin/WikiForum.php
===================================================================
--- trunk/lib/plugin/WikiForum.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/WikiForum.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -25,13 +25,13 @@
  * particular page (one page per topic) and provides an input form for
  * adding a new message.
  *
- *   <?plugin WikiForum ?>
+ *   <<WikiForum>>
  *
  * To provide information for the MainForum page (CategoryForum)
  * summary output mode is possible.
  *
- *   <?plugin WikiForum page=SubTopic1 mode=summary info=title,numposts,ctime,author ?>
- *   <?plugin WikiForum page=SubTopic2 mode=summary info=title,numposts,ctime,author ?>
+ *   <<WikiForum page=SubTopic1 mode=summary info=title,numposts,ctime,author >>
+ *   <<WikiForum page=SubTopic2 mode=summary info=title,numposts,ctime,author >>
  *
  * TODO: For admin user, put checkboxes beside comments to allow for bulk removal.
  * threaded identation for level of reply

Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/WikiPoll.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -24,7 +24,7 @@
  * This plugin provides configurable polls.
  *
  * Usage:
-<?plugin WikiPoll require_all=0 require_least=2
+<<WikiPoll require_all=0 require_least=2
            question[1]="Do you like PhpWiki?"
              answer[1][1]="Yes" answer[1][2]="Do not know" answer[1][3]="No"
            question[2]="Do you have PhpWiki installed by your own?"
@@ -38,10 +38,10 @@
            question[5]="Which PhpWiki version do you use?"
              answer[5][1]="1.2.x" answer[5][2]="1.3.1-12" answer[5][3]="1.3.13"
              answer[5][4]="1.3.14"
-?>
+>>
  *
  * Administration:
- * <?plugin WikiPoll page=PhpWikiPoll admin=1 ?>
+ * <<WikiPoll page=PhpWikiPoll admin=1 >>
  * and protect this page properly (e.g. PhpWikiPoll/Admin)
  *
  * TODO:

Modified: trunk/lib/plugin/_WikiTranslation.php
===================================================================
--- trunk/lib/plugin/_WikiTranslation.php	2010-05-26 12:10:14 UTC (rev 7446)
+++ trunk/lib/plugin/_WikiTranslation.php	2010-05-31 11:29:39 UTC (rev 7447)
@@ -26,17 +26,17 @@
  * Current favorite: translate.google.com if from_lang = en or fr
  *
  * Examples:
- *  <?plugin _WikiTranslation page=HomePage languages=fr ?>
+ *  <<_WikiTranslation page=HomePage languages=fr >>
  *     Translation service for HomePage into french (redirect to translate.google.com)
- *  <?plugin _WikiTranslation what=pages ?>
+ *  <<_WikiTranslation what=pages >>
  *     Translation matrix of all pages with proper translations (all in pgsrc)
- *  <?plugin _WikiTranslation what=wikiwords match="W*" limit=20 ?>
+ *  <<_WikiTranslation what=wikiwords match="W*" limit=20 >>
  *     Translation matrix of the first 20 wikiwords matching "W*"
- *  <?plugin _WikiTranslation string=HomePage languages=fr,de,sv ?>
+ *  <<_WikiTranslation string=HomePage languages=fr,de,sv >>
  *     Translation matrix for all given languages
- *  <?plugin _WikiTranslation string=HomePage ?>
+ *  <<_WikiTranslation string=HomePage >>
  *     Translation matrix for all supported languages
- *  <?plugin _WikiTranslation string=HomePage languages=fr ?>
+ *  <<_WikiTranslation string=HomePage languages=fr >>
  *     Just return the translated string for this language.
  *
  * @author:  Reini Urban


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7446] trunk/lib/WikiDB/backend/PearDB_ffpgsql.php

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

Revision: 7446
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7446&view=rev
Author:   vargenau
Date:     2010-05-26 12:10:14 +0000 (Wed, 26 May 2010)

Log Message:
-----------
Use ts_rank (Postgres 8.4)

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/PearDB_ffpgsql.php

Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2010-05-26 08:24:54 UTC (rev 7445)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2010-05-26 12:10:14 UTC (rev 7446)
@@ -606,7 +606,7 @@
 
             $search_clause .= "idxFTI @@ to_tsquery('$search_string')";
             if (!$orderby)
-               $orderby = " ORDER BY rank(idxFTI, to_tsquery('$search_string')) DESC";
+               $orderby = " ORDER BY ts_rank(idxFTI, to_tsquery('$search_string')) DESC";
         } else {
             $callback = new WikiMethodCb($searchobj, "_pagename_match_clause");
             $search_clause = "substring(plugin_wiki_page.pagename from 0 for $len) = '$pat') AND (";


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7445] trunk/themes/Sidebar/sidebar.css

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

Revision: 7445
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7445&view=rev
Author:   vargenau
Date:     2010-05-26 08:24:54 +0000 (Wed, 26 May 2010)

Log Message:
-----------
Add svn:keywords Id

Modified Paths:
--------------
    trunk/themes/Sidebar/sidebar.css

Property Changed:
----------------
    trunk/themes/Sidebar/sidebar.css

Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2010-05-25 13:49:31 UTC (rev 7444)
+++ trunk/themes/Sidebar/sidebar.css	2010-05-26 08:24:54 UTC (rev 7445)
@@ -1,5 +1,5 @@
 /**
- * $Id: sidebar.css,v 1.30 2007/01/13 23:42:20 rurban Exp $
+ * $Id$
  *
  * This incarnation of this stylesheet is a complete rewrite from the
  * ground up.


Property changes on: trunk/themes/Sidebar/sidebar.css
___________________________________________________________________
Added: svn:keywords
   + Id


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

Re: [phpwiki-checkins] SF.net SVN: phpwiki:[7414] trunk

[Reini U. <ru...@x-...>]

Marc-Etienne,

Why did go berserk and removed the getVersion API?
Subversion id's still provide the only hint on versions for installed
plugins.

2010/5/19  <var...@us...>:
> Revision: 7414
>          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7414&view=rev
> Author:   vargenau
> Date:     2010-05-19 08:57:58 +0000 (Wed, 19 May 2010)
>
> Log Message:
> -----------
> version of plugins no longer makes sense with Subversion global version number
>
> Modified Paths:
> --------------
>    trunk/lib/WikiPlugin.php
>    trunk/lib/plugin/AddComment.php
>    trunk/lib/plugin/AllPages.php
>    trunk/lib/plugin/AllUsers.php
>    trunk/lib/plugin/AnalyseAccessLogSql.php
>    trunk/lib/plugin/AppendText.php
>    trunk/lib/plugin/AsciiMath.php
>    trunk/lib/plugin/AsciiSVG.php
>    trunk/lib/plugin/AuthorHistory.php
>    trunk/lib/plugin/BackLinks.php
>    trunk/lib/plugin/BlogArchives.php
>    trunk/lib/plugin/BlogJournal.php
>    trunk/lib/plugin/BoxRight.php
>    trunk/lib/plugin/CacheTest.php
>    trunk/lib/plugin/Calendar.php
>    trunk/lib/plugin/CalendarList.php
>    trunk/lib/plugin/CategoryPage.php
>    trunk/lib/plugin/Chart.php
>    trunk/lib/plugin/Comment.php
>    trunk/lib/plugin/CreateBib.php
>    trunk/lib/plugin/CreatePage.php
>    trunk/lib/plugin/CreateToc.php
>    trunk/lib/plugin/CurrentTime.php
>    trunk/lib/plugin/Diff.php
>    trunk/lib/plugin/DynamicIncludePage.php
>    trunk/lib/plugin/EditMetaData.php
>    trunk/lib/plugin/ExternalSearch.php
>    trunk/lib/plugin/FileInfo.php
>    trunk/lib/plugin/FoafViewer.php
>    trunk/lib/plugin/FrameInclude.php
>    trunk/lib/plugin/FullTextSearch.php
>    trunk/lib/plugin/FuzzyPages.php
>    trunk/lib/plugin/GoTo.php
>    trunk/lib/plugin/GoogleMaps.php
>    trunk/lib/plugin/GooglePlugin.php
>    trunk/lib/plugin/GraphViz.php
>    trunk/lib/plugin/HelloWorld.php
>    trunk/lib/plugin/HtmlConverter.php
>    trunk/lib/plugin/Imdb.php
>    trunk/lib/plugin/IncludePage.php
>    trunk/lib/plugin/IncludePages.php
>    trunk/lib/plugin/IncludeSiteMap.php
>    trunk/lib/plugin/IncludeTree.php
>    trunk/lib/plugin/InterWikiSearch.php
>    trunk/lib/plugin/JabberPresence.php
>    trunk/lib/plugin/LdapSearch.php
>    trunk/lib/plugin/LikePages.php
>    trunk/lib/plugin/LinkDatabase.php
>    trunk/lib/plugin/LinkSearch.php
>    trunk/lib/plugin/ListPages.php
>    trunk/lib/plugin/ListRelations.php
>    trunk/lib/plugin/ListSubpages.php
>    trunk/lib/plugin/MediawikiTable.php
>    trunk/lib/plugin/ModeratedPage.php
>    trunk/lib/plugin/MostPopular.php
>    trunk/lib/plugin/NewPagesPerUser.php
>    trunk/lib/plugin/NoCache.php
>    trunk/lib/plugin/OldStyleTable.php
>    trunk/lib/plugin/OrphanedPages.php
>    trunk/lib/plugin/PageDump.php
>    trunk/lib/plugin/PageGroup.php
>    trunk/lib/plugin/PageHistory.php
>    trunk/lib/plugin/PageInfo.php
>    trunk/lib/plugin/PageTrail.php
>    trunk/lib/plugin/PasswordReset.php
>    trunk/lib/plugin/PhotoAlbum.php
>    trunk/lib/plugin/PhpHighlight.php
>    trunk/lib/plugin/PhpWeather.php
>    trunk/lib/plugin/Ploticus.php
>    trunk/lib/plugin/PluginManager.php
>    trunk/lib/plugin/PopUp.php
>    trunk/lib/plugin/PopularNearby.php
>    trunk/lib/plugin/PopularTags.php
>    trunk/lib/plugin/PreferenceApp.php
>    trunk/lib/plugin/PrevNext.php
>    trunk/lib/plugin/Processing.php
>    trunk/lib/plugin/RandomPage.php
>    trunk/lib/plugin/RateIt.php
>    trunk/lib/plugin/RawHtml.php
>    trunk/lib/plugin/RecentChanges.php
>    trunk/lib/plugin/RecentChangesCached.php
>    trunk/lib/plugin/RecentComments.php
>    trunk/lib/plugin/RecentEdits.php
>    trunk/lib/plugin/RecentReferrers.php
>    trunk/lib/plugin/RedirectTo.php
>    trunk/lib/plugin/RelatedChanges.php
>    trunk/lib/plugin/RichTable.php
>    trunk/lib/plugin/RssFeed.php
>    trunk/lib/plugin/SearchHighlight.php
>    trunk/lib/plugin/SemanticRelations.php
>    trunk/lib/plugin/SemanticSearch.php
>    trunk/lib/plugin/SemanticSearchAdvanced.php
>    trunk/lib/plugin/SiteMap.php
>    trunk/lib/plugin/SpellCheck.php
>    trunk/lib/plugin/SqlResult.php
>    trunk/lib/plugin/SyncWiki.php
>    trunk/lib/plugin/SyntaxHighlighter.php
>    trunk/lib/plugin/SystemInfo.php
>    trunk/lib/plugin/TeX2png.php
>    trunk/lib/plugin/Template.php
>    trunk/lib/plugin/TexToPng.php
>    trunk/lib/plugin/TitleSearch.php
>    trunk/lib/plugin/Transclude.php
>    trunk/lib/plugin/TranslateText.php
>    trunk/lib/plugin/UnfoldSubpages.php
>    trunk/lib/plugin/UpLoad.php
>    trunk/lib/plugin/UriResolver.php
>    trunk/lib/plugin/UserPreferences.php
>    trunk/lib/plugin/UserRatings.php
>    trunk/lib/plugin/Video.php
>    trunk/lib/plugin/VisualWiki.php
>    trunk/lib/plugin/WantedPages.php
>    trunk/lib/plugin/WantedPagesOld.php
>    trunk/lib/plugin/WatchPage.php
>    trunk/lib/plugin/WhoIsOnline.php
>    trunk/lib/plugin/WikiAdminChmod.php
>    trunk/lib/plugin/WikiAdminChown.php
>    trunk/lib/plugin/WikiAdminMarkup.php
>    trunk/lib/plugin/WikiAdminPurge.php
>    trunk/lib/plugin/WikiAdminRemove.php
>    trunk/lib/plugin/WikiAdminRename.php
>    trunk/lib/plugin/WikiAdminSearchReplace.php
>    trunk/lib/plugin/WikiAdminSelect.php
>    trunk/lib/plugin/WikiAdminSetAcl.php
>    trunk/lib/plugin/WikiAdminSetExternal.php
>    trunk/lib/plugin/WikiAdminUtils.php
>    trunk/lib/plugin/WikiBlog.php
>    trunk/lib/plugin/WikiForm.php
>    trunk/lib/plugin/WikiFormRich.php
>    trunk/lib/plugin/WikiForum.php
>    trunk/lib/plugin/WikiPoll.php
>    trunk/lib/plugin/WikicreoleTable.php
>    trunk/lib/plugin/YouTube.php
>    trunk/lib/plugin/_AuthInfo.php
>    trunk/lib/plugin/_BackendInfo.php
>    trunk/lib/plugin/_GroupInfo.php
>    trunk/lib/plugin/_PreferencesInfo.php
>    trunk/lib/plugin/_Retransform.php
>    trunk/lib/plugin/_WikiTranslation.php
>    trunk/lib/plugin/text2png.php
>    trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin
>    trunk/locale/de/pgsrc/Hilfe%2FWikiPlugin
>    trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde
>    trunk/locale/zh/pgsrc/HelloWorldPlugin
>    trunk/pgsrc/Help%2FHelloWorldPlugin
>    trunk/pgsrc/Help%2FWikiPlugin
>
> Modified: trunk/lib/WikiPlugin.php
> ===================================================================
> --- trunk/lib/WikiPlugin.php    2010-05-19 07:53:16 UTC (rev 7413)
> +++ trunk/lib/WikiPlugin.php    2010-05-19 08:57:58 UTC (rev 7414)
> @@ -83,13 +83,6 @@
>         return $this->getName();
>     }
>
> -    // plugins should override this with the commented-out code
> -    function getVersion() {
> -        return _("n/a");
> -        //return preg_replace("/[Revision: $]/", '',
> -        //                    "\$Revision: 1.67 $");
> -    }
> -

...
-- 
Reini Urban
http://phpwiki.org/           http://murbreak.at/

[phpwiki-checkins] SF.net SVN: phpwiki:[7444] trunk/themes/Sidebar/sidebar.css

[<ru...@us...>]

Revision: 7444
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7444&view=rev
Author:   rurban
Date:     2010-05-25 13:49:31 +0000 (Tue, 25 May 2010)

Log Message:
-----------
provide missing css source

Modified Paths:
--------------
    trunk/themes/Sidebar/sidebar.css

Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2010-05-21 12:19:56 UTC (rev 7443)
+++ trunk/themes/Sidebar/sidebar.css	2010-05-25 13:49:31 UTC (rev 7444)
@@ -1 +1,231 @@
-@import url("../default/phpwiki.css");body{background:#fff;font-family:Arial,Helvetica,sans-serif;font-size:85%;margin:0;}div.wikitext{margin-left:.5em;border-top:1px solid #e8e6df;border-left:1px solid #e8e6df;border-bottom:1px solid #b2b2b2;border-right:1px solid #b2b2b2;}div#logo img{left:1ex;top:1ex;margin:0;}h1{top:0;padding-top:.5ex;padding-bottom:.5ex;padding-left:.25em;width:100%;border-bottom:2px solid black;}h1 a.backlinks{text-decoration:none;}#navbar hr,#actionbar hr{display:none;}#actionbuttons,#signin{line-height:2.4ex;}.sidebar{line-height:1em;}.sidebar a.wikiadmin,.sidebar a.wikiaction{border:0;margin:0;padding:0;-moz-appearance:none;-moz-box-sizing:auto;-moz-border-radius:0;background-color:#fff;}div#signin{margin-bottom:1ex;}div#searchholder{display:inline;position:relative;}#searchGoButton{background-color:#fff;border:none;padding:0;height:15px;width:15px;-moz-appearance:none;-moz-box-sizing:auto;-moz-border-radius:0;line-height:1em;position:absolute;top:5px;left:132px;}#livesearch{position:relative;margin-left:.5em;}p.editdate{background:white;padding:.25ex .5em;border-top:1px solid #e8e6df;border-left:1px solid #e8e6df;border-bottom:1px solid #d3d2c8;border-right:1px solid #e8e6df;margin-left:.5em;margin-right:1em;margin-top:.5ex;margin-bottom:.5ex;}.debug{margin-left:.5em;left:.5em;max-width:13em;}div#xhtml-validator{right:.75em;}.clear-floats{clear:both;}div.box-title a,div.box-title a:visited,div.box-title a:link{font-weight:normal;text-decoration:none;color:black;}div.box-title a:hover{padding:0 4px 0 4px;background-color:ThreedLightShadow;border:1px outset;}div.box-data a,div.box-data a:visited,div.box-data a:link{text-decoration:none;color:black;font-size:smaller;}div.box-data a:hover{background-color:ThreedLightShadow;border:1px outset;}
\ No newline at end of file
+/**
+ * $Id: sidebar.css,v 1.30 2007/01/13 23:42:20 rurban Exp $
+ *
+ * This incarnation of this stylesheet is a complete rewrite from the
+ * ground up.
+ * 
+ * It renders excellent with Mozilla and very good with IE5.1Mac.
+ * 
+ * No floats are used, for older versions of ie (which apparently hang).
+ *
+ * OmniWeb is totally useless with this stylesheet.
+ * This also has not yet been tested against NS4.
+ * 
+ */
+@import url("../default/phpwiki.css");
+
+/**
+ * General settings
+ */
+body {
+  background: #ffffff;
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 85%; /* The default is too large. But enlarge monospace below */
+  margin: 0 0 0 0;
+}
+
+div.wikitext {
+  margin-left: 0.5em;
+  /* "paper" borders */
+  border-top:    1px solid #e8e6df;
+  border-left:   1px solid #e8e6df;
+  border-bottom: 1px solid #b2b2b2;
+  border-right:  1px solid #b2b2b2;
+}
+
+/** some border colors
+ ** to play with
+  #d3d2c8;
+  #e8e6df;
+  #6d6a5c;
+  #b3ae97;
+ **/
+div#logo img {
+  /*  position: fixed; */
+  left: 1ex;
+  top:  1ex;
+  margin: 0;
+}
+/*
+div#clock {
+  position: fixed;
+  left: 0.7ex;
+  top:  31ex;
+}
+div#calendar {
+  position: fixed;
+  left:  0.7ex;
+  top:  31ex;
+}
+*/
+h1 {
+  /*  position: fixed; */
+  top: 0;
+  /*background: ivory;*/
+  padding-top:    0.5ex;
+  padding-bottom: 0.5ex;
+  padding-left:   0.25em;
+  width: 100%;
+  border-bottom: 2px solid black;
+}
+
+h1 a.backlinks { text-decoration: none; }
+
+/**
+ * Common toolbar settings
+ * Note that div.toolbar is used for other toolbars besides
+ * #navbar and #actionbar, such as in editpage and removepage
+ */
+#navbar hr, #actionbar hr { display: none; }
+#actionbuttons, #signin { line-height: 2.4ex; }
+/* #navbuttons input { margin-bottom: 0.5ex; } */
+.sidebar { line-height: 1em; }
+/* #navbuttons { top: 5.5ex; } */
+
+/* backlinks button */
+.sidebar a.wikiadmin, .sidebar a.wikiaction { 
+  border: 0;
+  margin: 0;
+  padding: 0;
+  -moz-appearance: none;
+  -moz-box-sizing: auto;
+  -moz-border-radius: 0;
+  background-color: #fff;
+}
+
+/**
+ * Action links
+ * bonus for css2 browsers
+ * localise with dynamic css?
+ */
+/*
+div#actionbuttons:before {
+  display: block;
+  content: "Actions";
+}
+*/
+/* div#actionbuttons { bottom: 10ex; } */
+
+/**
+ * Sign In
+ */
+/* div#signin { position: fixed; bottom: 0; } */
+div#signin { margin-bottom: 1ex; }
+
+
+/**
+ * Search
+ */
+div#searchholder {
+  display: inline; 
+  position: relative;
+}
+#searchGoButton { 
+  background-color: #fff;
+  border: none;
+  padding: 0 0 0 0;
+  height: 15px;
+  width: 15px;
+  -moz-appearance: none;
+  -moz-box-sizing: auto;
+  -moz-border-radius: 0;
+  line-height: 1em;
+  position: absolute;
+  top: 5px;
+  left: 132px;
+}
+#livesearch { 
+  position: relative;
+  margin-left: 0.5em;
+}
+
+/**
+ * Last edited
+ *
+ * Really the only thing left in in #actionbar
+   at this point is the date, everything else
+   has been plucked out. */
+p.editdate {
+  background: white;
+  padding: 0.25ex 0.5em;
+  border-top:  1px solid #e8e6df;
+  border-left: 1px solid #e8e6df;
+  border-bottom: 1px solid #d3d2c8;
+  border-right:  1px solid #e8e6df;
+
+  margin-left:  0.5em;
+  margin-right: 1em;
+  margin-top:   0.5ex;
+  margin-bottom: 0.5ex;
+}
+
+/*
+div#actionbar {
+  color: black;
+  background: ivory;
+  border-top: 1px solid #b2b2b2;
+  width: auto;
+  position: fixed;
+  left:  13em;
+  bottom: 0;
+  margin: 0;
+}
+*/
+
+/**
+ * Other
+ */
+.debug {
+  margin-left:  0.5em;
+  left: 0.5em;
+  /*position: fixed;
+  top: 42ex;
+  width: 13em; */
+  max-width: 13em; /* ie ignores this */
+}
+
+/*
+div#xhtml-validator { display: none; }
+ */
+
+div#xhtml-validator {
+  /*  position: fixed; */
+  right: 0.75em;
+  /*  top: 1ex; */
+}
+
+.clear-floats {
+  clear: both;
+}
+
+/* Black Links */
+div.box-title a, div.box-title a:visited, div.box-title a:link {
+  font-weight: normal;
+  text-decoration: none;
+  color: black;
+}
+div.box-title a:hover {
+  padding: 0 4px 0 4px;
+  background-color: ThreedLightShadow;
+  border: 1px outset;
+}
+
+/* smaller sidebar links */
+div.box-data a, div.box-data a:visited, div.box-data a:link {
+  text-decoration: none;
+  color: black;
+  font-size: smaller;
+}
+
+div.box-data a:hover {
+  background-color: ThreedLightShadow;
+    /*background-color: #def;*/
+  border: 1px outset;
+}
+/* For emacs users
+ *
+ * Local Variables:
+ * mode: c
+ * c-file-style: cc-mode
+ * 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:[7443] trunk/locale

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

Revision: 7443
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7443&view=rev
Author:   vargenau
Date:     2010-05-21 12:19:56 +0000 (Fri, 21 May 2010)

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

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/de/LC_MESSAGES/phpwiki.php
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.php
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.php
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.php
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.php
    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/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php	2010-05-21 10:11:55 UTC (rev 7442)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2010-05-21 12:19:56 UTC (rev 7443)
@@ -886,8 +886,6 @@
    "Einbetten einer externen Webseite im Body dieser Wiki Seite.";
 $locale["Include multiple pages."] =
    "Füge mehrere Seiten ein.";
-$locale["Include of '%s' failed."] =
-   "Das Einfügen von »%s« ist fehlgeschlagen.";
 $locale["Include recursively all linked pages starting at %s"] =
    "Bette rekursiv alle verlinkten Seiten ein, angefangen mit %s";
 $locale["Include text from another wiki page."] =
@@ -1668,6 +1666,8 @@
    "Zeige Überblick über alle aktuellen Benutzersessions.";
 $locale["Show translations of various words or pages"] =
    "Zeige Übersetzungen für verschiedene Wörter oder Seiten";
+$locale["Sidebar"] =
+   "Sidebar";
 $locale["Sign In"] =
    "Anmelden";
 $locale["Sign Out"] =
@@ -2318,8 +2318,6 @@
    "Minuten";
 $locale["missing required version argument"] =
    "Parameter version muß angegeben werden";
-$locale["n/a"] =
-   "k.A.";
 $locale["new window"] =
    "neues Fenster";
 $locale["newer than the existing page."] =

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	2010-05-21 10:11:55 UTC (rev 7442)
+++ trunk/locale/es/LC_MESSAGES/phpwiki.php	2010-05-21 12:19:56 UTC (rev 7443)
@@ -358,8 +358,6 @@
    "El mapa de imagen expiró.  Recargue la página del wiki para reconstruir su pieza del HTML.";
 $locale["In the time since you started editing this page, another user has saved a new version of it."] =
    "En el tiempo desde que usted comenzó a corregir esta página, otro usuario ha ahorrado una nueva versión de ella.";
-$locale["Include of '%s' failed."] =
-   "Inserción de '%s' falló.";
 $locale["Included from %s"] =
    "Inserción de '%s'";
 $locale["Included from %s:"] =
@@ -960,8 +958,6 @@
    "minutas";
 $locale["missing required version argument"] =
    "parámetro requerido de la versión que falta";
-$locale["n/a"] =
-   "n/a";
 $locale["no page content"] =
    "ningún contenido de la página";
 $locale["not authenticated"] =

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	2010-05-21 10:11:55 UTC (rev 7442)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2010-05-21 12:19:56 UTC (rev 7443)
@@ -896,8 +896,6 @@
    "Au total: %d utilisateurs en ligne. :: %d enregistré(s) et %d invité(s)";
 $locale["Include an external web page within the body of a wiki page."] =
    "Inclure une page externe dans le corps de la WikiPage.";
-$locale["Include of '%s' failed."] =
-   "L'insertion de '%s' a échoué.";
 $locale["Include recursively all linked pages starting at %s"] =
    "Créer une carte du site commencer à %s";
 $locale["Include text from another wiki page."] =
@@ -1720,6 +1718,8 @@
    "Montre l'index de la table session. (utilisateurs en ligne).";
 $locale["Show translations of various words or pages"] =
    "Affiche la traduction de quelques mots dans certaines pages.";
+$locale["Sidebar"] =
+   "Barre verticale";
 $locale["Sign In"] =
    "Connexion";
 $locale["Sign Out"] =
@@ -2384,8 +2384,6 @@
    "minutes";
 $locale["missing required version argument"] =
    "argument de version requis manquant";
-$locale["n/a"] =
-   "n/c";
 $locale["newer than the existing page."] =
    "plus récent que la page existante.";
 $locale["no cache used"] =

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	2010-05-21 10:11:55 UTC (rev 7442)
+++ trunk/locale/it/LC_MESSAGES/phpwiki.php	2010-05-21 12:19:56 UTC (rev 7443)
@@ -168,8 +168,6 @@
    "AliasPaginaPrincipale";
 $locale["In the time since you started editing this page, another user has saved a new version of it."] =
    "Nel tempo da quando avete cominciato pubblicare questa pagina, un altro utente ha conservato una nuova versione di esso.";
-$locale["Include of '%s' failed."] =
-   "Inserimento di '%s' fallito.";
 $locale["IncludePage"] =
    "InserireLaPagina";
 $locale["IncludePagePlugin"] =

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

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/ja/LC_MESSAGES/phpwiki.php	2010-05-21 10:11:55 UTC (rev 7442)
+++ trunk/locale/ja/LC_MESSAGES/phpwiki.php	2010-05-21 12:19:56 UTC (rev 7443)
@@ -330,6 +330,8 @@
    "選択:";
 $locale["Serialized file %s"] =
    "シリアライズファイル %s";
+$locale["Sidebar"] =
+   "スライドバー";
 $locale["Sign In"] =
    "サインイン";
 $locale["Sign Out"] =

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	2010-05-21 10:11:55 UTC (rev 7442)
+++ trunk/locale/nl/LC_MESSAGES/phpwiki.php	2010-05-21 12:19:56 UTC (rev 7443)
@@ -56,8 +56,6 @@
    "Thuis";
 $locale["HomePage"] =
    "ThuisPagina";
-$locale["Include of '%s' failed."] =
-   "Insert van '%s' gefaald.";
 $locale["Last Author"] =
    "Vorige Auteur";
 $locale["Last Modified"] =

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2010-05-21 10:11:55 UTC (rev 7442)
+++ trunk/locale/po/de.po	2010-05-21 12:19:56 UTC (rev 7443)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 19:44+0100\n"
+"POT-Creation-Date: 2010-05-21 14:17+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."
@@ -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:199
+#: ../lib/EditToolbar.php:259 ../lib/plugin/WikiAdminSearchReplace.php:194
 msgid "Search & Replace"
 msgstr "Suchen & Ersetzen"
 
@@ -101,15 +101,15 @@
 msgid "Replace with"
 msgstr "Ersetze mit"
 
-#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:302
-#: ../lib/plugin/SyncWiki.php:328 ../lib/plugin/SyncWiki.php:351
-#: ../lib/plugin/WikiPoll.php:225 ../lib/upgrade.php:205
-#: ../lib/upgrade.php:408 ../lib/upgrade.php:422 ../lib/upgrade.php:442
-#: ../lib/upgrade.php:451 ../lib/upgrade.php:475 ../lib/upgrade.php:503
-#: ../lib/upgrade.php:553 ../lib/upgrade.php:556 ../lib/upgrade.php:588
-#: ../lib/upgrade.php:590 ../lib/upgrade.php:617 ../lib/upgrade.php:677
-#: ../lib/upgrade.php:702 ../lib/upgrade.php:845 ../lib/upgrade.php:848
-#: ../lib/upgrade.php:915
+#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:297
+#: ../lib/plugin/SyncWiki.php:323 ../lib/plugin/SyncWiki.php:346
+#: ../lib/plugin/WikiPoll.php:220 ../lib/upgrade.php:194
+#: ../lib/upgrade.php:397 ../lib/upgrade.php:411 ../lib/upgrade.php:431
+#: ../lib/upgrade.php:440 ../lib/upgrade.php:464 ../lib/upgrade.php:492
+#: ../lib/upgrade.php:542 ../lib/upgrade.php:545 ../lib/upgrade.php:577
+#: ../lib/upgrade.php:579 ../lib/upgrade.php:606 ../lib/upgrade.php:666
+#: ../lib/upgrade.php:691 ../lib/upgrade.php:834 ../lib/upgrade.php:837
+#: ../lib/upgrade.php:904
 msgid "OK"
 msgstr "OK"
 
@@ -203,13 +203,13 @@
 msgid "List"
 msgstr "Liste"
 
-#: ../lib/EditToolbar.php:193 ../lib/plugin/CreateToc.php:455
-#: ../lib/plugin/CreateToc.php:471
+#: ../lib/EditToolbar.php:193 ../lib/plugin/CreateToc.php:452
+#: ../lib/plugin/CreateToc.php:468
 msgid "Table of Contents"
 msgstr "Inhaltsverzeichnis"
 
 #: ../lib/EditToolbar.php:197 ../lib/PageList.php:530
-#: ../lib/plugin/AuthorHistory.php:157 ../lib/plugin/WantedPagesOld.php:148
+#: ../lib/plugin/AuthorHistory.php:152 ../lib/plugin/WantedPagesOld.php:143
 msgid "Page Name"
 msgstr "Seitenname"
 
@@ -222,7 +222,7 @@
 msgid "Template Name"
 msgstr "Vorlagenname"
 
-#: ../lib/EditToolbar.php:203 ../lib/plugin/PopularTags.php:64
+#: ../lib/EditToolbar.php:203 ../lib/plugin/PopularTags.php:58
 #: ../lib/plugin/Template.php:61
 msgid "Template"
 msgstr "Vorlage"
@@ -298,21 +298,21 @@
 msgid "%s: error while handling error:"
 msgstr "%s: Fehler während der Fehlerbehandlung von:"
 
-#: ../lib/FileFinder.php:191 ../lib/loadsave.php:1154
+#: ../lib/FileFinder.php:195 ../lib/loadsave.php:1151
 #, php-format
 msgid "%s: file not found"
 msgstr "»%s«: Datei nicht gefunden"
 
-#: ../lib/IniConfig.php:859
+#: ../lib/IniConfig.php:979
 msgid "CategoryGroup"
 msgstr "KategorieGruppen"
 
 # (namenlos=unbenannt; depends on interpretation)
-#: ../lib/IniConfig.php:861
+#: ../lib/IniConfig.php:981
 msgid "An unnamed PhpWiki"
 msgstr "Unbenanntes PhpWiki"
 
-#: ../lib/IniConfig.php:863 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:983 ../lib/upgrade.php:70
 #: ../themes/Wordpress/templates/actionbar.tmpl:21
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:132
@@ -348,34 +348,39 @@
 msgid "Page change"
 msgstr "Seiten Änderung"
 
-#: ../lib/MailNotify.php:285 ../lib/loadsave.php:972
+#: ../lib/MailNotify.php:285 ../lib/loadsave.php:969
 #: ../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:289 ../lib/MailNotify.php:305 ../lib/loadsave.php:96
+#: ../lib/MailNotify.php:289 ../lib/MailNotify.php:306 ../lib/loadsave.php:96
 #, php-format
 msgid "Edited by: %s"
 msgstr "Bearbeitet von: %s"
 
-#: ../lib/MailNotify.php:306
+#: ../lib/MailNotify.php:290
+#, fuzzy, php-format
+msgid "Summary: %s"
+msgstr "Zusammenfassung:"
+
+#: ../lib/MailNotify.php:307
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "Seite »%s« nach umbenennen »%s«"
 
-#: ../lib/MailNotify.php:343
+#: ../lib/MailNotify.php:344
 #, fuzzy, php-format
 msgid "User %s removed page %s"
 msgstr "Seite gelöscht %s"
 
-#: ../lib/MailNotify.php:379
+#: ../lib/MailNotify.php:380
 #, fuzzy
 msgid "E-Mail address confirmation"
 msgstr "E-Mail Bestätigung"
 
-#: ../lib/MailNotify.php:382
+#: ../lib/MailNotify.php:383
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -412,7 +417,7 @@
 msgid "Click to de-/select all pages"
 msgstr "Klicken Sie um alle/keine Seiten auszuwählen"
 
-#: ../lib/PageList.php:388 ../lib/plugin/IncludePage.php:192
+#: ../lib/PageList.php:388 ../lib/plugin/IncludePage.php:187
 #, php-format
 msgid " ... first %d bytes"
 msgstr " ... erste %d Bytes"
@@ -422,64 +427,64 @@
 msgid " ... around %s"
 msgstr "... cirka %s"
 
-#: ../lib/PageList.php:453 ../lib/plugin/AppendText.php:60
+#: ../lib/PageList.php:453 ../lib/plugin/AppendText.php:55
 #, php-format
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
-#: ../lib/PageList.php:668 ../lib/plugin/FullTextSearch.php:120
+#: ../lib/PageList.php:668 ../lib/plugin/FullTextSearch.php:115
 msgid "<no matches>"
 msgstr "<nichts gefunden>"
 
-#: ../lib/PageList.php:1170 ../lib/plugin/FullTextSearch.php:91
-#: ../lib/plugin/WikiAdminSearchReplace.php:184
+#: ../lib/PageList.php:1172 ../lib/plugin/FullTextSearch.php:86
+#: ../lib/plugin/WikiAdminSearchReplace.php:179
 msgid "Content"
 msgstr "Inhalt"
 
-#: ../lib/PageList.php:1186
+#: ../lib/PageList.php:1188
 msgid "All"
 msgstr ""
 
-#: ../lib/PageList.php:1190 ../themes/MonoBook/templates/info.tmpl:72
+#: ../lib/PageList.php:1192 ../themes/MonoBook/templates/info.tmpl:72
 #: ../themes/default/templates/info.tmpl:57
 msgid "Last Modified"
 msgstr "Zuletzt geändert"
 
-#: ../lib/PageList.php:1192
+#: ../lib/PageList.php:1194
 msgid "Hits"
 msgstr "Treffer"
 
-#: ../lib/PageList.php:1194 ../themes/Crao/templates/editpage.tmpl:38
+#: ../lib/PageList.php:1196 ../themes/Crao/templates/editpage.tmpl:38
 #: ../themes/Wordpress/templates/editpage.tmpl:39
 #: ../themes/default/templates/editpage.tmpl:40
 #: ../themes/gforge/templates/editpage.tmpl:35
 msgid "Size"
 msgstr "Größe"
 
-#: ../lib/PageList.php:1197 ../themes/MonoBook/templates/info.tmpl:74
+#: ../lib/PageList.php:1199 ../themes/MonoBook/templates/info.tmpl:74
 #: ../themes/default/templates/info.tmpl:59
 msgid "Last Summary"
 msgstr "Letzte Zusammenfassung"
 
-#: ../lib/PageList.php:1199 ../lib/plugin/AuthorHistory.php:116
-#: ../lib/plugin/AuthorHistory.php:159 ../lib/plugin/PluginManager.php:78
+#: ../lib/PageList.php:1201 ../lib/plugin/AuthorHistory.php:111
+#: ../lib/plugin/AuthorHistory.php:154
 msgid "Version"
 msgstr "Version"
 
-#: ../lib/PageList.php:1202 ../themes/MonoBook/templates/info.tmpl:73
+#: ../lib/PageList.php:1204 ../themes/MonoBook/templates/info.tmpl:73
 #: ../themes/default/templates/info.tmpl:58
 msgid "Last Author"
 msgstr "Letzter Autor"
 
-#: ../lib/PageList.php:1204 ../lib/WikiGroup.php:36
+#: ../lib/PageList.php:1206 ../lib/WikiGroup.php:36
 msgid "Owner"
 msgstr "Besitzer"
 
-#: ../lib/PageList.php:1206 ../lib/WikiGroup.php:37
+#: ../lib/PageList.php:1208 ../lib/WikiGroup.php:37
 msgid "Creator"
 msgstr "Erzeuger"
 
-#: ../lib/PageList.php:1212 ../themes/Crao/templates/editpage.tmpl:62
+#: ../lib/PageList.php:1214 ../themes/Crao/templates/editpage.tmpl:62
 #: ../themes/MonoBook/templates/info.tmpl:143
 #: ../themes/Wordpress/templates/editpage.tmpl:62
 #: ../themes/default/templates/editpage.tmpl:81
@@ -488,38 +493,38 @@
 msgid "Locked"
 msgstr "Gesperrt"
 
-#: ../lib/PageList.php:1213
+#: ../lib/PageList.php:1215
 msgid "locked"
 msgstr "gesperrt"
 
-#: ../lib/PageList.php:1215 ../themes/gforge/templates/editpage.tmpl:67
+#: ../lib/PageList.php:1217 ../themes/gforge/templates/editpage.tmpl:67
 #, fuzzy
 msgid "External"
 msgstr "Externe Links"
 
-#: ../lib/PageList.php:1216
+#: ../lib/PageList.php:1218
 #, fuzzy
 msgid "external"
 msgstr "Externe Links"
 
-#: ../lib/PageList.php:1219
+#: ../lib/PageList.php:1221
 msgid "Minor Edit"
 msgstr "Kleinere Änderung"
 
-#: ../lib/PageList.php:1219
+#: ../lib/PageList.php:1221
 msgid "minor"
 msgstr "kleinere"
 
-#: ../lib/PageList.php:1221
+#: ../lib/PageList.php:1223
 msgid "Markup"
 msgstr "Quelltext"
 
-#: ../lib/PageList.php:1390 ../lib/PageList.php:1397 ../lib/PageList.php:1403
+#: ../lib/PageList.php:1392 ../lib/PageList.php:1399 ../lib/PageList.php:1405
 #: ../lib/WikiDB/backend.php:530 ../lib/WikiDB/backend.php:536
 msgid "Illegal 'limit' argument: must be numeric"
 msgstr ""
 
-#: ../lib/PageList.php:1517 ../lib/plugin/WantedPagesOld.php:175
+#: ../lib/PageList.php:1519 ../lib/plugin/WantedPagesOld.php:170
 #, php-format
 msgid "Columns: %s."
 msgstr "Spalten: %s."
@@ -527,10 +532,10 @@
 # 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: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
+#: ../lib/loadsave.php:465 ../lib/loadsave.php:1030 ../lib/loadsave.php:1036
+#: ../lib/loadsave.php:1044 ../lib/main.php:1048 ../lib/main.php:1166
+#: ../lib/main.php:1178 ../lib/plugin/WikiAdminRename.php:143
+#: ../lib/plugin/WikiAdminSelect.php:218 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/head.tmpl:81
 #: ../themes/Crao/templates/navbar.tmpl:38
 #: ../themes/MonoBook/templates/navbar.tmpl:58
@@ -550,13 +555,13 @@
 msgid "PhpWikiAdministration"
 msgstr "PhpWikiSystemverwalten"
 
-#: ../lib/PagePerm.php:190 ../lib/main.php:1085
-#: ../lib/plugin/WikiAdminRename.php:148 ../lib/plugin/WikiAdminRename.php:273
+#: ../lib/PagePerm.php:190 ../lib/main.php:1077
+#: ../lib/plugin/WikiAdminRename.php:143 ../lib/plugin/WikiAdminRename.php:268
 #: ../themes/gforge/templates/actionbar.tmpl:114
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminSearchReplace.php:237
+#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminSearchReplace.php:232
 msgid "Replace"
 msgstr "Ersetze"
 
@@ -614,8 +619,8 @@
 msgid "Del/+"
 msgstr "Lö/+"
 
-#: ../lib/PagePerm.php:610 ../lib/plugin/PluginManager.php:78
-#: ../lib/plugin/WikiAdminSetAcl.php:257
+#: ../lib/PagePerm.php:610 ../lib/plugin/PluginManager.php:71
+#: ../lib/plugin/WikiAdminSetAcl.php:252
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -639,9 +644,9 @@
 msgid "Check to add this ACL"
 msgstr "Anklicken um diese ACL hinzuzufügen"
 
-#: ../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:78
+#: ../lib/PageType.php:136 ../lib/loadsave.php:905 ../lib/loadsave.php:1556
+#: ../lib/plugin/InterWikiSearch.php:52 ../lib/plugin/WantedPages.php:51
+#: ../lib/plugin/WantedPagesOld.php:73
 #: ../themes/MonoBook/templates/info.tmpl:168
 #: ../themes/MonoBook/templates/info.tmpl:169
 #: ../themes/default/templates/info.tmpl:160
@@ -653,7 +658,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:842
+#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:843
 #: ../themes/MonoBook/templates/actionbar.tmpl:22
 #: ../themes/MonoBook/templates/actionbar.tmpl:26
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
@@ -667,7 +672,7 @@
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../lib/PageType.php:298 ../lib/loadsave.php:1166
+#: ../lib/PageType.php:298 ../lib/loadsave.php:1163
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr "Die InterWikiListe wird von der externen Datei %s geladen."
@@ -683,11 +688,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:148 ../lib/display.php:383
-#: ../lib/loadsave.php:1578 ../lib/plugin/RecentChanges.php:62
+#: ../lib/RSSWriter091.php:112 ../lib/display.php:151 ../lib/display.php:395
+#: ../lib/loadsave.php:1575 ../lib/plugin/RecentChanges.php:62
 #: ../lib/plugin/RecentChanges.php:210 ../lib/plugin/RecentChanges.php:217
-#: ../lib/plugin/RecentChanges.php:386 ../lib/plugin/RecentChanges.php:675
-#: ../lib/plugin/RecentChanges.php:1154 ../themes/Crao/templates/head.tmpl:63
+#: ../lib/plugin/RecentChanges.php:393 ../lib/plugin/RecentChanges.php:682
+#: ../lib/plugin/RecentChanges.php:1161 ../themes/Crao/templates/head.tmpl:63
 #: ../themes/Crao/templates/navbar.tmpl:14
 #: ../themes/MonoBook/templates/navbar.tmpl:16
 #: ../themes/Portland/templates/navbar.tmpl:26
@@ -722,7 +727,7 @@
 msgid "Upload error: unknown error #"
 msgstr ""
 
-#: ../lib/Request.php:838 ../lib/main.php:1297 ../lib/main.php:1310
+#: ../lib/Request.php:838 ../lib/main.php:1286 ../lib/main.php:1299
 #, php-format
 msgid "%s is not writable."
 msgstr "%s is nicht änderbar."
@@ -731,7 +736,7 @@
 msgid "The PhpWiki access log file"
 msgstr "Die PhpWiki Zugriffslog Datei"
 
-#: ../lib/Request.php:840 ../lib/main.php:1300
+#: ../lib/Request.php:840 ../lib/main.php:1289
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
@@ -747,12 +752,12 @@
 msgid "UriResolver"
 msgstr ""
 
-#: ../lib/SemanticWeb.php:151 ../lib/plugin/SemanticSearch.php:330
-#: ../lib/plugin/SemanticSearchAdvanced.php:189
+#: ../lib/SemanticWeb.php:151 ../lib/plugin/SemanticSearch.php:326
+#: ../lib/plugin/SemanticSearchAdvanced.php:185
 msgid "Relation"
 msgstr ""
 
-#: ../lib/SemanticWeb.php:153 ../lib/plugin/SemanticSearch.php:406
+#: ../lib/SemanticWeb.php:153 ../lib/plugin/SemanticSearch.php:402
 msgid "Attribute"
 msgstr "Attribut"
 
@@ -761,8 +766,8 @@
 msgid "%4d  %s\n"
 msgstr "%4d  %s\n"
 
-#: ../lib/TextSearchQuery.php:115 ../lib/display.php:185
-#: ../lib/display.php:422 ../lib/plugin/FileInfo.php:129
+#: ../lib/TextSearchQuery.php:115 ../lib/display.php:188
+#: ../lib/display.php:434 ../lib/plugin/FileInfo.php:124
 #, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr "Nicht unterstütztes Argument: %s=%s"
@@ -785,7 +790,7 @@
 msgid "%s: Date of new revision is %s"
 msgstr "%s: Datum dieser aktuellen Neubearbeitung ist %s"
 
-#: ../lib/WikiDB.php:1028 ../lib/main.php:99
+#: ../lib/WikiDB.php:1028 ../lib/main.php:101
 msgid "Optimizing database"
 msgstr "Datenbank wird optimiert"
 
@@ -883,7 +888,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:1149
+#: ../lib/WikiGroup.php:838 ../lib/loadsave.php:1146
 #, php-format
 msgid "%s: not defined"
 msgstr "%s: nicht definiert"
@@ -907,34 +912,30 @@
 msgid "Unable to connect to LDAP server %s"
 msgstr "Konnte LDAP Server %s nicht finden"
 
-#: ../lib/WikiPlugin.php:88
-msgid "n/a"
-msgstr "k.A."
-
-#: ../lib/WikiPlugin.php:236
+#: ../lib/WikiPlugin.php:229
 #, php-format
 msgid "trailing cruft in plugin args: '%s'"
 msgstr "Überflüssiger Müll in den Zusatzprogramm Argumenten: »%s«"
 
-#: ../lib/WikiPlugin.php:244
+#: ../lib/WikiPlugin.php:237
 #, php-format
 msgid "Argument '%s' not declared by plugin."
 msgstr "Argument »%s« nicht im Zusatzprogramm deklariert."
 
-#: ../lib/WikiPlugin.php:364
+#: ../lib/WikiPlugin.php:357
 #, php-format
 msgid "Plugin %s failed."
 msgstr "Zusatzprogramm %s fehlgeschlagen."
 
-#: ../lib/WikiPlugin.php:370
+#: ../lib/WikiPlugin.php:363
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Zusatzprogramm %s deaktiviert."
 
-#: ../lib/WikiPlugin.php:504
-#, php-format
-msgid "Include of '%s' failed."
-msgstr "Das Einfügen von »%s« ist fehlgeschlagen."
+#: ../lib/WikiPlugin.php:486 ../lib/WikiPlugin.php:503
+#, fuzzy, php-format
+msgid "Plugin '%s' does not exist."
+msgstr "Gruppenseite »%s« existiert nicht"
 
 #: ../lib/WikiPlugin.php:506
 #, php-format
@@ -958,81 +959,81 @@
 msgid "Image map expired. Reload wiki page to recreate its html part."
 msgstr ""
 
-#: ../lib/WikiTheme.php:446
+#: ../lib/WikiTheme.php:451
 msgid "Never edited"
 msgstr "Noch nie bearbeitet."
 
-#: ../lib/WikiTheme.php:453
+#: ../lib/WikiTheme.php:458
 #, php-format
 msgid "%s at %s"
 msgstr "%s um %s"
 
-#: ../lib/WikiTheme.php:457
+#: ../lib/WikiTheme.php:462
 #, 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:459
+#: ../lib/WikiTheme.php:464
 #, php-format
 msgid "Last edited %s"
 msgstr "Zuletzt geändert %s"
 
-#: ../lib/WikiTheme.php:468
+#: ../lib/WikiTheme.php:473
 #, php-format
 msgid "Version %s, saved on %s"
 msgstr "Version %s. gespeichert am %s"
 
-#: ../lib/WikiTheme.php:470
+#: ../lib/WikiTheme.php:475
 #, php-format
 msgid "Last edited on %s"
 msgstr "Zuletzt bearbeitet am %s"
 
-#: ../lib/WikiTheme.php:486
+#: ../lib/WikiTheme.php:491
 msgid "today"
 msgstr "heute"
 
-#: ../lib/WikiTheme.php:493
+#: ../lib/WikiTheme.php:498
 msgid "yesterday"
 msgstr "gestern"
 
-#: ../lib/WikiTheme.php:514 ../lib/WikiTheme.php:516
+#: ../lib/WikiTheme.php:519 ../lib/WikiTheme.php:521
 #, php-format
 msgid "Owner: %s"
 msgstr "Besitzer: %s"
 
-#: ../lib/WikiTheme.php:529 ../lib/WikiTheme.php:531 ../lib/diff.php:261
-#: ../lib/plugin/Diff.php:75
+#: ../lib/WikiTheme.php:534 ../lib/WikiTheme.php:536 ../lib/diff.php:261
+#: ../lib/plugin/Diff.php:69
 #, php-format
 msgid "by %s"
 msgstr "von %s"
 
-#: ../lib/WikiTheme.php:623
+#: ../lib/WikiTheme.php:628
 #, php-format
 msgid "Empty link to: %s"
 msgstr "Leerer Link zu: %s"
 
-#: ../lib/WikiTheme.php:638 ../themes/MacOSX/themeinfo.php:71
+#: ../lib/WikiTheme.php:643 ../themes/MacOSX/themeinfo.php:78
 #, php-format
 msgid "Create: %s"
 msgstr "Erzeugen: %s"
 
-#: ../lib/WikiTheme.php:657
+#: ../lib/WikiTheme.php:662
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:682
+#: ../lib/WikiTheme.php:687
 #, php-format
 msgid "'%s': Bad page name"
 msgstr "»%s«: Ungültiger Seitenname"
 
-#: ../lib/WikiTheme.php:1032 ../lib/plugin/WatchPage.php:93
+#: ../lib/WikiTheme.php:1037 ../lib/plugin/WatchPage.php:88
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/Sidebar/templates/actionbar.tmpl:20
-#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:60
+#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:67
 #: ../themes/default/templates/actionbar.tmpl:16
 #: ../themes/gforge/templates/actionbar.tmpl:54
 #: ../themes/shamino_com/templates/actionbar.tmpl:8
@@ -1040,12 +1041,12 @@
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../lib/WikiTheme.php:1033 ../lib/plugin/Diff.php:37
-#: ../themes/blog/themeinfo.php:61
+#: ../lib/WikiTheme.php:1038 ../lib/plugin/Diff.php:36
+#: ../themes/blog/themeinfo.php:68
 msgid "Diff"
 msgstr "Diff"
 
-#: ../lib/WikiTheme.php:1034 ../themes/Crao/templates/signin.tmpl:14
+#: ../lib/WikiTheme.php:1039 ../themes/Crao/templates/signin.tmpl:14
 #: ../themes/Crao/templates/signin.tmpl:30
 #: ../themes/Wordpress/templates/signin.tmpl:17
 #: ../themes/Wordpress/templates/signin.tmpl:33
@@ -1058,61 +1059,62 @@
 msgid "Sign Out"
 msgstr "Abmelden"
 
-#: ../lib/WikiTheme.php:1035 ../lib/WikiUser.php:228
-#: ../lib/WikiUserNew.php:504 ../themes/Crao/templates/signin.tmpl:53
+#: ../lib/WikiTheme.php:1040 ../lib/WikiUser.php:228
+#: ../lib/WikiUserNew.php:505 ../themes/Crao/templates/signin.tmpl:53
 #: ../themes/default/templates/login.tmpl:92
 #: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr "Anmelden"
 
-#: ../lib/WikiTheme.php:1036
+#: ../lib/WikiTheme.php:1041
 msgid "Rename Page"
 msgstr "Seite Umbenennen"
 
-#: ../lib/WikiTheme.php:1037 ../themes/MacOSX/themeinfo.php:133
+#: ../lib/WikiTheme.php:1042 ../themes/MacOSX/themeinfo.php:140
 msgid "Lock Page"
 msgstr "Seite Sperren"
 
-#: ../lib/WikiTheme.php:1038 ../themes/MacOSX/themeinfo.php:134
+#: ../lib/WikiTheme.php:1043 ../themes/MacOSX/themeinfo.php:141
 msgid "Unlock Page"
 msgstr "Seite Freigeben"
 
-#: ../lib/WikiTheme.php:1039 ../lib/removepage.php:22 ../lib/removepage.php:56
+#: ../lib/WikiTheme.php:1044 ../lib/removepage.php:22 ../lib/removepage.php:56
 msgid "Remove Page"
 msgstr "Seite Löschen"
 
-#: ../lib/WikiTheme.php:1040 ../lib/purgepage.php:22 ../lib/purgepage.php:56
+#: ../lib/WikiTheme.php:1045 ../lib/purgepage.php:22 ../lib/purgepage.php:56
 msgid "Purge Page"
 msgstr "Seiten endgültig löschen"
 
-#: ../lib/WikiTheme.php:1205
+#: ../lib/WikiTheme.php:1215
 msgid ""
 "Some action(page) wanted to add more headers, but they were already printed."
 msgstr ""
 
-#: ../lib/WikiTheme.php:1287 ../themes/Hawaiian/themeinfo.php:28
-#: ../themes/MacOSX/themeinfo.php:102 ../themes/MonoBook/themeinfo.php:128
-#: ../themes/Portland/themeinfo.php:58 ../themes/SpaceWiki/themeinfo.php:42
-#: ../themes/Wordpress/themeinfo.php:60 ../themes/shamino_com/themeinfo.php:54
-#: ../themes/wikilens/themeinfo.php:26
+#: ../lib/WikiTheme.php:1312 ../themes/Hawaiian/themeinfo.php:34
+#: ../themes/MacOSX/themeinfo.php:109 ../themes/MonoBook/themeinfo.php:135
+#: ../themes/Portland/themeinfo.php:65 ../themes/Sidebar/themeinfo.php:118
+#: ../themes/SpaceWiki/themeinfo.php:48 ../themes/Wordpress/themeinfo.php:67
+#: ../themes/shamino_com/themeinfo.php:61 ../themes/wikilens/themeinfo.php:33
 msgid "Printer"
 msgstr "Drucker"
 
-#: ../lib/WikiTheme.php:1288 ../themes/MacOSX/themeinfo.php:103
-#: ../themes/MonoBook/themeinfo.php:129 ../themes/shamino_com/themeinfo.php:55
-#: ../themes/wikilens/themeinfo.php:27
+#: ../lib/WikiTheme.php:1313 ../themes/MacOSX/themeinfo.php:110
+#: ../themes/MonoBook/themeinfo.php:136 ../themes/shamino_com/themeinfo.php:62
+#: ../themes/wikilens/themeinfo.php:34
 msgid "Top & bottom toolbars"
 msgstr "Obere u. untere Werkzeugleisten"
 
-#: ../lib/WikiTheme.php:1289 ../themes/Hawaiian/themeinfo.php:29
-#: ../themes/MonoBook/themeinfo.php:130 ../themes/Portland/themeinfo.php:59
-#: ../themes/SpaceWiki/themeinfo.php:43 ../themes/Wordpress/themeinfo.php:61
-#: ../themes/shamino_com/themeinfo.php:56 ../themes/wikilens/themeinfo.php:28
+#: ../lib/WikiTheme.php:1314 ../themes/Hawaiian/themeinfo.php:35
+#: ../themes/MonoBook/themeinfo.php:137 ../themes/Portland/themeinfo.php:66
+#: ../themes/Sidebar/themeinfo.php:119 ../themes/SpaceWiki/themeinfo.php:49
+#: ../themes/Wordpress/themeinfo.php:68 ../themes/shamino_com/themeinfo.php:63
+#: ../themes/wikilens/themeinfo.php:35
 msgid "Modern"
 msgstr "Modern"
 
-#: ../lib/WikiTheme.php:1456 ../lib/main.php:1120
-#: ../lib/plugin/RecentChanges.php:802 ../lib/plugin/TitleSearch.php:44
+#: ../lib/WikiTheme.php:1482 ../lib/main.php:1112
+#: ../lib/plugin/RecentChanges.php:809 ../lib/plugin/TitleSearch.php:44
 #: ../themes/Crao/templates/navbar.tmpl:5
 #: ../themes/Crao/templates/navbar.tmpl:9
 #: ../themes/Crao/templates/navbar.tmpl:52
@@ -1126,7 +1128,7 @@
 msgid "TitleSearch"
 msgstr "TitelSuche"
 
-#: ../lib/WikiTheme.php:1508 ../lib/WikiUser.php:478
+#: ../lib/WikiTheme.php:1537 ../lib/WikiUser.php:478
 #: ../lib/plugin/Calendar.php:41 ../lib/plugin/Calendar.php:45
 #: ../themes/Crao/templates/head.tmpl:90
 #: ../themes/Crao/templates/navbar.tmpl:29
@@ -1140,16 +1142,16 @@
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../lib/WikiTheme.php:1787
+#: ../lib/WikiTheme.php:1816
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Zusatzprogramm %s: undefiniert"
 
-#: ../lib/WikiTheme.php:1810
+#: ../lib/WikiTheme.php:1839
 msgid "Related Links"
 msgstr "Verwandte Links"
 
-#: ../lib/WikiTheme.php:1831
+#: ../lib/WikiTheme.php:1860
 msgid "External Links"
 msgstr "Externe Links"
 
@@ -1159,16 +1161,16 @@
 #: ../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:614
+#: ../lib/WikiUser/PearDb.php:117 ../lib/WikiUserNew.php:615
 msgid "Invalid username."
 msgstr "Ungültiger Benutzername."
 
-#: ../lib/WikiUser.php:199 ../lib/WikiUserNew.php:656
+#: ../lib/WikiUser.php:199 ../lib/WikiUserNew.php:657
 msgid "Invalid password or userid."
 msgstr "Ungültiges Passwort oder falscher Benutzername."
 
 # (wörtlich=unzureichende Erlaubnisse)
-#: ../lib/WikiUser.php:201 ../lib/WikiUserNew.php:672
+#: ../lib/WikiUser.php:201 ../lib/WikiUserNew.php:673
 msgid "Insufficient permissions."
 msgstr "Keine ausreichenden Zugangsrechte."
 
@@ -1316,29 +1318,29 @@
 msgid "Given password ignored."
 msgstr "Passwort ignoriert."
 
-#: ../lib/WikiUserNew.php:431
+#: ../lib/WikiUserNew.php:432
 msgid ""
 "Automatically created user homepage to be able to store UserPreferences."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:654
+#: ../lib/WikiUserNew.php:655
 msgid "Invalid password."
 msgstr "Ungültiges Passwort."
 
-#: ../lib/WikiUserNew.php:718
+#: ../lib/WikiUserNew.php:719
 msgid "Empty Preferences or format of UserPreferences cookie not recognised."
 msgstr ""
 "Leere BenutzerEinstellungen oder BenutzerEinstellungs Cookie nicht erkannt."
 
-#: ../lib/WikiUserNew.php:722
+#: ../lib/WikiUserNew.php:723
 msgid "Default preferences will be used."
 msgstr "Die Vorgabe Benutzereinstellungen werden verwendent."
 
-#: ../lib/WikiUserNew.php:1328
+#: ../lib/WikiUserNew.php:1293
 msgid "The length of the password is shorter than the system policy allows."
 msgstr "Die Länge des Passwortes ist kürzer als vom System gefordert."
 
-#: ../lib/WikiUserNew.php:1354
+#: ../lib/WikiUserNew.php:1319
 msgid ""
 "The length of the stored password is shorter than the system policy allows. "
 "Sorry, you cannot login.\n"
@@ -1348,11 +1350,11 @@
 "Sie können sich leider nicht anmelden.\n"
 " Sie müssen den System Administrator bitten, Ihr Passwort neu zu setzen."
 
-#: ../lib/WikiUserNew.php:1369
+#: ../lib/WikiUserNew.php:1334
 msgid "The crypt function is not available in this version of PHP."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1370
+#: ../lib/WikiUserNew.php:1335
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
@@ -1360,16 +1362,16 @@
 "Sie haben vergessen ENCRYPTED_PASSWD auf true zu setzen. Bitte aktualisieren "
 "Sie config/config.ini und überprüfen sie auch ADMIN_PASSWD."
 
-#: ../lib/WikiUserNew.php:1383
+#: ../lib/WikiUserNew.php:1348
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 "Sie haben vergessen ENCRYPTED_PASSWD auf true in config/config.ini zu setzen."
 
-#: ../lib/WikiUserNew.php:1796 ../lib/plugin/WikiAdminUtils.php:116
+#: ../lib/WikiUserNew.php:1770 ../lib/plugin/WikiAdminUtils.php:111
 msgid "Email Verification"
 msgstr "E-Mail Bestätigung"
 
-#: ../lib/WikiUserNew.php:1797
+#: ../lib/WikiUserNew.php:1771
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -1383,12 +1385,12 @@
 "versenden.\n"
 "Siehe %s"
 
-#: ../lib/WikiUserNew.php:1857
+#: ../lib/WikiUserNew.php:1842
 #, php-format
 msgid "E-Mail address '%s' is not properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1861
+#: ../lib/WikiUserNew.php:1846
 #, php-format
 msgid "E-Mail address '%s' is properly formatted"
 msgstr ""
@@ -1437,7 +1439,7 @@
 msgid "Warning: This Wikiwyg editor has only Beta quality!"
 msgstr ""
 
-#: ../lib/XmlElement.php:491 ../lib/stdlib.php:1531
+#: ../lib/XmlElement.php:491 ../lib/stdlib.php:1532
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr "Kann »%s« Typ-Formatzeichenketten nicht mit »%s« vermischen."
@@ -1446,18 +1448,18 @@
 msgid "xml-rpc change"
 msgstr ""
 
-#: ../lib/diff.php:258 ../lib/plugin/Diff.php:72
+#: ../lib/diff.php:258 ../lib/plugin/Diff.php:66
 #, php-format
 msgid "version %s"
 msgstr "Version %s"
 
-#: ../lib/diff.php:265 ../lib/plugin/Diff.php:77
+#: ../lib/diff.php:265 ../lib/plugin/Diff.php:71
 #: ../lib/wikilens/PageListColumns.php:357
 msgid "None"
 msgstr "Keine"
 
-#: ../lib/diff.php:288 ../lib/plugin/Diff.php:100
-#: ../lib/plugin/PageHistory.php:336 ../lib/plugin/PageInfo.php:59
+#: ../lib/diff.php:288 ../lib/plugin/Diff.php:94
+#: ../lib/plugin/PageHistory.php:329 ../lib/plugin/PageInfo.php:54
 #, php-format
 msgid "I'm sorry, there is no such page as %s."
 msgstr "Leider gibt es keine solche Seite %s."
@@ -1467,89 +1469,89 @@
 msgid "Diff: %s"
 msgstr "Vergleich von: %s"
 
-#: ../lib/diff.php:298 ../lib/diff.php:308 ../lib/plugin/Diff.php:108
-#: ../lib/plugin/Diff.php:118
+#: ../lib/diff.php:298 ../lib/diff.php:308 ../lib/plugin/Diff.php:102
+#: ../lib/plugin/Diff.php:112
 #, php-format
 msgid "version %d"
 msgstr "Version %d."
 
-#: ../lib/diff.php:302 ../lib/plugin/Diff.php:112
+#: ../lib/diff.php:302 ../lib/plugin/Diff.php:106
 msgid "current version"
 msgstr "aktuelle Version"
 
-#: ../lib/diff.php:319 ../lib/plugin/Diff.php:129
+#: ../lib/diff.php:319 ../lib/plugin/Diff.php:123
 msgid "revision by previous author"
 msgstr "Revidierte Ausgabe des vorigen Autors"
 
-#: ../lib/diff.php:325 ../lib/plugin/Diff.php:135
+#: ../lib/diff.php:325 ../lib/plugin/Diff.php:129
 msgid "previous revision"
 msgstr "vorige Neubearbeitung"
 
-#: ../lib/diff.php:335 ../lib/plugin/Diff.php:145
+#: ../lib/diff.php:335 ../lib/plugin/Diff.php:139
 msgid "predecessor to the previous major change"
 msgstr "Vorgänger zur vorherigen größeren Änderung"
 
 # word substitution order changes here
-#: ../lib/diff.php:346 ../lib/plugin/Diff.php:155
+#: ../lib/diff.php:346 ../lib/plugin/Diff.php:149
 #, php-format
 msgid "Differences between %s and %s of %s."
 msgstr "Zeilenweiser Vergleich von %3$s, von %1$s mit %2$s."
 
 # (Differences sind eigentlich= Unterschiede, Abweichungen)
 # (eigentlich=weitere Abweichungen, Veränderungen)
-#: ../lib/diff.php:349 ../lib/plugin/Diff.php:158
+#: ../lib/diff.php:349 ../lib/plugin/Diff.php:152
 msgid "Other diffs:"
 msgstr "Andere Vergleiche:"
 
-#: ../lib/diff.php:350 ../lib/plugin/Diff.php:159
+#: ../lib/diff.php:350 ../lib/plugin/Diff.php:153
 msgid "Previous Major Revision"
 msgstr "Vorige größere Neubearbeitung"
 
-#: ../lib/diff.php:351 ../lib/plugin/Diff.php:160
+#: ../lib/diff.php:351 ../lib/plugin/Diff.php:154
 msgid "Previous Revision"
 msgstr "Vorige Neubearbeitung"
 
-#: ../lib/diff.php:352 ../lib/plugin/Diff.php:161
+#: ../lib/diff.php:352 ../lib/plugin/Diff.php:155
 msgid "Previous Author"
 msgstr "Voriger Autor"
 
-#: ../lib/diff.php:368 ../lib/plugin/Diff.php:178
+#: ../lib/diff.php:368 ../lib/plugin/Diff.php:172
 msgid "Newer page:"
 msgstr "Neuere Seite:"
 
-#: ../lib/diff.php:370 ../lib/plugin/Diff.php:180
+#: ../lib/diff.php:370 ../lib/plugin/Diff.php:174
 msgid "Older page:"
 msgstr "Ältere Seite:"
 
-#: ../lib/diff.php:378 ../lib/plugin/Diff.php:188
+#: ../lib/diff.php:378 ../lib/plugin/Diff.php:182
 #, fuzzy
 msgid "Content of versions "
 msgstr "Speichere Version %d zurück."
 
-#: ../lib/diff.php:379 ../lib/plugin/Diff.php:189
+#: ../lib/diff.php:379 ../lib/plugin/Diff.php:183
 #, fuzzy
 msgid " and "
 msgstr "hinzufügen "
 
-#: ../lib/diff.php:379 ../lib/plugin/Diff.php:189
+#: ../lib/diff.php:379 ../lib/plugin/Diff.php:183
 #, fuzzy
 msgid " is identical."
 msgstr "Versionen sind identisch"
 
-#: ../lib/diff.php:384 ../lib/plugin/Diff.php:194
+#: ../lib/diff.php:384 ../lib/plugin/Diff.php:188
 #, fuzzy
 msgid "Version "
 msgstr "Version"
 
-#: ../lib/diff.php:385 ../lib/plugin/Diff.php:195
+#: ../lib/diff.php:385 ../lib/plugin/Diff.php:189
 msgid " was created because: "
 msgstr ""
 
-#: ../lib/display.php:54 ../lib/display.php:316
-#: ../lib/plugin/HelloWorld.php:70 ../lib/plugin/PageGroup.php:164
-#: ../lib/plugin/PageGroup.php:175 ../lib/plugin/PageGroup.php:191
-#: ../lib/plugin/PageGroup.php:198 ../lib/plugin/PageHistory.php:238
-#: ../lib/plugin/UnfoldSubpages.php:159 ../themes/Crao/templates/head.tmpl:47
+#: ../lib/display.php:55 ../lib/display.php:321
+#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:159
+#: ../lib/plugin/PageGroup.php:170 ../lib/plugin/PageGroup.php:186
+#: ../lib/plugin/PageGroup.php:193 ../lib/plugin/PageHistory.php:236
+#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:47
 #: ../themes/MonoBook/templates/logo.tmpl:5
 #: ../themes/Portland/templates/body.tmpl:9
 #: ../themes/Wordpress/templates/body.tmpl:15
@@ -1562,13 +1564,13 @@
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../lib/display.php:83 ../lib/display.php:184 ../lib/display.php:421
+#: ../lib/display.php:86 ../lib/display.php:187 ../lib/display.php:433
 #: ../lib/plugin/LinkDatabase.php:42
 msgid "LinkDatabase"
 msgstr "LinkDatenbank"
 
-#: ../lib/display.php:253 ../lib/display.php:260
-#: ../lib/plugin/BackLinks.php:31 ../lib/plugin/_WikiTranslation.php:53
+#: ../lib/display.php:258 ../lib/display.php:265
+#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/navbar.tmpl:18
 #: ../themes/blog/templates/navbar.tmpl:11
 #: ../themes/default/templates/navbar.tmpl:21
@@ -1577,19 +1579,19 @@
 msgid "BackLinks"
 msgstr "BackLinks"
 
-#: ../lib/display.php:256 ../lib/display.php:263
+#: ../lib/display.php:261 ../lib/display.php:268
 #, php-format
 msgid "BackLinks for %s"
 msgstr "BackLinks für %s"
 
 # versandet (=full of sand) ;)
 # weitergeleitet von
-#: ../lib/display.php:271
+#: ../lib/display.php:276
 #, php-format
 msgid "(Redirected from %s)"
 msgstr "(Weitergeleitet von %s)"
 
-#: ../lib/display.php:345 ../themes/Crao/templates/head.tmpl:70
+#: ../lib/display.php:351 ../themes/Crao/templates/head.tmpl:70
 #: ../themes/Crao/templates/head.tmpl:71
 #: ../themes/default/templates/head.tmpl:78
 #: ../themes/default/templates/head.tmpl:79
@@ -1697,7 +1699,7 @@
 msgid "Versions are identical"
 msgstr "Versionen sind identisch"
 
-#: ../lib/editpage.php:559 ../themes/MacOSX/themeinfo.php:135
+#: ../lib/editpage.php:559 ../themes/MacOSX/themeinfo.php:142
 msgid "Page Locked"
 msgstr "Seite Gesperrt"
 
@@ -1717,13 +1719,13 @@
 "(Kopieren Sie Ihre Veränderungen in die Zwischenablage. Sie können versuchen "
 "eine andere Seite zu edieren oder Ihr Text in einem Texteditor speichern.)"
 
-#: ../lib/editpage.php:570 ../lib/editpage.php:571 ../lib/main.php:786
-#: ../lib/main.php:1156 ../lib/plugin/ModeratedPage.php:42
-#: ../lib/plugin/ModeratedPage.php:150 ../lib/plugin/ModeratedPage.php:220
-#: ../lib/plugin/ModeratedPage.php:260 ../lib/plugin/ModeratedPage.php:263
-#: ../lib/plugin/ModeratedPage.php:265 ../lib/plugin/ModeratedPage.php:267
-#: ../lib/plugin/ModeratedPage.php:351 ../lib/plugin/ModeratedPage.php:355
-#: ../lib/plugin/ModeratedPage.php:410 ../lib/plugin/ModeratedPage.php:435
+#: ../lib/editpage.php:570 ../lib/editpage.php:571 ../lib/main.php:789
+#: ../lib/main.php:1148 ../lib/plugin/ModeratedPage.php:42
+#: ../lib/plugin/ModeratedPage.php:146 ../lib/plugin/ModeratedPage.php:216
+#: ../lib/plugin/ModeratedPage.php:256 ../lib/plugin/ModeratedPage.php:259
+#: ../lib/plugin/ModeratedPage.php:261 ../lib/plugin/ModeratedPage.php:263
+#: ../lib/plugin/ModeratedPage.php:347 ../lib/plugin/ModeratedPage.php:351
+#: ../lib/plugin/ModeratedPage.php:406 ../lib/plugin/ModeratedPage.php:431
 msgid "ModeratedPage"
 msgstr "ModerierteSeite"
 
@@ -1734,9 +1736,9 @@
 "moderators at the definition in %s"
 msgstr ""
 
-#: ../lib/editpage.php:573 ../lib/plugin/PasswordReset.php:159
-#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:127
-#: ../lib/plugin/WatchPage.php:147 ../themes/Crao/templates/head.tmpl:86
+#: ../lib/editpage.php:573 ../lib/plugin/PasswordReset.php:154
+#: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
+#: ../lib/plugin/WatchPage.php:142 ../themes/Crao/templates/head.tmpl:86
 #: ../themes/Crao/templates/head.tmpl:87
 #: ../themes/Crao/templates/navbar.tmpl:24
 #: ../themes/MonoBook/templates/signin.tmpl:11
@@ -1801,7 +1803,7 @@
 "überschrieben. Deshalb sind Ihre und die Änderungen des anderen Autors "
 "miteinander kombiniert worden. Das Ergebnis sehen Sie unten."
 
-#: ../lib/editpage.php:676 ../lib/plugin/HtmlConverter.php:71
+#: ../lib/editpage.php:676 ../lib/plugin/HtmlConverter.php:66
 msgid "Convert"
 msgstr "Konvertieren"
 
@@ -1809,8 +1811,8 @@
 msgid "Changes"
 msgstr "Änderungen"
 
-#: ../lib/editpage.php:720 ../lib/plugin/UpLoad.php:167
-#: ../lib/plugin/UpLoad.php:172 ../lib/plugin/WikiForm.php:107
+#: ../lib/editpage.php:720 ../lib/plugin/UpLoad.php:162
+#: ../lib/plugin/UpLoad.php:167 ../lib/plugin/WikiForm.php:101
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -1851,7 +1853,7 @@
 msgid "Upload File"
 msgstr "Datei Hochladen"
 
-#: ../lib/loadsave.php:76 ../lib/plugin/WikiForm.php:74
+#: ../lib/loadsave.php:76 ../lib/plugin/WikiForm.php:68
 msgid "Load File"
 msgstr "Datei Laden"
 
@@ -1921,7 +1923,7 @@
 msgid "Dumping Pages"
 msgstr "Die Seiten werden geschrieben"
 
-#: ../lib/loadsave.php:357 ../lib/loadsave.php:620 ../lib/stdlib.php:1028
+#: ../lib/loadsave.php:357 ../lib/loadsave.php:619 ../lib/stdlib.php:1029
 msgid "Skipped."
 msgstr "Ausgelassen."
 
@@ -1930,86 +1932,86 @@
 msgid "saved as %s"
 msgstr "gespeichert als %s"
 
-#: ../lib/loadsave.php:375 ../lib/loadsave.php:690
-#: ../lib/plugin/text2png.php:228
+#: ../lib/loadsave.php:375 ../lib/loadsave.php:689
+#: ../lib/plugin/text2png.php:223
 #, php-format
 msgid "couldn't open file '%s' for writing"
 msgstr "Datei »%s« konnte nicht zum Schreiben geöffnet werden"
 
-#: ../lib/loadsave.php:381 ../lib/loadsave.php:700
+#: ../lib/loadsave.php:381 ../lib/loadsave.php:699
 #, php-format
 msgid "%s bytes written"
 msgstr "%s Bytes geschrieben"
 
-#: ../lib/loadsave.php:674 ../lib/loadsave.php:753 ../lib/loadsave.php:788
-#: ../lib/loadsave.php:818
+#: ../lib/loadsave.php:673 ../lib/loadsave.php:750 ../lib/loadsave.php:785
+#: ../lib/loadsave.php:815
 #, php-format
 msgid "... copied to %s"
 msgstr "... kopiert nach %s"
 
-#: ../lib/loadsave.php:677 ../lib/loadsave.php:755 ../lib/loadsave.php:790
-#: ../lib/loadsave.php:820
+#: ../lib/loadsave.php:676 ../lib/loadsave.php:752 ../lib/loadsave.php:787
+#: ../lib/loadsave.php:817
 #, php-format
 msgid "... not copied to %s"
 msgstr "... nicht kopiert nach %s"
 
-#: ../lib/loadsave.php:698
+#: ../lib/loadsave.php:697
 msgid "saved as "
 msgstr "gespeichert als "
 
-#: ../lib/loadsave.php:763 ../lib/loadsave.php:798 ../lib/loadsave.php:829
+#: ../lib/loadsave.php:760 ../lib/loadsave.php:795 ../lib/loadsave.php:826
 msgid "... not found"
 msgstr "... nicht gefunden"
 
-#: ../lib/loadsave.php:892
+#: ../lib/loadsave.php:889
 msgid "Empty pagename!"
 msgstr "Leerer Seitenname!"
 
-#: ../lib/loadsave.php:902
+#: ../lib/loadsave.php:899
 msgid "Invalid pagename!"
 msgstr "Ungültiger Seitenname!"
 
-#: ../lib/loadsave.php:965
+#: ../lib/loadsave.php:962
 #, php-format
 msgid "from %s"
 msgstr "von %s"
 
-#: ../lib/loadsave.php:980
+#: ../lib/loadsave.php:977
 msgid "has edit conflicts - overwriting anyway"
 msgstr ""
 "hat unauflösbare Konflikte beim Speichern - wird ungeprüft überschrieben"
 
-#: ../lib/loadsave.php:989
+#: ../lib/loadsave.php:986
 msgid "keep old"
 msgstr ""
 
-#: ../lib/loadsave.php:991
+#: ../lib/loadsave.php:988
 msgid "has edit conflicts - skipped"
 msgstr "hat unauflösbare Konflikte beim Speichern - übersprungen"
 
-#: ../lib/loadsave.php:1003
+#: ../lib/loadsave.php:1000
 #, php-format
 msgid "content is identical to current version %d - no new revision created"
 msgstr ""
 "Inhalt ist identisch mit der aktuellen Version %d - keine neue Version "
 "erzeugt"
 
-#: ../lib/loadsave.php:1017
+#: ../lib/loadsave.php:1014
 #, php-format
 msgid "- saved to database as version %d"
 msgstr "- in der Datenbank gespeichert als Version %d."
 
-#: ../lib/loadsave.php:1023 ../lib/loadsave.php:1294
+#: ../lib/loadsave.php:1020 ../lib/loadsave.php:1291
 #, php-format
 msgid "MIME file %s"
 msgstr "MIME-Datei %s"
 
-#: ../lib/loadsave.php:1024 ../lib/loadsave.php:1305
+#: ../lib/loadsave.php:1021 ../lib/loadsave.php:1302
 #, php-format
 msgid "Serialized file %s"
 msgstr "Serialisierte Datei %s"
 
-#: ../lib/loadsave.php:1025 ../lib/loadsave.php:1327
+#: ../lib/loadsave.php:1022 ../lib/loadsave.php:1324
 #, php-format
 msgid "plain file %s"
 msgstr "Nur-Text-Datei %s"
@@ -2017,24 +2019,24 @@
 # This translation gives the general idea of the action to be performed, 
 # but the text must be brief enough to fit inside a button:
 # "widersprechende Änderungen Zusammenfügen und die ergebende Seite Bearbeiten"
-#: ../lib/loadsave.php:1032 ../lib/plugin/SyncWiki.php:271
+#: ../lib/loadsave.php:1029 ../lib/plugin/SyncWiki.php:266
 msgid "Merge Edit"
 msgstr "Zusammenfügen Bearbeiten"
 
-#: ../lib/loadsave.php:1038
+#: ../lib/loadsave.php:1035
 msgid "Restore Anyway"
 msgstr "Ungeprüft überschreiben"
 
-#: ../lib/loadsave.php:1046
+#: ../lib/loadsave.php:1043
 msgid "Overwrite All"
 msgstr ""
 
-#: ../lib/loadsave.php:1053
+#: ../lib/loadsave.php:1050
 msgid " Sorry, cannot merge."
 msgstr " Konnte leider nicht automatisch einpflegen."
 
-#: ../lib/loadsave.php:1073 ../lib/loadsave.php:1083 ../lib/loadsave.php:1090
-#: ../lib/loadsave.php:1097 ../themes/MonoBook/templates/actionbar.tmpl:73
+#: ../lib/loadsave.php:1070 ../lib/loadsave.php:1080 ../lib/loadsave.php:1087
+#: ../lib/loadsave.php:1094 ../themes/MonoBook/templates/actionbar.tmpl:73
 #: ../themes/Sidebar/templates/actionbar.tmpl:47
 #: ../themes/Wordpress/templates/actionbar.tmpl:60
 #: ../themes/default/templates/actionbar.tmpl:31
@@ -2044,360 +2046,360 @@
 msgid "Revert"
 msgstr "Zurückspeichern"
 
-#: ../lib/loadsave.php:1074
+#: ../lib/loadsave.php:1071
 msgid "missing required version argument"
 msgstr "Parameter version muß angegeben werden"
 
-#: ../lib/loadsave.php:1082
+#: ../lib/loadsave.php:1079
 msgid "no page content"
 msgstr "leerer Seiteninalt"
 
-#: ../lib/loadsave.php:1089
+#: ../lib/loadsave.php:1086
 msgid "same version page"
 msgstr "selbe Version der Seite"
 
-#: ../lib/loadsave.php:1096
+#: ../lib/loadsave.php:1093
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: ../lib/loadsave.php:1108 ../lib/plugin/PasswordReset.php:107
-#: ../lib/plugin/PasswordReset.php:150 ../lib/plugin/UserPreferences.php:126
-#: ../lib/plugin/WatchPage.php:88 ../lib/plugin/WikiAdminChmod.php:147
-#: ../lib/plugin/WikiAdminChown.php:175 ../lib/plugin/WikiAdminMarkup.php:167
-#: ../lib/plugin/WikiAdminPurge.php:147 ../lib/plugin/WikiAdminRemove.php:201
-#: ../lib/plugin/WikiAdminRename.php:213
-#: ../lib/plugin/WikiAdminSearchReplace.php:193
-#: ../lib/plugin/WikiAdminSetAcl.php:204
+#: ../lib/loadsave.php:1105 ../lib/plugin/PasswordReset.php:102
+#: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/UserPreferences.php:121
+#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:142
+#: ../lib/plugin/WikiAdminChown.php:170 ../lib/plugin/WikiAdminMarkup.php:162
+#: ../lib/plugin/WikiAdminPurge.php:142 ../lib/plugin/WikiAdminRemove.php:196
+#: ../lib/plugin/WikiAdminRename.php:208
+#: ../lib/plugin/WikiAdminSearchReplace.php:188
+#: ../lib/plugin/WikiAdminSetAcl.php:199
 #: ../themes/default/templates/info.tmpl:134
 msgid "Yes"
 msgstr "Ja"
 
-#: ../lib/loadsave.php:1110 ../lib/plugin/PasswordReset.php:110
-#: ../lib/plugin/PasswordReset.php:153 ../lib/plugin/TranslateText.php:118
-#: ../lib/plugin/UserPreferences.php:128 ../lib/plugin/WatchPage.php:90
-#: ../lib/plugin/WatchPage.php:95 ../lib/plugin/WikiAdminChmod.php:160
-#: ../lib/plugin/WikiAdminChown.php:188 ../lib/plugin/WikiAdminMarkup.php:180
-#: ../lib/plugin/WikiAdminPurge.php:157 ../lib/plugin/WikiAdminRemove.php:223
-#: ../lib/plugin/WikiAdminRename.php:236
-#: ../lib/plugin/WikiAdminSearchReplace.php:205
-#: ../lib/plugin/WikiAdminSelect.php:153 ../lib/plugin/WikiAdminSetAcl.php:217
-#: ../lib/plugin/WikiAdminSetExternal.php:134
-#: ../lib/plugin/WikiAdminUtils.php:296 ../lib/plugin/WikiFormRich.php:310
-#: ../lib/purgepage.php:23 ../lib/removepage.php:23 ../lib/upgrade.php:801
+#: ../lib/loadsave.php:1107 ../lib/plugin/PasswordReset.php:105
+#: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
+#: ../lib/plugin/UserPreferences.php:123 ../lib/plugin/WatchPage.php:85
+#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:155
+#: ../lib/plugin/WikiAdminChown.php:183 ../lib/plugin/WikiAdminMarkup.php:175
+#: ../lib/plugin/WikiAdminPurge.php:152 ../lib/plugin/WikiAdminRemove.php:218
+#: ../lib/plugin/WikiAdminRename.php:231
+#: ../lib/plugin/WikiAdminSearchReplace.php:200
+#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:212
+#: ../lib/plugin/WikiAdminSetExternal.php:129
+#: ../lib/plugin/WikiAdminUtils.php:291 ../lib/plugin/WikiFormRich.php:306
+#: ../lib/purgepage.php:23 ../lib/removepage.php:23 ../lib/upgrade.php:790
 #: ../themes/default/templates/login.tmpl:94
 #: ../themes/default/templates/userprefs.tmpl:278
 #: ../themes/gforge/templates/userprefs.tmpl:369
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../lib/loadsave.php:1124
+#: ../lib/loadsave.php:1121
 #, php-format
 msgid "revert to version %d"
 msgstr "Speichere Version %d zurück."
 
-#: ../lib/loadsave.php:1130
+#: ../lib/loadsave.php:1127
 #, php-format
 msgid "Revert: %s"
 msgstr "Zurückspeichern: %s"
 
-#: ../lib/loadsave.php:1131
+#: ../lib/loadsave.php:1128
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr "- version %d in der Datenbank gespeichert als Version %d."
 
-#: ../lib/loadsave.php:1159
+#: ../lib/loadsave.php:1156
 msgid "Default InterWiki map file not loaded."
 msgstr "Standard-Datei der InterWikiListe nicht geladen."
 
-#: ../lib/loadsave.php:1342 ../lib/loadsave.php:1355
+#: ../lib/loadsave.php:1339 ../lib/loadsave.php:1352
 msgid "Skipping"
 msgstr "Übersprungen"
 
-#: ../lib/loadsave.php:1456
+#: ../lib/loadsave.php:1453
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1463
+#: ../lib/loadsave.php:1460
 #, php-format
 msgid "Bad file type: %s"
 msgstr "Ungültiger Dateityp: %s"
 
-#: ../lib/loadsave.php:1480
+#: ../lib/loadsave.php:1477
 #, php-format
 msgid "Loading '%s'"
 msgstr "»%s« wird geladen"
 
-#: ../lib/loadsave.php:1515
+#: ../lib/loadsave.php:1512
 msgid "Loading up virgin wiki"
 msgstr "Lade neue Seiten in das frische Wiki"
 
-#: ../lib/loadsave.php:1571
+#: ../lib/loadsave.php:1568
 msgid "No uploaded file to upload?"
 msgstr "Keine Datei zum Hochladen?"
 
-#: ../lib/loadsave.php:1574
+#: ../lib/loadsave.php:1571
 #, php-format
 msgid "Uploading %s"
 msgstr "%s wird hochgeladen"
 
-#: ../lib/main.php:469
+#: ../lib/main.php:472
 msgid "FORBIDDEN"
 msgstr "VERBOTEN"
 
-#: ../lib/main.php:470 ../lib/main.php:480
+#: ../lib/main.php:473 ../lib/main.php:483
 msgid "ANON"
 msgstr "ANON"
 
-#: ../lib/main.php:471
+#: ../lib/main.php:474
 msgid "BOGO"
 msgstr "BOGO"
 
-#: ../lib/main.php:472
+#: ../lib/main.php:475
 msgid "USER"
 msgstr "BENUTZER"
 
-#: ../lib/main.php:473
+#: ../lib/main.php:476
 msgid "ADMIN"
 msgstr "ADMIN"
 
-#: ../lib/main.php:474
+#: ../lib/main.php:477
 msgid "UNOBTAINABLE"
 msgstr "UNERREICHBAR"
 
-#: ../lib/main.php:502 ../lib/main.php:521
+#: ../lib/main.php:505 ../lib/main.php:524
 #, php-format
 msgid "%s is disallowed on this wiki."
 msgstr "»%s« ist auf diesem Wiki nicht zugelassen."
 
-#: ../lib/main.php:510
+#: ../lib/main.php:513
 msgid "authenticated"
 msgstr "authentifizierten"
 
-#: ../lib/main.php:510
+#: ../lib/main.php:513
 msgid "not authenticated"
 msgstr "nicht authentifizierten"
 
-#: ../lib/main.php:512
+#: ../lib/main.php:515
 msgid "Missing PagePermission:"
 msgstr "Fehlende Zugriffsberechtigung:"
 
 # Missing PagePermission:| access | pagename
-#: ../lib/main.php:511
+#: ../lib/main.php:514
 #, php-format
 msgid "%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."
 msgstr ""
 "%s %s »%s« ist auf diesem Wiki für %s Benutzer »%s« (Level: %s) nicht "
 "zugelassen."
 
-#: ../lib/main.php:529
+#: ../lib/main.php:532
 #, php-format
 msgid "You must sign in to %s."
 msgstr "Sie müssen sich anmelden %s."
 
-#: ../lib/main.php:539
+#: ../lib/main.php:542
 #, php-format
 msgid "Access for you is forbidden to %s."
 msgstr ""
 
-#: ../lib/main.php:541 ../lib/plugin/PluginManager.php:65
+#: ../lib/main.php:544 ../lib/plugin/PluginManager.php:58
 #, php-format
 msgid "You must be an administrator to %s."
 msgstr "Sie müssen Administratorrechte haben %s."
 
-#: ../lib/main.php:555
+#: ../lib/main.php:558
 msgid "view this page"
 msgstr "um diese Seite anzuzeigen"
 
-#: ../lib/main.php:556
+#: ../lib/main.php:559
 msgid "diff this page"
 msgstr "um von dieser Seite die Änderungen anzuzeigen"
 
-#: ../lib/main.php:557
+#: ../lib/main.php:560
 msgid "dump html pages"
 msgstr "um von diesem Wiki HTML-Dateien lokal abzuspeichern"
 
-#: ../lib/main.php:558
+#: ../lib/main.php:561
 msgid "dump serial pages"
 msgstr "um von diesem Wiki die Seiten lokal abzuspeichern"
 
-#: ../lib/main.php:559
+#: ../lib/main.php:562
 msgid "edit this page"
 msgstr "um diese Seite zu bearbeiten"
 
-#: ../lib/main.php:560
+#: ../lib/main.php:563
 msgid "rename this page"
 msgstr "um diese Seite umzubennen"
 
-#: ../lib/main.php:561
+#: ../lib/main.php:564
 msgid "revert to a previous version of this page"
 msgstr "Zurückspeichern einer älteren Version dieser Seite."
 
-#: ../lib/main.php:562
+#: ../lib/main.php:565
 msgid "create this page"
 msgstr "um diese Seite zu erzeugen"
 
-#: ../lib/main.php:563
+#: ../lib/main.php:566
 msgid "load files into this wiki"
 msgstr "um Seiten in dieses Wiki zu laden"
 
-#: ../lib/main.php:564
+#: ../lib/main.php:567
 msgid "lock this page"
 msgstr "um diese Seite zu sperren"
 
-#: ../lib/main.php:565
+#: ../lib/main.php:568
 msgid "purge this page"
 msgstr "um diese Seite endgültig zu löschen"
 
-#: ../lib/main.php:566
+#: ../lib/main.php:569
 msgid "remove this page"
 msgstr "um diese Seite zu löschen"
 
-#: ../lib/main.php:567
+#: ../lib/main.php:570
 msgid "unlock this page"
 msgstr "um diese Seite zu entsperren"
 
-#: ../lib/main.php:568
+#: ../lib/main.php:571
 msgid "upload a zip dump"
 msgstr "um einen ZIP-Speicherauszug in dieses Wiki zu laden"
 
 # (verify=verwirklichen, in die Tat umsetzen, durch- oder ausführen)
-#: ../lib/main.php:569
+#: ../lib/main.php:572
 msgid "verify the current action"
 msgstr "um die gegenwärtige Aktion durchzuführen"
 
-#: ../lib/main.php:570
+#: ../lib/main.php:573
 msgid "view the source of this page"
 msgstr "um den Quelltext dieser Seiten anzusehen"
 
-#: ../lib/main.php:571
+#: ../lib/main.php:574
 msgid "access this wiki via XML-RPC"
 msgstr "um via XML-RPC auf dieses Wiki zuzugreifen"
 
-#: ../lib/main.php:572
+#: ../lib/main.php:575
 msgid "access this wiki via SOAP"
 msgstr "um via SOAP auf dieses Wiki zuzugreifen"
 
-#: ../lib/main.php:573
+#: ../lib/main.php:576
 msgid "download a zip dump from this wiki"
 msgstr "um eine gezippte Sicherung von allen Wiki Seiten herunterzuladen"
 
-#: ../lib/main.php:574
+#: ../lib/main.php:577
 msgid "download a html zip dump from this wiki"
 msgstr "um alle HTML Seiten als Zipdatei von diesem Wiki herunterzuladen"
 
-#: ../lib/main.php:580
+#: ../lib/main.php:583
 msgid "use"
 msgstr "benutze"
 
-#: ../lib/main.php:598
+#: ../lib/main.php:601
 msgid "Browsing pages"
 msgstr "Das Durchblättern der Seiten dieses Wikis"
 
-#: ../lib/main.php:599
+#: ../lib/main.php:602
 msgid "Diffing pages"
 msgstr "Die Inhalts-Differenz-Seiten dieses Wikis"
 
-#: ../lib/main.php:600
+#: ../lib/main.php:603
 msgid "Dumping html pages"
 msgstr "Die Speicherung von Wiki Seiten als HTML-Dateien"
 
-#: ../lib/main.php:601
+#: ../lib/main.php:604
 msgid "Dumping serial pages"
 msgstr "Die Speicherung von Wiki Seiten als Dateien"
 
-#: ../lib/main.php:602
+#: ../lib/main.php:605
 msgid "Editing pages"
 msgstr "Ändern in diesem Wiki"
 
-#: ../lib/main.php:603
+#: ../lib/main.php:606
 msgid "Reverting to a previous version of pages"
 msgstr "Zurückspeichern einer älteren Version"
 
-#: ../lib/main.php:604
+#: ../lib/main.php:607
 msgid "Creating pages"
 msgstr "Neue Seiten erzeugen"
 
-#: ../lib/main.php:605
+#: ../lib/main.php:608
 msgid "Loading files"
 msgstr "Dateien hinaufladen"
 
-#: ../lib/main.php:606
+#: ../lib/main.php:609
 msgid "Locking pages"
 msgstr "Seiten sperren"
 
-#: ../lib/main.php:607
+#: ../lib/main.php:610
 msgid "Purging pages"
 msgstr "Das Durchblättern der Seiten dieses Wikis"
 
-#: ../lib/main.php:608
+#: ../lib/main.php:611
 msgid...
 
[truncated message content]