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 /modules-available/serversetup-bwlp/page.inc.php | |
| 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 'modules-available/serversetup-bwlp/page.inc.php')
| -rw-r--r-- | modules-available/serversetup-bwlp/page.inc.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/modules-available/serversetup-bwlp/page.inc.php b/modules-available/serversetup-bwlp/page.inc.php index 9bea4b50..9d7d11ac 100644 --- a/modules-available/serversetup-bwlp/page.inc.php +++ b/modules-available/serversetup-bwlp/page.inc.php @@ -81,8 +81,13 @@ class Page_ServerSetup extends Page return false; } - if ($this->taskStatus['statusCode'] === TASK_WAITING) { // TODO: Async if just displaying - $this->taskStatus = Taskmanager::waitComplete($this->taskStatus['id']); + if (!Taskmanager::isFinished($this->taskStatus)) { // TODO: Async if just displaying + $this->taskStatus = Taskmanager::waitComplete($this->taskStatus['id'], 4000); + } + + if (Taskmanager::isFailed($this->taskStatus) || !isset($this->taskStatus['data']['addresses'])) { + $this->taskStatus['data']['addresses'] = false; + return false; } $sortIp = array(); |