mikopbx / Core

src/PBXCoreREST/Lib/FilesManagementProcessor.php

Spacing +33 added lines, -33 removed lines

@@ -90,8 +90,8 @@ 
         }
         $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;
         }
@@ -109,8 +109,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;
             }
@@ -138,7 +138,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();
@@ -171,7 +171,7 @@ 
     {
         $totalFilesOnServerSize = 0;
         foreach (scandir($parameters['tempDir']) as $file) {
-            $totalFilesOnServerSize += filesize($parameters['tempDir'] . '/' . $file);
+            $totalFilesOnServerSize += filesize($parameters['tempDir'].'/'.$file);
         }
 
         if ($totalFilesOnServerSize >= $parameters['resumableTotalSize']) {
@@ -183,7 +183,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)
@@ -220,22 +220,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';
@@ -261,14 +261,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";
 
@@ -278,13 +278,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;
@@ -317,13 +317,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;
@@ -392,7 +392,7 @@ 
         $res->success   = true;
 
         $firmwareDirTmp = dirname($imgFileName);
-        $progress_file  = $firmwareDirTmp . '/progress';
+        $progress_file  = $firmwareDirTmp.'/progress';
 
         // Wait until download process started
         $d_pid = Util::getPidOfProcess("{$firmwareDirTmp}/download_settings.json");
@@ -404,7 +404,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;
@@ -508,11 +508,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
@@ -521,7 +521,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;
@@ -529,7 +529,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';
@@ -538,11 +538,11 @@ 
             $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';
-                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']}%";
                 }
@@ -573,13 +573,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;

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']}"
             );
         }
 

src/Core/Workers/WorkerBase.php

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'));
     }
 
     /**