mikopbx / Core

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/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();

src/Core/Asterisk/Configs/SIPConf.php

Spacing +57 added lines, -57 removed lines

@@ -55,15 +55,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) {
@@ -84,13 +84,13 @@ 
      */
     private function generateGeneralPj(): string
     {
-        $lang    = $this->generalSettings['PBXLanguage'];
+        $lang = $this->generalSettings['PBXLanguage'];
         [$topology, $extipaddr, $exthostname, $subnets] = $this->getTopologyData();
 
         $codecs = $this->getCodecs();
         $codecConf = '';
-        foreach ($codecs as $codec){
-            $codecConf.= "allow = {$codec}\n";
+        foreach ($codecs as $codec) {
+            $codecConf .= "allow = {$codec}\n";
         }
 
         $pbxVersion = PbxSettings::getValueByKey('PBXVersion');
@@ -99,50 +99,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. $this->generalSettings['SIPPort']));
+        file_put_contents($varEtcDir.'/topology_hash', md5($topology.$exthostname.$extipaddr.$this->generalSettings['SIPPort']));
         $conf .= "\n";
 
         return $conf;
@@ -154,19 +154,19 @@ 
      * @return bool
      */
     public function needAsteriskRestart():bool{
-        $di     = Di::getDefault();
+        $di = Di::getDefault();
         if ($di === null) {
             return false;
         }
-        $mikoPBXConfig  = new MikoPBXConfig();
+        $mikoPBXConfig = new MikoPBXConfig();
         [$topology, $extipaddr, $exthostname] = $this->getTopologyData();
 
         $generalSettings = $mikoPBXConfig->getGeneralSettings();
-        $now_hadh = md5($topology . $exthostname . $extipaddr. $generalSettings['SIPPort']);
-        $old_hash   = '';
+        $now_hadh = md5($topology.$exthostname.$extipaddr.$generalSettings['SIPPort']);
+        $old_hash = '';
         $varEtcDir = $di->getShared('config')->path('core.varEtcDir');
-        if (file_exists($varEtcDir . '/topology_hash')) {
-            $old_hash = file_get_contents($varEtcDir . '/topology_hash');
+        if (file_exists($varEtcDir.'/topology_hash')) {
+            $old_hash = file_get_contents($varEtcDir.'/topology_hash');
         }
 
         return $old_hash !== $now_hadh;
@@ -189,7 +189,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;
             }
@@ -227,7 +227,7 @@ 
         $conf        = '';
         $reg_strings = '';
         $prov_config = '';
-        if ($this->data_providers===null){
+        if ($this->data_providers === null) {
             $this->getSettings();
         }
         foreach ($this->data_providers as $provider) {
@@ -236,7 +236,7 @@ 
 
             $need_register = $provider['noregister'] !== '1';
             if ($need_register) {
-                $options     = [
+                $options = [
                     'type'     => 'auth',
                     'username' => $provider['username'],
                     'password' => $provider['secret'],
@@ -244,7 +244,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']}",
@@ -262,7 +262,7 @@ 
             }
 
             if ('1' !== $provider['receive_calls_without_auth']) {
-                $options     = [
+                $options = [
                     'type'     => 'auth',
                     'username' => $provider['username'],
                     'password' => $provider['secret'],
@@ -272,7 +272,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}";
@@ -286,7 +286,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';
             }
@@ -294,7 +294,7 @@ 
             $prov_config .= "[{$provider['uniqid']}]\n";
             $prov_config .= Util::overrideConfigurationArray($options, $manual_attributes, 'aor');
 
-            $options     = [
+            $options = [
                 'type'     => 'identify',
                 'endpoint' => $provider['uniqid'],
                 'match'    => $provider['host'],
@@ -355,7 +355,7 @@ 
      */
     public function generatePeersPj(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         $lang              = $this->generalSettings['PBXLanguage'];
@@ -369,7 +369,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',
@@ -521,7 +521,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;
         }
@@ -551,8 +551,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;
@@ -571,7 +571,7 @@ 
      */
     private function getOutRoutes(): array
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         /** @var \MikoPBX\Common\Models\OutgoingRoutingTable $rout */
@@ -606,7 +606,7 @@ 
      */
     public function extensionGenContexts(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         // Генерация внутреннего номерного плана.
@@ -624,8 +624,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']
@@ -644,7 +644,7 @@ 
      */
     public function extensionGenHints(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         $conf = '';
@@ -657,7 +657,7 @@ 
 
     public function extensionGenInternal(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         // Генерация внутреннего номерного плана.
@@ -672,7 +672,7 @@ 
 
     public function extensionGenInternalTransfer(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         // Генерация внутреннего номерного плана.

src/Core/Workers/WorkerCdr.php

Spacing +16 added lines, -16 removed lines

@@ -23,7 +23,7 @@ 
 
     public const SELECT_CDR_TUBE = 'select_cdr_tube';
     public const UPDATE_CDR_TUBE = 'update_cdr_tube';
-    protected int $maxProc=1;
+    protected int $maxProc = 1;
 
 
     private BeanstalkClient $client_queue;
@@ -93,12 +93,12 @@ 
         $result = json_decode($result_data, true);
         if (file_exists($result)) {
             $file_data = json_decode(file_get_contents($result), true);
-            if(!is_dir($result)){
+            if (!is_dir($result)) {
                 Util::mwExec("rm -rf {$result}");
             }
             $result = $file_data;
         }
-        if ( ! is_array($result) && ! is_object($result)) {
+        if (!is_array($result) && !is_object($result)) {
             return;
         }
         if (count($result) < 1) {
@@ -115,7 +115,7 @@ 
             if (trim($row['recordingfile']) !== '') {
                 // Если каналов не существует с ID, то можно удалить временные файлы.
                 $p_info = pathinfo($row['recordingfile']);
-                $fname  = $p_info['dirname'] . '/' . $p_info['filename'] . '.wav';
+                $fname  = $p_info['dirname'].'/'.$p_info['filename'].'.wav';
                 if (file_exists($fname) && !is_dir($fname)) {
                     Util::mwExec("rm -rf {$fname}");
                 }
@@ -139,19 +139,19 @@ 
                 $row['answer'] = '';
                 $billsec       = 0;
 
-                if ( ! empty($row['recordingfile'])) {
+                if (!empty($row['recordingfile'])) {
                     $p_info    = pathinfo($row['recordingfile']);
                     $file_list = [
-                        $p_info['dirname'] . '/' . $p_info['filename'] . '.mp3',
-                        $p_info['dirname'] . '/' . $p_info['filename'] . '.wav',
-                        $p_info['dirname'] . '/' . $p_info['filename'] . '_in.wav',
-                        $p_info['dirname'] . '/' . $p_info['filename'] . '_out.wav',
+                        $p_info['dirname'].'/'.$p_info['filename'].'.mp3',
+                        $p_info['dirname'].'/'.$p_info['filename'].'.wav',
+                        $p_info['dirname'].'/'.$p_info['filename'].'_in.wav',
+                        $p_info['dirname'].'/'.$p_info['filename'].'_out.wav',
                     ];
                     foreach ($file_list as $file) {
-                        if ( ! file_exists($file)) {
+                        if (!file_exists($file)) {
                             continue;
                         }
-                        if(!is_dir($file)){
+                        if (!is_dir($file)) {
                             Util::mwExec("rm -rf {$file}");
                         }
                     }
@@ -162,9 +162,9 @@ 
                 if (file_exists($row['recordingfile']) && !is_dir($row['recordingfile'])) {
                     Util::mwExec("rm -rf {$row['recordingfile']}");
                 }
-            } elseif (  ! empty($row['recordingfile']) &&
-                        ! file_exists(Util::trimExtensionForFile($row['recordingfile']) . 'wav') &&
-                        ! file_exists( $row['recordingfile']) ) {
+            } elseif (!empty($row['recordingfile']) &&
+                        !file_exists(Util::trimExtensionForFile($row['recordingfile']).'wav') &&
+                        !file_exists($row['recordingfile'])) {
                 /** @var CallDetailRecordsTmp $rec_data */
                 $rec_data = CallDetailRecordsTmp::findFirst(
                     "linkedid='{$row['linkedid']}' AND dst_chan='{$row['dst_chan']}'"
@@ -213,7 +213,7 @@ 
      */
     private function getActiveIdChannels(): array
     {
-        $am           = Util::getAstManager('off');
+        $am = Util::getAstManager('off');
         return $am->GetChannels(true);
     }
 
@@ -228,7 +228,7 @@ 
             $this->no_answered_calls[$row['linkedid']]['NOANSWER'] = false;
             return;
         }
-        if ( ! array_key_exists($row['dst_num'], $this->internal_numbers)) {
+        if (!array_key_exists($row['dst_num'], $this->internal_numbers)) {
             // dst_num - не является номером сотрудника. Это исходящий.
             return;
         }

src/Core/System/BeanstalkClient.php

Spacing +15 added lines, -15 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function __construct($tube = 'default', $port = '')
     {
-        $this->tube        = str_replace("\\", '-', $tube);;
+        $this->tube        = str_replace("\\", '-', $tube); ;
         $this->job_options = ['priority' => 250, 'delay' => 0, 'ttr' => 3600];
         $this->port = $port;
         $this->reconnect();
@@ -49,7 +49,7 @@ 
     {
         $config = $this->di->get('config')->beanstalk;
         $port   = $config->port;
-        if(!empty($this->port) && is_numeric($this->port)){
+        if (!empty($this->port) && is_numeric($this->port)) {
             $port = $this->port;
         }
 
@@ -126,7 +126,7 @@ 
     {
         $tube = str_replace("\\", '-', $tube);
         // Change tube
-        if ( ! empty($tube) && $this->tube !== $tube) {
+        if (!empty($tube) && $this->tube !== $tube) {
             $this->queue->useTube($tube);
         }
         $job_data = serialize($job_data);
@@ -178,9 +178,9 @@ 
         }
 
         // Processing job over callable function attached in $this->subscribe
-        if(json_decode($job->getData(), true) !==null){
-            $mData =  $job->getData();
-        }else{
+        if (json_decode($job->getData(), true) !== null) {
+            $mData = $job->getData();
+        } else {
             $mData = unserialize($job->getData(), [false]);
         }
         $this->message = $mData;
@@ -197,9 +197,9 @@ 
 
         try {
             $this->queue->delete($job);
-        }catch (\Pheanstalk\Exception\JobNotFoundException $e){
+        } catch (\Pheanstalk\Exception\JobNotFoundException $e) {
             // Игнорируем ошибку, задачи не существует, нечего удалять.
-        }catch (\Error $e){
+        } catch (\Error $e) {
             // Аналогично, нечего удалять.
             // Если задача и не удалена, то это будет исправлено позже при очистке.
         }
@@ -266,28 +266,28 @@ 
     /**
      * Drops orphaned tasks
      */
-    public function cleanTube(){
+    public function cleanTube() {
         $tubes = $this->queue->listTubes();
-        foreach ($tubes as $tube){
-            if(strpos($tube, "INBOX_") !== 0){
+        foreach ($tubes as $tube) {
+            if (strpos($tube, "INBOX_") !== 0) {
                 continue;
             }
             try {
                 $statData = $this->queue->statsTube($tube)->getArrayCopy();
                 $watching = $statData['current-watching'];
-                if($watching !== '0'){
+                if ($watching !== '0') {
                     continue;
                 }
                 // Нужно удалить все Jobs.
                 $this->queue->watch($tube);
-                while (true){
+                while (true) {
                     $job = $this->queue->reserveWithTimeout(1);
-                    if($job === null){
+                    if ($job === null) {
                         break;
                     }
                     $this->queue->delete($job);
                 }
-            }catch (\Exception $e){
+            } catch (\Exception $e) {
                 continue;
             }
 

Braces +7 added lines, -7 removed lines

@@ -83,8 +83,7 @@ 
         $job_data,
         int $timeout = 10,
         int $priority = PheanstalkInterface::DEFAULT_PRIORITY
-    )
-    {
+    ) {
         $this->message = false;
         $inbox_tube    = uniqid('INBOX_', true);
         $this->queue->watch($inbox_tube);
@@ -180,7 +179,7 @@ 
         // Processing job over callable function attached in $this->subscribe
         if(json_decode($job->getData(), true) !==null){
             $mData =  $job->getData();
-        }else{
+        } else{
             $mData = unserialize($job->getData(), [false]);
         }
         $this->message = $mData;
@@ -197,9 +196,9 @@ 
 
         try {
             $this->queue->delete($job);
-        }catch (\Pheanstalk\Exception\JobNotFoundException $e){
+        } catch (\Pheanstalk\Exception\JobNotFoundException $e){
             // Игнорируем ошибку, задачи не существует, нечего удалять.
-        }catch (\Error $e){
+        } catch (\Error $e){
             // Аналогично, нечего удалять.
             // Если задача и не удалена, то это будет исправлено позже при очистке.
         }
@@ -266,7 +265,8 @@ 
     /**
      * Drops orphaned tasks
      */
-    public function cleanTube(){
+    public function cleanTube()
+    {
         $tubes = $this->queue->listTubes();
         foreach ($tubes as $tube){
             if(strpos($tube, "INBOX_") !== 0){
@@ -287,7 +287,7 @@ 
                     }
                     $this->queue->delete($job);
                 }
-            }catch (\Exception $e){
+            } catch (\Exception $e){
                 continue;
             }
 

src/Core/Asterisk/Configs/FeaturesConf.php

Spacing +11 added lines, -11 removed lines

@@ -19,16 +19,16 @@ 
 
     protected function generateConfigProtected(): void
     {
-        $conf             = "[general]\n" .
-            "featuredigittimeout = {$this->generalSettings['PBXFeatureDigitTimeout']}\n" .
-            "atxfernoanswertimeout = {$this->generalSettings['PBXFeatureAtxferNoAnswerTimeout']}\n" .
-            "transferdigittimeout = {$this->generalSettings['PBXFeatureTransferDigitTimeout']}\n" .
-            "pickupexten = {$this->generalSettings['PBXFeaturePickupExten']}\n" .
-            "atxferabort = *0\n" .
-            "\n" .
-            "[featuremap]\n" .
-            "atxfer => {$this->generalSettings['PBXFeatureAttendedTransfer']}\n" .
-            "disconnect = *0\n" .
+        $conf = "[general]\n".
+            "featuredigittimeout = {$this->generalSettings['PBXFeatureDigitTimeout']}\n".
+            "atxfernoanswertimeout = {$this->generalSettings['PBXFeatureAtxferNoAnswerTimeout']}\n".
+            "transferdigittimeout = {$this->generalSettings['PBXFeatureTransferDigitTimeout']}\n".
+            "pickupexten = {$this->generalSettings['PBXFeaturePickupExten']}\n".
+            "atxferabort = *0\n".
+            "\n".
+            "[featuremap]\n".
+            "atxfer => {$this->generalSettings['PBXFeatureAttendedTransfer']}\n".
+            "disconnect = *0\n".
             "blindxfer => {$this->generalSettings['PBXFeatureBlindTransfer']}\n";
 
         $additionalModules = $this->di->getShared('pbxConfModules');
@@ -36,6 +36,6 @@ 
             $conf .= $appClass->getFeatureMap();
         }
 
-        Util::fileWriteContent($this->config->path('asterisk.astetcdir') . '/features.conf', $conf);
+        Util::fileWriteContent($this->config->path('asterisk.astetcdir').'/features.conf', $conf);
     }
 }
\ No newline at end of file

src/Core/Asterisk/agi-bin/cdr_connector.php

Spacing +41 added lines, -41 removed lines

@@ -32,14 +32,14 @@ 
     $orign_chan     = $agi->get_variable("orign_chan", true);
     $id             = $agi->get_variable("pt1c_UNIQUEID", true);
     $IS_ORGNT       = $agi->get_variable("IS_ORGNT", true);
-    if ($id == '' || ! empty($QUEUE_SRC_CHAN)) {
+    if ($id == '' || !empty($QUEUE_SRC_CHAN)) {
         // Если это вызов на агента очереди !empty($QUEUE_SRC_CHAN).
         // Если это новый вызов $id == ''.
-        $id = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+        $id = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
     }
     // Канал, AGI скрипта.
     $channel  = $agi->request['agi_channel'];
-    $is_local = ! (stripos($channel, 'local/') === false);
+    $is_local = !(stripos($channel, 'local/') === false);
     if ($QUEUE_SRC_CHAN != '' && $is_local) {
         // Это LOCAL, Переопределим на исходный.
         $channel = $QUEUE_SRC_CHAN;
@@ -54,7 +54,7 @@ 
     }
 
     $data['action'] = "$action";
-    if ( ! empty($IS_ORGNT)) {
+    if (!empty($IS_ORGNT)) {
         $dst_num            = $agi->request['agi_callerid'];
         $src_num            = $agi->request['agi_extension'];
         $data['dialstatus'] = 'ORIGINATE';
@@ -65,9 +65,9 @@ 
         $num     = substr($agi->request['agi_channel'], $p_start, $p_end);
 
         $p_start  = strpos($agi->request['agi_channel'], ';');
-        $dst_chan = substr($agi->request['agi_channel'], 0, $p_start) . ';1';
+        $dst_chan = substr($agi->request['agi_channel'], 0, $p_start).';1';
 
-        $id               = substr($agi->request['agi_uniqueid'], 0, 16) . '_' . $num . '_' . $IS_ORGNT;
+        $id               = substr($agi->request['agi_uniqueid'], 0, 16).'_'.$num.'_'.$IS_ORGNT;
         $data['dst_chan'] = $dst_chan;
     } else {
         $src_num = $agi->request['agi_callerid'];
@@ -84,7 +84,7 @@ 
     $data['agi_channel']  = $agi->request['agi_channel'];
     $data['did']          = $agi->get_variable("FROM_DID", true);
     $data['from_account'] = $from_account;
-    $data['IS_ORGNT']     = ! empty($IS_ORGNT);
+    $data['IS_ORGNT']     = !empty($IS_ORGNT);
 
     $agi->set_variable("__pt1c_UNIQUEID", "$id");
 
@@ -115,13 +115,13 @@ 
     }
 
     $IS_ORGNT = $agi->get_variable("IS_ORGNT", true);
-    if ( ! empty($IS_ORGNT)) {
+    if (!empty($IS_ORGNT)) {
         // Вероятно необходимо переопределить искать по двум ID.
         // Применимо только для Originate, когда в качестве звонящего используем два канала
         // мобильный и внутренний номер.
         $peer_mobile = $agi->get_variable("peer_mobile", true);
-        if ( ! empty($peer_mobile) && stripos($id, $peer_mobile) === false) {
-            $id             = substr($agi->request['agi_uniqueid'], 0, 16) . '_' . $peer_mobile . '_' . $IS_ORGNT;
+        if (!empty($peer_mobile) && stripos($id, $peer_mobile) === false) {
+            $id             = substr($agi->request['agi_uniqueid'], 0, 16).'_'.$peer_mobile.'_'.$IS_ORGNT;
             $data['org_id'] = $id;
         }
     }
@@ -154,22 +154,22 @@ 
     $data['BRIDGEPEER']      = $agi->get_variable("FROM_CHAN", true);
 
     $IS_ORGNT = $agi->get_variable("IS_ORGNT", true);
-    if ( ! empty($IS_ORGNT)) {
+    if (!empty($IS_ORGNT)) {
         // Вероятно необходимо переопределить ID.
         // Применимо только для Originate, когда в качестве звонящего используем два канала
         // мобильный и внутренний номер.
         $peer_mobile = $agi->get_variable("peer_mobile", true);
-        if ( ! empty($peer_mobile) && stripos($id, $peer_mobile) === false) {
-            $id             = substr($agi->request['agi_uniqueid'], 0, 16) . '_' . $peer_mobile . '_' . $IS_ORGNT;
+        if (!empty($peer_mobile) && stripos($id, $peer_mobile) === false) {
+            $id             = substr($agi->request['agi_uniqueid'], 0, 16).'_'.$peer_mobile.'_'.$IS_ORGNT;
             $data['org_id'] = $id;
         }
     }
 
-    if ( ! empty($data['ENDCALLONANSWER'])) {
+    if (!empty($data['ENDCALLONANSWER'])) {
         $agi->set_variable("__ENDCALLONANSWER", "");
     }
 
-    $PICKUPEER     = trim('' . $agi->get_variable("PICKUPEER", true));
+    $PICKUPEER     = trim(''.$agi->get_variable("PICKUPEER", true));
     $data['dnid']  = $agi->request['agi_dnid'];
     $mikoPBXConfig = new MikoPBXConfig();
     $pickupexten   = $mikoPBXConfig->getGeneralSettings('PBXFeaturePickupExten');
@@ -184,7 +184,7 @@ 
         // Очищаем переменную канала. Больше не требуется.
         $agi->set_variable("PICKUPEER", "");
         $data['old_id'] = $id;
-        $data['id']     = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+        $data['id']     = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
     }
     $agi->set_variable("__pt1c_UNIQUEID", "$id");
 
@@ -211,7 +211,7 @@ 
     $data['linkedid']    = $agi->get_variable("CDR(linkedid)", true);
     $data['did']         = $agi->get_variable("FROM_DID", true);
 
-    $data['agi_threadid'] = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+    $data['agi_threadid'] = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
 
     return $data;
 }
@@ -227,12 +227,12 @@ 
 function Event_transfer_dial($agi, $action)
 {
     $now = Util::getNowDate();
-    $id  = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+    $id  = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
 
     // Пытаемся определить канал.
     $TRANSFERERNAME = $agi->get_variable("TRANSFERERNAME", true);
     $QUEUE_SRC_CHAN = $agi->get_variable("QUEUE_SRC_CHAN", true);
-    $is_local       = ! (stripos($TRANSFERERNAME, 'local/') === false);
+    $is_local       = !(stripos($TRANSFERERNAME, 'local/') === false);
     if ($QUEUE_SRC_CHAN != '' && $is_local) {
         // Это LOCAL, Переопределим на исходный.
         $channel = $QUEUE_SRC_CHAN;
@@ -247,7 +247,7 @@ 
 
     $data                = [];
     $data['action']      = "$action";
-    $data['agi_channel'] = $channel;// $agi->request['agi_channel'];
+    $data['agi_channel'] = $channel; // $agi->request['agi_channel'];
     $data['linkedid']    = $agi->get_variable("CDR(linkedid)", true);
     $data['src_chan']    = $channel;
     $data['did']         = $agi->get_variable("FROM_DID", true);
@@ -321,7 +321,7 @@ 
     $data['did']          = $agi->get_variable("FROM_DID", true);
     $data['action']       = "$action";
     $data['agi_channel']  = $agi->request['agi_channel'];
-    $data['agi_threadid'] = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+    $data['agi_threadid'] = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
 
     $pos = stripos($data['agi_channel'], 'local/');
     if ($pos === false) {
@@ -350,7 +350,7 @@ 
     $data                 = [];
     $data['action']       = "$action";
     $data['did']          = $agi->get_variable("FROM_DID", true);
-    $data['agi_threadid'] = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+    $data['agi_threadid'] = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
 
     $data['linkedid']   = $agi->get_variable("CDR(linkedid)", true);
     $data['dialstatus'] = $agi->get_variable("DIALSTATUS", true);
@@ -385,7 +385,7 @@ 
     $agi->set_variable("pt1c_PARK_CHAN", $park_row['ParkeeChannel']);
 
     // Сбор данных для генерации CDR.
-    $id      = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+    $id      = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
     $channel = $agi->request['agi_channel'];
     $agi->set_variable("__pt1c_UNIQUEID", "$id");
     $data                 = [];
@@ -403,7 +403,7 @@ 
         $data['src_chan'] = $channel;
         $data['src_num']  = $agi->request['agi_callerid'];
         $data['dst_num']  = $agi->request['agi_extension'];
-        $data['dst_chan'] = 'Park:' . $agi->request['agi_extension'];
+        $data['dst_chan'] = 'Park:'.$agi->request['agi_extension'];
     } elseif (true === $park_row['pt1c_is_dst']) {
         $data['src_chan'] = $channel;
         $data['dst_chan'] = $park_row['ParkeeChannel'];
@@ -419,11 +419,11 @@ 
     if (trim($park_row['ParkingDuration']) !== '') {
         $time_start           = date("Y-m-d H:i:s", time() - 1 * ($park_row['ParkingDuration']));
         $data_parking         = [
-            'UNIQUEID' => $id . '_' . Util::generateRandomString(3),
+            'UNIQUEID' => $id.'_'.Util::generateRandomString(3),
             'src_chan' => $park_row['ParkeeChannel'],
             'src_num'  => $park_row['ParkeeCallerIDNum'],
             'dst_num'  => $park_row['ParkingSpace'],
-            'dst_chan' => 'Park:' . $park_row['ParkingSpace'],
+            'dst_chan' => 'Park:'.$park_row['ParkingSpace'],
             'start'    => $time_start,
             'answer'   => $time_start,
             'endtime'  => $now,
@@ -448,7 +448,7 @@ 
 function Event_unpark_call_timeout($agi, $action)
 {
     $now = Util::getNowDate();
-    $id  = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+    $id  = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
     // PARKER=SIP/206
     $PARKING_DURATION = $agi->get_variable("PARKING_DURATION", true);
     $PARKING_DURATION = ($PARKING_DURATION == '') ? 45 : $PARKING_DURATION;
@@ -460,7 +460,7 @@ 
         'src_chan' => $agi->request['agi_channel'], // $agi->get_variable("PARKER", true), // ???
         'src_num'  => $agi->request['agi_callerid'],
         'dst_num'  => $PARKING_SPACE,
-        'dst_chan' => 'Park:' . $PARKING_SPACE,
+        'dst_chan' => 'Park:'.$PARKING_SPACE,
         'start'    => $time_start,
         'answer'   => $time_start,
         'endtime'  => $now,
@@ -472,7 +472,7 @@ 
     ];
 
 
-    $id2 = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+    $id2 = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
     $agi->set_variable("__pt1c_UNIQUEID", "$id2");
 
     return $data;
@@ -493,8 +493,8 @@ 
     $id         = $agi->get_variable("pt1c_UNIQUEID", true);
     $ISTRANSFER = $agi->get_variable("ISTRANSFER", true);
 
-    if (empty($id) || ! empty($ISTRANSFER)) {
-        $id         = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+    if (empty($id) || !empty($ISTRANSFER)) {
+        $id         = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
         $time_start = $now;
     }
 
@@ -503,7 +503,7 @@ 
         // 'src_chan' => $agi->request['agi_channel'],
         // 'src_num'  => $agi->request['agi_callerid'],
         'dst_num'  => $agi->request['agi_extension'],
-        'dst_chan' => 'Queue:' . $agi->request['agi_extension'],
+        'dst_chan' => 'Queue:'.$agi->request['agi_extension'],
         // 'answer'   => $time_start,
         // 'end'  	   => $now,
         'did'      => $agi->get_variable("FROM_DID", true),
@@ -511,7 +511,7 @@ 
         'UNIQUEID' => $id,
         'linkedid' => $agi->get_variable("CDR(linkedid)", true),
     ];
-    if ( ! empty($time_start)) {
+    if (!empty($time_start)) {
         $data['src_chan'] = $agi->get_variable("QUEUE_SRC_CHAN", true);
         $data['src_num']  = $agi->request['agi_callerid'];
         $data['start']    = $time_start;
@@ -519,7 +519,7 @@ 
         $data['transfer'] = '0';
         $agi->set_variable("__pt1c_q_UNIQUEID", "$id");
     }
-    if ( ! empty($ISTRANSFER)) {
+    if (!empty($ISTRANSFER)) {
         $data['transfer'] = '1';
     } else {
         $data['transfer'] = '0';
@@ -590,7 +590,7 @@ 
 
     $is_conf   = ($agi->get_variable('CALLERID(num)', true) === 'Conference_Room');
     $not_local = (stripos($agi->request['agi_channel'], 'local/') === false);
-    if ($not_local && ! $is_conf) {
+    if ($not_local && !$is_conf) {
         $am         = Util::getAstManager();
         $res        = $am->meetMeCollectInfo($exten, ['conf_1c']);
         $callid     = $agi->request['agi_callerid'];
@@ -628,7 +628,7 @@ 
     }
 
     if (empty($id)) {
-        $id = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+        $id = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
     }
 
     $recordingfile = CdrDb::MeetMeSetRecFilename($id);
@@ -637,7 +637,7 @@ 
         'src_chan'      => $agi->request['agi_channel'],
         'src_num'       => $src_num,
         'dst_num'       => $dst_num,
-        'dst_chan'      => 'MeetMe:' . $mikoidconf,
+        'dst_chan'      => 'MeetMe:'.$mikoidconf,
         'start'         => $time_start,
         'answer'        => $time_start,
         'recordingfile' => "{$recordingfile}.mp3",
@@ -679,7 +679,7 @@ 
     $lamePath = Util::which('lame');
     $nicePath = Util::which('nice');
     $chmodPath = Util::which('chmod');
-    $command               = "{$nicePath} -n 19 {$lamePath} -b 32 --silent \"{$recordingfile}.wav\" \"{$recordingfile}.mp3\" && {$chmodPath} o+r \"{$recordingfile}.mp3\"";
+    $command = "{$nicePath} -n 19 {$lamePath} -b 32 --silent \"{$recordingfile}.wav\" \"{$recordingfile}.mp3\" && {$chmodPath} o+r \"{$recordingfile}.mp3\"";
     Util::mwExecBg($command);
 
     return $data;
@@ -695,14 +695,14 @@ 
  */
 function Event_dial_app($agi, $action)
 {
-    $id        = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+    $id        = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
     $extension = $agi->get_variable("APPEXTEN", true);
     if (empty($extension)) {
         $extension = $agi->request['agi_extension'];
     }
 
     $data             = Event_dial($agi, $action);
-    $data['dst_chan'] = 'App:' . $extension;
+    $data['dst_chan'] = 'App:'.$extension;
     $data['dst_num']  = $extension;
     $data['is_app']   = 1;
     $data['UNIQUEID'] = $id;
@@ -743,5 +743,5 @@ 
     $result = $func_name($agi, $action);
     // Оповещение без задержек.
     $data = base64_encode(json_encode($result));
-    $agi->exec("UserEvent", "CdrConnector,AgiData:" . base64_encode(json_encode($result)));
+    $agi->exec("UserEvent", "CdrConnector,AgiData:".base64_encode(json_encode($result)));
 }