more changes for the 2.0 branch

.gitignore

@@ -1,4 +1,3 @@
 tmp/logs/*
-tmp/cache/models/*
-tmp/cache/persistent/*
+tmp/cache/*
 Config/Database.php

Config/core.php

@@ -1,38 +1,5 @@
 <?php
-/**
- * This is core configuration file.
- *
- * Use it to configure core behavior of Cake.
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.Config
- * @since         CakePHP(tm) v 0.2.9
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-
-/**
- * CakePHP Debug Level:
- *
- * Production Mode:
- * 	0: No error messages, errors, or warnings shown. Flash messages redirect.
- *
- * Development Mode:
- * 	1: Errors and warnings shown, model caches refreshed, flash messages halted.
- * 	2: As in 1, but also with full debug messages and SQL output.
- *
- * In production mode, flash messages redirect after a time interval.
- * In development mode, you need to click the flash message to continue.
- */
-	Configure::write('debug', 2);
+Configure::write('debug', 2);
 
 /**
  * Configure the Error handler used to handle errors for your application.  By default

Controller/AppController.php

@@ -23,9 +23,6 @@ function beforeFilter(){
 
 		$user = $this->Auth->user();
 		$this->log("Auth user:".print_r($user,true),'debug');
-		if (!empty($user)) {
-			Configure::write('User', $user[$this->Auth->getModel()->alias]);
-		}
 
                 $this->user = $user;
                 $this->set('user', $this->user);

Controller/UsersController.php

@@ -81,8 +81,7 @@ function login(){
 	}
 	function logout(){
                 $this->log("Destroying session",'debug');
-                $this->Session->destroy();
-		$this->redirect('/');
+		$this->redirect('/idbroker/ldap_auths/logout');
 	}
 
 	function signup(){

View/Helper/MenuHelper.php

@@ -40,15 +40,15 @@ function buildMenu($tree=false){
 						$show = true;
 						break;
 					case 'anonymous': //This is only for users not logged in
-						if(!isset($user['User']['id'])){
+						if(!isset($user['User']) ){
 							$show = true;
 						}else{
 							$show = false;
 							continue;
 						}
 						break;
 					case 'authed':
-						if(isset($user['User']['id'])){
+						if(isset($user['User']) && !empty($user['User'])){
 							$show = true;
 						}else{
 							$show = false;