Changeset 9804

Timestamp:

Dec 31, 2008, 3:18:43 PM (13 years ago)

Author:

ebihara

Message:

#3240:changed InviteForm? to accepts PCAddress and MobileAddress?

Location:

OpenPNE3/trunk

Files:

• apps/pc_frontend/templates/_requestRegisterURLMail.php (modified) (1 diff)
• lib/form/InviteForm.class.php (modified) (2 diffs)

OpenPNE3/trunk/apps/pc_frontend/templates/_requestRegisterURLMail.php

@@ -1 +1 @@
 以下のURLから<?php echo OpenPNEConfig::get('sns_name') ?>に登録してください。
 
-<?php echo url_for(sprintf('pcAddress/register?token=%s&authMode=%s', $token, $authMode), true) ?>
+<?php if ($isMobile) : ?>
+<?php echo app_url_for('mobile_frontend', sprintf('mobileAddress/register?token=%s&authMode=%s', $token, $authMode), true) ?>
+<?php else: ?>
+<?php echo app_url_for('pc_frontend', sprintf('pcAddress/register?token=%s&authMode=%s', $token, $authMode), true) ?>
+<?php endif; ?>

OpenPNE3/trunk/lib/form/InviteForm.class.php

@@ -12 +12 @@
   public function configure()
   {
-    parent::configure();
-    $this->isAutoGenerate = false;
-    $this->memberConfigSettings['pc_address']['IsConfirm'] = false;
-    $this->setMemberConfigWidget('pc_address');
+    $this->setWidget('mail_address', new sfWidgetFormInput());
+    $this->setValidator('mail_address', new sfValidatorEmail());
+
+    $this->validatorSchema->setPostValidator(new sfValidatorCallback(array(
+        'callback' => array($this, 'validate'),
+    )));
   }
 
-  public function getToken()
+  public function validate($validator, $values, $arguments = array())
   {
-    $memberConfig = MemberConfigPeer::retrieveByNameAndMemberId('pc_address_token', $this->member->getId());
-    if ($memberConfig) {
-      return $memberConfig->getValue();
+    if (opToolkit::isMobileEmailAddress($values['mail_address']))
+    {
+      $mailValidator = new sfValidatorMobileEmail();
+      $values['mobile_address'] = $mailValidator->clean($values['mail_address']);
     }
+    else
+    {
+      $mailValidator = new opValidatorPCEmail();
+      $values['pc_address'] = $mailValidator->clean($values['mail_address']);
+    }
+
+    return $values;
   }
 
-  public function getMailAddress()
+  public function saveConfig($name, $value)
   {
-    $memberConfig = MemberConfigPeer::retrieveByNameAndMemberId('pc_address_pre', $this->member->getId());
-    if ($memberConfig) {
-      return $memberConfig->getValue();
+    if ('pc_address' === $name || 'mobile_address' === $name)
+    {
+      $this->savePreConfig($name, $value);
+      $memberConfig = MemberConfigPeer::retrieveByNameAndMemberId($name.'_token', $this->member->getId());
+      $token = $memberConfig->getValue();
+      $this->sendConfirmMail($token, $value, array(
+        'id'   => $this->member->getId(),
+        'type' => $name,
+      ));
     }
   }
@@ -39 +55 @@
       'token'    => $token,
       'authMode' => sfContext::getInstance()->getUser()->getCurrentAuthMode(),
+      'isMobile' => opToolkit::isMobileEmailAddress($to),
     );