Changeset 9660

Timestamp:

Dec 24, 2008, 6:59:32 PM (14 years ago)

Author:

ebihara

Message:

#3223:added opAuthValidatorMemberConfig and opAuthValidatorMemberConfigAndPassword

Location:

OpenPNE3/trunk/lib

Files:

• form/sfOpenPNEAuthForm.class.php (modified) (1 diff)
• user/sfOpenPNESecurityUser.class.php (modified) (1 diff)
• validator/opAuthValidatorMemberConfig.class.php (added)
• validator/opAuthValidatorMemberConfigAndPassword.class.php (added)

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

@@ -23 +23 @@
   {
     $this->widgetSchema->setNameFormat('auth'.$this->getAuthMode().'[%s]');
+  }
+
+  public function getMember()
+  {
+    $member = $this->getValue('member');
+    if ($member instanceof Member)
+    {
+      return $member;
+    }
+
+    return false;
   }
 

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

@@ -107 +107 @@
   public function login($form)
   {
-    $memberId = $form->getValue('member_id');
+    if ($member = $form->getMember())
+    {
+      $memberId = $member->getId();
+    }
+    else  // deprecated
+    {
+      $memberId = $form->getValue('member_id');
+    }
+
     if ($memberId)
     {