From 682f5191a746f32ac5c5ca1d6b0ea1ad0ebd0f4d Mon Sep 17 00:00:00 2001 From: kashiwasan Date: Fri, 2 Dec 2011 16:03:11 +0900 Subject: [PATCH 1/6] modified to regist for smartphone. --- .../opAuthMailAddress/actions/actions.class.php | 5 ++--- .../opAuthMailAddress/actions/components.class.php | 2 +- lib/form/opAuthRegisterFormMailAddress.class.php | 2 +- templates/mail/mobile/_notifyRegisterURL.php | 10 +--------- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php b/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php index f33d3d9..40fc98b 100644 --- a/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php +++ b/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php @@ -52,7 +52,7 @@ public function executeRegister($request) opActivateBehavior::disable(); $authMode = $memberConfig->getMember()->getConfig('register_auth_mode'); - $pcAddressPre = $memberConfig->getMember()->getConfig('pc_address_pre'); + $pcAddressPre = $memberConfig->getMember()->getConfig('pc_address_pre') ? $memberConfig->getMember()->getConfig('pc_address_pre') : $memberConfig->getMember()->getConfig('mobile_address_pre'); opActivateBehavior::enable(); if ('MobileUID' === $authMode) @@ -62,8 +62,7 @@ public function executeRegister($request) $this->forward404Unless($authMode === $this->getUser()->getCurrentAuthMode()); if (!$pcAddressPre) - { - + { return sfView::ERROR; } diff --git a/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php b/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php index 48c15dd..a92045a 100644 --- a/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php +++ b/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php @@ -15,7 +15,7 @@ public function executeRegisterBox($request) $token = $request->getParameter('token'); $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndValue('register_token', $token); opActivateBehavior::disable(); - $this->pcAddressPre = $memberConfig->getMember()->getConfig('pc_address_pre'); + $this->pcAddressPre = $memberConfig->getMember()->getConfig('pc_address_pre') : $memberConfig->getMember()->getConfig('pc_address_pre') : $memberConfig->getMember()->getConfig('mobile_address_pre'); opActivateBehavior::enable(); } } diff --git a/lib/form/opAuthRegisterFormMailAddress.class.php b/lib/form/opAuthRegisterFormMailAddress.class.php index 53241bd..bb9d97e 100644 --- a/lib/form/opAuthRegisterFormMailAddress.class.php +++ b/lib/form/opAuthRegisterFormMailAddress.class.php @@ -24,7 +24,7 @@ public function configure() // Hack for non-rendering secret answer $this->configForm->getWidget('secret_answer')->setOption('type', 'text'); - $this->mergePostValidator(new sfValidatorCallback(array('callback' => array($this, 'validateMemberConfig')))); + // $this->mergePostValidator(new sfValidatorCallback(array('callback' => array($this, 'validateMemberConfig')))); } public function bindAll($request) diff --git a/templates/mail/mobile/_notifyRegisterURL.php b/templates/mail/mobile/_notifyRegisterURL.php index eb1394f..bc49a68 100644 --- a/templates/mail/mobile/_notifyRegisterURL.php +++ b/templates/mail/mobile/_notifyRegisterURL.php @@ -5,12 +5,4 @@ $snsName)) ?> - - - - - - - - - + From 1d25095c644faeabbfa43bf5f17561071a27017b Mon Sep 17 00:00:00 2001 From: root Date: Fri, 2 Dec 2011 16:12:43 +0900 Subject: [PATCH 2/6] fixed fatal error. --- lib/form/opAuthRegisterFormMailAddress.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/form/opAuthRegisterFormMailAddress.class.php b/lib/form/opAuthRegisterFormMailAddress.class.php index bb9d97e..f76281e 100644 --- a/lib/form/opAuthRegisterFormMailAddress.class.php +++ b/lib/form/opAuthRegisterFormMailAddress.class.php @@ -55,6 +55,10 @@ public function doSave() else { $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('pc_address_pre', $this->getMember()->getId()); + if (!$memberConfig) + { + $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('mobile_address_pre', $this->getMember()->getId()); + } $memberConfig->setName('pc_address'); } From 0a9f6298ab89023d51baa4d2c0882ef7073a6668 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 2 Dec 2011 17:30:39 +0900 Subject: [PATCH 3/6] modified actions. --- .../modules/opAuthMailAddress/actions/components.class.php | 2 +- lib/form/opAuthRegisterFormMailAddress.class.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php b/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php index a92045a..30a7966 100644 --- a/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php +++ b/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php @@ -15,7 +15,7 @@ public function executeRegisterBox($request) $token = $request->getParameter('token'); $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndValue('register_token', $token); opActivateBehavior::disable(); - $this->pcAddressPre = $memberConfig->getMember()->getConfig('pc_address_pre') : $memberConfig->getMember()->getConfig('pc_address_pre') : $memberConfig->getMember()->getConfig('mobile_address_pre'); + $this->pcAddressPre = $memberConfig->getMember()->getConfig('pc_address_pre') ? $memberConfig->getMember()->getConfig('pc_address_pre') : $memberConfig->getMember()->getConfig('mobile_address_pre'); opActivateBehavior::enable(); } } diff --git a/lib/form/opAuthRegisterFormMailAddress.class.php b/lib/form/opAuthRegisterFormMailAddress.class.php index f76281e..8a67771 100644 --- a/lib/form/opAuthRegisterFormMailAddress.class.php +++ b/lib/form/opAuthRegisterFormMailAddress.class.php @@ -58,8 +58,12 @@ public function doSave() if (!$memberConfig) { $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('mobile_address_pre', $this->getMember()->getId()); + $memberConfig->setName('mobile_address'); + } + else + { + $memberConfig->setName('pc_address'); } - $memberConfig->setName('pc_address'); } $memberConfig->save(); From 87e9b183546f3d74c095f47d3bec20692d2fa416 Mon Sep 17 00:00:00 2001 From: kashiwasan Date: Tue, 20 Dec 2011 12:37:33 +0900 Subject: [PATCH 4/6] =?UTF-8?q?$pcAddressPre=E3=81=AE=E7=AE=87=E6=89=80?= =?UTF-8?q?=E3=82=92$addressPre=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/opAuthMailAddress/actions/actions.class.php | 4 ++-- .../modules/opAuthMailAddress/actions/components.class.php | 2 +- .../modules/opAuthMailAddress/templates/_registerBox.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php b/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php index 40fc98b..e76c161 100644 --- a/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php +++ b/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php @@ -52,7 +52,7 @@ public function executeRegister($request) opActivateBehavior::disable(); $authMode = $memberConfig->getMember()->getConfig('register_auth_mode'); - $pcAddressPre = $memberConfig->getMember()->getConfig('pc_address_pre') ? $memberConfig->getMember()->getConfig('pc_address_pre') : $memberConfig->getMember()->getConfig('mobile_address_pre'); + $addressPre = $memberConfig->getMember()->getConfig('pc_address_pre') ? $memberConfig->getMember()->getConfig('pc_address_pre') : $memberConfig->getMember()->getConfig('mobile_address_pre'); opActivateBehavior::enable(); if ('MobileUID' === $authMode) @@ -61,7 +61,7 @@ public function executeRegister($request) } $this->forward404Unless($authMode === $this->getUser()->getCurrentAuthMode()); - if (!$pcAddressPre) + if (!$addressPre) { return sfView::ERROR; } diff --git a/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php b/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php index 30a7966..268062a 100644 --- a/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php +++ b/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php @@ -15,7 +15,7 @@ public function executeRegisterBox($request) $token = $request->getParameter('token'); $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndValue('register_token', $token); opActivateBehavior::disable(); - $this->pcAddressPre = $memberConfig->getMember()->getConfig('pc_address_pre') ? $memberConfig->getMember()->getConfig('pc_address_pre') : $memberConfig->getMember()->getConfig('mobile_address_pre'); + $this->addressPre = $memberConfig->getMember()->getConfig('pc_address_pre') ? $memberConfig->getMember()->getConfig('pc_address_pre') : $memberConfig->getMember()->getConfig('mobile_address_pre'); opActivateBehavior::enable(); } } diff --git a/apps/pc_frontend/modules/opAuthMailAddress/templates/_registerBox.php b/apps/pc_frontend/modules/opAuthMailAddress/templates/_registerBox.php index 957e84c..f29c60f 100644 --- a/apps/pc_frontend/modules/opAuthMailAddress/templates/_registerBox.php +++ b/apps/pc_frontend/modules/opAuthMailAddress/templates/_registerBox.php @@ -1,4 +1,4 @@ - + __('Errors'), From 1e3bf51432ad9690adef22b7c830c292ab9920ab Mon Sep 17 00:00:00 2001 From: kashiwasan Date: Tue, 20 Dec 2011 12:38:14 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=A2=E3=82=A6=E3=83=88=E3=81=AE=E7=AE=87=E6=89=80=E3=82=92?= =?UTF-8?q?=E5=AE=8C=E5=85=A8=E9=99=A4=E5=8E=BB=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/form/opAuthRegisterFormMailAddress.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/form/opAuthRegisterFormMailAddress.class.php b/lib/form/opAuthRegisterFormMailAddress.class.php index 8a67771..821bd85 100644 --- a/lib/form/opAuthRegisterFormMailAddress.class.php +++ b/lib/form/opAuthRegisterFormMailAddress.class.php @@ -24,7 +24,6 @@ public function configure() // Hack for non-rendering secret answer $this->configForm->getWidget('secret_answer')->setOption('type', 'text'); - // $this->mergePostValidator(new sfValidatorCallback(array('callback' => array($this, 'validateMemberConfig')))); } public function bindAll($request) From 33394d5c139c69e7650a21fee27674cd66629185 Mon Sep 17 00:00:00 2001 From: kashiwasan Date: Tue, 20 Dec 2011 14:09:50 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=E6=90=BA=E5=B8=AF=E7=89=88=E3=83=A1?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=83=86=E3=83=B3=E3=83=97=E3=83=AC=E3=81=A7?= =?UTF-8?q?app=5Furl=5Ffor()=E3=81=AE=E4=BD=BF=E7=94=A8=E3=82=92=E5=BB=83?= =?UTF-8?q?=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/mail/mobile/_notifyRegisterURL.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/mail/mobile/_notifyRegisterURL.php b/templates/mail/mobile/_notifyRegisterURL.php index bc49a68..6416432 100644 --- a/templates/mail/mobile/_notifyRegisterURL.php +++ b/templates/mail/mobile/_notifyRegisterURL.php @@ -5,4 +5,4 @@ $snsName)) ?> - +