Changeset 10620

Timestamp:

Feb 4, 2009, 1:26:04 PM (14 years ago)

Author:

nagasawa

Message:

#3262,#3263:fixed the password form validators

Location:

OpenPNE3/trunk

Files:

• apps/mobile_frontend/i18n/messages.ja.xml (modified) (1 diff)
• apps/pc_frontend/i18n/messages.ja.xml (modified) (1 diff)
• lib/form/MemberConfigForm.class.php (modified) (1 diff)
• lib/form/MemberConfigForm/MemberConfigPasswordForm.class.php (modified) (1 diff)

OpenPNE3/trunk/apps/mobile_frontend/i18n/messages.ja.xml

@@ -291 +291 @@
         <target>前のﾍﾟｰｼﾞに戻る</target>
       </trans-unit>
-    </body>
+      <trans-unit id="">
+        <source>Please input by a-z or A-Z or 6-12 characters and 6-12 length.</source>
+        <target>6～12文字の半角英数で入力してください。</target>
+      </trans-unit>
+     </body>
   </file>
 </xliff>

OpenPNE3/trunk/apps/pc_frontend/i18n/messages.ja.xml

@@ -467 +467 @@
         <target>これ以上画像を追加できません。</target>
       </trans-unit>
-    </body>
+      <trans-unit id="">
+        <source>Please input by a-z or A-Z or 6-12 characters and 6-12 length.</source>
+        <target>6～12文字の半角英数で入力してください。</target>
+      </trans-unit>
+     </body>
   </file>
 </xliff>

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

@@ -87 +87 @@
       $this->widgetSchema->setLabel($name.'_confirm', $config['Caption'].' (Confirm)');
 
-      $this->mergePostValidator(new sfValidatorSchemaCompare($name, '==', $name.'_confirm'));
+      $this->mergePostValidator(new sfValidatorSchemaCompare($name.'_confirm', '==', $name));
     }
 

OpenPNE3/trunk/lib/form/MemberConfigForm/MemberConfigPasswordForm.class.php

@@ -23 +23 @@
   {
     $this->setWidget('now_password', new sfWidgetFormInputPassword());
-    $this->setValidator('now_password', new sfValidatorCallback(array('callback' => array($this, 'isValidPassword'))));
+    $this->setValidator(
+      'now_password',
+      new sfValidatorCallback(
+        array('callback' => array($this, 'isValidNowPassword'), 'required' => true)
+      )
+    );
     $this->widgetSchema->setLabel('now_password', 'Your current password');
+  }
+
+  public function setMemberConfigWidget($name)
+  {
+    $result = parent::setMemberConfigWidget($name);
+
+    if ($name === 'password')
+    {
+      $this->setValidator( $name, new sfValidatorCallback(array(
+        'callback'  => array($this, 'isValidPassword'),
+        'required' => true
+      )));
+    }
+
+    return $result;
+  }
+
+  public function isValidNowPassword($validator, $value)
+  {
+    $member = sfContext::getInstance()->getUser()->getMember();
+    if (md5($value) !== MemberConfigPeer::retrieveByNameAndMemberId('password', $member->getId())->getValue())
+    {
+      throw new sfValidatorError(new sfValidatorPass(), 'Invalid.', array('value' => $value));
+    }
+
+    return $value;
   }
 
   public function isValidPassword($validator, $value)
   {
-    $member = sfContext::getInstance()->getUser()->getMember();
-    if (md5($value) !== MemberConfigPeer::retrieveByNameAndMemberId('password', $member->getId())->getValue())
+    $size = strlen($value);
+    if (!preg_match("/^[a-zA-Z0-9]+$/", $value) || $size < 6 || $size > 12)
     {
-      throw new sfValidatorError(new sfValidatorPass(), 'invalid', array('value' => $value));
+      throw new sfValidatorError(new sfValidatorPass(), 'Please input by a-z or A-Z or 6-12 characters and 6-12 length.', array('value' => $value));
     }
 
     return $value;
   }
+
+  public function save()
+  {
+    $this->values['password'] = md5($this->values['password']);
+    parent::save();
+  }
 }