mikopbx / Core

src/Core/Asterisk/Configs/SIPConf.php

Spacing +57 added lines, -57 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;
@@ -189,7 +189,7 @@ 
                 continue;
             }
             $sub = new SubnetCalculator($lan_config['ipaddr'], $lan_config['subnet']);
-            $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;
             }
@@ -227,7 +227,7 @@ 
         $conf        = '';
         $reg_strings = '';
         $prov_config = '';
-        if ($this->data_providers===null){
+        if ($this->data_providers === null) {
             $this->getSettings();
         }
         foreach ($this->data_providers as $provider) {
@@ -236,7 +236,7 @@ 
 
             $need_register = $provider['noregister'] !== '1';
             if ($need_register) {
-                $options     = [
+                $options = [
                     'type'     => 'auth',
                     'username' => $provider['username'],
                     'password' => $provider['secret'],
@@ -244,7 +244,7 @@ 
                 $reg_strings .= "[REG-AUTH-{$provider['uniqid']}]\n";
                 $reg_strings .= Util::overrideConfigurationArray($options, $manual_attributes, 'registration-auth');
 
-                $options     = [
+                $options = [
                     'type'                        => 'registration',
                     // 'transport'                   => 'transport-udp',
                     'outbound_auth'               => "REG-AUTH-{$provider['uniqid']}",
@@ -262,7 +262,7 @@ 
             }
 
             if ('1' !== $provider['receive_calls_without_auth']) {
-                $options     = [
+                $options = [
                     'type'     => 'auth',
                     'username' => $provider['username'],
                     'password' => $provider['secret'],
@@ -272,7 +272,7 @@ 
             }
 
             $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']}:{$port}";
             } else {
                 $contact = "sip:{$provider['host']}:{$port}";
@@ -286,7 +286,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';
             }
@@ -294,7 +294,7 @@ 
             $prov_config .= "[{$provider['uniqid']}]\n";
             $prov_config .= Util::overrideConfigurationArray($options, $manual_attributes, 'aor');
 
-            $options     = [
+            $options = [
                 'type'     => 'identify',
                 'endpoint' => $provider['uniqid'],
                 'match'    => $provider['host'],
@@ -355,7 +355,7 @@ 
      */
     public function generatePeersPj(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         $lang              = $this->generalSettings['PBXLanguage'];
@@ -369,7 +369,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'];
 
             $options = [
                 'type'     => 'auth',
@@ -521,7 +521,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;
         }
@@ -551,8 +551,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;
@@ -571,7 +571,7 @@ 
      */
     private function getOutRoutes(): array
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         /** @var \MikoPBX\Common\Models\OutgoingRoutingTable $rout */
@@ -606,7 +606,7 @@ 
      */
     public function extensionGenContexts(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         // Генерация внутреннего номерного плана.
@@ -624,8 +624,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']
@@ -644,7 +644,7 @@ 
      */
     public function extensionGenHints(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         $conf = '';
@@ -657,7 +657,7 @@ 
 
     public function extensionGenInternal(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         // Генерация внутреннего номерного плана.
@@ -672,7 +672,7 @@ 
 
     public function extensionGenInternalTransfer(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         // Генерация внутреннего номерного плана.

src/Core/Workers/WorkerCdr.php

Spacing +16 added lines, -16 removed lines

@@ -23,7 +23,7 @@ 
 
     public const SELECT_CDR_TUBE = 'select_cdr_tube';
     public const UPDATE_CDR_TUBE = 'update_cdr_tube';
-    protected int $maxProc=1;
+    protected int $maxProc = 1;
 
 
     private BeanstalkClient $client_queue;
@@ -93,12 +93,12 @@ 
         $result = json_decode($result_data, true);
         if (file_exists($result)) {
             $file_data = json_decode(file_get_contents($result), true);
-            if(!is_dir($result)){
+            if (!is_dir($result)) {
                 Util::mwExec("rm -rf {$result}");
             }
             $result = $file_data;
         }
-        if ( ! is_array($result) && ! is_object($result)) {
+        if (!is_array($result) && !is_object($result)) {
             return;
         }
         if (count($result) < 1) {
@@ -115,7 +115,7 @@ 
             if (trim($row['recordingfile']) !== '') {
                 // Если каналов не существует с ID, то можно удалить временные файлы.
                 $p_info = pathinfo($row['recordingfile']);
-                $fname  = $p_info['dirname'] . '/' . $p_info['filename'] . '.wav';
+                $fname  = $p_info['dirname'].'/'.$p_info['filename'].'.wav';
                 if (file_exists($fname) && !is_dir($fname)) {
                     Util::mwExec("rm -rf {$fname}");
                 }
@@ -139,19 +139,19 @@ 
                 $row['answer'] = '';
                 $billsec       = 0;
 
-                if ( ! empty($row['recordingfile'])) {
+                if (!empty($row['recordingfile'])) {
                     $p_info    = pathinfo($row['recordingfile']);
                     $file_list = [
-                        $p_info['dirname'] . '/' . $p_info['filename'] . '.mp3',
-                        $p_info['dirname'] . '/' . $p_info['filename'] . '.wav',
-                        $p_info['dirname'] . '/' . $p_info['filename'] . '_in.wav',
-                        $p_info['dirname'] . '/' . $p_info['filename'] . '_out.wav',
+                        $p_info['dirname'].'/'.$p_info['filename'].'.mp3',
+                        $p_info['dirname'].'/'.$p_info['filename'].'.wav',
+                        $p_info['dirname'].'/'.$p_info['filename'].'_in.wav',
+                        $p_info['dirname'].'/'.$p_info['filename'].'_out.wav',
                     ];
                     foreach ($file_list as $file) {
-                        if ( ! file_exists($file)) {
+                        if (!file_exists($file)) {
                             continue;
                         }
-                        if(!is_dir($file)){
+                        if (!is_dir($file)) {
                             Util::mwExec("rm -rf {$file}");
                         }
                     }
@@ -162,9 +162,9 @@ 
                 if (file_exists($row['recordingfile']) && !is_dir($row['recordingfile'])) {
                     Util::mwExec("rm -rf {$row['recordingfile']}");
                 }
-            } elseif (  ! empty($row['recordingfile']) &&
-                        ! file_exists(Util::trimExtensionForFile($row['recordingfile']) . 'wav') &&
-                        ! file_exists( $row['recordingfile']) ) {
+            } elseif (!empty($row['recordingfile']) &&
+                        !file_exists(Util::trimExtensionForFile($row['recordingfile']).'wav') &&
+                        !file_exists($row['recordingfile'])) {
                 /** @var CallDetailRecordsTmp $rec_data */
                 $rec_data = CallDetailRecordsTmp::findFirst(
                     "linkedid='{$row['linkedid']}' AND dst_chan='{$row['dst_chan']}'"
@@ -213,7 +213,7 @@ 
      */
     private function getActiveIdChannels(): array
     {
-        $am           = Util::getAstManager('off');
+        $am = Util::getAstManager('off');
         return $am->GetChannels(true);
     }
 
@@ -228,7 +228,7 @@ 
             $this->no_answered_calls[$row['linkedid']]['NOANSWER'] = false;
             return;
         }
-        if ( ! array_key_exists($row['dst_num'], $this->internal_numbers)) {
+        if (!array_key_exists($row['dst_num'], $this->internal_numbers)) {
             // dst_num - не является номером сотрудника. Это исходящий.
             return;
         }

src/Core/System/BeanstalkClient.php

Spacing +15 added lines, -15 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function __construct($tube = 'default', $port = '')
     {
-        $this->tube        = str_replace("\\", '-', $tube);;
+        $this->tube        = str_replace("\\", '-', $tube); ;
         $this->job_options = ['priority' => 250, 'delay' => 0, 'ttr' => 3600];
         $this->port = $port;
         $this->reconnect();
@@ -49,7 +49,7 @@ 
     {
         $config = $this->di->get('config')->beanstalk;
         $port   = $config->port;
-        if(!empty($this->port) && is_numeric($this->port)){
+        if (!empty($this->port) && is_numeric($this->port)) {
             $port = $this->port;
         }
 
@@ -126,7 +126,7 @@ 
     {
         $tube = str_replace("\\", '-', $tube);
         // Change tube
-        if ( ! empty($tube) && $this->tube !== $tube) {
+        if (!empty($tube) && $this->tube !== $tube) {
             $this->queue->useTube($tube);
         }
         $job_data = serialize($job_data);
@@ -178,9 +178,9 @@ 
         }
 
         // Processing job over callable function attached in $this->subscribe
-        if(json_decode($job->getData(), true) !==null){
-            $mData =  $job->getData();
-        }else{
+        if (json_decode($job->getData(), true) !== null) {
+            $mData = $job->getData();
+        } else {
             $mData = unserialize($job->getData(), [false]);
         }
         $this->message = $mData;
@@ -197,8 +197,8 @@ 
 
         try {
             $this->queue->delete($job);
-        }catch (\Pheanstalk\Exception\JobNotFoundException $e){
-        }catch (\Error $e){
+        } catch (\Pheanstalk\Exception\JobNotFoundException $e) {
+        } catch (\Error $e) {
         }
     }
 
@@ -263,28 +263,28 @@ 
     /**
      * Drops orphaned tasks
      */
-    public function cleanTube(){
+    public function cleanTube() {
         $tubes = $this->queue->listTubes();
-        foreach ($tubes as $tube){
-            if(strpos($tube, "INBOX_") !== 0){
+        foreach ($tubes as $tube) {
+            if (strpos($tube, "INBOX_") !== 0) {
                 continue;
             }
             try {
                 $statData = $this->queue->statsTube($tube)->getArrayCopy();
                 $watching = $statData['current-watching'];
-                if($watching !== '0'){
+                if ($watching !== '0') {
                     continue;
                 }
                 // Нужно удалить все Jobs.
                 $this->queue->watch($tube);
-                while (true){
+                while (true) {
                     $job = $this->queue->reserveWithTimeout(1);
-                    if($job === null){
+                    if ($job === null) {
                         break;
                     }
                     $this->queue->delete($job);
                 }
-            }catch (\Exception $e){
+            } catch (\Exception $e) {
                 continue;
             }
 

Braces +7 added lines, -7 removed lines

@@ -83,8 +83,7 @@ 
         $job_data,
         int $timeout = 10,
         int $priority = PheanstalkInterface::DEFAULT_PRIORITY
-    )
-    {
+    ) {
         $this->message = false;
         $inbox_tube    = uniqid('INBOX_', true);
         $this->queue->watch($inbox_tube);
@@ -180,7 +179,7 @@ 
         // Processing job over callable function attached in $this->subscribe
         if(json_decode($job->getData(), true) !==null){
             $mData =  $job->getData();
-        }else{
+        } else{
             $mData = unserialize($job->getData(), [false]);
         }
         $this->message = $mData;
@@ -197,8 +196,8 @@ 
 
         try {
             $this->queue->delete($job);
-        }catch (\Pheanstalk\Exception\JobNotFoundException $e){
-        }catch (\Error $e){
+        } catch (\Pheanstalk\Exception\JobNotFoundException $e){
+        } catch (\Error $e){
         }
     }
 
@@ -263,7 +262,8 @@ 
     /**
      * Drops orphaned tasks
      */
-    public function cleanTube(){
+    public function cleanTube()
+    {
         $tubes = $this->queue->listTubes();
         foreach ($tubes as $tube){
             if(strpos($tube, "INBOX_") !== 0){
@@ -284,7 +284,7 @@ 
                     }
                     $this->queue->delete($job);
                 }
-            }catch (\Exception $e){
+            } catch (\Exception $e){
                 continue;
             }