From 7995310aa7915a6d8a31ebb9110f8d9ecf50241d Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza7@gmail.com>
Date: Fri, 16 Feb 2024 13:33:40 +0100
Subject: [PATCH] v1.7.1

---
 util/random/random.go           |  4 ++++
 web/html/xui/form/outbound.html | 31 ++++++++++++++-----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/util/random/random.go b/util/random/random.go
index b1dd2e09d4..c0894ec38c 100644
--- a/util/random/random.go
+++ b/util/random/random.go
@@ -41,3 +41,7 @@ func Seq(n int) string {
 	}
 	return string(runes)
 }
+
+func Num(n int) int {
+	return rand.Intn(n)
+}
diff --git a/web/html/xui/form/outbound.html b/web/html/xui/form/outbound.html
index e7edfc3203..5843ab4aef 100644
--- a/web/html/xui/form/outbound.html
+++ b/web/html/xui/form/outbound.html
@@ -193,25 +193,22 @@
             <a-input v-model.trim="outbound.settings.pass"></a-input>
         </a-form-item>
     </template>
+    <!-- trojan/shadowsocks -->
+    <template v-if="[Protocols.Trojan, Protocols.Shadowsocks].includes(outbound.protocol)">
+        <a-form-item label='{{ i18n "password" }}'>
+        <a-input v-model.trim="outbound.settings.password"></a-input>
+        </a-form-item>
+    </template>
     <!-- shadowsocks -->
     <template v-if="outbound.protocol === Protocols.Shadowsocks">
-    <a-form-item label='{{ i18n "password" }}'>
-      <a-input v-model.trim="outbound.settings.password"></a-input>
-    </a-form-item>
-    <a-form-item label='{{ i18n "encryption" }}'>
-      <a-select v-model="outbound.settings.method" :dropdown-class-name="themeSwitcher.currentTheme">
-        <a-select-option v-for="(method, method_name) in SSMethods" :value="method">[[ method_name ]]</a-select-option>
-      </a-select>
-    </a-form-item>
-    <a-form-item label='UDP over TCP'>
-      <a-switch v-model="outbound.settings.uot"></a-switch>
-    </a-form-item>
-  </template>
-  <!-- trojan -->
-  <template v-if="outbound.protocol === Protocols.Trojan">
-    <a-form-item label='{{ i18n "password" }}'>
-      <a-input v-model.trim="outbound.settings.password"></a-input>
-    </a-form-item>
+        <a-form-item label='{{ i18n "encryption" }}'>
+            <a-select v-model="outbound.settings.method" :dropdown-class-name="themeSwitcher.currentTheme">
+                <a-select-option v-for="(method, method_name) in SSMethods" :value="method">[[ method_name ]]</a-select-option>
+            </a-select>
+        </a-form-item>
+        <a-form-item label='UDP over TCP'>
+            <a-switch v-model="outbound.settings.uot"></a-switch>
+        </a-form-item>
   </template>
 </template>