Fix some errors

mikopbx · Apr 14, 2024 · 1e71313 · 1e71313
1 parent b26f3bc
commit 1e71313
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/src/Common/Messages/en.php b/src/Common/Messages/en.php
@@ -914,7 +914,7 @@
     'sf_CustomSounds' => 'Audio files',
     'sf_MusicOnHold' => 'Music on hold',
     'MIKO_PBX' => 'MIKO PBX',
-    'PBX is running in Live or Recovery mode' => 'The system is loaded in recovery mode',
+    'PBX is running in Live or Recovery mode' => 'The system is loaded in recovery mode (Live CD)',
     'this_is' => 'This is ',
     'Change language' => 'Change language / Смена языка интерфейса',
     'Check storage' => 'Check disk for errors',

diff --git a/src/Common/Messages/ru.php b/src/Common/Messages/ru.php
@@ -1146,7 +1146,7 @@
     'topMenu_SearchPlaceholder' => 'Введите поисковый запрос',
     'topMenu_SidebarButton' => 'Меню',
     'MIKO_PBX' => 'МИКО PBX',
-    'PBX is running in Live or Recovery mode' => 'Система загружена в режиме восстановления',
+    'PBX is running in Live or Recovery mode' => 'Система загружена в режиме восстановления (Live CD)',
     'LAN IP address assigned via DHCP' => 'LAN IP назначен через DHCP сервер',
     'LAN IP address' => 'LAN IP установлен вручную',
     'VLAN IP address assigned via' => 'VLAN IP: работает через',

diff --git a/src/Core/System/PBXInstaller.php b/src/Core/System/PBXInstaller.php
@@ -80,8 +80,6 @@ public function run()
                 $this->proceedInstallation();
             }
         }
-
-
     }
 
     /**

diff --git a/src/Core/System/PBXRecovery.php b/src/Core/System/PBXRecovery.php
@@ -55,7 +55,7 @@ public function __construct()
     {
         $this->fp      = fopen('php://stdin', 'r');
         $this->storage = new Storage();
-        $this->DEVICE  = $this->storage->getRecoverDiskName();
+        $this->DEVICE  = basename($this->storage->getRecoverDiskName());
         $this->VERSION = trim(file_get_contents('/offload/version'));
     }
 

diff --git a/src/Core/System/SystemMessages.php b/src/Core/System/SystemMessages.php
@@ -307,7 +307,7 @@ private static function showCredentials(int $lineWidth): string {
             $adminUser = PbxSettings::getValueByKey(PbxSettingsConstants::WEB_ADMIN_LOGIN);
             $info = self::formatLine("Default web credentials:", $lineWidth);
             $info .= PHP_EOL . self::formatLine("   Login: $adminUser", $lineWidth);
-            $info .= PHP_EOL . self::formatLine("   Password: $cloudInstanceId", $lineWidth);
+            $info .= PHP_EOL . self::formatLine("   Password: $webAdminPassword", $lineWidth);
             return $info;
         }
         return '';