From 95b19a687b131393938aca4e99f21c49e2a2fd4d Mon Sep 17 00:00:00 2001 From: xiaoz Date: Tue, 15 Mar 2022 10:40:43 +0800 Subject: [PATCH 1/3] 20220315 --- data/update.log | 5 ++++- index.php | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/data/update.log b/data/update.log index 412b1c1..5221fa3 100755 --- a/data/update.log +++ b/data/update.log @@ -62,4 +62,7 @@ CREATE INDEX on_options_key_IDX ON on_options ("key"); 20220312 1. 新增API：根据ID查询单个分类信息 2. 修复后台编辑链接，分类信息显示不正确 -3. 书签导入时文件名过滤 \ No newline at end of file +3. 书签导入时文件名过滤 + +20220315 +1. 修复一个任意文件漏洞 \ No newline at end of file diff --git a/index.php b/index.php index 82716bb..d1bf67e 100755 --- a/index.php +++ b/index.php @@ -43,8 +43,11 @@ if((!isset($c)) || ($c == '')){ else{ //对请求参数进行过滤，同时检查文件是否存在 - $c = str_replace('../','',$c); - $c = str_replace('./','',$c); + $c = str_replace('\\','/',$c); + $pattern = "%\./%"; + if ( preg_match_all($pattern,$c) ) { + exit('非法请求!'); + } //控制器文件 $controller_file = "./controller/".$c.'.php'; if( file_exists($controller_file) ) { From 0408f668bee0be8ff5d140ef17a8b716b8fd6f0e Mon Sep 17 00:00:00 2001 From: xiaoz Date: Tue, 15 Mar 2022 12:02:57 +0800 Subject: [PATCH 2/3] update baisuTwo --- templates/baisuTwo/css/style.css | 203 ++++++++++++++++++++------ templates/baisuTwo/index.php | 172 ++++++++++++++++++++-- templates/baisuTwo/js/admin.js | 239 +++++++++++++++++++++++++++++-- templates/baisuTwo/js/common.js | 12 +- 4 files changed, 561 insertions(+), 65 deletions(-) diff --git a/templates/baisuTwo/css/style.css b/templates/baisuTwo/css/style.css index fb85bc9..b942f60 100644 --- a/templates/baisuTwo/css/style.css +++ b/templates/baisuTwo/css/style.css @@ -98,56 +98,114 @@ a { padding: 0 25px 100px; overflow: auto; } + + /* 整个滚动条 */ + .index-nav .type-list::-webkit-scrollbar { width: 6px; background-color: transparent; } + + /* 滚动条上的按钮 (上下箭头). */ .index-nav .type-list::-webkit-scrollbar-button { height: 0px; width: 0px; } + + /* 滚动条上的滚动滑块. */ + .index-nav .type-list::-webkit-scrollbar-thumb { background-color: #64a15e; border-radius: 50px; } + + /* 滚动条轨道. */ + .index-nav .type-list::-webkit-scrollbar-track { background-color: transparent; } + + /* 滚动条没有滑块的轨道部分 */ + .index-nav .type-list::-webkit-scrollbar-track-piece { background-color: transparent; } .index-nav .type-list .list { + display: flex; + justify-content: flex-start; + align-items: center; + margin-bottom: 10px; + line-height: 42px; + transition: 0.3s all; + overflow: hidden; +} + +.index-nav .type-list .list a { + width: 80%; display: flex; justify-content: flex-start; align-items: center; font-size: 16px; font-weight: bold; - padding: 10px; - border-radius: 5px; - margin-bottom: 10px; + padding: 0 10px; + border-radius: 5px 0px 0px 5px; color: #555555; transition: 0.3s all; } -.index-nav .type-list .list i { +.index-nav .type-list .list a i { display: block; margin-right: 6px; font-size: 22px; } -.index-nav .type-list .list:hover { +.index-nav .type-list .list span { + display: block; + width: 0; + overflow: hidden; + text-align: center; + background-color: #477975; + cursor: pointer; + border-radius: 0px 5px 5px 0px; + color: #FFFFFF; + transition: 0.3s all; +} + +.index-nav .type-list .list span i { + display: block; + font-size: 18px; + transition: 0.3s all; +} +.index-nav .type-list .list.add{ + margin-top: 12px; +} +.index-nav .type-list .list.add a{ + width: 100%; + border: 1px solid #64a15e; + border-radius: 5px; + cursor: pointer; +} + + + +.index-nav .type-list .list:hover a { background-color: #64a15e; color: #FFFFFF; transition: 0.3s all; } +.index-nav .type-list .list:hover span { + width: 20%; + transition: 0.3s all; +} + .index-nav .user-info { width: 100%; background-color: #ffffff; @@ -313,12 +371,14 @@ a { font-size: 20px; color: #64a15e; } -.search-main .search-btnlist{ + +.search-main .search-btnlist { display: flex; justify-content: center; align-items: center; position: relative; } + .search-main button.search-btn { width: 140px; height: 50px; @@ -334,25 +394,28 @@ a { cursor: pointer; border-right: 1px solid #64a15e; } -.search-main button.search-btn img{ + +.search-main button.search-btn img { display: block; width: 25px; height: 25px; border-radius: 6px; margin-right: 6px; } + .search-main button.search-btn i { display: block; margin-right: 4px; font-size: 20px; line-height: 50px; } + .search-main button.search-change { width: 30px; height: 50px; text-align: center; border: none; - border-radius: 0px 10px 10px 0px; + border-radius: 0px 10px 10px 0px; background-color: #64a15e; color: #ffffff; font-size: 16px; @@ -367,7 +430,8 @@ a { font-size: 16px; line-height: 50px; } -.search-main .search-btnlist .search-lists{ + +.search-main .search-btnlist .search-lists { width: 390px; display: flex; justify-content: space-between; @@ -382,10 +446,12 @@ a { z-index: 100; box-shadow: 0px 0px 6px #000000; } -.search-main .search-btnlist .search-lists.hide{ + +.search-main .search-btnlist .search-lists.hide { display: none; } -.search-main .search-btnlist .search-lists .list{ + +.search-main .search-btnlist .search-lists .list { width: 33%; line-height: 40px; padding: 0 10px; @@ -397,7 +463,8 @@ a { cursor: pointer; transition: 0.3s all; } -.search-main .search-btnlist .search-lists .list img{ + +.search-main .search-btnlist .search-lists .list img { display: block; width: 20px; height: 20px; @@ -405,7 +472,7 @@ a { border-radius: 6px; } -.search-main .search-btnlist .search-lists .list:hover{ +.search-main .search-btnlist .search-lists .list:hover { background-color: #64a15e; color: #FFFFFF; transition: 0.3s all; @@ -459,8 +526,6 @@ a { margin-left: 15px; } - - .search-main-w .weather-main { width: 240px; height: 100%; @@ -528,7 +593,7 @@ a { position: relative; display: flex; justify-content: flex-start; - align-items: center; + align-items: flex-start; } .site-main .site-list .list span { @@ -589,13 +654,23 @@ a { bottom: 0; } +.site-main .site-list .list .desc { + display: block; + width: 100%; + font-size: 13px; + padding-bottom: 10px; + color: #666; + line-height: 1.5; +} + .site-main .site-list .list:hover { box-shadow: 0px 0px 6px #333; background-color: #64a15e; transition: 0.3s all; } -.site-main .site-list .list:hover p.name { +.site-main .site-list .list:hover p.name, +.site-main .site-list .list:hover p.desc { color: #ffffff; } @@ -636,14 +711,16 @@ footer.show { footer a:hover { color: #64a15e !important; } -.tool-list{ + +.tool-list { position: fixed; bottom: 30px; right: 15px; z-index: 99; width: 45px; } -.tool-list .list{ + +.tool-list .list { width: 45px; height: 45px; display: block; @@ -655,13 +732,16 @@ footer a:hover { cursor: pointer; margin-top: 12px; } -.tool-list .list i{ + +.tool-list .list i { font-size: 20px; } -.tool-list .addsite i{ + +.tool-list .addsite i { font-size: 24px; } + /**/ .addsiteBox { @@ -840,7 +920,9 @@ footer a:hover { margin-top: 0; } -.m-header{display: none;} +.m-header { + display: none; +} /* @@ -848,74 +930,72 @@ footer a:hover { */ @media only screen and (max-width: 1200px) { - .index-nav{ + .index-nav { left: -100%; transition: 0.3s all; } - .index-nav.show{ + .index-nav.show { left: 0; transition: 0.3s all; } - .index-main{ + .index-main { padding: 15px !important; } - .search-main-w{ + .search-main-w { width: 100%; height: 120px; margin-top: 60px; } - .search-main-w .date-main{ + .search-main-w .date-main { display: none; } - #he-plugin-standard{ + #he-plugin-standard { display: none; } - .search-main{ + .search-main { width: 100%; padding: 25px 0; flex-wrap: wrap; background-position: center; } - .search-main .search-input{ + .search-main .search-input { width: 80%; } - .search-main .search-btnlist{ + .search-main .search-btnlist { width: 100%; display: none; } - .search-main .search-btnlist .search-lists{ + .search-main .search-btnlist .search-lists { width: 100%; left: 0; right: 0; margin: auto; font-size: 13px; } - - - .site-main .site-name{ + .site-main .site-name { margin-bottom: 10px; } - .site-main .site-list .list{ + .site-main .site-list .list { width: 48%; margin-bottom: 10px; } - .site-main .site-list{ + .site-main .site-list { margin-bottom: 25px; } - .site-main .site-list .list span{ + .site-main .site-list .list span { position: absolute; right: 0px; top: 0; bottom: 0; margin: auto; } - .site-main .site-list .list a{ + .site-main .site-list .list a { padding: 0 10% 0 5%; } - footer{ + footer { padding-left: 0; } - .m-header{ + .m-header { width: 100%; padding: 10px 15px; display: flex; @@ -927,14 +1007,14 @@ footer a:hover { z-index: 9999; box-shadow: 0px 0px 1px #C0C4CC; } - .m-header .logo{ + .m-header .logo { height: 30px; } - .m-header .logo img{ + .m-header .logo img { display: block; height: 100%; } - .m-header .navbar{ + .m-header .navbar { display: flex; justify-content: center; flex-direction: column; @@ -946,4 +1026,39 @@ footer a:hover { color: #64a15e; border-radius: 6px; } + .m-navlist-w { + width: 100%; + position: absolute; + top: 100%; + left: 0; + right: 0; + background-color: #FFFFFF; + padding: 15px; + display: none; + border-top: 1px solid #C0C4CC; + } + .m-navlist { + display: flex; + justify-content: space-between; + flex-wrap: wrap; + align-items: center; + } + .m-navlist a.list { + width: 33%; + padding: 0 10px; + line-height: 40px; + display: flex; + justify-content: flex-start; + align-items: center; + } + .m-navlist a.list i { + display: block; + margin-right: 4px; + } + .addsite-main { + width: 100%; + } + .addsite-main .list.type span { + width: 32%; + } } \ No newline at end of file diff --git a/templates/baisuTwo/index.php b/templates/baisuTwo/index.php index 5eb0ae3..b4d214b 100644 --- a/templates/baisuTwo/index.php +++ b/templates/baisuTwo/index.php @@ -19,9 +19,18 @@ + +
+
- +
- + +
@@ -170,6 +202,9 @@

+

+ +

@@ -190,7 +225,7 @@