Compare commits

...

2 Commits

Author SHA1 Message Date
mercury ca37736cd5 fix menu rulesset with empty rules 2024-10-26 23:14:03 +04:00
mercury 1c4fff50d1 fix menu warp after update 2024-10-26 22:47:43 +04:00
2 changed files with 12 additions and 3 deletions
+10 -3
View File
@@ -3701,7 +3701,8 @@ DNS-over-HTTPS with IP:
{
$text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> rulesset list';
[$data, $text] = $this->listPac('rulessetlist', $page, 'xtlsrulesset', 1);
[$data, $tmp] = $this->listPac('rulessetlist', $page, 'xtlsrulesset', 1);
$text = array_merge($text, $tmp ?: []);
$data[] = [
[
'text' => $this->i18n('back'),
@@ -4705,12 +4706,18 @@ DNS-over-HTTPS with IP:
$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'));
if (empty($inversion)) {
$this->ssh('warp-cli --accept-tos registration delete 2>&1', 'wp');
} 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($inversion)) {
$this->warp();
}
}
public function warp()
+2
View File
@@ -1,3 +1,5 @@
26.10.2024 v1.89
- xray rulesset: фикс меню при отсутствующих правилах
26.10.2024 v1.88
- xray rulesset: дублирование кнопок текстом
- singbox 1.10.1 для windows x64