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

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

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

Log Message:
-----------
Check version is a positive integer; check firstlevelstyle is correct

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

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2011-05-04 10:20:46 UTC (rev 8061)
+++ trunk/lib/plugin/CreateToc.php	2011-05-04 10:22:03 UTC (rev 8062)
@@ -383,6 +383,11 @@
         if (($notoc) or ($liststyle == 'ol')) {
             $with_counter = 1;
         }
+        if ($firstlevelstyle and ($firstlevelstyle != 'number') 
+                             and ($firstlevelstyle != 'letter')
+                             and ($firstlevelstyle != 'roman')) {
+            return $this->error(_("Error: firstlevelstyle must be 'number', 'letter' or 'roman'"));
+        }
 
         // Check if page exists.
         if (!($dbi->isWikiPage($pagename))) {
@@ -398,6 +403,9 @@
         $page = $dbi->getPage($pagename);
 
         if ($version) {
+            if (!is_whole_number($version) or !($version>0)) {
+                return $this->error(_("Error: version must be a positive integer."));
+            }
             $r = $page->getRevision($version);
             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.