better checks in ip listing

[jirafeau_project.git] / lib / functions.php

diff --git a/lib/functions.php b/lib/functions.php
index 83fdaf1a6ec8d84d51b0008eec4f3dedd66e6b58..aaa0daf4ff409b23cb306805f89b5f3272a47395 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -1121,6 +1121,8 @@ get_ip_list_http_forwarded()
     if (!empty ($_SERVER['HTTP_X_FORWARDED_FOR']))
     {
         $l = explode (',', $_SERVER['HTTP_X_FORWARDED_FOR']);
     if (!empty ($_SERVER['HTTP_X_FORWARDED_FOR']))
     {
         $l = explode (',', $_SERVER['HTTP_X_FORWARDED_FOR']);

+        if ($l === FALSE)
+            return array();

         foreach ($l as $ip)
             array_push ($ip_list, preg_replace ('/\s+/', '', $ip));
     }
         foreach ($l as $ip)
             array_push ($ip_list, preg_replace ('/\s+/', '', $ip));
     }


@@ -1130,7 +1132,10 @@ get_ip_list_http_forwarded()
         foreach ($l as $ip)
         {
             // Separate IP from port
         foreach ($l as $ip)
         {
             // Separate IP from port

-            $ip = explode (':', $ip)[0];
+            $ipa = explode (':', $ip);
+            if ($ipa === FALSE)
+                continue;
+            $ip = $ipa[0];

             array_push ($ip_list, preg_replace ('/\s+/', '', $ip));
         }
     }
             array_push ($ip_list, preg_replace ('/\s+/', '', $ip));
         }
     }