mikopbx / Core

src/Core/Asterisk/Configs/CelConf.php

Spacing +6 added lines, -6 removed lines

@@ -19,12 +19,12 @@
 
     protected function generateConfigProtected(): void
     {
-        $conf = "[general]\n" .
-            "enable=yes\n" .
-            "events=CHAN_START,CHAN_END,ANSWER\n" .
-            "dateformat = %F %T\n\n" .
-            "[manager]\n" .
+        $conf = "[general]\n".
+            "enable=yes\n".
+            "events=CHAN_START,CHAN_END,ANSWER\n".
+            "dateformat = %F %T\n\n".
+            "[manager]\n".
             "enabled = yes\n\n";
-        Util::fileWriteContent($this->config->path('asterisk.astetcdir') . '/cel.conf', $conf);
+        Util::fileWriteContent($this->config->path('asterisk.astetcdir').'/cel.conf', $conf);
     }
 }
\ No newline at end of file

src/Core/System/Configs/Fail2BanConf.php

Spacing +56 added lines, -56 removed lines

@@ -44,7 +44,7 @@ 
     {
         $fail2ban = new self();
         if ($fail2ban->fail2ban_enable
-            && ! $fail2ban->fail2banIsRunning()) {
+            && !$fail2ban->fail2banIsRunning()) {
             $fail2ban->fail2banStart();
         }
     }
@@ -138,7 +138,7 @@ 
         $create_link = false;
 
         // Символическая ссылка на базу данных.
