Changeset 816 for trunk/lib

Timestamp:

Jul 3, 2024 1:26:01 AM (3 months ago)

Author:

anonymous

Message:

Minor fixes

Location:

trunk/lib

Files:

• Logger.inc.php (modified) (1 diff)
• Navigation.inc.php (modified) (1 diff)
• Utilities.inc.php (modified) (1 diff)

trunk/lib/Logger.inc.php

@@ -178 +178 @@
         case LOG_INFO:
         case LOG_DEBUG:
-            $app->logMsg(sprintf('%s (%s)', (string)$message, getDump($context)), LOG_CRIT, __FILE__, __LINE__);
+            $app->logMsg(sprintf('%s (%s)', (string)$message, getDump($context)), $level, __FILE__, __LINE__);
             break;
 

trunk/lib/Navigation.inc.php

@@ -440 +440 @@
         }
 
+        if (empty($test_uri)) {
+            return $false_return;
+        }
+
         $actual_uri = $include_query ? $_SERVER['REQUEST_URI'] : (strstr(getenv('REQUEST_URI'), '?', true) ?: getenv('REQUEST_URI')); // strstr() returns false if '?' is not found, so use a shorthand ternary operator.
         $test_uri = $include_query ? $test_uri : (strstr($test_uri, '?', true) ?: $test_uri); // strstr() returns false if '?' is not found, so use a shorthand ternary operator.

trunk/lib/Utilities.inc.php

@@ -1829 +1829 @@
 {
     $context = stream_context_create(['http' => ['method' => $method]]);
-    $headers = get_headers($url, 1, $context);
+    // Silence warning: PHP Warning:  get_headers() expects at most 2 parameters, 3 given
+    $headers = @get_headers($url, 1, $context);
     $app =& \App::getInstance();
     $app->logMsg(sprintf('HTTP response headers for %s %s: %s', strtoupper($method), $url, getDump($headers, true, SC_DUMP_JSON)), LOG_DEBUG, __FILE__, __LINE__);