mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-20 20:51:53 +02:00
Code Issues Releases Wiki Activity

Various banlist/logging updates

Browse Source
This commit is contained in:
e107steved 2007-12-26 13:21:34 +00:00
parent 0b7bdffe3c
commit 9162ce692a
11 changed files with 204 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
class2.php
View File

@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/class2.php,v $
| $Revision: 1.35 $
| $Date: 2007-12-22 12:39:23 $
| $Revision: 1.36 $
| $Date: 2007-12-26 13:21:34 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@ -910,7 +910,7 @@ function js_location($qry){
exit;
} else {
echo "<script type='text/javascript'>document.location.href='{$qry}'</script>\n"; exit;
}
}
}
function check_email($email) {
@ -1103,8 +1103,10 @@ function save_prefs($table = 'core', $uid = USERID, $row_val = '')
//------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------//
class e_online {
function online($online_tracking = false, $flood_control = false) {
class e_online
{
function online($online_tracking = false, $flood_control = false)
{
if($online_tracking == true || $flood_control == true)
{
global $online_timeout, $online_warncount, $online_bancount;
@ -1129,7 +1131,8 @@ class e_online {
if (USER)
{
// Find record that matches IP or visitor, or matches user info
if ($sql->db_Select("online", "*", "(`online_ip` = '{$ip}' AND `online_user_id` = '0') OR `online_user_id` = '{$udata}'")) {
if ($sql->db_Select("online", "*", "(`online_ip` = '{$ip}' AND `online_user_id` = '0') OR `online_user_id` = '{$udata}'"))
{
$row = $sql->db_Fetch();
if ($row['online_user_id'] == $udata) {
@ -1160,7 +1163,9 @@ class e_online {
}
}
$sql->db_Update("online", $query);
} else {
}
else
{
$sql->db_Insert("online", " '".time()."', '0', '{$udata}', '{$ip}', '{$page}', 1, 0");
}
}
@ -1194,10 +1199,12 @@ class e_online {
if ($row['online_pagecount'] > $online_bancount && ($row['online_ip'] != "127.0.0.1"))
{
// $sql->db_Insert("banlist", "'{$ip}', '0', 'Hit count exceeded ({$row['online_pagecount']} requests within allotted time)' ");
$e107->add_ban(2,"Hit count exceeded ({$row['online_pagecount']} requests within allotted time)",$ip,0);
if ($e107->add_ban(2,"Hit count exceeded ({$row['online_pagecount']} requests within allotted time)",$ip,0))
{
$e_event->trigger("flood", $ip);
exit;
}
}
if ($row['online_pagecount'] >= $online_warncount && $row['online_ip'] != "127.0.0.1")
{
echo "<div style='text-align:center; font: 11px verdana, tahoma, arial, helvetica, sans-serif;'><b>".LAN_WARNING."</b><br /><br />".CORE_LAN6."<br /></div>";

26
e107_admin/banlist.php
View File

@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/banlist.php,v $
| $Revision: 1.6 $
| $Date: 2007-12-23 21:15:48 $
| $Revision: 1.7 $
| $Date: 2007-12-26 13:21:34 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@ -217,7 +217,7 @@ function ban_time_dropdown($click_js = '', $zero_text=BANLAN_21, $curval=-1,$dro
// Character options for import & export
$separator_char = array(1 => ',', 2 => '|');
$quote_char = array(1 => '', 2 => "'", 3 => '"');
$quote_char = array(1 => '(none)', 2 => "'", 3 => '"');
function select_box($name, $data, $curval = FALSE)
@ -274,7 +274,7 @@ switch ($action)
<textarea class='tbox' name='ban_text[]' cols='50' rows='4'>{$pref['ban_messages'][$i]}</textarea>
</td>
<td class='forumheader3'>".ban_time_dropdown('',BANLAN_32,$pref['ban_durations'][$i],'ban_time[]')."</td>
";
</tr>";
}
$text .= "<tr><td class='forumheader3' colspan='3' style='text-align:center'><input class='button' type='submit' name='update_ban_prefs' value='".LAN_UPDATE."' /></td></tr>
</table>\n";
@ -293,10 +293,9 @@ switch ($action)
// Edit/add form first
$text .= "<div style='text-align:center'>
<form method='post' action='".e_SELF.$next."'>
<input type='hidden' name='entry_intent' value='{$action}' />
<table style='".ADMIN_WIDTH."' class='fborder'>
<tr>
<td style='width:30%' class='forumheader3'>".BANLAN_5.": </td>
<td style='width:30%' class='forumheader3'><input type='hidden' name='entry_intent' value='{$action}' />".BANLAN_5.": </td>
<td style='width:70%' class='forumheader3'>
<input class='tbox' type='text' name='ban_ip' size='40' value='".$banlist_ip."' maxlength='200' />{$rdns_warn}
</td>
@ -398,8 +397,8 @@ switch ($action)
if ($message) $ns->tablerender(BANLAN_48, "<div style='text-align:center; font-weight:bold'>{$message}</div>");
$text = "<div style='text-align:center'>
<form method='post' action='".e_ADMIN."banlist_export.php' name='ban_export_form' >
<div><table>
<form method='post' action='".e_ADMIN."banlist_export.php' id='ban_export_form' >
<table>
<colgroup>
<col style='width:70%' />
<col style='width:30%' />
@ -409,7 +408,7 @@ switch ($action)
$spacer = '';
for ($i = 0; $i < BAN_REASON_COUNT; $i++)
{
$text .= $spacer."<input type='checkbox' name='ban_types[{$i}]' value='".($i)."'>&nbsp;".constant('BANLAN_10'.$i)." - ".constant('BANLAN_11'.$i);
$text .= $spacer."<input type='checkbox' name='ban_types[{$i}]' value='".($i)."' />&nbsp;".constant('BANLAN_10'.$i)." - ".constant('BANLAN_11'.$i);
$spacer = "<br />\n";
}
$text .= "</td><td class='forumheader3'>".select_box('ban_separator',$separator_char).' '.BANLAN_37;
@ -421,16 +420,16 @@ switch ($action)
// Now do the import options
$text = "<div style='text-align:center'>
<form enctype=\"multipart/form-data\" method='post' action='".e_SELF."?transfer' name='ban_import_form' >
<div><table>
<form enctype=\"multipart/form-data\" method='post' action='".e_SELF."?transfer' id='ban_import_form' >
<table>
<colgroup>
<col style='width:70%' />
<col style='width:30%' />
</colgroup>
<tr><td class='fcaption'>".BANLAN_42."</td><td class='fcaption'>".BANLAN_15."</td></tr>";
$text .= "<tr><td class='forumheader3' rowspan='2'>\n";
$text .= "<input type='checkbox' name='ban_over_import' value='1'>&nbsp;".BANLAN_43.'<br />';
$text .= "<input type='checkbox' name='ban_over_expiry' value='1'>&nbsp;".BANLAN_44;
$text .= "<input type='checkbox' name='ban_over_import' value='1' />&nbsp;".BANLAN_43.'<br />';
$text .= "<input type='checkbox' name='ban_over_expiry' value='1' />&nbsp;".BANLAN_44;
$text .= "</td><td class='forumheader3'>".select_box('ban_separator',$separator_char).' '.BANLAN_37;
$text .= "</td></tr><tr><td class='forumheader3'>".select_box('ban_quote',$quote_char).' '.BANLAN_38."</td></tr>
@ -503,6 +502,7 @@ switch ($action)
}
$text .= "<td class='forumheader3'>{$val}</td>";
}
$text .= '</tr>';
}
$text .= "</table>\n";
}

34
e107_admin/fla.php
View File

@ -11,13 +11,14 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/fla.php,v $
| $Revision: 1.2 $
| $Date: 2007-12-09 16:42:22 $
| $Revision: 1.3 $
| $Date: 2007-12-26 13:21:34 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
require_once("../class2.php");
if (!getperms("4")) {
if (!getperms("4"))
{
header("location:".e_BASE."index.php");
exit;
}
@ -26,20 +27,25 @@ $e_sub_cat = 'failed_login';
require_once("auth.php");
$tmp = (e_QUERY) ? explode(".", e_QUERY) : "";
$from = (!$tmp[0]) ? 0 : intval($tmp[0]);
$amount = (!$tmp[1]) ? 50 : intval($tmp[1]);
$from = intval(varset($tmp[0], 0));
$amount = intval(varset($tmp[1], 50));
if(isset($_POST['delbanSubmit']))
{
$message = '';
$delcount = 0;
$spacer = '';
foreach($_POST['fladelete'] as $delete)
{
$delcount ++;
$sql -> db_Delete("generic", "gen_id='$delete' ");
$delcount ++;
$sql -> db_Delete("generic", "gen_id='{$delete}' ");
}
if ($delcount)
{
$message .= FLALAN_3.": ".$delcount;
$spacer = '<br />';
}
$message = FLALAN_3.": ".$delcount;
$bancount = 0;
foreach($_POST['flaban'] as $ban)
@ -47,14 +53,18 @@ if(isset($_POST['delbanSubmit']))
if($sql -> db_Select("generic", "*", "gen_id={$ban}"))
{
$at = $sql -> db_Fetch();
$e107->add_ban(4,FLALAN_4,$at['gen_ip'],ADMINID);
if (!$e107->add_ban(4,FLALAN_4,$at['gen_ip'],ADMINID))
{ // IP on whitelist (although possibly we shouldn't get to this stage, but check anyway
$message .= $spacer.str_replace(FLALAN_18,'--IP--',$at['gen_ip']);
$spacer = '<br />';
}
// $banlist_ip = $at['gen_ip'];
// $sql->db_Insert("banlist", "'$banlist_ip', '".ADMINID."', '".FLALAN_4."' ");
$sql -> db_Delete("generic", "gen_id='$ban' ");
$sql -> db_Delete("generic", "gen_id='{$ban}' ");
$bancount ++;
}
}
$message .= ", ".FLALAN_5.": ".$bancount;
$message .= $spacer.FLALAN_5.": ".$bancount;
}

62
e107_admin/users.php
View File

@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/users.php,v $
| $Revision: 1.8 $
| $Date: 2007-12-09 16:42:22 $
| $Revision: 1.9 $
| $Date: 2007-12-26 13:21:34 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@ -249,7 +249,7 @@ if (isset($_POST['useraction']) && $_POST['useraction'] == "ban")
// $sub_action = $_POST['userid'];
$sql->db_Select("user", "*", "user_id='".$_POST['userid']."'");
$row = $sql->db_Fetch();
if ($row['user_perms'] == "0")
if (($row['user_perms'] == "0") || ($row['user_perms'] == "0."))
{
$user->show_message(USRLAN_7);
}
@ -257,24 +257,29 @@ if (isset($_POST['useraction']) && $_POST['useraction'] == "ban")
{
if($sql->db_Update("user", "user_ban='1' WHERE user_id='".$_POST['userid']."' "))
{
$user->show_message(USRLAN_8);
$user->show_message(USRLAN_8);
}
if(trim($row['user_ip']) == "")
{
$user->show_message(USRLAN_135);
$user->show_message(USRLAN_135);
}
else
{
if($sql->db_Count("user", "(*)", "WHERE user_ip = '{$row['user_ip']}'") > 1)
{
$user->show_message(str_replace("{IP}", $row['user_ip'], USRLAN_136));
}
else
{
$e107->add_ban(6,USRLAN_149.$row['user_name'].'/'.$row['user_loginname'],$row['user_ip'],USERID);
// $sql -> db_Insert("banlist", "'".$row['user_ip']."', '".USERID."', '".$row['user_name']."' ");
if($sql->db_Count("user", "(*)", "WHERE user_ip = '{$row['user_ip']}'") > 1)
{ // Multiple users have same IP address
$user->show_message(str_replace("{IP}", $row['user_ip'], USRLAN_136));
}
else
{
if ($e107->add_ban(6,USRLAN_149.$row['user_name'].'/'.$row['user_loginname'],$row['user_ip'],USERID))
{ // Successful IP ban
$user->show_message(str_replace("{IP}", $row['user_ip'], USRLAN_137));
}
else
{ // IP address on whitelist
$user->show_message(str_replace("{IP}", $row['user_ip'], USRLAN_150));
}
}
}
}
$action = "main";
@ -780,7 +785,7 @@ class users
$text .= "<div style='cursor:pointer' onclick=\"expandit('sdisp')\">".LAN_DISPLAYOPT."</div>";
$text .= "<div id='sdisp' style='padding-top:4px;display:none;text-align:center;margin-left:auto;margin-right:auto'>
<table class='forumheader3' style='width:95%'><tr>";
<table class='forumheader3' style='width:95%'>";
$fields = mysql_list_fields($mySQLdefaultdb, MPREFIX."user");
$columns = mysql_num_fields($fields);
for ($i = 0; $i < $columns; $i++) {
@ -789,19 +794,26 @@ class users
// include extended fields in the list.
$sql -> db_Select("user_extended_struct");
while($row = $sql-> db_Fetch()){
$fname[] = "user_".$row['user_extended_struct_name'];
while($row = $sql-> db_Fetch())
{
$fname[] = "user_".$row['user_extended_struct_name'];
}
$m = 0;
foreach($fname as $fcol){
$checked = (in_array($fcol,$search_display)) ? "checked='checked'" : "";
$text .= "<td style='text-align:left; padding:0px'>";
$text .= "<input type='checkbox' name='searchdisp[]' value='".$fcol."' $checked />".str_replace("user_","",$fcol) . "</td>\n";
$m++;
if($m == 5){
$text .= "</tr><tr>";
$m = 0;
}
foreach($fname as $fcol)
{
if($m == 0)
{
$text .= "<tr>";
}
$checked = (in_array($fcol,$search_display)) ? "checked='checked'" : "";
$text .= "<td style='text-align:left; padding:0px'>";
$text .= "<input type='checkbox' name='searchdisp[]' value='".$fcol."' $checked />".str_replace("user_","",$fcol) . "</td>\n";
$m++;
if($m == 5)
{
$text .= "</tr>";
$m = 0;
}
}
$text .= "</table></div>

17
e107_handlers/e107_class.php
View File

@ -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.11 $
| $Date: 2007-12-16 11:14:47 $
| $Revision: 1.12 $
| $Date: 2007-12-26 13:21:34 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@ -220,7 +220,6 @@ class e107{
if ($show_error) header("HTTP/1.1 403 Forbidden", true);
if (isset($pref['ban_messages']))
{ // May want to display a message
$row = $sql->db_Fetch(); // Get the type of the ban
if (($row['banlist_banexpires'] > 0) && ($row['banlist_banexpires'] < time()))
{ // Ban has expired - delete from DB
$sql->db_Delete('banlist', $query);
@ -230,6 +229,7 @@ class e107{
if ($do_return) return FALSE;
echo $tp->toHTML(varsettrue($pref['ban_messages'][$row['banlist_bantype']])); // Show message if one set
}
$admin_log->e_log_event(4,__FILE__."|".__FUNCTION__."@".__LINE__,'BAN_03','LAN_AUDIT_LOG_003',$query,FALSE,LOG_TO_ROLLING);
exit();
}
// $admin_log->e_log_event(4,__FILE__."|".__FUNCTION__."@".__LINE__,"DBG","No ban found",$query,FALSE,LOG_TO_ROLLING);
@ -238,17 +238,26 @@ class e107{
// Add an entry to the banlist. $bantype = 1 for manual, 2 for flooding, 4 for multiple logins
// Returns TRUE if ban accepted.
// Returns FALSE if ban not accepted (i.e. because on whitelist, or invalid IP specified)
function add_ban($bantype,$ban_message='',$ban_ip='',$ban_user = 0,$ban_notes='')
{
global $sql, $pref;
if (!$ban_message) $ban_message = 'No explanation given';
if (!$ban_ip) $ban_ip = $this->getip();
$ban_ip = preg_replace("/[^\w@\.]*/",'',urldecode($ban_ip)); // Make sure no special characters
if (!$ban_ip) return;
if (!$ban_ip) return FALSE;
// See if the address is in the whitelist
if ($sql->db_Select('banlist','*','`banlist_bantype` >= '.BAN_TYPE_WHITELIST))
{ // Got a whitelist entry for this
$admin_log->e_log_event(4,__FILE__."|".__FUNCTION__."@".__LINE__,"BANLIST_11",'AL_BAN_LAN_11',$ban_ip,FALSE,LOG_TO_ROLLING);
return FALSE;
}
// Add using an array - handles DB changes better
$sql->db_Insert('banlist',array('banlist_ip' => $ban_ip, 'banlist_bantype' => $bantype, 'banlist_datestamp' => time(),
'banlist_banexpires' => (varsettrue($pref['ban_durations'][$bantype]) ? time() + ($pref['ban_durations'][$bantype]*60*60) : 0),
'banlist_admin' => $ban_user, 'banlist_reason' => $ban_message, 'banlist_notes' => $ban_notes));
return TRUE;
}

39
e107_handlers/login.php
View File

@ -12,8 +12,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/login.php,v $
| $Revision: 1.9 $
| $Date: 2007-12-15 15:06:40 $
| $Revision: 1.10 $
| $Date: 2007-12-26 13:21:34 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@ -227,20 +227,45 @@ class userlogin {
}
}
function update_xup($user_id, $user_xup = "") {
// This is called to update user settings from a XUP file - usually because the file name has changed.
// $user_xup has the new file name
function update_xup($user_id, $user_xup = "")
{
global $sql, $tp;
if($user_xup) {
if($user_xup)
{
require_once(e_HANDLER."xml_class.php");
$xml = new parseXml;
if($rawData = $xml -> getRemoteXmlFile($user_xup)) {
if($rawData = $xml -> getRemoteXmlFile($user_xup))
{
preg_match_all("#\<meta name=\"(.*?)\" content=\"(.*?)\" \/\>#si", $rawData, $match);
$count = 0;
foreach($match[1] as $value) {
foreach($match[1] as $value)
{
$$value = $tp -> toDB($match[2][$count]);
$count++;
}
$sql -> db_Update("user", "user_login='{$FN}', user_hideemail='{EMAILHIDE}', user_signature='{$SIG}', user_sess='{$PHOTO}', user_image='{$AV}', user_timezone='{$TZ}' WHERE user_id='".intval($user_id)."'");
// List of fields in main user record, and their corresponding XUP fields
$main_fields = array('user_realname' => 'FN',
'user_hideemail'=>'EMAILHIDE',
'user_signature'=>'SIG',
'user_sess'=>'PHOTO',
'user_image'=>'AV',
'user_timezone'=>'TZ');
$new_values = array();
foreach ($main_fields as $f => $v)
{
if (isset($$v) && $$v)
{
$new_values[$f] = $$v;
}
}
// Use of db_updateArray() ensures only non-empty fields are changed
$sql -> db_UpdateArray("user", $new_values, "WHERE user_id='".intval($user_id)."'");
// $sql -> db_Update("user", "user_realname='{$FN}', user_hideemail='{$EMAILHIDE}', user_signature='{$SIG}', user_sess='{$PHOTO}', user_image='{$AV}', user_timezone='{$TZ}' WHERE user_id='".intval($user_id)."'");
$ue_fields = "";
$fields = array("URL" => "homepage",

45
e107_handlers/mysql_class.php
View File

@ -12,8 +12,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/mysql_class.php,v $
| $Revision: 1.20 $
| $Date: 2007-12-18 20:57:37 $
| $Revision: 1.21 $
| $Date: 2007-12-26 13:21:34 $
| $Author: e107steved $
|
+----------------------------------------------------------------------------+
@ -30,7 +30,7 @@ $db_ConnectionID = NULL;
* MySQL Abstraction class
*
* @package e107
* @version $Revision: 1.20 $
* @version $Revision: 1.21 $
* @author $Author: e107steved $
*/
class db {
@ -350,6 +350,45 @@ class db {
}
}
/* Similar to db_Update(), but splits the variables and the 'WHERE' clause.
$vars may be an array (fieldname=>newvalue) of fields to be updated, or a simple list.
$arg is usually a 'WHERE' clause
*/
function db_UpdateArray($table, $vars, $arg, $debug = FALSE, $log_type = '', $log_remark = '')
{
$table = $this->db_IsLang($table);
$this->mySQLcurTable = $table;
if(!$this->mySQLaccess)
{
global $db_ConnectionID;
$this->mySQLaccess = $db_ConnectionID;
}
$new_data = '';
if (is_array($vars))
{
$spacer = '';
foreach ($vars as $fn => $fv)
{
$new_data .= $spacer."`{$fn}`='{$fv}'";
$spacer = ', ';
}
$vars = '';
}
if ($result = $this->mySQLresult = $this->db_Query('UPDATE '.MPREFIX.$table.' SET '.$new_data.$vars.' '.$arg, NULL, 'db_UpdateArray', $debug, $log_type, $log_remark))
{
$result = mysql_affected_rows($this->mySQLaccess);
if ($result == -1) return FALSE; // Error return from mysql_affected_rows
return $result;
}
else
{
$this->dbError("db_Update ($query)");
return FALSE;
}
}
/**
* @return array MySQL row
* @param string $mode

6
e107_languages/English/admin/lan_banlist.php
View File

@ -4,8 +4,8 @@
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_banlist.php,v $
| $Revision: 1.5 $
| $Date: 2007-12-16 11:14:53 $
| $Revision: 1.6 $
| $Date: 2007-12-26 13:21:34 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@ -22,7 +22,7 @@ define("BANLAN_11", "Auto-ban: More than 10 failed login attempts");
define("BANLAN_12", "Note: Reverse DNS is currently disabled; it must be enabled to allow banning by host. Banning by IP and email address will still function normally.");
define("BANLAN_13", "Note: To ban a user by user name, go to the users admin page: ");
define('BANLAN_14','Ban List');
define('BANLAN_15','Options');
define('BANLAN_15','Messages/Ban Periods');
define('BANLAN_16','Banning');
define('BANLAN_17','Ban Date');
define('BANLAN_18','Ban expires');

7
e107_languages/English/admin/lan_fla.php
View File

@ -4,9 +4,9 @@
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_fla.php,v $
| $Revision: 1.1.1.1 $
| $Date: 2006-12-02 04:34:40 $
| $Author: mcfly_e107 $
| $Revision: 1.2 $
| $Date: 2007-12-26 13:21:34 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
define("FLALAN_1", "Failed login attempts");
@ -26,5 +26,6 @@ define("FLALAN_14", "uncheck all ban checkboxes");
define("FLALAN_15", "The following IP address(es) have been auto-banned - user attempted more than ten failed logins");
define("FLALAN_16", "delete this auto ban list");
define("FLALAN_17", "Auto-ban list deleted");
define('FLALAN_18', "Could not ban IP address --IP-- - on whitelist");
?>

6
e107_languages/English/admin/lan_log_messages.php
View File

@ -1,6 +1,6 @@
<?php
// e107 Language File.
// $Id: lan_log_messages.php,v 1.2 2007-12-23 21:15:54 e107steved Exp $
// $Id: lan_log_messages.php,v 1.3 2007-12-26 13:21:34 e107steved Exp $
/*
The definitions in this file are for standard 'explanatory' messages which might be entered
@ -14,7 +14,7 @@ into any of the system logs. They are in three groups with different prefixes:
// User audit trail events. For messages 11-30, the last 2 digits must match the define for the event type in the admin log
define('LAN_AUDIT_LOG_001', "Access by banned user");
define('LAN_AUDIT_LOG_002', "Flood protection activated");
define('LAN_AUDIT_LOG_003', "");
define('LAN_AUDIT_LOG_003', 'Access from banned IP Address');
define('LAN_AUDIT_LOG_004', "");
define('LAN_AUDIT_LOG_005', "");
define('LAN_AUDIT_LOG_006', "User changed password");
@ -67,7 +67,7 @@ define('AL_BAN_LAN_07','Banlist imported');
define('AL_BAN_LAN_08','Banlist options updated');
define('AL_BAN_LAN_09','Banlist entry edited');
define('AL_BAN_LAN_10','Whitelist entry edited');
define('AL_BAN_LAN_11','Whitelist hit for ban entry');
// Rolling log events
//-------------------

38
e107_languages/English/admin/lan_users.php
View File

@ -4,8 +4,8 @@
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_users.php,v $
| $Revision: 1.7 $
| $Date: 2007-12-09 16:42:23 $
| $Revision: 1.8 $
| $Date: 2007-12-26 13:21:34 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@ -133,10 +133,28 @@ define("USRLAN_135", "No IP address found in user's info; IP not banned");
define("USRLAN_136", "Multiple users found with IP address of {IP}; IP not banned.");
define("USRLAN_137", "Users IP address of {IP} banned.");
define("USRLAN_138", "Unverified users");
define("USRLAN_139", "Your account has been activated.\n\nYou can visit {SITEURL} and log into the site using the login information you provided.");
define("USRLAN_140", "Email Re-sent to");
define("USRLAN_141", "Failed to Re-send email to");
define("USRLAN_142", "with the following activation link");
define("USRLAN_143", "Check For Bounces");
define("USRLAN_144", "Resend Confirmation Email to All");
define("USRLAN_145", "Bounced users");
define("USRLAN_146", "Member information is available to");
define("USRLAN_147", "Email address is already used by a banned user");
define("USRLAN_148", "Email address is banned");
define('USRLAN_149', "User banned: ");
define('USRLAN_150', "IP address of {IP} appears on whitelist; IP not banned.");
define("LAN_MAINADMIN","Main Admin");
define("LAN_ADMIN","Admin");
define("LAN_NOTVERIFIED","Not Verified");
define("LAN_BANNED","Banned");
define("LAN_BOUNCED","Bounced");
define("DUSRLAN_1", "ID");
define("DUSRLAN_2", "Display Name");
@ -176,21 +194,5 @@ define("DUSRLAN_35", "Picture");
define("DUSRLAN_36", "Password Change");
define("DUSRLAN_37", "XUP");
define("USRLAN_138", "Unverified users");
define("USRLAN_139", "Your account has been activated.\n\nYou can visit {SITEURL} and log into the site using the login information you provided.");
define("USRLAN_140", "Email Re-sent to");
define("USRLAN_141", "Failed to Re-send email to");
define("USRLAN_142", "with the following activation link");
define("LAN_BOUNCED","Bounced");
define("USRLAN_143", "Check For Bounces");
define("USRLAN_144", "Resend Confirmation Email to All");
define("USRLAN_145", "Bounced users");
define("USRLAN_146", "Member information is available to");
define("USRLAN_147", "Email address is already used by a banned user");
define("USRLAN_148", "Email address is banned");
define('USRLAN_149', "User banned: ");
?>