Fix potential problem with some absent HTTP request headers

Mibew · Dec 3, 2021 · 5a4d3d4 · 5a4d3d4
1 parent cd1e8ad
commit 5a4d3d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/mibew/libs/chat.php b/src/mibew/libs/chat.php
@@ -609,9 +609,11 @@ function visitor_from_request()
  */
 function get_remote_host()
 {
-    $ext_addr = $_SERVER['REMOTE_ADDR'];
+    $ext_addr = isset($_SERVER['REMOTE_ADDR'])
+                ? $_SERVER['REMOTE_ADDR']
+                : '';
     $has_proxy = isset($_SERVER['HTTP_X_FORWARDED_FOR'])
-        && $_SERVER['HTTP_X_FORWARDED_FOR'] != $_SERVER['REMOTE_ADDR'];
+        && $_SERVER['HTTP_X_FORWARDED_FOR'] != $ext_addr;
     if ($has_proxy) {
         $ips = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR'], 2);
         $ext_addr = (count($ips) > 1)

diff --git a/src/mibew/libs/pagination.php b/src/mibew/libs/pagination.php
@@ -36,7 +36,9 @@
  */
 function generate_pagination_link($page, $title)
 {
-    $lnk = $_SERVER['REQUEST_URI'];
+    $lnk = isset($_SERVER['REQUEST_URI'])
+           ? $_SERVER['REQUEST_URI']
+           : '';
     $href = preg_replace("/\?page=\d+\&/", "?", preg_replace("/\&page=\d+/", "", $lnk));
     $href .= strstr($href, "?") ? "&page=$page" : "?page=$page";