From 6740f501d1c928dd50b0a66922b826f87fc80969 Mon Sep 17 00:00:00 2001 From: taoser Date: Tue, 12 Oct 2021 16:52:51 +0800 Subject: [PATCH] 1.8.6 --- app/admin/controller/Forum.php | 4 +- app/admin/controller/Index.php | 4 +- app/admin/view/login/login.html | 3 +- app/index/Index.php | 121 +++++++++ app/index/User.php | 277 ++++++++++++++++++++ public/admin/style/login.css | 55 ++++ public/admin/style/res/bg.jpg | Bin 0 -> 317932 bytes public/admin/style/res/bg1.jpg | Bin 0 -> 321306 bytes public/static/res/css/global.css | 7 +- view/taoler/index/article/ask/detail.html | 31 ++- view/taoler/index/article/posts/detail.html | 9 +- 11 files changed, 488 insertions(+), 23 deletions(-) create mode 100644 app/index/Index.php create mode 100644 app/index/User.php create mode 100644 public/admin/style/login.css create mode 100644 public/admin/style/res/bg.jpg create mode 100644 public/admin/style/res/bg1.jpg diff --git a/app/admin/controller/Forum.php b/app/admin/controller/Forum.php index 3bb4ab5..98972e6 100644 --- a/app/admin/controller/Forum.php +++ b/app/admin/controller/Forum.php @@ -77,7 +77,7 @@ class Forum extends AdminController $res['msg'] = ''; $res['count'] = $count; foreach($forumList as $k=>$v){ - $res['data'][]= ['id'=>$v['aid'],'poster'=>$v['name'],'avatar'=>$v['user_img'],'title'=>$v['title'],'content'=>$v['content'],'posttime'=>date("Y-m-d",$v['update_time']),'top'=>$v['is_top'],'hot'=>$v['is_hot'],'reply'=>$v['is_reply'],'check'=>$v['status']]; + $res['data'][]= ['id'=>$v['aid'],'poster'=>$v['name'],'avatar'=>$v['user_img'],'title'=>htmlspecialchars($v['title']),'content'=>htmlspecialchars($v['content']),'posttime'=>date("Y-m-d",$v['update_time']),'top'=>$v['is_top'],'hot'=>$v['is_hot'],'reply'=>$v['is_reply'],'check'=>$v['status']]; } } else { $res = ['code'=>-1,'msg'=>'没有查询结果！']; @@ -262,7 +262,7 @@ class Forum extends AdminController $res = ['code'=>0,'msg'=>'','count'=>$count]; foreach($replys as $k => $v){ //$res['data'][] = ['id'=>$v['id'],'replyer'=>$v->user->name,'cardid'=>$v->article->title,'avatar'=>$v->user->user_img,'content'=>$v['content'],'replytime'=>$v['create_time']]; - $res['data'][] = ['id'=>$v['aid'],'replyer'=>$v['name'],'cardid'=>$v['title'],'avatar'=>$v['user_img'],'content'=>$v['content'],'replytime'=>date("Y-m-d",$v['create_time']),'check'=>$v['astatus'],'cid'=>$v['cid']]; + $res['data'][] = ['id'=>$v['aid'],'replyer'=>$v['name'],'cardid'=>htmlspecialchars($v['title']),'avatar'=>$v['user_img'],'content'=>htmlspecialchars($v['content']),'replytime'=>date("Y-m-d",$v['create_time']),'check'=>$v['astatus'],'cid'=>$v['cid']]; } } else { $res = ['code'=>-1,'msg'=>'没有查询结果！']; diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php index 3e9b65f..4da9777 100644 --- a/app/admin/controller/Index.php +++ b/app/admin/controller/Index.php @@ -120,7 +120,7 @@ class Index extends AdminController $res['count'] = $count; foreach($forumList as $k=>$v){ $url = (string) str_replace("admin","index",$this->domain.url('article/detail',['id'=>$v['aid']])); - $res['data'][]= ['id'=>$url,'title'=>$v['title'],'name'=>$v['name'],'catename'=>$v['catename'],'pv'=>$v['pv']]; + $res['data'][]= ['id'=>$url,'title'=>htmlspecialchars($v['title']),'name'=>$v['name'],'catename'=>$v['catename'],'pv'=>$v['pv']]; } } else { $res = ['code'=>-1,'msg'=>'本周还没有发帖！']; @@ -147,7 +147,7 @@ class Index extends AdminController if ($count) { $res = ['code'=>0,'msg'=>'','count'=>$count]; foreach($replys as $k => $v){ - $res['data'][] = ['content'=>$v['content'],'title'=>$v['title'],'cid'=>str_replace("admin","index",$this->domain.(string) url('article/detail',['id'=>$v['cid']])),'name'=>$v['name']]; + $res['data'][] = ['content'=>htmlspecialchars($v['content']),'title'=>htmlspecialchars($v['title']),'cid'=>str_replace("admin","index",$this->domain.(string) url('article/detail',['id'=>$v['cid']])),'name'=>$v['name']]; } } else { $res = ['code'=>-1,'msg'=>'本周还没评论']; diff --git a/app/admin/view/login/login.html b/app/admin/view/login/login.html index 1714917..3539a4b 100644 --- a/app/admin/view/login/login.html +++ b/app/admin/view/login/login.html @@ -8,7 +8,6 @@
-
{$vo.content|raw}
+
{$vo.content}
{$vo.zan} @@ -105,6 +107,7 @@ {:lang('edit')} {:lang('delete')} {/if} + {if ($vo.cai == 0) && ((session('user_id') == $article.user_id) OR ($user.auth ?? '')) /}{:lang('accept')}{/if}