diff options
| author | Jannik Schönartz | 2017-03-17 16:32:38 +0100 |
|---|---|---|
| committer | Jannik Schönartz | 2017-03-17 16:32:38 +0100 |
| commit | f327ab8bbb1091dd5fe3eeb7d1de9eb9fa69b342 (patch) | |
| tree | b94657b0a63070a36ac7042d8ea35e75ef86fed7 /modules-available/locationinfo/page.inc.php | |
| parent | Rework of the Server List. Many Bugfixes (see Mail). (diff) | |
| download | slx-admin-f327ab8bbb1091dd5fe3eeb7d1de9eb9fa69b342.tar.gz slx-admin-f327ab8bbb1091dd5fe3eeb7d1de9eb9fa69b342.tar.xz slx-admin-f327ab8bbb1091dd5fe3eeb7d1de9eb9fa69b342.zip | |
SetCredentials error message is no longer ignored.
Diffstat (limited to 'modules-available/locationinfo/page.inc.php')
| -rw-r--r-- | modules-available/locationinfo/page.inc.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php index ccf37d0e..dec022b2 100644 --- a/modules-available/locationinfo/page.inc.php +++ b/modules-available/locationinfo/page.inc.php @@ -259,10 +259,13 @@ class Page_LocationInfo extends Page $dbresult = Database::queryFirst("SELECT * FROM `setting_location_info` WHERE serverid = :serverid", array('serverid' => $serverid)); $serverInstance = CourseBackend::getInstance($dbresult['servertype']); - $serverInstance->setCredentials(json_decode($dbresult['credentials'], true), $dbresult['serverurl'], $serverid); - $setCred = $serverInstance->checkConnection(); + $setCredentials = $serverInstance->setCredentials(json_decode($dbresult['credentials'], true), $dbresult['serverurl'], $serverid); - if (!$setCred) { + if ($setCredentials) { + $setCred = $serverInstance->checkConnection(); + } + + if (!$setCredentials || !$setCred) { $error['timestamp'] = time(); $error['error'] = $serverInstance->getError(); Database::exec("UPDATE `setting_location_info` Set error=:error WHERE serverid=:id", array('id' => $serverid, 'error' => json_encode($error, true))); @@ -491,7 +494,7 @@ class Page_LocationInfo extends Page $credential['type'] = "array"; $credential['array'] = $selection; } - + $backend['credentials'][] = $credential; } $serverBackends[] = $backend; |