molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、内核修复

Browse Source 
2、用户模块完善和bug修复
This commit is contained in:
molong
2016-07-15 11:59:56 +08:00
parent 9ad5d5fd9c
commit ad1f4c029e
14 changed files with 122 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
application/admin/controller/User.php
View File

@@ -38,8 +38,8 @@ class User extends Admin{
}
/**
* create
* @author colin <colin@tensent.cn>
* 添加用户
* @author colin <molong@tensent.cn>
*/
public function add(){
$model = \think\Loader::model('User');
@@ -77,24 +77,13 @@ class User extends Admin{
$model = model('User');
if(IS_POST){
$data = $this->request->post();
if(!$data){
return $this->error($this->showRegError($model->getError()));
}
//为空
if($data['password'] == ''){
unset($data['password']);
unset($data['salt']);
}else{
$data['salt'] = rand_string();
$data['password'] = md5($password.$data['salt']);
}
$reuslt = $model->save($data,array('uid'=>$data['uid']));
$reuslt = $model->editUser($data, true);
if (false != $reuslt) {
if (false !== $reuslt) {
return $this->success('修改成功！', url('admin/user/index'));
}else{
return $this->error('修改失败！');
return $this->error($model->getError(), '');
}
}else{
$info = $this->getUserinfo();
@@ -236,25 +225,10 @@ class User extends Admin{
*/
public function editpwd() {
if (IS_POST) {
$user = \think\Loader::model('User');
//获取参数
$password = input('post.old');
if(empty($password)){
return $this->error('请输入原密码');
}
$data['password'] = input('post.password');
if (empty($data['password'])) {
return $this->error('请输入新密码');
}
$repassword = input('post.repassword');
if (empty($repassword)) {
return $this->error('请输入确认密码');
}
if ($data['password'] !== $repassword) {
return $this->error('您输入的新密码与确认密码不一致');
}
$res = $user->updateUserFields(UID, $password, $data);
$user = model('User');
$data = $this->request->post();
$res = $user->editpw($data);
if ($res) {
return $this->success('修改密码成功！');
}else {
@@ -297,61 +271,4 @@ class User extends Admin{
return $this->error('参数非法');
}
}
/**
* 获取用户注册错误信息
* @param integer $code 错误编码
* @return string 错误信息
*/
private function showRegError($code = 0) {
switch ($code) {
case -1:
$error = '用户名长度必须在16个字符以内！';
break;
case -2:
$error = '用户名被禁止注册！';
break;
case -3:
$error = '用户名被占用！';
break;
case -4:
$error = '密码长度必须在6-30个字符之间！';
break;
case -5:
$error = '邮箱格式不正确！';
break;
case -6:
$error = '邮箱长度必须在1-32个字符之间！';
break;
case -7:
$error = '邮箱被禁止注册！';
break;
case -8:
$error = '邮箱被占用！';
break;
case -9:
$error = '手机格式不正确！';
break;
case -10:
$error = '手机被禁止注册！';
break;
case -11:
$error = '手机号被占用！';
break;
default:
$error = '未知错误';
}
return $error;
}
}