diff options
| author | Simon Rettberg | 2017-03-21 12:18:47 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-03-21 12:18:47 +0100 |
| commit | c415a9374872c6235fe822a5e038546522817e3a (patch) | |
| tree | d04977a0cb1978195af5ce2ce083832de92e7178 /inc | |
| parent | [webinterface] Remember last HTTPS config; add redirect to HTTPS setting (diff) | |
| download | slx-admin-c415a9374872c6235fe822a5e038546522817e3a.tar.gz slx-admin-c415a9374872c6235fe822a5e038546522817e3a.tar.xz slx-admin-c415a9374872c6235fe822a5e038546522817e3a.zip | |
Fix a couple of warnings and notices from error.log
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/property.inc.php | 8 | ||||
| -rw-r--r-- | inc/util.inc.php | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/inc/property.inc.php b/inc/property.inc.php index b3d8081a..b33e1bff 100644 --- a/inc/property.inc.php +++ b/inc/property.inc.php @@ -146,19 +146,19 @@ class Property public static function getVersionCheckInformation() { - $data = json_decode(self::get('versioncheck-data'), true); - if (isset($data['time']) && $data['time'] + 120 > time()) + $data = json_decode(self::get('versioncheck-data', '[]'), true); + if (isset($data['time']) && $data['time'] + 60 > time()) return $data; $task = Taskmanager::submit('DownloadText', array( 'url' => CONFIG_REMOTE_ML . '/list.php' )); if (!isset($task['id'])) return 'Could not start list download (' . Message::asString() . ')'; - if ($task['statusCode'] !== TASK_FINISHED) { + if (!Taskmanager::isFinished($task)) { $task = Taskmanager::waitComplete($task['id'], 5000); } if ($task['statusCode'] !== TASK_FINISHED || !isset($task['data']['content'])) { - return $task['data']['error']; + return isset($task['data']['error']) ? $task['data']['error'] : 'Timeout'; } $data = json_decode($task['data']['content'], true); $data['time'] = time(); diff --git a/inc/util.inc.php b/inc/util.inc.php index d454d18d..f5e10ebc 100644 --- a/inc/util.inc.php +++ b/inc/util.inc.php @@ -375,7 +375,7 @@ SADFACE; * @param bool $secure true = only use strong random sources * @return string|bool string of requested length, false on error */ - public static function randomBytes($length, $secure) + public static function randomBytes($length, $secure = true) { if (function_exists('random_bytes')) { return random_bytes($length); |