public nobgit read

NobMail

Based on mailcow: dockerized

Languages

Repository composition by tracked source files.

PHP

PHP 49% JavaScript 35% HTML 9% CSS 4% Shell 2% Python 1% Lua 0% Perl 0% Ruby 0% SCSS 0%

Create file Wiki Documentation

Clone

https://nobgit.com/orgs/nobgit/nobmail.git

ssh://[email protected]:2222/orgs/nobgit/nobmail.git

Commit

[Web] Compatibility: Re-add _int vars

d5c22de9

andryyy <[email protected]> 6 years ago

data/web/inc/functions.admin.inc.php        | 2 ++
 data/web/inc/functions.domain_admin.inc.php | 2 ++
 data/web/inc/functions.fail2ban.inc.php     | 2 ++
 3 files changed, 6 insertions(+)

Diff

diff --git a/data/web/inc/functions.admin.inc.php b/data/web/inc/functions.admin.inc.php
index 3a087184..3bac1688 100644
--- a/data/web/inc/functions.admin.inc.php
+++ b/data/web/inc/functions.admin.inc.php
@@ -264,7 +264,9 @@ function admin($_action, $_data = null) {
       }
       $admindata['username'] = $row['username'];
       $admindata['tfa_active'] = (is_null($row['tfa_active'])) ? 0 : $row['tfa_active'];
+      $admindata['tfa_active_int'] = (is_null($row['tfa_active'])) ? 0 : $row['tfa_active'];
       $admindata['active'] = $row['active'];
+      $admindata['active_int'] = $row['active'];
       $admindata['created'] = $row['created'];
       return $admindata;
     break;
diff --git a/data/web/inc/functions.domain_admin.inc.php b/data/web/inc/functions.domain_admin.inc.php
index e0473e2a..8ac3dea4 100644
--- a/data/web/inc/functions.domain_admin.inc.php
+++ b/data/web/inc/functions.domain_admin.inc.php
@@ -416,7 +416,9 @@ function domain_admin($_action, $_data = null) {
       }
       $domainadmindata['username'] = $row['username'];
       $domainadmindata['tfa_active'] = (is_null($row['tfa_active'])) ? 0 : $row['tfa_active'];
+      $domainadmindata['tfa_active_int'] = (is_null($row['tfa_active'])) ? 0 : $row['tfa_active'];
       $domainadmindata['active'] = $row['active'];
+      $domainadmindata['active_int'] = $row['active'];
       $domainadmindata['created'] = $row['created'];
       // GET SELECTED
       $stmt = $pdo->prepare("SELECT `domain` FROM `domain`
diff --git a/data/web/inc/functions.fail2ban.inc.php b/data/web/inc/functions.fail2ban.inc.php
index 85c9029f..6f6b024f 100644
--- a/data/web/inc/functions.fail2ban.inc.php
+++ b/data/web/inc/functions.fail2ban.inc.php
@@ -171,6 +171,7 @@ function fail2ban($_action, $_data = null) {
             }
             // Whitelist network
             elseif ($_data['action'] == "whitelist") {
+              if (empty($network)) { continue; }
               if (valid_network($network)) {
                 try {
                   $redis->hSet('F2B_WHITELIST', $network, 1);
@@ -197,6 +198,7 @@ function fail2ban($_action, $_data = null) {
             }
             // Blacklist network
             elseif ($_data['action'] == "blacklist") {
+              if (empty($network)) { continue; }
               if (valid_network($network) && !in_array($network, array(
                 '0.0.0.0',
                 '0.0.0.0/0',