mikopbx / Core

etc/inc/PHPMailer/SMTP.php

Spacing +30 added lines, -30 removed lines

@@ -295,7 +295,7 @@ 
         }
         // Connect to the SMTP server
         $this->edebug(
-            "Connection: opening to $host:$port, timeout=$timeout, options=" .
+            "Connection: opening to $host:$port, timeout=$timeout, options=".
             (count($options) > 0 ? var_export($options, true) : 'array()'),
             self::DEBUG_CONNECTION
         );
@@ -305,7 +305,7 @@ 
             $socket_context = stream_context_create($options);
             set_error_handler([$this, 'errorHandler']);
             $this->smtp_conn = stream_socket_client(
-                $host . ':' . $port,
+                $host.':'.$port,
                 $errno,
                 $errstr,
                 $timeout,
@@ -338,7 +338,7 @@ 
                 (string) $errstr
             );
             $this->edebug(
-                'SMTP ERROR: ' . $this->error['error']
+                'SMTP ERROR: '.$this->error['error']
                 . ": $errstr ($errno)",
                 self::DEBUG_CLIENT
             );
@@ -358,7 +358,7 @@ 
         }
         // Get any announcement
         $announce = $this->get_lines();
-        $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
+        $this->edebug('SERVER -> CLIENT: '.$announce, self::DEBUG_SERVER);
 
         return true;
     }
@@ -431,15 +431,15 @@ 
                 return false;
             }
 
-            $this->edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
+            $this->edebug('Auth method requested: '.($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
             $this->edebug(
-                'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']),
+                'Auth methods available on the server: '.implode(',', $this->server_caps['AUTH']),
                 self::DEBUG_LOWLEVEL
             );
 
             //If we have requested a specific auth type, check the server supports it before trying others
             if (!in_array($authtype, $this->server_caps['AUTH'])) {
-                $this->edebug('Requested auth method not available: ' . $authtype, self::DEBUG_LOWLEVEL);
+                $this->edebug('Requested auth method not available: '.$authtype, self::DEBUG_LOWLEVEL);
                 $authtype = null;
             }
 
@@ -457,7 +457,7 @@ 
 
                     return false;
                 }
-                self::edebug('Auth method selected: ' . $authtype, self::DEBUG_LOWLEVEL);
+                self::edebug('Auth method selected: '.$authtype, self::DEBUG_LOWLEVEL);
             }
 
             if (!in_array($authtype, $this->server_caps['AUTH'])) {
@@ -477,7 +477,7 @@ 
                 // Send encoded username and password
                 if (!$this->sendCommand(
                     'User & Password',
-                    base64_encode("\0" . $username . "\0" . $password),
+                    base64_encode("\0".$username."\0".$password),
                     235
                 )
                 ) {
@@ -505,7 +505,7 @@ 
                 $challenge = base64_decode(substr($this->last_reply, 4));
 
                 // Build the response
-                $response = $username . ' ' . $this->hmac($challenge, $password);
+                $response = $username.' '.$this->hmac($challenge, $password);
 
                 // send encoded credentials
                 return $this->sendCommand('Username', base64_encode($response), 235);
@@ -517,7 +517,7 @@ 
                 $oauth = $OAuth->getOauth64();
 
                 // Start authentication
-                if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 ' . $oauth, 235)) {
+                if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 '.$oauth, 235)) {
                     return false;
                 }
                 break;
@@ -564,7 +564,7 @@ 
         $k_ipad = $key ^ $ipad;
         $k_opad = $key ^ $opad;
 
-        return md5($k_opad . pack('H*', md5($k_ipad . $data)));
+        return md5($k_opad.pack('H*', md5($k_ipad.$data)));
     }
 
     /**
@@ -679,7 +679,7 @@ 
                 }
                 //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
                 if ($in_headers) {
-                    $line = "\t" . $line;
+                    $line = "\t".$line;
                 }
             }
             $lines_out[] = $line;
@@ -688,9 +688,9 @@ 
             foreach ($lines_out as $line_out) {
                 //RFC2821 section 4.5.2
                 if (!empty($line_out) and $line_out[0] == '.') {
-                    $line_out = '.' . $line_out;
+                    $line_out = '.'.$line_out;
                 }
-                $this->client_send($line_out . static::LE, 'DATA');
+                $this->client_send($line_out.static::LE, 'DATA');
             }
         }
 
@@ -736,7 +736,7 @@ 
      */
     protected function sendHello($hello, $host)
     {
-        $noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250);
+        $noerror = $this->sendCommand($hello, $hello.' '.$host, 250);
         $this->helo_rply = $this->last_reply;
         if ($noerror) {
             $this->parseHelloFields($hello);
@@ -807,7 +807,7 @@ 
 
         return $this->sendCommand(
             'MAIL FROM',
-            'MAIL FROM:<' . $from . '>' . $useVerp,
+            'MAIL FROM:<'.$from.'>'.$useVerp,
             250
         );
     }
@@ -847,7 +847,7 @@ 
     {
         return $this->sendCommand(
             'RCPT TO',
-            'RCPT TO:<' . $address . '>',
+            'RCPT TO:<'.$address.'>',
             [250, 251]
         );
     }
@@ -886,7 +886,7 @@ 
 
             return false;
         }
-        $this->client_send($commandstring . static::LE, $command);
+        $this->client_send($commandstring.static::LE, $command);
 
         $this->last_reply = $this->get_lines();
         // Fetch SMTP code and possible error code explanation
@@ -896,8 +896,8 @@ 
             $code_ex = (count($matches) > 2 ? $matches[2] : null);
             // Cut off error code from each response line
             $detail = preg_replace(
-                "/{$code}[ -]" .
-                ($code_ex ? str_replace('.', '\\.', $code_ex) . ' ' : '') . '/m',
+                "/{$code}[ -]".
+                ($code_ex ? str_replace('.', '\\.', $code_ex).' ' : '').'/m',
                 '',
                 $this->last_reply
             );
@@ -908,7 +908,7 @@ 
             $detail = substr($this->last_reply, 4);
         }
 
