From 28c5b9d5068502b98853ff9a77bec97943d43fda Mon Sep 17 00:00:00 2001 From: mercury Date: Mon, 14 Oct 2024 09:47:19 +0400 Subject: [PATCH] =?UTF-8?q?xray=20route:=20=D1=83=D1=87=D0=B5=D1=82=20?= =?UTF-8?q?=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=20=D0=B2=20pro?= =?UTF-8?q?cess=5Fname,=20package=5Fname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/bot.php | 4 ++-- version | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/bot.php b/app/bot.php index ba17a53..591d972 100644 --- a/app/bot.php +++ b/app/bot.php @@ -2428,7 +2428,7 @@ DNS-over-HTTPS with IP: if (!empty($domains)) { $conf = $this->getPacConf(); foreach ($domains as $k => $v) { - $conf[$type][$type == 'rulessetlist' ? trim($v) : idn_to_ascii(trim($v))] = true; + $conf[$type][in_array($type, ['rulessetlist', 'packagelist', 'processlist']) ? trim($v) : idn_to_ascii(trim($v))] = true; } ksort($conf[$type]); $this->setPacConf($conf); @@ -3680,7 +3680,7 @@ DNS-over-HTTPS with IP: foreach ($domains as $k => $v) { $data[] = [ [ - 'text' => $this->i18n($v ? 'on' : 'off') . ' ' . ($basename ? basename($k) . ' ' : '') . idn_to_utf8($k), + 'text' => $this->i18n($v ? 'on' : 'off') . ' ' . ($basename ? basename($k) . ' ' : '') . (in_array($type, ['rulessetlist', 'packagelist', 'processlist']) ? $k : idn_to_utf8($k)), 'callback_data' => "/change$type " . ($i + $page * $this->limit), ], [ diff --git a/version b/version index 39f3e50..4d9d971 100644 --- a/version +++ b/version @@ -1,3 +1,5 @@ +14.10.2024 v1.70 +- xray route: учет регистра в process_name, package_name 14.10.2024 v1.69 - xray route: добавлен список process_name 14.10.2024 v1.68