improve name for subscription

app/bot.php

@@ -3767,13 +3767,14 @@ DNS-over-HTTPS with IP:
     public function userXr($i, $fs = 0, $fv = 0)
     {
         $c         = $this->getXray();
-        $domain    = $this->getPacConf()['domain'] ?: $this->ip;
+        $pac       = $this->getPacConf() ?: $this->ip;
+        $domain    = $pac['domain'] ?: $this->ip;
         $scheme    = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
         $hash      = substr(md5($this->key), 0, 8);
         $v2ray     = "$scheme://{$domain}/pac?h=$hash&t=s&b=1&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}";
         $sing      = "$scheme://{$domain}/pac?h=$hash&t=si&b=1&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}";
-        $fullsing  = 'sing-box://import-remote-profile/?url=' . urlencode("$scheme://{$domain}/pac?h=$hash&t=si&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}") . "#vpnbot$i";
-        $fullv2ray = 'v2rayng://install-config?url=' . urlencode("$scheme://{$domain}/pac?h=$hash&t=s&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}") . "#vpnbot$i";
+        $fullsing  = 'sing-box://import-remote-profile/?url=' . urlencode("$scheme://{$domain}/pac?h=$hash&t=si&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}") . "#{$c['inbounds'][0]['settings']['clients'][$i]['email']}";
+        $fullv2ray = 'v2rayng://install-config?url=' . urlencode("$scheme://{$domain}/pac?h=$hash&t=s&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}") . "#{$c['inbounds'][0]['settings']['clients'][$i]['email']}";
         if (!empty($fs)) {
             return $fullsing;
         }
@@ -3796,10 +3797,10 @@ DNS-over-HTTPS with IP:
                 'callback_data' => "/switchXr $i",
             ],
         ];
-        $template = $c['inbounds'][0]['settings']['clients'][$i]['template'] ? base64_decode($c['inbounds'][0]['settings']['clients'][$i]['template']) : 'default';
+        $template = $c['inbounds'][0]['settings']['clients'][$i]['template'] ? base64_decode($c['inbounds'][0]['settings']['clients'][$i]['template']) : 'default(' . ($pac['defaulttemplate'] ? base64_decode($pac['defaulttemplate']) : 'origin') . ')';
         $data[] = [
             [
-                'text'          => $this->i18n('template') . ": $template",
+                'text'          => $this->i18n('template singbox') . ": $template",
                 'callback_data' => "/templateUser $i",
             ],
         ];

version

@@ -1,3 +1,7 @@
+12.04.2024 v1.26
+- имя клиента xtls подтягивается по подписке из бота
+11.04.2024 v1.25
+- подпись дефолтного шаблона в разделе пользователя xtls
 11.04.2024 v1.24
 - обновлен раздел PAC, добавлена возможность добавить домены из https://community.antifilter.download/
 11.04.2024 v1.23