From: John Keeping <john@keeping.me.uk>
Date: Thu, 5 Jul 2012 18:43:44 +0000 (+0100)
Subject: Make Handler::before() hierarchy consistent
X-Git-Tag: 1.6.0~200^2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=17f9d2003ac3f47db316630decd07143992ed16f;p=tt-rss.git

Make Handler::before() hierarchy consistent

In API, the before() method (inherited from Handler) takes a $method
argument, although this is not declared for the before method() in
handler.  PHP in strict mode treats this as an error.

Since call sites already pass the $method argument, change
Handler::before() and the before() method in all other subclasses to
take this argument.
---

diff --git a/classes/dlg.php b/classes/dlg.php
index 0a5412fb..4d5068ba 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -2,8 +2,8 @@
 class Dlg extends Protected_Handler {
 	private $param;
 
-	function before() {
-		if (parent::before()) {
+	function before($method) {
+		if (parent::before($method)) {
 			header("Content-Type: text/xml; charset=utf-8");
 			$this->param = db_escape_string($_REQUEST["param"]);
 			print "<dlg>";
diff --git a/classes/handler.php b/classes/handler.php
index 404b8306..9d6c99e0 100644
--- a/classes/handler.php
+++ b/classes/handler.php
@@ -12,7 +12,7 @@ class Handler {
 		return true;
 	}
 
-	function before() {
+	function before($method) {
 		return true;
 	}
 
diff --git a/classes/pref_instances.php b/classes/pref_instances.php
index aae5bbaf..fec95780 100644
--- a/classes/pref_instances.php
+++ b/classes/pref_instances.php
@@ -7,8 +7,8 @@ class Pref_Instances extends Protected_Handler {
 		return array_search($method, $csrf_ignored) !== false;
 	}
 
-	function before() {
-		if (parent::before()) {
+	function before($method) {
+		if (parent::before($method)) {
 			if ($_SESSION["access_level"] < 10) {
 				print __("Your access level is insufficient to open this tab.");
 				return false;
diff --git a/classes/pref_users.php b/classes/pref_users.php
index 94ee270d..8f8f819f 100644
--- a/classes/pref_users.php
+++ b/classes/pref_users.php
@@ -1,7 +1,7 @@
 <?php
 class Pref_Users extends Protected_Handler {
-		function before() {
-			if (parent::before()) {
+		function before($method) {
+			if (parent::before($method)) {
 				if ($_SESSION["access_level"] < 10) {
 					print __("Your access level is insufficient to open this tab.");
 					return false;
diff --git a/classes/protected_handler.php b/classes/protected_handler.php
index e8a6d40a..5d8d690c 100644
--- a/classes/protected_handler.php
+++ b/classes/protected_handler.php
@@ -1,8 +1,8 @@
 <?php
 class Protected_Handler extends Handler {
 
-	function before() {
-		return parent::before() && $_SESSION['uid'];
+	function before($method) {
+		return parent::before($method) && $_SESSION['uid'];
 	}
 }
 ?>