Changeset 290 for trunk/lib

Timestamp:

Nov 26, 2007 11:30:12 PM (16 years ago)

Author:

quinn

Message:

Fixed getRemoteAddr() to return only one value of a comma-delimited list.

Location:

trunk/lib

Files:

• TemplateGlue.inc.php (modified) (1 diff)
• Utilities.inc.php (modified) (1 diff)

trunk/lib/TemplateGlue.inc.php

@@ -73 +73 @@
     $row = mysql_fetch_row($qid);
     if (preg_match('/^enum|^set/i', $row[1]) && preg_match_all("/'([^']*)'/", $row[1], $enum)) {
+        natsort($enum[1]);
         return $enum[1];
     } else {

trunk/lib/Utilities.inc.php

@@ -849 +849 @@
 {
     $ip = getenv('HTTP_CLIENT_IP');
-    if (empty($ip) || $ip == 'unknown' || $ip == 'localhost' || $ip == '127.0.0.1') {
+    if (in_array($ip, array('', 'unknown', 'localhost', '127.0.0.1'))) {
         $ip = getenv('HTTP_X_FORWARDED_FOR');
-        if (empty($ip) || $ip == 'unknown' || $ip == 'localhost' || $ip == '127.0.0.1') {
+        if (mb_strpos($ip, ',') !== false) {
+            // If HTTP_X_FORWARDED_FOR returns a comma-delimited list of IPs then return the first one (assuming the first is the original).
+            $ips = explode(',', $ip, 2);
+            $ip = $ips[0];
+        }
+        if (in_array($ip, array('', 'unknown', 'localhost', '127.0.0.1'))) {
             $ip = getenv('REMOTE_ADDR');
         }