Changeset 746

Timestamp:

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

Author:

anonymous

Message:

Add brackets to avoid ambiguity in return value

Location:

trunk/lib

Files:

• App.inc.php (modified) (2 diffs)
• Currency.inc.php (modified) (2 diffs)
• Utilities.inc.php (modified) (4 diffs)

trunk/lib/App.inc.php

@@ -429 +429 @@
             // But not if all DB credentials have been defined already by other means.
             if ($this->cli && '' != $this->getParam('db_auth_file') && (!$this->getParam('db_server') || !$this->getParam('db_name') || !$this->getParam('db_user') || !$this->getParam('db_pass'))) {
-                if (false !== $db_auth_file = stream_resolve_include_path($this->getParam('db_auth_file'))) {
+                if (false !== ($db_auth_file = stream_resolve_include_path($this->getParam('db_auth_file')))) {
                     if (is_readable($db_auth_file)) {
                         $db_auth = json_decode(file_get_contents($db_auth_file), true);
@@ -622 +622 @@
 
         // Set the application version if defined.
-        if (false !== $site_version_file = stream_resolve_include_path($this->getParam('site_version_file'))) {
+        if (false !== ($site_version_file = stream_resolve_include_path($this->getParam('site_version_file')))) {
             if (mb_strpos($site_version_file, '.json') !== false) {
                 $version_json = json_decode(trim(file_get_contents($site_version_file)), true);

trunk/lib/Currency.inc.php

@@ -123 +123 @@
     public function getValue($amount, $base, $target)
     {
-        if (false !== $rate = $this->getRate($base, $target)) {
+        if (false !== ($rate = $this->getRate($base, $target))) {
             return abs($rate * $amount);
         } else {
@@ -231 +231 @@
             // Fetch XML from ECB <http://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml>
             $api_url = 'http://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml';
-            if (false === $sXML = file_get_contents($api_url)) {
+            if (false === ($sXML = file_get_contents($api_url))) {
                 $app->logMsg(sprintf('Failed to load ECB XML data from: %s', $api_url), LOG_WARNING, __FILE__, __LINE__);
                 return false;
             }
-            if (false === $oXML = simplexml_load_string($sXML)) {
+            if (false === ($oXML = simplexml_load_string($sXML))) {
                 $app->logMsg(sprintf('Failed to decode ECB XML data: %s', truncate($sXML, 200, 'end')), LOG_WARNING, __FILE__, __LINE__);
                 return false;

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;