phpwiki-checkins Mailing List for PhpWiki (Page 125)

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

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

You can subscribe to this list here.

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

Flat | Threaded

<< < 1 .. 123 124 125 126 127 .. 538 > >> (Page 125 of 538)

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

From: <var...@us...> - 2011-06-01 12:33:32

Revision: 8090
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8090&view=rev
Author:   vargenau
Date:     2011-06-01 12:33:26 +0000 (Wed, 01 Jun 2011)

Log Message:
-----------
In AllPages, include_empty is false by default

Modified Paths:
--------------
    trunk/lib/plugin/AllPages.php
    trunk/pgsrc/Help%2FAllPagesPlugin

Modified: trunk/lib/plugin/AllPages.php
===================================================================
--- trunk/lib/plugin/AllPages.php	2011-06-01 12:21:26 UTC (rev 8089)
+++ trunk/lib/plugin/AllPages.php	2011-06-01 12:33:26 UTC (rev 8090)
@@ -44,8 +44,7 @@
              PageList::supportedArgs(),
              array(
                    'noheader'      => false,
-                   'include_empty' => true, // is faster
-                   //'pages'         => false, // DONT, this would be ListPages then.
+                   'include_empty' => false,
                    'info'          => '',
                    'debug'         => false,
                    'userpages'     => false

Modified: trunk/pgsrc/Help%2FAllPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FAllPagesPlugin	2011-06-01 12:21:26 UTC (rev 8089)
+++ trunk/pgsrc/Help%2FAllPagesPlugin	2011-06-01 12:33:26 UTC (rev 8090)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Wed,  1 Jun 2011 14:29:50 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -26,11 +26,11 @@
 ! Default value
 |-
 | **noheader**
-| Boolean header should be omitted.
+| Boolean. If true, header should be omitted.
 | false
 |-
 | **include_empty**
-| Boolean
+| Boolean. If true, pages that are referenced but not yet created are included in the list.
 | false
 |-
 | **info**


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8089] trunk/lib/WikiDB.php

From: <var...@us...> - 2011-06-01 12:21:32

Revision: 8089
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8089&view=rev
Author:   vargenau
Date:     2011-06-01 12:21:26 +0000 (Wed, 01 Jun 2011)

Log Message:
-----------
This is not an error if include_empty=1 in AllPages

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

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2011-06-01 12:17:46 UTC (rev 8088)
+++ trunk/lib/WikiDB.php	2011-06-01 12:21:26 UTC (rev 8089)
@@ -1826,6 +1826,13 @@
             trigger_error("WikiDB_PageIterator->next pagename", E_USER_WARNING);
         }
 
