SAM2O2O
diff --git a/‎src/controller/InstallDBController.php‎
Lines changed: 3 additions & 1 deletion b/‎src/controller/InstallDBController.php‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎src/public/js/im/zalyMsg.js‎
Lines changed: 16 additions & 0 deletions b/‎src/public/js/im/zalyMsg.js‎
Lines changed: 16 additions & 0 deletions
@@ -211,9 +211,11 @@ public function doIndex()
             if(!$doucmentRoot || !$scriptRoot) {
                 $isInstallRootPath = false;
             }
-            if($doucmentRoot."/index.php" != $scriptRoot) {
+
+            if($doucmentRoot.DIRECTORY_SEPARATOR."index.php" != $scriptRoot) {
                 $isInstallRootPath = false;
             }
+
             if($isInstallRootPath === false) {
                 echo $this->lang == 1 ? "目前只支持根目录运行" : "Currently only the root directory is supported.";
                 return;
 
@@ -959,6 +959,21 @@ function base64ToBlob(base64, mime)
     return new Blob(byteArrays, {type: mime});
 }
 
+function handleMsgContentText(str)
+{
+    var reg=/((http|ftp|https):\/\/)?[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?/;
+    var arr = str.match(reg);
+    console.log("reg ===" + JSON.stringify(arr));
+
+    if(arr == null) {
+        return str;
+    }
+    var urlLink = arr.shift();
+    var urlLinkHtml = "<a href='"+urlLink+"'>"+urlLink+"</a>";
+    str = str.replace(urlLink, urlLinkHtml);
+    return str;
+}
+
 //---------------------------------------------append msg html to chat dialog-------------------------------------------------
 
 function appendMsgHtmlToChatDialog(msg)
@@ -986,6 +1001,7 @@ function appendMsgHtmlToChatDialog(msg)
         switch(msgType) {
             case MessageType.MessageText :
                 var msgContent = msg['text'].body;
+                msgContent = handleMsgContentText(msgContent);
                 html = template("tpl-send-msg-text", {
                     roomType: msg.roomType,
                     nickname:nickname,
Original file line number	Diff line number	Diff line change
`@@ -211,9 +211,11 @@ public function doIndex()`
`211`	`211`	`if(!$doucmentRoot \|\| !$scriptRoot) {`
`212`	`212`	`$isInstallRootPath = false;`
`213`	`213`	`}`
`214`		`- if($doucmentRoot."/index.php" != $scriptRoot) {`
	`214`	`+`
	`215`	`+ if($doucmentRoot.DIRECTORY_SEPARATOR."index.php" != $scriptRoot) {`
`215`	`216`	`$isInstallRootPath = false;`
`216`	`217`	`}`
	`218`	`+`
`217`	`219`	`if($isInstallRootPath === false) {`
`218`	`220`	`echo $this->lang == 1 ? "目前只支持根目录运行" : "Currently only the root directory is supported.";`
`219`	`221`	`return;`