terrylinooo / shieldon

src/Firewall/Log/ActionLogParser.php

Spacing +28 added lines, -28 removed lines

@@ -197,7 +197,7 @@ 
         ];
 
         if (empty($dataRange[$this->type])) {
-            if (preg_match('/past_([0-9]+)_days/', $this->type, $matches) ) {
+            if (preg_match('/past_([0-9]+)_days/', $this->type, $matches)) {
                 $dayCount = $matches[1];
                 $startDate = date('Ymd', strtotime('-' . $dayCount . ' days'));
                 $endDate = date('Ymd');
@@ -336,21 +336,21 @@ 
             return [];
         }
 
-        $results['captcha_chart_string']  = '';     // string
-        $results['pageview_chart_string'] = '';     // string
-        $results['captcha_success_count'] = 0;      // integer
-        $results['captcha_failure_count'] = 0;      // integer
-        $results['captcha_count'] = 0;              // integer
-        $results['pageview_count'] = 0;             // integer
-        $results['captcha_percentageage'] = 0;      // integer
+        $results['captcha_chart_string']  = ''; // string
+        $results['pageview_chart_string'] = ''; // string
+        $results['captcha_success_count'] = 0; // integer
+        $results['captcha_failure_count'] = 0; // integer
+        $results['captcha_count'] = 0; // integer
+        $results['pageview_count'] = 0; // integer
+        $results['captcha_percentageage'] = 0; // integer
         $results['captcha_failure_percentage'] = 0; // integer
         $results['captcha_success_percentage'] = 0; // integer
 
-        $results['action_ban_count'] = 0;           // integer
-        $results['action_temp_ban_count'] = 0;      // integer
-        $results['action_unban_count'] = 0;         // integer
-        $results['blacklist_count'] = 0;            // integer
-        $results['session_limit_count'] = 0;        // integer
+        $results['action_ban_count'] = 0; // integer
+        $results['action_temp_ban_count'] = 0; // integer
+        $results['action_unban_count'] = 0; // integer
+        $results['blacklist_count'] = 0; // integer
+        $results['session_limit_count'] = 0; // integer
 
         $ipdData = $this->getIpData();
 
@@ -391,22 +391,22 @@ 
     {
         $periodData = $this->getPeriodData();
 
-        $results['captcha_chart_string']  = '';     // string
-        $results['pageview_chart_string'] = '';     // string
-        $results['label_chart_string'] = '';        // string
-        $results['captcha_success_count'] = 0;      // integer
-        $results['captcha_failure_count'] = 0;      // integer
-        $results['captcha_count'] = 0;              // integer
-        $results['pageview_count'] = 0;             // integer
-        $results['captcha_percentageage'] = 0;      // integer
+        $results['captcha_chart_string']  = ''; // string
+        $results['pageview_chart_string'] = ''; // string
+        $results['label_chart_string'] = ''; // string
+        $results['captcha_success_count'] = 0; // integer
+        $results['captcha_failure_count'] = 0; // integer
+        $results['captcha_count'] = 0; // integer
+        $results['pageview_count'] = 0; // integer
+        $results['captcha_percentageage'] = 0; // integer
         $results['captcha_failure_percentage'] = 0; // integer
         $results['captcha_success_percentage'] = 0; // integer
 
-        $results['action_ban_count'] = 0;           // integer
-        $results['action_temp_ban_count'] = 0;      // integer
-        $results['action_unban_count'] = 0;         // integer
-        $results['blacklist_count'] = 0;            // integer
-        $results['session_limit_count'] = 0;        // integer
+        $results['action_ban_count'] = 0; // integer
+        $results['action_temp_ban_count'] = 0; // integer
+        $results['action_unban_count'] = 0; // integer
+        $results['blacklist_count'] = 0; // integer
+        $results['session_limit_count'] = 0; // integer
 
         if (!empty($periodData)) {
 
@@ -436,7 +436,7 @@ 
             }
 
             $results['captcha_chart_string'] = implode(',', $chartCaptcha);
-            $results['pageview_chart_string']= implode(',', $chartPageview);
+            $results['pageview_chart_string'] = implode(',', $chartPageview);
             $results['captcha_success_chart_string'] = implode(',', $chartCaptchaSuccess);
             $results['captcha_failure_chart_string'] = implode(',', $chartCaptchaFailure);
             $results['label_chart_string'] = "'" . implode("','", $labels) . "'";
@@ -466,7 +466,7 @@ 
         $ip = $log['ip'];
         $sessionId = $log['session_id'];
 
-        $this->ipDetail[$t][$ip]['session_id'][$sessionId ] = 1;
+        $this->ipDetail[$t][$ip]['session_id'][$sessionId] = 1;
 
         if ($logActionCode === self::LOG_TEMPORARILY_BAN) {
             $this->periodDetail[$t][$k]['action_temp_ban_count']++;

src/Firewall/Firewall/MainTrait.php

Spacing +10 added lines, -10 removed lines

@@ -102,9 +102,9 @@ 
 
         $this->kernel->setProperty('time_unit_quota', $frequencyQuota);
 
-        $this->kernel->setProperty('cookie_name', $settings['cookie']['config']['cookie_name']);      // ssjd
-        $this->kernel->setProperty('cookie_domain', $settings['cookie']['config']['cookie_domain']);  // ''
-        $this->kernel->setProperty('cookie_value', $settings['cookie']['config']['cookie_value']);    // 1
+        $this->kernel->setProperty('cookie_name', $settings['cookie']['config']['cookie_name']); // ssjd
+        $this->kernel->setProperty('cookie_domain', $settings['cookie']['config']['cookie_domain']); // ''
+        $this->kernel->setProperty('cookie_value', $settings['cookie']['config']['cookie_value']); // 1
 
         $this->kernel->setProperty('interval_check_referer', $settings['referer']['config']['time_buffer']);
         $this->kernel->setProperty('interval_check_session', $settings['referer']['config']['time_buffer']);
@@ -211,7 +211,7 @@ 
 
         foreach ($ipList as $ip) {
 
-            if (0 === strpos($this->kernel->getCurrentUrl(), $ip['url']) ) {
+            if (0 === strpos($this->kernel->getCurrentUrl(), $ip['url'])) {
 
                 if ('allow' === $ip['rule']) {
                     $allowedList[] = $ip['ip'];
@@ -280,12 +280,12 @@ 
         $setting = $this->getOption('failed_attempts_in_a_row', 'events');
 
         $this->kernel->setProperty('deny_attempt_enable', [
-            'data_circle' => $setting['data_circle']['enable'],         // false   
+            'data_circle' => $setting['data_circle']['enable'], // false   
             'system_firewall' => $setting['system_firewall']['enable'], // false   
         ]);
 
         $this->kernel->setProperty('deny_attempt_buffer', [
-            'data_circle' => $setting['data_circle']['buffer'],         // 10
+            'data_circle' => $setting['data_circle']['buffer'], // 10
             'system_firewall' => $setting['system_firewall']['buffer'], // 10
         ]);
 
@@ -293,7 +293,7 @@ 
         $recordAttempt = $this->getOption('record_attempt');
 
         $this->kernel->setProperty('record_attempt_detection_period', $recordAttempt['detection_period']); // 5
-        $this->kernel->setProperty('reset_attempt_counter', $recordAttempt['time_to_reset']);              // 1800
+        $this->kernel->setProperty('reset_attempt_counter', $recordAttempt['time_to_reset']); // 1800
     }
 
     /**
@@ -304,7 +304,7 @@ 
     protected function setIptablesBridgeDirectory(): void
     {
         $iptablesSetting = $this->getOption('config', 'iptables');
-        $this->kernel->setProperty('iptables_watching_folder',  $iptablesSetting['watching_folder']);
+        $this->kernel->setProperty('iptables_watching_folder', $iptablesSetting['watching_folder']);
     }
 
     /**
@@ -318,7 +318,7 @@ 
 
         if ($sessionLimitSetting['enable']) {
 
-            $onlineUsers = $sessionLimitSetting['config']['count']  ?? 100;
+            $onlineUsers = $sessionLimitSetting['config']['count'] ?? 100;
             $alivePeriod = $sessionLimitSetting['config']['period'] ?? 300;
 
             $this->kernel->limitSession($onlineUsers, $alivePeriod);
@@ -341,7 +341,7 @@ 
 
             $lastResetTime = $cronjobSetting['config']['last_update'];
 
-            if (!empty($lastResetTime) ) {
+            if (!empty($lastResetTime)) {
                 $lastResetTime = strtotime($lastResetTime);
             } else {
                 // @codeCoverageIgnoreStart