fix

childeYin · childeYin · commit 94046d12ddb0 · 2018-10-13T10:18:20.000+08:00
diff --git a/src/controller/InstallDBController.php b/src/controller/InstallDBController.php
@@ -67,11 +67,8 @@ public function doIndex()
 
 
         $config = require($sampleFileName);
-
         $sqliteName = "";
-
         $this->lang = isset($_GET['lang']) ? $_GET['lang'] : "1";
-
         $method = $_SERVER['REQUEST_METHOD'];
         if ($method == 'POST') {
             //install site
@@ -206,16 +203,15 @@ public function doIndex()
             $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']) : "";
-            $isInstallRootPath = true;
+            $doucmentUri = isset($_SERVER['DOCUMENT_URI']) ? $_SERVER['DOCUMENT_URI'] : "";
 
+            $isInstallRootPath = true;
             if(!$doucmentRoot || !$scriptRoot) {
                 $isInstallRootPath = false;
             }
-
-            if($doucmentRoot.DIRECTORY_SEPARATOR."index.php" != $scriptRoot) {
+            if($doucmentRoot.$doucmentUri != $scriptRoot) {
                 $isInstallRootPath = false;
             }
-
             if($isInstallRootPath === false) {
                 echo $this->lang == 1 ? "目前只支持根目录运行" : "Currently only the root directory is supported.";
                 return;
@@ -458,6 +454,30 @@ private function initPluginMiniProgram()
                 'permissionType' => Zaly\Proto\Core\PluginPermissionType::PluginPermissionAll,
                 'authKey' => "",
             ],
+            [
+                'pluginId' => 104,
+                'name' => "gif小程序",
+                'logo' => "",
+                'sort' => 2, //order = 2
+                'landingPageUrl' => "index.php?action=miniProgram.gif.index",
+                'landingPageWithProxy' => 1, //1 表示走site代理
+                'usageType' => Zaly\Proto\Core\PluginUsageType::PluginUsageU2Message,
+                'loadingType' => Zaly\Proto\Core\PluginLoadingType::PluginLoadingChatbox,
+                'permissionType' => Zaly\Proto\Core\PluginPermissionType::PluginPermissionAll,
+                'authKey' => "",
+            ],
+            [
+                'pluginId' => 104,
+                'name' => "gif小程序",
+                'logo' => "",
+                'sort' => 2, //order = 2
+                'landingPageUrl' => "index.php?action=miniProgram.gif.index",
+                'landingPageWithProxy' => 1, //1 表示走site代理
+                'usageType' => Zaly\Proto\Core\PluginUsageType::PluginUsageGroupMessage,
+                'loadingType' => Zaly\Proto\Core\PluginLoadingType::PluginLoadingChatbox,
+                'permissionType' => Zaly\Proto\Core\PluginPermissionType::PluginPermissionAll,
+                'authKey' => "",
+            ],
             [
                 'pluginId' => 105,
                 'name' => "账户密码管理",
diff --git a/src/public/js/im/zalyGroupMsg.js b/src/public/js/im/zalyGroupMsg.js
@@ -2176,9 +2176,8 @@ function updateInfo(profileId, profileType)
     }catch (error) {
 
     }
-
     var subName = name;
-    if(name.length>10) {
+    if(name!=undefined && name.length>10) {
         subName = name.substr(0, 8) + "...";
     }
     $(".nickname_"+profileId).html(name);
@@ -2475,8 +2474,6 @@ $(document).on("click", ".permission-join", function () {
     showWindow($("#permission-join"));
 });
 
-
-
 $(document).on("click", ".mark_down", function () {
     var isMarkDown = $(".mark_down").attr("is_on");
     if(isMarkDown == "on") {
@@ -2488,8 +2485,6 @@ $(document).on("click", ".mark_down", function () {
     }
 });
 
-
-
 $(document).on("click", ".imgDiv", function () {
     var imgDivs = $(".imgDiv");
     var length = imgDivs.length;
@@ -2653,11 +2648,6 @@ function handleHtmlLanguage(html)
 
 
 
-
-
-
-
-
 //-----------------------------------api.friend.update---------------------------------------------------------
 
 
diff --git a/src/public/js/im/zalyMsg.js b/src/public/js/im/zalyMsg.js
@@ -206,7 +206,7 @@ function appendOrInsertRoomList(msg, isInsert, showNotification)
 
     }
 
-    if(name.length>10) {
+    if(name !=undefined && name.length>10) {
         name = name.substr(0, 8) + "...";
     }
     var html = template("tpl-chatSession", {

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ function appendOrInsertRoomList(msg, isInsert, showNotification)`
`206`	`206`
`207`	`207`	`}`
`208`	`208`
`209`		`- if(name.length>10) {`
	`209`	`+ if(name !=undefined && name.length>10) {`
`210`	`210`	`name = name.substr(0, 8) + "...";`
`211`	`211`	`}`
`212`	`212`	`var html = template("tpl-chatSession", {`