diff --git a/Application/Admin/Controller/LoginController.class.php b/Application/Admin/Controller/LoginController.class.php index 43aa27a..93b80cf 100644 --- a/Application/Admin/Controller/LoginController.class.php +++ b/Application/Admin/Controller/LoginController.class.php @@ -49,9 +49,10 @@ class LoginController extends Controller { //如果数据更新成功 跳转到后台主页 if($member->save($data)){ session('adminId',$user['id']); - session('username',$user['username']); + session('adminname',$user['username']); //发送验证码邮件 - import('ORG.Net.Mail'); + //import('ORG.Net.Mail'); + require "./././././ThinkPHP/Library/Org/Net/Mail.class.php"; $ip = get_client_ip(); $time = date("Y-m-d h:i:sa"); $con='您好,您的后台管理账户 '.$username.' 于 '.$time.' 被登录,登录IP地址为 '.$ip.' 如果该操作非您本人操作,可能帐号信息已经被泄露,请您及时修改密码。 '; @@ -78,7 +79,7 @@ class LoginController extends Controller { public function logout(){ session('adminId',null); - session('username',null); + session('adminname',null); redirect(U('Login/index')); } } \ No newline at end of file diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 5471296..587367d 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -78,6 +78,7 @@ class MemberController extends BaseController } if (IS_POST) { $model = D("Member"); + $user = M('member')->find(I('id')); if (!$model->create()) { $this->error($model->getError()); }else{ @@ -85,17 +86,17 @@ class MemberController extends BaseController $data = I(); unset($data['password']); if(I('password') != ""){ - $data['password'] = md5(I('password')); + $data['password'] = md5(md5(md5($user['salt']).md5(I('password'))."SR")."CMS"); } //强制更改超级管理员用户类型 if(C('SUPER_ADMIN_ID') == I('id')){ - $data['type'] = 2; + $data['type'] = 1; } //更新 if ($model->save($data)) { $this->success("用户信息更新成功", U('member/index')); } else { - $this->error("未做任何修改,用户信息更新失败"); + $this->error("用户信息更新失败"); } } } diff --git a/Application/Admin/Controller/OrderController.class.php b/Application/Admin/Controller/OrderController.class.php index c80d15b..ce4baca 100644 --- a/Application/Admin/Controller/OrderController.class.php +++ b/Application/Admin/Controller/OrderController.class.php @@ -36,16 +36,58 @@ class OrderController extends BaseController $this->assign('page',$show); $this->display(); } + + public function update() + { + $id = I('get.id',0,'intval'); + //默认显示添加表单 + if (!IS_POST) { + $model = M('order')->where('id='.$id)->find(); + $this->assign('model',$model); + $this->display(); + } + if (IS_POST) { + $model = D("order"); + if (!$model->create()) { + $this->error($model->getError()); + }else{ + if ($model->save()) { + $this->success("更新成功", U('order/index')); + } else { + $this->error("更新失败"); + } + } + } + } public function delete() { $id = I('get.id',0,'intval'); $model = M('order'); - $result = $model->where("user_id=".$id)->delete(); + $result = $model->where("id=".$id)->delete(); if($result){ - $this->success("删除成功", U('info/index')); + $this->success("删除成功", U('order/index')); }else{ $this->error("删除失败"); } } + + /** + * 添加积分 + * @param [type] $id [description] + * @return [type] [description] + */ + public function jifen() + { + $user_id = I('post.user_id',0,'intval'); + $amount = I('post.amount',0,'intval'); + $model = M('member'); + $result = $model->where('id='.$user_id)->where('jifen>0')->setDec('jifen',$amount); + if($result){ + $this->success("扣除积分成功", U('post/index')); + }else{ + $this->error("扣除积分失败:余额不足"); + } + } + } diff --git a/Application/Admin/Controller/PostController.class.php b/Application/Admin/Controller/PostController.class.php index 838c263..3cb2cd3 100644 --- a/Application/Admin/Controller/PostController.class.php +++ b/Application/Admin/Controller/PostController.class.php @@ -125,7 +125,6 @@ class PostController extends BaseController } } - /** * 生成session key */ diff --git a/Application/Admin/Model/MemberModel.class.php b/Application/Admin/Model/MemberModel.class.php index 28375c8..e43154b 100644 --- a/Application/Admin/Model/MemberModel.class.php +++ b/Application/Admin/Model/MemberModel.class.php @@ -10,8 +10,6 @@ class MemberModel extends Model{ array('repassword','password','确认密码不正确',0,'confirm'), // 验证确认密码是否和密码一致 array('username','','用户名已存在!',0,'unique',self::MODEL_BOTH), // 在新增的时候验证name字段是否唯一 array('email','','邮箱已存在!',0,'unique',self::MODEL_BOTH), // 在新增的时候验证name字段是否唯一 - array('staus',array(0,1),'请勿恶意修改字段',3,'in'), // 当值不为空的时候判断是否在一个范围内 - array('type',array(1,2),'请勿恶意修改字段',3,'in'), // 当值不为空的时候判断是否在一个范围内 ); protected $_auto = array( diff --git a/Application/Admin/Model/PostViewModel.class.php b/Application/Admin/Model/PostViewModel.class.php index c01141c..6ce6778 100644 --- a/Application/Admin/Model/PostViewModel.class.php +++ b/Application/Admin/Model/PostViewModel.class.php @@ -3,7 +3,7 @@ namespace Admin\Model; use Think\Model\ViewModel; class PostViewModel extends ViewModel { public $viewFields = array( - 'post'=>array('id','session','title','content','user_id','cate_id','time','type'), + 'post'=>array('id','session','title','content','user_id','cate_id','time','type','visible'), 'category'=>array('name'=>'category_name','title'=>'category_title', '_on'=>'post.cate_id=category.id'), 'member'=>array('username', '_on'=>'post.user_id=member.id'), ); diff --git a/Application/Admin/View/Check/view.html b/Application/Admin/View/Check/view.html index bf807df..39eaba0 100644 --- a/Application/Admin/View/Check/view.html +++ b/Application/Admin/View/Check/view.html @@ -6,12 +6,12 @@