mikopbx / Core

src/Common/Models/ModelsBase.php

Spacing +59 added lines, -59 removed lines

@@ -70,7 +70,7 @@ 
             $moduleDir = PbxExtensionUtils::getModuleDir($module['uniqid']);
 
             $moduleJson = "{$moduleDir}/module.json";
-            if ( ! file_exists($moduleJson)) {
+            if (!file_exists($moduleJson)) {
                 continue;
             }
             $jsonString            = file_get_contents($moduleJson);
@@ -81,7 +81,7 @@ 
             }
 
             $moduleModelsDir = "{$moduleDir}/Models";
-            $results         = glob($moduleModelsDir . '/*.php', GLOB_NOSORT);
+            $results         = glob($moduleModelsDir.'/*.php', GLOB_NOSORT);
             foreach ($results as $file) {
                 $className        = pathinfo($file)['filename'];
                 $moduleModelClass = "\\Modules\\{$module['uniqid']}\\Models\\{$className}";
@@ -116,16 +116,16 @@ 
                 $newErrorMessage = $this->t('ConstraintViolation');
                 $newErrorMessage .= "<ul class='list'>";
                 if ($relatedRecords === false) {
-                    throw new Model\Exception('Error on models relationship ' . $errorMessage);
+                    throw new Model\Exception('Error on models relationship '.$errorMessage);
                 }
                 if ($relatedRecords instanceof Resultset) {
                     foreach ($relatedRecords as $item) {
                         if ($item instanceof ModelsBase) {
-                            $newErrorMessage .= '<li>' . $item->getRepresent(true) . '</li>';
+                            $newErrorMessage .= '<li>'.$item->getRepresent(true).'</li>';
                         }
                     }
                 } elseif ($relatedRecords instanceof ModelsBase) {
-                    $newErrorMessage .= '<li>' . $relatedRecords->getRepresent(true) . '</li>';
+                    $newErrorMessage .= '<li>'.$relatedRecords->getRepresent(true).'</li>';
                 } else {
                     $newErrorMessage .= '<li>Unknown object</li>';
                 }
@@ -176,7 +176,7 @@ 
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementCallQueues');
                 } else {
-                    $name .= $this->t('mo_CallQueueShort4Dropdown') . ': ' . $this->name;
+                    $name .= $this->t('mo_CallQueueShort4Dropdown').': '.$this->name;
                 }
                 break;
             case ConferenceRooms::class:
@@ -184,7 +184,7 @@ 
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementConferenceRooms');
                 } else {
-                    $name .= $this->t('mo_ConferenceRoomsShort4Dropdown') . ': ' . $this->name;
+                    $name .= $this->t('mo_ConferenceRoomsShort4Dropdown').': '.$this->name;
                 }
                 break;
             case CustomFiles::class:
@@ -195,7 +195,7 @@ 
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementDialplanApplications');
                 } else {
-                    $name .= $this->t('mo_ApplicationShort4Dropdown') . ': ' . $this->name;
+                    $name .= $this->t('mo_ApplicationShort4Dropdown').': '.$this->name;
                 }
                 break;
             case ExtensionForwardingRights::class:
@@ -257,7 +257,7 @@ 
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementIax');
                 } elseif ($this->disabled === '1') {
-                    $name .= "{$this->description} ({$this->t( 'mo_Disabled' )})";
+                    $name .= "{$this->description} ({$this->t('mo_Disabled')})";
                 } else {
                     $name .= $this->description;
                 }
@@ -267,7 +267,7 @@ 
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementIvrMenu');
                 } else {
-                    $name .= $this->t('mo_IVRMenuShort4Dropdown') . ': ' . $this->name;
+                    $name .= $this->t('mo_IVRMenuShort4Dropdown').': '.$this->name;
                 }
                 break;
             case IvrMenuActions::class:
@@ -280,7 +280,7 @@ 
                 $name = '<i class="map signs icon"></i> ';
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementIncomingRoutingTable');
-                } elseif ( ! empty($this->note)) {
+                } elseif (!empty($this->note)) {
                     $name .= $this->t('repIncomingRoutingTable', ['represent' => $this->note]);
                 } else {
                     $name .= $this->t('repIncomingRoutingTableNumber', ['represent' => $this->id]);
@@ -295,8 +295,8 @@ 
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementNetworkFilters');
                 } else {
-                    $name .= $this->description . '('
-                        . $this->t('fw_PermitNetwork') . ': ' . $this->permit
+                    $name .= $this->description.'('
+                        . $this->t('fw_PermitNetwork').': '.$this->permit
                         . ')';
                 }
                 break;
@@ -304,7 +304,7 @@ 
                 $name = '<i class="random icon"></i> ';
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementOutgoingRoutingTable');
-                } elseif ( ! empty($this->rulename)) {
+                } elseif (!empty($this->rulename)) {
                     $name .= $this->t('repOutgoingRoutingTable', ['represent' => $this->rulename]);
                 } else {
                     $name .= $this->t('repOutgoingRoutingTableNumber', ['represent' => $this->id]);
@@ -314,24 +314,24 @@ 
                 $name = '<i class="time icon"></i> ';
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementOutWorkTimes');
-                } elseif ( ! empty($this->description)) {
+                } elseif (!empty($this->description)) {
                     $name .= $this->t('repOutWorkTimes', ['represent' => $this->description]);
                 } else {
                     $represent = '';
                     if (is_numeric($this->date_from)) {
-                        $represent .= date("d/m/Y", $this->date_from) . '-';
+                        $represent .= date("d/m/Y", $this->date_from).'-';
                     }
                     if (is_numeric($this->date_to)) {
-                        $represent .= date("d/m/Y", $this->date_to) . ' ';
+                        $represent .= date("d/m/Y", $this->date_to).' ';
                     }
                     if (isset($this->weekday_from)) {
-                        $represent .= $this->t(date('D', strtotime("Sunday +{$this->weekday_from} days"))) . '-';
+                        $represent .= $this->t(date('D', strtotime("Sunday +{$this->weekday_from} days"))).'-';
                     }
                     if (isset($this->weekday_to)) {
-                        $represent .= $this->t(date('D', strtotime("Sunday +{$this->weekday_to} days"))) . ' ';
+                        $represent .= $this->t(date('D', strtotime("Sunday +{$this->weekday_to} days"))).' ';
                     }
                     if (isset($this->time_from) || isset($this->time_to)) {
-                        $represent .= $this->time_from . ' - ' . $this->time_to . ' ';
+                        $represent .= $this->time_from.' - '.$this->time_to.' ';
                     }
                     $name .= $this->t('repOutWorkTimes', ['represent' => $represent]);
                 }
@@ -348,7 +348,7 @@ 
                 break;
             case PbxExtensionModules::class:
                 $name = '<i class="puzzle piece icon"></i> '
-                    . $this->t('mo_ModuleShort4Dropdown') . ': '
+                    . $this->t('mo_ModuleShort4Dropdown').': '
                     . $this->name;
                 break;
             case Sip::class:
@@ -356,14 +356,14 @@ 
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementSip');
                 } elseif ($this->disabled === '1') {
-                    $name .= "{$this->description} ({$this->t( 'mo_Disabled' )})";
+                    $name .= "{$this->description} ({$this->t('mo_Disabled')})";
                 } else {
                     $name .= $this->description;
                 }
 
                 break;
             case Users::class:
-                $name = '<i class="user outline icon"></i> ' . $this->username;
+                $name = '<i class="user outline icon"></i> '.$this->username;
                 break;
             case SoundFiles::class:
                 $name = '<i class="file audio outline icon"></i> ';