+        if (!$pagename) {
+            if (isset($next['linkrelation'])
+              or isset($next['pagedata']['linkrelation'])) {
+                return false;
+            }
+        }
+
         // There's always hits, but we cache only if more
         // (well not with file, cvs and dba)
         if (isset($next['pagedata']) and count($next['pagedata']) > 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:[8088] trunk/lib/WikiDB.php

From: <var...@us...> - 2011-06-01 12:17:52

Revision: 8088
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8088&view=rev
Author:   vargenau
Date:     2011-06-01 12:17:46 +0000 (Wed, 01 Jun 2011)

Log Message:
-----------
This is not an error if include_empty=1 in AllPages

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

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2011-05-20 14:29:42 UTC (rev 8087)
+++ trunk/lib/WikiDB.php	2011-06-01 12:17:46 UTC (rev 8088)
@@ -1817,24 +1817,15 @@
      * @return WikiDB_Page The next WikiDB_Page in the sequence.
      */
     function next () {
-        if ( ! ($next = $this->_iter->next()) )
+        if ( ! ($next = $this->_iter->next()) ) {
             return false;
+        }
 
         $pagename = &$next['pagename'];
-    if (!is_string($pagename)) { // Bug #1327912 fixed by Joachim Lous
-        /*if (is_array($pagename) && isset($pagename['linkto'])) {
-        $pagename = $pagename['linkto'];
-        }
-            $pagename = strval($pagename);*/
+        if (!is_string($pagename)) { // Bug #1327912 fixed by Joachim Lous
             trigger_error("WikiDB_PageIterator->next pagename", E_USER_WARNING);
-    }
-        if (!$pagename) {
-            if (isset($next['linkrelation'])
-                or isset($next['pagedata']['linkrelation'])) return false;
-            trigger_error('empty pagename in WikiDB_PageIterator::next()', E_USER_WARNING);
-            var_dump($next);
-            return false;
         }
+
         // There's always hits, but we cache only if more
         // (well not with file, cvs and dba)
         if (isset($next['pagedata']) and count($next['pagedata']) > 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:[8087] trunk/g

From: <var...@us...> - 2011-05-20 14:29:48

Revision: 8087
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8087&view=rev
Author:   vargenau
Date:     2011-05-20 14:29:42 +0000 (Fri, 20 May 2011)

Log Message:
-----------
noindex,nofollow by default

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

Modified: trunk/g
===================================================================
--- trunk/g	2011-05-20 12:58:49 UTC (rev 8086)
+++ trunk/g	2011-05-20 14:29:42 UTC (rev 8087)
@@ -57,6 +57,10 @@
     exit_disabled('home');
 } else {
 
+    global $robots;
+
+    $robots = "noindex,nofollow";
+
     $group_name = $project->getUnixName();
     $group_public_name = $project->getPublicName();
 


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8086] trunk/lib/display.php

From: <var...@us...> - 2011-05-20 12:58:55

Revision: 8086
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8086&view=rev
Author:   vargenau
Date:     2011-05-20 12:58:49 +0000 (Fri, 20 May 2011)

Log Message:
-----------
Revert

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

Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2011-05-20 10:53:54 UTC (rev 8085)
+++ trunk/lib/display.php	2011-05-20 12:58:49 UTC (rev 8086)
@@ -220,14 +220,8 @@
     global $robots;
     $pagename = $request->getArg('pagename');
     $version = $request->getArg('version');
-    $action = $request->getArg('action');
     $page = $request->getPage();
 
-    /* Tell Google (and others) to ignore e.g. MyPage?action=diff */
-    if ($action) {
-        $robots = "noindex,nofollow";
-        $toks['ROBOTS_META'] = $robots;
-    }
     if ($version) {
         $revision = $page->getRevision($version);
         if (!$revision)


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8085] trunk/lib/diff.php

From: <var...@us...> - 2011-05-20 10:54:00

Revision: 8085
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8085&view=rev
Author:   vargenau
Date:     2011-05-20 10:53:54 +0000 (Fri, 20 May 2011)

Log Message:
-----------
Must use single quote for string because of $ in "%1$s"

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

Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php	2011-05-20 10:40:59 UTC (rev 8084)
+++ trunk/lib/diff.php	2011-05-20 10:53:54 UTC (rev 8085)
@@ -317,14 +317,14 @@
 
         if ($diff->isEmpty()) {
             $html->pushContent(HTML::hr(),
-                               HTML::p(sprintf(_("Content of versions %1$s and %2$s is identical."),
+                               HTML::p(sprintf(_('Content of versions %1$s and %2$s is identical.'),
                                                $old->getVersion(),
                                                $new->getVersion())));
             // If two consecutive versions have the same content, it is because the page was
             // renamed, or metadata changed: ACL, owner, markup.
             // We give the reason by printing the summary.
             if (($new->getVersion() - $old->getVersion()) == 1) {
-                $html->pushContent(HTML::p(sprintf(_("Version %1$s was created because: %2$s"),
+                $html->pushContent(HTML::p(sprintf(_('Version %1$s was created because: %2$s'),
                                                    $new->getVersion(),
                                                    $new->get('summary'))));
             }


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8084] trunk/lib/display.php

From: <var...@us...> - 2011-05-20 10:41:06

Revision: 8084
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8084&view=rev
Author:   vargenau
Date:     2011-05-20 10:40:59 +0000 (Fri, 20 May 2011)

Log Message:
-----------
Tell Google (and others) to ignore e.g. MyPage?action=diff

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

Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2011-05-20 09:29:40 UTC (rev 8083)
+++ trunk/lib/display.php	2011-05-20 10:40:59 UTC (rev 8084)
@@ -220,7 +220,14 @@
     global $robots;
     $pagename = $request->getArg('pagename');
     $version = $request->getArg('version');
+    $action = $request->getArg('action');
     $page = $request->getPage();
+
+    /* Tell Google (and others) to ignore e.g. MyPage?action=diff */
+    if ($action) {
+        $robots = "noindex,nofollow";
+        $toks['ROBOTS_META'] = $robots;
+    }
     if ($version) {
         $revision = $page->getRevision($version);
         if (!$revision)


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8083] trunk/lib/display.php

From: <var...@us...> - 2011-05-20 09:29:46

Revision: 8083
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8083&view=rev
Author:   vargenau
Date:     2011-05-20 09:29:40 +0000 (Fri, 20 May 2011)

Log Message:
-----------
Fix whitespace

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

Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2011-05-20 09:06:15 UTC (rev 8082)
+++ trunk/lib/display.php	2011-05-20 09:29:40 UTC (rev 8083)
@@ -84,13 +84,13 @@
 
     $transformedContent = $actionrev->getTransformedContent();
 
-   /* Optionally tell google (and others) not to take notice of action pages.
-      RecentChanges or AllPages might be an exception.
-   */
+    /* Optionally tell google (and others) not to take notice of action pages.
+       RecentChanges or AllPages might be an exception.
+    */
     $args = array();
     if (GOOGLE_LINKS_NOFOLLOW) {
         $robots = "noindex,nofollow";
-    $args = array('ROBOTS_META' => $robots);
+        $args = array('ROBOTS_META' => $robots);
     }
 
     /* Handle other formats: So far we had html only.
@@ -104,79 +104,79 @@
     /* At first the single page formats: html, xml */
     if ($pagename == _("LinkDatabase")) {
         $template = Template('browse', array('CONTENT' => $transformedContent));
-    GeneratePage($template, $pagetitle, $revision, $args);
+        GeneratePage($template, $pagetitle, $revision, $args);
     } elseif (!$format or $format == 'html' or $format == 'sidebar' or $format == 'contribs') {
-    $template = Template('browse', array('CONTENT' => $transformedContent));
-    GeneratePage($template, $pagetitle, $revision, $args);
+        $template = Template('browse', array('CONTENT' => $transformedContent));
+        GeneratePage($template, $pagetitle, $revision, $args);
     } elseif ($format == 'xml') {
         $request->setArg('format','');
-    $template = new Template('browse', $request,
+        $template = new Template('browse', $request,
                                  array('revision' => $revision,
                                        'CONTENT'  => $transformedContent,
                        ));
-    $html = GeneratePageAsXML($template, $pagename, $revision /*,
+        $html = GeneratePageAsXML($template, $pagename, $revision /*,
                   array('VALID_LINKS' => $args['VALID_LINKS'])*/);
-    header("Content-Type: application/xhtml+xml; charset=" . $GLOBALS['charset']);
-    echo $html;
+        header("Content-Type: application/xhtml+xml; charset=" . $GLOBALS['charset']);
+        echo $html;
     } else {
         $pagelist = null;
         require_once('lib/WikiPlugin.php');
-    // Then the multi-page formats
-    // rss (if not already handled by RecentChanges)
-    // Need the pagelist from the first plugin
-    foreach($transformedContent->_content as $cached_element) {
-        if (is_a($cached_element, "Cached_PluginInvocation")) {
-            $loader = new WikiPluginLoader;
-            $markup = null;
-            // return the first found pagelist
-            $pagelist = $loader->expandPI($cached_element->_pi, $request,
-                                          $markup, $pagename);
-            if (is_a($pagelist, 'PageList'))
-                break;
+        // Then the multi-page formats
+        // rss (if not already handled by RecentChanges)
+        // Need the pagelist from the first plugin
+        foreach($transformedContent->_content as $cached_element) {
+            if (is_a($cached_element, "Cached_PluginInvocation")) {
+                $loader = new WikiPluginLoader;
+                $markup = null;
+                // return the first found pagelist
+                $pagelist = $loader->expandPI($cached_element->_pi, $request,
+                                              $markup, $pagename);
+                if (is_a($pagelist, 'PageList'))
+                    break;
+            }
         }
-    }
         if (!$pagelist or !is_a($pagelist, 'PageList')) {
-        if (!in_array($format, array("rss91","rss2","rss","atom","rdf")))
-        trigger_error(sprintf("Format %s requires an actionpage returning a pagelist.",
+            if (!in_array($format, array("rss91","rss2","rss","atom","rdf")))
+            trigger_error(sprintf("Format %s requires an actionpage returning a pagelist.",
                       $format)
                   ."\n".("Fall back to single page mode"), E_USER_WARNING);
-        require_once('lib/PageList.php');
-        $pagelist = new PageList();
-        if ($format == 'pdf')
-            $pagelist->addPage($page);
-    } else {
+            require_once('lib/PageList.php');
+            $pagelist = new PageList();
+            if ($format == 'pdf')
+                $pagelist->addPage($page);
+        } else {
             foreach ($pagelist->_pages as $page) {
                 $name = $page->getName();
                 if ($name != $pagename and $page->exists())
                     $args['VALID_LINKS'][] = $name;
             }
-    }
-    if ($format == 'pdf') {
-        require_once("lib/pdf.php");
-        array_unshift($args['VALID_LINKS'], $pagename);
-        ConvertAndDisplayPdfPageList($request, $pagelist, $args);
-    }
-    elseif ($format == 'ziphtml') { // need to fix links
-        require_once('lib/loadsave.php');
-        array_unshift($args['VALID_LINKS'], $pagename);
-        $request->setArg('zipname', FilenameForPage($pagename).".zip");
-        $request->setArg('pages', $args['VALID_LINKS']);
-        $request->setArg('format','');
-        MakeWikiZipHtml($request);
-    } // time-sorted RDF á la RecentChanges
-    elseif (in_array($format, array("rss91","rss2","rss","atom"))) {
+        }
+        if ($format == 'pdf') {
+            require_once("lib/pdf.php");
+            array_unshift($args['VALID_LINKS'], $pagename);
+            ConvertAndDisplayPdfPageList($request, $pagelist, $args);
+        }
+        elseif ($format == 'ziphtml') { // need to fix links
+            require_once('lib/loadsave.php');
+            array_unshift($args['VALID_LINKS'], $pagename);
+            $request->setArg('zipname', FilenameForPage($pagename).".zip");
+            $request->setArg('pages', $args['VALID_LINKS']);
+            $request->setArg('format','');
+            MakeWikiZipHtml($request);
+        } // time-sorted RDF à la RecentChanges
+        elseif (in_array($format, array("rss91","rss2","rss","atom"))) {
             $args = $request->getArgs();
             //$request->setArg('format','');
             if ($pagename == _("RecentChanges")) {
                 $template->printExpansion($args);
-        } else {
-            require_once("lib/plugin/RecentChanges.php");
-            $plugin = new WikiPlugin_RecentChanges();
+            } else {
+                require_once("lib/plugin/RecentChanges.php");
+                $plugin = new WikiPlugin_RecentChanges();
                 return $plugin->format($plugin->getChanges($request->_dbi, $args), $args);
-        }
-    } elseif ($format == 'json') { // for faster autocompletion on searches
-        $req_args =& $request->args;
-        unset($req_args['format']);
+            }
+        } elseif ($format == 'json') { // for faster autocompletion on searches
+            $req_args =& $request->args;
+            unset($req_args['format']);
             $json = array('count' => count($pagelist->_pages),
                           'list'  => $args['VALID_LINKS'],
                           'args'  => $req_args,
@@ -190,26 +190,26 @@
             }
             header("Content-Type: application/json");
             die($json_enc);
-    } elseif ($format == 'rdf') { // all semantic relations and attributes
-        require_once("lib/SemanticWeb.php");
-        $rdf = new RdfWriter($request, $pagelist);
-        $rdf->format();
-    } elseif ($format == 'rdfs') {
-        require_once("lib/SemanticWeb.php");
-        $rdf = new RdfsWriter($request, $pagelist);
-        $rdf->format();
-    } elseif ($format == 'owl') { // or daml?
-        require_once("lib/SemanticWeb.php");
-        $rdf = new OwlWriter($request, $pagelist);
-        $rdf->format();
-    } else {
-        if (!in_array($pagename, array(_("LinkDatabase"))))
-        trigger_error(sprintf(_("Unsupported argument: %s=%s"),"format",$format),
+        } elseif ($format == 'rdf') { // all semantic relations and attributes
+            require_once("lib/SemanticWeb.php");
+            $rdf = new RdfWriter($request, $pagelist);
+            $rdf->format();
+        } elseif ($format == 'rdfs') {
+            require_once("lib/SemanticWeb.php");
+            $rdf = new RdfsWriter($request, $pagelist);
+            $rdf->format();
+        } elseif ($format == 'owl') { // or daml?
+            require_once("lib/SemanticWeb.php");
+            $rdf = new OwlWriter($request, $pagelist);
+            $rdf->format();
+        } else {
+            if (!in_array($pagename, array(_("LinkDatabase"))))
+            trigger_error(sprintf(_("Unsupported argument: %s=%s"),"format",$format),
                           E_USER_WARNING);
-        $template = Template('browse', array('CONTENT' => $transformedContent));
-        GeneratePage($template, $pagetitle, $revision, $args);
+            $template = Template('browse', array('CONTENT' => $transformedContent));
+            GeneratePage($template, $pagetitle, $revision, $args);
+        }
     }
-    }
     $request->checkValidators();
     flush();
     return '';
@@ -227,9 +227,8 @@
             NoSuchRevision($request, $page, $version);
         /* Tell Google (and others) to ignore old versions of pages */
         $robots = "noindex,nofollow";
-    $toks['ROBOTS_META'] = $robots;
-    }
-    else {
+        $toks['ROBOTS_META'] = $robots;
+    } else {
         $revision = $page->getCurrentRevision();
     }
     $format = $request->getArg('format');
@@ -240,17 +239,16 @@
         // DOCTYPE html needed to allow unencoded entities like &nbsp; without !CDATA[]
         echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',"\n";
-    if ($page->exists()) {
-        header("Last-Modified: " . Rfc1123DateTime($revision->get('mtime')));
-        $request->cacheControl();
-        $request->setArg('format','');
+        if ($page->exists()) {
+            header("Last-Modified: " . Rfc1123DateTime($revision->get('mtime')));
+            $request->cacheControl();
+            $request->setArg('format','');
             $page_content = $revision->getTransformedContent();
             $page_content->printXML();
             $request->_is_buffering_output = false; // avoid wrong Content-Length with errors
             $request->finish();
-        }
-        else {
-        $request->cacheControl();
+        } else {
+            $request->cacheControl();
             echo('<div style="display:none;" />');
             $request->_is_buffering_output = false; // avoid wrong Content-Length with errors
             $request->finish();
@@ -345,18 +343,18 @@
                     $toks['SEARCH_ENGINE'] = $result['engine'];
                     $toks['SEARCH_ENGINE_URL'] = $result['engine_url'];
                     $toks['SEARCH_TERM'] = $result['query'];
-            //$toks['HEADER'] = HTML($actionpage->getName(),": ",$pageheader); // h1 with backlink
+                    //$toks['HEADER'] = HTML($actionpage->getName(),": ",$pageheader); // h1 with backlink
                     $actioncontent = new TransformedText($actionrev->getPage(),
                                                          $actionrev->getPackedContent(),
                                                          $actionrev->getMetaData());
-            // prepend the actionpage in front of the hightlighted content
-                $toks['CONTENT'] = HTML($actioncontent, $page_content);
+                    // prepend the actionpage in front of the hightlighted content
+                    $toks['CONTENT'] = HTML($actioncontent, $page_content);
                 }
+            }
+        } else {
+            $page_content = $revision->getTransformedContent();
         }
     } else {
-            $page_content = $revision->getTransformedContent();
-    }
-    } else {
         $page_content = $revision->getTransformedContent();
     }
 
@@ -390,44 +388,44 @@
     /* Only single page versions. rss only if not already handled by RecentChanges.
      */
     if (!$format or $format == 'html' or $format == 'sidebar' or $format == 'contribs') {
-    $template->printExpansion($toks);
+        $template->printExpansion($toks);
     } else {
-    // No pagelist here. Single page version only
-    require_once("lib/PageList.php");
-    $pagelist = new PageList();
-    $pagelist->addPage($page);
-    if ($format == 'pdf') {
-        require_once("lib/pdf.php");
-        $request->setArg('format','');
-        ConvertAndDisplayPdfPageList($request, $pagelist);
-    // time-sorted rdf a la RecentChanges
-    } elseif (in_array($format, array("rss91","rss2","rss","atom"))) {
-        //$request->setArg('format','');
+        // No pagelist here. Single page version only
+        require_once("lib/PageList.php");
+        $pagelist = new PageList();
+        $pagelist->addPage($page);
+        if ($format == 'pdf') {
+            require_once("lib/pdf.php");
+            $request->setArg('format','');
+            ConvertAndDisplayPdfPageList($request, $pagelist);
+            // time-sorted rdf a la RecentChanges
+        } elseif (in_array($format, array("rss91","rss2","rss","atom"))) {
+            //$request->setArg('format','');
             if ($pagename == _("RecentChanges"))
                 $template->printExpansion($toks);
             else {
-            require_once("lib/plugin/RecentChanges.php");
+                require_once("lib/plugin/RecentChanges.php");
             $plugin = new WikiPlugin_RecentChanges();
                 $args = $request->getArgs();
                 return $plugin->format($plugin->getChanges($request->_dbi, $args), $args);
             }
-    } elseif ($format == 'rdf') { // all semantic relations and attributes
-        require_once("lib/SemanticWeb.php");
-        $rdf = new RdfWriter($request, $pagelist);
-        $rdf->format();
-    } elseif ($format == 'owl') { // or daml?
-        require_once("lib/SemanticWeb.php");
-        $rdf = new OwlWriter($request, $pagelist);
-        $rdf->format();
-    } elseif ($format == 'json') { // include page content asynchronously
-        $request->setArg('format','');
-        if ($page->exists())
+        } elseif ($format == 'rdf') { // all semantic relations and attributes
+            require_once("lib/SemanticWeb.php");
+            $rdf = new RdfWriter($request, $pagelist);
+            $rdf->format();
+        } elseif ($format == 'owl') { // or daml?
+            require_once("lib/SemanticWeb.php");
+            $rdf = new OwlWriter($request, $pagelist);
+            $rdf->format();
+        } elseif ($format == 'json') { // include page content asynchronously
+            $request->setArg('format','');
+            if ($page->exists())
                 $content = $page_content->asXML();
             else
                 $content = '';
-        $req_args = $request->args;
-        unset($req_args['format']);
-        // no meta-data so far, just the content
+            $req_args = $request->args;
+            unset($req_args['format']);
+            // no meta-data so far, just the content
             $json = array('content' => $content,
                           'args'    => $req_args,
                           'phpwiki-version' => PHPWIKI_VERSION);
@@ -440,13 +438,13 @@
             }
             header("Content-Type: application/json");
             die($json_enc);
-    } else {
-        if (!in_array($pagename, array(_("LinkDatabase"))))
-        trigger_error(sprintf(_("Unsupported argument: %s=%s"),"format",$format),
+        } else {
+            if (!in_array($pagename, array(_("LinkDatabase"))))
+            trigger_error(sprintf(_("Unsupported argument: %s=%s"),"format",$format),
                           E_USER_WARNING);
-        $template->printExpansion($toks);
+            $template->printExpansion($toks);
+        }
     }
-    }
 
     $page->increaseHitCount();
 


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8082] trunk/lib/display.php

From: <var...@us...> - 2011-05-20 09:06:21

Revision: 8082
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8082&view=rev
Author:   vargenau
Date:     2011-05-20 09:06:15 +0000 (Fri, 20 May 2011)

Log Message:
-----------
Add header

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

Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2011-05-19 19:27:35 UTC (rev 8081)
+++ trunk/lib/display.php	2011-05-20 09:06:15 UTC (rev 8082)
@@ -1,7 +1,26 @@
 <?php
-// display.php: fetch page or get default content
 // $Id$
+/* Copyright (C) 2004-2011 $ThePhpWikiProgrammingTeam
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
+// display.php: fetch page or get default content
+
 require_once('lib/Template.php');
 
 /**


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8081] trunk/themes/fusionforge/themeinfo.php

From: <var...@us...> - 2011-05-19 19:27:41

Revision: 8081
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8081&view=rev
Author:   vargenau
Date:     2011-05-19 19:27:35 +0000 (Thu, 19 May 2011)

Log Message:
-----------
Update from Phpwiki

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

Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php	2011-05-19 19:14:34 UTC (rev 8080)
+++ trunk/themes/fusionforge/themeinfo.php	2011-05-19 19:27:35 UTC (rev 8081)
@@ -38,11 +38,7 @@
             //group is private
             if (!$project->isPublic()) {
                 //if it's a private group, you must be a member of that group
-                if (defined('RBAC') and RBAC) {
-                    session_require_perm('project_read', $group_id);
-                } else {
-                    session_require(array('group'=>$group_id));
-                }
+                session_require_perm('project_read', $group_id);
             }
 
             //for dead projects must be member of admin project


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

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

From: <var...@us...> - 2011-05-19 19:14:40

Revision: 8080
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8080&view=rev
Author:   vargenau
Date:     2011-05-19 19:14:34 +0000 (Thu, 19 May 2011)

Log Message:
-----------
New FSF address

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

Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2011-05-18 18:19:24 UTC (rev 8079)
+++ trunk/lib/WikiDB/backend.php	2011-05-19 19:14:34 UTC (rev 8080)
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License along
  * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /*


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

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

From: <var...@us...> - 2011-05-18 18:19:33

Revision: 8079
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8079&view=rev
Author:   vargenau
Date:     2011-05-18 18:19:24 +0000 (Wed, 18 May 2011)

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

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

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

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

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

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

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

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

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2011-05-18 16:44:31 UTC (rev 8078)
+++ trunk/locale/po/de.po	2011-05-18 18:19:24 UTC (rev 8079)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-14 16:24+0200\n"
+"POT-Creation-Date: 2011-05-18 20: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."
@@ -174,7 +174,7 @@
 # (Im Wortsinne heißt das eigentlich: "jüngste = eben gemachte
 # Änderungen"; in terms of newspapers or journalism it's traditionally
 # "NeuesteNachrichten" or much more better "DasNeueste").
-#: ../lib/display.php:151 ../lib/display.php:387 ../lib/loadsave.php:1578
+#: ../lib/display.php:151 ../lib/display.php:387 ../lib/loadsave.php:1579
 #: ../lib/plugin/RecentChanges.php:62 ../lib/plugin/RecentChanges.php:210
 #: ../lib/plugin/RecentChanges.php:217 ../lib/plugin/RecentChanges.php:393
 #: ../lib/plugin/RecentChanges.php:681 ../lib/plugin/RecentChanges.php:1160
@@ -621,8 +621,8 @@
 msgid "List"
 msgstr "Liste"
 
-#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:471
-#: ../lib/plugin/CreateToc.php:486
+#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:479
+#: ../lib/plugin/CreateToc.php:494
 msgid "Table of Contents"
 msgstr "Inhaltsverzeichnis"
 
@@ -704,7 +704,7 @@
 msgid "%s: error while handling error:"
 msgstr "%s: Fehler während der Fehlerbehandlung von:"
 
-#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1157
+#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1158
 #, php-format
 msgid "%s: file not found"
 msgstr "»%s«: Datei nicht gefunden"
@@ -742,7 +742,7 @@
 #: ../lib/upgrade.php:1112 ../themes/blog/templates/blogform.tmpl:10
 #: ../themes/default/templates/blogform.tmpl:10
 #: ../themes/fusionforge/templates/blogform.tmpl:10
-#: ../themes/fusionforge/themeinfo.php:53
+#: ../themes/fusionforge/themeinfo.php:55
 msgid ": "
 msgstr ": "
 
@@ -777,8 +777,8 @@
 
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
-#: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1036
-#: ../lib/loadsave.php:1042 ../lib/loadsave.php:1050 ../lib/main.php:1063
+#: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1063
 #: ../lib/main.php:1185 ../lib/main.php:1197 ../lib/PagePerm.php:190
 #: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
@@ -803,7 +803,7 @@
 
 # (Wrong Translation; sorry, but the German term for edit is NOT
 # editieren, but  e d i e r e n).
-#: ../lib/loadsave.php:96 ../lib/MailNotify.php:287 ../lib/MailNotify.php:304
+#: ../lib/loadsave.php:96 ../lib/MailNotify.php:288 ../lib/MailNotify.php:305
 #, php-format
 msgid "Edited by: %s"
 msgstr "Bearbeitet von: %s"
@@ -866,7 +866,7 @@
 msgid "Dumping Pages"
 msgstr "Die Seiten werden geschrieben"
 
-#: ../lib/loadsave.php:367 ../lib/loadsave.php:629 ../lib/stdlib.php:1019
+#: ../lib/loadsave.php:367 ../lib/loadsave.php:630 ../lib/stdlib.php:1020
 msgid "Skipped."
 msgstr "Ausgelassen."
 
@@ -875,46 +875,46 @@
 msgid "saved as %s"
 msgstr "gespeichert als %s"
 
-#: ../lib/loadsave.php:385 ../lib/loadsave.php:699
+#: ../lib/loadsave.php:385 ../lib/loadsave.php:700
 #: ../lib/plugin/text2png.php:222
 #, php-format
 msgid "couldn't open file '%s' for writing"
 msgstr "Datei »%s« konnte nicht zum Schreiben geöffnet werden"
 
-#: ../lib/loadsave.php:391 ../lib/loadsave.php:709
+#: ../lib/loadsave.php:391 ../lib/loadsave.php:710
 #, php-format
 msgid "%s bytes written"
 msgstr "%s Bytes geschrieben"
 
-#: ../lib/loadsave.php:683 ../lib/loadsave.php:760 ../lib/loadsave.php:795
-#: ../lib/loadsave.php:825
+#: ../lib/loadsave.php:684 ../lib/loadsave.php:761 ../lib/loadsave.php:796
+#: ../lib/loadsave.php:826
 #, php-format
 msgid "... copied to %s"
 msgstr "... kopiert nach %s"
 
-#: ../lib/loadsave.php:686 ../lib/loadsave.php:762 ../lib/loadsave.php:797
-#: ../lib/loadsave.php:827
+#: ../lib/loadsave.php:687 ../lib/loadsave.php:763 ../lib/loadsave.php:798
+#: ../lib/loadsave.php:828
 #, php-format
 msgid "... not copied to %s"
 msgstr "... nicht kopiert nach %s"
 
-#: ../lib/loadsave.php:707
+#: ../lib/loadsave.php:708
 msgid "saved as "
 msgstr "gespeichert als "
 
-#: ../lib/loadsave.php:770 ../lib/loadsave.php:805 ../lib/loadsave.php:836
+#: ../lib/loadsave.php:771 ../lib/loadsave.php:806 ../lib/loadsave.php:837
 msgid "... not found"
 msgstr "... nicht gefunden"
 
-#: ../lib/loadsave.php:896
+#: ../lib/loadsave.php:897
 msgid "Empty pagename!"
 msgstr "Leerer Seitenname!"
 
-#: ../lib/loadsave.php:906
+#: ../lib/loadsave.php:907
 msgid "Invalid pagename!"
 msgstr "Ungültiger Seitenname!"
 
-#: ../lib/loadsave.php:912 ../lib/loadsave.php:1559 ../lib/PageType.php:136
+#: ../lib/loadsave.php:913 ../lib/loadsave.php:1560 ../lib/PageType.php:136
 #: ../lib/plugin/InterWikiSearch.php:52 ../lib/plugin/WantedPagesOld.php:73
 #: ../lib/plugin/WantedPages.php:51 ../themes/default/templates/info.tmpl:160
 #: ../themes/default/templates/info.tmpl:161
@@ -923,52 +923,52 @@
 msgid "InterWikiMap"
 msgstr "InterWikiListe"
 
-#: ../lib/loadsave.php:969
+#: ../lib/loadsave.php:970
 #, php-format
 msgid "from %s"
 msgstr "von %s"
 
-#: ../lib/loadsave.php:978 ../lib/MailNotify.php:283
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:284
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Neue Seite"
 
-#: ../lib/loadsave.php:986
+#: ../lib/loadsave.php:987
 msgid "has edit conflicts - overwriting anyway"
 msgstr ""
 "hat unauflösbare Konflikte beim Speichern - wird ungeprüft überschrieben"
 
-#: ../lib/loadsave.php:995
+#: ../lib/loadsave.php:996
 msgid "keep old"
 msgstr ""
 
-#: ../lib/loadsave.php:997
+#: ../lib/loadsave.php:998
 msgid "has edit conflicts - skipped"
 msgstr "hat unauflösbare Konflikte beim Speichern - übersprungen"
 
-#: ../lib/loadsave.php:1006
+#: ../lib/loadsave.php:1007
 #, 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:1020
+#: ../lib/loadsave.php:1021
 #, php-format
 msgid "- saved to database as version %d"
 msgstr "- in der Datenbank gespeichert als Version %d."
 
-#: ../lib/loadsave.php:1026 ../lib/loadsave.php:1297
+#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1298
 #, php-format
 msgid "MIME file %s"
 msgstr "MIME-Datei %s"
 
-#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1308
+#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1309
 #, php-format
 msgid "Serialized file %s"
 msgstr "Serialisierte Datei %s"
 
-#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1330
+#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1331
 #, php-format
 msgid "plain file %s"
 msgstr "Nur-Text-Datei %s"
@@ -976,24 +976,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:1035 ../lib/plugin/SyncWiki.php:268
+#: ../lib/loadsave.php:1036 ../lib/plugin/SyncWiki.php:268
 msgid "Merge Edit"
 msgstr "Zusammenfügen Bearbeiten"
 
-#: ../lib/loadsave.php:1041
+#: ../lib/loadsave.php:1042
 msgid "Restore Anyway"
 msgstr "Ungeprüft überschreiben"
 
-#: ../lib/loadsave.php:1049
+#: ../lib/loadsave.php:1050
 msgid "Overwrite All"
 msgstr ""
 
-#: ../lib/loadsave.php:1056
+#: ../lib/loadsave.php:1057
 msgid " Sorry, cannot merge."
 msgstr " Konnte leider nicht automatisch einpflegen."
 
-#: ../lib/loadsave.php:1076 ../lib/loadsave.php:1086 ../lib/loadsave.php:1093
-#: ../lib/loadsave.php:1100 ../themes/default/templates/actionbar.tmpl:31
+#: ../lib/loadsave.php:1077 ../lib/loadsave.php:1087 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1101 ../themes/default/templates/actionbar.tmpl:31
 #: ../themes/fusionforge/templates/actionbar.tmpl:77
 #: ../themes/fusionforge/templates/userprefs.tmpl:253
 #: ../themes/MonoBook/templates/actionbar.tmpl:73
@@ -1003,23 +1003,23 @@
 msgid "Revert"
 msgstr "Zurückspeichern"
 
-#: ../lib/loadsave.php:1077
+#: ../lib/loadsave.php:1078
 msgid "missing required version argument"
 msgstr "Parameter version muß angegeben werden"
 
-#: ../lib/loadsave.php:1085
+#: ../lib/loadsave.php:1086
 msgid "no page content"
 msgstr "leerer Seiteninalt"
 
-#: ../lib/loadsave.php:1092
+#: ../lib/loadsave.php:1093
 msgid "same version page"
 msgstr "selbe Version der Seite"
 
-#: ../lib/loadsave.php:1099
+#: ../lib/loadsave.php:1100
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: ../lib/loadsave.php:1111 ../lib/plugin/PasswordReset.php:102
+#: ../lib/loadsave.php:1112 ../lib/plugin/PasswordReset.php:102
 #: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/UserPreferences.php:116
 #: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:141
 #: ../lib/plugin/WikiAdminChown.php:170 ../lib/plugin/WikiAdminMarkup.php:162
@@ -1031,7 +1031,7 @@
 msgid "Yes"
 msgstr "Ja"
 
-#: ../lib/loadsave.php:1113 ../lib/plugin/PasswordReset.php:105
+#: ../lib/loadsave.php:1114 ../lib/plugin/PasswordReset.php:105
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
 #: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
@@ -1041,7 +1041,7 @@
 #: ../lib/plugin/WikiAdminSearchReplace.php:199
 #: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
 #: ../lib/plugin/WikiAdminSetExternal.php:131
-#: ../lib/plugin/WikiAdminUtils.php:293 ../lib/plugin/WikiFormRich.php:310
+#: ../lib/plugin/WikiAdminUtils.php:293 ../lib/plugin/WikiFormRich.php:307
 #: ../lib/purgepage.php:23 ../lib/removepage.php:23 ../lib/upgrade.php:791
 #: ../themes/default/templates/login.tmpl:88
 #: ../themes/default/templates/userprefs.tmpl:278
@@ -1049,63 +1049,63 @@
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../lib/loadsave.php:1127
+#: ../lib/loadsave.php:1128
 #, php-format
 msgid "revert to version %d"
 msgstr "Speichere Version %d zurück."
 
-#: ../lib/loadsave.php:1133
+#: ../lib/loadsave.php:1134
 #, php-format
 msgid "Revert: %s"
 msgstr "Zurückspeichern: %s"
 
-#: ../lib/loadsave.php:1134
+#: ../lib/loadsave.php:1135
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr "- version %d in der Datenbank gespeichert als Version %d."
 
-#: ../lib/loadsave.php:1152 ../lib/WikiGroup.php:838
+#: ../lib/loadsave.php:1153 ../lib/WikiGroup.php:838
 #, php-format
 msgid "%s: not defined"
 msgstr "%s: nicht definiert"
 
-#: ../lib/loadsave.php:1162
+#: ../lib/loadsave.php:1163
 msgid "Default InterWiki map file not loaded."
 msgstr "Standard-Datei der InterWikiListe nicht geladen."
 
-#: ../lib/loadsave.php:1169 ../lib/PageType.php:298
+#: ../lib/loadsave.php:1170 ../lib/PageType.php:298
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr "Die InterWikiListe wird von der externen Datei %s geladen."
 
-#: ../lib/loadsave.php:1345 ../lib/loadsave.php:1358
+#: ../lib/loadsave.php:1346 ../lib/loadsave.php:1359
 msgid "Skipping"
 msgstr "Übersprungen"
 
-#: ../lib/loadsave.php:1459
+#: ../lib/loadsave.php:1460
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1466
+#: ../lib/loadsave.php:1467
 #, php-format
 msgid "Bad file type: %s"
 msgstr "Ungültiger Dateityp: %s"
 
-#: ../lib/loadsave.php:1483
+#: ../lib/loadsave.php:1484
 #, php-format
 msgid "Loading '%s'"
 msgstr "»%s« wird geladen"
 
-#: ../lib/loadsave.php:1515
+#: ../lib/loadsave.php:1516
 msgid "Loading up virgin wiki"
 msgstr "Lade neue Seiten in das frische Wiki"
 
-#: ../lib/loadsave.php:1571
+#: ../lib/loadsave.php:1572
 msgid "No uploaded file to upload?"
 msgstr "Keine Datei zum Hochladen?"
 
-#: ../lib/loadsave.php:1574
+#: ../lib/loadsave.php:1575
 #, php-format
 msgid "Uploading %s"
 msgstr "%s wird hochgeladen"
@@ -1115,40 +1115,40 @@
 msgid "PageChange Notification of %s"
 msgstr "SeitenÄnderung Benachrichtigung von %s"
 
-#: ../lib/MailNotify.php:228
+#: ../lib/MailNotify.php:229
 #, php-format
 msgid "sent to %s"
 msgstr "an %s gesendet"
 
-#: ../lib/MailNotify.php:234
+#: ../lib/MailNotify.php:235
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "Fehler: Konnte nicht %s an %s senden"
 
-#: ../lib/MailNotify.php:256
+#: ../lib/MailNotify.php:257
 msgid "Page change"
 msgstr "Seiten Änderung"
 
-#: ../lib/MailNotify.php:288
+#: ../lib/MailNotify.php:289
 #, php-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
 
-#: ../lib/MailNotify.php:305
+#: ../lib/MailNotify.php:306
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "Seite »%s« nach umbenennen »%s«"
 
-#: ../lib/MailNotify.php:342
+#: ../lib/MailNotify.php:343
 #, php-format
 msgid "User %s removed page %s"
 msgstr "Seite gelöscht %s von Benutzer %s"
 
-#: ../lib/MailNotify.php:378
+#: ../lib/MailNotify.php:379
 msgid "E-Mail address confirmation"
 msgstr "E-Mail Bestätigung"
 
-#: ../lib/MailNotify.php:381
+#: ../lib/MailNotify.php:382
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1529,7 +1529,7 @@
 msgid "Click to de-/select all pages"
 msgstr "Klicken Sie um alle/keine Seiten auszuwählen"
 
-#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:190
+#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:193
 #, php-format
 msgid " ... first %d bytes"
 msgstr " ... erste %d Bytes"
@@ -1755,7 +1755,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:833
+#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:834
 #: ../themes/default/templates/navbar.tmpl:8
 #: ../themes/default/templates/navbar.tmpl:10
 #: ../themes/fusionforge/templates/actionbar.tmpl:16
@@ -1800,7 +1800,7 @@
 msgid "Click to display all comments"
 msgstr "Klicken um Kommentare anzuzeigen"
 
-#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:484
+#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:492
 msgid "Click to display"
 msgstr "Klicken um anzuzeigen"
 
@@ -1863,112 +1863,112 @@
 msgid "Authenticated users on this wiki (%d total):"
 msgstr "Eingetragene Benutzer in diesem Wiki (Gesamt: %d):"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:162
-#: ../lib/plugin/AnalyseAccessLogSql.php:197
-msgid "0 - last minute"
-msgstr ""
-
 #: ../lib/plugin/AnalyseAccessLogSql.php:163
 #: ../lib/plugin/AnalyseAccessLogSql.php:198
-msgid "1 - 1 minute to 1 hour"
+msgid "0 - last minute"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:164
 #: ../lib/plugin/AnalyseAccessLogSql.php:199
-msgid "2 - 1 hour to 1 day"
+msgid "1 - 1 minute to 1 hour"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:165
 #: ../lib/plugin/AnalyseAccessLogSql.php:200
-msgid "3 - 1 day to 1 week"
+msgid "2 - 1 hour to 1 day"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:166
 #: ../lib/plugin/AnalyseAccessLogSql.php:201
-msgid "4 - 1 week to 1 month"
+msgid "3 - 1 day to 1 week"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:167
 #: ../lib/plugin/AnalyseAccessLogSql.php:202
-msgid "5 - 1 month to 1 year"
+msgid "4 - 1 week to 1 month"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:168
 #: ../lib/plugin/AnalyseAccessLogSql.php:203
+msgid "5 - 1 month to 1 year"
+msgstr ""
+
+#: ../lib/plugin/AnalyseAccessLogSql.php:169
+#: ../lib/plugin/AnalyseAccessLogSql.php:204
 msgid "6 - more than 1 year"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:222
+#: ../lib/plugin/AnalyseAccessLogSql.php:223
 msgid "referring_urls"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:223
+#: ../lib/plugin/AnalyseAccessLogSql.php:224
 msgid "external_referers"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:224
+#: ../lib/plugin/AnalyseAccessLogSql.php:225
 msgid "referring_domains"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:225
+#: ../lib/plugin/AnalyseAccessLogSql.php:226
 msgid "remote_hosts"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:226
+#: ../lib/plugin/AnalyseAccessLogSql.php:227
 msgid "users"
 msgstr "Benutzer"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:227
+#: ../lib/plugin/AnalyseAccessLogSql.php:228
 msgid "host_users"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:228
+#: ../lib/plugin/AnalyseAccessLogSql.php:229
 msgid "search_bots"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:229
+#: ../lib/plugin/AnalyseAccessLogSql.php:230
 msgid "search_bots_hits"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:231
+#: ../lib/plugin/AnalyseAccessLogSql.php:232
 msgid "minutes"
 msgstr "Minuten"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:232
+#: ../lib/plugin/AnalyseAccessLogSql.php:233
 msgid "hours"
 msgstr "Stunden"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:233 ../lib/plugin/VisualWiki.php:498
+#: ../lib/plugin/AnalyseAccessLogSql.php:234 ../lib/plugin/VisualWiki.php:498
 msgid "days"
 msgstr "Tage"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:234
+#: ../lib/plugin/AnalyseAccessLogSql.php:235
 msgid "weeks"
 msgstr "Wochen"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:252
+#: ../lib/plugin/AnalyseAccessLogSql.php:253
 msgid "AnalyseAccessLogSql"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:256
+#: ../lib/plugin/AnalyseAccessLogSql.php:257
 msgid "Show summary information from the access log table."
 msgstr "Zeige Überblick über die Access LOG-Tabelle."
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:264
+#: ../lib/plugin/AnalyseAccessLogSql.php:265
 msgid "The requested information is available only to Administrators."
 msgstr "Diese Information ist nur für Administratoren zugänglich."
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:267
+#: ../lib/plugin/AnalyseAccessLogSql.php:268
 msgid "The SQL_ACCESS_LOG is not enabled."
 msgstr "SQL_ACCESS_LOG ist nicht aktiviert."
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:278
+#: ../lib/plugin/AnalyseAccessLogSql.php:279
 #, php-format
 msgid "Unrecognised parameter 'mode=%s'"
 msgstr "Ungültiges Argument 'mode=%s'"
 
 # some empty DB field
-#: ../lib/plugin/AnalyseAccessLogSql.php:297
+#: ../lib/plugin/AnalyseAccessLogSql.php:298
 #: ../lib/plugin/_BackendInfo.php:119 ../lib/plugin/SemanticSearch.php:411
 #: ../lib/plugin/WatchPage.php:57
 msgid "<empty>"
@@ -1996,11 +1996,11 @@
 msgid "AppendText to %s"
 msgstr "TextHinzufügen zu %s"
 
-#: ../lib/plugin/AppendText.php:125
+#: ../lib/plugin/AppendText.php:126
 msgid "Page successfully updated."
 msgstr "Datei erfolgreich geändert."
 
-#: ../lib/plugin/AppendText.php:142
+#: ../lib/plugin/AppendText.php:143
 #, php-format
 msgid "Go to %s."
 msgstr "Gehe zu %s."
@@ -2359,28 +2359,36 @@
 msgid "No page specified."
 msgstr "Keine Seite angegeben."
 
-#: ../lib/plugin/CreateToc.php:389 ../lib/plugin/Template.php:129
+#: ../lib/plugin/CreateToc.php:389
+msgid "Error: firstlevelstyle must be 'number', 'letter' or 'roman'"
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:394 ../lib/plugin/Template.php:129
 #, php-format
 msgid "Page '%s' does not exist."
 msgstr "Seite »%s« existiert nicht"
 
-#: ../lib/plugin/CreateToc.php:394 ../lib/plugin/Diff.php:86
+#: ../lib/plugin/CreateToc.php:399 ../lib/plugin/Diff.php:86
 #: ../lib/plugin/PageDump.php:85
 #, php-format
 msgid "Illegal access to page %s: no read access"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:403 ../lib/plugin/IncludePage.php:104
-#: ../lib/plugin/PageGroup.php:124 ../lib/plugin/Template.php:142
+#: ../lib/plugin/CreateToc.php:407
+msgid "Error: version must be a positive integer."
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:411 ../lib/plugin/IncludePage.php:107
+#: ../lib/plugin/PageGroup.php:124 ../lib/plugin/Template.php:145
 #, php-format
 msgid "%s: no such revision %d."
 msgstr "%s(%d): keine solche Version"
 
-#: ../lib/plugin/CreateToc.php:414
+#: ../lib/plugin/CreateToc.php:422
 msgid "CreateToc disabled for old markup."
 msgstr "InhaltsVerzeichnis deaktiviert für altes Markup."
 
-#: ../lib/plugin/CreateToc.php:477
+#: ../lib/plugin/CreateToc.php:485
 msgid "Click to display to TOC"
 msgstr "Klicken um TOC anzuzeigen"
 
@@ -2507,7 +2515,7 @@
 
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:63
 #: ../lib/plugin/PageGroup.php:98 ../lib/plugin/SyncWiki.php:70
-#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:193
+#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:190
 #, php-format
 msgid "A required argument '%s' is missing."
 msgstr "Erforderliches Argument »%s« fehlt."
@@ -2583,7 +2591,7 @@
 #: ../lib/plugin/WikiAdminSearchReplace.php:121
 #: ../lib/plugin/WikiAdminSetAcl.php:141
 #: ../lib/plugin/WikiAdminSetExternal.php:96
-#: ../lib/plugin/WikiAdminUtils.php:64 ../lib/plugin/WikiFormRich.php:176
+#: ../lib/plugin/WikiAdminUtils.php:64
 msgid "Plugin not run: not in browse mode"
 msgstr ""
 
@@ -2792,8 +2800,8 @@
 msgid "Include text from another wiki page."
 msgstr "Text von einer andere Seite einfügen."
 
-#: ../lib/plugin/IncludePage.php:85 ../lib/plugin/IncludePage.php:125
-#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:164
+#: ../lib/plugin/IncludePage.php:85 ../lib/plugin/IncludePage.php:128
+#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:167
 #: ../lib/plugin/UnfoldSubpages.php:100 ../lib/plugin/UnfoldSubpages.php:130
 #, fuzzy, php-format
 msgid "Recursive inclusion of page %s ignored"
@@ -2810,17 +2818,21 @@
 msgid "Illegal inclusion of page %s: no read access"
 msgstr "Fehler beim Einfügen der Seite %s: rekursiver Selbstaufruf ignoriert"
 
-#: ../lib/plugin/IncludePage.php:154
+#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/Template.php:141
+msgid "Error: rev must be a positive integer."
+msgstr ""
+
+#: ../lib/plugin/IncludePage.php:157
 #, fuzzy, php-format
 msgid "Included from %s (revision %d)"
 msgstr "Eingefügter Text von %s"
 
-#: ../lib/plugin/IncludePage.php:156
+#: ../lib/plugin/IncludePage.php:159
 #, php-format
 msgid "Included from %s"
 msgstr "Eingefügter Text von %s"
 
-#: ../lib/plugin/IncludePage.php:181
+#: ../lib/plugin/IncludePage.php:184
 #, php-format
 msgid " ... first %d lines"
 msgstr " ... erste %d Zeilen"
@@ -3311,7 +3323,7 @@
 msgid "Contents"
 msgstr "Inhalt"
 
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2174
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2175
 #, php-format
 msgid "<%s: no such section>"
 msgstr "<%s: unbekannte Sektion>"
@@ -5895,7 +5907,7 @@
 msgid "Access Restrictions"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:113 ../lib/WikiUserNew.php:1781
+#: ../lib/plugin/WikiAdminUtils.php:113 ../lib/WikiUserNew.php:1782
 msgid "Email Verification"
 msgstr "E-Mail Bestätigung"
 
@@ -6428,139 +6440,139 @@
 msgid "the file '%s'"
 msgstr "die Datei %s"
 
-#: ../lib/stdlib.php:388 ../lib/stdlib.php:422
+#: ../lib/stdlib.php:389 ../lib/stdlib.php:423
 msgid "BAD URL -- remove all of <, >, \""
 msgstr "URL Formfehler - Entfernen Sie alle Zeichen mit <, >, \""
 
-#: ../lib/stdlib.php:474
+#: ../lib/stdlib.php:475
 #, php-format
 msgid "Invalid image attribute \"%s\" %s=%s"
 msgstr "Ungültiger Parameter: \"%s\" %s=%s"
 
-#: ../lib/stdlib.php:486
+#: ../lib/stdlib.php:487
 #, php-format
 msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:492
+#: ../lib/stdlib.php:493
 #, php-format
 msgid ""
 "Invalid image link fixed \"%s\" => \"%s\".\n"
 " Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:511 ../lib/stdlib.php:548
+#: ../lib/stdlib.php:512 ../lib/stdlib.php:549
 msgid "Invalid image size"
 msgstr "Ungültige Bildgröße"
 
-#: ../lib/stdlib.php:722
+#: ../lib/stdlib.php:723
 msgid "BAD phpwiki: URL"
 msgstr "phpwiki: URL Formfehler"
 
-#: ../lib/stdlib.php:760
+#: ../lib/stdlib.php:761
 msgid "Lock page to enable link"
 msgstr "Seite sperren, um den Link zu aktivieren"
 
-#: ../lib/stdlib.php:890
+#: ../lib/stdlib.php:891
 #, php-format
 msgid "'%s': Bad page name: %s"
 msgstr "»%s«: Ungültiger Seitenname: %s"
 
 # z.B. führende Leerzeichen
-#: ../lib/stdlib.php:920 ../lib/stdlib.php:951
+#: ../lib/stdlib.php:921 ../lib/stdlib.php:952
 #, php-format
 msgid "Leading %s not allowed"
 msgstr "Führende %s nicht erlaubt"
 
-#: ../lib/stdlib.php:935
+#: ../lib/stdlib.php:936
 msgid "White space converted to single space"
 msgstr ""
 
-#: ../lib/stdlib.php:941
+#: ../lib/stdlib.php:942
 msgid "Control characters not allowed"
 msgstr "Steuerzeichen nicht erlaubt"
 
-#: ../lib/stdlib.php:962
+#: ../lib/stdlib.php:963
 msgid "too long"
 msgstr "zu lang"
 
-#: ../lib/stdlib.php:971
+#: ../lib/stdlib.php:972
 #, php-format
 msgid "Illegal chars %s removed"
 msgstr "Ungültiges Zeichen %s entfernt"
 
-#: ../lib/stdlib.php:1017
+#: ../lib/stdlib.php:1018
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:1018
+#: ../lib/stdlib.php:1019
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1281
+#: ../lib/stdlib.php:1282
 msgid "Revision Not Found"
 msgstr "Version nicht gefunden"
 
-#: ../lib/stdlib.php:1282
+#: ../lib/stdlib.php:1283
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr "Leider ist keine Version %d von %s in der Datenbank."
 
-#: ../lib/stdlib.php:1285
+#: ../lib/stdlib.php:1286
 msgid "Bad Version"
 msgstr "Ungültige Version"
 
-#: ../lib/stdlib.php:1421
+#: ../lib/stdlib.php:1422
 msgid "-???"
 msgstr ""
 
-#: ../lib/stdlib.php:1424
+#: ../lib/stdlib.php:1425
 #, php-format
 msgid "%s B"
 msgstr ""
 
-#: ../lib/stdlib.php:1426 ../themes/MonoBook/templates/info.tmpl:30
+#: ../lib/stdlib.php:1427 ../themes/MonoBook/templates/info.tmpl:30
 #, php-format
 msgid "%s bytes"
 msgstr "%s Bytes"
 
-#: ../lib/stdlib.php:1431
+#: ../lib/stdlib.php:1432
 #, php-format
 msgid "%s KiB"
 msgstr ""
 
-#: ../lib/stdlib.php:1433 ../themes/MonoBook/templates/info.tmpl:33
+#: ../lib/stdlib.php:1434 ../themes/MonoBook/templates/info.tmpl:33
 #, php-format
 msgid "%s KiB (%s bytes)"
 msgstr "%s KiB (%s Bytes)"
 
-#: ../lib/stdlib.php:1520 ../lib/XmlElement.php:487
+#: ../lib/stdlib.php:1521 ../lib/XmlElement.php:487
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr "Kann »%s« Typ-Formatzeichenketten nicht mit »%s« vermischen."
 
-#: ../lib/stdlib.php:1529
+#: ../lib/stdlib.php:1530
 #, php-format
 msgid "%s: argument index out of range"
 msgstr "%s: Ungültiger Index in Array"
 
-#: ../lib/stdlib.php:1608 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1609 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr "%s ist leer."
 
-#: ../lib/stdlib.php:1615
+#: ../lib/stdlib.php:1616
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr "Konnte Verzeichnis »%s« nicht zum Lesen öffnen"
 
-#: ../lib/stdlib.php:1946
+#: ../lib/stdlib.php:1947
 msgid "Okay"
 msgstr "OK"
 
-#: ../lib/stdlib.php:2131 ../lib/stdlib.php:2144
+#: ../lib/stdlib.php:2132 ../lib/stdlib.php:2145
 #, php-format
 msgid "... (first %s words)"
 msgstr "... (erste %s Wörter)"
@@ -6861,13 +6873,13 @@
 msgid "%s: Date of new revision is %s"
 msgstr "%s: Datum dieser aktuellen Neubearbeitung ist %s"
 
-#: ../lib/WikiDB.php:1660 ../lib/WikiDB.php:1664
+#: ../lib/WikiDB.php:1661 ../lib/WikiDB.php:1665
 #: ../themes/default/templates/homepage.tmpl:7
 #, php-format
 msgid "Describe %s here."
 msgstr "Beschreiben Sie %s hier."
 
-#: ../lib/WikiDB.php:1699
+#: ../lib/WikiDB.php:1700
 #, php-format
 msgid "Oops! Revision %s of %s seems to have been deleted!"
 msgstr "Hoppla! Es scheint, die Version %s von %s wurde gelöscht!"
@@ -7101,7 +7113,7 @@
 msgid "Sign Out"
 msgstr "Abmelden"
 
-#: ../lib/WikiTheme.php:1033 ../lib/WikiUserNew.php:509
+#: ../lib/WikiTheme.php:1033 ../lib/WikiUserNew.php:510
 #: ../lib/WikiUser.php:228 ../themes/Crao/templates/signin.tmpl:53
 #: ../themes/default/templates/login.tmpl:71
 #: ../themes/default/templates/login.tmpl:86
@@ -7164,7 +7176,7 @@
 #: ../lib/WikiUser/AdoDb.php:47 ../lib/WikiUser/AdoDb.php:204
 #: ../lib/WikiUser/Db.php:59 ../lib/WikiUser/File.php:74
 #: ../lib/WikiUser/IMAP.php:34 ../lib/WikiUser/LDAP.php:141
-#: ../lib/WikiUserNew.php:619 ../lib/WikiUser/PdoDb.php:46
+#: ../lib/WikiUserNew.php:620 ../lib/WikiUser/PdoDb.php:46
 #: ../lib/WikiUser/PdoDb.php:121 ../lib/WikiUser/PearDb.php:43
 #: ../lib/WikiUser/PearDb.php:133 ../lib/WikiUser.php:195
 #: ../lib/WikiUser.php:275 ../lib/WikiUser/POP3.php:33
@@ -7241,38 +7253,38 @@
 msgid "Invalid username '%s' for LDAP Auth"
 msgstr "Ungültiger Benutzername »%s« für LDAP Auth"
 
-#: ../lib/WikiUserNew.php:436
+#: ../lib/WikiUserNew.php:437
 msgid ""
 "Automatically created user homepage to be able to store UserPreferences."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:659
+#: ../lib/WikiUserNew.php:660
 msgid "Invalid password."
 msgstr "Ungültiges Passwort."
 
-#: ../lib/WikiUserNew.php:661 ../lib/WikiUser.php:199
+#: ../lib/WikiUserNew.php:662 ../lib/WikiUser.php:199
 msgid "Invalid password or userid."
 msgstr "Ungültiges Passwort oder falscher Benutzername."
 
 # (wörtlich=unzureichende Erlaubnisse)
-#: ../lib/WikiUserNew.php:677 ../lib/WikiUser.php:201
+#: ../lib/WikiUserNew.php:678 ../lib/WikiUser.php:201
 msgid "Insufficient permissions."
 msgstr "Keine ausreichenden Zugangsrechte."
 
-#: ../lib/WikiUserNew.php:723
+#: ../lib/WikiUserNew.php:724
 msgid "Empty Preferences or format of UserPreferences cookie not recognised."
 msgstr ""
 "Leere BenutzerEinstellungen oder BenutzerEinstellungs Cookie nicht erkannt."
 
-#: ../lib/WikiUserNew.php:727
+#: ../lib/WikiUserNew.php:728
 msgid "Default preferences will be used."
 msgstr "Die Vorgabe Benutzereinstellungen werden verwendent."
 
-#: ../lib/WikiUserNew.php:1298
+#: ../lib/WikiUserNew.php:1299
 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:1324
+#: ../lib/WikiUserNew.php:1325
 msgid ""
 "The length of the stored password is shorter than the system policy allows. "
 "Sorry, you cannot login.\n"
@@ -7282,11 +7294,11 @@
 "Sie können sich leider nicht anmelden.\n"
 " Sie müssen den System Administrator bitten, Ihr Passwort neu zu setzen."
 
-#: ../lib/WikiUserNew.php:1339
+#: ../lib/WikiUserNew.php:1340
 msgid "The crypt function is not available in this version of PHP."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1340
+#: ../lib/WikiUserNew.php:1341
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
@@ -7294,12 +7306,12 @@
 "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:1353
+#: ../lib/WikiUserNew.php:1354
 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:1782
+#: ../lib/WikiUserNew.php:1783
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -7313,12 +7325,12 @@
 "versenden.\n"
 "Siehe %s"
 
-#: ../lib/WikiUserNew.php:1842
+#: ../lib/WikiUserNew.php:1843
 #, php-format
 msgid "E-mail address '%s' is not properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1846
+#: ../lib/WikiUserNew.php:1847
 #, php-format
 msgid "E-mail address '%s' is properly formatted"
 msgstr ""
@@ -8707,16 +8719,16 @@
 msgid "Hide or show LinkIcons."
 msgstr ""
 
-#: ../themes/fusionforge/themeinfo.php:71
+#: ../themes/fusionforge/themeinfo.php:73
 #, fuzzy
 msgid "This page is external."
 msgstr "Formatierung der Seite '%s' auf '%s' geändert."
 
-#: ../themes/fusionforge/themeinfo.php:73
+#: ../themes/fusionforge/themeinfo.php:75
 msgid "This project is shared with third-party users"
 msgstr ""
 
-#: ../themes/fusionforge/themeinfo.php:74
+#: ../themes/fusionforge/themeinfo.php:76
 #, php-format
 msgid " (non %s users)."
 msgstr ""

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2011-05-18 16:44:31 UTC (rev 8078)
+++ trunk/locale/po/es.po	2011-05-18 18:19:24 UTC (rev 8079)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-14 16:24+0200\n"
+"POT-Creation-Date: 2011-05-18 20:17+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -178,7 +178,7 @@
 msgstr ""
 
 # lib/stdlib.php:384 lib/stdlib.php:445
-#: ../lib/display.php:151 ../lib/display.php:387 ../lib/loadsave.php:1578
+#: ../lib/display.php:151 ../lib/display.php:387 ../lib/loadsave.php:1579
 #: ../lib/plugin/RecentChanges.php:62 ../lib/plugin/RecentChanges.php:210
 #: ../lib/plugin/RecentChanges.php:217 ../lib/plugin/RecentChanges.php:393
 #: ../lib/plugin/RecentChanges.php:681 ../lib/plugin/RecentChanges.php:1160
@@ -635,8 +635,8 @@
 msgid "List"
 msgstr "Listas:"
 
-#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:471
-#: ../lib/plugin/CreateToc.php:486
+#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:479
+#: ../lib/plugin/CreateToc.php:494
 #, fuzzy
 msgid "Table of Contents"
 msgstr "ningún contenido de la página"
@@ -726,7 +726,7 @@
 msgid "%s: error while handling error:"
 msgstr "%s: error mientras que maneja error:"
 
-#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1157
+#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1158
 #, php-format
 msgid "%s: file not found"
 msgstr "%s: fichero no encontrado"
@@ -764,7 +764,7 @@
 #: ../lib/upgrade.php:1112 ../themes/blog/templates/blogform.tmpl:10
 #: ../themes/default/templates/blogform.tmpl:10
 #: ../themes/fusionforge/templates/blogform.tmpl:10
-#: ../themes/fusionforge/themeinfo.php:53
+#: ../themes/fusionforge/themeinfo.php:55
 msgid ": "
 msgstr ": "
 
@@ -797,8 +797,8 @@
 msgid "Dump pages as XHTML"
 msgstr "Páginas de la descarga como XHTML"
 
-#: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1036
-#: ../lib/loadsave.php:1042 ../lib/loadsave.php:1050 ../lib/main.php:1063
+#: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1063
 #: ../lib/main.php:1185 ../lib/main.php:1197 ../lib/PagePerm.php:190
 #: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
@@ -821,7 +821,7 @@
 msgid "PhpWikiAdministration"
 msgstr "AdministraciónDePhpWiki"
 
-#: ../lib/loadsave.php:96 ../lib/MailNotify.php:287 ../lib/MailNotify.php:304
+#: ../lib/loadsave.php:96 ../lib/MailNotify.php:288 ../lib/MailNotify.php:305
 #, php-format
 msgid "Edited by: %s"
 msgstr "Editar: %s"
@@ -881,7 +881,7 @@
 msgid "Dumping Pages"
 msgstr "Descargar Las Páginas"
 
-#: ../lib/loadsave.php:367 ../lib/loadsave.php:629 ../lib/stdlib.php:1019
+#: ../lib/loadsave.php:367 ../lib/loadsave.php:630 ../lib/stdlib.php:1020
 msgid "Skipped."
 msgstr "Saltado."
 
@@ -890,50 +890,50 @@
 msgid "saved as %s"
 msgstr "ahorrado como %s"
 
-#: ../lib/loadsave.php:385 ../lib/loadsave.php:699
+#: ../lib/loadsave.php:385 ../lib/loadsave.php:700
 #: ../lib/plugin/text2png.php:222
 #, php-format
 msgid "couldn't open file '%s' for writing"
 msgstr "Error al escribir la página '%s'"
 
-#: ../lib/loadsave.php:391 ../lib/loadsave.php:709
+#: ../lib/loadsave.php:391 ../lib/loadsave.php:710
 #, php-format
 msgid "%s bytes written"
 msgstr "%s octetos"
 
 # lib/editpage.php:19
-#: ../lib/loadsave.php:683 ../lib/loadsave.php:760 ../lib/loadsave.php:795
-#: ../lib/loadsave.php:825
+#: ../lib/loadsave.php:684 ../lib/loadsave.php:761 ../lib/loadsave.php:796
+#: ../lib/loadsave.php:826
 #, php-format
 msgid "... copied to %s"
 msgstr "... copia de [%s]"
 
 # lib/editpage.php:19
-#: ../lib/loadsave.php:686 ../lib/loadsave.php:762 ../lib/loadsave.php:797
-#: ../lib/loadsave.php:827
+#: ../lib/loadsave.php:687 ../lib/loadsave.php:763 ../lib/loadsave.php:798
+#: ../lib/loadsave.php:828
 #, php-format
 msgid "... not copied to %s"
 msgstr "... non copia de [%s]"
 
-#: ../lib/loadsave.php:707
+#: ../lib/loadsave.php:708
 msgid "saved as "
 msgstr "ahorrado como "
 
-#: ../lib/loadsave.php:770 ../lib/loadsave.php:805 ../lib/loadsave.php:836
+#: ../lib/loadsave.php:771 ../lib/loadsave.php:806 ../lib/loadsave.php:837
 msgid "... not found"
 msgstr "... no encontrado"
 
 # lib/pageinfo.php:9
-#: ../lib/loadsave.php:896
+#: ../lib/loadsave.php:897
 msgid "Empty pagename!"
 msgstr "¡Escriba un nombre de página!"
 
-#: ../lib/loadsave.php:906
+#: ../lib/loadsave.php:907
 #, fuzzy
 msgid "Invalid pagename!"
 msgstr "Username inválido"
 
-#: ../lib/loadsave.php:912 ../lib/loadsave.php:1559 ../lib/PageType.php:136
+#: ../lib/loadsave.php:913 ../lib/loadsave.php:1560 ../lib/PageType.php:136
 #: ../lib/plugin/InterWikiSearch.php:52 ../lib/plugin/WantedPagesOld.php:73
 #: ../lib/plugin/WantedPages.php:51 ../themes/default/templates/info.tmpl:160
 #: ../themes/default/templates/info.tmpl:161
@@ -942,74 +942,74 @@
 msgid "InterWikiMap"
 msgstr "InterMapaDeWiki"
 
-#: ../lib/loadsave.php:969
+#: ../lib/loadsave.php:970
 #, php-format
 msgid "from %s"
 msgstr "de %s"
 
-#: ../lib/loadsave.php:978 ../lib/MailNotify.php:283
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:284
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Página nueva"
 
-#: ../lib/loadsave.php:986
+#: ../lib/loadsave.php:987
 msgid "has edit conflicts - overwriting anyway"
 msgstr "tiene corregir conflictos - sobreescribiendo de todos modos"
 
-#: ../lib/loadsave.php:995
+#: ../lib/loadsave.php:996
 msgid "keep old"
 msgstr ""
 
-#: ../lib/loadsave.php:997
+#: ../lib/loadsave.php:998
 msgid "has edit conflicts - skipped"
 msgstr "tiene corregir los conflictos - saltados"
 
-#: ../lib/loadsave.php:1006
+#: ../lib/loadsave.php:1007
 #, php-format
 msgid "content is identical to current version %d - no new revision created"
 msgstr ""
 "el contenido es idéntico a la versión actual %d - ninguna nueva revisión "
 "creada"
 
-#: ../lib/loadsave.php:1020
+#: ../lib/loadsave.php:1021
 #, php-format
 msgid "- saved to database as version %d"
 msgstr "- ahorrado a la base de datos como versión %d"
 
-#: ../lib/loadsave.php:1026 ../lib/loadsave.php:1297
+#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1298
 #, php-format
 msgid "MIME file %s"
 msgstr "Archivo %s del MIME"
 
-#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1308
+#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1309
 #, php-format
 msgid "Serialized file %s"
 msgstr "Archivo serializado %s"
 
-#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1330
+#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1331
 #, php-format
 msgid "plain file %s"
 msgstr "archivo llano %s"
 
-#: ../lib/loadsave.php:1035 ../lib/plugin/SyncWiki.php:268
+#: ../lib/loadsave.php:1036 ../lib/plugin/SyncWiki.php:268
 msgid "Merge Edit"
 msgstr "Fusión Editar"
 
-#: ../lib/loadsave.php:1041
+#: ../lib/loadsave.php:1042
 msgid "Restore Anyway"
 msgstr "Restore de todos modos"
 
-#: ../lib/loadsave.php:1049
+#: ../lib/loadsave.php:1050
 msgid "Overwrite All"
 msgstr "Sobreescriba Todos"
 
-#: ../lib/loadsave.php:1056
+#: ../lib/loadsave.php:1057
 msgid " Sorry, cannot merge."
 msgstr " Apesadumbrado, no puede combinarse."
 
 # lib/msql.php:237 lib/msql.php:312
-#: ../lib/loadsave.php:1076 ../lib/loadsave.php:1086 ../lib/loadsave.php:1093
-#: ../lib/loadsave.php:1100 ../themes/default/templates/actionbar.tmpl:31
+#: ../lib/loadsave.php:1077 ../lib/loadsave.php:1087 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1101 ../themes/default/templates/actionbar.tmpl:31
 #: ../themes/fusionforge/templates/actionbar.tmpl:77
 #: ../themes/fusionforge/templates/userprefs.tmpl:253
 #: ../themes/MonoBook/templates/actionbar.tmpl:73
@@ -1019,24 +1019,24 @@
 msgid "Revert"
 msgstr "Invierta"
 
-#: ../lib/loadsave.php:1077
+#: ../lib/loadsave.php:1078
 msgid "missing required version argument"
 msgstr "parámetro requerido de la versión que falta"
 
-#: ../lib/loadsave.php:1085
+#: ../lib/loadsave.php:1086
 msgid "no page content"
 msgstr "ningún contenido de la página"
 
-#: ../lib/loadsave.php:1092
+#: ../lib/loadsave.php:1093
 msgid "same version page"
 msgstr "la misma página de la versión"
 
-#: ../lib/loadsave.php:1099
+#: ../lib/loadsave.php:1100
 #, fuzzy
 msgid "Cancelled"
 msgstr "Cancelar"
 
-#: ../lib/loadsave.php:1111 ../lib/plugin/PasswordReset.php:102
+#: ../lib/loadsave.php:1112 ../lib/plugin/PasswordReset.php:102
 #: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/UserPreferences.php:116
 #: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:141
 #: ../lib/plugin/WikiAdminChown.php:170 ../lib/plugin/WikiAdminMarkup.php:162
@@ -1048,7 +1048,7 @@
 msgid "Yes"
 msgstr "Si"
 
-#: ../lib/loadsave.php:1113 ../lib/plugin/PasswordReset.php:105
+#: ../lib/loadsave.php:1114 ../lib/plugin/PasswordReset.php:105
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
 #: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
@@ -1058,7 +1058,7 @@
 #: ../lib/plugin/WikiAdminSearchReplace.php:199
 #: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
 #: ../lib/plugin/WikiAdminSetExternal.php:131
-#: ../lib/plugin/WikiAdminUtils.php:293 ../lib/plugin/WikiFormRich.php:310
+#: ../lib/plugin/WikiAdminUtils.php:293 ../lib/plugin/WikiFormRich.php:307
 #: ../lib/purgepage.php:23 ../lib/removepage.php:23 ../lib/upgrade.php:791
 #: ../themes/default/templates/login.tmpl:88
 #: ../themes/default/templates/userprefs.tmpl:278
@@ -1066,64 +1066,64 @@
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../lib/loadsave.php:1127
+#: ../lib/loadsave.php:1128
 #, php-format
 msgid "revert to version %d"
 msgstr "invierta a la versión %d"
 
 # lib/msql.php:237 lib/msql.php:312
-#: ../lib/loadsave.php:1133
+#: ../lib/loadsave.php:1134
 #, fuzzy, php-format
 msgid "Revert: %s"
 msgstr "Invierta"
 
-#: ../lib/loadsave.php:1134
+#: ../lib/loadsave.php:1135
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr "- versión %d ahorrada a la base de datos como versión %d"
 
-#: ../lib/loadsave.php:1152 ../lib/WikiGroup.php:838
+#: ../lib/loadsave.php:1153 ../lib/WikiGroup.php:838
 #, php-format
 msgid "%s: not defined"
 msgstr "%s: no definido"
 
-#: ../lib/loadsave.php:1162
+#: ../lib/loadsave.php:1163
 msgid "Default InterWiki map file not loaded."
 msgstr "Archivo del InterMapa de Wiki del defecto no cargado."
 
-#: ../lib/loadsave.php:1169 ../lib/PageType.php:298
+#: ../lib/loadsave.php:1170 ../lib/PageType.php:298
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr "Cargamento InterMapaDeWiki del archivo externo %s."
 
-#: ../lib/loadsave.php:1345 ../lib/loadsave.php:1358
+#: ../lib/loadsave.php:1346 ../lib/loadsave.php:1359
 msgid "Skipping"
 msgstr "El saltar"
 
-#: ../lib/loadsave.php:1459
+#: ../lib/loadsave.php:1460
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1466
+#: ../lib/loadsave.php:1467
 #, php-format
 msgid "Bad file type: %s"
 msgstr "Mal tipo del archivo:  %s"
 
-#: ../lib/loadsave.php:1483
+#: ../lib/loadsave.php:1484
 #, php-format
 msgid "Loading '%s'"
 msgstr "'%s' que carga"
 
-#: ../lib/loadsave.php:1515
+#: ../lib/loadsave.php:1516
 msgid "Loading up virgin wiki"
 msgstr "El cargar encima de wiki virginal"
 
-#: ../lib/loadsave.php:1571
+#: ../lib/loadsave.php:1572
 msgid "No uploaded file to upload?"
 msgstr "¿Ningún archivo uploaded a upload?"
 
-#: ../lib/loadsave.php:1574
+#: ../lib/loadsave.php:1575
 #, php-format
 msgid "Uploading %s"
 msgstr "%s uploading"
@@ -1133,43 +1133,43 @@
 msgid "PageChange Notification of %s"
 msgstr "Pagine la notificación del cambio de %s enviado a %s"
 
-#: ../lib/MailNotify.php:228
+#: ../lib/MailNotify.php:229
 #, fuzzy, php-format
 msgid "sent to %s"
 msgstr "Vuelva a %s"
 
 # lib/msql.php:29 lib/mysql.php:36
-#: ../lib/MailNotify.php:234
+#: ../lib/MailNotify.php:235
 #, fuzzy, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "No podía conectar con %s"
 
 # lib/pageinfo.php:21
-#: ../lib/MailNotify.php:256
+#: ../lib/MailNotify.php:257
 msgid "Page change"
 msgstr "Cambio de la página"
 
-#: ../lib/MailNotify.php:288
+#: ../lib/MailNotify.php:289
 #, fuzzy, php-format
 msgid "Summary: %s"
 msgstr "Comentarios"
 
-#: ../lib/MailNotify.php:305
+#: ../lib/MailNotify.php:306
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "La página retitula %s a %s"
 
-#: ../lib/MailNotify.php:342
+#: ../lib/MailNotify.php:343
 #, fuzzy, php-format
 msgid "User %s removed page %s"
 msgstr "Página borrar %s"
 
-#: ../lib/MailNotify.php:378
+#: ../lib/MailNotify.php:379
 #, fuzzy
 msgid "E-Mail address confirmation"
 msgstr "Verificación Del Email"
 
-#: ../lib/MailNotify.php:381
+#: ../lib/MailNotify.php:382
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1560,7 +1560,7 @@
 msgid "Click to de-/select all pages"
 msgstr "Tecleo para de-/seleccionar todas las páginas"
 
-#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:190
+#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:193
 #, php-format
 msgid " ... first %d bytes"
 msgstr " ... primeros octetos de %d"
@@ -1792,7 +1792,7 @@
 "ADVERTENCIA: Se abre la página de InterMapaDeWiki, tan no usando esos "
 "acoplamientos."
 
-#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:833
+#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:834
 #: ../themes/default/templates/navbar.tmpl:8
 #: ../themes/default/templates/navbar.tmpl:10
 #: ../themes/fusionforge/templates/actionbar.tmpl:16
@@ -1839,7 +1839,7 @@
 msgid "Click to display all comments"
 msgstr ""
 
-#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:484
+#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:492
 msgid "Click to display"
 msgstr ""
 
@@ -1899,111 +1899,111 @@
 msgid "Authenticated users on this wiki (%d total):"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:162
-#: ../lib/plugin/AnalyseAccessLogSql.php:197
-msgid "0 - last minute"
-msgstr ""
-
 #: ../lib/plugin/AnalyseAccessLogSql.php:163
 #: ../lib/plugin/AnalyseAccessLogSql.php:198
-msgid "1 - 1 minute to 1 hour"
+msgid "0 - last minute"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:164
 #: ../lib/plugin/AnalyseAccessLogSql.php:199
-msgid "2 - 1 hour to 1 day"
+msgid "1 - 1 minute to 1 hour"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:165
 #: ../lib/plugin/AnalyseAccessLogSql.php:200
-msgid "3 - 1 day to 1 week"
+msgid "2 - 1 hour to 1 day"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:166
 #: ../lib/plugin/AnalyseAccessLogSql.php:201
-msgid "4 - 1 week to 1 month"
+msgid "3 - 1 day to 1 week"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:167
 #: ../lib/plugin/AnalyseAccessLogSql.php:202
-msgid "5 - 1 month to 1 year"
+msgid "4 - 1 week to 1 month"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:168
 #: ../lib/plugin/AnalyseAccessLogSql.php:203
+msgid "5 - 1 month to 1 year"
+msgstr ""
+
+#: ../lib/plugin/AnalyseAccessLogSql.php:169
+#: ../lib/plugin/AnalyseAccessLogSql.php:204
 msgid "6 - more than 1 year"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:222
+#: ../lib/plugin/AnalyseAccessLogSql.php:223
 msgid "referring_urls"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:223
+#: ../lib/plugin/AnalyseAccessLogSql.php:224
 msgid "external_referers"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:224
+#: ../lib/plugin/AnalyseAccessLogSql.php:225
 msgid "referring_domains"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:225
+#: ../lib/plugin/AnalyseAccessLogSql.php:226
 msgid "remote_hosts"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:226
+#: ../lib/plugin/AnalyseAccessLogSql.php:227
 msgid "users"
 msgstr "usuarios"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:227
+#: ../lib/plugin/AnalyseAccessLogSql.php:228
 msgid "host_users"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:228
+#: ../lib/plugin/AnalyseAccessLogSql.php:229
 msgid "search_bots"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:229
+#: ../lib/plugin/AnalyseAccessLogSql.php:230
 msgid "search_bots_hits"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:231
+#: ../lib/plugin/AnalyseAccessLogSql.php:232
 msgid "minutes"
 msgstr "minutas"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:232
+#: ../lib/plugin/AnalyseAccessLogSql.php:233
 msgid "hours"
 msgstr "horas"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:233 ../lib/plugin/VisualWiki.php:498
+#: ../lib/plugin/AnalyseAccessLogSql.php:234 ../lib/plugin/VisualWiki.php:498
 msgid "days"
 msgstr "dias"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:234
+#: ../lib/plugin/AnalyseAccessLogSql.php:235
 msgid "weeks"
 msgstr "semanas"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:252
+#: ../lib/plugin/AnalyseAccessLogSql.php:253
 msgid "AnalyseAccessLogSql"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:256
+#: ../lib/plugin/AnalyseAccessLogSql.php:257
 msgid "Show summary information from the access log table."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:264
+#: ../lib/plugin/AnalyseAccessLogSql.php:265
 msgid "The requested information is available only to Administrators."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:267
+#: ../lib/plugin/AnalyseAccessLogSql.php:268
 msgid "The SQL_ACCESS_LOG is not enabled."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:278
+#: ../lib/plugin/AnalyseAccessLogSql.php:279
 #, php-format
 msgid "Unrecognised parameter 'mode=%s'"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:297
+#: ../lib/plugin/AnalyseAccessLogSql.php:298
 #: ../lib/plugin/_BackendInfo.php:119 ../lib/plugin/SemanticSearch.php:411
 #: ../lib/plugin/WatchPage.php:57
 msgid "<empty>"
@@ -2031,11 +2031,11 @@
 msgid "AppendText to %s"
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:125
+#: ../lib/plugin/AppendText.php:126
 msgid "Page successfully updated."
 msgstr "Página actualizada con éxito."
 
-#: ../lib/plugin/AppendText.php:142
+#: ../lib/plugin/AppendText.php:143
 #, php-format
 msgid "Go to %s."
 msgstr ""
@@ -2397,28 +2397,36 @@
 msgid "No page specified."
 msgstr "Ningunos cambios encontrados"
 
-#: ../lib/plugin/CreateToc.php:389 ../lib/plugin/Template.php:129
+#: ../lib/plugin/CreateToc.php:389
+msgid "Error: firstlevelstyle must be 'number', 'letter' or 'roman'"
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:394 ../lib/plugin/Template.php:129
 #, fuzzy, php-format
 msgid "Page '%s' does not exist."
 msgstr "La página '%s' del grupo no existe"
 
-#: ../lib/plugin/CreateToc.php:394 ../lib/plugin/Diff.php:86
+#: ../lib/plugin/CreateToc.php:399 ../lib/plugin/Diff.php:86
 #: ../lib/plugin/PageDump.php:85
 #, php-format
 msgid "Illegal access to page %s: no read access"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:403 ../lib/plugin/IncludePage.php:104
-#: ../lib/plugin/PageGroup.php:124 ../lib/plugin/Template.php:142
+#: ../lib/plugin/CreateToc.php:407
+msgid "Error: version must be a positive integer."
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:411 ../lib/plugin/IncludePage.php:107
+#: ../lib/plugin/PageGroup.php:124 ../lib/plugin/Template.php:145
 #, fuzzy, php-format
 msgid "%s: no such revision %d."
 msgstr "%s: ninguna tal clase"
 
-#: ../lib/plugin/CreateToc.php:414
+#: ../lib/plugin/CreateToc.php:422
 msgid "CreateToc disabled for old markup."
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:477
+#: ../lib/plugin/CreateToc.php:485
 msgid "Click to display to TOC"
 msgstr ""
 
@@ -2550,7 +2558,7 @@
 
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:63
 #: ../lib/plugin/PageGroup.php:98 ../lib/plugin/SyncWiki.php:70
-#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:193
+#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:190
 #, php-format
 msgid "A required argument '%s' is missing."
 msgstr ""
@@ -2624,7 +2632,7 @@
 #: ../lib/plugin/WikiAdminSearchReplace.php:121
 #: ../lib/plugin/WikiAdminSetAcl.php:141
 #: ../lib/plugin/WikiAdminSetExternal.php:96
-#: ../lib/plugin/WikiAdminUtils.php:64 ../lib/plugin/WikiFormRich.php:176
+#: ../lib/plugin/WikiAdminUtils.php:64
 msgid "Plugin not run: not in browse mode"
 msgstr ""
 
@@ -2837,8 +2845,8 @@
 msgid "Include text from another wiki page."
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:85 ../lib/plugin/IncludePage.php:125
-#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:164
+#: ../lib/plugin/IncludePage.php:85 ../lib/plugin/IncludePage.php:128
+#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:167
 #: ../lib/plugin/UnfoldSubpages.php:100 ../lib/plugin/UnfoldSubpages.php:130
 #, php-format
 msgid "Recursive inclusion of page %s ignored"
@@ -2855,19 +2863,23 @@
 msgid "Illegal inclusion of page %s: no read access"
 msgstr ""
 
+#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/Template.php:141
+msgid "Error: rev must be a positive integer."
+msgstr ""
+
 # lib/msql.php:237 lib/msql.php:312
-#: ../lib/plugin/IncludePage.php:154
+#: ../lib/plugin/IncludePage.php:157
 #, fuzzy, php-format
 msgid "Included from %s (revision %d)"
 msgstr "Inserción de '%s'"
 
 # lib/msql.php:237 lib/msql.php:312
-#: ../lib/plugin/IncludePage.php:156
+#: ../lib/plugin/IncludePage.php:159
 #, php-format
 msgid "Included from %s"
 msgstr "Inserción de '%s'"
 
-#: ../lib/plugin/IncludePage.php:181
+#: ../lib/plugin/IncludePage.php:184
 #, php-format
 msgid " ... first %d lines"
 msgstr ""
@@ -3338,7 +3350,7 @@
 msgid "Contents"
 msgstr ""
 
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2174
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2175
 #, php-format
 msgid "<%s: no such section>"
 msgstr ""
@@ -5902,7 +5914,7 @@
 msgid "Access Restrictions"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:113 ../lib/WikiUserNew.php:1781
+#: ../lib/plugin/WikiAdminUtils.php:113 ../lib/WikiUserNew.php:1782
 msgid "Email Verification"
 msgstr "Verificación Del Email"
 
@@ -6427,139 +6439,139 @@
 msgid "the file '%s'"
 msgstr "el archivo %s"
 
-#: ../lib/stdlib.php:388 ../lib/stdlib.php:422
+#: ../lib/stdlib.php:389 ../lib/stdlib.php:423
 msgid "BAD URL -- remove all of <, >, \""
 msgstr ""
 
-#: ../lib/stdlib.php:474
+#: ../lib/stdlib.php:475
 #, php-format
 msgid "Invalid image attribute \"%s\" %s=%s"
 msgstr ""
 
-#: ../lib/stdlib.php:486
+#: ../lib/stdlib.php:487
 #, php-format
 msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:492
+#: ../lib/stdlib.php:493
 #, php-format
 msgid ""
 "Invalid image link fixed \"%s\" => \"%s\".\n"
 " Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:511 ../lib/stdlib.php:548
+#: ../lib/stdlib.php:512 ../lib/stdlib.php:549
 msgid "Invalid image size"
 msgstr ""
 
-#: ../lib/stdlib.php:722
+#: ../lib/stdlib.php:723
 msgid "BAD phpwiki: URL"
 msgstr ""
 
-#: ../lib/stdlib.php:760
+#: ../lib/stdlib.php:761
 msgid "Lock page to enable link"
 msgstr ""
 
-#: ../lib/stdlib.php:890
+#: ../lib/stdlib.php:891
 #, php-format
 msgid "'%s': Bad page name: %s"
 msgstr ""
 
-#: ../lib/stdlib.php:920 ../lib/stdlib.php:951
+#: ../lib/stdlib.php:921 ../lib/stdlib.php:952
 #, php-format
 msgid "Leading %s not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:935
+#: ../lib/stdlib.php:936
 msgid "White space converted to single space"
 msgstr ""
 
-#: ../lib/stdlib.php:941
+#: ../lib/stdlib.php:942
 msgid "Control characters not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:962
+#: ../lib/stdlib.php:963
 msgid "too long"
 msgstr "demasiado de largo"
 
-#: ../lib/stdlib.php:971
+#: ../lib/stdlib.php:972
 #, php-format
 msgid "Illegal chars %s removed"
 msgstr "Los carbones ilegales %s quitaron"
 
-#: ../lib/stdlib.php:1017
+#: ../lib/stdlib.php:1018
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:1018
+#: ../lib/stdlib.php:1019
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1281
+#: ../lib/stdlib.php:1282
 msgid "Revision Not Found"
 msgstr "Revisión No encontrada"
 
 # lib/pageinfo.php:36
-#: ../lib/stdlib.php:1282
+#: ../lib/stdlib.php:1283
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr "Estoy apesadumbrado.  La versión %d de %s no está en la base de datos."
 
-#: ../lib/stdlib.php:1285
+#: ../lib/stdlib.php:1286
 msgid "Bad Version"
 msgstr ""
 
-#: ../lib/stdlib.php:1421
+#: ../lib/stdlib.php:1422
 msgid "-???"
 msgstr ""
 
-#: ../lib/stdlib.php:1424
+#: ../lib/stdlib.php:1425
 #, php-format
 msgid "%s B"
 msgstr ""
 
-#: ../lib/stdlib.php:1426 ../themes/MonoBook/templates/info.tmpl:30
+#: ../lib/stdlib.php:1427 ../themes/MonoBook/templates/info.tmpl:30
 #, php-format
 msgid "%s bytes"
 msgstr "%s octetos"
 
-#: ../lib/stdlib.php:1431
+#: ../lib/stdlib.php:1432
 #, php-format
 msgid "%s KiB"
 msgstr ""
 
-#: ../lib/stdlib.php:1433 ../themes/MonoBook/templates/info.tmpl:33
+#: ../lib/stdlib.php:1434 ../themes/MonoBook/templates/info.tmpl:33
 #, fuzzy, php-format
 msgid "%s KiB (%s bytes)"
 msgstr "%s Kb (%s octetos)"
 
-#: ../lib/stdlib.php:1520 ../lib/XmlElement.php:487
+#: ../lib/stdlib.php:1521 ../lib/XmlElement.php:487
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr ""
 
-#: ../lib/stdlib.php:1529
+#: ../lib/stdlib.php:1530
 #, php-format
 msgid "%s: argument index out of range"
 msgstr ""
 
-#: ../lib/stdlib.php:1608 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1609 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr ""
 
-#: ../lib/stdlib.php:1615
+#: ../lib/stdlib.php:1616
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr ""
 
-#: ../lib/stdlib.php:1946
+#: ../lib/stdlib.php:1947
 msgid "Okay"
 msgstr ""
 
-#: ../lib/stdlib.php:2131 ../lib/stdlib.php:2144
+#: ../lib/stdlib.php:2132 ../lib/stdlib.php:2145
 #, php-format
 msgid "... (first %s words)"
 msgstr ""
@@ -6867,13 +6879,13 @@
 msgid "%s: Date of new revision is %s"
 msgstr "%s: La fecha de la nueva revisión es %s"
 
-#: ../lib/WikiDB.php:1660 ../lib/WikiDB.php:1664
+#: ../lib/WikiDB.php:1661 ../lib/WikiDB.php:1665
 #: ../themes/default/templates/homepage.tmpl:7
 #, php-format
 msgid "Describe %s here."
 msgstr "Describe %s aquí."
 
-#: ../lib/WikiDB.php:1699
+#: ../lib/WikiDB.php:1700
 ...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[8078] trunk/themes/fusionforge/themeinfo.php

From: <var...@us...> - 2011-05-18 16:44:37

Revision: 8078
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8078&view=rev
Author:   vargenau
Date:     2011-05-18 16:44:31 +0000 (Wed, 18 May 2011)

Log Message:
-----------
Test if defined

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

Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php	2011-05-18 16:24:52 UTC (rev 8077)
+++ trunk/themes/fusionforge/themeinfo.php	2011-05-18 16:44:31 UTC (rev 8078)
@@ -38,7 +38,7 @@
             //group is private
             if (!$project->isPublic()) {
                 //if it's a private group, you must be a member of that group
-                if (RBAC) {
+                if (defined('RBAC') and RBAC) {
                     session_require_perm('project_read', $group_id);
                 } else {
                     session_require(array('group'=>$group_id));


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8077] trunk/LICENSE

From: <var...@us...> - 2011-05-18 16:24:58

Revision: 8077
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8077&view=rev
Author:   vargenau
Date:     2011-05-18 16:24:52 +0000 (Wed, 18 May 2011)

Log Message:
-----------
New FSF address; GNU Lesser

Modified Paths:
--------------
    trunk/LICENSE

Modified: trunk/LICENSE
===================================================================
--- trunk/LICENSE	2011-05-18 16:16:58 UTC (rev 8076)
+++ trunk/LICENSE	2011-05-18 16:24:52 UTC (rev 8077)
@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -56,7 +56,7 @@
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -255,7 +255,7 @@
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -307,7 +307,6 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
@@ -336,5 +335,5 @@
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8076] trunk/lib/WikiDB/adodb/license.txt

From: <var...@us...> - 2011-05-18 16:17:05

Revision: 8076
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8076&view=rev
Author:   vargenau
Date:     2011-05-18 16:16:58 +0000 (Wed, 18 May 2011)

Log Message:
-----------
New FSF address

Modified Paths:
--------------
    trunk/lib/WikiDB/adodb/license.txt

Modified: trunk/lib/WikiDB/adodb/license.txt
===================================================================
--- trunk/lib/WikiDB/adodb/license.txt	2011-05-18 16:10:53 UTC (rev 8075)
+++ trunk/lib/WikiDB/adodb/license.txt	2011-05-18 16:16:58 UTC (rev 8076)
@@ -36,147 +36,505 @@
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ==========================================================
-GNU LESSER GENERAL PUBLIC LICENSE
-Version 2.1, February 1999 
- 
-Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
 
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
 [This is the first released version of the Lesser GPL.  It also counts
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
- 
- 
-Preamble
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. 
 
-This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. 
+                            Preamble
 
-When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. 
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
 
-To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. 
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
 
-For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. 
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
 
-We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. 
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
 
-To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. 
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
 
-Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. 
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
 
-Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. 
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
 
-When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. 
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
 
-We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. 
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
 
-For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. 
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
 
-In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. 
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
 
-Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. 
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
 
-The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. 
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
 
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". 
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
 
-A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. 
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
 
-The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) 
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
 
-"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. 
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
 
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
 
-1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. 
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
 
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
 
-2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: 
+    a) The modified work must itself be a software library.
 
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
 
-a) The modified work must itself be a software library. 
-b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. 
-c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. 
-d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. 
-(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) 
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
 
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. 
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
 
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. 
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
 
-In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
 
-3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. 
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
 
-Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. 
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
 
-This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
 
-4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. 
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
 
-If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
 
-5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. 
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
 
-However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. 
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
 
-When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. 
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
 
-If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) 
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
 
-Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
 
-6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. 
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
 
-You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: 
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
 
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
 
-a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) 
-b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. 
-c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. 
-d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. 
-e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. 
-For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. 
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
 
-It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
 
-7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: 
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
 
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
 
-a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. 
-b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 
-8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
 
-9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
 
-10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
 
-11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. 
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
 
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. 
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
 
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. 
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
 
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
 
-12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
 
-13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. 
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
 
-Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
 
-14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. 
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
 
-NO WARRANTY 
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
 
-15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
 
-16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
+                            NO WARRANTY
 
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
 
-END OF TERMS AND CONDITIONS
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!


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

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

From: <var...@us...> - 2011-05-18 16:11:00

Revision: 8075
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8075&view=rev
Author:   vargenau
Date:     2011-05-18 16:10:53 +0000 (Wed, 18 May 2011)

Log Message:
-----------
New FSF address

Modified Paths:
--------------
    trunk/lib/nusoap/README.txt
    trunk/lib/pear/DB/Pager.php
    trunk/lib/pear/DB/ldap.php

Modified: trunk/lib/nusoap/README.txt
===================================================================
--- trunk/lib/nusoap/README.txt	2011-05-18 16:07:24 UTC (rev 8074)
+++ trunk/lib/nusoap/README.txt	2011-05-18 16:10:53 UTC (rev 8075)
@@ -15,7 +15,7 @@
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 If you have any questions or comments, please email or visit the website:
 

Modified: trunk/lib/pear/DB/Pager.php
===================================================================
--- trunk/lib/pear/DB/Pager.php	2011-05-18 16:07:24 UTC (rev 8074)
+++ trunk/lib/pear/DB/Pager.php	2011-05-18 16:10:53 UTC (rev 8075)
@@ -17,7 +17,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //
 //
 // $Id$

Modified: trunk/lib/pear/DB/ldap.php
===================================================================
--- trunk/lib/pear/DB/ldap.php	2011-05-18 16:07:24 UTC (rev 8074)
+++ trunk/lib/pear/DB/ldap.php	2011-05-18 16:10:53 UTC (rev 8075)
@@ -17,7 +17,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //
 // Contributors
 // - Piotr Roszatycki <Pio...@ne...>


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8074] trunk/lib/nusoap/lgpl.txt

From: <var...@us...> - 2011-05-18 16:07:30

Revision: 8074
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8074&view=rev
Author:   vargenau
Date:     2011-05-18 16:07:24 +0000 (Wed, 18 May 2011)

Log Message:
-----------
New FSF address

Modified Paths:
--------------
    trunk/lib/nusoap/lgpl.txt

Modified: trunk/lib/nusoap/lgpl.txt
===================================================================
--- trunk/lib/nusoap/lgpl.txt	2011-05-18 15:52:14 UTC (rev 8073)
+++ trunk/lib/nusoap/lgpl.txt	2011-05-18 16:07:24 UTC (rev 8074)
@@ -1,8 +1,8 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -10,7 +10,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -112,7 +112,7 @@
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
+                  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -146,7 +146,7 @@
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -432,7 +432,7 @@
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,7 +455,7 @@
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
            How to Apply These Terms to Your New Libraries
 
@@ -485,7 +485,7 @@
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -500,5 +500,3 @@
   Ty Coon, President of Vice
 
 That's all there is to it!
-
-


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8073] trunk/admin/wiki2omega

From: <var...@us...> - 2011-05-18 15:52:20

Revision: 8073
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8073&view=rev
Author:   vargenau
Date:     2011-05-18 15:52:14 +0000 (Wed, 18 May 2011)

Log Message:
-----------
New FSF address

Modified Paths:
--------------
    trunk/admin/wiki2omega

Modified: trunk/admin/wiki2omega
===================================================================
--- trunk/admin/wiki2omega	2011-05-18 15:45:03 UTC (rev 8072)
+++ trunk/admin/wiki2omega	2011-05-18 15:52:14 UTC (rev 8073)
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 =pod
 


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

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

From: <var...@us...> - 2011-05-18 15:45:09

Revision: 8072
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8072&view=rev
Author:   vargenau
Date:     2011-05-18 15:45:03 +0000 (Wed, 18 May 2011)

Log Message:
-----------
Fix header

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

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2011-05-18 14:56:14 UTC (rev 8071)
+++ trunk/lib/WikiUserNew.php	2011-05-18 15:45:03 UTC (rev 8072)
@@ -1,25 +1,26 @@
 <?php //-*-php-*-
 //$Id$
 /* Copyright (C) 2004,2005,2006,2007,2009,2010 $ThePhpWikiProgrammingTeam
-* Copyright (C) 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
-* Copyright (C) 2009-2010 Roger Guignard, Alcatel-Lucent
-*
-* 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.,
-* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ * Copyright (C) 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright (C) 2009-2010 Roger Guignard, Alcatel-Lucent
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 /**
  * This is a complete OOP rewrite of the old WikiUser code with various
  * configurable external authentication methods.


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

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

From: <var...@us...> - 2011-05-18 14:56:25

Revision: 8071
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8071&view=rev
Author:   vargenau
Date:     2011-05-18 14:56:14 +0000 (Wed, 18 May 2011)

Log Message:
-----------
New FSF address

Modified Paths:
--------------
    trunk/LICENSE
    trunk/admin/wiki2omega
    trunk/config/migrate-phpwiki-config
    trunk/configurator.php
    trunk/g
    trunk/index.php
    trunk/lib/AccessLog.php
    trunk/lib/ArchiveCleaner.php
    trunk/lib/AtomParser.php
    trunk/lib/BlockParser.php
    trunk/lib/CachedMarkup.php
    trunk/lib/Captcha.php
    trunk/lib/DbSession/ADODB.php
    trunk/lib/EditToolbar.php
    trunk/lib/Google.php
    trunk/lib/HtmlParser.php
    trunk/lib/IniConfig.php
    trunk/lib/InlineParser.php
    trunk/lib/MailNotify.php
    trunk/lib/PageList.php
    trunk/lib/PagePerm.php
    trunk/lib/PageType.php
    trunk/lib/Request.php
    trunk/lib/RssParser.php
    trunk/lib/SemanticWeb.php
    trunk/lib/SpamBlocklist.php
    trunk/lib/WikiDB/backend/ADODB.php
    trunk/lib/WikiDB/backend/PDO.php
    trunk/lib/WikiDB/backend/PDO_mysql.php
    trunk/lib/WikiDB/backend/PDO_oci8.php
    trunk/lib/WikiDB/backend/PDO_pgsql.php
    trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
    trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
    trunk/lib/WikiDB/backend/file.php
    trunk/lib/WikiDB/backend/flatfile.php
    trunk/lib/WikiDB/backend.php
    trunk/lib/WikiDB/file.php
    trunk/lib/WikiDB/flatfile.php
    trunk/lib/WikiGroup.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/WikiTheme.php
    trunk/lib/WikiUser/AdoDb.php
    trunk/lib/WikiUser/BogoLogin.php
    trunk/lib/WikiUser/Db.php
    trunk/lib/WikiUser/EMailConfirm.php
    trunk/lib/WikiUser/Facebook.php
    trunk/lib/WikiUser/File.php
    trunk/lib/WikiUser/Forbidden.php
    trunk/lib/WikiUser/FusionForge.php
    trunk/lib/WikiUser/HttpAuth.php
    trunk/lib/WikiUser/HttpAuthUpper.php
    trunk/lib/WikiUser/IMAP.php
    trunk/lib/WikiUser/LDAP.php
    trunk/lib/WikiUser/LdapUpper.php
    trunk/lib/WikiUser/OpenID.php
    trunk/lib/WikiUser/POP3.php
    trunk/lib/WikiUser/PdoDb.php
    trunk/lib/WikiUser/PearDb.php
    trunk/lib/WikiUser/PersonalPage.php
    trunk/lib/WikiUser/Session.php
    trunk/lib/WikiUserNew.php
    trunk/lib/XmlParser.php
    trunk/lib/XmlRpcServer.php
    trunk/lib/imagecache.php
    trunk/lib/imdb.php
    trunk/lib/install.php
    trunk/lib/loadsave.php
    trunk/lib/main.php
    trunk/lib/nusoap/nusoap.php
    trunk/lib/pdf.php
    trunk/lib/plugin/AddComment.php
    trunk/lib/plugin/AllPages.php
    trunk/lib/plugin/AllUsers.php
    trunk/lib/plugin/AnalyseAccessLogSql.php
    trunk/lib/plugin/AppendText.php
    trunk/lib/plugin/AsciiMath.php
    trunk/lib/plugin/AsciiSVG.php
    trunk/lib/plugin/AtomFeed.php
    trunk/lib/plugin/AuthorHistory.php
    trunk/lib/plugin/BackLinks.php
    trunk/lib/plugin/BlogArchives.php
    trunk/lib/plugin/BlogJournal.php
    trunk/lib/plugin/BoxRight.php
    trunk/lib/plugin/CacheTest.php
    trunk/lib/plugin/Calendar.php
    trunk/lib/plugin/CalendarList.php
    trunk/lib/plugin/CategoryPage.php
    trunk/lib/plugin/Chart.php
    trunk/lib/plugin/Comment.php
    trunk/lib/plugin/CreateBib.php
    trunk/lib/plugin/CreatePage.php
    trunk/lib/plugin/CreateToc.php
    trunk/lib/plugin/CurrentTime.php
    trunk/lib/plugin/DeadEndPages.php
    trunk/lib/plugin/Diff.php
    trunk/lib/plugin/DynamicIncludePage.php
    trunk/lib/plugin/EditMetaData.php
    trunk/lib/plugin/ExternalSearch.php
    trunk/lib/plugin/FacebookLike.php
    trunk/lib/plugin/FileInfo.php
    trunk/lib/plugin/FoafViewer.php
    trunk/lib/plugin/FrameInclude.php
    trunk/lib/plugin/FullTextSearch.php
    trunk/lib/plugin/FuzzyPages.php
    trunk/lib/plugin/GoTo.php
    trunk/lib/plugin/GoogleMaps.php
    trunk/lib/plugin/GooglePlugin.php
    trunk/lib/plugin/GraphViz.php
    trunk/lib/plugin/HelloWorld.php
    trunk/lib/plugin/HtmlConverter.php
    trunk/lib/plugin/Imdb.php
    trunk/lib/plugin/IncludePage.php
    trunk/lib/plugin/IncludePages.php
    trunk/lib/plugin/IncludeSiteMap.php
    trunk/lib/plugin/IncludeTree.php
    trunk/lib/plugin/InterWikiSearch.php
    trunk/lib/plugin/JabberPresence.php
    trunk/lib/plugin/LdapSearch.php
    trunk/lib/plugin/LikePages.php
    trunk/lib/plugin/LinkDatabase.php
    trunk/lib/plugin/LinkSearch.php
    trunk/lib/plugin/ListPages.php
    trunk/lib/plugin/ListRelations.php
    trunk/lib/plugin/ListSubpages.php
    trunk/lib/plugin/MediawikiTable.php
    trunk/lib/plugin/ModeratedPage.php
    trunk/lib/plugin/MostPopular.php
    trunk/lib/plugin/NewPagesPerUser.php
    trunk/lib/plugin/NoCache.php
    trunk/lib/plugin/OldStyleTable.php
    trunk/lib/plugin/OrphanedPages.php
    trunk/lib/plugin/PageDump.php
    trunk/lib/plugin/PageGroup.php
    trunk/lib/plugin/PageHistory.php
    trunk/lib/plugin/PageInfo.php
    trunk/lib/plugin/PageTrail.php
    trunk/lib/plugin/PasswordReset.php
    trunk/lib/plugin/PhotoAlbum.php
    trunk/lib/plugin/PhpHighlight.php
    trunk/lib/plugin/PhpWeather.php
    trunk/lib/plugin/Ploticus.php
    trunk/lib/plugin/PluginManager.php
    trunk/lib/plugin/PopUp.php
    trunk/lib/plugin/PopularNearby.php
    trunk/lib/plugin/PopularTags.php
    trunk/lib/plugin/PreferenceApp.php
    trunk/lib/plugin/PrevNext.php
    trunk/lib/plugin/Processing.php
    trunk/lib/plugin/RandomPage.php
    trunk/lib/plugin/RateIt.php
    trunk/lib/plugin/RawHtml.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/plugin/RecentChangesCached.php
    trunk/lib/plugin/RecentComments.php
    trunk/lib/plugin/RecentEdits.php
    trunk/lib/plugin/RecentReferrers.php
    trunk/lib/plugin/RedirectTo.php
    trunk/lib/plugin/RelatedChanges.php
    trunk/lib/plugin/RichTable.php
    trunk/lib/plugin/RssFeed.php
    trunk/lib/plugin/SearchHighlight.php
    trunk/lib/plugin/SemanticRelations.php
    trunk/lib/plugin/SemanticSearch.php
    trunk/lib/plugin/SemanticSearchAdvanced.php
    trunk/lib/plugin/SiteMap.php
    trunk/lib/plugin/SpellCheck.php
    trunk/lib/plugin/SqlResult.php
    trunk/lib/plugin/SyncWiki.php
    trunk/lib/plugin/SyntaxHighlighter.php
    trunk/lib/plugin/SystemInfo.php
    trunk/lib/plugin/TeX2png.php
    trunk/lib/plugin/Template.php
    trunk/lib/plugin/TexToPng.php
    trunk/lib/plugin/TitleSearch.php
    trunk/lib/plugin/Transclude.php
    trunk/lib/plugin/TranslateText.php
    trunk/lib/plugin/UnfoldSubpages.php
    trunk/lib/plugin/UpLoad.php
    trunk/lib/plugin/UriResolver.php
    trunk/lib/plugin/UserPreferences.php
    trunk/lib/plugin/UserRatings.php
    trunk/lib/plugin/Video.php
    trunk/lib/plugin/VisualWiki.php
    trunk/lib/plugin/WantedPages.php
    trunk/lib/plugin/WantedPagesOld.php
    trunk/lib/plugin/WatchPage.php
    trunk/lib/plugin/WhoIsOnline.php
    trunk/lib/plugin/WikiAdminChmod.php
    trunk/lib/plugin/WikiAdminChown.php
    trunk/lib/plugin/WikiAdminMarkup.php
    trunk/lib/plugin/WikiAdminPurge.php
    trunk/lib/plugin/WikiAdminRemove.php
    trunk/lib/plugin/WikiAdminRename.php
    trunk/lib/plugin/WikiAdminSearchReplace.php
    trunk/lib/plugin/WikiAdminSelect.php
    trunk/lib/plugin/WikiAdminSetAcl.php
    trunk/lib/plugin/WikiAdminSetAclSimple.php
    trunk/lib/plugin/WikiAdminSetExternal.php
    trunk/lib/plugin/WikiAdminUtils.php
    trunk/lib/plugin/WikiBlog.php
    trunk/lib/plugin/WikiForm.php
    trunk/lib/plugin/WikiFormRich.php
    trunk/lib/plugin/WikiForum.php
    trunk/lib/plugin/WikiPoll.php
    trunk/lib/plugin/WikicreoleTable.php
    trunk/lib/plugin/YouTube.php
    trunk/lib/plugin/_AuthInfo.php
    trunk/lib/plugin/_BackendInfo.php
    trunk/lib/plugin/_GroupInfo.php
    trunk/lib/plugin/_PreferencesInfo.php
    trunk/lib/plugin/_Retransform.php
    trunk/lib/plugin/_WikiTranslation.php
    trunk/lib/plugin/text2png.php
    trunk/lib/stdlib.php
    trunk/lib/upgrade.php
    trunk/lib/wikilens/PageListColumns.php
    trunk/lib/wikilens/RatingsUser.php
    trunk/lib/wikilens/Utils.php
    trunk/passencrypt.php
    trunk/tests/CompatInfo.php
    trunk/tests/unit/lib/AtomParserTest.php
    trunk/tests/unit/lib/plugin/AtomFeedTest.php
    trunk/tests/unit/test.php
    trunk/themes/fusionforge/fusionforge-autonumbering.css
    trunk/themes/fusionforge/fusionforge-fullscreen.css
    trunk/themes/fusionforge/fusionforge-print.css
    trunk/themes/fusionforge/fusionforge-rereading.css
    trunk/themes/fusionforge/fusionforge.css
    trunk/wikiadmin.php

Modified: trunk/LICENSE
===================================================================
--- trunk/LICENSE	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/LICENSE	2011-05-18 14:56:14 UTC (rev 8071)
@@ -303,9 +303,9 @@
     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 this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 Also add information on how to contact you by electronic and paper mail.

Modified: trunk/admin/wiki2omega
===================================================================
--- trunk/admin/wiki2omega	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/admin/wiki2omega	2011-05-18 14:56:14 UTC (rev 8071)
@@ -11,8 +11,8 @@
 # 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 this program; if not, write to the Free Software
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 =pod

Modified: trunk/config/migrate-phpwiki-config
===================================================================
--- trunk/config/migrate-phpwiki-config	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/config/migrate-phpwiki-config	2011-05-18 14:56:14 UTC (rev 8071)
@@ -19,9 +19,9 @@
 # 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
+# You should have received a copy of the GNU General Public License along
+# with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 # Store the values
 # In the form $values{$varname} = (value, comment_state)

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/configurator.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -18,9 +18,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/g
===================================================================
--- trunk/g	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/g	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 /*

Modified: trunk/index.php
===================================================================
--- trunk/index.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/index.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -25,9 +25,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 require_once (dirname(__FILE__).'/lib/prepend.php');

Modified: trunk/lib/AccessLog.php
===================================================================
--- trunk/lib/AccessLog.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/AccessLog.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/ArchiveCleaner.php
===================================================================
--- trunk/lib/ArchiveCleaner.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/ArchiveCleaner.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -14,9 +14,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 class ArchiveCleaner

Modified: trunk/lib/AtomParser.php
===================================================================
--- trunk/lib/AtomParser.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/AtomParser.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /**
  * This class is a poor-man Atom parser, it does no validation of the feed.

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/BlockParser.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 //require_once('lib/HtmlElement.php');
 require_once('lib/CachedMarkup.php');

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/CachedMarkup.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 require_once("lib/Units.php");

Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/Captcha.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -17,9 +17,9 @@
  * 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 This File; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with This File; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 class Captcha {

Modified: trunk/lib/DbSession/ADODB.php
===================================================================
--- trunk/lib/DbSession/ADODB.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/DbSession/ADODB.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -14,9 +14,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/EditToolbar.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/Google.php
===================================================================
--- trunk/lib/Google.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/Google.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -19,8 +19,8 @@
  Lesser General Public License for more details.
 
  You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ License along with this library; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
  If you have any questions or comments, please email:
 

Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/HtmlParser.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -20,9 +20,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/IniConfig.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -28,9 +28,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/InlineParser.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /**
  * This is the code which deals with the inline part of the (new-style)

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/MailNotify.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/PageList.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/PagePerm.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/PageType.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 require_once('lib/CachedMarkup.php');

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/Request.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 class Request {

Modified: trunk/lib/RssParser.php
===================================================================
--- trunk/lib/RssParser.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/RssParser.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -24,9 +24,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/SemanticWeb.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -98,9 +98,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 require_once('lib/RssWriter.php');

Modified: trunk/lib/SpamBlocklist.php
===================================================================
--- trunk/lib/SpamBlocklist.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/SpamBlocklist.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -14,9 +14,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
 

Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend/ADODB.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend/PDO.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/WikiDB/backend/PDO_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_mysql.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend/PDO_mysql.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/WikiDB/backend/PDO_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_oci8.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend/PDO_oci8.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/WikiDB/backend/PDO_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_pgsql.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend/PDO_pgsql.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -17,9 +17,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 /*

Modified: trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend/file.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/WikiDB/backend/flatfile.php
===================================================================
--- trunk/lib/WikiDB/backend/flatfile.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend/flatfile.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,8 +15,8 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 

Modified: trunk/lib/WikiDB/file.php
===================================================================
--- trunk/lib/WikiDB/file.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/file.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -17,9 +17,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 

Modified: trunk/lib/WikiDB/flatfile.php
===================================================================
--- trunk/lib/WikiDB/flatfile.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/flatfile.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 require_once( 'lib/WikiDB.php' );

Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiGroup.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 if (!defined('GROUP_METHOD') or

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiPluginCached.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiTheme.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -13,9 +13,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/WikiUser/AdoDb.php
===================================================================
--- trunk/lib/WikiUser/AdoDb.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/AdoDb.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 include_once("lib/WikiUser/Db.php");

Modified: trunk/lib/WikiUser/BogoLogin.php
===================================================================
--- trunk/lib/WikiUser/BogoLogin.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/BogoLogin.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /** Without stored password. A _BogoLoginPassUser with password

Modified: trunk/lib/WikiUser/Db.php
===================================================================
--- trunk/lib/WikiUser/Db.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/Db.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/WikiUser/EMailConfirm.php
===================================================================
--- trunk/lib/WikiUser/EMailConfirm.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/EMailConfirm.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 class _EMailConfirmPassUser

Modified: trunk/lib/WikiUser/Facebook.php
===================================================================
--- trunk/lib/WikiUser/Facebook.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/Facebook.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * From http://developeronline.blogspot.com/2008/10/using-perl-against-facebook-part-i.html:
  * GET 'http://www.facebook.com/login.php', and rest our virtual browser there to collect the cookies

Modified: trunk/lib/WikiUser/File.php
===================================================================
--- trunk/lib/WikiUser/File.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/File.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 class _FilePassUser

Modified: trunk/lib/WikiUser/Forbidden.php
===================================================================
--- trunk/lib/WikiUser/Forbidden.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/Forbidden.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/WikiUser/FusionForge.php
===================================================================
--- trunk/lib/WikiUser/FusionForge.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/FusionForge.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /** Call the FusionForge functions to get the username

Modified: trunk/lib/WikiUser/HttpAuth.php
===================================================================
--- trunk/lib/WikiUser/HttpAuth.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/HttpAuth.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/WikiUser/HttpAuthUpper.php
===================================================================
--- trunk/lib/WikiUser/HttpAuthUpper.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/HttpAuthUpper.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/WikiUser/IMAP.php
===================================================================
--- trunk/lib/WikiUser/IMAP.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/IMAP.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 class _IMAPPassUser

Modified: trunk/lib/WikiUser/LDAP.php
===================================================================
--- trunk/lib/WikiUser/LDAP.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/LDAP.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 class _LDAPPassUser

Modified: trunk/lib/WikiUser/LdapUpper.php
===================================================================
--- trunk/lib/WikiUser/LdapUpper.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/LdapUpper.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 include_once("lib/WikiUser/LDAP.php");
 

Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/OpenID.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -17,9 +17,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * This is not yet finished. We do not want to use zend extensions.
  *

Modified: trunk/lib/WikiUser/POP3.php
===================================================================
--- trunk/lib/WikiUser/POP3.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/POP3.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 require_once("lib/WikiUser/IMAP.php");

Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/PdoDb.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 include_once("lib/WikiUser/Db.php");

Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/PearDb.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 include_once("lib/WikiUser/Db.php");
 

Modified: trunk/lib/WikiUser/PersonalPage.php
===================================================================
--- trunk/lib/WikiUser/PersonalPage.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/PersonalPage.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/WikiUser/Session.php
===================================================================
--- trunk/lib/WikiUser/Session.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/Session.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUserNew.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
 * 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
+* You should have received a copy of the GNU General Public License along
+* with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 /**
  * This is a complete OOP rewrite of the old WikiUser code with various

Modified: trunk/lib/XmlParser.php
===================================================================
--- trunk/lib/XmlParser.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/XmlParser.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -33,9 +33,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**

Modified: trunk/lib/XmlRpcServer.php
===================================================================
--- trunk/lib/XmlRpcServer.php	2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/XmlRpcServer.php	2011-05-18 14:56:14 UTC (rev 8071)
@@ -17,9 +17,9 @@
  * 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
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * LIBRARY USED - POSSIBLE PROBLEMS
  * ================================

Modified: trunk/lib/imagecache.php
===================================================================
--- trunk/lib/imagecache.php	2011-05-04 19:12:16 UTC...
 
[truncated message content]

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

From: <var...@us...> - 2011-05-04 19:12:23

Revision: 8070
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8070&view=rev
Author:   vargenau
Date:     2011-05-04 19:12:16 +0000 (Wed, 04 May 2011)

Log Message:
-----------
Check "rev" is a positive integer

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

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2011-05-04 15:54:09 UTC (rev 8069)
+++ trunk/lib/plugin/IncludePage.php	2011-05-04 19:12:16 UTC (rev 8070)
@@ -99,6 +99,9 @@
 
         $p = $dbi->getPage($page);
         if ($rev) {
+            if (!is_whole_number($rev) or !($rev>0)) {
+                return $this->error(_("Error: rev must be a positive integer."));
+            }
             $r = $p->getRevision($rev);
             if ((!$r) || ($r->hasDefaultContents())) {
                 return $this->error(sprintf(_("%s: no such revision %d."),

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2011-05-04 15:54:09 UTC (rev 8069)
+++ trunk/lib/plugin/Template.php	2011-05-04 19:12:16 UTC (rev 8070)
@@ -137,6 +137,9 @@
 
         $p = $dbi->getPage($page);
         if ($args['rev']) {
+            if (!is_whole_number($args['rev']) or !($args['rev']>0)) {
+                return $this->error(_("Error: rev must be a positive integer."));
+            }
             $r = $p->getRevision($args['rev']);
             if ((!$r) || ($r->hasDefaultContents())) {
                 return $this->error(sprintf(_("%s: no such revision %d."),


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8069] trunk/themes/fusionforge/themeinfo.php

From: <var...@us...> - 2011-05-04 15:54:15

Revision: 8069
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8069&view=rev
Author:   vargenau
Date:     2011-05-04 15:54:09 +0000 (Wed, 04 May 2011)

Log Message:
-----------
warning_msg --> information

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

Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php	2011-05-04 15:48:08 UTC (rev 8068)
+++ trunk/themes/fusionforge/themeinfo.php	2011-05-04 15:54:09 UTC (rev 8069)
@@ -72,7 +72,7 @@
                     if ($page->get('external')) {
                         $external_msg = _("This page is external.");
                     }
-                    echo $HTML->warning_msg(_("This project is shared with third-party users") .
+                    echo $HTML->information(_("This project is shared with third-party users") .
                                             sprintf(_(" (non %s users)."), forge_get_config('company')) .
                                             (isset($external_msg) ? ' ' . $external_msg : ''));
                 }


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

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

From: <var...@us...> - 2011-05-04 15:48:14

Revision: 8068
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8068&view=rev
Author:   vargenau
Date:     2011-05-04 15:48:08 +0000 (Wed, 04 May 2011)

Log Message:
-----------
Fix order of arguments; use italics

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

Modified: trunk/pgsrc/Help%2FCreateTocPlugin
===================================================================
--- trunk/pgsrc/Help%2FCreateTocPlugin	2011-05-04 15:42:28 UTC (rev 8067)
+++ trunk/pgsrc/Help%2FCreateTocPlugin	2011-05-04 15:48:08 UTC (rev 8068)
@@ -1,4 +1,4 @@
-Date: Tue, 21 Sep 2010 09:44:16 +0000
+Date: Wed,  4 May 2011 17:46:02 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -32,7 +32,7 @@
 | true
 |-
 | **firstlevelstyle**
-| Style of first level numbering: number, letter or roman.
+| Style of first level numbering: //number//, //letter// or //roman//.
 | number
 |-
 | **headers**
@@ -48,7 +48,7 @@
 | false
 |-
 | **liststyle**
-| List style: dl or ol or ul. Using ol is equivalent to with_counter=1.
+| List style: //dl// or //ol// or //ul//. Using //ol// is equivalent to //with_counter=1//.
 | dl
 |-
 | **noheader**
@@ -63,16 +63,16 @@
 | Table of Contents of which page?
 | current pagename
 |-
+| **position**
+| Where to display the Table of Contents: //full//, //left// or //right//.
+| full
+|-
 | **version**
-| page version
+| Page version
 | most recent version
 |-
-| **position**
-| Where to display the Table of Contents: full, left or right.
-| full
-|-
 | **width**
-| Width of Table of Contents (if position is left or right)
+| Width of Table of Contents (if position is //left// or //right//)
 | 200px
 |-
 | **with_counter**


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8067] trunk/themes/fusionforge/themeinfo.php

From: <var...@us...> - 2011-05-04 15:42:34

Revision: 8067
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8067&view=rev
Author:   vargenau
Date:     2011-05-04 15:42:28 +0000 (Wed, 04 May 2011)

Log Message:
-----------
Protect footer with FUSIONFORGE

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

Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php	2011-05-04 10:28:35 UTC (rev 8066)
+++ trunk/themes/fusionforge/themeinfo.php	2011-05-04 15:42:28 UTC (rev 8067)
@@ -82,14 +82,17 @@
     }
 
     function footer() {
-        global $HTML;
 
-        $domain = textdomain(NULL);
-        textdomain('fusionforge');
+        if (defined('FUSIONFORGE') and FUSIONFORGE) {
+            global $HTML;
 
-        $HTML->footer(array());
+            $domain = textdomain(NULL);
+            textdomain('fusionforge');
 
-        textdomain($domain);
+            $HTML->footer(array());
+
+            textdomain($domain);
+        }
     }
 
     function initGlobals() {


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8066] trunk/themes/fusionforge/fusionforge.css

From: <var...@us...> - 2011-05-04 10:28:41

Revision: 8066
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8066&view=rev
Author:   vargenau
Date:     2011-05-04 10:28:35 +0000 (Wed, 04 May 2011)

Log Message:
-----------
Update CSS for Fusionforge

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

Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2011-05-04 10:27:44 UTC (rev 8065)
+++ trunk/themes/fusionforge/fusionforge.css	2011-05-04 10:28:35 UTC (rev 8066)
@@ -47,6 +47,60 @@
  * General
  */
 
+body {
+	margin: 0 0 0 0;
+}
+
+form { margin: 0; }
+
+img { border: 0; vertical-align: middle; }
+
+body {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	color: #565c5e; /* Alcatel-Lucent grey */
+}
+
+h1 { font-size: 1.8em; }
+h2 { font-size: 1.6em; line-height:1.1em;}
+h3 { font-size: 1.2em; line-height:1.3em;}
+h4 { font-size: 1.0em; line-height:1.3em;}
+h5 { font-size: 0.8em; }
+h6 { font-size: 0.6em; }
+
+/* Titles in the page. */
+h1, .titlebar, .widget_titlebar {
+	background: url(/themes/alcatel-lucent/images/bgrd_hpage_header.gif) white;
+	background-position: bottom;
+	background-repeat: repeat-x;
+	padding-left: 10px;
+	padding-right: 10px;
+	padding-top: 4px;
+	padding-bottom: 6px;
+	border-top:1px solid #dddddd;
+	border-bottom:1px solid #dddddd;
+	vertical-align: middle;
+	font-family: 'trebuchet MS', Arial, Helvetica, sans-serif;
+	color: #554295; /* Alcatel-Lucent violet */
+	font-weight: normal;
+	font-size: 1.8em;
+	line-height: 1.3em;
+	text-align: left;
+	height: 24px;
+	margin-top: 4px;
+}
+
+/* Hack for the wiki that inserts an unneccessary </p> */
+.titlebar p {
+	color: #554295; /* Alcatel-Lucent violet */
+	font-size: 1em;
+	margin-bottom: 0;
+	margin-top: 0;
+}
+
+.titlebar a {
+	padding-left: 10px;
+}
+
 /* Because in some cases there is a <p> in nested lists */
 li p { margin:0; }
 
@@ -619,25 +673,95 @@
 
 /* Banners ============================================================ */
 
+p.success, p.feedback, p.warning, p.warning_msg, p.error, p.information,
+div.success, div.feedback, div.warning, div.warning_msg, div.error, div.information {
+   font-weight: bold;
+   font-size: 12px;
+   text-align: center;
+   border: 1px solid;
+   margin: 15px 0px;
+   padding: 10px 10px 10px 10px;
+}
+
+.success, .feedback {
+   border-color: green;
+   background-color: #DFF2BF;
+}
+.warning_msg, .warning {
+   border-color: orange;
+   background-color: #FEEFB3;
+}
+.error {
+   border-color: red;
+   background-color: #FFBABA;
+}
+.information {
+   border-color: blue;
+   background-color: #BDE5F8;
+}
+
+p.success, p.feedback, 
+p.warning, p.warning_msg, 
+p.error, 
+p.information,
+div.success, div.feedback, 
+div.warning, div.warning_msg, 
+div.error, 
+div.information {
+   text-align: left;
+   background-repeat: no-repeat;
+   background-position: 10px;
+   -moz-border-radius: 1em;
+   -webkit-border-radius: 1em;
+   border-radius: 1em;
+   padding: 10px 10px 10px 50px;
+}
+
+div.success, div.feedback,
+p.success, p.feedback {
+   color: #4F8A10;
+   background-image:url('/themes/base-alcatel-lucent/images/success.png');
+}
+div.feedback p, div.feedback li,
+div.success p, div.success li {
+   color: #4F8A10;
+}
+
+div.warning, div.warning_msg,
+p.warning, p.warning_msg {
+   color: #9F6000;
+   background-image: url('/themes/base-alcatel-lucent/images/warning.png');
+}
+div.warning p, div.warning_msg p,
+div.warning li, div.warning_msg li {
+   color: #9F6000;
+}
+
+div.error,
+p.error {
+   color: #D8000C;
+   background-image: url('/themes/base-alcatel-lucent/images/error.png');
+}
+div.error p,
+div.error li {
+   color: #D8000C;
+}
+
+div.information,
+p.information {
+   color: #00529B;
+   background-image: url('/themes/base-alcatel-lucent/images/info.png');
+}
+
 .error, .warning, .debug, .hint {
     font-weight: bold;
     font-size: 11px;
     text-align: left;
-    border-width: 2px;
+    border-width: 1px;
     border-style: solid;
     padding: 0.5em;
 }
 
-.error {
-    background-color: #ffc0cb; /* pink */
-    border-color: red;
-}
-
-.warning {
-    background-color: #ffd297; /* orange */
-    border-color: #FFA500; /* orange */
-}
-
 .debug {
     background-color: white;
     border-color: #fff8dc; /* darker ivory */
@@ -648,13 +772,6 @@
     border-color: black;
 }
 
-p.error, p.warning, p.debug, p.hint,
-div.error div.warning, div.debug, div.hint {
-    border-radius: 1em;
-    -moz-border-radius: 1em;
-    -webkit-border-radius: 1em;
-}
-
 span.error, span.warning, span.debug, span.hint {
   padding: 0;
 }
@@ -987,6 +1104,11 @@
 }
 
 /* Main wiki browse banner */
+
+.browsebanner {
+   clear: both;
+}
+
 .browsebanner table {
    width: 100%;
    background-color: #e9fbff;


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

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

Flat | Threaded

<< < 1 .. 123 124 125 126 127 .. 538 > >> (Page 125 of 538)