commit 04e657a75b821f893c6ddacb39f018ca408978f1 Author: root Date: Tue Mar 1 07:56:06 2016 -0500 ユーザー登録機能実装 diff --git a/app/Config/bootstrap.php b/app/Config/bootstrap.php index 73f8f00..cf2cb01 100755 --- a/app/Config/bootstrap.php +++ b/app/Config/bootstrap.php @@ -99,6 +99,7 @@ Configure::write('Dispatcher.filters', array( * Configures default file logging options */ App::uses('CakeLog', 'Log'); +App::uses( 'CakeEmail', 'Network/Email'); CakeLog::config('debug', array( 'engine' => 'File', 'types' => array('notice', 'info', 'debug'), diff --git a/app/Config/core.php b/app/Config/core.php index 5afca1a..c10faa2 100755 --- a/app/Config/core.php +++ b/app/Config/core.php @@ -34,7 +34,7 @@ * 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',22 ); /** * Configure the Error handler used to handle errors for your application. By default diff --git a/app/Config/email.php b/app/Config/email.php new file mode 100755 index 0000000..20fe8e2 --- /dev/null +++ b/app/Config/email.php @@ -0,0 +1,91 @@ + The name of a supported transport; valid options are as follows: + * Mail - Send using PHP mail function + * Smtp - Send using SMTP + * Debug - Do not send the email, just return the result + * + * You can add custom transports (or override existing transports) by adding the + * appropriate file to app/Network/Email. Transports should be named 'YourTransport.php', + * where 'Your' is the name of the transport. + * + * from => + * The origin email. See CakeEmail::from() about the valid values + */ +class EmailConfig { + + public $default = array( + 'transport' => 'Mail', + 'from' => 'you@localhost', + //'charset' => 'utf-8', + //'headerCharset' => 'utf-8', + ); + + public $smtp = array( + 'transport' => 'Smtp', + 'from' => array('site@localhost' => 'My Site'), + 'host' => 'localhost', + 'port' => 25, + 'timeout' => 30, + 'username' => 'user', + 'password' => 'secret', + 'client' => null, + 'log' => false, + //'charset' => 'utf-8', + //'headerCharset' => 'utf-8', + ); + + public $fast = array( + 'from' => 'you@localhost', + 'sender' => null, + 'to' => null, + 'cc' => null, + 'bcc' => null, + 'replyTo' => null, + 'readReceipt' => null, + 'returnPath' => null, + 'messageId' => true, + 'subject' => null, + 'message' => null, + 'headers' => null, + 'viewRender' => null, + 'template' => false, + 'layout' => false, + 'viewVars' => null, + 'attachments' => null, + 'emailFormat' => null, + 'transport' => 'Smtp', + 'host' => 'localhost', + 'port' => 25, + 'timeout' => 30, + 'username' => 'user', + 'password' => 'secret', + 'client' => null, + 'log' => true, + //'charset' => 'utf-8', + //'headerCharset' => 'utf-8', + ); + +} diff --git a/app/Controller/UsersController.php b/app/Controller/UsersController.php index e10f428..ccbb42e 100755 --- a/app/Controller/UsersController.php +++ b/app/Controller/UsersController.php @@ -9,11 +9,10 @@ App::uses('AppController', 'Controller'); class UsersController extends AppController { public $layout = 'procedure'; - // var $name = 'users'; public function beforeFilter() { parent::beforeFilter(); - $this->Auth->allow('add'); + $this->Auth->allow('register','activate'); } /** @@ -48,6 +47,115 @@ class UsersController extends AppController { $this->set('user', $this->User->find('first', $options)); } + +/** + * register method + * + * @return void + */ + public function register() { + if($this->request->is('post') || $this->request->is('put')){ + $this->User->set($this->request->data); + if($this->User->validates()){ + $this->Session->write('register',$this->request->data); + $this->redirect(array('action'=>'confirm')); + }else{ + } + } + + // if (!empty( $this->data)){ + // // 保存 + // if( $this->User->set( $this->data)){ + // // if( $this->User->save( $this->data)){ + // // ユーザアクティベート(本登録)用URLの作成 + // $url = + // DS . strtolower($this->name) . // コントローラ + // DS . 'activate' . // アクション + // DS . $this->User->id . // ユーザID + // DS . $this->User->getActivationHash(); // ハッシュ値 + // $url = Router::url( $url, true); // ドメイン(+サブディレクトリ)を付与 + // // メール送信 + // // return + // $this->redirect(array('action' => 'confirm')); + // $this->Session->write('register',$this->request->data); + // $this->Session->setFlash( '仮登録成功。メール送信しました。'); + // } else { + // // バリデーションエラーメッセージを渡す + // $this->Session->setFlash( '入力エラー'); + // } + // } + } + +/** + * register confirm + */ + public function confirm() { + if($this->Session->read('register')){ + $this->set('register',$this->Session->read('register')); + }else{ + $this->redirect(array('action'=>'register')); + } + } + + +/** + * register sent + */ + public function sent() { + // if (!empty( $this->data)){ + // // 保存 + if( $this->User->save($this->Session->read('register'))){ + // メール送信 + $this->set('register',$this->Session->read('register')); + $name = $this->Session->read('register.user.login_id'); + $mail = $this->Session->read('register.user.email'); + // ユーザアクティベート(本登録)用URLの作成 + $url = + DS . 'users' . // コントローラ + DS . 'activate' . // アクション + DS . $this->User->id . // ユーザID + DS . $this->User->getActivationHash(); // ハッシュ値 + $url = Router::url( $url, true); // ドメイン(+サブディレクトリ)を付与 + $comment = $url; + + $Email = new CakeEmail(); + $Email->charset('ISO-2022-JP'); + $Email->emailFormat('text'); + $Email->template('user_register'); + $Email->viewVars(array('name'=>$name,'comment'=>$comment)); + $Email->from($mail); + $Email->to('hasegawa@i-hearts.jp'); + $Email->subject('[PICT CODE]問い合わせ'); + $Email->send(); + + // return + // $this->redirect(array('action' => 'confirm')); + // $this->Session->setFlash( '仮登録成功。メール送信しました。'); + // } else { + // // バリデーションエラーメッセージを渡す + // $this->Session->setFlash( '入力エラー'); + // } + } + + } + +/** + * register activate + */ + public function activate( $user_id = null, $in_hash = null) { + // UserモデルにIDをセット + $this->User->id = $user_id; + if ($this->User->exists() && $in_hash == $this->User->getActivationHash()) { + // 本登録に有効なURL + // statusフィールドを0に更新 + $this->User->saveField( 'status', 0); + $this->Session->setFlash( 'Your account has been activated.'); + }else{ + // 本登録に無効なURL + $this->Session->setFlash( 'Invalid activation URL'); + } + } + /** * add method * @@ -140,4 +248,9 @@ class UsersController extends AppController { public function logout() { $this->redirect($this->Auth->logout()); } + + + } + + diff --git a/app/Model/User.php b/app/Model/User.php index 69ffbdf..1ec00e2 100755 --- a/app/Model/User.php +++ b/app/Model/User.php @@ -28,16 +28,26 @@ class User extends AppModel { //'on' => 'create', // Limit validation to 'create' or 'update' operations ), ), - 'password' => array( - 'notBlank' => array( - 'rule' => array('notBlank'), - //'message' => 'Your custom message here', - //'allowEmpty' => false, - //'required' => false, - //'last' => false, // Stop validation after this rule - //'on' => 'create', // Limit validation to 'create' or 'update' operations - ), - ), + 'email' => array( + // メールアドレスであること。 + 'validEmail' => array( 'rule' => array( 'email', true), 'message' => 'アドレスを入力して下さい'), + // 一意性チェック + // 'emailExists' => array( 'rule' => 'isUnique', 'message' => '既に登録されています'), + ), + 'password' => array( + // パスワード・確認用パスワードの一致 + 'match' => array( 'rule' => array( 'confirmPassword', 'password_confirm'), 'message' => '一致しません'), + ), + // 'password' => array( + // 'notBlank' => array( + // 'rule' => array('notBlank'), + // //'message' => 'Your custom message here', + // //'allowEmpty' => false, + // //'required' => false, + // //'last' => false, // Stop validation after this rule + // //'on' => 'create', // Limit validation to 'create' or 'update' operations + // ), + // ), 'status' => array( 'numeric' => array( 'rule' => array('numeric'), @@ -51,6 +61,25 @@ class User extends AppModel { ); + + public function confirmPassword( $field, $password_confirm) { + if ($field['password'] === $this->data[$this->name][$password_confirm]) { + // パスワードハッシュ化 + $this->data[$this->name]['password'] = Security::hash( $plain, 'sha512', true); + return true; + } + } + + public function getActivationHash() { + // ユーザIDの有無確認 + if (!isset($this->id)) { + return false; + } + // 更新日時をハッシュ化 + return Security::hash( $this->field('updated'), 'md5', true); + } + + public function beforeSave($options = array()) { if (isset($this->data[$this->alias]['password'])) { $passwordHasher = new BlowfishPasswordHasher(); diff --git a/app/View/Emails/text/user_register.ctp b/app/View/Emails/text/user_register.ctp new file mode 100755 index 0000000..7f13c51 --- /dev/null +++ b/app/View/Emails/text/user_register.ctp @@ -0,0 +1,16 @@ +━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +このメールは、PICT CODE から配信されています +━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ + +以下の内容で、お客様よりお問い合わせがありました。 + +お名前： + +お問い合わせ内容： + + + +━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +PICT CODE カスタマーサポートセンター +メールでのお問い合わせ： info@itkids.com +━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ diff --git a/app/View/Layouts/procedure.ctp b/app/View/Layouts/procedure.ctp index 2410de9..4550f1f 100755 --- a/app/View/Layouts/procedure.ctp +++ b/app/View/Layouts/procedure.ctp @@ -19,7 +19,7 @@ - + @@ -47,30 +47,15 @@ - - - - - - +
fetch('content'); ?>
+