mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

MDL-19628 getremoteaddr() now normally returns 0.0.0.0, which is good for logs and so on. It can be made to return null when that is required, by a new parameter.

Browse Source
This commit is contained in:
Martin Dougiamas 2010-05-20 02:36:20 +00:00
parent e1eea055e5
commit 765a1d4ba8
4 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/datalib.php
View File

@ -2007,9 +2007,6 @@ function add_to_log($courseid, $module, $action, $url='', $info='', $cm=0, $user
}
$REMOTE_ADDR = getremoteaddr();
if (empty($REMOTE_ADDR)) {
$REMOTE_ADDR = '0.0.0.0';
}
$timenow = time();
$info = $info;

23
lib/moodlelib.php
View File

@ -2526,8 +2526,8 @@ function require_user_key_login($script, $instance=null) {
}
if ($key->iprestriction) {
$remoteaddr = getremoteaddr();
if ($remoteaddr == '' or !address_in_subnet($remoteaddr, $key->iprestriction)) {
$remoteaddr = getremoteaddr(null);
if (empty($remoteaddr) or !address_in_subnet($remoteaddr, $key->iprestriction)) {
print_error('ipmismatch');
}
}
@ -8552,6 +8552,9 @@ function make_unique_id_code($extra='') {
*/
function address_in_subnet($addr, $subnetstr) {
if ($addr == '0.0.0.0') {
return false;
}
$subnets = explode(',', $subnetstr);
$found = false;
$addr = trim($addr);
@ -8813,7 +8816,7 @@ function cleardoubleslashes ($path) {
*/
function remoteip_in_list($list){
$inlist = false;
$client_ip = getremoteaddr();
$client_ip = getremoteaddr(null);
if(!$client_ip){
// ensure access on cli
@ -8835,9 +8838,10 @@ function remoteip_in_list($list){
* Returns most reliable client address
*
* @global object
* @param string $default If an address can't be determined, then return this
* @return string The remote IP address
*/
function getremoteaddr() {
function getremoteaddr($default='0.0.0.0') {
global $CFG;
if (empty($CFG->getremoteaddrconf)) {
@ -8849,18 +8853,21 @@ function getremoteaddr() {
}
if (!($variablestoskip & GETREMOTEADDR_SKIP_HTTP_CLIENT_IP)) {
if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
return cleanremoteaddr($_SERVER['HTTP_CLIENT_IP']);
$address = cleanremoteaddr($_SERVER['HTTP_CLIENT_IP']);
return $address ? $address : $default;
}
}
if (!($variablestoskip & GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR)) {
if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
return cleanremoteaddr($_SERVER['HTTP_X_FORWARDED_FOR']);
$address = cleanremoteaddr($_SERVER['HTTP_X_FORWARDED_FOR']);
return $address ? $address : $default;
}
}
if (!empty($_SERVER['REMOTE_ADDR'])) {
return cleanremoteaddr($_SERVER['REMOTE_ADDR']);
$address = cleanremoteaddr($_SERVER['REMOTE_ADDR']);
return $address ? $address : $default;
} else {
return null;
return $default;
}
}

6
mod/chat/lib.php
View File

@ -601,9 +601,6 @@ function chat_login_user($chatid, $version, $groupid, $course) {
// or provide a dummy value for the db
if (empty($chatuser->ip)) {
$chatuser->ip = getremoteaddr();
if (empty($chatuser->ip)) {
$chatuser->ip = '';
}
}
if (($chatuser->course != $course->id) or ($chatuser->userid != $USER->id)) {
@ -628,9 +625,6 @@ function chat_login_user($chatid, $version, $groupid, $course) {
// or provide a dummy value for the db
if (empty($chatuser->ip)) {
$chatuser->ip = getremoteaddr();
if (empty($chatuser->ip)) {
$chatuser->ip = '';
}
}

2
mod/quiz/simpletest/testaccessrules.php
View File

@ -50,7 +50,7 @@ class simple_rules_test extends UnitTestCase {
// Test the allowed case by getting the user's IP address. However, this
// does not always work, for example using the mac install package on my laptop.
$quiz->subnet = getremoteaddr();
$quiz->subnet = getremoteaddr(null);
if (!empty($quiz->subnet)) {
$quiz->questions = '';
$quizobj = new quiz($quiz, $cm, null);