Extract SystemMessages class from Util,

Improve messages on cloud provisioning
mikopbx · Apr 10, 2024 · a560587 · a560587
1 parent bfd7fd5
commit a560587
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 37 deletions.
diff --git a/src/AdminCabinet/Controllers/SessionController.php b/src/AdminCabinet/Controllers/SessionController.php
@@ -49,14 +49,13 @@ class SessionController extends BaseController
      */
     public function indexAction(): void
     {
-        $this->view->NameFromSettings
-            = PbxSettings::getValueByKey(PbxSettingsConstants::PBX_NAME);
-        $this->view->DescriptionFromSettings
-            = PbxSettings::getValueByKey(PbxSettingsConstants::PBX_DESCRIPTION);
-        if ($this->view->DescriptionFromSettings==='auth_DefaultCloudPasswordInstructions'){
-            $this->view->DescriptionFromSettings=$this->translation->_($this->view->DescriptionFromSettings);
+        $this->view->setVar('NameFromSettings', PbxSettings::getValueByKey(PbxSettingsConstants::PBX_NAME));
+        $description = PbxSettings::getValueByKey(PbxSettingsConstants::PBX_DESCRIPTION);
+        if ($description===PbxSettingsConstants::DEFAULT_CLOUD_PASSWORD_DESCRIPTION){
+            $description=$this->translation->_($description);
         }
-        $this->view->form = new LoginForm();
+        $this->view->setVar('DescriptionFromSettings', $description);
+        $this->view->setVar('form', new LoginForm());
     }
 
     /**

diff --git a/src/Common/Models/PbxSettingsConstants.php b/src/Common/Models/PbxSettingsConstants.php
@@ -151,4 +151,6 @@ abstract class PbxSettingsConstants
     const PBX_LICENSE = 'PBXLicense';
 
 
+    // Other
+    const DEFAULT_CLOUD_PASSWORD_DESCRIPTION = 'auth_DefaultCloudPasswordInstructions';
 }
diff --git a/src/Core/System/CloudProvisioning.php b/src/Core/System/CloudProvisioning.php
@@ -41,7 +41,7 @@ class CloudProvisioning
      */
     public static function start(): void
     {
-        if (self::checkItNeedToStartProvisioning()===false){
+        if (self::checkItNeedToStartProvisioning() === false) {
             $message = "  |- Provisioning was already completed.";
             SystemMessages::echoToTeletype($message);
             SystemMessages::teletypeEchoResult($message, SystemMessages::RESULT_SKIPPED);
@@ -70,6 +70,17 @@ public static function start(): void
         }
     }
 
+    /**
+     * Checks if provisioning is needed.
+     */
+    private static function checkItNeedToStartProvisioning(): bool
+    {
+        if (PbxSettings::findFirst('key="' . PbxSettingsConstants::CLOUD_PROVISIONING . '"') === null) {
+            return true;    // Need provision
+        }
+        return false;   // Provisioning is already completed
+    }
+
     /**
      * After provisioning, perform the following actions:
      * @param $provider mixed The provider object.
@@ -87,15 +98,4 @@ public static function afterProvisioning($provider, string $cloudName): void
         $provider->updatePbxSettings(PbxSettingsConstants::VIRTUAL_HARDWARE_TYPE, $cloudName);
 
     }
-
-    /**
-     * Checks if provisioning is needed.
-     */
-    private static function checkItNeedToStartProvisioning(): bool
-    {
-        if (PbxSettings::findFirst('key="' . PbxSettingsConstants::CLOUD_PROVISIONING . '"') === null) {
-            return true;    // Need provision
-        }
-        return false;   // Provisioning is already completed
-    }
 }
diff --git a/src/Core/System/CloudProvisioning/CloudProvider.php b/src/Core/System/CloudProvisioning/CloudProvider.php
@@ -148,6 +148,7 @@ protected function updateWebPassword(string $webPassword): void
         }
         $this->updatePbxSettings(PbxSettingsConstants::WEB_ADMIN_PASSWORD, $webPassword);
         $this->updatePbxSettings(PbxSettingsConstants::CLOUD_INSTANCE_ID, $webPassword);
+        $this->updatePbxSettings(PbxSettingsConstants::PBX_DESCRIPTION, PbxSettingsConstants::DEFAULT_CLOUD_PASSWORD_DESCRIPTION);
     }
 
 }
diff --git a/src/Core/System/RootFS/etc/rc/bootup b/src/Core/System/RootFS/etc/rc/bootup
@@ -19,21 +19,17 @@
  */
 
 namespace MikoPBX\Core\RootFS\etc\rc;
