detect remote address to be IPv6 and record it

Author: michield

public_html/lists/admin/index.php

@@ -301,6 +301,7 @@ function mb_strtolower($string)
 if (!empty($GLOBALS['require_login'])) {
     //bth 7.1.2015 to support x-forwarded-for
     $remoteAddr = getClientIP();
+    $isIP4 = preg_match('/^([0-9]{1,3}\.){3}[0-9]{1,3}$/', $remoteAddr);
 
     if ($GLOBALS['authenticationplugin']) {
         $GLOBALS['admin_auth'] = $GLOBALS['plugins'][$GLOBALS['authenticationplugin']];
@@ -340,13 +341,13 @@ function mb_strtolower($string)
 
             if ($doLoginCheck) {
               # check if this is a new IP address
-              $knownIP = Sql_Fetch_Row_Query(sprintf('select * from %s where remote_ip4 = "%s" and adminid = %d ',$GLOBALS['tables']['admin_login'],$remoteAddr,$loginresult[0]));
+              $knownIP = Sql_Fetch_Row_Query(sprintf('select * from %s where remote_ip4 = "%s" or remote_ip6 = "%s" and adminid = %d ',$GLOBALS['tables']['admin_login'],$remoteAddr,$remoteAddr,$loginresult[0]));
               if (empty($knownIP[0])) {
                 notifyNewIPLogin($loginresult[0]);
               }
               Sql_Query(sprintf('insert into %s (moment,adminid,remote_ip4,remote_ip6,sessionid,active) 
                 values(%d,%d,"%s","%s","%s",1)',
-                $GLOBALS['tables']['admin_login'],time(),$loginresult[0],$remoteAddr,"",session_id()));
+                $GLOBALS['tables']['admin_login'],time(),$loginresult[0],$isIP4 ? $remoteAddr: '',$isIP4 ? '' : $remoteAddr,session_id()));
             }
         }
         //If passwords are encrypted and a password recovery request was made, send mail to the admin of the given email address.
@@ -401,7 +402,7 @@ function mb_strtolower($string)
     } elseif ($_SESSION['adminloggedin'] && $_SESSION['logindetails']) {
         if ($doLoginCheck) {
           $active = Sql_Fetch_Row_Query(sprintf('select active from %s where adminid = %d and (remote_ip4 = "%s" or remote_ip6 = "%s") and sessionid = "%s"',
-            $GLOBALS['tables']['admin_login'],$_SESSION['logindetails']['id'],$remoteAddr,"",session_id()));
+            $GLOBALS['tables']['admin_login'],$_SESSION['logindetails']['id'],$remoteAddr,$remoteAddr,session_id()));
         } else {
           $active = array(1); ## pretend to be active
         }