メールアドレス登録時の仮登録修正

diff --git a/app/controllers/components/auth_plus.php b/app/controllers/components/auth_plus.php
index 9a11644..b8b8213 100644 (file)
--- a/app/controllers/components/auth_plus.php
+++ b/app/controllers/components/auth_plus.php
@@ -38,6 +38,7 @@ class AuthPlusComponent extends AuthComponent {
                } else {
                        $this->loginRedirect = Configure::read('Routing.basePath');
                }
+
                if ("/".$this->loginRedirect == Router::normalize(Configure::read('Routing.loginPath'))) {
                        $this->loginRedirect = Router::normalize(Configure::read('Routing.basePath'));
                        if (Configure::read('mobileUserAgent')) {

diff --git a/app/controllers/regist_mails_controller.php b/app/controllers/regist_mails_controller.php
index 8e3e9a5..e080b58 100644 (file)
--- a/app/controllers/regist_mails_controller.php
+++ b/app/controllers/regist_mails_controller.php
@@ -124,6 +124,11 @@ class RegistMailsController extends AppController {
                        }
                }
 
+               if (isset($this->user['User']['pcmail']) && !empty($this->user['User']['pcmail'])) {
+                       $this->user['User']['pcmail'] = $this->Crypt->decrypt($this->user['User']['pcmail']);
+               }
+               $this->set('user', $this->user);
+
                $this->pageTitle .= " - ". __('Regist Mail', true);
        }
 

diff --git a/app/controllers/users_controller.php b/app/controllers/users_controller.php
index d71836a..8711a7a 100644 (file)
--- a/app/controllers/users_controller.php
+++ b/app/controllers/users_controller.php
@@ -216,10 +216,12 @@ class UsersController extends ModuleController {
 
        function edit_mail($code = null) {
                if (empty($code)) {
-                               $this->Session->setFlash(__('Invalid URL.', true));
+                       $this->Session->setFlash(__('Invalid URL.', true));
                        $this->redirect(array('controller' => 'users', 'action'=>'login'));
                }
+
                $registData = $this->{$this->modelClass}->getRegistData4code($code);
+
                // $codeに該当するデータなし、user_idが異なる
                if (empty($registData) || empty($registData['RegistMail']['user_id']) || $registData['RegistMail']['user_id'] != $this->user_id) {
                        $this->Session->setFlash(__('Invalid URL.', true));
@@ -591,7 +593,6 @@ class UsersController extends ModuleController {
                                $this->{$this->modelClass}->deleteRegistData4mail($registData['RegistMail']['mail']);
                        }
 
-
                        $this->redirect(array('controller' => 'users', 'action'=>'index'));
                }
        }
@@ -621,7 +622,7 @@ class UsersController extends ModuleController {
                        $fields = array('pcmail');
                }
 
-               // バリデーション
+               // validate
                $data['User']['id'] = $this->user_id;
                if ($this->User->save($data, array('fieldList' => $fields, 'validate' => false))) {
                                $this->{$this->modelClass}->deleteRegistData4mail($registData['RegistMail']['mail']);

diff --git a/app/locale/jpn/LC_MESSAGES/default.po b/app/locale/jpn/LC_MESSAGES/default.po
index ef3e350..0d6ea8f 100644 (file)
--- a/app/locale/jpn/LC_MESSAGES/default.po
+++ b/app/locale/jpn/LC_MESSAGES/default.po
@@ -1865,8 +1865,16 @@ msgid "Regist Mail"
 msgstr "メールアドレス登録"
 
 #: /views/regist_mails/add.ctp:
-msgid "Input your mail address."
-msgstr "メールアドレスを入力してください。"
+msgid "Change Mail"
+msgstr "メールアドレス変更"
+
+#: /views/regist_mails/add.ctp:
+msgid "Your Address"
+msgstr "現在のアドレス"
+
+#: /views/regist_mails/add.ctp:
+msgid "New address"
+msgstr "登録するアドレス"
 
 #: /controllers/regist_mails_controller.php:
 msgid "This Address has been registed."

diff --git a/app/models/app_model.php b/app/models/app_model.php
index 3a4fab2..a94f7a0 100644 (file)
--- a/app/models/app_model.php
+++ b/app/models/app_model.php
@@ -286,6 +286,20 @@ class AppModel extends Model {
                return $this->RegistMail->deleteAll($conditions);
        }
 
+       function deleteRegistData4user_id($user_id)
+       {
+               if (!$user_id) {
+                       return null;
+               }
+
+               $this->RegistMail = CorePlus::set_model('RegistMail');
+               $conditions = array(
+                       'RegistMail.user_id' => $user_id,
+               );
+
+               return $this->RegistMail->deleteAll($conditions);
+       }
+
        function isUniquePcMail($data)
        {
                // usersチェック

diff --git a/app/views/elements/pc_mainnav.ctp b/app/views/elements/pc_mainnav.ctp
index 6b3e542..4549cb6 100644 (file)
--- a/app/views/elements/pc_mainnav.ctp
+++ b/app/views/elements/pc_mainnav.ctp
@@ -1,3 +1,4 @@
+<?php if ($this->action != 'regist_end'): ?>
 <?php if (isset($site_configs['Site.outerHome']['value']) && $site_configs['Site.outerHome']['value']): ?>
        <li><?php echo $html->link($site_configs['Site.outerHomeLinkname']['value'], $site_configs['Site.outerHome']['value']); ?>
 <?php endif; ?>
@@ -25,3 +26,4 @@
 <?php echo $html->link(__('Login', true), array('controller' => 'users', 'action' => 'login')); ?>
 <?php endif; ?>
 </li>
+<?php endif; ?>
\ No newline at end of file

diff --git a/app/views/regist_mails/add.ctp b/app/views/regist_mails/add.ctp
index c9134ac..bc20046 100644 (file)
--- a/app/views/regist_mails/add.ctp
+++ b/app/views/regist_mails/add.ctp
@@ -1,14 +1,32 @@
 <div class="registMails form">
 <?php echo $form->create('RegistMail');?>
 <fieldset>
-<legend><?php __('Regist Mail');?></legend>
-<?php
-       echo $html->div('attention', __('Input your mail address.', true));
-       echo $form->input('mail', array(
-               'label' => false,
-       ));
 
-       echo $token->create();
+<?php 
+if (isset($user['User']['pcmail']) && !empty($user['User']['pcmail'])) {
+       echo $html->tag('legend', __('Change Mail', true));
+} else {
+       echo $html->tag('legend', __('Regist Mail', true));
+}
+
+if (isset($user['User']['pcmail']) && !empty($user['User']['pcmail'])) {
+       echo $html->div('input', 
+               $html->tag('label', 
+                       __('Your Address', true),
+                       array(
+                       )
+               ).
+               $html->div('', 
+                       $user['User']['pcmail']
+               )
+       );
+}
+
+echo $form->input('mail', array(
+       'label' =>  __('New address', true),
+));
+
+echo $token->create();
 ?>
 </fieldset>
 <?php echo $form->end(array('label' => __('Submit', true)));?>