From cdf26da132186ad68bb8ae311a70eabd77a22dee Mon Sep 17 00:00:00 2001 From: xiaoz Date: Sun, 7 Apr 2019 21:43:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/Home.php | 8 +++++++- application/controllers/Img.php | 8 +++++++- application/libraries/Basic.php | 28 ++++++++++++++++++++++++++++ application/views/user/home.php | 2 +- application/views/user/img.php | 2 +- data/json/config.simple.js | 7 +++++++ data/json/index.html | 0 data/version.txt | 2 +- 8 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 data/json/config.simple.js create mode 100644 data/json/index.html diff --git a/application/controllers/Home.php b/application/controllers/Home.php index ba5f652..a3e8b5b 100644 --- a/application/controllers/Home.php +++ b/application/controllers/Home.php @@ -21,11 +21,17 @@ //加载数据库模型 $this->load->model('query','',TRUE); $siteinfo = $this->query->site_setting(); + //读取配置文件内容 + $this->load->library("basic"); + $conf = $this->basic->conf("info"); + + $siteinfo = json_decode($siteinfo->values); + $siteinfo->info = $conf->index_info; //echo $siteinfo->title; //$data['title'] = '图片上传'; $this->load->view('user/header.php',$siteinfo); - $this->load->view('user/home.php'); + $this->load->view('user/home.php',$siteinfo); $this->load->view('user/footer.php'); } //首页多图上传 diff --git a/application/controllers/Img.php b/application/controllers/Img.php index a6890b1..0381b2e 100644 --- a/application/controllers/Img.php +++ b/application/controllers/Img.php @@ -7,7 +7,12 @@ $this->load->model('query','',TRUE); $siteinfo = $this->query->site_setting(); $siteinfo = json_decode($siteinfo->values); - + + //加载常用基本类库 + $this->load->library("basic"); + //获取配置文件信息的内容 + $conf = $this->basic->conf("info"); + //var_dump($conf->img_info); //过滤imgid $imgid = strip_tags($imgid); //计算imgid长度 @@ -60,6 +65,7 @@ "size" => $size ); + $datas['img_info'] = $conf->img_info; // $data['title'] = '图片浏览'; // $data['url'] = $domain.$imginfo->path; // $data['date'] = $imginfo->date; diff --git a/application/libraries/Basic.php b/application/libraries/Basic.php index 6ba1b68..149c404 100644 --- a/application/libraries/Basic.php +++ b/application/libraries/Basic.php @@ -106,5 +106,33 @@ return $data; } + //读取站点配置文件 + public function conf($arg = ''){ + //检查配置文件是否存在，并读取对应内容 + if(is_file(FCPATH."data/json/config.js")){ + $conf_path = FCPATH."data/json/config.js"; + } + //配置文件不存在，读取默认配置 + else{ + $conf_path = FCPATH."data/json/config.simple.js"; + } + $conf_path = str_replace("\\","/",$conf_path); + //echo $conf_path; + //读取配置文件内容 + $content = json_decode(file_get_contents($conf_path)); + + //根据传入的参数来返回不同的数据 + switch ($arg) { + case 'alert': + return $content->alert; + break; + case 'info': + return $content->info; + break; + default: + return $content; + break; + } + } } ?> \ No newline at end of file diff --git a/application/views/user/home.php b/application/views/user/home.php index aad0747..f0adf2d 100644 --- a/application/views/user/home.php +++ b/application/views/user/home.php @@ -5,7 +5,7 @@
diff --git a/application/views/user/img.php b/application/views/user/img.php index 73ca47b..afd7029 100644 --- a/application/views/user/img.php +++ b/application/views/user/img.php @@ -17,7 +17,7 @@ 下载

- 此图片来自网友上传，不代表本站立场，若有侵权，请联系管理员删除！（QQ:337003006） +
diff --git a/data/json/config.simple.js b/data/json/config.simple.js new file mode 100644 index 0000000..8dad4e6 --- /dev/null +++ b/data/json/config.simple.js @@ -0,0 +1,7 @@ +{ + "alert": "ImgURL配置文件，请使用json格式，修改后建议使用http://www.bejson.com/ 进行校验，以免出现异常。", + "info": { + "index_info": "游客限制每日上传10张，单张图片不能超过5M，上传的图片将公开显示，使用之前请先阅读《使用协议<\/a>》", + "img_info": "此图片来自网友上传，不代表本站立场，若有侵权，请联系管理员删除！" + } +} \ No newline at end of file diff --git a/data/json/index.html b/data/json/index.html new file mode 100644 index 0000000..e69de29 diff --git a/data/version.txt b/data/version.txt index 3b7a444..54c2310 100644 --- a/data/version.txt +++ b/data/version.txt @@ -1 +1 @@ -v2.1.2-20190406 \ No newline at end of file +v2.1.3-20190407 \ No newline at end of file