Merge branch 'master' into dev_sam

SAM2O2O · SAM2O2O · commit 9715c30143c4 · 2018-10-13T14:43:36.000+08:00
diff --git a/src/config.sample.php b/src/config.sample.php
@@ -7,8 +7,8 @@
  */
 
 return array(
-    'siteVersionName' => '1.0.9',
-    'siteVersionCode' => '10009',
+    'siteVersionName' => '1.0.11',
+    'siteVersionCode' => '10011',
     'apiPageIndex' => './index.php?action=page.index',
     'apiPageLogin' => './index.php?action=page.login',
     'apiPageLogout' => './index.php?action=page.logout',
diff --git a/src/controller/Api/Group/Api_Group_UpdateController.php b/src/controller/Api/Group/Api_Group_UpdateController.php
@@ -113,10 +113,6 @@ private function handleValues($values, $groupId)
             $this->ctx->Wpf_Logger->info($tag, " group profile updateValues  =". json_encode($updateValues));
             $this->ctx->Wpf_Logger->info($tag, " group profile writeUpdateAdminType  =". $writeUpdateAdminType);
 
-
-            //只有群主管理员可以修改
-            $this->isGroupAdmin($groupId);
-
             $groupInfo = $this->getGroupProfile($groupId);
 
             if($writeUpdateAdminType !== false) {
@@ -152,6 +148,9 @@ private function handleValues($values, $groupId)
                 return;
             }
 
+            //只有群主管理员可以修改
+            $this->isGroupAdmin($groupId);
+
             $where = [
                 "groupId" => $groupId
             ];
diff --git a/src/controller/InstallDBController.php b/src/controller/InstallDBController.php
@@ -204,16 +204,15 @@ public function doIndex()
             $testCurlUrl = $sampleFile['test_curl'];
             $testCurlUrl = ZalyHelper::getFullReqUrl($testCurlUrl);
             $curlResult  = $this->curl->request($testCurlUrl, 'get');
-            $doucmentRoot = isset($_SERVER['DOCUMENT_ROOT']) ? str_replace("//", "/", $_SERVER['DOCUMENT_ROOT']) : "";
-            $scriptRoot = isset($_SERVER['SCRIPT_FILENAME']) ? str_replace("//", "/",  $_SERVER['SCRIPT_FILENAME']) : "";
+            //防止自己配置nginx的时候，多写一个/
+            $requestUri = isset($_SERVER['REQUEST_URI']) ? str_replace(array("\\", "//"), array("/", "/"),  $_SERVER['REQUEST_URI']) : "";
+            $requestUris = explode("/", $requestUri);
             $isInstallRootPath = true;
 
-            if(!$doucmentRoot || !$scriptRoot) {
-                $isInstallRootPath = false;
-            }
-            if($doucmentRoot."/index.php" != $scriptRoot) {
+            if(count($requestUris) > 2) {
                 $isInstallRootPath = false;
             }
+
             if($isInstallRootPath === false) {
                 echo $this->lang == 1 ? "目前只支持根目录运行" : "Currently only the root directory is supported.";
                 return;
diff --git a/src/public/js/im/zalyGroupMsg.js b/src/public/js/im/zalyGroupMsg.js
@@ -1950,7 +1950,11 @@ function updateInfo(profileId, profileType)
     var name = template("tpl-string", {
         string : name
     });
-    name = name.trim();
+    try{
+        name = name.trim();
+    }catch (error) {
+
+    }
     var subName = name;
     if(name.length>10) {
         subName = name.substr(0, 8) + "...";
diff --git a/src/public/js/im/zalyMsg.js b/src/public/js/im/zalyMsg.js
@@ -185,7 +185,12 @@ function appendOrInsertRoomList(msg, isInsert, showNotification)
     }
 
     var avatar = msg.roomType == GROUP_MSG ? msg.avatar : msg.userAvatar;
-    name = name.trim();
+    
+    try{
+        name = name.trim();
+    }catch (error) {
+
+    }
     if(name.length>10) {
         name = name.substr(0, 8) + "...";
     }

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,12 @@ function appendOrInsertRoomList(msg, isInsert, showNotification)`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`var avatar = msg.roomType == GROUP_MSG ? msg.avatar : msg.userAvatar;`
`188`		`- name = name.trim();`
	`188`	`+`
	`189`	`+ try{`
	`190`	`+ name = name.trim();`
	`191`	`+ }catch (error) {`
	`192`	`+`
	`193`	`+ }`
`189`	`194`	`if(name.length>10) {`
`190`	`195`	`name = name.substr(0, 8) + "...";`
`191`	`196`	`}`