terrylinooo / shieldon

src/Firewall/Session.php

Indentation +1 added lines, -1 removed lines

@@ -175,7 +175,7 @@
      * @return void
      */
     public function init(
-             $driver, 
+                $driver, 
         int  $gcExpires     = 300, 
         int  $gcProbability = 1, 
         int  $gcDivisor     = 100, 

src/Firewall/Helpers.php

Spacing +2 added lines, -2 removed lines

@@ -239,7 +239,7 @@ 
         $masked = implode('.', $tmp);
 
     } else {
-        $masked =  str_repeat('*', strlen($str) - 6) . substr($str, -6);
+        $masked = str_repeat('*', strlen($str) - 6) . substr($str, -6);
     }
 
     return $masked;
@@ -795,7 +795,7 @@ 
  */
 function create_session_id(): string
 {
-    $hash =  rand() . 'ej;1zj47vu;3e;31g642941ek62au/41' . time();
+    $hash = rand() . 'ej;1zj47vu;3e;31g642941ek62au/41' . time();
 
     return md5($hash);
 }
\ No newline at end of file

src/Firewall/Kernel/TemplateTrait.php

Spacing +2 added lines, -2 removed lines

@@ -321,8 +321,8 @@
         $statStart = Container::get('shieldon_start');
         $statEnd = Container::get('shieldon_end');
 
-        $startTimeArr = explode(' ',$statStart['time']);
-        $endTimeArr = explode(' ',$statStart['time']);
+        $startTimeArr = explode(' ', $statStart['time']);
+        $endTimeArr = explode(' ', $statStart['time']);
 
         $timeDifference = ($endTimeArr[1] - $startTimeArr[1]) + ($endTimeArr[0] - $startTimeArr[0]);
         $memoryDifference = round(($statEnd['memory'] - $statStart['memory']) / 1024, 2); // KB

src/Firewall/Kernel/DriverTrait.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
             $this->driver->setChannel($channel);
         } else {
             Event::AddListener('set_driver',
-                function ($args) use ($channel) {
+                function($args) use ($channel) {
                     $args['driver']->setChannel($channel);
                 }
             );

src/Firewall/Firewall/SetupTrait.php

Spacing +8 added lines, -8 removed lines

@@ -314,7 +314,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'];
@@ -376,7 +376,7 @@ 
         $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   
             ]
         );
@@ -384,7 +384,7 @@ 
         $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
             ]
         );
@@ -429,8 +429,8 @@ 
 
         if ($sessionLimitSetting['enable']) {
 
-            $onlineUsers = $sessionLimitSetting['config']['count'];       // default: 100
-            $alivePeriod = $sessionLimitSetting['config']['period'];      // default: 300
+            $onlineUsers = $sessionLimitSetting['config']['count']; // default: 100
+            $alivePeriod = $sessionLimitSetting['config']['period']; // default: 300
             $isUniqueIp  = $sessionLimitSetting['config']['unique_only']; // false
 
             $this->kernel->limitSession($onlineUsers, $alivePeriod, $isUniqueIp);
@@ -453,7 +453,7 @@ 
 
             $lastResetTime = $cronjobSetting['config']['last_update'];
 
-            if (!empty($lastResetTime) ) {
+            if (!empty($lastResetTime)) {
                 $lastResetTime = strtotime($lastResetTime);
             } else {
                 // @codeCoverageIgnoreStart
@@ -535,8 +535,8 @@ 
         $dialogInfo = $this->getOption('dialog_info_disclosure');
 
         $this->kernel->setProperty('display_online_info', $dialogInfo['online_user_amount']);
-        $this->kernel->setProperty('display_user_info',   $dialogInfo['user_inforamtion']);
-        $this->kernel->setProperty('display_http_code',   $dialogInfo['http_status_code']);
+        $this->kernel->setProperty('display_user_info', $dialogInfo['user_inforamtion']);
+        $this->kernel->setProperty('display_http_code', $dialogInfo['http_status_code']);
         $this->kernel->setProperty('display_reason_code', $dialogInfo['reason_code']);
         $this->kernel->setProperty('display_reason_text', $dialogInfo['reason_text']);
     }

templates/panel/operation_status.php

Braces +45 added lines, -18 removed lines

@@ -42,8 +42,11 @@ 
                     <div class="nums">
                         <?php if (!empty($filter_cookie)) : ?>
                             <a href="#" onclick="displayLogs('frequency');"><?php echo $filter_cookie; ?></a>
-                        <?php else : ?>
-                            <?php echo $filter_cookie; ?>
+                        <?php else {
+    : ?>
+                            <?php echo $filter_cookie;
+}
+?>
                         <?php endif; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'overview_note_cookie', 'Check whether visitors can create cookies with JavaScript'); ?></div>
@@ -58,8 +61,11 @@ 
                     <div class="nums">
                         <?php if (!empty($filter_session)) : ?>
                             <a href="#" onclick="displayLogs('session');"><?php echo $filter_session; ?></a>
-                        <?php else : ?>
-                            <?php echo $filter_session; ?>
+                        <?php else {
+    : ?>
+                            <?php echo $filter_session;
+}
+?>
                         <?php endif; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'overview_note_session', 'Detect whether multiple sessions were created by the same visitor.'); ?></div>
