Skip to content

スマートフォンから新規登録できるように対応 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kashiwasan wants to merge 6 commits into
base: master
Choose a base branch
from
Open

スマートフォンから新規登録できるように対応 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
682f519
modified to regist for smartphone.
Dec 2, 2011
1d25095
fixed fatal error.
Dec 2, 2011
0a9f629
modified actions.
Dec 2, 2011
87e9b18
$pcAddressPreの箇所を$addressPreに修正
Dec 20, 2011
1e3bf51
コメントアウトの箇所を完全除去。
Dec 20, 2011
33394d5
携帯版メールテンプレでapp_url_for()の使用を廃止
Dec 20, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function executeRegister($request)

opActivateBehavior::disable();
$authMode = $memberConfig->getMember()->getConfig('register_auth_mode');
$pcAddressPre = $memberConfig->getMember()->getConfig('pc_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)
Expand All @@ -61,9 +61,8 @@ public function executeRegister($request)
}
$this->forward404Unless($authMode === $this->getUser()->getCurrentAuthMode());

if (!$pcAddressPre)
{

if (!$addressPre)
{
return sfView::ERROR;
}

Expand Down
2 changes: 1 addition & 1 deletion apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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->addressPre = $memberConfig->getMember()->getConfig('pc_address_pre') ? $memberConfig->getMember()->getConfig('pc_address_pre') : $memberConfig->getMember()->getConfig('mobile_address_pre');
opActivateBehavior::enable();
}
}
2 changes: 1 addition & 1 deletion apps/pc_frontend/modules/opAuthMailAddress/templates/_registerBox.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php if (!$pcAddressPre): ?>
<?php if (!$addressPre): ?>
<?php
$options = array(
'title' => __('Errors'),
Expand Down
11 changes: 9 additions & 2 deletions lib/form/opAuthRegisterFormMailAddress.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -55,7 +54,15 @@ public function doSave()
else
{
$memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('pc_address_pre', $this->getMember()->getId());
$memberConfig->setName('pc_address');
if (!$memberConfig)
{
$memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('mobile_address_pre', $this->getMember()->getId());
$memberConfig->setName('mobile_address');
}
else
{
$memberConfig->setName('pc_address');
}
}

$memberConfig->save();
Expand Down
10 changes: 1 addition & 9 deletions templates/mail/mobile/_notifyRegisterURL.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,4 @@

<?php echo __('* Participate in %1%', array('%1%' => $snsName)) ?>

<?php if ($isMobile) : ?>
<?php echo app_url_for('mobile_frontend', sprintf('opAuthMailAddress/register?token=%s&authMode=%s', $token, $authMode), true) ?>

<?php echo __('Can access this registration URL with mobile only.') ?>
<?php else: ?>
<?php echo app_url_for('pc_frontend', sprintf('opAuthMailAddress/register?token=%s&authMode=%s', $token, $authMode), true) ?>

<?php echo __('Can access this registration URL with pc only.') ?>
<?php endif; ?>
<?php echo url_for(sprintf('opAuthMailAddress/register?token=%s&authMode=%s', $token, $authMode), true); ?>