Merge pull request #1162 from ytetsuro/fix/paginate-bug

lonnieezell · web-flow · commit f3a8caf05170 · 2018-08-16T09:21:10.000-05:00
Fixed insufficient validation of parameters related to pager.
diff --git a/system/Model.php b/system/Model.php
@@ -999,7 +999,7 @@ public function chunk($size = 100, \Closure $userFunc)
 	public function paginate(int $perPage = 20, string $group = 'default')
 	{
 		// Get the necessary parts.
-		$page = isset($_GET['page']) && $_GET['page'] > 1 ? $_GET['page'] : 1;
+		$page = ctype_digit($_GET['page'] ?? '') && $_GET['page'] > 1 ? $_GET['page'] : 1;
 
 		$total = $this->countAllResults(false);
 

Original file line number	Diff line number	Diff line change
`@@ -999,7 +999,7 @@ public function chunk($size = 100, \Closure $userFunc)`
`999`	`999`	`public function paginate(int $perPage = 20, string $group = 'default')`
`1000`	`1000`	`{`
`1001`	`1001`	`// Get the necessary parts.`
`1002`		`- $page = isset($_GET['page']) && $_GET['page'] > 1 ? $_GET['page'] : 1;`
	`1002`	`+ $page = ctype_digit($_GET['page'] ?? '') && $_GET['page'] > 1 ? $_GET['page'] : 1;`
`1003`	`1003`
`1004`	`1004`	`$total = $this->countAllResults(false);`
`1005`	`1005`