extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix to get IP-ranges working

Browse Source
This commit is contained in:
Ralf Becker 2004-05-04 09:51:17 +00:00
parent 257b69a6fb
commit 3b632d36c7
1 changed files with 24 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
phpgwapi/inc/class.setup.inc.php
View File

@ -283,60 +283,37 @@
function checkip($remoteip='') function checkip($remoteip='')
{ {
$allowed_ips = split(',',$GLOBALS['phpgw_info']['server']['setup_acl']); //echo "<p>setup::checkip($remoteip) against setup_acl='".$GLOBALS['phpgw_info']['server']['setup_acl']."'</p>\n";
if(!empty($GLOBALS['phpgw_info']['server']['setup_acl']) && is_array($allowed_ips) && count($allowed_ips) > 0) $allowed_ips = explode(',',$GLOBALS['phpgw_info']['server']['setup_acl']);
if(empty($GLOBALS['phpgw_info']['server']['setup_acl']) || !is_array($allowed_ips))
{ {
$foundip = False; return True; // no test
foreach($allowed_ips as $value) }
$remotes = explode('.',$remoteip);
foreach($allowed_ips as $value)
{
if (!preg_match('/^[0-9.]+$/',$value))
{ {
if (!preg_match('/^[0-9.]$/',$value)) $value = gethostbyname($was=$value); // resolve domain-name, eg. a dyndns account
//echo "resolving '$was' to '$value'<br>\n";
}
$values = explode('.',$value);
for($i = 0; $i < count($values); ++$i)
{
if ((int) $values[$i] != (int) $remotes[$i])
{ {
$value = gethostbyname($value); // resolve domain-name, eg. a dyndns account break;
}
$test = split("\.",$value);
if(count($test) < 3)
{
$value .= ".0.0";
$tmp = split("\.",$remoteip);
$tmp[2] = 0;
$tmp[3] = 0;
$testremoteip = join('.',$tmp);
}
elseif(count($test) < 4)
{
$value .= ".0";
$tmp = split("\.",$remoteip);
$tmp[3] = 0;
$testremoteip = join('.',$tmp);
}
elseif(count($test) == 4 &&
(int)$test[3] == 0)
{
$tmp = split("\.",$remoteip);
$tmp[3] = 0;
$testremoteip = join('.',$tmp);
}
else
{
$testremoteip = $remoteip;
}
//echo '<br>testing: ' . $testremoteip . ' compared to ' . $value;
if($testremoteip == $value)
{
//echo ' - PASSED!';
$foundip = True;
} }
} }
if(!$foundip) if ($i == count($values))
{ {
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = ''; return True; // match
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = lang('Invalid IP address');
return False;
} }
} }
return True; $GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = '';
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = lang('Invalid IP address');
return False;
} }
/*! /*!
@ -350,7 +327,7 @@
{ {
return False; return False;
} }
$version = str_replace('pre','.',$versionstring); $version = str_replace('pre','.',$versionstring);
$varray = explode('.',$version); $varray = explode('.',$version);
$major = implode('.',array($varray[0],$varray[1],$varray[2])); $major = implode('.',array($varray[0],$varray[1],$varray[2]));