X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fadminpanelaction.php;h=af6e11a511487805f7c5aaf337c584f2d270fcd4;hb=3d334451c45bd93b222d58155404786ee0667a0e;hp=5642c68d629139c382d8cdc2056a8894ea7eff98;hpb=2dbdb0f185cb9b98097ce2f20bbd9430ab715203;p=quix0rs-gnu-social.git diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php index 5642c68d62..af6e11a511 100644 --- a/lib/adminpanelaction.php +++ b/lib/adminpanelaction.php @@ -60,7 +60,7 @@ class AdminPanelAction extends Action * * @return boolean success flag */ - function prepare($args) + function prepare(array $args=array()) { parent::prepare($args); @@ -69,7 +69,6 @@ class AdminPanelAction extends Action if (!common_logged_in()) { // TRANS: Error message displayed when trying to perform an action that requires a logged in user. $this->clientError(_('Not logged in.')); - return false; } $user = common_current_user(); @@ -94,7 +93,6 @@ class AdminPanelAction extends Action if (!$user->hasRight(Right::CONFIGURESITE)) { // TRANS: Client error message thrown when a user tries to change admin settings but has no access rights. $this->clientError(_('You cannot make changes to this site.')); - return false; } // This panel must be enabled @@ -106,7 +104,6 @@ class AdminPanelAction extends Action if (!self::canAdmin($name)) { // TRANS: Client error message throw when a certain panel's settings cannot be changed. $this->clientError(_('Changes to that panel are not allowed.'), 403); - return false; } return true; @@ -122,7 +119,7 @@ class AdminPanelAction extends Action * * @return void */ - function handle($args) + function handle(array $args=array()) { if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->checkSessionToken(); @@ -220,7 +217,6 @@ class AdminPanelAction extends Action { // TRANS: Client error message. $this->clientError(_('showForm() not implemented.')); - return; } /** @@ -248,36 +244,6 @@ class AdminPanelAction extends Action { // TRANS: Client error message $this->clientError(_('saveSettings() not implemented.')); - return; - } - - /** - * Delete a design setting - * - * // XXX: Maybe this should go in Design? --Z - * - * @return mixed $result false if something didn't work - */ - function deleteSetting($section, $setting) - { - $config = new Config(); - - $config->section = $section; - $config->setting = $setting; - - if ($config->find(true)) { - $result = $config->delete(); - if (!$result) { - common_log_db_error($config, 'DELETE', __FILE__); - // TRANS: Client error message thrown if design settings could not be deleted in - // TRANS: the admin panel Design. - $this->clientError(_("Unable to delete design setting.")); - return null; - } - return $result; - } - - return null; } function canAdmin($name)