mikopbx / Core

src/AdminCabinet/Controllers/PbxExtensionModulesController.php

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

@@ -57,7 +57,7 @@ 
      */
     public function modifyAction(string $uniqid): void
     {
-        $menuSettings               = "AdditionalMenuItem{$uniqid}";
+        $menuSettings               = "additionalmenuitem{$uniqid}";
         $unCamelizedControllerName  = Text::uncamelize($uniqid, '-');
         $previousMenuSettings       = PbxSettings::findFirstByKey($menuSettings);
         $this->view->showAtMainMenu = $previousMenuSettings !== false;
@@ -69,7 +69,7 @@ 
                 'href'          => $this->url->get($unCamelizedControllerName),
                 'group'         => '',
                 'iconClass'     => 'puzzle piece',
-                'caption'       => "Breadcrumb$uniqid",
+                'caption'       => "breadcrumb$uniqid",
                 'showAtSidebar' => false,
             ];
             $previousMenuSettings->value = json_encode($value);
@@ -77,7 +77,7 @@ 
         $options                = json_decode($previousMenuSettings->value, true);
         $this->view->form       = new PbxExtensionModuleSettingsForm($previousMenuSettings, $options);
         $this->view->title      = $this->translation->_('ext_SettingsForModule') . ' ' . $this->translation->_(
-                "Breadcrumb$uniqid"
+                "breadcrumb$uniqid"
             );
         $this->view->submitMode = null;
         $this->view->indexUrl   = $unCamelizedControllerName;
