".BANLAN_12."
".$rs->form_hidden("ban_secure", "1");
- if (!$ban_total = $sql->db_Select("banlist","*","ORDER BY banlist_ip","nowhere"))
+ if (($action != 'list') && ($action != 'white')) $action = 'list';
+ $edit_action = ($action == 'list' ? 'edit' : 'whedit');
+ $del_action = ($action == 'list' ? 'remove' : 'whremove');
+ $col_widths = array('list' => array(10,5,35,30,10,10), 'white' => array(15,40,35,10));
+ $col_titles = array('list' => array(BANLAN_17,BANLAN_20,BANLAN_10,BANLAN_19,BANLAN_18,LAN_OPTIONS),
+ 'white' => array(BANLAN_55,BANLAN_56,BANLAN_19,LAN_OPTIONS));
+ $no_values = array('list' => BANLAN_2, 'white' => BANLAN_54);
+ $col_defs = array('list' => array('banlist_datestamp'=>0,'banlist_bantype'=>0,'ip_reason'=>BANLAN_7,'banlist_notes'=>0,'banlist_banexpires'=>0,'ban_options'=>0),
+ 'white' => array('banlist_datestamp'=>0,'ip_reason'=>BANLAN_57,'banlist_notes'=>0,'ban_options'=>0));
+
+ $text = $rs->form_open("post", e_SELF.'?'.$action, "ban_form")."
".$rs->form_hidden("ban_secure", "1");
+ $filter = ($action == 'white') ? 'banlist_bantype='.BAN_TYPE_WHITELIST : 'banlist_bantype!='.BAN_TYPE_WHITELIST ;
+ if (!$ban_total = $sql->db_Select("banlist","*",$filter." ORDER BY banlist_ip"))
{
- $text .= "
-
\n";
}
$text .= "".$rs->form_close();
- $ns->tablerender(BANLAN_3, $text);
+ $ns->tablerender(($action == 'list' ? BANLAN_3 : BANLAN_61), $text);
// End of case 'list' and the default case
} // End switch ($action)
@@ -456,6 +498,14 @@ function banlist_adminmenu()
$var['add']['link'] = e_SELF."?add";
$var['add']['perm'] = "4";
+ $var['white']['text'] = BANLAN_52; // List existing whitelist entries
+ $var['white']['link'] = e_SELF."?white";
+ $var['white']['perm'] = "4";
+
+ $var['whadd']['text'] = BANLAN_53; // Add a new whitelist entry
+ $var['whadd']['link'] = e_SELF."?whadd";
+ $var['whadd']['perm'] = "4";
+
$var['transfer']['text'] = BANLAN_35;
$var['transfer']['link'] = e_SELF."?transfer";
$var['transfer']['perm'] = "4";
diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index 1fb9d66c2..e0cc8e0eb 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $
-| $Revision: 1.10 $
-| $Date: 2007-12-09 16:42:23 $
+| $Revision: 1.11 $
+| $Date: 2007-12-16 11:14:47 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -206,8 +206,16 @@ class e107{
{
global $sql, $tp, $pref, $admin_log;
// $admin_log->e_log_event(4,__FILE__."|".__FUNCTION__."@".__LINE__,"DBG","Check for Ban",$query,FALSE,LOG_TO_ROLLING);
- if ($sql->db_Select('banlist','*',$query))
+ if ($sql->db_Select('banlist','*',$query.' ORDER BY `banlist_bantype` DESC'))
{
+ // Any whitelist entries will be first - so we can answer based on the first DB record read
+ define('BAN_TYPE_WHITELIST',100); // Entry for whitelist
+ $row = $sql->db_Fetch();
+ if ($row['banlist_bantype'] >= BAN_TYPE_WHITELIST)
+ {
+// $admin_log->e_log_event(4,__FILE__."|".__FUNCTION__."@".__LINE__,"DBG","Whitelist hit",$query,FALSE,LOG_TO_ROLLING);
+ return TRUE;
+ }
// $admin_log->e_log_event(4,__FILE__."|".__FUNCTION__."@".__LINE__,"DBG","Active Ban",$query,FALSE,LOG_TO_ROLLING);
if ($show_error) header("HTTP/1.1 403 Forbidden", true);
if (isset($pref['ban_messages']))
diff --git a/e107_languages/English/admin/help/banlist.php b/e107_languages/English/admin/help/banlist.php
index adee7ba85..9536bf4b4 100644
--- a/e107_languages/English/admin/help/banlist.php
+++ b/e107_languages/English/admin/help/banlist.php
@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/help/banlist.php,v $
-| $Revision: 1.4 $
-| $Date: 2007-12-11 22:48:42 $
+| $Revision: 1.5 $
+| $Date: 2007-12-16 11:14:53 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -55,6 +55,17 @@ Entering the email address *@bar.com will stop anyone using that email domain fr
Banning by user name
This is done from the user administration page.
"; break; +case 'whadd' : +case 'whedit' : + $text = "You can specify IP addresses which you know to be 'friendly' here - generally those for the main site admins, to guarantee that they can + always gain access to the site.
+ You are advised to keep the number of addresses in this list to an absolute minimum; both for security, and to minimise the impact on site performance."; + break; +case 'white' : + $text = "This page shows a list of all IP addresses and email addresses which are explicitly permitted.
+ This list takes priority over the ban list - it should not be possible for an address from this list to be banned.
+ All addresses must be manually entered."; + break; case 'list' : default : $text = "This page shows a list of all IP addresses, hostnames and email addresses which are banned. diff --git a/e107_languages/English/admin/lan_banlist.php b/e107_languages/English/admin/lan_banlist.php index 38294fa43..b17ed6238 100644 --- a/e107_languages/English/admin/lan_banlist.php +++ b/e107_languages/English/admin/lan_banlist.php @@ -4,13 +4,13 @@ | e107 website system - Language File. | | $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_banlist.php,v $ -| $Revision: 1.4 $ -| $Date: 2007-12-11 22:48:42 $ +| $Revision: 1.5 $ +| $Date: 2007-12-16 11:14:53 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ define("BANLAN_1", "Ban removed."); -define("BANLAN_2", "No bans."); +define("BANLAN_2", 'No bans in list.'); define("BANLAN_3", "Existing Bans"); define("BANLAN_4", "Remove ban"); define("BANLAN_5", "Enter IP, email address, or host"); @@ -32,7 +32,7 @@ define('BANLAN_21','Never'); define('BANLAN_22','Unknown'); define('BANLAN_23','day(s)'); define('BANLAN_24','hours'); -define('BANLAN_25','Add an entry'); +define('BANLAN_25','Add to Banlist'); define('BANLAN_26','Currently '); define('BANLAN_27','Invalid characters in IP address stripped - now:'); define('BANLAN_28','Ban type'); @@ -59,15 +59,17 @@ define('BANLAN_48','Error importing file'); define('BANLAN_49','CSV import: Unbalanced quotes in line '); define('BANLAN_50','CSV import: Error writing banlist record at line '); define('BANLAN_51','CSV import: Success, --NUM-- lines imported from file '); -define('BANLAN_52',''); -define('BANLAN_53',''); -define('BANLAN_54',''); -define('BANLAN_55',''); -define('BANLAN_56',''); -define('BANLAN_57',''); -define('BANLAN_58',''); -define('BANLAN_59',''); -define('BANLAN_60',''); +define('BANLAN_52','Whitelist'); +define('BANLAN_53','Add to Whitelist'); +define('BANLAN_54','No entries in whitelist'); +define('BANLAN_55','Entry Date'); +define('BANLAN_56','IP/Email, User'); +define('BANLAN_57','User'); +define('BANLAN_58','Add users to the whitelist'); +define('BANLAN_59','Edit existing whitelist entry'); +define('BANLAN_60','Edit existing banlist entry'); +define('BANLAN_61','Existing Whitelist entries'); +define('BANLAN_62',''); // Ban types - block reserved 100-109 define('BANLAN_100', 'Unknown');
".BANLAN_2."
";
+ $text .= "".$no_values[$action]."
";
}
else
{
- $text .= "| ".BANLAN_17." | -".BANLAN_20." | -".BANLAN_10." | -".BANLAN_19." | -".BANLAN_18." | -".LAN_OPTIONS." | -
| {$ct} | "; + $text .= "|||||
| ".($banlist_datestamp ? strftime(BAN_TIME_FORMAT,$banlist_datestamp) : BANLAN_22 )." | -".constant('BANLAN_10'.$banlist_bantype)." | -{$banlist_ip} ".BANLAN_7.": {$banlist_reason} |
- {$banlist_notes} | -".($banlist_banexpires ? strftime(BAN_TIME_FORMAT,$banlist_banexpires).(($banlist_banexpires < time()) ? ' ('.BANLAN_34.')' : '')
- : BANLAN_21)." - ".ban_time_dropdown("onchange=\"urljump('".e_SELF."?newtime-{$banlist_ip}-'+this.value)\"")." |
-
- ![".LAN_EDIT."](".$images_path."edit_16.png "\".LAN_EDIT.\"")
- toJS(LAN_CONFIRMDEL." [".$banlist_ip."]")."');
- if (r) { document.getElementById('ban_form').action='".e_SELF."?remove-{$banlist_ip}'; } return r; \" /> | ";
- $count++;
+ $text .= "
| {$val} | "; + } } $text .= "
This is done from the user administration page.
"; break; +case 'whadd' : +case 'whedit' : + $text = "You can specify IP addresses which you know to be 'friendly' here - generally those for the main site admins, to guarantee that they can + always gain access to the site.
+ You are advised to keep the number of addresses in this list to an absolute minimum; both for security, and to minimise the impact on site performance."; + break; +case 'white' : + $text = "This page shows a list of all IP addresses and email addresses which are explicitly permitted.
+ This list takes priority over the ban list - it should not be possible for an address from this list to be banned.
+ All addresses must be manually entered."; + break; case 'list' : default : $text = "This page shows a list of all IP addresses, hostnames and email addresses which are banned. diff --git a/e107_languages/English/admin/lan_banlist.php b/e107_languages/English/admin/lan_banlist.php index 38294fa43..b17ed6238 100644 --- a/e107_languages/English/admin/lan_banlist.php +++ b/e107_languages/English/admin/lan_banlist.php @@ -4,13 +4,13 @@ | e107 website system - Language File. | | $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_banlist.php,v $ -| $Revision: 1.4 $ -| $Date: 2007-12-11 22:48:42 $ +| $Revision: 1.5 $ +| $Date: 2007-12-16 11:14:53 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ define("BANLAN_1", "Ban removed."); -define("BANLAN_2", "No bans."); +define("BANLAN_2", 'No bans in list.'); define("BANLAN_3", "Existing Bans"); define("BANLAN_4", "Remove ban"); define("BANLAN_5", "Enter IP, email address, or host"); @@ -32,7 +32,7 @@ define('BANLAN_21','Never'); define('BANLAN_22','Unknown'); define('BANLAN_23','day(s)'); define('BANLAN_24','hours'); -define('BANLAN_25','Add an entry'); +define('BANLAN_25','Add to Banlist'); define('BANLAN_26','Currently '); define('BANLAN_27','Invalid characters in IP address stripped - now:'); define('BANLAN_28','Ban type'); @@ -59,15 +59,17 @@ define('BANLAN_48','Error importing file'); define('BANLAN_49','CSV import: Unbalanced quotes in line '); define('BANLAN_50','CSV import: Error writing banlist record at line '); define('BANLAN_51','CSV import: Success, --NUM-- lines imported from file '); -define('BANLAN_52',''); -define('BANLAN_53',''); -define('BANLAN_54',''); -define('BANLAN_55',''); -define('BANLAN_56',''); -define('BANLAN_57',''); -define('BANLAN_58',''); -define('BANLAN_59',''); -define('BANLAN_60',''); +define('BANLAN_52','Whitelist'); +define('BANLAN_53','Add to Whitelist'); +define('BANLAN_54','No entries in whitelist'); +define('BANLAN_55','Entry Date'); +define('BANLAN_56','IP/Email, User'); +define('BANLAN_57','User'); +define('BANLAN_58','Add users to the whitelist'); +define('BANLAN_59','Edit existing whitelist entry'); +define('BANLAN_60','Edit existing banlist entry'); +define('BANLAN_61','Existing Whitelist entries'); +define('BANLAN_62',''); // Ban types - block reserved 100-109 define('BANLAN_100', 'Unknown');