From c633c116bfbedf420ab547a91157c0afc259a2ff Mon Sep 17 00:00:00 2001
From: Cake <cake_67@users.sourceforge.jp>
Date: Sun, 10 Jan 2010 14:23:13 +0900
Subject: [PATCH] =?utf8?q?=E8=AA=8D=E8=A8=BC=E6=B8=88=E3=83=A6=E3=83=BC?=
 =?utf8?q?=E3=82=B6=E6=83=85=E5=A0=B1=E5=8F=96=E5=BE=97=E6=96=B9=E6=B3=95?=
 =?utf8?q?=E3=81=AE=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Authから取得
---
 app/controllers/app_controller.php   | 18 ++----------------
 app/controllers/users_controller.php | 13 +++++++++++++
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/app/controllers/app_controller.php b/app/controllers/app_controller.php
index 270cf66..f1f9507 100644
--- a/app/controllers/app_controller.php
+++ b/app/controllers/app_controller.php
@@ -67,7 +67,7 @@ class AppController extends Controller
 			$this->AuthPlus->actionPath = 'controllers/';
 			$this->AuthPlus->authorize = 'crud';
 			// 認証済みユーザ情報のセット
-			$this->user = $this->getUser($this->AuthPlus->user('id'));
+			$this->user = $this->AuthPlus->user();
 			if (in_array($this->AuthPlus->user('group_id'), array(1,2,3))) {
 				$this->isAdministrator = true;
 			}
@@ -101,6 +101,7 @@ class AppController extends Controller
 		parent::beforeRender();
 	}
 
+	/* 共通関数 */
 	/* 
 	 * 不正な$this->dataセットを削除
 	 */
@@ -117,7 +118,6 @@ class AppController extends Controller
 		}
 
 	}
-
 }
 
 // AppControllerを携帯とPCで振り分け
@@ -203,20 +203,6 @@ class PcAppController extends AppController
 		parent::beforeRender();
 
 	}
-
-	/* 共通関数 */
-	function getUser($id) {
-		if (!$id) {
-			return $this->user;
-		}
-		$user = $this->User->read(null, $id);
-		if (!$user['User']) {
-			$this->Session->setFlash(__('Invalid User.', true));
-			return $this->user;
-		}
-		return $user;
-	}
-
 }
 
 
diff --git a/app/controllers/users_controller.php b/app/controllers/users_controller.php
index 442e4cd..487a5f9 100644
--- a/app/controllers/users_controller.php
+++ b/app/controllers/users_controller.php
@@ -412,5 +412,18 @@ class UsersController extends ModuleController {
 		}
 	}
 
+	/* ユーザ情報取得 */
+	function getUser($id) {
+		if (!$id) {
+			return $this->user;
+		}
+		$user = $this->User->read(null, $id);
+		if (!$user['User']) {
+			$this->Session->setFlash(__('Invalid User.', true));
+			return $this->user;
+		}
+		return $user;
+	}
+
 }
 
-- 
2.11.0