From 94b8568628e323334b63e873dda21a44e434b2d6 Mon Sep 17 00:00:00 2001 From: dongsheng Date: Thu, 11 Dec 2008 05:18:17 +0000 Subject: [PATCH] "MDL-16954, get rid of remote_addr notice on cli, set ip = 0.0.0.0 in mdl_log table when accessed from cli, merged from 1.9" --- lib/datalib.php | 3 +++ lib/moodlelib.php | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/datalib.php b/lib/datalib.php index 272aa5bcdc..f3cddee115 100644 --- a/lib/datalib.php +++ b/lib/datalib.php @@ -1895,6 +1895,9 @@ 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; diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 15e00037de..3d16c9c4fc 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -7439,7 +7439,11 @@ function getremoteaddr() { return cleanremoteaddr($_SERVER['HTTP_X_FORWARDED_FOR']); } } - return cleanremoteaddr($_SERVER['REMOTE_ADDR']); + if (!empty($_SERVER['REMOTE_ADDR'])) { + return cleanremoteaddr($_SERVER['REMOTE_ADDR']); + } else { + return null; + } } /** -- 2.39.5