From 8e5953cae3b4b37025c038bc15397ea0ed1fc017 Mon Sep 17 00:00:00 2001
From: Martin Zhou <1009465756@qq.com>
Date: Wed, 31 May 2017 23:03:37 +0800
Subject: [PATCH] =?UTF-8?q?SRCMS=20V2.0.1=E5=BC=80=E5=8F=91=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
修复 荣誉榜排行顺序问题
修复 站点名称和简介无法配置的问题
修复 荣誉榜团队无法编辑的问题
删除 Ueditor存在漏洞的截屏插件
---
.../Controller/StatisticController.class.php | 21 ++
Application/Admin/View/Hall/add.html | 4 +-
Application/Admin/View/Hall/update.html | 4 +
Application/Admin/View/Statistic/index.html | 65 ++++
Application/Admin/View/Wiki/index.html | 19 ++
Application/Common/Conf/db.php | 8 -
.../Home/Controller/BlogController.class.php | 4 +-
.../Home/Controller/GiftController.class.php | 4 +-
.../Home/Controller/HallController.class.php | 5 +-
.../Home/Controller/IndexController.class.php | 2 +
.../Home/Controller/PageController.class.php | 4 +-
Application/Home/View/Blog/index.html | 14 +-
Application/Home/View/Blog/view.html | 12 +-
Application/Home/View/Gift/index.html | 12 +-
Application/Home/View/Hall/index.html | 12 +-
Application/Home/View/Hall/view.html | 8 +-
Application/Home/View/Index/index.html | 12 +-
Application/Home/View/Page/index.html | 8 +-
Application/Home/View/Page/view.html | 8 +-
.../User/Controller/PostController.class.php | 2 +-
DB/srcms.sql | 314 ++++++++++++------
README.md | 43 ++-
ThinkPHP/Tpl/think_exception.tpl | 2 +-
logo.png | Bin 0 -> 4058 bytes
24 files changed, 403 insertions(+), 184 deletions(-)
create mode 100644 Application/Admin/Controller/StatisticController.class.php
create mode 100644 Application/Admin/View/Statistic/index.html
create mode 100644 Application/Admin/View/Wiki/index.html
create mode 100644 logo.png
diff --git a/Application/Admin/Controller/StatisticController.class.php b/Application/Admin/Controller/StatisticController.class.php
new file mode 100644
index 0000000..ae0c87d
--- /dev/null
+++ b/Application/Admin/Controller/StatisticController.class.php
@@ -0,0 +1,21 @@
+ 10:28 2017/02/02
+ * @Copyright 2015-2020 SISMO
+ * @Project homepage https://github.com/CNSISMO
+ * @Version 2.0
+ */
+
+
+class StatisticController extends BaseController
+{
+ /**
+ * 漏洞报告列表
+ */
+ public function index()
+ {
+ $this -> display();
+ }
+}
\ No newline at end of file
diff --git a/Application/Admin/View/Hall/add.html b/Application/Admin/View/Hall/add.html
index 220fed6..944133c 100644
--- a/Application/Admin/View/Hall/add.html
+++ b/Application/Admin/View/Hall/add.html
@@ -34,8 +34,8 @@
-
-
+
+
diff --git a/Application/Admin/View/Hall/update.html b/Application/Admin/View/Hall/update.html
index c2daec3..fe142db 100644
--- a/Application/Admin/View/Hall/update.html
+++ b/Application/Admin/View/Hall/update.html
@@ -14,6 +14,10 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Application/Admin/View/Wiki/index.html b/Application/Admin/View/Wiki/index.html
new file mode 100644
index 0000000..2e34f5c
--- /dev/null
+++ b/Application/Admin/View/Wiki/index.html
@@ -0,0 +1,19 @@
+
+
+
+
+
+
企业安全维基
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Application/Common/Conf/db.php b/Application/Common/Conf/db.php
index 10a8375..99792c0 100644
--- a/Application/Common/Conf/db.php
+++ b/Application/Common/Conf/db.php
@@ -9,12 +9,4 @@ return array(
//'DB_PREFIX' => 'wx_', // 数据库表前缀
'DB_FIELDS_CACHE' => true, // 启用字段缓存
'DB_CHARSET' => 'utf8', // 数据库编码默认采用utf8
-'DB_CONFIG1' => array(
- 'db_type' => 'mysql',
- 'db_user' => 'root',
- 'db_pwd' => 'root',
- 'db_host' => 'localhost',
- 'db_port' => '3306',
- 'db_name' => 'srflow'
-),
);
\ No newline at end of file
diff --git a/Application/Home/Controller/BlogController.class.php b/Application/Home/Controller/BlogController.class.php
index 99081b0..cf77e8f 100644
--- a/Application/Home/Controller/BlogController.class.php
+++ b/Application/Home/Controller/BlogController.class.php
@@ -18,9 +18,9 @@ class BlogController extends Controller{
$model = M('blog');
$tmodel= M('setting');
$pages = $model->limit(15)->select();
- $title = $tmodel->where('id=1')->select();
- $this->assign('title', $title);
+ $settings = $tmodel -> where('id=1') -> select();
$this->assign('model', $pages);
+ $this->assign('settings', $settings);
$this->display();
}
diff --git a/Application/Home/Controller/GiftController.class.php b/Application/Home/Controller/GiftController.class.php
index 10a0cdf..390744d 100644
--- a/Application/Home/Controller/GiftController.class.php
+++ b/Application/Home/Controller/GiftController.class.php
@@ -17,8 +17,8 @@ class GiftController extends Controller{
public function index(){
$gift = M('links')->select();
$tmodel= M('setting');
- $title = $tmodel->where('id=1')->select();
- $this->assign('title', $title);
+ $settings = $tmodel -> where('id=1') -> select();
+ $this->assign('settings', $settings);
$this->assign('gift',$gift);
$this->display();
}
diff --git a/Application/Home/Controller/HallController.class.php b/Application/Home/Controller/HallController.class.php
index 23e92db..7ac5536 100644
--- a/Application/Home/Controller/HallController.class.php
+++ b/Application/Home/Controller/HallController.class.php
@@ -18,7 +18,10 @@ class HallController extends Controller{
{
$xuhao = 1;
$model = M('member');
- $user = $model->order('jifen ASC')->where('jifen>0')->select();
+ $tmodel= M('setting');
+ $settings = $tmodel -> where('id=1') -> select();
+ $user = $model->order('jifen DESC')->where('jifen>0')->select();
+ $this->assign('settings', $settings);
$this ->assign('xuhao',$xuhao);
$this->assign('user',$user);
$this->display();
diff --git a/Application/Home/Controller/IndexController.class.php b/Application/Home/Controller/IndexController.class.php
index f128a82..d46b12c 100644
--- a/Application/Home/Controller/IndexController.class.php
+++ b/Application/Home/Controller/IndexController.class.php
@@ -21,9 +21,11 @@ class IndexController extends Controller{
$title = $tmodel->where('id=1')->select();
$hall = $model->order('id DESC')->select();
$advisories = $amodel -> select();
+ $settings = $tmodel -> where('id=1') -> select();
$this->assign('model', $hall);
$this->assign('title', $title);
$this->assign('advisories', $advisories);
+ $this->assign('settings', $settings);
$this->display();
}
}
diff --git a/Application/Home/Controller/PageController.class.php b/Application/Home/Controller/PageController.class.php
index e290c7e..39d7cfb 100644
--- a/Application/Home/Controller/PageController.class.php
+++ b/Application/Home/Controller/PageController.class.php
@@ -19,8 +19,8 @@ class PageController extends Controller{
$model = M('page');
$tmodel= M('setting');
$pages = $model->limit(15)->select();
- $title = $tmodel->where('id=1')->select();
- $this->assign('title', $title);
+ $settings = $tmodel -> where('id=1') -> select();
+ $this->assign('settings', $settings);
$this->assign('model', $pages);
$this->display();
}
diff --git a/Application/Home/View/Blog/index.html b/Application/Home/View/Blog/index.html
index d95a425..6d125dd 100644
--- a/Application/Home/View/Blog/index.html
+++ b/Application/Home/View/Blog/index.html
@@ -6,9 +6,9 @@
-
研究博客 - Google Inc.安全应急响应中心
-
-
+
研究博客 - <foreach name="settings" item="s"> {$s.key2} </foreach>安全应急响应中心
+
+
@@ -43,7 +43,7 @@
-
Google Inc.
+ {$s.key2}
安全应急响应中心
@@ -62,7 +62,7 @@
-
-
© Google 2017-2018 Powered by: SRCMS
+
{$s.key6}
-
© Google 2017-2018 Powered by: SRCMS
+
{$s.key6}
-
© Google 2017-2018 Powered by: SRCMS
+
{$s.key6}
-
© Google 2017-2018 Powered by: SRCMS
+
{$s.key6}
-
© Google 2017-2018 Powered by: SRCMS
+
{$s.key6}
-
Google INC.
安全应急响应中心
+
{$s.key2}
安全应急响应中心
诚邀广大安全专家共建安全生态
@@ -90,7 +90,7 @@
-
Google INC.
安全应急响应中心
+
{$s.key2}
安全应急响应中心
诚邀广大安全专家共建安全生态
@@ -289,7 +289,7 @@
@@ -305,7 +305,7 @@
-
© Google 2017-2018 Powered by: SRCMS
+
{$s.key6}
-
© Google 2017-2018 Powered by: SRCMS
+
{$s.key6}
-
© Google 2017-2018 Powered by: SRCMS
+
{$s.key6}
版本：v2.0.0-alpha.1. Code licensed MIT.
-
+
