np/oc the domain is preserved when transferring

This reverts commit fb22744fa7.

app/bot.php

@@ -755,11 +755,11 @@ class Bot
             'download' => 0,
             'upload'   => 0,
         ];
-        foreach ($p['clients'] as $k => $v) {
-            $p['clients'][$k]['global']['download']  += $v['session']['download'];
-            $p['clients'][$k]['session']['download']  = 0;
-            $p['clients'][$k]['global']['upload']    += $v['session']['upload'];
-            $p['clients'][$k]['session']['upload']    = 0;
+        foreach ($p['users'] as $k => $v) {
+            $p['users'][$k]['global']['download']  += $v['session']['download'];
+            $p['users'][$k]['session']['download']  = 0;
+            $p['users'][$k]['global']['upload']    += $v['session']['upload'];
+            $p['users'][$k]['session']['upload']    = 0;
         }
         $this->setXrayStats($p);
     }
@@ -993,7 +993,7 @@ class Bot
     {
         $r = $this->send(
             $this->input['chat'],
-            "@{$this->input['username']} enter pass",
+            "@{$this->input['username']} enter password",
             $this->input['message_id'],
             reply: 'enter password',
         );
@@ -1011,7 +1011,7 @@ class Bot
             $this->input['chat'],
             "@{$this->input['username']} enter name",
             $this->input['message_id'],
-            reply: 'enter password',
+            reply: 'enter name',
         );
         $_SESSION['reply'][$r['result']['message_id']] = [
             'start_message'  => $this->input['message_id'],
@@ -1357,14 +1357,22 @@ class Bot
                 'upload'   => $tu,
             ];
             if (!empty($users = $x['inbounds'][0]['settings']['clients'])) {
+                $tmp = [];
                 foreach ($users as $k => $v) {
                     $d = json_decode($this->ssh('xray api stats --server=127.0.0.1:8080 -name "user>>>' . $v['email'] . '>>>traffic>>>downlink" 2>&1', 'xr'), true)['stat']['value'] ?: 0;
                     $u = json_decode($this->ssh('xray api stats --server=127.0.0.1:8080 -name "user>>>' . $v['email'] . '>>>traffic>>>uplink" 2>&1', 'xr'), true)['stat']['value'] ?: 0;
-                    $p['users'][$k]['session'] = [
-                        'download' => $d,
-                        'upload'   => $u,
+                    $tmp[$k] = [
+                        'session' => [
+                            'download' => $d,
+                            'upload'   => $u,
+                        ],
+                        'global' => [
+                            'download' => $p['users'][$k]['global']['download'],
+                            'upload'   => $p['users'][$k]['global']['upload'],
+                        ]
                     ];
                 }
+                $p['users'] = $tmp;
             }
             $this->setXrayStats($p);
         } catch (\Throwable $th) {
@@ -5304,10 +5312,13 @@ DNS-over-HTTPS with IP:
 
     public function delxr($i)
     {
-        $r = $this->getXray();
+        $r  = $this->getXray();
+        $st = $this->getXrayStats();
         foreach ($r['inbounds'][0]['settings']['clients'] as $k => $v) {
             if ($i == $k) {
                 unset($r['inbounds'][0]['settings']['clients'][$k]);
+                unset($st['users'][$k]);
+                $this->setXrayStats($st);
                 $this->restartXray($r);
                 $this->adguardXrayClients();
                 break;
@@ -5415,10 +5426,7 @@ DNS-over-HTTPS with IP:
     public function resetXrUser($i)
     {
         $c = $this->getXrayStats();
-        $c['clients'][$i]['global'] = [
-            'download' => 0,
-            'upload'   => 0,
-        ];
+        unset($c['users'][$i]);
         $this->restartXray($this->getXray());
         $this->userXr($i);
     }
@@ -5751,7 +5759,6 @@ DNS-over-HTTPS with IP:
                 'callback_data' => '/addLinkDomain',
             ],
         ];
-        $ip_count = $p['ip_count'] ?: 1;
         $data[] = [
             [
                 'text'          => $this->i18n('Reality') . ' ' . ($p['transport'] == 'Reality' ? $this->i18n('on') : $this->i18n('off')),
@@ -5761,6 +5768,9 @@ DNS-over-HTTPS with IP:
                 'text'          => $this->i18n('Websocket') . ' ' . ($p['transport'] != 'Reality' ? $this->i18n('on') : $this->i18n('off')),
                 'callback_data' => "/changeTransport 1",
             ],
+        ];
+        $ip_count = $p['ip_count'] ?: 1;
+        $data[] = [
             [
                 'text'          => $this->i18n('ip limit') . ' ' . ($p['ip_limit'] ? ": {$p['ip_limit']} sec & $ip_count" : $this->i18n('off')),
                 'callback_data' => "/setIpLimit",
@@ -6010,8 +6020,8 @@ DNS-over-HTTPS with IP:
                 foreach ($xr['inbounds'][0]['settings']['clients'] as $k => $v) {
                     if (empty($v['off']) && $v['email'] == $m['email']) {
                         require __DIR__ . '/config.php';
-                        foreach ($c['admin'] as $k => $v) {
-                            $this->send($v, "vless: {$m['email']} is turned off (limit by one IP)");
+                        foreach ($c['admin'] as $admin) {
+                            $this->send($admin, "vless: {$m['email']} is turned off (limit by one IP)");
                         }
                         unset($this->pool[$m['email']]);
                         $this->switchXr($k, 1);
@@ -6644,7 +6654,7 @@ DNS-over-HTTPS with IP:
         if (!empty($route['rules'])) {
             foreach ($route['rules'] as $k => $v) {
                 if (!empty($v['addruleset'])) {
-                    $t[$v['outbound']] = $k;
+                    $t[$v['outbound'] ?: 'block'] = $k;
                 }
             }
             $p = $this->getPacConf();
@@ -6845,7 +6855,13 @@ DNS-over-HTTPS with IP:
 
     public function getHashSubdomain($subdomain)
     {
-        return $this->getPacConf()["{$subdomain}_domain"] ?: substr(hash('sha256', "$subdomain{$this->key}"), 0, 8);
+        $p = $this->getPacConf();
+        if (!empty($p["{$subdomain}_domain"])) {
+            return $p["{$subdomain}_domain"];
+        }
+        $p["{$subdomain}_domain"] = substr(hash('sha256', "$subdomain{$this->key}"), 0, 8);
+        $this->setPacConf($p);
+        return $p["{$subdomain}_domain"];
     }
 
     public function addWg($page)

version

@@ -1,3 +1,8 @@
+02.03.2025 v2.14
+- vless ip limit: фикс выключения юзера
+22.02.2025 v2.13
+- vless: улучшение сбора статы
+- vless: фикс добавления правил srs для block outbound
 11.02.2025 v2.12
 - vless: хранение статы в отдельном файле
 - vless ip limit: возможность указать кол-во айпи