mikopbx / Core

src/PBXCoreREST/Controllers/Files/PostController.php

Spacing +6 added lines, -6 removed lines

@@ -97,11 +97,11 @@ 
         if ($response !== false) {
             $response = json_decode($response, true);
             $filename = $response['data']['filename'] ?? '';
-            if ( ! file_exists($filename)) {
+            if (!file_exists($filename)) {
                 $response['messages'][] = 'Config file not found';
             } else {
                 $response['data']['filename'] = $filename;
-                $response['data']['content']  = mb_convert_encoding('' . file_get_contents($filename), 'UTF-8', 'UTF-8');
+                $response['data']['content']  = mb_convert_encoding(''.file_get_contents($filename), 'UTF-8', 'UTF-8');
                 unlink($filename);
             }
             $this->response->setPayloadSuccess($response);
@@ -115,7 +115,7 @@ 
      */
     public function uploadResumableAction(): void
     {
-        $data   = $this->request->getPost();
+        $data = $this->request->getPost();
         $data['result'] = 'ERROR';
 
         if ($this->request->hasFiles() > 0) {
@@ -127,7 +127,7 @@ 
                 'resumableTotalSize'   => $this->request->getPost('resumableTotalSize'),
             ];
             foreach ($this->request->getUploadedFiles() as $file) {
-                $data['files'][]= [
+                $data['files'][] = [
                     'file_path' => $file->getTempName(),
                     'file_size' => $file->getSize(),
                     'file_error'=> $file->getError(),
@@ -135,9 +135,9 @@ 
                     'file_type' => $file->getType()
                 ];
                 if ($file->getError()) {
-                    $data['data'] = 'error ' . $file->getError() . ' in file ' . $file->getTempName();
+                    $data['data'] = 'error '.$file->getError().' in file '.$file->getTempName();
                     $this->sendError(400, $data['data']);
-                    Util::sysLogMsg('UploadFile', 'error ' . $file->getError() . ' in file ' . $file->getTempName());
+                    Util::sysLogMsg('UploadFile', 'error '.$file->getError().' in file '.$file->getTempName());
                     return;
                 }
             }

src/PBXCoreREST/Lib/SysLogsManagementProcessor.php

Spacing +21 added lines, -21 removed lines

@@ -76,35 +76,35 @@ 
     {
         $res            = new PBXApiResult();
         $res->processor = __METHOD__;
-        $filename       = System::getLogDir() . '/' . $filename;
-        if ( ! file_exists($filename)) {
+        $filename       = System::getLogDir().'/'.$filename;
+        if (!file_exists($filename)) {
             $res->success    = false;
-            $res->messages[] = 'No access to the file ' . $filename;
+            $res->messages[] = 'No access to the file '.$filename;
         } else {
             $res->success = true;
             $head         = Util::which('head');
             $grep         = Util::which('grep');
             $tail         = Util::which('tail');
             $filter       = escapeshellarg($filter);
-            $offset       = (int)$offset;
-            $lines        = (int)$lines;
-            $linesPlusOffset = $lines+$offset;
+            $offset       = (int) $offset;
+            $lines        = (int) $lines;
+            $linesPlusOffset = $lines + $offset;
 
             $di          = Di::getDefault();
             $dirsConfig  = $di->getShared('config');
-            $filenameTmp = $dirsConfig->path('www.downloadCacheDir') . '/' . __FUNCTION__ . '_' . time() . '.log';
-            if (empty($filter)){
+            $filenameTmp = $dirsConfig->path('www.downloadCacheDir').'/'.__FUNCTION__.'_'.time().'.log';
+            if (empty($filter)) {
                 $cmd         = "{$tail} -n {$linesPlusOffset} {$filename}";
             } else {
                 $cmd         = "{$grep} -F {$filter} {$filename} | $tail -n {$linesPlusOffset}";
             }
-            if ($offset>0){
+            if ($offset > 0) {
                 $cmd .= " | {$head} -n {$lines}";
             }
             $cmd .= " > $filenameTmp";
 
             Util::mwExec("$cmd; chown www:www $filenameTmp");
-            $res->data['cmd']=$cmd;
+            $res->data['cmd'] = $cmd;
             $res->data['filename'] = $filenameTmp;
         }
 
@@ -162,7 +162,7 @@ 
         $systemInfoFile = "{$logDir}/system-information.log";
         file_put_contents($systemInfoFile, SysinfoManagementProcessor::prepareSysyinfoContent());
 
-        $futureFileName        = $temp_dir . '/temp-all-log-' . time() . '.zip';
+        $futureFileName        = $temp_dir.'/temp-all-log-'.time().'.zip';
         $res->data['filename'] = $futureFileName;
         $res->success          = true;
 
@@ -198,7 +198,7 @@ 
         $res->processor = __METHOD__;
 
         $progress_file = "{$resultFile}.progress";
-        if ( ! file_exists($progress_file)) {
+        if (!file_exists($progress_file)) {
             $res->messages[] = 'Archive does not exist. Try again!';
         } elseif (file_exists($progress_file) && file_get_contents($progress_file) === '100') {
             $uid          = Util::generateRandomString(36);
@@ -206,7 +206,7 @@ 
             $downloadLink = $di->getShared('config')->path('www.downloadCacheDir');
             $result_dir   = "{$downloadLink}/{$uid}";
             Util::mwMkdir($result_dir);
-            $link_name = 'MikoPBXLogs_' . basename($resultFile);
+            $link_name = 'MikoPBXLogs_'.basename($resultFile);
             Util::createUpdateSymlink($resultFile, "{$result_dir}/{$link_name}");
             Util::addRegularWWWRights("{$result_dir}/{$link_name}");
             $res->success          = true;
@@ -232,10 +232,10 @@ 
     {
         $res            = new PBXApiResult();
         $res->processor = __METHOD__;
-        $filename       = System::getLogDir() . '/' . $filename;
-        if ( ! file_exists($filename)) {
+        $filename       = System::getLogDir().'/'.$filename;
+        if (!file_exists($filename)) {
             $res->success    = false;
-            $res->messages[] = 'File does not exist ' . $filename;
+            $res->messages[] = 'File does not exist '.$filename;
         } else {
             $uid          = Util::generateRandomString(36);
             $di           = Di::getDefault();
@@ -276,7 +276,7 @@ 
                 continue;
             }
 
-            $relativePath             = str_ireplace($logDir . '/', '', $entry);
+            $relativePath             = str_ireplace($logDir.'/', '', $entry);
             $fileSizeKB               = ceil($fileSize / 1024);
             $filesList[$relativePath] =
                 [
@@ -313,11 +313,11 @@ 
                 continue;
             }
             //if current file ($d) is a directory, call scanDirRecursively
-            if (is_dir($dir . '/' . $d)) {
-                $list[] = self::scanDirRecursively($dir . '/' . $d);
+            if (is_dir($dir.'/'.$d)) {
+                $list[] = self::scanDirRecursively($dir.'/'.$d);
                 //otherwise, add the file to the list
-            } elseif (is_file($dir . '/' . $d) || is_link($dir . '/' . $d)) {
-                $list[] = $dir . '/' . $d;
+            } elseif (is_file($dir.'/'.$d) || is_link($dir.'/'.$d)) {
+                $list[] = $dir.'/'.$d;
             }
         }
 

src/Core/Workers/WorkerNotifyByEmail.php

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
 
 class WorkerNotifyByEmail extends WorkerBase
 {
-    protected int $maxProc=1;
+    protected int $maxProc = 1;
     /**
      * Entry point
      *
@@ -50,7 +50,7 @@ 
         $tmpArray = [];
         foreach ($data as $call) {
             $keyHash = $call['email'].$call['start'].$call['from_number'].$call['to_number'];
-            if(in_array($keyHash, $tmpArray, true)){
+            if (in_array($keyHash, $tmpArray, true)) {
                 continue;
             }
             $tmpArray[] = $keyHash;
@@ -58,7 +58,7 @@ 
              * 'language'
              * 'is_internal'
              */
-            if ( ! isset($emails[$call['email']])) {
+            if (!isset($emails[$call['email']])) {
                 $emails[$call['email']] = '';
             }
 
@@ -96,7 +96,7 @@ 
 
 // Start worker process
 $workerClassname = WorkerNotifyByEmail::class;
-$action = $argv[1]??'';
+$action = $argv[1] ?? '';
 if ($action === 'start') {
     cli_set_process_title($workerClassname);
     while (true) {

src/Core/Workers/WorkerBase.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
     {
         $pingTube = $this->makePingTubeName(static::class);
         if ($pingTube === $parameters['UserEvent']) {
-            $this->am->UserEvent("{$pingTube}Pong", []);
+            $this->am->UserEvent("{$pingTube}pong", []);
 
             return true;
         }

Spacing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
     {
         $activeProcesses = Util::getPidOfProcess(static::class, getmypid());
         if ($this->maxProc === 1) {
-            if ( ! empty($activeProcesses)) {
+            if (!empty($activeProcesses)) {
                 $killApp = Util::which('kill');
                 // Завершаем старый процесс.
                 Util::mwExec("{$killApp} {$activeProcesses}");
@@ -56,7 +56,7 @@ 
             $killApp   = Util::which('kill');
             // Завершим лишние
             while ($countProc >= 0) {
-                if ( ! isset($processes[$countProc])) {
+                if (!isset($processes[$countProc])) {
                     break;
                 }
                 // Завершаем старый процесс.
@@ -104,7 +104,7 @@ 
      */
     public function pingCallBack(BeanstalkClient $message): void
     {
-        $message->reply(json_encode($message->getBody() . ':pong'));
+        $message->reply(json_encode($message->getBody().':pong'));
     }
 
     /**

src/Core/System/Storage.php

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -460,17 +460,17 @@
             $test_alert = '';
             if ($free < 5) {
                 $need_alert = true;
-                $test_alert = "The {$disk['id']} has less than 5% of free space available.";
+                $test_alert = "the {$disk['id']} has less than 5% of free space available.";
             }
 
             if ($disk['free_space'] < 500) {
                 $need_alert = true;
-                $test_alert = "The {$disk['id']} has less than 500MB of free space available.";
+                $test_alert = "the {$disk['id']} has less than 500MB of free space available.";
             }
 
             if ($disk['free_space'] < 100) {
                 $need_alert = true;
-                $test_alert = "The {$disk['id']} has less than 100MB of free space available. Old call records will be deleted.";
+                $test_alert = "the {$disk['id']} has less than 100MB of free space available. Old call records will be deleted.";
                 Util::processPHPWorker(WorkerRemoveOldRecords::class);
             }
 

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 @@ 
             Util::mwExec("{$umountPath} {$device}");
         }
 
-        if ( ! self::isStorageDiskMounted($device)) {
+        if (!self::isStorageDiskMounted($device)) {
             Util::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);
         Util::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 @@ 
             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}'");
@@ -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');
             Util::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 @@ 
                 Util::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 @@ 
         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);
@@ -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 @@ 
             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);
         }
@@ -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');
         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;
@@ -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);
     }
 
     /**
@@ -1100,13 +1100,13 @@ 
         $cacheDirs   = [];
         $cacheDirs[] = $this->config->path('www.uploadDir');
         $cacheDirs[] = $this->config->path('www.downloadCacheDir');
-        $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}/*");
             }
         }
@@ -1216,7 +1216,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');
@@ -1224,7 +1224,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);
     }
 
     /**
@@ -1237,7 +1237,7 @@ 
         $size    = 0;
         $mntDir  = '';
         $mounted = self::isStorageDiskMounted('', $mntDir);
-        if ( ! $mounted) {
+        if (!$mounted) {
             return 0;
         }
         $hd = $this->getAllHdd(true);
@@ -1258,12 +1258,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/Core/System/Util.php

Indentation +23 added lines, -23 removed lines

@@ -262,32 +262,32 @@ 
 
         $WorkerPID = self::getPidOfProcess($proc_name);
 
-         switch ($action) {
-             case 'status':
+            switch ($action) {
+                case 'status':
                  $status = ($WorkerPID !== '') ? 'Started' : 'Stoped';
-                 return ['status' => $status, 'app' => $proc_name, 'PID' => $WorkerPID];
-             case 'restart':
+                    return ['status' => $status, 'app' => $proc_name, 'PID' => $WorkerPID];
+                case 'restart':
                  // Firstly start new process
                  self::mwExec("{$path_nohup} {$cmd} {$param}  > {$out_file} 2>&1 &");
-                 // Then kill the old one
-                 if ($WorkerPID !== '') {
-                     self::mwExec("{$path_kill} -9 {$WorkerPID}  > /dev/null 2>&1 &");
-                 }
-                 break;
-             case 'stop':
+                    // Then kill the old one
+                    if ($WorkerPID !== '') {
+                        self::mwExec("{$path_kill} -9 {$WorkerPID}  > /dev/null 2>&1 &");
+                    }
+                    break;
+                case 'stop':
                  if ($WorkerPID !== '') {
-                     self::mwExec("{$path_kill} -9 {$WorkerPID}  > /dev/null 2>&1 &");
-                 }
-                 break;
-             case 'start':
+                        self::mwExec("{$path_kill} -9 {$WorkerPID}  > /dev/null 2>&1 &");
+                    }
+                    break;
+                case 'start':
                  if ($WorkerPID === '') {
-                     self::mwExec("{$path_nohup} {$cmd} {$param}  > {$out_file} 2>&1 &");
-                 }
-                 break;
-             case 'multiStart':
+                        self::mwExec("{$path_nohup} {$cmd} {$param}  > {$out_file} 2>&1 &");
+                    }
+                    break;
+                case 'multiStart':
                  self::mwExec("{$path_nohup} {$cmd} {$param}  > {$out_file} 2>&1 &");
-                 break;
-             default:
+                    break;
+                default:
          }
 
         return true;
@@ -375,9 +375,9 @@ 
         $variable = "_IS_ORGNT={$IS_ORGNT},pt1c_cid={$dest_number},_extenfrom1c={$peer_number},__peer_mobile={$peer_mobile},_FROM_PEER={$peer_number}";
 
         return $am->Originate($channel,
-                              $dest_number,
-                              $context,
-                      '1', null, null, null, null, $variable, null, true);
+                                $dest_number,
+                                $context,
+                        '1', null, null, null, null, $variable, null, true);
     }
 
     /**

Spacing +31 added lines, -31 removed lines

@@ -46,7 +46,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";
             }
@@ -66,7 +66,7 @@ 
     {
         $killallPath = self::which('killall');
 
-        return self::mwExec($killallPath . ' ' . escapeshellarg($procName));
+        return self::mwExec($killallPath.' '.escapeshellarg($procName));
     }
 
     /**
@@ -81,7 +81,7 @@ 
     public static function mwExec($command, &$outArr = null, &$retVal = null): int
     {
         $retVal = 0;
-        $outArr   = [];
+        $outArr = [];
         $di     = Di::getDefault();
 
         if ($di !== null && $di->getShared('config')->path('core.debugMode')) {
@@ -107,7 +107,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 {
@@ -169,17 +169,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,10 +199,10 @@ 
      * @param string $param
      * @param string $action
      */
-    public static function processPHPWorker(string $className, string $param = 'start', string $action='restart'): void
+    public static function processPHPWorker(string $className, string $param = 'start', string $action = 'restart'): void
     {
         $workerPath = self::getFilePathByClassName($className);
-        if ( ! empty($workerPath)) {
+        if (!empty($workerPath)) {
             $command = "php -f {$workerPath}";
             self::processWorker($command, $param, $className, $action);
         }
@@ -223,7 +223,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;
@@ -237,7 +237,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);
@@ -348,8 +348,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(
@@ -371,7 +371,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}";
@@ -391,9 +391,9 @@ 
      */
     public static function getAstManager($events = 'on'): AsteriskManager
     {
-        if($events === 'on'){
+        if ($events === 'on') {
             $nameService = 'amiListner';
-        }else{
+        } else {
             $nameService = 'amiCommander';
         }
 
@@ -419,7 +419,7 @@ 
         for ($i = 0; $i < $length; $i++) {
             try {
                 $randomString .= $characters[random_int(0, $charactersLength - 1)];
-            }catch (Throwable $e ){
+            } catch (Throwable $e) {
                 $randomString = '';
             }
         }
@@ -599,7 +599,7 @@ 
     public static function getExtensionOfFile($filename)
     {
         $path_parts = pathinfo($filename);
-        return $path_parts['extension']??'';
+        return $path_parts['extension'] ?? '';
     }
 
     /**
@@ -613,10 +613,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;
@@ -688,14 +688,14 @@ 
             $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);
                     }
                 }
             }
-            if($objects !== false){
+            if ($objects !== false) {
                 reset($objects);
             }
             rmdir($dir);
@@ -714,7 +714,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',
@@ -726,11 +726,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,
@@ -876,7 +876,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);
@@ -888,7 +888,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) {

Braces +4 added lines, -3 removed lines

@@ -393,7 +393,7 @@ 
     {
         if($events === 'on'){
             $nameService = 'amiListner';
-        }else{
+        } else{
             $nameService = 'amiCommander';
         }
 
@@ -419,7 +419,7 @@ 
         for ($i = 0; $i < $length; $i++) {
             try {
                 $randomString .= $characters[random_int(0, $charactersLength - 1)];
-            }catch (Throwable $e ){
+            } catch (Throwable $e ){
                 $randomString = '';
             }
         }
@@ -919,7 +919,8 @@ 
      *
      * @return array
      */
-    public static function flattenArray(array $array) {
+    public static function flattenArray(array $array)
+    {
         $result = [];
         foreach ($array as $value) {
             if (is_array($value)) {

src/AdminCabinet/Controllers/NetworkController.php

Spacing +11 added lines, -11 removed lines

@@ -37,7 +37,7 @@ 
         $internetInterface = LanInterfaces::findFirstByInternet('1');
         if ($internetInterface === null) {
             $internetInterface = new LanInterfaces();
-            $internetInterface->id     = 1;
+            $internetInterface->id = 1;
         }
 
         // We will find additional interfaces which we can delete
@@ -60,7 +60,7 @@ 
      */
     public function saveAction(): void
     {
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
 
@@ -125,9 +125,9 @@ 
                 case 'extipaddr':
                     if ($itIsInternetInterfce) {
                         if (array_key_exists($name, $data)) {
-                            $eth->$name = ($data['usenat'] === 'on') ? $data[$name] : $data['ipaddr_' . $eth->id];
+                            $eth->$name = ($data['usenat'] === 'on') ? $data[$name] : $data['ipaddr_'.$eth->id];
                         } else {
-                            $eth->$name = $data['ipaddr_' . $eth->id];
+                            $eth->$name = $data['ipaddr_'.$eth->id];
                         }
                     } else {
                         $eth->$name = '';
@@ -146,8 +146,8 @@ 
                     }
                     break;
                 case 'dhcp':
-                    if (array_key_exists($name . '_' . $eth->id, $data)) {
-                        $eth->$name = ($data['dhcp_' . $eth->id]) === 'on' ? '1' : '0';
+                    if (array_key_exists($name.'_'.$eth->id, $data)) {
+                        $eth->$name = ($data['dhcp_'.$eth->id]) === 'on' ? '1' : '0';
                     }
                     break;
                 case 'internet':
@@ -156,13 +156,13 @@ 
                 case 'ipaddr':
                 case 'subnet':
                     $eth->$name = '';
-                    if (array_key_exists($name . '_' . $eth->id, $data)) {
-                        $eth->$name = ($data['dhcp_' . $eth->id]) === 'on' ? '' : $data[$name . '_' . $eth->id];
+                    if (array_key_exists($name.'_'.$eth->id, $data)) {
+                        $eth->$name = ($data['dhcp_'.$eth->id]) === 'on' ? '' : $data[$name.'_'.$eth->id];
                     }
                     break;
                 case 'interface':
                     if ($eth->id === 0) {
-                        $eth->$name = LanInterfaces::findFirstById($data[$name . '_' . $eth->id])->interface;
+                        $eth->$name = LanInterfaces::findFirstById($data[$name.'_'.$eth->id])->interface;
                     }
                     break;
                 case 'domain':
@@ -177,8 +177,8 @@ 
                     }
                     break;
                 default:
-                    if (array_key_exists($name . '_' . $eth->id, $data)) {
-                        $eth->$name = $data[$name . '_' . $eth->id];
+                    if (array_key_exists($name.'_'.$eth->id, $data)) {
+                        $eth->$name = $data[$name.'_'.$eth->id];
                     }
             }
         }

src/PBXCoreREST/Workers/WorkerDownloader.php

Spacing +6 added lines, -6 removed lines

@@ -41,12 +41,12 @@ 
         ini_set('memory_limit', '300M');
 
         $temp_dir            = dirname($this->settings['res_file']);
-        $this->progress_file = $temp_dir . '/progress';
-        $this->error_file    = $temp_dir . '/error';
+        $this->progress_file = $temp_dir.'/progress';
+        $this->error_file    = $temp_dir.'/error';
 
         $result = $this->getFile();
         $result = $result && $this->checkFile();
-        if ( ! $result) {
+        if (!$result) {
             Util::sysLogMsg(__CLASS__, 'Download error...');
         }
     }
@@ -62,7 +62,7 @@ 
         if (file_exists($this->settings['res_file'])) {
             unlink($this->settings['res_file']);
         }
-        if (isset($this->settings['size'])){
+        if (isset($this->settings['size'])) {
             $this->file_size = $this->settings['size'];
         } else {
             $this->file_size = $this->remoteFileSize($this->settings['url']);
@@ -72,7 +72,7 @@ 
 
         $fp = fopen($this->settings['res_file'], 'w');
         $ch = curl_init();
-        if ( ! is_resource($ch)) {
+        if (!is_resource($ch)) {
             return false;
         }
         curl_setopt($ch, CURLOPT_FILE, $fp);
@@ -122,7 +122,7 @@ 
      */
     public function checkFile(): bool
     {
-        if ( ! file_exists($this->settings['res_file'])) {
+        if (!file_exists($this->settings['res_file'])) {
             file_put_contents($this->error_file, 'File did not upload', FILE_APPEND);
 
             return false;

src/PBXCoreREST/Workers/WorkerMergeUploadedFile.php

Spacing +7 added lines, -7 removed lines

@@ -19,13 +19,13 @@ 
     public function start($argv): void
     {
         $settings_file = trim($argv[1]);
-        if ( ! file_exists($settings_file)) {
+        if (!file_exists($settings_file)) {
             Util::sysLogMsg(__CLASS__, 'File with settings not found');
 
             return;
         }
         $settings = json_decode(file_get_contents($settings_file), true);
-        $progress_file = $settings['tempDir'] . '/merging_progress';
+        $progress_file = $settings['tempDir'].'/merging_progress';
         $this->mergeFilesInDirectory(
             $settings['tempDir'],
             $settings['resumableFilename'],
@@ -36,7 +36,7 @@ 
 
         // Check filesize is equal uploaded size
         $resultFileSize = filesize($settings['fullUploadedFileName']);
-        if ((int)$settings['resumableTotalSize'] === $resultFileSize) {
+        if ((int) $settings['resumableTotalSize'] === $resultFileSize) {
             file_put_contents($progress_file, '100');
         } else {
             Util::sysLogMsg(
@@ -47,7 +47,7 @@ 
 
         // Delete uploaded file after 10 minutes
         Util::mwExecBg(
-            '/sbin/shell_functions.sh killprocesses ' . $settings['tempDir'] . ' -TERM 0;rm -rf ' . $settings['tempDir'],
+            '/sbin/shell_functions.sh killprocesses '.$settings['tempDir'].' -TERM 0;rm -rf '.$settings['tempDir'],
             '/dev/null',
             600
         );
@@ -73,7 +73,7 @@ 
         // Restore original file from chunks
         if (($fp = fopen($result_file, 'w')) !== false) {
             for ($i = 1; $i <= $total_files; $i++) {
-                $tmp_file = $tempDir . '/' . $fileName . '.part' . $i;
+                $tmp_file = $tempDir.'/'.$fileName.'.part'.$i;
                 fwrite($fp, file_get_contents($tmp_file));
                 unlink($tmp_file);
                 $currentProgress = round($i / $total_files * 100);
@@ -82,11 +82,11 @@ 
             }
             fclose($fp);
         } else {
-            Util::sysLogMsg('UploadFile', 'cannot create the destination file - ' . $result_file);
+            Util::sysLogMsg('UploadFile', 'cannot create the destination file - '.$result_file);
 
             return;
         }
-        Util::sysLogMsg('UploadFile', 'destination file - ' . $result_file);
+        Util::sysLogMsg('UploadFile', 'destination file - '.$result_file);
     }
 }
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
         } else {
             Util::sysLogMsg(
                 'UploadFile',
-                "File {$settings['fullUploadedFileName']} size {$resultFileSize} does not equal {$settings['resumableTotalSize']}"
+                "file {$settings['fullUploadedFileName']} size {$resultFileSize} does not equal {$settings['resumableTotalSize']}"
             );
         }