1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00

Bugtracker #4671 - hardcoded text

This commit is contained in:
e107steved
2009-02-03 21:16:29 +00:00
parent 90d244601a
commit 46d7bd0db2
2 changed files with 50 additions and 45 deletions

View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/online_class.php,v $
| $Revision: 1.3 $
| $Date: 2008-11-22 12:57:25 $
| $Revision: 1.4 $
| $Date: 2009-02-03 21:16:15 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -87,21 +87,26 @@ class e_online
else
{
//Current page request is from a visitor
if ($sql->db_Select("online", "*", "`online_ip` = '{$ip}' AND `online_user_id` = '0'")) {
if ($sql->db_Select("online", "*", "`online_ip` = '{$ip}' AND `online_user_id` = '0'"))
{
$row = $sql->db_Fetch();
if ($row['online_timestamp'] < (time() - $online_timeout)) //It has been at least 'timeout' seconds since this ip has connected
{
//Update record with timestamp, current page, and set pagecount to 1
$query = "`online_timestamp` = '".time()."', `online_location` = '{$page}', `online_pagecount` = 1 WHERE `online_ip` = '{$ip}' AND `online_user_id` = '0' LIMIT 1";
} else {
}
else
{
//Update record with current page and increment pagecount
$row['online_pagecount'] ++;
// echo "here {$online_pagecount}";
$query="`online_location` = '{$page}', `online_pagecount` = {$row['online_pagecount']} WHERE `online_ip` = '{$ip}' AND `online_user_id` = '0' LIMIT 1";
}
$sql->db_Update("online", $query);
} else {
}
else
{
$sql->db_Insert("online", " '".time()."', '0', '0', '{$ip}', '{$page}', 1, 0");
}
}
@@ -113,8 +118,8 @@ class e_online
if ($row['online_pagecount'] > $online_bancount && ($e107->ipDecode($row['online_ip'],TRUE) != "127.0.0.1"))
{
// $sql->db_Insert("banlist", "'{$ip}', '0', 'Hit count exceeded ({$row['online_pagecount']} requests within allotted time)' ");
if ($e107->add_ban(2,"Hit count exceeded ({$row['online_pagecount']} requests within allotted time)",$ip,0))
include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_banlist.php');
if ($e107->add_ban(2,str_replace('--HITS--',$row['online_pagecount'],BANLAN_78),$ip,0))
{
$e_event->trigger("flood", $ip);
exit;

View File

@@ -4,9 +4,9 @@
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_banlist.php,v $
| $Revision: 1.8 $
| $Date: 2008-12-23 15:18:31 $
| $Author: secretr $
| $Revision: 1.9 $
| $Date: 2009-02-03 21:16:15 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
define("BANLAN_1", "Ban removed.");
@@ -85,7 +85,7 @@ define('BANLAN_74','Banlist Maintenance');
define('BANLAN_75','Remove expired bans from list');
define('BANLAN_76','Execute');
define('BANLAN_77','Messages/Ban Periods');
define('BANLAN_78','');
define('BANLAN_78','Hit count exceeded (--HITS-- requests within allotted time)');
define('BANLAN_79','');
define('BANLAN_80','');