phpwiki-checkins Mailing List for PhpWiki (Page 2)

Revision: 8062
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8062&view=rev
Author: vargenau
Date: 2011年05月04日 10:22:03 +0000 (2011年5月04日)
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.

Revision: 8061
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8061&view=rev
Author: vargenau
Date: 2011年05月04日 10:20:46 +0000 (2011年5月04日)
Log Message:
-----------
New utility function: is_whole_number
Modified Paths:
--------------
 trunk/lib/stdlib.php
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2011年04月27日 13:53:27 UTC (rev 8060)
+++ trunk/lib/stdlib.php	2011年05月04日 10:20:46 UTC (rev 8061)
@@ -97,6 +97,7 @@
 is_localhost($url)
 javascript_quote_string($s)
 isSerialized($s)
+ is_whole_number($var)
 parse_attributes($line)
 is_image ($filename)
 is_video ($filename)
@@ -2383,6 +2384,14 @@
 }
 
 /**
+ * Determine if a variable represents a whole number
+ */
+
+function is_whole_number($var) {
+ return (is_numeric($var) && (intval($var)==floatval($var)));
+}
+
+/**
 * Take a string and return an array of pairs (attribute name, attribute value)
 *
 * We allow attributes with or without double quotes (")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.