(fixes #2410, BP from #1668) added the validation in opAuthRegisterFo…

…rmMailAddress for application and e-mail

lib/form/opAuthRegisterFormMailAddress.class.php

@@ -25,6 +25,8 @@ 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)
@@ -61,4 +63,27 @@ public function doSave()
     $memberConfig->save();
     return $memberConfig;
   }
+
+  public function validateMemberConfig($validator, $values, $arguments = array())
+  {
+    if (sfConfig::get('app_is_mobile', false))
+    {
+      $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('mobile_address_pre', $this->getMember()->getId());
+      if (!$memberConfig)
+      {
+        throw new sfValidatorError($validator, 'Can access this registration URL with pc only.');
+      }
+    }
+    else
+    {
+      $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('pc_address_pre', $this->getMember()->getId());
+      if (!$memberConfig)
+      {
+        throw new sfValidatorError($validator, 'Can access this registration URL with mobile only.');
+      }
+    }
+
+    return $values;
+  }
+
 }