1.20 release

kalcaddle · May 25, 2021 · 5f47ad8 · 5f47ad8
1 parent 846098e
commit 5f47ad8
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 24 deletions.
diff --git a/app/autoload.php b/app/autoload.php
diff --git a/app/controller/user/setting.class.php b/app/controller/user/setting.class.php
@@ -225,19 +225,11 @@ public function decodePwd($password) {
 	 * 用户头像上传
 	 */
 	public function setHeadImage() {
-		$file = $this->in['path'];
-		$userID = $this->user['userID'];
-		$fileInfo = IO::info($file);
-		if(!$fileInfo || 
-			!in_array($fileInfo['ext'],$this->imageExt) ||
-			$fileInfo['targetType'] != 'system' || 
-			$fileInfo['createUser']['userID'] != USER_ID
-		){
-			show_json(LNG('user.unAuthFile'),false);
+		$link = Input::get('link', 'require');
+		if(strpos($link, APP_HOST) != 0) {
+			show_json(LNG('common.illegalRequest'), false);
 		}
-
-		$link = Action('explorer.share')->linkFile($file);
-		if(!$link) show_json(null, false);
+		$userID = USER_ID;
 		$link = str_replace(APP_HOST, './', $link);
 		if(!$this->model->userEdit($userID, array("avatar" => $link))) {
 			show_json(LNG('explorer.upload.error'), false);

diff --git a/app/function/file.function.php b/app/function/file.function.php
@@ -853,7 +853,7 @@ function is_text_file($ext){
 		'vtt','filters','cer','reg','config','pem','srt','ass','lrc','opf','ncx',
 		'classpath','mymetadata','jsdtscope','project','tern-project','tld','iml','sln',
 		'gitattributes','mf','name','container','lock','applescript','mvnw','apple-app-site-association',
-		'magnet','sample','example','http','puml','plantuml'
+		'magnet','sample','example','http','puml','plantuml','plist',
 	);
 	return in_array($ext,$extArray);
 }

diff --git a/static/app/dist/api.js b/static/app/dist/api.js
diff --git a/static/app/dist/lib.js b/static/app/dist/lib.js
diff --git a/static/app/dist/main.js b/static/app/dist/main.js
diff --git a/static/app/dist/vendor.js b/static/app/dist/vendor.js
diff --git a/static/style/dist/main.css b/static/style/dist/main.css
diff --git a/static/style/lib/main.css b/static/style/lib/main.css