@@ -128,7 +128,7 @@ 
         $result  = [];
         $modules = PbxExtensionModules::getEnabledModulesArray();
         foreach ($modules as $module) {
-            $menuSettings         = "AdditionalMenuItem{$module['uniqid']}";
+            $menuSettings         = "additionalmenuitem{$module['uniqid']}";
             $previousMenuSettings = PbxSettings::findFirstByKey($menuSettings);
             if ($previousMenuSettings !== null) {
                 $result['items'][] = json_decode($previousMenuSettings->value, true);

src/Common/Providers/PBXConfModulesProvider.php

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

@@ -83,7 +83,7 @@
         $modules = PbxExtensionModules::getEnabledModulesArray();
         foreach ($modules as $value) {
             $class_name      = str_replace('Module', '', $value['uniqid']);
-            $full_class_name = "\\Modules\\{$value['uniqid']}\\Lib\\{$class_name}Conf";
+            $full_class_name = "\\Modules\\{$value['uniqid']}\\Lib\\{$class_name}conf";
             if (class_exists($full_class_name)) {
                 $object = new $full_class_name();
                 if ($object instanceof ConfigClass){

src/Core/Workers/WorkerCallEvents.php

Braces +4 added lines, -3 removed lines

@@ -90,7 +90,7 @@ 
     {
         if(isset($this->mixMonitorChannels[$channel])){
             unset($this->mixMonitorChannels[$channel]);
-        }else{
+        } else{
             return;
         }
         if ($this->record_calls) {
@@ -1319,7 +1319,8 @@ 
      *
      * @return bool
      */
-    private function filterNotValid($filter){
+    private function filterNotValid($filter)
+    {
         $haveErrors = false;
         if(isset($filter['bind'])){
             if(is_array($filter)){
@@ -1328,7 +1329,7 @@ 
                         $haveErrors = true;
                     }
                 }
-            }else{
+            } else{
                 $haveErrors = true;
             }
         }

Spacing +86 added lines, -86 removed lines

@@ -34,8 +34,8 @@ 
      */
     public function MixMonitor($channel, $file_name = null, $sub_dir = null, $full_name = null): string
     {
-        $resFile = $this->mixMonitorChannels[$channel]??'';
-        if($resFile !== ''){
+        $resFile = $this->mixMonitorChannels[$channel] ?? '';
+        if ($resFile !== '') {
             return $resFile;
         }
         $resFile           = '';
@@ -43,7 +43,7 @@ 
         if ($this->record_calls) {
             [$f, $options] = $this->setMonitorFilenameOptions($full_name, $sub_dir, $file_name);
             $arr = $this->am->GetChannels(false);
-            if(!in_array($channel, $arr, true)){
+            if (!in_array($channel, $arr, true)) {
                 return '';
             }
             $srcFile = "{$f}.wav";
@@ -85,9 +85,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) {
@@ -125,7 +125,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()));
             }
         }
@@ -144,7 +144,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 = [
@@ -160,14 +160,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;
                 }
@@ -181,7 +181,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;
@@ -197,14 +197,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()));
             }
         }
@@ -224,7 +224,7 @@ 
             // Событие возникает, когда мы пытаемся перехватить вызов на соседний телефон.
             $filter = [
                 'UNIQUEID=:UNIQUEID:',
-                'bind' => ['UNIQUEID' => $data['old_id'],],
+                'bind' => ['UNIQUEID' => $data['old_id'], ],
             ];
             /** @var CallDetailRecordsTmp $m_data */
             $m_data = CallDetailRecordsTmp::find($filter);
@@ -238,7 +238,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'], $new_data['end']);
                 self::insertDataToDbM($new_data);
@@ -250,7 +250,7 @@ 
                 $this->am->UserEvent('CdrConnector', ['AgiData' => $AgiData]);
             }
         } else {
-            if ( ! empty($data['ENDCALLONANSWER'])) {
+            if (!empty($data['ENDCALLONANSWER'])) {
                 // Переменная ENDCALLONANSWER устанавливается при начале работы умной маршуртизации.
                 // Как только произошел ответ на вызов, отметим вызов на приложение как завершенный.
                 $filter = [
@@ -267,7 +267,7 @@ 
                     $row->writeAttribute('endtime', $data['answer']);
                     $row->writeAttribute('is_app', 1);
                     $res = $row->save();
-                    if ( ! $res) {
+                    if (!$res) {
                         Util::sysLogMsg('ENDCALLONANSWER', implode(' ', $row->getMessages()));
                     }
                 }
@@ -289,7 +289,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'],
                     ],
                 ];
             }
@@ -302,7 +302,7 @@ 
                         continue;
                     }
                     // Найдем все прочие CDR по данному originate и отметим как завершенные.
-                    $filter      = [
+                    $filter = [
                         'linkedid=:linkedid: AND endtime <> "" AND src_chan <> :src_chan:',
                         'bind' => [
                             'linkedid' => $row->linkedid,
@@ -316,7 +316,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();
                     }
 
@@ -328,13 +328,13 @@ 
                 }
 
                 $row->writeAttribute('answer', $data['answer']);
-                $recFile = $data['recordingfile']??'';
-                if(!empty($recFile)){
+                $recFile = $data['recordingfile'] ?? '';
+                if (!empty($recFile)) {
                     $this->mixMonitorChannels[$data['agi_channel']] = $recFile;
                     $row->writeAttribute('recordingfile', $recFile);
                 }
                 $res = $row->save();
-                if ( !$res) {
+                if (!$res) {
                     Util::sysLogMsg('Action_dial_answer', implode(' ', $row->getMessages()));
                 }
             }
@@ -360,10 +360,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']]);
         }
     }
@@ -375,24 +375,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'], 'CHANNEL(linkedid)', null, false);
-            if ( empty($linkedid) || $linkedid === $data['linkedid']) {
+            if (empty($linkedid) || $linkedid === $data['linkedid']) {
                 continue;
             }
 
@@ -405,7 +405,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'];
@@ -437,7 +437,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'],
@@ -454,8 +454,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);
                 }
             }
@@ -468,7 +468,7 @@ 
                 $row->writeAttribute('dialstatus', $data['dialstatus']);
             }
             $res = $row->update();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_hangup_chan', implode(' ', $row->getMessages()));
             }
 
@@ -500,14 +500,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;
         }
 
         $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'],
