22
This commit is contained in:
@@ -150,7 +150,7 @@ class CommonController extends BaseController{
|
||||
}
|
||||
$username = $email;
|
||||
unset($mobile);
|
||||
captcha_verfiy('email','register',$email,false);
|
||||
captcha_verify('email','register',$email,false);
|
||||
}
|
||||
if ($type == 'mobile') {
|
||||
if(!$mobile || !Validate::regex($mobile, "^1\d{10}$")){
|
||||
@@ -158,7 +158,7 @@ class CommonController extends BaseController{
|
||||
}
|
||||
$username = $mobile;
|
||||
unset($email);
|
||||
captcha_verfiy('mobile','register',$mobile,false);
|
||||
captcha_verify('mobile','register',$mobile,false);
|
||||
}
|
||||
if ($type == 'username') {
|
||||
if(!$username){
|
||||
@@ -226,11 +226,11 @@ class CommonController extends BaseController{
|
||||
}
|
||||
$data = ['userinfo' => $user];
|
||||
// if ($type == 'email') {
|
||||
// captcha_verfiy('email','register',$email,true);
|
||||
// captcha_verify('email','register',$email,true);
|
||||
// }else if ($type == 'mobile') {
|
||||
// captcha_verfiy('mobile','register',$mobile,true);
|
||||
// captcha_verify('mobile','register',$mobile,true);
|
||||
// }else{
|
||||
// captcha_verfiy('image','register',$mobile,true);
|
||||
// captcha_verify('image','register',$mobile,true);
|
||||
// }
|
||||
return $this->success(__('Sign up successful'), $data);
|
||||
} catch (\Exception $e) {
|
||||
@@ -326,16 +326,16 @@ class CommonController extends BaseController{
|
||||
$user = false;
|
||||
}
|
||||
if($user){
|
||||
captcha_verfiy('mobile','reset_pwd',$user->mobile);
|
||||
captcha_verify('mobile','reset_pwd',$user->mobile);
|
||||
}
|
||||
}else{
|
||||
if ($mobile && Validate::regex($mobile, "^1\d{10}$")) {
|
||||
captcha_verfiy('mobile','reset_pwd',$mobile);
|
||||
captcha_verify('mobile','reset_pwd',$mobile);
|
||||
$region = Input('region');
|
||||
$region = str_replace('+','',$region);
|
||||
$user = UserModel::where('region',$region)->where('mobile',$mobile)->find();
|
||||
}else if ($email && Validate::is($email, "email")) {
|
||||
captcha_verfiy('email','reset_pwd',$email);
|
||||
captcha_verify('email','reset_pwd',$email);
|
||||
$user = UserModel::getByEmail($email);
|
||||
}
|
||||
}
|
||||
@@ -385,19 +385,19 @@ class CommonController extends BaseController{
|
||||
if($user){
|
||||
|
||||
if($verify_type == 'email'){
|
||||
captcha_verfiy('email','reset_trade_pwd',$user->email);
|
||||
captcha_verify('email','reset_trade_pwd',$user->email);
|
||||
}else if($verify_type == 'mobile'){
|
||||
captcha_verfiy('mobile','reset_trade_pwd',$user->mobile);
|
||||
captcha_verify('mobile','reset_trade_pwd',$user->mobile);
|
||||
}else{
|
||||
return $this->error(__('Unknown verify type'));
|
||||
}
|
||||
}
|
||||
}else{
|
||||
if ($mobile && Validate::regex($mobile, "^1\d{10}$")) {
|
||||
captcha_verfiy('mobile','reset_trade_pwd',$mobile);
|
||||
captcha_verify('mobile','reset_trade_pwd',$mobile);
|
||||
$user = UserModel::getByMobile($mobile);
|
||||
}elseif ($email && Validate::is($email, "email")) {
|
||||
captcha_verfiy('email','reset_trade_pwd',$email);
|
||||
captcha_verify('email','reset_trade_pwd',$email);
|
||||
$user = UserModel::getByEmail($email);
|
||||
}
|
||||
}
|
||||
@@ -534,11 +534,11 @@ class CommonController extends BaseController{
|
||||
$event = $request->post('event');
|
||||
try {
|
||||
if($type == 'email'){
|
||||
$result = captcha_verfiy('email', $event , $email,false);
|
||||
$result = captcha_verify('email', $event , $email,false);
|
||||
}elseif($type == 'mobile'){
|
||||
$result = captcha_verfiy('mobile', $event , $mobile,false);
|
||||
$result = captcha_verify('mobile', $event , $mobile,false);
|
||||
}else{
|
||||
$result = captcha_verfiy('image', $event , '',false);
|
||||
$result = captcha_verify('image', $event , '',false);
|
||||
}
|
||||
if(!$result){
|
||||
return $this->fail(__('Captcha is incorrect'));
|
||||
|
||||
Reference in New Issue
Block a user