-        if (file_exists($res_file)){
+        if (file_exists($res_file)) {
             if (filetype($res_file) !== 'link') {
                 unlink($res_file);
                 $create_link = true;
@@ -191,59 +191,59 @@ 
         }
         $this->generateJails();
 
-        $jails        = [
+        $jails = [
             'dropbear'    => 'iptables-allports[name=SSH, protocol=all]',
             'mikopbx-www' => 'iptables-allports[name=HTTP, protocol=all]',
         ];
         $modulesJails = $this->generateModulesJailsLocal();
         $jails        = array_merge($jails, $modulesJails);
-        $config       = "[DEFAULT]\n" .
+        $config       = "[DEFAULT]\n".
             "ignoreip = 127.0.0.1 {$user_whitelist}\n\n";
 
         $syslog_file = SyslogConf::getSyslogFile();
 
         foreach ($jails as $jail => $action) {
-            $config .= "[{$jail}]\n" .
-                "enabled = true\n" .
-                "backend = process\n" .
-                "logpath = {$syslog_file}\n" .
+            $config .= "[{$jail}]\n".
+                "enabled = true\n".
+                "backend = process\n".
+                "logpath = {$syslog_file}\n".
                 // "logprocess = logread -f\n".
-                "maxretry = {$max_retry}\n" .
-                "findtime = {$find_time}\n" .
-                "bantime = {$ban_time}\n" .
-                "logencoding = utf-8\n" .
+                "maxretry = {$max_retry}\n".
+                "findtime = {$find_time}\n".
+                "bantime = {$ban_time}\n".
+                "logencoding = utf-8\n".
                 "action = {$action}\n\n";
         }
 
-        $log_dir = System::getLogDir() . '/asterisk/';
-        $config  .= "[asterisk_security_log]\n" .
-            "enabled = true\n" .
-            "filter = asterisk\n" .
-            "action = iptables-allports[name=ASTERISK, protocol=all]\n" .
-            "logencoding = utf-8\n" .
-            "maxretry = {$max_retry}\n" .
-            "findtime = {$find_time}\n" .
-            "bantime = {$ban_time}\n" .
+        $log_dir = System::getLogDir().'/asterisk/';
+        $config .= "[asterisk_security_log]\n".
+            "enabled = true\n".
+            "filter = asterisk\n".
+            "action = iptables-allports[name=ASTERISK, protocol=all]\n".
+            "logencoding = utf-8\n".
+            "maxretry = {$max_retry}\n".
+            "findtime = {$find_time}\n".
+            "bantime = {$ban_time}\n".
             "logpath = {$log_dir}security_log\n\n";
 
-        $config .= "[asterisk_error]\n" .
-            "enabled = true\n" .
-            "filter = asterisk\n" .
-            "action = iptables-allports[name=ASTERISK_ERROR, protocol=all]\n" .
-            "maxretry = {$max_retry}\n" .
-            "findtime = {$find_time}\n" .
-            "bantime = {$ban_time}\n" .
-            "logencoding = utf-8\n" .
+        $config .= "[asterisk_error]\n".
+            "enabled = true\n".
+            "filter = asterisk\n".
+            "action = iptables-allports[name=ASTERISK_ERROR, protocol=all]\n".
+            "maxretry = {$max_retry}\n".
+            "findtime = {$find_time}\n".
+            "bantime = {$ban_time}\n".
+            "logencoding = utf-8\n".
             "logpath = {$log_dir}error\n\n";
 
-        $config .= "[asterisk_public]\n" .
-            "enabled = true\n" .
-            "filter = asterisk\n" .
-            "action = iptables-allports[name=ASTERISK_PUBLIC, protocol=all]\n" .
-            "maxretry = {$max_retry}\n" .
-            "findtime = {$find_time}\n" .
-            "bantime = {$ban_time}\n" .
-            "logencoding = utf-8\n" .
+        $config .= "[asterisk_public]\n".
+            "enabled = true\n".
+            "filter = asterisk\n".
+            "action = iptables-allports[name=ASTERISK_PUBLIC, protocol=all]\n".
+            "maxretry = {$max_retry}\n".
+            "findtime = {$find_time}\n".
+            "bantime = {$ban_time}\n".
+            "logencoding = utf-8\n".
             "logpath = {$log_dir}messages\n\n";
 
         Util::fileWriteContent('/etc/fail2ban/jail.local', $config);
@@ -256,23 +256,23 @@ 
     {
         $filterPath = self::FILTER_PATH;
 
-        $conf = "[INCLUDES]\n" .
-            "before = common.conf\n" .
-            "[Definition]\n" .
-            "_daemon = [\S\W\s]+web_auth\n" .
-            'failregex = ^%(__prefix_line)sFrom:\s<HOST>\sUserAgent:(\S|\s)*Wrong password$' . "\n" .
-            '            ^(\S|\s)*nginx:\s+\d+/\d+/\d+\s+(\S|\s)*status\s+403(\S|\s)*client:\s+<HOST>(\S|\s)*' . "\n" .
+        $conf = "[INCLUDES]\n".
+            "before = common.conf\n".
+            "[Definition]\n".
+            "_daemon = [\S\W\s]+web_auth\n".
+            'failregex = ^%(__prefix_line)sFrom:\s<HOST>\sUserAgent:(\S|\s)*Wrong password$'."\n".
+            '            ^(\S|\s)*nginx:\s+\d+/\d+/\d+\s+(\S|\s)*status\s+403(\S|\s)*client:\s+<HOST>(\S|\s)*'."\n".
             "ignoreregex =\n";
         file_put_contents("{$filterPath}/mikopbx-www.conf", $conf);
 
-        $conf = "[INCLUDES]\n" .
-            "before = common.conf\n" .
-            "[Definition]\n" .
-            "_daemon = (authpriv.warn )?dropbear\n" .
-            'prefregex = ^%(__prefix_line)s<F-CONTENT>(?:[Ll]ogin|[Bb]ad|[Ee]xit).+</F-CONTENT>$' . "\n" .
-            'failregex = ^[Ll]ogin attempt for nonexistent user (\'.*\' )?from <HOST>:\d+$' . "\n" .
-            '            ^[Bb]ad (PAM )?password attempt for .+ from <HOST>(:\d+)?$' . "\n" .
-            '            ^[Ee]xit before auth \(user \'.+\', \d+ fails\): Max auth tries reached - user \'.+\' from <HOST>:\d+\s*$' . "\n" .
+        $conf = "[INCLUDES]\n".
+            "before = common.conf\n".
+            "[Definition]\n".
+            "_daemon = (authpriv.warn )?dropbear\n".
+            'prefregex = ^%(__prefix_line)s<F-CONTENT>(?:[Ll]ogin|[Bb]ad|[Ee]xit).+</F-CONTENT>$'."\n".
+            'failregex = ^[Ll]ogin attempt for nonexistent user (\'.*\' )?from <HOST>:\d+$'."\n".
+            '            ^[Bb]ad (PAM )?password attempt for .+ from <HOST>(:\d+)?$'."\n".
+            '            ^[Ee]xit before auth \(user \'.+\', \d+ fails\): Max auth tries reached - user \'.+\' from <HOST>:\d+\s*$'."\n".
             "ignoreregex =\n";
         file_put_contents("{$filterPath}/dropbear.conf", $conf);
 
@@ -291,9 +291,9 @@ 
         foreach ($additionalModules as $appClass) {
             if (method_exists($appClass, 'generateFail2BanJails')) {
                 $content = $appClass->generateFail2BanJails();
-                if ( ! empty($content)) {
+                if (!empty($content)) {
                     $moduleUniqueId = $appClass->moduleUniqueId;
-                    $fileName = Text::uncamelize($moduleUniqueId,'_').'.conf';
+                    $fileName = Text::uncamelize($moduleUniqueId, '_').'.conf';
                     file_put_contents("{$filterPath}/{$fileName}", $content);
                 }
             }
@@ -312,9 +312,9 @@ 
         foreach ($additionalModules as $appClass) {
             if (method_exists($appClass, 'generateFail2BanJails')) {
                 $content = $appClass->generateFail2BanJails();
-                if ( ! empty($content)) {
-                    $moduleUniqueId                    = $appClass->moduleUniqueId;
-                    $fileName = Text::uncamelize($moduleUniqueId,'_');
+                if (!empty($content)) {
+                    $moduleUniqueId = $appClass->moduleUniqueId;
+                    $fileName = Text::uncamelize($moduleUniqueId, '_');
                     $jails[$fileName] = "iptables-allports[name={$moduleUniqueId}, protocol=all]";
                 }
             }

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

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
  */
 class UpdateConfigsUpToVer62110 extends Injectable implements UpgradeSystemConfigInterface
 {
-  	public const PBX_VERSION = '6.2.110';
+        public const PBX_VERSION = '6.2.110';
 
     public function processUpdate():void
     {

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

Indentation +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
  */
 class UpdateConfigsUpToVer100 extends Injectable implements UpgradeSystemConfigInterface
 {
-  	public const PBX_VERSION = '1.0.0';
+        public const PBX_VERSION = '1.0.0';
 
     public function processUpdate():void
     {

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
         /** @var \MikoPBX\Common\Models\Sip $peer */
         $peers = Sip::find('type="peer"');
         foreach ($peers as $peer) {
-            $peer->secret = md5('' . time() . 'sip' . $peer->id);
+            $peer->secret = md5(''.time().'sip'.$peer->id);
             $peer->save();
         }
 
@@ -38,7 +38,7 @@ 
         /** @var \MikoPBX\Common\Models\AsteriskManagerUsers $manager */
         $managers = AsteriskManagerUsers::find();
         foreach ($managers as $manager) {
-            $manager->secret = md5('' . time() . 'manager' . $manager->id);
+            $manager->secret = md5(''.time().'manager'.$manager->id);
             $manager->save();
         }
     }

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

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
  */
 class UpdateConfigsUpToVer64 extends Injectable implements UpgradeSystemConfigInterface
 {
-  	public const PBX_VERSION = '6.4.1';
+        public const PBX_VERSION = '6.4.1';
 
     private ConfigAlias $config;
     private MikoPBXConfig $mikoPBXConfig;

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
         /** @var \MikoPBX\Common\Models\DialplanApplications $res */
         $app_number = '10000100';
         $app_logic  = base64_encode('1,Goto(voice_mail_peer,voicemail,1)');
-        $d_app      = DialplanApplications::findFirst('extension="' . $app_number . '"');
+        $d_app      = DialplanApplications::findFirst('extension="'.$app_number.'"');
         if ($d_app === null) {
             $d_app                   = new DialplanApplications();
             $d_app->applicationlogic = $app_logic;
@@ -53,7 +53,7 @@ 
             $d_app->description      = 'Voice Mail';
             $d_app->name             = 'VOICEMAIL';
             $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/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/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/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/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()) {