mikopbx / Core

src/Core/System/Configs/SyslogConf.php

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
     {
         $syslog_file = '/var/log/messages';
         $log_file    = self::getSyslogFile();
-        if ( ! file_exists($syslog_file)) {
+        if (!file_exists($syslog_file)) {
             file_put_contents($syslog_file, '');
         }
         $syslogdPath = Util::which('syslogd');
@@ -32,9 +32,9 @@ 
         $logreadPath = Util::which('logread');
         $killPath = Util::which('kill');
         $pid = Processes::getPidOfProcess($syslogdPath);
-        if ( ! empty($pid)) {
+        if (!empty($pid)) {
             $options = file_exists($log_file) ? '>' : '';
-            Processes::mwExec("{$busyboxPath} {$logreadPath} 2> /dev/null >" . $options . $log_file);
+            Processes::mwExec("{$busyboxPath} {$logreadPath} 2> /dev/null >".$options.$log_file);
             // Завершаем процесс.
             Processes::mwExec("{$busyboxPath} {$killPath} '$pid'");
         }
@@ -49,7 +49,7 @@ 
      */
     public static function getSyslogFile(): string
     {
-        $logdir = System::getLogDir() . '/system';
+        $logdir = System::getLogDir().'/system';
         Util::mwMkdir($logdir);
         return "$logdir/messages";
     }

src/Core/System/Configs/BeanstalkConf.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         while (true) {
             $pid = Processes::getPidOfProcess('beanstalkd');
             if (empty($pid)) {
-                Util::echoWithSyslog(' - Wait for start beanstalkd deamon ...' . PHP_EOL);
+                Util::echoWithSyslog(' - Wait for start beanstalkd deamon ...'.PHP_EOL);
                 sleep(2);
             } else {
                 break;

src/Core/System/Configs/SSHConf.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
     public function configure()
     {
         $lofFile = '/var/log/lastlog';
-        if(!file_exists($lofFile)){
+        if (!file_exists($lofFile)) {
             file_put_contents($lofFile, '');
         }
         $dropbear_dir = '/etc/dropbear';
@@ -47,7 +47,7 @@ 
         $dropbearkeyPath = Util::which('dropbearkey');
         $dropbearPath = Util::which('dropbear');
         foreach ($keytypes as $keytype => $db_key) {
-            $res_keyfilepath = "{$dropbear_dir}/dropbear_" . $keytype . "_host_key";
+            $res_keyfilepath = "{$dropbear_dir}/dropbear_".$keytype."_host_key";
             $key             = $this->mikoPBXConfig->getGeneralSettings($db_key);
             $key             = (isset($key) && is_string($key)) ? trim($key) : "";
             if (strlen($key) > 100) {
@@ -55,7 +55,7 @@ 
                 file_put_contents($res_keyfilepath, base64_decode($key));
             }
             // If key not exists, we will generate and store new one into file and database
-            if ( ! file_exists($res_keyfilepath)) {
+            if (!file_exists($res_keyfilepath)) {
                 // Generation
                 Processes::mwExec("{$dropbearkeyPath} -t $keytype -f $res_keyfilepath");
                 // Storing

src/Core/System/Configs/NginxConf.php

Spacing +16 added lines, -16 removed lines

@@ -64,17 +64,17 @@ 
             echo $killPath.' -QUIT '.$pid."\n";
         }
         $timeStart = time();
-        while (true){
-            if(time() - $timeStart > 20){
+        while (true) {
+            if (time() - $timeStart > 20) {
                 break;
             }
             usleep(50000);
             $pid = Processes::getPidOfProcess('nginx: master process');
-            if($pid !== ''){
+            if ($pid !== '') {
                 continue;
             }
             $result = Processes::mwExec($NginxPath);
-            if($result === 0){
+            if ($result === 0) {
                 break;
             }
             echo "RESULT -- $result\n";
@@ -112,9 +112,9 @@ 
 
         $RedirectToHttps = $this->mikoPBXConfig->getGeneralSettings('RedirectToHttps');
         if ($RedirectToHttps === '1' && $not_ssl === false) {
-            $conf_data = 'if ( $remote_addr != "127.0.0.1" ) {' . PHP_EOL
-                . '        ' . 'return 301 https://$host:' . $WEBHTTPSPort . '$request_uri;' . PHP_EOL
-                . '       }' . PHP_EOL;
+            $conf_data = 'if ( $remote_addr != "127.0.0.1" ) {'.PHP_EOL
+                . '        '.'return 301 https://$host:'.$WEBHTTPSPort.'$request_uri;'.PHP_EOL
+                . '       }'.PHP_EOL;
             $config    = str_replace('include mikopbx/locations/*.conf;', $conf_data, $config);
         }
         file_put_contents($httpConfigFile, $config);
@@ -124,8 +124,8 @@ 
         $WEBHTTPSPrivateKey = $this->mikoPBXConfig->getGeneralSettings('WEBHTTPSPrivateKey');
         if (
             $not_ssl === false
-            && ! empty($WEBHTTPSPublicKey)
-            && ! empty($WEBHTTPSPrivateKey)
+            && !empty($WEBHTTPSPublicKey)
+            && !empty($WEBHTTPSPrivateKey)
         ) {
             $public_filename  = '/etc/ssl/certs/nginx.crt';
             $private_filename = '/etc/ssl/private/nginx.key';
@@ -140,7 +140,7 @@ 
 
         // Test work
         $currentConfigIsGood = $this->testCurrentNginxConfig();
-        if ($level < 1 && ! $currentConfigIsGood) {
+        if ($level < 1 && !$currentConfigIsGood) {
             ++$level;
             Util::sysLogMsg('nginx', 'Failed test config file. SSL will be disable...');
             $this->generateConf(true, $level);
@@ -169,9 +169,9 @@ 
      */
     public function generateModulesConf(): void
     {
-        $locationsPath     = self::MODULES_LOCATIONS_PATH;
-        if (!is_dir($locationsPath)){
-            Util::mwMkdir($locationsPath,true);
+        $locationsPath = self::MODULES_LOCATIONS_PATH;
+        if (!is_dir($locationsPath)) {
+            Util::mwMkdir($locationsPath, true);
         }
         $additionalModules = $this->di->getShared('pbxConfModules');
         $rmPath            = Util::which('rm');
@@ -179,12 +179,12 @@ 
         foreach ($additionalModules as $appClass) {
             if (method_exists($appClass, 'createNginxLocations')) {
                 $locationContent = $appClass->createNginxLocations();
-                if ( ! empty($locationContent)) {
+                if (!empty($locationContent)) {
                     $confFileName = "{$locationsPath}/{$appClass->moduleUniqueId}.conf";
                     file_put_contents($confFileName, $locationContent);
-                    if ( ! $this->testCurrentNginxConfig()) {
+                    if (!$this->testCurrentNginxConfig()) {
                         Processes::mwExec("{$rmPath} {$confFileName}");
-                        Util::sysLogMsg('nginx', 'Failed test config file for module' . $appClass->moduleUniqueId);
+                        Util::sysLogMsg('nginx', 'Failed test config file for module'.$appClass->moduleUniqueId);
                     }
                 }
             }

src/PBXCoreREST/Workers/WorkerMergeUploadedFile.php

Spacing +7 added lines, -7 removed lines

@@ -21,13 +21,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'],
@@ -38,7 +38,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(
@@ -49,7 +49,7 @@ 
 
         // Delete uploaded file after 10 minutes
         Processes::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
         );
@@ -75,7 +75,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);
@@ -84,11 +84,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);
     }
 }
 

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";
 
             Processes::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/PBXCoreREST/Lib/SysinfoManagementProcessor.php

Spacing +59 added lines, -59 removed lines

@@ -64,7 +64,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();
 
@@ -98,7 +98,7 @@ 
         $content .= self::getAsteriskInfo();
         $content .= self::getChangedConfigFiles();
         $content .= self::getCorruptedFiles();
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
 
         return $content;
     }
@@ -111,12 +111,12 @@ 
     public static function getDate(): string
     {
         $content    = '───────────────────────────────────────── Date ─────────────────────────────────────────';
-        $content    .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $datePath = Util::which('date');
         $ut         = [];
         Processes::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;
     }
 
@@ -129,9 +129,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;
     }
 
@@ -143,13 +143,13 @@ 
     public static function getUpTime(): string
     {
         $content    = '───────────────────────────────────────── Uptime ─────────────────────────────────────────';
-        $content    .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $uptimePath = Util::which('uptime');
         $ut         = [];
         Processes::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;
     }
 
@@ -161,7 +161,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');
@@ -173,8 +173,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;
     }
 
@@ -186,7 +186,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');
@@ -194,19 +194,19 @@ 
         $freePath = Util::which('free');
         Processes::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;
         Processes::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;
         Processes::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;
         Processes::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;
     }
 
@@ -218,13 +218,13 @@ 
     private static function getStorageInfo(): string
     {
         $content = '─────────────────────────────────────────── df ───────────────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $dfPath  = Util::which('df');
         $out     = [];
         Processes::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;
     }
 
@@ -236,13 +236,13 @@ 
     private static function getIfconfigInfo(): string
     {
         $content      = '─────────────────────────────────────── ifconfig ──────────────────────────────────────';
-        $content      .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $ifconfigPath = Util::which('ifconfig');
         $out          = [];
         Processes::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;
     }
 
@@ -254,13 +254,13 @@ 
     private static function getArpInfo(): string
     {
         $content = '─────────────────────────────────────────── arp ──────────────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $arpPath = Util::which('arp');
         $out     = [];
         Processes::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;
     }
 
@@ -272,13 +272,13 @@ 
     private static function getRouteInfo(): string
     {
         $content   = '────────────────────────────────────────── route ─────────────────────────────────────────';
-        $content   .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $routePath = Util::which('route');
         $out       = [];
         Processes::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;
     }
 
@@ -290,13 +290,13 @@ 
     private static function getIptablesInfo(): string
     {
         $content      = '────────────────────────────────────────── iptables ──────────────────────────────────────';
-        $content      .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $iptablesPath = Util::which('iptables');
         $out          = [];
         Processes::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;
     }
 
@@ -308,17 +308,17 @@ 
     private static function getPingInfo(): string
     {
         $content  = '──────────────────────────────────────────── ping ────────────────────────────────────────';
-        $content  .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $pingPath = Util::which('ping');
         $out      = [];
         Processes::mwExec("{$pingPath} 8.8.8.8 -w 2", $out);
         $pingOut = implode(PHP_EOL, $out);
         Processes::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;
     }
 
@@ -332,12 +332,12 @@ 
         $opensslPath = Util::which('openssl');
 
         $content = '─────────────────────────────────────── openssl ─────────────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $out     = [];
         Processes::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;
     }
 
@@ -351,23 +351,23 @@ 
         $asteriskPath = Util::which('asterisk');
 
         $content = '────────────────────────────────── asterisk registrations ────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         Processes::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;
         Processes::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;
         Processes::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;
     }
 
@@ -379,12 +379,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;
     }
 
@@ -396,12 +396,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;
     }
 
@@ -439,7 +439,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/SystemManagementProcessor.php

Spacing +20 added lines, -20 removed lines

@@ -159,14 +159,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";
 
@@ -195,7 +195,7 @@ 
         $res            = new PBXApiResult();
         $res->processor = __METHOD__;
         $moduleMetadata = FilesManagementProcessor::getMetadataFromModuleFile($filePath);
-        if ( ! $moduleMetadata->success) {
+        if (!$moduleMetadata->success) {
             return $moduleMetadata;
         } else {
             $moduleUniqueID = $moduleMetadata->data['uniqid'];
@@ -234,7 +234,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();
             }
@@ -295,7 +295,7 @@ 
                 $setup->unregisterModule();
             }
         }
-        $res->success                    = true;
+        $res->success = true;
         return $res;
     }
 
@@ -371,15 +371,15 @@ 
             [IncomingRoutingTable::class => ''],
             [OutWorkTimes::class => ''],
             [AsteriskManagerUsers::class => ''],
-            [Extensions::class => 'type="' . Extensions::TYPE_IVR_MENU . '"'],  // IVR Menu
-            [Extensions::class => 'type="' . Extensions::TYPE_CONFERENCE . '"'],  // CONFERENCE
-            [Extensions::class => 'type="' . Extensions::TYPE_QUEUE . '"'],  // QUEUE
+            [Extensions::class => 'type="'.Extensions::TYPE_IVR_MENU.'"'], // IVR Menu
+            [Extensions::class => 'type="'.Extensions::TYPE_CONFERENCE.'"'], // CONFERENCE
+            [Extensions::class => 'type="'.Extensions::TYPE_QUEUE.'"'], // QUEUE
         ];
 
         foreach ($clearThisModels as $modelParams) {
             foreach ($modelParams as $key => $value) {
                 $records = call_user_func([$key, 'find'], $value);
-                if ( ! $records->delete()) {
+                if (!$records->delete()) {
                     $res->messages[] = $records->getMessages();
                     $res->success    = false;
                 }
@@ -387,13 +387,13 @@ 
         }
 
         // Other extensions
-        $parameters     = [
+        $parameters = [
             'conditions' => 'not number IN ({ids:array})',
             'bind'       => [
                 'ids' => [
                     '000063', // Reads back the extension
                     '000064', // 0000MILLI
-                    '10003246',// Echo test
+                    '10003246', // Echo test
                     '10000100' // Voicemail
                 ],
             ],
@@ -407,7 +407,7 @@ 
                 $stopDeleting = true;
                 continue;
             }
-            if ( ! $record->delete()) {
+            if (!$record->delete()) {
                 $deleteAttempts += 1;
             }
             if ($deleteAttempts > $countRecords * 10) {
@@ -423,12 +423,12 @@ 
                 'custom' => SoundFiles::CATEGORY_CUSTOM,
             ],
         ];
-        $records    = SoundFiles::find($parameters);
+        $records = SoundFiles::find($parameters);
 
         foreach ($records as $record) {
             if (stripos($record->path, '/storage/usbdisk1/mikopbx') !== false) {
                 Processes::mwExec("{$rm} -rf {$record->path}");
-                if ( ! $record->delete()) {
+                if (!$record->delete()) {
                     $res->messages[] = $record->getMessages();
                     $res->success    = false;
                 }
@@ -440,7 +440,7 @@ 
         foreach ($records as $record) {
             $moduleDir = PbxExtensionUtils::getModuleDir($record->uniqid);
             Processes::mwExec("{$rm} -rf {$moduleDir}");
-            if ( ! $record->delete()) {
+            if (!$record->delete()) {
                 $res->messages[] = $record->getMessages();
                 $res->success    = false;
             }
@@ -448,7 +448,7 @@ 
 
         // Delete CallRecords
         $records = CallDetailRecords::find();
-        if ( ! $records->delete()) {
+        if (!$records->delete()) {
             $res->messages[] = $records->getMessages();
             $res->success    = false;
         }
@@ -473,14 +473,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}'.";
@@ -489,8 +489,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);

src/PBXCoreREST/Lib/FilesManagementProcessor.php

Spacing +36 added lines, -36 removed lines

@@ -91,18 +91,18 @@ 
         }
         $parameters['uploadDir'] = $di->getShared('config')->path('www.uploadDir');
         $parameters['tempDir']   = "{$parameters['uploadDir']}/{$parameters['resumableIdentifier']}";
-        if ( ! Util::mwMkdir($parameters['tempDir'])) {
-            $res->messages[] = 'Temp dir does not exist ' . $parameters['tempDir'];
+        if (!Util::mwMkdir($parameters['tempDir'])) {
+            $res->messages[] = 'Temp dir does not exist '.$parameters['tempDir'];
 
             return $res;
         }
 
         $fileName                           = pathinfo($parameters['resumableFilename'], PATHINFO_FILENAME);
-        $fileName                           = preg_replace( '/[\W]/', '', $fileName);
-        if (strlen($fileName)<10){
+        $fileName                           = preg_replace('/[\W]/', '', $fileName);
+        if (strlen($fileName) < 10) {
             $fileName = ''.md5(time()).'-'.$fileName;
         }
-        $fileName                           .= '.'.pathinfo($parameters['resumableFilename'], PATHINFO_EXTENSION);
+        $fileName .= '.'.pathinfo($parameters['resumableFilename'], PATHINFO_EXTENSION);
         $parameters['resumableFilename']    = $fileName;
         $parameters['fullUploadedFileName'] = "{$parameters['tempDir']}/{$fileName}";
 
@@ -116,8 +116,8 @@ 
         }
 
         foreach ($parameters['files'] as $file_data) {
-            if ( ! self::moveUploadedPartToSeparateDir($parameters, $file_data)) {
-                $res->messages[] = 'Does not found any uploaded chunks on with path ' . $file_data['file_path'];
+            if (!self::moveUploadedPartToSeparateDir($parameters, $file_data)) {
+                $res->messages[] = 'Does not found any uploaded chunks on with path '.$file_data['file_path'];
 
                 return $res;
             }
@@ -145,7 +145,7 @@ 
      */
     private static function moveUploadedPartToSeparateDir(array $parameters, array $file_data): bool
     {
-        if ( ! file_exists($file_data['file_path'])) {
+        if (!file_exists($file_data['file_path'])) {
             return false;
         }
         $factory          = new StreamFactory();
@@ -178,7 +178,7 @@ 
     {
         $totalFilesOnServerSize = 0;
         foreach (scandir($parameters['tempDir']) as $file) {
-            $totalFilesOnServerSize += filesize($parameters['tempDir'] . '/' . $file);
+            $totalFilesOnServerSize += filesize($parameters['tempDir'].'/'.$file);
         }
 
         if ($totalFilesOnServerSize >= $parameters['resumableTotalSize']) {
@@ -190,7 +190,7 @@ 
                 'resumableTotalSize'   => $parameters['resumableTotalSize'],
                 'resumableTotalChunks' => $parameters['resumableTotalChunks'],
             ];
-            $settings_file  = "{$parameters['tempDir']}/merge_settings";
+            $settings_file = "{$parameters['tempDir']}/merge_settings";
             file_put_contents(
                 $settings_file,
                 json_encode($merge_settings, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT)
@@ -227,22 +227,22 @@ 
         $uploadDir = $di->getShared('config')->path('www.uploadDir');
 
         $upload_id     = $postData['id'] ?? null;
-        $progress_dir  = $uploadDir . '/' . $upload_id;
-        $progress_file = $progress_dir . '/merging_progress';
+        $progress_dir  = $uploadDir.'/'.$upload_id;
+        $progress_file = $progress_dir.'/merging_progress';
         if (empty($upload_id)) {
             $res->success                   = false;
             $res->data['d_status_progress'] = '0';
             $res->data['d_status']          = 'ID_NOT_SET';
             $res->messages[]                = 'Upload ID does 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';
-            $res->messages[]                = 'Does not found anything with path: ' . $progress_dir;
+            $res->messages[]                = 'Does not found anything with path: '.$progress_dir;
         } elseif ('100' === file_get_contents($progress_file)) {
             $res->success                   = true;
             $res->data['d_status_progress'] = '100';
@@ -268,14 +268,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";
 
@@ -285,13 +285,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');
-        Processes::mwExec("{$rmPath} -rf " . implode(' ', $arrDeletedFiles), $out);
+        Processes::mwExec("{$rmPath} -rf ".implode(' ', $arrDeletedFiles), $out);
         if (file_exists($filePath)) {
             $res->success  = false;
             $res->messages = $out;
@@ -324,13 +324,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}";
             Processes::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;
@@ -399,7 +399,7 @@ 
         $res->success   = true;
 
         $firmwareDirTmp = dirname($imgFileName);
-        $progress_file  = $firmwareDirTmp . '/progress';
+        $progress_file  = $firmwareDirTmp.'/progress';
 
         // Wait until download process started
         $d_pid = Processes::getPidOfProcess("{$firmwareDirTmp}/download_settings.json");
@@ -411,7 +411,7 @@ 
             $error = trim(file_get_contents("{$firmwareDirTmp}/error"));
         }
 
-        if ( ! file_exists($progress_file)) {
+        if (!file_exists($progress_file)) {
             $res->data['d_status_progress'] = '0';
             $res->messages[]                = 'NOT_FOUND';
             $res->success                   = false;
@@ -515,11 +515,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'));
         }
 
         // Wait until download process started
@@ -528,7 +528,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;
@@ -536,7 +536,7 @@ 
             $res->data['d_status']          = 'DOWNLOAD_ERROR';
             $res->data['d_status_progress'] = file_get_contents($progress_file);
             $res->data['d_error']           = $error;
-            $res->messages[]                = file_get_contents($moduleDirTmp . '/error');
+            $res->messages[]                = file_get_contents($moduleDirTmp.'/error');
             $res->success                   = false;
         } elseif ('100' === file_get_contents($progress_file)) {
             $res->data['d_status_progress'] = '100';
@@ -545,11 +545,11 @@ 
             $res->success                   = true;
         } else {
             $res->data['d_status_progress'] = file_get_contents($progress_file);
-            $d_pid                          = Processes::getPidOfProcess($moduleDirTmp . '/download_settings.json');
+            $d_pid                          = Processes::getPidOfProcess($moduleDirTmp.'/download_settings.json');
             if (empty($d_pid)) {
                 $res->data['d_status'] = 'DOWNLOAD_ERROR';
-                if (file_exists($moduleDirTmp . '/error')) {
-                    $res->messages[] = file_get_contents($moduleDirTmp . '/error');
+                if (file_exists($moduleDirTmp.'/error')) {
+                    $res->messages[] = file_get_contents($moduleDirTmp.'/error');
                 } else {
                     $res->messages[] = "Download process interrupted at {$res->data['d_status_progress']}%";
                 }
@@ -580,13 +580,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';
 
             Processes::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;