Merge pull request #20 from johnkeeping/strict-mode-fixes

Make Handler::before() hierarchy consistent

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>";

classes/handler.php

@@ -12,7 +12,7 @@ class Handler {
 		return true;
 	}
 
-	function before() {
+	function before($method) {
 		return true;
 	}
 

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;

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;

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'];
 	}
 }
 ?>