From 9cc8998300448c74644ca72e41e94680ee0a175f Mon Sep 17 00:00:00 2001 From: Martin Zhou <1009465756@qq.com> Date: Sat, 3 Dec 2016 21:42:04 +0800 Subject: [PATCH] =?UTF-8?q?SRCMS=C2=B7=E8=BD=BB=E5=93=8D=E5=BA=94=20V1.8?= =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复: 1. 后台无法查看生成的工单 2. 前端页面JS远程资源失效问题 3. 前台用户密码修改设计缺陷（Issued By 藏形匿影） 优化: 1. 多处代码提升二次开发可读性 新增: 1. 安全工单模块中动态更新功能 --- .../Admin/Controller/BaseController.class.php | 8 +-- .../Admin/Controller/BlogController.class.php | 8 +-- .../Controller/CategoryController.class.php | 8 +-- .../Controller/CheckController.class.php | 37 ++++++++-- .../Admin/Controller/HallController.class.php | 8 +-- .../Controller/IndexController.class.php | 8 +-- .../Admin/Controller/InfoController.class.php | 8 +-- .../Controller/LoginController.class.php | 8 +-- .../Controller/ManagerController.class.php | 8 +-- .../Controller/MemberController.class.php | 8 +-- .../Controller/OrderController.class.php | 8 +-- .../Admin/Controller/PageController.class.php | 8 +-- .../Admin/Controller/PostController.class.php | 14 ++-- .../Controller/SettingController.class.php | 8 +-- Application/Admin/View/Check/view.html | 72 +++++++++++++++++-- Application/Admin/View/Index/index.html | 18 +---- Application/Admin/View/Post/index.html | 2 +- Application/Admin/View/Post/update.html | 6 -- Application/Admin/View/Public/sidebar.html | 2 +- Application/Common/Conf/config.php | 34 ++++----- .../Home/Controller/BlogController.class.php | 28 +++----- .../Home/Controller/GiftController.class.php | 8 +-- .../Home/Controller/HallController.class.php | 21 +++--- .../Home/Controller/IndexController.class.php | 8 +-- .../Home/Controller/PageController.class.php | 28 +++----- Application/Home/View/Blog/index.html | 16 +---- Application/Home/View/Blog/view.html | 10 +-- Application/Home/View/Gift/index.html | 5 +- Application/Home/View/Hall/index.html | 14 ---- Application/Home/View/Index/index.html | 1 - Application/Home/View/Page/index.html | 28 ++++---- Application/Home/View/Page/view.html | 3 +- .../User/Controller/BaseController.class.php | 8 +-- .../Controller/ChangeController.class.php | 32 +++++---- .../Controller/ForgetController.class.php | 11 +-- .../User/Controller/GiftController.class.php | 8 +-- .../User/Controller/IndexController.class.php | 8 +-- .../User/Controller/InfoController.class.php | 8 +-- .../User/Controller/LoginController.class.php | 8 +-- .../User/Controller/PostController.class.php | 8 +-- .../User/Controller/RegController.class.php | 15 ++-- Application/User/View/Change/index.html | 2 +- Application/User/View/Public/header.html | 7 +- DB/srcms.sql | 54 ++++++++++---- README.md | 38 +++++++--- admin.php | 15 ++-- index.php | 15 ++-- user.php | 17 ++--- 48 files changed, 372 insertions(+), 333 deletions(-) diff --git a/Application/Admin/Controller/BaseController.class.php b/Application/Admin/Controller/BaseController.class.php index ab33760..7fa8ed6 100644 --- a/Application/Admin/Controller/BaseController.class.php +++ b/Application/Admin/Controller/BaseController.class.php @@ -3,10 +3,10 @@ namespace Admin\Controller; use Think\Controller; /** - * @author Zhou Yuyang <1009465756@qq.com> 12:28 2016/1/23 - * @copyright 2105-2018 SRCMS - * @homepage http://www.src.pw - * @version 1.5 + * @Author: Zhou Yuyang <1009465756@qq.com> 10:28 2016/12/03 + * @Copyright 2015-2020 SISMO + * @Project homepage https://github.com/CNSISMO + * @Version 1.8 */ diff --git a/Application/Admin/Controller/BlogController.class.php b/Application/Admin/Controller/BlogController.class.php index 98d6844..969c60d 100644 --- a/Application/Admin/Controller/BlogController.class.php +++ b/Application/Admin/Controller/BlogController.class.php @@ -3,10 +3,10 @@ namespace Admin\Controller; use Admin\Controller; /** - * @author Zhou Yuyang <1009465756@qq.com> 12:28 2016/1/23 - * @copyright 2105-2018 SRCMS - * @homepage http://www.src.pw - * @version 1.5 + * @Author: Zhou Yuyang <1009465756@qq.com> 10:28 2016/12/03 + * @Copyright 2015-2020 SISMO + * @Project homepage https://github.com/CNSISMO + * @Version 1.8 */ /** diff --git a/Application/Admin/Controller/CategoryController.class.php b/Application/Admin/Controller/CategoryController.class.php index f82ab85..38824d7 100644 --- a/Application/Admin/Controller/CategoryController.class.php +++ b/Application/Admin/Controller/CategoryController.class.php @@ -3,10 +3,10 @@ namespace Admin\Controller; use Admin\Controller; /** - * @author Zhou Yuyang <1009465756@qq.com> 12:28 2016/1/23 - * @copyright 2105-2018 SRCMS - * @homepage http://www.src.pw - * @version 1.5 + * @Author: Zhou Yuyang <1009465756@qq.com> 10:28 2016/12/03 + * @Copyright 2015-2020 SISMO + * @Project homepage https://github.com/CNSISMO + * @Version 1.8 */ /** diff --git a/Application/Admin/Controller/CheckController.class.php b/Application/Admin/Controller/CheckController.class.php index a56a8dd..c096f28 100644 --- a/Application/Admin/Controller/CheckController.class.php +++ b/Application/Admin/Controller/CheckController.class.php @@ -3,10 +3,10 @@ namespace Admin\Controller; use Think\Controller; /** - * @author Zhou Yuyang <1009465756@qq.com> 12:28 2016/1/23 - * @copyright 2105-2018 SRCMS - * @homepage http://www.src.pw - * @version 1.5 + * @Author: Zhou Yuyang <1009465756@qq.com> 10:28 2016/12/03 + * @Copyright 2015-2020 SISMO + * @Project homepage https://github.com/CNSISMO + * @Version 1.8 */ class CheckController extends Controller @@ -15,9 +15,34 @@ class CheckController extends Controller * 临时查看漏洞报告 */ public function view(){ - $id = I('get.session_id',0,'intval'); + $id = I('get.session_id',0,'number_int'); //seesion token防注入 $model = M('post')->where('session='.$id)->find(); + $flow = M('wflow')->where('session='.$id)->select(); + $this->assign('wflow',$flow); $this->assign('model',$model); - $this->display(); + $this->display(); + } + /** + * 添加漏洞处理进展 + */ + public function add() + { + //默认显示添加表单 + if (!IS_POST) { + $this->display(); + } + if (IS_POST) { + $model = D("wflow"); + if (!$model->create()) { + $this->error($model->getError()); + exit(); + } else { + if ($model->add()) { + $this->success("添加成功", U('post/index')); + } else { + $this->error("添加失败", U('post/index')); + } + } + } } } diff --git a/Application/Admin/Controller/HallController.class.php b/Application/Admin/Controller/HallController.class.php index c9ef63f..cda2a15 100644 --- a/Application/Admin/Controller/HallController.class.php +++ b/Application/Admin/Controller/HallController.class.php @@ -3,10 +3,10 @@ namespace Admin\Controller; use Admin\Controller; /** - * @author Zhou Yuyang <1009465756@qq.com> 12:28 2016/1/23 - * @copyright 2105-2018 SRCMS - * @homepage http://www.src.pw - * @version 1.5 + * @Author: Zhou Yuyang <1009465756@qq.com> 10:28 2016/12/03 + * @Copyright 2015-2020 SISMO + * @Project homepage https://github.com/CNSISMO + * @Version 1.8 */ /** diff --git a/Application/Admin/Controller/IndexController.class.php b/Application/Admin/Controller/IndexController.class.php index 9102bbb..826db92 100644 --- a/Application/Admin/Controller/IndexController.class.php +++ b/Application/Admin/Controller/IndexController.class.php @@ -3,10 +3,10 @@ namespace Admin\Controller; use Admin\Controller; /** - * @author Zhou Yuyang <1009465756@qq.com> 12:28 2016/1/23 - * @copyright 2105-2018 SRCMS - * @homepage http://www.src.pw - * @version 1.5 + * @Author: Zhou Yuyang <1009465756@qq.com> 10:28 2016/12/03 + * @Copyright 2015-2020 SISMO + * @Project homepage https://github.com/CNSISMO + * @Version 1.8 */ class IndexController extends BaseController{ diff --git a/Application/Admin/Controller/InfoController.class.php b/Application/Admin/Controller/InfoController.class.php index 116fd0c..633e2c8 100644 --- a/Application/Admin/Controller/InfoController.class.php +++ b/Application/Admin/Controller/InfoController.class.php @@ -3,10 +3,10 @@ namespace Admin\Controller; use Admin\Controller; /** - * @author Zhou Yuyang <1009465756@qq.com> 12:28 2016/1/23 - * @copyright 2105-2018 SRCMS - * @homepage http://www.src.pw - * @version 1.5 + * @Author: Zhou Yuyang <1009465756@qq.com> 10:28 2016/12/03 + * @Copyright 2015-2020 SISMO + * @Project homepage https://github.com/CNSISMO + * @Version 1.8 */ /** diff --git a/Application/Admin/Controller/LoginController.class.php b/Application/Admin/Controller/LoginController.class.php index 93b80cf..5e14df8 100644 --- a/Application/Admin/Controller/LoginController.class.php +++ b/Application/Admin/Controller/LoginController.class.php @@ -3,10 +3,10 @@ namespace Admin\Controller; use Think\Controller; /** - * @author Zhou Yuyang <1009465756@qq.com> 12:28 2016/1/23 - * @copyright 2105-2018 SRCMS - * @homepage http://www.src.pw - * @version 1.5 + * @Author: Zhou Yuyang <1009465756@qq.com> 10:28 2016/12/03 + * @Copyright 2015-2020 SISMO + * @Project homepage https://github.com/CNSISMO + * @Version 1.8 */ class LoginController extends Controller { diff --git a/Application/Admin/Controller/ManagerController.class.php b/Application/Admin/Controller/ManagerController.class.php index 61b2ce4..b1ec70e 100644 --- a/Application/Admin/Controller/ManagerController.class.php +++ b/Application/Admin/Controller/ManagerController.class.php @@ -3,10 +3,10 @@ namespace Admin\Controller; use Admin\Controller; /** - * @author Zhou Yuyang <1009465756@qq.com> 12:28 2016/1/26 - * @copyright 2105-2018 SRCMS - * @homepage http://www.src.pw - * @version 1.6 + * @Author: Zhou Yuyang <1009465756@qq.com> 10:28 2016/12/03 + * @Copyright 2015-2020 SISMO + * @Project homepage https://github.com/CNSISMO + * @Version 1.8 */ /** diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 587367d..df51121 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -3,10 +3,10 @@ namespace Admin\Controller; use Admin\Controller; /** - * @author Zhou Yuyang <1009465756@qq.com> 12:28 2016/1/23 - * @copyright 2105-2018 SRCMS - * @homepage http://www.src.pw - * @version 1.5 + * @Author: Zhou Yuyang <1009465756@qq.com> 10:28 2016/12/03 + * @Copyright 2015-2020 SISMO + * @Project homepage https://github.com/CNSISMO + * @Version 1.8 */ /** diff --git a/Application/Admin/Controller/OrderController.class.php b/Application/Admin/Controller/OrderController.class.php index ce4baca..5c7d6f9 100644 --- a/Application/Admin/Controller/OrderController.class.php +++ b/Application/Admin/Controller/OrderController.class.php @@ -2,10 +2,10 @@ namespace Admin\Controller; use Admin\Controller; /** - * @author Zhou Yuyang <1009465756@qq.com> 12:28 2016/1/23 - * @copyright 2105-2018 SRCMS - * @homepage http://www.src.pw - * @version 1.5 + * @Author: Zhou Yuyang <1009465756@qq.com> 10:28 2016/12/03 + * @Copyright 2015-2020 SISMO + * @Project homepage https://github.com/CNSISMO + * @Version 1.8 */ /** diff --git a/Application/Admin/Controller/PageController.class.php b/Application/Admin/Controller/PageController.class.php index 18bfc1c..61726e1 100644 --- a/Application/Admin/Controller/PageController.class.php +++ b/Application/Admin/Controller/PageController.class.php @@ -2,10 +2,10 @@ namespace Admin\Controller; use Admin\Controller; /** - * @author Zhou Yuyang <1009465756@qq.com> 12:28 2016/1/23 - * @copyright 2105-2018 SRCMS - * @homepage http://www.src.pw - * @version 1.5 + * @Author: Zhou Yuyang <1009465756@qq.com> 10:28 2016/12/03 + * @Copyright 2015-2020 SISMO + * @Project homepage https://github.com/CNSISMO + * @Version 1.8 */ /** diff --git a/Application/Admin/Controller/PostController.class.php b/Application/Admin/Controller/PostController.class.php index 3cb2cd3..7767af5 100644 --- a/Application/Admin/Controller/PostController.class.php +++ b/Application/Admin/Controller/PostController.class.php @@ -2,10 +2,10 @@ namespace Admin\Controller; use Admin\Controller; /** - * @author Zhou Yuyang <1009465756@qq.com> 12:28 2016/1/23 - * @copyright 2105-2018 SRCMS - * @homepage http://www.src.pw - * @version 1.5 + * @Author: Zhou Yuyang <1009465756@qq.com> 10:28 2016/12/03 + * @Copyright 2015-2020 SISMO + * @Project homepage https://github.com/CNSISMO + * @Version 1.8 */ class PostController extends BaseController @@ -130,10 +130,12 @@ class PostController extends BaseController */ public function session(){ $id = I('get.id',0,'intval'); - $str = '!@#$%^&*abcdefghijklmnopqrstuvwxyz'; - $session = md5($str[rand(0,35)].$str[rand(0,35)].$str[rand(0,35)].$str[rand(0,35)].$str[rand(0,35)].$str[rand(0,35)]); + $str = '1234567890'; + $session = $str[rand(0,10)].$str[rand(0,10)].$str[rand(0,10)].$str[rand(0,10)].$str[rand(0,10)].$str[rand(0,10)].$str[rand(0,10)].$str[rand(0,10)].$str[rand(0,10)].$str[rand(0,10)].$str[rand(0,10)].$str[rand(0,10)].$str[rand(0,10)].$str[rand(0,10)].$str[rand(0,10)].$str[rand(0,10)].$str[rand(0,10)].$str[rand(0,10)].$str[rand(0,10)].$str[rand(0,10)].$str[rand(0,10)]; + $visible = 1; $model = M('post'); $model->session = $session; + $model->visible = $visible; $result = $model->where('id='.$id)->save(); if($result){ $this->success("授权成功", U('Check/view?session_id='.$session)); diff --git a/Application/Admin/Controller/SettingController.class.php b/Application/Admin/Controller/SettingController.class.php index a70d6a1..146c8d2 100644 --- a/Application/Admin/Controller/SettingController.class.php +++ b/Application/Admin/Controller/SettingController.class.php @@ -3,10 +3,10 @@ namespace Admin\Controller; use Admin\Controller; /** - * @author Zhou Yuyang <1009465756@qq.com> 12:28 2016/1/23 - * @copyright 2105-2018 SRCMS - * @homepage http://www.src.pw - * @version 1.5 + * @Author: Zhou Yuyang <1009465756@qq.com> 10:28 2016/12/03 + * @Copyright 2015-2020 SISMO + * @Project homepage https://github.com/CNSISMO + * @Version 1.8 */ /** diff --git a/Application/Admin/View/Check/view.html b/Application/Admin/View/Check/view.html index 39eaba0..06bd540 100644 --- a/Application/Admin/View/Check/view.html +++ b/Application/Admin/View/Check/view.html @@ -4,13 +4,11 @@ 安全工单 - + + - @@ -25,7 +23,7 @@ 安全应急响应中心 - 安全工单 + 外部安全工单
-

#修复建议 / 修补期限： +

#修复建议 / 修补期限： 10天 3天 2天 @@ -69,6 +67,53 @@ {$model.advise}

+
+ +
+

#处理进展 / @{$v.time} / 状态变更：已确认 + 已分配 + 处理中 + 已结单 + / 变动人：{$v.userid}

+
+
+ 
+			 {$v.content|htmlspecialchars_decode|waf}
+
+
+ +
+
+ + +
+
+ 处理人： +
+
+ 处理状态： + + + + +
+
+ +
+
+ +
+ +
+

注意事项:

@@ -77,5 +122,20 @@
+ + + + + + \ No newline at end of file diff --git a/Application/Admin/View/Index/index.html b/Application/Admin/View/Index/index.html index f854f7f..37600ef 100644 --- a/Application/Admin/View/Index/index.html +++ b/Application/Admin/View/Index/index.html @@ -7,6 +7,7 @@ 您好！欢迎登陆应急响应中心管理后台

注意:请定期修改您的后台密码，保证安全性！

+

请您定期更新SRCMS以获取最新安全补丁和特性：点击此处查看项目

-
- -

-最新版本： - -

-

发布日期： - -

-

-更新简介： - -

-

-立即下载 -

-
diff --git a/Application/Admin/View/Post/index.html b/Application/Admin/View/Post/index.html index 9fd2070..64f6735 100644 --- a/Application/Admin/View/Post/index.html +++ b/Application/Admin/View/Post/index.html @@ -43,7 +43,7 @@ {$v.time|date="Y/m/d",###} {$v.username} {$v.category_title} - 审核 | 生成工单 | 查看工单 | 删除 + 审核 | 生成工单 查看工单 | 删除 diff --git a/Application/Admin/View/Post/update.html b/Application/Admin/View/Post/update.html index 027b341..c3bcd79 100644 --- a/Application/Admin/View/Post/update.html +++ b/Application/Admin/View/Post/update.html @@ -28,12 +28,6 @@
-
-
- -
diff --git a/Application/Admin/View/Public/sidebar.html b/Application/Admin/View/Public/sidebar.html index ab7959c..daf550c 100644 --- a/Application/Admin/View/Public/sidebar.html +++ b/Application/Admin/View/Public/sidebar.html @@ -31,6 +31,6 @@
  • - 系统设置 + 系统设置
    • \ No newline at end of file diff --git a/Application/Common/Conf/config.php b/Application/Common/Conf/config.php index 8959683..fa8c689 100644 --- a/Application/Common/Conf/config.php +++ b/Application/Common/Conf/config.php @@ -1,25 +1,27 @@ '配置值' 'MODULE_ALLOW_LIST' => array('Home','Admin',), - //我们用了入口版定 所以下面这行可以注释掉 - //'DEFAULT_MODULE' => 'Home', // 默认模块 - //'SHOW_PAGE_TRACE' => flase, 'LOAD_EXT_CONFIG' => 'db', - 'URL_CASE_INSENSITIVE' => true, //url不区分大小写 + /** + URL不区分大小写 + **/ + 'URL_CASE_INSENSITIVE' => true, 'URL_MODEL' =>0, 'URL_HTML_SUFFIX' =>'html', - //'DEFAULT_FILTER' => 'htmlspecialchars', - 'SUPER_ADMIN_ID'=>1, //超级管理员id 删除用户的时候用这个禁止删除 'SHOW_ERROR_MSG' => true, - //用户注册默认信息 - 'DEFAULT_SCORE'=>100, - 'MAIL_ADDRESS'=>'xxxx@126.com', // 此处填写邮箱地址 - 'MAIL_SMTP'=>'smtp.126.com', // 邮箱SMTP服务器 - 'MAIL_LOGINNAME'=>'xxxxx', // 邮箱登录帐号 - 'MAIL_PASSWORD'=>'xxxxx', // 邮箱密码 - 'MAIL_CHARSET'=>'UTF-8',//编码 - 'MAIL_AUTH'=>true,//邮箱认证 - 'MAIL_HTML'=>true,//true HTML格式 false TXT格式 + /** + 邮件服务配置 + **/ + 'MAIL_ADDRESS'=>'xxxx@126.com', // 此处填写邮箱地址 + 'MAIL_SMTP'=>'smtp.126.com', // 邮箱SMTP服务器（各家邮件服务提供商smtp服务器地址不同） + 'MAIL_LOGINNAME'=>'xxxxx', // 邮箱登录帐号 + 'MAIL_PASSWORD'=>'xxxxx', // 邮箱密码（QQ邮箱登录密码不是QQ密码） + 'MAIL_CHARSET'=>'UTF-8', // 邮件字符编码 + 'MAIL_AUTH'=>true, // 邮箱认证 + // true：发送的邮件正文为HTML格式 false：发送的邮件正文为TXT格式 + 'MAIL_HTML'=>true, + /** + 站点全局开启http-only + **/ 'COOKIE_HTTPONLY' => '' ); \ No newline at end of file diff --git a/Application/Home/Controller/BlogController.class.php b/Application/Home/Controller/BlogController.class.php index fed1e25..2798494 100644 --- a/Application/Home/Controller/BlogController.class.php +++ b/Application/Home/Controller/BlogController.class.php @@ -1,10 +1,10 @@ 12:28 2016/1/23 - * @copyright 2105-2018 SRCMS - * @homepage http://www.src.pw - * @version 1.5 + * @Author: Zhou Yuyang <1009465756@qq.com> 10:28 2016/12/03 + * @Copyright 2015-2020 SISMO + * @Project homepage https://github.com/CNSISMO + * @Version 1.8 */ namespace Home\Controller; @@ -13,32 +13,20 @@ use Think\Controller; class BlogController extends Controller{ - public function index($key="") + public function index() { - if($key == ""){ - $model = M('blog'); - }else{ - $where['title'] = array('like',"%$key%"); - $where['name'] = array('like',"%$key%"); - $where['_logic'] = 'or'; - $model = M('blog')->where($where); - } - - $count = $model->where($where)->count();// 查询满足要求的总记录数 - $Page = new \Extend\Page($count,15);// 实例化分页类 传入总记录数和每页显示的记录数(25) - $show = $Page->show();// 分页显示输出 - $pages = $model->limit($Page->firstRow.','.$Page->listRows)->where($where)->order('id DESC')->select(); + $model = M('blog'); $tmodel= M('setting'); + $pages = $model->limit(15)->select(); $title = $tmodel->where('id=1')->select(); $this->assign('title', $title); $this->assign('model', $pages); - $this->assign('page',$show); $this->display(); } public function view(){ - $id = I('get.id',0,'intval'); + $id = I('get.id',0,'number_int'); $model = M('blog')->where('id='.$id)->find(); $tmodel= M('setting'); $title = $tmodel->where('id=1')->select(); diff --git a/Application/Home/Controller/GiftController.class.php b/Application/Home/Controller/GiftController.class.php index 70273e6..8562b30 100644 --- a/Application/Home/Controller/GiftController.class.php +++ b/Application/Home/Controller/GiftController.class.php @@ -1,10 +1,10 @@ 12:28 2016/1/23 - * @copyright 2105-2018 SRCMS - * @homepage http://www.src.pw - * @version 1.5 + * @Author: Zhou Yuyang <1009465756@qq.com> 10:28 2016/12/03 + * @Copyright 2015-2020 SISMO + * @Project homepage https://github.com/CNSISMO + * @Version 1.8 */ namespace Home\Controller; diff --git a/Application/Home/Controller/HallController.class.php b/Application/Home/Controller/HallController.class.php index 79a8e06..2ed55dd 100644 --- a/Application/Home/Controller/HallController.class.php +++ b/Application/Home/Controller/HallController.class.php @@ -1,10 +1,10 @@ 13:59 2016/1/25 - * @copyright 2105-2018 SRCMS - * @homepage http://www.src.pw - * @version 1.5 + * @Author: Zhou Yuyang <1009465756@qq.com> 10:28 2016/12/03 + * @Copyright 2015-2020 SISMO + * @Project homepage https://github.com/CNSISMO + * @Version 1.8 */ namespace Home\Controller; @@ -15,13 +15,14 @@ class HallController extends Controller{ public function index() { - $xuhao = 1; - $model = M('member'); - $tmodel= M('setting'); - $title = $tmodel->where('id=1')->select(); - $user = $model->order('jifen ASC')->where('type=1')->where('jifen>0')->select(); // fix bug issued by phith0n 13:59 2016/1/25 + $xuhao = 1; + $model = M('member'); + $tmodel= M('setting'); + $title = $tmodel->where('id=1')->select(); + // fix bug issued by phith0n 13:59 2016/1/25 + $user = $model->order('jifen ASC')->where('type=1')->where('jifen>0')->select(); $this->assign('title', $title); - $this ->assign('xuhao',$xuhao); + $this ->assign('xuhao',$xuhao); $this->assign('user',getSortedCategory($user)); $this->display(); } diff --git a/Application/Home/Controller/IndexController.class.php b/Application/Home/Controller/IndexController.class.php index c63229d..71c1392 100644 --- a/Application/Home/Controller/IndexController.class.php +++ b/Application/Home/Controller/IndexController.class.php @@ -1,10 +1,10 @@ 12:28 2016/1/23 - * @copyright 2105-2018 SRCMS - * @homepage http://www.src.pw - * @version 1.5 + * @Author: Zhou Yuyang <1009465756@qq.com> 10:28 2016/12/03 + * @Copyright 2015-2020 SISMO + * @Project homepage https://github.com/CNSISMO + * @Version 1.8 */ namespace Home\Controller; diff --git a/Application/Home/Controller/PageController.class.php b/Application/Home/Controller/PageController.class.php index a0482d9..397640e 100644 --- a/Application/Home/Controller/PageController.class.php +++ b/Application/Home/Controller/PageController.class.php @@ -1,10 +1,10 @@ 12:28 2016/1/23 - * @copyright 2105-2018 SRCMS - * @homepage http://www.src.pw - * @version 1.5 + * @Author: Zhou Yuyang <1009465756@qq.com> 10:28 2016/12/03 + * @Copyright 2015-2020 SISMO + * @Project homepage https://github.com/CNSISMO + * @Version 1.8 */ namespace Home\Controller; @@ -13,26 +13,14 @@ use Think\Controller; class PageController extends Controller{ - public function index($key="") + public function index() { - if($key == ""){ - $model = M('page'); - }else{ - $where['title'] = array('like',"%$key%"); - $where['name'] = array('like',"%$key%"); - $where['_logic'] = 'or'; - $model = M('page')->where($where); - } - - $count = $model->where($where)->count();// 查询满足要求的总记录数 - $Page = new \Extend\Page($count,15);// 实例化分页类 传入总记录数和每页显示的记录数(25) - $show = $Page->show();// 分页显示输出 - $pages = $model->limit($Page->firstRow.','.$Page->listRows)->where($where)->order('id DESC')->select(); - $tmodel= M('setting'); + $model = M('page'); + $tmodel= M('setting'); + $pages = $model->limit(15)->select(); $title = $tmodel->where('id=1')->select(); $this->assign('title', $title); $this->assign('model', $pages); - $this->assign('page',$show); $this->display(); } diff --git a/Application/Home/View/Blog/index.html b/Application/Home/View/Blog/index.html index 645f9f8..906392c 100644 --- a/Application/Home/View/Blog/index.html +++ b/Application/Home/View/Blog/index.html @@ -31,7 +31,6 @@
    - - - + diff --git a/Application/Home/View/Blog/view.html b/Application/Home/View/Blog/view.html index d5b0cf3..844419f 100644 --- a/Application/Home/View/Blog/view.html +++ b/Application/Home/View/Blog/view.html @@ -7,9 +7,6 @@ - @@ -30,13 +27,12 @@
    - + @@ -54,7 +50,7 @@
    - 返回列表 + 返回列表
    @@ -68,7 +64,7 @@ - + diff --git a/Application/Home/View/Gift/index.html b/Application/Home/View/Gift/index.html index 2a8dca1..e2b2df2 100644 --- a/Application/Home/View/Gift/index.html +++ b/Application/Home/View/Gift/index.html @@ -30,7 +30,6 @@ @@ -67,7 +64,7 @@ - + diff --git a/Application/Home/View/Hall/index.html b/Application/Home/View/Hall/index.html index 22b0af2..f803d6c 100644 --- a/Application/Home/View/Hall/index.html +++ b/Application/Home/View/Hall/index.html @@ -46,24 +46,10 @@