Compare commits

..

2 Commits

Author SHA1 Message Date
mercury 39643bf681 add html fake from settings menu 2024-10-06 23:19:05 +04:00
mercury 5f1fc6d912 override html mock 2024-10-06 21:04:13 +04:00
6 changed files with 46 additions and 7 deletions
+2 -1
View File
@@ -19,4 +19,5 @@ mirror/.env
update/*
!update/update.sh
override.env
override.env
override.html
+32 -2
View File
@@ -482,8 +482,8 @@ class Bot
case preg_match('~^/proxy$~', $this->input['callback'], $m):
$this->proxy();
break;
case preg_match('~^/showpac$~', $this->input['callback'], $m):
$this->showpac();
case preg_match('~^/addOverrideHtml$~', $this->input['callback'], $m):
$this->addOverrideHtml();
break;
case preg_match('~^/export$~', $this->input['callback'], $m):
$this->exportManual();
@@ -809,6 +809,30 @@ class Bot
];
}
public function addOverrideHtml()
{
$r = $this->send(
$this->input['chat'],
"@{$this->input['username']} attach html",
$this->input['message_id'],
reply: 'attach html',
);
$_SESSION['reply'][$r['result']['message_id']] = [
'start_message' => $this->input['message_id'],
'start_callback' => $this->input['callback_id'],
'callback' => 'setOverrideHtml',
'args' => [],
];
}
public function setOverrideHtml()
{
$r = $this->request('getFile', ['file_id' => $this->input['file_id']]);
if (!empty($f = file_get_contents($this->file . $r['result']['file_path']))) {
file_put_contents('/app/webapp/override.html', $f);
}
}
public function restartOcserv($conf)
{
file_put_contents('/config/ocserv.conf', $conf);
@@ -5518,6 +5542,12 @@ DNS-over-HTTPS with IP:
'callback_data' => "/backup",
],
];
$data[] = [
[
'text' => $this->i18n('fake html'),
'callback_data' => "/addOverrideHtml",
],
];
$data[] = [
[
'text' => $this->i18n('logs'),
+4
View File
@@ -337,4 +337,8 @@ $i = [
'en' => '🟢 have updates',
'ru' => '🟢 есть обновления',
],
'fake html' => [
'en' => 'fake html',
'ru' => 'фейк заглушка',
],
];
+2 -2
View File
@@ -31,7 +31,7 @@ http {
location / {
root /app;
index login.html;
index override.html login.html;
try_files $uri $uri/ =404;
}
location /adguard/ {
@@ -123,7 +123,7 @@ http {
# location / {
# root /app;
# index login.html;
# index override.html login.html;
# try_files $uri $uri/ =404;
# }
# location /adguard/ {
+2 -2
View File
@@ -31,7 +31,7 @@ http {
location / {
root /app;
index login.html;
index override.html login.html;
try_files $uri $uri/ =404;
}
location /adguard/ {
@@ -123,7 +123,7 @@ http {
# location / {
# root /app;
# index login.html;
# index override.html login.html;
# try_files $uri $uri/ =404;
# }
# location /adguard/ {
+4
View File
@@ -1,3 +1,7 @@
06.10.2024 v1.64.1
- добавление html заглушки через меню
06.10.2024 v1.64
- возможность установить свою html-заглушку
06.10.2024 v1.63
- приоритет правила block над остальными в стандартном шаблоне sing-box
30.09.2024 v1.62