terrylinooo / shieldon

src/Firewall/Driver/FileDriver.php

Spacing +2 added lines, -2 removed lines

@@ -356,8 +356,8 @@
         $path = [];
 
         $path['filter'] = $this->directory . '/' . $this->tableFilterLogs . '/' . $ip . '.' . $this->extension;
-        $path['session'] = $this->directory . '/' . $this->tableSessions   . '/' . $ip . '.' . $this->extension;
-        $path['rule'] = $this->directory . '/' . $this->tableRuleList   . '/' . $ip . '.' . $this->extension;
+        $path['session'] = $this->directory . '/' . $this->tableSessions . '/' . $ip . '.' . $this->extension;
+        $path['rule'] = $this->directory . '/' . $this->tableRuleList . '/' . $ip . '.' . $this->extension;
 
         return $path[$type] ?? '';
     }

src/Firewall/Log/ActionLogParser.php

Spacing +28 added lines, -28 removed lines

@@ -208,7 +208,7 @@ 
             default:
 
                 // We also accept querying N days data from logs. For example: `past_365_days`.
-                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'));
@@ -331,21 +331,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();
 
@@ -386,22 +386,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)) {
 
@@ -431,7 +431,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) . "'";
@@ -461,7 +461,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/Log/ActionLogger.php

Spacing +3 added lines, -3 removed lines

@@ -100,10 +100,10 @@
             $record['session_id'] = substr($record['session_id'], 0, 4);
         }
 
-        $data[0] = $record['ip']          ?? 'null';
-        $data[1] = $record['session_id']  ?? 'null';
+        $data[0] = $record['ip'] ?? 'null';
+        $data[1] = $record['session_id'] ?? 'null';
         $data[2] = $record['action_code'] ?? 'null';
-        $data[3] = $record['timesamp']    ?? 'null';
+        $data[3] = $record['timesamp'] ?? 'null';
 
         file_put_contents($this->filePath, implode(',', $data) . "\n", FILE_APPEND | LOCK_EX);
     }

Indentation +7 added lines, -7 removed lines

