From: Michael Rasmussen Date: Tue, 23 Jun 2015 23:21:46 +0000 (+0200) Subject: prepare for wblistadm server X-Git-Url: http://git.datanom.net/qtadmin.git/commitdiff_plain/fa2344f453c982a7a9b06285a4581788659c3f4f prepare for wblistadm server --- diff --git a/rest_client.php b/rest_client.php index e73a5d8..15614c5 100644 --- a/rest_client.php +++ b/rest_client.php @@ -32,16 +32,14 @@ if (! isset($_SESSION['ticket'])) { $response = $util->RESTCall($CFG->wblistadm_url.'/ticket', $data, $cookiesIn = ''); if ($response['http_code'] >= 200 && $response['http_code'] <= 204) { $_SESSION['ticket'] = json_decode($response['content']); - $_SESSION['CSRFPreventionToken'] = array('CSRFPreventionToken' => $_SESSION['ticket']->data->CSRFPreventionToken); + $_SESSION['CSRFPreventionToken'] = array('CSRFPreventionToken', $_SESSION['ticket']->data->CSRFPreventionToken); $_SESSION['cookies'] = $response['cookies']; } } else { - $response = $util->RESTCall($CFG->wblistadm_url.'/show', $_SESSION['CSRFPreventionToken'], + $response = $util->RESTCall($CFG->wblistadm_url.'/show', null, $cookiesIn = $_SESSION['cookies'], $_SESSION['CSRFPreventionToken']); - if ($response['http_code'] >= 200 && $response['http_code'] <= 204) { $data = json_decode($response['content']); $_SESSION['cookies'] = $response['cookies']; - } } ?> @@ -59,7 +57,8 @@ if (! isset($_SESSION['ticket'])) {