diff --git a/admin/admin_settings.php b/admin/admin_settings.php index b19f7018..7b1bb404 100644 --- a/admin/admin_settings.php +++ b/admin/admin_settings.php @@ -46,6 +46,7 @@ $hesk_settings['language_default'] = $hesk_settings['language']; require(HESK_PATH . 'inc/common.inc.php'); $hesk_settings['language'] = $hesk_settings['language_default']; require(HESK_PATH . 'inc/admin_functions.inc.php'); +require(HESK_PATH . 'inc/mail_functions.inc.php'); hesk_load_database_functions(); hesk_session_start(); diff --git a/admin/banned_emails.php b/admin/banned_emails.php index e44bf575..b1078e61 100644 --- a/admin/banned_emails.php +++ b/admin/banned_emails.php @@ -36,6 +36,7 @@ define('PAGE_TITLE', 'ADMIN_TOOLS'); require(HESK_PATH . 'hesk_settings.inc.php'); require(HESK_PATH . 'inc/common.inc.php'); require(HESK_PATH . 'inc/admin_functions.inc.php'); +require(HESK_PATH . 'inc/mail_functions.inc.php'); hesk_load_database_functions(); hesk_session_start(); @@ -66,175 +67,184 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php'); /* Print main manage users page */ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); ?> - -
- +
+ +
+
+

+ + +
+ + +
+ + + +
+
+
+
+
+ +
+
+
-
-
-
- +
+
+ +
+ john@email.com
+ @domain.com
- -
-
-
- -
- john@email.com
- @domain.com -
-
-
- ' . $hesklang['eperm'] . ''; - if ($num < 1) { - echo '

' . $hesklang['no_banemails'] . '

'; - } else { - // List of staff - if (!isset($admins)) { - $admins = array(); - $res2 = hesk_dbQuery("SELECT `id`,`name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users`"); - while ($row = hesk_dbFetchAssoc($res2)) { - $admins[$row['id']] = $row['name']; - } - } - - ?> - - - - - - +
+
-
- - - - - ' . $hesklang['eperm'] . ''; + if ($num < 1) { + echo '

' . $hesklang['no_banemails'] . '

'; + } else { + // List of staff + if (!isset($admins)) { + $admins = array(); + $res2 = hesk_dbQuery("SELECT `id`,`name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users`"); + while ($row = hesk_dbFetchAssoc($res2)) { + $admins[$row['id']] = $row['name']; + } + } + + ?> +
+ + + + + + + + + + + + '; - if ($can_unban) { - echo ' + if ($can_unban) { + echo ' '; - } + } - echo ''; - } // End while - ?> - -
' . $ban['email'] . ' ' . (isset($admins[$ban['banned_by']]) ? $admins[$ban['banned_by']] : $hesklang['e_udel']) . ' ' . $ban['dt'] . '
-
- - '; + } // End while + ?> + +
+
+ + +
+
+ - +
+
- + - + + + - -
- +
+ +
+
+ + +
+ + +
+ + + +
+
+
+
+
+ +
+
+
-
-
-
- +
+
+ +
+ 123.0.0.0
+ 123.0.0.1 - 123.0.0.53
+ 123.0.0.0/24
+ 123.0.*.*
- -
-
-
- -
- 123.0.0.0
- 123.0.0.1 - 123.0.0.53
- 123.0.0.0/24
- 123.0.*.* -
-
-
- = " . intval($hesk_settings['attempt_limit']) . " AND `last_attempt` > (NOW() - INTERVAL " . intval($hesk_settings['attempt_banmin']) . " MINUTE)"); - $num = hesk_dbNumRows($res); - - echo '

' . $hesklang['iptemp'] . '

'; - - if ($num > 0) { - ?> - - - - - +
+
= " . intval($hesk_settings['attempt_limit']) . " AND `last_attempt` > (NOW() - INTERVAL " . intval($hesk_settings['attempt_banmin']) . " MINUTE)"); + $num = hesk_dbNumRows($res); + + echo '

' . $hesklang['iptemp'] . '

'; + + if ($num > 0) { ?> -
- - - - - + + + + + + + + + + + '; - if ($can_unban) { - echo ' + if ($can_unban) { + echo ' '; - } + } - echo ''; - } // End while + echo ''; + } // End while - ?> - -
' . $ban['ip'] . ' ' . $ban['minutes'] . ' @@ -200,64 +204,64 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
- ' . $hesklang['no_banips'] . '

'; - } - - // Get banned ips from database - $res = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'banned_ips` ORDER BY `ip_from` ASC'); - $num = hesk_dbNumRows($res); - - echo '

' . $hesklang['ipperm'] . '

'; - - if ($num < 1) { - echo '

' . $hesklang['no_banips'] . '

'; - } else { - // List of staff - if (!isset($admins)) { - $admins = array(); - $res2 = hesk_dbQuery("SELECT `id`,`name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users`"); - while ($row = hesk_dbFetchAssoc($res2)) { - $admins[$row['id']] = $row['name']; - } - } - - ?> - - - - - - - - - + ?> + +
- - - - ' . $hesklang['no_banips'] . '

'; } - echo ' + // Get banned ips from database + $res = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'banned_ips` ORDER BY `ip_from` ASC'); + $num = hesk_dbNumRows($res); + + echo '

' . $hesklang['ipperm'] . '

'; + + if ($num < 1) { + echo '

' . $hesklang['no_banips'] . '

'; + } else { + // List of staff + if (!isset($admins)) { + $admins = array(); + $res2 = hesk_dbQuery("SELECT `id`,`name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users`"); + while ($row = hesk_dbFetchAssoc($res2)) { + $admins[$row['id']] = $row['name']; + } + } + + ?> + + + + + + + + + + + + + + @@ -265,27 +269,32 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); '; - if ($can_unban) { - echo ' + if ($can_unban) { + echo ' '; - } + } - echo ''; - } // End while - ?> - -
' . $ban['ip_display'] . ' ' . (($ban['ip_to'] == $ban['ip_from']) ? long2ip($ban['ip_to']) : long2ip($ban['ip_from']) . ' - ' . long2ip($ban['ip_to'])) . '' . $ban['dt'] . '
- '; + } // End while + ?> + + + + ?> +
+
+ + - + + - -
-