mikopbx / Core

src/PBXCoreREST/Config/RegisterDIServices.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 
         foreach ($pbxRestAPIProviders as $provider) {
             // Delete previous provider
-            if (property_exists($provider,'SERVICE_NAME')
+            if (property_exists($provider, 'SERVICE_NAME')
                 && $di->has($provider::SERVICE_NAME)) {
                 $di->remove($provider::SERVICE_NAME);
             }

src/PBXCoreREST/Providers/ResponseProvider.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
     {
         $di->setShared(
             self::SERVICE_NAME,
-            function () {
+            function() {
                 $response = new Response();
 
                 /**

Braces +2 added lines, -1 removed lines

@@ -30,7 +30,8 @@
     {
         $di->setShared(
             self::SERVICE_NAME,
-            function () {
+            function ()
+            {
                 $response = new Response();
 
                 /**

src/PBXCoreREST/Providers/BeanstalkConnectionProvider.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     {
         $di->setShared(
             self::SERVICE_NAME,
-            function () {
+            function() {
                 return new BeanstalkClient(WorkerApiCommands::class);
             }
         );

Braces +2 added lines, -1 removed lines

@@ -33,7 +33,8 @@
     {
         $di->setShared(
             self::SERVICE_NAME,
-            function () {
+            function ()
+            {
                 return new BeanstalkClient(WorkerApiCommands::class);
             }
         );

src/PBXCoreREST/Providers/DispatcherProvider.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     {
         $di->setShared(
             self::SERVICE_NAME,
-            function () {
+            function() {
                 // Create a events manager
                 $eventsManager = new EventsManager();
                 $dispatcher = new Dispatcher();

Braces +2 added lines, -1 removed lines

@@ -35,7 +35,8 @@
     {
         $di->setShared(
             self::SERVICE_NAME,
-            function () {
+            function ()
+            {
                 // Create a events manager
                 $eventsManager = new EventsManager();
                 $dispatcher = new Dispatcher();

src/Core/Config/RegisterDIServices.php

Spacing +2 added lines, -2 removed lines

@@ -88,7 +88,7 @@ 
 
         foreach ($providersList as $provider) {
             // Delete previous provider
-            if (property_exists($provider,'SERVICE_NAME')
+            if (property_exists($provider, 'SERVICE_NAME')
                 && $di->has($provider::SERVICE_NAME)) {
                 $di->remove($provider::SERVICE_NAME);
             }
@@ -113,7 +113,7 @@ 
 
         foreach ($dbProvidersList as $provider) {
             // Delete previous provider
-            if (property_exists($provider,'SERVICE_NAME')
+            if (property_exists($provider, 'SERVICE_NAME')
                 && $di->has($provider::SERVICE_NAME)) {
                 $di->remove($provider::SERVICE_NAME);
             }

src/Core/System/Util.php

Spacing +38 added lines, -38 removed lines

@@ -44,7 +44,7 @@ 
             }
             if (is_array($value)) {
                 array_unshift($value, ' ');
-                $result_config .= trim(implode("\n{$key} = ", $value)) . "\n";
+                $result_config .= trim(implode("\n{$key} = ", $value))."\n";
             } else {
                 $result_config .= "{$key} = {$value}\n";
             }
@@ -64,7 +64,7 @@ 
     {
         $killallPath = self::which('killall');
 
-        return self::mwExec($killallPath . ' ' . escapeshellarg($procName));
+        return self::mwExec($killallPath.' '.escapeshellarg($procName));
     }
 
     /**
@@ -105,7 +105,7 @@ 
         $rmPath    = self::which('rm');
         $sleepPath = self::which('sleep');
         if ($sleep_time > 0) {
-            $filename = '/tmp/' . time() . '_noop.sh';
+            $filename = '/tmp/'.time().'_noop.sh';
             file_put_contents($filename, "{$sleepPath} {$sleep_time}; {$command}; {$rmPath} -rf {$filename}");
             $noop_command = "{$nohupPath} {$shPath} {$filename} > {$out_file} 2>&1 &";
         } else {
@@ -167,17 +167,17 @@ 
      *
      * @return bool
      */
-    public static function mwMkdir(string $parameters, bool $addWWWRights=false): bool
+    public static function mwMkdir(string $parameters, bool $addWWWRights = false): bool
     {
         $result = true;
         if (posix_getuid() === 0) {
             $arrPaths = explode(' ', $parameters);
             if (count($arrPaths) > 0) {
                 foreach ($arrPaths as $path) {
-                    if ( ! empty($path)
-                        && ! file_exists($path)
-                        && ! mkdir($path, 0755, true)
-                        && ! is_dir($path)) {
+                    if (!empty($path)
+                        && !file_exists($path)
+                        && !mkdir($path, 0755, true)
+                        && !is_dir($path)) {
                         $result = false;
                         self::sysLogMsg('Util', 'Error on create folder '.$path);
                     }
@@ -199,7 +199,7 @@ 
     public static function restartPHPWorker(string $className, string $param = 'start'): void
     {
         $workerPath = self::getFilePathByClassName($className);
-        if ( ! empty($workerPath)) {
+        if (!empty($workerPath)) {
             $command = "php -f {$workerPath}";
             self::processWorker($command, $param, $className, 'restart');
         }
@@ -219,7 +219,7 @@ 
             $reflection = new ReflectionClass($className);
             $filename   = $reflection->getFileName();
         } catch (\ReflectionException $exception) {
-            self::sysLogMsg('Util', 'Error ' . $exception->getMessage());
+            self::sysLogMsg('Util', 'Error '.$exception->getMessage());
         }
 
         return $filename;
@@ -233,7 +233,7 @@ 
      * @param ?int $level
      * @param ?int $facility
      */
-    public static function sysLogMsg($log_name, $text, $level = null, $facility=LOG_AUTH): void
+    public static function sysLogMsg($log_name, $text, $level = null, $facility = LOG_AUTH): void
     {
         $level = ($level === null) ? LOG_WARNING : $level;
         openlog("$log_name", LOG_PID | LOG_PERROR, $facility);
@@ -333,8 +333,8 @@ 
 
         $name       = addslashes($name);
         $filter_cmd = '';
-        if ( ! empty($exclude)) {
-            $filter_cmd = "| $path_grep -v " . escapeshellarg($exclude);
+        if (!empty($exclude)) {
+            $filter_cmd = "| $path_grep -v ".escapeshellarg($exclude);
         }
         $out = [];
         self::mwExec(
@@ -356,7 +356,7 @@ 
     public static function amiOriginate($peer_number, $peer_mobile, $dest_number): array
     {
         $am       = self::getAstManager('off');
-        $channel  = 'Local/' . $peer_number . '@internal-originate';
+        $channel  = 'Local/'.$peer_number.'@internal-originate';
         $context  = 'all_peers';
         $IS_ORGNT = self::generateRandomString();
         $variable = "_IS_ORGNT={$IS_ORGNT},pt1c_cid={$dest_number},_extenfrom1c={$peer_number},__peer_mobile={$peer_mobile},_FROM_PEER={$peer_number}";
@@ -376,9 +376,9 @@ 
      */
     public static function getAstManager($events = 'on'): AsteriskManager
     {
-        if($events === 'on'){
+        if ($events === 'on') {
             $nameService = 'amiListner';
-        }else{
+        } else {
             $nameService = 'amiCommander';
         }
 
@@ -408,7 +408,7 @@ 
         for ($i = 0; $i < $length; $i++) {
             try {
                 $randomString .= $characters[random_int(0, $charactersLength - 1)];
-            }catch (\Exception $e ){
+            } catch (\Exception $e) {
                 $randomString = '';
             }
         }
@@ -517,7 +517,7 @@ 
             file_put_contents($filename_orgn, $data);
         }
 
-        if ( ! $res) {
+        if (!$res) {
             // Файл еще не зарегистрирован в базе. Сделаем это.
             $res = new CustomFiles();
             $res->writeAttribute('filepath', $filename);
@@ -588,7 +588,7 @@ 
     public static function getExtensionOfFile($filename)
     {
         $path_parts = pathinfo($filename);
-        return $path_parts['extension']??'';
+        return $path_parts['extension'] ?? '';
     }
 
     /**
@@ -602,10 +602,10 @@ 
     public static function trimExtensionForFile($filename, $delimiter = '.'): string
     {
         // Отсечем расширение файла.
-        $tmp_arr = explode((string)$delimiter, $filename);
+        $tmp_arr = explode((string) $delimiter, $filename);
         if (count($tmp_arr) > 1) {
             unset($tmp_arr[count($tmp_arr) - 1]);
-            $filename = implode((string)$delimiter, $tmp_arr);
+            $filename = implode((string) $delimiter, $tmp_arr);
         }
 
         return $filename;
@@ -676,7 +676,7 @@ 
         $total_files_on_server_size = 0;
         foreach (scandir($temp_dir) as $file) {
             $temp_total                 = $total_files_on_server_size;
-            $tempfilesize               = filesize($temp_dir . '/' . $file);
+            $tempfilesize               = filesize($temp_dir.'/'.$file);
             $total_files_on_server_size = $temp_total + $tempfilesize;
         }
         // check that all the parts are present
@@ -707,19 +707,19 @@ 
         $progress_dir = ''
     ) {
         if (empty($result_file)) {
-            $result_file = dirname($temp_dir) . '/' . $fileName;
+            $result_file = dirname($temp_dir).'/'.$fileName;
         }
 
         $show_progress = file_exists($progress_dir);
-        $progress_file = $progress_dir . '/progress';
-        if ($show_progress && ! file_exists($progress_file)) {
+        $progress_file = $progress_dir.'/progress';
+        if ($show_progress && !file_exists($progress_file)) {
             file_put_contents($progress_file, '0');
         }
 
         // create the final destination file
         if (($fp = fopen($result_file, 'w')) !== false) {
             for ($i = 1; $i <= $total_files; $i++) {
-                $tmp_file = $temp_dir . '/' . $fileName . '.part' . $i;
+                $tmp_file = $temp_dir.'/'.$fileName.'.part'.$i;
                 fwrite($fp, file_get_contents($tmp_file));
                 // Удаляем временный файл.
                 unlink($tmp_file);
@@ -729,15 +729,15 @@ 
             }
             fclose($fp);
         } else {
-            self::sysLogMsg('UploadFile', 'cannot create the destination file - ' . $result_file);
+            self::sysLogMsg('UploadFile', 'cannot create the destination file - '.$result_file);
 
             return false;
         }
-        self::sysLogMsg('UploadFile', 'destination file - ' . $result_file);
+        self::sysLogMsg('UploadFile', 'destination file - '.$result_file);
         // rename the temporary directory (to avoid access from other
         // concurrent chunks uploads) and than delete it
-        if (rename($temp_dir, $temp_dir . '_UNUSED')) {
-            self::rRmDir($temp_dir . '_UNUSED');
+        if (rename($temp_dir, $temp_dir.'_UNUSED')) {
+            self::rRmDir($temp_dir.'_UNUSED');
         } else {
             self::rRmDir($temp_dir);
         }
@@ -764,10 +764,10 @@ 
             $objects = scandir($dir);
             foreach ($objects as $object) {
                 if ($object != "." && $object != "..") {
-                    if (filetype($dir . "/" . $object) == "dir") {
-                        self::rRmDir($dir . "/" . $object);
+                    if (filetype($dir."/".$object) == "dir") {
+                        self::rRmDir($dir."/".$object);
                     } else {
-                        unlink($dir . "/" . $object);
+                        unlink($dir."/".$object);
                     }
                 }
             }
@@ -788,7 +788,7 @@ 
     public static function generateSslCert($options = null, $config_args_pkey = null, $config_args_csr = null): array
     {
         // Инициализация настроек.
-        if ( ! $options) {
+        if (!$options) {
             $options = [
                 "countryName"            => 'RU',
                 "stateOrProvinceName"    => 'Moscow',
@@ -800,11 +800,11 @@ 
             ];
         }
 
-        if ( ! $config_args_csr) {
+        if (!$config_args_csr) {
             $config_args_csr = ['digest_alg' => 'sha256'];
         }
 
-        if ( ! $config_args_pkey) {
+        if (!$config_args_pkey) {
             $config_args_pkey = [
                 "private_key_bits" => 2048,
                 "private_key_type" => OPENSSL_KEYTYPE_RSA,
@@ -950,7 +950,7 @@ 
             $row = trim($row);
             $pos = strpos($row, ']');
             if ($pos !== false && strpos($row, '[') === 0) {
-                $row = "\n" . substr($row, 0, $pos);
+                $row = "\n".substr($row, 0, $pos);
             }
         }
         unset($row);
@@ -962,7 +962,7 @@ 
         foreach ($sections as $section) {
             $data_rows    = explode("\n", trim($section));
             $section_name = trim($data_rows[0] ?? '');
-            if ( ! empty($section_name)) {
+            if (!empty($section_name)) {
                 unset($data_rows[0]);
                 $manual_data[$section_name] = [];
                 foreach ($data_rows as $row) {

src/Core/System/Storage.php

Spacing +62 added lines, -62 removed lines

@@ -82,16 +82,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;
@@ -110,7 +110,7 @@ 
             Util::mwExec("{$umountPath} {$device}");
         }
 
-        if ( ! self::isStorageDiskMounted($device)) {
+        if (!self::isStorageDiskMounted($device)) {
             Util::mwExec("{$rmPath} -rf '{$tmp_dir}'");
         }
 
@@ -240,9 +240,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);
@@ -274,19 +274,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";
         }
 
@@ -312,10 +312,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 = '';
@@ -350,7 +350,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}'");
@@ -420,7 +420,7 @@ 
      */
     public static function statusMkfs($dev): string
     {
-        if ( ! file_exists($dev)) {
+        if (!file_exists($dev)) {
             $dev = "/dev/{$dev}";
         }
         $out      = [];
@@ -443,7 +443,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}/*");
         }
@@ -459,7 +459,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;
             }
@@ -483,7 +483,7 @@ 
                 Util::restartPHPWorker(WorkerRemoveOldRecords::class);
             }
 
-            if ( ! $need_alert) {
+            if (!$need_alert) {
                 continue;
             }
 
@@ -523,8 +523,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),
@@ -546,8 +546,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) {
@@ -563,8 +563,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;
             }
@@ -671,14 +671,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));
             }
@@ -686,8 +686,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));
             }
@@ -713,7 +713,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);
@@ -750,19 +750,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;
@@ -819,7 +819,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;
@@ -830,7 +830,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);
         }
@@ -850,8 +850,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();
@@ -865,18 +865,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);
         }
@@ -991,11 +991,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;
@@ -1005,9 +1005,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"; // НЕ МОНТИРУЕМ!
@@ -1052,12 +1052,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);
         }
@@ -1094,13 +1094,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);
     }
 
     /**
@@ -1113,13 +1113,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}/*");
             }
         }
@@ -1229,7 +1229,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);
         Util::mwExec("{$ddCmd} if=/dev/zero of={$swapFile} bs={$bs} count={$countBlock}");
 
         $mkSwapCmd = Util::which('mkswap');
@@ -1237,7 +1237,7 @@ 
 
         $swapOnCmd = Util::which('swapon');
         $result    = Util::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);
     }
 
     /**
@@ -1250,7 +1250,7 @@ 
         $size    = 0;
         $mntDir  = '';
         $mounted = self::isStorageDiskMounted('', $mntDir);
-        if ( ! $mounted) {
+        if (!$mounted) {
             return 0;
         }
         $hd = $this->getAllHdd(true);
@@ -1271,12 +1271,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/Models/FirewallRules.php

Spacing +5 added lines, -5 removed lines

@@ -129,14 +129,14 @@
 
         //Add modules firewall rules
         $di = Di::getDefault();
-        if ($di!==null) {
+        if ($di !== null) {
             $pbxConfModules = $di->get('pbxConfModules');
-            foreach ($pbxConfModules as $pbxConfModule){
+            foreach ($pbxConfModules as $pbxConfModule) {
                 $additionalRules = $pbxConfModule->getDefaultFirewallRules();
-                if ($additionalRules!==[]){
+                if ($additionalRules !== []) {
                     $additionalRules = array_change_key_case($additionalRules, CASE_UPPER);
-                    foreach ($additionalRules as $key=>$rule){
-                        $template[$key]=$rule;
+                    foreach ($additionalRules as $key=>$rule) {
+                        $template[$key] = $rule;
                     }
                 }
             }

src/Common/Providers/NatsConnectionProvider.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
         $gnatsConfig = $di->getShared('config')->get('gnats');
         $di->setShared(
             self::SERVICE_NAME,
-            function () use ($gnatsConfig) {
+            function() use ($gnatsConfig) {
                 $connectionOptions = new NatsConnectionOptions();
                 $host              = $gnatsConfig->host;
                 $port              = $gnatsConfig->port;

Braces +2 added lines, -1 removed lines

@@ -34,7 +34,8 @@
         $gnatsConfig = $di->getShared('config')->get('gnats');
         $di->setShared(
             self::SERVICE_NAME,
-            function () use ($gnatsConfig) {
+            function () use ($gnatsConfig)
+            {
                 $connectionOptions = new NatsConnectionOptions();
                 $host              = $gnatsConfig->host;
                 $port              = $gnatsConfig->port;