Changeset 12322

Timestamp:

Jul 20, 2009, 4:58:09 PM (14 years ago)

Author:

ebihara

Message:

#4136:fixed the registration process that doesn't allow a disabled member to begin registeration again

Location:

OpenPNE3/trunk

Files:

• apps/mobile_frontend/modules/member/config/security.yml (modified) (1 diff)
• apps/mobile_frontend/templates/layout.php (modified) (2 diffs)
• lib/form/doctrine/InviteForm.class.php (modified) (2 diffs)
• lib/form/opAuthRegisterForm.class.php (modified) (1 diff)
• lib/user/sfOpenPNESecurityUser.class.php (modified) (1 diff)

OpenPNE3/trunk/apps/mobile_frontend/modules/member/config/security.yml

@@ -4 +4 @@
 
 registerInput:
-  credentials: SNSRegisterBegin
+  credentials: [[SNSRegisterBegin, SNSRegisterFinish]]
 
 configComplete:

OpenPNE3/trunk/apps/mobile_frontend/templates/layout.php

@@ -51 +51 @@
 
 <?php if (!include_slot('op_mobile_footer')): ?>
+<?php if ($sf_user->hasCredential('SNSMember')): ?>
 <table width="100%">
 <tbody><tr><td align="center" bgcolor="<?php echo $op_color["core_color_11"] ?>">
@@ -56 +57 @@
 </td></tr></tbody></table>
 <?php endif; ?>
+<?php endif; ?>
 </body>
 </html>

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

@@ -57 +57 @@
     }
 
-    if (!empty($values['mobile_address']) && Doctrine::getTable('MemberConfig')->retrieveByNameAndValue('mobile_address', $values['mobile_address']))
+    if (!empty($values['mobile_address']) && !$this->validateAddress('mobile_address', $values['mobile_address']))
     {
       throw new sfValidatorError($validator, 'invalid');
     }
-    if (!empty($values['pc_address']) && Doctrine::getTable('MemberConfig')->retrieveByNameAndValue('pc_address', $values['pc_address']))
+    if (!empty($values['pc_address']) && !$this->validateAddress('pc_address', $values['pc_address']))
     {
       throw new sfValidatorError($validator, 'invalid');
@@ -67 +67 @@
 
     return $values;
+  }
+
+  protected function validateAddress($configName, $configValue)
+  {
+    $activation = opActivateBehavior::getEnabled();
+    opActivateBehavior::disable();
+
+    if ($config = Doctrine::getTable('MemberConfig')->retrieveByNameAndValue($configName, $configValue))
+    {
+      if ($config->getMember()->getIsActive() || !$config->getMember()->getConfig($configName.'_token'))
+      {
+        if ($activation)
+        {
+          opActivateBehavior::enable();
+        }
+        return false;
+      }
+
+      $this->member = $config->getMember();
+    }
+    elseif ($config = Doctrine::getTable('MemberConfig')->retrieveByNameAndValue($configName.'_pre', $configValue))
+    {
+      $this->member = $config->getMember();
+    }
+
+    if ($activation)
+    {
+      opActivateBehavior::enable();
+    }
+    return true;
   }
 

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

@@ -47 +47 @@
 
     $this->memberForm = new MemberForm($this->getMember());
-    $this->profileForm = new MemberProfileForm($this->getMember()->getMemberProfile());
+    $this->profileForm = new MemberProfileForm($this->getMember()->getProfiles());
     $this->profileForm->setRegisterWidgets();
     $this->configForm = new MemberConfigForm($this->getMember());

OpenPNE3/trunk/lib/user/sfOpenPNESecurityUser.class.php

@@ -172 +172 @@
     {
       $this->setMemberId($memberId);
+      if (!$this->getMember())
+      {
+        return false;
+      }
 
       if ($this->getMember()->isOnBlacklist())