mikopbx / Core

src/Modules/Setup/PbxExtensionSetupBase.php

Spacing +22 added lines, -22 removed lines

@@ -114,8 +114,8 @@ 
         $this->messages = [];
         $this->db      = $this->di->getShared('db');
         $this->config  = $this->di->getShared('config');
-        $this->license =  $this->di->getShared('license');
-        $this->moduleDir = $this->config->path('core.modulesDir') . '/' . $this->moduleUniqueID;
+        $this->license = $this->di->getShared('license');
+        $this->moduleDir = $this->config->path('core.modulesDir').'/'.$this->moduleUniqueID;
         $settings_file = "{$this->moduleDir}/module.json";
         if (file_exists($settings_file)) {
             $module_settings = json_decode(file_get_contents($settings_file), true);
@@ -139,7 +139,7 @@ 
             }
         }
 
-        $this->messages  = [];
+        $this->messages = [];
 
 
     }
@@ -154,21 +154,21 @@ 
     {
         $result = true;
         try {
-            if ( ! $this->activateLicense()) {
+            if (!$this->activateLicense()) {
                 $this->messages[] = 'License activate error';
                 $result           = false;
             }
-            if ( ! $this->installFiles()) {
+            if (!$this->installFiles()) {
                 $this->messages[] = ' installFiles error';
                 $result           = false;
             }
-            if ( ! $this->installDB()) {
+            if (!$this->installDB()) {
                 $this->messages[] = ' installDB error';
                 $result           = false;
             }
             $this->fixFilesRights();
         } catch (\Exception $exception) {
-            $result         = false;
+            $result = false;
             $this->messages[] = $exception->getMessage();
         }
 
@@ -199,7 +199,7 @@ 
         PbxExtensionUtils::createAgiBinSymlinks($this->moduleUniqueID);
 
         // Restore database settings
-        $modulesDir          = $this->config->path('core.modulesDir');
+        $modulesDir = $this->config->path('core.modulesDir');
         $backupPath = "{$modulesDir}/Backup/{$this->moduleUniqueID}";
         if (is_dir($backupPath)) {
             $cpPath = Util::which('cp');
@@ -220,7 +220,7 @@ 
 
         // Add executable right to module's binary
         $binDir = $this->moduleDir.'/bin';
-        if (is_dir($binDir)){
+        if (is_dir($binDir)) {
             Util::addExecutableRights($binDir);
         }
 
@@ -253,16 +253,16 @@ 
     {
         $result = true;
         try {
-            if ( ! $this->unInstallDB($keepSettings)) {
+            if (!$this->unInstallDB($keepSettings)) {
                 $this->messages[] = ' unInstallDB error';
                 $result           = false;
             }
-            if ($result && ! $this->unInstallFiles($keepSettings)) {
+            if ($result && !$this->unInstallFiles($keepSettings)) {
                 $this->messages[] = ' unInstallFiles error';
                 $result           = false;
             }
         } catch (\Exception $exception) {
-            $result         = false;
+            $result = false;
             $this->messages[] = $exception->getMessage();
         }
 
@@ -310,7 +310,7 @@ 
     {
         $cpPath = Util::which('cp');
         $rmPath = Util::which('rm');
-        $modulesDir          = $this->config->path('core.modulesDir');
+        $modulesDir = $this->config->path('core.modulesDir');
         $backupPath = "{$modulesDir}/Backup/{$this->moduleUniqueID}";
         Util::mwExec("{$rmPath} -rf {$backupPath}");
         if ($keepSettings) {
@@ -323,21 +323,21 @@ 
         // IMG
         $imgCacheDir = appPath('sites/admin-cabinet/assets/img/cache');
         $moduleImageCacheDir = "{$imgCacheDir}/{$this->moduleUniqueID}";
-        if (file_exists($moduleImageCacheDir)){
+        if (file_exists($moduleImageCacheDir)) {
             unlink($moduleImageCacheDir);
         }
 
         // CSS
         $cssCacheDir = appPath('sites/admin-cabinet/assets/css/cache');
         $moduleCSSCacheDir = "{$cssCacheDir}/{$this->moduleUniqueID}";
-        if (file_exists($moduleCSSCacheDir)){
+        if (file_exists($moduleCSSCacheDir)) {
             unlink($moduleCSSCacheDir);
         }
 
         // JS
         $jsCacheDir = appPath('sites/admin-cabinet/assets/js/cache');
         $moduleJSCacheDir = "{$jsCacheDir}/{$this->moduleUniqueID}";
-        if (file_exists($moduleJSCacheDir)){
+        if (file_exists($moduleJSCacheDir)) {
             unlink($moduleJSCacheDir);
         }
 
@@ -371,7 +371,7 @@ 
         }
 
         $module = PbxExtensionModules::findFirstByUniqid($this->moduleUniqueID);
-        if ( ! $module) {
+        if (!$module) {
             $module           = new PbxExtensionModules();
             $module->name     = $this->locString("Breadcrumb{$this->moduleUniqueID}");
             $module->disabled = '1';
@@ -397,7 +397,7 @@ 
         $language             = substr(PbxSettings::getValueByKey('WebAdminLanguage'), 0, 2);
         $translates           = [];
         $extensionsTranslates = [[]];
-        $results              = glob($this->moduleDir . '/{Messages}/en.php', GLOB_BRACE);
+        $results              = glob($this->moduleDir.'/{Messages}/en.php', GLOB_BRACE);
         foreach ($results as $path) {
             $langArr = require $path;
             if (is_array($langArr)) {
@@ -409,7 +409,7 @@ 
         }
         if ($language !== 'en') {
             $additionalTranslates = [[]];
-            $results              = glob($this->moduleDir . "/{Messages}/{$language}.php", GLOB_BRACE);
+            $results              = glob($this->moduleDir."/{Messages}/{$language}.php", GLOB_BRACE);
             foreach ($results as $path) {
                 $langArr = require $path;
                 if (is_array($langArr)) {
@@ -440,13 +440,13 @@ 
         // Add new connection for this module after add new Models folder
         RegisterDIServices::recreateModulesDBConnections();
 
-        $results = glob($this->moduleDir . '/Models/*.php', GLOB_NOSORT);
+        $results = glob($this->moduleDir.'/Models/*.php', GLOB_NOSORT);
         $dbUpgrade = new UpdateDatabase();
         foreach ($results as $file) {
             $className        = pathinfo($file)['filename'];
             $moduleModelClass = "\\Modules\\{$this->moduleUniqueID}\\Models\\{$className}";
             $upgradeResult = $dbUpgrade->createUpdateDbTableByAnnotations($moduleModelClass);
-            if (!$upgradeResult){
+            if (!$upgradeResult) {
                 return false;
             }
 
@@ -472,7 +472,7 @@ 
             $menuSettings      = new PbxSettings();
             $menuSettings->key = $menuSettingsKey;
         }
-        $value               = [
+        $value = [
             'uniqid'        => $this->moduleUniqueID,
             'href'          => "/admin-cabinet/$unCamelizedControllerName",
             'group'         => 'maintenance',

src/Modules/PbxExtensionUtils.php

Spacing +11 added lines, -11 removed lines

@@ -26,8 +26,8 @@ 
      */
     public static function isEnabled(string $moduleUniqueID):bool
     {
-        $result        = PbxExtensionModules::findFirstByUniqid($moduleUniqueID);
-        return ($result!==false && $result->disabled !== '1');
+        $result = PbxExtensionModules::findFirstByUniqid($moduleUniqueID);
+        return ($result !== false && $result->disabled !== '1');
     }
 
     /**
@@ -39,12 +39,12 @@ 
      */
     public static function getModuleDir(string $moduleUniqueID):string
     {
-        $di      = Di::getDefault();
-        if ($di === null){
+        $di = Di::getDefault();
+        if ($di === null) {
             return "/tmp/{$moduleUniqueID}";
         }
-        $config  = $di->getShared('config');
-        $modulesDir    = $config->path('core.modulesDir');
+        $config = $di->getShared('config');
+        $modulesDir = $config->path('core.modulesDir');
 
         return"{$modulesDir}/{$moduleUniqueID}";
     }
@@ -54,7 +54,7 @@ 
      *
      * @param string $moduleUniqueID
      */
-    public static function  createAssetsSymlinks (string $moduleUniqueID):void
+    public static function  createAssetsSymlinks(string $moduleUniqueID):void
     {
         $moduleDir = self::getModuleDir($moduleUniqueID);
 
@@ -62,7 +62,7 @@ 
         $moduleImageDir      = "{$moduleDir}/public/assets/img";
         $imgCacheDir = appPath('sites/admin-cabinet/assets/img/cache');
         $moduleImageCacheDir = "{$imgCacheDir}/{$moduleUniqueID}";
-        if (file_exists($moduleImageCacheDir)){
+        if (file_exists($moduleImageCacheDir)) {
             unlink($moduleImageCacheDir);
         }
         if (file_exists($moduleImageDir)) {
@@ -72,7 +72,7 @@ 
         $moduleCSSDir      = "{$moduleDir}/public/assets/css";
         $cssCacheDir = appPath('sites/admin-cabinet/assets/css/cache');
         $moduleCSSCacheDir = "{$cssCacheDir}/{$moduleUniqueID}";
-        if (file_exists($moduleCSSCacheDir)){
+        if (file_exists($moduleCSSCacheDir)) {
             unlink($moduleCSSCacheDir);
         }
         if (file_exists($moduleCSSDir)) {
@@ -82,7 +82,7 @@ 
         $moduleJSDir      = "{$moduleDir}/public/assets/js";
         $jsCacheDir = appPath('sites/admin-cabinet/assets/js/cache');
         $moduleJSCacheDir = "{$jsCacheDir}/{$moduleUniqueID}";
-        if (file_exists($moduleJSCacheDir)){
+        if (file_exists($moduleJSCacheDir)) {
             unlink($moduleJSCacheDir);
         }
         if (file_exists($moduleJSDir)) {
@@ -110,7 +110,7 @@ 
         $moduleAgiBinDir = "{$moduleDir}/agi-bin";
         $files           = glob("$moduleAgiBinDir/*.{php}", GLOB_BRACE);
         foreach ($files as $file) {
-            $newFilename = $agiBinDir . '/' . pathinfo($file)['filename'];
+            $newFilename = $agiBinDir.'/'.pathinfo($file)['filename'];
             Util::createUpdateSymlink($file, $newFilename);
         }
     }

src/Core/System/System.php

Spacing +3 added lines, -3 removed lines

@@ -185,7 +185,7 @@ 
      */
     public function timezoneConfigure(): void
     {
-        $timezone = $this->mikoPBXConfig->getGeneralSettings('PBXTimezone');;
+        $timezone = $this->mikoPBXConfig->getGeneralSettings('PBXTimezone'); ;
         if (file_exists('/etc/TZ')) {
             unlink("/etc/TZ");
         }
@@ -194,7 +194,7 @@ 
         }
         if ($timezone) {
             $zone_file = "/usr/share/zoneinfo/{$timezone}";
-            if ( ! file_exists($zone_file)) {
+            if (!file_exists($zone_file)) {
                 return;
             }
             $cpPath = Util::which('cp');
@@ -270,7 +270,7 @@ 
         $workerSafeScriptsPath = Util::getFilePathByClassName(WorkerSafeScriptsCore::class);
         $phpPath               = Util::which('php');
         $WorkerSafeScripts     = "{$phpPath} -f {$workerSafeScriptsPath} restart > /dev/null 2> /dev/null";
-        Util::mwExecBg($WorkerSafeScripts,'/dev/null');
+        Util::mwExecBg($WorkerSafeScripts, '/dev/null');
         exit(0);
     }
 }

src/Core/System/Storage.php

Spacing +59 added lines, -59 removed lines

@@ -78,16 +78,16 @@ 
     public static function isStorageDisk($device): bool
     {
         $result = false;
-        if ( ! file_exists("{$device}")) {
+        if (!file_exists("{$device}")) {
             return $result;
         }
 
-        $tmp_dir = '/tmp/mnt_' . time();
+        $tmp_dir = '/tmp/mnt_'.time();
         Util::mwMkdir($tmp_dir);
         $out = [];
 
         $storage  = new Storage();
-        $uid_part = 'UUID=' . $storage->getUuid($device) . '';
+        $uid_part = 'UUID='.$storage->getUuid($device).'';
         $format   = $storage->getFsType($device);
         if ($format === '') {
             return false;
@@ -106,7 +106,7 @@ 
             Util::mwExec("{$umountPath} {$device}");
         }
 
-        if ( ! self::isStorageDiskMounted($device)) {
+        if (!self::isStorageDiskMounted($device)) {
             Util::mwExec("{$rmPath} -rf '{$tmp_dir}'");
         }
 
@@ -236,9 +236,9 @@ 
         $timeoutPath = Util::which('timeout');
         $sshfsPath   = Util::which('sshfs');
 
-        $command = "{$timeoutPath} -t 3 {$sshfsPath} -p {$port} -o nonempty -o password_stdin -o 'StrictHostKeyChecking=no' " .
-            "{$user}@{$host}:{$remout_dir} {$local_dir} << EOF\n" .
-            "{$pass}\n" .
+        $command = "{$timeoutPath} -t 3 {$sshfsPath} -p {$port} -o nonempty -o password_stdin -o 'StrictHostKeyChecking=no' ".
+            "{$user}@{$host}:{$remout_dir} {$local_dir} << EOF\n".
+            "{$pass}\n".
             "EOF\n";
         // file_put_contents('/tmp/sshfs_'.$host, $command);
         Util::mwExec($command, $out);
@@ -270,19 +270,19 @@ 
 
         // Собираем строку подключения к ftp.
         $auth_line = '';
-        if ( ! empty($user)) {
-            $auth_line .= 'user="' . $user;
-            if ( ! empty($pass)) {
+        if (!empty($user)) {
+            $auth_line .= 'user="'.$user;
+            if (!empty($pass)) {
                 $auth_line .= ":{$pass}";
             }
             $auth_line .= '",';
         }
 
-        $connect_line = 'ftp://' . $host;
-        if ( ! empty($port)) {
+        $connect_line = 'ftp://'.$host;
+        if (!empty($port)) {
             $connect_line .= ":{$port}";
         }
-        if ( ! empty($remout_dir)) {
+        if (!empty($remout_dir)) {
             $connect_line .= "$remout_dir";
         }
 
@@ -308,10 +308,10 @@ 
      */
     public static function mkfs_disk($dev)
     {
-        if ( ! file_exists($dev)) {
+        if (!file_exists($dev)) {
             $dev = "/dev/{$dev}";
         }
-        if ( ! file_exists($dev)) {
+        if (!file_exists($dev)) {
             return false;
         }
         $dir = '';
@@ -346,7 +346,7 @@ 
             Util::mwExec("/sbin/shell_functions.sh 'killprocesses' '$dir' -TERM 0");
             Util::mwExec("{$umountPath} {$dir}");
         }
-        $result = ! self::isStorageDiskMounted($dir);
+        $result = !self::isStorageDiskMounted($dir);
         if ($result && file_exists($dir)) {
             // Если диск не смонтирован, то удаляем каталог.
             Util::mwExec("{$rmPath} -rf '{$dir}'");
@@ -416,7 +416,7 @@ 
      */
     public static function statusMkfs($dev): string
     {
-        if ( ! file_exists($dev)) {
+        if (!file_exists($dev)) {
             $dev = "/dev/{$dev}";
         }
         $out      = [];
@@ -439,7 +439,7 @@ 
         }
         $config        = $di->getShared('config');
         $phpSessionDir = $config->path('www.phpSessionDir');
-        if ( ! empty($phpSessionDir)) {
+        if (!empty($phpSessionDir)) {
             $rmPath = Util::which('rm');
             Util::mwExec("{$rmPath} -rf {$phpSessionDir}/*");
         }
@@ -455,7 +455,7 @@ 
         // Создание больщого файла для тестов.
         // head -c 1500MB /dev/urandom > /storage/usbdisk1/big_file.mp3
         foreach ($hdd as $disk) {
-            if ($disk['sys_disk'] === true && ! self::isStorageDiskMounted("{$disk['id']}4")) {
+            if ($disk['sys_disk'] === true && !self::isStorageDiskMounted("{$disk['id']}4")) {
                 // Это системный диск (4ый раздел). Он не смонтирован.
                 continue;
             }
@@ -479,7 +479,7 @@ 
                 Util::restartPHPWorker(WorkerRemoveOldRecords::class);
             }
 
-            if ( ! $need_alert) {
+            if (!$need_alert) {
                 continue;
             }
 
@@ -519,8 +519,8 @@ 
                 $m_size      = round(($disk_data[1] + $disk_data[2]) / 1024, 1);
                 $res_disks[] = [
                     'id'         => $disk_data[0],
-                    'size'       => "" . $m_size,
-                    'size_text'  => "" . $m_size . " Mb",
+                    'size'       => "".$m_size,
+                    'size_text'  => "".$m_size." Mb",
                     'vendor'     => 'Debian',
                     'mounted'    => '/storage/usbdisk1',
                     'free_space' => round($disk_data[2] / 1024, 1),
@@ -542,8 +542,8 @@ 
 
         $cf_disk   = '';
         $varEtcDir = $this->config->path('core.varEtcDir');
-        if (file_exists($varEtcDir . '/cfdevice')) {
-            $cf_disk = trim(file_get_contents($varEtcDir . '/cfdevice'));
+        if (file_exists($varEtcDir.'/cfdevice')) {
+            $cf_disk = trim(file_get_contents($varEtcDir.'/cfdevice'));
         }
 
         foreach ($disks as $disk) {
@@ -559,8 +559,8 @@ 
             $sys_disk = ($cf_disk == $disk);
 
             $mb_size = 0;
-            if (is_file("/sys/block/" . $disk . "/size")) {
-                $original_size = trim(file_get_contents("/sys/block/" . $disk . "/size"));
+            if (is_file("/sys/block/".$disk."/size")) {
+                $original_size = trim(file_get_contents("/sys/block/".$disk."/size"));
                 $original_size = ($original_size * 512 / 1024 / 1024);
                 $mb_size       = $original_size;
             }
@@ -667,14 +667,14 @@ 
     private function getVendorDisk($disk): string
     {
         $temp_vendor = [];
-        if (is_file("/sys/block/" . $disk . "/device/vendor")) {
-            $data = trim(file_get_contents("/sys/block/" . $disk . "/device/vendor"));
+        if (is_file("/sys/block/".$disk."/device/vendor")) {
+            $data = trim(file_get_contents("/sys/block/".$disk."/device/vendor"));
             if ($data != '') {
                 $temp_vendor[] = trim(str_replace(',', ' ', $data));
             }
         }
-        if (is_file("/sys/block/" . $disk . "/device/model")) {
-            $data = trim(file_get_contents("/sys/block/" . $disk . "/device/model"));
+        if (is_file("/sys/block/".$disk."/device/model")) {
+            $data = trim(file_get_contents("/sys/block/".$disk."/device/model"));
             if ($data != '') {
                 $temp_vendor[] = trim(str_replace(',', ' ', $data));
             }
@@ -682,8 +682,8 @@ 
         if (count($temp_vendor) == 0) {
             $temp_vendor[] = $disk;
         }
-        if (is_file("/sys/block/" . $disk . "/device/type")) {
-            $data = trim(file_get_contents("/sys/block/" . $disk . "/device/type"));
+        if (is_file("/sys/block/".$disk."/device/type")) {
+            $data = trim(file_get_contents("/sys/block/".$disk."/device/type"));
             if ($data != '') {
                 $temp_vendor[] = trim(str_replace(',', ' ', $data));
             }
@@ -709,7 +709,7 @@ 
         Util::mwExec("{$dfPath} -m | {$grepPath} {$hdd} | {$awkPath} '{print $4}'", $out);
         $result = 0;
         foreach ($out as $res) {
-            if ( ! is_numeric($res)) {
+            if (!is_numeric($res)) {
                 continue;
             }
             $result += (1 * $res);
@@ -746,19 +746,19 @@ 
                 $path_size_info = $tmp_path;
             }
             if (empty($path_size_info)) {
-                $tmp_path = "/sys/block/" . substr($dev, 0, 3) . "/{$dev}/size";
+                $tmp_path = "/sys/block/".substr($dev, 0, 3)."/{$dev}/size";
                 if (file_exists($tmp_path)) {
                     $path_size_info = $tmp_path;
                 }
             }
 
-            if ( ! empty($path_size_info)) {
+            if (!empty($path_size_info)) {
                 $original_size = trim(file_get_contents($path_size_info));
                 $original_size = ($original_size * 512 / 1024 / 1024);
                 $mb_size       = $original_size;
             }
 
-            $tmp_dir = "/tmp/{$dev}_" . time();
+            $tmp_dir = "/tmp/{$dev}_".time();
             $out     = [];
 
             $fs           = null;
@@ -815,7 +815,7 @@ 
         }
         Util::mwMkdir($dir);
 
-        if ( ! file_exists($dir)) {
+        if (!file_exists($dir)) {
             Util::sysLogMsg('Storage', "Unable mount $dev $format to $dir. Unable create dir.");
 
             return false;
@@ -826,7 +826,7 @@ 
             Util::mwExec("{$mountNtfs3gPath} /dev/{$dev} {$dir}", $out);
         } else {
             $storage   = new Storage();
-            $uid_part  = 'UUID=' . $storage->getUuid("/dev/{$dev}") . '';
+            $uid_part  = 'UUID='.$storage->getUuid("/dev/{$dev}").'';
             $mountPath = Util::which('mount');
             Util::mwExec("{$mountPath} -t {$format} {$uid_part} {$dir}", $out);
         }
@@ -846,8 +846,8 @@ 
             unlink($storage_dev_file);
         }
 
-        if (file_exists($varEtcDir . '/cfdevice')) {
-            $cf_disk = trim(file_get_contents($varEtcDir . '/cfdevice'));
+        if (file_exists($varEtcDir.'/cfdevice')) {
+            $cf_disk = trim(file_get_contents($varEtcDir.'/cfdevice'));
         }
 
         $disks = $this->getDiskSettings();
@@ -861,18 +861,18 @@ 
                 // Если это системный диск, то пытаемся подключить раздел 4.
                 $dev = "{$disk['device']}4";
             }
-            if ( ! $this->hddExists($dev)) {
+            if (!$this->hddExists($dev)) {
                 // Диск не существует.
                 continue;
             }
-            if ($disk['media'] === '1' || ! file_exists($storage_dev_file)) {
+            if ($disk['media'] === '1' || !file_exists($storage_dev_file)) {
                 file_put_contents($storage_dev_file, "/storage/usbdisk{$disk['id']}");
                 $this->updateConfigWithNewMountPoint("/storage/usbdisk{$disk['id']}");
             }
 
-            $str_uid     = 'UUID=' . $this->getUuid($dev) . '';
+            $str_uid     = 'UUID='.$this->getUuid($dev).'';
             $format_p4   = $this->getFsType($dev);
-            $conf        .= "{$str_uid} /storage/usbdisk{$disk['id']} {$format_p4} async,rw 0 0\n";
+            $conf .= "{$str_uid} /storage/usbdisk{$disk['id']} {$format_p4} async,rw 0 0\n";
             $mount_point = "/storage/usbdisk{$disk['id']}";
             Util::mwMkdir($mount_point);
         }
@@ -974,11 +974,11 @@ 
         Util::mwMkdir('/storage');
         $chmodPath = Util::which('chmod');
         Util::mwExec("{$chmodPath} 755 /storage");
-        if ( ! file_exists($varEtcDir . '/cfdevice')) {
+        if (!file_exists($varEtcDir.'/cfdevice')) {
             return;
         }
         $fstab     = '';
-        $file_data = file_get_contents($varEtcDir . '/cfdevice');
+        $file_data = file_get_contents($varEtcDir.'/cfdevice');
         $cf_disk   = trim($file_data);
         if ('' == $cf_disk) {
             return;
@@ -988,9 +988,9 @@ 
         $part3 = (strpos($cf_disk, 'mmcblk') !== false) ? "{$cf_disk}p3" : "{$cf_disk}3"; // Conf
 
 
-        $uid_part2 = 'UUID=' . $this->getUuid("/dev/{$part2}") . '';
+        $uid_part2 = 'UUID='.$this->getUuid("/dev/{$part2}").'';
         $format_p2 = $this->getFsType($part2);
-        $uid_part3 = 'UUID=' . $this->getUuid("/dev/{$part3}") . '';
+        $uid_part3 = 'UUID='.$this->getUuid("/dev/{$part3}").'';
         $format_p3 = $this->getFsType($part3);
 
         // $fstab .= "/dev/{$part1} /cf msdos ro 1 1\n"; // НЕ МОНТИРУЕМ!
@@ -1035,12 +1035,12 @@ 
             }
         }
 
-        if ( ! empty($path)) {
+        if (!empty($path)) {
             Util::mwMkdir($path);
         }
 
         $downloadCacheDir = appPath('sites/pbxcore/files/cache');
-        if ( ! $isLiveCd) {
+        if (!$isLiveCd) {
             Util::mwMkdir($downloadCacheDir);
             Util::createUpdateSymlink($this->config->path('www.downloadCacheDir'), $downloadCacheDir);
         }
@@ -1078,13 +1078,13 @@ 
     public function createAssetsSymlinks(): void
     {
         $jsCacheDir = appPath('sites/admin-cabinet/assets/js/cache');
-        Util::createUpdateSymlink($this->config->path('adminApplication.assetsCacheDir') . '/js', $jsCacheDir);
+        Util::createUpdateSymlink($this->config->path('adminApplication.assetsCacheDir').'/js', $jsCacheDir);
 
         $cssCacheDir = appPath('sites/admin-cabinet/assets/css/cache');
-        Util::createUpdateSymlink($this->config->path('adminApplication.assetsCacheDir') . '/css', $cssCacheDir);
+        Util::createUpdateSymlink($this->config->path('adminApplication.assetsCacheDir').'/css', $cssCacheDir);
 
         $imgCacheDir = appPath('sites/admin-cabinet/assets/img/cache');
-        Util::createUpdateSymlink($this->config->path('adminApplication.assetsCacheDir') . '/img', $imgCacheDir);
+        Util::createUpdateSymlink($this->config->path('adminApplication.assetsCacheDir').'/img', $imgCacheDir);
     }
 
     /**
@@ -1097,13 +1097,13 @@ 
         $cacheDirs[] = $this->config->path('www.downloadCacheDir');
         $cacheDirs[] = $this->config->path('www.managedCacheDir');
         $cacheDirs[] = $this->config->path('www.modelsCacheDir');
-        $cacheDirs[] = $this->config->path('adminApplication.assetsCacheDir') . '/js';
-        $cacheDirs[] = $this->config->path('adminApplication.assetsCacheDir') . '/css';
-        $cacheDirs[] = $this->config->path('adminApplication.assetsCacheDir') . '/img';
+        $cacheDirs[] = $this->config->path('adminApplication.assetsCacheDir').'/js';
+        $cacheDirs[] = $this->config->path('adminApplication.assetsCacheDir').'/css';
+        $cacheDirs[] = $this->config->path('adminApplication.assetsCacheDir').'/img';
         $cacheDirs[] = $this->config->path('adminApplication.voltCacheDir');
         $rmPath      = Util::which('rm');
         foreach ($cacheDirs as $cacheDir) {
-            if ( ! empty($cacheDir)) {
+            if (!empty($cacheDir)) {
                 Util::mwExec("{$rmPath} -rf {$cacheDir}/*");
             }
         }
@@ -1174,12 +1174,12 @@ 
      */
     public function saveDiskSettings($data, $id = '1'): void
     {
-        if ( ! is_array($data)) {
+        if (!is_array($data)) {
             return;
         }
         $disk_data = $this->getDiskSettings($id);
         if (count($disk_data) === 0) {
-            $uniqid           = strtoupper('STORAGE-DISK-' . md5(time()));
+            $uniqid           = strtoupper('STORAGE-DISK-'.md5(time()));
             $storage_settings = new StorageModel();
             foreach ($data as $key => $val) {
                 $storage_settings->writeAttribute($key, $val);

src/Common/Providers/ModelsCacheProvider.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
 
         $di->setShared(
             'modelsCache',
-            function () use ($tempDir){
+            function() use ($tempDir){
                 $serializerFactory = new SerializerFactory();
                 $options = [
                     'defaultSerializer' => 'php',
@@ -53,7 +53,7 @@ 
                     'storageDir' => $tempDir
                 ];
 
-                $adapter = new Stream ($serializerFactory, $options);
+                $adapter = new Stream($serializerFactory, $options);
                 return new Cache($adapter);
             }
         );

Braces +2 added lines, -1 removed lines

@@ -45,7 +45,8 @@
 
         $di->setShared(
             'modelsCache',
-            function () use ($tempDir){
+            function () use ($tempDir)
+            {
                 $serializerFactory = new SerializerFactory();
                 $options = [
                     'defaultSerializer' => 'php',