terrylinooo / shieldon

templates/panel/action_log_today.php

Braces +5 added lines, -2 removed lines

@@ -60,9 +60,12 @@
                 </div>
             </div>
         </div>
-    <?php else : ?>
+    <?php else {
+    : ?>
         <div class="alert alert-danger">
-            <?php _e('panel', 'log_msg_no_logger', 'Sorry, you have to implement ActionLogger to use this function.'); ?>
+            <?php _e('panel', 'log_msg_no_logger', 'Sorry, you have to implement ActionLogger to use this function.');
+}
+?>
             
         </div>
     <?php endif; ?>

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,7 @@ 
 ?>
 
 <div class="so-dashboard">
-    <?php if (! empty($period_data)) : ?>
+    <?php if (!empty($period_data)) : ?>
     <div class="so-flex">
         <div class="so-board">
             <div class="board-field left">
@@ -88,7 +88,7 @@ 
                 </tr>
             </thead>
             <tbody>
-                <?php if (! empty($ip_details)) : ?>
+                <?php if (!empty($ip_details)) : ?>
                 <?php foreach ($ip_details as $ip => $ipInfo) : ?>
                 <tr>
                     <td>
@@ -111,7 +111,7 @@ 
         </table>
     </div>
     <div class="so-timezone">
-        <?php if (! empty($last_cached_time)) : ?>
+        <?php if (!empty($last_cached_time)) : ?>
             <?php _e('panel', 'log_label_cache_time', 'Report generated time'); ?>: <strong class="text-info"><?php echo $last_cached_time; ?></strong>
             &nbsp;&nbsp;&nbsp;&nbsp; 
         <?php endif; ?>
@@ -121,7 +121,7 @@ 
 
 <?php
 
-    if (! empty($period_data)) {
+    if (!empty($period_data)) {
         $data['period_data'] = $period_data;
         $data['past_seven_hours'] = $past_seven_hours;
         $this->loadViewPart('panel/js/chart', $data);

templates/panel/action_log_yesterday.php

Braces +5 added lines, -2 removed lines

@@ -60,9 +60,12 @@
                 </div>
             </div>
         </div>
-    <?php else : ?>
+    <?php else {
+    : ?>
         <div class="alert alert-danger">
-            <?php _e('panel', 'log_msg_no_logger', 'Sorry, you have to implement ActionLogger to use this function.'); ?>
+            <?php _e('panel', 'log_msg_no_logger', 'Sorry, you have to implement ActionLogger to use this function.');
+}
+?>
             
         </div>
     <?php endif; ?>

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,7 @@ 
 ?>
 
 <div class="so-dashboard">
-    <?php if (! empty($period_data)) : ?>
+    <?php if (!empty($period_data)) : ?>
     <div class="so-flex">
         <div class="so-board">
             <div class="board-field left">
@@ -89,7 +89,7 @@ 
                 </tr>
             </thead>
             <tbody>
-                <?php if (! empty($ip_details)) : ?>
+                <?php if (!empty($ip_details)) : ?>
                 <?php foreach ($ip_details as $ip => $ipInfo) : ?>
                 <tr>
                     <td>
@@ -112,7 +112,7 @@ 
         </table>
     </div>
     <div class="so-timezone">
-        <?php if (! empty($last_cached_time)) : ?>
+        <?php if (!empty($last_cached_time)) : ?>
             <?php _e('panel', 'log_label_cache_time', 'Report generated time'); ?>: <strong class="text-info"><?php echo $last_cached_time; ?></strong>
             &nbsp;&nbsp;&nbsp;&nbsp; 
         <?php endif; ?>
@@ -122,7 +122,7 @@ 
 
 <?php
 
-    if (! empty($period_data)) {
+    if (!empty($period_data)) {
         $data['period_data'] = $period_data;
         $this->loadViewPart('panel/js/chart', $data);
     }

templates/panel/overview.php

Spacing +4 added lines, -4 removed lines

@@ -203,7 +203,7 @@ 
                 <div class="filter-status">
                     <div class="heading"><?php _e('panel', 'overview_label_action_logger', 'Action Logger'); ?></div>
                     <div class="nums">
-                        <?php echo $data['action_logger']  ? '<i class="far fa-play-circle"></i>' : '<i class="far fa-stop-circle"></i>'; ?>
+                        <?php echo $data['action_logger'] ? '<i class="far fa-play-circle"></i>' : '<i class="far fa-stop-circle"></i>'; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'overview_note_action_logger', 'Record every visitor’s behavior.'); ?></div>
                 </div>
@@ -222,7 +222,7 @@ 
                 <div class="filter-status">
                     <div class="heading"><?php _e('panel', 'overview_label_recaptcha', 'reCAPTCHA'); ?></div>
                     <div class="nums">
-                        <?php echo $captcha['recaptcha']  ? '<i class="far fa-play-circle"></i>' : '<i class="far fa-stop-circle"></i>'; ?>
+                        <?php echo $captcha['recaptcha'] ? '<i class="far fa-play-circle"></i>' : '<i class="far fa-stop-circle"></i>'; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'overview_note_recaptcha', 'Provided by Google.'); ?></div>
                 </div>
@@ -231,7 +231,7 @@ 
                 <div class="filter-status">
                     <div class="heading"><?php _e('panel', 'overview_label_image_captcha', 'Image Captcha'); ?></div>
                     <div class="nums">
-                        <?php echo $captcha['imagecaptcha']  ? '<i class="far fa-play-circle"></i>' : '<i class="far fa-stop-circle"></i>'; ?>
+                        <?php echo $captcha['imagecaptcha'] ? '<i class="far fa-play-circle"></i>' : '<i class="far fa-stop-circle"></i>'; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'overview_note_image_captcha', 'A simple text-in-image Captcha.'); ?></div>
                 </div>