-        $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
+        $this->edebug('SERVER -> CLIENT: '.$this->last_reply, self::DEBUG_SERVER);
 
         if (!in_array($code, (array) $expect)) {
             $this->setError(
@@ -918,7 +918,7 @@ 
                 $code_ex
             );
             $this->edebug(
-                'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
+                'SMTP ERROR: '.$this->error['error'].': '.$this->last_reply,
                 self::DEBUG_CLIENT
             );
 
@@ -984,7 +984,7 @@ 
     public function turn()
     {
         $this->setError('The SMTP TURN command is not implemented');
-        $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
+        $this->edebug('SMTP NOTICE: '.$this->error['error'], self::DEBUG_CLIENT);
 
         return false;
     }
@@ -1005,7 +1005,7 @@ 
             in_array($command, ['User & Password', 'Username', 'Password'], true)) {
             $this->edebug('CLIENT -> SERVER: <credentials hidden>', self::DEBUG_CLIENT);
         } else {
-            $this->edebug('CLIENT -> SERVER: ' . $data, self::DEBUG_CLIENT);
+            $this->edebug('CLIENT -> SERVER: '.$data, self::DEBUG_CLIENT);
         }
         set_error_handler([$this, 'errorHandler']);
         $result = fwrite($this->smtp_conn, $data);
