terrylinooo / shieldon

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);
                         }
                     }
@@ -613,10 +613,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+');
                 }
             }
     
@@ -694,7 +694,7 @@ 
                     (string) $db['user'],
                     (string) $db['pass']
                 );
-            } catch(PDOException $e) {
+            } catch (PDOException $e) {
                 $result = false;
                 $this->pushMessage('error', 
                     __(
@@ -747,7 +747,7 @@ 
         if (class_exists('PDO')) {
             try {
                 new PDO('sqlite:' . $sqliteFilePath);
-            } catch(PDOException $e) { 
+            } catch (PDOException $e) { 
                 $this->pushMessage('error', $e->getMessage());
                 $result = false;
             }
@@ -789,10 +789,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/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 +12 added lines, -12 removed lines

@@ -197,9 +197,9 @@ 
     protected function doDelete(string $ip, string $type = 'filter'): bool
     {
         switch ($type) {
-            case 'rule'      : return $this->remove($this->tableRuleList,   ['log_ip' => $ip]);
+            case 'rule'      : return $this->remove($this->tableRuleList, ['log_ip' => $ip]);
             case 'filter': return $this->remove($this->tableFilterLogs, ['log_ip' => $ip]);
-            case 'session'   : return $this->remove($this->tableSessions,   ['id'     => $ip]);
+            case 'session'   : return $this->remove($this->tableSessions, ['id'     => $ip]);
         }
 
         return false;
@@ -225,14 +225,14 @@ 
     private function update(string $table, array $data, array $where)
     {
         $placeholder = [];
-        foreach($data as $k => $v) {
+        foreach ($data as $k => $v) {
             $placeholder[] = "$k = :$k";
         }
 
         $dataPlaceholder = implode(', ', $placeholder);
 
         $placeholder = [];
-        foreach($where as $k => $v) {
+        foreach ($where as $k => $v) {
             $placeholder[] = "$k = :$k";
         }
 
@@ -244,7 +244,7 @@ 
 
             $bind = array_merge($data, $where);
     
-            foreach($bind as $k => $v) {
+            foreach ($bind as $k => $v) {
 
                 // @codeCoverageIgnoreStart
 
@@ -272,7 +272,7 @@ 
 
         // @codeCoverageIgnoreStart
         
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             throw $e->getMessage();
         }
 
@@ -292,7 +292,7 @@ 
     {
         $placeholderField = [];
         $placeholderValue = [];
-        foreach($data as $k => $v) {
+        foreach ($data as $k => $v) {
             $placeholderField[] = "`$k`";
             $placeholderValue[] = ":$k";
         }
@@ -304,7 +304,7 @@ 
             $sql = 'INSERT INTO ' . $table . ' (' . $dataPlaceholderField . ') VALUES (' . $dataPlaceholderValue . ')';
             $query = $this->db->prepare($sql);
 
-            foreach($data as $k => $v) {
+            foreach ($data as $k => $v) {
 
                 // @codeCoverageIgnoreStart
 
@@ -332,7 +332,7 @@ 
 
         // @codeCoverageIgnoreStart
 
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             return false;
         }
 
@@ -351,7 +351,7 @@ 
     {
 
         $placeholder = [];
-        foreach($where as $k => $v) {
+        foreach ($where as $k => $v) {
             $placeholder[] = "`$k` = :$k";
         }
 
@@ -362,7 +362,7 @@ 
             $sql = 'DELETE FROM ' . $table . ' WHERE ' . $dataPlaceholder;
             $query = $this->db->prepare($sql);
 
-            foreach($where as $k => $v) {
+            foreach ($where as $k => $v) {
 
                 // @codeCoverageIgnoreStart
 
@@ -385,7 +385,7 @@ 
 
         // @codeCoverageIgnoreStart
 
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             return false;
         }