@@ -74,8 +80,11 @@ 
                     <div class="nums">
                         <?php if (!empty($filter_frequency)) : ?>
                             <a href="#" onclick="displayLogs('frequency');"><?php echo $filter_frequency; ?></a>
-                        <?php else : ?>
-                            <?php echo $filter_frequency; ?>
+                        <?php else {
+    : ?>
+                            <?php echo $filter_frequency;
+}
+?>
                         <?php endif; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'overview_note_frequency', 'Check how often a visitor views pages.'); ?></div>
@@ -90,8 +99,11 @@ 
                     <div class="nums">
                         <?php if (!empty($filter_referer)) : ?>
                             <a href="#" onclick="displayLogs('referer');"><?php echo $filter_referer; ?></a>
-                        <?php else : ?>
-                            <?php echo $filter_referer; ?>
+                        <?php else {
+    : ?>
+                            <?php echo $filter_referer;
+}
+?>
                         <?php endif; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'overview_note_referer', 'Check HTTP referrer information.'); ?></div>
@@ -116,8 +128,11 @@ 
                     <div class="nums">
                         <?php if (!empty($component_ip)) : ?>
                             <a href="#" onclick="displayLogs('ip');"><?php echo $component_ip; ?></a>
-                        <?php else : ?>
-                            <?php echo $component_ip; ?>
+                        <?php else {
+    : ?>
+                            <?php echo $component_ip;
+}
+?>
                         <?php endif; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'operation_note_ip', 'Advanced IP address mangement.'); ?></div>
@@ -132,8 +147,11 @@ 
                     <div class="nums">
                         <?php if (!empty($component_trustedbot)) : ?>
                             <a href="#" onclick="displayLogs('trustedbot');"><?php echo $component_trustedbot; ?></a>
-                        <?php else : ?>
-                            <?php echo $component_trustedbot; ?>
+                        <?php else {
+    : ?>
+                            <?php echo $component_trustedbot;
+}
+?>
                         <?php endif; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'operation_note_trustedbot', 'Allow popular search engines to crawl your website.'); ?></div>
@@ -148,8 +166,11 @@ 
                     <div class="nums">
                         <?php if (!empty($component_header)) : ?>
                             <a href="#" onclick="displayLogs('header');"><?php echo $component_header; ?></a>
-                        <?php else : ?>
-                            <?php echo $component_header; ?>
+                        <?php else {
+    : ?>
+                            <?php echo $component_header;
+}
+?>
                         <?php endif; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'operation_note_header', 'Analyze visitors header information.'); ?></div>
@@ -164,8 +185,11 @@ 
                     <div class="nums">
                         <?php if (!empty($component_rdns)) : ?>
                             <a href="#" onclick="displayLogs('rdns');"><?php echo $component_rdns; ?></a>
-                        <?php else : ?>
-                            <?php echo $component_rdns; ?>
+                        <?php else {
+    : ?>
+                            <?php echo $component_rdns;
+}
+?>
                         <?php endif; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'operation_note_rdns', 'Identify visitor IP resolved hostname (RDNS).'); ?></div>
@@ -180,8 +204,11 @@ 
                     <div class="nums">
                         <?php if (!empty($component_useragent)) : ?>
                             <a href="#" onclick="displayLogs('useragent');"><?php echo $component_useragent; ?></a>
-                        <?php else : ?>
-                            <?php echo $component_useragent; ?>
+                        <?php else {
+    : ?>
+                            <?php echo $component_useragent;
+}
+?>
                         <?php endif; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'operation_note_useragent', 'Analysis user-agent information from visitors.'); ?></div>

templates/panel/table_sessions.php

Spacing +5 added lines, -5 removed lines

@@ -49,7 +49,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 (in minutes)'); ?></div>
             </div>
         </div>
@@ -59,7 +59,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 user count.'); ?></div>
             </div>
         </div>
@@ -99,14 +99,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 {

src/Firewall/Log/ActionLogger.php

Spacing +3 added lines, -3 removed lines

@@ -111,10 +111,10 @@
 
         $data = [];
 
-        $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['timestamp']    ?? 'null';
+        $data[3] = $record['timestamp'] ?? 'null';
 
         file_put_contents($this->filePath, implode(',', $data) . "\n", FILE_APPEND | LOCK_EX);
     }

src/Firewall/FirewallTrait.php

Spacing +1 added lines, -1 removed lines

@@ -272,7 +272,7 @@
             $channel = '_' . $this->channel;
         }
 
-        return $this->directory . '/' . $this->version . $channel .  '_' . $driverType . '_' . $this->checkpoint;
+        return $this->directory . '/' . $this->version . $channel . '_' . $driverType . '_' . $this->checkpoint;
     }
 
     /**