@@ -382,7 +382,7 @@ 
             $link     = $this->getWebInterfaceLink();
             $category = explode('\\', static::class)[3];
             $result   = $this->t(
-                'rep' . $category,
+                'rep'.$category,
                 [
                     'represent' => "<a href='{$link}'>{$name}</a>",
                 ]
@@ -407,7 +407,7 @@ 
 
         if (strlen($s) > $max_length) {
             $offset = ($max_length - 3) - strlen($s);
-            $s      = substr($s, 0, strrpos($s, ' ', $offset)) . '...';
+            $s      = substr($s, 0, strrpos($s, ' ', $offset)).'...';
         }
 
         return $s;
@@ -426,80 +426,80 @@ 
         $link    = '#';
         switch (static::class) {
             case AsteriskManagerUsers::class:
-                $link = $url->get('asterisk-managers/modify/' . $this->id, null, null, $baseUri);
+                $link = $url->get('asterisk-managers/modify/'.$this->id, null, null, $baseUri);
                 break;
             case CallQueueMembers::class:
-                $link = $url->get('call-queues/modify/' . $this->CallQueues->uniqid, null, null, $baseUri);
+                $link = $url->get('call-queues/modify/'.$this->CallQueues->uniqid, null, null, $baseUri);
                 break;
             case CallQueues::class:
-                $link = $url->get('call-queues/modify/' . $this->uniqid, null, null, $baseUri);
+                $link = $url->get('call-queues/modify/'.$this->uniqid, null, null, $baseUri);
                 break;
             case ConferenceRooms::class:
-                $link = $url->get('conference-rooms/modify/' . $this->uniqid, null, null, $baseUri);
+                $link = $url->get('conference-rooms/modify/'.$this->uniqid, null, null, $baseUri);
                 break;
             case CustomFiles::class:
-                $link = $url->get('custom-files/modify/' . $this->id, null, null, $baseUri);
+                $link = $url->get('custom-files/modify/'.$this->id, null, null, $baseUri);
                 break;
             case DialplanApplications::class:
-                $link = $url->get('dialplan-applications/modify/' . $this->uniqid, null, null, $baseUri);
+                $link = $url->get('dialplan-applications/modify/'.$this->uniqid, null, null, $baseUri);
                 break;
             case ExtensionForwardingRights::class:
 
                 break;
             case Extensions::class:
-                $link = $url->get('extensions/modify/' . $this->id, null, null, $baseUri);
+                $link = $url->get('extensions/modify/'.$this->id, null, null, $baseUri);
                 break;
             case ExternalPhones::class:
                 if ($this->Extensions->is_general_user_number === "1") {
-                    $parameters    = [
-                        'conditions' => 'is_general_user_number="1" AND type="' . Extensions::TYPE_EXTERNAL . '" AND userid=:userid:',
+                    $parameters = [
+                        'conditions' => 'is_general_user_number="1" AND type="'.Extensions::TYPE_EXTERNAL.'" AND userid=:userid:',
                         'bind'       => [
                             'userid' => $this->Extensions->userid,
                         ],
                     ];
                     $needExtension = Extensions::findFirst($parameters);
-                    $link          = $url->get('extensions/modify/' . $needExtension->id, null, null, $baseUri);
+                    $link          = $url->get('extensions/modify/'.$needExtension->id, null, null, $baseUri);
                 } else {
-                    $link = '#';//TODO сделать если будет раздел для допоплнинельных номеров пользователя
+                    $link = '#'; //TODO сделать если будет раздел для допоплнинельных номеров пользователя
                 }
                 break;
             case Fail2BanRules::class:
-                $link = '#';//TODO сделать если будет fail2ban
+                $link = '#'; //TODO сделать если будет fail2ban
                 break;
             case FirewallRules::class:
-                $link = $url->get('firewall/modify/' . $this->NetworkFilters->id, null, null, $baseUri);
+                $link = $url->get('firewall/modify/'.$this->NetworkFilters->id, null, null, $baseUri);
                 break;
             case Iax::class:
-                $link = $url->get('providers/modifyiax/' . $this->Providers->id, null, null, $baseUri);
+                $link = $url->get('providers/modifyiax/'.$this->Providers->id, null, null, $baseUri);
                 break;
             case IvrMenu::class:
-                $link = $url->get('ivr-menu/modify/' . $this->uniqid, null, null, $baseUri);
+                $link = $url->get('ivr-menu/modify/'.$this->uniqid, null, null, $baseUri);
                 break;
             case IvrMenuActions::class:
-                $link = $url->get('ivr-menu/modify/' . $this->IvrMenu->uniqid, null, null, $baseUri);
+                $link = $url->get('ivr-menu/modify/'.$this->IvrMenu->uniqid, null, null, $baseUri);
                 break;
             case Codecs::class:
                 break;
             case IncomingRoutingTable::class:
-                $link = $url->get('incoming-routes/modify/' . $this->id, null, null, $baseUri);
+                $link = $url->get('incoming-routes/modify/'.$this->id, null, null, $baseUri);
                 break;
             case LanInterfaces::class:
                 $link = $url->get('network/index/', null, null, $baseUri);
                 break;
             case NetworkFilters::class:
-                $link = $url->get('firewall/modify/' . $this->id, null, null, $baseUri);
+                $link = $url->get('firewall/modify/'.$this->id, null, null, $baseUri);
                 break;
             case OutgoingRoutingTable::class:
-                $link = $url->get('outbound-routes/modify/' . $this->id, null, null, $baseUri);
+                $link = $url->get('outbound-routes/modify/'.$this->id, null, null, $baseUri);
                 break;
             case OutWorkTimes::class:
-                $link = $url->get('out-off-work-time/modify/' . $this->id, null, null, $baseUri);
+                $link = $url->get('out-off-work-time/modify/'.$this->id, null, null, $baseUri);
                 break;
             case Providers::class:
                 if ($this->type === "IAX") {
-                    $link = $url->get('providers/modifyiax/' . $this->uniqid, null, null, $baseUri);
+                    $link = $url->get('providers/modifyiax/'.$this->uniqid, null, null, $baseUri);
                 } else {
-                    $link = $url->get('providers/modifysip/' . $this->uniqid, null, null, $baseUri);
+                    $link = $url->get('providers/modifysip/'.$this->uniqid, null, null, $baseUri);
                 }
                 break;
             case PbxSettings::class:
@@ -511,26 +511,26 @@ 
             case Sip::class:
                 if ($this->Extensions) { // Это внутренний номер?
                     if ($this->Extensions->is_general_user_number === "1") {
-                        $link = $url->get('extensions/modify/' . $this->Extensions->id, null, null, $baseUri);
+                        $link = $url->get('extensions/modify/'.$this->Extensions->id, null, null, $baseUri);
                     } else {
-                        $link = '#';//TODO сделать если будет раздел для допоплнинельных номеров пользователя
+                        $link = '#'; //TODO сделать если будет раздел для допоплнинельных номеров пользователя
                     }
                 } elseif ($this->Providers) { // Это провайдер
-                    $link = $url->get('providers/modifysip/' . $this->Providers->id, null, null, $baseUri);
+                    $link = $url->get('providers/modifysip/'.$this->Providers->id, null, null, $baseUri);
                 }
                 break;
             case Users::class:
-                $parameters    = [
+                $parameters = [
                     'conditions' => 'userid=:userid:',
                     'bind'       => [
                         'userid' => $this->id,
                     ],
                 ];
                 $needExtension = Extensions::findFirst($parameters);
-                $link          = $url->get('extensions/modify/' . $needExtension->id, null, null, $baseUri);
+                $link          = $url->get('extensions/modify/'.$needExtension->id, null, null, $baseUri);
                 break;
             case SoundFiles::class:
-                $link = $url->get('sound-files/modify/' . $this->id, null, null, $baseUri);
+                $link = $url->get('sound-files/modify/'.$this->id, null, null, $baseUri);
                 break;
             default:
         }
@@ -546,7 +546,7 @@ 
         $metaData      = $this->di->get('modelsMetadata');
         $defaultValues = $metaData->getDefaultValues($this);
         foreach ($defaultValues as $field => $value) {
-            if ( ! isset($this->{$field})) {
+            if (!isset($this->{$field})) {
                 $this->{$field} = $value;
             }
         }
@@ -680,7 +680,7 @@ 
                 = $currentDeleteRecord->_modelsManager->getRelations(get_class($currentDeleteRecord));
         foreach ($relations as $relation) {
             $foreignKey = $relation->getOption('foreignKey');
-            if ( ! array_key_exists('action', $foreignKey)) {
+            if (!array_key_exists('action', $foreignKey)) {
                 continue;
             }
             // Check if there are some record which restrict delete current record
@@ -698,10 +698,10 @@ 
                     ? ' OR ' : '';
                 $parameters['conditions']             .= $referencedField
                     . '= :field'
-                    . $index . ':';
+                    . $index.':';
                 $bindField
                                                       = $mappedFields[$index];
-                $parameters['bind']['field' . $index] = $currentDeleteRecord->$bindField;
+                $parameters['bind']['field'.$index] = $currentDeleteRecord->$bindField;
             }
             $relatedRecords = $relatedModel::find($parameters);
             switch ($foreignKey['action']) {
@@ -775,7 +775,7 @@ 
         if (php_sapi_name() === 'cli') {
             return;
         }
-        if ( ! $this->hasSnapshotData()) {
+        if (!$this->hasSnapshotData()) {
             return;
         } // nothing changed
 
@@ -797,7 +797,7 @@ 
     {
         // Add changed fields set to Beanstalkd queue
         $queue = $this->di->getShared('beanstalkConnectionModels');
-        if ($queue===null){
+        if ($queue === null) {
             return;
         }
         if ($this instanceof PbxSettings) {

src/Core/Asterisk/Configs/ExtensionsConf.php

Braces +3 added lines, -3 removed lines

@@ -575,7 +575,7 @@ 
                     // Вызов будет отвечен сразу конференцией.
                     $dial_command = " \n\t" . 'same => n,' . 'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?' . "Goto(internal,{$rout['extension']},1));";
                     $rout_data_dial[$rout_number] .= "";
-                }else{
+                } else{
                     $dial_command                 = " \n\t" . 'same => n,' . 'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?' . "Dial(Local/{$rout['extension']}@internal-incoming/n,{$timeout},cTKg));";
                     $rout_data_dial[$rout_number] .= " \n\t" . "same => n,Set(M_TIMEOUT={$timeout})";
                 }
@@ -616,7 +616,7 @@ 
             if ($add_login_pattern && array_key_exists('X!', $rout_data_dial) && isset($dialplan['X!'])) {
                 $dialplan[$login]       = str_replace('_X!,1', "{$login},1", $dialplan['X!']);
                 $rout_data_dial[$login] = $rout_data_dial['X!'];
-            }elseif($add_login_pattern === true && $need_def_rout === true && count($data) === 1){
+            } elseif($add_login_pattern === true && $need_def_rout === true && count($data) === 1){
                 // Только маршрут "По умолчанию".
                 $dialplan[$login]       = str_replace('_X!,1', "{$login},1", $dialplan['X!']);
             }
@@ -650,7 +650,7 @@ 
                     // Это конференция. Тут не требуется обработка таймаута ответа.
                     // Вызов будет отвечен сразу конференцией.
                     $conf .= "\t" . "same => n," . 'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?' . "Goto(internal,{$default_action->extension},1)); default action" . "\n";
-                }else {
+                } else {
                     $conf .= "\t" . "same => n," . 'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?' . "Dial(Local/{$default_action->extension}@internal/n,,cTKg)); default action" . "\n";
                 }
                 foreach ($additionalModules as $appClass) {

Spacing +235 added lines, -235 removed lines

@@ -26,14 +26,14 @@ 
         $additionalModules = $this->di->getShared('pbxConfModules');
         $conf = "[globals] \n".
                 "TRANSFER_CONTEXT=internal-transfer; \n";
-        if($this->generalSettings['PBXRecordCalls'] === '1'){
-            $conf.="MONITOR_DIR=".Storage::getMonitorDir()." \n";
-            $conf.="MONITOR_STEREO=".$this->generalSettings['PBXSplitAudioThread']." \n";
+        if ($this->generalSettings['PBXRecordCalls'] === '1') {
+            $conf .= "MONITOR_DIR=".Storage::getMonitorDir()." \n";
+            $conf .= "MONITOR_STEREO=".$this->generalSettings['PBXSplitAudioThread']." \n";
         }
         foreach ($additionalModules as $appClass) {
             $addition = $appClass->extensionGlobals();
-            if (!empty($addition)){
-                $conf .=$appClass->confBlockWithComments($addition);
+            if (!empty($addition)) {
+                $conf .= $appClass->confBlockWithComments($addition);
             }
         }
         $conf .= "\n";
@@ -56,7 +56,7 @@ 
         // Переключатель по времени.
         $this->generateOutWorkTimes($conf);
 
-        Util::fileWriteContent($this->config->path('asterisk.astetcdir') . '/extensions.conf', $conf);
+        Util::fileWriteContent($this->config->path('asterisk.astetcdir').'/extensions.conf', $conf);
     }
 
     /**
@@ -68,68 +68,68 @@ 
     {
         $extension = 'X!';
         // Контекст для AMI originate. Без него отображается не корректный CallerID.
-        $conf .= '[sipregistrations]' . "\n\n";
+        $conf .= '[sipregistrations]'."\n\n";
 
-        $conf .= '[messages]' . "\n" .
-            'exten => _' . $extension . ',1,MessageSend(sip:${EXTEN},"${CALLERID(name)}"${MESSAGE(from)})' . "\n\n";
+        $conf .= '[messages]'."\n".
+            'exten => _'.$extension.',1,MessageSend(sip:${EXTEN},"${CALLERID(name)}"${MESSAGE(from)})'."\n\n";
 
-        $conf .= '[internal-originate]' . " \n";
-        $conf .= 'exten => _' . $extension . ',1,NoOP(Hint ${HINT} exten ${EXTEN} )' . " \n";
-        $conf .= '; Если это originate, то скроем один CDR.' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${pt1c_cid}x" != "x"]?Set(CALLERID(num)=${pt1c_cid}))' . " \n\t";
+        $conf .= '[internal-originate]'." \n";
+        $conf .= 'exten => _'.$extension.',1,NoOP(Hint ${HINT} exten ${EXTEN} )'." \n";
+        $conf .= '; Если это originate, то скроем один CDR.'." \n\t";
+        $conf .= 'same => n,ExecIf($["${pt1c_cid}x" != "x"]?Set(CALLERID(num)=${pt1c_cid}))'." \n\t";
 
-        $conf .= 'same => n,ExecIf($["${CUT(CHANNEL,\;,2)}" == "2"]?Set(__PT1C_SIP_HEADER=${SIPADDHEADER}))' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${peer_mobile}x" != "x"]?Set(ADDITIONAL_PEER=&Local/${peer_mobile}@outgoing/n))' . " \n\t";
+        $conf .= 'same => n,ExecIf($["${CUT(CHANNEL,\;,2)}" == "2"]?Set(__PT1C_SIP_HEADER=${SIPADDHEADER}))'." \n\t";
+        $conf .= 'same => n,ExecIf($["${peer_mobile}x" != "x"]?Set(ADDITIONAL_PEER=&Local/${peer_mobile}@outgoing/n))'." \n\t";
 
         // Описываем возможность прыжка в пользовательский sub контекст.
-        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)' . "\n\t";
-        $conf .= 'same => n,Dial(Local/${EXTEN}@internal-users/n${ADDITIONAL_PEER},60,cTteKkHhb(originate_create_chan,s,1))' . " \n\n";
-
-        $conf .= '[originate_create_chan]' . " \n";
-        $conf .= 'exten => s,1,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)' . "\n\t";
-        $conf .= 'same => n,return' . " \n\n";
-
-        $conf .= '[dial_create_chan]' . " \n";
-        $conf .= 'exten => s,1,Gosub(lua_${ISTRANSFER}dial_create_chan,${EXTEN},1)' . "\n\t";
-        $conf .= 'same => n,Set(pt1c_is_dst=1)' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${PT1C_SIP_HEADER}x" != "x"]?Set(PJSIP_HEADER(add,${CUT(PT1C_SIP_HEADER,:,1)})=${CUT(PT1C_SIP_HEADER,:,2)}))' . " \n\t";
-        $conf .= 'same => n,Set(__PT1C_SIP_HEADER=${UNDEFINED})' . " \n\t";
-        $conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)' . " \n\t";
-        $conf .= 'same => n,return' . " \n\n";
-
-        $conf .= '[hangup_handler]' . "\n";
-        $conf .= 'exten => s,1,NoOp(--- hangup - ${CHANNEL} ---)' . "\n\t";
-        $conf .= 'same => n,Gosub(hangup_chan,${EXTEN},1)' . "\n\t";
-
-        $conf .= 'same => n,return' . "\n\n";
-
-        $conf .= '[set_orign_chan]' . "\n";
-        $conf .= 'exten => s,1,Wait(0.2)' . "\n\t";
-        $conf .= 'same => n,Set(pl=${IF($["${CHANNEL:-1}" == "1"]?2:1)})' . "\n\t";
-        $conf .= 'same => n,Set(orign_chan=${IMPORT(${CUT(CHANNEL,\;,1)}\;${pl},BRIDGEPEER)})' . "\n\t";
-        $conf .= 'same => n,ExecIf($[ "${orign_chan}x" == "x" ]?Set(orign_chan=${IMPORT(${CUT(CHANNEL,\;,1)}\;${pl},FROM_CHAN)}))' . "\n\t";
-        $conf .= 'same => n,ExecIf($[ "${QUEUE_SRC_CHAN}x" != "x" ]?Set(__QUEUE_SRC_CHAN=${orign_chan}))' . "\n\t";
-        $conf .= 'same => n,ExecIf($[ "${QUEUE_SRC_CHAN:0:5}" == "Local" ]?Set(__QUEUE_SRC_CHAN=${FROM_CHAN}))' . "\n\t";
-        $conf .= 'same => n,ExecIf($[ "${FROM_CHAN}x" == "x" ]?Set(__FROM_CHAN=${IMPORT(${CUT(CHANNEL,\;,1)}\;${pl},BRIDGEPEER)}))' . "\n\t";
-        $conf .= 'same => n,return' . "\n\n";
-
-        $conf .= '[playback]' . "\n";
-        $conf .= 'exten => s,1,Playback(hello_demo,noanswer)' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${SRC_BRIDGE_CHAN}x" == "x"]?Wait(30))' . "\n\t";
-        $conf .= 'same => n,Wait(0.3)' . "\n\t";
-        $conf .= 'same => n,Bridge(${SRC_BRIDGE_CHAN},kKTthH)' . "\n\n";
-
-        $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\n";
+        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)'."\n\t";
+        $conf .= 'same => n,Dial(Local/${EXTEN}@internal-users/n${ADDITIONAL_PEER},60,cTteKkHhb(originate_create_chan,s,1))'." \n\n";
+
+        $conf .= '[originate_create_chan]'." \n";
+        $conf .= 'exten => s,1,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)'."\n\t";
+        $conf .= 'same => n,return'." \n\n";
+
+        $conf .= '[dial_create_chan]'." \n";
+        $conf .= 'exten => s,1,Gosub(lua_${ISTRANSFER}dial_create_chan,${EXTEN},1)'."\n\t";
+        $conf .= 'same => n,Set(pt1c_is_dst=1)'." \n\t";
+        $conf .= 'same => n,ExecIf($["${PT1C_SIP_HEADER}x" != "x"]?Set(PJSIP_HEADER(add,${CUT(PT1C_SIP_HEADER,:,1)})=${CUT(PT1C_SIP_HEADER,:,2)}))'." \n\t";
+        $conf .= 'same => n,Set(__PT1C_SIP_HEADER=${UNDEFINED})'." \n\t";
+        $conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)'." \n\t";
+        $conf .= 'same => n,return'." \n\n";
+
+        $conf .= '[hangup_handler]'."\n";
+        $conf .= 'exten => s,1,NoOp(--- hangup - ${CHANNEL} ---)'."\n\t";
+        $conf .= 'same => n,Gosub(hangup_chan,${EXTEN},1)'."\n\t";
+
+        $conf .= 'same => n,return'."\n\n";
+
+        $conf .= '[set_orign_chan]'."\n";
+        $conf .= 'exten => s,1,Wait(0.2)'."\n\t";
+        $conf .= 'same => n,Set(pl=${IF($["${CHANNEL:-1}" == "1"]?2:1)})'."\n\t";
+        $conf .= 'same => n,Set(orign_chan=${IMPORT(${CUT(CHANNEL,\;,1)}\;${pl},BRIDGEPEER)})'."\n\t";
+        $conf .= 'same => n,ExecIf($[ "${orign_chan}x" == "x" ]?Set(orign_chan=${IMPORT(${CUT(CHANNEL,\;,1)}\;${pl},FROM_CHAN)}))'."\n\t";
+        $conf .= 'same => n,ExecIf($[ "${QUEUE_SRC_CHAN}x" != "x" ]?Set(__QUEUE_SRC_CHAN=${orign_chan}))'."\n\t";
+        $conf .= 'same => n,ExecIf($[ "${QUEUE_SRC_CHAN:0:5}" == "Local" ]?Set(__QUEUE_SRC_CHAN=${FROM_CHAN}))'."\n\t";
+        $conf .= 'same => n,ExecIf($[ "${FROM_CHAN}x" == "x" ]?Set(__FROM_CHAN=${IMPORT(${CUT(CHANNEL,\;,1)}\;${pl},BRIDGEPEER)}))'."\n\t";
+        $conf .= 'same => n,return'."\n\n";
+
+        $conf .= '[playback]'."\n";
+        $conf .= 'exten => s,1,Playback(hello_demo,noanswer)'."\n\t";
+        $conf .= 'same => n,ExecIf($["${SRC_BRIDGE_CHAN}x" == "x"]?Wait(30))'."\n\t";
+        $conf .= 'same => n,Wait(0.3)'."\n\t";
+        $conf .= 'same => n,Bridge(${SRC_BRIDGE_CHAN},kKTthH)'."\n\n";
+
+        $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\n";
 
         // TODO / Добавление / удаление префиксов на входящий callerid.
-        $conf .= '[add-trim-prefix-clid]' . "\n";
-        $conf .= 'exten => _.!,1,NoOp(--- Incoming call from ${CALLERID(num)} ---)' . "\n\t";
-        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)' . "\n\t";
+        $conf .= '[add-trim-prefix-clid]'."\n";
+        $conf .= 'exten => _.!,1,NoOp(--- Incoming call from ${CALLERID(num)} ---)'."\n\t";
+        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)'."\n\t";
         // Отсекаем "+".
         // $conf.= 'same => n,ExecIf( $["${CALLERID(num):0:1}" == "+"]?Set(CALLERID(num)=${CALLERID(num):1}))'."\n\t";
         // Отсекаем "7" и добавляем "8".
         // $conf.= 'same => n,ExecIf( $["${REGEX("^7[0-9]+" ${CALLERID(num)})}" == "1"]?Set(CALLERID(num)=8${CALLERID(num):1}))'."\n\t";
-        $conf .= 'same => n,return' . "\n\n";
+        $conf .= 'same => n,return'."\n\n";
     }
 
     /**
@@ -145,136 +145,136 @@ 
         $additionalModules = $this->di->getShared('pbxConfModules');
         foreach ($additionalModules as $appClass) {
             $addition = $appClass->extensionGenContexts();
-            if (!empty($addition)){
-                $conf .=$appClass->confBlockWithComments($addition);
+            if (!empty($addition)) {
+                $conf .= $appClass->confBlockWithComments($addition);
             }
         }
         $conf .= "\n";
         $conf .= "[internal-num-undefined] \n";
-        $conf .= 'exten => _' . $extension . ',1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))' . "\n\t";
+        $conf .= 'exten => _'.$extension.',1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\t";
+        $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))'."\n\t";
         $conf .= "same => n,Playback(pbx-invalid,noanswer) \n\n";
 
         $conf .= "[internal-fw]\n";
-        $conf .= 'exten => _' . $extension . ',1,NoOp(DIALSTATUS - ${DIALSTATUS})' . "\n\t";
+        $conf .= 'exten => _'.$extension.',1,NoOp(DIALSTATUS - ${DIALSTATUS})'."\n\t";
         // CANCEL - вызов был отменен, к примеру *0, не нужно дальше искать адресат.
-        $conf .= 'same => n,ExecIf($["${DIALSTATUS}" == "CANCEL"]?Hangup())' . "\n\t";
+        $conf .= 'same => n,ExecIf($["${DIALSTATUS}" == "CANCEL"]?Hangup())'."\n\t";
         // BUSY - занято. К примру абонент завершил вызов или DND.
-        $conf .= 'same => n,ExecIf($["${DIALSTATUS}" == "BUSY"]?Set(dstatus=FW_BUSY))' . "\n\t";
+        $conf .= 'same => n,ExecIf($["${DIALSTATUS}" == "BUSY"]?Set(dstatus=FW_BUSY))'."\n\t";
         // CHANUNAVAIL - канал не доступен. К примеру телефон не зарегистрирован или не отвечает.
-        $conf .= 'same => n,ExecIf($["${DIALSTATUS}" == "CHANUNAVAIL"]?Set(dstatus=FW_UNAV))' . "\n\t";
+        $conf .= 'same => n,ExecIf($["${DIALSTATUS}" == "CHANUNAVAIL"]?Set(dstatus=FW_UNAV))'."\n\t";
         // NOANSWER - не ответили по таймауту.
-        $conf .= 'same => n,ExecIf($["${dstatus}x" == "x"]?Set(dstatus=FW))' . "\n\t";
-        $conf .= 'same => n,Set(fw=${DB(${dstatus}/${EXTEN})})' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${fw}x" != "x"]?Set(__pt1c_UNIQUEID=${UNDEFINED})' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${fw}x" != "x"]?Goto(internal,${fw},1))' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))' . "\n\t";
-        $conf .= 'same => n,Hangup() ' . "\n\n";
+        $conf .= 'same => n,ExecIf($["${dstatus}x" == "x"]?Set(dstatus=FW))'."\n\t";
+        $conf .= 'same => n,Set(fw=${DB(${dstatus}/${EXTEN})})'."\n\t";
+        $conf .= 'same => n,ExecIf($["${fw}x" != "x"]?Set(__pt1c_UNIQUEID=${UNDEFINED})'."\n\t";
+        $conf .= 'same => n,ExecIf($["${fw}x" != "x"]?Goto(internal,${fw},1))'."\n\t";
+        $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))'."\n\t";
+        $conf .= 'same => n,Hangup() '."\n\n";
 
         $conf .= "[all_peers]\n";
-        $conf .= 'include => internal-hints' . "\n";
-        $conf .= 'exten => failed,1,Hangup()' . "\n";
+        $conf .= 'include => internal-hints'."\n";
+        $conf .= 'exten => failed,1,Hangup()'."\n";
 
-        $conf .= 'exten => _.!,1,ExecIf($[ "${EXTEN}" == "h" ]?Hangup())' . "\n\t";
+        $conf .= 'exten => _.!,1,ExecIf($[ "${EXTEN}" == "h" ]?Hangup())'."\n\t";
         // Фильтр спецсимволов. Разершаем только цифры.
-        $conf .= 'same => n,Set(cleanNumber=${FILTER(\*\#1234567890,${EXTEN})})' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${EXTEN}" != "${cleanNumber}"]?Goto(${CONTEXT},${cleanNumber},$[${PRIORITY} + 1]))' . "\n\t";
+        $conf .= 'same => n,Set(cleanNumber=${FILTER(\*\#1234567890,${EXTEN})})'."\n\t";
+        $conf .= 'same => n,ExecIf($["${EXTEN}" != "${cleanNumber}"]?Goto(${CONTEXT},${cleanNumber},$[${PRIORITY} + 1]))'."\n\t";
 
-        $conf .= 'same => n,Set(__FROM_CHAN=${CHANNEL})' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${OLD_LINKEDID}x" == "x"]?Set(__OLD_LINKEDID=${CHANNEL(linkedid)}))' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" != "Local"]?Gosub(set_from_peer,s,1))' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Gosub(set_orign_chan,s,1))' . "\n\t";
+        $conf .= 'same => n,Set(__FROM_CHAN=${CHANNEL})'."\n\t";
+        $conf .= 'same => n,ExecIf($["${OLD_LINKEDID}x" == "x"]?Set(__OLD_LINKEDID=${CHANNEL(linkedid)}))'."\n\t";
+        $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" != "Local"]?Gosub(set_from_peer,s,1))'."\n\t";
+        $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Gosub(set_orign_chan,s,1))'."\n\t";
 
-        $conf .= 'same => n,ExecIf($["${CALLERID(num)}x" == "x"]?Set(CALLERID(num)=${FROM_PEER}))' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${CALLERID(num)}x" == "x"]?Set(CALLERID(name)=${FROM_PEER}))' . "\n\t";
+        $conf .= 'same => n,ExecIf($["${CALLERID(num)}x" == "x"]?Set(CALLERID(num)=${FROM_PEER}))'."\n\t";
+        $conf .= 'same => n,ExecIf($["${CALLERID(num)}x" == "x"]?Set(CALLERID(name)=${FROM_PEER}))'."\n\t";
 
-        $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local" && "${FROM_PEER}x" == "x"]?Set(__FROM_PEER=${CALLERID(num)}))' . "\n\t";
-        $conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)' . "\n\t";
-        $conf .= 'same => n,Gosub(${ISTRANSFER}dial,${EXTEN},1)' . "\n\t";
+        $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local" && "${FROM_PEER}x" == "x"]?Set(__FROM_PEER=${CALLERID(num)}))'."\n\t";
+        $conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)'."\n\t";
+        $conf .= 'same => n,Gosub(${ISTRANSFER}dial,${EXTEN},1)'."\n\t";
 
         // Описываем возможность прыжка в пользовательский sub контекст.
-        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)' . "\n\t";
+        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)'."\n\t";
 
-        $conf .= 'same => n,Goto(peer_${FROM_PEER},${EXTEN},1)' . "\n\n";
+        $conf .= 'same => n,Goto(peer_${FROM_PEER},${EXTEN},1)'."\n\n";
 
-        $pickupexten =  $this->generalSettings['PBXFeaturePickupExten'];
-        $conf        .= 'exten => _' . $pickupexten . $extension . ',1,Set(PICKUPEER=' . $technology . '/${FILTER(0-9,${EXTEN:2})})' . "\n\t";
-        $conf        .= 'same => n,Set(pt1c_dnid=${EXTEN})' . "\n\t";
-        $conf        .= 'same => n,PickupChan(${PICKUPEER})' . "\n\t";
-        $conf        .= 'same => n,Hangup()' . "\n\n";
+        $pickupexten = $this->generalSettings['PBXFeaturePickupExten'];
+        $conf        .= 'exten => _'.$pickupexten.$extension.',1,Set(PICKUPEER='.$technology.'/${FILTER(0-9,${EXTEN:2})})'."\n\t";
+        $conf        .= 'same => n,Set(pt1c_dnid=${EXTEN})'."\n\t";
+        $conf        .= 'same => n,PickupChan(${PICKUPEER})'."\n\t";
+        $conf        .= 'same => n,Hangup()'."\n\n";
 
         $voicemail_exten = $this->generalSettings['VoicemailExten'];
-        $conf            .= 'exten => ' . $voicemail_exten . ',1,NoOp(NOTICE, Dialing out from ${CALLERID(all)} to VoiceMail)' . "\n\t";
-        $conf            .= 'same => n,VoiceMailMain(admin@voicemailcontext,s)' . "\n\t";
-        $conf            .= 'same => n,Hangup()' . "\n\n";
+        $conf            .= 'exten => '.$voicemail_exten.',1,NoOp(NOTICE, Dialing out from ${CALLERID(all)} to VoiceMail)'."\n\t";
+        $conf            .= 'same => n,VoiceMailMain(admin@voicemailcontext,s)'."\n\t";
+        $conf            .= 'same => n,Hangup()'."\n\n";
 
         $conf .= "[voice_mail_peer] \n";
-        $conf .= 'exten => voicemail,1,Answer()' . "\n\t";
-        $conf .= 'same => n,VoiceMail(admin@voicemailcontext)' . "\n\t";
-        $conf .= 'same => n,Hangup()' . "\n\n";
+        $conf .= 'exten => voicemail,1,Answer()'."\n\t";
+        $conf .= 'same => n,VoiceMail(admin@voicemailcontext)'."\n\t";
+        $conf .= 'same => n,Hangup()'."\n\n";
 
         // Контекст для внутренних вызовов.
         $conf .= "[internal] \n";
 
         foreach ($additionalModules as $appClass) {
             $addition = $appClass->getIncludeInternal();
-            if (!empty($addition)){
-                $conf .=$appClass->confBlockWithComments($addition);
+            if (!empty($addition)) {
+                $conf .= $appClass->confBlockWithComments($addition);
             }
         }
 
         foreach ($additionalModules as $appClass) {
             $addition = $appClass->extensionGenInternal();
-            if (!empty($addition)){
-                $conf .=$appClass->confBlockWithComments($addition);
+            if (!empty($addition)) {
+                $conf .= $appClass->confBlockWithComments($addition);
             }
         }
 
-        $conf .= 'exten => i,1,NoOp(-- INVALID NUMBER --)' . "\n\t";
-        $conf .= 'same => n,Set(DIALSTATUS=INVALID_NUMBER)' . "\n\t";
-        $conf .= 'same => n,Playback(privacy-incorrect,noanswer)' . "\n\t";
-        $conf .= 'same => n,Hangup()' . "\n";
+        $conf .= 'exten => i,1,NoOp(-- INVALID NUMBER --)'."\n\t";
+        $conf .= 'same => n,Set(DIALSTATUS=INVALID_NUMBER)'."\n\t";
+        $conf .= 'same => n,Playback(privacy-incorrect,noanswer)'."\n\t";
+        $conf .= 'same => n,Hangup()'."\n";
 
-        $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\n";
+        $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\n";
 
         $conf .= "[internal-incoming]\n";
-        $conf .= 'exten => _.!,1,ExecIf($["${MASTER_CHANNEL(M_TIMEOUT)}x" != "x"]?Set(TIMEOUT(absolute)=${MASTER_CHANNEL(M_TIMEOUT)}))' . " \n\t";
-        $conf .= 'same => n,Set(MASTER_CHANNEL(M_TIMEOUT_CHANNEL)=${CHANNEL})' . " \n\t";
-        $conf .= 'same => n,Set(MASTER_CHANNEL(M_TIMEOUT)=${EMPTY_VAR})' . " \n\t";
-        $conf .= 'same => n,Goto(internal,${EXTEN},1)' . " \n\n";
+        $conf .= 'exten => _.!,1,ExecIf($["${MASTER_CHANNEL(M_TIMEOUT)}x" != "x"]?Set(TIMEOUT(absolute)=${MASTER_CHANNEL(M_TIMEOUT)}))'." \n\t";
+        $conf .= 'same => n,Set(MASTER_CHANNEL(M_TIMEOUT_CHANNEL)=${CHANNEL})'." \n\t";
+        $conf .= 'same => n,Set(MASTER_CHANNEL(M_TIMEOUT)=${EMPTY_VAR})'." \n\t";
+        $conf .= 'same => n,Goto(internal,${EXTEN},1)'." \n\n";
 
         $conf .= "[internal-users] \n";
-        $conf .= 'exten => _' . $extension . ',1,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${ISTRANSFER}x" != "x"]?Set(SIPADDHEADER01=${EMPTY_VAR})' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Gosub(set_orign_chan,s,1))' . " \n\t";
+        $conf .= 'exten => _'.$extension.',1,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)'." \n\t";
+        $conf .= 'same => n,ExecIf($["${ISTRANSFER}x" != "x"]?Set(SIPADDHEADER01=${EMPTY_VAR})'." \n\t";
+        $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Gosub(set_orign_chan,s,1))'." \n\t";
 
-        $conf .= 'same => n,Gosub(${ISTRANSFER}dial,${EXTEN},1)' . "\n\t";
+        $conf .= 'same => n,Gosub(${ISTRANSFER}dial,${EXTEN},1)'."\n\t";
         // Проверим, существует ли такой пир.
 
-        $conf .= 'same => n,ExecIf($["${PJSIP_ENDPOINT(${EXTEN},auth)}x" == "x"]?Goto(internal-num-undefined,${EXTEN},1))' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${DEVICE_STATE(' . $technology . '/${EXTEN})}" == "BUSY"]?Set(DIALSTATUS=BUSY))' . " \n\t";
-        $conf .= 'same => n,GotoIf($["${DEVICE_STATE(' . $technology . '/${EXTEN})}" == "BUSY"]?fw_start)' . " \n\t";
+        $conf .= 'same => n,ExecIf($["${PJSIP_ENDPOINT(${EXTEN},auth)}x" == "x"]?Goto(internal-num-undefined,${EXTEN},1))'." \n\t";
+        $conf .= 'same => n,ExecIf($["${DEVICE_STATE('.$technology.'/${EXTEN})}" == "BUSY"]?Set(DIALSTATUS=BUSY))'." \n\t";
+        $conf .= 'same => n,GotoIf($["${DEVICE_STATE('.$technology.'/${EXTEN})}" == "BUSY"]?fw_start)'." \n\t";
 
         // Как долго звонить пиру.
-        $conf .= 'same => n,Set(ringlength=${DB(FW_TIME/${EXTEN})})' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${ringlength}x" == "x"]?Set(ringlength=600))' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${QUEUE_SRC_CHAN}x" != "x" && "${ISTRANSFER}x" == "x"]?Set(ringlength=600))' . " \n\t";
+        $conf .= 'same => n,Set(ringlength=${DB(FW_TIME/${EXTEN})})'." \n\t";
+        $conf .= 'same => n,ExecIf($["${ringlength}x" == "x"]?Set(ringlength=600))'." \n\t";
+        $conf .= 'same => n,ExecIf($["${QUEUE_SRC_CHAN}x" != "x" && "${ISTRANSFER}x" == "x"]?Set(ringlength=600))'." \n\t";
 
-        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1) ' . " \n\t";
+        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1) '." \n\t";
         // Совершаем вызов пира.
-        $conf .= 'same => n,Set(DST_CONTACT=${PJSIP_DIAL_CONTACTS(${EXTEN})})' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${FIELDQTY(DST_CONTACT,&)}" != "1"]?Set(__PT1C_SIP_HEADER=${EMPTY_VAR}))' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${DST_CONTACT}x" != "x"]?Dial(${DST_CONTACT},${ringlength},cTtekKHhU(${ISTRANSFER}dial_answer)b(dial_create_chan,s,1)):Set(DIALSTATUS=CHANUNAVAIL))' . " \n\t";
-        $conf .= 'same => n(fw_start),NoOp(dial_hangup)' . " \n\t";
+        $conf .= 'same => n,Set(DST_CONTACT=${PJSIP_DIAL_CONTACTS(${EXTEN})})'." \n\t";
+        $conf .= 'same => n,ExecIf($["${FIELDQTY(DST_CONTACT,&)}" != "1"]?Set(__PT1C_SIP_HEADER=${EMPTY_VAR}))'." \n\t";
+        $conf .= 'same => n,ExecIf($["${DST_CONTACT}x" != "x"]?Dial(${DST_CONTACT},${ringlength},cTtekKHhU(${ISTRANSFER}dial_answer)b(dial_create_chan,s,1)):Set(DIALSTATUS=CHANUNAVAIL))'." \n\t";
+        $conf .= 'same => n(fw_start),NoOp(dial_hangup)'." \n\t";
 
         // QUEUE_SRC_CHAN - установлена, если вызов сервершен агенту очереди.
         // Проверяем нужна ли переадресация
-        $conf       .= 'same => n,ExecIf($["${DIALSTATUS}" != "ANSWER" && "${ISTRANSFER}x" != "x"]?Goto(internal-fw,${EXTEN},1))' . " \n\t";
-        $conf       .= 'same => n,ExecIf($["${DIALSTATUS}" != "ANSWER" && "${QUEUE_SRC_CHAN}x" == "x"]?Goto(internal-fw,${EXTEN},1))' . " \n\t";
-        $conf       .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))' . " \n\t";
-        $conf       .= 'same => n,Hangup()' . "\n\n";
+        $conf       .= 'same => n,ExecIf($["${DIALSTATUS}" != "ANSWER" && "${ISTRANSFER}x" != "x"]?Goto(internal-fw,${EXTEN},1))'." \n\t";
+        $conf       .= 'same => n,ExecIf($["${DIALSTATUS}" != "ANSWER" && "${QUEUE_SRC_CHAN}x" == "x"]?Goto(internal-fw,${EXTEN},1))'." \n\t";
+        $conf       .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))'." \n\t";
+        $conf       .= 'same => n,Hangup()'."\n\n";
 
-        $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\n";
+        $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\n";
     }
 
     /**
@@ -285,22 +285,22 @@ 
     private function generateInternalTransfer(&$conf): void
     {
         $additionalModules = $this->di->getShared('pbxConfModules');
-        $conf              .= "[internal-transfer] \n";
+        $conf .= "[internal-transfer] \n";
 
         foreach ($additionalModules as $appClass) {
-            $addition= $appClass->getIncludeInternalTransfer();
-            if (!empty($addition)){
-                $conf .=$appClass->confBlockWithComments($addition);
+            $addition = $appClass->getIncludeInternalTransfer();
+            if (!empty($addition)) {
+                $conf .= $appClass->confBlockWithComments($addition);
             }
         }
 
         foreach ($additionalModules as $appClass) {
-            $addition= $appClass->extensionGenInternalTransfer();
-            if (!empty($addition)){
-                $conf .=$appClass->confBlockWithComments($addition);
+            $addition = $appClass->extensionGenInternalTransfer();
+            if (!empty($addition)) {
+                $conf .= $appClass->confBlockWithComments($addition);
             }
         }
-        $conf .= 'exten => h,1,Gosub(transfer_dial_hangup,${EXTEN},1)' . "\n\n";
+        $conf .= 'exten => h,1,Gosub(transfer_dial_hangup,${EXTEN},1)'."\n\n";
     }
 
     /**
@@ -311,11 +311,11 @@ 
     private function generateSipHints(&$conf): void
     {
         $additionalModules = $this->di->getShared('pbxConfModules');
-        $conf              .= "[internal-hints] \n";
+        $conf .= "[internal-hints] \n";
         foreach ($additionalModules as $appClass) {
             $addition = $appClass->extensionGenHints();
-            if (!empty($addition)){
-                $conf .=$appClass->confBlockWithComments($addition);
+            if (!empty($addition)) {
+                $conf .= $appClass->confBlockWithComments($addition);
             }
         }
         $conf .= "\n\n";
@@ -329,16 +329,16 @@ 
     private function generateOutContextPeers(&$conf): void
     {
         $additionalModules = $this->di->getShared('pbxConfModules');
-        $conf              .= "[outgoing] \n";
+        $conf .= "[outgoing] \n";
 
-        $conf .= 'exten => _+.!,1,NoOp(Strip + sign from number and convert it to +)' . " \n\t";
-        $conf .= 'same => n,Set(ADDPLUS=+);' . " \n\t";
-        $conf .= 'same => n,Goto(${CONTEXT},${EXTEN:1},1);' . " \n\n";
-        $conf .= 'exten => _X!,1,NoOp(Start outgoing calling...)' . " \n\t";
-        $conf .= 'same => n,Ringing()' . " \n\t";
+        $conf .= 'exten => _+.!,1,NoOp(Strip + sign from number and convert it to +)'." \n\t";
+        $conf .= 'same => n,Set(ADDPLUS=+);'." \n\t";
+        $conf .= 'same => n,Goto(${CONTEXT},${EXTEN:1},1);'." \n\n";
+        $conf .= 'exten => _X!,1,NoOp(Start outgoing calling...)'." \n\t";
+        $conf .= 'same => n,Ringing()'." \n\t";
 
         // Описываем возможность прыжка в пользовательский sub контекст.
-        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)' . "\n\t";
+        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)'."\n\t";
 
         /** @var \MikoPBX\Common\Models\OutgoingRoutingTable $routs */
         /** @var \MikoPBX\Common\Models\OutgoingRoutingTable $rout */
@@ -350,66 +350,66 @@ 
             if ($technology !== '') {
                     $rout_data                       = $rout->toArray();
                     $rout_data['technology']         = $technology;
-                    $id_dialplan                     = $rout_data['providerid'] . '-' . $rout_data['id'] . '-outgoing';
+                    $id_dialplan                     = $rout_data['providerid'].'-'.$rout_data['id'].'-outgoing';
                     $provider_contexts[$id_dialplan] = $rout_data;
-                    $conf                            .= $this->generateOutgoingRegexPattern($rout_data);
+                    $conf .= $this->generateOutgoingRegexPattern($rout_data);
                     continue;
             }
         }
-        $conf .= 'same => n,ExecIf($["${peer_mobile}x" != "x"]?Hangup())' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${DIALSTATUS}" != "ANSWER" && "${BLINDTRANSFER}x" != "x" && "${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${ROUTFOUND}x" == "x"]?Gosub(dial,${EXTEN},1))' . "\n\t";
+        $conf .= 'same => n,ExecIf($["${peer_mobile}x" != "x"]?Hangup())'." \n\t";
+        $conf .= 'same => n,ExecIf($["${DIALSTATUS}" != "ANSWER" && "${BLINDTRANSFER}x" != "x" && "${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\t";
+        $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))'." \n\t";
+        $conf .= 'same => n,ExecIf($["${ROUTFOUND}x" == "x"]?Gosub(dial,${EXTEN},1))'."\n\t";
 
-        $conf .= 'same => n,Playback(silence/2,noanswer)' . " \n\t";
-        $conf .= 'same => n,ExecIf($["${ROUTFOUND}x" != "x"]?Playback(followme/sorry,noanswer):Playback(cannot-complete-as-dialed,noanswer))' . " \n\t";
-        $conf .= 'same => n,Hangup()' . " \n\n";
-        $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\t";
+        $conf .= 'same => n,Playback(silence/2,noanswer)'." \n\t";
+        $conf .= 'same => n,ExecIf($["${ROUTFOUND}x" != "x"]?Playback(followme/sorry,noanswer):Playback(cannot-complete-as-dialed,noanswer))'." \n\t";
+        $conf .= 'same => n,Hangup()'." \n\n";
+        $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\t";
 
         foreach ($provider_contexts as $id_dialplan => $rout) {
             $conf .= "\n[{$id_dialplan}]\n";
             if (isset($rout['trimfrombegin']) && $rout['trimfrombegin'] > 0) {
                 // $exten_var = '${ADDPLUS}${EXTEN:'.$rout['trimfrombegin'].'}';
-                $exten_var    = '${EXTEN:' . $rout['trimfrombegin'] . '}';
-                $change_exten = 'same => n,ExecIf($["${EXTEN}" != "${number}"]?Goto(${CONTEXT},${number},$[${PRIORITY} + 1]))' . "\n\t";
+                $exten_var    = '${EXTEN:'.$rout['trimfrombegin'].'}';
+                $change_exten = 'same => n,ExecIf($["${EXTEN}" != "${number}"]?Goto(${CONTEXT},${number},$[${PRIORITY} + 1]))'."\n\t";
             } else {
                 $exten_var    = '${ADDPLUS}${EXTEN}';
                 $change_exten = '';
             }
-            $conf .= 'exten => _X!,1,Set(number=' . $rout['prepend'] . $exten_var . ')' . "\n\t";
+            $conf .= 'exten => _X!,1,Set(number='.$rout['prepend'].$exten_var.')'."\n\t";
             $conf .= $change_exten;
             foreach ($additionalModules as $appClass) {
                 $addition = $appClass->generateOutRoutContext($rout);
-                if (!empty($addition)){
-                    $conf .=$appClass->confBlockWithComments($addition);
+                if (!empty($addition)) {
+                    $conf .= $appClass->confBlockWithComments($addition);
                 }
             }
-            $conf .= 'same => n,ExecIf($["${number}x" == "x"]?Hangup())' . "\n\t";
-            $conf .= 'same => n,Set(ROUTFOUND=1)' . "\n\t";
-            $conf .= 'same => n,Gosub(${ISTRANSFER}dial,${EXTEN},1)' . "\n\t";
+            $conf .= 'same => n,ExecIf($["${number}x" == "x"]?Hangup())'."\n\t";
+            $conf .= 'same => n,Set(ROUTFOUND=1)'."\n\t";
+            $conf .= 'same => n,Gosub(${ISTRANSFER}dial,${EXTEN},1)'."\n\t";
 
-            $conf .= 'same => n,ExecIf($["${EXTERNALPHONE}" == "${EXTEN}"]?Set(DOPTIONS=tk))' . "\n\t";
+            $conf .= 'same => n,ExecIf($["${EXTERNALPHONE}" == "${EXTEN}"]?Set(DOPTIONS=tk))'."\n\t";
 
             // Описываем возможность прыжка в пользовательский sub контекст.
-            $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(' . $rout['providerid'] . '-outgoing-custom,${EXTEN},1)}" == "1"]?' . $rout['providerid'] . '-outgoing-custom,${EXTEN},1)' . "\n\t";
+            $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS('.$rout['providerid'].'-outgoing-custom,${EXTEN},1)}" == "1"]?'.$rout['providerid'].'-outgoing-custom,${EXTEN},1)'."\n\t";
 
             if ($rout['technology'] === IAXConf::TYPE_IAX2) {
-                $conf .= 'same => n,Dial(' . $rout['technology'] . '/' . $rout['providerid'] . '/${number},600,${DOPTIONS}TKU(${ISTRANSFER}dial_answer)b(dial_create_chan,s,1))' . "\n\t";
+                $conf .= 'same => n,Dial('.$rout['technology'].'/'.$rout['providerid'].'/${number},600,${DOPTIONS}TKU(${ISTRANSFER}dial_answer)b(dial_create_chan,s,1))'."\n\t";
             } else {
-                $conf .= 'same => n,Dial(' . $rout['technology'] . '/${number}@' . $rout['providerid'] . ',600,${DOPTIONS}TKU(${ISTRANSFER}dial_answer)b(dial_create_chan,s,1))' . "\n\t";
+                $conf .= 'same => n,Dial('.$rout['technology'].'/${number}@'.$rout['providerid'].',600,${DOPTIONS}TKU(${ISTRANSFER}dial_answer)b(dial_create_chan,s,1))'."\n\t";
             }
             foreach ($additionalModules as $appClass) {
                 $addition = $appClass->generateOutRoutAfterDialContext($rout);
-                if (!empty($addition)){
-                    $conf .=$appClass->confBlockWithComments($addition);
+                if (!empty($addition)) {
+                    $conf .= $appClass->confBlockWithComments($addition);
                 }
             }
-            $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(' . $rout['providerid'] . '-outgoing-after-dial-custom,${EXTEN}),1}" == "1"]?' . $rout['providerid'] . '-outgoing-after-dial-custom,${EXTEN},1)' . "\n\t";
+            $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS('.$rout['providerid'].'-outgoing-after-dial-custom,${EXTEN}),1}" == "1"]?'.$rout['providerid'].'-outgoing-after-dial-custom,${EXTEN},1)'."\n\t";
 
-            $conf .= 'same => n,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\t";
-            $conf .= 'same => n,ExecIf($["${DIALSTATUS}" = "ANSWER"]?Hangup())' . "\n\t";
-            $conf .= 'same => n,Set(pt1c_UNIQUEID=${EMPTY_VALUE})' . "\n\t";
-            $conf .= 'same => n,return' . "\n";
+            $conf .= 'same => n,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\t";
+            $conf .= 'same => n,ExecIf($["${DIALSTATUS}" = "ANSWER"]?Hangup())'."\n\t";
+            $conf .= 'same => n,Set(pt1c_UNIQUEID=${EMPTY_VALUE})'."\n\t";
+            $conf .= 'same => n,return'."\n";
         }
     }
 
@@ -425,14 +425,14 @@ 
         $conf        = '';
         $restnumbers = '';
         if (isset($rout['restnumbers']) && $rout['restnumbers'] > 0) {
-            $restnumbers = "[0-9]{" . $rout['restnumbers'] . "}$";
+            $restnumbers = "[0-9]{".$rout['restnumbers']."}$";
         } elseif ($rout['restnumbers'] == 0) {
             $restnumbers = "$";
         } elseif ($rout['restnumbers'] == -1) {
             $restnumbers = "";
         }
         $numberbeginswith = $rout['numberbeginswith'];
-        $conf             .= 'same => n,ExecIf($["${REGEX("^' . $numberbeginswith . $restnumbers . '" ${EXTEN})}" == "1"]?Gosub(' . $rout['providerid'] . '-' . $rout['id'] . '-outgoing,${EXTEN},1))' . " \n\t";
+        $conf .= 'same => n,ExecIf($["${REGEX("^'.$numberbeginswith.$restnumbers.'" ${EXTEN})}" == "1"]?Gosub('.$rout['providerid'].'-'.$rout['id'].'-outgoing,${EXTEN},1))'." \n\t";
 
         return $conf;
     }
@@ -449,7 +449,7 @@ 
         $conf              .= self::generateIncomingContextPeers('none', '', '');
         $conf              .= "[public-direct-dial] \n";
         foreach ($additionalModules as $appClass) {
-            if ($appClass instanceof $this){
+            if ($appClass instanceof $this) {
                 continue;
             }
             $appClass->generatePublicContext($conf);
@@ -479,7 +479,7 @@ 
         $conf              = '';
         $dialplan          = [];
         $di = Di::getDefault();
-        if ($di===null){
+        if ($di === null) {
             return '';
         }
         $additionalModules = $di->getShared('pbxConfModules');
@@ -535,55 +535,55 @@ 
             if (empty($rout_data)) {
                 $ext_prefix = ('none' === $provider) ? '' : '_';
                 $rout_data  .= "exten => {$ext_prefix}{$rout_number},1,NoOp(--- Incoming call ---)\n\t";
-                $rout_data  .= 'same => n,Set(CHANNEL(language)=' . $lang . ')' . "\n\t";
-                $rout_data  .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)' . "\n\t";
-                $rout_data  .= 'same => n,Set(__FROM_DID=${EXTEN})' . "\n\t";
-                $rout_data  .= 'same => n,Set(__FROM_CHAN=${CHANNEL})' . "\n\t";
+                $rout_data  .= 'same => n,Set(CHANNEL(language)='.$lang.')'."\n\t";
+                $rout_data  .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)'."\n\t";
+                $rout_data  .= 'same => n,Set(__FROM_DID=${EXTEN})'."\n\t";
+                $rout_data  .= 'same => n,Set(__FROM_CHAN=${CHANNEL})'."\n\t";
 
                 // Установка имени пира.
-                $rout_data .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" != "Local"]?Gosub(set_from_peer,s,1))' . "\n\t";
-                $rout_data .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Set(__FROM_PEER=${CALLERID(num)}))' . "\n\t";
+                $rout_data .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" != "Local"]?Gosub(set_from_peer,s,1))'."\n\t";
+                $rout_data .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Set(__FROM_PEER=${CALLERID(num)}))'."\n\t";
 
                 // TODO / Подмена входящего callerid.
-                $rout_data .= 'same => n,Gosub(add-trim-prefix-clid,${EXTEN},1)' . "\n\t";
+                $rout_data .= 'same => n,Gosub(add-trim-prefix-clid,${EXTEN},1)'."\n\t";
 
                 foreach ($additionalModules as $appClass) {
                      $addition = $appClass->generateIncomingRoutBeforeDial($rout_number);
-                     if (!empty($addition)){
-                         $rout_data .=$appClass->confBlockWithComments($addition);
+                     if (!empty($addition)) {
+                         $rout_data .= $appClass->confBlockWithComments($addition);
                      }
                  }
 
                 // Перехват на ответственного.
-                $rout_data .= 'same => n,UserEvent(Interception,CALLERID: ${CALLERID(num)},chan1c: ${CHANNEL},FROM_DID: ${FROM_DID})' . "\n\t";
+                $rout_data .= 'same => n,UserEvent(Interception,CALLERID: ${CALLERID(num)},chan1c: ${CHANNEL},FROM_DID: ${FROM_DID})'."\n\t";
                 // Проверим распискние для входящих внешних звонков.
                 $rout_data .= 'same => n,Gosub(check-out-work-time,${EXTEN},1)';
                 // Описываем возможность прыжка в пользовательский sub контекст.
-                $rout_data .= " \n\t" . 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)';
+                $rout_data .= " \n\t".'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)';
             }
 
-            if ( ! empty($rout['extension'])) {
+            if (!empty($rout['extension'])) {
                 $rout_data = rtrim($rout_data);
                 // Обязательно проверяем "DIALSTATUS", в случае с парковой через AMI вызова это необходимо.
                 // При ответе может отработать следующий приоритет.
-                if ( ! isset($rout_data_dial[$rout_number])) {
+                if (!isset($rout_data_dial[$rout_number])) {
                     $rout_data_dial[$rout_number] = '';
                 }
 
-                if(in_array($rout['extension'], $confExtensions, true)){
+                if (in_array($rout['extension'], $confExtensions, true)) {
                     // Это конференция. Тут не требуется обработка таймаута ответа.
                     // Вызов будет отвечен сразу конференцией.
-                    $dial_command = " \n\t" . 'same => n,' . 'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?' . "Goto(internal,{$rout['extension']},1));";
+                    $dial_command = " \n\t".'same => n,'.'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?'."Goto(internal,{$rout['extension']},1));";
                     $rout_data_dial[$rout_number] .= "";
-                }else{
-                    $dial_command                 = " \n\t" . 'same => n,' . 'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?' . "Dial(Local/{$rout['extension']}@internal-incoming/n,{$timeout},cTKg));";
-                    $rout_data_dial[$rout_number] .= " \n\t" . "same => n,Set(M_TIMEOUT={$timeout})";
+                } else {
+                    $dial_command = " \n\t".'same => n,'.'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?'."Dial(Local/{$rout['extension']}@internal-incoming/n,{$timeout},cTKg));";
+                    $rout_data_dial[$rout_number] .= " \n\t"."same => n,Set(M_TIMEOUT={$timeout})";
                 }
                 $rout_data_dial[$rout_number] .= $dial_command;
 
                 if (is_array($provider)) {
                     $key = $provider[$rout['provider']] ?? '';
-                    if ( ! isset($rout_data_dial[$key])) {
+                    if (!isset($rout_data_dial[$key])) {
                         $rout_data_dial[$key] = '';
                     }
                     if (empty($number)) {
@@ -594,9 +594,9 @@ 
         }
 
         if (is_string($login)) {
-            $add_login_pattern = ! empty($login);
+            $add_login_pattern = !empty($login);
             foreach ($data as $rout) {
-                if ( ! $add_login_pattern) {
+                if (!$add_login_pattern) {
                     break;
                 } // Логин не заполнен, обработка не требуется.
                 $is_num = preg_match_all('/^\d+$/m', $login, $matches, PREG_SET_ORDER, 0);
@@ -616,7 +616,7 @@ 
             if ($add_login_pattern && array_key_exists('X!', $rout_data_dial) && isset($dialplan['X!'])) {
                 $dialplan[$login]       = str_replace('_X!,1', "{$login},1", $dialplan['X!']);
                 $rout_data_dial[$login] = $rout_data_dial['X!'];
-            }elseif($add_login_pattern === true && $need_def_rout === true && count($data) === 1){
+            }elseif ($add_login_pattern === true && $need_def_rout === true && count($data) === 1) {
                 // Только маршрут "По умолчанию".
                 $dialplan[$login]       = str_replace('_X!,1', "{$login},1", $dialplan['X!']);
             }
@@ -627,7 +627,7 @@ 
         }
 
         foreach ($dialplan as $key => &$dpln) {
-            if ( ! array_key_exists($key, $rout_data_dial)) {
+            if (!array_key_exists($key, $rout_data_dial)) {
                 continue;
             }
             $dpln = rtrim($dpln);
@@ -636,34 +636,34 @@ 
         unset($dpln);
 
         $uniqid = is_string($provider) ? $provider : $uniqid;
-        $conf   .= "\n" . "[{$uniqid}-incoming]\n";
+        $conf .= "\n"."[{$uniqid}-incoming]\n";
         foreach ($dialplan as $dpln) {
-            $conf .= $dpln . "\n";
+            $conf .= $dpln."\n";
             if (null === $default_action && 'none' !== $provider) {
                 continue;
             }
             if ('extension' === $default_action->action) {
                 // Обязательно проверяем "DIALSTATUS", в случае с парковой через AMI вызова это необходимо.
                 // При ответе может отработать следующий приоритет.
-                $conf .= "\t" . 'same => n,Set(M_TIMEOUT=0)' . "\n";
-                if(in_array($default_action->extension, $confExtensions, true)){
+                $conf .= "\t".'same => n,Set(M_TIMEOUT=0)'."\n";
+                if (in_array($default_action->extension, $confExtensions, true)) {
                     // Это конференция. Тут не требуется обработка таймаута ответа.
                     // Вызов будет отвечен сразу конференцией.
-                    $conf .= "\t" . "same => n," . 'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?' . "Goto(internal,{$default_action->extension},1)); default action" . "\n";
-                }else {
-                    $conf .= "\t" . "same => n," . 'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?' . "Dial(Local/{$default_action->extension}@internal/n,,cTKg)); default action" . "\n";
+                    $conf .= "\t"."same => n,".'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?'."Goto(internal,{$default_action->extension},1)); default action"."\n";
+                } else {
+                    $conf .= "\t"."same => n,".'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?'."Dial(Local/{$default_action->extension}@internal/n,,cTKg)); default action"."\n";
                 }
                 foreach ($additionalModules as $appClass) {
                     $addition = $appClass->generateIncomingRoutAfterDialContext($uniqid);
-                    if (!empty($addition)){
-                         $conf .=$appClass->confBlockWithComments($addition);
+                    if (!empty($addition)) {
+                         $conf .= $appClass->confBlockWithComments($addition);
                     }
                 }
-                $conf .= " \t" . 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-after-dial-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-after-dial-custom,${EXTEN},1)' . "\n";
+                $conf .= " \t".'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-after-dial-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-after-dial-custom,${EXTEN},1)'."\n";
             } elseif ('busy' === $default_action->action) {
-                $conf .= "\t" . "same => n,Busy()" . "\n";
+                $conf .= "\t"."same => n,Busy()"."\n";
             }
-            $conf .= "\t" . "same => n,Hangup()" . "\n";
+            $conf .= "\t"."same => n,Hangup()"."\n";
         }
 
         return $conf;
@@ -679,10 +679,10 @@ 
     private function generateOutWorkTimes(&$conf): string
     {
         $conf .= "\n\n[playback-exit]\n";
-        $conf .= 'exten => _.!,1,NoOp(check time)' . "\n\t";
-        $conf .= 'same => n,Gosub(dial_outworktimes,${EXTEN},1)' . "\n\t";
-        $conf .= 'same => n,Playback(${filename})' . "\n\t";
-        $conf .= 'same => n,Hangup()' . "\n\n";
+        $conf .= 'exten => _.!,1,NoOp(check time)'."\n\t";
+        $conf .= 'same => n,Gosub(dial_outworktimes,${EXTEN},1)'."\n\t";
+        $conf .= 'same => n,Playback(${filename})'."\n\t";
+        $conf .= 'same => n,Hangup()'."\n\n";
 
         $conf .= "[check-out-work-time]\n";
         $conf .= "exten => _.!,1,NoOp(check time)\n\t";
@@ -694,9 +694,9 @@ 
         $now_year = 1 * date('Y', time());
         foreach ($data as $out_data) {
             /** @var \MikoPBX\Common\Models\OutWorkTimes $out_data */
-            if ( ! empty($out_data->date_from) && ! empty($out_data->date_to)) {
-                $year_from = 1 * date('Y', (int)$out_data->date_from);
-                $year_to   = 1 * date('Y', (int)$out_data->date_to);
+            if (!empty($out_data->date_from) && !empty($out_data->date_to)) {
+                $year_from = 1 * date('Y', (int) $out_data->date_from);
+                $year_to   = 1 * date('Y', (int) $out_data->date_to);
                 if ($now_year < $year_from || $now_year > $year_to) {
                     // Правило не актуально для текущего года.
                     continue;
@@ -733,11 +733,11 @@ 
                 $mdays  = '*';
                 $months = '*';
             } else {
-                $mdays  = strtolower(date("j", (int)$date_from));
-                $months = strtolower(date("M", (int)$date_from));
-                if ( ! empty($date_to)) {
-                    $mdays  .= "-" . strtolower(date("j", (int)$date_to));
-                    $months .= "-" . strtolower(date("M", (int)$date_to));
+                $mdays  = strtolower(date("j", (int) $date_from));
+                $months = strtolower(date("M", (int) $date_from));
+                if (!empty($date_to)) {
+                    $mdays  .= "-".strtolower(date("j", (int) $date_to));
+                    $months .= "-".strtolower(date("M", (int) $date_to));
                 }
             }
 
@@ -750,12 +750,12 @@ 
                 $res           = SoundFiles::findFirst($out_data->audio_message_id);
                 $audio_message = ($res === null) ? '' : Util::trimExtensionForFile($res->path);
 
-                $conf_out_set_var .= "[work-time-set-var-{$out_data->id}]\n" .
-                    'exten => _.!,1,Set(filename=' . $audio_message . ')' . "\n\t" .
-                    'same => n,Goto(playback-exit,${EXTEN},1)' . "\n\n";
+                $conf_out_set_var .= "[work-time-set-var-{$out_data->id}]\n".
+                    'exten => _.!,1,Set(filename='.$audio_message.')'."\n\t".
+                    'same => n,Goto(playback-exit,${EXTEN},1)'."\n\n";
 
                 $appname = 'ExecIfTime';
-                $appdata = 'Goto(work-time-set-var-' . $out_data->id . ',${EXTEN},1)';
+                $appdata = 'Goto(work-time-set-var-'.$out_data->id.',${EXTEN},1)';
             }
             $conf .= "same => n,{$appname}($times,$weekdays,$mdays,$months?{$appdata})\n\t";
         }
@@ -781,10 +781,10 @@ 
         if ($provider !== null) {
             if ($provider->type === 'SIP') {
                 $account    = Sip::findFirst('disabled="0" AND uniqid = "'.$uniqueID.'"');
-                $technology = ($account === null)?'':SIPConf::getTechnology();
+                $technology = ($account === null) ? '' : SIPConf::getTechnology();
             } elseif ($provider->type === 'IAX') {
                 $account    = Iax::findFirst('disabled="0" AND uniqid = "'.$uniqueID.'"');
-                $technology = ($account === null)?'':'IAX2';
+                $technology = ($account === null) ? '' : 'IAX2';
             }
         }
 

src/Core/Asterisk/Configs/ConferenceConf.php

Spacing +11 added lines, -11 removed lines

@@ -19,7 +19,7 @@ 
     protected function generateConfigProtected(): void
     {
         $conf = "";
-        file_put_contents($this->config->path('asterisk.astetcdir') . '/confbridge.conf', $conf);
+        file_put_contents($this->config->path('asterisk.astetcdir').'/confbridge.conf', $conf);
     }
 
     /**
@@ -32,7 +32,7 @@ 
         $conf = '';
         $data = self::getConferenceExtensions();
         foreach ($data as $conference) {
-            $conf .= "exten => {$conference},1,Goto(conference-rooms,{$conference},1)" . "\n";
+            $conf .= "exten => {$conference},1,Goto(conference-rooms,{$conference},1)"."\n";
         }
         $conf .= "\n";
 
@@ -47,7 +47,7 @@ 
         $conf = '';
         $data = self::getConferenceExtensions();
         foreach ($data as $conference) {
-            $conf .= "exten => {$conference},1,Goto(conference-rooms,{$conference},1)" . "\n";
+            $conf .= "exten => {$conference},1,Goto(conference-rooms,{$conference},1)"."\n";
         }
         $conf .= "\n";
 
@@ -72,13 +72,13 @@ 
         $conf .= "[conference-rooms] \n";
         $data = self::getConferenceExtensions();
         foreach ($data as $conference) {
-            $conf .= 'exten => ' . $conference . ',1,NoOp(---)' . "\n\t";
-            $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Hangup())' . "\n\t";
-            $conf .= 'same => n,AGI(cdr_connector.php,meetme_dial)' . "\n\t";
-            $conf .= 'same => n,Answer()' . "\n\t";
-            $conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler_meetme,s,1)' . "\n\t";
-            $conf .= 'same => n,Meetme(${EXTEN},qdMT' . $rec_options . ')' . "\n\t";
-            $conf .= 'same => n,Hangup()' . "\n\n";
+            $conf .= 'exten => '.$conference.',1,NoOp(---)'."\n\t";
+            $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Hangup())'."\n\t";
+            $conf .= 'same => n,AGI(cdr_connector.php,meetme_dial)'."\n\t";
+            $conf .= 'same => n,Answer()'."\n\t";
+            $conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler_meetme,s,1)'."\n\t";
+            $conf .= 'same => n,Meetme(${EXTEN},qdMT'.$rec_options.')'."\n\t";
+            $conf .= 'same => n,Hangup()'."\n\n";
         }
 
         return $conf;
@@ -107,7 +107,7 @@ 
     public static function getConferenceExtensions():array{
         $confExtensions = [];
         $conferences = ConferenceRooms::find(['order' => 'extension', 'columns' => 'extension'])->toArray();
-        foreach ($conferences as $conference){
+        foreach ($conferences as $conference) {
             $confExtensions[] = $conference['extension'];
         }
         return $confExtensions;

src/Core/Workers/Cron/WorkerSafeScriptsCore.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -165,7 +165,7 @@ 
             }
             if (false === $result) {
                 Processes::processPHPWorker($workerClassName);
-                Util::sysLogMsg(__CLASS__, "Service {$workerClassName} started.");
+                Util::sysLogMsg(__CLASS__, "service {$workerClassName} started.");
             }
             $time_elapsed_secs = microtime(true) - $start;
             if ($time_elapsed_secs > 10) {
@@ -233,7 +233,7 @@ 
 
             if ($res_ping === false && $level < 10) {
                 Processes::processPHPWorker($workerClassName);
-                Util::sysLogMsg(__CLASS__, "Service {$workerClassName} started.");
+                Util::sysLogMsg(__CLASS__, "service {$workerClassName} started.");
                 // Wait 1 second while service will be ready to listen requests
                 sleep(1);
 

Spacing +6 added lines, -6 removed lines

@@ -44,7 +44,7 @@ 
     {
         $arrWorkers = $this->prepareWorkersList();
         ReactKernel::start(
-            function () use ($arrWorkers) {
+            function() use ($arrWorkers) {
                 // Parallel execution https://github.com/recoilphp/recoil
                 foreach ($arrWorkers as $workersWithCurrentType) {
                     foreach ($workersWithCurrentType as $worker) {
@@ -63,7 +63,7 @@ 
      */
     private function prepareWorkersList(): array
     {
-        $arrWorkers        = [
+        $arrWorkers = [
             self::CHECK_BY_AMI           =>
                 [
                     WorkerAmiListener::class,
@@ -110,7 +110,7 @@ 
      */
     public function restartWorker($workerClassName): ?Generator
     {
-        Processes::processPHPWorker($workerClassName, 'start','restart');
+        Processes::processPHPWorker($workerClassName, 'start', 'restart');
         yield;
     }
 
@@ -126,7 +126,7 @@ 
         PBX::waitFullyBooted();
         $arrWorkers = $this->prepareWorkersList();
         ReactKernel::start(
-            function () use ($arrWorkers) {
+            function() use ($arrWorkers) {
                 // Parallel execution https://github.com/recoilphp/recoil
                 foreach ($arrWorkers as $workerType => $workersWithCurrentType) {
                     foreach ($workersWithCurrentType as $worker) {
@@ -177,7 +177,7 @@ 
         } catch (Throwable $e) {
             global $errorLogger;
             $errorLogger->captureException($e);
-            Util::sysLogMsg($workerClassName . '_EXCEPTION', $e->getMessage());
+            Util::sysLogMsg($workerClassName.'_EXCEPTION', $e->getMessage());
         }
         yield;
     }
@@ -250,7 +250,7 @@ 
         } catch (Throwable $e) {
             global $errorLogger;
             $errorLogger->captureException($e);
-            Util::sysLogMsg($workerClassName . '_EXCEPTION', $e->getMessage());
+            Util::sysLogMsg($workerClassName.'_EXCEPTION', $e->getMessage());
         }
         yield;
     }

src/Core/System/Network.php

Spacing +64 added lines, -64 removed lines

@@ -29,7 +29,7 @@ 
         }
 
         Processes::killByName('pcapsipdump');
-        $log_dir = System::getLogDir() . '/pcapsipdump';
+        $log_dir = System::getLogDir().'/pcapsipdump';
         Util::mwMkdir($log_dir);
 
         $network         = new Network();
@@ -38,7 +38,7 @@ 
         foreach ($arr_eth as $eth) {
             $pid_file = "/var/run/pcapsipdump_{$eth}.pid";
             Processes::mwExecBg(
-                $pcapsipdumpPath . ' -T 120 -P ' . $pid_file . ' -i ' . $eth . ' -m \'^(INVITE|REGISTER)$\' -L ' . $log_dir . '/dump.db'
+                $pcapsipdumpPath.' -T 120 -P '.$pid_file.' -i '.$eth.' -m \'^(INVITE|REGISTER)$\' -L '.$log_dir.'/dump.db'
             );
         }
     }
@@ -146,10 +146,10 @@ 
         /** @var \MikoPBX\Common\Models\LanInterfaces $res */
         $res = LanInterfaces::findFirst("internet = '1'");
         if (null !== $res) {
-            if ( ! empty($res->primarydns) && '127.0.0.1' != $res->primarydns) {
+            if (!empty($res->primarydns) && '127.0.0.1' != $res->primarydns) {
                 $dns[] = $res->primarydns;
             }
-            if ( ! empty($res->secondarydns) && '127.0.0.1' != $res->secondarydns) {
+            if (!empty($res->secondarydns) && '127.0.0.1' != $res->secondarydns) {
                 $dns[] = $res->secondarydns;
             }
         }
@@ -165,39 +165,39 @@ 
     public function generatePdnsdConfig($named_dns): void
     {
         $tempDir   = $this->di->getShared('config')->path('core.tempDir');
-        $cache_dir = $tempDir . '/pdnsd/cache';
+        $cache_dir = $tempDir.'/pdnsd/cache';
         Util::mwMkdir($cache_dir);
 
-        $conf = 'global {' . "\n" .
-            '	perm_cache=10240;' . "\n" .
-            '	cache_dir="' . $cache_dir . '";' . "\n" .
-            '	pid_file = /var/run/pdnsd.pid;' . "\n" .
-            '	run_as="nobody";' . "\n" .
-            '	server_ip = 127.0.0.1;' . "\n" .
-            '	status_ctl = on;' . "\n" .
-            '	query_method=udp_tcp;' . "\n" .
-            '	min_ttl=15m;' . "\n" .
-            '	max_ttl=1w;' . "\n" .
-            '	timeout=10;' . "\n" .
-            '	neg_domain_pol=on;' . "\n" .
-            '	run_as=root;' . "\n" .
-            '	daemon=on;' . "\n" .
-            '}' . "\n" .
-            'server {' . "\n" .
-            '	label = "main";' . "\n" .
-            '	ip = ' . implode(', ', $named_dns) . ';' . "\n" .
-            '	interface=lo;' . "\n" .
-            '	uptest=if;' . "\n" .
-            '	interval=10m;' . "\n" .
-            '	purge_cache=off;' . "\n" .
+        $conf = 'global {'."\n".
+            '	perm_cache=10240;'."\n".
+            '	cache_dir="'.$cache_dir.'";'."\n".
+            '	pid_file = /var/run/pdnsd.pid;'."\n".
+            '	run_as="nobody";'."\n".
+            '	server_ip = 127.0.0.1;'."\n".
+            '	status_ctl = on;'."\n".
+            '	query_method=udp_tcp;'."\n".
+            '	min_ttl=15m;'."\n".
+            '	max_ttl=1w;'."\n".
+            '	timeout=10;'."\n".
+            '	neg_domain_pol=on;'."\n".
+            '	run_as=root;'."\n".
+            '	daemon=on;'."\n".
+            '}'."\n".
+            'server {'."\n".
+            '	label = "main";'."\n".
+            '	ip = '.implode(', ', $named_dns).';'."\n".
+            '	interface=lo;'."\n".
+            '	uptest=if;'."\n".
+            '	interval=10m;'."\n".
+            '	purge_cache=off;'."\n".
             '}';
 
-        $pdnsdConfFile  = '/etc/pdnsd.conf';
+        $pdnsdConfFile = '/etc/pdnsd.conf';
         $savedConf = '';
-        if(file_exists($pdnsdConfFile)){
+        if (file_exists($pdnsdConfFile)) {
             $savedConf = file_get_contents($pdnsdConfFile);
         }
-        if($savedConf != $conf){
+        if ($savedConf != $conf) {
             file_put_contents($pdnsdConfFile, $conf);
         }
         $pdnsdPath = Util::which('pdnsd');
@@ -205,7 +205,7 @@ 
         if (!empty($pid) && $savedConf === $conf) {
             // Выполним дополнительную проверку, работает ли сервер.
             $resultResolve = gethostbynamel('lic.miko.ru');
-            if($resultResolve !== false){
+            if ($resultResolve !== false) {
                 // Ничего делать не нужно. Конфиг не изменился. Рестарт не требуется.
                 return;
             }
@@ -282,7 +282,7 @@ 
                  */
                 $pid_file = "/var/run/udhcpc_{$if_name}";
                 $pid_pcc  = Processes::getPidOfProcess($pid_file);
-                if ( ! empty($pid_pcc) && file_exists($pid_file)) {
+                if (!empty($pid_pcc) && file_exists($pid_file)) {
                     // Завершаем старый процесс.
                     $killPath = Util::which('kill');
                     $catPath  = Util::which('cat');
@@ -411,10 +411,10 @@ 
 
             $result = [''];
             if (file_exists('/etc/static-routes')) {
-                $command = "{$catPath} /etc/static-routes " .
-                    "| {$grepPath} '^rout' " .
-                    "| {$busyboxPath} awk -F ';' '{print $1}' " .
-                    "| {$grepPath} '{$if_name}\$' " .
+                $command = "{$catPath} /etc/static-routes ".
+                    "| {$grepPath} '^rout' ".
+                    "| {$busyboxPath} awk -F ';' '{print $1}' ".
+                    "| {$grepPath} '{$if_name}\$' ".
                     "| {$awkPath} -F 'dev {$if_name}' '{ print $1 }'";
                 Processes::mwExec($command, $result);
             }
@@ -424,19 +424,19 @@ 
 
             if ($if_data['vlanid'] > 0) {
                 // Пока только статика.
-                $lan_config = "auto {$if_data['interface_orign']}.{$if_data['vlanid']}\n" .
-                    "iface {$if_data['interface_orign']}.{$if_data['vlanid']} inet static \n" .
-                    "address {$ipaddr}\n" .
-                    "netmask {$subnet}\n" .
-                    "gateway {$gateway}\n" .
-                    "dns-nameservers 127.0.0.1\n" .
-                    "vlan_raw_device {$if_data['interface_orign']}\n" .
-                    "{$routs_add}\n" .
+                $lan_config = "auto {$if_data['interface_orign']}.{$if_data['vlanid']}\n".
+                    "iface {$if_data['interface_orign']}.{$if_data['vlanid']} inet static \n".
+                    "address {$ipaddr}\n".
+                    "netmask {$subnet}\n".
+                    "gateway {$gateway}\n".
+                    "dns-nameservers 127.0.0.1\n".
+                    "vlan_raw_device {$if_data['interface_orign']}\n".
+                    "{$routs_add}\n".
                     "{$routs_rem}\n";
             } elseif (trim($if_data['dhcp']) === '1') {
-                $lan_config = "auto {$if_name}\n" .
-                    "iface {$if_name} inet dhcp\n" .
-                    "{$routs_add}\n" .
+                $lan_config = "auto {$if_name}\n".
+                    "iface {$if_name} inet dhcp\n".
+                    "{$routs_add}\n".
                     "{$routs_rem}\n";
             } else {
                 if (empty($ipaddr)) {
@@ -449,13 +449,13 @@ 
                     echo "Caught exception: $ipaddr $subnet", $e->getMessage(), "\n";
                     continue;
                 }
-                $lan_config = "auto {$if_name}\n" .
-                    "iface {$if_name} inet static\n" .
-                    "address {$ipaddr}\n" .
-                    "netmask {$subnet}\n" .
-                    "gateway {$gateway}\n" .
-                    "dns-nameservers 127.0.0.1\n" .
-                    "{$routs_add}\n" .
+                $lan_config = "auto {$if_name}\n".
+                    "iface {$if_name} inet static\n".
+                    "address {$ipaddr}\n".
+                    "netmask {$subnet}\n".
+                    "gateway {$gateway}\n".
+                    "dns-nameservers 127.0.0.1\n".
+                    "{$routs_add}\n".
                     "{$routs_rem}\n";
             }
             file_put_contents("/etc/network/interfaces.d/{$if_name}", $lan_config);
@@ -546,7 +546,7 @@ 
         $net_mask = explode(".", $net_mask);
 
         foreach ($net_mask as $oct_ect) {
-            $bits += strlen(str_replace("0", "", decbin((int)$oct_ect)));
+            $bits += strlen(str_replace("0", "", decbin((int) $oct_ect)));
         }
 
         return $bits;
@@ -609,7 +609,7 @@ 
         $data->hostname  = 'mikopbx';
         $data->domain    = '';
         $data->topology  = 'private';
-        $data->primarydns= '';
+        $data->primarydns = '';
         $data->save();
 
         return $data->toArray();
@@ -630,15 +630,15 @@ 
     public function hostnameConfigure(): void
     {
         $data       = Network::getHostName();
-        $hosts_conf = "127.0.0.1 localhost\n" .
+        $hosts_conf = "127.0.0.1 localhost\n".
             "127.0.0.1 {$data['hostname']}\n";
-        if ( ! empty($data['domain'])) {
+        if (!empty($data['domain'])) {
             $hosts_conf .= "127.0.0.1 {$data['hostname']}.{$data['domain']}\n";
         }
         Util::fileWriteContent('/etc/hosts', $hosts_conf);
 
         $hostnamePath = Util::which('hostname');
-        Processes::mwExec($hostnamePath . ' ' . escapeshellarg("{$data['hostname']}"));
+        Processes::mwExec($hostnamePath.' '.escapeshellarg("{$data['hostname']}"));
     }
 
     /**
@@ -652,12 +652,12 @@ 
 
         $pidFile = '/var/run/openvpn.pid';
         $pid     = Processes::getPidOfProcess('openvpn');
-        if ( ! empty($pid)) {
+        if (!empty($pid)) {
             // Завершаем процесс.
             $busyboxPath = Util::which('busybox');
             Processes::mwExec("{$busyboxPath} kill '$pid'");
         }
-        if ( ! empty($data)) {
+        if (!empty($data)) {
             $openvpnPath = Util::which('openvpn');
             Processes::mwExecBg("{$openvpnPath} --config /etc/openvpn.ovpn --writepid {$pidFile}", '/dev/null', 5);
         }
@@ -867,12 +867,12 @@ 
         if ($res === null) {
             return;
         }
-        if (empty($res->primarydns) && ! empty($data['primarydns'])) {
+        if (empty($res->primarydns) && !empty($data['primarydns'])) {
             $res->writeAttribute('primarydns', $data['primarydns']);
         } elseif (empty($res->secondarydns) && $res->primarydns !== $data['primarydns']) {
             $res->writeAttribute('secondarydns', $data['primarydns']);
         }
-        if (empty($res->secondarydns) && ! empty($data['secondarydns'])) {
+        if (empty($res->secondarydns) && !empty($data['secondarydns'])) {
             $res->writeAttribute('secondarydns', $data['secondarydns']);
         }
         $res->save();
@@ -915,7 +915,7 @@ 
     {
         // Настройка по умолчанию.
         $interface = trim(getenv('interface'));
-        if ( ! Util::isSystemctl()) {
+        if (!Util::isSystemctl()) {
             // Для MIKO LFS Edition.
             $busyboxPath = Util::which('busybox');
             Processes::mwExec("{$busyboxPath} ifconfig $interface 192.168.2.1 netmask 255.255.255.0");

src/Core/System/BeanstalkClient.php

Spacing +11 added lines, -11 removed lines

@@ -48,7 +48,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;
         }
 
@@ -102,7 +102,7 @@ 
                 $this->queue->delete($job);
             }
         } catch (Throwable $exception) {
-            Util::sysLogMsg(__METHOD__, 'Exception: ' . $exception->getMessage());
+            Util::sysLogMsg(__METHOD__, 'Exception: '.$exception->getMessage());
             if ($job !== null) {
                 $this->queue->bury($job);
             }
@@ -134,7 +134,7 @@ 
     ): Job {
         $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);
@@ -159,10 +159,10 @@ 
                 $queueStats = $this->queue->stats()->getArrayCopy();
 
                 // Delete buried jobs
-                $countBuried=$queueStats['current-jobs-buried'];
+                $countBuried = $queueStats['current-jobs-buried'];
                 while ($job = $this->queue->peekBuried()) {
                     $countBuried--;
-                    if ($countBuried<0){
+                    if ($countBuried < 0) {
                         break;
                     }
                     $id = $job->getId();
@@ -171,23 +171,23 @@ 
                 }
 
                 // Delete outdated jobs
-                $countReady=$queueStats['current-jobs-ready'];
+                $countReady = $queueStats['current-jobs-ready'];
                 while ($job = $this->queue->peekReady()) {
                     $countReady--;
-                    if ($countReady<0){
+                    if ($countReady < 0) {
                         break;
                     }
                     $id = $job->getId();
                     $jobStats = $this->queue->statsJob($job)->getArrayCopy();
-                    $age                   = (int)$jobStats['age'];
-                    $expectedTimeToExecute = (int)$jobStats['ttr'] * 2;
+                    $age                   = (int) $jobStats['age'];
+                    $expectedTimeToExecute = (int) $jobStats['ttr'] * 2;
                     if ($age > $expectedTimeToExecute) {
                         $this->queue->delete($job);
                         Util::sysLogMsg(__METHOD__, "Deleted outdated job with ID {$id} from {$tube}");
                     }
                 }
             } catch (Throwable $exception) {
-                Util::sysLogMsg(__METHOD__, 'Exception: ' . $exception->getMessage());
+                Util::sysLogMsg(__METHOD__, 'Exception: '.$exception->getMessage());
             }
         }
     }
@@ -220,7 +220,7 @@ 
         try {
             $job = $this->queue->reserveWithTimeout($timeout);
         } catch (Throwable $exception) {
-            Util::sysLogMsg(__METHOD__, 'Exception: ' . $exception->getMessage());
+            Util::sysLogMsg(__METHOD__, 'Exception: '.$exception->getMessage());
         }
 
         if ($job === null) {

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;
 
@@ -203,7 +203,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();
@@ -219,7 +219,7 @@ 
      */
     public static function sipReload():void
     {
-        $di     = Di::getDefault();
+        $di = Di::getDefault();
         if ($di === null) {
             return;
         }
@@ -235,7 +235,7 @@ 
             Processes::mwExec("{$asteriskPath} -rx 'module reload acl'");
             Processes::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);
             // Завершаем каналы.
             Processes::mwExec("{$asteriskPath} -rx 'channel request hangup all'");
             usleep(500000);
@@ -248,7 +248,7 @@ 
      */
     public static function iaxReload(): void
     {
-        $iax    = new IAXConf();
+        $iax = new IAXConf();
         $iax->generateConfig();
         $asteriskPath = Util::which('asterisk');
         Processes::mwExec("{$asteriskPath} -rx 'iax2 reload'");
@@ -305,7 +305,7 @@ 
             'result' => 'ERROR',
         ];
 
-        if ( ! $this->di->getShared('registry')->booting) {
+        if (!$this->di->getShared('registry')->booting) {
             $this->stop();
         }
         /**
@@ -321,7 +321,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/System/Storage.php

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -460,17 +460,17 @@
             $test_alert = '';
             if ($free < 5) {
                 $need_alert = true;
-                $test_alert = "The {$disk['id']} has less than 5% of free space available.";
+                $test_alert = "the {$disk['id']} has less than 5% of free space available.";
             }
 
             if ($disk['free_space'] < 500) {
                 $need_alert = true;
-                $test_alert = "The {$disk['id']} has less than 500MB of free space available.";
+                $test_alert = "the {$disk['id']} has less than 500MB of free space available.";
             }
 
             if ($disk['free_space'] < 100) {
                 $need_alert = true;
-                $test_alert = "The {$disk['id']} has less than 100MB of free space available. Old call records will be deleted.";
+                $test_alert = "the {$disk['id']} has less than 100MB of free space available. Old call records will be deleted.";
                 Processes::processPHPWorker(WorkerRemoveOldRecords::class);
             }
 

Spacing +62 added lines, -62 removed lines

@@ -73,16 +73,16 @@ 
     public static function isStorageDisk($device): bool
     {
         $result = false;
-        if ( ! file_exists("{$device}")) {
+        if (!file_exists("{$device}")) {
             return $result;
         }
 
-        $tmp_dir = '/tmp/mnt_' . time();
+        $tmp_dir = '/tmp/mnt_'.time();
         Util::mwMkdir($tmp_dir);
         $out = [];
 
         $storage  = new Storage();
-        $uid_part = 'UUID=' . $storage->getUuid($device) . '';
+        $uid_part = 'UUID='.$storage->getUuid($device).'';
         $format   = $storage->getFsType($device);
         if ($format === '') {
             return false;
@@ -101,7 +101,7 @@ 
             Processes::mwExec("{$umountPath} {$device}");
         }
 
-        if ( ! self::isStorageDiskMounted($device)) {
+        if (!self::isStorageDiskMounted($device)) {
             Processes::mwExec("{$rmPath} -rf '{$tmp_dir}'");
         }
 
@@ -231,9 +231,9 @@ 
         $timeoutPath = Util::which('timeout');
         $sshfsPath   = Util::which('sshfs');
 
-        $command = "{$timeoutPath} -t 3 {$sshfsPath} -p {$port} -o nonempty -o password_stdin -o 'StrictHostKeyChecking=no' " .
-            "{$user}@{$host}:{$remout_dir} {$local_dir} << EOF\n" .
-            "{$pass}\n" .
+        $command = "{$timeoutPath} -t 3 {$sshfsPath} -p {$port} -o nonempty -o password_stdin -o 'StrictHostKeyChecking=no' ".
+            "{$user}@{$host}:{$remout_dir} {$local_dir} << EOF\n".
+            "{$pass}\n".
             "EOF\n";
         // file_put_contents('/tmp/sshfs_'.$host, $command);
         Processes::mwExec($command, $out);
@@ -265,19 +265,19 @@ 
 
         // Собираем строку подключения к ftp.
         $auth_line = '';
-        if ( ! empty($user)) {
-            $auth_line .= 'user="' . $user;
-            if ( ! empty($pass)) {
+        if (!empty($user)) {
+            $auth_line .= 'user="'.$user;
+            if (!empty($pass)) {
                 $auth_line .= ":{$pass}";
             }
             $auth_line .= '",';
         }
 
-        $connect_line = 'ftp://' . $host;
-        if ( ! empty($port)) {
+        $connect_line = 'ftp://'.$host;
+        if (!empty($port)) {
             $connect_line .= ":{$port}";
         }
-        if ( ! empty($remout_dir)) {
+        if (!empty($remout_dir)) {
             $connect_line .= "$remout_dir";
         }
 
@@ -303,10 +303,10 @@ 
      */
     public static function mkfs_disk($dev)
     {
-        if ( ! file_exists($dev)) {
+        if (!file_exists($dev)) {
             $dev = "/dev/{$dev}";
         }
-        if ( ! file_exists($dev)) {
+        if (!file_exists($dev)) {
             return false;
         }
         $dir = '';
@@ -341,7 +341,7 @@ 
             Processes::mwExec("/sbin/shell_functions.sh 'killprocesses' '$dir' -TERM 0");
             Processes::mwExec("{$umountPath} {$dir}");
         }
-        $result = ! self::isStorageDiskMounted($dir);
+        $result = !self::isStorageDiskMounted($dir);
         if ($result && file_exists($dir)) {
             // Если диск не смонтирован, то удаляем каталог.
             Processes::mwExec("{$rmPath} -rf '{$dir}'");
@@ -411,7 +411,7 @@ 
      */
     public static function statusMkfs($dev): string
     {
-        if ( ! file_exists($dev)) {
+        if (!file_exists($dev)) {
             $dev = "/dev/{$dev}";
         }
         $out      = [];
@@ -434,7 +434,7 @@ 
         }
         $config        = $di->getShared('config');
         $phpSessionDir = $config->path('www.phpSessionDir');
-        if ( ! empty($phpSessionDir)) {
+        if (!empty($phpSessionDir)) {
             $rmPath = Util::which('rm');
             Processes::mwExec("{$rmPath} -rf {$phpSessionDir}/*");
         }
@@ -450,7 +450,7 @@ 
         // Создание больщого файла для тестов.
         // head -c 1500MB /dev/urandom > /storage/usbdisk1/big_file.mp3
         foreach ($hdd as $disk) {
-            if ($disk['sys_disk'] === true && ! self::isStorageDiskMounted("{$disk['id']}4")) {
+            if ($disk['sys_disk'] === true && !self::isStorageDiskMounted("{$disk['id']}4")) {
                 // Это системный диск (4ый раздел). Он не смонтирован.
                 continue;
             }
@@ -474,7 +474,7 @@ 
                 Processes::processPHPWorker(WorkerRemoveOldRecords::class);
             }
 
-            if ( ! $need_alert) {
+            if (!$need_alert) {
                 continue;
             }
 
@@ -514,8 +514,8 @@ 
                 $m_size      = round(($disk_data[1] + $disk_data[2]) / 1024, 1);
                 $res_disks[] = [
                     'id'         => $disk_data[0],
-                    'size'       => "" . $m_size,
-                    'size_text'  => "" . $m_size . " Mb",
+                    'size'       => "".$m_size,
+                    'size_text'  => "".$m_size." Mb",
                     'vendor'     => 'Debian',
                     'mounted'    => '/storage/usbdisk1',
                     'free_space' => round($disk_data[2] / 1024, 1),
@@ -537,8 +537,8 @@ 
 
         $cf_disk   = '';
         $varEtcDir = $this->config->path('core.varEtcDir');
-        if (file_exists($varEtcDir . '/cfdevice')) {
-            $cf_disk = trim(file_get_contents($varEtcDir . '/cfdevice'));
+        if (file_exists($varEtcDir.'/cfdevice')) {
+            $cf_disk = trim(file_get_contents($varEtcDir.'/cfdevice'));
         }
 
         foreach ($disks as $disk) {
@@ -554,8 +554,8 @@ 
             $sys_disk = ($cf_disk == $disk);
 
             $mb_size = 0;
-            if (is_file("/sys/block/" . $disk . "/size")) {
-                $original_size = trim(file_get_contents("/sys/block/" . $disk . "/size"));
+            if (is_file("/sys/block/".$disk."/size")) {
+                $original_size = trim(file_get_contents("/sys/block/".$disk."/size"));
                 $original_size = ($original_size * 512 / 1024 / 1024);
                 $mb_size       = $original_size;
             }
@@ -662,14 +662,14 @@ 
     private function getVendorDisk($disk): string
     {
         $temp_vendor = [];
-        if (is_file("/sys/block/" . $disk . "/device/vendor")) {
-            $data = trim(file_get_contents("/sys/block/" . $disk . "/device/vendor"));
+        if (is_file("/sys/block/".$disk."/device/vendor")) {
+            $data = trim(file_get_contents("/sys/block/".$disk."/device/vendor"));
             if ($data != '') {
                 $temp_vendor[] = trim(str_replace(',', ' ', $data));
             }
         }
-        if (is_file("/sys/block/" . $disk . "/device/model")) {
-            $data = trim(file_get_contents("/sys/block/" . $disk . "/device/model"));
+        if (is_file("/sys/block/".$disk."/device/model")) {
+            $data = trim(file_get_contents("/sys/block/".$disk."/device/model"));
             if ($data != '') {
                 $temp_vendor[] = trim(str_replace(',', ' ', $data));
             }
@@ -677,8 +677,8 @@ 
         if (count($temp_vendor) == 0) {
             $temp_vendor[] = $disk;
         }
-        if (is_file("/sys/block/" . $disk . "/device/type")) {
-            $data = trim(file_get_contents("/sys/block/" . $disk . "/device/type"));
+        if (is_file("/sys/block/".$disk."/device/type")) {
+            $data = trim(file_get_contents("/sys/block/".$disk."/device/type"));
             if ($data != '') {
                 $temp_vendor[] = trim(str_replace(',', ' ', $data));
             }
@@ -704,7 +704,7 @@ 
         Processes::mwExec("{$dfPath} -m | {$grepPath} {$hdd} | {$awkPath} '{print $4}'", $out);
         $result = 0;
         foreach ($out as $res) {
-            if ( ! is_numeric($res)) {
+            if (!is_numeric($res)) {
                 continue;
             }
             $result += (1 * $res);
@@ -741,19 +741,19 @@ 
                 $path_size_info = $tmp_path;
             }
             if (empty($path_size_info)) {
-                $tmp_path = "/sys/block/" . substr($dev, 0, 3) . "/{$dev}/size";
+                $tmp_path = "/sys/block/".substr($dev, 0, 3)."/{$dev}/size";
                 if (file_exists($tmp_path)) {
                     $path_size_info = $tmp_path;
                 }
             }
 
-            if ( ! empty($path_size_info)) {
+            if (!empty($path_size_info)) {
                 $original_size = trim(file_get_contents($path_size_info));
                 $original_size = ($original_size * 512 / 1024 / 1024);
                 $mb_size       = $original_size;
             }
 
-            $tmp_dir = "/tmp/{$dev}_" . time();
+            $tmp_dir = "/tmp/{$dev}_".time();
             $out     = [];
 
             $fs           = null;
@@ -810,7 +810,7 @@ 
         }
         Util::mwMkdir($dir);
 
-        if ( ! file_exists($dir)) {
+        if (!file_exists($dir)) {
             Util::sysLogMsg('Storage', "Unable mount $dev $format to $dir. Unable create dir.");
 
             return false;
@@ -821,7 +821,7 @@ 
             Processes::mwExec("{$mountNtfs3gPath} /dev/{$dev} {$dir}", $out);
         } else {
             $storage   = new Storage();
-            $uid_part  = 'UUID=' . $storage->getUuid("/dev/{$dev}") . '';
+            $uid_part  = 'UUID='.$storage->getUuid("/dev/{$dev}").'';
             $mountPath = Util::which('mount');
             Processes::mwExec("{$mountPath} -t {$format} {$uid_part} {$dir}", $out);
         }
@@ -841,8 +841,8 @@ 
             unlink($storage_dev_file);
         }
 
-        if (file_exists($varEtcDir . '/cfdevice')) {
-            $cf_disk = trim(file_get_contents($varEtcDir . '/cfdevice'));
+        if (file_exists($varEtcDir.'/cfdevice')) {
+            $cf_disk = trim(file_get_contents($varEtcDir.'/cfdevice'));
         }
 
         $disks = $this->getDiskSettings();
@@ -856,18 +856,18 @@ 
                 // Если это системный диск, то пытаемся подключить раздел 4.
                 $dev = "{$disk['device']}4";
             }
-            if ( ! $this->hddExists($dev)) {
+            if (!$this->hddExists($dev)) {
                 // Диск не существует.
                 continue;
             }
-            if ($disk['media'] === '1' || ! file_exists($storage_dev_file)) {
+            if ($disk['media'] === '1' || !file_exists($storage_dev_file)) {
                 file_put_contents($storage_dev_file, "/storage/usbdisk{$disk['id']}");
                 $this->updateConfigWithNewMountPoint("/storage/usbdisk{$disk['id']}");
             }
 
-            $str_uid     = 'UUID=' . $this->getUuid($dev) . '';
+            $str_uid     = 'UUID='.$this->getUuid($dev).'';
             $format_p4   = $this->getFsType($dev);
-            $conf        .= "{$str_uid} /storage/usbdisk{$disk['id']} {$format_p4} async,rw 0 0\n";
+            $conf .= "{$str_uid} /storage/usbdisk{$disk['id']} {$format_p4} async,rw 0 0\n";
             $mount_point = "/storage/usbdisk{$disk['id']}";
             Util::mwMkdir($mount_point);
         }
@@ -979,11 +979,11 @@ 
         Util::mwMkdir('/storage');
         $chmodPath = Util::which('chmod');
         Processes::mwExec("{$chmodPath} 755 /storage");
-        if ( ! file_exists($varEtcDir . '/cfdevice')) {
+        if (!file_exists($varEtcDir.'/cfdevice')) {
             return;
         }
         $fstab     = '';
-        $file_data = file_get_contents($varEtcDir . '/cfdevice');
+        $file_data = file_get_contents($varEtcDir.'/cfdevice');
         $cf_disk   = trim($file_data);
         if ('' == $cf_disk) {
             return;
@@ -993,9 +993,9 @@ 
         $part3 = (strpos($cf_disk, 'mmcblk') !== false) ? "{$cf_disk}p3" : "{$cf_disk}3"; // Conf
 
 
-        $uid_part2 = 'UUID=' . $this->getUuid("/dev/{$part2}") . '';
+        $uid_part2 = 'UUID='.$this->getUuid("/dev/{$part2}").'';
         $format_p2 = $this->getFsType($part2);
-        $uid_part3 = 'UUID=' . $this->getUuid("/dev/{$part3}") . '';
+        $uid_part3 = 'UUID='.$this->getUuid("/dev/{$part3}").'';
         $format_p3 = $this->getFsType($part3);
 
         // $fstab .= "/dev/{$part1} /cf msdos ro 1 1\n"; // НЕ МОНТИРУЕМ!
@@ -1040,12 +1040,12 @@ 
             }
         }
 
-        if ( ! empty($path)) {
+        if (!empty($path)) {
             Util::mwMkdir($path);
         }
 
         $downloadCacheDir = appPath('sites/pbxcore/files/cache');
-        if ( ! $isLiveCd) {
+        if (!$isLiveCd) {
             Util::mwMkdir($downloadCacheDir);
             Util::createUpdateSymlink($this->config->path('www.downloadCacheDir'), $downloadCacheDir);
         }
@@ -1083,13 +1083,13 @@ 
     public function createAssetsSymlinks(): void
     {
         $jsCacheDir = appPath('sites/admin-cabinet/assets/js/cache');
-        Util::createUpdateSymlink($this->config->path('adminApplication.assetsCacheDir') . '/js', $jsCacheDir);
+        Util::createUpdateSymlink($this->config->path('adminApplication.assetsCacheDir').'/js', $jsCacheDir);
 
         $cssCacheDir = appPath('sites/admin-cabinet/assets/css/cache');
-        Util::createUpdateSymlink($this->config->path('adminApplication.assetsCacheDir') . '/css', $cssCacheDir);
+        Util::createUpdateSymlink($this->config->path('adminApplication.assetsCacheDir').'/css', $cssCacheDir);
 
         $imgCacheDir = appPath('sites/admin-cabinet/assets/img/cache');
-        Util::createUpdateSymlink($this->config->path('adminApplication.assetsCacheDir') . '/img', $imgCacheDir);
+        Util::createUpdateSymlink($this->config->path('adminApplication.assetsCacheDir').'/img', $imgCacheDir);
     }
 
     /**
@@ -1102,13 +1102,13 @@ 
         $cacheDirs[] = $this->config->path('www.downloadCacheDir');
         $cacheDirs[] = $this->config->path('www.managedCacheDir');
         $cacheDirs[] = $this->config->path('www.modelsCacheDir');
-        $cacheDirs[] = $this->config->path('adminApplication.assetsCacheDir') . '/js';
-        $cacheDirs[] = $this->config->path('adminApplication.assetsCacheDir') . '/css';
-        $cacheDirs[] = $this->config->path('adminApplication.assetsCacheDir') . '/img';
+        $cacheDirs[] = $this->config->path('adminApplication.assetsCacheDir').'/js';
+        $cacheDirs[] = $this->config->path('adminApplication.assetsCacheDir').'/css';
+        $cacheDirs[] = $this->config->path('adminApplication.assetsCacheDir').'/img';
         $cacheDirs[] = $this->config->path('adminApplication.voltCacheDir');
         $rmPath      = Util::which('rm');
         foreach ($cacheDirs as $cacheDir) {
-            if ( ! empty($cacheDir)) {
+            if (!empty($cacheDir)) {
                 Processes::mwExec("{$rmPath} -rf {$cacheDir}/*");
             }
         }
@@ -1218,7 +1218,7 @@ 
         $countBlock = $swapSize * $bs;
         $ddCmd      = Util::which('dd');
 
-        Util::sysLogMsg('Swap', 'make swap ' . $swapFile, LOG_INFO, LOG_INFO);
+        Util::sysLogMsg('Swap', 'make swap '.$swapFile, LOG_INFO, LOG_INFO);
         Processes::mwExec("{$ddCmd} if=/dev/zero of={$swapFile} bs={$bs} count={$countBlock}");
 
         $mkSwapCmd = Util::which('mkswap');
@@ -1226,7 +1226,7 @@ 
 
         $swapOnCmd = Util::which('swapon');
         $result    = Processes::mwExec("{$swapOnCmd} {$swapFile}");
-        Util::sysLogMsg('Swap', 'connect swap result: ' . $result, LOG_INFO, LOG_INFO);
+        Util::sysLogMsg('Swap', 'connect swap result: '.$result, LOG_INFO, LOG_INFO);
     }
 
     /**
@@ -1239,7 +1239,7 @@ 
         $size    = 0;
         $mntDir  = '';
         $mounted = self::isStorageDiskMounted('', $mntDir);
-        if ( ! $mounted) {
+        if (!$mounted) {
             return 0;
         }
         $hd = $this->getAllHdd(true);
@@ -1260,12 +1260,12 @@ 
      */
     public function saveDiskSettings($data, $id = '1'): void
     {
-        if ( ! is_array($data)) {
+        if (!is_array($data)) {
             return;
         }
         $disk_data = $this->getDiskSettings($id);
         if (count($disk_data) === 0) {
-            $uniqid           = strtoupper('STORAGE-DISK-' . md5(time()));
+            $uniqid           = strtoupper('STORAGE-DISK-'.md5(time()));
             $storage_settings = new StorageModel();
             foreach ($data as $key => $val) {
                 $storage_settings->writeAttribute($key, $val);

src/Core/System/Util.php

Spacing +26 added lines, -26 removed lines

@@ -47,7 +47,7 @@ 
             }
             if (is_array($value)) {
                 array_unshift($value, ' ');
-                $result_config .= trim(implode("\n{$key} = ", $value)) . "\n";
+                $result_config .= trim(implode("\n{$key} = ", $value))."\n";
             } else {
                 $result_config .= "{$key} = {$value}\n";
             }
@@ -69,7 +69,7 @@ 
     public static function amiOriginate($peer_number, $peer_mobile, $dest_number): array
     {
         $am       = self::getAstManager('off');
-        $channel  = 'Local/' . $peer_number . '@internal-originate';
+        $channel  = 'Local/'.$peer_number.'@internal-originate';
         $context  = 'all_peers';
         $IS_ORGNT = self::generateRandomString();
         $variable = "_IS_ORGNT={$IS_ORGNT},pt1c_cid={$dest_number},_extenfrom1c={$peer_number},__peer_mobile={$peer_mobile},_FROM_PEER={$peer_number}";
@@ -336,10 +336,10 @@ 
     public static function trimExtensionForFile($filename, $delimiter = '.'): string
     {
         // Отсечем расширение файла.
-        $tmp_arr = explode((string)$delimiter, $filename);
+        $tmp_arr = explode((string) $delimiter, $filename);
         if (count($tmp_arr) > 1) {
             unset($tmp_arr[count($tmp_arr) - 1]);
-            $filename = implode((string)$delimiter, $tmp_arr);
+            $filename = implode((string) $delimiter, $tmp_arr);
         }
 
         return $filename;
@@ -418,7 +418,7 @@ 
      */
     public static function mwExec($command, &$outArr = null, &$retVal = null): int
     {
-        self::sysLogMsg('Util', 'Deprecated call ' . __METHOD__ . ' from ' . static::class);
+        self::sysLogMsg('Util', 'Deprecated call '.__METHOD__.' from '.static::class);
 
         return Processes::mwExec($command, $outArr, $retVal);
     }
@@ -463,10 +463,10 @@ 
             $objects = scandir($dir);
             foreach ($objects as $object) {
                 if ($object != "." && $object != "..") {
-                    if (filetype($dir . "/" . $object) == "dir") {
-                        self::rRmDir($dir . "/" . $object);
+                    if (filetype($dir."/".$object) == "dir") {
+                        self::rRmDir($dir."/".$object);
                     } else {
-                        unlink($dir . "/" . $object);
+                        unlink($dir."/".$object);
                     }
                 }
             }
@@ -489,7 +489,7 @@ 
     public static function generateSslCert($options = null, $config_args_pkey = null, $config_args_csr = null): array
     {
         // Инициализация настроек.
-        if ( ! $options) {
+        if (!$options) {
             $options = [
                 "countryName"            => 'RU',
                 "stateOrProvinceName"    => 'Moscow',
@@ -501,11 +501,11 @@ 
             ];
         }
 
-        if ( ! $config_args_csr) {
+        if (!$config_args_csr) {
             $config_args_csr = ['digest_alg' => 'sha256'];
         }
 
-        if ( ! $config_args_pkey) {
+        if (!$config_args_pkey) {
             $config_args_pkey = [
                 "private_key_bits" => 2048,
                 "private_key_type" => OPENSSL_KEYTYPE_RSA,
@@ -593,12 +593,12 @@ 
             $arrPaths = explode(' ', $parameters);
             if (count($arrPaths) > 0) {
                 foreach ($arrPaths as $path) {
-                    if ( ! empty($path)
-                        && ! file_exists($path)
-                        && ! mkdir($path, 0755, true)
-                        && ! is_dir($path)) {
+                    if (!empty($path)
+                        && !file_exists($path)
+                        && !mkdir($path, 0755, true)
+                        && !is_dir($path)) {
                         $result = false;
-                        self::sysLogMsg('Util', 'Error on create folder ' . $path);
+                        self::sysLogMsg('Util', 'Error on create folder '.$path);
                     }
                     if ($addWWWRights) {
                         self::addRegularWWWRights($path);
@@ -672,7 +672,7 @@ 
             $row = trim($row);
             $pos = strpos($row, ']');
             if ($pos !== false && strpos($row, '[') === 0) {
-                $row = "\n" . substr($row, 0, $pos);
+                $row = "\n".substr($row, 0, $pos);
             }
         }
         unset($row);
@@ -684,7 +684,7 @@ 
         foreach ($sections as $section) {
             $data_rows    = explode("\n", trim($section));
             $section_name = trim($data_rows[0] ?? '');
-            if ( ! empty($section_name)) {
+            if (!empty($section_name)) {
                 unset($data_rows[0]);
                 $manual_data[$section_name] = [];
                 foreach ($data_rows as $row) {
@@ -744,7 +744,7 @@ 
             $reflection = new ReflectionClass($className);
             $filename   = $reflection->getFileName();
         } catch (ReflectionException $exception) {
-            self::sysLogMsg('Util', 'Error ' . $exception->getMessage());
+            self::sysLogMsg('Util', 'Error '.$exception->getMessage());
         }
 
         return $filename;
@@ -761,7 +761,7 @@ 
      */
     public static function getPidOfProcess($name, $exclude = ''): string
     {
-        self::sysLogMsg('Util', 'Deprecated call ' . __METHOD__ . ' from ' . static::class);
+        self::sysLogMsg('Util', 'Deprecated call '.__METHOD__.' from '.static::class);
 
         return Processes::getPidOfProcess($name, $exclude);
     }
@@ -781,7 +781,7 @@ 
      */
     public static function processWorker($cmd, $param, $proc_name, $action, $out_file = '/dev/null')
     {
-        self::sysLogMsg('Util', 'Deprecated call ' . __METHOD__ . ' from ' . static::class);
+        self::sysLogMsg('Util', 'Deprecated call '.__METHOD__.' from '.static::class);
 
         return Processes::processWorker($cmd, $param, $proc_name, $action, $out_file);
     }
@@ -799,7 +799,7 @@ 
         string $param = 'start',
         string $action = 'restart'
     ): void {
-        self::sysLogMsg('Util', 'Deprecated call ' . __METHOD__ . ' from ' . static::class);
+        self::sysLogMsg('Util', 'Deprecated call '.__METHOD__.' from '.static::class);
         Processes::processPHPWorker($className, $param, $action);
     }
 
@@ -813,7 +813,7 @@ 
      */
     public static function killByName($procName): ?int
     {
-        self::sysLogMsg('Util', 'Deprecated call ' . __METHOD__ . ' from ' . static::class);
+        self::sysLogMsg('Util', 'Deprecated call '.__METHOD__.' from '.static::class);
 
         return Processes::killByName($procName);
     }
@@ -828,7 +828,7 @@ 
      */
     public static function mwExecBg($command, $out_file = '/dev/null', $sleep_time = 0): void
     {
-        self::sysLogMsg('Util', 'Deprecated call ' . __METHOD__ . ' from ' . static::class);
+        self::sysLogMsg('Util', 'Deprecated call '.__METHOD__.' from '.static::class);
         Processes::mwExecBg($command, $out_file, $sleep_time);
     }
 
@@ -842,7 +842,7 @@ 
      */
     public static function mwExecBgWithTimeout($command, $timeout = 4, $logname = '/dev/null'): void
     {
-        self::sysLogMsg('Util', 'Deprecated call ' . __METHOD__ . ' from ' . static::class);
+        self::sysLogMsg('Util', 'Deprecated call '.__METHOD__.' from '.static::class);
         Processes::mwExecBgWithTimeout($command, $timeout, $logname);
     }
 
@@ -856,7 +856,7 @@ 
      */
     public static function mwExecCommands($arr_cmds, &$out = [], $logname = ''): void
     {
-        self::sysLogMsg('Util', 'Deprecated call ' . __METHOD__ . ' from ' . static::class);
+        self::sysLogMsg('Util', 'Deprecated call '.__METHOD__.' from '.static::class);
         Processes::mwExecCommands($arr_cmds, $out, $logname);
     }