From 4c24c7b78493f246e7d7dcf0b4aa9a8e18ee6687 Mon Sep 17 00:00:00 2001
From: nate <nate@cakephp.org>
Date: Wed, 14 Feb 2007 20:04:00 +0000
Subject: [PATCH] Updating core Auth/ACL error messages

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4518 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/controller/components/auth.php         | 2 +-
 cake/libs/controller/components/dbacl/db_acl.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php
index b3489c006..b6b5918ca 100644
--- a/cake/libs/controller/components/auth.php
+++ b/cake/libs/controller/components/auth.php
@@ -351,7 +351,7 @@ class AuthComponent extends Object {
 			case 'controller':
 				$this->mapActions();
 				if (!isset($this->actionMap[$this->params['action']])) {
-					trigger_error('Auth::startup() - Attempted access of un-mapped action "' . $this->params['action'] . '"', E_USER_WARNING);
+					trigger_error('Auth::startup() - Attempted access of un-mapped action "' . $this->params['action'] . '" in controller "' . $this->params['controller'] . '"', E_USER_WARNING);
 				} else {
 					$valid = $this->Acl->check($this->user(), $this->action(':controller'), $this->actionMap[$this->params['action']]);
 				}
diff --git a/cake/libs/controller/components/dbacl/db_acl.php b/cake/libs/controller/components/dbacl/db_acl.php
index 86e904a1e..3f99ea924 100644
--- a/cake/libs/controller/components/dbacl/db_acl.php
+++ b/cake/libs/controller/components/dbacl/db_acl.php
@@ -75,10 +75,11 @@ class DB_ACL extends AclBase {
 		$acoPath = new Set($Aco->node($aco));
 
 		if (empty($aroPath) ||  empty($acoPath)) {
-			trigger_error("DB_ACL::check() - Attempted to check permissions on/with a node that does not exist.  Node references:\nAro: " . print_r($aro, true) . "\nAco: " . print_r($aco, true), E_USER_WARNING);
+			trigger_error("DB_ACL::check() - Failed ARO/ACO node lookup in permissions check.  Node references:\nAro: " . print_r($aro, true) . "\nAco: " . print_r($aco, true), E_USER_WARNING);
 			return false;
 		}
 		if ($acoPath->get() == null || $acoPath->get() == array()) {
+			trigger_error("DB_ACL::check() - Failed ACO node lookup in permissions check.  Node references:\nAro: " . print_r($aro, true) . "\nAco: " . print_r($aco, true), E_USER_WARNING);
 			return false;
 		}