diff --git a/sub/subService.go b/sub/subService.go
index 19ca21d9..b7edd7a1 100644
--- a/sub/subService.go
+++ b/sub/subService.go
@@ -825,7 +825,11 @@ func (s *SubService) genRemark(inbound *model.Inbound, email string, extra strin
'e': "",
'o': "",
}
- if len(email) > 0 {
+ emailInRemark, err := s.settingService.GetSubEmailInRemark()
+ if err != nil {
+ emailInRemark = true
+ }
+ if len(email) > 0 && emailInRemark {
orders['e'] = email
}
if len(inbound.Remark) > 0 {
diff --git a/web/assets/js/model/setting.js b/web/assets/js/model/setting.js
index d61d4b8e..aea63317 100644
--- a/web/assets/js/model/setting.js
+++ b/web/assets/js/model/setting.js
@@ -48,6 +48,7 @@ class AllSetting {
this.subUpdates = 12;
this.subEncrypt = true;
this.subShowInfo = true;
+ this.subEmailInRemark = true;
this.subURI = "";
this.subJsonURI = "";
this.subClashURI = "";
diff --git a/web/entity/entity.go b/web/entity/entity.go
index 7f37f564..d8a1279c 100644
--- a/web/entity/entity.go
+++ b/web/entity/entity.go
@@ -73,6 +73,7 @@ type AllSetting struct {
ExternalTrafficInformURI string `json:"externalTrafficInformURI" form:"externalTrafficInformURI"` // URI for external traffic reporting
SubEncrypt bool `json:"subEncrypt" form:"subEncrypt"` // Encrypt subscription responses
SubShowInfo bool `json:"subShowInfo" form:"subShowInfo"` // Show client information in subscriptions
+ SubEmailInRemark bool `json:"subEmailInRemark" form:"subEmailInRemark"` // Include email in subscription remark/name
SubURI string `json:"subURI" form:"subURI"` // Subscription server URI
SubJsonPath string `json:"subJsonPath" form:"subJsonPath"` // Path for JSON subscription endpoint
SubJsonURI string `json:"subJsonURI" form:"subJsonURI"` // JSON subscription server URI
diff --git a/web/html/settings/panel/subscription/general.html b/web/html/settings/panel/subscription/general.html
index 725a9359..d0842833 100644
--- a/web/html/settings/panel/subscription/general.html
+++ b/web/html/settings/panel/subscription/general.html
@@ -90,6 +90,14 @@
+
+ {{ i18n "pages.settings.subEmailInRemark"}}
+ {{ i18n
+ "pages.settings.subEmailInRemarkDesc"}}
+
+
+
+
{{ i18n "pages.xray.basicTemplate"}}
{{ i18n "pages.settings.subTitle"}}
diff --git a/web/service/setting.go b/web/service/setting.go
index 560dce3a..bfb11686 100644
--- a/web/service/setting.go
+++ b/web/service/setting.go
@@ -68,6 +68,7 @@ var defaultValueMap = map[string]string{
"subUpdates": "12",
"subEncrypt": "true",
"subShowInfo": "true",
+ "subEmailInRemark": "true",
"subURI": "",
"subJsonPath": "/json/",
"subJsonURI": "",
@@ -552,6 +553,10 @@ func (s *SettingService) GetSubShowInfo() (bool, error) {
return s.getBool("subShowInfo")
}
+func (s *SettingService) GetSubEmailInRemark() (bool, error) {
+ return s.getBool("subEmailInRemark")
+}
+
func (s *SettingService) GetPageSize() (int, error) {
return s.getInt("pageSize")
}
diff --git a/web/translation/translate.ar_EG.toml b/web/translation/translate.ar_EG.toml
index 2e76cf94..f31270e6 100644
--- a/web/translation/translate.ar_EG.toml
+++ b/web/translation/translate.ar_EG.toml
@@ -471,6 +471,8 @@
"subEncryptDesc" = "المحتوى اللي هيترجع من خدمة الاشتراك هيكون مشفر بـ Base64."
"subShowInfo" = "اظهر معلومات الاستخدام"
"subShowInfoDesc" = "هيظهر الترافيك المتبقي والتاريخ في تطبيقات العملاء."
+"subEmailInRemark" = "تضمين البريد الإلكتروني في الاسم"
+"subEmailInRemarkDesc" = "تضمين بريد العميل الإلكتروني في اسم ملف تعريف الاشتراك."
"subURI" = "مسار البروكسي العكسي"
"subURIDesc" = "مسار URI لرابط الاشتراك عشان تستخدمه ورا البروكسي."
"externalTrafficInformEnable" = "تنبيه الترافيك الخارجي"
diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml
index 49c9f952..a8843447 100644
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -471,6 +471,8 @@
"subEncryptDesc" = "The returned content of subscription service will be Base64 encoded."
"subShowInfo" = "Show Usage Info"
"subShowInfoDesc" = "The remaining traffic and date will be displayed in the client apps."
+"subEmailInRemark" = "Include Email in Name"
+"subEmailInRemarkDesc" = "Include the client email in the subscription profile name."
"subURI" = "Reverse Proxy URI"
"subURIDesc" = "The URI path of the subscription URL for use behind proxies."
"externalTrafficInformEnable" = "External Traffic Inform"
diff --git a/web/translation/translate.es_ES.toml b/web/translation/translate.es_ES.toml
index cce4018f..5839a497 100644
--- a/web/translation/translate.es_ES.toml
+++ b/web/translation/translate.es_ES.toml
@@ -470,7 +470,9 @@
"subEncrypt" = "Encriptar configuraciones"
"subEncryptDesc" = "Encriptar las configuraciones devueltas en la suscripción."
"subShowInfo" = "Mostrar información de uso"
-"subShowInfoDesc" = "Mostrar tráfico restante y fecha después del nombre de configuración."
+"subShowInfoDesc" = "Mostrar tráfico restante y fecha después del nombre de configuración."
+"subEmailInRemark" = "Incluir Email en el nombre"
+"subEmailInRemarkDesc" = "Incluir el correo del cliente en el nombre del perfil de suscripción."
"subURI" = "URI de proxy inverso"
"externalTrafficInformEnable" = "Informe de tráfico externo"
"externalTrafficInformEnableDesc" = "Informar a la API externa sobre cada actualización de tráfico."
diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml
index e1f49b80..995b16d7 100644
--- a/web/translation/translate.fa_IR.toml
+++ b/web/translation/translate.fa_IR.toml
@@ -471,6 +471,8 @@
"subEncryptDesc" = "کدگذاری خواهدشد Base64 محتوای برگشتی سرویس سابسکریپشن برپایه"
"subShowInfo" = "نمایش اطلاعات مصرف"
"subShowInfoDesc" = "ترافیک و زمان باقیمانده را در برنامههای کاربری نمایش میدهد"
+"subEmailInRemark" = "گنجاندن ایمیل در نام"
+"subEmailInRemarkDesc" = "ایمیل کاربر در نام پروفایل اشتراک گنجانده میشود."
"subURI" = "پروکسی معکوس URI مسیر"
"subURIDesc" = "سابسکریپشن را برای استفاده در پشت پراکسیها تغییر میدهد URI مسیر"
"externalTrafficInformEnable" = "اطلاع رسانی خارجی مصرف ترافیک"
diff --git a/web/translation/translate.id_ID.toml b/web/translation/translate.id_ID.toml
index f2ac71fc..d945dd75 100644
--- a/web/translation/translate.id_ID.toml
+++ b/web/translation/translate.id_ID.toml
@@ -471,6 +471,8 @@
"subEncryptDesc" = "Konten yang dikembalikan dari layanan langganan akan dienkripsi Base64."
"subShowInfo" = "Tampilkan Info Penggunaan"
"subShowInfoDesc" = "Sisa traffic dan tanggal akan ditampilkan di aplikasi klien."
+"subEmailInRemark" = "Sertakan Email dalam Nama"
+"subEmailInRemarkDesc" = "Sertakan email klien dalam nama profil langganan."
"subURI" = "URI Proxy Terbalik"
"subURIDesc" = "Path URI dari URL langganan untuk digunakan di belakang proxy."
"externalTrafficInformEnable" = "Informasikan API eksternal pada setiap pembaruan lalu lintas."
diff --git a/web/translation/translate.ja_JP.toml b/web/translation/translate.ja_JP.toml
index da67e758..e23a8467 100644
--- a/web/translation/translate.ja_JP.toml
+++ b/web/translation/translate.ja_JP.toml
@@ -471,6 +471,8 @@
"subEncryptDesc" = "サブスクリプションサービスが返す内容をBase64エンコードする"
"subShowInfo" = "利用情報を表示"
"subShowInfoDesc" = "クライアントアプリで残りのトラフィックと日付情報を表示する"
+"subEmailInRemark" = "名前にメールを含める"
+"subEmailInRemarkDesc" = "サブスクリプションプロファイル名にクライアントのメールアドレスを含めます。"
"subURI" = "リバースプロキシURI"
"subURIDesc" = "プロキシ後ろのサブスクリプションURLのURIパスに使用する"
"externalTrafficInformEnable" = "外部トラフィック情報"
diff --git a/web/translation/translate.pt_BR.toml b/web/translation/translate.pt_BR.toml
index 10a2b156..e38bbf19 100644
--- a/web/translation/translate.pt_BR.toml
+++ b/web/translation/translate.pt_BR.toml
@@ -471,6 +471,8 @@
"subEncryptDesc" = "O conteúdo retornado pelo serviço de assinatura será codificado em Base64."
"subShowInfo" = "Mostrar Informações de Uso"
"subShowInfoDesc" = "O tráfego restante e a data serão exibidos nos aplicativos de cliente."
+"subEmailInRemark" = "Incluir Email no nome"
+"subEmailInRemarkDesc" = "Incluir o email do cliente no nome do perfil de assinatura."
"subURI" = "URI de Proxy Reverso"
"subURIDesc" = "O caminho URI da URL de assinatura para uso por trás de proxies."
"externalTrafficInformEnable" = "Informações de tráfego externo"
diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml
index b3ec617d..ff185a8c 100644
--- a/web/translation/translate.ru_RU.toml
+++ b/web/translation/translate.ru_RU.toml
@@ -471,6 +471,8 @@
"subEncryptDesc" = "Шифровать возвращенные конфиги в подписке"
"subShowInfo" = "Показать информацию об использовании"
"subShowInfoDesc" = "Отображать остаток трафика и дату окончания после имени конфигурации"
+"subEmailInRemark" = "Включать Email в название"
+"subEmailInRemarkDesc" = "Включать email клиента в название профиля подписки."
"subURI" = "URI обратного прокси"
"subURIDesc" = "Изменить базовый URI URL-адреса подписки для использования за прокси-серверами"
"externalTrafficInformEnable" = "Информация о внешнем трафике"
diff --git a/web/translation/translate.tr_TR.toml b/web/translation/translate.tr_TR.toml
index 5aaa1b03..f52a35b9 100644
--- a/web/translation/translate.tr_TR.toml
+++ b/web/translation/translate.tr_TR.toml
@@ -471,6 +471,8 @@
"subEncryptDesc" = "Abonelik hizmetinin döndürülen içeriği Base64 ile şifrelenir."
"subShowInfo" = "Kullanım Bilgisini Göster"
"subShowInfoDesc" = "Kalan trafik ve tarih müşteri uygulamalarında görüntülenir."
+"subEmailInRemark" = "Ada Email Ekle"
+"subEmailInRemarkDesc" = "Abonelik profil adına istemcinin e-postasını dahil edin."
"subURI" = "Ters Proxy URI"
"subURIDesc" = "Proxy arkasında kullanılacak abonelik URL'sinin URI yolu."
"externalTrafficInformEnable" = "Harici Trafik Bilgisi"
diff --git a/web/translation/translate.uk_UA.toml b/web/translation/translate.uk_UA.toml
index b83122c9..2734bccf 100644
--- a/web/translation/translate.uk_UA.toml
+++ b/web/translation/translate.uk_UA.toml
@@ -471,6 +471,8 @@
"subEncryptDesc" = "Повернений вміст послуги підписки матиме кодування Base64."
"subShowInfo" = "Показати інформацію про використання"
"subShowInfoDesc" = "Залишок трафіку та дата відображатимуться в клієнтських програмах."
+"subEmailInRemark" = "Включати Email до назви"
+"subEmailInRemarkDesc" = "Включати email клієнта до назви профілю підписки."
"subURI" = "URI зворотного проксі"
"subURIDesc" = "URI до URL-адреси підписки для використання за проксі."
"externalTrafficInformEnable" = "Інформація про зовнішній трафік"
diff --git a/web/translation/translate.vi_VN.toml b/web/translation/translate.vi_VN.toml
index 3d836b33..a5e87444 100644
--- a/web/translation/translate.vi_VN.toml
+++ b/web/translation/translate.vi_VN.toml
@@ -470,7 +470,9 @@
"subEncrypt" = "Mã hóa cấu hình"
"subEncryptDesc" = "Mã hóa các cấu hình được trả về trong gói đăng ký"
"subShowInfo" = "Hiển thị thông tin sử dụng"
-"subShowInfoDesc" = "Hiển thị lưu lượng truy cập còn lại và ngày sau tên cấu hình"
+"subShowInfoDesc" = "Hiển thị lưu lượng truy cập còn lại và ngày sau tên cấu hình"
+"subEmailInRemark" = "Thêm Email vào tên"
+"subEmailInRemarkDesc" = "Thêm email của client vào tên hồ sơ đăng ký."
"subURI" = "URI proxy trung gian"
"subURIDesc" = "Thay đổi URI cơ sở của URL gói đăng ký để sử dụng cho proxy trung gian"
"externalTrafficInformEnable" = "Thông báo giao thông bên ngoài"
diff --git a/web/translation/translate.zh_CN.toml b/web/translation/translate.zh_CN.toml
index 57c23eac..d111076b 100644
--- a/web/translation/translate.zh_CN.toml
+++ b/web/translation/translate.zh_CN.toml
@@ -471,6 +471,8 @@
"subEncryptDesc" = "订阅服务返回的内容将采用 Base64 编码"
"subShowInfo" = "显示使用信息"
"subShowInfoDesc" = "客户端应用中将显示剩余流量和日期信息"
+"subEmailInRemark" = "在名称中包含邮箱"
+"subEmailInRemarkDesc" = "在订阅配置名称中包含客户端邮箱。"
"subURI" = "反向代理 URI"
"subURIDesc" = "用于代理后面的订阅 URL 的 URI 路径"
"externalTrafficInformEnable" = "外部交通通知"
diff --git a/web/translation/translate.zh_TW.toml b/web/translation/translate.zh_TW.toml
index 69e5164c..9114ea2a 100644
--- a/web/translation/translate.zh_TW.toml
+++ b/web/translation/translate.zh_TW.toml
@@ -471,6 +471,8 @@
"subEncryptDesc" = "訂閱服務返回的內容將採用 Base64 編碼"
"subShowInfo" = "顯示使用資訊"
"subShowInfoDesc" = "客戶端應用中將顯示剩餘流量和日期資訊"
+"subEmailInRemark" = "在名稱中包含郵箱"
+"subEmailInRemarkDesc" = "在訂閱配置名稱中包含客戶端郵箱。"
"subURI" = "反向代理 URI"
"subURIDesc" = "用於代理後面的訂閱 URL 的 URI 路徑"
"externalTrafficInformEnable" = "外部交通通知"