@@ -1111,14 +1111,14 @@ 
             //Must pass vars in here as params are by reference
             if (!stream_select($selR, $selW, $selW, $this->Timelimit)) {
                 $this->edebug(
-                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
+                    'SMTP -> get_lines(): timed-out ('.$this->Timeout.' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;
             }
             //Deliberate noise suppression - errors are handled afterwards
             $str = @fgets($this->smtp_conn, 515);
-            $this->edebug('SMTP INBOUND: "' . trim($str) . '"', self::DEBUG_LOWLEVEL);
+            $this->edebug('SMTP INBOUND: "'.trim($str).'"', self::DEBUG_LOWLEVEL);
             $data .= $str;
             // If response is only 3 chars (not valid, but RFC5321 S4.2 says it must be handled),
             // or 4th character is a space, we are done reading, break the loop,
@@ -1130,7 +1130,7 @@ 
             $info = stream_get_meta_data($this->smtp_conn);
             if ($info['timed_out']) {
                 $this->edebug(
-                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
+                    'SMTP -> get_lines(): timed-out ('.$this->Timeout.' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;
@@ -1138,8 +1138,8 @@ 
             // Now check if reads took too long
             if ($endtime and time() > $endtime) {
                 $this->edebug(
-                    'SMTP -> get_lines(): timelimit reached (' .
-                    $this->Timelimit . ' sec)',
+                    'SMTP -> get_lines(): timelimit reached ('.
+                    $this->Timelimit.' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;

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

@@ -876,7 +876,7 @@ 
     protected function sendCommand($command, $commandstring, $expect)
     {
         if (!$this->connected()) {
-            $this->setError("Called $command without being connected");
+            $this->setError("called $command without being connected");
 
             return false;
         }
@@ -958,7 +958,7 @@ 
      */
     public function verify($name)
     {
-        return $this->sendCommand('VRFY', "VRFY $name", [250, 251]);
+        return $this->sendCommand('VRFY', "vrfy $name", [250, 251]);
     }
 
     /**

etc/inc/PHPMailer/Exception.php

Spacing +1 added lines, -1 removed lines

@@ -22,6 +22,6 @@
      */
     public function errorMessage()
     {
-        return '<strong>' . htmlspecialchars($this->getMessage()) . "</strong><br />\n";
+        return '<strong>'.htmlspecialchars($this->getMessage())."</strong><br />\n";
     }
 }
\ No newline at end of file

etc/inc/PHPMailer/POP3.php

Spacing +3 added lines, -3 removed lines

@@ -276,11 +276,11 @@ 
         }
 
         // Send the Username
-        $this->sendString("USER $username" . static::LE);
+        $this->sendString("USER $username".static::LE);
         $pop3_response = $this->getResponse();
         if ($this->checkResponse($pop3_response)) {
             // Send the Password
-            $this->sendString("PASS $password" . static::LE);
+            $this->sendString("PASS $password".static::LE);
             $pop3_response = $this->getResponse();
             if ($this->checkResponse($pop3_response)) {
                 return true;
@@ -400,7 +400,7 @@ 
     protected function catchWarning($errno, $errstr, $errfile, $errline)
     {
         $this->setError(
-            'Connecting to the POP3 server raised a PHP warning:' .
+            'Connecting to the POP3 server raised a PHP warning:'.
             "errno: $errno errstr: $errstr; errfile: $errfile; errline: $errline"
         );
     }

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

@@ -276,11 +276,11 @@
         }
 
         // Send the Username
-        $this->sendString("USER $username" . static::LE);
+        $this->sendString("user $username" . static::LE);
         $pop3_response = $this->getResponse();
         if ($this->checkResponse($pop3_response)) {
             // Send the Password
-            $this->sendString("PASS $password" . static::LE);
+            $this->sendString("pass $password" . static::LE);
             $pop3_response = $this->getResponse();
             if ($this->checkResponse($pop3_response)) {
                 return true;

etc/inc/test.php

Spacing +8 added lines, -8 removed lines

@@ -10,23 +10,23 @@ 
 ini_set('display_errors', 1);
 ini_set('display_startup_errors', 1);
 require_once 'globals.php';
-$g['booting']   = true;
+$g['booting'] = true;
 
-unset($errorLogger,$g['error_logger']);
+unset($errorLogger, $g['error_logger']);
 Util::get_pid_process('udhcp', '');
 
 $if_name = 'eth1';
-$pid_file= "/var/run/udhcpc_{$if_name}";
+$pid_file = "/var/run/udhcpc_{$if_name}";
 $pid_pcc = Util::get_pid_process($pid_file);
-if(!empty($pid_pcc)){
+if (!empty($pid_pcc)) {
     // Завершаем старый процесс.
     system("kill `cat {$pid_file}` {$pid_pcc}");
 }
 
 exit(0);
 
-if(count($argv)===1){
-    $g['booting']   = false;
+if (count($argv) === 1) {
+    $g['booting'] = false;
     Cdr::create_db();
     Util::CreateLogDB();
 
@@ -36,7 +36,7 @@ 
 
     Firewall::reload_firewall();
 
-}elseif (count($argv)===3){
+}elseif (count($argv) === 3) {
     // php -f /etc/inc/test.php ModuleSmartIVR InstallDB
     // php -f /etc/inc/test.php ModuleSmartIVR unInstallDB
     // php -f /etc/inc/test.php ModuleCTIClient unInstallDB
@@ -58,7 +58,7 @@ 
     $module = $argv[1] ?? '';
     $action = $argv[2] ?? '';
     $path_class = "\\Modules\\{$module}\\setup\\PbxExtensionSetup";
-    if(!class_exists($path_class)){
+    if (!class_exists($path_class)) {
         $path_class = false;
         echo "Класс не существует.. $path_class";
         exit(1);

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 
     Firewall::reload_firewall();
 
-}elseif (count($argv)===3){
+} elseif (count($argv)===3){
     // php -f /etc/inc/test.php ModuleSmartIVR InstallDB
     // php -f /etc/inc/test.php ModuleSmartIVR unInstallDB
     // php -f /etc/inc/test.php ModuleCTIClient unInstallDB

etc/inc/firewall.php

Indentation +40 added lines, -40 removed lines

@@ -31,18 +31,18 @@ 
     /**
      *	Удаление всех правил Firewall.
      */
-	private function drop_all_rules():void {
-		Util::mwexec('iptables -F');
-		Util::mwexec('iptables -X');
-	}
-
-	/**
-	 *	Установка правил Firewall. 
-	**/
+    private function drop_all_rules():void {
+        Util::mwexec('iptables -F');
+        Util::mwexec('iptables -X');
+    }
+
+    /**
+     *	Установка правил Firewall. 
+     **/
     public function apply_config():void {
         self::fail2ban_stop();
         $this->drop_all_rules();
-		self::fail2ban_make_dirs();
+        self::fail2ban_make_dirs();
 
         if($this->firewall_enable){
             $arr_command = array();
@@ -167,13 +167,13 @@ 
      * @return string
      */
     private function get_iptables_input_rule($dport='', $other_data='', $action='ACCEPT'){
-		$data_port	= '';
-		if(trim($dport) !== ''){
-			$data_port= '--dport '.$dport;
+        $data_port	= '';
+        if(trim($dport) !== ''){
+            $data_port= '--dport '.$dport;
         }
-		$other_data = trim($other_data);
-		return "iptables -A INPUT $other_data $data_port -j $action";
-	}
+        $other_data = trim($other_data);
+        return "iptables -A INPUT $other_data $data_port -j $action";
+    }
 
     /**
      * Записываем конфиг для fail2ban. Описываем правила блокировок.
@@ -212,7 +212,7 @@ 
             'mikopbx-www'   => 'iptables-allports[name=HTTP, protocol=all]'
         );
         $config = "[DEFAULT]\n".
-                  "ignoreip = 127.0.0.1 {$user_whitelist}\n\n";
+                    "ignoreip = 127.0.0.1 {$user_whitelist}\n\n";
 
         $syslog_file = System::get_syslog_file();
 
@@ -231,34 +231,34 @@ 
 
         $log_dir = System::get_log_dir().'/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";
+                    "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".
-                  "logpath = {$log_dir}error\n\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".
-                  "logpath = {$log_dir}messages\n\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::file_write_content('/etc/fail2ban/jail.local',$config);
     }

Spacing +87 added lines, -87 removed lines

@@ -8,14 +8,14 @@ 
 
 require_once('globals.php');
 
-class Firewall{
+class Firewall {
     private $firewall_enable;
     private $fail2ban_enable;
 
     /**
      * Firewall constructor.
      */
-    public function __construct(){
+    public function __construct() {
         $this->firewall_enable = false;
         $this->fail2ban_enable = false;
         // Получение настроек.
@@ -44,7 +44,7 @@ 
         $this->drop_all_rules();
 		self::fail2ban_make_dirs();
 
-        if($this->firewall_enable){
+        if ($this->firewall_enable) {
             $arr_command = array();
             $arr_command[] = $this->get_iptables_input_rule('', '-m conntrack --ctstate ESTABLISHED,RELATED');
             // Добавляем разрешения на сервисы.
@@ -57,14 +57,14 @@ 
             // Кастомизация правил firewall.
             $arr_commands = []; $out = [];
             Util::file_write_content('/etc/firewall_additional', '');
-            Util::mwexec("/bin/cat /etc/firewall_additional | grep -v '|' | grep -v '&'| /bin/grep '^iptables' | /bin/busybox awk -F ';' '{print $1}'",$arr_commands);
-            Util::mwexec_commands($arr_commands,$out, 'firewall_additional');
+            Util::mwexec("/bin/cat /etc/firewall_additional | grep -v '|' | grep -v '&'| /bin/grep '^iptables' | /bin/busybox awk -F ';' '{print $1}'", $arr_commands);
+            Util::mwexec_commands($arr_commands, $out, 'firewall_additional');
         }
-        if($this->fail2ban_enable){
+        if ($this->fail2ban_enable) {
             // Настройка правил бана.
             $this->write_config();
             self::fail2ban_start();
-        }else{
+        } else {
             self::fail2ban_stop();
         }
     }
@@ -73,14 +73,14 @@ 
      * Рестарт firewall.
      * @return array
      */
-    static function reload_firewall(){
+    static function reload_firewall() {
         $result   = [];
 
         $pid_file = '/var/run/service_reload_firewall.pid';
-        if(file_exists($pid_file)){
+        if (file_exists($pid_file)) {
             $old_pid = file_get_contents($pid_file);
             $process = Util::get_pid_process("^{$old_pid}");
-            if($process !== ''){
+            if ($process !== '') {
                 $result['result'] = 'ERROR';
                 $result['data']   = 'Another restart process has not yet completed';
                 return $result;
@@ -100,12 +100,12 @@ 
      * Проверка статуса fail2ban
      * @return bool
      */
-    private function fail2ban_is_runing(){
+    private function fail2ban_is_runing() {
         $res_ping = Util::mwexec('fail2ban-client ping');
         $res_stat = Util::mwexec('fail2ban-client status');
 
         $result = false;
-        if($res_ping === 0 && $res_stat === 0){
+        if ($res_ping === 0 && $res_stat === 0) {
             $result = true;
         }
         return $result;
@@ -114,9 +114,9 @@ 
     /**
      * Проверка запущен ли fail2ban.
      */
-    static function check_fail2ban(){
+    static function check_fail2ban() {
         $firewall = new Firewall();
-        if($firewall->fail2ban_enable && !$firewall->fail2ban_is_runing()){
+        if ($firewall->fail2ban_enable && !$firewall->fail2ban_is_runing()) {
             self::fail2ban_start();
         }
     }
@@ -125,34 +125,34 @@ 
      * Генератор правил iptables.
      * @param $arr_command
      */
-    private function AddFirewallRules(&$arr_command){
+    private function AddFirewallRules(&$arr_command) {
         /** @var Models\FirewallRules $result */
         /** @var Models\FirewallRules $rule */
         /** @var Models\FirewallRules $rule */
         $result = Models\FirewallRules::find();
-        foreach ($result as $rule){
-            if($rule->portfrom !== $rule->portto && trim($rule->portto) !== ''){
-                $port ="{$rule->portfrom}:{$rule->portto}";
-            }else{
+        foreach ($result as $rule) {
+            if ($rule->portfrom !== $rule->portto && trim($rule->portto) !== '') {
+                $port = "{$rule->portfrom}:{$rule->portto}";
+            } else {
                 $port = $rule->portfrom;
             }
             /** @var Models\NetworkFilters $network_filter */
             $network_filter = Models\NetworkFilters::findFirst($rule->networkfilterid);
-            if(!$network_filter){
+            if (!$network_filter) {
                 Util::sys_log_msg('Firewall', "network_filter_id not found {$rule->networkfilterid}");
                 continue;
             }
-            if('0.0.0.0/0' === $network_filter->permit && $rule->action !== 'allow'){
+            if ('0.0.0.0/0' === $network_filter->permit && $rule->action !== 'allow') {
                 continue;
             }
             $other_data = "-p {$rule->protocol}";
-            $other_data .= ($network_filter===null)?'':' -s '.$network_filter->permit;
-            if($rule->protocol === 'icmp'){
+            $other_data .= ($network_filter === null) ? '' : ' -s '.$network_filter->permit;
+            if ($rule->protocol === 'icmp') {
                 $port = '';
                 $other_data .= ' --icmp-type echo-request';
             }
 
-            $action = ($rule->action === 'allow')?'ACCEPT':'DROP';
+            $action = ($rule->action === 'allow') ? 'ACCEPT' : 'DROP';
             $arr_command[] = $this->get_iptables_input_rule($port, $other_data, $action);
         }
         // Разрешим все локальные подключения.
@@ -166,10 +166,10 @@ 
      * @param string $action
      * @return string
      */
-    private function get_iptables_input_rule($dport='', $other_data='', $action='ACCEPT'){
+    private function get_iptables_input_rule($dport = '', $other_data = '', $action = 'ACCEPT') {
 		$data_port	= '';
-		if(trim($dport) !== ''){
-			$data_port= '--dport '.$dport;
+		if (trim($dport) !== '') {
+			$data_port = '--dport '.$dport;
         }
 		$other_data = trim($other_data);
 		return "iptables -A INPUT $other_data $data_port -j $action";
@@ -183,24 +183,24 @@ 
         $user_whitelist = '';
         /** @var Models\Fail2BanRules $res */
         $res = Models\Fail2BanRules::findFirst("id = '1'");
-        if($res!==null){
+        if ($res !== null) {
             $max_retry      = $res->maxretry;
             $find_time      = $res->findtime;
             $ban_time       = $res->bantime;
             $whitelist      = $res->whitelist;
             $arr_whitelist = explode(' ', $whitelist);
-            foreach ($arr_whitelist as $ip_string){
-                if(Verify::is_ipaddress($ip_string)){
-                    $user_whitelist.="$ip_string ";
+            foreach ($arr_whitelist as $ip_string) {
+                if (Verify::is_ipaddress($ip_string)) {
+                    $user_whitelist .= "$ip_string ";
                 }
             }
             $net_filters = Models\NetworkFilters::find("newer_block_ip = '1'");
-            foreach ($net_filters as $filter){
-                $user_whitelist.="{$filter->permit} ";
+            foreach ($net_filters as $filter) {
+                $user_whitelist .= "{$filter->permit} ";
             }
 
             $user_whitelist = trim($user_whitelist);
-        }else{
+        } else {
             $max_retry      = '10';
             $find_time      = '1800';
             $ban_time       = '43200';
@@ -216,8 +216,8 @@ 
 
         $syslog_file = System::get_syslog_file();
 
-        foreach ($jails as $jail => $action){
-            $config.= "[{$jail}]\n".
+        foreach ($jails as $jail => $action) {
+            $config .= "[{$jail}]\n".
                 "enabled = true\n".
                 "backend = process\n".
                 "logpath = {$syslog_file}\n".
@@ -230,7 +230,7 @@ 
         }
 
         $log_dir = System::get_log_dir().'/asterisk/';
-        $config.= "[asterisk_security_log]\n".
+        $config .= "[asterisk_security_log]\n".
                   "enabled = true\n".
                   "filter = asterisk\n".
                   "action = iptables-allports[name=ASTERISK, protocol=all]\n".
@@ -240,7 +240,7 @@ 
                   "bantime = {$ban_time}\n".
                   "logpath = {$log_dir}security_log\n\n";
 
-        $config.= "[asterisk_error]\n".
+        $config .= "[asterisk_error]\n".
                   "enabled = true\n".
                   "filter = asterisk\n".
                   "action = iptables-allports[name=ASTERISK_ERROR, protocol=all]\n".
@@ -250,7 +250,7 @@ 
                   "logencoding = utf-8\n".
                   "logpath = {$log_dir}error\n\n";
 
-        $config.= "[asterisk_public]\n".
+        $config .= "[asterisk_public]\n".
                   "enabled = true\n".
                   "filter = asterisk\n".
                   "action = iptables-allports[name=ASTERISK_PUBLIC, protocol=all]\n".
@@ -260,13 +260,13 @@ 
                   "logencoding = utf-8\n".
                   "logpath = {$log_dir}messages\n\n";
 
-        Util::file_write_content('/etc/fail2ban/jail.local',$config);
+        Util::file_write_content('/etc/fail2ban/jail.local', $config);
     }
 
     /**
      * Создаем дополнительные правила.
      */
-    private function generate_jails(){
+    private function generate_jails() {
 
         $conf = "[INCLUDES]\n".
                 "before = common.conf\n".
@@ -302,14 +302,14 @@ 
     /**
      * Завершение работы fail2ban;
      */
-    static function fail2ban_stop(){
+    static function fail2ban_stop() {
         Util::mwexec('fail2ban-client -x stop');
     }
 
     /**
      * Старт firewall.
      */
-    static function fail2ban_start(){
+    static function fail2ban_start() {
 
         // Чистим битые строки, не улдаленные после отмены бана.
         self::clean_fail2ban_db();
@@ -320,18 +320,18 @@ 
         Util::mwexec($command);
     }
 
-    static function clean_fail2ban_db(){
+    static function clean_fail2ban_db() {
         /** @var Models\Fail2BanRules $res */
         $res = Models\Fail2BanRules::findFirst("id = '1'");
-        if($res!==null) {
+        if ($res !== null) {
             $ban_time = $res->bantime;
-        }else{
+        } else {
             $ban_time = '43800';
         }
         $path_db    = self::fail2ban_get_db_path();
         $db         = new SQLite3($path_db);
         $db->busyTimeout(3000);
-        if(FALSE === self::table_ban_exists($db)){
+        if (FALSE === self::table_ban_exists($db)) {
             return;
         }
         $q = 'DELETE'.' from bans WHERE (timeofban+'.$ban_time.')<'.time();
@@ -343,28 +343,28 @@ 
      * @param $ip
      * @return array
      */
-    static function fail2ban_unban_all($ip){
+    static function fail2ban_unban_all($ip) {
         $ip = trim($ip);
         $result = array('result'=>'Success');
-        if(!Verify::is_ipaddress($ip)){
+        if (!Verify::is_ipaddress($ip)) {
             $result['message'] = "Not valid ip '{$ip}'.";
             return $result;
         }
         $config = new Config();
         $fail2ban_enable = $config->get_general_settings('PBXFail2BanEnabled');
         $enable = ($fail2ban_enable == '1');
-        if($enable){
+        if ($enable) {
             // Попробуем найти jail по данным DB.
             // fail2ban-client unban 172.16.156.1
             // TODO Util::mwexec("fail2ban-client unban {$ip}}");
             $data = self::get_ban_ip($ip);
-            foreach ($data as $row){
+            foreach ($data as $row) {
                 $res = self::fail2ban_unban($ip, $row['jail']);
-                if($res['result']==='ERROR'){
+                if ($res['result'] === 'ERROR') {
                     $result = $res;
                 }
             }
-        }else{
+        } else {
             $result = self::fail2ban_unban_db($ip);
         }
 
@@ -377,27 +377,27 @@ 
      * @param $jail
      * @return array
      */
-    static function fail2ban_unban($ip, $jail){
+    static function fail2ban_unban($ip, $jail) {
         $res = array('result' => 'ERROR');
         $ip  = trim($ip);
         // Валидация...
         $matches = array();
         // preg_match_all('/^[a-z-]+$/', $jail, $matches, PREG_SET_ORDER);
-        if(!Verify::is_ipaddress($ip)){
+        if (!Verify::is_ipaddress($ip)) {
             // это НЕ IP адрес, или не корректно указан jail.
             $res['message'] = 'Not valid ip or jail.';
             return $res;
         }
         $path_sock = '/var/run/fail2ban/fail2ban.sock';
-        if(file_exists($path_sock) && filetype($path_sock) === 'socket'){
+        if (file_exists($path_sock) && filetype($path_sock) === 'socket') {
             $out = array();
             Util::mwexec("fail2ban-client set {$jail} unbanip {$ip} 2>&1", $out);
             $res_data = trim(implode('', $out));
-            if($res_data !== $ip && $res_data !== "IP $ip is not banned"){
+            if ($res_data !== $ip && $res_data !== "IP $ip is not banned") {
                 $res['message'] = 'Error fail2ban-client. '.$res_data;
                 return $res;
             }
-        }else{
+        } else {
             $res['message'] = 'Fail2ban not run.';
             return $res;
         }
@@ -412,12 +412,12 @@ 
      * @param string $jail
      * @return array
      */
-    static function fail2ban_unban_db($ip, $jail=''){
-        $jail_q     = ($jail==='')?'':"AND jail = '{$jail}'";
+    static function fail2ban_unban_db($ip, $jail = '') {
+        $jail_q     = ($jail === '') ? '' : "AND jail = '{$jail}'";
         $path_db    = self::fail2ban_get_db_path();
         $db         = new SQLite3($path_db);
         $db->busyTimeout(3000);
-        if(FALSE === self::table_ban_exists($db)){
+        if (FALSE === self::table_ban_exists($db)) {
             // Таблица не существует. Бана нет.
             $res = [
                 'result'    => 'Success',
@@ -430,7 +430,7 @@ 
 
         $err = $db->lastErrorMsg();
         $res = [
-            'result'    => ($err === 'not an error')?'Success':'ERROR',
+            'result'    => ($err === 'not an error') ? 'Success' : 'ERROR',
             'message'   =>  $err
         ];
 
@@ -441,7 +441,7 @@ 
      * Возвращает путь к файлу базы данных fail2ban.
      * @return string
      */
-    static function fail2ban_get_db_path(){
+    static function fail2ban_get_db_path() {
         return '/var/lib/fail2ban/fail2ban.sqlite3';
     }
 
@@ -449,55 +449,55 @@ 
      * Создает служебные директории и ссылки на файлы fail2ban
      * @return string
      */
-    static function fail2ban_make_dirs(){
+    static function fail2ban_make_dirs() {
         global $g;
         $res_file = self::fail2ban_get_db_path();
         $filename = basename($res_file);
 
-        $old_dir_db   = $g['cf_path'].'/fail2ban';
+        $old_dir_db = $g['cf_path'].'/fail2ban';
         $dir_db = self::get_fail2ban_db_dir();
 
         // Создаем рабочие каталоги.
         $db_bd_dir = dirname($res_file);
-        if(!is_dir($db_bd_dir) && !mkdir($db_bd_dir,0755, true) && !is_dir($db_bd_dir)){
+        if (!is_dir($db_bd_dir) && !mkdir($db_bd_dir, 0755, true) && !is_dir($db_bd_dir)) {
             Util::log_msg_db('Fail2ban', 'Error create dir '.$db_bd_dir);
         }
-        if(!is_dir($dir_db) && !mkdir($dir_db,0755, true) && !is_dir($dir_db)){
+        if (!is_dir($dir_db) && !mkdir($dir_db, 0755, true) && !is_dir($dir_db)) {
             Util::log_msg_db('Fail2ban', 'Error create dir '.$dir_db);
         }
 
         $create_link = false;
 
         // Символическая ссылка на базу данных.
-        if(@filetype($res_file) !== 'link'){
+        if (@filetype($res_file) !== 'link') {
             @unlink($res_file);
             $create_link = true;
-        }elseif(readlink($res_file) === "$old_dir_db/$filename"){
+        }elseif (readlink($res_file) === "$old_dir_db/$filename") {
             @unlink($res_file);
             $create_link = true;
-            if(file_exists("$old_dir_db/$filename")){
+            if (file_exists("$old_dir_db/$filename")) {
                 // Перемещаем файл в новое местоположение.
                 Util::mwexec("mv '$old_dir_db/$filename' '$dir_db/$filename'");
             }
         }
 
-        if($create_link === true){
+        if ($create_link === true) {
             @symlink("$dir_db/$filename", $res_file);
         }
         return $res_file;
     }
 
-    static function get_fail2ban_db_dir(){
-        if( Storage::is_storage_disk_mounted() ){
+    static function get_fail2ban_db_dir() {
+        if (Storage::is_storage_disk_mounted()) {
             $mount_point = Storage::get_media_dir();
             $db_dir = "$mount_point/fail2ban";
-        }else{
+        } else {
             $db_dir = "/var/spool/fail2ban";
         }
-        if(!is_dir($db_dir) && !mkdir($db_dir,0755, true) && !is_dir($db_dir)){
+        if (!is_dir($db_dir) && !mkdir($db_dir, 0755, true) && !is_dir($db_dir)) {
             Util::log_msg_db('Fail2ban', 'Error create dir '.$db_dir);
         }
-        if(!file_exists($db_dir)){
+        if (!file_exists($db_dir)) {
             $db_dir = '/tmp';
         }
         return $db_dir;
@@ -508,36 +508,36 @@ 
      * @param null $ip
      * @return array
      */
-    static function get_ban_ip($ip = null){
+    static function get_ban_ip($ip = null) {
         $result = [];
 
         /** @var Models\Fail2BanRules $res */
         $res = Models\Fail2BanRules::findFirst("id = '1'");
-        if($res!==null) {
+        if ($res !== null) {
             $ban_time = $res->bantime;
-        }else{
+        } else {
             $ban_time = '43800';
         }
 
         // Добавленн фильтр по времени бана. возвращаем только адреса, которые еще НЕ разбанены.
         $q = 'SELECT'.' DISTINCT jail,ip,MAX(timeofban) AS timeofban, MAX(timeofban+'.$ban_time.') AS timeunban FROM bans where (timeofban+'.$ban_time.')>'.time();
-        if($ip !== null){
+        if ($ip !== null) {
             $q .= " AND ip='{$ip}'";
         }
-        $q.=' GROUP BY jail,ip';
+        $q .= ' GROUP BY jail,ip';
 
         $path_db = self::fail2ban_get_db_path();
         $db = new SQLite3($path_db);
         $db->busyTimeout(5000);
 
-        if(FALSE === self::table_ban_exists($db)){
+        if (FALSE === self::table_ban_exists($db)) {
             // Таблица не существует. Бана нет.
             return $result;
         }
 
-        $results  = $db->query($q);
-        if(FALSE !== $results && $results->numColumns()>0){
-            while($res = $results->fetchArray(SQLITE3_ASSOC)){
+        $results = $db->query($q);
+        if (FALSE !== $results && $results->numColumns() > 0) {
+            while ($res = $results->fetchArray(SQLITE3_ASSOC)) {
                 $result[] = $res;
             }
         }
@@ -550,9 +550,9 @@ 
      * @param SQLite3 $db
      * @return bool
      */
-    static function table_ban_exists($db){
+    static function table_ban_exists($db) {
         $q_check = 'SELECT'.' name FROM sqlite_master WHERE type = "table" AND name="bans"';
-        $result_check  = $db->query($q_check);
+        $result_check = $db->query($q_check);
         $result = (FALSE !== $result_check && $result_check->fetchArray(SQLITE3_ASSOC) !== FALSE);
         return $result;
     }

Braces +47 added lines, -28 removed lines

@@ -8,14 +8,16 @@ 
 
 require_once('globals.php');
 
-class Firewall{
+class Firewall
+{
     private $firewall_enable;
     private $fail2ban_enable;
 
     /**
      * Firewall constructor.
      */
-    public function __construct(){
+    public function __construct()
+    {
         $this->firewall_enable = false;
         $this->fail2ban_enable = false;
         // Получение настроек.
@@ -64,7 +66,7 @@ 
             // Настройка правил бана.
             $this->write_config();
             self::fail2ban_start();
-        }else{
+        } else{
             self::fail2ban_stop();
         }
     }
@@ -73,7 +75,8 @@ 
      * Рестарт firewall.
      * @return array
      */
-    static function reload_firewall(){
+    static function reload_firewall()
+    {
         $result   = [];
 
         $pid_file = '/var/run/service_reload_firewall.pid';
@@ -100,7 +103,8 @@ 
      * Проверка статуса fail2ban
      * @return bool
      */
-    private function fail2ban_is_runing(){
+    private function fail2ban_is_runing()
+    {
         $res_ping = Util::mwexec('fail2ban-client ping');
         $res_stat = Util::mwexec('fail2ban-client status');
 
@@ -114,7 +118,8 @@ 
     /**
      * Проверка запущен ли fail2ban.
      */
-    static function check_fail2ban(){
+    static function check_fail2ban()
+    {
         $firewall = new Firewall();
         if($firewall->fail2ban_enable && !$firewall->fail2ban_is_runing()){
             self::fail2ban_start();
@@ -125,7 +130,8 @@ 
      * Генератор правил iptables.
      * @param $arr_command
      */
-    private function AddFirewallRules(&$arr_command){
+    private function AddFirewallRules(&$arr_command)
+    {
         /** @var Models\FirewallRules $result */
         /** @var Models\FirewallRules $rule */
         /** @var Models\FirewallRules $rule */
@@ -133,7 +139,7 @@ 
         foreach ($result as $rule){
             if($rule->portfrom !== $rule->portto && trim($rule->portto) !== ''){
                 $port ="{$rule->portfrom}:{$rule->portto}";
-            }else{
+            } else{
                 $port = $rule->portfrom;
             }
             /** @var Models\NetworkFilters $network_filter */
@@ -166,7 +172,8 @@ 
      * @param string $action
      * @return string
      */
-    private function get_iptables_input_rule($dport='', $other_data='', $action='ACCEPT'){
+    private function get_iptables_input_rule($dport='', $other_data='', $action='ACCEPT')
+    {
 		$data_port	= '';
 		if(trim($dport) !== ''){
 			$data_port= '--dport '.$dport;
@@ -200,7 +207,7 @@ 
             }
 
             $user_whitelist = trim($user_whitelist);
-        }else{
+        } else{
             $max_retry      = '10';
             $find_time      = '1800';
             $ban_time       = '43200';
@@ -266,7 +273,8 @@ 
     /**
      * Создаем дополнительные правила.
      */
-    private function generate_jails(){
+    private function generate_jails()
+    {
 
         $conf = "[INCLUDES]\n".
                 "before = common.conf\n".
@@ -302,14 +310,16 @@ 
     /**
      * Завершение работы fail2ban;
      */
-    static function fail2ban_stop(){
+    static function fail2ban_stop()
+    {
         Util::mwexec('fail2ban-client -x stop');
     }
 
     /**
      * Старт firewall.
      */
-    static function fail2ban_start(){
+    static function fail2ban_start()
+    {
 
         // Чистим битые строки, не улдаленные после отмены бана.
         self::clean_fail2ban_db();
@@ -320,12 +330,13 @@ 
         Util::mwexec($command);
     }
 
-    static function clean_fail2ban_db(){
+    static function clean_fail2ban_db()
+    {
         /** @var Models\Fail2BanRules $res */
         $res = Models\Fail2BanRules::findFirst("id = '1'");
         if($res!==null) {
             $ban_time = $res->bantime;
-        }else{
+        } else{
             $ban_time = '43800';
         }
         $path_db    = self::fail2ban_get_db_path();
@@ -343,7 +354,8 @@ 
      * @param $ip
      * @return array
      */
-    static function fail2ban_unban_all($ip){
+    static function fail2ban_unban_all($ip)
+    {
         $ip = trim($ip);
         $result = array('result'=>'Success');
         if(!Verify::is_ipaddress($ip)){
@@ -364,7 +376,7 @@ 
                     $result = $res;
                 }
             }
-        }else{
+        } else{
             $result = self::fail2ban_unban_db($ip);
         }
 
@@ -377,7 +389,8 @@ 
      * @param $jail
      * @return array
      */
-    static function fail2ban_unban($ip, $jail){
+    static function fail2ban_unban($ip, $jail)
+    {
         $res = array('result' => 'ERROR');
         $ip  = trim($ip);
         // Валидация...
@@ -397,7 +410,7 @@ 
                 $res['message'] = 'Error fail2ban-client. '.$res_data;
                 return $res;
             }
-        }else{
+        } else{
             $res['message'] = 'Fail2ban not run.';
             return $res;
         }
@@ -412,7 +425,8 @@ 
      * @param string $jail
      * @return array
      */
-    static function fail2ban_unban_db($ip, $jail=''){
+    static function fail2ban_unban_db($ip, $jail='')
+    {
         $jail_q     = ($jail==='')?'':"AND jail = '{$jail}'";
         $path_db    = self::fail2ban_get_db_path();
         $db         = new SQLite3($path_db);
@@ -441,7 +455,8 @@ 
      * Возвращает путь к файлу базы данных fail2ban.
      * @return string
      */
-    static function fail2ban_get_db_path(){
+    static function fail2ban_get_db_path()
+    {
         return '/var/lib/fail2ban/fail2ban.sqlite3';
     }
 
@@ -449,7 +464,8 @@ 
      * Создает служебные директории и ссылки на файлы fail2ban
      * @return string
      */
-    static function fail2ban_make_dirs(){
+    static function fail2ban_make_dirs()
+    {
         global $g;
         $res_file = self::fail2ban_get_db_path();
         $filename = basename($res_file);
@@ -472,7 +488,7 @@ 
         if(@filetype($res_file) !== 'link'){
             @unlink($res_file);
             $create_link = true;
-        }elseif(readlink($res_file) === "$old_dir_db/$filename"){
+        } elseif(readlink($res_file) === "$old_dir_db/$filename"){
             @unlink($res_file);
             $create_link = true;
             if(file_exists("$old_dir_db/$filename")){
@@ -487,11 +503,12 @@ 
         return $res_file;
     }
 
-    static function get_fail2ban_db_dir(){
+    static function get_fail2ban_db_dir()
+    {
         if( Storage::is_storage_disk_mounted() ){
             $mount_point = Storage::get_media_dir();
             $db_dir = "$mount_point/fail2ban";
-        }else{
+        } else{
             $db_dir = "/var/spool/fail2ban";
         }
         if(!is_dir($db_dir) && !mkdir($db_dir,0755, true) && !is_dir($db_dir)){
@@ -508,14 +525,15 @@ 
      * @param null $ip
      * @return array
      */
-    static function get_ban_ip($ip = null){
+    static function get_ban_ip($ip = null)
+    {
         $result = [];
 
         /** @var Models\Fail2BanRules $res */
         $res = Models\Fail2BanRules::findFirst("id = '1'");
         if($res!==null) {
             $ban_time = $res->bantime;
-        }else{
+        } else{
             $ban_time = '43800';
         }
 
@@ -550,7 +568,8 @@ 
      * @param SQLite3 $db
      * @return bool
      */
-    static function table_ban_exists($db){
+    static function table_ban_exists($db)
+    {
         $q_check = 'SELECT'.' name FROM sqlite_master WHERE type = "table" AND name="bans"';
         $result_check  = $db->query($q_check);
         $result = (FALSE !== $result_check && $result_check->fetchArray(SQLITE3_ASSOC) !== FALSE);

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

@@ -331,7 +331,7 @@ 
         $path_db    = self::fail2ban_get_db_path();
         $db         = new SQLite3($path_db);
         $db->busyTimeout(3000);
-        if(FALSE === self::table_ban_exists($db)){
+        if(false === self::table_ban_exists($db)){
             return;
         }
         $q = 'DELETE'.' from bans WHERE (timeofban+'.$ban_time.')<'.time();
@@ -393,7 +393,7 @@ 
             $out = array();
             Util::mwexec("fail2ban-client set {$jail} unbanip {$ip} 2>&1", $out);
             $res_data = trim(implode('', $out));
-            if($res_data !== $ip && $res_data !== "IP $ip is not banned"){
+            if($res_data !== $ip && $res_data !== "ip $ip is not banned"){
                 $res['message'] = 'Error fail2ban-client. '.$res_data;
                 return $res;
             }
@@ -417,7 +417,7 @@ 
         $path_db    = self::fail2ban_get_db_path();
         $db         = new SQLite3($path_db);
         $db->busyTimeout(3000);
-        if(FALSE === self::table_ban_exists($db)){
+        if(false === self::table_ban_exists($db)){
             // Таблица не существует. Бана нет.
             $res = [
                 'result'    => 'Success',
@@ -530,13 +530,13 @@ 
         $db = new SQLite3($path_db);
         $db->busyTimeout(5000);
 
-        if(FALSE === self::table_ban_exists($db)){
+        if(false === self::table_ban_exists($db)){
             // Таблица не существует. Бана нет.
             return $result;
         }
 
         $results  = $db->query($q);
-        if(FALSE !== $results && $results->numColumns()>0){
+        if(false !== $results && $results->numColumns()>0){
             while($res = $results->fetchArray(SQLITE3_ASSOC)){
                 $result[] = $res;
             }
@@ -553,7 +553,7 @@ 
     static function table_ban_exists($db){
         $q_check = 'SELECT'.' name FROM sqlite_master WHERE type = "table" AND name="bans"';
         $result_check  = $db->query($q_check);
-        $result = (FALSE !== $result_check && $result_check->fetchArray(SQLITE3_ASSOC) !== FALSE);
+        $result = (false !== $result_check && $result_check->fetchArray(SQLITE3_ASSOC) !== false);
         return $result;
     }
 

etc/inc/Nats/ConnectionOptions.php

Indentation +15 added lines, -15 removed lines

@@ -94,16 +94,16 @@ 
      * @var array
      */
     private $configurable = [
-                             'host',
-                             'port',
-                             'user',
-                             'pass',
-                             'token',
-                             'lang',
-                             'version',
-                             'verbose',
-                             'pedantic',
-                             'reconnect',
+                                'host',
+                                'port',
+                                'user',
+                                'pass',
+                                'token',
+                                'lang',
+                                'version',
+                                'verbose',
+                                'pedantic',
+                                'reconnect',
                             ];
 
 
@@ -151,11 +151,11 @@ 
     public function __toString()
     {
         $a = [
-              'lang'     => $this->lang,
-              'version'  => $this->version,
-              'verbose'  => $this->verbose,
-              'pedantic' => $this->pedantic,
-             ];
+                'lang'     => $this->lang,
+                'version'  => $this->version,
+                'verbose'  => $this->verbose,
+                'pedantic' => $this->pedantic,
+                ];
         if (empty($this->user) === false) {
             $a['user'] = $this->user;
         }

etc/inc/Nats/test/test.php

Indentation +8 added lines, -8 removed lines

@@ -9,12 +9,12 @@
 require_once 'globals.php';
 $i = 0;
 while($i < 1){
-	$lines = file(__DIR__.'/nats_log');
-	// Осуществим проход массива и выведем номера строк и их содержимое в виде HTML-кода.
-	foreach ($lines as $line_num => $line) {
-		$row = trim($line);
-		$client = new BeanstalkClient('call_events');
-		$client->publish($row);
-	}
-	$i = $i + 1;
+    $lines = file(__DIR__.'/nats_log');
+    // Осуществим проход массива и выведем номера строк и их содержимое в виде HTML-кода.
+    foreach ($lines as $line_num => $line) {
+        $row = trim($line);
+        $client = new BeanstalkClient('call_events');
+        $client->publish($row);
+    }
+    $i = $i + 1;
 }

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
 require_once 'globals.php';
 $i = 0;
-while($i < 1){
+while ($i < 1) {
 	$lines = file(__DIR__.'/nats_log');
 	// Осуществим проход массива и выведем номера строк и их содержимое в виде HTML-кода.
 	foreach ($lines as $line_num => $line) {

etc/inc/Nats/test/test_long_str_client.php

Indentation +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
 // Обработчик результата запроса. 
 $worker = function ($message) {
-	echo "Получена строка в ".strlen($message)." символов\n";
+    echo "Получена строка в ".strlen($message)." символов\n";
 };
 
 $start = microtime(true);

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
 require_once 'Nats/autoloader.php';
 
 // Обработчик результата запроса. 
-$worker = function ($message) {
+$worker = function($message) {
 	echo "Получена строка в ".strlen($message)." символов\n";
 };
 
@@ -21,13 +21,13 @@ 
 
 echo "отправляем строку в ".strlen($q)." символов\n";
 
-while ($ch < 1000){
+while ($ch < 1000) {
     $ch++;
     $q = Util::generateRandomString($ch);
     $client->request('echo', $q, $worker);
     // echo $result."\n";
 }
 
-echo "Total time: ". (microtime(true) - $start);
+echo "Total time: ".(microtime(true) - $start);
 
 

Braces +2 added lines, -1 removed lines

@@ -10,7 +10,8 @@
 require_once 'Nats/autoloader.php';
 
 // Обработчик результата запроса. 
-$worker = function ($message) {
+$worker = function ($message)
+{
 	echo "Получена строка в ".strlen($message)." символов\n";
 };
 

etc/inc/Nats/test/test_long_str_warker.php

Indentation +5 added lines, -5 removed lines

@@ -12,12 +12,12 @@
 $client = new \Nats\Connection();
 
 $echo_worker = function ($message) {
-	// echo "Получена строка в ".strlen($message)." символов\n";
-	$message->reply($message);
+    // echo "Получена строка в ".strlen($message)." символов\n";
+    $message->reply($message);
 };
 
 while (true) {
-	$client->connect();
-	$client->subscribe('echo',  	  $echo_worker);
-	$client->wait();
+    $client->connect();
+    $client->subscribe('echo',  	  $echo_worker);
+    $client->wait();
 }

Spacing +2 added lines, -2 removed lines

@@ -11,13 +11,13 @@
 
 $client = new \Nats\Connection();
 
-$echo_worker = function ($message) {
+$echo_worker = function($message) {
 	// echo "Получена строка в ".strlen($message)." символов\n";
 	$message->reply($message);
 };
 
 while (true) {
 	$client->connect();
-	$client->subscribe('echo',  	  $echo_worker);
+	$client->subscribe('echo', $echo_worker);
 	$client->wait();
 }

Braces +2 added lines, -1 removed lines

@@ -11,7 +11,8 @@
 
 $client = new \Nats\Connection();
 
-$echo_worker = function ($message) {
+$echo_worker = function ($message)
+{
 	// echo "Получена строка в ".strlen($message)." символов\n";
 	$message->reply($message);
 };