Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[9411] trunk/lib
|
From: <var...@us...> - 2014-12-03 14:57:43
|
Revision: 9411
http://sourceforge.net/p/phpwiki/code/9411
Author: vargenau
Date: 2014-12-03 14:57:35 +0000 (Wed, 03 Dec 2014)
Log Message:
-----------
New function is_limit
Modified Paths:
--------------
trunk/lib/plugin/AllPages.php
trunk/lib/plugin/AllUsers.php
trunk/lib/plugin/BackLinks.php
trunk/lib/plugin/IncludePages.php
trunk/lib/plugin/LinkDatabase.php
trunk/lib/plugin/ListSubpages.php
trunk/lib/plugin/MostPopular.php
trunk/lib/plugin/OrphanedPages.php
trunk/lib/plugin/PageHistory.php
trunk/lib/plugin/PopularNearby.php
trunk/lib/plugin/TitleSearch.php
trunk/lib/plugin/WantedPages.php
trunk/lib/plugin/WantedPagesOld.php
trunk/lib/stdlib.php
Modified: trunk/lib/plugin/AllPages.php
===================================================================
--- trunk/lib/plugin/AllPages.php 2014-12-03 12:46:50 UTC (rev 9410)
+++ trunk/lib/plugin/AllPages.php 2014-12-03 14:57:35 UTC (rev 9411)
@@ -64,7 +64,7 @@
{
$args = $this->getArgs($argstr, $request);
- if (isset($args['limit']) && !is_numeric($args['limit'])) {
+ if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::p(array('class' => "error"),
_("Illegal 'limit' argument: must be numeric"));
}
Modified: trunk/lib/plugin/AllUsers.php
===================================================================
--- trunk/lib/plugin/AllUsers.php 2014-12-03 12:46:50 UTC (rev 9410)
+++ trunk/lib/plugin/AllUsers.php 2014-12-03 14:57:35 UTC (rev 9411)
@@ -68,7 +68,7 @@
{
$args = $this->getArgs($argstr, $request);
- if (isset($args['limit']) && !is_numeric($args['limit'])) {
+ if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::p(array('class' => "error"),
_("Illegal 'limit' argument: must be numeric"));
}
Modified: trunk/lib/plugin/BackLinks.php
===================================================================
--- trunk/lib/plugin/BackLinks.php 2014-12-03 12:46:50 UTC (rev 9410)
+++ trunk/lib/plugin/BackLinks.php 2014-12-03 14:57:35 UTC (rev 9411)
@@ -59,7 +59,7 @@
{
$args = $this->getArgs($argstr, $request);
- if (isset($args['limit']) && !is_numeric($args['limit'])) {
+ if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::p(array('class' => "error"),
_("Illegal 'limit' argument: must be numeric"));
}
Modified: trunk/lib/plugin/IncludePages.php
===================================================================
--- trunk/lib/plugin/IncludePages.php 2014-12-03 12:46:50 UTC (rev 9410)
+++ trunk/lib/plugin/IncludePages.php 2014-12-03 14:57:35 UTC (rev 9411)
@@ -55,7 +55,7 @@
{
$args = $this->getArgs($argstr, $request);
- if (isset($args['limit']) && !is_numeric($args['limit'])) {
+ if (isset($args['limit']) && !limit($args['limit'])) {
return HTML::p(array('class' => "error"),
_("Illegal 'limit' argument: must be numeric"));
}
Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php 2014-12-03 12:46:50 UTC (rev 9410)
+++ trunk/lib/plugin/LinkDatabase.php 2014-12-03 14:57:35 UTC (rev 9411)
@@ -101,7 +101,7 @@
global $WikiTheme;
$args = $this->getArgs($argstr, $request);
- if (isset($args['limit']) && !is_numeric($args['limit'])) {
+ if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::p(array('class' => "error"),
_("Illegal 'limit' argument: must be numeric"));
}
Modified: trunk/lib/plugin/ListSubpages.php
===================================================================
--- trunk/lib/plugin/ListSubpages.php 2014-12-03 12:46:50 UTC (rev 9410)
+++ trunk/lib/plugin/ListSubpages.php 2014-12-03 14:57:35 UTC (rev 9411)
@@ -64,7 +64,7 @@
{
$args = $this->getArgs($argstr, $request);
- if (isset($args['limit']) && !is_numeric($args['limit'])) {
+ if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::p(array('class' => "error"),
_("Illegal 'limit' argument: must be numeric"));
}
Modified: trunk/lib/plugin/MostPopular.php
===================================================================
--- trunk/lib/plugin/MostPopular.php 2014-12-03 12:46:50 UTC (rev 9410)
+++ trunk/lib/plugin/MostPopular.php 2014-12-03 14:57:35 UTC (rev 9411)
@@ -64,7 +64,7 @@
extract($args);
- if (isset($limit) && !is_numeric($limit)) {
+ if (isset($limit) && !is_limit($limit)) {
return HTML::p(array('class' => "error"),
_("Illegal 'limit' argument: must be numeric"));
}
Modified: trunk/lib/plugin/OrphanedPages.php
===================================================================
--- trunk/lib/plugin/OrphanedPages.php 2014-12-03 12:46:50 UTC (rev 9410)
+++ trunk/lib/plugin/OrphanedPages.php 2014-12-03 14:57:35 UTC (rev 9411)
@@ -62,7 +62,7 @@
{
$args = $this->getArgs($argstr, $request);
- if (isset($args['limit']) && !is_numeric($args['limit'])) {
+ if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::p(array('class' => "error"),
_("Illegal 'limit' argument: must be numeric"));
}
Modified: trunk/lib/plugin/PageHistory.php
===================================================================
--- trunk/lib/plugin/PageHistory.php 2014-12-03 12:46:50 UTC (rev 9410)
+++ trunk/lib/plugin/PageHistory.php 2014-12-03 14:57:35 UTC (rev 9411)
@@ -341,7 +341,7 @@
{
$args = $this->getArgs($argstr, $request);
- if (isset($args['limit']) && !is_numeric($args['limit'])) {
+ if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::div(array('class' => "error"),
_("Illegal 'limit' argument: must be numeric"));
}
Modified: trunk/lib/plugin/PopularNearby.php
===================================================================
--- trunk/lib/plugin/PopularNearby.php 2014-12-03 12:46:50 UTC (rev 9410)
+++ trunk/lib/plugin/PopularNearby.php 2014-12-03 14:57:35 UTC (rev 9411)
@@ -65,7 +65,7 @@
{
$args = $this->getArgs($argstr, $request);
- if (isset($args['limit']) && !is_numeric($args['limit'])) {
+ if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::div(array('class' => "error"),
_("Illegal 'limit' argument: must be numeric"));
}
Modified: trunk/lib/plugin/TitleSearch.php
===================================================================
--- trunk/lib/plugin/TitleSearch.php 2014-12-03 12:46:50 UTC (rev 9410)
+++ trunk/lib/plugin/TitleSearch.php 2014-12-03 14:57:35 UTC (rev 9411)
@@ -78,7 +78,7 @@
{
$args = $this->getArgs($argstr, $request);
- if (isset($args['limit']) && !is_numeric($args['limit'])) {
+ if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::p(array('class' => "error"),
_("Illegal 'limit' argument: must be numeric"));
}
Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php 2014-12-03 12:46:50 UTC (rev 9410)
+++ trunk/lib/plugin/WantedPages.php 2014-12-03 14:57:35 UTC (rev 9411)
@@ -69,7 +69,7 @@
{
$args = $this->getArgs($argstr, $request);
- if (isset($args['limit']) && !is_numeric($args['limit'])) {
+ if (isset($args['limit']) && !is_limit($args['limit'])) {
return HTML::p(array('class' => "error"),
_("Illegal 'limit' argument: must be numeric"));
}
Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php 2014-12-03 12:46:50 UTC (rev 9410)
+++ trunk/lib/plugin/WantedPagesOld.php 2014-12-03 14:57:35 UTC (rev 9411)
@@ -61,7 +61,7 @@
{
extract($this->getArgs($argstr, $request));
- if (isset($limit) && !is_numeric($limit)) {
+ if (isset($limit) && !is_limit($limit)) {
return HTML::p(array('class' => "error"),
_("Illegal 'limit' argument: must be numeric"));
}
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2014-12-03 12:46:50 UTC (rev 9410)
+++ trunk/lib/stdlib.php 2014-12-03 14:57:35 UTC (rev 9411)
@@ -1972,6 +1972,22 @@
}
/**
+ * Determine if a variable represents a limit
+ * It can be an integer or two integers separated by ","
+ */
+
+function is_limit($var)
+{
+ if (is_whole_number($var)) {
+ return true;
+ }
+ $limits = explode(',', $var);
+ return (count($limits) == 2)
+ && is_whole_number($limits[0])
+ && is_whole_number($limits[1]);
+}
+
+/**
* Determine if a variable represents a whole number
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
