prepare for wblistadm server

diff --git a/lib/utils.inc.php b/lib/utils.inc.php
index e0ab45d868a7d3c7996343bd695c0c7e2f9567e1..f32e2095713e2e7ff4d998bf592c456611effd07 100644 (file)
--- a/lib/utils.inc.php
+++ b/lib/utils.inc.php
@@ -384,7 +384,7 @@ class Utils {
         return $string;
     }
 
-    public function RESTCall($url, $data = null, $cookiesIn = '') {
+    public function RESTCall($url, $data = null, $cookiesIn = '', $headers = null) {
         $options = array(
             CURLOPT_RETURNTRANSFER => true,     // return web page
             CURLOPT_HEADER         => true,     //return headers in addition to content
@@ -405,6 +405,10 @@ class Utils {
             $options[CURLOPT_POSTFIELDS] = $data;
         }
 
+        if ($headers) {
+            $options[CURLOPT_HTTPHEADER] = $headers;
+        }
+
         $ch = curl_init($url);
         curl_setopt_array($ch, $options);
         $rough_content = curl_exec($ch);

diff --git a/rest_client.php b/rest_client.php
index ed24278d4733f823a2fd35e3afa2ffaec27362e9..e73a5d8cbd1b2991adb1dd7f2efbafec3b27ecfa 100644 (file)
--- a/rest_client.php
+++ b/rest_client.php
@@ -32,11 +32,12 @@ 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'] = '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'], $cookiesIn = $_SESSION['cookies']);
+    $response = $util->RESTCall($CFG->wblistadm_url.'/show', $_SESSION['CSRFPreventionToken'],
+                                $cookiesIn = $_SESSION['cookies'], $_SESSION['CSRFPreventionToken']);
     if ($response['http_code'] >= 200 && $response['http_code'] <= 204) {
         $data = json_decode($response['content']);
         $_SESSION['cookies'] = $response['cookies'];