Replaced $_SERVER['REMOTE_ADDR'] with \Geeklog\IP::getIPAddress()

plugins/polls/functions.inc

@@ -226,7 +226,7 @@ function plugin_deletecomment_polls($cid, $id, $returnBoolean)
             COM_redirect($_CONF['site_url'] . "/polls/index.php?pid=$id&aid=-1");
         }
     } else {
-        COM_errorLog("User {$_USER['username']} (IP: {$_SERVER['REMOTE_ADDR']}) "
+        COM_errorLog("User {$_USER['username']} (IP: " . \Geeklog\IP::getIPAddress() . ") "
             . "tried to illegally delete comment $cid from poll $id");
 
         if ($returnBoolean) {
@@ -803,7 +803,7 @@ function POLLS_pollsave($pid, $aid)
     // This always does an insert so no need to provide key_field and key_value args
     DB_query(
         "INSERT INTO {$_TABLES['pollvoters']} (ipaddress, date, pid) "
-        . "VALUES ('" . DB_escapeString($_SERVER['REMOTE_ADDR']) . "', " . time() . ", '" . DB_escapeString($pid) . "')");
+        . "VALUES ('" . DB_escapeString(\Geeklog\IP::getIPAddress()) . "', " . time() . ", '" . DB_escapeString($pid) . "')");
     $retval .= COM_showMessageText(
             $LANG_POLLS['savedvotemsg'] . ' "'
             . DB_getItem($_TABLES['polltopics'], 'topic', "pid = '" . DB_escapeString($pid) . "'") . '"',
@@ -1027,7 +1027,7 @@ function POLLS_ipAlreadyVoted($pid, $ip = '')
     $retval = false;
 
     if (empty($ip)) {
-        $ip = $_SERVER['REMOTE_ADDR'];
+        $ip = \Geeklog\IP::getIPAddress();
     }
 
     if (DB_count($_TABLES['pollvoters'],

plugins/recaptcha/functions.inc

@@ -635,7 +635,7 @@ function RECAPTCHA_getIP()
     } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
         $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
     } else {
-        $ip = $_SERVER['REMOTE_ADDR'];
+        $ip = \Geeklog\IP::getIPAddress();
     }
 
     return $ip;
@@ -703,7 +703,7 @@ function RECAPTCHA_verify($type, $token)
             $entry = sprintf(
                 RECAPTCHA_str('entry_error', true),
                 $type,
-                $_SERVER['REMOTE_ADDR'],
+                \Geeklog\IP::getIPAddress(),
                 $msg
             );
             $entry = RECAPTCHA_esc($entry);

plugins/spamx/Akismet.Examine.class.php

@@ -62,7 +62,7 @@ public function execute($comment, $permanentLink = null, $commentType = Geeklog\
             if (($answer == PLG_SPAM_FOUND) || ($answer == PLG_SPAM_UNSURE)) {
                 SPAMX_log(
                     $LANG_SX00['foundspam'] . 'Akismet' . $LANG_SX00['foundspam2'] . $this->getUid()
-                    . $LANG_SX00['foundspam3'] . $_SERVER['REMOTE_ADDR']
+                    . $LANG_SX00['foundspam3'] . \Geeklog\IP::getIPAddress()
                 );
             }
         }

plugins/spamx/BannedUsers.Examine.class.php

@@ -71,7 +71,7 @@ public function execute($comment, $permanentLink = null, $commentType = Geeklog\
                 $answer = PLG_SPAM_FOUND; // quit on first positive match
                 SPAMX_log($LANG_SX00['foundspam'] . $val . ' (' . $LANG28[42] . ')' .
                     $LANG_SX00['foundspam2'] . $uid .
-                    $LANG_SX00['foundspam3'] . $_SERVER['REMOTE_ADDR']
+                    $LANG_SX00['foundspam3'] . \Geeklog\IP::getIPAddress()
                 );
                 break;
             }

plugins/spamx/BlackList.Examine.class.php

@@ -73,7 +73,7 @@ public function execute($comment, $permanentLink = null, $commentType = Geeklog\
                 $this->updateStat('Personal', $val);
                 SPAMX_log($LANG_SX00['foundspam'] . $val .
                     $LANG_SX00['foundspam2'] . $uid .
-                    $LANG_SX00['foundspam3'] . $_SERVER['REMOTE_ADDR']);
+                    $LANG_SX00['foundspam3'] . \Geeklog\IP::getIPAddress());
                 break;
             }
         }

plugins/spamx/Header.Examine.class.php

@@ -83,7 +83,7 @@ public function execute($comment, $permanentLink = null, $commentType = Geeklog\
                         SPAMX_log($LANG_SX00['foundspam'] . $entry .
                             $LANG_SX00['foundspam2'] . $uid .
                             $LANG_SX00['foundspam3'] .
-                            $_SERVER['REMOTE_ADDR']
+                            \Geeklog\IP::getIPAddress()
                         );
                         break;
                     }

plugins/spamx/IP.Examine.class.php

@@ -41,7 +41,7 @@ class IP extends BaseCommand
     public function execute($comment, $permanentLink = null, $commentType = Geeklog\Akismet::COMMENT_TYPE_COMMENT,
                             $commentAuthor = null, $commentAuthorEmail = null, $commentAuthorURL = null)
     {
-        return $this->_process($_SERVER['REMOTE_ADDR']);
+        return $this->_process(\Geeklog\IP::getIPAddress());
     }
 
     /**

plugins/spamx/IPofUrl.Examine.class.php

@@ -68,7 +68,7 @@ public function execute($comment, $permanentLink = null, $commentType = Geeklog\
                     $this->updateStat('IPofUrl', $val);
                     SPAMX_log($LANG_SX00['foundspam'] . $urls[2][$i] .
                         $LANG_SX00['foundspam2'] . $uid .
-                        $LANG_SX00['foundspam3'] . $_SERVER['REMOTE_ADDR']
+                        $LANG_SX00['foundspam3'] . \Geeklog\IP::getIPAddress()
                     );
                     break;
                 }

plugins/spamx/MailAdmin.Action.class.php

@@ -48,7 +48,7 @@ public function execute($comment, $permanentLink = null, $commentType = Geeklog\
     {
         global $_CONF, $LANG_SX00, $_SPX_CONF;
 
-        $uid = $this->getUid() . '@' . $_SERVER['REMOTE_ADDR'];
+        $uid = $this->getUid() . '@' . \Geeklog\IP::getIPAddress();
         $msg = sprintf($LANG_SX00['emailmsg'],
             $_CONF['site_name'], $uid, $comment);
 

plugins/spamx/SFS.Examine.class.php

@@ -46,7 +46,7 @@ public function execute($comment, $permanentLink = null, $commentType = Geeklog\
             $answer = PLG_SPAM_FOUND;
             SPAMX_log($LANG_SX00['foundspam'] . 'Stop Forum Spam (SFS)' .
                 $LANG_SX00['foundspam2'] . $uid .
-                $LANG_SX00['foundspam3'] . $_SERVER['REMOTE_ADDR']
+                $LANG_SX00['foundspam3'] . \Geeklog\IP::getIPAddress()
             );
         }
 

plugins/spamx/SFS.Misc.class.php

@@ -50,7 +50,7 @@ class SFS extends BaseCommand
     public function execute($comment, $permanentLink = null, $commentType = Geeklog\Akismet::COMMENT_TYPE_COMMENT,
                             $commentAuthor = null, $commentAuthorEmail = null, $commentAuthorURL = null)
     {
-        $this->result = $this->_process($commentAuthorEmail, $_SERVER['REMOTE_ADDR']);
+        $this->result = $this->_process($commentAuthorEmail, \Geeklog\IP::getIPAddress());
 
         return $this->result;
     }

plugins/spamx/SFSbase.class.php

@@ -61,7 +61,7 @@ function CheckForSpam($post)
         }
 
 
-        $ip = $_SERVER['REMOTE_ADDR'];
+        $ip = \Geeklog\IP::getIPAddress();
         $query = "http://api.stopforumspam.org/api?f=serial&ip=$ip";
 
         $req = new HTTP_Request2(

plugins/spamx/SNL.Examine.class.php

@@ -48,7 +48,7 @@ public function execute($comment, $permanentLink = null, $commentType = Geeklog\
             $answer = PLG_SPAM_FOUND;
             SPAMX_log($LANG_SX00['foundspam'] . 'Spam Number of Links (SNL)' .
                 $LANG_SX00['foundspam2'] . $uid .
-                $LANG_SX00['foundspam3'] . $_SERVER['REMOTE_ADDR']
+                $LANG_SX00['foundspam3'] . \Geeklog\IP::getIPAddress()
             );
         }
 

plugins/staticpages/functions.inc

@@ -322,7 +322,7 @@ function plugin_deletecomment_staticpages($cid, $id, $returnBoolean)
             COM_redirect($url);
         }
     } else {
-        COM_errorLog("User {$_USER['username']} (IP: {$_SERVER['REMOTE_ADDR']}) "
+        COM_errorLog("User {$_USER['username']} (IP: " . \Geeklog\IP::getIPAddress() . ") "
             . "tried to illegally delete comment $cid from staticpage $id");
 
         if ($returnBoolean) {

public_html/admin/plugins/recaptcha/index.php

@@ -35,7 +35,7 @@
 // Only let admin users access this page
 if (!SEC_hasRights('recaptcha.edit')) {
     // Someone is trying to illegally access this page
-    COM_errorLog("Someone has tried to illegally access the recaptcha Admin page.  User id: {$_USER['uid']}, Username: {$_USER['username']}, IP: {$_SERVER['REMOTE_ADDR']}", 1);
+    COM_errorLog("Someone has tried to illegally access the recaptcha Admin page.  User id: {$_USER['uid']}, Username: {$_USER['username']}, IP: " . \Geeklog\IP::getIPAddress(), 1);
 
     $content = COM_startBlock(RECAPTCHA_esc($LANG_ACCESS['accessdenied']))
         . RECAPTCHA_esc($LANG_ACCESS['plugin_access_denied_msg'])

public_html/admin/plugins/spamx/index.php

@@ -60,7 +60,7 @@
     // Someone is trying to illegally access this page
     $display .= COM_showMessageText($MESSAGE[29], $MESSAGE[30]);
     $display = COM_createHTMLDocument($display, array('pagetitle' => $MESSAGE[30]));
-    COM_accessLog("Someone has tried to illegally access the Spam-X Admin page.  User id: {$_USER['uid']}, Username: {$_USER['username']}, IP: {$_SERVER['REMOTE_ADDR']}", 1);
+    COM_accessLog("Someone has tried to illegally access the Spam-X Admin page.  User id: {$_USER['uid']}, Username: {$_USER['username']}, IP: " . \Geeklog\IP::getIPAddress(), 1);
     COM_output($display);
     exit;
 }

public_html/lib-common.php

@@ -2332,7 +2332,7 @@ function COM_errorLog($logEntry, $actionId = '')
     if (!empty($logEntry)) {
         $logEntry = str_replace(array('<?', '?>'), array('(@', '@)'), $logEntry);
         $timestamp = @strftime('%c');
-        $remoteAddress = $_SERVER['REMOTE_ADDR'];
+        $remoteAddress = \Geeklog\IP::getIPAddress();
 
         if (!isset($_CONF['path_layout']) && (($actionId == 2) || empty($actionId))) {
             $actionId = 1;
@@ -6133,7 +6133,7 @@ function COM_checkSpeedlimit($type = 'submit', $max = 1, $property = '')
     }
 
     if (empty($property)) {
-        $property = $_SERVER['REMOTE_ADDR'];
+        $property = \Geeklog\IP::getIPAddress();
     }
     $property = DB_escapeString($property);
 
@@ -6594,7 +6594,7 @@ function COM_applyBasicFilter($parameter, $isNumeric = false)
 
     if ($log_manipulation) {
         if (strcmp($p, $parameter) != 0) {
-            COM_errorLog("Filter applied: >> {$parameter} << filtered to {$p} [IP {$_SERVER['REMOTE_ADDR']}]", 1);
+            COM_errorLog("Filter applied: >> {$parameter} << filtered to {$p} [IP " . \Geeklog\IP::getIPAddress() . "]", 1);
         }
     }
 
@@ -8067,9 +8067,9 @@ function COM_handle404($alternate_url = '')
     // Add file log stuff
     if (isset($_CONF['404_log']) && $_CONF['404_log']) {
         if (empty($_USER['uid'])) {
-            $byUser = 'anon@' . $_SERVER['REMOTE_ADDR'];
+            $byUser = 'anon@' . \Geeklog\IP::getIPAddress();
         } else {
-            $byUser = $_USER['uid'] . '@' . $_SERVER['REMOTE_ADDR'];
+            $byUser = $_USER['uid'] . '@' . \Geeklog\IP::getIPAddress();
         }
 
         $logEntry = "404 Error generated by {$byUser} for URL: {$url}";

public_html/links/index.php

@@ -444,7 +444,7 @@ function prepare_link_item($A, &$template)
 	$msg = $LANG_LINKS[119] . LB . LB . "{$title}, {$url}" . LB . LB
             . $LANG_LINKS[120] . LB . $editurl . LB . LB
             . $LANG_LINKS[121] . $_USER['username'] . ', IP: '
-            . $_SERVER['REMOTE_ADDR'];
+            . \Geeklog\IP::getIPAddress();
         COM_mail($_CONF['site_mail'], $LANG_LINKS[118], $msg);
         $message = array($LANG_LINKS[123], $LANG_LINKS[122]);
     }

public_html/pingback.php

@@ -70,7 +70,7 @@ function PNB_handlePingback($id, $type, $url, $oururl)
 
     // handle pingbacks to articles on our own site
     $skip_speedlimit = false;
-    if ($_SERVER['REMOTE_ADDR'] == $_SERVER['SERVER_ADDR']) {
+    if (\Geeklog\IP::getIPAddress() === $_SERVER['SERVER_ADDR']) {
         if (!isset($_CONF['pingback_self'])) {
             $_CONF['pingback_self'] = 0; // default: skip self-pingbacks
         }
@@ -95,7 +95,7 @@ function PNB_handlePingback($id, $type, $url, $oururl)
     // update speed limit in any case
     COM_updateSpeedlimit('pingback');
 
-    if ($_SERVER['REMOTE_ADDR'] != $_SERVER['SERVER_ADDR']) {
+    if (\Geeklog\IP::getIPAddress() !== $_SERVER['SERVER_ADDR']) {
         if ($_CONF['check_trackback_link'] & 4) {
             $parts = parse_url($url);
             if (empty($parts['host'])) {
@@ -104,7 +104,7 @@ function PNB_handlePingback($id, $type, $url, $oururl)
                 return new XML_RPC_Response(0, 33, $PNB_ERROR['uri_invalid']);
             } else {
                 $ip = gethostbyname($parts['host']);
-                if ($ip != $_SERVER['REMOTE_ADDR']) {
+                if ($ip !== \Geeklog\IP::getIPAddress()) {
                     TRB_logRejected('Pingback: IP address mismatch', $url);
 
                     return new XML_RPC_Response(0, 49, $PNB_ERROR['spam']);

system/classes/IP.php

@@ -64,7 +64,7 @@ public static function init($ipAddressTable = 'gl_ip_addresses', $anonymizationP
             self::$anonymizationPolicy = $anonymizationPolicy;
 
             self::$ipAddress = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '127.0.01';
-            $_SERVER['REMOTE_ADDR'] = '0.0.0.0';
+//            $_SERVER['REMOTE_ADDR'] = '0.0.0.0';  // some time in the future
             self::$isInitialized = true;
         }
     }

system/classes/Mail.php

@@ -173,15 +173,15 @@ public static function send($to, $subject, $body, $from = '', $html = false, $pr
         $headers = $message->getHeaders();
         $headers->addTextHeader('X-Mailer', 'Geeklog ' . VERSION);
 
-        if (!empty($_SERVER['REMOTE_ADDR']) && !empty($_SERVER['SERVER_ADDR']) &&
-            ($_SERVER['REMOTE_ADDR'] != $_SERVER['SERVER_ADDR'])
+        if (!empty(IP::getIPAddress()) && !empty($_SERVER['SERVER_ADDR']) &&
+            (IP::getIPAddress() !== $_SERVER['SERVER_ADDR'])
         ) {
             $url = COM_getCurrentURL();
 
             if (substr($url, 0, strlen($_CONF['site_admin_url']))
                 != $_CONF['site_admin_url']
             ) {
-                $headers->addTextHeader('X-Originating-IP', $_SERVER['REMOTE_ADDR']);
+                $headers->addTextHeader('X-Originating-IP', \Geeklog\IP::getIPAddress());
             }
         }
 

system/classes/downloader.class.php

@@ -497,8 +497,8 @@ public function downloadFile($fileName)
         // IP address and, if so, verify the user is originating from one of
         // those places
         if ($this->_limitByIP) {
-            if (!in_array($_SERVER['REMOTE_ADDR'], $this->_allowedIPS)) {
-                $this->_addError('The IP, ' . $_SERVER['REMOTE_ADDR'] . ' is not in the list of accepted IP addresses.  Refusing to allow file download(s)');
+            if (!in_array(\Geeklog\IP::getIPAddress(), $this->_allowedIPS)) {
+                $this->_addError('The IP, ' . \Geeklog\IP::getIPAddress() . ' is not in the list of accepted IP addresses.  Refusing to allow file download(s)');
 
                 return false;
             }

system/classes/sanitize.class.php

@@ -222,7 +222,7 @@ private function _applyFilter($parameter, $isnumeric = false)
 
         if ($this->_logmode) {
             if (strcmp($p, $parameter) != 0) {
-                COM_errorLog("Filter applied: >> $parameter << filtered to $p [IP {$_SERVER['REMOTE_ADDR']}]", 1);
+                COM_errorLog("Filter applied: >> $parameter << filtered to $p [IP " . \Geeklog\IP::getIPAddress() . "]", 1);
             }
         }
 

system/classes/upload.class.php

@@ -1211,8 +1211,8 @@ public function uploadFiles()
         // IP address and, if so, verify the poster is originating from one of
         // those places
         if ($this->_limitByIP) {
-            if (!in_array($_SERVER['REMOTE_ADDR'], $this->_allowedIPS)) {
-                $this->_addError('The IP, ' . $_SERVER['REMOTE_ADDR'] . ' is not in the list of '
+            if (!in_array(\Geeklog\IP::getIPAddress(), $this->_allowedIPS)) {
+                $this->_addError('The IP, ' . \Geeklog\IP::getIPAddress() . ' is not in the list of '
                     . 'accepted IP addresses.  Refusing to allow file upload(s)');
 
                 return false;

system/lib-article.php

@@ -1926,7 +1926,7 @@ function plugin_deletecomment_article($cid, $id, $returnBoolean)
             COM_redirect(COM_buildUrl($_CONF['site_url'] . "/article.php?story=$id") . '#comments');
         }
     } else {
-        COM_errorLog("User {$_USER['username']} (IP: {$_SERVER['REMOTE_ADDR']}) "
+        COM_errorLog("User {$_USER['username']} (IP: " . \Geeklog\IP::getIPAddress() . ") "
             . "tried to illegally delete comment $cid from $id");
 
         if ($returnBoolean) {