Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Cleaning up the AuthComponent

Simplify if statements, return early and less variable use
  • Loading branch information...
commit 2c70319d2721e09cfd8ad3aae34d0aa26f95a136 1 parent 51e0715
@dogmatic69 dogmatic69 authored
Showing with 33 additions and 31 deletions.
  1. +33 −31 lib/Cake/Controller/Component/AuthComponent.php
View
64 lib/Cake/Controller/Component/AuthComponent.php
@@ -300,23 +300,24 @@ public function startup(Controller $controller) {
}
}
return true;
- } else {
- if (!$this->_getUser()) {
- if (!$request->is('ajax')) {
- $this->flash($this->authError);
- $this->Session->write('Auth.redirect', $request->here());
- $controller->redirect($loginAction);
- return false;
- } elseif (!empty($this->ajaxLogin)) {
- $controller->viewPath = 'Elements';
- echo $controller->render($this->ajaxLogin, $this->RequestHandler->ajaxLayout);
- $this->_stop();
- return false;
- } else {
- $controller->redirect(null, 403);
- }
+ }
+
+ if (!$this->_getUser()) {
+ if (!$request->is('ajax')) {
+ $this->flash($this->authError);
+ $this->Session->write('Auth.redirect', $request->here());
+ $controller->redirect($loginAction);
+ return false;
+ }
+ if (!empty($this->ajaxLogin)) {
+ $controller->viewPath = 'Elements';
+ echo $controller->render($this->ajaxLogin, $this->RequestHandler->ajaxLayout);
+ $this->_stop();
+ return false;
}
+ $controller->redirect(null, 403);
}
+
if (empty($this->authorize) || $this->isAuthorized($this->user())) {
return true;
}
@@ -360,7 +361,8 @@ protected function _setDefaults() {
public function isAuthorized($user = null, $request = null) {
if (empty($user) && !$this->user()) {
return false;
- } elseif (empty($user)) {
+ }
+ if (empty($user)) {
$user = $this->user();
}
if (empty($request)) {
@@ -428,12 +430,12 @@ public function allow($action = null) {
$args = func_get_args();
if (empty($args) || $action === null) {
$this->allowedActions = $this->_methods;
- } else {
- if (isset($args[0]) && is_array($args[0])) {
- $args = $args[0];
- }
- $this->allowedActions = array_merge($this->allowedActions, $args);
+ return;
+ }
+ if (isset($args[0]) && is_array($args[0])) {
+ $args = $args[0];
}
+ $this->allowedActions = array_merge($this->allowedActions, $args);
}
/**
@@ -454,18 +456,18 @@ public function deny($action = null) {
$args = func_get_args();
if (empty($args) || $action === null) {
$this->allowedActions = array();
- } else {
- if (isset($args[0]) && is_array($args[0])) {
- $args = $args[0];
- }
- foreach ($args as $arg) {
- $i = array_search($arg, $this->allowedActions);
- if (is_int($i)) {
- unset($this->allowedActions[$i]);
- }
+ return;
+ }
+ if (isset($args[0]) && is_array($args[0])) {
+ $args = $args[0];
+ }
+ foreach ($args as $arg) {
+ $i = array_search($arg, $this->allowedActions);
+ if (is_int($i)) {
+ unset($this->allowedActions[$i]);
}
- $this->allowedActions = array_values($this->allowedActions);
}
+ $this->allowedActions = array_values($this->allowedActions);
}
/**
Please sign in to comment.
Something went wrong with that request. Please try again.