mikopbx / Core

src/PBXCoreREST/Lib/FirewallManagementProcessor.php

Indentation +15 added lines, -15 removed lines

@@ -79,22 +79,22 @@
         return $res;
     }
 
-     public static function getDbConnection(){
-         if(!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)){
-             return null;
-         }
-         try {
-             $db      = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
-         }catch (\Exception $e){
-             return null;
-         }
-         $db->busyTimeout(5000);
-         $fail2ban = new Fail2BanConf();
-         if (false === $fail2ban->tableBanExists($db)) {
-             return null;
-         }
+        public static function getDbConnection(){
+            if(!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)){
+                return null;
+            }
+            try {
+                $db      = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
+            }catch (\Exception $e){
+                return null;
+            }
+            $db->busyTimeout(5000);
+            $fail2ban = new Fail2BanConf();
+            if (false === $fail2ban->tableBanExists($db)) {
+                return null;
+            }
 
-         return $db;
+            return $db;
     }
 
     /**

Spacing +14 added lines, -14 removed lines

@@ -28,18 +28,18 @@ 
      */
     public static function fail2banUnbanAll(string $ip): PBXApiResult
     {
-        $ip     = trim($ip);
+        $ip = trim($ip);
         $res = new PBXApiResult();
         $res->processor = __METHOD__;
         $res->success = true;
-        if ( ! Verify::isIpAddress($ip)) {
+        if (!Verify::isIpAddress($ip)) {
             $res->success = false;
-            $res->messages[]="Not valid ip '{$ip}'.";
+            $res->messages[] = "Not valid ip '{$ip}'.";
         }
-        $fail2ban        = new Fail2BanConf();
+        $fail2ban = new Fail2BanConf();
         if ($fail2ban->fail2ban_enable) {
             $fail2ban = Util::which('fail2ban-client');
-            $res->success  = (Util::mwExec("{$fail2ban} unban {$ip}") === 0);
+            $res->success = (Util::mwExec("{$fail2ban} unban {$ip}") === 0);
         } else {
             $res = self::fail2banUnbanDb($ip);
         }
@@ -60,7 +60,7 @@ 
         $res->processor = __METHOD__;
 
         $db = self::getDbConnection();
-        if(!$db){
+        if (!$db) {
             // Таблица не существует. Бана нет.
             $res->success    = false;
             $res->messages[] = 'DB '.Fail2BanConf::FAIL2BAN_DB_PATH.' not found';
@@ -79,13 +79,13 @@ 
         return $res;
     }
 
-     public static function getDbConnection(){
-         if(!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)){
+     public static function getDbConnection() {
+         if (!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)) {
              return null;
          }
          try {
-             $db      = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
-         }catch (\Exception $e){
+             $db = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
+         } catch (\Exception $e) {
              return null;
          }
          $db->busyTimeout(5000);
@@ -110,7 +110,7 @@ 
             $ban_time = '43800';
         }
         // Добавленн фильтр по времени бана. возвращаем только адреса, которые еще НЕ разбанены.
-        $q = 'SELECT' . ' DISTINCT jail,ip,MAX(timeofban) AS timeofban, MAX(timeofban+' . $ban_time . ') AS timeunban FROM bans where (timeofban+' . $ban_time . ')>' . time();
+        $q = 'SELECT'.' DISTINCT jail,ip,MAX(timeofban) AS timeofban, MAX(timeofban+'.$ban_time.') AS timeunban FROM bans where (timeofban+'.$ban_time.')>'.time();
         if ($ip !== null) {
             $q .= " AND ip='{$ip}'";
         }
@@ -133,13 +133,13 @@ 
 
         $jail_q  = ($jail === '') ? '' : "AND jail = '{$jail}'";
         $path_db = Fail2BanConf::FAIL2BAN_DB_PATH;
-        if(!file_exists($path_db)){
+        if (!file_exists($path_db)) {
             // Таблица не существует. Бана нет.
             $res->success    = false;
             $res->messages[] = "DB {$path_db} not found";
             return $res;
         }
-        $db      = new SQLite3($path_db);
+        $db = new SQLite3($path_db);
         $db->busyTimeout(3000);
         $fail2ban = new Fail2BanConf();
         if (false === $fail2ban->tableBanExists($db)) {
@@ -147,7 +147,7 @@ 
             $res->success = true;
             return $res;
         }
-        $q = 'DELETE' . " FROM bans WHERE ip = '{$ip}' {$jail_q}";
+        $q = 'DELETE'." FROM bans WHERE ip = '{$ip}' {$jail_q}";
         $db->query($q);
 
         $err = $db->lastErrorMsg();

Braces +3 added lines, -2 removed lines

@@ -79,13 +79,14 @@
         return $res;
     }
 
-     public static function getDbConnection(){
+     public static function getDbConnection()
+     {
          if(!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)){
              return null;
          }
          try {
              $db      = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
-         }catch (\Exception $e){
+         } catch (\Exception $e){
              return null;
          }
          $db->busyTimeout(5000);

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
         if(!file_exists($path_db)){
             // Таблица не существует. Бана нет.
             $res->success    = false;
-            $res->messages[] = "DB {$path_db} not found";
+            $res->messages[] = "db {$path_db} not found";
             return $res;
         }
         $db      = new SQLite3($path_db);