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

1、更新内核

Browse Source 
2、修复模型bug
3、修复后台部分操作的bug
4、清除多余文件
This commit is contained in:
molong
2016-07-07 08:58:01 +08:00
parent f3fff63632
commit 2d3e41037d
43 changed files with 499 additions and 752 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/controller/Action.php
View File

@@ -140,9 +140,9 @@ class Action extends Admin {
$result = db('Action')->where($map)->setField('status',$status);
if ($result !== false) {
action_log('setstatus_action', 'Action', $id, session('user_auth.uid'));
return $this->success('设置'.$message.'状态成功！','');
return $this->success('设置'.$message.'状态成功！');
}else{
return $this->error('设置'.$message.'状态失败！','');
return $this->error('设置'.$message.'状态失败！');
}
}

10
application/admin/controller/Addons.php
View File

@@ -60,10 +60,10 @@ class Addons extends Admin {
if ($result) {
return $this->success("创建成功！",url('admin/addons/index'));
}else{
return $this->error("创建失败！",'');
return $this->error("创建失败！");
}
}else{
return $this->error($this->addons->getError(),'');
return $this->error($this->addons->getError());
}
}else{
$hooks = db('Hooks')->field('name,description')->select();
@@ -111,7 +111,7 @@ class Addons extends Admin {
return $this->error($this->addons->getError());
}
}else{
return $this->error('插件不存在','');
return $this->error('插件不存在');
}
}
@@ -123,7 +123,7 @@ class Addons extends Admin {
if($result === false){
return $this->error($this->addons->getError(),'');
}else{
return $this->success('卸载成功！','');
return $this->success('卸载成功！');
}
}
@@ -166,7 +166,7 @@ class Addons extends Admin {
}else{
$id = input('id','','trim,intval');
if (!$id) {
return $this->error("非法操作！",'');
return $this->error("非法操作！");
}
$info = $this->addons->find($id);
if (!empty($info)) {

2
application/admin/controller/Attribute.php
View File

@@ -101,7 +101,7 @@ class Attribute extends Admin {
if ($result) {
return $this->success("修改成功！",url('Attribute/index',array('model_id'=>$_POST['model_id'])));
}else{
return $this->error($this->model->getError(),'');
return $this->error($this->model->getError());
}
}else{
$id = input('id','','trim,intval');

4
application/admin/controller/Category.php
View File

@@ -240,9 +240,9 @@ class Category extends Admin{
$map['id'] = array('IN',$ids);
$result = db('Category')->where($map)->setField('status', $status);
if ($result) {
return $this->success("设置成功！",'');
return $this->success("设置成功！");
}else{
return $this->error("设置失败！",'');
return $this->error("设置失败！");
}
}
}

4
application/admin/controller/Channel.php
View File

@@ -173,10 +173,10 @@ class Channel extends Admin{
if ($res !== false) {
return $this->success('排序成功！',url('admin/channel/index'));
} else {
return $this->error('排序失败！','');
return $this->error('排序失败！');
}
} else {
return $this->error('非法请求！','');
return $this->error('非法请求！');
}
}

2
application/admin/controller/Config.php
View File

@@ -203,7 +203,7 @@ class Config extends Admin{
$res = db('Config')->where(array('id' => $value))->setField('sort', $key + 1);
}
if ($res !== false) {
return $this->success('排序成功！', '', Cookie('__forward__'));
return $this->success('排序成功！', Cookie('__forward__'));
}
else {
return $this->error('排序失败！');

8
application/admin/controller/Content.php
View File

@@ -55,7 +55,7 @@ class Content extends Admin{
unset($map['model_id']);
}
$list = $this->model->where($map)->field($field)->order($order)->paginate(15);
$list = $this->model->where($map)->order($order)->paginate(15);
$data = array(
'grid' => $grid_list,
@@ -158,7 +158,7 @@ class Content extends Admin{
if ($result) {
return $this->success("删除成功！");
}else{
return $this->error("删除失败！", '', "");
return $this->error("删除失败！");
}
}
@@ -188,9 +188,9 @@ class Content extends Admin{
$map['id'] = $id;
$result = $model::where($map)->setField('is_top',$is_top);
if (false !== $result) {
return $this->success("操作成功！", '');
return $this->success("操作成功！");
}else{
return $this->error("操作失败！！", '');
return $this->error("操作失败！！");
}
}

6
application/admin/controller/Group.php
View File

@@ -153,8 +153,8 @@ class Group extends Admin {
return $this->error("非法操作！");
}
if (IS_POST) {
$rule = input('rule',array());
$extend_rule = input('extend_rule',array());
$rule = $this->request->post('rule/a', array());
$extend_rule = $this->request->post('extend_rule/a', array());
$extend_result = $rule_result = false;
//扩展权限
$extend_data = array();
@@ -175,7 +175,7 @@ class Group extends Admin {
if ($rule_result !== false || $extend_result !== false) {
return $this->success("授权成功！", url('admin/group/index'));
}else{
return $this->error("授权失败！", '');
return $this->error("授权失败！");
}
}else{
$group = $this->group->where(array('id'=>$id))->find();

2
application/admin/controller/Model.php
View File

@@ -139,7 +139,7 @@ class Model extends Admin{
if($res['status']){
return $this->success($res['info'], url('index'));
}else{
return $this->error($res['info'], '');
return $this->error($res['info']);
}
}

4
application/admin/controller/Seo.php
View File

@@ -55,7 +55,7 @@ class Seo extends Admin{
if ($result) {
return $this->success("添加成功！");
}else{
return $this->error("添加失败！","");
return $this->error("添加失败！");
}
}else{
return $this->error($this->model->getError());
@@ -78,7 +78,7 @@ class Seo extends Admin{
if (false !== $result) {
return $this->success("修改成功！");
}else{
return $this->error("修改失败！","");
return $this->error("修改失败！");
}
}else{
return $this->error($this->model->getError());

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

@@ -94,7 +94,7 @@ class User extends Admin{
if (false != $reuslt) {
return $this->success('修改成功！', url('admin/user/index'));
}else{
return $this->error('修改失败！', '');
return $this->error('修改失败！');
}
}else{
$info = $this->getUserinfo();
@@ -240,19 +240,19 @@ class User extends Admin{
//获取参数
$password = input('post.old');
if(empty($password)){
return $this->error('请输入原密码','');
return $this->error('请输入原密码');
}
$data['password'] = input('post.password');
if (empty($data['password'])) {
return $this->error('请输入新密码','');
return $this->error('请输入新密码');
}
$repassword = input('post.repassword');
if (empty($repassword)) {
return $this->error('请输入确认密码','');
return $this->error('请输入确认密码');
}
if ($data['password'] !== $repassword) {
return $this->error('您输入的新密码与确认密码不一致','');
return $this->error('您输入的新密码与确认密码不一致');
}
$res = $user->updateUserFields(UID, $password, $data);
if ($res) {