mikopbx / Core

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

src/Core/System/System.php

Spacing +3 added lines, -3 removed lines

@@ -174,7 +174,7 @@ 
         if (file_exists('/etc/TZ')) {
             $origin_tz = file_get_contents("/etc/TZ");
         }
-        if ($origin_tz !== $db_tz){
+        if ($origin_tz !== $db_tz) {
             self::timezoneConfigure();
         }
         $origin_tz = $db_tz;
@@ -244,7 +244,7 @@ 
         }
         if ($timezone) {
             $zone_file = "/usr/share/zoneinfo/{$timezone}";
-            if ( ! file_exists($zone_file)) {
+            if (!file_exists($zone_file)) {
                 return;
             }
             $cpPath = Util::which('cp');
@@ -282,7 +282,7 @@ 
             try {
                 /** @var \MikoPBX\Modules\Config\ConfigClass $appClass */
                 $appClass->onAfterPbxStarted();
-            }catch (\Error $e){
+            } catch (\Error $e) {
                 Util::sysLogMsg('onAfterPbxStarted', $e->getMessage());
             }
         }

Braces +1 added lines, -1 removed lines

@@ -282,7 +282,7 @@
             try {
                 /** @var \MikoPBX\Modules\Config\ConfigClass $appClass */
                 $appClass->onAfterPbxStarted();
-            }catch (\Error $e){
+            } catch (\Error $e){
                 Util::sysLogMsg('onAfterPbxStarted', $e->getMessage());
             }
         }

src/Core/System/Network.php

Spacing +65 added lines, -65 removed lines

@@ -29,7 +29,7 @@ 
         }
 
         Util::killByName('pcapsipdump');
-        $log_dir = System::getLogDir() . '/pcapsipdump';
+        $log_dir = System::getLogDir().'/pcapsipdump';
         Util::mwMkdir($log_dir);
 
         $network         = new Network();
@@ -38,7 +38,7 @@ 
         foreach ($arr_eth as $eth) {
             $pid_file = "/var/run/pcapsipdump_{$eth}.pid";
             Util::mwExecBg(
-                $pcapsipdumpPath . ' -T 120 -P ' . $pid_file . ' -i ' . $eth . ' -m \'^(INVITE|REGISTER)$\' -L ' . $log_dir . '/dump.db'
+                $pcapsipdumpPath.' -T 120 -P '.$pid_file.' -i '.$eth.' -m \'^(INVITE|REGISTER)$\' -L '.$log_dir.'/dump.db'
             );
         }
     }