@@ -224,13 +224,13 @@
     }
 
 /**
-     * Get data from log file.
-     *
-     * @param string $fromYmd The string in Ymd Date format.
-     * @param string $toYmd   The end date.
-     *
-     * @return array
-     */
+ * Get data from log file.
+ *
+ * @param string $fromYmd The string in Ymd Date format.
+ * @param string $toYmd   The end date.
+ *
+ * @return array
+ */
     private function getDataFromSingleDate(string $fromYmd = '', string $toYmd = ''): array
     {
         $results = [];

templates/panel/table_sessions.php

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
             </div>
             <div class="board-field right">
                 <div class="heading"><?php _e('panel', 'table_heading_period', 'Period'); ?></div>
-                <div class="nums"><?php echo number_format($session_limit_period ); ?></div>
+                <div class="nums"><?php echo number_format($session_limit_period); ?></div>
                 <div class="note"><?php _e('panel', 'table_note_period', 'Keep-alive period. (minutes)'); ?></div>
             </div>
         </div>
@@ -49,7 +49,7 @@ 
             </div>
             <div class="board-field right">
                 <div class="heading"><?php _e('panel', 'table_heading_online', 'Online'); ?></div>
-                <div class="nums"><?php echo number_format($online_count ); ?></div>
+                <div class="nums"><?php echo number_format($online_count); ?></div>
                 <div class="note"><?php _e('panel', 'table_note_online', 'Online session amount.'); ?></div>
             </div>
         </div>
@@ -89,14 +89,14 @@ 
 
                         $remainsTime = $expires - (time() - $sessionInfo['time']);
 
-                        if ($remainsTime < 1 ) {
+                        if ($remainsTime < 1) {
                             $remainsTime = 0;
                         }
 
-                        if ($i < $session_limit_count ) {
+                        if ($i < $session_limit_count) {
                             $satusName = __('panel', 'table_text_allowable', 'Allowable');
 
-                            if ($remainsTime < 1 ) {
+                            if ($remainsTime < 1) {
                                 $satusName = __('panel', 'table_text_expired', 'Expired');
                             }
                         } else {

templates/panel/table_filter_logs.php

Spacing +4 added lines, -4 removed lines

@@ -58,20 +58,20 @@
             </thead>
             <tbody>
                 <?php foreach ($ip_log_list as $ipInfo) : ?>
-                    <?php $logData = is_array($ipInfo['log_data']) ? $ipInfo['log_data'] : json_decode($ipInfo['log_data'], true ); ?>
+                    <?php $logData = is_array($ipInfo['log_data']) ? $ipInfo['log_data'] : json_decode($ipInfo['log_data'], true); ?>
                     <?php
 
                         $text_warning = '';
 
-                        if ($logData['pageviews_m'] > 6 || $logData['pageviews_h'] > 50 || $logData['pageviews_d'] > 100 ) {
+                        if ($logData['pageviews_m'] > 6 || $logData['pageviews_h'] > 50 || $logData['pageviews_d'] > 100) {
                             $text_warning = '<span class="so-text-warning"><i class="fas fa-exclamation-triangle"></i></span>';
                         }
 
-                        if ($logData['flag_js_cookie'] > 2 || $logData['flag_multi_session'] > 2 || $logData['flag_empty_referer'] > 2 ) {
+                        if ($logData['flag_js_cookie'] > 2 || $logData['flag_multi_session'] > 2 || $logData['flag_empty_referer'] > 2) {
                             $text_warning = '<span class="so-text-warning"><i class="fas fa-exclamation-triangle"></i></span>';
                         }
 
-                        if ($logData['flag_js_cookie'] > 3 || $logData['flag_multi_session'] > 3 || $logData['flag_empty_referer'] > 3 ) {
+                        if ($logData['flag_js_cookie'] > 3 || $logData['flag_multi_session'] > 3 || $logData['flag_empty_referer'] > 3) {
                             $text_warning = '<span class="so-text-danger"><i class="fas fa-exclamation-triangle"></i></span>';
                         }
                     ?>

templates/frontend/captcha.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 							<p><input type="submit" value="<?php _e('core', 'stop_submit', 'Submit') ?>" /></p>
 						</form>
 					</div>
-					<?php if (! empty($dialoguserinfo)) : ?>
+					<?php if (!empty($dialoguserinfo)) : ?>
 						<div class="status-user-info">
 							<?php foreach ($dialoguserinfo as $key => $userinfo) : ?>
 								<div class="row">

src/Firewall/Panel/BaseController.php

Spacing +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
             define('SHIELDON_VIEW', true);
         }
 
-        $viewFilePath =  __DIR__ . '/../../../templates/' . $page . '.php';
+        $viewFilePath = __DIR__ . '/../../../templates/' . $page . '.php';
     
         if (!empty($data)) {
             extract($data);

src/Firewall/Panel/ConfigMethodsTrait.php

Indentation +8 added lines, -8 removed lines

@@ -35,14 +35,14 @@
  */
 trait ConfigMethodsTrait
 {
-     /**
-     * Parse the POST fields and set them into configuration data structure.
-     * Used for saveConfig method only.
-     *
-     * @param array $postParams
-     *
-     * @return void
-     */
+        /**
+         * Parse the POST fields and set them into configuration data structure.
+         * Used for saveConfig method only.
+         *
+         * @param array $postParams
+         *
+         * @return void
+         */
     protected function saveConfigPrepareSettings(array $postParams): void
     {
         foreach ($postParams as $postKey => $postData) {

Spacing +9 added lines, -9 removed lines

@@ -77,7 +77,7 @@ 
                     } else {
                         if (is_numeric($postData)) {
                             $this->setConfig(str_replace('__', '.', $postKey), (int) $postData);
-                        } else  {
+                        } else {
                             $this->setConfig(str_replace('__', '.', $postKey), $postData);
                         }
                     }
@@ -165,10 +165,10 @@ 
                 // Create default log files.
                 if (is_writable($iptablesWatchingFolder)) {
                     fopen($iptablesWatchingFolder . '/iptables_queue.log', 'w+');
-                    fopen($iptablesWatchingFolder . '/ipv4_status.log',    'w+');
-                    fopen($iptablesWatchingFolder . '/ipv6_status.log',    'w+');
-                    fopen($iptablesWatchingFolder . '/ipv4_command.log',   'w+');
-                    fopen($iptablesWatchingFolder . '/ipv6_command.log',   'w+');
+                    fopen($iptablesWatchingFolder . '/ipv4_status.log', 'w+');
+                    fopen($iptablesWatchingFolder . '/ipv6_status.log', 'w+');
+                    fopen($iptablesWatchingFolder . '/ipv4_command.log', 'w+');
+                    fopen($iptablesWatchingFolder . '/ipv6_command.log', 'w+');
                 }
             }
     
@@ -246,7 +246,7 @@ 
                     (string) $db['user'],
                     (string) $db['pass']
                 );
-            } catch(PDOException $e) {
+            } catch (PDOException $e) {
                 $result = false;
                 $this->pushMessage('error', 
                     __(
@@ -299,7 +299,7 @@ 
         if (class_exists('PDO')) {
             try {
                 new PDO('sqlite:' . $sqliteFilePath);
-            } catch(PDOException $e) { 
+            } catch (PDOException $e) { 
                 $this->pushMessage('error', $e->getMessage());
                 $result = false;
             }
@@ -341,10 +341,10 @@ 
                 $redis = new Redis();
                 $redis->connect(
                     (string) $this->getConfig('drivers.redis.host'), 
-                    (int)    $this->getConfig('drivers.redis.port')
+                    (int) $this->getConfig('drivers.redis.port')
                 );
                 unset($redis);
-            } catch(RedisException $e) {
+            } catch (RedisException $e) {
                 $this->pushMessage('error', $e->getMessage());
                 $result = false;
             }

src/Firewall/Firewall/Driver/ItemSqliteDriver.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 
         // @codeCoverageIgnoreStart
 
-        } catch(PDOException $e) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
         }