mikopbx / Core

src/Core/System/Upgrade/Releases/UpdateConfigsUpToVer2020162.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 
 class UpdateConfigsUpToVer2020162 extends Injectable implements UpgradeSystemConfigInterface
 {
-  	public const PBX_VERSION = '2020.1.62';
+        public const PBX_VERSION = '2020.1.62';
 
     private ConfigAlias $config;
     private MikoPBXConfig $mikoPBXConfig;

Spacing +6 added lines, -6 removed lines

@@ -71,19 +71,19 @@
 
 
         $app_number = '10003246';
-        $d_app      = DialplanApplications::findFirst('extension="' . $app_number . '"');
+        $d_app      = DialplanApplications::findFirst('extension="'.$app_number.'"');
         if ($d_app === null) {
-            $app_text                = '1,Answer()' . "\n" .
-                'n,AGI(cdr_connector.php,${ISTRANSFER}dial_answer)' . "\n" .
-                'n,Echo()' . "\n" .
-                'n,Hangup()' . "\n";
+            $app_text = '1,Answer()'."\n".
+                'n,AGI(cdr_connector.php,${ISTRANSFER}dial_answer)'."\n".
+                'n,Echo()'."\n".
+                'n,Hangup()'."\n";
             $d_app                   = new DialplanApplications();
             $d_app->applicationlogic = base64_encode($app_text);
             $d_app->extension        = $app_number;
             $d_app->description      = 'Echos audio and video back to the caller as soon as it is received. Used to test connection delay.';
             $d_app->name             = 'Echo test';
             $d_app->type             = 'plaintext';
-            $d_app->uniqid           = 'DIALPLAN-APPLICATION-' . md5(time());
+            $d_app->uniqid           = 'DIALPLAN-APPLICATION-'.md5(time());
 
             if ($d_app->save()) {
                 $extension = Extensions::findFirst("number = '{$app_number}'");

src/Core/System/Upgrade/UpdateSystemConfig.php

Spacing +3 added lines, -3 removed lines

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

src/Core/Asterisk/AGI.php

Braces +9 added lines, -6 removed lines

@@ -104,7 +104,8 @@ 
     /**
      * Считываем переданные скрипту переменные.
      */
-    private function readRequestData(){
+    private function readRequestData()
+    {
         if($this->in !== false){
             $str = PHP_EOL;
             // read the request
@@ -226,7 +227,7 @@ 
         if ($ret['code'] != AGIRES_OK){
             // some sort of error
             $ret['data'] = $str;
-        }else{
+        } else{
             // Normal AGI RES OK response
             $parse    = explode(' ', trim($str));
             $in_token = false;
@@ -237,15 +238,15 @@ 
                     if ($token[strlen($token) - 1] == ')') {
                         $in_token = false;
                     }
-                }elseif ($token[0] == '('){
+                } elseif ($token[0] == '('){
                     if ($token[strlen($token) - 1] != ')') {
                         $in_token = true;
                     }
                     $ret['data'] .= ' ' . trim($token, '() ');
-                }elseif (strpos($token, '=')){
+                } elseif (strpos($token, '=')){
                     $token          = explode('=', $token);
                     $ret[$token[0]] = $token[1];
-                }elseif ($token != ''){
+                } elseif ($token != ''){
                     $ret['data'] .= ' ' . $token;
                 }
             }
@@ -277,9 +278,11 @@ 
         $ret['code'] = substr($str, 0, 3);
         $str         = trim(substr($str, 3));
 
-        if ($str[0] === '-') // We have a multiline response!
+        if ($str[0] === '-') {
+            // We have a multiline response!
         {
             $count = 0;
+        }
             $str   = substr($str, 1) . "\n";
             $line  = fgets($this->in, 4096);
             while (substr($line, 0, 3) != $ret['code'] && $count < 5) {

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

@@ -410,7 +410,7 @@ 
      */
     public function hangup($channel = '')
     {
-        return $this->evaluate("HANGUP $channel");
+        return $this->evaluate("hangup $channel");
     }
 
     /**
@@ -576,7 +576,7 @@ 
             $options = join(',', $options);
         }
 
-        return $this->evaluate("EXEC $application $options");
+        return $this->evaluate("exec $application $options");
     }
 
     /**

Spacing +36 added lines, -36 removed lines

@@ -8,19 +8,19 @@ 
 
 namespace MikoPBX\Core\Asterisk;
 
-define('AST_DIGIT_ANY',                 '0123456789#*');
-define('AGIRES_OK',                     200);
-define('AST_STATE_DOWN',                0);
-define('AST_STATE_RESERVED',            1);
-define('AST_STATE_OFFHOOK',             2);
-define('AST_STATE_DIALING',             3);
-define('AST_STATE_RING',                4);
-define('AST_STATE_RINGING',             5);
-define('AST_STATE_UP',                  6);
-define('AST_STATE_BUSY',                7);
-define('AST_STATE_DIALING_OFFHOOK',     8);
-define('AST_STATE_PRERING',             9);
-define('AUDIO_FILENO',                  3);
+define('AST_DIGIT_ANY', '0123456789#*');
+define('AGIRES_OK', 200);
+define('AST_STATE_DOWN', 0);
+define('AST_STATE_RESERVED', 1);
+define('AST_STATE_OFFHOOK', 2);
+define('AST_STATE_DIALING', 3);
+define('AST_STATE_RING', 4);
+define('AST_STATE_RINGING', 5);
+define('AST_STATE_UP', 6);
+define('AST_STATE_BUSY', 7);
+define('AST_STATE_DIALING_OFFHOOK', 8);
+define('AST_STATE_PRERING', 9);
+define('AUDIO_FILENO', 3);
 
 /**
  * AGI class
@@ -94,8 +94,8 @@ 
         $this->conLogBusy = false;
         ob_implicit_flush(1);
         // Open stdin & stdout.
-        $this->in  = defined('STDIN') ? STDIN  : fopen('php://stdin',  'r');
-        $this->out = defined('STDOUT')? STDOUT : fopen('php://stdout', 'w');
+        $this->in  = defined('STDIN') ? STDIN  : fopen('php://stdin', 'r');
+        $this->out = defined('STDOUT') ? STDOUT : fopen('php://stdout', 'w');
         $this->request = [];
 
         $this->readRequestData();
@@ -104,18 +104,18 @@ 
     /**
      * Считываем переданные скрипту переменные.
      */
-    private function readRequestData(){
-        if($this->in !== false){
+    private function readRequestData() {
+        if ($this->in !== false) {
             $str = PHP_EOL;
             // read the request
             $resIn = fgets($this->in);
-            if($resIn !== false){
+            if ($resIn !== false) {
                 $str = $resIn;
             }
             while ($str !== PHP_EOL) {
                 $this->request[substr($str, 0, strpos($str, ':'))] = trim(substr($str, strpos($str, ':') + 1));
                 $resIn = fgets($this->in);
-                if($resIn === false){
+                if ($resIn === false) {
                     break;
                 }
                 $str = $resIn;
@@ -167,11 +167,11 @@ 
     {
         $broken = ['code' => 500, 'result' => -1, 'data' => ''];
 
-        if( !is_resource($this->out) ){
+        if (!is_resource($this->out)) {
             return $broken;
         }
 
-        if ( !fwrite($this->out, trim($command) . "\n")) {
+        if (!fwrite($this->out, trim($command)."\n")) {
             return $broken;
         }
         fflush($this->out);
@@ -179,7 +179,7 @@ 
         // parse result
         $str = '';
         $ret = [];
-        if(!$this->evaluateReadResponse($str, $ret)){
+        if (!$this->evaluateReadResponse($str, $ret)) {
             return $broken;
         }
 
@@ -196,30 +196,30 @@ 
     private function evaluateParseResponse($str, &$ret):void{
         $ret['result'] = null;
         $ret['data']   = '';
-        if ($ret['code'] != AGIRES_OK){
+        if ($ret['code'] != AGIRES_OK) {
             // some sort of error
             $ret['data'] = $str;
-        }else{
+        } else {
             // Normal AGI RES OK response
             $parse    = explode(' ', trim($str));
             $in_token = false;
             foreach ($parse as $token) {
-                if ($in_token){
+                if ($in_token) {
                     // we previously hit a token starting with ')' but not ending in ')'
-                    $ret['data'] .= ' ' . trim($token, '() ');
+                    $ret['data'] .= ' '.trim($token, '() ');
                     if ($token[strlen($token) - 1] == ')') {
                         $in_token = false;
                     }
-                }elseif ($token[0] == '('){
+                }elseif ($token[0] == '(') {
                     if ($token[strlen($token) - 1] != ')') {
                         $in_token = true;
                     }
-                    $ret['data'] .= ' ' . trim($token, '() ');
-                }elseif (strpos($token, '=')){
+                    $ret['data'] .= ' '.trim($token, '() ');
+                }elseif (strpos($token, '=')) {
                     $token          = explode('=', $token);
                     $ret[$token[0]] = $token[1];
-                }elseif ($token != ''){
-                    $ret['data'] .= ' ' . $token;
+                }elseif ($token != '') {
+                    $ret['data'] .= ' '.$token;
                 }
             }
             $ret['data'] = trim($ret['data']);
@@ -234,7 +234,7 @@ 
      */
     private function evaluateReadResponse(string & $str, array & $ret): bool{
         $result = true;
-        if(!is_resource($this->in)){
+        if (!is_resource($this->in)) {
             return $result;
         }
 
@@ -253,10 +253,10 @@ 
         if ($str[0] === '-') // We have a multiline response!
         {
             $count = 0;
-            $str   = substr($str, 1) . "\n";
+            $str   = substr($str, 1)."\n";
             $line  = fgets($this->in, 4096);
             while (substr($line, 0, 3) != $ret['code'] && $count < 5) {
-                $str   .= $line;
+                $str .= $line;
                 $line  = fgets($this->in, 4096);
                 $count = (trim($line) == '') ? $count + 1 : 0;
             }
@@ -602,7 +602,7 @@ 
         return $this->exec(
             'Dial',
             trim(
-                "$type/$identifier" . $this->option_delim . $timeout . $this->option_delim . $options . $this->option_delim . $url,
+                "$type/$identifier".$this->option_delim.$timeout.$this->option_delim.$options.$this->option_delim.$url,
                 $this->option_delim
             )
         );
@@ -622,7 +622,7 @@ 
      */
     public function exec_goto($a, $b = null, $c = null)
     {
-        return $this->exec('Goto', trim($a . $this->option_delim . $b . $this->option_delim . $c, $this->option_delim));
+        return $this->exec('Goto', trim($a.$this->option_delim.$b.$this->option_delim.$c, $this->option_delim));
     }
 
 

src/PBXCoreREST/Workers/WorkerMergeUploadedFile.php

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

@@ -39,7 +39,7 @@
         if ((int)$settings['resumableTotalSize'] === $resultFileSize){
             file_put_contents($progress_file, '100');
         } else {
-            Util::sysLogMsg('UploadFile', "File {$settings['fullUploadedFileName']} size {$resultFileSize} does not equal {$settings['resumableTotalSize']}");
+            Util::sysLogMsg('UploadFile', "file {$settings['fullUploadedFileName']} size {$resultFileSize} does not equal {$settings['resumableTotalSize']}");
         }
 
         // Delete uploaded file after 10 minutes

Spacing +8 added lines, -8 removed lines

@@ -19,12 +19,12 @@ 
     public function start($argv): void
     {
         $settings_file = trim($argv[1]);
-        if ( ! file_exists($settings_file)) {
+        if (!file_exists($settings_file)) {
             Util::sysLogMsg(__CLASS__, 'File with settings not found');
             return;
         }
         $settings = json_decode(file_get_contents($settings_file), true);
-        $progress_file = $settings['tempDir'] . '/merging_progress';
+        $progress_file = $settings['tempDir'].'/merging_progress';
         $this->mergeFilesInDirectory(
             $settings['tempDir'],
             $settings['resumableFilename'],
@@ -35,7 +35,7 @@ 
 
         // Check filesize is equal uploaded size
         $resultFileSize = filesize($settings['fullUploadedFileName']);
-        if ((int)$settings['resumableTotalSize'] === $resultFileSize){
+        if ((int) $settings['resumableTotalSize'] === $resultFileSize) {
             file_put_contents($progress_file, '100');
         } else {
             Util::sysLogMsg('UploadFile', "File {$settings['fullUploadedFileName']} size {$resultFileSize} does not equal {$settings['resumableTotalSize']}");
@@ -43,7 +43,7 @@ 
 
         // Delete uploaded file after 10 minutes
         Util::mwExecBg(
-            '/sbin/shell_functions.sh killprocesses ' . $settings['tempDir'] . ' -TERM 0;rm -rf ' . $settings['tempDir'],
+            '/sbin/shell_functions.sh killprocesses '.$settings['tempDir'].' -TERM 0;rm -rf '.$settings['tempDir'],
             '/dev/null',
             600
         );
@@ -69,19 +69,19 @@ 
         // Restore original file from chunks
         if (($fp = fopen($result_file, 'w')) !== false) {
             for ($i = 1; $i <= $total_files; $i++) {
-                $tmp_file = $tempDir . '/' . $fileName . '.part' . $i;
+                $tmp_file = $tempDir.'/'.$fileName.'.part'.$i;
                 fwrite($fp, file_get_contents($tmp_file));
                 unlink($tmp_file);
-                $currentProgress = round($i / $total_files * 100)-1; //Up to 99%
+                $currentProgress = round($i / $total_files * 100) - 1; //Up to 99%
                 file_put_contents($progress_file, $currentProgress, 2);
             }
             fclose($fp);
         } else {
-            Util::sysLogMsg('UploadFile', 'cannot create the destination file - ' . $result_file);
+            Util::sysLogMsg('UploadFile', 'cannot create the destination file - '.$result_file);
 
             return;
         }
-        Util::sysLogMsg('UploadFile', 'destination file - ' . $result_file);
+        Util::sysLogMsg('UploadFile', 'destination file - '.$result_file);
     }
 }
 

src/Core/Workers/WorkerModelsEvents.php

Spacing +9 added lines, -9 removed lines

@@ -105,7 +105,7 @@ 
     private int $timeout = 2;
     private array $arrObject;
     private array $PRIORITY_R;
-    protected int $maxProc=1;
+    protected int $maxProc = 1;
 
 
     /**
@@ -190,7 +190,7 @@ 
         foreach ($additionalModules as $appClass) {
             // Проверим, зависит ли объект от измененных данных.
             $dependences = $appClass->dependenceModels();
-            if (in_array($called_class, $dependences)){
+            if (in_array($called_class, $dependences)) {
                 // Получаем новые настройки.
                 $appClass->getSettings();
             }
@@ -238,7 +238,7 @@ 
                 break;
             case Codecs::class:
                 $this->modified_tables[self::R_IAX] = true;
-                $this->modified_tables[self::R_SIP]     = true;
+                $this->modified_tables[self::R_SIP] = true;
                 break;
             case IncomingRoutingTable::class:
                 $this->modified_tables[self::R_DIALPLAN] = true;
@@ -310,16 +310,16 @@ 
                     $this->modified_tables[self::R_NATS]    = true;
                 }
                 if ($this->pbxSettings->itHasTimeZoneSettings()) {
-                    $this->modified_tables[self::R_TIMEZONE]    = true;
-                    $this->modified_tables[self::R_NGINX]    = true;
-                    $this->modified_tables[self::R_PHP_FPM]    = true;
+                    $this->modified_tables[self::R_TIMEZONE] = true;
+                    $this->modified_tables[self::R_NGINX] = true;
+                    $this->modified_tables[self::R_PHP_FPM] = true;
                     $this->modified_tables[self::R_REST_API_WORKER] = true;
                 }
                 if ($this->pbxSettings->itHasNTPSettings()) {
-                    $this->modified_tables[self::R_NTP]    = true;
+                    $this->modified_tables[self::R_NTP] = true;
                 }
                 if ($this->pbxSettings->itHasCallRecordSettings()) {
-                    $this->modified_tables[ self::R_CALL_EVENTS_WORKER]  = true;
+                    $this->modified_tables[self::R_CALL_EVENTS_WORKER] = true;
                 }
                 break;
             case Sip::class:
@@ -490,7 +490,7 @@ 
      */
     public function reloadNginx(): void
     {
-        $nginxConf  = new NginxConf();
+        $nginxConf = new NginxConf();
         $nginxConf->reStart();
     }
 

src/AdminCabinet/Providers/AssetProvider.php

Spacing +10 added lines, -10 removed lines

@@ -50,7 +50,7 @@ 
     {
         $di->set(
             self::SERVICE_NAME,
-            function () use ($di) {
+            function() use ($di) {
                 $assets = new AssetProvider();
                 $assets->initializeClassVariables();
                 $dispatcher = $di->get('dispatcher');
@@ -63,7 +63,7 @@ 
                     $action = 'index';
                 }
                 if ($session !== null && $session->has('versionHash')) {
-                    $version = (string)$session->get('versionHash');
+                    $version = (string) $session->get('versionHash');
                 } else {
                     $version = str_replace(PHP_EOL, '', file_get_contents('/etc/version'));
                 }
@@ -290,7 +290,7 @@ 
     {
         $language   = $di->getShared('language');
         $langJSFile = "js/cache/localization-{$language}-{$version}.min.js";
-        if ( ! file_exists($langJSFile)) {
+        if (!file_exists($langJSFile)) {
             $arrStr = [];
             foreach ($di->getShared('messages') as $key => $value) {
                 $arrStr[$key] = str_replace(
@@ -318,24 +318,24 @@ 
      */
     private function generateFilesAndLinks($controller, string $action, string $version): void
     {
-        $resultCombinedName = Text::uncamelize(ucfirst($controller) . ucfirst($action), '-');
-        $resultCombinedName = strlen($resultCombinedName) !== '' ? $resultCombinedName . '-' : '';
+        $resultCombinedName = Text::uncamelize(ucfirst($controller).ucfirst($action), '-');
+        $resultCombinedName = strlen($resultCombinedName) !== '' ? $resultCombinedName.'-' : '';
 
 
         foreach ($this->headerCollectionJS as $resource) {
-            $resource->setPath($resource->getPath() . '?v=' . $version);
+            $resource->setPath($resource->getPath().'?v='.$version);
         }
         foreach ($this->footerCollectionJS as $resource) {
-            $resource->setPath($resource->getPath() . '?v=' . $version);
+            $resource->setPath($resource->getPath().'?v='.$version);
         }
         foreach ($this->semanticCollectionJS as $resource) {
-            $resource->setPath($resource->getPath() . '?v=' . $version);
+            $resource->setPath($resource->getPath().'?v='.$version);
         }
         foreach ($this->semanticCollectionCSS as $resource) {
-            $resource->setPath($resource->getPath() . '?v=' . $version);
+            $resource->setPath($resource->getPath().'?v='.$version);
         }
         foreach ($this->footerCollectionACE as $resource) {
-            $resource->setPath($resource->getPath() . '?v=' . $version);
+            $resource->setPath($resource->getPath().'?v='.$version);
         }
 
 

Braces +2 added lines, -1 removed lines

@@ -50,7 +50,8 @@
     {
         $di->set(
             self::SERVICE_NAME,
-            function () use ($di) {
+            function () use ($di)
+            {
                 $assets = new AssetProvider();
                 $assets->initializeClassVariables();
                 $dispatcher = $di->get('dispatcher');

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

@@ -72,7 +72,7 @@
                 $assets->makeHeaderAssets($session, $moduleName);
 
                 // Generates Controllers assets
-                $method_name = "make{$controller}Assets";
+                $method_name = "make{$controller}assets";
                 if (method_exists($assets, $method_name)) {
                     $assets->$method_name($action);
                 }

src/Core/System/Network.php

Spacing +65 added lines, -65 removed lines

@@ -29,7 +29,7 @@ 
         }
 
         Util::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";
             Util::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  = Util::getPidOfProcess($pid_file);
-                if ( ! empty($pid_pcc)) {
+                if (!empty($pid_pcc)) {
                     // Завершаем старый процесс.
                     $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 }'";
                 Util::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;
@@ -603,13 +603,13 @@ 
         $data->name      = $name;
         $data->interface = $name;
         $data->dhcp      = '1';
-        $data->internet  = ($general === true) ? '1' : '0';;
+        $data->internet  = ($general === true) ? '1' : '0'; ;
         $data->disabled  = '0';
         $data->vlanid    = '0';
         $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');
-        Util::mwExec($hostnamePath . ' ' . escapeshellarg("{$data['hostname']}"));
+        Util::mwExec($hostnamePath.' '.escapeshellarg("{$data['hostname']}"));
     }
 
     /**
@@ -652,12 +652,12 @@ 
 
         $pidFile = '/var/run/openvpn.pid';
         $pid     = Util::getPidOfProcess('openvpn');
-        if ( ! empty($pid)) {
+        if (!empty($pid)) {
             // Завершаем процесс.
             $busyboxPath = Util::which('busybox');
             Util::mwExec("{$busyboxPath} kill '$pid'");
         }
-        if ( ! empty($data)) {
+        if (!empty($data)) {
             $openvpnPath = Util::which('openvpn');
             Util::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');
             Util::mwExec("{$busyboxPath} ifconfig $interface 192.168.2.1 netmask 255.255.255.0");

src/Modules/PbxExtensionState.php

Spacing +19 added lines, -19 removed lines

@@ -41,16 +41,16 @@ 
         $this->moduleUniqueID = $moduleUniqueID;
         $this->modulesRoot    = $this->getDI()->getShared('config')->path('core.modulesDir');
         $moduleJson           = "{$this->modulesRoot}/{$this->moduleUniqueID}/module.json";
-        if ( ! file_exists($moduleJson)) {
-            $this->messages[] = 'module.json not found for module ' . $this->moduleUniqueID;
+        if (!file_exists($moduleJson)) {
+            $this->messages[] = 'module.json not found for module '.$this->moduleUniqueID;
 
             return;
         }
 
         $jsonString            = file_get_contents($moduleJson);
         $jsonModuleDescription = json_decode($jsonString, true);
-        if ( ! is_array($jsonModuleDescription)) {
-            $this->messages[] = 'module.json parsing error ' . $this->moduleUniqueID;
+        if (!is_array($jsonModuleDescription)) {
+            $this->messages[] = 'module.json parsing error '.$this->moduleUniqueID;
 
             return;
         }
@@ -93,13 +93,13 @@ 
             }
         }
         $success = $this->makeBeforeEnableTest();
-        if ( ! $success) {
+        if (!$success) {
             return false;
         }
 
         $this->reloadConfigClass();
         // Если ошибок нет, включаем Firewall и модуль
-        if ( ! $this->enableFirewallSettings()) {
+        if (!$this->enableFirewallSettings()) {
             $this->messages[] = 'Error on enable firewall settings';
 
             return false;
@@ -180,7 +180,7 @@ 
                 if (array_key_exists($network->id, $previousRules)) {
                     $newRule->action = $previousRules[$network->id];
                 }
-                if ( ! $newRule->save()) {
+                if (!$newRule->save()) {
                     $this->messages[] = $newRule->getMessages();
                 }
             }
@@ -207,7 +207,7 @@ 
     {
         if ($this->configClass !== null
             && method_exists($this->configClass, 'createNginxLocations')
-            && ! empty($this->configClass->createNginxLocations())) {
+            && !empty($this->configClass->createNginxLocations())) {
             $nginxConf = new NginxConf();
             $nginxConf->generateModulesConf();
             $nginxConf->reStart();
@@ -224,7 +224,7 @@ 
     {
         if ($this->configClass !== null
             && method_exists($this->configClass, 'generateFail2BanJails')
-            && ! empty($this->configClass->generateFail2BanJails())) {
+            && !empty($this->configClass->generateFail2BanJails())) {
             IptablesConf::reloadFirewall();
         }
     }
@@ -236,12 +236,12 @@ 
     public function disableModule(): bool
     {
         $success = $this->makeBeforeDisableTest();
-        if ( ! $success) {
+        if (!$success) {
             return false;
         }
         $this->reloadConfigClass();
         // Если ошибок нет, выключаем Firewall и модуль
-        if ( ! $this->disableFirewallSettings()) {
+        if (!$this->disableFirewallSettings()) {
             $this->messages[] = 'Error on disable firewall settings';
 
             return false;
@@ -300,7 +300,7 @@ 
             && method_exists($this->configClass, 'onBeforeModuleDisable')
             && $this->configClass->onBeforeModuleDisable() === false) {
             $messages = $this->configClass->getMessages();
-            if ( ! empty($messages)) {
+            if (!empty($messages)) {
                 $this->messages = $messages;
             } else {
                 $this->messages[] = 'Error on the Module enable function at onBeforeModuleDisable';
@@ -318,7 +318,7 @@ 
             $className        = pathinfo($file)['filename'];
             $moduleModelClass = "\\Modules\\{$this->moduleUniqueID}\\Models\\{$className}";
             try {
-                if ( ! class_exists($moduleModelClass)) {
+                if (!class_exists($moduleModelClass)) {
                     continue;
                 }
                 $reflection = new ReflectionClass($moduleModelClass);
@@ -330,7 +330,7 @@ 
                 }
                 $records = $moduleModelClass::find();
                 foreach ($records as $record) {
-                    if ( ! $record->beforeDelete()) {
+                    if (!$record->beforeDelete()) {
                         foreach ($record->getMessages() as $message) {
                             $this->messages[] = $message->getMessage();
                         }
@@ -382,7 +382,7 @@ 
             $savedState[$detailRule->networkfilterid] = $detailRule->action;
         }
         $this->db->begin(true);
-        if ( ! $currentRules->delete()) {
+        if (!$currentRules->delete()) {
             $this->messages[] = $currentRules->getMessages();
 
             return false;
@@ -394,7 +394,7 @@ 
             $previousRuleSettings->key = "{$this->moduleUniqueID}FirewallSettings";
         }
         $previousRuleSettings->value = json_encode($savedState);
-        if ( ! $previousRuleSettings->save()) {
+        if (!$previousRuleSettings->save()) {
             $this->messages[] = $previousRuleSettings->getMessages();
         }
         if (count($errors) > 0) {
@@ -447,7 +447,7 @@ 
             && method_exists($this->configClass, 'onBeforeModuleEnable')
             && $this->configClass->onBeforeModuleEnable() === false) {
             $messages = $this->configClass->getMessages();
-            if ( ! empty($messages)) {
+            if (!empty($messages)) {
                 $this->messages = $messages;
             } else {
                 $this->messages[] = 'Error on the enableModule function at onBeforeModuleEnable';
@@ -467,7 +467,7 @@ 
             $moduleModelClass = "\\Modules\\{$this->moduleUniqueID}\\Models\\{$className}";
 
             try {
-                if ( ! class_exists($moduleModelClass)) {
+                if (!class_exists($moduleModelClass)) {
                     continue;
                 }
                 $reflection = new ReflectionClass($moduleModelClass);
@@ -497,7 +497,7 @@ 
                                     'modulename' => $record->getRepresent(true),
                                 ]
                             );
-                            $success          = false;
+                            $success = false;
                         }
                     }
                 }

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

@@ -69,7 +69,7 @@ 
     private function reloadConfigClass(): void
     {
         $class_name      = str_replace('Module', '', $this->moduleUniqueID);
-        $configClassName = "\\Modules\\{$this->moduleUniqueID}\\Lib\\{$class_name}Conf";
+        $configClassName = "\\Modules\\{$this->moduleUniqueID}\\Lib\\{$class_name}conf";
         if (class_exists($configClassName)) {
             $this->configClass = new $configClassName();
         } else {
@@ -151,7 +151,7 @@ 
 
         $this->db->begin(true);
         $defaultRules         = $this->configClass->getDefaultFirewallRules();
-        $previousRuleSettings = PbxSettings::findFirstByKey("{$this->moduleUniqueID}FirewallSettings");
+        $previousRuleSettings = PbxSettings::findFirstByKey("{$this->moduleUniqueID}firewallsettings");
         $previousRules        = [];
         if ($previousRuleSettings !== null) {
             $previousRules = json_decode($previousRuleSettings->value, true);
@@ -388,10 +388,10 @@ 
             return false;
         }
 
-        $previousRuleSettings = PbxSettings::findFirstByKey("{$this->moduleUniqueID}FirewallSettings");
+        $previousRuleSettings = PbxSettings::findFirstByKey("{$this->moduleUniqueID}firewallsettings");
         if ($previousRuleSettings === null) {
             $previousRuleSettings      = new PbxSettings();
-            $previousRuleSettings->key = "{$this->moduleUniqueID}FirewallSettings";
+            $previousRuleSettings->key = "{$this->moduleUniqueID}firewallsettings";
         }
         $previousRuleSettings->value = json_encode($savedState);
         if ( ! $previousRuleSettings->save()) {

src/Modules/PbxExtensionUtils.php

Spacing +4 added lines, -4 removed lines

@@ -114,7 +114,7 @@ 
         $moduleAgiBinDir = "{$moduleDir}/agi-bin";
         $files           = glob("$moduleAgiBinDir/*.{php}", GLOB_BRACE);
         foreach ($files as $file) {
-            $newFilename = $agiBinDir . '/' . basename($file);
+            $newFilename = $agiBinDir.'/'.basename($file);
             Util::createUpdateSymlink($file, $newFilename);
         }
 
@@ -135,7 +135,7 @@ 
             $needDisable = false;
             $moduleDir   = PbxExtensionUtils::getModuleDir($module['uniqid']);
             $moduleJson  = "{$moduleDir}/module.json";
-            if ( ! file_exists($moduleJson)) {
+            if (!file_exists($moduleJson)) {
                 $needDisable = true;
             }
             $jsonString            = file_get_contents($moduleJson);
@@ -151,8 +151,8 @@ 
                 } catch (ErrorAlias $exception) {
                     Util::sysLogMsg(__CLASS__, "Can not disable module {$module['uniqid']} Message: {$exception}");
                 } finally {
-                    $currentModule           = PbxExtensionModules::findFirstByUniqid($module['uniqid']);
-                    if ($currentModule->disabled==='0'){
+                    $currentModule = PbxExtensionModules::findFirstByUniqid($module['uniqid']);
+                    if ($currentModule->disabled === '0') {
                         $currentModule->disabled = '1';
                         $currentModule->update();
                     }