mikopbx / Core

src/PBXCoreREST/Workers/WorkerMakeLogFilesArchive.php

Spacing +2 added lines, -2 removed lines

@@ -23,12 +23,12 @@
             exit(2);
         }
         $settings_file = trim($argv[1]);
-        if ( ! file_exists($settings_file)) {
+        if (!file_exists($settings_file)) {
             // File with settings not found
             exit(3);
         }
         $file_data = json_decode(file_get_contents($settings_file), true);
-        if ( ! isset($file_data['result_file'])) {
+        if (!isset($file_data['result_file'])) {
             // Wrong settings
             exit(4);
         }

src/PBXCoreREST/Lib/SysinfoManagementProcessor.php

Spacing +59 added lines, -59 removed lines

@@ -63,7 +63,7 @@ 
         $res->success = true;
         $di           = Di::getDefault();
         $dirsConfig   = $di->getShared('config');
-        $filenameTmp  = $dirsConfig->path('www.downloadCacheDir') . '/' . __FUNCTION__ . '_' . time() . '.txt';
+        $filenameTmp  = $dirsConfig->path('www.downloadCacheDir').'/'.__FUNCTION__.'_'.time().'.txt';
 
         $content = self::prepareSysyinfoContent();
 
@@ -97,7 +97,7 @@ 
         $content .= self::getAsteriskInfo();
         $content .= self::getChangedConfigFiles();
         $content .= self::getCorruptedFiles();
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
 
         return $content;
     }
@@ -110,12 +110,12 @@ 
     public static function getDate(): string
     {
         $content    = '───────────────────────────────────────── Date ─────────────────────────────────────────';
-        $content    .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $datePath = Util::which('date');
         $ut         = [];
         Util::mwExec($datePath, $ut);
-        $content .= implode(PHP_EOL, $ut). PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= implode(PHP_EOL, $ut).PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -128,9 +128,9 @@ 
     {
         $version = PbxSettings::getValueByKey('PBXVersion');
         $content = '─────────────────────────────────────── PBXVersion ───────────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
-        $content .= $version . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
+        $content .= $version.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -142,13 +142,13 @@ 
     public static function getUpTime(): string
     {
         $content    = '───────────────────────────────────────── Uptime ─────────────────────────────────────────';
-        $content    .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $uptimePath = Util::which('uptime');
         $ut         = [];
         Util::mwExec($uptimePath, $ut);
-        $uptime  = implode(PHP_EOL, $ut);
-        $content .= $uptime . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $uptime = implode(PHP_EOL, $ut);
+        $content .= $uptime.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -160,7 +160,7 @@ 
     public static function getCpu(): string
     {
         $content    = '───────────────────────────────────────── CPU load ───────────────────────────────────────';
-        $content    .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $ut         = [];
         $grepPath   = Util::which('grep');
         $mpstatPath = Util::which('mpstat');
@@ -172,8 +172,8 @@ 
             $rv = 100;
         }
 
-        $content .= round($rv, 2) . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= round($rv, 2).PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -185,7 +185,7 @@ 
     public static function getMemInfo(): string
     {
         $content  = '───────────────────────────────────────── MemInfo ────────────────────────────────────────';
-        $content  .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $out      = [];
         $catPath  = Util::which('cat');
         $grepPath = Util::which('grep');
@@ -193,19 +193,19 @@ 
         $freePath = Util::which('free');
         Util::mwExec("{$catPath} /proc/meminfo | {$grepPath} -C 0 'Inactive:' | {$awkPath} '{print $2}'", $out);
         $inactive = round((1 * implode($out)) / 1024, 2);
-        $content  .= "inactive = {$inactive}" . PHP_EOL;
+        $content .= "inactive = {$inactive}".PHP_EOL;
         Util::mwExec("{$catPath} /proc/meminfo | {$grepPath} -C 0 'MemFree:' | {$awkPath} '{print $2}'", $out);
         $free    = round((1 * implode($out)) / 1024, 2);
-        $content .= "free = {$free}" . PHP_EOL;
+        $content .= "free = {$free}".PHP_EOL;
         Util::mwExec("{$catPath} /proc/meminfo | {$grepPath} -C 0 'MemTotal:' | {$awkPath} '{print $2}'", $out);
         $total   = round((1 * implode($out)) / 1024, 2);
-        $content .= "total = {$total}" . PHP_EOL . PHP_EOL;
+        $content .= "total = {$total}".PHP_EOL.PHP_EOL;
 
         $content .= '────────────────────────────────────────── Free ─────────────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         Util::mwExec($freePath, $out);
-        $content .= implode(PHP_EOL, $out) . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= implode(PHP_EOL, $out).PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -217,13 +217,13 @@ 
     private static function getStorageInfo(): string
     {
         $content = '─────────────────────────────────────────── df ───────────────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $dfPath  = Util::which('df');
         $out     = [];
         Util::mwExec("{$dfPath} -h", $out);
         $dfOut   = implode(PHP_EOL, $out);
-        $content .= $dfOut . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= $dfOut.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -235,13 +235,13 @@ 
     private static function getIfconfigInfo(): string
     {
         $content      = '─────────────────────────────────────── ifconfig ──────────────────────────────────────';
-        $content      .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $ifconfigPath = Util::which('ifconfig');
         $out          = [];
         Util::mwExec($ifconfigPath, $out);
         $ifconfigOut = implode(PHP_EOL, $out);
-        $content     .= $ifconfigOut . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content     .= $ifconfigOut.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -253,13 +253,13 @@ 
     private static function getArpInfo(): string
     {
         $content = '─────────────────────────────────────────── arp ──────────────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $arpPath = Util::which('arp');
         $out     = [];
         Util::mwExec($arpPath, $out);
         $arpOut  = implode(PHP_EOL, $out);
-        $content .= $arpOut . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= $arpOut.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -271,13 +271,13 @@ 
     private static function getRouteInfo(): string
     {
         $content   = '────────────────────────────────────────── route ─────────────────────────────────────────';
-        $content   .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $routePath = Util::which('route');
         $out       = [];
         Util::mwExec($routePath, $out);
         $routeOut = implode(PHP_EOL, $out);
-        $content  .= $routeOut . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content  .= $routeOut.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -289,13 +289,13 @@ 
     private static function getIptablesInfo(): string
     {
         $content      = '────────────────────────────────────────── iptables ──────────────────────────────────────';
-        $content      .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $iptablesPath = Util::which('iptables');
         $out          = [];
         Util::mwExec("{$iptablesPath} -S", $out);
         $iptablesOut = implode(PHP_EOL, $out);
-        $content     .= $iptablesOut . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content     .= $iptablesOut.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -307,17 +307,17 @@ 
     private static function getPingInfo(): string
     {
         $content  = '──────────────────────────────────────────── ping ────────────────────────────────────────';
-        $content  .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $pingPath = Util::which('ping');
         $out      = [];
         Util::mwExec("{$pingPath} 8.8.8.8 -w 2", $out);
         $pingOut = implode(PHP_EOL, $out);
         Util::mwExec("{$pingPath} ya.ru -w 2", $out);
         $ping2Out = implode(PHP_EOL, $out);
-        $content  .= $pingOut . PHP_EOL;
-        $content  .= PHP_EOL . PHP_EOL;
-        $content  .= $ping2Out . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content  .= $pingOut.PHP_EOL;
+        $content  .= PHP_EOL.PHP_EOL;
+        $content  .= $ping2Out.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -331,12 +331,12 @@ 
         $opensslPath = Util::which('openssl');
 
         $content = '─────────────────────────────────────── openssl ─────────────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $out     = [];
         Util::mwExec("{$opensslPath} s_client -connect lic.miko.ru:443", $out);
         $opensslOut = implode(PHP_EOL, $out);
-        $content    .= $opensslOut . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= $opensslOut.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -350,23 +350,23 @@ 
         $asteriskPath = Util::which('asterisk');
 
         $content = '────────────────────────────────── asterisk registrations ────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         Util::mwExec("{$asteriskPath} -rx 'pjsip show registrations' ", $out);
         $asteriskOut = implode(PHP_EOL, $out);
-        $content     .= $asteriskOut . PHP_EOL;
+        $content .= $asteriskOut.PHP_EOL;
 
         $content .= '────────────────────────────────── asterisk endpoints ───────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         Util::mwExec("{$asteriskPath} -rx 'pjsip show endpoints' ", $out);
         $asteriskOut = implode(PHP_EOL, $out);
-        $content     .= $asteriskOut . PHP_EOL;
+        $content .= $asteriskOut.PHP_EOL;
 
         $content .= '─────────────────────────────────── asterisk contacts ───────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         Util::mwExec("{$asteriskPath} -rx 'pjsip show contacts' ", $out);
         $asteriskOut = implode(PHP_EOL, $out);
-        $content     .= $asteriskOut . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= $asteriskOut.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -378,12 +378,12 @@ 
     private static function getChangedConfigFiles(): string
     {
         $content = '────────────────────────────────── Changed config files ─────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $files   = CustomFiles::find('mode!="none"');
         foreach ($files as $file) {
-            $content .= "({$file->mode}){$file->filepath}" . PHP_EOL;
+            $content .= "({$file->mode}){$file->filepath}".PHP_EOL;
         }
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -395,12 +395,12 @@ 
     private static function getCorruptedFiles(): string
     {
         $content = '──────────────────────────────────── Corrupted files ────────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $files   = Main::checkForCorruptedFiles();
         foreach ($files as $file) {
-            $content .= $file . PHP_EOL;
+            $content .= $file.PHP_EOL;
         }
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -438,7 +438,7 @@ 
             $response        = json_decode($resultrequest, true);
             $res->data['ip'] = $response['ip'];
         } else {
-            $res->messages[] = 'Error format data ' . $resultrequest;
+            $res->messages[] = 'Error format data '.$resultrequest;
         }
 
         return $res;

src/PBXCoreREST/Lib/LogsManagementProcessor.php

Spacing +13 added lines, -13 removed lines

@@ -74,10 +74,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[] = 'No access to the file ' . $filename;
+            $res->messages[] = 'No access to the file '.$filename;
         } else {
             $res->success = true;
             $cat          = Util::which('cat');
@@ -86,10 +86,10 @@ 
 
             $di          = Di::getDefault();
             $dirsConfig  = $di->getShared('config');
-            $filenameTmp = $dirsConfig->path('www.downloadCacheDir') . '/' . __FUNCTION__ . '_' . time() . '.log';
-            $cmd         = "{$cat} {$filename} | {$grep} " . escapeshellarg($filter) . " | $tail -n " . escapeshellarg(
+            $filenameTmp = $dirsConfig->path('www.downloadCacheDir').'/'.__FUNCTION__.'_'.time().'.log';
+            $cmd         = "{$cat} {$filename} | {$grep} ".escapeshellarg($filter)." | $tail -n ".escapeshellarg(
                     $lines
-                ) . "> $filenameTmp";
+                )."> $filenameTmp";
             Util::mwExec("$cmd; chown www:www $filenameTmp");
             $res->data['filename'] = $filenameTmp;
         }
@@ -148,7 +148,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;
 
@@ -184,7 +184,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);
@@ -192,7 +192,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;
@@ -218,10 +218,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();
@@ -262,7 +262,7 @@ 
                 continue;
             }
 
-            $relativePath             = str_ireplace($logDir . '/', '', $entry);
+            $relativePath             = str_ireplace($logDir.'/', '', $entry);
             $fileSizeKB               = ceil($fileSize / 1024);
             $filesList[$relativePath] =
                 [

src/PBXCoreREST/Lib/SystemManagementProcessor.php

Spacing +2 added lines, -2 removed lines

@@ -178,14 +178,14 @@
         $res->data['message'] = 'In progress...';
 
 
-        if ( ! file_exists($tempFilename)) {
+        if (!file_exists($tempFilename)) {
             $res->success    = false;
             $res->messages[] = "Update file '{$tempFilename}' not found.";
 
             return $res;
         }
 
-        if ( ! file_exists('/var/etc/cfdevice')) {
+        if (!file_exists('/var/etc/cfdevice')) {
             $res->success    = false;
             $res->messages[] = "The system is not installed";
 

src/PBXCoreREST/Lib/FilesManagementProcessor.php

Spacing +54 added lines, -54 removed lines

@@ -91,17 +91,17 @@ 
             );
 
             if (isset($resumableIdentifier) && trim($resumableIdentifier) !== '') {
-                $temp_dir         = $uploadDir . '/' . Util::trimExtensionForFile(basename($resumableFilename));
-                $temp_dst_file    = $uploadDir . '/' . $upload_id . '/' . $upload_id . '_' . basename(
+                $temp_dir         = $uploadDir.'/'.Util::trimExtensionForFile(basename($resumableFilename));
+                $temp_dst_file    = $uploadDir.'/'.$upload_id.'/'.$upload_id.'_'.basename(
                         $resumableFilename
                     );
-                $chunks_dest_file = $temp_dir . '/' . $resumableFilename . '.part' . $resumableChunkNumber;
+                $chunks_dest_file = $temp_dir.'/'.$resumableFilename.'.part'.$resumableChunkNumber;
             } else {
-                $temp_dir         = $uploadDir . '/' . $upload_id;
-                $temp_dst_file    = $temp_dir . '/' . $upload_id . '_' . basename($file->getClientFilename());
+                $temp_dir         = $uploadDir.'/'.$upload_id;
+                $temp_dst_file    = $temp_dir.'/'.$upload_id.'_'.basename($file->getClientFilename());
                 $chunks_dest_file = $temp_dst_file;
             }
-            if ( ! Util::mwMkdir($temp_dir) || ! Util::mwMkdir(dirname($temp_dst_file))) {
+            if (!Util::mwMkdir($temp_dir) || !Util::mwMkdir(dirname($temp_dst_file))) {
                 Util::sysLogMsg('UploadFile', "Error create dir '$temp_dir'");
                 $res->success    = false;
                 $res->messages[] = "Error create dir '{$temp_dir}'";
@@ -124,7 +124,7 @@ 
                         ],
                         'action' => 'merge',
                     ];
-                    $settings_file  = "{$temp_dir}/merge_settings";
+                    $settings_file = "{$temp_dir}/merge_settings";
                     file_put_contents(
                         $settings_file,
                         json_encode($merge_settings, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT)
@@ -144,10 +144,10 @@ 
                 $res->data['upload_id'] = $upload_id;
                 $res->data['filename']  = $temp_dst_file;
                 $res->data['d_status']  = 'UPLOAD_COMPLETE';
-                file_put_contents($temp_dir . '/progress', '100');
+                file_put_contents($temp_dir.'/progress', '100');
 
                 Util::mwExecBg(
-                    '/sbin/shell_functions.sh killprocesses ' . $temp_dir . ' -TERM 0;rm -rf ' . $temp_dir,
+                    '/sbin/shell_functions.sh killprocesses '.$temp_dir.' -TERM 0;rm -rf '.$temp_dir,
                     '/dev/null',
                     120
                 );
@@ -178,18 +178,18 @@ 
         $uploadDir = $di->getShared('config')->path('www.uploadDir');
         if ($postData && isset($postData['id'])) {
             $upload_id     = $postData['id'];
-            $progress_dir  = $uploadDir . '/' . $upload_id;
-            $progress_file = $progress_dir . '/progress';
+            $progress_dir  = $uploadDir.'/'.$upload_id;
+            $progress_file = $progress_dir.'/progress';
 
             if (empty($upload_id)) {
                 $res->success                   = false;
                 $res->data['d_status_progress'] = '0';
                 $res->data['d_status']          = 'ID_NOT_SET';
-            } elseif ( ! file_exists($progress_file) && file_exists($progress_dir)) {
+            } elseif (!file_exists($progress_file) && file_exists($progress_dir)) {
                 $res->success                   = true;
                 $res->data['d_status_progress'] = '0';
                 $res->data['d_status']          = 'INPROGRESS';
-            } elseif ( ! file_exists($progress_dir)) {
+            } elseif (!file_exists($progress_dir)) {
                 $res->success                   = false;
                 $res->data['d_status_progress'] = '0';
                 $res->data['d_status']          = 'NOT_FOUND';
@@ -217,14 +217,14 @@ 
     {
         $res            = new PBXApiResult();
         $res->processor = __METHOD__;
-        if ( ! file_exists($filename)) {
+        if (!file_exists($filename)) {
             $res->success    = false;
             $res->messages[] = "File '{$filename}' not found.";
 
             return $res;
         }
         $out          = [];
-        $tmp_filename = '/tmp/' . time() . "_" . basename($filename);
+        $tmp_filename = '/tmp/'.time()."_".basename($filename);
         if (false === copy($filename, $tmp_filename)) {
             $res->success    = false;
             $res->messages[] = "Unable to create temporary file '{$tmp_filename}'.";
@@ -233,8 +233,8 @@ 
         }
 
         // Принудительно устанавливаем расширение файла в wav.
-        $n_filename     = Util::trimExtensionForFile($filename) . ".wav";
-        $n_filename_mp3 = Util::trimExtensionForFile($filename) . ".mp3";
+        $n_filename     = Util::trimExtensionForFile($filename).".wav";
+        $n_filename_mp3 = Util::trimExtensionForFile($filename).".mp3";
         // Конвертируем файл.
         $tmp_filename = escapeshellcmd($tmp_filename);
         $n_filename   = escapeshellcmd($n_filename);
@@ -288,13 +288,13 @@ 
             $cat          = Util::which('cat');
             $di           = Di::getDefault();
             $dirsConfig   = $di->getShared('config');
-            $filenameTmp  = $dirsConfig->path('www.downloadCacheDir') . '/' . __FUNCTION__ . '_' . time() . '.conf';
+            $filenameTmp  = $dirsConfig->path('www.downloadCacheDir').'/'.__FUNCTION__.'_'.time().'.conf';
             $cmd          = "{$cat} {$filename} > $filenameTmp";
             Util::mwExec("$cmd; chown www:www $filenameTmp");
             $res->data['filename'] = $filenameTmp;
         } else {
             $res->success    = false;
-            $res->messages[] = 'No access to the file ' . $filename;
+            $res->messages[] = 'No access to the file '.$filename;
         }
 
         return $res;
@@ -317,8 +317,8 @@ 
         }
         $rmPath = Util::which('rm');
         $module = 'NewFirmware';
-        if ( ! file_exists($tempDir . "/{$module}")) {
-            Util::mwMkdir($tempDir . "/{$module}");
+        if (!file_exists($tempDir."/{$module}")) {
+            Util::mwMkdir($tempDir."/{$module}");
         } else {
             // Чистим файлы, загруженные онлайн.
             Util::mwExec("{$rmPath} -rf {$tempDir}/{$module}/* ");
@@ -338,13 +338,13 @@ 
 
         $workerDownloaderPath = Util::getFilePathByClassName(WorkerDownloader::class);
 
-        file_put_contents($tempDir . "/{$module}/progress", '0');
+        file_put_contents($tempDir."/{$module}/progress", '0');
         file_put_contents(
-            $tempDir . "/{$module}/download_settings.json",
+            $tempDir."/{$module}/download_settings.json",
             json_encode($download_settings, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
         );
         $phpPath = Util::which('php');
-        Util::mwExecBg("{$phpPath} -f {$workerDownloaderPath} " . $tempDir . "/{$module}/download_settings.json");
+        Util::mwExecBg("{$phpPath} -f {$workerDownloaderPath} ".$tempDir."/{$module}/download_settings.json");
 
         $res                   = new PBXApiResult();
         $res->processor        = __METHOD__;
@@ -372,15 +372,15 @@ 
         } else {
             $tempDir = '/tmp';
         }
-        $modulesDir    = $tempDir . '/NewFirmware';
-        $progress_file = $modulesDir . '/progress';
+        $modulesDir    = $tempDir.'/NewFirmware';
+        $progress_file = $modulesDir.'/progress';
 
         $error = '';
-        if (file_exists($modulesDir . '/error')) {
-            $error = trim(file_get_contents($modulesDir . '/error'));
+        if (file_exists($modulesDir.'/error')) {
+            $error = trim(file_get_contents($modulesDir.'/error'));
         }
 
-        if ( ! file_exists($progress_file)) {
+        if (!file_exists($progress_file)) {
             $res->data['d_status_progress'] = '0';
             $res->data['d_status']          = 'NOT_FOUND';
         } elseif ('' !== $error) {
@@ -393,12 +393,12 @@ 
             $res->data['filePath']          = "{$tempDir}/NewFirmware/update.img";
         } else {
             $res->data['d_status_progress'] = file_get_contents($progress_file);
-            $d_pid                          = Util::getPidOfProcess($tempDir . '/NewFirmware/download_settings.json');
+            $d_pid                          = Util::getPidOfProcess($tempDir.'/NewFirmware/download_settings.json');
             if (empty($d_pid)) {
                 $res->data['d_status'] = 'DOWNLOAD_ERROR';
                 $error                 = '';
-                if (file_exists($modulesDir . '/error')) {
-                    $error = file_get_contents($modulesDir . '/error');
+                if (file_exists($modulesDir.'/error')) {
+                    $error = file_get_contents($modulesDir.'/error');
                 }
                 $res->data['d_error'] = $error;
             } else {
@@ -479,11 +479,11 @@ 
         } else {
             $tempDir = '/tmp';
         }
-        $moduleDirTmp  = $tempDir . '/' . $moduleUniqueID;
-        $progress_file = $moduleDirTmp . '/progress';
+        $moduleDirTmp  = $tempDir.'/'.$moduleUniqueID;
+        $progress_file = $moduleDirTmp.'/progress';
         $error         = '';
-        if (file_exists($moduleDirTmp . '/error')) {
-            $error = trim(file_get_contents($moduleDirTmp . '/error'));
+        if (file_exists($moduleDirTmp.'/error')) {
+            $error = trim(file_get_contents($moduleDirTmp.'/error'));
         }
 
         // Ожидание запуска процесса загрузки.
@@ -492,7 +492,7 @@ 
             usleep(500000);
         }
 
-        if ( ! file_exists($progress_file)) {
+        if (!file_exists($progress_file)) {
             $res->data['d_status_progress'] = '0';
             $res->data['d_status']          = 'NOT_FOUND';
             $res->success                   = false;
@@ -508,12 +508,12 @@ 
             $res->success                   = true;
         } else {
             $res->data['d_status_progress'] = file_get_contents($progress_file);
-            $d_pid                          = Util::getPidOfProcess($moduleDirTmp . '/download_settings.json');
+            $d_pid                          = Util::getPidOfProcess($moduleDirTmp.'/download_settings.json');
             if (empty($d_pid)) {
                 $res->data['d_status'] = 'DOWNLOAD_ERROR';
                 $error                 = '';
-                if (file_exists($moduleDirTmp . '/error')) {
-                    $error = file_get_contents($moduleDirTmp . '/error');
+                if (file_exists($moduleDirTmp.'/error')) {
+                    $error = file_get_contents($moduleDirTmp.'/error');
                 }
                 $res->messages[] = $error;
                 $res->success    = false;
@@ -538,14 +538,14 @@ 
         $res            = new PBXApiResult();
         $res->processor = __METHOD__;
         $extension      = Util::getExtensionOfFile($filePath);
-        if ( ! in_array($extension, ['mp3', 'wav', 'alaw'])) {
+        if (!in_array($extension, ['mp3', 'wav', 'alaw'])) {
             $res->success    = false;
             $res->messages[] = "It is forbidden to remove the file type $extension.";
 
             return $res;
         }
 
-        if ( ! file_exists($filePath)) {
+        if (!file_exists($filePath)) {
             $res->success         = true;
             $res->data['message'] = "File '{$filePath}' already deleted";
 
@@ -555,13 +555,13 @@ 
         $out = [];
 
         $arrDeletedFiles = [
-            escapeshellarg(Util::trimExtensionForFile($filePath) . ".wav"),
-            escapeshellarg(Util::trimExtensionForFile($filePath) . ".mp3"),
-            escapeshellarg(Util::trimExtensionForFile($filePath) . ".alaw"),
+            escapeshellarg(Util::trimExtensionForFile($filePath).".wav"),
+            escapeshellarg(Util::trimExtensionForFile($filePath).".mp3"),
+            escapeshellarg(Util::trimExtensionForFile($filePath).".alaw"),
         ];
 
         $rmPath = Util::which('rm');
-        Util::mwExec("{$rmPath} -rf " . implode(' ', $arrDeletedFiles), $out);
+        Util::mwExec("{$rmPath} -rf ".implode(' ', $arrDeletedFiles), $out);
         if (file_exists($filePath)) {
             $res->success  = false;
             $res->messages = $out;
@@ -585,7 +585,7 @@ 
         $res            = new PBXApiResult();
         $res->processor = __METHOD__;
         $moduleMetadata = FilesManagementProcessor::getMetadataFromModuleFile($filePath);
-        if ( ! $moduleMetadata->success) {
+        if (!$moduleMetadata->success) {
             return $moduleMetadata;
         } else {
             $moduleUniqueID = $moduleMetadata->data['uniqid'];
@@ -612,13 +612,13 @@ 
             $grepPath    = Util::which('grep');
             $echoPath    = Util::which('echo');
             $awkPath     = Util::which('awk');
-            $cmd         = 'f="' . $filePath . '"; p=`' . $sevenZaPath . ' l $f | ' . $grepPath . ' module.json`;if [ "$?" == "0" ]; then ' . $sevenZaPath . ' -so e -y -r $f `' . $echoPath . ' $p |  ' . $awkPath . ' -F" " \'{print $6}\'`; fi';
+            $cmd         = 'f="'.$filePath.'"; p=`'.$sevenZaPath.' l $f | '.$grepPath.' module.json`;if [ "$?" == "0" ]; then '.$sevenZaPath.' -so e -y -r $f `'.$echoPath.' $p |  '.$awkPath.' -F" " \'{print $6}\'`; fi';
 
             Util::mwExec($cmd, $out);
             $settings = json_decode(implode("\n", $out), true);
 
             $moduleUniqueID = $settings['moduleUniqueID'] ?? null;
-            if ( ! $moduleUniqueID) {
+            if (!$moduleUniqueID) {
                 $res->messages[] = 'The" moduleUniqueID " in the module file is not described.the json or file does not exist.';
 
                 return $res;
@@ -662,7 +662,7 @@ 
         if (class_exists($pbxExtensionSetupClass)
             && method_exists($pbxExtensionSetupClass, 'installModule')) {
             $setup = new $pbxExtensionSetupClass($moduleUniqueID);
-            if ( ! $setup->installModule()) {
+            if (!$setup->installModule()) {
                 $res->success    = false;
                 $res->messages[] = $setup->getMessages();
             }
@@ -754,11 +754,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/PBXCoreREST/Controllers/Syslog/PostController.php

Spacing +4 added lines, -4 removed lines

@@ -66,11 +66,11 @@ 
             $response = json_decode($response, true);
 
             $filename = $response['data']['filename'] ?? '';
-            if ( ! file_exists($filename)) {
+            if (!file_exists($filename)) {
                 $response['messages'][] = 'Log file not found';
             } else {
                 $response['data']['filename'] = $filename;
-                $response['data']['content']  = '' . file_get_contents($filename);
+                $response['data']['content']  = ''.file_get_contents($filename);
                 unlink($filename);
             }
 
@@ -102,8 +102,8 @@ 
             if (array_key_exists('filename', $response['data'])) {
                 $di           = Di::getDefault();
                 $downloadLink = $di->getShared('config')->path('www.downloadCacheDir');
-                $filename     = $downloadLink . "/" . $response['data']['filename'] ?? '';
-                if ( ! file_exists($filename)) {
+                $filename     = $downloadLink."/".$response['data']['filename'] ?? '';
+                if (!file_exists($filename)) {
                     $response['messages'][] = 'File not found';
                 } else {
                     $scheme                       = $this->request->getScheme();

src/PBXCoreREST/Controllers/Sysinfo/GetController.php

Spacing +2 added lines, -2 removed lines

@@ -53,10 +53,10 @@
         if ($response !== false) {
             $response = json_decode($response, true);
             $filename = $response['data']['filename'] ?? '';
-            if ( ! file_exists($filename)) {
+            if (!file_exists($filename)) {
                 $response['messages'][] = 'System information collected file not found';
             } else {
-                $response['data']['content']  = '' . file_get_contents($filename);
+                $response['data']['content'] = ''.file_get_contents($filename);
                 unlink($filename);
             }
             $this->response->setPayloadSuccess($response);

src/PBXCoreREST/Controllers/System/PostController.php

Spacing +4 added lines, -4 removed lines

@@ -128,10 +128,10 @@ 
         $mohDir                = $di->getShared('config')->path('asterisk.mohdir');
         switch ($category) {
             case SoundFiles::CATEGORY_MOH:
-                $data['filename'] = "{$mohDir}/" . basename($data['temp_filename']);
+                $data['filename'] = "{$mohDir}/".basename($data['temp_filename']);
                 break;
             case SoundFiles::CATEGORY_CUSTOM:
-                $data['filename'] = "{$mediaDir}/" . basename($data['temp_filename']);
+                $data['filename'] = "{$mediaDir}/".basename($data['temp_filename']);
                 break;
             default:
                 $this->sendError(400, 'Category not set');
@@ -160,11 +160,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']  = '' . file_get_contents($filename);
+                $response['data']['content']  = ''.file_get_contents($filename);
                 unlink($filename);
             }
             $this->response->setPayloadSuccess($response);

src/Common/Models/PbxSettings.php

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
     {
         return [
             'Name'                            => 'PBX system',
-            'VirtualHardwareType'             => 'REAL',//VMWARE,HYPERV,AWS,AZURE
+            'VirtualHardwareType'             => 'REAL', //VMWARE,HYPERV,AWS,AZURE
             'Description'                     => '',
             'RestartEveryNight'               => '0',
             'SIPPort'                         => '5060',
@@ -100,7 +100,7 @@ 
             'VoicemailNotificationsEmail'     => 'admin@mycompany.com',
             'VoicemailExten'                  => '*001',
             'PBXLanguage'                     => 'en-en',
-            'PBXInternalExtensionLength'      => '3',// Длина внутреннего номера
+            'PBXInternalExtensionLength'      => '3', // Длина внутреннего номера
             'PBXRecordCalls'                  => '1',
             'PBXSplitAudioThread'             => '0',
             'PBXCallParkingExt'               => '800',
@@ -138,7 +138,7 @@ 
         $result = parent::findFirstByKey($key);
         if ($result === null || $result->value === null) {
             $arrOfDefaultValues = self::getDefaultArrayValues();
-            if ( ! array_key_exists($key, $arrOfDefaultValues)) {
+            if (!array_key_exists($key, $arrOfDefaultValues)) {
                 return '';
             }