mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 13:17:24 +02:00
Code Issues Releases Wiki Activity

IPV6 handling - basics

Browse Source
This commit is contained in:
e107steved
2008-11-22 12:57:42 +00:00
parent 5c99758db5
commit 45859f6adb
7 changed files with 239 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
e107_admin/admin_log.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_admin/admin_log.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/admin_log.php,v $
| $Revision: 1.17 $ | $Revision: 1.18 $
| $Date: 2008-08-10 11:41:01 $ | $Date: 2008-11-22 12:57:25 $
| $Author: e107steved $ | $Author: e107steved $
| |
| Preferences: | Preferences:
@@ -107,12 +107,12 @@ if (isset($_POST['deleteitems']) && ($action == 'comments'))
unset($back_count); unset($back_count);
if (isset($_POST['deleteoldadmin']) && isset($_POST['rolllog_clearadmin'])) if (isset($_POST['deleteoldadmin']) && isset($_POST['rolllog_clearadmin']))
{ {
$back_count = $_POST['rolllog_clearadmin']; $back_count = intval($_POST['rolllog_clearadmin']);
$next_action = 'confdel'; $next_action = 'confdel';
} }
elseif (isset($_POST['deleteoldaudit']) && isset($_POST['rolllog_clearaudit'])) elseif (isset($_POST['deleteoldaudit']) && isset($_POST['rolllog_clearaudit']))
{ {
$back_count = $_POST['rolllog_clearaudit']; $back_count = intval($_POST['rolllog_clearaudit']);
$next_action = 'auditdel'; $next_action = 'auditdel';
} }
@@ -252,41 +252,41 @@ $last_noted_time = 0;
$rl_cookiename = $pref['cookie_name']."_rl_admin"; $rl_cookiename = $pref['cookie_name']."_rl_admin";
if (isset($_POST['updatefilters']) || isset($_POST['clearfilters'])) if (isset($_POST['updatefilters']) || isset($_POST['clearfilters']))
{ // Need to put the filter values into the cookie { // Need to put the filter values into the cookie
if (!isset($_POST['clearfilters'])) if (!isset($_POST['clearfilters']))
{ // Only update filter values from S_POST[] if 'clear filters' not active { // Only update filter values from S_POST[] if 'clear filters' not active
$start_time = $_POST['starttimedate'] + $_POST['starttimehours']*3600 + $_POST['starttimemins']*60; $start_time = intval($_POST['starttimedate'] + $_POST['starttimehours']*3600 + $_POST['starttimemins']*60);
$start_enabled = isset($_POST['start_enabled']); $start_enabled = isset($_POST['start_enabled']);
if (isset($_POST['timelength'])) if (isset($_POST['timelength']))
{ {
$end_time = intval($_POST['timelength'])*60 + $start_time; $end_time = intval($_POST['timelength'])*60 + $start_time;
} }
else else
{ {
$end_time = $_POST['endtimedate'] + $_POST['endtimehours']*3600 + $_POST['endtimemins']*60; $end_time = intval($_POST['endtimedate'] + $_POST['endtimehours']*3600 + $_POST['endtimemins']*60);
} }
$end_enabled = isset($_POST['end_enabled']); $end_enabled = isset($_POST['end_enabled']);
$user_filter = $_POST['roll_user_filter']; $user_filter = intval($_POST['roll_user_filter']);
$event_filter = $_POST['roll_event_filter']; $event_filter = $tp->toDB($_POST['roll_event_filter']);
$pri_filter_cond = $_POST['roll_pri_cond']; $pri_filter_cond = $tp->toDB($_POST['roll_pri_cond']);
$pri_filter_val = $_POST['roll_pri_val']; $pri_filter_val = $tp->toDB($_POST['roll_pri_val']);
$caller_filter = $_POST['roll_caller_filter']; $caller_filter = $tp->toDB($_POST['roll_caller_filter']);
$ipaddress_filter = $_POST['roll_ipaddress_filter']; $ipaddress_filter = $e107->ipEncode($tp->toDB($_POST['roll_ipaddress_filter']));
$downloadid_filter = $_POST['roll_downloadid_filter']; $downloadid_filter = $tp->toDB($_POST['roll_downloadid_filter']);
} }
$cookie_string = implode("|",array($start_time,$start_enabled,$end_time,$end_enabled,$user_filter,$event_filter,$pri_filter_cond,$pri_filter_val,$caller_filter,$ipaddress_filter,$downloadid_filter)); $cookie_string = implode("|",array($start_time,$start_enabled,$end_time,$end_enabled,$user_filter,$event_filter,$pri_filter_cond,$pri_filter_val,$caller_filter,$ipaddress_filter,$downloadid_filter));
// echo $cookie_string."<br />"; // echo $cookie_string."<br />";
// Create session cookie to store values // Create session cookie to store values
cookie($rl_cookiename,$cookie_string,0); // Use session cookie cookie($rl_cookiename,$cookie_string,0); // Use session cookie
} }
else else
{ {
// Now try and get the filters from the cookie // Now try and get the filters from the cookie
if (isset($_COOKIE[$rl_cookiename])) if (isset($_COOKIE[$rl_cookiename]))
list($start_time,$start_enabled,$end_time,$end_enabled,$user_filter,$event_filter,$pri_filter_cond,$pri_filter_val, $caller_filter,$ipaddress_filter,$downloadid_filter) = explode("|",$_COOKIE[$rl_cookiename]); list($start_time,$start_enabled,$end_time,$end_enabled,$user_filter,$event_filter,$pri_filter_cond,$pri_filter_val, $caller_filter,$ipaddress_filter,$downloadid_filter) = explode("|",$_COOKIE[$rl_cookiename]);
if (isset($qs[1]) && isset($qs[2]) && ($qs[1] == 'user') && ctype_digit($qs[2]) && (intval($qs[2]) > 0)) if (isset($qs[1]) && isset($qs[2]) && ($qs[1] == 'user') && ctype_digit($qs[2]) && (intval($qs[2]) > 0))
{ {
$user_filter = intval($qs[2]); $user_filter = intval($qs[2]);
} }
} }
$timelength = 5; $timelength = 5;
@@ -789,7 +789,7 @@ $sort_fields = array(
break; break;
case 'ipfilter' : case 'ipfilter' :
$text .= "<td class='forumheader3'>".RL_LAN_060."<br /><span class='smalltext'><em>".RL_LAN_061."</em></span></td> $text .= "<td class='forumheader3'>".RL_LAN_060."<br /><span class='smalltext'><em>".RL_LAN_061."</em></span></td>
<td class='forumheader3'><input class='tbox' type='text' name='roll_ipaddress_filter' size='20' value='".$ipaddress_filter."' maxlength='20' /></td>"; <td class='forumheader3'><input class='tbox' type='text' name='roll_ipaddress_filter' size='20' value='".$e107->ipDecode($ipaddress_filter)."' maxlength='20' /></td>";
$filter_cols += 2; $filter_cols += 2;
break; break;
case 'userfilter' : case 'userfilter' :
@@ -923,13 +923,16 @@ function log_process($matches)
// Look for pseudo-code for newlines, link insertion // Look for pseudo-code for newlines, link insertion
$val = preg_replace_callback("#\[!(\w+?)(=.+?){0,1}!]#",'log_process',$row['dblog_remarks']); $val = preg_replace_callback("#\[!(\w+?)(=.+?){0,1}!]#",'log_process',$row['dblog_remarks']);
break; break;
case 'dblog_ip' :
$val = $e107->ipDecode($row['dblog_ip']);
break;
case 'comment_ip' : case 'comment_ip' :
$val = $row['comment_ip']; $val = $e107->ipDecode($row['comment_ip']);
if (strlen($val) == 8) /* if (strlen($val) == 8) // New decoder should handle this automatically
{ {
$hexip = explode('.', chunk_split($val, 2, '.')); $hexip = explode('.', chunk_split($val, 2, '.'));
$val = hexdec($hexip[0]). '.' . hexdec($hexip[1]) . '.' . hexdec($hexip[2]) . '.' . hexdec($hexip[3]); $val = hexdec($hexip[0]). '.' . hexdec($hexip[1]) . '.' . hexdec($hexip[2]) . '.' . hexdec($hexip[3]);
} } */
break; break;
case 'comment_comment' : case 'comment_comment' :
$val =$tp->text_truncate($row['comment_comment'],100,'...'); // Just display first bit of comment $val =$tp->text_truncate($row['comment_comment'],100,'...'); // Just display first bit of comment

22
e107_admin/banlist.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_admin/banlist.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/banlist.php,v $
| $Revision: 1.10 $ | $Revision: 1.11 $
| $Date: 2008-11-14 06:01:06 $ | $Date: 2008-11-22 12:57:25 $
| $Author: e107coders $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -92,7 +92,11 @@ if (isset($_POST['ban_ip']))
'whedit' - Editing whitelist 'whedit' - Editing whitelist
'whadd' - Adding to whitelist 'whadd' - Adding to whitelist
*/ */
$new_vals = array('banlist_ip' => $_POST['ban_ip']); if ($e107->whatIsThis($new_ban_ip) == 'ip')
{
$new_ban_ip = $e107->IPencode($new_ban_ip); // Normalise numeric IP addresses
}
$new_vals = array('banlist_ip' => $new_ban_ip);
if (isset($_POST['add_ban'])) if (isset($_POST['add_ban']))
{ {
$new_vals['banlist_datestamp'] = time(); $new_vals['banlist_datestamp'] = time();
@@ -400,7 +404,7 @@ switch ($action)
<tr> <tr>
<td style='width:30%' class='forumheader3'><input type='hidden' name='entry_intent' value='{$action}' />".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'> <td style='width:70%' class='forumheader3'>
<input class='tbox' type='text' name='ban_ip' size='40' value='".$banlist_ip."' maxlength='200' />{$rdns_warn} <input class='tbox' type='text' name='ban_ip' size='40' value='".$e107->ipDecode($banlist_ip)."' maxlength='200' />{$rdns_warn}
</td> </td>
</tr>"; </tr>";
@@ -587,7 +591,7 @@ switch ($action)
$val = "<a title='".constant('BANLAN_11'.$banlist_bantype)."'>".constant('BANLAN_10'.$banlist_bantype)."</a>"; $val = "<a title='".constant('BANLAN_11'.$banlist_bantype)."'>".constant('BANLAN_10'.$banlist_bantype)."</a>";
break; break;
case 'ip_reason' : case 'ip_reason' :
$val = $banlist_ip."<br />".$fv.": ".$banlist_reason; $val = $e107->ipDecode($banlist_ip)."<br />".$fv.": ".$banlist_reason;
break; break;
case 'banlist_banexpires' : case 'banlist_banexpires' :
$val = ($banlist_banexpires ? strftime(BAN_TIME_FORMAT,$banlist_banexpires).(($banlist_banexpires < time()) ? ' ('.BANLAN_34.')' : '') $val = ($banlist_banexpires ? strftime(BAN_TIME_FORMAT,$banlist_banexpires).(($banlist_banexpires < time()) ? ' ('.BANLAN_34.')' : '')
@@ -596,7 +600,7 @@ switch ($action)
case 'ban_options' : case 'ban_options' :
$val = "<a href='".e_SELF."?{$edit_action}-{$banlist_ip}'><img src='".$images_path."edit_16.png' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:0px' /></a> $val = "<a href='".e_SELF."?{$edit_action}-{$banlist_ip}'><img src='".$images_path."edit_16.png' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:0px' /></a>
<input name='delete_ban_entry' type='image' src='".$images_path."delete_16.png' alt='".LAN_DELETE."' title='".LAN_DELETE."' style='border:0px' <input name='delete_ban_entry' type='image' src='".$images_path."delete_16.png' alt='".LAN_DELETE."' title='".LAN_DELETE."' style='border:0px'
onclick=\" var r = jsconfirm('".$tp->toJS(LAN_CONFIRMDEL." [".$banlist_ip."]")."'); onclick=\" var r = jsconfirm('".$tp->toJS(LAN_CONFIRMDEL." [".$e107->ipDecode($banlist_ip)."]")."');
if (r) { document.getElementById('ban_form').action='".e_SELF."?{$del_action}-{$banlist_ip}'; } return r; \" />"; if (r) { document.getElementById('ban_form').action='".e_SELF."?{$del_action}-{$banlist_ip}'; } return r; \" />";
break; break;
case 'banlist_notes' : case 'banlist_notes' :
@@ -669,7 +673,7 @@ function parse_date($instr)
// Return a message // Return a message
function process_csv($filename, $override_imports, $override_expiry, $separator = ',', $quote = '"') function process_csv($filename, $override_imports, $override_expiry, $separator = ',', $quote = '"')
{ {
global $sql, $pref; global $sql, $pref, $e107;
// echo "Read CSV: {$filename} separator: {$separator}, quote: {$quote} override imports: {$override_imports} override expiry: {$override_expiry}<br />"; // echo "Read CSV: {$filename} separator: {$separator}, quote: {$quote} override imports: {$override_imports} override expiry: {$override_expiry}<br />";
// Renumber imported bans // Renumber imported bans
if ($override_imports) $sql->db_Update('banlist', "`banlist_bantype`=".BAN_TYPE_TEMPORARY." WHERE `banlist_bantype` = ".BAN_TYPE_IMPORTED); if ($override_imports) $sql->db_Update('banlist', "`banlist_bantype`=".BAN_TYPE_TEMPORARY." WHERE `banlist_bantype` = ".BAN_TYPE_IMPORTED);
@@ -703,7 +707,7 @@ function process_csv($filename, $override_imports, $override_expiry, $separator
switch ($field_num) switch ($field_num)
{ {
case 1 : // IP address case 1 : // IP address
$field_list['banlist_ip'] = $f; $field_list['banlist_ip'] = $e107->ipEncode($f);
break; break;
case 2 : // Original date of ban case 2 : // Original date of ban
$field_list['banlist_datestamp'] = parse_date($f); $field_list['banlist_datestamp'] = parse_date($f);

8
e107_files/shortcode/batch/comment_shortcodes.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/comment_shortcodes.php,v $ | $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/comment_shortcodes.php,v $
| $Revision: 1.6 $ | $Revision: 1.7 $
| $Date: 2008-05-25 08:26:11 $ | $Date: 2008-11-22 12:57:35 $
| $Author: e107steved $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -126,9 +126,9 @@ return $RATING;
SC_END SC_END
SC_BEGIN IPADDRESS SC_BEGIN IPADDRESS
global $IPADDRESS, $comrow; global $IPADDRESS, $comrow, $e107;
//require_once(e_HANDLER."encrypt_handler.php"); //require_once(e_HANDLER."encrypt_handler.php");
return (ADMIN ? "<a href='".e_BASE."userposts.php?0.comments.".$comrow['user_id']."'>".COMLAN_330." ".$comrow['comment_ip']."</a>" : ""); return (ADMIN ? "<a href='".e_BASE."userposts.php?0.comments.".$comrow['user_id']."'>".COMLAN_330." ".$e107->ipDecode($comrow['comment_ip'])."</a>" : "");
SC_END SC_END
SC_BEGIN LEVEL SC_BEGIN LEVEL

10
e107_handlers/comment_class.php
View File

@@ -12,8 +12,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/comment_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/comment_class.php,v $
| $Revision: 1.15 $ | $Revision: 1.16 $
| $Date: 2008-10-22 21:31:08 $ | $Date: 2008-11-22 12:57:25 $
| $Author: e107steved $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -187,7 +187,7 @@ class comment {
//addrating : boolean, to show rating system in rendered comment //addrating : boolean, to show rating system in rendered comment
global $sql, $sc_style, $comment_shortcodes, $COMMENTSTYLE, $rater, $gen, $imode; global $sql, $sc_style, $comment_shortcodes, $COMMENTSTYLE, $rater, $gen, $imode;
global $pref, $comrow, $tp, $NEWIMAGE, $USERNAME, $RATING, $datestamp; global $pref, $comrow, $tp, $NEWIMAGE, $USERNAME, $RATING, $datestamp;
global $thisaction, $thistable, $thisid; global $thisaction, $thistable, $thisid, $e107;
if(isset($pref['comments_disabled']) && $pref['comments_disabled'] == TRUE) if(isset($pref['comments_disabled']) && $pref['comments_disabled'] == TRUE)
{ {
@@ -221,7 +221,7 @@ class comment {
$unblock = "[<a href='".e_ADMIN_ABS."comment.php?unblock-".$comrow['comment_id']."-$url-".$comrow['comment_item_id']."'>".COMLAN_1."</a>] "; $unblock = "[<a href='".e_ADMIN_ABS."comment.php?unblock-".$comrow['comment_id']."-$url-".$comrow['comment_item_id']."'>".COMLAN_1."</a>] ";
$block = "[<a href='".e_ADMIN_ABS."comment.php?block-".$comrow['comment_id']."-$url-".$comrow['comment_item_id']."'>".COMLAN_2."</a>] "; $block = "[<a href='".e_ADMIN_ABS."comment.php?block-".$comrow['comment_id']."-$url-".$comrow['comment_item_id']."'>".COMLAN_2."</a>] ";
$delete = "[<a href='".e_ADMIN_ABS."comment.php?delete-".$comrow['comment_id']."-$url-".$comrow['comment_item_id']."'>".COMLAN_3."</a>] "; $delete = "[<a href='".e_ADMIN_ABS."comment.php?delete-".$comrow['comment_id']."-$url-".$comrow['comment_item_id']."'>".COMLAN_3."</a>] ";
$userinfo = "[<a href='".e_ADMIN_ABS."userinfo.php?".$comrow['comment_ip']."'>".COMLAN_4."</a>]"; $userinfo = "[<a href='".e_ADMIN_ABS."userinfo.php?".$e107->ipDecode($comrow['comment_ip'])."'>".COMLAN_4."</a>]";
if (!$COMMENTSTYLE) if (!$COMMENTSTYLE)
{ {
@@ -390,7 +390,7 @@ class comment {
if (!defined("emessage")) if (!defined("emessage"))
{ {
$ip = $e107->getip(); // Store IP 'in the raw' - could be IPv4 or IPv6 $ip = $e107->getip(); // Store IP 'in the raw' - could be IPv4 or IPv6. Its always returned in a normalised form
$_t = time(); $_t = time();
if($editpid) if($editpid)

200
e107_handlers/e107_class.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $
| $Revision: 1.19 $ | $Revision: 1.20 $
| $Date: 2008-10-19 11:35:00 $ | $Date: 2008-11-22 12:57:25 $
| $Author: e107steved $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -203,19 +203,28 @@ class e107
*/ */
function ban() function ban()
{ {
global $sql, $e107, $tp, $pref; global $sql, $e107, $tp, $pref;
$ban_count = $sql->db_Count("banlist"); $ban_count = $sql->db_Count("banlist");
if($ban_count) if($ban_count)
{
$vals = array();
$ip = $this->getip();
if ($ip != 'x.x.x.x')
{ {
$tmp = explode(".",$ip); $vals = array();
$vals[] = $tp -> toDB($_SERVER['REMOTE_ADDR'], true); $ip = $this->getip(); // This will be in normalised IPV6 form
$vals[] = $tmp[0].".".$tmp[1].".".$tmp[2].".*"; if ($ip != 'x.x.x.x')
$vals[] = $tmp[0].".".$tmp[1].".*.*"; {
} $vals[] = $ip; // Always look for exact match
if (strpos($ip,'0000:0000:0000:0000:0000:ffff:') === 0)
{ // It's an IPV4 address
$vals[] = substr($ip,0,-2).'*';
$vals[] = substr($ip,0,-4).'*';
$vals[] = substr($ip,0,-7).'*'; // Knock off colon as well here
}
else
{ // Its an IPV6 address - ban in blocks of 16 bits
$vals[] = substr($ip,0,-4).'*';
$vals[] = substr($ip,0,-9).'*';
$vals[] = substr($ip,0,-14).'*';
}
}
if(varsettrue($pref['enable_rdns'])) if(varsettrue($pref['enable_rdns']))
{ {
@@ -324,33 +333,166 @@ class e107
* Get the current user's IP address * Get the current user's IP address
* *
* @return string * @return string
* returns the address in internal 'normalised' IPV6 format - so most code should continue to work provided the DB Field is big enougn
*/ */
function getip() { function getip()
if(!$this->_ip_cache){ {
if (getenv('HTTP_X_FORWARDED_FOR')) { if(!$this->_ip_cache)
{
if (getenv('HTTP_X_FORWARDED_FOR'))
{
$ip=$_SERVER['REMOTE_ADDR']; $ip=$_SERVER['REMOTE_ADDR'];
if (preg_match("/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", getenv('HTTP_X_FORWARDED_FOR'), $ip3)) { if (preg_match("/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", getenv('HTTP_X_FORWARDED_FOR'), $ip3))
$ip2 = array('#^0\..*#', {
'#^127\..*#', // Local loopbacks $ip2 = array('#^0\..*#',
'#^192\.168\..*#', // RFC1918 - Private Network '#^127\..*#', // Local loopbacks
'#^172\.(?:1[6789]|2\d|3[01])\..*#', // RFC1918 - Private network '#^192\.168\..*#', // RFC1918 - Private Network
'#^10\..*#', // RFC1918 - Private Network '#^172\.(?:1[6789]|2\d|3[01])\..*#', // RFC1918 - Private network
'#^169\.254\..*#', // RFC3330 - Link-local, auto-DHCP '#^10\..*#', // RFC1918 - Private Network
'#^2(?:2[456789]|[345][0-9])\..*#' // Single check for Class D and Class E '#^169\.254\..*#', // RFC3330 - Link-local, auto-DHCP
); '#^2(?:2[456789]|[345][0-9])\..*#' // Single check for Class D and Class E
);
$ip = preg_replace($ip2, $ip, $ip3[1]); $ip = preg_replace($ip2, $ip, $ip3[1]);
} }
} else { }
else
{
$ip = $_SERVER['REMOTE_ADDR']; $ip = $_SERVER['REMOTE_ADDR'];
} }
if ($ip == "") { if ($ip == "")
{
$ip = "x.x.x.x"; $ip = "x.x.x.x";
} }
$this->_ip_cache = $ip; $this->_ip_cache = $this->ipEncode($ip); // Normalise for storage
} }
return $this->_ip_cache; return $this->_ip_cache;
} }
// Encode an IP address to internal representation. Returns string if successful; FALSE on error
// Default separates fields with ':'; set $div='' to produce a 32-char packed hex string
function ipEncode($ip, $div=':')
{
$ret = '';
$divider = '';
if (strstr($ip,':'))
{ // Its IPV6 (could have an IP4 'tail')
if (strstr($ip,'.'))
{ // IPV4 'tail' to deal with
$temp = strrpos($ip,':') +1;
$ip4 = substr($ip,$temp);
$ip = substr($ip,0, $temp).$this->ip4_encode($ip4);
}
// Now 'normalise' the address
$temp = explode(':',$ip);
$s = 8 - count($temp); // One element will of course be the blank
foreach ($temp as $f)
{
if ($f == '')
{
$ret .= $divider.'0000'; // Always put in one set of zeros for the blank
$divider = $div;
if ($s > 0)
{
$ret .= str_repeat($div.'0000',$s);
$s = 0;
}
}
else
{
$ret .= $divider.sprintf('%04x',hexdec($f));
$divider = $div;
}
}
return $ret;
}
if (strstr($ip,'.'))
{ // Its IPV4
$ipa = explode('.', $ip);
$temp = sprintf('%02x%02x%s%02x%02x', $ipa[0], $ipa[1], $div, $ipa[2], $ipa[3]);
return str_repeat('0000'.$div,5).'ffff'.$div.$temp;
}
return FALSE; // Unknown
}
// Takes an encoded IP address - returns a displayable one
// Set $IP4Legacy TRUE to display 'old' (IPv4) addresses in the familiar dotted format
// Should handle most things that can be thrown at it.
function ipDecode($ip, $IP4Legacy = FALSE)
{
if (strstr($ip,'.'))
{
if ($IP4Legacy) return $ip; // Assume its unencoded IPV4
$ipa = explode('.', $ip);
$ip = '0:0:0:0:0:ffff:'.sprintf('%02x%02x:%02x%02x', $ipa[0], $ipa[1], $ipa[2], $ipa[3]);
}
if (strstr($ip,'::')) return $ip; // Assume its a compressed IPV6 address already
if ((strlen($ip) == 8) && !strstr($ip,':'))
{ // Assume a 'legacy' IPV4 encoding
$ip = '0:0:0:0:0:ffff:'.implode(':',str_split($ip,4)); // Turn it into standard IPV6
}
elseif ((strlen($ip) == 32) && !strstr($ip,':'))
{ // Assume a compressed hex IPV6
$ip = implode(':',str_split($ip,4));
}
if (!strstr($ip,':')) return FALSE; // Return on problem - no ':'!
$temp = explode(':',$ip);
$z = 0; // State of the 'zero manager' - 0 = not started, 1 = running, 2 = done
$ret = '';
$zc = 0; // Count zero fields (not always required)
foreach ($temp as $t)
{
$v = hexdec($t);
if (($v != 0) || ($z == 2))
{
if ($z == 1)
{ // Just finished a run of zeros
$z++;
$ret .= ':';
}
if ($ret) $ret .= ':';
$ret .= sprintf('%x',$v); // Drop leading zeros
}
else
{ // Zero field
$z = 1;
$zc++;
}
}
if ($z == 1)
{ // Need to add trailing zeros, or double colon
if ($zc > 1) $ret .= '::'; else $ret .= ':0';
}
if ($IP4Legacy && (substr($ret,0,7) == '::ffff:'))
{
$temp = explode(':',substr($ret,7)); // Should give us two 16-bit hex values
$z = array();
foreach ($temp as $t)
{
$zc = hexdec($t);
$z[] = intval($zc / 256); // intval needed to avoid small rounding error
$z[] = $zc % 256;
}
$ret = implode('.',$z);
}
return $ret;
}
// Given a string which may be IP address, email address etc, tries to work out what it is
function whatIsThis($string)
{
if (strstr($string,'@')) return 'email'; // Email address
if (strstr($string,'http://')) return 'url';
if (strstr($string,'ftp://')) return 'ftp';
$string = strtolower($string);
if (str_replace(' ','',strtr($string,'0123456789abcdef.:*',' ')) == '') // Delete all characters found in ipv4 or ipv6 addresses, plus wildcards
{
return 'ip';
}
return 'unknown';
}
function get_host_name($ip_address) function get_host_name($ip_address)
{ {

6
e107_handlers/online_class.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/online_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/online_class.php,v $
| $Revision: 1.2 $ | $Revision: 1.3 $
| $Date: 2008-01-13 10:51:34 $ | $Date: 2008-11-22 12:57:25 $
| $Author: e107steved $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -111,7 +111,7 @@ class e_online
$row['online_pagecount'] = 1; $row['online_pagecount'] = 1;
} }
if ($row['online_pagecount'] > $online_bancount && ($row['online_ip'] != "127.0.0.1")) 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)' "); // $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)) if ($e107->add_ban(2,"Hit count exceeded ({$row['online_pagecount']} requests within allotted time)",$ip,0))

5
e107_languages/English/admin/help/banlist.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/help/banlist.php,v $ | $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/help/banlist.php,v $
| $Revision: 1.7 $ | $Revision: 1.8 $
| $Date: 2008-06-15 10:05:53 $ | $Date: 2008-11-22 12:57:42 $
| $Author: e107steved $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -63,6 +63,7 @@ Either enter their full IP address or use a wildcard to ban a range of IP addres
<b>Banning by IP address:</b><br /> <b>Banning by IP address:</b><br />
Entering the IP address 123.123.123.123 will stop the user with that address visiting your site.<br /> Entering the IP address 123.123.123.123 will stop the user with that address visiting your site.<br />
Entering the IP address 123.123.123.* will stop anyone in that IP range from visiting your site.<br /><br /> Entering the IP address 123.123.123.* will stop anyone in that IP range from visiting your site.<br /><br />
IPV6 format addresses are also supported, including '::' to represent a block of zero values.<br /><br />
<b>Banning by email address</b><br /> <b>Banning by email address</b><br />
Entering the email address foo@bar.com will stop anyone using that email address from registering as a member on your site.<br /> Entering the email address foo@bar.com will stop anyone using that email address from registering as a member on your site.<br />
Entering the email address *@bar.com will stop anyone using that email domain from registering as a member on your site.<br /><br /> Entering the email address *@bar.com will stop anyone using that email domain from registering as a member on your site.<br /><br />