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

1、更新内核

Browse Source 
2、代码格式化
This commit is contained in:
molong
2016-07-21 14:29:32 +08:00
parent 3cc2c38dc7
commit a72ba86faa
20 changed files with 1214 additions and 1083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
application/user/controller/Content.php
View File

@@ -10,51 +10,51 @@
namespace app\user\controller;
use app\common\controller\User;
class Content extends User{
class Content extends User {
public function _initialize(){
public function _initialize() {
parent::_initialize();
$this->getContentMenu();
$model_id = $this->request->param('model_id');
$row = db('Model')->select();
$row = db('Model')->select();
foreach ($row as $key => $value) {
$list[$value['id']] = $value;
$list[$value['id']] = $value;
}
if (empty($list[$model_id])) {
return $this->error("无此模型！");
}else {
} else {
$this->modelInfo = $list[$model_id];
if ($this->modelInfo['extend'] > 1) {
$this->model = model($this->modelInfo['name']);
}else{
} else {
$this->model = model('Document')->extend($this->modelInfo['name']);
}
}
$this->assign('model_id',$model_id);
$this->assign('model_list',$list);
$this->assign('model_info',$this->modelInfo);
$this->assign('model_id', $model_id);
$this->assign('model_list', $list);
$this->assign('model_info', $this->modelInfo);
}
public function index(){
public function index() {
if ($this->modelInfo['list_grid'] == '') {
return $this->error("列表定义不正确！", url('admin/model/edit',array('id'=>$this->modelInfo['id'])));
return $this->error("列表定义不正确！", url('admin/model/edit', array('id' => $this->modelInfo['id'])));
}
$grid_list = get_grid_list($this->modelInfo['list_grid']);
$order = "id desc";
$grid_list = get_grid_list($this->modelInfo['list_grid']);
$order = "id desc";
$map['uid'] = session('user_auth.uid');
if ($this->modelInfo['extend'] == 1) {
$map['model_id'] = $this->modelInfo['id'];
}
$field = array_filter($grid_list['fields']);
$list = $this->model->where($map)->field($field)->order($order)->paginate(15);
$list = $this->model->where($map)->field($field)->order($order)->paginate(15);
$data = array(
'grid' => $grid_list,
'list' => $list,
'page' => $list->render()
'grid' => $grid_list,
'list' => $list,
'page' => $list->render(),
);
$this->assign($data);
return $this->fetch();
@@ -64,21 +64,21 @@ class Content extends User{
* 内容添加
* @author molong <ycgpp@126.com>
*/
public function add(){
public function add() {
if (IS_POST) {
$result = $this->model->change();
if ($result) {
return $this->success("添加成功！",url('admin/content/index',array('model_id'=>$this->modelInfo['id'])));
}else{
return $this->error($this->model->getError(),'');
return $this->success("添加成功！", url('admin/content/index', array('model_id' => $this->modelInfo['id'])));
} else {
return $this->error($this->model->getError(), '');
}
}else{
} else {
$info = array(
'model_id' => $this->modelInfo['id']
'model_id' => $this->modelInfo['id'],
);
$data = array(
'info' => $info,
'fieldGroup' => $this->getField($this->modelInfo)
'info' => $info,
'fieldGroup' => $this->getField($this->modelInfo),
);
$this->assign($data);
return $this->fetch('public/edit');
@@ -89,15 +89,15 @@ class Content extends User{
* 内容修改
* @author molong <ycgpp@126.com>
*/
public function edit($id){
public function edit($id) {
if (IS_POST) {
$result = $this->model->change();
if ($result !== false) {
return $this->success("更新成功！",url('admin/content/index',array('model_id'=>$this->modelInfo['id'])));
}else{
return $this->error($this->model->getError(),'');
return $this->success("更新成功！", url('admin/content/index', array('model_id' => $this->modelInfo['id'])));
} else {
return $this->error($this->model->getError(), '');
}
}else{
} else {
if (!$id) {
return $this->error("非法操作！");
}
@@ -106,9 +106,9 @@ class Content extends User{
return $this->error($this->model->getError());
}
$info['model_id'] = $this->modelInfo['id'];
$data = array(
'info' => $info,
'fieldGroup' => $this->getField($this->modelInfo)
$data = array(
'info' => $info,
'fieldGroup' => $this->getField($this->modelInfo),
);
$this->assign($data);
return $this->fetch('public/edit');
@@ -119,44 +119,44 @@ class Content extends User{
* 内容删除
* @author molong <ycgpp@126.com>
*/
public function del(){
$id = input('get.id','','trim');
$ids = input('post.ids/a',array());
public function del() {
$id = input('get.id', '', 'trim');
$ids = input('post.ids/a', array());
array_push($ids, $id);
if (empty($ids)) {
return $this->error("非法操作！");
}
$map['id'] = array('IN',$ids);
$result = $this->model->del($map);
$map['id'] = array('IN', $ids);
$result = $this->model->del($map);
if ($result) {
return $this->success("删除成功！");
}else{
} else {
return $this->error("删除失败！", '', "");
}
}
protected function getField(){
protected function getField() {
$field_group = parse_config_attr($this->modelInfo['field_group']);
$field_sort = json_decode($this->modelInfo['field_sort'],true);
$field_sort = json_decode($this->modelInfo['field_sort'], true);
if ($this->modelInfo['extend'] > 1) {
$map['model_id'] = $this->modelInfo['id'];
}else{
$model_id[] = $this->modelInfo['id'];
$model_id[] = 1;
$map['model_id'] = array('IN',$model_id);
} else {
$model_id[] = $this->modelInfo['id'];
$model_id[] = 1;
$map['model_id'] = array('IN', $model_id);
}
if (ACTION_NAME == 'add') {
$map['is_show'] = array('in',array('1','2'));
}elseif(ACTION_NAME == 'edit'){
$map['is_show'] = array('in',array('1','3'));
$map['is_show'] = array('in', array('1', '2'));
} elseif (ACTION_NAME == 'edit') {
$map['is_show'] = array('in', array('1', '3'));
}
//获得数组的第一条数组
$first_key = array_keys($field_group);
$fields = model('Attribute')->getFieldlist($map);
$fields = model('Attribute')->getFieldlist($map);
if (!empty($field_sort)) {
foreach ($field_sort as $key => $value) {
foreach ($value as $index) {
@@ -168,8 +168,8 @@ class Content extends User{
}
}
//未进行排序的放入第一组中
$fields[] = array('name'=>'model_id','type'=>'hidden'); //加入模型ID值
$fields[] = array('name'=>'id','type'=>'hidden'); //加入模型ID值
$fields[] = array('name' => 'model_id', 'type' => 'hidden'); //加入模型ID值
$fields[] = array('name' => 'id', 'type' => 'hidden'); //加入模型ID值
foreach ($fields as $key => $value) {
$groupfield[$first_key[0]][] = $value;
}

4
application/user/controller/Index.php
View File

@@ -10,9 +10,9 @@
namespace app\user\controller;
use app\common\controller\User;
class Index extends User{
class Index extends User {
public function index(){
public function index() {
return $this->fetch();
}
}