First upload of wblist page

[qtadmin.git] / rest_client.php

diff --git a/rest_client.php b/rest_client.php
index e50f923d716ca8b7a5ffcacc4b817c4cf17dea25..c0d81b801038eebd81fe2ea4d417d4046394c4b5 100644 (file)
--- 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']);
     $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['token'] = $ticket->data->CSRFPreventionToken;
+        $_SESSION['CSRFPreventionToken'] = array('CSRFPreventionToken: ' . $_SESSION['ticket']->data->CSRFPreventionToken);

         $_SESSION['cookies'] = $response['cookies'];
     }
 } else {
         $_SESSION['cookies'] = $response['cookies'];
     }
 } else {

-    $response = $util->RESTCall($CFG->wblistadm_url.'/show', $_SESSION['CSRFPreventionToken'], $cookiesIn = $_SESSION['cookies']);
-    if ($response['http_code'] >= 200 && $response['http_code'] <= 204) {
+    $response = $util->RESTCall($CFG->wblistadm_url.'/show', null,
+                                $cookiesIn = $_SESSION['cookies'], $_SESSION['CSRFPreventionToken']);

         $data = json_decode($response['content']);
         $data = json_decode($response['content']);

-        $_SESSION['CSRFPreventionToken'] = 'CSRFPreventionToken='.$ticket->data->CSRFPreventionToken;
-        $_SESSION['cookies'] = $response['cookies'];
-    }
+        //$_SESSION['cookies'] = $response['cookies'];

 }
 
 ?>
 }
 
 ?>


@@ -59,7 +57,8 @@ if (! isset($_SESSION['ticket'])) {
 <pre>
 <?php
 print_r($response);
 <pre>
 <?php
 print_r($response);

-print "Ticket: \n".var_export($_SESSION['ticket'],true)."\nCookies: ".$_SESSION['cookies']."\nToken: ".$_SESSION['CSRFPreventionToken'];
+print "Ticket: \n".var_export($_SESSION['ticket'],true)."\nCookies: ".$_SESSION['cookies']."\nToken: ".
+    var_export($_SESSION['CSRFPreventionToken'], true);

 if (isset($data)) {
     print "\n";
     print_r($data);
 if (isset($data)) {
     print "\n";
     print_r($data);