Update false evaluations

=== false and !== false to is_null where appropriate.

diff --git a/boot.php b/boot.php
index eda8a4037da418844ff85279647c137efa68cf52..c6f7b1e20d1d66dc83412978b306457f1a7d1971 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -742,7 +742,7 @@ function run_update_function($x)
                // delete the config entry to try again.
 
                $t = Config::get('database', 'update_' . $x);
-               if ($t !== false) {
+               if (!is_null($t)) {
                        return false;
                }
                Config::set('database', 'update_' . $x, time());

diff --git a/include/nav.php b/include/nav.php
index f2bf161f9e2862deab14e25005d2a0a464ebb950..58ec150e7ad21bbbdbadaee68240e908b8f92ae6 100644 (file)
--- a/include/nav.php
+++ b/include/nav.php
@@ -209,7 +209,7 @@ function nav_info(App $a)
 
        // Provide a banner/logo/whatever
        $banner = Config::get('system', 'banner');
-       if ($banner === false) {
+       if (is_null($banner)) {
                $banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
        }
 

diff --git a/include/network.php b/include/network.php
index 52e3409573347db9754dc7f1249fb09a95f14f5b..06649554b02cfc1738b52e2be993621e94343d40 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -126,6 +126,7 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array())
        if (x($opts, 'timeout')) {
                @curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']);
        } else {
+               // if Config::get returns null, intval will be 0 which will also evaluate to false
                $curl_time = intval(Config::get('system', 'curl_timeout'));
                @curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
        }
@@ -302,6 +303,7 @@ function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
        if (intval($timeout)) {
                curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
        } else {
+               // if Config::get returns null, intval will be 0 which will also evaluate to false
                $curl_time = intval(Config::get('system', 'curl_timeout'));
                curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
        }

diff --git a/src/Content/Feature.php b/src/Content/Feature.php
index 864c07a0d83352bcb655f093a3fb661b16f92f85..f17b649eefaa0aae09d0af3b2fcb86a089bf3c51 100644 (file)
--- a/src/Content/Feature.php
+++ b/src/Content/Feature.php
@@ -23,13 +23,15 @@ class Feature
        {
                $x = Config::get('feature_lock', $feature, false);
 
-               if ($x === false) {
+               if (is_null($x)) {
                        $x = PConfig::get($uid, 'feature', $feature, false);
                }
-               if ($x === false) {
+
+               if (is_null($x)) {
                        $x = Config::get('feature', $feature, false);
                }
-               if ($x === false) {
+
+               if (is_null($x)) {
                        $x = self::getDefault($feature);
                }
 

diff --git a/src/Network/FKOAuthDataStore.php b/src/Network/FKOAuthDataStore.php
index 126f140bdf76cd6f57dfb35ef2f4b736f78b235d..d7fa14518903b981bb8cbf0f470ee13faf5a8f19 100644 (file)
--- a/src/Network/FKOAuthDataStore.php
+++ b/src/Network/FKOAuthDataStore.php
@@ -171,7 +171,7 @@ class FKOAuthDataStore extends OAuthDataStore
                dba::delete('tokens', array('id' => $token->key));
 
 
-               if (!is_null($ret) && $uverifier !== false) {
+               if (!is_null($ret) && !is_null($uverifier)) {
                        Config::delete("oauth", $verifier);
                }
 

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index c1fb5350c3dc7f91a955cc8b2585a33e4c9397b9..c3528b623e01c9eb8d771bccfac85efec5d4d607 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -92,7 +92,7 @@ Class OnePoll
 
                if ($contact['subhub']) {
                        $poll_interval = Config::get('system', 'pushpoll_frequency');
-                       $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
+                       $contact['priority'] = ((!is_null($poll_interval)) ? intval($poll_interval) : 3);
                        $hub_update = false;
 
                        if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 day")) {

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index a8654f743b1a0a2dce32aa46926dfe1b1c34d7fd..0f81200890be8b702c22761669b2a08b731f93ac 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -110,13 +110,13 @@ EOT;
 function get_vier_config($key, $default = false, $admin = false) {
        if (local_user() && !$admin) {
                $result = PConfig::get(local_user(), "vier", $key);
-               if ($result !== false) {
+               if (!is_null($result)) {
                        return $result;
                }
        }
 
        $result = Config::get("vier", $key);
-       if ($result !== false) {
+       if (!is_null($result)) {
                return $result;
        }