L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated formatting in getremoteaddr, and made add_to_log use it

Browse Source
This commit is contained in:
moodler
2005-04-01 07:40:07 +00:00
parent 5b2ae5848c
commit fcaff7ffcd
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/datalib.php
+3 -1
View File
@@ -2627,7 +2627,7 @@ function instance_is_visible($moduletype, $module) {
*/
function add_to_log($courseid, $module, $action, $url='', $info='', $cm=0, $user=0) {
global $db, $CFG, $USER, $REMOTE_ADDR;
global $db, $CFG, $USER;
if ($cm === '') { // postgres won't translate empty string to its default
$cm = 0;
@@ -2642,6 +2642,8 @@ function add_to_log($courseid, $module, $action, $url='', $info='', $cm=0, $user
$userid = empty($USER->id) ? '0' : $USER->id;
}
$REMOTE_ADDR = getremoteaddr();
$timenow = time();
$info = addslashes($info);
$url = html_entity_decode($url); // for php < 4.3.0 this is defined in moodlelib.php
lib/moodlelib.php
+10 -5
View File
@@ -5535,11 +5535,16 @@ function unzip_show_status ($list,$removepath) {
* @return string The remote IP address
*/
function getremoteaddr() {
if (!empty($_SERVER['HTTP_CLIENT_IP'])) $ip = $_SERVER['HTTP_CLIENT_IP'];
else if(!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
else if(!empty($_SERVER['REMOTE_ADDR'])) $ip = $_SERVER['REMOTE_ADDR'];
else $ip = false; //just in case
return $ip;
if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
return $_SERVER['HTTP_CLIENT_IP'];
}
if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
return $_SERVER['HTTP_X_FORWARDED_FOR'];
}
if (!empty($_SERVER['REMOTE_ADDR'])) {
return $_SERVER['REMOTE_ADDR'];
}
return '';
}
/**