From 737665c62c9186ef3d4d8e6245f7dc5cf4c2face Mon Sep 17 00:00:00 2001
From: HFO4 <912394456@qq.com>
Date: Wed, 13 Mar 2019 19:38:23 +0800
Subject: [PATCH] Feat: Change prefer theme color

---
 application/index/controller/Member.php    | 11 +++++++++++
 application/index/model/User.php           |  8 ++++++++
 application/index/view/home/home.html      |  3 ++-
 application/index/view/member/setting.html |  3 +++
 static/js/uploader/qiniu.js                |  2 +-
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/application/index/controller/Member.php b/application/index/controller/Member.php
index eb1f4765..e948e352 100644
--- a/application/index/controller/Member.php
+++ b/application/index/controller/Member.php
@@ -236,6 +236,17 @@ class Member extends Controller{
 		}
 	}
 
+	public function ChangeThemeColor(){
+		$this->userObj = new User(cookie('user_id'),cookie('login_key'));
+		$this->loginStatusCheck();
+		$saveAction = $this->userObj->changeOption("preferTheme",input("post.theme"));
+		if($saveAction[0]){
+			return json(['error' => '200','msg' => '设置成功']);
+		}else{
+			return json(['error' => '1','msg' => $saveAction[1]]);
+		}
+	}
+
 	public function HomePage(){
 		$this->userObj = new User(cookie('user_id'),cookie('login_key'));
 		$userInfo = $this->userObj->getInfo();
diff --git a/application/index/model/User.php b/application/index/model/User.php
index 0a87ad6f..d6b15af5 100644
--- a/application/index/model/User.php
+++ b/application/index/model/User.php
@@ -127,6 +127,7 @@ class User extends Model{
 			'delay_time' =>0,
 			'avatar' => "default",
 			'profile' => true,
+			'options' => "{}",
 		];
 		if(Db::name('users')->insert($sqlData)){
 			$userId = Db::name('users')->getLastInsID();
@@ -355,6 +356,13 @@ class User extends Model{
 		}
 	}
 
+	public function changeOption($optionKey,$optionValue){
+		$options = json_decode($this->userSQLData["options"],true);
+		$options[$optionKey] = $optionValue;
+		Db::name("users")->where("id",$this->uid)->update(["options" => json_encode($options)]);
+		return [1,1];
+	}
+
 	public function changePwd($origin,$new){
 		if(md5(config('salt').$origin) != $this->userSQLData["user_pass"]){
 			return [0,"原密码错误"];
diff --git a/application/index/view/home/home.html b/application/index/view/home/home.html
index 22ffd69b..97cb3d47 100644
--- a/application/index/view/home/home.html
+++ b/application/index/view/home/home.html
@@ -54,6 +54,7 @@
         siteInfo = {
             mainTitle: "{$options.siteName}",
         };
+        pathCache = {};
         path = "{$path}";
         mediaType = {},
         isMobile = window.innerWidth < 600;
@@ -82,7 +83,7 @@
 <script src="http://192.168.123.19:3000/static/js/2.chunk.js"></script>
 <script src="http://192.168.123.19:3000/static/js/3.chunk.js"></script>
 <script src="http://192.168.123.19:3000/static/js/4.chunk.js"></script>
-<script src="http://192.168.123.19:3000/static/js/7.chunk.js"></script>
+<script src="http://192.168.123.19:3000/static/js/6.chunk.js"></script>
 <script src="http://192.168.123.19:3000/static/js/1.chunk.js"></script>
 <script src="http://192.168.123.19:3000/static/js/9.chunk.js"></script>
 <script src="http://192.168.123.19:3000/static/js/5.chunk.js"></script>
diff --git a/application/index/view/member/setting.html b/application/index/view/member/setting.html
index 1016cd3f..8dc95349 100644
--- a/application/index/view/member/setting.html
+++ b/application/index/view/member/setting.html
@@ -23,9 +23,11 @@
     <title>用户设置- {$options.siteName}</title>
     <script type="text/javascript">
         colorTheme = {:json_encode($options["themeConfig"])};
+        colorThemeOptions = {$options["themes"]};
         isHomePage = false;
         isSharePage = false;
         pageId="userSetting";
+        siteUrl = "{$options.siteURL}";
         userInfo = {
             uid: {$userInfo.uid},
             nick: "{$userInfo.userNick}",
@@ -36,6 +38,7 @@
             regTime: "{$userSQL.user_date}",
             homePage: "{$userSQL.profile}",
             twoFactor: "{$userSQL.two_step}",
+            webdav:"{$userInfo.groupData.webdav}",
         };
         siteInfo = {
             mainTitle: "{$options.siteName}",
diff --git a/static/js/uploader/qiniu.js b/static/js/uploader/qiniu.js
index acb0c67a..b949dbcb 100644
--- a/static/js/uploader/qiniu.js
+++ b/static/js/uploader/qiniu.js
@@ -724,7 +724,7 @@ function QiniuJsSDK() {
 						resolve(xhr);
 					};
 					xhr.onerror = reject;
-					xhr.open('GET', that.uptoken_url);
+					xhr.open('GET', that.uptoken_url+"?path="+encodeURIComponent(window.pathCache[file.id]));
 					xhr.send();
 				});
 				ajax.then(function(result){