no message

kalcaddle · Sep 6, 2018 · 3e94e9d · 3e94e9d
1 parent f184f3e
commit 3e94e9d
Show file tree

Hide file tree

Showing 25 changed files with 48 additions and 45 deletions.
diff --git a/app/controller/systemMember.class.php b/app/controller/systemMember.class.php
@@ -274,7 +274,7 @@ public function add($user = false){
 		}else{
 			$userArray[] = $name;
 		}
-		$nickName = $name;
+		$nickName = 0;
 		if(isset($this->in['nickName'])){
 			$nickName = trim(rawurldecode($this->in['nickName']));
 		}
@@ -291,7 +291,7 @@ public function add($user = false){
 			$userInfo = array(
 				'userID'	=>  $userID,
 				'name'      =>  $val,
-				'nickName'	=>  $nickName,
+				'nickName'	=>  $nickName ? $nickName : $val,
 				'password'  =>  md5($password),
 				'role'      =>  $this->in['role'],
 				'config'    =>  array('sizeMax' => floatval($this->in['sizeMax']),//M

diff --git a/app/controller/utils.php b/app/controller/utils.php
diff --git a/plugins/toolsCommon/static/pie/.pie.tif b/plugins/toolsCommon/static/pie/.pie.tif
diff --git a/plugins/zipView/package.json b/plugins/zipView/package.json
@@ -2,7 +2,7 @@
 	"id":"zipView",
 	"name":"{{LNG.Plugin.default.zipView}}",
 	"title":"",
-	"version":"1.32",
+	"version":"1.34",
 	"source":{
 		"icon":"{{pluginHost}}static/images/icon.png",
 		"screenshoot":[
@@ -34,7 +34,7 @@
 			"type":"number",
 			"display":"{{LNG.Plugin.Config.fileSort}}",
 			"desc":"{{LNG.Plugin.Config.fileSortDesc}}",
-			"value":10,
+			"value":10
 		}
 	}
 }
diff --git a/plugins/zipView/static/page.js b/plugins/zipView/static/page.js
@@ -1,4 +1,7 @@
 define(function(require, exports) {
+	if(!core.authCheck('explorer.fileDownload')){
+		$(".context-menu-list .open-browser").remove();
+	}
 	var menuAction = function(action,option){
 		//console.log(action,option);
 		var zip = function(fileType){

diff --git a/static/js/app/src/api/default/main.js b/static/js/app/src/api/default/main.js
diff --git a/static/js/app/src/api/view/main.js b/static/js/app/src/api/view/main.js
diff --git a/static/js/app/src/app/main.js b/static/js/app/src/app/main.js
diff --git a/static/js/app/src/desktop/main.js b/static/js/app/src/desktop/main.js
diff --git a/static/js/app/src/edit/main.js b/static/js/app/src/edit/main.js
diff --git a/static/js/app/src/editor/main.js b/static/js/app/src/editor/main.js
diff --git a/static/js/app/src/explorer/main.js b/static/js/app/src/explorer/main.js
diff --git a/static/js/app/src/explorerWap/main.js b/static/js/app/src/explorerWap/main.js
diff --git a/static/js/app/src/plugins/main.js b/static/js/app/src/plugins/main.js
diff --git a/static/js/app/src/setting/main.js b/static/js/app/src/setting/main.js
diff --git a/static/js/app/src/shareEditor/main.js b/static/js/app/src/shareEditor/main.js
diff --git a/static/js/app/src/shareExplorer/main.js b/static/js/app/src/shareExplorer/main.js
diff --git a/static/js/app/src/shareIndex/main.js b/static/js/app/src/shareIndex/main.js
diff --git a/static/js/app/src/user/main.js b/static/js/app/src/user/main.js
diff --git a/static/style/skin/base/app_code_edit.css b/static/style/skin/base/app_code_edit.css
diff --git a/static/style/skin/base/app_desktop.css b/static/style/skin/base/app_desktop.css
diff --git a/static/style/skin/base/app_editor.css b/static/style/skin/base/app_editor.css
diff --git a/static/style/skin/base/app_explorer.css b/static/style/skin/base/app_explorer.css
diff --git a/static/style/skin/base/app_setting.css b/static/style/skin/base/app_setting.css
diff --git a/static/style/skin/base/common.css b/static/style/skin/base/common.css