@@ -146,10 +146,10 @@ 
         /** @var \MikoPBX\Common\Models\LanInterfaces $res */
         $res = LanInterfaces::findFirst("internet = '1'");
         if (null !== $res) {
-            if ( ! empty($res->primarydns) && '127.0.0.1' != $res->primarydns) {
+            if (!empty($res->primarydns) && '127.0.0.1' != $res->primarydns) {
                 $dns[] = $res->primarydns;
             }
-            if ( ! empty($res->secondarydns) && '127.0.0.1' != $res->secondarydns) {
+            if (!empty($res->secondarydns) && '127.0.0.1' != $res->secondarydns) {
                 $dns[] = $res->secondarydns;
             }
         }
@@ -165,39 +165,39 @@ 
     public function generatePdnsdConfig($named_dns): void
     {
         $tempDir   = $this->di->getShared('config')->path('core.tempDir');
-        $cache_dir = $tempDir . '/pdnsd/cache';
+        $cache_dir = $tempDir.'/pdnsd/cache';
         Util::mwMkdir($cache_dir);
 
-        $conf = 'global {' . "\n" .
-            '	perm_cache=10240;' . "\n" .
-            '	cache_dir="' . $cache_dir . '";' . "\n" .
-            '	pid_file = /var/run/pdnsd.pid;' . "\n" .
-            '	run_as="nobody";' . "\n" .
-            '	server_ip = 127.0.0.1;' . "\n" .
-            '	status_ctl = on;' . "\n" .
-            '	query_method=udp_tcp;' . "\n" .
-            '	min_ttl=15m;' . "\n" .
-            '	max_ttl=1w;' . "\n" .
-            '	timeout=10;' . "\n" .
-            '	neg_domain_pol=on;' . "\n" .
-            '	run_as=root;' . "\n" .
-            '	daemon=on;' . "\n" .
-            '}' . "\n" .
-            'server {' . "\n" .
-            '	label = "main";' . "\n" .
-            '	ip = ' . implode(', ', $named_dns) . ';' . "\n" .
-            '	interface=lo;' . "\n" .
-            '	uptest=if;' . "\n" .
-            '	interval=10m;' . "\n" .
-            '	purge_cache=off;' . "\n" .
+        $conf = 'global {'."\n".
+            '	perm_cache=10240;'."\n".
+            '	cache_dir="'.$cache_dir.'";'."\n".
+            '	pid_file = /var/run/pdnsd.pid;'."\n".
+            '	run_as="nobody";'."\n".
+            '	server_ip = 127.0.0.1;'."\n".
+            '	status_ctl = on;'."\n".
+            '	query_method=udp_tcp;'."\n".
+            '	min_ttl=15m;'."\n".
+            '	max_ttl=1w;'."\n".
+            '	timeout=10;'."\n".
+            '	neg_domain_pol=on;'."\n".
+            '	run_as=root;'."\n".
+            '	daemon=on;'."\n".
+            '}'."\n".
+            'server {'."\n".
+            '	label = "main";'."\n".
+            '	ip = '.implode(', ', $named_dns).';'."\n".
+            '	interface=lo;'."\n".
+            '	uptest=if;'."\n".
+            '	interval=10m;'."\n".
+            '	purge_cache=off;'."\n".
             '}';
 
-        $pdnsdConfFile  = '/etc/pdnsd.conf';
+        $pdnsdConfFile = '/etc/pdnsd.conf';
         $savedConf = '';
-        if(file_exists($pdnsdConfFile)){
+        if (file_exists($pdnsdConfFile)) {
             $savedConf = file_get_contents($pdnsdConfFile);
         }
-        if($savedConf != $conf){
+        if ($savedConf != $conf) {
             file_put_contents($pdnsdConfFile, $conf);
         }
         $pdnsdPath = Util::which('pdnsd');
@@ -205,7 +205,7 @@ 
         if (!empty($pid) && $savedConf === $conf) {
             // Выполним дополнительную проверку, работает ли сервер.
             $resultResolve = gethostbynamel('lic.miko.ru');
-            if($resultResolve !== false){
+            if ($resultResolve !== false) {
                 // Ничего делать не нужно. Конфиг не изменился. Рестарт не требуется.
                 return;
             }
@@ -282,7 +282,7 @@ 
                  */
                 $pid_file = "/var/run/udhcpc_{$if_name}";
                 $pid_pcc  = Util::getPidOfProcess($pid_file);
-                if ( ! empty($pid_pcc) && file_exists($pid_file)) {
+                if (!empty($pid_pcc) && file_exists($pid_file)) {
                     // Завершаем старый процесс.
                     $killPath = Util::which('kill');
                     $catPath  = Util::which('cat');
@@ -411,10 +411,10 @@ 
 
             $result = [''];
             if (file_exists('/etc/static-routes')) {
-                $command = "{$catPath} /etc/static-routes " .
-                    "| {$grepPath} '^rout' " .
-                    "| {$busyboxPath} awk -F ';' '{print $1}' " .
-                    "| {$grepPath} '{$if_name}\$' " .
+                $command = "{$catPath} /etc/static-routes ".
+                    "| {$grepPath} '^rout' ".
+                    "| {$busyboxPath} awk -F ';' '{print $1}' ".
+                    "| {$grepPath} '{$if_name}\$' ".
                     "| {$awkPath} -F 'dev {$if_name}' '{ print $1 }'";
                 Util::mwExec($command, $result);
             }
@@ -424,19 +424,19 @@ 
 
             if ($if_data['vlanid'] > 0) {
                 // Пока только статика.
-                $lan_config = "auto {$if_data['interface_orign']}.{$if_data['vlanid']}\n" .
-                    "iface {$if_data['interface_orign']}.{$if_data['vlanid']} inet static \n" .
-                    "address {$ipaddr}\n" .
-                    "netmask {$subnet}\n" .
-                    "gateway {$gateway}\n" .
-                    "dns-nameservers 127.0.0.1\n" .
-                    "vlan_raw_device {$if_data['interface_orign']}\n" .
-                    "{$routs_add}\n" .
+                $lan_config = "auto {$if_data['interface_orign']}.{$if_data['vlanid']}\n".
+                    "iface {$if_data['interface_orign']}.{$if_data['vlanid']} inet static \n".
+                    "address {$ipaddr}\n".
+                    "netmask {$subnet}\n".
+                    "gateway {$gateway}\n".
+                    "dns-nameservers 127.0.0.1\n".
+                    "vlan_raw_device {$if_data['interface_orign']}\n".
+                    "{$routs_add}\n".
                     "{$routs_rem}\n";
             } elseif (trim($if_data['dhcp']) === '1') {
-                $lan_config = "auto {$if_name}\n" .
-                    "iface {$if_name} inet dhcp\n" .
-                    "{$routs_add}\n" .
+                $lan_config = "auto {$if_name}\n".
+                    "iface {$if_name} inet dhcp\n".
+                    "{$routs_add}\n".
                     "{$routs_rem}\n";
             } else {
                 if (empty($ipaddr)) {
@@ -449,13 +449,13 @@ 
                     echo "Caught exception: $ipaddr $subnet", $e->getMessage(), "\n";
                     continue;
                 }
-                $lan_config = "auto {$if_name}\n" .
-                    "iface {$if_name} inet static\n" .
-                    "address {$ipaddr}\n" .
-                    "netmask {$subnet}\n" .
-                    "gateway {$gateway}\n" .
-                    "dns-nameservers 127.0.0.1\n" .
-                    "{$routs_add}\n" .
+                $lan_config = "auto {$if_name}\n".
+                    "iface {$if_name} inet static\n".
+                    "address {$ipaddr}\n".
+                    "netmask {$subnet}\n".
+                    "gateway {$gateway}\n".
+                    "dns-nameservers 127.0.0.1\n".
+                    "{$routs_add}\n".
                     "{$routs_rem}\n";
             }
             file_put_contents("/etc/network/interfaces.d/{$if_name}", $lan_config);
@@ -546,7 +546,7 @@ 
         $net_mask = explode(".", $net_mask);
 
         foreach ($net_mask as $oct_ect) {
-            $bits += strlen(str_replace("0", "", decbin((int)$oct_ect)));
+            $bits += strlen(str_replace("0", "", decbin((int) $oct_ect)));
         }
 
         return $bits;
@@ -603,13 +603,13 @@ 
         $data->name      = $name;
         $data->interface = $name;
         $data->dhcp      = '1';
-        $data->internet  = ($general === true) ? '1' : '0';;
+        $data->internet  = ($general === true) ? '1' : '0'; ;
         $data->disabled  = '0';
         $data->vlanid    = '0';
         $data->hostname  = 'mikopbx';
         $data->domain    = '';
         $data->topology  = 'private';
-        $data->primarydns= '';
+        $data->primarydns = '';
         $data->save();
 
         return $data->toArray();
@@ -630,15 +630,15 @@ 
     public function hostnameConfigure(): void
     {
         $data       = Network::getHostName();
-        $hosts_conf = "127.0.0.1 localhost\n" .
+        $hosts_conf = "127.0.0.1 localhost\n".
             "127.0.0.1 {$data['hostname']}\n";
-        if ( ! empty($data['domain'])) {
+        if (!empty($data['domain'])) {
             $hosts_conf .= "127.0.0.1 {$data['hostname']}.{$data['domain']}\n";
         }
         Util::fileWriteContent('/etc/hosts', $hosts_conf);
 
         $hostnamePath = Util::which('hostname');
-        Util::mwExec($hostnamePath . ' ' . escapeshellarg("{$data['hostname']}"));
+        Util::mwExec($hostnamePath.' '.escapeshellarg("{$data['hostname']}"));
     }
 
     /**
@@ -652,12 +652,12 @@ 
 
         $pidFile = '/var/run/openvpn.pid';
         $pid     = Util::getPidOfProcess('openvpn');
-        if ( ! empty($pid)) {
+        if (!empty($pid)) {
             // Завершаем процесс.
             $busyboxPath = Util::which('busybox');
             Util::mwExec("{$busyboxPath} kill '$pid'");
         }
-        if ( ! empty($data)) {
+        if (!empty($data)) {
             $openvpnPath = Util::which('openvpn');
             Util::mwExecBg("{$openvpnPath} --config /etc/openvpn.ovpn --writepid {$pidFile}", '/dev/null', 5);
         }
@@ -867,12 +867,12 @@ 
         if ($res === null) {
             return;
         }
-        if (empty($res->primarydns) && ! empty($data['primarydns'])) {
+        if (empty($res->primarydns) && !empty($data['primarydns'])) {
             $res->writeAttribute('primarydns', $data['primarydns']);
         } elseif (empty($res->secondarydns) && $res->primarydns !== $data['primarydns']) {
             $res->writeAttribute('secondarydns', $data['primarydns']);
         }
-        if (empty($res->secondarydns) && ! empty($data['secondarydns'])) {
+        if (empty($res->secondarydns) && !empty($data['secondarydns'])) {
             $res->writeAttribute('secondarydns', $data['secondarydns']);
         }
         $res->save();
@@ -915,7 +915,7 @@ 
     {
         // Настройка по умолчанию.
         $interface = trim(getenv('interface'));
-        if ( ! Util::isSystemctl()) {
+        if (!Util::isSystemctl()) {
             // Для MIKO LFS Edition.
             $busyboxPath = Util::which('busybox');
             Util::mwExec("{$busyboxPath} ifconfig $interface 192.168.2.1 netmask 255.255.255.0");

src/PBXCoreREST/Lib/FilesManagementProcessor.php

Spacing +36 added lines, -36 removed lines

@@ -90,18 +90,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}";
 
@@ -115,8 +115,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;
             }
@@ -144,7 +144,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();
@@ -177,7 +177,7 @@ 
     {
         $totalFilesOnServerSize = 0;
         foreach (scandir($parameters['tempDir']) as $file) {
-            $totalFilesOnServerSize += filesize($parameters['tempDir'] . '/' . $file);
+            $totalFilesOnServerSize += filesize($parameters['tempDir'].'/'.$file);
         }
 
         if ($totalFilesOnServerSize >= $parameters['resumableTotalSize']) {
@@ -189,7 +189,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)
@@ -226,22 +226,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';
@@ -267,14 +267,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";
 
@@ -284,13 +284,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;
@@ -323,13 +323,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;
@@ -398,7 +398,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");
@@ -410,7 +410,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;
@@ -514,11 +514,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
@@ -527,7 +527,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;
@@ -535,7 +535,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';
@@ -544,11 +544,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']}%";
                 }
@@ -579,13 +579,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/AdminCabinet/Controllers/SessionController.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
      */
     public function startAction(): void
     {
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             $this->forward('session/index');
         }
         $loginFromUser = $this->request->getPost('login');
@@ -92,7 +92,7 @@ 
     private function updateSystemLanguage(): void
     {
         $newLanguage = $this->session->get('WebAdminLanguage');
-        if ( ! isset($newLanguage)) {
+        if (!isset($newLanguage)) {
             return;
         }
         $languageSettings = PbxSettings::findFirstByKey('WebAdminLanguage');

src/Modules/Setup/PbxExtensionSetupBase.php

Spacing +22 added lines, -22 removed lines

@@ -114,8 +114,8 @@ 
         $this->messages = [];
         $this->db      = $this->di->getShared('db');
         $this->config  = $this->di->getShared('config');
-        $this->license =  $this->di->getShared('license');
-        $this->moduleDir = $this->config->path('core.modulesDir') . '/' . $this->moduleUniqueID;
+        $this->license = $this->di->getShared('license');
+        $this->moduleDir = $this->config->path('core.modulesDir').'/'.$this->moduleUniqueID;
         $settings_file = "{$this->moduleDir}/module.json";
         if (file_exists($settings_file)) {
             $module_settings = json_decode(file_get_contents($settings_file), true);
@@ -139,7 +139,7 @@ 
             }
         }
 
-        $this->messages  = [];
+        $this->messages = [];
 
 
     }
@@ -154,21 +154,21 @@ 
     {
         $result = true;
         try {
-            if ( ! $this->activateLicense()) {
+            if (!$this->activateLicense()) {
                 $this->messages[] = 'License activate error';
                 $result           = false;
             }
-            if ( ! $this->installFiles()) {
+            if (!$this->installFiles()) {
                 $this->messages[] = ' installFiles error';
                 $result           = false;
             }
-            if ( ! $this->installDB()) {
+            if (!$this->installDB()) {
                 $this->messages[] = ' installDB error';
                 $result           = false;
             }
             $this->fixFilesRights();
         } catch (\Exception $exception) {
-            $result         = false;
+            $result = false;
             $this->messages[] = $exception->getMessage();
         }
 
@@ -199,7 +199,7 @@ 
         PbxExtensionUtils::createAgiBinSymlinks($this->moduleUniqueID);
 
         // Restore database settings
-        $modulesDir          = $this->config->path('core.modulesDir');
+        $modulesDir = $this->config->path('core.modulesDir');
         $backupPath = "{$modulesDir}/Backup/{$this->moduleUniqueID}";
         if (is_dir($backupPath)) {
             $cpPath = Util::which('cp');
@@ -222,7 +222,7 @@ 
             "{$this->moduleDir}/bin"
         ];
         foreach ($dirs as $dir) {
-            if(file_exists($dir) && is_dir($dir)){
+            if (file_exists($dir) && is_dir($dir)) {
                 // Add executable right to module's binary
                 Util::addExecutableRights($dir);
             }
@@ -257,16 +257,16 @@ 
     {
         $result = true;
         try {
-            if ( ! $this->unInstallDB($keepSettings)) {
+            if (!$this->unInstallDB($keepSettings)) {
                 $this->messages[] = ' unInstallDB error';
                 $result           = false;
             }
-            if ($result && ! $this->unInstallFiles($keepSettings)) {
+            if ($result && !$this->unInstallFiles($keepSettings)) {
                 $this->messages[] = ' unInstallFiles error';
                 $result           = false;
             }
         } catch (\Exception $exception) {
-            $result         = false;
+            $result = false;
             $this->messages[] = $exception->getMessage();
         }
 
@@ -314,7 +314,7 @@ 
     {
         $cpPath = Util::which('cp');
         $rmPath = Util::which('rm');
-        $modulesDir          = $this->config->path('core.modulesDir');
+        $modulesDir = $this->config->path('core.modulesDir');
         $backupPath = "{$modulesDir}/Backup/{$this->moduleUniqueID}";
         Util::mwExec("{$rmPath} -rf {$backupPath}");
         if ($keepSettings) {
@@ -327,21 +327,21 @@ 
         // IMG
         $imgCacheDir = appPath('sites/admin-cabinet/assets/img/cache');
         $moduleImageCacheDir = "{$imgCacheDir}/{$this->moduleUniqueID}";
-        if (file_exists($moduleImageCacheDir)){
+        if (file_exists($moduleImageCacheDir)) {
             unlink($moduleImageCacheDir);
         }
 
         // CSS
         $cssCacheDir = appPath('sites/admin-cabinet/assets/css/cache');
         $moduleCSSCacheDir = "{$cssCacheDir}/{$this->moduleUniqueID}";
-        if (file_exists($moduleCSSCacheDir)){
+        if (file_exists($moduleCSSCacheDir)) {
             unlink($moduleCSSCacheDir);
         }
 
         // JS
         $jsCacheDir = appPath('sites/admin-cabinet/assets/js/cache');
         $moduleJSCacheDir = "{$jsCacheDir}/{$this->moduleUniqueID}";
-        if (file_exists($moduleJSCacheDir)){
+        if (file_exists($moduleJSCacheDir)) {
             unlink($moduleJSCacheDir);
         }
 
@@ -375,7 +375,7 @@ 
         }
 
         $module = PbxExtensionModules::findFirstByUniqid($this->moduleUniqueID);
-        if ( ! $module) {
+        if (!$module) {
             $module           = new PbxExtensionModules();
             $module->name     = $this->locString("Breadcrumb{$this->moduleUniqueID}");
             $module->disabled = '1';
@@ -401,7 +401,7 @@ 
         $language             = substr(PbxSettings::getValueByKey('WebAdminLanguage'), 0, 2);
         $translates           = [];
         $extensionsTranslates = [[]];
-        $results              = glob($this->moduleDir . '/{Messages}/en.php', GLOB_BRACE);
+        $results              = glob($this->moduleDir.'/{Messages}/en.php', GLOB_BRACE);
         foreach ($results as $path) {
             $langArr = require $path;
             if (is_array($langArr)) {
@@ -413,7 +413,7 @@ 
         }
         if ($language !== 'en') {
             $additionalTranslates = [[]];
-            $results              = glob($this->moduleDir . "/{Messages}/{$language}.php", GLOB_BRACE);
+            $results              = glob($this->moduleDir."/{Messages}/{$language}.php", GLOB_BRACE);
             foreach ($results as $path) {
                 $langArr = require $path;
                 if (is_array($langArr)) {
@@ -444,13 +444,13 @@ 
         // Add new connection for this module after add new Models folder
         RegisterDIServices::recreateModulesDBConnections();
 
-        $results = glob($this->moduleDir . '/Models/*.php', GLOB_NOSORT);
+        $results = glob($this->moduleDir.'/Models/*.php', GLOB_NOSORT);
         $dbUpgrade = new UpdateDatabase();
         foreach ($results as $file) {
             $className        = pathinfo($file)['filename'];
             $moduleModelClass = "\\Modules\\{$this->moduleUniqueID}\\Models\\{$className}";
             $upgradeResult = $dbUpgrade->createUpdateDbTableByAnnotations($moduleModelClass);
-            if (!$upgradeResult){
+            if (!$upgradeResult) {
                 return false;
             }
 
@@ -476,7 +476,7 @@ 
             $menuSettings      = new PbxSettings();
             $menuSettings->key = $menuSettingsKey;
         }
-        $value               = [
+        $value = [
             'uniqid'        => $this->moduleUniqueID,
             'href'          => "/admin-cabinet/{$unCamelizedControllerName}",
             'group'         => 'modules',

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

@@ -377,13 +377,13 @@ 
         $module = PbxExtensionModules::findFirstByUniqid($this->moduleUniqueID);
         if ( ! $module) {
             $module           = new PbxExtensionModules();
-            $module->name     = $this->locString("Breadcrumb{$this->moduleUniqueID}");
+            $module->name     = $this->locString("breadcrumb{$this->moduleUniqueID}");
             $module->disabled = '1';
         }
         $module->uniqid        = $this->moduleUniqueID;
         $module->developer     = $this->developer;
         $module->version       = $this->version;
-        $module->description   = $this->locString("SubHeader{$this->moduleUniqueID}");
+        $module->description   = $this->locString("subheader{$this->moduleUniqueID}");
         $module->support_email = $this->support_email;
 
         return $module->save();
@@ -469,7 +469,7 @@ 
      */
     public function addToSidebar(): bool
     {
-        $menuSettingsKey           = "AdditionalMenuItem{$this->moduleUniqueID}";
+        $menuSettingsKey           = "additionalmenuitem{$this->moduleUniqueID}";
         $unCamelizedControllerName = Text::uncamelize($this->moduleUniqueID, '-');
         $menuSettings              = PbxSettings::findFirstByKey($menuSettingsKey);
         if ($menuSettings === null) {
@@ -481,7 +481,7 @@ 
             'href'          => "/admin-cabinet/{$unCamelizedControllerName}",
             'group'         => 'modules',
             'iconClass'     => 'puzzle',
-            'caption'       => "Breadcrumb{$this->moduleUniqueID}",
+            'caption'       => "breadcrumb{$this->moduleUniqueID}",
             'showAtSidebar' => true,
         ];
         $menuSettings->value = json_encode($value);

src/Core/System/PBX.php

Spacing +9 added lines, -9 removed lines

@@ -90,7 +90,7 @@ 
             return;
         }
         $max_size    = 2;
-        $log_dir     = System::getLogDir() . '/asterisk/';
+        $log_dir     = System::getLogDir().'/asterisk/';
         $text_config = "{$log_dir}{$f_name} {
     nocreate
     nocopytruncate
@@ -105,8 +105,8 @@ 
         {$asteriskPath} -rx 'logger reload' > /dev/null 2> /dev/null
     endscript
 }";
-        $varEtcDir  = $di->getShared('config')->path('core.varEtcDir');
-        $path_conf   = $varEtcDir . '/asterisk_logrotate_' . $f_name . '.conf';
+        $varEtcDir = $di->getShared('config')->path('core.varEtcDir');
+        $path_conf = $varEtcDir.'/asterisk_logrotate_'.$f_name.'.conf';
         file_put_contents($path_conf, $text_config);
         $mb10 = $max_size * 1024 * 1024;
 
@@ -202,7 +202,7 @@ 
 
     public static function checkCodec($name, $desc, $type): void
     {
-        $codec = Codecs::findFirst('name="' . $name . '"');
+        $codec = Codecs::findFirst('name="'.$name.'"');
         if ($codec === null) {
             /** @var \MikoPBX\Common\Models\Codecs $codec_g722 */
             $codec              = new Codecs();
@@ -218,7 +218,7 @@ 
      */
     public static function sipReload():void
     {
-        $di     = Di::getDefault();
+        $di = Di::getDefault();
         if ($di === null) {
             return;
         }
@@ -234,7 +234,7 @@ 
             Util::mwExec("{$asteriskPath} -rx 'module reload acl'");
             Util::mwExec("{$asteriskPath} -rx 'core reload'");
         } else {
-            Util::sysLogMsg('SIP RELOAD', 'Need reload asterisk',LOG_INFO, LOG_INFO);
+            Util::sysLogMsg('SIP RELOAD', 'Need reload asterisk', LOG_INFO, LOG_INFO);
             // Завершаем каналы.
             Util::mwExec("{$asteriskPath} -rx 'channel request hangup all'");
             usleep(500000);
@@ -247,7 +247,7 @@ 
      */
     public static function iaxReload(): void
     {
-        $iax    = new IAXConf();
+        $iax = new IAXConf();
         $iax->generateConfig();
         $asteriskPath = Util::which('asterisk');
         Util::mwExec("{$asteriskPath} -rx 'iax2 reload'");
@@ -304,7 +304,7 @@ 
             'result' => 'ERROR',
         ];
 
-        if ( ! $this->di->getShared('registry')->booting) {
+        if (!$this->di->getShared('registry')->booting) {
             $this->stop();
         }
         /**
@@ -320,7 +320,7 @@ 
         // Создание базы данных истории звонков.
         /** @var \Phalcon\Db\Adapter\Pdo\Sqlite $connection */
         $connection = $this->di->get('dbCDR');
-        if ( ! $connection->tableExists('cdr')) {
+        if (!$connection->tableExists('cdr')) {
             RegisterDIServices::recreateDBConnections();
         } else {
             CdrDb::checkDb();