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.
This commit is contained in:
John Keeping 2012-07-05 19:43:44 +01:00
parent 68916212b2
commit 17f9d2003a
5 changed files with 9 additions and 9 deletions

View File

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

View File

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

View File

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

View File

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

View File

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