-use MikoPBX\Core\System\{Processes, SystemMessages, Util, SystemLoader};
+use MikoPBX\Core\System\{Processes, Util, SystemLoader};
 
 require_once('Globals.php');
 
-// Echo message with syslog
-SystemMessages::echoWithSyslog(' - Start /etc/rc/bootup ...'.PHP_EOL);
-
 // Sleep if /tmp/ejectcd file exists
 if(file_exists('/tmp/ejectcd')){
     sleep(15);
 }
 
-// Create instance of SystemLoader and start the system
+// Create an instance of SystemLoader and start the system
 $mikoPBX = new SystemLoader();
-SystemMessages::echoWithSyslog(' - Start SystemLoader\startSystem...'.PHP_EOL);
 $result = $mikoPBX->startSystem();
 
 // Run /etc/rc/bootup_pbx in background if system start is successful

diff --git a/src/Core/System/RootFS/etc/rc/bootup_pbx b/src/Core/System/RootFS/etc/rc/bootup_pbx
@@ -20,12 +20,9 @@
 
 namespace MikoPBX\Core\RootFS\etc\rc;
 
-use MikoPBX\Core\System\{SystemMessages, SystemLoader};
+use MikoPBX\Core\System\SystemLoader;
 require_once('Globals.php');
 
-SystemMessages::echoWithSyslog(' - Start /etc/rc/bootup_pbx ...'.PHP_EOL);
-SystemMessages::echoWithSyslog(' - Start SystemLoader ...'.PHP_EOL);
-
 // Create instance of SystemLoader and start MikoPBX
 $mikoPBX = new SystemLoader();
 $mikoPBX->startMikoPBX();
diff --git a/src/Core/System/SystemLoader.php b/src/Core/System/SystemLoader.php
@@ -244,12 +244,11 @@ public function startSystem(): bool
 
         // Start cloud provisioning
         if (!$this->isDocker) {
-            $this->echoStartMsg(' - Cloud provisioning...'."\n");
+            $this->echoStartMsg(' - Cloud provisioning...'.PHP_EOL);
             CloudProvisioning::start();
-            $this->echoResultMsg();
 
             // Connect storage in a cloud if needed
-            $this->echoStartMsg(' - Auto connect storage for a cloud ..."\n"');
+            $this->echoStartMsg(' - Auto connect storage for a cloud ...'.PHP_EOL);
             $connectResult = Storage::connectStorageInCloud();
             $this->echoResultMsg($connectResult);
         }

diff --git a/src/Core/Workers/Libs/WorkerModelsEvents/Actions/ReloadCloudDescriptionAction.php b/src/Core/Workers/Libs/WorkerModelsEvents/Actions/ReloadCloudDescriptionAction.php
@@ -8,8 +8,6 @@
 
 class ReloadCloudDescriptionAction implements ReloadActionInterface
 {
-    public const DEFAULT_PASSWORD_DESCRIPTION = 'auth_DefaultCloudPasswordInstructions';
-
     /**
      * Reset default cloud password instructions
      *
@@ -21,11 +19,12 @@ public function execute(array $parameters = []): void
         $description = PbxSettings::getValueByKey(PbxSettingsConstants::PBX_DESCRIPTION);
         $cloudInstanceId = PbxSettings::getValueByKey(PbxSettingsConstants::CLOUD_INSTANCE_ID);
         $webAdminPassword = PbxSettings::getValueByKey(PbxSettingsConstants::WEB_ADMIN_PASSWORD);
+        $defaultDescription = PbxSettingsConstants::DEFAULT_CLOUD_PASSWORD_DESCRIPTION;
 
-        if ($cloudInstanceId === $webAdminPassword && $description!==self::DEFAULT_PASSWORD_DESCRIPTION){
+        if ($cloudInstanceId === $webAdminPassword && $description!==$defaultDescription){
             $config = new MikoPBXConfig();
-            $config->setGeneralSettings(PbxSettingsConstants::PBX_DESCRIPTION, self::DEFAULT_PASSWORD_DESCRIPTION);
-        } elseIf ($description === self::DEFAULT_PASSWORD_DESCRIPTION) {
+            $config->setGeneralSettings(PbxSettingsConstants::PBX_DESCRIPTION, $defaultDescription);
+        } elseIf ($description === $defaultDescription) {
             $config = new MikoPBXConfig();
             $config->resetGeneralSettings(PbxSettingsConstants::PBX_DESCRIPTION);
         }