"MDL-16954, get rid of remote_addr notice on cli, set ip = 0.0.0.0 in mdl_log table...

diff --git a/lib/datalib.php b/lib/datalib.php
index 272aa5bcdc0301a5b0246994934d28a1676a2575..f3cddee1158869f7fc462964a186880efbf461a4 100644 (file)
--- 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 15e00037ded7114ff705ad28784f23a5d7fe0a9c..3d16c9c4fcc7cd87a79235c76d1e5802b7dd1090 100644 (file)
--- 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;
+    }
 }
 
 /**