Permalink
Browse files

Refactoring to use flashLayout variable when setting flash messages

  • Loading branch information...
1 parent 8d6135a commit 2484245c68fb3f615295122440e5c48a1bd00338 @renan renan committed Aug 13, 2009
Showing with 11 additions and 3 deletions.
  1. +11 −3 cake/libs/controller/components/auth.php
@@ -85,6 +85,14 @@ class AuthComponent extends Object {
var $ajaxLogin = null;
/**
+ * The name of the layout element used on Session::setFlash
+ *
+ * @var string
+ * @access public
+ */
+ var $flashLayout = 'default';
+
+/**
* The name of the model that represents users which will be authenticated. Defaults to 'User'.
*
* @var string
@@ -358,13 +366,13 @@ function startup(&$controller) {
}
}
- $this->Session->setFlash($this->loginError, 'default', array(), 'auth');
+ $this->Session->setFlash($this->loginError, $this->flashLayout, array(), 'auth');
$controller->data[$model->alias][$this->fields['password']] = null;
return false;
} else {
if (!$this->user()) {
if (!$this->RequestHandler->isAjax()) {
- $this->Session->setFlash($this->authError, 'default', array(), 'auth');
+ $this->Session->setFlash($this->authError, $this->flashLayout, array(), 'auth');
if (!empty($controller->params['url']) && count($controller->params['url']) >= 2) {
$query = $controller->params['url'];
unset($query['url'], $query['ext']);
@@ -428,7 +436,7 @@ function startup(&$controller) {
return true;
}
- $this->Session->setFlash($this->authError, 'default', array(), 'auth');
+ $this->Session->setFlash($this->authError, $this->flashLayout, array(), 'auth');
$controller->redirect($controller->referer(), null, true);
return false;
}

0 comments on commit 2484245

Please sign in to comment.