Changeset 746 for trunk/lib/Utilities.inc.php

Timestamp:

May 31, 2021 1:51:18 AM (3 years ago)

Author:

anonymous

Message:

Add brackets to avoid ambiguity in return value

File:

• trunk/lib/Utilities.inc.php (modified) (4 diffs)

trunk/lib/Utilities.inc.php

@@ -1627 +1627 @@
     $app =& App::getInstance();
 
-    if (false === $resolved_filename = stream_resolve_include_path($filename)) {
+    if (false === ($resolved_filename = stream_resolve_include_path($filename))) {
         $app->logMsg(sprintf('JSON file "%s" not found in path "%s"', $filename, get_include_path()), LOG_ERR, __FILE__, __LINE__);
         return null;
@@ -1637 +1637 @@
     }
 
-    if (null === $data = json_decode(file_get_contents($resolved_filename), $assoc, $depth, $options)) {
+    if (null === ($data = json_decode(file_get_contents($resolved_filename), $assoc, $depth, $options))) {
         $app->logMsg(sprintf('JSON is unparsable: %s', $resolved_filename), LOG_ERR, __FILE__, __LINE__);
         return null;
@@ -1705 +1705 @@
         return false;
     case -5:
-        $app->logMsg('IP Intelligence: Banned: no permission or invalid email address', LOG_WARNING, __FILE__, __LINE__);
+        $app->logMsg('IP Intelligence: Banned: exceeded query limits, no permission, or invalid email address', LOG_WARNING, __FILE__, __LINE__);
         return false;
     case -6:
@@ -1711 +1711 @@
         return false;
     default:
-        if (!is_numeric($response) || $response < 0 || $response >= $threshold) {
+        if (!is_numeric($response) || $response < 0) {
+            $app->logMsg(sprintf('IP Intelligence: Unknown status for IP (%s): %s', $response, $ip), LOG_NOTICE, __FILE__, __LINE__);
+            return false;
+        }
+        if ($response >= $threshold) {
             $app->logMsg(sprintf('IP Intelligence: Bad IP (%s): %s', $response, $ip), LOG_NOTICE, __FILE__, __LINE__);
             return true;