@@ -529,8 +529,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'];
@@ -541,7 +541,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";
@@ -562,7 +562,7 @@ 
             $this->am->UserEvent('CdrConnector', ['AgiData' => $AgiData]);
 
             self::insertDataToDbM($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'];
@@ -578,12 +578,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;
                 }
             }
@@ -661,7 +661,7 @@ 
      */
     public function Action_transfer_dial_create_chan($data): void
     {
-        $filter     = [
+        $filter = [
             'UNIQUEID=:UNIQUEID: AND endtime = "" AND answer = ""',
             'bind' => [
                 'UNIQUEID' => $data['transfer_UNIQUEID'],
@@ -674,7 +674,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;
                 }
@@ -688,7 +688,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;
@@ -700,11 +700,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()));
             }
         }
@@ -721,7 +721,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'],
             ],
         ];
 
@@ -730,13 +730,13 @@ 
         $m_data = CallDetailRecordsTmp::find($filter);
         foreach ($m_data as $row) {
             $row->writeAttribute('answer', $data['answer']);
-            $recFile = $data['recordingfile']??'';
-            if(!empty($recFile)){
+            $recFile = $data['recordingfile'] ?? '';
+            if (!empty($recFile)) {
                 $this->mixMonitorChannels[$data['agi_channel']] = $recFile;
                 $row->writeAttribute('recordingfile', $recFile);
             }
             $res = $row->save();
-            if ( !$res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_transfer_dial_answer', implode(' ', $row->getMessages()));
             }
         }
@@ -770,7 +770,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()));
                 }
             }
@@ -805,7 +805,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()));
                 }
             }
@@ -825,7 +825,7 @@ 
                 $this->MixMonitor($row->dst_chan, $info['filename'], $subdir);
                 // Снимем со строк признак переадресации.
                 $row->writeAttribute('transfer', 0);
-                if ( ! $row->save()) {
+                if (!$row->save()) {
                     Util::sysLogMsg('Action_transfer_dial_answer', implode(' ', $row->getMessages()));
                 }
             }
@@ -901,7 +901,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);
@@ -972,7 +972,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()));
             }
         }
@@ -1001,7 +1001,7 @@ 
                 $row->writeAttribute('dialstatus', $data['dialstatus']);
             }
             $res = $row->save();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_queue_end', implode(' ', $row->getMessages()));
             }
         }
@@ -1031,11 +1031,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;
@@ -1047,7 +1047,7 @@ 
             // Подменим ID на идентификатор конференции.
             $row->writeAttribute('linkedid', $data['meetme_id']);
             $res = $row->save();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_hangup_chan_meetme', implode(' ', $row->getMessages()));
             }
         }
@@ -1064,11 +1064,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()));
             }
         }
@@ -1107,9 +1107,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));
@@ -1139,14 +1139,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);
@@ -1155,7 +1155,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) {
@@ -1164,7 +1164,7 @@ 
             $m_data->writeAttribute($attribute, $value);
         }
         $res = $m_data->save();
-        if ( ! $res) {
+        if (!$res) {
             Util::sysLogMsg(__FUNCTION__, implode(' ', $m_data->getMessages()));
         }
 
@@ -1203,7 +1203,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;
         }
@@ -1225,7 +1225,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();
                 }
@@ -1250,7 +1250,7 @@ 
             $new_m_data->transfer     = $data['transfer'];
 
             $res = $new_m_data->save();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg(__FUNCTION__, implode(' ', $m_data->getMessages()));
             }
 
@@ -1259,7 +1259,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) {
@@ -1268,7 +1268,7 @@ 
             $m_data->writeAttribute($attribute, $value);
         }
         $res = $m_data->save();
-        if ( ! $res) {
+        if (!$res) {
             Util::sysLogMsg(__FUNCTION__, implode(' ', $m_data->getMessages()));
         }
 
@@ -1283,12 +1283,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);
@@ -1307,7 +1307,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;
             }
@@ -1323,7 +1323,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);
@@ -1339,16 +1339,16 @@ 
      *
      * @return bool
      */
-    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;
             }
         }
