mikopbx / Core

src/Core/System/PBX.php

Spacing +9 added lines, -9 removed lines

@@ -90,7 +90,7 @@ 
             return;
         }
         $max_size    = 2;
-        $log_dir     = System::getLogDir() . '/asterisk/';
+        $log_dir     = System::getLogDir().'/asterisk/';
         $text_config = "{$log_dir}{$f_name} {
     nocreate
     nocopytruncate
@@ -105,8 +105,8 @@ 
         {$asteriskPath} -rx 'logger reload' > /dev/null 2> /dev/null
     endscript
 }";
-        $varEtcDir  = $di->getShared('config')->path('core.varEtcDir');
-        $path_conf   = $varEtcDir . '/asterisk_logrotate_' . $f_name . '.conf';
+        $varEtcDir = $di->getShared('config')->path('core.varEtcDir');
+        $path_conf = $varEtcDir.'/asterisk_logrotate_'.$f_name.'.conf';
         file_put_contents($path_conf, $text_config);
         $mb10 = $max_size * 1024 * 1024;
 
@@ -202,7 +202,7 @@ 
 
     public static function checkCodec($name, $desc, $type): void
     {
-        $codec = Codecs::findFirst('name="' . $name . '"');
+        $codec = Codecs::findFirst('name="'.$name.'"');
         if ($codec === null) {
             /** @var \MikoPBX\Common\Models\Codecs $codec_g722 */
             $codec              = new Codecs();
@@ -218,7 +218,7 @@ 
      */
     public static function sipReload():void
     {
-        $di     = Di::getDefault();
+        $di = Di::getDefault();
         if ($di === null) {
             return;
         }
@@ -234,7 +234,7 @@ 
             Util::mwExec("{$asteriskPath} -rx 'module reload acl'");
             Util::mwExec("{$asteriskPath} -rx 'core reload'");
         } else {
-            Util::sysLogMsg('SIP RELOAD', 'Need reload asterisk',LOG_INFO, LOG_INFO);
+            Util::sysLogMsg('SIP RELOAD', 'Need reload asterisk', LOG_INFO, LOG_INFO);
             // Завершаем каналы.
             Util::mwExec("{$asteriskPath} -rx 'channel request hangup all'");
             usleep(500000);
@@ -247,7 +247,7 @@ 
      */
     public static function iaxReload(): void
     {
-        $iax    = new IAXConf();
+        $iax = new IAXConf();
         $iax->generateConfig();
         $asteriskPath = Util::which('asterisk');
         Util::mwExec("{$asteriskPath} -rx 'iax2 reload'");
@@ -304,7 +304,7 @@ 
             'result' => 'ERROR',
         ];
 
-        if ( ! $this->di->getShared('registry')->booting) {
+        if (!$this->di->getShared('registry')->booting) {
             $this->stop();
         }
         /**
@@ -320,7 +320,7 @@ 
         // Создание базы данных истории звонков.
         /** @var \Phalcon\Db\Adapter\Pdo\Sqlite $connection */
         $connection = $this->di->get('dbCDR');
-        if ( ! $connection->tableExists('cdr')) {
+        if (!$connection->tableExists('cdr')) {
             RegisterDIServices::recreateDBConnections();
         } else {
             CdrDb::checkDb();

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();
         }
         // Генерация внутреннего номерного плана.