wip #4614 @0.5

diff --git a/.htaccess b/.htaccess
index 96e71e3bd99d6cda4521cde1292824d32bc5793c..ecf24c6f858899129b99ed4f1d85983e07eb056c 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -4,8 +4,6 @@ Options +FollowSymlinks
 AddDefaultCharset UTF-8\r
 AddCharset UTF-8 log\r
 \r
-\r
-\r
 # Static\r
 <IfModule mod_expires.c>\r
 #      ExpiresActive On\r
@@ -14,6 +12,8 @@ AddCharset UTF-8 log
 \r
 <IfModule mod_headers.c>\r
        Header merge Access-Control-Allow-Origin "*"\r
+       Header append Access-Control-Allow-Methods "POST,GET,OPTIONS,PUT,DELETE"\r
+       Header append Access-Control-Allow-Headers "Content-Type,Accept,x-requested-with"\r
 </IfModule>\r
 \r
 <IfModule mod_deflate.c>\r

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 7d6682dec13ef77d69991526be27f8f3a7e442db..02af9fd7b13e5c1f7b55d8d381e20249a78958bb 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -1376,9 +1376,13 @@ class wsServices extends cubeFlashGateway
         exit;
     }
 
-    public static function yslSurvey()
+    public function yslSurvey()
     {
+
+
         global $core;
+        $this->outputXML = false;
+
         try {
             $c = $core->con->openCursor('ysl_survey');
             $c->fluidbook_id = $_POST['Fluidbook_ID'];
@@ -1394,6 +1398,9 @@ class wsServices extends cubeFlashGateway
             $res = '0';
         }
         ob_end_clean();
+        header('Access-Control-Allow-Origin: *');
+        header('Access-Control-Allow-Methods: POST,GET,OPTIONS,PUT,DELETE');
+        header('Access-Control-Allow-Headers: Content-Type,Accept,x-requested-with');
         header('Content-Type: text/plain');
         die($res);
     }