From: dongsheng <dongsheng>
Date: Fri, 1 May 2009 03:04:10 +0000 (+0000)
Subject: "MDL-19037, use getremoteaddr to get remote ip address"
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b8aa76c1a4d9ff4ab9e6b78742ed1ade8498c5cb;p=moodle.git

"MDL-19037, use getremoteaddr to get remote ip address"
---

diff --git a/auth/ldap/auth.php b/auth/ldap/auth.php
index 83d45c2457..cd36ea6bd1 100644
--- a/auth/ldap/auth.php
+++ b/auth/ldap/auth.php
@@ -1807,7 +1807,7 @@ class auth_plugin_ldap extends auth_plugin_base {
            && !empty($this->config->ntlmsso_subnet)      // have a subnet to test for
            && empty($_GET['authldap_skipntlmsso'])       // haven't failed it yet
            && (isguestuser() || !isloggedin())           // guestuser or not-logged-in users
-            && address_in_subnet($_SERVER['REMOTE_ADDR'], $this->config->ntlmsso_subnet)) {
+            && address_in_subnet(getremoteaddr(), $this->config->ntlmsso_subnet)) {
 
             // First, let's remember where we were trying to get to before we got here
             if (empty($SESSION->wantsurl)) {
diff --git a/lib/form/recaptcha.php b/lib/form/recaptcha.php
index a1ad0ae9ce..3b509f3266 100644
--- a/lib/form/recaptcha.php
+++ b/lib/form/recaptcha.php
@@ -129,7 +129,7 @@ class MoodleQuickForm_recaptcha extends HTML_QuickForm_input {
         global $CFG;
         require_once $CFG->libdir . '/recaptchalib.php';
         $response = recaptcha_check_answer($CFG->recaptchaprivatekey,
-                                           $_SERVER['REMOTE_ADDR'],
+                                           getremoteaddr(),
                                            $challenge_field,
                                            $response_field,
                                            $this->_https);
diff --git a/mod/hotpot/view.php b/mod/hotpot/view.php
index 2136d272fd..49033d6818 100644
--- a/mod/hotpot/view.php
+++ b/mod/hotpot/view.php
@@ -58,7 +58,7 @@
         if (!hotpot_is_visible($cm)) {
             $error = get_string("activityiscurrentlyhidden");
         // check network address
-        } else if ($hotpot->subnet && !address_in_subnet($_SERVER['REMOTE_ADDR'], $hotpot->subnet)) {
+        } else if ($hotpot->subnet && !address_in_subnet(getremoteaddr(), $hotpot->subnet)) {
             $error = get_string("subneterror", "quiz");
         // check number of attempts
         } else if ($hotpot->attempts && $hotpot->attempts <= $DB->count_records_select('hotpot_attempts', 'hotpot=? AND userid=?', array($hotpot->id, $USER->id), 'COUNT(DISTINCT clickreportid)')) { 
diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
index d2af53306b..30eb00554a 100644
--- a/mod/resource/type/file/resource.class.php
+++ b/mod/resource/type/file/resource.class.php
@@ -735,7 +735,7 @@ class resource_file extends resource_base {
                 return extern_server_file($this->resource->reference);
             }
         }
-        return md5($_SERVER['REMOTE_ADDR'].$CFG->resource_secretphrase);
+        return md5(getremoteaddr().$CFG->resource_secretphrase);
     }
 
     function setup_preprocessing(&$defaults){
diff --git a/mod/resource/type/repository/resource.class.php b/mod/resource/type/repository/resource.class.php
index 697f0993a0..e23d80e52b 100644
--- a/mod/resource/type/repository/resource.class.php
+++ b/mod/resource/type/repository/resource.class.php
@@ -497,7 +497,7 @@ function set_encrypted_parameter() {
             return extern_server_file($this->resource->reference);
         }
     }
-    return md5($_SERVER['REMOTE_ADDR'].$CFG->resource_secretphrase);
+    return md5(getremoteaddr().$CFG->resource_secretphrase);
 }