mikopbx / Core

src/Core/Workers/WorkerBase.php

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
             file_put_contents($this->getPidFile(), $activeProcesses);
         } else {
             $pidFilesDir = dirname($this->getPidFile());
-            $pidFile     = $pidFilesDir . '/' . pathinfo($this->getPidFile(), PATHINFO_BASENAME);
+            $pidFile     = $pidFilesDir.'/'.pathinfo($this->getPidFile(), PATHINFO_BASENAME);
             // Delete old PID files
             $rm = Util::which('rm');
             Processes::mwExec("{$rm} -rf {$pidFile}*");
@@ -85,7 +85,7 @@ 
      */
     public function pingCallBack(BeanstalkClient $message): void
     {
-        $message->reply(json_encode($message->getBody() . ':pong'));
+        $message->reply(json_encode($message->getBody().':pong'));
     }
 
     /**

src/Core/System/Processes.php

Spacing +6 added lines, -6 removed lines

@@ -27,7 +27,7 @@ 
     {
         $killallPath = Util::which('killall');
 
-        return self::mwExec($killallPath . ' ' . escapeshellarg($procName));
+        return self::mwExec($killallPath.' '.escapeshellarg($procName));
     }
 
     /**
@@ -135,7 +135,7 @@ 
         }
         $currentProcCount = count($processes);
 
-        if ( ! class_exists($className)) {
+        if (!class_exists($className)) {
             return;
         }
         $workerObject    = new $className();
@@ -177,7 +177,7 @@ 
                     $countProc4Kill = $neededProcCount - $currentProcCount;
                     // Send SIGUSR1 command to them
                     while ($countProc4Kill >= 0) {
-                        if ( ! isset($processes[$countProc4Kill])) {
+                        if (!isset($processes[$countProc4Kill])) {
                             break;
                         }
                         // Kill old processes with timeout, maybe it is soft restart and worker die without any help
@@ -207,8 +207,8 @@ 
 
         $name       = addslashes($name);
         $filter_cmd = '';
-        if ( ! empty($exclude)) {
-            $filter_cmd = "| $path_grep -v " . escapeshellarg($exclude);
+        if (!empty($exclude)) {
+            $filter_cmd = "| $path_grep -v ".escapeshellarg($exclude);
         }
         $out = [];
         self::mwExec(
@@ -233,7 +233,7 @@ 
         $rmPath    = Util::which('rm');
         $sleepPath = Util::which('sleep');
         if ($sleep_time > 0) {
-            $filename = '/tmp/' . time() . '_noop.sh';
+            $filename = '/tmp/'.time().'_noop.sh';
             file_put_contents($filename, "{$sleepPath} {$sleep_time}; {$command}; {$rmPath} -rf {$filename}");
             $noop_command = "{$nohupPath} {$shPath} {$filename} > {$out_file} 2>&1 &";
         } else {

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("CHANNEL(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("CHANNEL(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("CHANNEL(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("CHANNEL(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\"";
     Processes::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/Asterisk/Configs/SIPConf.php

Spacing +62 added lines, -62 removed lines

@@ -55,15 +55,15 @@ 
         $conf .= $this->generateProvidersPj();
         $conf .= $this->generatePeersPj();
 
-        Util::fileWriteContent($this->config->path('asterisk.astetcdir') . '/pjsip.conf', $conf);
+        Util::fileWriteContent($this->config->path('asterisk.astetcdir').'/pjsip.conf', $conf);
         $pjConf = '[log_mappings]'."\n".
             'type=log_mappings'."\n".
             'asterisk_error = 0'."\n".
             'asterisk_warning = 2'."\n".
             'asterisk_debug = 1,3,4,5,6'."\n\n";
 
-        file_put_contents($this->config->path('asterisk.astetcdir') . '/pjproject.conf', $pjConf);
-        file_put_contents($this->config->path('asterisk.astetcdir') . '/sorcery.conf', '');
+        file_put_contents($this->config->path('asterisk.astetcdir').'/pjproject.conf', $pjConf);
+        file_put_contents($this->config->path('asterisk.astetcdir').'/sorcery.conf', '');
 
         $db = new AstDB();
         foreach ($this->data_peers as $peer) {
@@ -84,13 +84,13 @@ 
      */
     private function generateGeneralPj(): string
     {
-        $lang    = $this->generalSettings['PBXLanguage'];
+        $lang = $this->generalSettings['PBXLanguage'];
         [$topology, $extipaddr, $exthostname, $subnets] = $this->getTopologyData();
 
         $codecs = $this->getCodecs();
         $codecConf = '';
-        foreach ($codecs as $codec){
-            $codecConf.= "allow = {$codec}\n";
+        foreach ($codecs as $codec) {
+            $codecConf .= "allow = {$codec}\n";
         }
 
         $pbxVersion = PbxSettings::getValueByKey('PBXVersion');
@@ -99,50 +99,50 @@ 
             foreach ($subnets as $net) {
                 $natConf .= "local_net={$net}\n";
             }
-            if ( ! empty($exthostname)) {
+            if (!empty($exthostname)) {
                 $parts = explode(':', $exthostname);
-                $natConf  .= 'external_media_address=' . $parts[0] . "\n";
-                $natConf  .= 'external_signaling_address=' . $parts[0] . "\n";
-                $natConf  .= 'external_signaling_port=' . ($parts[1] ?? '5060');
-            } elseif ( ! empty($extipaddr)) {
+                $natConf  .= 'external_media_address='.$parts[0]."\n";
+                $natConf  .= 'external_signaling_address='.$parts[0]."\n";
+                $natConf  .= 'external_signaling_port='.($parts[1] ?? '5060');
+            } elseif (!empty($extipaddr)) {
                 $parts = explode(':', $extipaddr);
-                $natConf  .= 'external_media_address=' . $parts[0] . "\n";
-                $natConf  .= 'external_signaling_address=' . $parts[0] . "\n";
-                $natConf  .= 'external_signaling_port=' . ($parts[1] ?? '5060');
+                $natConf  .= 'external_media_address='.$parts[0]."\n";
+                $natConf  .= 'external_signaling_address='.$parts[0]."\n";
+                $natConf  .= 'external_signaling_port='.($parts[1] ?? '5060');
             }
         }
 
-        $conf = "[general] \n" .
-            "disable_multi_domain=on\n" .
-            "transport = udp \n\n" .
+        $conf = "[general] \n".
+            "disable_multi_domain=on\n".
+            "transport = udp \n\n".
 
-            "[global] \n" .
-            "type = global\n" .
-            "endpoint_identifier_order=username,ip,anonymous\n" .
-            "user_agent = mikopbx-{$pbxVersion}\n\n" .
+            "[global] \n".
+            "type = global\n".
+            "endpoint_identifier_order=username,ip,anonymous\n".
+            "user_agent = mikopbx-{$pbxVersion}\n\n".
 
-            "[anonymous]\n" .
-            "type = endpoint\n" .
+            "[anonymous]\n".
+            "type = endpoint\n".
             $codecConf.
             "language={$lang}\n".
-            "timers = no\n" .
+            "timers = no\n".
             "context = public-direct-dial\n\n".
 
-            "[transport-udp]\n" .
-            "type = transport\n" .
-            "protocol = udp\n" .
+            "[transport-udp]\n".
+            "type = transport\n".
+            "protocol = udp\n".
             "bind=0.0.0.0:{$this->generalSettings['SIPPort']}\n".
             "{$natConf}\n\n".
 
-            "[transport-tcp]\n" .
-            "type = transport\n" .
-            "protocol = tcp\n" .
+            "[transport-tcp]\n".
+            "type = transport\n".
+            "protocol = tcp\n".
             "bind=0.0.0.0:{$this->generalSettings['SIPPort']}\n".
             "{$natConf}\n\n".
             '';
 
         $varEtcDir = $this->config->path('core.varEtcDir');
-        file_put_contents($varEtcDir . '/topology_hash', md5($topology . $exthostname . $extipaddr. $this->generalSettings['SIPPort']));
+        file_put_contents($varEtcDir.'/topology_hash', md5($topology.$exthostname.$extipaddr.$this->generalSettings['SIPPort']));
         $conf .= "\n";
 
         return $conf;
@@ -154,19 +154,19 @@ 
      * @return bool
      */
     public function needAsteriskRestart():bool{
-        $di     = Di::getDefault();
+        $di = Di::getDefault();
         if ($di === null) {
             return false;
         }
-        $mikoPBXConfig  = new MikoPBXConfig();
+        $mikoPBXConfig = new MikoPBXConfig();
         [$topology, $extipaddr, $exthostname] = $this->getTopologyData();
 
         $generalSettings = $mikoPBXConfig->getGeneralSettings();
-        $now_hadh = md5($topology . $exthostname . $extipaddr. $generalSettings['SIPPort']);
-        $old_hash   = '';
+        $now_hadh = md5($topology.$exthostname.$extipaddr.$generalSettings['SIPPort']);
+        $old_hash = '';
         $varEtcDir = $di->getShared('config')->path('core.varEtcDir');
-        if (file_exists($varEtcDir . '/topology_hash')) {
-            $old_hash = file_get_contents($varEtcDir . '/topology_hash');
+        if (file_exists($varEtcDir.'/topology_hash')) {
+            $old_hash = file_get_contents($varEtcDir.'/topology_hash');
         }
 
         return $old_hash !== $now_hadh;
@@ -190,11 +190,11 @@ 
             }
             try {
                 $sub = new SubnetCalculator($lan_config['ipaddr'], $lan_config['subnet']);
-            }catch (\Throwable $e){
+            } catch (\Throwable $e) {
                 Util::sysLogMsg(self::class, $e->getMessage());
                 continue;
             }
-            $net = $sub->getNetworkPortion() . '/' . $lan_config['subnet'];
+            $net = $sub->getNetworkPortion().'/'.$lan_config['subnet'];
             if ($if_data['topology'] === 'private' && in_array($net, $subnets, true) === false) {
                 $subnets[] = $net;
             }
@@ -232,7 +232,7 @@ 
         $conf        = '';
         $reg_strings = '';
         $prov_config = '';
-        if ($this->data_providers===null){
+        if ($this->data_providers === null) {
             $this->getSettings();
         }
         $additionalModules = $this->di->getShared('pbxConfModules');
@@ -263,10 +263,10 @@ 
      */
     private function generateProviderRegistrationAuth(array $provider, array $additionalModules, array $manual_attributes): string{
         $conf = '';
-        if($provider['noregister'] === '1'){
+        if ($provider['noregister'] === '1') {
             return $conf;
         }
-        $options     = [
+        $options = [
             'type'     => 'registration-auth',
             'username' => $provider['username'],
             'password' => $provider['secret'],
@@ -289,10 +289,10 @@ 
      */
     private function generateProviderRegistration(array $provider, array $additionalModules, array $manual_attributes): string{
         $conf = '';
-        if($provider['noregister'] === '1'){
+        if ($provider['noregister'] === '1') {
             return $conf;
         }
-        $options     = [
+        $options = [
             'type'                        => 'registration',
             'outbound_auth'               => "REG-AUTH-{$provider['uniqid']}",
             'contact_user'                => $provider['username'],
@@ -324,7 +324,7 @@ 
         if ('1' === $provider['receive_calls_without_auth']) {
             return $conf;
         }
-        $options     = [
+        $options = [
             'type'     => 'endpoint-auth',
             'username' => $provider['username'],
             'password' => $provider['secret'],
@@ -348,7 +348,7 @@ 
     private function generateProviderAor(array $provider, array $additionalModules, array $manual_attributes): string{
         $conf = '';
         $defaultuser = (trim($provider['defaultuser']) === '') ? $provider['username'] : $provider['defaultuser'];
-        if ( ! empty($defaultuser) && '1' !== $provider['receive_calls_without_auth']) {
+        if (!empty($defaultuser) && '1' !== $provider['receive_calls_without_auth']) {
             $contact = "sip:$defaultuser@{$provider['host']}:{$provider['port']}";
         } else {
             $contact = "sip:{$provider['host']}:{$provider['port']}";
@@ -361,7 +361,7 @@ 
             'minimum_expiration' => $this->generalSettings['SIPMinExpiry'],
             'default_expiration' => $this->generalSettings['SIPDefaultExpiry'],
         ];
-        if($provider['qualify'] === '1'){
+        if ($provider['qualify'] === '1') {
             $options['qualify_frequency'] = $provider['qualifyfreq'];
             $options['qualify_timeout']   = '3.0';
         }
@@ -436,7 +436,7 @@ 
      */
     private function generateProviderIdentify(array $provider, array $additionalModules, array $manual_attributes): string{
         $conf = '';
-        $options     = [
+        $options = [
             'type'     => 'identify',
             'endpoint' => $provider['uniqid'],
             'match'    => $provider['host'],
@@ -468,8 +468,8 @@ 
             'pl-pl' => 'pl',
             'pt-br' => 'pt',
         ];
-        $toneZone = $settings[$lang]??'';
-        if(!empty($toneZone)){
+        $toneZone = $settings[$lang] ?? '';
+        if (!empty($toneZone)) {
             $options['inband_progress'] = 'yes';
             $options['tone_zone'] = $toneZone;
         }
@@ -483,7 +483,7 @@ 
      */
     public function generatePeersPj(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         $lang              = $this->generalSettings['PBXLanguage'];
@@ -578,7 +578,7 @@ 
         $language = (trim($language) === '') ? 'en-en' : $language;
 
         $calleridname = (trim($peer['calleridname']) === '') ? $peer['extension'] : $peer['calleridname'];
-        $busylevel = (trim($peer['busylevel']) === '') ? '1' : '' . $peer['busylevel'];
+        $busylevel = (trim($peer['busylevel']) === '') ? '1' : ''.$peer['busylevel'];
 
         $dtmfmode = ($peer['dtmfmode'] === 'rfc2833') ? 'rfc4733' : $peer['dtmfmode'];
         $options = [
@@ -704,7 +704,7 @@ 
             'conditions'=>'disabled="0"',
             'order' => 'type, priority',
         ];
-        $codecs     = Codecs::find($filter);
+        $codecs = Codecs::find($filter);
         foreach ($codecs as $codec_data) {
             $arr_codecs[] = $codec_data->name;
         }
@@ -734,8 +734,8 @@ 
             // Получим используемые кодеки.
             $arr_data['codecs'] = $this->getCodecs();
 
-            $context_id = preg_replace("/[^a-z\d]/iu", '', $sip_peer->host . $sip_peer->port);
-            if ( ! isset($this->contexts_data[$context_id])) {
+            $context_id = preg_replace("/[^a-z\d]/iu", '', $sip_peer->host.$sip_peer->port);
+            if (!isset($this->contexts_data[$context_id])) {
                 $this->contexts_data[$context_id] = [];
             }
             $this->contexts_data[$context_id][$sip_peer->uniqid] = $sip_peer->username;
@@ -754,7 +754,7 @@ 
      */
     private function getOutRoutes(): array
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         /** @var OutgoingRoutingTable $rout */
@@ -789,7 +789,7 @@ 
      */
     public function extensionGenContexts(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         // Генерация внутреннего номерного плана.
@@ -807,8 +807,8 @@ 
             $contexts_data = $this->contexts_data[$provider['context_id']];
             if (count($contexts_data) === 1) {
                 $conf .= ExtensionsConf::generateIncomingContextPeers($provider['uniqid'], $provider['username'], '');
-            } elseif ( ! in_array($provider['context_id'], $contexts, true)) {
-                $conf       .= ExtensionsConf::generateIncomingContextPeers(
+            } elseif (!in_array($provider['context_id'], $contexts, true)) {
+                $conf .= ExtensionsConf::generateIncomingContextPeers(
                     $contexts_data,
                     null,
                     $provider['context_id']
@@ -827,7 +827,7 @@ 
      */
     public function extensionGenHints(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         $conf = '';
@@ -840,7 +840,7 @@ 
 
     public function extensionGenInternal(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         // Генерация внутреннего номерного плана.
@@ -855,7 +855,7 @@ 
 
     public function extensionGenInternalTransfer(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         // Генерация внутреннего номерного плана.

Braces +1 added lines, -1 removed lines

@@ -190,7 +190,7 @@
             }
             try {
                 $sub = new SubnetCalculator($lan_config['ipaddr'], $lan_config['subnet']);
-            }catch (\Throwable $e){
+            } catch (\Throwable $e){
                 Util::sysLogMsg(self::class, $e->getMessage());
                 continue;
             }

src/Core/System/Upgrade/UpdateSystemConfig.php

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
         if ($previous_version !== $current_version) {
             $upgradeClasses      = [];
             $upgradeClassesDir   = appPath('src/Core/System/Upgrade/Releases');
-            $upgradeClassesFiles = glob($upgradeClassesDir . '/*.php', GLOB_NOSORT);
+            $upgradeClassesFiles = glob($upgradeClassesDir.'/*.php', GLOB_NOSORT);
             foreach ($upgradeClassesFiles as $file) {
                 $className        = pathinfo($file)['filename'];
                 $moduleModelClass = "\\MikoPBX\\Core\\System\\Upgrade\\Releases\\{$className}";
@@ -57,7 +57,7 @@ 
                 if (version_compare($previous_version, $releaseNumber, '<')) {
                     $processor = new $upgradeClass();
                     $processor->processUpdate();
-                    Util::echoWithSyslog(' - UpdateConfigs: Upgrade system up to ' . $releaseNumber . ' ');
+                    Util::echoWithSyslog(' - UpdateConfigs: Upgrade system up to '.$releaseNumber.' ');
                     Util::echoGreenDone();
                 }
             }
@@ -78,7 +78,7 @@ 
         $modules = PbxExtensionModules::find();
         $modulesDir = $this->getDI()->getShared('config')->path('core.modulesDir');
         foreach ($modules as $module) {
-            if ( ! is_dir("{$modulesDir}/{$module->uniqid}")) {
+            if (!is_dir("{$modulesDir}/{$module->uniqid}")) {
                 $module->delete();
             }
         }

src/Common/Models/PbxSettings.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
         $cacheKey        = explode('\\', static::class)[3];
         $parameters      = [
             'cache' => [
-                'key'      => $cacheKey . '-getAllPbxSettings',
+                'key'      => $cacheKey.'-getAllPbxSettings',
                 'lifetime' => 300,
             ],
         ];
@@ -68,7 +68,7 @@ 
     {
         return [
             'Name'                            => 'PBX system',
-            'VirtualHardwareType'             => 'REAL',//VMWARE,HYPERV,AWS,AZURE
+            'VirtualHardwareType'             => 'REAL', //VMWARE,HYPERV,AWS,AZURE
             'Description'                     => '',
             'RestartEveryNight'               => '0',
             'SIPPort'                         => '5060',
@@ -110,11 +110,11 @@ 
             'MailTplVoicemailSubject'         => 'VoiceMail from PBX',
             'MailTplVoicemailBody'            => 'See attach',
             'MailTplVoicemailFooter'          => '',
-            'NTPServer'                       => '0.pool.ntp.org' . PHP_EOL . '1.pool.ntp.org' . PHP_EOL,
+            'NTPServer'                       => '0.pool.ntp.org'.PHP_EOL.'1.pool.ntp.org'.PHP_EOL,
             'VoicemailNotificationsEmail'     => 'admin@mycompany.com',
             'VoicemailExten'                  => '*001',
             'PBXLanguage'                     => 'en-en',
-            'PBXInternalExtensionLength'      => '3',// Длина внутреннего номера
+            'PBXInternalExtensionLength'      => '3', // Длина внутреннего номера
             'PBXRecordCalls'                  => '1',
             'PBXSplitAudioThread'             => '0',
             'PBXCallParkingExt'               => '800',
@@ -151,7 +151,7 @@ 
         $cacheKey        = explode('\\', static::class)[3];
         $parameters      = [
             'cache' => [
-                'key'      => $cacheKey . '-getValueByKey',
+                'key'      => $cacheKey.'-getValueByKey',
                 'lifetime' => 300,
             ],
         ];