From 71911a69898a9b42192406ff4b8c2b58f07b2e1a Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Wed, 6 Dec 2017 15:25:36 -0500 Subject: [PATCH] Use default value use the default value parameter correctly! --- include/network.php | 10 ++++------ src/Worker/OnePoll.php | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/network.php b/include/network.php index 06649554b0..45f5d4e79a 100644 --- a/include/network.php +++ b/include/network.php @@ -126,9 +126,8 @@ 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)); + $curl_time = Config::get('system', 'curl_timeout', 60); + @curl_setopt($ch, CURLOPT_TIMEOUT, intval($curl_time)); } // by default we will allow self-signed certs @@ -303,9 +302,8 @@ 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)); + $curl_time = Config::get('system', 'curl_timeout', 60); + curl_setopt($ch, CURLOPT_TIMEOUT, intval($curl_time)); } if (defined('LIGHTTPD')) { diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php index c3528b623e..1190c77f5f 100644 --- a/src/Worker/OnePoll.php +++ b/src/Worker/OnePoll.php @@ -91,8 +91,8 @@ Class OnePoll $t = $contact['last-update']; if ($contact['subhub']) { - $poll_interval = Config::get('system', 'pushpoll_frequency'); - $contact['priority'] = ((!is_null($poll_interval)) ? intval($poll_interval) : 3); + $poll_interval = Config::get('system', 'pushpoll_frequency', 3); + $contact['priority'] = intval($poll_interval); $hub_update = false; if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 day")) {