diff options
| author | Jannik Schönartz | 2017-03-08 14:23:41 +0100 |
|---|---|---|
| committer | Jannik Schönartz | 2017-03-08 14:23:41 +0100 |
| commit | 5443dd9bd6106bdfe74eca03f053b76641b7d502 (patch) | |
| tree | 38bbf8caace1d0913563b3ca79e0feec6d5a4d5b | |
| parent | Merge branch 'location-info-panel' of git.openslx.org:openslx-ng/slx-admin in... (diff) | |
| download | slx-admin-5443dd9bd6106bdfe74eca03f053b76641b7d502.tar.gz slx-admin-5443dd9bd6106bdfe74eca03f053b76641b7d502.tar.xz slx-admin-5443dd9bd6106bdfe74eca03f053b76641b7d502.zip | |
API: setCredentials without json_encode
| -rw-r--r-- | modules-available/locationinfo/api.inc.php | 2 | ||||
| -rw-r--r-- | modules-available/locationinfo/page.inc.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php index 45e48064..31acb157 100644 --- a/modules-available/locationinfo/api.inc.php +++ b/modules-available/locationinfo/api.inc.php @@ -89,7 +89,7 @@ function getCalendar($idList) { $resultarray = array(); foreach ($serverList as $server) { $serverInstance = CourseBackend::getInstance($server['type']); - $serverInstance->setCredentials(json_encode($server['credentials']), $server['serverurl'], $server['serverid']); + $serverInstance->setCredentials($server['credentials'], $server['serverurl'], $server['serverid']); $calendarFromBackend = $serverInstance->fetchSchedule($server['idList']); $formattedArray = array(); foreach ($calendarFromBackend as $key => $value) { diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php index b3bf7c66..578a773c 100644 --- a/modules-available/locationinfo/page.inc.php +++ b/modules-available/locationinfo/page.inc.php @@ -347,7 +347,7 @@ class Page_LocationInfo extends Page // Instance the backend and set the credentials to check if the Authentification is accepted. $backendType = CourseBackend::getInstance($db['servertype']); - $backendType->setCredentials(json_encode($db['credentials'], true), $db['serverurl'], $db['serverid']); + $backendType->setCredentials(json_decode($db['credentials'], true), $db['serverurl'], $db['serverid']); $connection = $backendType->checkConnection(); if ($connection === true) { |