terrylinooo / shieldon

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/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);
@@ -525,7 +525,7 @@ 
                     } else {
                         if (is_numeric($postData)) {
                             $this->setConfig(str_replace('__', '.', $postKey), (int) $postData);
-                        } else  {
+                        } else {
                             $this->setConfig(str_replace('__', '.', $postKey), $postData);
                         }
                     }
@@ -611,10 +611,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+');
                 }
             }
     
@@ -661,7 +661,7 @@ 
                             (string) $db['user'],
                             (string) $db['pass']
                         );
-                    } catch(PDOException $e) {
+                    } catch (PDOException $e) {
                         $result = false;
                         $this->pushMessage('error', 
                             __(
@@ -704,7 +704,7 @@ 
                 if (class_exists('PDO')) {
                     try {
                         $pdo = new PDO('sqlite:' . $sqliteFilePath);
-                    } catch(PDOException $e) {
+                    } catch (PDOException $e) {
                         $result = false;
                         $this->pushMessage('error', $e->getMessage());
                     }
@@ -737,9 +737,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) {
                         $result = false;
                         $this->pushMessage('error', $e->getMessage());
                     }