diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js
index 291f0adc..ba8b322e 100644
--- a/web/assets/js/model/xray.js
+++ b/web/assets/js/model/xray.js
@@ -1080,9 +1080,9 @@ class Inbound extends XrayCommonClass {
}
get serverName() {
- if (this.stream.isTls || this.stream.isXtls || this.stream.isReality) {
- return this.stream.tls.server;
- }
+ if (this.stream.isTls) return this.stream.tls.server;
+ if (this.stream.isXtls) return this.stream.xtls.server;
+ if (this.stream.isReality) return this.stream.reality.serverNames;
return "";
}
diff --git a/web/html/xui/inbound_info_modal.html b/web/html/xui/inbound_info_modal.html
index 1390bbcd..e92fc874 100644
--- a/web/html/xui/inbound_info_modal.html
+++ b/web/html/xui/inbound_info_modal.html
@@ -51,19 +51,15 @@
-
- tls: {{ i18n "enabled" }}
- tls {{ i18n "domainName" }}: [[ inbound.serverName ? inbound.serverName : '' ]]
+ |
+ {{ i18n "security" }}
+ [[ inbound.stream.security ]]
+
+
+ {{ i18n "domainName" }}
+ [[ inbound.serverName ? inbound.serverName : '' ]]
+
|
-
- xtls: {{ i18n "enabled" }}
- xtls {{ i18n "domainName" }}: [[ inbound.serverName ? inbound.serverName : '' ]]
- |
-
- reality: {{ i18n "enabled" }}
- reality Destination: [[ inbound.stream.reality.dest ]]
- |
- tls: {{ i18n "disabled" }} |
diff --git a/web/service/inbound.go b/web/service/inbound.go
index 58a3de9f..73dd17e5 100644
--- a/web/service/inbound.go
+++ b/web/service/inbound.go
@@ -1004,7 +1004,8 @@ func (s *InboundService) GetInboundTags() (string, error) {
if err != nil && err != gorm.ErrRecordNotFound {
return "", err
}
- return "[\"" + strings.Join(inboundTags, "\", \"") + "\"]", nil
+ tags, _ := json.Marshal(inboundTags)
+ return string(tags), nil
}
func (s *InboundService) MigrationRemoveOrphanedTraffics() {
diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml
index 2aa31d4d..761ebaf7 100644
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -287,14 +287,14 @@
"subEncrypt" = "Encrypt configs"
"subEncryptDesc" = "Encrypt the returned configs in subscription"
"subShowInfo" = "Show usage info"
-"subShowInfoDesc" = "Show remianed traffic and date after config name"
+"subShowInfoDesc" = "Show remained traffic and date after config name"
"subURI" = "Reverse Proxy URI"
"subURIDesc" = "Change base URI of subscription URL for using on behind of proxies"
[pages.xray]
"title" = "Xray Settings"
"save" = "Save Settings"
-"restart" = "Reastart Xray"
+"restart" = "Restart Xray"
"basicTemplate" = "Basic Template"
"advancedTemplate" = "Advanced Template"
"generalConfigs" = "General Configs"
@@ -446,7 +446,7 @@
"usage" = "❗ Please provide a text to search!"
"getID" = "🆔 Your ID: {{ .ID }}
"
"helpAdminCommands" = "Search for a client email:\r\n/usage [Email]
\r\n \r\nSearch for inbounds (with client stats):\r\n/inbound [Remark]
"
-"helpClientCommands" = "To search for statistics, just use folowing command:\r\n \r\n/usage [UUID|Password]
\r\n \r\nUse UUID for vmess/vless and Password for Trojan."
+"helpClientCommands" = "To search for statistics, just use the following command:\r\n \r\n/usage [UUID|Password]
\r\n \r\nUse UUID for vmess/vless and Password for Trojan."
[tgbot.messages]
"cpuThreshold" = "🔴 The CPU usage {{ .Percent }}% is more than threshold {{ .Threshold }}%"