terrylinooo / shieldon

src/Firewall/Panel/Home.php

Spacing +4 added lines, -4 removed lines

@@ -171,11 +171,11 @@
         */
 
         $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,
         ];
 
         $reflection = new ReflectionObject($this->kernel);

src/Firewall/Panel/BaseController.php

Spacing +10 added lines, -10 removed lines

@@ -174,7 +174,7 @@ 
             define('SHIELDON_VIEW', true);
         }
 
-        $viewFilePath =  __DIR__ . '/../../../templates/' . $page . '.php';
+        $viewFilePath = __DIR__ . '/../../../templates/' . $page . '.php';
     
         if (!empty($data)) {
             extract($data);
@@ -365,7 +365,7 @@ 
                     } else {
                         if (is_numeric($postData)) {
                             $this->setConfig(str_replace('__', '.', $postKey), (int) $postData);
-                        } else  {
+                        } else {
                             $this->setConfig(str_replace('__', '.', $postKey), $postData);
                         }
                     }
@@ -395,7 +395,7 @@ 
                             (string) $db['user'],
                             (string) $db['pass']
                         );
-                    } catch(PDOException $e) {
+                    } catch (PDOException $e) {
                         $isDataDriverFailed = true;
                         $this->pushMessage('error', 
                             __(
@@ -440,7 +440,7 @@ 
                 if (class_exists('PDO')) {
                     try {
                         $pdo = new PDO('sqlite:' . $sqliteFilePath);
-                    } catch(PDOException $e) {
+                    } catch (PDOException $e) {
                         $isDataDriverFailed = true;
                         $this->pushMessage('error', $e->getMessage());
                     }
@@ -475,9 +475,9 @@ 
                         $redis = new Redis();
                         $redis->connect(
                             (string) $this->getConfig('drivers.redis.host'), 
-                            (int)    $this->getConfig('drivers.redis.port')
+                            (int) $this->getConfig('drivers.redis.port')
                         );
-                    } catch(RedisException $e) {
+                    } catch (RedisException $e) {
                         $isDataDriverFailed = true;
                         $this->pushMessage('error', $e->getMessage());
                     }
@@ -573,10 +573,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+');
                 }
             }
     

src/Firewall/Panel/Report.php

Spacing +6 added lines, -6 removed lines

@@ -42,11 +42,11 @@ 
     public function operation(): ResponseInterface
     {
         $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,
         ];
 
         $reflection = new ReflectionObject($this->kernel);
@@ -218,7 +218,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'];
                 }
@@ -232,7 +232,7 @@ 
 
                 $logCacheHandler->save($type, $data);
     
-                if ('today' === $type ) {
+                if ('today' === $type) {
                     $this->parser->prepare('past_seven_hours');
                     $data['past_seven_hours'] = $this->parser->getParsedPeriodData();
 

templates/panel/action_log_last_month.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,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">
@@ -85,8 +85,8 @@ 
                 </tr>
             </thead>
             <tbody>
-                <?php if (! empty($ip_details)) : ?>
-                <?php foreach($ip_details as $ip => $ipInfo) : ?>
+                <?php if (!empty($ip_details)) : ?>
+                <?php foreach ($ip_details as $ip => $ipInfo) : ?>
                 <tr>
                     <td>
                         <?php if ($this->mode === 'demo') : ?>
@@ -108,7 +108,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; ?>
@@ -118,7 +118,7 @@ 
 
 <?php
 
-    if (! empty($period_data)) {
+    if (!empty($period_data)) {
         $data['period_data'] = $period_data;
         $this->_include('panel/js/chart', $data);
     }

templates/panel/action_log_this_month.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,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">
@@ -85,8 +85,8 @@ 
                 </tr>
             </thead>
             <tbody>
-                <?php if (! empty($ip_details)) : ?>
-                <?php foreach($ip_details as $ip => $ipInfo) : ?>
+                <?php if (!empty($ip_details)) : ?>
+                <?php foreach ($ip_details as $ip => $ipInfo) : ?>
                 <tr>
                     <td>
                         <?php if ($this->mode === 'demo') : ?>
@@ -108,7 +108,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; ?>
@@ -118,7 +118,7 @@ 
 
 <?php
 
-    if (! empty($period_data)) {
+    if (!empty($period_data)) {
         $data['period_data'] = $period_data;
         $this->_include('panel/js/chart', $data);
     }

templates/panel/template.php

Spacing +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
 if (
     isset($_SERVER['HTTP_HOST']) && 
     strpos($_SERVER['HTTP_HOST'], 'project.lo') !== false
-)  {
+) {
     // `shieldon-doc.lo` is the virtual domain that Terry is using to design CSS for Firewall Panel UI.
     $staticSrc = 'http://shieldon-doc.lo/static';
 }
@@ -331,7 +331,7 @@ 
             </div>
         </div>
 
-        <?php if (! empty($this->messages)) : ?>
+        <?php if (!empty($this->messages)) : ?>
         <div id="message-modal" class="modal fade" tabindex="-1" role="dialog">
             <div class="modal-dialog modal-dialog-centered modal-lightbox" role="document">
                 <div class="modal-content">

templates/panel/action_log_yesterday.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,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">
@@ -85,8 +85,8 @@ 
                 </tr>
             </thead>
             <tbody>
-                <?php if (! empty($ip_details)) : ?>
-                <?php foreach($ip_details as $ip => $ipInfo) : ?>
+                <?php if (!empty($ip_details)) : ?>
+                <?php foreach ($ip_details as $ip => $ipInfo) : ?>
                 <tr>
                     <td>
                         <?php if ($this->mode === 'demo') : ?>
@@ -108,7 +108,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; ?>
@@ -118,7 +118,7 @@ 
 
 <?php
 
-    if (! empty($period_data)) {
+    if (!empty($period_data)) {
         $data['period_data'] = $period_data;
         $this->_include('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>

src/Firewall/Kernel.php

Spacing +5 added lines, -5 removed lines

@@ -340,7 +340,7 @@ 
      * 
      * @return void
      */
-    public function __construct(?ServerRequestInterface $request  = null, ?ResponseInterface $response = null)
+    public function __construct(?ServerRequestInterface $request = null, ?ResponseInterface $response = null)
     {
         // Load helper functions. This is the must.
         new Helpers();
@@ -1648,10 +1648,10 @@ 
 
         $ui = [
             'background_image' => $this->dialogUI['background_image'] ?? '',
-            'bg_color'         => $this->dialogUI['bg_color']         ?? '#ffffff',
-            'header_bg_color'  => $this->dialogUI['header_bg_color']  ?? '#212531',
-            'header_color'     => $this->dialogUI['header_color']     ?? '#ffffff',
-            'shadow_opacity'   => $this->dialogUI['shadow_opacity']   ?? '0.2',
+            'bg_color'         => $this->dialogUI['bg_color'] ?? '#ffffff',
+            'header_bg_color'  => $this->dialogUI['header_bg_color'] ?? '#212531',
+            'header_color'     => $this->dialogUI['header_color'] ?? '#ffffff',
+            'shadow_opacity'   => $this->dialogUI['shadow_opacity'] ?? '0.2',
         ];
 
         if (!defined('SHIELDON_VIEW')) {