@@ -1357,7 +1357,7 @@ 
 
     public function errorHandler($m): void
     {
-        Util::sysLogMsg(self::class . '_ERROR', $m);
+        Util::sysLogMsg(self::class.'_ERROR', $m);
     }
 }
 

src/Core/Asterisk/CdrDb.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
             $date = CallEventsLogs::maximum(
                 ['linkedid = "'.$row_cdr->linkedid.'"', 'column' => 'eventtime']
             );
-            if ( ! $row_cdr->endtime) {
+            if (!$row_cdr->endtime) {
                 if ($date) {
                     $row_cdr->endtime = $date;
                 } elseif ($row_cdr->answer) {

src/Core/Workers/WorkerModelsEvents.php

Spacing +10 added lines, -10 removed lines

@@ -189,7 +189,7 @@ 
         foreach ($additionalModules as $appClass) {
             // Проверим, зависит ли объект от измененных данных.
             $dependences = $appClass->dependenceModels();
-            if (in_array($called_class, $dependences, true)){
+            if (in_array($called_class, $dependences, true)) {
                 // Получаем новые настройки.
                 $appClass->getSettings();
             }
@@ -235,7 +235,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 SoundFiles::class:
                 $this->modified_tables[self::R_MOH] = true;
@@ -253,7 +253,7 @@ 
                 break;
             case PbxSettings::class:
                 $pbxSettings = PbxSettings::findFirstByKey($data['recordId']);
-                if ($pbxSettings===null){
+                if ($pbxSettings === null) {
                     return;
                 }
                 if ($pbxSettings->itHasFeaturesSettingsChanges()) {
@@ -295,17 +295,17 @@ 
                     $this->modified_tables[self::R_NATS]    = true;
                 }
                 if ($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 ($pbxSettings->itHasNTPSettings()) {
-                    $this->modified_tables[self::R_NTP]    = true;
+                    $this->modified_tables[self::R_NTP] = true;
                 }
                 if ($pbxSettings->itHasCallRecordSettings()) {
-                    $this->modified_tables[self::R_CALL_EVENTS_WORKER]  = true;
-                    $this->modified_tables[self::R_DIALPLAN]  = true;
+                    $this->modified_tables[self::R_CALL_EVENTS_WORKER] = true;
+                    $this->modified_tables[self::R_DIALPLAN] = true;
                 }
                 break;
             case PbxExtensionModules::class:
@@ -466,7 +466,7 @@ 
      */
     public function reloadNginx(): void
     {
-        $nginxConf  = new NginxConf();
+        $nginxConf = new NginxConf();
         $nginxConf->generateConf();
         $nginxConf->reStart();
     }

src/PBXCoreREST/Controllers/System/PostController.php

Spacing +3 added lines, -3 removed lines

@@ -101,7 +101,7 @@ 
                 $data = $this->request->getPost();
                 $this->sendRequestToBackendWorker('system', $actionName, $data);
                 // Clear WWW models cache after successfully install or remove module
-                if ($this->response->getStatusCode()===200){
+                if ($this->response->getStatusCode() === 200) {
                     PbxExtensionModules::clearCache(Extensions::class);
                     PbxExtensionModules::clearCache(PbxExtensionModules::class);
                     PbxExtensionModules::clearCache(PbxSettings::class);
@@ -126,10 +126,10 @@ 
         $mohDir                = $di->getShared('config')->path('asterisk.mohdir');
         switch ($category) {
             case SoundFiles::CATEGORY_MOH:
-                $data['filename'] = "{$mohDir}/" . basename($data['temp_filename']);
+                $data['filename'] = "{$mohDir}/".basename($data['temp_filename']);
                 break;
             case SoundFiles::CATEGORY_CUSTOM:
-                $data['filename'] = "{$mediaDir}/" . basename($data['temp_filename']);
+                $data['filename'] = "{$mediaDir}/".basename($data['temp_filename']);
                 break;
             default:
                 $this->sendError(400, 'Category not set');

src/Core/Workers/WorkerBeanstalkdTidyUp.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     {
         $managedCache = $this->di->get('managedCache');
         $lastTubesCheck = $managedCache->get('lastTubesCheck');
-        if ($lastTubesCheck === null){
+        if ($lastTubesCheck === null) {
             $client = new BeanstalkClient();
             $client->cleanTubes();
             $managedCache->set('lastTubesCheck', time(), 300);

src/AdminCabinet/Controllers/ExtensionsController.php

Spacing +41 added lines, -41 removed lines

@@ -80,14 +80,14 @@ 
                     $extensionTable[$extension->userid]['email']    = $extension->email;
                     $extensionTable[$extension->userid]['secret']   = $extension->secret;
 
-                    if ( ! array_key_exists('mobile', $extensionTable[$extension->userid])) {
+                    if (!array_key_exists('mobile', $extensionTable[$extension->userid])) {
                         $extensionTable[$extension->userid]['mobile'] = '';
                     }
                     if ($extension->avatar) {
                         $filename    = md5($extension->avatar);
                         $imgCacheDir = appPath('sites/admin-cabinet/assets/img/cache');
                         $imgFile     = "{$imgCacheDir}/$filename.jpg";
-                        if ( ! file_exists($imgFile)) {
+                        if (!file_exists($imgFile)) {
                             $this->base64ToJpeg($extension->avatar, $imgFile);
                         }
 
@@ -152,7 +152,7 @@ 
             $extension->Sip                    = new Sip();
             $extension->Sip->disabled          = 0;
             $extension->Sip->type              = 'peer';
-            $extension->Sip->uniqid            = Extensions::TYPE_SIP.strtoupper('-PHONE-' . md5(time()));
+            $extension->Sip->uniqid            = Extensions::TYPE_SIP.strtoupper('-PHONE-'.md5(time()));
             $extension->Sip->busylevel         = 1;
             $extension->Sip->qualify           = '1';
             $extension->Sip->qualifyfreq       = 60;
@@ -174,7 +174,7 @@ 
             $arrNetworkFilters[$filter->id] = $filter->getRepresent();
         }
 
-        $parameters        = [
+        $parameters = [
             'conditions' => 'type = "'.Extensions::TYPE_EXTERNAL.'" AND is_general_user_number = "1" AND userid=:userid:',
             'bind'       => [
                 'userid' => $extension->userid,
@@ -187,11 +187,11 @@ 
             $externalExtension->type                     = Extensions::TYPE_EXTERNAL;
             $externalExtension->is_general_user_number   = '1';
             $externalExtension->ExternalPhones           = new ExternalPhones();
-            $externalExtension->ExternalPhones->uniqid   = Extensions::TYPE_EXTERNAL.strtoupper('-' . md5(time()));
+            $externalExtension->ExternalPhones->uniqid   = Extensions::TYPE_EXTERNAL.strtoupper('-'.md5(time()));
             $externalExtension->ExternalPhones->disabled = '0';
         }
 
-        $forwardingExtensions  = [];
+        $forwardingExtensions = [];
         $forwardingExtensions[''] = $this->translation->_('ex_SelectNumber');
 
         $parameters = [
@@ -235,11 +235,11 @@ 
             'conditions' => 'type = "'.Extensions::TYPE_SIP.'"',
             'column'     => 'number',
         ];
-        $query      = Extensions::maximum($parameters);
+        $query = Extensions::maximum($parameters);
         if ($query === null) {
             $query = 200;
         }
-        $result       = (int)$query + 1;
+        $result       = (int) $query + 1;
         $extensionsLength = PbxSettings::getValueByKey('PBXInternalExtensionLength');
         $maxExtension = (10 ** $extensionsLength) - 1;
 
@@ -253,7 +253,7 @@ 
      */
     public function saveAction(): void
     {
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
 
@@ -275,21 +275,21 @@ 
             $fwdEntity->ringlength = 45;
         } else {
             $extension = $sipEntity->Extensions;
-            if ( ! $extension) {
+            if (!$extension) {
                 $extension = new Extensions();
             }
             $userEntity = $extension->Users;
-            if ( ! $userEntity) {
+            if (!$userEntity) {
                 $userEntity = new Users();
             }
             $fwdEntity = $extension->ExtensionForwardingRights;
-            if ( ! $fwdEntity) {
+            if (!$fwdEntity) {
                 $fwdEntity = new ExtensionForwardingRights();
             }
         }
 
         // Заполним параметры пользователя
-        if ( ! $this->saveUser($userEntity, $data)) {
+        if (!$this->saveUser($userEntity, $data)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -297,7 +297,7 @@ 
         }
 
         // Заполним параметры внутреннего номера
-        if ( ! $this->saveExtension($extension, $userEntity, $data, false)) {
+        if (!$this->saveExtension($extension, $userEntity, $data, false)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -305,7 +305,7 @@ 
         }
 
         // Заполним параметры SIP учетки
-        if ( ! $this->saveSip($sipEntity, $data)) {
+        if (!$this->saveSip($sipEntity, $data)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -314,7 +314,7 @@ 
 
 
         // Заполним параметры маршрутизации
-        if ( ! $this->saveForwardingRights($fwdEntity, $data)) {
+        if (!$this->saveForwardingRights($fwdEntity, $data)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -322,7 +322,7 @@ 
         }
 
         // Если мобильный не указан, то не будем его добавлять в базу
-        if ( ! empty($data['mobile_number'])) {
+        if (!empty($data['mobile_number'])) {
             $externalPhone = ExternalPhones::findFirstByUniqid($data['mobile_uniqid']);
             if ($externalPhone === null) {
                 $externalPhone   = new ExternalPhones();
@@ -332,7 +332,7 @@ 
             }
 
             // Заполним параметры Extension для мобильного
-            if ( ! $this->saveExtension($mobileExtension, $userEntity, $data, true)) {
+            if (!$this->saveExtension($mobileExtension, $userEntity, $data, true)) {
                 $this->view->success = false;
                 $this->db->rollback();
 
@@ -340,7 +340,7 @@ 
             }
 
             // Заполним параметры ExternalPhones для мобильного
-            if ( ! $this->saveExternalPhones($externalPhone, $data)) {
+            if (!$this->saveExternalPhones($externalPhone, $data)) {
                 $this->view->success = false;
                 $this->db->rollback();
 
@@ -348,7 +348,7 @@ 
             }
         } else {
             // Удалить номер мобильного если он был привязан к пользователю
-            $parameters          = [
+            $parameters = [
                 'conditions' => 'type="'.Extensions::TYPE_EXTERNAL.'" AND is_general_user_number = "1" AND userid=:userid:',
                 'bind'       => [
                     'userid' => $userEntity->id,
@@ -390,16 +390,16 @@ 
         foreach ($userEntity as $name => $value) {
             switch ($name) {
                 case 'role':
-                    if (array_key_exists('user_' . $name, $data)) {
-                        $userEntity->$name = ($userEntity->$name === 'user') ? 'user' : $data['user_' . $name]; // не повышаем роль
+                    if (array_key_exists('user_'.$name, $data)) {
+                        $userEntity->$name = ($userEntity->$name === 'user') ? 'user' : $data['user_'.$name]; // не повышаем роль
                     }
                     break;
                 case 'language':
                     $userEntity->$name = PbxSettings::getValueByKey('PBXLanguage');
                     break;
                 default:
-                    if (array_key_exists('user_' . $name, $data)) {
-                        $userEntity->$name = $data['user_' . $name];
+                    if (array_key_exists('user_'.$name, $data)) {
+                        $userEntity->$name = $data['user_'.$name];
                     }
             }
         }
@@ -491,20 +491,20 @@ 
                     break;
                 case 'disabled':
                 case 'disablefromuser':
-                    if (array_key_exists('sip_' . $name, $data)) {
-                        $sipEntity->$name = ($data['sip_' . $name] === 'on') ? '1' : '0';
+                    if (array_key_exists('sip_'.$name, $data)) {
+                        $sipEntity->$name = ($data['sip_'.$name] === 'on') ? '1' : '0';
                     } else {
                         $sipEntity->$name = "0";
                     }
                     break;
                 case 'networkfilterid':
-                    if ( ! array_key_exists('sip_' . $name, $data)) {
+                    if (!array_key_exists('sip_'.$name, $data)) {
                         continue 2;
                     }
-                    if ($data['sip_' . $name] === 'none') {
+                    if ($data['sip_'.$name] === 'none') {
                         $sipEntity->$name = null;
                     } else {
-                        $sipEntity->$name = $data['sip_' . $name];
+                        $sipEntity->$name = $data['sip_'.$name];
                     }
                     break;
                 case 'extension':
@@ -517,8 +517,8 @@ 
                     $sipEntity->setManualAttributes($data['sip_manualattributes']);
                     break;
                 default:
-                    if (array_key_exists('sip_' . $name, $data)) {
-                        $sipEntity->$name = $data['sip_' . $name];
+                    if (array_key_exists('sip_'.$name, $data)) {
+                        $sipEntity->$name = $data['sip_'.$name];
                     }
             }
         }
@@ -548,8 +548,8 @@ 
                     $forwardingRight->$name = $data['number'];
                     break;
                 default:
-                    if (array_key_exists('fwd_' . $name, $data)) {
-                        $forwardingRight->$name = ($data['fwd_' . $name] === -1) ? '' : $data['fwd_' . $name];
+                    if (array_key_exists('fwd_'.$name, $data)) {
+                        $forwardingRight->$name = ($data['fwd_'.$name] === -1) ? '' : $data['fwd_'.$name];
                     }
             }
         }
@@ -586,15 +586,15 @@ 
                     $externalPhone->$name = $data['user_username'];
                     break;
                 case 'disabled':
-                    if (array_key_exists('mobile_' . $name, $data)) {
-                        $externalPhone->$name = ($data['mobile_' . $name] === 'on') ? '1' : '0';
+                    if (array_key_exists('mobile_'.$name, $data)) {
+                        $externalPhone->$name = ($data['mobile_'.$name] === 'on') ? '1' : '0';
                     } else {
                         $externalPhone->$name = '0';
                     }
                     break;
                 default:
-                    if (array_key_exists('mobile_' . $name, $data)) {
-                        $externalPhone->$name = $data['mobile_' . $name];
+                    if (array_key_exists('mobile_'.$name, $data)) {
+                        $externalPhone->$name = $data['mobile_'.$name];
                     }
             }
         }
@@ -623,13 +623,13 @@ 
 
         $errors = null;
         if ($extension !== null && $extension->ExtensionForwardingRights
-            && ! $extension->ExtensionForwardingRights->delete()) {
+            && !$extension->ExtensionForwardingRights->delete()) {
             $errors = $extension->ExtensionForwardingRights->getMessages();
         }
 
-        if ( ! $errors && $extension) {
+        if (!$errors && $extension) {
             $user = $extension->Users;
-            if ( ! $user->delete()) {
+            if (!$user->delete()) {
                 $errors = $user->getMessages();
             }
         }
@@ -749,7 +749,7 @@ 
      */
     public function GetPhonesRepresentAction(): void
     {
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
         $numbers = $this->request->getPost('numbers');

src/AdminCabinet/Providers/DispatcherProvider.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
     {
         $di->setShared(
             self::SERVICE_NAME,
-            function () {
+            function() {
                 $eventsManager = new EventsManager();
 
 
@@ -61,7 +61,7 @@ 
                 /**
                  * Handle exceptions and not-found exceptions using NotFoundPlugin
                  */
-                if (! class_exists(PrettyPageHandler::class)) {
+                if (!class_exists(PrettyPageHandler::class)) {
                     $eventsManager->attach(
                         'dispatch:beforeException',
                         new NotFoundPlugin()

Braces +2 added lines, -1 removed lines

@@ -38,7 +38,8 @@
     {
         $di->setShared(
             self::SERVICE_NAME,
-            function () {
+            function ()
+            {
                 $eventsManager = new EventsManager();