@@ -251,7 +251,7 @@ 
                 <div class="filter-status">
                     <div class="heading"><?php _e('panel', 'overview_label_' . $k, ''); ?></div>
                     <div class="nums">
-                        <?php echo $messengers[$k]  ? '<i class="far fa-play-circle"></i>' : '<i class="far fa-stop-circle"></i>'; ?>
+                        <?php echo $messengers[$k] ? '<i class="far fa-play-circle"></i>' : '<i class="far fa-stop-circle"></i>'; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'overview_note_' . $k, ''); ?></div>
                 </div>

templates/panel/xss_protection.php

Braces +5 added lines, -2 removed lines

@@ -62,7 +62,8 @@ 
             </tbdoy>
         </table>
     </div>
-    <?php else: ?>
+    <?php else {
+    : ?>
     <div id="so-table-loading" class="so-datatables">
         <div class="lds-css ng-scope">
             <div class="lds-ripple">
@@ -71,7 +72,9 @@ 
             </div>
         </div>
     </div>
-    <?php endif; ?>
+    <?php endif;
+}
+?>
     <div id="so-table-container" class="so-datatables" style="display: none;">
         <table id="so-datalog" class="cell-border compact stripe responsive" cellspacing="0" width="100%">
             <thead>

Spacing +2 added lines, -2 removed lines

@@ -114,7 +114,7 @@ 
         </div>
     </div>
     <br />
-    <?php if ( empty($xss_protected_list)) : ?>
+    <?php if (empty($xss_protected_list)) : ?>
     <div id="so-table-container" class="so-datatables">
         <table id="so-datalog" class="cell-border compact stripe responsive" cellspacing="0" width="100%">
             <tbody>
@@ -146,7 +146,7 @@ 
                 </tr>
             </thead>
             <tbody>
-                <?php if (! empty($xss_protected_list)) : ?>
+                <?php if (!empty($xss_protected_list)) : ?>
                 <?php foreach ($xss_protected_list as $i => $info) : ?>
                 <tr>
                     <td><?php echo $info['type']; ?></td>

src/Firewall/Panel/Home.php

Spacing +4 added lines, -4 removed lines

