mikopbx / Core

src/Core/Workers/WorkerCallEvents.php

Spacing +93 added lines, -93 removed lines

@@ -39,14 +39,14 @@ 
      */
     public function MixMonitor($channel, $file_name = null, $sub_dir = null, $full_name = null, $onlySetVar = false): string
     {
-        $resFile = $this->mixMonitorChannels[$channel]??'';
-        if($resFile !== ''){
+        $resFile = $this->mixMonitorChannels[$channel] ?? '';
+        if ($resFile !== '') {
             return $resFile;
         }
-        $resFile           = '';
+        $resFile = '';
         $file_name = str_replace('/', '_', $file_name);
         if ($this->record_calls) {
-            if ( ! file_exists($full_name)) {
+            if (!file_exists($full_name)) {
                 $monitor_dir = Storage::getMonitorDir();
                 if ($sub_dir === null) {
                     $sub_dir = date('Y/m/d/H/');
@@ -62,21 +62,21 @@ 
                 $options = 'ab';
             }
             $nicePath   = Util::which('nice');
-            $wav2mp3Path= Util::which('wav2mp3.sh');
+            $wav2mp3Path = Util::which('wav2mp3.sh');
 
             $arr = $this->am->GetChannels(false);
-            if(!in_array($channel, $arr, true)){
+            if (!in_array($channel, $arr, true)) {
                 CdrDb::LogEvent("MixMonitor: Channel {$channel} not found.");
                 return '';
             }
             $srcFile = "{$f}.wav";
             $resFile = "{$f}.mp3";
             $command = "{$nicePath} -n 19 {$wav2mp3Path} '{$f}'";
-            if($onlySetVar){
+            if ($onlySetVar) {
                 $this->am->SetVar($channel, 'MIX_FILE_NAME', $srcFile);
-                $this->am->SetVar($channel, 'MIX_CMD',       $command);
-                $this->am->SetVar($channel, 'MIX_OPTIONS',   $options);
-            }else{
+                $this->am->SetVar($channel, 'MIX_CMD', $command);
+                $this->am->SetVar($channel, 'MIX_OPTIONS', $options);
+            } else {
                 $res        = $this->am->MixMonitor($channel, $srcFile, $options, $command);
                 $res['cmd'] = "MixMonitor($channel, $file_name)";
                 CdrDb::LogEvent(json_encode($res));
@@ -95,9 +95,9 @@ 
      */
     public function StopMixMonitor($channel): void
     {
-        if(isset($this->mixMonitorChannels[$channel])){
+        if (isset($this->mixMonitorChannels[$channel])) {
             unset($this->mixMonitorChannels[$channel]);
-        }else{
+        } else {
             return;
         }
         if ($this->record_calls) {
@@ -137,7 +137,7 @@ 
         foreach ($m_data as $row) {
             $row->writeAttribute('endtime', $data['start']);
             $res = $row->update();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_app_end', implode(' ', $row->getMessages()));
             }
         }
@@ -156,7 +156,7 @@ 
             // мобильный и внутренний номер.
             $filter = [
                 '(UNIQUEID=:UNIQUEID: OR UNIQUEID=:org_id:) AND endtime = ""',
-                'bind' => ['UNIQUEID' => $data['UNIQUEID'], 'org_id' => $data['org_id'],],
+                'bind' => ['UNIQUEID' => $data['UNIQUEID'], 'org_id' => $data['org_id'], ],
             ];
         } else {
             $filter = [
@@ -173,14 +173,14 @@ 
         /** @var CallDetailRecordsTmp $row */
         $m_data = CallDetailRecordsTmp::find($filter);
         foreach ($m_data as $row) {
-            if ( ! is_object($row)) {
+            if (!is_object($row)) {
                 continue;
             }
             ///
             // Проверим, если более одного канала SIP/256 при входящем.
             $column_chan_name = ('ORIGINATE' === $row->dialstatus) ? 'src_chan' : 'dst_chan';
 
-            if ( ! empty($row->$column_chan_name) && $data['dst_chan'] !== $row->$column_chan_name) {
+            if (!empty($row->$column_chan_name) && $data['dst_chan'] !== $row->$column_chan_name) {
                 if ($row_create) {
                     continue;
                 }
@@ -194,7 +194,7 @@ 
                     $new_row->writeAttribute($attribute, $value);
                 }
                 $new_row->writeAttribute($column_chan_name, $data['dst_chan']);
-                $new_row->writeAttribute('UNIQUEID', $data['UNIQUEID'] . '_' . $data['dst_chan']);
+                $new_row->writeAttribute('UNIQUEID', $data['UNIQUEID'].'_'.$data['dst_chan']);
                 // Подмена $row;
                 $row        = $new_row;
                 $row_create = true;
@@ -207,8 +207,8 @@ 
                 // При оригинации меняется местами srs_chan в поле dst_chan.
                 $row->writeAttribute('src_chan', $data['dst_chan']);
             } else {
-                if ( ! $rec_start) {
-                    $data['recordingfile'] = $this->MixMonitor($data['dst_chan'], $row->UNIQUEID,null, $row->recordingfile,true);
+                if (!$rec_start) {
+                    $data['recordingfile'] = $this->MixMonitor($data['dst_chan'], $row->UNIQUEID, null, $row->recordingfile, true);
                     $row->writeAttribute('recordingfile', $data['recordingfile']);
                     $rec_start = true;
                 }
@@ -216,14 +216,14 @@ 
                 $row->writeAttribute('dst_chan', $data['dst_chan']);
             }
 
-            if (isset($data['to_account']) && ! empty($data['to_account'])) {
+            if (isset($data['to_account']) && !empty($data['to_account'])) {
                 $row->writeAttribute($account_col, $data['to_account']);
             }
-            if (isset($data['dst_call_id']) && ! empty($data['dst_call_id'])) {
+            if (isset($data['dst_call_id']) && !empty($data['dst_call_id'])) {
                 $row->writeAttribute('dst_call_id', $data['dst_call_id']);
             }
             $res = $row->save();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_dial_create_chan', implode(' ', $row->getMessages()));
             }
         }
@@ -243,7 +243,7 @@ 
             // Событие возникает, когда мы пытаемся перехватить вызов на соседний телефон.
             $filter = [
                 'UNIQUEID=:UNIQUEID:',
-                'bind' => ['UNIQUEID' => $data['old_id'],],
+                'bind' => ['UNIQUEID' => $data['old_id'], ],
             ];
             /** @var CallDetailRecordsTmp $m_data */
             $m_data = CallDetailRecordsTmp::find($filter);
@@ -257,7 +257,7 @@ 
                 $new_data['dst_chan']       = $data['agi_channel'];
                 $new_data['dst_num']        = $data['dst_num'];
                 $new_data['UNIQUEID']       = $data['id'];
-                $new_data['recordingfile']  = $this->MixMonitor($new_data['dst_chan'],  'pickup_'.$new_data['UNIQUEID']);
+                $new_data['recordingfile']  = $this->MixMonitor($new_data['dst_chan'], 'pickup_'.$new_data['UNIQUEID']);
 
                 unset($new_data['id']);
                 unset($new_data['end']);
@@ -270,7 +270,7 @@ 
                 $this->am->UserEvent('CdrConnector', ['AgiData' => $AgiData]);
             }
         } else {
-            if ( ! empty($data['ENDCALLONANSWER'])) {
+            if (!empty($data['ENDCALLONANSWER'])) {
                 // Переменная ENDCALLONANSWER устанавливается при начале работы умной маршуртизации.
                 // Как только произошел ответ на вызов, отметим вызов на приложение как завершенный.
                 $filter = [
@@ -287,7 +287,7 @@ 
                     $row->writeAttribute('endtime', $data['answer']);
                     $row->writeAttribute('is_app', 1);
                     $res = $row->save();
-                    if ( ! $res) {
+                    if (!$res) {
                         Util::sysLogMsg('ENDCALLONANSWER', implode(' ', $row->getMessages()));
                     }
                 }
@@ -309,7 +309,7 @@ 
                     '(UNIQUEID=:UNIQUEID: OR UNIQUEID=:UNIQUEID_CHAN:) AND answer = "" AND endtime = ""',
                     'bind' => [
                         'UNIQUEID'      => $data['id'],
-                        'UNIQUEID_CHAN' => $data['id'] . '_' . $data['agi_channel'],
+                        'UNIQUEID_CHAN' => $data['id'].'_'.$data['agi_channel'],
                     ],
                 ];
             }
@@ -322,7 +322,7 @@ 
                         continue;
                     }
                     // Найдем все прочие CDR по данному originate и отметим как завершенные.
-                    $filter      = [
+                    $filter = [
                         'linkedid=:linkedid: AND endtime <> "" AND src_chan <> :src_chan:',
                         'bind' => [
                             'linkedid' => $row->linkedid,
@@ -336,7 +336,7 @@ 
                             $orgn_row->writeAttribute('endtime', $data['answer']);
                         }
                         $orgn_row->writeAttribute('dst_chan', '');
-                        $orgn_row->writeAttribute('UNIQUEID', $data['id'] . '_' . $orgn_row->src_chan);
+                        $orgn_row->writeAttribute('UNIQUEID', $data['id'].'_'.$orgn_row->src_chan);
                         $orgn_row->update();
                     }
 
@@ -349,7 +349,7 @@ 
                     $row->writeAttribute('answer', $data['answer']);
                 }
                 $res = $row->save();
-                if ( ! $res) {
+                if (!$res) {
                     Util::sysLogMsg('Action_dial_answer', implode(' ', $row->getMessages()));
                 }
             }
@@ -375,10 +375,10 @@ 
         $this->hangupChanCheckSipTrtansfer($data, $channels);
 
         // Очистим память.
-        if(isset($this->checkChanHangupTransfer[$data['agi_channel']])){
+        if (isset($this->checkChanHangupTransfer[$data['agi_channel']])) {
             unset($this->checkChanHangupTransfer[$data['agi_channel']]);
         }
-        if(isset($this->mixMonitorChannels[$data['agi_channel']])){
+        if (isset($this->mixMonitorChannels[$data['agi_channel']])) {
             unset($this->mixMonitorChannels[$data['agi_channel']]);
         }
     }
@@ -390,24 +390,24 @@ 
      */
     private function hangupChanCheckSipTrtansfer($data, $channels):void{
         $not_local = (stripos($data['agi_channel'], 'local/') === false);
-        if($not_local === false || $data['OLD_LINKEDID'] !== $data['linkedid']) {
+        if ($not_local === false || $data['OLD_LINKEDID'] !== $data['linkedid']) {
             return;
         }
         $active_chans = $this->am->GetChannels(false);
         // Намек на SIP трансфер.
         foreach ($channels as $data_chan) {
-            if ( ! in_array($data_chan['chan'], $active_chans, true)) {
+            if (!in_array($data_chan['chan'], $active_chans, true)) {
                 // Вызов уже завершен. Не интересно.
                 continue;
             }
             $BRIDGEPEER = $this->am->GetVar($data_chan['chan'], 'BRIDGEPEER', null, false);
-            if ( ! in_array($BRIDGEPEER, $active_chans, true) || !is_string($BRIDGEPEER)) {
+            if (!in_array($BRIDGEPEER, $active_chans, true) || !is_string($BRIDGEPEER)) {
                 // Вызов уже завершен. Не интересно.
                 continue;
             }
 
             $linkedid = $this->am->GetVar($data_chan['chan'], 'CDR(linkedid)', null, false);
-            if ( empty($linkedid) || $linkedid === $data['linkedid']) {
+            if (empty($linkedid) || $linkedid === $data['linkedid']) {
                 continue;
             }
 
@@ -420,7 +420,7 @@ 
             $n_data['start']         = date('Y-m-d H:i:s');
             $n_data['answer']        = date('Y-m-d H:i:s');
             $n_data['linkedid']      = $linkedid;
-            $n_data['UNIQUEID']      = $data['linkedid'] . Util::generateRandomString();
+            $n_data['UNIQUEID']      = $data['linkedid'].Util::generateRandomString();
             $n_data['transfer']      = '0';
             $n_data['recordingfile'] = $this->MixMonitor($n_data['dst_chan'], $n_data['UNIQUEID']);
             $n_data['did']           = $data_chan['did'];
@@ -452,7 +452,7 @@ 
      * @param array $channels
      */
     private function hangupChanEndCalls(array $data, array &$transfer_calls, array &$channels):void{
-        $filter         = [
+        $filter = [
             'linkedid=:linkedid: AND endtime = "" AND (src_chan=:src_chan: OR dst_chan=:dst_chan:)',
             'bind' => [
                 'linkedid' => $data['linkedid'],
@@ -469,8 +469,8 @@ 
             }
             if ($row->dialstatus === 'ORIGINATE') {
                 $row->writeAttribute('dialstatus', '');
-                if($row->answer === ''){
-                    $newId = $row->linkedid.'_'.$row->src_num.'_'.substr($row->src_chan, strpos($row->src_chan,'-') +1);
+                if ($row->answer === '') {
+                    $newId = $row->linkedid.'_'.$row->src_num.'_'.substr($row->src_chan, strpos($row->src_chan, '-') + 1);
                     $row->writeAttribute('UNIQUEID', $newId);
                 }
             }
@@ -483,7 +483,7 @@ 
                 $row->writeAttribute('dialstatus', $data['dialstatus']);
             }
             $res = $row->update();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_hangup_chan', implode(' ', $row->getMessages()));
             }
 
@@ -515,14 +515,14 @@ 
      */
     public function Action_CreateRowTransfer($action, $data, $calls_data = null): void
     {
-        if( isset($this->checkChanHangupTransfer[$data['agi_channel']]) ) {
+        if (isset($this->checkChanHangupTransfer[$data['agi_channel']])) {
             return;
-        }else{
+        } else {
             $this->checkChanHangupTransfer[$data['agi_channel']] = $action;
         }
 
         if (null === $calls_data) {
-            $filter     = [
+            $filter = [
                 'linkedid=:linkedid: AND endtime = "" AND transfer=1 AND (src_chan=:chan: OR dst_chan=:chan:)',
                 'bind'  => [
                     'linkedid' => $data['linkedid'],
@@ -544,8 +544,8 @@ 
                     $insert_data[$fname_chan] = $row_data['dst_chan'];
                     $insert_data[$fname_num]  = $row_data['dst_num'];
                 } else {
-                    $fname_chan = ! isset($insert_data['src_chan']) ? 'src_chan' : 'dst_chan';
-                    $fname_num  = ! isset($insert_data['src_num']) ? 'src_num' : 'dst_num';
+                    $fname_chan = !isset($insert_data['src_chan']) ? 'src_chan' : 'dst_chan';
+                    $fname_num  = !isset($insert_data['src_num']) ? 'src_num' : 'dst_num';
 
                     $insert_data[$fname_chan] = $row_data['src_chan'];
                     $insert_data[$fname_num]  = $row_data['src_num'];
@@ -556,7 +556,7 @@ 
             $this->StopMixMonitor($insert_data['dst_chan']);
             $recordingfile = $this->MixMonitor(
                 $insert_data['dst_chan'],
-                'transfer_' . $insert_data['src_num'] . '_' . $insert_data['dst_num'] . '_' . $data['linkedid']
+                'transfer_'.$insert_data['src_num'].'_'.$insert_data['dst_num'].'_'.$data['linkedid']
             );
             //
             $insert_data['action']        = "{$action}_end_trasfer";
@@ -578,7 +578,7 @@ 
 
             $this->insertDataToDbM($insert_data);
             CdrDb::LogEvent(json_encode($insert_data));
-        } elseif (empty($calls_data[0]['answer']) && count($calls_data) === 1 && ! empty($calls_data[0]['recordingfile'])) {
+        } elseif (empty($calls_data[0]['answer']) && count($calls_data) === 1 && !empty($calls_data[0]['recordingfile'])) {
             // Возобновление записи разговора при срыве переадресации.
             $row_data = $calls_data[0];
             $chan     = ($data['agi_channel'] === $row_data['src_chan']) ? $row_data['dst_chan'] : $row_data['src_chan'];
@@ -594,12 +594,12 @@ 
             /** @var CallDetailRecordsTmp $row */
             $not_ended_cdr = null;
             $transferNotComplete = false;
-            foreach ($cdr as $row){
-                if($row->transfer === '1' && ($row->src_chan === $chan || $row->dst_chan === $chan) ){
+            foreach ($cdr as $row) {
+                if ($row->transfer === '1' && ($row->src_chan === $chan || $row->dst_chan === $chan)) {
                     $not_ended_cdr = $row;
                 }
-                if($row->answer === '' && $row->endtime === ''
-                    && ($row->src_chan === $chan || $row->dst_chan === $chan) ){
+                if ($row->answer === '' && $row->endtime === ''
+                    && ($row->src_chan === $chan || $row->dst_chan === $chan)) {
                     $transferNotComplete = true;
                 }
             }
@@ -657,7 +657,7 @@ 
      */
     public function Action_transfer_dial_create_chan($data): void
     {
-        $filter     = [
+        $filter = [
             'UNIQUEID=:UNIQUEID: AND endtime = "" AND answer = ""',
             'bind' => [
                 'UNIQUEID' => $data['transfer_UNIQUEID'],
@@ -670,7 +670,7 @@ 
         foreach ($m_data as $row) {
             ///
             // Проверим, если более одного канала SIP/256 при входящем.
-            if ( ! empty($row->dst_chan) && $data['dst_chan'] !== $row->dst_chan) {
+            if (!empty($row->dst_chan) && $data['dst_chan'] !== $row->dst_chan) {
                 if ($row_create) {
                     continue;
                 }
@@ -684,7 +684,7 @@ 
                     $new_row->writeAttribute($attribute, $value);
                 }
                 $new_row->writeAttribute('dst_chan', $data['dst_chan']);
-                $new_row->writeAttribute('UNIQUEID', $data['transfer_UNIQUEID'] . '_' . $data['dst_chan']);
+                $new_row->writeAttribute('UNIQUEID', $data['transfer_UNIQUEID'].'_'.$data['dst_chan']);
                 // $new_row->save();
                 // Подмена $row;
                 $row        = $new_row;
@@ -697,11 +697,11 @@ 
 
             $row->writeAttribute('dst_chan', $data['dst_chan']);
             $row->writeAttribute('recordingfile', $data['recordingfile']);
-            if (isset($data['dst_call_id']) && ! empty($data['dst_call_id'])) {
+            if (isset($data['dst_call_id']) && !empty($data['dst_call_id'])) {
                 $row->writeAttribute('dst_call_id', $data['dst_call_id']);
             }
             $res = $row->save();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_transfer_dial_create_chan', implode(' ', $row->getMessages()));
             }
         }
@@ -718,7 +718,7 @@ 
             '(UNIQUEID=:UNIQUEID: OR UNIQUEID=:UNIQUEID_CHAN:) AND answer = "" AND endtime = ""',
             'bind' => [
                 'UNIQUEID'      => $data['transfer_UNIQUEID'],
-                'UNIQUEID_CHAN' => $data['transfer_UNIQUEID'] . '_' . $data['agi_channel'],
+                'UNIQUEID_CHAN' => $data['transfer_UNIQUEID'].'_'.$data['agi_channel'],
             ],
         ];
 
@@ -728,7 +728,7 @@ 
         foreach ($m_data as $row) {
             $row->writeAttribute('answer', $data['answer']);
             $res = $row->save();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_transfer_dial_answer', implode(' ', $row->getMessages()));
             }
         }
@@ -762,7 +762,7 @@ 
                 // Завершим вызов в CDR.
                 $row->writeAttribute('endtime', $data['end']);
                 $row->writeAttribute('transfer', 0);
-                if ( ! $row->save()) {
+                if (!$row->save()) {
                     Util::sysLogMsg('Action_transfer_dial_answer', implode(' ', $row->getMessages()));
                 }
             }
@@ -797,7 +797,7 @@ 
                 // Ответа не было. Переадресация отменена.
                 $row->writeAttribute('endtime', $data['end']);
                 $row->writeAttribute('transfer', 0);
-                if ( ! $row->save()) {
+                if (!$row->save()) {
                     Util::sysLogMsg('Action_transfer_dial_answer', implode(' ', $row->getMessages()));
                 }
             }
@@ -817,7 +817,7 @@ 
                 $this->MixMonitor($row->src_chan, $info['filename'], $subdir);
                 // Снимем со строк признак переадресации.
                 $row->writeAttribute('transfer', 0);
-                if ( ! $row->save()) {
+                if (!$row->save()) {
                     Util::sysLogMsg('Action_transfer_dial_answer', implode(' ', $row->getMessages()));
                 }
             }
@@ -893,7 +893,7 @@ 
 
                 $f_list = $m_data->toArray();
                 foreach ($data as $attribute => $value) {
-                    if ( ! array_key_exists($attribute, $f_list)) {
+                    if (!array_key_exists($attribute, $f_list)) {
                         continue;
                     }
                     $m_data->writeAttribute($attribute, $value);
@@ -964,7 +964,7 @@ 
             $row->writeAttribute('answer', $data['answer']);
             $row->writeAttribute('endtime', $data['answer']);
             $res = $row->save();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_queue_answer', implode(' ', $row->getMessages()));
             }
         }
@@ -993,7 +993,7 @@ 
                 $row->writeAttribute('dialstatus', $data['dialstatus']);
             }
             $res = $row->save();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_queue_end', implode(' ', $row->getMessages()));
             }
         }
@@ -1023,11 +1023,11 @@ 
             if ($dest_chan === $row->dst_chan) {
                 $is_local        = (stripos($data['src_chan'], 'local/') !== false);
                 $is_stored_local = (stripos($row->src_chan, 'local/') !== false);
-                if ($row->UNIQUEID === $data['UNIQUEID'] && $is_local && ! $is_stored_local) {
+                if ($row->UNIQUEID === $data['UNIQUEID'] && $is_local && !$is_stored_local) {
                     $data['src_chan'] = $row->src_chan;
                 }
                 if (file_exists($row->recordingfile) || file_exists(
-                        Util::trimExtensionForFile($row->recordingfile) . '.wav'
+                        Util::trimExtensionForFile($row->recordingfile).'.wav'
                     )) {
                     // Переопределим путь к файлу записи разговора. Для конферецнии файл один.
                     $recordingfile = $row->recordingfile;
@@ -1039,7 +1039,7 @@ 
             // Подменим ID на идентификатор конференции.
             $row->writeAttribute('linkedid', $data['meetme_id']);
             $res = $row->save();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_hangup_chan_meetme', implode(' ', $row->getMessages()));
             }
         }
@@ -1056,11 +1056,11 @@ 
             $row->writeAttribute('transfer', 0);
             $row->writeAttribute('linkedid', $data['meetme_id']);
 
-            if ( ! empty($recordingfile)) {
+            if (!empty($recordingfile)) {
                 $row->writeAttribute('recordingfile', $recordingfile);
             }
             $res = $row->save();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_hangup_chan_meetme', implode(' ', $row->getMessages()));
             }
         }
@@ -1099,9 +1099,9 @@ 
      */
     public function callEventsWorker($tube): void
     {
-        $data      = json_decode($tube->getBody(), true);
-        $funcName = "Action_".$data['action']??'';
-        if ( method_exists($this, $funcName) ) {
+        $data = json_decode($tube->getBody(), true);
+        $funcName = "Action_".$data['action'] ?? '';
+        if (method_exists($this, $funcName)) {
             $this->$funcName($data);
         }
         $tube->reply(json_encode(true));
@@ -1131,14 +1131,14 @@ 
     public function updateDataInDbM($data): bool
     {
         if (empty($data['UNIQUEID'])) {
-            Util::sysLogMsg(__FUNCTION__, 'UNIQUEID is empty ' . json_encode($data));
+            Util::sysLogMsg(__FUNCTION__, 'UNIQUEID is empty '.json_encode($data));
 
             return false;
         }
 
         $filter = [
             "UNIQUEID=:id:",
-            'bind' => ['id' => $data['UNIQUEID'],],
+            'bind' => ['id' => $data['UNIQUEID'], ],
         ];
         /** @var CallDetailRecordsTmp $m_data */
         $m_data = CallDetailRecordsTmp::findFirst($filter);
@@ -1147,7 +1147,7 @@ 
         }
         $f_list = $m_data->toArray();
         foreach ($data as $attribute => $value) {
-            if ( ! array_key_exists($attribute, $f_list)) {
+            if (!array_key_exists($attribute, $f_list)) {
                 continue;
             }
             if ('UNIQUEID' == $attribute) {
@@ -1156,7 +1156,7 @@ 
             $m_data->writeAttribute($attribute, $value);
         }
         $res = $m_data->save();
-        if ( ! $res) {
+        if (!$res) {
             Util::sysLogMsg(__FUNCTION__, implode(' ', $m_data->getMessages()));
         }
 
@@ -1196,7 +1196,7 @@ 
     public static function insertDataToDbM($data): bool
     {
         if (empty($data['UNIQUEID'])) {
-            Util::sysLogMsg(__FUNCTION__, 'UNIQUEID is empty ' . json_encode($data));
+            Util::sysLogMsg(__FUNCTION__, 'UNIQUEID is empty '.json_encode($data));
 
             return false;
         }
@@ -1206,7 +1206,7 @@ 
         $m_data = CallDetailRecordsTmp::findFirst(
             [
                 "UNIQUEID=:id:",
-                'bind' => ['id' => $data['UNIQUEID'],],
+                'bind' => ['id' => $data['UNIQUEID'], ],
             ]
         );
         if ($m_data === null) {
@@ -1215,7 +1215,7 @@ 
         } elseif (isset($data['IS_ORGNT']) && $data['IS_ORGNT'] !== false && $data['action'] == 'dial') {
             if (empty($m_data->endtime)) {
                 // Если это оригинация dial может прийти дважды.
-                if(!empty($m_data->src_num) && $m_data->src_num === $data['dst_num']){
+                if (!empty($m_data->src_num) && $m_data->src_num === $data['dst_num']) {
                     $m_data->dst_num = $data['src_num'];
                     $m_data->save();
                 }
@@ -1240,7 +1240,7 @@ 
                 $new_m_data->transfer     = $data['transfer'];
 
                 $res = $new_m_data->save();
-                if ( ! $res) {
+                if (!$res) {
                     Util::sysLogMsg(__FUNCTION__, implode(' ', $m_data->getMessages()));
                 }
 
@@ -1250,7 +1250,7 @@ 
 
         $f_list = $m_data->toArray();
         foreach ($data as $attribute => $value) {
-            if ( ! array_key_exists($attribute, $f_list)) {
+            if (!array_key_exists($attribute, $f_list)) {
                 continue;
             }
             if ($is_new === false && 'UNIQUEID' == $attribute) {
@@ -1259,7 +1259,7 @@ 
             $m_data->writeAttribute($attribute, $value);
         }
         $res = $m_data->save();
-        if ( ! $res) {
+        if (!$res) {
             Util::sysLogMsg(__FUNCTION__, implode(' ', $m_data->getMessages()));
         }
 
@@ -1274,12 +1274,12 @@ 
         $q      = $tube->getBody();
         $filter = json_decode($q, true);
 
-        if($this->filterNotValid($filter)){
+        if ($this->filterNotValid($filter)) {
             $tube->reply('[]');
             return;
         }
 
-        $res    = null;
+        $res = null;
         try {
             if (isset($filter['miko_tmp_db'])) {
                 $res = CallDetailRecordsTmp::find($filter);
@@ -1298,7 +1298,7 @@ 
             }
             $filter['add_pack_query']['bind'][$filter['columns']] = $arr;
 
-            if($this->filterNotValid($filter['add_pack_query'])){
+            if ($this->filterNotValid($filter['add_pack_query'])) {
                 $tube->reply('[]');
                 return;
             }
@@ -1316,7 +1316,7 @@ 
         if (isset($filter['miko_result_in_file'])) {
             $di         = Di::getDefault();
             $dirsConfig = $di->getShared('config');
-            $filename   = $dirsConfig->path('core.tempDir') . '/' . md5(microtime(true));
+            $filename   = $dirsConfig->path('core.tempDir').'/'.md5(microtime(true));
             file_put_contents($filename, $res_data);
             Util::addRegularWWWRights($filename);
             $res_data = json_encode($filename);
@@ -1329,16 +1329,16 @@ 
      * Проверка фильтра на корректность bind параметров.
      * @param $filter
      */
-    private function filterNotValid($filter){
+    private function filterNotValid($filter) {
         $haveErrors = false;
-        if(isset($filter['bind'])){
-            if(is_array($filter)){
+        if (isset($filter['bind'])) {
+            if (is_array($filter)) {
                 foreach ($filter['bind'] as $bindValue) {
-                    if(empty($bindValue)){
+                    if (empty($bindValue)) {
                         $haveErrors = true;
                     }
                 }
-            }else{
+            } else {
                 $haveErrors = true;
             }
         }
@@ -1347,7 +1347,7 @@ 
 
     public function errorHandler($m): void
     {
-        Util::sysLogMsg(self::class . '_ERROR', $m);
+        Util::sysLogMsg(self::class.'_ERROR', $m);
     }
 }
 

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/Configs/ExtensionsConf.php

Spacing +227 added lines, -227 removed lines

@@ -25,11 +25,11 @@ 
         /** @scrutinizer ignore-call */
         $additionalModules = $this->di->getShared('pbxConfModules');
         $conf              = "[globals] \n";
-        $conf              .= "TRANSFER_CONTEXT=internal-transfer; \n";
+        $conf .= "TRANSFER_CONTEXT=internal-transfer; \n";
         foreach ($additionalModules as $appClass) {
             $addition = $appClass->extensionGlobals();
-            if (!empty($addition)){
-                $conf .=$appClass->confBlockWithComments($addition);
+            if (!empty($addition)) {
+                $conf .= $appClass->confBlockWithComments($addition);
             }
         }
         $conf .= "\n";
@@ -52,7 +52,7 @@ 
         // Переключатель по времени.
         $this->generateOutWorkTimes($conf);
 
-        Util::fileWriteContent($this->config->path('asterisk.astetcdir') . '/extensions.conf', $conf);
+        Util::fileWriteContent($this->config->path('asterisk.astetcdir').'/extensions.conf', $conf);
     }
 
     /**
@@ -64,68 +64,68 @@ 
     {
         $extension = 'X!';
         // Контекст для AMI originate. Без него отображается не корректный CallerID.
-        $conf .= '[sipregistrations]' . "\n\n";
+        $conf .= '[sipregistrations]'."\n\n";
 
-        $conf .= '[messages]' . "\n" .
-            'exten => _' . $extension . ',1,MessageSend(sip:${EXTEN},"${CALLERID(name)}"${MESSAGE(from)})' . "\n\n";
+        $conf .= '[messages]'."\n".
+            'exten => _'.$extension.',1,MessageSend(sip:${EXTEN},"${CALLERID(name)}"${MESSAGE(from)})'."\n\n";
 
-        $conf .= '[internal-originate]' . " \n";
-        $conf .= 'exten => _' . $extension . ',1,NoOP(Hint ${HINT} exten ${EXTEN} )' . " \n";
-        $conf .= '; Если это originate, то скроем один CDR.' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${pt1c_cid}x" != "x"]?Set(CALLERID(num)=${pt1c_cid}))' . " \n\t";
+        $conf .= '[internal-originate]'." \n";
+        $conf .= 'exten => _'.$extension.',1,NoOP(Hint ${HINT} exten ${EXTEN} )'." \n";
+        $conf .= '; Если это originate, то скроем один CDR.'." \n\t";
+        $conf .= 'same => n,ExecIf($["${pt1c_cid}x" != "x"]?Set(CALLERID(num)=${pt1c_cid}))'." \n\t";
 
-        $conf .= 'same => n,ExecIf($["${CUT(CHANNEL,\;,2)}" == "2"]?Set(__PT1C_SIP_HEADER=${SIPADDHEADER}))' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${peer_mobile}x" != "x"]?Set(ADDITIONAL_PEER=&Local/${peer_mobile}@outgoing/n))' . " \n\t";
+        $conf .= 'same => n,ExecIf($["${CUT(CHANNEL,\;,2)}" == "2"]?Set(__PT1C_SIP_HEADER=${SIPADDHEADER}))'." \n\t";
+        $conf .= 'same => n,ExecIf($["${peer_mobile}x" != "x"]?Set(ADDITIONAL_PEER=&Local/${peer_mobile}@outgoing/n))'." \n\t";
 
         // Описываем возможность прыжка в пользовательский sub контекст.
-        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)' . "\n\t";
-        $conf .= 'same => n,Dial(Local/${EXTEN}@internal-users/n${ADDITIONAL_PEER},60,cTteKkHhb(originate_create_chan,s,1))' . " \n\n";
-
-        $conf .= '[originate_create_chan]' . " \n";
-        $conf .= 'exten => s,1,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)' . "\n\t";
-        $conf .= 'same => n,return' . " \n\n";
-
-        $conf .= '[dial_create_chan]' . " \n";
-        $conf .= 'exten => s,1,Gosub(lua_${ISTRANSFER}dial_create_chan,${EXTEN},1)' . "\n\t";
-        $conf .= 'same => n,Set(pt1c_is_dst=1)' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${PT1C_SIP_HEADER}x" != "x"]?Set(PJSIP_HEADER(add,${CUT(PT1C_SIP_HEADER,:,1)})=${CUT(PT1C_SIP_HEADER,:,2)}))' . " \n\t";
-        $conf .= 'same => n,Set(__PT1C_SIP_HEADER=${UNDEFINED})' . " \n\t";
-        $conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)' . " \n\t";
-        $conf .= 'same => n,return' . " \n\n";
-
-        $conf .= '[hangup_handler]' . "\n";
-        $conf .= 'exten => s,1,NoOp(--- hangup - ${CHANNEL} ---)' . "\n\t";
-        $conf .= 'same => n,Gosub(hangup_chan,${EXTEN},1)' . "\n\t";
-
-        $conf .= 'same => n,return' . "\n\n";
-
-        $conf .= '[set_orign_chan]' . "\n";
-        $conf .= 'exten => s,1,Wait(0.2)' . "\n\t";
-        $conf .= 'same => n,Set(pl=${IF($["${CHANNEL:-1}" == "1"]?2:1)})' . "\n\t";
-        $conf .= 'same => n,Set(orign_chan=${IMPORT(${CUT(CHANNEL,\;,1)}\;${pl},BRIDGEPEER)})' . "\n\t";
-        $conf .= 'same => n,ExecIf($[ "${orign_chan}x" == "x" ]?Set(orign_chan=${IMPORT(${CUT(CHANNEL,\;,1)}\;${pl},FROM_CHAN)}))' . "\n\t";
-        $conf .= 'same => n,ExecIf($[ "${QUEUE_SRC_CHAN}x" != "x" ]?Set(__QUEUE_SRC_CHAN=${orign_chan}))' . "\n\t";
-        $conf .= 'same => n,ExecIf($[ "${QUEUE_SRC_CHAN:0:5}" == "Local" ]?Set(__QUEUE_SRC_CHAN=${FROM_CHAN}))' . "\n\t";
-        $conf .= 'same => n,ExecIf($[ "${FROM_CHAN}x" == "x" ]?Set(__FROM_CHAN=${IMPORT(${CUT(CHANNEL,\;,1)}\;${pl},BRIDGEPEER)}))' . "\n\t";
-        $conf .= 'same => n,return' . "\n\n";
-
-        $conf .= '[playback]' . "\n";
-        $conf .= 'exten => s,1,Playback(hello_demo,noanswer)' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${SRC_BRIDGE_CHAN}x" == "x"]?Wait(30))' . "\n\t";
-        $conf .= 'same => n,Wait(0.3)' . "\n\t";
-        $conf .= 'same => n,Bridge(${SRC_BRIDGE_CHAN},kKTthH)' . "\n\n";
-
-        $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\n";
+        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)'."\n\t";
+        $conf .= 'same => n,Dial(Local/${EXTEN}@internal-users/n${ADDITIONAL_PEER},60,cTteKkHhb(originate_create_chan,s,1))'." \n\n";
+
+        $conf .= '[originate_create_chan]'." \n";
+        $conf .= 'exten => s,1,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)'."\n\t";
+        $conf .= 'same => n,return'." \n\n";
+
+        $conf .= '[dial_create_chan]'." \n";
+        $conf .= 'exten => s,1,Gosub(lua_${ISTRANSFER}dial_create_chan,${EXTEN},1)'."\n\t";
+        $conf .= 'same => n,Set(pt1c_is_dst=1)'." \n\t";
+        $conf .= 'same => n,ExecIf($["${PT1C_SIP_HEADER}x" != "x"]?Set(PJSIP_HEADER(add,${CUT(PT1C_SIP_HEADER,:,1)})=${CUT(PT1C_SIP_HEADER,:,2)}))'." \n\t";
+        $conf .= 'same => n,Set(__PT1C_SIP_HEADER=${UNDEFINED})'." \n\t";
+        $conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)'." \n\t";
+        $conf .= 'same => n,return'." \n\n";
+
+        $conf .= '[hangup_handler]'."\n";
+        $conf .= 'exten => s,1,NoOp(--- hangup - ${CHANNEL} ---)'."\n\t";
+        $conf .= 'same => n,Gosub(hangup_chan,${EXTEN},1)'."\n\t";
+
+        $conf .= 'same => n,return'."\n\n";
+
+        $conf .= '[set_orign_chan]'."\n";
+        $conf .= 'exten => s,1,Wait(0.2)'."\n\t";
+        $conf .= 'same => n,Set(pl=${IF($["${CHANNEL:-1}" == "1"]?2:1)})'."\n\t";
+        $conf .= 'same => n,Set(orign_chan=${IMPORT(${CUT(CHANNEL,\;,1)}\;${pl},BRIDGEPEER)})'."\n\t";
+        $conf .= 'same => n,ExecIf($[ "${orign_chan}x" == "x" ]?Set(orign_chan=${IMPORT(${CUT(CHANNEL,\;,1)}\;${pl},FROM_CHAN)}))'."\n\t";
+        $conf .= 'same => n,ExecIf($[ "${QUEUE_SRC_CHAN}x" != "x" ]?Set(__QUEUE_SRC_CHAN=${orign_chan}))'."\n\t";
+        $conf .= 'same => n,ExecIf($[ "${QUEUE_SRC_CHAN:0:5}" == "Local" ]?Set(__QUEUE_SRC_CHAN=${FROM_CHAN}))'."\n\t";
+        $conf .= 'same => n,ExecIf($[ "${FROM_CHAN}x" == "x" ]?Set(__FROM_CHAN=${IMPORT(${CUT(CHANNEL,\;,1)}\;${pl},BRIDGEPEER)}))'."\n\t";
+        $conf .= 'same => n,return'."\n\n";
+
+        $conf .= '[playback]'."\n";
+        $conf .= 'exten => s,1,Playback(hello_demo,noanswer)'."\n\t";
+        $conf .= 'same => n,ExecIf($["${SRC_BRIDGE_CHAN}x" == "x"]?Wait(30))'."\n\t";
+        $conf .= 'same => n,Wait(0.3)'."\n\t";
+        $conf .= 'same => n,Bridge(${SRC_BRIDGE_CHAN},kKTthH)'."\n\n";
+
+        $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\n";
 
         // TODO / Добавление / удаление префиксов на входящий callerid.
-        $conf .= '[add-trim-prefix-clid]' . "\n";
-        $conf .= 'exten => _.!,1,NoOp(--- Incoming call from ${CALLERID(num)} ---)' . "\n\t";
-        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)' . "\n\t";
+        $conf .= '[add-trim-prefix-clid]'."\n";
+        $conf .= 'exten => _.!,1,NoOp(--- Incoming call from ${CALLERID(num)} ---)'."\n\t";
+        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)'."\n\t";
         // Отсекаем "+".
         // $conf.= 'same => n,ExecIf( $["${CALLERID(num):0:1}" == "+"]?Set(CALLERID(num)=${CALLERID(num):1}))'."\n\t";
         // Отсекаем "7" и добавляем "8".
         // $conf.= 'same => n,ExecIf( $["${REGEX("^7[0-9]+" ${CALLERID(num)})}" == "1"]?Set(CALLERID(num)=8${CALLERID(num):1}))'."\n\t";
-        $conf .= 'same => n,return' . "\n\n";
+        $conf .= 'same => n,return'."\n\n";
     }
 
     /**
@@ -141,136 +141,136 @@ 
         $additionalModules = $this->di->getShared('pbxConfModules');
         foreach ($additionalModules as $appClass) {
             $addition = $appClass->extensionGenContexts();
-            if (!empty($addition)){
-                $conf .=$appClass->confBlockWithComments($addition);
+            if (!empty($addition)) {
+                $conf .= $appClass->confBlockWithComments($addition);
             }
         }
         $conf .= "\n";
         $conf .= "[internal-num-undefined] \n";
-        $conf .= 'exten => _' . $extension . ',1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))' . "\n\t";
+        $conf .= 'exten => _'.$extension.',1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\t";
+        $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))'."\n\t";
         $conf .= "same => n,Playback(pbx-invalid,noanswer) \n\n";
 
         $conf .= "[internal-fw]\n";
-        $conf .= 'exten => _' . $extension . ',1,NoOp(DIALSTATUS - ${DIALSTATUS})' . "\n\t";
+        $conf .= 'exten => _'.$extension.',1,NoOp(DIALSTATUS - ${DIALSTATUS})'."\n\t";
         // CANCEL - вызов был отменен, к примеру *0, не нужно дальше искать адресат.
-        $conf .= 'same => n,ExecIf($["${DIALSTATUS}" == "CANCEL"]?Hangup())' . "\n\t";
+        $conf .= 'same => n,ExecIf($["${DIALSTATUS}" == "CANCEL"]?Hangup())'."\n\t";
         // BUSY - занято. К примру абонент завершил вызов или DND.
-        $conf .= 'same => n,ExecIf($["${DIALSTATUS}" == "BUSY"]?Set(dstatus=FW_BUSY))' . "\n\t";
+        $conf .= 'same => n,ExecIf($["${DIALSTATUS}" == "BUSY"]?Set(dstatus=FW_BUSY))'."\n\t";
         // CHANUNAVAIL - канал не доступен. К примеру телефон не зарегистрирован или не отвечает.
-        $conf .= 'same => n,ExecIf($["${DIALSTATUS}" == "CHANUNAVAIL"]?Set(dstatus=FW_UNAV))' . "\n\t";
+        $conf .= 'same => n,ExecIf($["${DIALSTATUS}" == "CHANUNAVAIL"]?Set(dstatus=FW_UNAV))'."\n\t";
         // NOANSWER - не ответили по таймауту.
-        $conf .= 'same => n,ExecIf($["${dstatus}x" == "x"]?Set(dstatus=FW))' . "\n\t";
-        $conf .= 'same => n,Set(fw=${DB(${dstatus}/${EXTEN})})' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${fw}x" != "x"]?Set(__pt1c_UNIQUEID=${UNDEFINED})' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${fw}x" != "x"]?Goto(internal,${fw},1))' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))' . "\n\t";
-        $conf .= 'same => n,Hangup() ' . "\n\n";
+        $conf .= 'same => n,ExecIf($["${dstatus}x" == "x"]?Set(dstatus=FW))'."\n\t";
+        $conf .= 'same => n,Set(fw=${DB(${dstatus}/${EXTEN})})'."\n\t";
+        $conf .= 'same => n,ExecIf($["${fw}x" != "x"]?Set(__pt1c_UNIQUEID=${UNDEFINED})'."\n\t";
+        $conf .= 'same => n,ExecIf($["${fw}x" != "x"]?Goto(internal,${fw},1))'."\n\t";
+        $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))'."\n\t";
+        $conf .= 'same => n,Hangup() '."\n\n";
 
         $conf .= "[all_peers]\n";
-        $conf .= 'include => internal-hints' . "\n";
-        $conf .= 'exten => failed,1,Hangup()' . "\n";
+        $conf .= 'include => internal-hints'."\n";
+        $conf .= 'exten => failed,1,Hangup()'."\n";
 
-        $conf .= 'exten => _.!,1,ExecIf($[ "${EXTEN}" == "h" ]?Hangup())' . "\n\t";
+        $conf .= 'exten => _.!,1,ExecIf($[ "${EXTEN}" == "h" ]?Hangup())'."\n\t";
         // Фильтр спецсимволов. Разершаем только цифры.
-        $conf .= 'same => n,Set(cleanNumber=${FILTER(\*\#1234567890,${EXTEN})})' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${EXTEN}" != "${cleanNumber}"]?Goto(${CONTEXT},${cleanNumber},$[${PRIORITY} + 1]))' . "\n\t";
+        $conf .= 'same => n,Set(cleanNumber=${FILTER(\*\#1234567890,${EXTEN})})'."\n\t";
+        $conf .= 'same => n,ExecIf($["${EXTEN}" != "${cleanNumber}"]?Goto(${CONTEXT},${cleanNumber},$[${PRIORITY} + 1]))'."\n\t";
 
-        $conf .= 'same => n,Set(__FROM_CHAN=${CHANNEL})' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${OLD_LINKEDID}x" == "x"]?Set(__OLD_LINKEDID=${CDR(linkedid)}))' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" != "Local"]?Gosub(set_from_peer,s,1))' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Gosub(set_orign_chan,s,1))' . "\n\t";
+        $conf .= 'same => n,Set(__FROM_CHAN=${CHANNEL})'."\n\t";
+        $conf .= 'same => n,ExecIf($["${OLD_LINKEDID}x" == "x"]?Set(__OLD_LINKEDID=${CDR(linkedid)}))'."\n\t";
+        $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" != "Local"]?Gosub(set_from_peer,s,1))'."\n\t";
+        $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Gosub(set_orign_chan,s,1))'."\n\t";
 
-        $conf .= 'same => n,ExecIf($["${CALLERID(num)}x" == "x"]?Set(CALLERID(num)=${FROM_PEER}))' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${CALLERID(num)}x" == "x"]?Set(CALLERID(name)=${FROM_PEER}))' . "\n\t";
+        $conf .= 'same => n,ExecIf($["${CALLERID(num)}x" == "x"]?Set(CALLERID(num)=${FROM_PEER}))'."\n\t";
+        $conf .= 'same => n,ExecIf($["${CALLERID(num)}x" == "x"]?Set(CALLERID(name)=${FROM_PEER}))'."\n\t";
 
-        $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local" && "${FROM_PEER}x" == "x"]?Set(__FROM_PEER=${CALLERID(num)}))' . "\n\t";
-        $conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)' . "\n\t";
-        $conf .= 'same => n,Gosub(${ISTRANSFER}dial,${EXTEN},1)' . "\n\t";
+        $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local" && "${FROM_PEER}x" == "x"]?Set(__FROM_PEER=${CALLERID(num)}))'."\n\t";
+        $conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)'."\n\t";
+        $conf .= 'same => n,Gosub(${ISTRANSFER}dial,${EXTEN},1)'."\n\t";
 
         // Описываем возможность прыжка в пользовательский sub контекст.
-        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)' . "\n\t";
+        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)'."\n\t";
 
-        $conf .= 'same => n,Goto(peer_${FROM_PEER},${EXTEN},1)' . "\n\n";
+        $conf .= 'same => n,Goto(peer_${FROM_PEER},${EXTEN},1)'."\n\n";
 
-        $pickupexten =  $this->generalSettings['PBXFeaturePickupExten'];
-        $conf        .= 'exten => _' . $pickupexten . $extension . ',1,Set(PICKUPEER=' . $technology . '/${FILTER(0-9,${EXTEN:2})})' . "\n\t";
-        $conf        .= 'same => n,Set(pt1c_dnid=${EXTEN})' . "\n\t";
-        $conf        .= 'same => n,PickupChan(${PICKUPEER})' . "\n\t";
-        $conf        .= 'same => n,Hangup()' . "\n\n";
+        $pickupexten = $this->generalSettings['PBXFeaturePickupExten'];
+        $conf        .= 'exten => _'.$pickupexten.$extension.',1,Set(PICKUPEER='.$technology.'/${FILTER(0-9,${EXTEN:2})})'."\n\t";
+        $conf        .= 'same => n,Set(pt1c_dnid=${EXTEN})'."\n\t";
+        $conf        .= 'same => n,PickupChan(${PICKUPEER})'."\n\t";
+        $conf        .= 'same => n,Hangup()'."\n\n";
 
         $voicemail_exten = $this->generalSettings['VoicemailExten'];
-        $conf            .= 'exten => ' . $voicemail_exten . ',1,NoOp(NOTICE, Dialing out from ${CALLERID(all)} to VoiceMail)' . "\n\t";
-        $conf            .= 'same => n,VoiceMailMain(admin@voicemailcontext,s)' . "\n\t";
-        $conf            .= 'same => n,Hangup()' . "\n\n";
+        $conf            .= 'exten => '.$voicemail_exten.',1,NoOp(NOTICE, Dialing out from ${CALLERID(all)} to VoiceMail)'."\n\t";
+        $conf            .= 'same => n,VoiceMailMain(admin@voicemailcontext,s)'."\n\t";
+        $conf            .= 'same => n,Hangup()'."\n\n";
 
         $conf .= "[voice_mail_peer] \n";
-        $conf .= 'exten => voicemail,1,Answer()' . "\n\t";
-        $conf .= 'same => n,VoiceMail(admin@voicemailcontext)' . "\n\t";
-        $conf .= 'same => n,Hangup()' . "\n\n";
+        $conf .= 'exten => voicemail,1,Answer()'."\n\t";
+        $conf .= 'same => n,VoiceMail(admin@voicemailcontext)'."\n\t";
+        $conf .= 'same => n,Hangup()'."\n\n";
 
         // Контекст для внутренних вызовов.
         $conf .= "[internal] \n";
 
         foreach ($additionalModules as $appClass) {
             $addition = $appClass->getIncludeInternal();
-            if (!empty($addition)){
-                $conf .=$appClass->confBlockWithComments($addition);
+            if (!empty($addition)) {
+                $conf .= $appClass->confBlockWithComments($addition);
             }
         }
 
         foreach ($additionalModules as $appClass) {
             $addition = $appClass->extensionGenInternal();
-            if (!empty($addition)){
-                $conf .=$appClass->confBlockWithComments($addition);
+            if (!empty($addition)) {
+                $conf .= $appClass->confBlockWithComments($addition);
             }
         }
 
-        $conf .= 'exten => i,1,NoOp(-- INVALID NUMBER --)' . "\n\t";
-        $conf .= 'same => n,Set(DIALSTATUS=INVALID_NUMBER)' . "\n\t";
-        $conf .= 'same => n,Playback(privacy-incorrect,noanswer)' . "\n\t";
-        $conf .= 'same => n,Hangup()' . "\n";
+        $conf .= 'exten => i,1,NoOp(-- INVALID NUMBER --)'."\n\t";
+        $conf .= 'same => n,Set(DIALSTATUS=INVALID_NUMBER)'."\n\t";
+        $conf .= 'same => n,Playback(privacy-incorrect,noanswer)'."\n\t";
+        $conf .= 'same => n,Hangup()'."\n";
 
-        $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\n";
+        $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\n";
 
         $conf .= "[internal-incoming]\n";
-        $conf .= 'exten => _.!,1,ExecIf($["${MASTER_CHANNEL(M_TIMEOUT)}x" != "x"]?Set(TIMEOUT(absolute)=${MASTER_CHANNEL(M_TIMEOUT)}))' . " \n\t";
-        $conf .= 'same => n,Set(MASTER_CHANNEL(M_TIMEOUT_CHANNEL)=${CHANNEL})' . " \n\t";
-        $conf .= 'same => n,Set(MASTER_CHANNEL(M_TIMEOUT)=${EMPTY_VAR})' . " \n\t";
-        $conf .= 'same => n,Goto(internal,${EXTEN},1)' . " \n\n";
+        $conf .= 'exten => _.!,1,ExecIf($["${MASTER_CHANNEL(M_TIMEOUT)}x" != "x"]?Set(TIMEOUT(absolute)=${MASTER_CHANNEL(M_TIMEOUT)}))'." \n\t";
+        $conf .= 'same => n,Set(MASTER_CHANNEL(M_TIMEOUT_CHANNEL)=${CHANNEL})'." \n\t";
+        $conf .= 'same => n,Set(MASTER_CHANNEL(M_TIMEOUT)=${EMPTY_VAR})'." \n\t";
+        $conf .= 'same => n,Goto(internal,${EXTEN},1)'." \n\n";
 
         $conf .= "[internal-users] \n";
-        $conf .= 'exten => _' . $extension . ',1,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${ISTRANSFER}x" != "x"]?Set(SIPADDHEADER01=${EMPTY_VAR})' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Gosub(set_orign_chan,s,1))' . " \n\t";
+        $conf .= 'exten => _'.$extension.',1,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)'." \n\t";
+        $conf .= 'same => n,ExecIf($["${ISTRANSFER}x" != "x"]?Set(SIPADDHEADER01=${EMPTY_VAR})'." \n\t";
+        $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Gosub(set_orign_chan,s,1))'." \n\t";
 
-        $conf .= 'same => n,Gosub(${ISTRANSFER}dial,${EXTEN},1)' . "\n\t";
+        $conf .= 'same => n,Gosub(${ISTRANSFER}dial,${EXTEN},1)'."\n\t";
         // Проверим, существует ли такой пир.
 
-        $conf .= 'same => n,ExecIf($["${PJSIP_ENDPOINT(${EXTEN},auth)}x" == "x"]?Goto(internal-num-undefined,${EXTEN},1))' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${DEVICE_STATE(' . $technology . '/${EXTEN})}" == "BUSY"]?Set(DIALSTATUS=BUSY))' . " \n\t";
-        $conf .= 'same => n,GotoIf($["${DEVICE_STATE(' . $technology . '/${EXTEN})}" == "BUSY"]?fw_start)' . " \n\t";
+        $conf .= 'same => n,ExecIf($["${PJSIP_ENDPOINT(${EXTEN},auth)}x" == "x"]?Goto(internal-num-undefined,${EXTEN},1))'." \n\t";
+        $conf .= 'same => n,ExecIf($["${DEVICE_STATE('.$technology.'/${EXTEN})}" == "BUSY"]?Set(DIALSTATUS=BUSY))'." \n\t";
+        $conf .= 'same => n,GotoIf($["${DEVICE_STATE('.$technology.'/${EXTEN})}" == "BUSY"]?fw_start)'." \n\t";
 
         // Как долго звонить пиру.
-        $conf .= 'same => n,Set(ringlength=${DB(FW_TIME/${EXTEN})})' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${ringlength}x" == "x"]?Set(ringlength=600))' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${QUEUE_SRC_CHAN}x" != "x" && "${ISTRANSFER}x" == "x"]?Set(ringlength=600))' . " \n\t";
+        $conf .= 'same => n,Set(ringlength=${DB(FW_TIME/${EXTEN})})'." \n\t";
+        $conf .= 'same => n,ExecIf($["${ringlength}x" == "x"]?Set(ringlength=600))'." \n\t";
+        $conf .= 'same => n,ExecIf($["${QUEUE_SRC_CHAN}x" != "x" && "${ISTRANSFER}x" == "x"]?Set(ringlength=600))'." \n\t";
 
-        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1) ' . " \n\t";
+        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1) '." \n\t";
         // Совершаем вызов пира.
-        $conf .= 'same => n,Set(DST_CONTACT=${PJSIP_DIAL_CONTACTS(${EXTEN})})' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${FIELDQTY(DST_CONTACT,&)}" != "1"]?Set(__PT1C_SIP_HEADER=${EMPTY_VAR}))' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${DST_CONTACT}x" != "x"]?Dial(${DST_CONTACT},${ringlength},cTtekKHhU(${ISTRANSFER}dial_answer)b(dial_create_chan,s,1)):Set(DIALSTATUS=CHANUNAVAIL))' . " \n\t";
-        $conf .= 'same => n(fw_start),NoOp(dial_hangup)' . " \n\t";
+        $conf .= 'same => n,Set(DST_CONTACT=${PJSIP_DIAL_CONTACTS(${EXTEN})})'." \n\t";
+        $conf .= 'same => n,ExecIf($["${FIELDQTY(DST_CONTACT,&)}" != "1"]?Set(__PT1C_SIP_HEADER=${EMPTY_VAR}))'." \n\t";
+        $conf .= 'same => n,ExecIf($["${DST_CONTACT}x" != "x"]?Dial(${DST_CONTACT},${ringlength},cTtekKHhU(${ISTRANSFER}dial_answer)b(dial_create_chan,s,1)):Set(DIALSTATUS=CHANUNAVAIL))'." \n\t";
+        $conf .= 'same => n(fw_start),NoOp(dial_hangup)'." \n\t";
 
         // QUEUE_SRC_CHAN - установлена, если вызов сервершен агенту очереди.
         // Проверяем нужна ли переадресация
-        $conf       .= 'same => n,ExecIf($["${DIALSTATUS}" != "ANSWER" && "${ISTRANSFER}x" != "x"]?Goto(internal-fw,${EXTEN},1))' . " \n\t";
-        $conf       .= 'same => n,ExecIf($["${DIALSTATUS}" != "ANSWER" && "${QUEUE_SRC_CHAN}x" == "x"]?Goto(internal-fw,${EXTEN},1))' . " \n\t";
-        $conf       .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))' . " \n\t";
-        $conf       .= 'same => n,Hangup()' . "\n\n";
+        $conf       .= 'same => n,ExecIf($["${DIALSTATUS}" != "ANSWER" && "${ISTRANSFER}x" != "x"]?Goto(internal-fw,${EXTEN},1))'." \n\t";
+        $conf       .= 'same => n,ExecIf($["${DIALSTATUS}" != "ANSWER" && "${QUEUE_SRC_CHAN}x" == "x"]?Goto(internal-fw,${EXTEN},1))'." \n\t";
+        $conf       .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))'." \n\t";
+        $conf       .= 'same => n,Hangup()'."\n\n";
 
-        $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\n";
+        $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\n";
     }
 
     /**
@@ -281,22 +281,22 @@ 
     private function generateInternalTransfer(&$conf): void
     {
         $additionalModules = $this->di->getShared('pbxConfModules');
-        $conf              .= "[internal-transfer] \n";
+        $conf .= "[internal-transfer] \n";
 
         foreach ($additionalModules as $appClass) {
-            $addition= $appClass->getIncludeInternalTransfer();
-            if (!empty($addition)){
-                $conf .=$appClass->confBlockWithComments($addition);
+            $addition = $appClass->getIncludeInternalTransfer();
+            if (!empty($addition)) {
+                $conf .= $appClass->confBlockWithComments($addition);
             }
         }
 
         foreach ($additionalModules as $appClass) {
-            $addition= $appClass->extensionGenInternalTransfer();
-            if (!empty($addition)){
-                $conf .=$appClass->confBlockWithComments($addition);
+            $addition = $appClass->extensionGenInternalTransfer();
+            if (!empty($addition)) {
+                $conf .= $appClass->confBlockWithComments($addition);
             }
         }
-        $conf .= 'exten => h,1,Gosub(transfer_dial_hangup,${EXTEN},1)' . "\n\n";
+        $conf .= 'exten => h,1,Gosub(transfer_dial_hangup,${EXTEN},1)'."\n\n";
     }
 
     /**
@@ -307,11 +307,11 @@ 
     private function generateSipHints(&$conf): void
     {
         $additionalModules = $this->di->getShared('pbxConfModules');
-        $conf              .= "[internal-hints] \n";
+        $conf .= "[internal-hints] \n";
         foreach ($additionalModules as $appClass) {
             $addition = $appClass->extensionGenHints();
-            if (!empty($addition)){
-                $conf .=$appClass->confBlockWithComments($addition);
+            if (!empty($addition)) {
+                $conf .= $appClass->confBlockWithComments($addition);
             }
         }
         $conf .= "\n\n";
@@ -325,16 +325,16 @@ 
     private function generateOutContextPeers(&$conf): void
     {
         $additionalModules = $this->di->getShared('pbxConfModules');
-        $conf              .= "[outgoing] \n";
+        $conf .= "[outgoing] \n";
 
-        $conf .= 'exten => _+.!,1,NoOp(Strip + sign from number and convert it to +)' . " \n\t";
-        $conf .= 'same => n,Set(ADDPLUS=+);' . " \n\t";
-        $conf .= 'same => n,Goto(${CONTEXT},${EXTEN:1},1);' . " \n\n";
-        $conf .= 'exten => _X!,1,NoOp(Start outgoing calling...)' . " \n\t";
-        $conf .= 'same => n,Ringing()' . " \n\t";
+        $conf .= 'exten => _+.!,1,NoOp(Strip + sign from number and convert it to +)'." \n\t";
+        $conf .= 'same => n,Set(ADDPLUS=+);'." \n\t";
+        $conf .= 'same => n,Goto(${CONTEXT},${EXTEN:1},1);'." \n\n";
+        $conf .= 'exten => _X!,1,NoOp(Start outgoing calling...)'." \n\t";
+        $conf .= 'same => n,Ringing()'." \n\t";
 
         // Описываем возможность прыжка в пользовательский sub контекст.
-        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)' . "\n\t";
+        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)'."\n\t";
 
         /** @var \MikoPBX\Common\Models\OutgoingRoutingTable $routs */
         /** @var \MikoPBX\Common\Models\OutgoingRoutingTable $rout */
@@ -346,66 +346,66 @@ 
             if ($technology !== '') {
                     $rout_data                       = $rout->toArray();
                     $rout_data['technology']         = $technology;
-                    $id_dialplan                     = $rout_data['providerid'] . '-' . $rout_data['id'] . '-outgoing';
+                    $id_dialplan                     = $rout_data['providerid'].'-'.$rout_data['id'].'-outgoing';
                     $provider_contexts[$id_dialplan] = $rout_data;
-                    $conf                            .= $this->generateOutgoingRegexPattern($rout_data);
+                    $conf .= $this->generateOutgoingRegexPattern($rout_data);
                     continue;
             }
         }
-        $conf .= 'same => n,ExecIf($["${peer_mobile}x" != "x"]?Hangup())' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${DIALSTATUS}" != "ANSWER" && "${BLINDTRANSFER}x" != "x" && "${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${ROUTFOUND}x" == "x"]?Gosub(dial,${EXTEN},1))' . "\n\t";
+        $conf .= 'same => n,ExecIf($["${peer_mobile}x" != "x"]?Hangup())'." \n\t";
+        $conf .= 'same => n,ExecIf($["${DIALSTATUS}" != "ANSWER" && "${BLINDTRANSFER}x" != "x" && "${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\t";
+        $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))'." \n\t";
+        $conf .= 'same => n,ExecIf($["${ROUTFOUND}x" == "x"]?Gosub(dial,${EXTEN},1))'."\n\t";
 
-        $conf .= 'same => n,Playback(silence/2,noanswer)' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${ROUTFOUND}x" != "x"]?Playback(followme/sorry,noanswer):Playback(cannot-complete-as-dialed,noanswer))' . " \n\t";
-        $conf .= 'same => n,Hangup()' . " \n\n";
-        $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\t";
+        $conf .= 'same => n,Playback(silence/2,noanswer)'." \n\t";
+        $conf .= 'same => n,ExecIf($["${ROUTFOUND}x" != "x"]?Playback(followme/sorry,noanswer):Playback(cannot-complete-as-dialed,noanswer))'." \n\t";
+        $conf .= 'same => n,Hangup()'." \n\n";
+        $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\t";
 
         foreach ($provider_contexts as $id_dialplan => $rout) {
             $conf .= "\n[{$id_dialplan}]\n";
             if (isset($rout['trimfrombegin']) && $rout['trimfrombegin'] > 0) {
                 // $exten_var = '${ADDPLUS}${EXTEN:'.$rout['trimfrombegin'].'}';
-                $exten_var    = '${EXTEN:' . $rout['trimfrombegin'] . '}';
-                $change_exten = 'same => n,ExecIf($["${EXTEN}" != "${number}"]?Goto(${CONTEXT},${number},$[${PRIORITY} + 1]))' . "\n\t";
+                $exten_var    = '${EXTEN:'.$rout['trimfrombegin'].'}';
+                $change_exten = 'same => n,ExecIf($["${EXTEN}" != "${number}"]?Goto(${CONTEXT},${number},$[${PRIORITY} + 1]))'."\n\t";
             } else {
                 $exten_var    = '${ADDPLUS}${EXTEN}';
                 $change_exten = '';
             }
-            $conf .= 'exten => _X!,1,Set(number=' . $rout['prepend'] . $exten_var . ')' . "\n\t";
+            $conf .= 'exten => _X!,1,Set(number='.$rout['prepend'].$exten_var.')'."\n\t";
             $conf .= $change_exten;
             foreach ($additionalModules as $appClass) {
                 $addition = $appClass->generateOutRoutContext($rout);
-                if (!empty($addition)){
-                    $conf .=$appClass->confBlockWithComments($addition);
+                if (!empty($addition)) {
+                    $conf .= $appClass->confBlockWithComments($addition);
                 }
             }
-            $conf .= 'same => n,ExecIf($["${number}x" == "x"]?Hangup())' . "\n\t";
-            $conf .= 'same => n,Set(ROUTFOUND=1)' . "\n\t";
-            $conf .= 'same => n,Gosub(${ISTRANSFER}dial,${EXTEN},1)' . "\n\t";
+            $conf .= 'same => n,ExecIf($["${number}x" == "x"]?Hangup())'."\n\t";
+            $conf .= 'same => n,Set(ROUTFOUND=1)'."\n\t";
+            $conf .= 'same => n,Gosub(${ISTRANSFER}dial,${EXTEN},1)'."\n\t";
 
-            $conf .= 'same => n,ExecIf($["${EXTERNALPHONE}" == "${EXTEN}"]?Set(DOPTIONS=tk))' . "\n\t";
+            $conf .= 'same => n,ExecIf($["${EXTERNALPHONE}" == "${EXTEN}"]?Set(DOPTIONS=tk))'."\n\t";
 
             // Описываем возможность прыжка в пользовательский sub контекст.
-            $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(' . $rout['providerid'] . '-outgoing-custom,${EXTEN},1)}" == "1"]?' . $rout['providerid'] . '-outgoing-custom,${EXTEN},1)' . "\n\t";
+            $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS('.$rout['providerid'].'-outgoing-custom,${EXTEN},1)}" == "1"]?'.$rout['providerid'].'-outgoing-custom,${EXTEN},1)'."\n\t";
 
             if ($rout['technology'] === IAXConf::TYPE_IAX2) {
-                $conf .= 'same => n,Dial(' . $rout['technology'] . '/' . $rout['providerid'] . '/${number},600,${DOPTIONS}TKU(dial_answer)b(dial_create_chan,s,1))' . "\n\t";
+                $conf .= 'same => n,Dial('.$rout['technology'].'/'.$rout['providerid'].'/${number},600,${DOPTIONS}TKU(dial_answer)b(dial_create_chan,s,1))'."\n\t";
             } else {
-                $conf .= 'same => n,Dial(' . $rout['technology'] . '/${number}@' . $rout['providerid'] . ',600,${DOPTIONS}TKU(dial_answer)b(dial_create_chan,s,1))' . "\n\t";
+                $conf .= 'same => n,Dial('.$rout['technology'].'/${number}@'.$rout['providerid'].',600,${DOPTIONS}TKU(dial_answer)b(dial_create_chan,s,1))'."\n\t";
             }
             foreach ($additionalModules as $appClass) {
                 $addition = $appClass->generateOutRoutAfterDialContext($rout);
-                if (!empty($addition)){
-                    $conf .=$appClass->confBlockWithComments($addition);
+                if (!empty($addition)) {
+                    $conf .= $appClass->confBlockWithComments($addition);
                 }
             }
-            $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(' . $rout['providerid'] . '-outgoing-after-dial-custom,${EXTEN}),1}" == "1"]?' . $rout['providerid'] . '-outgoing-after-dial-custom,${EXTEN},1)' . "\n\t";
+            $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS('.$rout['providerid'].'-outgoing-after-dial-custom,${EXTEN}),1}" == "1"]?'.$rout['providerid'].'-outgoing-after-dial-custom,${EXTEN},1)'."\n\t";
 
-            $conf .= 'same => n,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\t";
-            $conf .= 'same => n,ExecIf($["${DIALSTATUS}" = "ANSWER"]?Hangup())' . "\n\t";
-            $conf .= 'same => n,Set(pt1c_UNIQUEID=${EMPTY_VALUE})' . "\n\t";
-            $conf .= 'same => n,return' . "\n";
+            $conf .= 'same => n,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\t";
+            $conf .= 'same => n,ExecIf($["${DIALSTATUS}" = "ANSWER"]?Hangup())'."\n\t";
+            $conf .= 'same => n,Set(pt1c_UNIQUEID=${EMPTY_VALUE})'."\n\t";
+            $conf .= 'same => n,return'."\n";
         }
     }
 
@@ -421,14 +421,14 @@ 
         $conf        = '';
         $restnumbers = '';
         if (isset($rout['restnumbers']) && $rout['restnumbers'] > 0) {
-            $restnumbers = "[0-9]{" . $rout['restnumbers'] . "}$";
+            $restnumbers = "[0-9]{".$rout['restnumbers']."}$";
         } elseif ($rout['restnumbers'] == 0) {
             $restnumbers = "$";
         } elseif ($rout['restnumbers'] == -1) {
             $restnumbers = "";
         }
         $numberbeginswith = $rout['numberbeginswith'];
-        $conf             .= 'same => n,ExecIf($["${REGEX("^' . $numberbeginswith . $restnumbers . '" ${EXTEN})}" == "1"]?Gosub(' . $rout['providerid'] . '-' . $rout['id'] . '-outgoing,${EXTEN},1))' . " \n\t";
+        $conf .= 'same => n,ExecIf($["${REGEX("^'.$numberbeginswith.$restnumbers.'" ${EXTEN})}" == "1"]?Gosub('.$rout['providerid'].'-'.$rout['id'].'-outgoing,${EXTEN},1))'." \n\t";
 
         return $conf;
     }
@@ -445,7 +445,7 @@ 
         $conf              .= self::generateIncomingContextPeers('none', '', '');
         $conf              .= "[public-direct-dial] \n";
         foreach ($additionalModules as $appClass) {
-            if ($appClass instanceof $this){
+            if ($appClass instanceof $this) {
                 continue;
             }
             $appClass->generatePublicContext($conf);
@@ -475,7 +475,7 @@ 
         $conf              = '';
         $dialplan          = [];
         $di = Di::getDefault();
-        if ($di===null){
+        if ($di === null) {
             return '';
         }
         $additionalModules = $di->getShared('pbxConfModules');
@@ -530,48 +530,48 @@ 
             if (empty($rout_data)) {
                 $ext_prefix = ('none' === $provider) ? '' : '_';
                 $rout_data  .= "exten => {$ext_prefix}{$rout_number},1,NoOp(--- Incoming call ---)\n\t";
-                $rout_data  .= 'same => n,Set(CHANNEL(language)=' . $lang . ')' . "\n\t";
-                $rout_data  .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)' . "\n\t";
-                $rout_data  .= 'same => n,Set(__FROM_DID=${EXTEN})' . "\n\t";
-                $rout_data  .= 'same => n,Set(__FROM_CHAN=${CHANNEL})' . "\n\t";
+                $rout_data  .= 'same => n,Set(CHANNEL(language)='.$lang.')'."\n\t";
+                $rout_data  .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)'."\n\t";
+                $rout_data  .= 'same => n,Set(__FROM_DID=${EXTEN})'."\n\t";
+                $rout_data  .= 'same => n,Set(__FROM_CHAN=${CHANNEL})'."\n\t";
 
                 // Установка имени пира.
-                $rout_data .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" != "Local"]?Gosub(set_from_peer,s,1))' . "\n\t";
-                $rout_data .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Set(__FROM_PEER=${CALLERID(num)}))' . "\n\t";
+                $rout_data .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" != "Local"]?Gosub(set_from_peer,s,1))'."\n\t";
+                $rout_data .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Set(__FROM_PEER=${CALLERID(num)}))'."\n\t";
 
                 // TODO / Подмена входящего callerid.
-                $rout_data .= 'same => n,Gosub(add-trim-prefix-clid,${EXTEN},1)' . "\n\t";
+                $rout_data .= 'same => n,Gosub(add-trim-prefix-clid,${EXTEN},1)'."\n\t";
 
                 foreach ($additionalModules as $appClass) {
                      $addition = $appClass->generateIncomingRoutBeforeDial($rout_number);
-                     if (!empty($addition)){
-                         $rout_data .=$appClass->confBlockWithComments($addition);
+                     if (!empty($addition)) {
+                         $rout_data .= $appClass->confBlockWithComments($addition);
                      }
                  }
 
                 // Перехват на ответственного.
-                $rout_data .= 'same => n,UserEvent(Interception,CALLERID: ${CALLERID(num)},chan1c: ${CHANNEL},FROM_DID: ${FROM_DID})' . "\n\t";
+                $rout_data .= 'same => n,UserEvent(Interception,CALLERID: ${CALLERID(num)},chan1c: ${CHANNEL},FROM_DID: ${FROM_DID})'."\n\t";
                 // Проверим распискние для входящих внешних звонков.
                 $rout_data .= 'same => n,Gosub(check-out-work-time,${EXTEN},1)';
                 // Описываем возможность прыжка в пользовательский sub контекст.
-                $rout_data .= " \n\t" . 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)';
+                $rout_data .= " \n\t".'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)';
             }
 
-            if ( ! empty($rout['extension'])) {
+            if (!empty($rout['extension'])) {
                 $rout_data = rtrim($rout_data);
                 // Обязательно проверяем "DIALSTATUS", в случае с парковой через AMI вызова это необходимо.
                 // При ответе может отработать следующий приоритет.
-                if ( ! isset($rout_data_dial[$rout_number])) {
+                if (!isset($rout_data_dial[$rout_number])) {
                     $rout_data_dial[$rout_number] = '';
                 }
 
-                $dial_command                 = " \n\t" . 'same => n,' . 'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?' . "Dial(Local/{$rout['extension']}@internal-incoming/n,{$timeout},cTKg));";
-                $rout_data_dial[$rout_number] .= " \n\t" . "same => n,Set(M_TIMEOUT={$timeout})";
+                $dial_command = " \n\t".'same => n,'.'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?'."Dial(Local/{$rout['extension']}@internal-incoming/n,{$timeout},cTKg));";
+                $rout_data_dial[$rout_number] .= " \n\t"."same => n,Set(M_TIMEOUT={$timeout})";
                 $rout_data_dial[$rout_number] .= $dial_command;
 
                 if (is_array($provider)) {
                     $key = $provider[$rout['provider']] ?? '';
-                    if ( ! isset($rout_data_dial[$key])) {
+                    if (!isset($rout_data_dial[$key])) {
                         $rout_data_dial[$key] = '';
                     }
                     if (empty($number)) {
@@ -582,9 +582,9 @@ 
         }
 
         if (is_string($login)) {
-            $add_login_pattern = ! empty($login);
+            $add_login_pattern = !empty($login);
             foreach ($data as $rout) {
-                if ( ! $add_login_pattern) {
+                if (!$add_login_pattern) {
                     break;
                 } // Логин не заполнен, обработка не требуется.
                 $is_num = preg_match_all('/^\d+$/m', $login, $matches, PREG_SET_ORDER, 0);
@@ -604,7 +604,7 @@ 
             if ($add_login_pattern && array_key_exists('X!', $rout_data_dial) && isset($dialplan['X!'])) {
                 $dialplan[$login]       = str_replace('_X!,1', "{$login},1", $dialplan['X!']);
                 $rout_data_dial[$login] = $rout_data_dial['X!'];
-            }elseif($add_login_pattern === true && $need_def_rout === true && count($data) === 1){
+            }elseif ($add_login_pattern === true && $need_def_rout === true && count($data) === 1) {
                 // Только маршрут "По умолчанию".
                 $dialplan[$login]       = str_replace('_X!,1', "{$login},1", $dialplan['X!']);
             }
@@ -615,7 +615,7 @@ 
         }
 
         foreach ($dialplan as $key => &$dpln) {
-            if ( ! array_key_exists($key, $rout_data_dial)) {
+            if (!array_key_exists($key, $rout_data_dial)) {
                 continue;
             }
             $dpln = rtrim($dpln);
@@ -624,29 +624,29 @@ 
         unset($dpln);
 
         $uniqid = is_string($provider) ? $provider : $uniqid;
-        $conf   .= "\n" . "[{$uniqid}-incoming]\n";
+        $conf .= "\n"."[{$uniqid}-incoming]\n";
         foreach ($dialplan as $dpln) {
-            $conf .= $dpln . "\n";
+            $conf .= $dpln."\n";
             if (null == $default_action && 'none' !== $provider) {
                 continue;
             }
             if ('extension' === $default_action->action) {
                 // Обязательно проверяем "DIALSTATUS", в случае с парковой через AMI вызова это необходимо.
                 // При ответе может отработать следующий приоритет.
-                $conf .= "\t" . 'same => n,Set(M_TIMEOUT=0)' . "\n";
-                $conf .= "\t" . "same => n," . 'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?' . "Dial(Local/{$default_action->extension}@internal/n,,cTKg)); default action" . "\n";
+                $conf .= "\t".'same => n,Set(M_TIMEOUT=0)'."\n";
+                $conf .= "\t"."same => n,".'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?'."Dial(Local/{$default_action->extension}@internal/n,,cTKg)); default action"."\n";
 
                 foreach ($additionalModules as $appClass) {
                     $addition = $appClass->generateIncomingRoutAfterDialContext($uniqid);
-                    if (!empty($addition)){
-                         $conf .=$appClass->confBlockWithComments($addition);
+                    if (!empty($addition)) {
+                         $conf .= $appClass->confBlockWithComments($addition);
                     }
                 }
-                $conf .= " \t" . 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-after-dial-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-after-dial-custom,${EXTEN},1)' . "\n";
+                $conf .= " \t".'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-after-dial-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-after-dial-custom,${EXTEN},1)'."\n";
             } elseif ('busy' === $default_action->action) {
-                $conf .= "\t" . "same => n,Busy()" . "\n";
+                $conf .= "\t"."same => n,Busy()"."\n";
             }
-            $conf .= "\t" . "same => n,Hangup()" . "\n";
+            $conf .= "\t"."same => n,Hangup()"."\n";
         }
 
         return $conf;
@@ -662,10 +662,10 @@ 
     private function generateOutWorkTimes(&$conf): string
     {
         $conf .= "\n\n[playback-exit]\n";
-        $conf .= 'exten => _.!,1,NoOp(check time)' . "\n\t";
-        $conf .= 'same => n,Gosub(dial_outworktimes,${EXTEN},1)' . "\n\t";
-        $conf .= 'same => n,Playback(${filename})' . "\n\t";
-        $conf .= 'same => n,Hangup()' . "\n\n";
+        $conf .= 'exten => _.!,1,NoOp(check time)'."\n\t";
+        $conf .= 'same => n,Gosub(dial_outworktimes,${EXTEN},1)'."\n\t";
+        $conf .= 'same => n,Playback(${filename})'."\n\t";
+        $conf .= 'same => n,Hangup()'."\n\n";
 
         $conf .= "[check-out-work-time]\n";
         $conf .= "exten => _.!,1,NoOp(check time)\n\t";
@@ -677,9 +677,9 @@ 
         $now_year = 1 * date('Y', time());
         foreach ($data as $out_data) {
             /** @var \MikoPBX\Common\Models\OutWorkTimes $out_data */
-            if ( ! empty($out_data->date_from) && ! empty($out_data->date_to)) {
-                $year_from = 1 * date('Y', (int)$out_data->date_from);
-                $year_to   = 1 * date('Y', (int)$out_data->date_to);
+            if (!empty($out_data->date_from) && !empty($out_data->date_to)) {
+                $year_from = 1 * date('Y', (int) $out_data->date_from);
+                $year_to   = 1 * date('Y', (int) $out_data->date_to);
                 if ($now_year < $year_from || $now_year > $year_to) {
                     // Правило не актуально для текущего года.
                     continue;
@@ -716,11 +716,11 @@ 
                 $mdays  = '*';
                 $months = '*';
             } else {
-                $mdays  = strtolower(date("j", (int)$date_from));
-                $months = strtolower(date("M", (int)$date_from));
-                if ( ! empty($date_to)) {
-                    $mdays  .= "-" . strtolower(date("j", (int)$date_to));
-                    $months .= "-" . strtolower(date("M", (int)$date_to));
+                $mdays  = strtolower(date("j", (int) $date_from));
+                $months = strtolower(date("M", (int) $date_from));
+                if (!empty($date_to)) {
+                    $mdays  .= "-".strtolower(date("j", (int) $date_to));
+                    $months .= "-".strtolower(date("M", (int) $date_to));
                 }
             }
 
@@ -733,12 +733,12 @@ 
                 $res           = SoundFiles::findFirst($out_data->audio_message_id);
                 $audio_message = ($res === null) ? '' : Util::trimExtensionForFile($res->path);
 
-                $conf_out_set_var .= "[work-time-set-var-{$out_data->id}]\n" .
-                    'exten => _.!,1,Set(filename=' . $audio_message . ')' . "\n\t" .
-                    'same => n,Goto(playback-exit,${EXTEN},1)' . "\n\n";
+                $conf_out_set_var .= "[work-time-set-var-{$out_data->id}]\n".
+                    'exten => _.!,1,Set(filename='.$audio_message.')'."\n\t".
+                    'same => n,Goto(playback-exit,${EXTEN},1)'."\n\n";
 
                 $appname = 'ExecIfTime';
-                $appdata = 'Goto(work-time-set-var-' . $out_data->id . ',${EXTEN},1)';
+                $appdata = 'Goto(work-time-set-var-'.$out_data->id.',${EXTEN},1)';
             }
             $conf .= "same => n,{$appname}($times,$weekdays,$mdays,$months?{$appdata})\n\t";
         }
@@ -764,10 +764,10 @@ 
         if ($provider !== null) {
             if ($provider->type === 'SIP') {
                 $account    = Sip::findFirst('disabled="0" AND uniqid = "'.$uniqueID.'"');
-                $technology = ($account === null)?'':SIPConf::getTechnology();
+                $technology = ($account === null) ? '' : SIPConf::getTechnology();
             } elseif ($provider->type === 'IAX') {
                 $account    = Iax::findFirst('disabled="0" AND uniqid = "'.$uniqueID.'"');
-                $technology = ($account === null)?'':'IAX2';
+                $technology = ($account === null) ? '' : 'IAX2';
             }
         }
 

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)));
 }

src/Core/Workers/WorkerModelsEvents.php

Spacing +9 added lines, -9 removed lines

@@ -105,7 +105,7 @@ 
     private int $timeout = 2;
     private array $arrObject;
     private array $PRIORITY_R;
-    protected int $maxProc=1;
+    protected int $maxProc = 1;
 
 
     /**
@@ -190,7 +190,7 @@ 
         foreach ($additionalModules as $appClass) {
             // Проверим, зависит ли объект от измененных данных.
             $dependences = $appClass->dependenceModels();
-            if (in_array($called_class, $dependences)){
+            if (in_array($called_class, $dependences)) {
                 // Получаем новые настройки.
                 $appClass->getSettings();
             }
@@ -238,7 +238,7 @@ 
                 break;
             case Codecs::class:
                 $this->modified_tables[self::R_IAX] = true;
-                $this->modified_tables[self::R_SIP]     = true;
+                $this->modified_tables[self::R_SIP] = true;
                 break;
             case IncomingRoutingTable::class:
                 $this->modified_tables[self::R_DIALPLAN] = true;
@@ -310,16 +310,16 @@ 
                     $this->modified_tables[self::R_NATS]    = true;
                 }
                 if ($this->pbxSettings->itHasTimeZoneSettings()) {
-                    $this->modified_tables[self::R_TIMEZONE]    = true;
-                    $this->modified_tables[self::R_NGINX]    = true;
-                    $this->modified_tables[self::R_PHP_FPM]    = true;
+                    $this->modified_tables[self::R_TIMEZONE] = true;
+                    $this->modified_tables[self::R_NGINX] = true;
+                    $this->modified_tables[self::R_PHP_FPM] = true;
                     $this->modified_tables[self::R_REST_API_WORKER] = true;
                 }
                 if ($this->pbxSettings->itHasNTPSettings()) {
-                    $this->modified_tables[self::R_NTP]    = true;
+                    $this->modified_tables[self::R_NTP] = true;
                 }
                 if ($this->pbxSettings->itHasCallRecordSettings()) {
-                    $this->modified_tables[ self::R_CALL_EVENTS_WORKER]  = true;
+                    $this->modified_tables[self::R_CALL_EVENTS_WORKER] = true;
                 }
                 break;
             case Sip::class:
@@ -490,7 +490,7 @@ 
      */
     public function reloadNginx(): void
     {
-        $nginxConf  = new NginxConf();
+        $nginxConf = new NginxConf();
         $nginxConf->generateConf();
         $nginxConf->reStart();
     }

src/AdminCabinet/Controllers/GeneralSettingsController.php

Spacing +4 added lines, -4 removed lines

@@ -39,7 +39,7 @@ 
      */
     public function saveAction(): void
     {
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
         $data        = $this->request->getPost();
@@ -76,7 +76,7 @@ 
                     $this->session->set('SendMetrics', $record->value);
                     break;
                 case 'PBXFeatureTransferDigitTimeout':
-                    $record->value = ceil((int)$data['PBXFeatureDigitTimeout']/1000);
+                    $record->value = ceil((int) $data['PBXFeatureDigitTimeout'] / 1000);
                     break;
                 default:
                     if (array_key_exists($key, $data)) {
@@ -94,10 +94,10 @@ 
         }
 
         $codecs = json_decode($data['codecs'], true);
-        foreach ($codecs as $codec){
+        foreach ($codecs as $codec) {
            $record = Codecs::findFirstById($codec['codecId']);
            $record->priority = $codec['priority'];
-           $record->disabled = $codec['disabled']===true?'1':'0';
+           $record->disabled = $codec['disabled'] === true ? '1' : '0';
            $record->update();
         }
 

src/PBXCoreREST/Lib/FirewallManagementProcessor.php

Indentation +15 added lines, -15 removed lines

@@ -79,22 +79,22 @@
         return $res;
     }
 
-     public static function getDbConnection(){
-         if(!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)){
-             return null;
-         }
-         try {
-             $db      = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
-         }catch (\Exception $e){
-             return null;
-         }
-         $db->busyTimeout(5000);
-         $fail2ban = new Fail2BanConf();
-         if (false === $fail2ban->tableBanExists($db)) {
-             return null;
-         }
+        public static function getDbConnection(){
+            if(!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)){
+                return null;
+            }
+            try {
+                $db      = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
+            }catch (\Exception $e){
+                return null;
+            }
+            $db->busyTimeout(5000);
+            $fail2ban = new Fail2BanConf();
+            if (false === $fail2ban->tableBanExists($db)) {
+                return null;
+            }
 
-         return $db;
+            return $db;
     }
 
     /**

Spacing +14 added lines, -14 removed lines

@@ -28,18 +28,18 @@ 
      */
     public static function fail2banUnbanAll(string $ip): PBXApiResult
     {
-        $ip     = trim($ip);
+        $ip = trim($ip);
         $res = new PBXApiResult();
         $res->processor = __METHOD__;
         $res->success = true;
-        if ( ! Verify::isIpAddress($ip)) {
+        if (!Verify::isIpAddress($ip)) {
             $res->success = false;
-            $res->messages[]="Not valid ip '{$ip}'.";
+            $res->messages[] = "Not valid ip '{$ip}'.";
         }
-        $fail2ban        = new Fail2BanConf();
+        $fail2ban = new Fail2BanConf();
         if ($fail2ban->fail2ban_enable) {
             $fail2ban = Util::which('fail2ban-client');
-            $res->success  = (Util::mwExec("{$fail2ban} unban {$ip}") === 0);
+            $res->success = (Util::mwExec("{$fail2ban} unban {$ip}") === 0);
         } else {
             $res = self::fail2banUnbanDb($ip);
         }
@@ -60,7 +60,7 @@ 
         $res->processor = __METHOD__;
 
         $db = self::getDbConnection();
-        if(!$db){
+        if (!$db) {
             // Таблица не существует. Бана нет.
             $res->success    = false;
             $res->messages[] = 'DB '.Fail2BanConf::FAIL2BAN_DB_PATH.' not found';
@@ -79,13 +79,13 @@ 
         return $res;
     }
 
-     public static function getDbConnection(){
-         if(!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)){
+     public static function getDbConnection() {
+         if (!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)) {
              return null;
          }
          try {
-             $db      = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
-         }catch (\Exception $e){
+             $db = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
+         } catch (\Exception $e) {
              return null;
          }
          $db->busyTimeout(5000);
@@ -110,7 +110,7 @@ 
             $ban_time = '43800';
         }
         // Добавленн фильтр по времени бана. возвращаем только адреса, которые еще НЕ разбанены.
-        $q = 'SELECT' . ' DISTINCT jail,ip,MAX(timeofban) AS timeofban, MAX(timeofban+' . $ban_time . ') AS timeunban FROM bans where (timeofban+' . $ban_time . ')>' . time();
+        $q = 'SELECT'.' DISTINCT jail,ip,MAX(timeofban) AS timeofban, MAX(timeofban+'.$ban_time.') AS timeunban FROM bans where (timeofban+'.$ban_time.')>'.time();
         if ($ip !== null) {
             $q .= " AND ip='{$ip}'";
         }
@@ -133,13 +133,13 @@ 
 
         $jail_q  = ($jail === '') ? '' : "AND jail = '{$jail}'";
         $path_db = Fail2BanConf::FAIL2BAN_DB_PATH;
-        if(!file_exists($path_db)){
+        if (!file_exists($path_db)) {
             // Таблица не существует. Бана нет.
             $res->success    = false;
             $res->messages[] = "DB {$path_db} not found";
             return $res;
         }
-        $db      = new SQLite3($path_db);
+        $db = new SQLite3($path_db);
         $db->busyTimeout(3000);
         $fail2ban = new Fail2BanConf();
         if (false === $fail2ban->tableBanExists($db)) {
@@ -147,7 +147,7 @@ 
             $res->success = true;
             return $res;
         }
-        $q = 'DELETE' . " FROM bans WHERE ip = '{$ip}' {$jail_q}";
+        $q = 'DELETE'." FROM bans WHERE ip = '{$ip}' {$jail_q}";
         $db->query($q);
 
         $err = $db->lastErrorMsg();

Braces +3 added lines, -2 removed lines

@@ -79,13 +79,14 @@
         return $res;
     }
 
-     public static function getDbConnection(){
+     public static function getDbConnection()
+     {
          if(!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)){
              return null;
          }
          try {
              $db      = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
-         }catch (\Exception $e){
+         } catch (\Exception $e){
              return null;
          }
          $db->busyTimeout(5000);

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

@@ -136,7 +136,7 @@
         if(!file_exists($path_db)){
             // Таблица не существует. Бана нет.
             $res->success    = false;
-            $res->messages[] = "DB {$path_db} not found";
+            $res->messages[] = "db {$path_db} not found";
             return $res;
         }
         $db      = new SQLite3($path_db);

src/PBXCoreREST/Lib/SystemManagementProcessor.php

Spacing +19 added lines, -19 removed lines

@@ -162,14 +162,14 @@ 
         $res->data['message'] = 'In progress...';
 
 
-        if ( ! file_exists($tempFilename)) {
+        if (!file_exists($tempFilename)) {
             $res->success    = false;
             $res->messages[] = "Update file '{$tempFilename}' not found.";
 
             return $res;
         }
 
-        if ( ! file_exists('/var/etc/cfdevice')) {
+        if (!file_exists('/var/etc/cfdevice')) {
             $res->success    = false;
             $res->messages[] = "The system is not installed";
 
@@ -198,7 +198,7 @@ 
         $res            = new PBXApiResult();
         $res->processor = __METHOD__;
         $moduleMetadata = FilesManagementProcessor::getMetadataFromModuleFile($filePath);
-        if ( ! $moduleMetadata->success) {
+        if (!$moduleMetadata->success) {
             return $moduleMetadata;
         } else {
             $moduleUniqueID = $moduleMetadata->data['uniqid'];
@@ -237,7 +237,7 @@ 
         if (class_exists($pbxExtensionSetupClass)
             && method_exists($pbxExtensionSetupClass, 'installModule')) {
             $setup = new $pbxExtensionSetupClass($moduleUniqueID);
-            if ( ! $setup->installModule()) {
+            if (!$setup->installModule()) {
                 $res->success    = false;
                 $res->messages[] = $setup->getMessages();
             }
@@ -384,15 +384,15 @@ 
             [IncomingRoutingTable::class => ''],
             [OutWorkTimes::class => ''],
             [AsteriskManagerUsers::class => ''],
-            [Extensions::class => 'type="' . Extensions::TYPE_IVR_MENU . '"'],  // IVR Menu
-            [Extensions::class => 'type="' . Extensions::TYPE_CONFERENCE . '"'],  // CONFERENCE
-            [Extensions::class => 'type="' . Extensions::TYPE_QUEUE . '"'],  // QUEUE
+            [Extensions::class => 'type="'.Extensions::TYPE_IVR_MENU.'"'], // IVR Menu
+            [Extensions::class => 'type="'.Extensions::TYPE_CONFERENCE.'"'], // CONFERENCE
+            [Extensions::class => 'type="'.Extensions::TYPE_QUEUE.'"'], // QUEUE
         ];
 
         foreach ($clearThisModels as $modelParams) {
             foreach ($modelParams as $key => $value) {
                 $records = call_user_func([$key, 'find'], $value);
-                if ( ! $records->delete()) {
+                if (!$records->delete()) {
                     $res->messages[] = $records->getMessages();
                     $res->success    = false;
                 }
@@ -400,13 +400,13 @@ 
         }
 
         // Other extensions
-        $parameters     = [
+        $parameters = [
             'conditions' => 'not number IN ({ids:array})',
             'bind'       => [
                 'ids' => [
                     '000063', // Reads back the extension
                     '000064', // 0000MILLI
-                    '10003246',// Echo test
+                    '10003246', // Echo test
                     '10000100' // Voicemail
                 ],
             ],
@@ -420,7 +420,7 @@ 
                 $stopDeleting = true;
                 continue;
             }
-            if ( ! $record->delete()) {
+            if (!$record->delete()) {
                 $deleteAttempts += 1;
             }
             if ($deleteAttempts > $countRecords * 10) {
@@ -436,12 +436,12 @@ 
                 'custom' => SoundFiles::CATEGORY_CUSTOM,
             ],
         ];
-        $records    = SoundFiles::find($parameters);
+        $records = SoundFiles::find($parameters);
 
         foreach ($records as $record) {
             if (stripos($record->path, '/storage/usbdisk1/mikopbx') !== false) {
                 Util::mwExec("{$rm} -rf {$record->path}");
-                if ( ! $record->delete()) {
+                if (!$record->delete()) {
                     $res->messages[] = $record->getMessages();
                     $res->success    = false;
                 }
@@ -453,7 +453,7 @@ 
         foreach ($records as $record) {
             $moduleDir = PbxExtensionUtils::getModuleDir($record->uniqid);
             Util::mwExec("{$rm} -rf {$moduleDir}");
-            if ( ! $record->delete()) {
+            if (!$record->delete()) {
                 $res->messages[] = $record->getMessages();
                 $res->success    = false;
             }
@@ -461,7 +461,7 @@ 
 
         // Delete CallRecords
         $records = CallDetailRecords::find();
-        if ( ! $records->delete()) {
+        if (!$records->delete()) {
             $res->messages[] = $records->getMessages();
             $res->success    = false;
         }
@@ -486,14 +486,14 @@ 
     {
         $res            = new PBXApiResult();
         $res->processor = __METHOD__;
-        if ( ! file_exists($filename)) {
+        if (!file_exists($filename)) {
             $res->success    = false;
             $res->messages[] = "File '{$filename}' not found.";
 
             return $res;
         }
         $out          = [];
-        $tmp_filename = '/tmp/' . time() . "_" . basename($filename);
+        $tmp_filename = '/tmp/'.time()."_".basename($filename);
         if (false === copy($filename, $tmp_filename)) {
             $res->success    = false;
             $res->messages[] = "Unable to create temporary file '{$tmp_filename}'.";
@@ -502,8 +502,8 @@ 
         }
 
         // Принудительно устанавливаем расширение файла в wav.
-        $n_filename     = Util::trimExtensionForFile($filename) . ".wav";
-        $n_filename_mp3 = Util::trimExtensionForFile($filename) . ".mp3";
+        $n_filename     = Util::trimExtensionForFile($filename).".wav";
+        $n_filename_mp3 = Util::trimExtensionForFile($filename).".mp3";
         // Конвертируем файл.
         $tmp_filename = escapeshellcmd($tmp_filename);
         $n_filename   = escapeshellcmd($n_filename);