update version

directly in telegram

.gitignore

@@ -20,4 +20,5 @@ update/*
 !update/update.sh
 
 override.env
-override.html
+override.html
+override.php

app/bot.php

@@ -142,9 +142,18 @@ class Bot
             case preg_match('~^/autoupdate$~', $this->input['message'], $m):
                 $this->autoupdate();
                 break;
+            case preg_match('~^/adgFillAllowedClients(?: (\d+))?$~', $this->input['callback'], $m):
+                $this->adgFillAllowedClients($m[1] ?: false);
+                break;
             case preg_match('~^/appOutbound$~', $this->input['callback'], $m):
                 $this->appOutbound();
                 break;
+            case preg_match('~^/domainsOutbound$~', $this->input['callback'], $m):
+                $this->domainsOutbound();
+                break;
+            case preg_match('~^/finalOutbound$~', $this->input['callback'], $m):
+                $this->finalOutbound();
+                break;
             case preg_match('~^/processOutbound$~', $this->input['callback'], $m):
                 $this->processOutbound();
                 break;
@@ -286,9 +295,6 @@ class Bot
             case preg_match('~^/checkdns$~', $this->input['callback'], $m):
                 $this->checkdns();
                 break;
-            case preg_match('~^/resetnginx$~', $this->input['callback'], $m):
-                $this->resetnginx();
-                break;
             case preg_match('~^/adguardpsswd$~', $this->input['callback'], $m):
                 $this->adguardpsswd();
                 break;
@@ -398,6 +404,9 @@ class Bot
             case preg_match('~^/deldomain$~', $this->input['callback'], $m):
                 $this->delDomain();
                 break;
+            case preg_match('~^/addNipdomain$~', $this->input['callback'], $m):
+                $this->addNipdomain();
+                break;
             case preg_match('~^/(?P<action>change|delete)(?P<typelist>\w+) (?P<arg>\d+)$~', $this->input['callback'], $m):
                 $this->listPacChange($m['typelist'], $m['action'], $m['arg']);
                 break;
@@ -434,6 +443,9 @@ class Bot
             case preg_match('~^/xtlswarp(?: (\d+))?$~', $this->input['callback'], $m):
                 $this->xtlswarp($m[1] ?: 0);
                 break;
+            case preg_match('~^/xtlsproxy(?: (\d+))?$~', $this->input['callback'], $m):
+                $this->xtlsproxy($m[1] ?: 0);
+                break;
             case preg_match('~^/xtlsapp(?: (\d+))?$~', $this->input['callback'], $m):
                 $this->xtlsapp($m[1] ?: 0);
                 break;
@@ -443,9 +455,15 @@ class Bot
             case preg_match('~^/xtlsrulesset(?: (\d+))?$~', $this->input['callback'], $m):
                 $this->xtlsrulesset($m[1] ?: 0);
                 break;
+            case preg_match('~^/templateCopy (\w+)(?: (.+))?$~', $this->input['callback'], $m):
+                $this->templateCopy($m[1], $m[2]);
+                break;
             case preg_match('~^/delTemplate (\w+)(?: (.+))?$~', $this->input['callback'], $m):
                 $this->delTemplate($m[1], $m[2]);
                 break;
+            case preg_match('~^/downloadOrigin (\w+)$~', $this->input['callback'], $m):
+                $this->downloadOrigin($m[1]);
+                break;
             case preg_match('~^/downloadTemplate (\w+)(?: (.+))?$~', $this->input['callback'], $m):
                 $this->downloadTemplate($m[1], $m[2]);
                 break;
@@ -1063,25 +1081,32 @@ class Bot
 
     public function cron()
     {
+        $period = 10;
         while (true) {
             $this->shutdownClient();
             $this->shutdownClientXr();
             $this->checkVersion();
-            $this->checkBackup();
+            $this->checkBackup($period);
             $this->checkCert();
-            sleep(10);
+            sleep($period);
         }
     }
 
-    public function checkBackup()
+    public function checkBackup($delta)
     {
         $c   = $this->getPacConf();
-        $now = strtotime(date('Y-m-d H:i'));
         if (!empty($c['backup'])) {
+            $now = strtotime(date('Y-m-d H:i:s'));
             [$start, $period] = explode('/', $c['backup']);
-            $start  = strtotime($start);
-            $period = strtotime($period, 0);
-            if ($now - $start >= $period && ($now - $start) % $period == 0) {
+            $start  = strtotime(trim($start));
+            $period = strtotime(trim($period), 0);
+            if (
+                !empty($start)
+                && !empty($period)
+                && empty($this->backup)
+                && $now - $start >= 0
+                && (($now - $start) % $period < $delta)
+            ) {
                 if (!empty($c['pinbackup'])) {
                     $this->pinAdmin($c['pinbackup'], 1);
                 }
@@ -1090,6 +1115,12 @@ class Bot
         }
     }
 
+    public function cleanQueue(): void
+    {
+        $r = $this->request('deleteWebhook', []);
+        $r = $this->request('getUpdates', ['offset' => -1]);
+    }
+
     public function pinAdmin($pin, $unpin = false)
     {
         require __DIR__ . '/config.php';
@@ -1104,9 +1135,8 @@ class Bot
     {
         require __DIR__ . '/config.php';
         $conf              = $this->getPacConf();
-        $bot               = $this->request('getMyName', [])['result']['name'];
+        $bot               = preg_replace('~[\W]~iu', '_', $this->request('getMyName', [])['result']['name']);
         $conf['pinbackup'] = $this->upload("{$bot}_export_" . date('d_m_Y_H_i') . '.json', $this->export(), $c['admin'][0])['result']['message_id'];
-        $conf['backup']    = implode(' / ', [date('Y-m-d H:i'), trim(explode('/', $conf['backup'])[1])]);
         $this->setPacConf($conf);
         $this->pinAdmin($conf['pinbackup']);
     }
@@ -1296,7 +1326,7 @@ class Bot
         if (!empty($file)) {
             file_put_contents($file, $json);
         }
-        $bot = $this->request('getMyName', [])['result']['name'];
+        $bot = preg_replace('~[\W]~iu', '_', $this->request('getMyName', [])['result']['name']);
         return $this->upload("{$bot}_export_" . date('d_m_Y_H_i') . '.json', $json);
     }
 
@@ -1448,8 +1478,10 @@ class Bot
             $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
             $this->language = $this->getPacConf()['language'] ?: 'en';
             $this->limit    = $this->getPacConf()['limitpage'] ?: 5;
-            sleep(3);
-            $this->menu();
+            if (empty($file)) {
+                sleep(3);
+                $this->menu();
+            }
         }
     }
 
@@ -1745,6 +1777,11 @@ class Bot
         }
     }
 
+    public function addNipdomain()
+    {
+        $this->addDomain(str_replace('.', '-', $this->ip) . '.nip.io');
+    }
+
     public function addDomain($domain, $nomenu = false)
     {
         $domain = trim($domain);
@@ -1785,11 +1822,19 @@ class Bot
 
     public function sslip()
     {
-        $c = $this->getPacConf();
-        if (empty($c['domain'])) {
+        require __DIR__ . '/config.php';
+        $p  = $this->getPacConf();
+        $ip = getenv('IP');
+        $r  = $this->send($c['admin'][0], "start $ip");
+
+        $this->input['chat']        = $c['admin'][0];
+        $this->input['message_id']  = $r['result']['message_id'];
+        $this->input['callback_id'] = false;
+        if (empty($p)) {
             $this->addDomain(str_replace('.', '-', $this->ip) . '.nip.io', 1);
             $this->setSSL('letsencrypt');
         }
+        $this->menu();
     }
 
     public function comment($text, $tag)
@@ -2031,25 +2076,20 @@ class Bot
         ];
     }
 
-    public function resetnginx()
+    public function adguardSync()
     {
-        $nginx   = file_get_contents('/config/nginx.conf');
-        $default = file_get_contents('/config/nginx_default.conf');
-        file_put_contents('/config/nginx.conf', $default);
-        $u = $this->ssh("nginx -t 2>&1", 'ng');
-        $out[] = $u;
-        $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
-        if (preg_match('~test is successful~', $u)) {
-            $out[] = $this->ssh("nginx -s reload 2>&1", 'ng');
-            $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
-            $conf = $this->getPacConf();
-            unset($conf['domain']);
-            $this->setPacConf($conf);
-        } else {
-            file_put_contents('/config/nginx.conf', $nginx);
+        $pac = $this->getPacConf();
+        $ssl = $this->nginxGetTypeCert();
+        $c   = yaml_parse_file($this->adguard);
+        $this->stopAd();
+        $c['users'][0]['password'] = $pac['adpswd'] ?: password_hash(substr(hash('md5', time()), 0, 10), PASSWORD_DEFAULT);
+        if (!empty($ssl) && !empty($pac['domain']) && empty($c['tls']['enabled'])) {
+            $c['tls']['enabled']     = true;
+            $c['tls']['server_name'] = $pac['domain'];
         }
-        sleep(5);
-        $this->menu('config');
+        yaml_emit_file($this->adguard, $c);
+        $this->startAd();
+        $this->adguardProtect();
     }
 
     public function adguardpsswd()
@@ -2220,7 +2260,12 @@ class Bot
         $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
         $out[] = $this->stopAd();
         $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
-        $this->adguardChangePswd($pass);
+        $c = yaml_parse_file($this->adguard);
+        $c['users'][0]['password'] = password_hash($pass, PASSWORD_DEFAULT);
+        yaml_emit_file($this->adguard, $c);
+        $p = $this->getPacConf();
+        $p['adpswd'] = $pass;
+        $this->setPacConf($p);
         $out[] = $this->startAd();
         $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
         sleep(3);
@@ -2231,12 +2276,8 @@ class Bot
     {
         $out[] = 'Restart Adguard Home';
         $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
-        $out[] = $this->stopAd();
-        $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
-        $c = yaml_parse_file($this->adguard);
-        yaml_emit_file($this->adguard, $c);
-        $out[] = $this->startAd();
-        $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
+        exec('git -C / checkout config/AdGuardHome.yaml');
+        $this->adguardSync();
         sleep(3);
         $this->menu('adguard');
     }
@@ -2445,7 +2486,10 @@ DNS-over-HTTPS with IP:
     {
         switch ($type) {
             case 'includelist':
-                $this->pacUpdate();
+                $this->pacUpdate($_SESSION['proxylistentry']);
+                if (!empty($_SESSION['proxylistentry'])) {
+                    $this->xtlsproxy();
+                }
                 break;
             case 'blocklist':
                 $this->xrayUpdateRules();
@@ -3325,6 +3369,7 @@ DNS-over-HTTPS with IP:
 
     public function pacMenu($page = 0)
     {
+        unset($_SESSION['proxylistentry']);
         $rmpac  = stat(__DIR__ . '/zapretlists/rmpac');
         $rpac   = stat(__DIR__ . '/zapretlists/rpac');
         $mpac   = stat(__DIR__ . '/zapretlists/mpac');
@@ -3405,7 +3450,7 @@ DNS-over-HTTPS with IP:
                 'callback_data' => "/addCommunityFilter",
             ],
         ];
-        $data   = array_merge($data, $this->listPac('includelist', $page, 'pacMenu'));
+        $data   = array_merge($data, $this->listPac('includelist', $page, 'pacMenu')[0]);
         $data[] = [
             [
                 'text'          => $this->i18n('back'),
@@ -3544,7 +3589,7 @@ DNS-over-HTTPS with IP:
     {
         $text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> block list';
 
-        $data   = $this->listPac('blocklist', $page, 'xtlsblock');
+        [$data] = $this->listPac('blocklist', $page, 'xtlsblock');
         $data[] = [
             [
                 'text'          => $this->i18n('back'),
@@ -3563,7 +3608,33 @@ DNS-over-HTTPS with IP:
     {
         $text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> warp list';
 
-        $data   = $this->listPac('warplist', $page, 'xtlswarp');
+        [$data] = $this->listPac('warplist', $page, 'xtlswarp');
+        $data[] = [
+            [
+                'text'          => $this->i18n('back'),
+                'callback_data' => "/routes",
+            ],
+        ];
+        $this->update(
+            $this->input['chat'],
+            $this->input['message_id'],
+            implode("\n", $text ?: ['...']),
+            $data ?: false,
+        );
+    }
+
+    public function xtlsproxy($page = 0)
+    {
+        $_SESSION['proxylistentry'] = 1;
+        $p = $this->getPacConf();
+        $text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> proxy list';
+        [$data] = $this->listPac('includelist', $page, 'xtlsproxy');
+        $data[] = [
+            [
+                'text'          => 'set to ' . ($p['domains_outbound'] ? 'proxy' : 'direct'),
+                'callback_data' => "/domainsOutbound",
+            ],
+        ];
         $data[] = [
             [
                 'text'          => $this->i18n('back'),
@@ -3586,6 +3657,22 @@ DNS-over-HTTPS with IP:
         $this->xtlsapp();
     }
 
+    public function domainsOutbound()
+    {
+        $p = $this->getPacConf();
+        $p['domains_outbound'] = !$p['domains_outbound'];
+        $p = $this->setPacConf($p);
+        $this->xtlsproxy();
+    }
+
+    public function finalOutbound()
+    {
+        $p = $this->getPacConf();
+        $p['final_outbound'] = !$p['final_outbound'];
+        $p = $this->setPacConf($p);
+        $this->routes();
+    }
+
     public function processOutbound()
     {
         $p = $this->getPacConf();
@@ -3598,7 +3685,7 @@ DNS-over-HTTPS with IP:
     {
         $text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> package list';
 
-        $data   = $this->listPac('packagelist', $page, 'xtlsapp');
+        [$data] = $this->listPac('packagelist', $page, 'xtlsapp');
         $p      = $this->getPacConf();
         $data[] = [
             [
@@ -3624,7 +3711,7 @@ DNS-over-HTTPS with IP:
     {
         $text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> process list';
 
-        $data   = $this->listPac('processlist', $page, 'xtlsprocess');
+        [$data] = $this->listPac('processlist', $page, 'xtlsprocess');
         $p      = $this->getPacConf();
         $data[] = [
             [
@@ -3650,7 +3737,8 @@ DNS-over-HTTPS with IP:
     {
         $text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> rulesset list';
 
-        $data   = $this->listPac('rulessetlist', $page, 'xtlsrulesset', 1);
+        [$data, $tmp] = $this->listPac('rulessetlist', $page, 'xtlsrulesset', 1);
+        $text = array_merge($text, $tmp ?: []);
         $data[] = [
             [
                 'text'          => $this->i18n('back'),
@@ -3681,6 +3769,9 @@ DNS-over-HTTPS with IP:
             $domains = array_slice($domains, $page * $this->limit, $this->limit, true);
             $i = 0;
             foreach ($domains as $k => $v) {
+                if ($type == 'rulessetlist') {
+                    $text[] = "<blockquote><code>$k</code></blockquote>";
+                }
                 $data[] = [
                     [
                         'text'          => $this->i18n($v ? 'on' : 'off') . ' ' . ($basename ? basename($k) . ' ' : '') . (in_array($type, ['rulessetlist', 'packagelist', 'processlist']) ? $k : idn_to_utf8($k)),
@@ -3727,7 +3818,7 @@ DNS-over-HTTPS with IP:
                 ],
             ];
         }
-        return $data;
+        return [$data, $text];
     }
 
     public function listPacChange($type, $action, $key)
@@ -3843,9 +3934,10 @@ DNS-over-HTTPS with IP:
     public function menu($type = false, $arg = false, $return = false)
     {
         $domain = $this->getPacConf()['domain'] ?: $this->ip;
+        $cron   = exec('pgrep -f cron.php');
         $menu   = [
             'main' => [
-                'text' => 'v' . getenv('VER'),
+                'text' => 'v' . getenv('VER') . ($this->dontshowcron ? '' : "\ncron: " . $this->i18n($cron ? 'on' : 'off') . ($cron ? '' : ' show <code>logs/php_error</code>')),
                 'data' => [
                     [
                         [
@@ -4137,7 +4229,7 @@ DNS-over-HTTPS with IP:
         $expose = $m[1];
         $pass   = htmlspecialchars($pac['ocserv']);
         $text[] = "Menu -> OpenConnect";
-        if (!empty($m[1])) {
+        if (!empty($cs)) {
             $text[] = "<code>https://oc.$domain/?$cs</code>";
         }
         $text[] = "password: <span class='tg-spoiler'>$pass</span>";
@@ -4325,6 +4417,22 @@ DNS-over-HTTPS with IP:
         ];
     }
 
+    public function templateCopy($type)
+    {
+        $r = $this->send(
+            $this->input['chat'],
+            "@{$this->input['username']} send the template name",
+            $this->input['message_id'],
+            reply: 'send the template name',
+        );
+        $_SESSION['reply'][$r['result']['message_id']] = [
+            'start_message'  => $this->input['message_id'],
+            'start_callback' => $this->input['callback_id'],
+            'callback'       => 'copyTemplate',
+            'args'           => [$type],
+        ];
+    }
+
     public function addTemplate($n, $type)
     {
         if (empty($this->input['caption'])) {
@@ -4343,6 +4451,30 @@ DNS-over-HTTPS with IP:
         $this->templates($type);
     }
 
+    public function saveTemplate($name, $type, $json)
+    {
+        if (json_decode($json, true) === false) {
+            return [
+                'status'  => false,
+                'message' => 'wrong format',
+            ];
+        }
+        $pac = $this->getPacConf();
+        switch ($name) {
+            case 'origin':
+                file_put_contents("/config/$type.json", $json);
+                break;
+
+            default:
+                $pac["{$type}templates"][$name] = json_decode($json, true);
+                break;
+        }
+        $this->setPacConf($pac);
+        return [
+            'status' => true,
+        ];
+    }
+
     public function delTemplate($type, $name)
     {
         $pac = $this->getPacConf();
@@ -4351,6 +4483,27 @@ DNS-over-HTTPS with IP:
         $this->templates($type);
     }
 
+    public function copyTemplate($name, $type)
+    {
+        $pac  = $this->getPacConf();
+        $pac["{$type}templates"][$name] = json_decode(file_get_contents("/config/$type.json"), true);
+        $this->setPacConf($pac);
+        $this->templates($type);
+    }
+
+    public function downloadOrigin($type)
+    {
+        switch ($type) {
+            case 'sing':
+                $f = new \CURLFile('/config/sing.json', 'application/json', 'origin.json');
+                break;
+            case 'v2ray':
+                $f = new \CURLFile('/config/v2ray.json', 'application/json', 'origin.json');
+                break;
+        }
+        $this->sendFile($this->input['chat'], $f);
+    }
+
     public function downloadTemplate($type, $name)
     {
         $pac = $this->getPacConf();
@@ -4389,6 +4542,14 @@ DNS-over-HTTPS with IP:
                 'text'          => "origin",
                 'web_app' => ['url' => "https://$domain/pac?h=$hash&t=te&ty=$type"],
             ],
+            [
+                'text'          => $this->i18n('download'),
+                'callback_data' => "/downloadOrigin $type",
+            ],
+            [
+                'text'          => $this->i18n('copy'),
+                'callback_data' => "/templateCopy $type",
+            ],
             [
                 'text'          => $this->i18n($pac["default{$type}template"] && !empty($pac["{$type}templates"][base64_decode($pac["default{$type}template"])]) ? 'off' : 'on'),
                 'callback_data' => "/defaultTemplate $type",
@@ -4397,7 +4558,7 @@ DNS-over-HTTPS with IP:
         foreach ($templates as $k => $v) {
             $data[] = [
                 [
-                    'text'          => "$k",
+                    'text'          => $k,
                     'web_app' => ['url' => "https://$domain/pac?h=$hash&t=te&ty=$type&te=" . urlencode($k)],
                 ],
                 [
@@ -4554,6 +4715,8 @@ DNS-over-HTTPS with IP:
     {
         $text[] = "Menu -> " . $this->i18n('xray') . ' -> routes';
 
+        $p = $this->getPacConf();
+
         $data = [
             [[
                 'text'          => $this->i18n('block'),
@@ -4564,16 +4727,24 @@ DNS-over-HTTPS with IP:
                 'callback_data' => "/xtlswarp",
             ]],
             [[
-                'text'          => $this->i18n('process'),
+                'text'          => $this->i18n('rulesset'),
+                'callback_data' => "/xtlsrulesset",
+            ]],
+            [[
+                'text'          => 'domains: ' . ($p['domains_outbound'] ? 'direct' : 'proxy'),
+                'callback_data' => "/xtlsproxy",
+            ]],
+            [[
+                'text'          => 'process: ' . ($p['process_outbound'] ? 'direct' : 'proxy'),
                 'callback_data' => "/xtlsprocess",
             ]],
             [[
-                'text'          => $this->i18n('package'),
+                'text'          => 'package: ' . ($p['app_outbound'] ? 'direct' : 'proxy'),
                 'callback_data' => "/xtlsapp",
             ]],
             [[
-                'text'          => $this->i18n('rulesset'),
-                'callback_data' => "/xtlsrulesset",
+                'text'          => 'final: ' . ($p['final_outbound'] ? 'proxy' : 'direct'),
+                'callback_data' => "/finalOutbound",
             ]],
         ];
         $data[] = [
@@ -4632,23 +4803,33 @@ DNS-over-HTTPS with IP:
 
     public function offWarp()
     {
-        $p = $this->getPacConf();
-        if (empty($p['warpoff'])) {
-            $this->ssh('pkill warp-svc', 'wp');
-            $p['warpoff'] = 1;
-        } else {
+        $p    = $this->getPacConf();
+        if (!empty($this->selfupdate)) {
+            if (!empty($p['warpoff'])) {
+                $this->ssh('warp-cli --accept-tos registration delete 2>&1', 'wp');
+                $this->ssh('pkill warp-svc', 'wp');
+            }
+        } elseif (!empty($p['warpoff'])) {
             $this->ssh('warp-svc > /dev/null 2>&1 &', 'wp');
             sleep(3);
-            $this->send($this->input['chat'], 'Registration: ' . $this->ssh('warp-cli --accept-tos registration new 2>&1', 'wp'));
-            if (!empty($p['warp'])) {
-                $this->send($this->input['chat'], 'License: ' . $this->ssh("warp-cli --accept-tos registration license {$p['warp']} 2>&1", 'wp'));
+            if (empty($this->ssh('[ -f "/var/lib/cloudflare-warp/conf.json" ] && echo 1', 'wp'))) {
+                $this->send($this->input['chat'], 'Registration: ' . $this->ssh('warp-cli --accept-tos registration new 2>&1', 'wp'));
+                if (!empty($p['warp'])) {
+                    $this->send($this->input['chat'], 'License: ' . $this->ssh("warp-cli --accept-tos registration license {$p['warp']} 2>&1", 'wp'));
+                }
             }
             $this->send($this->input['chat'], 'Proxy mode: ' . $this->ssh('warp-cli --accept-tos mode proxy 2>&1', 'wp'));
             $this->send($this->input['chat'], 'Connect: ' . $this->ssh('warp-cli --accept-tos connect 2>&1', 'wp'));
             unset($p['warpoff']);
+        } else {
+            $this->send($this->input['chat'], 'Registration delete: ' . $this->ssh('warp-cli --accept-tos registration delete 2>&1', 'wp'));
+            $this->ssh('pkill warp-svc', 'wp');
+            $p['warpoff'] = 1;
         }
         $this->setPacConf($p);
-        $this->warp();
+        if (empty($this->selfupdate)) {
+            $this->warp();
+        }
     }
 
     public function warp()
@@ -4656,7 +4837,7 @@ DNS-over-HTTPS with IP:
         $p      = $this->getPacConf();
         $text[] = "Menu -> " . $this->i18n('warp');
         $text[] = "status: " . $this->warpStatus();
-        $text[] = "key: " . $this->getPacConf()['warp'];
+        $text[] = "key: <code>{$this->getPacConf()['warp']}</code>";
         $data[] = [
             [
                 'text'          => $this->i18n($p['warpoff'] ? 'off' : 'on'),
@@ -4995,13 +5176,17 @@ DNS-over-HTTPS with IP:
         }
 
         $json = $this->replaceTags(json_encode($c), [
-            '"~pac~"'         => json_encode(array_keys(array_filter($pac['includelist'] ?: []))),
-            '~dns~'         => "https://$domain/dns-query/$uid",
-            '~uid~'         => $uid,
-            '~domain~'      => $domain,
-            '~short_id~'    => $xr['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0],
-            '~public_key~'  => $pac['xray'],
-            '~server_name~' => $xr['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0],
+            '"~pac~"'            => json_encode(array_keys(array_filter($pac['includelist'] ?: []))),
+            '~dns~'              => "https://$domain/dns-query/$uid",
+            '~uid~'              => $uid,
+            '~domain~'           => $domain,
+            '~short_id~'         => $xr['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0],
+            '~public_key~'       => $pac['xray'],
+            '~server_name~'      => $xr['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0],
+            '~app_outbound~'     => $pac['app_outbound'] ? 'direct' : 'proxy',
+            '~process_outbound~' => $pac['process_outbound'] ? 'direct' : 'proxy',
+            '~domains_outbound~' => $pac['domains_outbound'] ? 'direct' : 'proxy',
+            '~final_outbound~'   => $pac['final_outbound'] ? 'proxy' : 'direct',
         ]);
         $json = $this->clearEmptyRules($json);
 
@@ -5025,6 +5210,14 @@ DNS-over-HTTPS with IP:
             }
             $json['routing']['rules'] = array_values($json['routing']['rules']);
         }
+        if (!empty($json['route']['rules'])) {
+            foreach ($json['route']['rules'] as $k => $v) {
+                if (count($v) < 2) {
+                    unset($json['route']['rules'][$k]);
+                }
+            }
+            $json['route']['rules'] = array_values($json['route']['rules']);
+        }
         return json_encode($json);
     }
 
@@ -5123,11 +5316,6 @@ DNS-over-HTTPS with IP:
                         "download_detour" => "direct",
                     ];
                     $route['rules'][$k]['rule_set'][] = $r['name'];
-                    switch (true) {
-                        case preg_match('#~(.+)~#', $route['rules'][$k]['outbound'], $m):
-                            $route['rules'][$k]['outbound'] = $pac[$m[1]] ? 'direct' : 'proxy';
-                            break;
-                    }
                 }
                 unset($route['rules'][$k]['createruleset']);
                 if (empty($route['rules'][$k]['rule_set'])) {
@@ -5230,23 +5418,6 @@ DNS-over-HTTPS with IP:
         ];
     }
 
-    public function adguardCheckPswd()
-    {
-        if (empty($this->getPacConf()['adpswd'])) {
-            $this->adguardChangePswd(substr(hash('md5', time()), 0, 10));
-        }
-    }
-
-    public function adguardChangePswd($pass)
-    {
-        $c = yaml_parse_file($this->adguard);
-        $c['users'][0]['password'] = password_hash($pass, PASSWORD_DEFAULT);
-        yaml_emit_file($this->adguard, $c);
-        $p = $this->getPacConf();
-        $p['adpswd'] = $pass;
-        $this->setPacConf($p);
-    }
-
     public function adguardProtect()
     {
         $h = substr(hash('sha256', $this->key), 0, 8);
@@ -5297,6 +5468,12 @@ DNS-over-HTTPS with IP:
             $text .= "DNS over HTTPS:\n<code>$ip</code>\n<code>$scheme://$domain/dns-query" . ($conf['adguardkey'] ? "/{$conf['adguardkey']}" : '') . "</code>\n\n";
             $text .= "DNS over TLS:\n<code>tls://" . ($conf['adguardkey'] ? "{$conf['adguardkey']}." : '') . "$domain</code>";
         }
+        $status = $this->i18n(exec("JSON=1 dnslookup google.com ad") ? 'on' : 'off');
+        $safesearch = yaml_parse_file($this->adguard)['filtering']['safe_search']['enabled'];
+        $text .= "\n\nstatus: $status\t\tsafesearch: " . $this->i18n($safesearch ? 'on' : 'off');
+        $allowedClients = yaml_parse_file($this->adguard)['dns']['allowed_clients'];
+        $text .= $allowedClients ? "\n\nallowed clients: \n - " . implode("\n - ", $allowedClients) : '';
+
         $data = [
             [
                 [
@@ -5323,13 +5500,29 @@ DNS-over-HTTPS with IP:
         ];
         $data[] = [
             [
-                'text'          => $this->i18n('add upstream'),
-                'callback_data' => "/addupstream",
+                'text'          => $this->i18n('fill allowed clients'),
+                'callback_data' => "/adgFillAllowedClients 0",
             ],
+            [
+                'text'          => $this->i18n('delete allowed clients'),
+                'callback_data' => "/adgFillAllowedClients 1",
+            ],
+        ];
+        $data[] = [
             [
                 'text'          => $this->i18n('check DNS'),
                 'callback_data' => "/checkdns",
             ],
+            [
+                'text'          => $this->i18n('reset settings'),
+                'callback_data' => "/adguardreset",
+            ],
+        ];
+        $data[] = [
+            [
+                'text'          => $this->i18n('add upstream'),
+                'callback_data' => "/addupstream",
+            ],
         ];
         $upstreams = yaml_parse_file($this->adguard)['dns']['upstream_dns'];
         if (!empty($upstreams)) {
@@ -5358,6 +5551,35 @@ DNS-over-HTTPS with IP:
         ];
     }
 
+    public function adgFillAllowedClients($delete = false)
+    {
+        $pac = $this->getPacConf();
+        $out[] = 'Restart Adguard Home';
+        $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
+        $this->stopAd();
+        $c = yaml_parse_file($this->adguard);
+        if (!empty($delete)) {
+            unset($c['dns']['allowed_clients']);
+        } else {
+            $c['dns']['allowed_clients'] = [];
+            $c['dns']['allowed_clients'][] = '10.10.0.0/24';
+            if (!empty($pac['adguardKey'])) {
+                $c['dns']['allowed_clients'][] = $pac['adguardKey'];
+            }
+            $c['dns']['allowed_clients'][] = getenv('WGADDRESS');
+            $c['dns']['allowed_clients'][] = getenv('WG1ADDRESS');
+            $c['dns']['allowed_clients'][] = '10.0.2.0/24'; // openconnect
+            if (!empty($xr = $this->getXray())) {
+                foreach ($xr['inbounds'][0]['settings']['clients'] as $v) {
+                    $c['dns']['allowed_clients'][] = $v['id'];
+                }
+            }
+        }
+        yaml_emit_file($this->adguard, $c);
+        $this->startAd();
+        $this->menu('adguard');
+    }
+
     public function menuLang()
     {
         $data = [];
@@ -5433,7 +5655,7 @@ DNS-over-HTTPS with IP:
         ];
         exec("git -C / branch -vv", $mm);
         return [
-            'text' => '<pre><code class="language-shell">' . implode("\n", $mm) . '</code></pre>',
+            'text' => '<pre><code class="language-shell">' . htmlentities(implode("\n", $mm)) . '</code></pre>',
             'data' => $data,
         ];
     }
@@ -5477,6 +5699,10 @@ DNS-over-HTTPS with IP:
                     'text'          => $this->i18n('+ subdomain'),
                     'callback_data' => '/addSubdomain',
                 ],
+                [
+                    'text'          => $this->i18n('nip.io'),
+                    'callback_data' => '/addNipdomain',
+                ],
             ],
         ];
         if ($conf['domain']) {
@@ -5516,12 +5742,6 @@ DNS-over-HTTPS with IP:
                 ];
             }
         }
-        /*$data[] = [
-            [
-                'text'          => $this->i18n('reset nginx'),
-                'callback_data' => "/resetnginx",
-            ],
-        ];*/
         $data[] = [
             [
                 'text'          => "{$this->i18n('add')} {$this->i18n('admin')}",
@@ -5565,7 +5785,11 @@ DNS-over-HTTPS with IP:
         ];
         $backup = array_filter(explode('/', $conf['backup']));
         if (!empty($backup)) {
-            $backup = "{$backup[0]} start / {$backup[1]} period";
+            if (!empty(strtotime($backup[0])) && !empty(strtotime($backup[1]))) {
+                $backup = "{$backup[0]} start / {$backup[1]} period";
+            } else {
+                $backup = $this->i18n('off') . " {$conf['backup']} - wrong format";
+            }
         }
         $data[] = [
             [
@@ -5712,32 +5936,22 @@ DNS-over-HTTPS with IP:
 
     public function selfUpdate()
     {
-        require __DIR__ . '/config.php';
-        if (!empty($c['admin'])) {
-            $ip = getenv('IP');
-            $rm = explode(':', trim(file_get_contents('/update/reload_message')));
-            $m  = file_get_contents('/update/message');
-            foreach ($c['admin'] as $k => $v) {
-                $r = $this->send($v, "start $ip");
-                $this->input['chat']        = $v;
-                $this->input['message_id']  = $r['result']['message_id'];
-                if (file_exists($this->update)) {
-                    if (!empty($m)) {
-                        $this->send($v, "<pre>$m</pre>", $v == $rm[0] ? $rm[1] : 0);
-                    }
-                    $r = $this->send($v, "import settings");
-                    $this->input['chat']        = $v;
-                    $this->input['message_id']  = $r['result']['message_id'];
-                    $this->input['callback_id'] = $r['result']['message_id'];
-                    if (empty($flag)) {
-                        $this->importFile($this->update);
-                        unlink($this->update);
-                        $flag = true;
-                    }
-                } else {
-                    $this->menu();
-                }
+        $ip                         = getenv('IP');
+        $rm                         = explode(':', trim(file_get_contents('/update/reload_message')));
+        $m                          = file_get_contents('/update/message');
+        $this->input['chat']        = $rm[0];
+        $this->input['message_id']  = $rm[1];
+        $this->input['callback_id'] = $rm[1];
+        if (file_exists($this->update)) {
+            $this->selfupdate = true;
+            if (!empty($m)) {
+                $this->send($this->input['chat'], "<pre>$m</pre>", $rm[1]);
             }
+            $r = $this->send($this->input['chat'], "import settings");
+            $this->input['message_id']  = $r['result']['message_id'];
+            $this->input['callback_id'] = $r['result']['message_id'];
+            $this->importFile($this->update);
+            unlink($this->update);
         }
         file_put_contents('/update/message', '');
         file_put_contents('/update/reload_message', '');
@@ -5875,7 +6089,11 @@ DNS-over-HTTPS with IP:
             $c['backup'] = '';
         } else {
             [$start, $period] = explode('/', $text);
-            $c['backup'] = implode(' / ', [date('Y-m-d H:i', strtotime($start)), trim($period)]);
+            if (!empty(strtotime($start)) && !empty(strtotime($period))) {
+                $c['backup'] = implode(' / ', [date('Y-m-d H:i', strtotime($start)), trim($period)]);
+            } else {
+                $this->send($this->input['from'], $this->input['message'] . ' - wrong format');
+            }
         }
         if ($c['pinbackup']) {
             $this->pinAdmin($c['pinbackup'], 1);
@@ -5993,25 +6211,25 @@ DNS-over-HTTPS with IP:
 
     public function createConfig($data)
     {
+        $pac = $this->getPacConf();
         $conf[] = "[Interface]";
         if (empty($data['interface']['ListenPort'])) {
             if (empty($data['interface']['DNS'])) {
-                $data['interface']['DNS'] = $this->getPacConf()[$this->getInstanceWG(1) . 'dns'] ?: $this->dns;
+                $data['interface']['DNS'] = $pac[$this->getInstanceWG(1) . 'dns'] ?: $this->dns;
             }
             if (empty($data['interface']['MTU'])) {
-                $data['interface']['MTU'] = $this->getPacConf()[$this->getInstanceWG(1) . 'mtu'] ?: $this->mtu;
+                $data['interface']['MTU'] = $pac[$this->getInstanceWG(1) . 'mtu'] ?: $this->mtu;
             }
         }
         foreach ($data['interface'] as $k => $v) {
             $conf[] = "$k = $v";
         }
-        $pac = $this->getPacConf();
         if (!empty($data['peers'])) {
             foreach ($data['peers'] as $peer) {
                 $conf[] = '';
                 $conf[] = $peer['# PublicKey'] ? '# [Peer]' : '[Peer]';
                 if (!empty($peer['Endpoint'])) {
-                    $peer['Endpoint'] = ($this->getPacConf()[$this->getInstanceWG(1) . 'endpoint'] ? $this->ip : $this->getDomain()) . ":" . getenv($this->getInstanceWG(1) ? 'WG1PORT' : 'WGPORT');
+                    $peer['Endpoint'] = ($pac[$this->getInstanceWG(1) . 'endpoint'] ? $this->ip : $this->getDomain()) . ":" . getenv($this->getInstanceWG(1) ? 'WG1PORT' : 'WGPORT');
                 }
                 foreach ($peer as $k => $v) {
                     $conf[] = "$k = $v";

app/i18n.php

@@ -282,8 +282,8 @@ $i = [
         'ru' => 'пагинация',
     ],
     'exchange'  => [
-        'en' => 'open ip',
-        'ru' => 'откр айпи',
+        'en' => 'client isolation',
+        'ru' => 'изоляция клиентов',
     ],
     'ocserv'  => [
         'en' => 'OpenConnect',
@@ -345,4 +345,12 @@ $i = [
         'en' => 'expose-iroutes',
         'ru' => 'изоляция клиентов',
     ],
+    'fill allowed clients'  => [
+        'en' => 'fill allowed clients',
+        'ru' => 'заполнить белый список клиентов',
+    ],
+    'delete allowed clients'  => [
+        'en' => 'delete allowed clients',
+        'ru' => 'очистить белый список клиентов',
+    ],
 ];

app/index.php

@@ -11,6 +11,9 @@ if ('POST' == $_SERVER['REQUEST_METHOD'] && $_GET['k'] == $c['key']) {
     require __DIR__ . '/calc.php';
     require __DIR__ . '/bot.php';
     require __DIR__ . '/i18n.php';
+    if (file_exists(__DIR__ . '/override.php')) {
+        include __DIR__ . '/override.php';
+    }
     $bot = new Bot($c['key'], $i);
     $bot->input();
     exit;
@@ -44,8 +47,63 @@ if ($hash == substr(md5($c['key']), 0, 8)) {
                 $t = json_decode(file_get_contents("/config/{$_GET['ty']}.json"), true);
             }
             if ($t) {
-                header('Content-Type: application/json');
-                echo json_encode($t, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+                header('Content-Type: text/html');
+                $t = json_encode($t, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+                $name = $_GET['te'] ?: 'origin';
+                $type = $_GET['ty'];
+                echo <<<HTML
+                    <!DOCTYPE HTML>
+                    <html lang="en" style="height:100%">
+                    <head>
+                        <!-- when using the mode "code", it's important to specify charset utf-8 -->
+                        <meta charset="utf-8">
+                        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+                        <link href="jsoneditor.min.css" rel="stylesheet" type="text/css">
+                        <script src="jsoneditor.min.js"></script>
+                        <script src="jquery-3.7.1.min.js"></script>
+                        <script src="https://telegram.org/js/telegram-web-app.js"></script>
+                    </head>
+                    <body style="height:100%">
+                        <div id="jsoneditor" style="height:100%"></div>
+
+                        <script>
+                            jQuery(function($) {
+                                var tg = window.Telegram.WebApp;
+                                // create the editor
+                                const container = document.getElementById("jsoneditor")
+                                const options = {}
+                                const editor = new JSONEditor(container, options)
+                                editor.set({$t})
+                                tg.MainButton.show().setText('{$bot->i18n('save')}').onClick(function (e) {
+                                    var self = this;
+                                    $.ajax({
+                                        url: '/webapp/save?' + tg.initData,
+                                        method: 'POST',
+                                        data: {
+                                            name: '$name',
+                                            type: '$type',
+                                            json: editor.getText()
+                                        },
+                                        dataType: 'json'
+                                    }).done(function (r) {
+                                        if (r.status == true) {
+                                            tg.MainButton.setText('{$bot->i18n('success')}')
+                                            setTimeout(() => {
+                                                tg.close();
+                                            }, 500);
+                                        } else {
+                                            tg.MainButton.setText(r.message);
+                                        }
+                                    }).fail(function (r) {
+                                        tg.MainButton.setText('{$bot->i18n('error')}')
+                                    });
+                                });
+                            });
+                        </script>
+                    </body>
+                    </html>
+                    HTML;
                 exit;
             }
 
@@ -78,8 +136,13 @@ if (!empty($_GET['hash'])) {
         require __DIR__ . '/bot.php';
         require __DIR__ . '/i18n.php';
         $bot = new Bot($c['key'], $i);
-        setcookie('c', substr(hash('sha256', $c['key']), 0, 8), 0, '/');
-        setcookie('a', $bot->adguardBasicAuth(), 0, '/');
+        if (!empty($_POST['json'])) {
+            echo json_encode($bot->saveTemplate($_POST['name'], $_POST['type'], $_POST['json']));
+            die();
+        } else {
+            setcookie('c', substr(hash('sha256', $c['key']), 0, 8), 0, '/');
+            setcookie('a', $bot->adguardBasicAuth(), 0, '/');
+        }
         die('ok');
     }
 }

app/init.php

@@ -10,9 +10,7 @@ if ($c['debug']) {
 }
 
 $bot = new Bot($c['key'], $i);
+$bot->cleanQueue();
 $bot->setwebhook();
-$bot->selfUpdate();
-$bot->adguardCheckPswd();
-$bot->adguardProtect();
 $bot->syncPortClients();
 $bot->setcommands();

app/service.php

@@ -12,6 +12,12 @@ if ($c['debug']) {
 
 $bot = new Bot($c['key'], $i);
 
+$bot->selfUpdate();
 $bot->restartTG();
+if (!empty($bot->selfupdate)) {
+    $bot->offWarp();
+}
+$bot->dontshowcron = 1;
+$bot->adguardSync();
 $bot->sslip();
 $bot->cleanDocker();

app/webapp/img/jsoneditor-icons.svg

@@ -0,0 +1,749 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="240"
+   height="144"
+   id="svg4136"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="jsoneditor-icons.svg">
+  <title
+     id="title6512">JSON Editor Icons</title>
+  <metadata
+     id="metadata4148">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>JSON Editor Icons</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4146" />
+  <sodipodi:namedview
+     pagecolor="#ff63ff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1026"
+     id="namedview4144"
+     showgrid="true"
+     inkscape:zoom="4"
+     inkscape:cx="13.229181"
+     inkscape:cy="119.82429"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4136"
+     showguides="false"
+     borderlayer="false"
+     inkscape:showpageshadow="true"
+     showborder="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4640"
+       empspacing="24" />
+  </sodipodi:namedview>
+  <!-- Created with SVG-edit - http://svg-edit.googlecode.com/ -->
+  <rect
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0"
+     id="svg_1"
+     height="16"
+     width="16"
+     y="4"
+     x="4" />
+  <rect
+     id="svg_1-7"
+     height="16"
+     width="16"
+     y="3.999995"
+     x="28.000006"
+     style="fill:#ec3f29;fill-opacity:0.94117647;stroke:none;stroke-width:0" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0"
+     x="52.000004"
+     y="3.999995"
+     width="16"
+     height="16"
+     id="rect4165" />
+  <rect
+     id="rect4175"
+     height="16"
+     width="16"
+     y="3.9999852"
+     x="172.00002"
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0" />
+  <rect
+     id="rect4175-3"
+     height="16"
+     width="16"
+     y="3.999995"
+     x="196"
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0" />
+  <g
+     id="g4299"
+     style="stroke:none">
+    <rect
+       x="7.0000048"
+       y="10.999998"
+       width="9.9999924"
+       height="1.9999986"
+       id="svg_1-1"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0" />
+    <rect
+       x="11.000005"
+       y="7.0000114"
+       width="1.9999955"
+       height="9.9999838"
+       id="svg_1-1-1"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0" />
+  </g>
+  <g
+     id="g4299-3"
+     transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,19.029435,12.000001)"
+     style="stroke:none">
+    <rect
+       x="7.0000048"
+       y="10.999998"
+       width="9.9999924"
+       height="1.9999986"
+       id="svg_1-1-0"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0" />
+    <rect
+       x="11.000005"
+       y="7.0000114"
+       width="1.9999955"
+       height="9.9999838"
+       id="svg_1-1-1-9"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0" />
+  </g>
+  <rect
+     id="svg_1-7-5"
+     height="6.9999905"
+     width="6.9999909"
+     y="7.0000048"
+     x="55.000004"
+     style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:#4c4c4c;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     x="58"
+     y="10.00001"
+     width="6.9999909"
+     height="6.9999905"
+     id="rect4354" />
+  <rect
+     id="svg_1-7-5-7"
+     height="6.9999905"
+     width="6.9999909"
+     y="10.000005"
+     x="58.000004"
+     style="fill:#ffffff;fill-opacity:1;stroke:#3c80df;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.94117647" />
+  <g
+     id="g4378">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0"
+       x="198"
+       y="10.999999"
+       width="7.9999909"
+       height="1.9999965"
+       id="svg_1-7-5-3" />
+    <rect
+       id="rect4374"
+       height="1.9999946"
+       width="11.999995"
+       y="7.0000005"
+       x="198"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0" />
+    <rect
+       id="rect4376"
+       height="1.9999995"
+       width="3.9999928"
+       y="14.999996"
+       x="198"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0" />
+  </g>
+  <g
+     transform="matrix(1,0,0,-1,-23.999995,23.999995)"
+     id="g4383">
+    <rect
+       id="rect4385"
+       height="1.9999965"
+       width="7.9999909"
+       y="10.999999"
+       x="198"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0"
+       x="198"
+       y="7.0000005"
+       width="11.999995"
+       height="1.9999946"
+       id="rect4387" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0"
+       x="198"
+       y="14.999996"
+       width="3.9999928"
+       height="1.9999995"
+       id="rect4389" />
+  </g>
+  <rect
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none"
+     id="rect3754-4"
+     width="16"
+     height="16"
+     x="76"
+     y="3.9999199" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 85.10447,6.0157384 -0.0156,1.4063 c 3.02669,-0.2402 0.33008,3.6507996 2.48438,4.5780996 -2.18694,1.0938 0.49191,4.9069 -2.45313,4.5781 l -0.0156,1.4219 c 5.70828,0.559 1.03264,-5.1005 4.70313,-5.2656 l 0,-1.4063 c -3.61303,-0.027 1.11893,-5.7069996 -4.70313,-5.3124996 z"
+     id="path4351"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccc" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 82.78125,5.9984384 0.0156,1.4063 c -3.02668,-0.2402 -0.33007,3.6506996 -2.48437,4.5780996 2.18694,1.0938 -0.49192,4.9069 2.45312,4.5781 l 0.0156,1.4219 c -5.70827,0.559 -1.03263,-5.1004 -4.70312,-5.2656 l 0,-1.4063 c 3.61303,-0.027 -1.11894,-5.7070996 4.70312,-5.3124996 z"
+     id="path4351-9"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccc" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none"
+     id="rect3754-25"
+     width="16"
+     height="16"
+     x="100"
+     y="3.9999199" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 103.719,5.6719384 0,12.7187996 3.03125,0 0,-1.5313 -1.34375,0 0,-9.6249996 1.375,0 0,-1.5625 z"
+     id="path2987"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 112.2185,5.6721984 0,12.7187996 -3.03125,0 0,-1.5313 1.34375,0 0,-9.6249996 -1.375,0 0,-1.5625 z"
+     id="path2987-1"
+     inkscape:connector-curvature="0" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none"
+     id="rect3754-73"
+     width="16"
+     height="16"
+     x="124"
+     y="3.9999199" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 126.2824,17.602938 1.78957,0 1.14143,-2.8641 5.65364,0 1.14856,2.8641 1.76565,0 -4.78687,-11.1610996 -1.91903,0 z"
+     id="path3780"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccc" />
+  <path
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none"
+     d="m 129.72704,13.478838 4.60852,0.01 -2.30426,-5.5497996 z"
+     id="path3782"
+     inkscape:connector-curvature="0" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none"
+     id="rect3754-35"
+     width="16"
+     height="16"
+     x="148"
+     y="3.9999199" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 156.47655,5.8917384 0,2.1797 0.46093,2.3983996 1.82813,0 0.39844,-2.3983996 0,-2.1797 z"
+     id="path5008-2"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 152.51561,5.8906384 0,2.1797 0.46094,2.3983996 1.82812,0 0.39844,-2.3983996 0,-2.1797 z"
+     id="path5008-2-8"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
+  <rect
+     id="svg_1-7-2"
+     height="1.9999961"
+     width="11.999996"
+     y="64"
+     x="54"
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0" />
+  <rect
+     id="svg_1-7-2-2"
+     height="2.9999905"
+     width="2.9999907"
+     y="52"
+     x="80.000008"
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
+     x="85.000008"
+     y="52"
+     width="2.9999907"
+     height="2.9999905"
+     id="rect4561" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
+     x="80.000008"
+     y="58"
+     width="2.9999907"
+     height="2.9999905"
+     id="rect4563" />
+  <rect
+     id="rect4565"
+     height="2.9999905"
+     width="2.9999907"
+     y="58"
+     x="85.000008"
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0" />
+  <rect
+     id="rect4567"
+     height="2.9999905"
+     width="2.9999907"
+     y="64"
+     x="80.000008"
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
+     x="85.000008"
+     y="64"
+     width="2.9999907"
+     height="2.9999905"
+     id="rect4569" />
+  <circle
+     style="opacity:1;fill:none;fill-opacity:1;stroke:#4c4c4c;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path4571"
+     cx="110.06081"
+     cy="57.939209"
+     r="4.7438836" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
+     x="116.64566"
+     y="-31.79752"
+     width="4.229713"
+     height="6.4053884"
+     id="rect4563-2"
+     transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
+  <path
+     style="fill:#4c4c4c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 125,56 138.77027,56.095 132,64 Z"
+     id="path4613"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path4615"
+     d="M 149,64 162.77027,63.905 156,56 Z"
+     style="fill:#4c4c4c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
+     x="54"
+     y="53"
+     width="11.999996"
+     height="1.9999961"
+     id="rect4638" />
+  <rect
+     id="svg_1-7-2-24"
+     height="1.9999957"
+     width="12.99999"
+     y="-56"
+     x="53"
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
+     transform="matrix(0,1,-1,0,0,0)" />
+  <rect
+     transform="matrix(0,1,-1,0,0,0)"
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
+     x="53"
+     y="-66"
+     width="12.99999"
+     height="1.9999957"
+     id="rect4657" />
+  <rect
+     id="rect4659"
+     height="0.99999291"
+     width="11.999999"
+     y="57"
+     x="54"
+     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0" />
+  <rect
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
+     x="54"
+     y="88.000122"
+     width="11.999996"
+     height="1.9999961"
+     id="rect4661" />
+  <rect
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
+     x="80.000008"
+     y="76.000122"
+     width="2.9999907"
+     height="2.9999905"
+     id="rect4663" />
+  <rect
+     id="rect4665"
+     height="2.9999905"
+     width="2.9999907"
+     y="76.000122"
+     x="85.000008"
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" />
+  <rect
+     id="rect4667"
+     height="2.9999905"
+     width="2.9999907"
+     y="82.000122"
+     x="80.000008"
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" />
+  <rect
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
+     x="85.000008"
+     y="82.000122"
+     width="2.9999907"
+     height="2.9999905"
+     id="rect4669" />
+  <rect
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
+     x="80.000008"
+     y="88.000122"
+     width="2.9999907"
+     height="2.9999905"
+     id="rect4671" />
+  <rect
+     id="rect4673"
+     height="2.9999905"
+     width="2.9999907"
+     y="88.000122"
+     x="85.000008"
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" />
+  <circle
+     r="4.7438836"
+     cy="81.939331"
+     cx="110.06081"
+     id="circle4675"
+     style="opacity:1;fill:none;fill-opacity:1;stroke:#d3d3d3;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
+     id="rect4677"
+     height="6.4053884"
+     width="4.229713"
+     y="-14.826816"
+     x="133.6163"
+     style="fill:#d3d3d3;fill-opacity:1;stroke:#d3d3d3;stroke-width:0;stroke-opacity:1" />
+  <path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path4679"
+     d="m 125,80.000005 13.77027,0.09499 L 132,87.999992 Z"
+     style="fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:#d3d3d3;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:#d3d3d3;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 149,88.0002 162.77027,87.9052 156,80.0002 Z"
+     id="path4681"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <rect
+     id="rect4683"
+     height="1.9999961"
+     width="11.999996"
+     y="77.000122"
+     x="54"
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,-1,0,0,0)"
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
+     x="77.000122"
+     y="-56"
+     width="12.99999"
+     height="1.9999957"
+     id="rect4685" />
+  <rect
+     id="rect4687"
+     height="1.9999957"
+     width="12.99999"
+     y="-66"
+     x="77.000122"
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
+     transform="matrix(0,1,-1,0,0,0)" />
+  <rect
+     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
+     x="54"
+     y="81.000122"
+     width="11.999999"
+     height="0.99999291"
+     id="rect4689" />
+  <rect
+     id="rect4761-1"
+     height="1.9999945"
+     width="15.99999"
+     y="101"
+     x="76.000008"
+     style="fill:#ffffff;fill-opacity:0.8;stroke:none;stroke-width:0" />
+  <rect
+     id="rect4761-0"
+     height="1.9999945"
+     width="15.99999"
+     y="105"
+     x="76.000008"
+     style="fill:#ffffff;fill-opacity:0.8;stroke:none;stroke-width:0" />
+  <rect
+     id="rect4761-7"
+     height="1.9999945"
+     width="9"
+     y="109"
+     x="76.000008"
+     style="fill:#ffffff;fill-opacity:0.8;stroke:none;stroke-width:0" />
+  <rect
+     id="rect4761-1-1"
+     height="1.9999945"
+     width="12"
+     y="125"
+     x="76.000008"
+     style="fill:#ffffff;fill-opacity:0.8;stroke:none;stroke-width:0" />
+  <rect
+     id="rect4761-1-1-4"
+     height="1.9999945"
+     width="10"
+     y="137"
+     x="76.000008"
+     style="fill:#ffffff;fill-opacity:0.8;stroke:none;stroke-width:0" />
+  <rect
+     id="rect4761-1-1-4-4"
+     height="1.9999945"
+     width="10"
+     y="129"
+     x="82"
+     style="fill:#ffffff;fill-opacity:0.8;stroke:none;stroke-width:0" />
+  <rect
+     id="rect4761-1-1-4-4-3"
+     height="1.9999945"
+     width="9"
+     y="133"
+     x="82"
+     style="fill:#ffffff;fill-opacity:0.8;stroke:none;stroke-width:0" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.8;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.66157866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="m 36.398438,100.0254 c -0.423362,-0.013 -0.846847,0.01 -1.265626,0.062 -1.656562,0.2196 -3.244567,0.9739 -4.507812,2.2266 L 29,100.5991 l -2.324219,7.7129 7.826172,-1.9062 -1.804687,-1.9063 c 1.597702,-1.5308 4.048706,-1.8453 5.984375,-0.7207 1.971162,1.1452 2.881954,3.3975 2.308593,5.5508 -0.573361,2.1533 -2.533865,3.6953 -4.830078,3.6953 l 0,3.0742 c 3.550756,0 6.710442,-2.4113 7.650391,-5.9414 0.939949,-3.5301 -0.618463,-7.2736 -3.710938,-9.0703 -1.159678,-0.6738 -2.431087,-1.0231 -3.701171,-1.0625 z"
+     id="path4138" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.8;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.66157866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="m 59.722656,99.9629 c -1.270084,0.039 -2.541493,0.3887 -3.701172,1.0625 -3.092475,1.7967 -4.650886,5.5402 -3.710937,9.0703 0.939949,3.5301 4.09768,5.9414 7.648437,5.9414 l 0,-3.0742 c -2.296214,0 -4.256717,-1.542 -4.830078,-3.6953 -0.573361,-2.1533 0.337432,-4.4056 2.308594,-5.5508 1.935731,-1.1246 4.38863,-0.8102 5.986326,0.7207 l -1.806638,1.9063 7.828128,1.9062 -2.32422,-7.7129 -1.62696,1.7168 c -1.26338,-1.2531 -2.848917,-2.0088 -4.505855,-2.2285 -0.418778,-0.055 -0.842263,-0.076 -1.265625,-0.062 z"
+     id="path4138-1" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.96599996;stroke-miterlimit:4;stroke-dasharray:none"
+     d="m 10.5,100 0,2 -2.4999996,0 L 12,107 l 4,-5 -2.5,0 0,-2 -3,0 z"
+     id="path3055-0-77" />
+  <path
+     style="opacity:0.8;fill:none;stroke:#ffffff;stroke-width:1.96599996;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 4.9850574,108.015 14.0298856,-0.03"
+     id="path5244-5-0-5"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="opacity:0.8;fill:none;stroke:#ffffff;stroke-width:1.96599996;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 4.9849874,132.015 14.0298866,-0.03"
+     id="path5244-5-0-5-8"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.4;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.66157866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="m 36.398438,123.9629 c -0.423362,-0.013 -0.846847,0.01 -1.265626,0.062 -1.656562,0.2196 -3.244567,0.9739 -4.507812,2.2266 L 29,124.5366 l -2.324219,7.7129 7.826172,-1.9062 -1.804687,-1.9063 c 1.597702,-1.5308 4.048706,-1.8453 5.984375,-0.7207 1.971162,1.1453 2.881954,3.3975 2.308593,5.5508 -0.573361,2.1533 -2.533864,3.6953 -4.830078,3.6953 l 0,3.0742 c 3.550757,0 6.710442,-2.4093 7.650391,-5.9394 0.939949,-3.5301 -0.618463,-7.2756 -3.710938,-9.0723 -1.159678,-0.6737 -2.431087,-1.0231 -3.701171,-1.0625 z"
+     id="path4138-12" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.4;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.66157866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="m 59.722656,123.9629 c -1.270084,0.039 -2.541493,0.3888 -3.701172,1.0625 -3.092475,1.7967 -4.650886,5.5422 -3.710937,9.0723 0.939949,3.5301 4.09768,5.9394 7.648437,5.9394 l 0,-3.0742 c -2.296214,0 -4.256717,-1.542 -4.830078,-3.6953 -0.573361,-2.1533 0.337432,-4.4055 2.308594,-5.5508 1.935731,-1.1246 4.38863,-0.8102 5.986326,0.7207 l -1.806638,1.9063 7.828128,1.9062 -2.32422,-7.7129 -1.62696,1.7168 c -1.26338,-1.2531 -2.848917,-2.0088 -4.505855,-2.2285 -0.418778,-0.055 -0.842263,-0.076 -1.265625,-0.062 z"
+     id="path4138-1-3" />
+  <path
+     id="path6191"
+     d="m 10.5,116 0,-2 -2.4999996,0 L 12,109 l 4,5 -2.5,0 0,2 -3,0 z"
+     style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.96599996;stroke-miterlimit:4;stroke-dasharray:none"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.96599996;stroke-miterlimit:4;stroke-dasharray:none"
+     d="m 10.5,129 0,-2 -2.4999996,0 L 12,122 l 4,5 -2.5,0 0,2 -3,0 z"
+     id="path6193" />
+  <path
+     id="path6195"
+     d="m 10.5,135 0,2 -2.4999996,0 L 12,142 l 4,-5 -2.5,0 0,-2 -3,0 z"
+     style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.96599996;stroke-miterlimit:4;stroke-dasharray:none"
+     inkscape:connector-curvature="0" />
+  <path
+     sodipodi:type="star"
+     style="fill:#4d4d4d;fill-opacity:0.90196078;stroke:#d3d3d3;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path4500"
+     sodipodi:sides="3"
+     sodipodi:cx="11.55581"
+     sodipodi:cy="60.073242"
+     sodipodi:r1="5.1116104"
+     sodipodi:r2="2.5558052"
+     sodipodi:arg1="0"
+     sodipodi:arg2="1.0471976"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 16.66742,60.073242 -3.833708,2.213392 -3.8337072,2.213393 0,-4.426785 0,-4.426784 3.8337082,2.213392 z"
+     inkscape:transform-center-x="-1.2779026" />
+  <path
+     inkscape:transform-center-x="1.277902"
+     d="m -31.500004,60.073242 -3.833708,2.213392 -3.833707,2.213393 0,-4.426785 0,-4.426784 3.833707,2.213392 z"
+     inkscape:randomized="0"
+     inkscape:rounded="0"
+     inkscape:flatsided="false"
+     sodipodi:arg2="1.0471976"
+     sodipodi:arg1="0"
+     sodipodi:r2="2.5558052"
+     sodipodi:r1="5.1116104"
+     sodipodi:cy="60.073242"
+     sodipodi:cx="-36.611614"
+     sodipodi:sides="3"
+     id="path4502"
+     style="fill:#4d4d4d;fill-opacity:0.90196078;stroke:#d3d3d3;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     sodipodi:type="star"
+     transform="scale(-1,1)" />
+  <path
+     d="m 16.66742,60.073212 -3.833708,2.213392 -3.8337072,2.213392 0,-4.426784 0,-4.426785 3.8337082,2.213392 z"
+     inkscape:randomized="0"
+     inkscape:rounded="0"
+     inkscape:flatsided="false"
+     sodipodi:arg2="1.0471976"
+     sodipodi:arg1="0"
+     sodipodi:r2="2.5558052"
+     sodipodi:r1="5.1116104"
+     sodipodi:cy="60.073212"
+     sodipodi:cx="11.55581"
+     sodipodi:sides="3"
+     id="path4504"
+     style="fill:#4d4d4d;fill-opacity:0.90196078;stroke:#d3d3d3;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     sodipodi:type="star"
+     transform="matrix(0,1,-1,0,72.0074,71.7877)"
+     inkscape:transform-center-y="1.2779029" />
+  <path
+     inkscape:transform-center-y="-1.2779026"
+     transform="matrix(0,-1,-1,0,96,96)"
+     sodipodi:type="star"
+     style="fill:#4d4d4d;fill-opacity:0.90196078;stroke:#d3d3d3;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path4506"
+     sodipodi:sides="3"
+     sodipodi:cx="11.55581"
+     sodipodi:cy="60.073212"
+     sodipodi:r1="5.1116104"
+     sodipodi:r2="2.5558052"
+     sodipodi:arg1="0"
+     sodipodi:arg2="1.0471976"
+     inkscape:flatsided="false"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 16.66742,60.073212 -3.833708,2.213392 -3.8337072,2.213392 0,-4.426784 0,-4.426785 3.8337082,2.213392 z" />
+  <path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path4615-5"
+     d="m 171.82574,65.174193 16.34854,0 -8.17427,-13.348454 z"
+     style="fill:#fbb917;fill-opacity:1;fill-rule:evenodd;stroke:#fbb917;stroke-width:1.65161395;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 179,55 0,6 2,0 0,-6"
+     id="path4300"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 179,62 0,2 2,0 0,-2"
+     id="path4300-6"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:#ffffff;fill-opacity:0.8;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:0.8"
+     d="M 99.994369,113.0221 102,114.98353 l 7,-6.9558 3,0.97227 2,-1 1,-2 0,-3 -3,3 -3,-3 3,-3 -3,0 -2,1 -1,2 0.99437,3.0221 z"
+     id="path4268"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccccccccc" />
+  <rect
+     id="rect4175-3-5"
+     height="16"
+     width="16"
+     y="4"
+     x="220"
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0" />
+  <path
+     style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 234,6 0,2 -5,5 0,5 -2,0 0,-5 -5,-5 0,-2"
+     id="path3546"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccc" />
+  <g
+     transform="matrix(1.3333328,0,0,-1.5999992,-139.9999,127.19999)"
+     id="g4383-6">
+    <rect
+       id="rect4385-2"
+       height="1.2499905"
+       width="5.9999924"
+       y="12.625005"
+       x="198.00002"
+       style="fill:#ffffff;fill-opacity:0.8;stroke:#000000;stroke-width:0" />
+    <rect
+       style="fill:#ffffff;fill-opacity:0.8;stroke:#000000;stroke-width:0"
+       x="198.00002"
+       y="15.125007"
+       width="7.4999928"
+       height="1.2499949"
+       id="rect4387-9" />
+    <rect
+       style="fill:#ffffff;fill-opacity:0.8;stroke:#000000;stroke-width:0"
+       x="198.00002"
+       y="7.6250024"
+       width="2.9999909"
+       height="1.2499905"
+       id="rect4389-1-0" />
+    <rect
+       style="fill:#ffffff;fill-opacity:0.8;stroke:#000000;stroke-width:0"
+       x="198.00002"
+       y="10.125004"
+       width="4.4999919"
+       height="1.2499905"
+       id="rect4389-1-9" />
+    <path
+       style="fill:#ffffff;fill-opacity:0.8;fill-rule:evenodd;stroke:none;stroke-width:0.68465352px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 207.00001,16.375004 0,-5.625005 -2.25,0 3,-3.1250014 3,3.1250014 -2.25,0 0,5.625005 -1.5,0"
+       id="path4402"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+  </g>
+  <path
+     style="fill:#ffffff;fill-opacity:0.8;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 164,100 0,3 -6,6 0,7 -4,0 0,-7 -6,-6 0,-3"
+     id="path3546-2-2"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccc" />
+  <rect
+     style="fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0"
+     id="svg_1-3"
+     height="16"
+     width="16"
+     y="28"
+     x="4" />
+  <path
+     sodipodi:nodetypes="ccccccccc"
+     inkscape:connector-curvature="0"
+     id="path4402-5-7"
+     d="m 15,41 0,-7 -4,0 0,3 -5,-4 5,-4 0,3 6,0 0,9"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.68465352px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+</svg>

config/AdGuardHome.yaml

@@ -16,5 +16,8 @@ dns:
 tls:
   certificate_path: /certs/cert_public
   private_key_path: /certs/cert_private
+filtering:
+  safe_search:
+    enabled: false
 log:
   file: /logs/adguard

config/sing.json

@@ -68,23 +68,23 @@
         {
             "flow": "xtls-rprx-vision",
             "packet_encoding": "",
-            "server": "",
+            "server": "~domain~",
             "server_port": 443,
             "tls": {
                 "enabled": true,
                 "insecure": false,
                 "reality": {
                     "enabled": true,
-                    "public_key": "",
-                    "short_id": ""
+                    "public_key": "~public_key~",
+                    "short_id": "~short_id~"
                 },
-                "server_name": "",
+                "server_name": "~server_name~",
                 "utls": {
                     "enabled": true,
                     "fingerprint": "chrome"
                 }
             },
-            "uuid": "",
+            "uuid": "~uid~",
             "type": "vless",
             "domain_strategy": "ipv4_only",
             "tag": "proxy"
@@ -110,6 +110,20 @@
                 "protocol": "dns",
                 "outbound": "dns-out"
             },
+            {
+                "createruleset": [
+                    {
+                        "name": "pac",
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "domain_suffix": "~pac~"
+                            }
+                        ]
+                    }
+                ],
+                "outbound": "~domains_outbound~"
+            },
             {
                 "createruleset": [
                     {
@@ -154,15 +168,6 @@
             },
             {
                 "createruleset": [
-                    {
-                        "name": "pac",
-                        "interval": "15s",
-                        "rules": [
-                            {
-                                "domain_suffix": "~pac~"
-                            }
-                        ]
-                    },
                     {
                         "name": "warp",
                         "interval": "15s",
@@ -179,6 +184,6 @@
                 "outbound": "direct"
             }
         ],
-        "final": "direct"
+        "final": "~final_outbound~"
     }
 }

config/upstream.conf

@@ -30,7 +30,7 @@ stream {
     map_hash_bucket_size 128;
     map $ssl_preread_server_name $sni_name {
         #domain
-        www.microsoft.com reality;
+        telegram.org reality;
         #domain
 
         #ocserv

config/v2ray.json

@@ -40,10 +40,10 @@
         "protocol": "vless",
         "settings": {
             "vnext": [{
-                "address": "",
+                "address": "~domain~",
                 "port": 443,
                 "users": [{
-                    "id": "",
+                    "id": "~uid~",
                     "alterId": 0,
                     "email": "t@t.tt",
                     "security": "auto",
@@ -56,11 +56,11 @@
             "network": "tcp",
             "security": "reality",
             "realitySettings": {
-                "serverName": "",
+                "serverName": "~server_name~",
                 "fingerprint": "chrome",
                 "show": false,
-                "publicKey": "",
-                "shortId": "",
+                "publicKey": "~public_key~",
+                "shortId": "~short_id~",
                 "spiderX": ""
             }
         },

config/xray.json

@@ -18,13 +18,13 @@
             "streamSettings": {
                 "network": "tcp",
                 "realitySettings": {
-                    "dest": "www.microsoft.com:443",
+                    "dest": "telegram.org:443",
                     "maxClientVer": "",
                     "maxTimeDiff": 0,
                     "minClientVer": "",
                     "privateKey": "",
                     "serverNames": [
-                        "www.microsoft.com"
+                        "telegram.org"
                     ],
                     "shortIds": [],
                     "show": false,

docker-compose.yml

@@ -16,6 +16,7 @@ networks:
                 - subnet: 10.10.1.0/24
 volumes:
     adguard:
+    warp:
 
 services:
     up:
@@ -302,7 +303,7 @@ services:
                 ipv4_address: 10.10.0.14
         logging: *default-logging
     ad:
-        image: mercurykd/vpnbot-ad:1.1
+        image: mercurykd/vpnbot-ad:1.2
         build:
             dockerfile: dockerfile/adguard.dockerfile
             args:
@@ -510,6 +511,7 @@ services:
             - ./config:/config
             - ./certs:/certs
             - ./scripts/start_wp.sh:/start_wp.sh
+            - warp:/var/lib/cloudflare-warp
         hostname: warp
         container_name: warp-${VER}
         depends_on:

scripts/start_wp.sh

@@ -7,10 +7,13 @@ if [ "$off" == 'null' ]
 then
     warp-svc > /dev/null &
     sleep 3
-    warp-cli --accept-tos registration new
-    if [ ! -z "$key" ]
+    if [ ! -f /var/lib/cloudflare-warp/conf.json ]
     then
-        warp-cli --accept-tos registration license $key
+        warp-cli --accept-tos registration new
+        if [ ! -z "$key" ]
+        then
+            warp-cli --accept-tos registration license $key
+        fi
     fi
     warp-cli --accept-tos mode proxy
     warp-cli --accept-tos connect

version

@@ -1,3 +1,56 @@
+04.11.2024 v1.93
+- adguardHome: сброс настроек
+- adguardHome: статус работоспособности
+- xray: выбор outbound для списков
+- xray: выбор outbound для final
+- xray: дефолтный домен reality microsoft.com заменен на telegram.org
+- xray: создание шаблона путем копирования оригинала
+- xray: редактирование шаблона прямо в боте
+30.10.2024 v1.92
+- возможность скачать origin шаблон
+30.10.2024 v1.91
+- кнопка nip.io для быстрой смены домена
+27.10.2024 v1.90
+- очередной фикс запуска warp после апдейта
+- правки фраз меню
+26.10.2024 v1.89
+- xray rulesset: фикс меню при отсутствующих правилах
+26.10.2024 v1.88
+- xray rulesset: дублирование кнопок текстом
+- singbox 1.10.1 для windows x64
+- фикс с включенным warp после апдейта
+- фикс с нерабочей кнопкой апдейта, обновится можно через /autoupdate если поймали не рабочую кнопку апдейта
+25.10.2024 v1.87
+- xray: в routes добавлен раздел proxy - зеркало раздела Pac
+25.10.2024 v1.86
+- фикс не срабатывания автобэкапа во время старта
+- adguard: вывод списка разрешенных клиентов
+- adguard: кнопка заполнения разрешенных клиентов - собирает все clientId со всех контейнеров
+- adguard: вывод статуса безопасного поиска
+- warp: при выключении удаляется регистрация deviceid
+24.10.2024 v1.85
+- фикс удаления состояния warp после рестарта
+- возможность перезаписать фразы меню бота через app/override.php
+24.10.2024 v1.84
+- фикс показа ссылки для openconnect
+24.10.2024 v1.83
+- фикс ошибок доступа контейнеров при автообновлении
+23.10.2024 v1.82
+- фикс автобэкапа
+23.10.2024 v1.81
+- фикс краша wireguard после апдейта
+23.10.2024 v1.80
+- фикс пустых правил для singbox
+23.10.2024 v1.79
+- улучшение процесса обновления
+23.10.2024 v1.78
+- фикс двойного импорта при обновлении, когда админов больше одного
+- рестарт бота сбрасывает очередь сообщений от телеграма
+- при старте статус крона не показывается, т.к он еще не успел запуститься
+23.10.2024 v1.77
+- вывод статуса cron
+- фикс с отправкой бэкапа при спецсимволах в названии бота
+- проверка формата времени в автобэкапе
 22.10.2024 v1.76
 - улучшение определения ip бота при старте
 22.10.2024 v1.75