mikopbx / Core

src/PBXCoreREST/Controllers/System/PostController.php

Spacing +2 added lines, -2 removed lines

@@ -109,10 +109,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');

src/PBXCoreREST/Controllers/Files/PostController.php

Spacing +6 added lines, -6 removed lines

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

src/PBXCoreREST/Lib/FilesManagementProcessor.php

Spacing +47 added lines, -47 removed lines

@@ -89,8 +89,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;
         }
 
@@ -99,15 +99,15 @@ 
 
         // Delete old progress and result file
         $oldMergeProgressFile = "{$parameters['tempDir']}/merging_progress";
-        if (file_exists($oldMergeProgressFile)){
+        if (file_exists($oldMergeProgressFile)) {
             unlink($oldMergeProgressFile);
         }
-        if (file_exists($parameters['fullUploadedFileName'])){
+        if (file_exists($parameters['fullUploadedFileName'])) {
             unlink($parameters['fullUploadedFileName']);
         }
 
         foreach ($parameters['files'] as $file_data) {
-            if (!self::moveUploadedPartToSeparateDir($parameters, $file_data)){
+            if (!self::moveUploadedPartToSeparateDir($parameters, $file_data)) {
                 $res->messages[] = 'Does not found any uploaded chunks on with path '.$file_data['file_path'];
                 return $res;
             }
@@ -135,7 +135,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();
@@ -148,7 +148,7 @@ 
             $file_data['file_type']
         );
         $chunks_dest_file = "{$parameters['tempDir']}/{$parameters['resumableFilename']}.part{$parameters['resumableChunkNumber']}";
-        if (file_exists($chunks_dest_file)){
+        if (file_exists($chunks_dest_file)) {
             $rm = Util::which('rm');
             Util::mwExec("{$rm} -f {$chunks_dest_file}");
         }
@@ -167,7 +167,7 @@ 
     {
         $totalFilesOnServerSize = 0;
         foreach (scandir($parameters['tempDir']) as $file) {
-            $totalFilesOnServerSize += filesize($parameters['tempDir'] . '/' . $file);
+            $totalFilesOnServerSize += filesize($parameters['tempDir'].'/'.$file);
         }
 
         if ($totalFilesOnServerSize >= $parameters['resumableTotalSize']) {
@@ -179,7 +179,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)
@@ -214,22 +214,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';
@@ -265,13 +265,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;
@@ -294,8 +294,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}/* ");
@@ -315,13 +315,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__;
@@ -349,15 +349,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) {
@@ -370,12 +370,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 {
@@ -456,11 +456,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'));
         }
 
         // Ожидание запуска процесса загрузки.
@@ -469,7 +469,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;
@@ -485,15 +485,15 @@ 
             $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']}%";
+                    $res->messages[] = "Download process interrupted at {$res->data['d_status_progress']}%";
                 }
-                $res->success    = false;
+                $res->success = false;
             } else {
                 $res->data['d_status'] = 'DOWNLOAD_IN_PROGRESS';
                 $res->success          = true;
@@ -515,14 +515,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";
 
@@ -532,13 +532,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;
@@ -567,13 +567,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/Lib/SysLogsManagementProcessor.php

Spacing +21 added lines, -21 removed lines

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

src/PBXCoreREST/Workers/WorkerDownloader.php

Spacing +5 added lines, -5 removed lines

@@ -41,8 +41,8 @@ 
         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';
         Util::mwMkdir($temp_dir);
 
         if ($this->getFile()) {
@@ -119,15 +119,15 @@ 
      */
     public function action(): void
     {
-        if (empty($this->settings) || ! isset($this->settings['action'])) {
+        if (empty($this->settings) || !isset($this->settings['action'])) {
             return;
         }
-        if ( ! file_exists($this->settings['res_file'])) {
+        if (!file_exists($this->settings['res_file'])) {
             file_put_contents($this->error_file, 'File does not uploaded', FILE_APPEND);
 
             return;
         }
-        if ( ! file_exists($this->settings['res_file'])
+        if (!file_exists($this->settings['res_file'])
             || md5_file($this->settings['res_file']) !== $this->settings['md5'])
         {
             if (file_exists($this->settings['res_file'])) {

src/Core/System/Upgrade/Releases/UpdateConfigsUpToVer20202754.php

Spacing +18 added lines, -18 removed lines

@@ -81,7 +81,7 @@ 
             'slin'  => 'Signed Linear PCM',
             'opus'  => 'Opus',
         ];
-        $codecs      = Codecs::find();
+        $codecs = Codecs::find();
         // Удалим лишние кодеки
         /** @var Codecs $codec */
         foreach ($codecs as $codec) {
@@ -89,10 +89,10 @@ 
                 $this->checkDisabledCodec($codec);
                 continue;
             }
-            if ( ! $codec->delete()) {
+            if (!$codec->delete()) {
                 Util::sysLogMsg(
                     __CLASS__,
-                    'Can not delete codec ' . $codec->name . ' from MikoPBX\Common\Models\Codecs'
+                    'Can not delete codec '.$codec->name.' from MikoPBX\Common\Models\Codecs'
                 );
             }
         }
@@ -107,7 +107,7 @@ 
      */
     private function checkDisabledCodec(Codecs $codec): void
     {
-        if ( ! in_array($codec->disabled, ['0', '1'], true)) {
+        if (!in_array($codec->disabled, ['0', '1'], true)) {
             $codec->disabled = '0';
             $codec->save();
         }
@@ -121,7 +121,7 @@ 
     private function addNewCodecs(array $availCodecs): void
     {
         foreach ($availCodecs as $availCodec => $desc) {
-            $codecData = Codecs::findFirst('name="' . $availCodec . '"');
+            $codecData = Codecs::findFirst('name="'.$availCodec.'"');
             if ($codecData === null) {
                 $codecData = new Codecs();
             } elseif ($codecData->description === $desc) {
@@ -136,10 +136,10 @@ 
             }
             $codecData->type        = $type;
             $codecData->description = $desc;
-            if ( ! $codecData->save()) {
+            if (!$codecData->save()) {
                 Util::sysLogMsg(
                     __CLASS__,
-                    'Can not update codec info ' . $codecData->name . ' from \MikoPBX\Common\Models\Codecs'
+                    'Can not update codec info '.$codecData->name.' from \MikoPBX\Common\Models\Codecs'
                 );
             }
         }
@@ -191,12 +191,12 @@ 
         $astDbPath = $this->config->path('astDatabase.dbfile');
         if (file_exists($astDbPath)) {
             $table = 'astdb';
-            $sql   = 'DELETE FROM ' . $table . ' WHERE key LIKE "/DND/SIP%" OR key LIKE "/CF/SIP%" OR key LIKE "/UserBuddyStatus/SIP%"';
+            $sql   = 'DELETE FROM '.$table.' WHERE key LIKE "/DND/SIP%" OR key LIKE "/CF/SIP%" OR key LIKE "/UserBuddyStatus/SIP%"';
             $db    = new \SQLite3($astDbPath);
             try {
                 $db->exec($sql);
             } catch (\Error $e) {
-                Util::sysLogMsg(__CLASS__, 'Can clean astdb from UserBuddyStatus...' . $e->getMessage());
+                Util::sysLogMsg(__CLASS__, 'Can clean astdb from UserBuddyStatus...'.$e->getMessage());
                 sleep(2);
             }
             $db->close();
@@ -209,12 +209,12 @@ 
      */
     private function copyMohFilesToStorage(): void
     {
-        $oldMohDir = $this->config->path('asterisk.astvarlibdir') . '/sounds/moh';
-        if ( ! file_exists($oldMohDir)) {
+        $oldMohDir = $this->config->path('asterisk.astvarlibdir').'/sounds/moh';
+        if (!file_exists($oldMohDir)) {
             return;
         }
         $currentMohDir = $this->config->path('asterisk.mohdir');
-        if ( ! Util::mwMkdir($currentMohDir)) {
+        if (!Util::mwMkdir($currentMohDir)) {
             return;
         }
 
@@ -223,9 +223,9 @@ 
             if (in_array($file, ['.', '..'])) {
                 continue;
             }
-            if (copy($oldMohDir . '/' . $file, $currentMohDir . '/' . $file)) {
+            if (copy($oldMohDir.'/'.$file, $currentMohDir.'/'.$file)) {
                 $sound_file           = new SoundFiles();
-                $sound_file->path     = $currentMohDir . '/' . $file;
+                $sound_file->path     = $currentMohDir.'/'.$file;
                 $sound_file->category = SoundFiles::CATEGORY_MOH;
                 $sound_file->name     = $file;
                 $sound_file->save();
@@ -289,7 +289,7 @@ 
             Extensions::TYPE_CONFERENCE,
 
         ];
-        $extensions           = Extensions::find();
+        $extensions = Extensions::find();
         foreach ($extensions as $extension) {
             if (in_array($extension->type, $showInPhonebookTypes)) {
                 $extension->show_in_phonebook = '1';
@@ -304,14 +304,14 @@ 
      */
     private function moveReadOnlySoundsToStorage(): void
     {
-        $currentMediaDir = $this->config->path('asterisk.customSoundDir') . '/';
-        if ( ! is_dir($currentMediaDir)) {
+        $currentMediaDir = $this->config->path('asterisk.customSoundDir').'/';
+        if (!is_dir($currentMediaDir)) {
             Util::mwMkdir($currentMediaDir);
         }
         $soundFiles = SoundFiles::find();
         foreach ($soundFiles as $soundFile) {
             if (stripos($soundFile->path, '/offload/asterisk/sounds/other/') === 0) {
-                $newPath = $currentMediaDir . pathinfo($soundFile->path)['basename'];
+                $newPath = $currentMediaDir.pathinfo($soundFile->path)['basename'];
                 if (copy($soundFile->path, $newPath)) {
                     $soundFile->path = $newPath;
                     $soundFile->update();

src/Core/System/Notifications.php

Spacing +7 added lines, -7 removed lines

@@ -77,7 +77,7 @@ 
                 $from_name = $settings['MailSMTPFromUsername'];
             }
 
-            $mail->Port    = (integer)$settings['MailSMTPPort'];
+            $mail->Port    = (integer) $settings['MailSMTPPort'];
             $mail->CharSet = 'UTF-8';
 
             $mail->setFrom($from_address, $from_name);
@@ -89,14 +89,14 @@ 
             $mail->Subject = $subject;
             $mail->Body    = $message;
 
-            if ( ! $mail->send()) {
+            if (!$mail->send()) {
                 $messages[] = $mail->ErrorInfo;
             }
         } catch (\Exception $e) {
             $messages[] = $e->getMessage();
         }
 
-        if (count($messages)>0) {
+        if (count($messages) > 0) {
             Util::sysLogMsg('PHPMailer', implode(' ', $messages), LOG_ERR);
             return false;
         }
@@ -108,7 +108,7 @@ 
         $settings             = $mikoPBXConfig->getGeneralSettings();
         $systemNotificationsEmail = $settings['SystemNotificationsEmail'];
         $result = self::sendMail($systemNotificationsEmail, 'Test mail from MIKO PBX', '<b>Test message</b><hr>');
-        return ($result===true);
+        return ($result === true);
     }
 
     /**
@@ -121,10 +121,10 @@ 
         $mikoPBXConfig = new MikoPBXConfig();
         $settings      = $mikoPBXConfig->getGeneralSettings();
 
-        $conf = "defaults\n" .
-            "auth       on\n" .
+        $conf = "defaults\n".
+            "auth       on\n".
             // "logfile    /var/log/msmtp.log\n".
-            "timeout    10\n" .
+            "timeout    10\n".
             "syslog     LOG_LOCAL0\n\n";
 
         if (isset($settings["MailSMTPUseTLS"]) && $settings["MailSMTPUseTLS"] == "1") {

src/Core/Workers/WorkerNotifyByEmail.php

Spacing +4 added lines, -4 removed lines

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

src/Core/Asterisk/Configs/SIPConf.php

Spacing +50 added lines, -50 removed lines

@@ -54,15 +54,15 @@ 
         $conf .= $this->generateProvidersPj();
         $conf .= $this->generatePeersPj();
 
-        Util::fileWriteContent($this->config->path('asterisk.astetcdir') . '/pjsip.conf', $conf);
+        Util::fileWriteContent($this->config->path('asterisk.astetcdir').'/pjsip.conf', $conf);
         $pjConf = '[log_mappings]'."\n".
             'type=log_mappings'."\n".
             'asterisk_error = 0'."\n".
             'asterisk_warning = 2'."\n".
             'asterisk_debug = 1,3,4,5,6'."\n\n";
 
-        file_put_contents($this->config->path('asterisk.astetcdir') . '/pjproject.conf', $pjConf);
-        file_put_contents($this->config->path('asterisk.astetcdir') . '/sorcery.conf', '');
+        file_put_contents($this->config->path('asterisk.astetcdir').'/pjproject.conf', $pjConf);
+        file_put_contents($this->config->path('asterisk.astetcdir').'/sorcery.conf', '');
 
         $db = new AstDB();
         foreach ($this->data_peers as $peer) {
@@ -97,7 +97,7 @@ 
                 continue;
             }
             $sub = new SubnetCalculator($lan_config['ipaddr'], $lan_config['subnet']);
-            $net = $sub->getNetworkPortion() . '/' . $lan_config['subnet'];
+            $net = $sub->getNetworkPortion().'/'.$lan_config['subnet'];
             if ($if_data['topology'] === 'private' && in_array($net, $subnets, true) === false) {
                 $subnets[] = $net;
             }
@@ -116,8 +116,8 @@ 
         }
         $codecs = $this->getCodecs();
         $codecConf = '';
-        foreach ($codecs as $codec){
-            $codecConf.= "allow = {$codec}\n";
+        foreach ($codecs as $codec) {
+            $codecConf .= "allow = {$codec}\n";
         }
 
         $pbxVersion = PbxSettings::getValueByKey('PBXVersion');
@@ -126,50 +126,50 @@ 
             foreach ($subnets as $net) {
                 $natConf .= "local_net={$net}\n";
             }
-            if ( ! empty($exthostname)) {
+            if (!empty($exthostname)) {
                 $parts = explode(':', $exthostname);
-                $natConf  .= 'external_media_address=' . $parts[0] . "\n";
-                $natConf  .= 'external_signaling_address=' . $parts[0] . "\n";
-                $natConf  .= 'external_signaling_port=' . ($parts[1] ?? '5060');
-            } elseif ( ! empty($extipaddr)) {
+                $natConf  .= 'external_media_address='.$parts[0]."\n";
+                $natConf  .= 'external_signaling_address='.$parts[0]."\n";
+                $natConf  .= 'external_signaling_port='.($parts[1] ?? '5060');
+            } elseif (!empty($extipaddr)) {
                 $parts = explode(':', $extipaddr);
-                $natConf  .= 'external_media_address=' . $parts[0] . "\n";
-                $natConf  .= 'external_signaling_address=' . $parts[0] . "\n";
-                $natConf  .= 'external_signaling_port=' . ($parts[1] ?? '5060');
+                $natConf  .= 'external_media_address='.$parts[0]."\n";
+                $natConf  .= 'external_signaling_address='.$parts[0]."\n";
+                $natConf  .= 'external_signaling_port='.($parts[1] ?? '5060');
             }
         }
 
-        $conf = "[general] \n" .
-            "disable_multi_domain=on\n" .
-            "transport = udp \n\n" .
+        $conf = "[general] \n".
+            "disable_multi_domain=on\n".
+            "transport = udp \n\n".
 
-            "[global] \n" .
-            "type = global\n" .
-            "endpoint_identifier_order=username,ip,anonymous\n" .
-            "user_agent = mikopbx-{$pbxVersion}\n\n" .
+            "[global] \n".
+            "type = global\n".
+            "endpoint_identifier_order=username,ip,anonymous\n".
+            "user_agent = mikopbx-{$pbxVersion}\n\n".
 
-            "[anonymous]\n" .
-            "type = endpoint\n" .
+            "[anonymous]\n".
+            "type = endpoint\n".
             $codecConf.
             "language={$lang}\n".
-            "timers = no\n" .
+            "timers = no\n".
             "context = public-direct-dial\n\n".
 
-            "[transport-udp]\n" .
-            "type = transport\n" .
-            "protocol = udp\n" .
+            "[transport-udp]\n".
+            "type = transport\n".
+            "protocol = udp\n".
             "bind=0.0.0.0:{$this->generalSettings['SIPPort']}\n".
             "{$natConf}\n\n".
 
-            "[transport-tcp]\n" .
-            "type = transport\n" .
-            "protocol = tcp\n" .
+            "[transport-tcp]\n".
+            "type = transport\n".
+            "protocol = tcp\n".
             "bind=0.0.0.0:{$this->generalSettings['SIPPort']}\n".
             "{$natConf}\n\n".
             '';
 
         $varEtcDir = $this->config->path('core.varEtcDir');
-        file_put_contents($varEtcDir . '/topology_hash', md5($topology . $exthostname . $extipaddr));
+        file_put_contents($varEtcDir.'/topology_hash', md5($topology.$exthostname.$extipaddr));
         $conf .= "\n";
 
         return $conf;
@@ -186,7 +186,7 @@ 
         $conf        = '';
         $reg_strings = '';
         $prov_config = '';
-        if ($this->data_providers===null){
+        if ($this->data_providers === null) {
             $this->getSettings();
         }
         foreach ($this->data_providers as $provider) {
@@ -195,7 +195,7 @@ 
 
             $need_register = $provider['noregister'] !== '1';
             if ($need_register) {
-                $options     = [
+                $options = [
                     'type'     => 'auth',
                     'username' => $provider['username'],
                     'password' => $provider['secret'],
@@ -203,7 +203,7 @@ 
                 $reg_strings .= "[REG-AUTH-{$provider['uniqid']}]\n";
                 $reg_strings .= Util::overrideConfigurationArray($options, $manual_attributes, 'registration-auth');
 
-                $options     = [
+                $options = [
                     'type'                        => 'registration',
                     // 'transport'                   => 'transport-udp',
                     'outbound_auth'               => "REG-AUTH-{$provider['uniqid']}",
@@ -221,7 +221,7 @@ 
             }
 
             if ('1' !== $provider['receive_calls_without_auth']) {
-                $options     = [
+                $options = [
                     'type'     => 'auth',
                     'username' => $provider['username'],
                     'password' => $provider['secret'],
@@ -231,7 +231,7 @@ 
             }
 
             $defaultuser = (trim($provider['defaultuser']) === '') ? $provider['username'] : $provider['defaultuser'];
-            if ( ! empty($defaultuser) && '1' !== $provider['receive_calls_without_auth']) {
+            if (!empty($defaultuser) && '1' !== $provider['receive_calls_without_auth']) {
                 $contact = "sip:$defaultuser@{$provider['host']}:{$port}";
             } else {
                 $contact = "sip:{$provider['host']}:{$port}";
@@ -245,7 +245,7 @@ 
                 'minimum_expiration' => $this->generalSettings['SIPMinExpiry'],
                 'default_expiration' => $this->generalSettings['SIPDefaultExpiry'],
             ];
-            if($provider['qualify'] === '1'){
+            if ($provider['qualify'] === '1') {
                 $options['qualify_frequency'] = $provider['qualifyfreq'];
                 $options['qualify_timeout']   = '3.0';
             }
@@ -253,7 +253,7 @@ 
             $prov_config .= "[{$provider['uniqid']}]\n";
             $prov_config .= Util::overrideConfigurationArray($options, $manual_attributes, 'aor');
 
-            $options     = [
+            $options = [
                 'type'     => 'identify',
                 'endpoint' => $provider['uniqid'],
                 'match'    => $provider['host'],
@@ -314,7 +314,7 @@ 
      */
     public function generatePeersPj(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         $lang              = $this->generalSettings['PBXLanguage'];
@@ -328,7 +328,7 @@ 
             $language = (trim($language) === '') ? 'en-en' : $language;
 
             $calleridname = (trim($peer['calleridname']) === '') ? $peer['extension'] : $peer['calleridname'];
-            $busylevel    = (trim($peer['busylevel']) === '') ? '1' : '' . $peer['busylevel'];
+            $busylevel    = (trim($peer['busylevel']) === '') ? '1' : ''.$peer['busylevel'];
 
             $options = [
                 'type'     => 'auth',
@@ -480,7 +480,7 @@ 
             'conditions'=>'disabled="0"',
             'order' => 'type, priority',
         ];
-        $codecs     = Codecs::find($filter);
+        $codecs = Codecs::find($filter);
         foreach ($codecs as $codec_data) {
             $arr_codecs[] = $codec_data->name;
         }
@@ -510,8 +510,8 @@ 
             // Получим используемые кодеки.
             $arr_data['codecs'] = $this->getCodecs();
 
-            $context_id = preg_replace("/[^a-z\d]/iu", '', $sip_peer->host . $sip_peer->port);
-            if ( ! isset($this->contexts_data[$context_id])) {
+            $context_id = preg_replace("/[^a-z\d]/iu", '', $sip_peer->host.$sip_peer->port);
+            if (!isset($this->contexts_data[$context_id])) {
                 $this->contexts_data[$context_id] = [];
             }
             $this->contexts_data[$context_id][$sip_peer->uniqid] = $sip_peer->username;
@@ -530,7 +530,7 @@ 
      */
     private function getOutRoutes(): array
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         /** @var \MikoPBX\Common\Models\OutgoingRoutingTable $rout */
@@ -565,7 +565,7 @@ 
      */
     public function extensionGenContexts(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         // Генерация внутреннего номерного плана.
@@ -583,8 +583,8 @@ 
             $contexts_data = $this->contexts_data[$provider['context_id']];
             if (count($contexts_data) === 1) {
                 $conf .= ExtensionsConf::generateIncomingContextPeers($provider['uniqid'], $provider['username'], '');
-            } elseif ( ! in_array($provider['context_id'], $contexts, true)) {
-                $conf       .= ExtensionsConf::generateIncomingContextPeers(
+            } elseif (!in_array($provider['context_id'], $contexts, true)) {
+                $conf .= ExtensionsConf::generateIncomingContextPeers(
                     $contexts_data,
                     null,
                     $provider['context_id']
@@ -603,7 +603,7 @@ 
      */
     public function extensionGenHints(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         $conf = '';
@@ -616,7 +616,7 @@ 
 
     public function extensionGenInternal(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         // Генерация внутреннего номерного плана.
@@ -631,7 +631,7 @@ 
 
     public function extensionGenInternalTransfer(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         // Генерация внутреннего номерного плана.