mikopbx / Core

src/Core/System/Storage.php

Spacing +62 added lines, -62 removed lines

@@ -73,16 +73,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;
@@ -101,7 +101,7 @@ 
             Processes::mwExec("{$umountPath} {$device}");
         }
 
-        if ( ! self::isStorageDiskMounted($device)) {
+        if (!self::isStorageDiskMounted($device)) {
             Processes::mwExec("{$rmPath} -rf '{$tmp_dir}'");
         }
 
@@ -231,9 +231,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);
         Processes::mwExec($command, $out);
@@ -265,19 +265,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";
         }
 
@@ -303,10 +303,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 = '';
@@ -341,7 +341,7 @@ 
             Processes::mwExec("/sbin/shell_functions.sh 'killprocesses' '$dir' -TERM 0");
             Processes::mwExec("{$umountPath} {$dir}");
         }
-        $result = ! self::isStorageDiskMounted($dir);
+        $result = !self::isStorageDiskMounted($dir);
         if ($result && file_exists($dir)) {
             // Если диск не смонтирован, то удаляем каталог.
             Processes::mwExec("{$rmPath} -rf '{$dir}'");
@@ -411,7 +411,7 @@ 
      */
     public static function statusMkfs($dev): string
     {
-        if ( ! file_exists($dev)) {
+        if (!file_exists($dev)) {
             $dev = "/dev/{$dev}";
         }
         $out      = [];
@@ -434,7 +434,7 @@ 
         }
         $config        = $di->getShared('config');
         $phpSessionDir = $config->path('www.phpSessionDir');
-        if ( ! empty($phpSessionDir)) {
+        if (!empty($phpSessionDir)) {
             $rmPath = Util::which('rm');
             Processes::mwExec("{$rmPath} -rf {$phpSessionDir}/*");
         }
@@ -450,7 +450,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;
             }
@@ -474,7 +474,7 @@ 
                 Processes::processPHPWorker(WorkerRemoveOldRecords::class);
             }
 
-            if ( ! $need_alert) {
+            if (!$need_alert) {
                 continue;
             }
 
@@ -514,8 +514,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),
@@ -537,8 +537,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) {
@@ -554,8 +554,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;
             }
@@ -662,14 +662,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));
             }
@@ -677,8 +677,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));
             }
@@ -704,7 +704,7 @@ 
         Processes::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);
@@ -741,19 +741,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;
@@ -810,7 +810,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;
@@ -821,7 +821,7 @@ 
             Processes::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');
             Processes::mwExec("{$mountPath} -t {$format} {$uid_part} {$dir}", $out);
         }
@@ -841,8 +841,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();
@@ -856,18 +856,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);
         }
@@ -979,11 +979,11 @@ 
         Util::mwMkdir('/storage');
         $chmodPath = Util::which('chmod');
         Processes::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;
@@ -993,9 +993,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"; // НЕ МОНТИРУЕМ!
@@ -1040,12 +1040,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);
         }
@@ -1083,13 +1083,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);
     }
 
     /**
@@ -1102,13 +1102,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)) {
                 Processes::mwExec("{$rmPath} -rf {$cacheDir}/*");
             }
         }
@@ -1218,7 +1218,7 @@ 
         $countBlock = $swapSize * $bs;
         $ddCmd      = Util::which('dd');
 
-        Util::sysLogMsg('Swap', 'make swap ' . $swapFile, LOG_INFO, LOG_INFO);
+        Util::sysLogMsg('Swap', 'make swap '.$swapFile, LOG_INFO, LOG_INFO);
         Processes::mwExec("{$ddCmd} if=/dev/zero of={$swapFile} bs={$bs} count={$countBlock}");
 
         $mkSwapCmd = Util::which('mkswap');
@@ -1226,7 +1226,7 @@ 
 
         $swapOnCmd = Util::which('swapon');
         $result    = Processes::mwExec("{$swapOnCmd} {$swapFile}");
-        Util::sysLogMsg('Swap', 'connect swap result: ' . $result, LOG_INFO, LOG_INFO);
+        Util::sysLogMsg('Swap', 'connect swap result: '.$result, LOG_INFO, LOG_INFO);
     }
 
     /**
@@ -1239,7 +1239,7 @@ 
         $size    = 0;
         $mntDir  = '';
         $mounted = self::isStorageDiskMounted('', $mntDir);
-        if ( ! $mounted) {
+        if (!$mounted) {
             return 0;
         }
         $hd = $this->getAllHdd(true);
@@ -1260,12 +1260,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);