diff options
| author | Christian Hofmaier | 2017-04-12 14:30:18 +0200 |
|---|---|---|
| committer | Christian Hofmaier | 2017-04-12 14:30:18 +0200 |
| commit | 9f27c7cdeb1df2f9c42373f419c6621d4faa71ca (patch) | |
| tree | e55c6e1d95685df2117401e97f946b962f4e0f47 /inc/property.inc.php | |
| parent | [permissionmanager] changed description to tooltips (diff) | |
| parent | [rebootcontrol] New module for shutting down and rebooting clients (diff) | |
| download | slx-admin-9f27c7cdeb1df2f9c42373f419c6621d4faa71ca.tar.gz slx-admin-9f27c7cdeb1df2f9c42373f419c6621d4faa71ca.tar.xz slx-admin-9f27c7cdeb1df2f9c42373f419c6621d4faa71ca.zip | |
Merge branches 'master' and 'permission-manager' of git.openslx.org:openslx-ng/slx-admin into permission-manager
Diffstat (limited to 'inc/property.inc.php')
| -rw-r--r-- | inc/property.inc.php | 8 |
1 files changed, 4 insertions, 4 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(); |