@@ -236,11 +236,11 @@
     private function overviewTemplateVarsOfComponents(array $data = []): array
     {
         $data['components'] = [
-            'Ip'         => (!empty($this->kernel->component['Ip']))         ? true : false,
+            'Ip'         => (!empty($this->kernel->component['Ip'])) ? true : false,
             'TrustedBot' => (!empty($this->kernel->component['TrustedBot'])) ? true : false,
-            'Header'     => (!empty($this->kernel->component['Header']))     ? true : false,
-            'Rdns'       => (!empty($this->kernel->component['Rdns']))       ? true : false,
-            'UserAgent'  => (!empty($this->kernel->component['UserAgent']))  ? true : false,
+            'Header'     => (!empty($this->kernel->component['Header'])) ? true : false,
+            'Rdns'       => (!empty($this->kernel->component['Rdns'])) ? true : false,
+            'UserAgent'  => (!empty($this->kernel->component['UserAgent'])) ? true : false,
         ];
 
         return $data;

src/Firewall/Panel/Report.php

Spacing +6 added lines, -6 removed lines

@@ -127,7 +127,7 @@ 
                 $data['period_data'] = $ipDetailsCachedData['period_data'];
                 $lastCachedTime = date('Y-m-d H:i:s', $ipDetailsCachedData['time']);
     
-                if ('today' === $type ) {
+                if ('today' === $type) {
                     $ipDetailsCachedData = $logCacheHandler->get('past_seven_hours');
                     $data['past_seven_hours'] = $ipDetailsCachedData['period_data'];
                 }
@@ -141,7 +141,7 @@ 
 
                 $logCacheHandler->save($type, $data);
     
-                if ('today' === $type ) {
+                if ('today' === $type) {
                     $this->parser->prepare('past_seven_hours');
                     $data['past_seven_hours'] = $this->parser->getParsedPeriodData();
 
@@ -172,11 +172,11 @@ 
     private function operationTemplateVarsOfComponents(array $data = []): array
     {
         $data['components'] = [
-            'Ip'         => (!empty($this->kernel->component['Ip']))         ? true : false,
+            'Ip'         => (!empty($this->kernel->component['Ip'])) ? true : false,
             'TrustedBot' => (!empty($this->kernel->component['TrustedBot'])) ? true : false,
-            'Header'     => (!empty($this->kernel->component['Header']))     ? true : false,
-            'Rdns'       => (!empty($this->kernel->component['Rdns']))       ? true : false,
-            'UserAgent'  => (!empty($this->kernel->component['UserAgent']))  ? true : false,
+            'Header'     => (!empty($this->kernel->component['Header'])) ? true : false,
+            'Rdns'       => (!empty($this->kernel->component['Rdns'])) ? true : false,
+            'UserAgent'  => (!empty($this->kernel->component['UserAgent'])) ? true : false,
         ];
 
         return $data;

templates/panel/setting/daemon.php

Braces +5 added lines, -2 removed lines

@@ -304,9 +304,12 @@
                 <div>
                     <?php if ($this->mode === 'demo') : ?>
                         <code id="code1" style="display: none">* * * * * root bash your_project_folder/vendor/shieldon/bin/iptables_bridge.sh --watch=your_watching_folder >> /var/log/shieldon.log 2>&1</code>
-                    <?php else: ?>
+                    <?php else {
+    : ?>
                         <code id="code1" style="display: none">* * * * * root bash <?php echo realpath(__DIR__ . '/../../../bin/iptables_bridge.sh') ?> --watch=<span id="iptables-watch-folder"></span> >> /var/log/shieldon.log 2>&1</code>
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
                     
                     <textarea id="code2" class="form-control" rows="4" style="font-size: 12px; font-family: monospace;"></textarea>
                 </div><br />

src/Firewall/Driver/SqlDriverProvider.php

Indentation +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
         return $this->{$method}($ip);
     }
 
-   /**
+    /**
      * {@inheritDoc}
      */
     protected function doFetchAll(string $type = 'filter'): array

Spacing +3 added lines, -3 removed lines

@@ -302,7 +302,7 @@ 
 
         // @codeCoverageIgnoreStart
         
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             return false;
         }
 
@@ -361,7 +361,7 @@ 
 
         // @codeCoverageIgnoreStart
 
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             return false;
         }
 
@@ -414,7 +414,7 @@ 
 
         // @codeCoverageIgnoreStart
 
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             return false;
         }
 

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 = [];