From 09f74be14c94c722a63371cacd7e99a2e8bd7733 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 11 Jun 2012 17:24:16 -0700
Subject: [PATCH] variable confusion in poller, don't allow negative page
 offsets

---
 boot.php            | 4 ++--
 include/onepoll.php | 4 ++--
 include/poller.php  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/boot.php b/boot.php
index 45922f8870..70dd1c4268 100644
--- a/boot.php
+++ b/boot.php
@@ -432,7 +432,7 @@ if(! class_exists('App')) {
 			 * pagination
 			 */
 
-			$this->pager['page'] = ((x($_GET,'page')) ? $_GET['page'] : 1);
+			$this->pager['page'] = ((x($_GET,'page') && intval($_GET['page']) > 0) ? intval($_GET['page']) : 1);
 			$this->pager['itemspage'] = 50;
 			$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
 			$this->pager['total'] = 0;
@@ -499,7 +499,7 @@ if(! class_exists('App')) {
 		}
 
 		function set_pager_itemspage($n) {
-			$this->pager['itemspage'] = intval($n);
+			$this->pager['itemspage'] = ((intval($n) > 0) ? intval($n) : 0);
 			$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
 
 		}
diff --git a/include/onepoll.php b/include/onepoll.php
index ba7d5ebaf5..02763cf4ba 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -94,8 +94,8 @@ function onepoll_run($argv, $argc){
 	$t = $contact['last-update'];
 
 	if($contact['subhub']) {
-		$interval = get_config('system','pushpoll_frequency');
-		$contact['priority'] = (($interval !== false) ? intval($interval) : 3);
+		$poll_interval = get_config('system','pushpoll_frequency');
+		$contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
 		$hub_update = false;
 
 		if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day"))
diff --git a/include/poller.php b/include/poller.php
index 6b12445d19..fefc9b381d 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -201,8 +201,8 @@ function poller_run($argv, $argc){
 
 
 				if($contact['subhub']) {
-					$interval = get_config('system','pushpoll_frequency');
-					$contact['priority'] = (($interval !== false) ? intval($interval) : 3);
+					$poll_interval = get_config('system','pushpoll_frequency');
+					$contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
 					$hub_update = false;
 	
 					if((datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) || $force)