From 9da11e2b3587f8e2d43ae761867f1382efa92650 Mon Sep 17 00:00:00 2001
From: mercury <mercury.kd@gmail.com>
Date: Wed, 6 Nov 2024 23:06:06 +0400
Subject: [PATCH] fix adguard password

---
 app/bot.php | 4 +++-
 version     | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/bot.php b/app/bot.php
index 70c7987..d59cada 100644
--- a/app/bot.php
+++ b/app/bot.php
@@ -2088,10 +2088,12 @@ class Bot
     public function adguardSync()
     {
         $pac = $this->getPacConf();
+        $pac['adpswd'] = $pac['adpswd'] ?: substr(hash('md5', time()), 0, 10);
+        $this->setPacConf($pac);
         $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);
+        $c['users'][0]['password'] = password_hash($pac['adpswd'], PASSWORD_DEFAULT);
         if (!empty($ssl) && !empty($pac['domain']) && empty($c['tls']['enabled'])) {
             $c['tls']['enabled']     = true;
             $c['tls']['server_name'] = $pac['domain'];
diff --git a/version b/version
index 1afad28..3bc75b4 100644
--- a/version
+++ b/version
@@ -1,3 +1,6 @@
+06.11.2024 v1.96
+- фикс пароля adguard
+- таймаоут для проверки статуса adguard
 04.11.2024 v1.95
 - отключение портов контейнеров из меню
 - перезагрузка из меню