mikopbx / Core

src/Core/System/Upgrade/UpdateDatabase.php

Spacing +9 added lines, -9 removed lines

@@ -59,7 +59,7 @@ 
             $moduleModelClass = "MikoPBX\\Common\\Models\\{$className}";
             try {
                 $this->createUpdateDbTableByAnnotations($moduleModelClass);
-            } catch (Throwable $exception){
+            } catch (Throwable $exception) {
                 Util::echoWithSyslog('Errors within update table '.$className.' '.$exception->getMessage());
             }
         }
@@ -78,7 +78,7 @@ 
     {
         $result = true;
         if (
-            ! class_exists($modelClassName)
+            !class_exists($modelClassName)
             || count(get_class_vars($modelClassName)) === 0) {
             return true;
         }
@@ -118,7 +118,7 @@ 
                 'isNumeric' => false,
                 'primary'   => false,
             ];
-            $previousAttribute           = $attribute;
+            $previousAttribute = $attribute;
         }
 
         // Set data types
@@ -226,8 +226,8 @@ 
 
         $connectionService->begin();
 
-        if ( ! $connectionService->tableExists($tableName)) {
-            Util::echoWithSyslog(' - UpdateDatabase: Create new table: ' . $tableName . ' ');
+        if (!$connectionService->tableExists($tableName)) {
+            Util::echoWithSyslog(' - UpdateDatabase: Create new table: '.$tableName.' ');
             $result = $connectionService->createTable($tableName, '', $columnsNew);
             Util::echoGreenDone();
         } else {
@@ -235,7 +235,7 @@ 
             $currentColumnsArr = $connectionService->describeColumns($tableName, '');
 
             if ($this->isTableStructureNotEqual($currentColumnsArr, $columns)) {
-                Util::echoWithSyslog(' - UpdateDatabase: Upgrade table: ' . $tableName . ' ');
+                Util::echoWithSyslog(' - UpdateDatabase: Upgrade table: '.$tableName.' ');
                 // Create new table and copy all data
                 $currentStateColumnList = [];
                 $oldColNames            = []; // Старые названия колонок
@@ -325,13 +325,13 @@ 
                 if ($oldField->$compared_setting() !== $newField->$compared_setting()) {
                     // Sqlite transform "1" to ""1"" in default settings, but it is normal
                     if ($compared_setting === 'getDefault'
-                        && $oldField->$compared_setting() === '"' . $newField->$compared_setting() . '"') {
+                        && $oldField->$compared_setting() === '"'.$newField->$compared_setting().'"') {
                         continue;
                     }
 
                     // Description for "length" is integer, but table structure store it as string
                     if ($compared_setting === 'getSize'
-                        && (string)$oldField->$compared_setting() === (string)$newField->$compared_setting()) {
+                        && (string) $oldField->$compared_setting() === (string) $newField->$compared_setting()) {
                         continue;
                     }
 
@@ -359,7 +359,7 @@ 
         // Drop not exist indexes
         foreach ($currentIndexes as $indexName => $currentIndex) {
             if (stripos($indexName, 'sqlite_autoindex') === false
-                && ! array_key_exists($indexName, $indexes)
+                && !array_key_exists($indexName, $indexes)
             ) {
                 Util::echoWithSyslog(" - UpdateDatabase: Delete index: {$indexName} ");
                 $result = $result + $connectionService->dropIndex($tableName, '', $indexName);

src/Core/System/System.php

Spacing +3 added lines, -3 removed lines

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

Braces +1 added lines, -1 removed lines

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

src/Common/Models/Extensions.php

Spacing +5 added lines, -5 removed lines

@@ -112,7 +112,7 @@ 
         $freeExtension = '2200100';
         for ($i = 100; ; $i++) {
             $freeExtension = "2200{$i}";
-            if ( ! in_array(['number' => $freeExtension], $result, false)) {
+            if (!in_array(['number' => $freeExtension], $result, false)) {
                 break;
             }
         }
@@ -421,8 +421,8 @@ 
                 $relatedModel     = $relation->getReferencedModel();
                 $referencedFields = is_array($referencedFields) ? $referencedFields : [$referencedFields];
                 foreach ($referencedFields as $referencedField) {
-                    $parameters     = [
-                        'conditions' => $referencedField . '= :oldNumber:',
+                    $parameters = [
+                        'conditions' => $referencedField.'= :oldNumber:',
                         'bind'       => ['oldNumber' => $snapShotData['number']],
                     ];
                     $relatedRecords = call_user_func([$relatedModel, 'find'], $parameters);
@@ -476,8 +476,8 @@ 
                 $relatedModel     = $relation->getReferencedModel();
                 $referencedFields = is_array($referencedFields) ? $referencedFields : [$referencedFields];
                 foreach ($referencedFields as $referencedField) {
-                    $parameters     = [
-                        'conditions' => $referencedField . '= :Number:',
+                    $parameters = [
+                        'conditions' => $referencedField.'= :Number:',
                         'bind'       => ['Number' => $this->number],
                     ];
                     $relatedRecords = call_user_func([$relatedModel, 'find'], $parameters);

src/Common/Providers/LicenseProvider.php

Spacing +2 added lines, -2 removed lines

@@ -50,10 +50,10 @@
     {
         $di->setShared(
             self::SERVICE_NAME,
-            function () {
+            function() {
                 try {
                     return new License('http://127.0.0.1:8223');
-                } catch (Throwable $exception){
+                } catch (Throwable $exception) {
                     Util::sysLogMsg(__CLASS__, $exception);
                 }
                 return null;

Braces +2 added lines, -1 removed lines

@@ -50,7 +50,8 @@
     {
         $di->setShared(
             self::SERVICE_NAME,
-            function () {
+            function ()
+            {
                 try {
                     return new License('http://127.0.0.1:8223');
                 } catch (Throwable $exception){

src/AdminCabinet/Controllers/TopMenuSearchController.php

Spacing +15 added lines, -15 removed lines

@@ -46,7 +46,7 @@ 
             // IncomingRoutingTable',
             // OutgoingRoutingTable',
         ];
-        $results    = [[]];
+        $results = [[]];
         foreach ($arrClasses as $itemClass) {
             $records = call_user_func([$itemClass, 'find']);
             $categoryItems = [];
@@ -90,7 +90,7 @@ 
             'typeLocalized' => $this->translation->_("ex_dropdownCategory_{$type}"),
             'sorter'        => $clearedRepresent,
         ];
-        $items[]          = $result;
+        $items[] = $result;
     }
 
     /**
@@ -103,7 +103,7 @@ 
         $elements = $this->elements;
 
         $items[] = [
-            'name'          => $elements->getIconByController('incoming-routes') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('incoming-routes').' '.$this->translation->_(
                     'mm_IncomingRoutes'
                 ),
             'value'         => $this->url->get('incoming-routes'),
@@ -112,7 +112,7 @@ 
             'sorter'        => strip_tags($this->translation->_('mm_IncomingRoutes')),
         ];
         $items[] = [
-            'name'          => $elements->getIconByController('outbound-routes') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('outbound-routes').' '.$this->translation->_(
                     'mm_OutboundRoutes'
                 ),
             'value'         => $this->url->get('outbound-routes'),
@@ -121,7 +121,7 @@ 
             'sorter'        => strip_tags($this->translation->_('mm_OutboundRoutes')),
         ];
         $items[] = [
-            'name'          => $elements->getIconByController('general-settings') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('general-settings').' '.$this->translation->_(
                     'mm_GeneralSettings'
                 ),
             'value'         => $this->url->get('general-settings/modify'),
@@ -130,7 +130,7 @@ 
             'sorter'        => strip_tags($this->translation->_('mm_GeneralSettings')),
         ];
         $items[] = [
-            'name'          => $elements->getIconByController('time-settings') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('time-settings').' '.$this->translation->_(
                     'mm_SystemClock'
                 ),
             'value'         => $this->url->get('time-settings/modify'),
@@ -139,14 +139,14 @@ 
             'sorter'        => strip_tags($this->translation->_('mm_SystemClock')),
         ];
         $items[] = [
-            'name'          => $elements->getIconByController('network') . ' ' . $this->translation->_('mm_Network'),
+            'name'          => $elements->getIconByController('network').' '.$this->translation->_('mm_Network'),
             'value'         => $this->url->get('network/modify/'),
             'type'          => 'MENUITEMS',
             'typeLocalized' => $this->translation->_('ex_dropdownCategory_MENUITEMS'),
             'sorter'        => strip_tags($this->translation->_('mm_Network')),
         ];
         $items[] = [
-            'name'          => $elements->getIconByController('mail-settings') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('mail-settings').' '.$this->translation->_(
                     'mm_MailSettings'
                 ),
             'value'         => $this->url->get('mail-settings/modify'),
@@ -155,7 +155,7 @@ 
             'sorter'        => strip_tags($this->translation->_('mm_MailSettings')),
         ];
         $items[] = [
-            'name'          => $elements->getIconByController('call-detail-records') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('call-detail-records').' '.$this->translation->_(
                     'mm_CallDetailRecords'
                 ),
             'value'         => $this->url->get('call-detail-records'),
@@ -164,7 +164,7 @@ 
             'sorter'        => strip_tags($this->translation->_('mm_CallDetailRecords')),
         ];
         $items[] = [
-            'name'          => $elements->getIconByController('sound-files') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('sound-files').' '.$this->translation->_(
                     'mm_SoundFiles'
                 ),
             'value'         => $this->url->get('sound-files'),
@@ -174,7 +174,7 @@ 
         ];
 
         $items[] = [
-            'name'          => $elements->getIconByController('licensing') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('licensing').' '.$this->translation->_(
                     'mm_Licensing'
                 ),
             'value'         => $this->url->get('licensing/modify/'),
@@ -184,7 +184,7 @@ 
         ];
 
         $items[] = [
-            'name'          => $elements->getIconByController('pbx-extension-modules') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('pbx-extension-modules').' '.$this->translation->_(
                     'BreadcrumbPbxExtensionModules'
                 ),
             'value'         => $this->url->get('pbx-extension-modules'),
@@ -194,7 +194,7 @@ 
         ];
 
         $items[] = [
-            'name'          => $elements->getIconByController('system-diagnostic') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('system-diagnostic').' '.$this->translation->_(
                     'mm_SystemDiagnostic'
                 ),
             'value'         => $this->url->get('system-diagnostic'),
@@ -204,7 +204,7 @@ 
         ];
 
         $items[] = [
-            'name'          => $elements->getIconByController('fail2-ban') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('fail2-ban').' '.$this->translation->_(
                     'mm_BruteForceProtection'
                 ),
             'value'         => $this->url->get('fail2-ban'),
@@ -213,7 +213,7 @@ 
             'sorter'        => strip_tags($this->translation->_('mm_BruteForceProtection')),
         ];
         $items[] = [
-            'name'          => $elements->getIconByController('update') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('update').' '.$this->translation->_(
                     'mm_UpdateSystem'
                 ),
             'value'         => $this->url->get('update'),

src/AdminCabinet/Controllers/SystemDiagnosticController.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
     public function indexAction(): void
     {
-        $this->view->form     = new SystemDiagnosticForm();
+        $this->view->form = new SystemDiagnosticForm();
     }
 
 

sites/pbxcore/index.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
 $di = new FactoryDefault();
 
 // Auto-loader configuration
-require_once __DIR__ . '/../../src/Common/Config/ClassLoader.php';
+require_once __DIR__.'/../../src/Common/Config/ClassLoader.php';
 
 // Attach Sentry error logger
 $errorLogger = new SentryErrorLogger('pbx-core-rest');
@@ -34,7 +34,7 @@ 
 } catch (Throwable $e) {
     $errorLogger->captureException($e);
     echo $e->getMessage();
-    Util::sysLogMsg('pbx_core_api', $e->getMessage() );
+    Util::sysLogMsg('pbx_core_api', $e->getMessage());
 }
 
 

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) {