mikopbx / Core

src/Core/Asterisk/Configs/FeaturesConf.php

Spacing +11 added lines, -11 removed lines

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

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

Spacing +41 added lines, -41 removed lines

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

src/Core/Workers/WorkerModelsEvents.php

Spacing +9 added lines, -9 removed lines

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