mikopbx / Core

src/AdminCabinet/Providers/VoltProvider.php

Spacing +4 added lines, -4 removed lines

@@ -31,8 +31,8 @@ 
         $appConfig = $di->getShared('config')->adminApplication;
         $di->setShared(
             self::SERVICE_NAME,
-            function () use ($view, $di, $appConfig) {
-                $voltCacheDir = $appConfig->voltCacheDir . '/';
+            function() use ($view, $di, $appConfig) {
+                $voltCacheDir = $appConfig->voltCacheDir.'/';
                 $volt         = new VoltEngine($view, $di);
                 $volt->setOptions(
                     [
@@ -44,8 +44,8 @@ 
                 $compiler->addFunction('in_array', 'in_array');
 
                 if ($appConfig->debugMode === true) {
-                    $cacheFiles = glob($appConfig->voltCacheDir . '/*.php');
-                    if ($cacheFiles!==false){
+                    $cacheFiles = glob($appConfig->voltCacheDir.'/*.php');
+                    if ($cacheFiles !== false) {
                         array_map(
                             'unlink',
                             $cacheFiles

Braces +2 added lines, -1 removed lines

@@ -31,7 +31,8 @@
         $appConfig = $di->getShared('config')->adminApplication;
         $di->setShared(
             self::SERVICE_NAME,
-            function () use ($view, $di, $appConfig) {
+            function () use ($view, $di, $appConfig)
+            {
                 $voltCacheDir = $appConfig->voltCacheDir . '/';
                 $volt         = new VoltEngine($view, $di);
                 $volt->setOptions(

src/AdminCabinet/Providers/LanguageSelectorProvider.php

Spacing +2 added lines, -2 removed lines

@@ -31,12 +31,12 @@
     {
         $di->setShared(
             self::SERVICE_NAME,
-            function () use ($di){
+            function() use ($di){
                 $roSession = $di->getShared('sessionRO');
                 if ($roSession !== null && array_key_exists(
                         'WebAdminLanguage',
                         $roSession
-                    ) && ! empty($roSession['WebAdminLanguage'])) {
+                    ) && !empty($roSession['WebAdminLanguage'])) {
                     $language = $roSession['WebAdminLanguage'];
                 } elseif (array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER)) {
                     $ls       = new LanguageSelector();

Braces +2 added lines, -1 removed lines

@@ -31,7 +31,8 @@
     {
         $di->setShared(
             self::SERVICE_NAME,
-            function () use ($di){
+            function () use ($di)
+            {
                 $roSession = $di->getShared('sessionRO');
                 if ($roSession !== null && array_key_exists(
                         'WebAdminLanguage',

src/Core/Asterisk/Configs/QueueConf.php

Spacing +16 added lines, -16 removed lines

@@ -86,7 +86,7 @@ 
             $q_conf .= "\n";
         }
 
-        Util::fileWriteContent($this->config->path('asterisk.astetcdir') . '/queues.conf', $q_conf);
+        Util::fileWriteContent($this->config->path('asterisk.astetcdir').'/queues.conf', $q_conf);
 
     }
 
@@ -140,7 +140,7 @@ 
         // Генерация внутреннего номерного плана.
         $conf = "[queue_agent_answer]\n";
         $conf .= "exten => s,1,NoOp(--- Answer Queue ---)\n\t";
-        $conf .= 'same => n,Gosub(queue_answer,${EXTEN},1)' . "\n\t";
+        $conf .= 'same => n,Gosub(queue_answer,${EXTEN},1)'."\n\t";
         $conf .= "same => n,Return()\n\n";
 
         return $conf;
@@ -170,8 +170,8 @@ 
         $conf = '';
         $db_data = $this->getQueueData();
         foreach ($db_data as $queue) {
-            $conf .= 'exten => _' . $queue['extension'] . ',1,Set(__ISTRANSFER=transfer_)' . " \n\t";
-            $conf .= 'same => n,Goto(internal,${EXTEN},1)' . " \n";
+            $conf .= 'exten => _'.$queue['extension'].',1,Set(__ISTRANSFER=transfer_)'." \n\t";
+            $conf .= 'same => n,Goto(internal,${EXTEN},1)'." \n";
         }
         $conf .= "\n";
 
@@ -190,36 +190,36 @@ 
         $queue_ext_conf = '';
         $db_data = $this->getQueueData();
         foreach ($db_data as $queue) {
-            $calleridPrefix = preg_replace('/[^a-zA-Zа-яА-Я0-9 ]/ui', '', $queue['callerid_prefix']??'');
+            $calleridPrefix = preg_replace('/[^a-zA-Zа-яА-Я0-9 ]/ui', '', $queue['callerid_prefix'] ?? '');
 
             $queue_ext_conf .= "exten => {$queue['extension']},1,NoOp(--- Start Queue ---) \n\t";
             $queue_ext_conf .= "same => n,Answer() \n\t";
-            $queue_ext_conf .= 'same => n,Set(__QUEUE_SRC_CHAN=${CHANNEL})' . "\n\t";
-            $queue_ext_conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Gosub(set_orign_chan,s,1))' . "\n\t";
-            $queue_ext_conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)' . "\n\t";
-            $queue_ext_conf .= 'same => n,Gosub(queue_start,${EXTEN},1)' . "\n\t";
+            $queue_ext_conf .= 'same => n,Set(__QUEUE_SRC_CHAN=${CHANNEL})'."\n\t";
+            $queue_ext_conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Gosub(set_orign_chan,s,1))'."\n\t";
+            $queue_ext_conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)'."\n\t";
+            $queue_ext_conf .= 'same => n,Gosub(queue_start,${EXTEN},1)'."\n\t";
 
             $options = '';
             if (isset($queue['caller_hear']) && $queue['caller_hear'] === 'ringing') {
                 $options .= 'r'; // Установить КПВ (гудки) вместо Музыки на Удержании для ожидающих в очереди
             }
-            $ringlength     = (trim($queue['timeout_to_redirect_to_extension']) == '') ? 300 : $queue['timeout_to_redirect_to_extension'];
-            if(!empty($calleridPrefix)){
+            $ringlength = (trim($queue['timeout_to_redirect_to_extension']) == '') ? 300 : $queue['timeout_to_redirect_to_extension'];
+            if (!empty($calleridPrefix)) {
                 $queue_ext_conf .= "same => n,Set(CALLERID(name)={$calleridPrefix}:".'${CALLERID(name)}'.") \n\t";
             }
 
             $queue_ext_conf .= "same => n,Queue({$queue['uniqid']},CkT{$options},,,{$ringlength},,,queue_agent_answer) \n\t";
             // Оповестим о завершении работы очереди.
-            $queue_ext_conf .= 'same => n,Gosub(queue_end,${EXTEN},1)' . "\n\t";
+            $queue_ext_conf .= 'same => n,Gosub(queue_end,${EXTEN},1)'."\n\t";
 
             if (trim($queue['timeout_extension']) !== '') {
                 // Если по таймауту не ответили, то выполним переадресацию.
-                $queue_ext_conf .= 'same => n,ExecIf($["${QUEUESTATUS}" == "TIMEOUT"]?Goto(internal,' . $queue['timeout_extension'] . ',1))' . " \n\t";
+                $queue_ext_conf .= 'same => n,ExecIf($["${QUEUESTATUS}" == "TIMEOUT"]?Goto(internal,'.$queue['timeout_extension'].',1))'." \n\t";
             }
             if (trim($queue['redirect_to_extension_if_empty']) !== '') {
                 // Если пустая очередь, то выполним переадресацию.
-                $exp            = '$["${QUEUESTATUS}" == "JOINEMPTY" || "${QUEUESTATUS}" == "LEAVEEMPTY" ]';
-                $queue_ext_conf .= 'same => n,ExecIf(' . $exp . '?Goto(internal,' . $queue['redirect_to_extension_if_empty'] . ',1))' . " \n\t";
+                $exp = '$["${QUEUESTATUS}" == "JOINEMPTY" || "${QUEUESTATUS}" == "LEAVEEMPTY" ]';
+                $queue_ext_conf .= 'same => n,ExecIf('.$exp.'?Goto(internal,'.$queue['redirect_to_extension_if_empty'].',1))'." \n\t";
             }
             $queue_ext_conf .= "\n";
         }
@@ -232,7 +232,7 @@ 
      */
     public static function queueReload(): void
     {
-        $queue            = new self();
+        $queue = new self();
         $queue->generateConfig();
         $out = [];
         $asteriskPath = Util::which('asterisk');

src/AdminCabinet/Library/Cidr.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     // e.g. 10.0.2.56/21 = 10.0.0.0
     public function cidr2network($ip, $cidr)
     {
-        return long2ip((ip2long($ip)) & ((-1 << (32 - (int)$cidr))));
+        return long2ip((ip2long($ip)) & ((-1 << (32 - (int) $cidr))));
     }
 
     // convert netmask to cidr
@@ -51,7 +51,7 @@ 
         $netmask = explode(".", $netmask);
 
         foreach ($netmask as $octect) {
-            $bits += strlen(str_replace("0", "", decbin((int)$octect)));
+            $bits += strlen(str_replace("0", "", decbin((int) $octect)));
         }
 
         return $bits;

src/PBXCoreREST/Workers/WorkerLongPoolAPI.php

Spacing +7 added lines, -7 removed lines

@@ -30,7 +30,7 @@ 
 
 class WorkerLongPoolAPI extends WorkerBase
 {
-    protected int $maxProc=1;
+    protected int $maxProc = 1;
 
     public function start($argv): void
     {
@@ -46,7 +46,7 @@ 
             $this->setChannelsData();
             if (is_array($data) && isset($data['infos'])) {
                 foreach ($data['infos'] as $channel_data) {
-                    $url = 'http://localhost/pbxcore/api/long/pub?id=' . $channel_data['channel'];
+                    $url = 'http://localhost/pbxcore/api/long/pub?id='.$channel_data['channel'];
 
                     $data_for_send = $this->execFunction($channel_data['channel']);
                     if ($data_for_send) {
@@ -54,7 +54,7 @@ 
                         $this->postData($url, "$data_for_send\n");
                     }
 
-                    if ( ! isset($COMMON_CNANNELS[$channel_data['channel']])) {
+                    if (!isset($COMMON_CNANNELS[$channel_data['channel']])) {
                         continue;
                     }
 
@@ -131,7 +131,7 @@ 
     private function execFunction($channel, $common_chan = null)
     {
         clearstatcache();
-        if ( ! $this->checkAction($channel, $common_chan)) {
+        if (!$this->checkAction($channel, $common_chan)) {
             return '';
         }
         $data_for_send = null;
@@ -162,18 +162,18 @@ 
      */
     private function checkAction($channel, $common_chan = null)
     {
-        if ( ! $common_chan) {
+        if (!$common_chan) {
             $actions = $GLOBALS['ACTIONS'];
         } else {
             $actions = $GLOBALS['COMMON_CNANNELS'][$common_chan];
         }
 
         $enable = false;
-        if ( ! $actions) {
+        if (!$actions) {
             return $enable;
         }
         // $data = null;
-        $now  = time();
+        $now = time();
 
         $action_data = $actions[$channel] ?? null;
         if ($action_data !== null) {

src/Core/System/Configs/NginxConf.php

Spacing +16 added lines, -16 removed lines

@@ -63,17 +63,17 @@ 
             echo $killPath.' -QUIT '.$pid."\n";
         }
         $timeStart = time();
-        while (true){
-            if(time() - $timeStart > 20){
+        while (true) {
+            if (time() - $timeStart > 20) {
                 break;
             }
             usleep(50000);
             $pid = Util::getPidOfProcess('nginx: master process');
-            if($pid !== ''){
+            if ($pid !== '') {
                 continue;
             }
             $result = Util::mwExec($NginxPath);
-            if($result === 0){
+            if ($result === 0) {
                 break;
             }
             echo "RESULT -- $result\n";
@@ -111,9 +111,9 @@ 
 
         $RedirectToHttps = $this->mikoPBXConfig->getGeneralSettings('RedirectToHttps');
         if ($RedirectToHttps === '1' && $not_ssl === false) {
-            $conf_data = 'if ( $remote_addr != "127.0.0.1" ) {' . PHP_EOL
-                . '        ' . 'return 301 https://$host:' . $WEBHTTPSPort . '$request_uri;' . PHP_EOL
-                . '       }' . PHP_EOL;
+            $conf_data = 'if ( $remote_addr != "127.0.0.1" ) {'.PHP_EOL
+                . '        '.'return 301 https://$host:'.$WEBHTTPSPort.'$request_uri;'.PHP_EOL
+                . '       }'.PHP_EOL;
             $config    = str_replace('include mikopbx/locations/*.conf;', $conf_data, $config);
         }
         file_put_contents($httpConfigFile, $config);
@@ -123,8 +123,8 @@ 
         $WEBHTTPSPrivateKey = $this->mikoPBXConfig->getGeneralSettings('WEBHTTPSPrivateKey');
         if (
             $not_ssl === false
-            && ! empty($WEBHTTPSPublicKey)
-            && ! empty($WEBHTTPSPrivateKey)
+            && !empty($WEBHTTPSPublicKey)
+            && !empty($WEBHTTPSPrivateKey)
         ) {
             $public_filename  = '/etc/ssl/certs/nginx.crt';
             $private_filename = '/etc/ssl/private/nginx.key';
@@ -139,7 +139,7 @@ 
 
         // Test work
         $currentConfigIsGood = $this->testCurrentNginxConfig();
-        if ($level < 1 && ! $currentConfigIsGood) {
+        if ($level < 1 && !$currentConfigIsGood) {
             ++$level;
             Util::sysLogMsg('nginx', 'Failed test config file. SSL will be disable...');
             $this->generateConf(true, $level);
@@ -168,9 +168,9 @@ 
      */
     public function generateModulesConf(): void
     {
-        $locationsPath     = self::MODULES_LOCATIONS_PATH;
-        if (!is_dir($locationsPath)){
-            Util::mwMkdir($locationsPath,true);
+        $locationsPath = self::MODULES_LOCATIONS_PATH;
+        if (!is_dir($locationsPath)) {
+            Util::mwMkdir($locationsPath, true);
         }
         $additionalModules = $this->di->getShared('pbxConfModules');
         $rmPath            = Util::which('rm');
@@ -178,12 +178,12 @@ 
         foreach ($additionalModules as $appClass) {
             if (method_exists($appClass, 'createNginxLocations')) {
                 $locationContent = $appClass->createNginxLocations();
-                if ( ! empty($locationContent)) {
+                if (!empty($locationContent)) {
                     $confFileName = "{$locationsPath}/{$appClass->moduleUniqueId}.conf";
                     file_put_contents($confFileName, $locationContent);
-                    if ( ! $this->testCurrentNginxConfig()) {
+                    if (!$this->testCurrentNginxConfig()) {
                         Util::mwExec("{$rmPath} {$confFileName}");
-                        Util::sysLogMsg('nginx', 'Failed test config file for module' . $appClass->moduleUniqueId);
+                        Util::sysLogMsg('nginx', 'Failed test config file for module'.$appClass->moduleUniqueId);
                     }
                 }
             }

src/Core/Asterisk/Configs/ConferenceConf.php

Spacing +10 added lines, -10 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 = ConferenceRooms::find(['order' => 'extension']);
         foreach ($data as $conference) {
-            $conf .= "exten => {$conference->extension},1,Goto(conference-rooms,{$conference->extension},1)" . "\n";
+            $conf .= "exten => {$conference->extension},1,Goto(conference-rooms,{$conference->extension},1)"."\n";
         }
         $conf .= "\n";
 
@@ -47,7 +47,7 @@ 
         $conf = '';
         $data = ConferenceRooms::find(['order' => 'extension']);
         foreach ($data as $conference) {
-            $conf .= "exten => {$conference->extension},1,Goto(conference-rooms,{$conference->extension},1)" . "\n";
+            $conf .= "exten => {$conference->extension},1,Goto(conference-rooms,{$conference->extension},1)"."\n";
         }
         $conf .= "\n";
 
@@ -72,13 +72,13 @@ 
         $conf .= "[conference-rooms] \n";
         $data = ConferenceRooms::find(['order' => 'extension']);
         foreach ($data as $conference) {
-            $conf .= 'exten => ' . $conference->extension . ',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->extension.',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;

src/Core/System/Configs/PHPConf.php

Spacing +7 added lines, -7 removed lines

@@ -25,7 +25,7 @@ 
     {
         $src_log_file = '/var/log/php_error.log';
         $dst_log_file = self::getLogFile();
-        if ( ! file_exists($src_log_file)) {
+        if (!file_exists($src_log_file)) {
             file_put_contents($src_log_file, '');
         }
         $options = file_exists($dst_log_file) ? '>' : '';
@@ -41,7 +41,7 @@ 
      */
     public static function getLogFile(): string
     {
-        $logdir = System::getLogDir() . '/php';
+        $logdir = System::getLogDir().'/php';
         Util::mwMkdir($logdir);
         return "$logdir/error.log";
     }
@@ -55,7 +55,7 @@ 
 
         $max_size    = 2;
         $f_name      = self::getLogFile();
-        $text_config = $f_name . " {
+        $text_config = $f_name." {
     nocreate
     nocopytruncate
     delaycompress
@@ -69,13 +69,13 @@ 
     endscript
 }";
         // TODO::Доделать рестарт PHP-FPM после обновление лога
-        $di     = Di::getDefault();
-        if ($di !== null){
+        $di = Di::getDefault();
+        if ($di !== null) {
             $varEtcDir = $di->getConfig()->path('core.varEtcDir');
         } else {
             $varEtcDir = '/var/etc';
         }
-        $path_conf   = $varEtcDir . '/php_logrotate_' . basename($f_name) . '.conf';
+        $path_conf = $varEtcDir.'/php_logrotate_'.basename($f_name).'.conf';
         file_put_contents($path_conf, $text_config);
         $mb10 = $max_size * 1024 * 1024;
 
@@ -91,7 +91,7 @@ 
      */
     public static function phpTimeZoneConfigure(): void
     {
-        $timezone      = PbxSettings::getValueByKey('PBXTimezone');
+        $timezone = PbxSettings::getValueByKey('PBXTimezone');
         date_default_timezone_set($timezone);
         if (file_exists('/etc/TZ')) {
             $catPath = Util::which('cat');

src/Core/System/Configs/NTPConf.php

Spacing +3 added lines, -3 removed lines

@@ -22,12 +22,12 @@
         $ntp_servers = PbxSettings::getValueByKey('NTPServer');
         $ntp_servers = preg_split('/\r\n|\r|\n| /', $ntp_servers);
         $ntp_conf = '';
-        foreach ($ntp_servers as $ntp_server){
-            if ( ! empty($ntp_server)) {
+        foreach ($ntp_servers as $ntp_server) {
+            if (!empty($ntp_server)) {
                 $ntp_conf .= "server {$ntp_server}".PHP_EOL;
             }
         }
-        if ($ntp_conf==='') {
+        if ($ntp_conf === '') {
             $ntp_conf = 'server 0.pool.ntp.org
 server 1.pool.ntp.org
 server 2.pool.ntp.org';