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

    ログイン機能の改善

diff --git a/app/Config/bootstrap.php b/app/Config/bootstrap.php
index e438d47..832053e 100755
--- a/app/Config/bootstrap.php
+++ b/app/Config/bootstrap.php
@@ -90,6 +90,16 @@ Cache::config('default', array('engine' => 'File'));
  *
  * ));
  */
+
+
+// define定義
+config('const');
+
+
+
+
+
+
 Configure::write('Recaptcha.publicKey', 'your-public-api-key');
 Configure::write('Recaptcha.privateKey', 'your-private-api-key');
 Configure::write('Dispatcher.filters', array(
diff --git a/app/Config/const.php b/app/Config/const.php
new file mode 100755
index 0000000..d8c85c4
--- /dev/null
+++ b/app/Config/const.php
@@ -0,0 +1,7 @@
+<?php
+
+// カラーミーのOAuth
+define("MAIL_FROM", "hasegawa@i-hearts.jp");
+
+
+?>
diff --git a/app/Config/core.php b/app/Config/core.php
index 9bed5a5..723b669 100755
--- a/app/Config/core.php
+++ b/app/Config/core.php
@@ -215,7 +215,7 @@
  * the cake shell command: cake schema create Sessions
  */
 	Configure::write('Session', array(
-		'defaults' => 'database'
+		'defaults' => 'php'
 	));
 
 /**
diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 8ef7739..d235739 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -60,14 +60,18 @@ class AppController extends Controller {
 					'passwordHasher' => 'Blowfish'
                 )
             ),
-			'flash' => array(
-				'element' => 'alert',
-				'key' => 'auth',
-				'params' => array(
-					'plugin' => 'BoostCake',
-					'class' => 'alert-error'
-				)
-			)
+			// 'flash' => array(
+			// 	'element' => 'alert',
+			// 	'key' => 'auth',
+			// 	'params' => array(
+			// 		'plugin' => 'BoostCake',
+			// 		'class' => 'alert-error'
+			// 	)
+			// )
 		)
 	);
+	    public function beforeFilter() {
+        // $this->Auth->allow('index', 'view');
+    }
+
 }
diff --git a/app/Controller/TopController.php b/app/Controller/TopController.php
index e832d36..e3a44e7 100755
--- a/app/Controller/TopController.php
+++ b/app/Controller/TopController.php
@@ -114,7 +114,7 @@ class TopController extends AppController {
 		$Email->emailFormat('text');
 		$Email->template('user_contact');
 		$Email->viewVars(array('name'=>$name,'comment'=>$comment));
-		$Email->from('yano@i-hearts.jp');
+		$Email->from( MAIL_FROM );
 		$Email->to($mail);
 		$Email->subject('[PICT CODE]問い合わせ');
 		$Email->send();
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>'));
 			}
 		}
 	}	
diff --git a/app/Model/User.php b/app/Model/User.php
index 359fb53..944e56e 100755
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -88,8 +88,6 @@ class User extends AppModel {
     public function passwordConfirm($check){
         //２つのパスワードフィールドが一致する事を確認する
         if($this->data['User']['password'] === $this->data['User']['password_confirm']){
-            // パスワードハッシュ化
-            $this->data[$this->name]['password'] = Security::hash( $password, 'sha512', true);
             return true;
         }else{
             return false;
diff --git a/app/webroot/css/main.css b/app/webroot/css/main.css
index 70665c4..6b5f26c 100755
--- a/app/webroot/css/main.css
+++ b/app/webroot/css/main.css
@@ -661,6 +661,10 @@ article.contact dl dd textarea {
 	-moz-border-radius: 5px;
 	border-radius: 5px;
 }
+article.contact dl dd div input span,
+article.contact dl dd div textarea span{
+	margin: 0 0 0 120px;
+}
 
 article.contact dl dd textarea {
 	height: 180px;