diff options
| author | mohammadmovaghari <52345697+mohammadmovaghari@users.noreply.github.com> | 2023-04-04 16:43:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-04 16:43:46 +0300 |
| commit | 5be9131078d0d30ea02bb847cc0835b36d1fc102 (patch) | |
| tree | ca3b769f274d43584e1e4c6b9e638b1dc178b593 /web/html | |
| parent | 87acb81496fd2aacb282460e95da05a89dc9a0e1 (diff) | |
| parent | 0e5de1aec8f3b090fce14638d7e0030ff7b7f40f (diff) | |
Merge pull request #1 from MHSanaei/main
update with main
Diffstat (limited to 'web/html')
| -rw-r--r-- | web/html/login.html | 10 | ||||
| -rw-r--r-- | web/html/xui/setting.html | 6 |
2 files changed, 6 insertions, 10 deletions
diff --git a/web/html/login.html b/web/html/login.html index 5138f15e..4218793c 100644 --- a/web/html/login.html +++ b/web/html/login.html @@ -63,25 +63,21 @@ <a-form-item> <a-row justify="center" class="selectLang"> - <a-col :span="4"><span>Language : </span></a-col> + <a-col :span="5"><span>Language :</span></a-col> - <a-col :span="6"> + <a-col :span="7"> <a-select ref="selectLang" v-model="lang" @change="setLang(lang)" > - <a-select-option :value="l.value" label="China" v-for="l in supportLangs" > + <a-select-option :value="l.value" label="English" v-for="l in supportLangs" > <span role="img" aria-label="l.name" v-text="l.icon"></span> <span v-text="l.name"></span> </a-select-option> </a-select> </a-col> - </a-row> - - - </a-form-item> </a-form> </a-col> diff --git a/web/html/xui/setting.html b/web/html/xui/setting.html index 7acab065..b4a974eb 100644 --- a/web/html/xui/setting.html +++ b/web/html/xui/setting.html @@ -345,7 +345,7 @@ if(this.templateSettings != null){ this.templateSettings.routing.rules.forEach(routingRule => { if(routingRule.hasOwnProperty("domain")){ - if (routingRule.domain[0] === "regexp:.+.ir$" && routingRule.outboundTag == "blocked"){ + if ((routingRule.domain[0] === "regexp:.+.ir$" || routingRule.domain[0] === "ext:iran.dat:ir" || routingRule.domain[0] === "ext:iran.dat:other") && routingRule.outboundTag == "blocked") { localdomainFilter = true } } @@ -356,13 +356,13 @@ set: function (newValue) { newTemplateSettings = JSON.parse(this.allSetting.xrayTemplateConfig); if (newValue){ - newTemplateSettings.routing.rules.push(JSON.parse("{\"outboundTag\": \"blocked\",\"domain\": [\"regexp:.+.ir$\"],\"type\": \"field\"}")) + newTemplateSettings.routing.rules.push(JSON.parse("{\"outboundTag\": \"blocked\",\"domain\": [\"regexp:.+.ir$\", \"ext:iran.dat:ir\", \"ext:iran.dat:other\"],\"type\": \"field\"}")) } else { newTemplateSettings.routing.rules = []; this.templateSettings.routing.rules.forEach(routingRule => { if (routingRule.hasOwnProperty('domain')){ - if (routingRule.domain[0] === "regexp:.+.ir$" && routingRule.outboundTag == "blocked"){ + if ((routingRule.domain[0] === "regexp:.+.ir$" || routingRule.domain[0] === "ext:iran.dat:ir" || routingRule.domain[0] === "ext:iran.dat:other") && routingRule.outboundTag == "blocked"){ return; } } |