Commit 77b7aa25 authored by xiabin's avatar xiabin

修改找回密码的严重问题

parent 3b38a40b
This diff is collapsed.
......@@ -17,6 +17,7 @@ class PasswordResetRequestForm extends Model
public $telephone;
public $verifyCode;
/**
* @inheritdoc
*/
......@@ -30,11 +31,21 @@ class PasswordResetRequestForm extends Model
'filter' => ['status' => User::STATUS_ACTIVE],
'message' => 'There is no user with such telephone.'
],
['verifyCode', 'required'],
['verifyCode', 'captcha']
];
}
/**
* @inheritdoc
*/
public function attributeLabels()
{
return [
'verifyCode'=>''
];
}
public function sendMsg()
{
......
......@@ -45,7 +45,7 @@ class ResetPasswordForm extends Model
['password', 'required'],
['password', 'string', 'min' => 6],
['rePassword', 'string', 'min' => 6],
['rePassword', 'compare', 'compareAttribute' => 'rePassword'],
['rePassword', 'compare', 'compareAttribute' => 'password','message'=>'两次密码输入不一致'],
];
}
......
......@@ -35,7 +35,7 @@ class SignupForm extends Model
[['password', 'rePassword'], 'required'],
['password', 'string', 'min' => 6],
['rePassword', 'string', 'min' => 6],
['rePassword', 'compare', 'compareAttribute' => 'rePassword'],
['rePassword', 'compare', 'compareAttribute' => 'password'],
['from', 'integer'],
['verifyCode', 'required'],
['verifyCode', 'captcha']
......
......@@ -21,6 +21,7 @@ class TokenInputForm extends Model
{
public $token;
public $verifyCode;
/**
* @return array
*/
......@@ -29,10 +30,24 @@ class TokenInputForm extends Model
return [
['token', 'trim'],
['token', 'required'],
['token', 'string']
['token', 'string'],
['verifyCode', 'required'],
['verifyCode', 'captcha']
];
}
/**
* @inheritdoc
*/
public function attributeLabels()
{
return [
'verifyCode'=>''
];
}
/**
* @inheritdoc
*/
......
......@@ -5,6 +5,7 @@
/* @var $model \frontend\models\PasswordResetRequestForm */
use yii\bootstrap\ActiveForm;
use yii\captcha\Captcha;
$this->title = '找回密码';
\frontend\assets\AppAsset::addScript($this, '@web/assets/request_password_reset.js');
......@@ -36,15 +37,20 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
<input name="telephone" type="text" class="" placeholder="请输入注册的手机号码" required="" autofocus="">
<!--<span class="tips">手机号或者密码错误</span>-->
</div>
<div class="password input-wrapper last-wrapper"">
<?= $form->field($model, 'verifyCode')->widget(Captcha::className(),[
'template' => "{image}",
'imageOptions' => ['alt' => '验证码'],
'captchaAction' => 'site/captcha',
])->error(FALSE); ?>
<input id="verifyCode" name="verifyCode" type="text" placeholder="输入验证码" required="">
<span id="verifyCode" class="tips"><?= $model->getFirstError('verifyCode') ?></span>
</div>
<div class="v-geetest">
<div id="embed-captcha"></div>
<p id="wait" class="show">正在加载验证码......</p>
<p id="notice" class="hide">请先拖动验证码到相应位置</p>
</div>
<div class="foot-reg-btn">
<button id="submit" class="btn btn-log" type="submit">获取验证码</button>
</div>
......
......@@ -8,20 +8,6 @@ use yii\helpers\Html;
use yii\bootstrap\ActiveForm;
$this->title = 'Reset password';
$jsString = <<<JS
$("#submit").unbind().click(function() {
console.log($("#password").val());
console.log($("#repassword").val());
if($("#password").val() != $("#repassword").val()){
$("#repassword_tips").html('两次密码不一致');
return false;
}
});
JS;
$this->registerJs($jsString);
?>
<div class="container">
<div class="z-m-center">
......@@ -41,20 +27,21 @@ $this->registerJs($jsString);
<div class="tab-pane fade in active" id="three">
<?php $form = ActiveForm::begin(['id' => 'request-password-reset-form']); ?>
<div class="reg-box">
<div class="password input-wrapper">
<input value="<?= $model->password ?>" id="password" name="password" type="password" class=""
placeholder="设置新密码" required="">
placeholder="设置新密码" >
<span id="repassword_tips" class="tips"><?= $model->getFirstError('password') ?></span>
</div>
<div class="check-password input-wrapper last-wrapper">
<input value="<?= $model->rePassword ?>" id="repassword" name="rePassword" type="password" class="" placeholder="重复输入密码" required="">
<div class="check-password input-wrapper">
<input value="<?= $model->rePassword ?>" id="repassword" name="rePassword" type="password" class="" placeholder="重复输入密码" >
<span id="repassword_tips" class="tips"><?= $model->getFirstError('rePassword') ?></span>
</div>
</div>
<div class="foot-reg-btn">
<button id="submit" class="btn btn-log" type="submit">确认</button>
<button class="btn btn-log" type="submit">确认</button>
</div>
<?php ActiveForm::end() ?>
</div>
......
......@@ -7,6 +7,7 @@
*/
use yii\captcha\Captcha;
use yii\helpers\Html;
use yii\bootstrap\ActiveForm;
......@@ -40,11 +41,15 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
<input name="token" type="text" class="" value="<?= $model->token?>" placeholder="请输入6位验证码" required="" autofocus="">
<span class="tips"><?= $model->getFirstError('token') ?></span>
</div>
<div style="margin-top: 20px;margin-bottom: 20px">
<div id="embed-captcha"></div>
<p id="wait" class="show">正在加载验证码......</p>
<p id="notice" class="hide">请先拖动验证码到相应位置</p>
</div>
<div class="password input-wrapper last-wrapper"">
<?= $form->field($model, 'verifyCode')->widget(Captcha::className(),[
'template' => "{image}",
'imageOptions' => ['alt' => '验证码'],
'captchaAction' => 'site/captcha',
])->error(FALSE); ?>
<input id="verifyCode" name="verifyCode" type="text" placeholder="输入验证码" required="">
<span id="verifyCode" class="tips"><?= $model->getFirstError('verifyCode') ?></span>
</div>
</div>
<div class="foot-reg-btn">
<button id="token_input" class="btn btn-log" type="submit">下一步</button>
......
/**
* Created by xiabin on 2016/9/26.
*/
var handlerEmbed = function (captchaObj) {
$("#submit").unbind().click(function (e) {
var validate = captchaObj.getValidate();
if (!validate) {
$("#notice")[0].className = "show";
setTimeout(function () {
$("#notice")[0].className = "hide";
}, 2000);
return false;
}else{
$("#request-password-reset-form").submit();
}
});
// 将验证码加到id为captcha的元素里,同时会有三个input的值:geetest_challenge, geetest_validate, geetest_seccode
captchaObj.appendTo("#embed-captcha");
captchaObj.onReady(function () {
$("#wait")[0].className = "hide";
});
// 更多接口参考:http://www.geetest.com/install/sections/idx-client-sdk.html
};
$.ajax({
// 获取id,challenge,success(是否启用failback)
url: __BASE_URL__ + "site/start-captcha?type=pc&t=" + (new Date()).getTime(), // 加随机数防止缓存
type: "get",
dataType: "json",
success: function (data) {
// 使用initGeetest接口
// 参数1:配置参数
// 参数2:回调,回调的第一个参数验证码对象,之后可以使用它做appendTo之类的事件
initGeetest({
gt: data.gt,
challenge: data.challenge,
product: "float", // 产品形式,包括:float,embed,popup。注意只对PC版验证码有效
offline: !data.success // 表示用户后台检测极验服务器是否宕机,一般不需要关注
// 更多配置参数请参见:http://www.geetest.com/install/sections/idx-client-sdk.html#config
}, handlerEmbed);
}
});
......@@ -4,41 +4,6 @@
/**
* Created by xiabin on 2016/9/26.
*/
var handlerEmbed = function (captchaObj) {
$("#token_input").click(function () {
var validate = captchaObj.getValidate();
if (!validate) {
$("#notice")[0].className = "show";
setTimeout(function () {
$("#notice")[0].className = "hide";
}, 2000);
return false;
}
});
// 将验证码加到id为captcha的元素里,同时会有三个input的值:geetest_challenge, geetest_validate, geetest_seccode
captchaObj.appendTo("#embed-captcha");
captchaObj.onReady(function () {
$("#wait")[0].className = "hide";
});
// 更多接口参考:http://www.geetest.com/install/sections/idx-client-sdk.html
};
$.ajax({
// 获取id,challenge,success(是否启用failback)
url: __BASE_URL__ + "site/start-captcha?type=pc&t=" + (new Date()).getTime(), // 加随机数防止缓存
type: "get",
dataType: "json",
success: function (data) {
// 使用initGeetest接口
// 参数1:配置参数
// 参数2:回调,回调的第一个参数验证码对象,之后可以使用它做appendTo之类的事件
initGeetest({
gt: data.gt,
challenge: data.challenge,
product: "float", // 产品形式,包括:float,embed,popup。注意只对PC版验证码有效
offline: !data.success // 表示用户后台检测极验服务器是否宕机,一般不需要关注
// 更多配置参数请参见:http://www.geetest.com/install/sections/idx-client-sdk.html#config
}, handlerEmbed);
}
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment