commit 8fa10255c509b6b77d694b7366878172b605ee59
Author: hasse <hasegawa@i-hearts.jp>
Date:   Tue Mar 8 04:29:23 2016 -0500

    ログイン機能の改善

diff --git a/app/Controller/UsersController.php b/app/Controller/UsersController.php
index 610abba..879d3d9 100755
--- a/app/Controller/UsersController.php
+++ b/app/Controller/UsersController.php
@@ -14,7 +14,7 @@ class UsersController extends AppController {
 
     public function beforeFilter() {
         parent::beforeFilter();
-        $this->Auth->allow('register','activate','confirm','sent','login');
+        $this->Auth->allow('register','activate','confirm','sent','login','index');
     }
 
 /**
@@ -103,7 +103,7 @@ class UsersController extends AppController {
 		$Email->emailFormat('text');
 		$Email->template('user_register');
 		$Email->viewVars(array('name'=>$name,'comment'=>$comment));
-		$Email->from('hasegawa@i-hearts.jp');
+		$Email->from( MAIL_FROM ); //MAIL_FROM：Config/const.phpにて定義
 		$Email->to($mail);
 		$Email->subject('[PICT CODE]問い合わせ');
 		$Email->send();
@@ -119,8 +119,8 @@ class UsersController extends AppController {
 	    $this->User->id = $user_id;
 	    if ($this->User->exists() && $in_hash == $this->User->getActivationHash()) {
 	    // 本登録に有効なURL
-	        // statusフィールドを0に更新
-	        $this->User->saveField( 'status', 0);
+	        // statusフィールドを1に更新
+	        $this->User->saveField( 'status', 1);
 	        $this->Session->setFlash( 'Your account has been activated.');
 	    }else{
 	    // 本登録に無効なURL
@@ -204,13 +204,19 @@ class UsersController extends AppController {
 		}
 		if ($this->request->is('post')) {
 			if ($this->Auth->login()) {
-				$this->redirect('/Users/login_top');                          
+				// var_dump($this->Auth->login('User.status'));
+				// exit;
+				if($this->Auth->user('User.status') == 1){
+					$this->redirect('/Users/login_top');                          
+				}else{
+				$this->Flash->loginerror('まだ本登録が完了していません。送られてきたメールを見てね！', array(
+				    'key' => 'positive',
+					));
+				}
 			} else {
 				$this->Flash->loginerror('ニックネームか　パスワードにまちがいが あるよ！', array(
 				    'key' => 'positive',
 					));
-				//$this->Flash->error(__('error'));
-				// $this->Flash->error(__('<section class="caution"><p>ニックネームか　パスワードに<br>まちがいが あるよ！</p></section>'));
 			}
 		}
 	}