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

1、bug的修复

Browse Source 
2、内核更新
This commit is contained in:
molong
2016-07-10 23:48:24 +08:00
parent f3fff63632
commit 1a0a29413a
50 changed files with 760 additions and 958 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');

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

@@ -19,12 +19,8 @@ class Category extends Admin{
public function index(){
$map = array('status' => array('gt', -1));
$row = db('Category')->where($map)->order('sort asc,id asc')->select();
$list = db('Category')->where($map)->order('sort asc,id asc')->column('*','id');
$list = array();
foreach ($row as $key => $value) {
$list[$value['id']] = $value;
}
if (!empty($list)) {
$tree = new \com\Tree();
$list = $tree->toFormatTree($list);
@@ -240,9 +236,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("设置失败！");
}
}
}

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

@@ -21,7 +21,7 @@ class Channel extends Admin{
/* 获取频道列表 */
//$map = array('status' => array('gt', -1), 'pid'=>$pid);
$map = array('status' => array('gt', -1));
$list = db('Channel')->where($map)->order('sort asc,id asc')->select();
$list = db('Channel')->where($map)->order('sort asc,id asc')->column('*','id');
if (!empty($list)) {
$tree = new \com\Tree();
@@ -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();

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

@@ -27,8 +27,8 @@ class Index extends Admin{
$this->checkVerify($verify);
$user = model('User');
$info = $user->login($username,$password);
if ($info) {
$uid = $user->login($username,$password);
if ($uid > 0) {
return $this->success('登录成功！',url('admin/index/index'));
}else{
switch($uid) {

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

@@ -19,7 +19,7 @@ class Menu extends Admin{
public function index(){
$map = array();
$title = trim(input('get.title'));
$list = db("Menu")->where($map)->field(true)->order('sort asc,id asc')->select();
$list = db("Menu")->where($map)->field(true)->order('sort asc,id asc')->column('*','id');
int_to_string($list,array('hide'=>array(1=>'是',0=>'否'),'is_dev'=>array(1=>'是',0=>'否')));
if (!empty($list)) {

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) {

2
application/admin/static/css/style.css
View File

@@ -2803,7 +2803,7 @@ input[type="radio"] {
margin-bottom:20px;
}
#login-full-wrapper {
background:url(/Public/images/login-img.jpg) no-repeat center center;
background:url(/public/images/login-img.jpg) no-repeat center center;
background-size:cover;
width:100%;
height:100%;

4
application/admin/view/database/import.html
View File

@@ -17,9 +17,6 @@
<table class="table table-striped">
<thead>
<tr>
<th width="60">
<input class="check-all" type="checkbox" value="">
</th>
<th width="200">备份名称</th>
<th width="80">卷数</th>
<th width="80">压缩</th>
@@ -32,7 +29,6 @@
<tbody>
{volist name="list" id="data"}
<tr>
<td><input class="ids" type="checkbox" name="tables[]"></td>
<td>{$data.time|date='Ymd-His',###}</td>
<td>{$data.part}</td>
<td>{$data.compress}</td>

5
application/admin/view/index/login.html
View File

@@ -104,7 +104,10 @@ $(function(){
function success(data){
if(data.code){
window.location.href = data.url;
$.messager.show(data.msg, {placement: 'center',type:'success'});
setTimeout(function(){
window.location.href = data.url;
},2000);
} else {
$.messager.show(data.msg, {placement: 'center',type:'success'});
//刷新验证码

18
application/common.php
View File

@@ -8,7 +8,7 @@
// +----------------------------------------------------------------------
// SentCMS常量定义
define('SENTCMS_VERSION', '3.0.20160408');
define('SENTCMS_VERSION', '3.0.20160630');
define('SENT_ADDON_PATH', ROOT_PATH . DS . 'addons' . DS);
//字符串解密加密
@@ -261,6 +261,22 @@ function get_cover($cover_id, $field = null){
return empty($field) ? $picture : $picture[$field];
}
/**
* 获取多图地址
* @param array $covers
* @return 返回图片列表
* @author molong <molong@tensent.cn>
*/
function get_cover_list($covers){
if ($covers == '') {
return false;
}
$cover_list = explode(',', $covers);
foreach ($cover_list as $item) {
$list[] = get_cover($item, 'path');
}
return $list;
}
/**
* 字符串命名风格转换

3
application/common/controller/User.php
View File

@@ -34,6 +34,9 @@ class User extends Base{
array('title'=>'密码修改', 'url'=>'user/profile/editpw', 'icon'=>'key'),
array('title'=>'更换头像', 'url'=>'user/profile/avatar', 'icon'=>'male'),
);
$menu['订单管理'] = array(
array('title'=>'我的订单', 'url'=>'user/order/index', 'icon'=>'shopping-bag'),
);
$contetnmenu = $this->getContentMenu();
if (!empty($contetnmenu)) {
$menu['内容管理'] = $contetnmenu;

13
application/common/model/Addons.php
View File

@@ -82,11 +82,16 @@ class Addons extends \app\common\model\Base {
public function install($data){
if ($data) {
$result = $this->save($data);
if ($result) {
model('Hooks')->addHooks($data['name']);
return true;
$info = $this->where('name', $data['name'])->find();
if (null == $info) {
$result = $this->save($data);
if ($result) {
return model('Hooks')->addHooks($data['name']);
}else{
return false;
}
}else{
$this->error = "已安装！";
return false;
}
}else{

6
application/common/model/Content.php
View File

@@ -24,6 +24,10 @@ class Content extends Base{
'cover_id' => 'integer',
);
protected function setUidAttr(){
return session('user_auth.uid');
}
protected function setCreateTimeAttr($value){
return $value ? strtotime($value) : time();
}
@@ -41,7 +45,7 @@ class Content extends Base{
return date('Y-m-d H:i:s',$value);
}
public function setInfo($name){
public function extend($name){
$this->name = $name;
return $this;
}

31
application/common/model/Hooks.php
View File

@@ -33,8 +33,10 @@ class Hooks extends Base {
}
protected function setAddonsAttr($value){
$string = implode(",", $value[1]);
return $string;
if ($value[1]) {
$string = implode(",", $value[1]);
return $string;
}
}
protected function getTypeTextAttr($value, $data){
@@ -71,7 +73,30 @@ class Hooks extends Base {
return false;
}
$methods = get_class_methods($addons_class);
dump($methods);
foreach ($methods as $item) {
if ('Addon' === substr($item, -5, 5)) {
$info = $this->where('name', substr($item, 0, -5))->find();
if (null == $info) {
$save = array(
'name' => $addons_name,
'description' => '',
'type' => 1,
'addons' => array($addons_name),
'update_time' => time(),
'status' => 1
);
$this->save($save);
}else{
if ($info['addons']) {
# code...
}else{
$addons = substr($item, 0, -5);
}
$this->where('name', $addons_name)->setField('addons', $addons);
}
}
}
return true;
}
public function removeHooks($addons_name){

4
application/common/model/Model.php
View File

@@ -55,11 +55,13 @@ class Model extends Base{
if($data['extend'] == 1){
//默认文档前缀
$tablename = 'document_'.$data['name'];
$is_auto_increment = false;
}else{
$tablename = $data['name'];
$is_auto_increment = true;
}
$sql = $db->start_table($tablename)
->create_id('id', 11 , '主键' , false);
->create_id('id', 11 , '主键' , $is_auto_increment);
if ($data['extend'] != 1) {
$sql = $sql->create_uid();
}

34
application/common/view/default/ad/sider.html
View File

@@ -1,24 +1,18 @@
<div class="banner">
<div class="warp">
<div class="banner-side">
<ul>
{volist name="ad" id="item"}
<li>
<a href="{$item['url']}" target="_blank">
<img src="{:get_cover($item['cover_id'],'path')}">
<div class="title"><span>{$item['title']}</span></div>
</a>
</li>
{/volist}
</ul>
<ol class="dots">
{volist name="ad" id="item"}
<li class="dot">{$item['title']}</li>
{/volist}
</ol>
</div>
</div>
<ul>
{volist name="ad" id="item"}
<li style="background:{$item['bgcolor']|default='#95FCBD'};" title="{$item['title']}">
<div class="body">
<div class="content">{$item['content']}</div>
</div>
</li>
{/volist}
</ul>
</div>
<script type="text/javascript">
$(".banner-side").slide({mainCell:"ul",titCell:".dots .dot",autoPlay:true});
$(function() {
$('.banner').unslider({
dots: true, // Display dot navigation
});
});
</script>

10
application/config.php
View File

@@ -10,7 +10,7 @@
return array(
// 调试模式
'app_debug' => true,
'app_debug' => false,
'charset' => 'UTF-8',
'lang_switch_on' => true, // 开启语言包功能
@@ -98,8 +98,8 @@ return array(
'path' => LOG_PATH,
),
// 页面Trace信息
// 'trace' =>array(
// //支持Html,Console 设为false则不显示
// 'type' => false,
// )
'trace' =>array(
//支持Html,Console 设为false则不显示
'type' => 'Html',
)
);

4
application/index/controller/Content.php
View File

@@ -127,8 +127,8 @@ class Content extends Fornt{
$data = array(
'info' => $info
);
if ($name) {
$teamplate = 'content/'.$this->modelInfo['name'].'/'.$name;
if (isset($info['template_detail']) && $info['template_detail']) {
$teamplate = 'content/'.$this->modelInfo['name'].'/'.$info['template_detail'];
}else{
$teamplate = 'content/'.$this->modelInfo['name'].'/detail';
}