(no commit message)

diff --git a/inc/extranet/Controlleur/class.ws.conversion.session.php b/inc/extranet/Controlleur/class.ws.conversion.session.php
index ee639f69675a89ede6e4701daf9aa90ff05e6f1f..cba1eb434ffeefee7146aea55f324ab60063164b 100644 (file)
--- a/inc/extranet/Controlleur/class.ws.conversion.session.php
+++ b/inc/extranet/Controlleur/class.ws.conversion.session.php
@@ -2,17 +2,16 @@
 \r
 class wsConversionSession {\r
        public $documents = array();\r
-       public $session_id;\r
-       public function __construct($session_id)\r
+       public function __construct()\r
        {\r
                $this->documents = $_SESSION['conversionSession'];\r
-               $this->session_id = $session_id;\r
-               $_SESSION['conversionSessionProgress'] = '0';\r
+               $_SESSION['conversionSessionProgress'] = 0;\r
                unset($_SESSION['conversionSession']);\r
        }\r
 \r
        public function process()\r
        {\r
+               $_SESSION['conversionSessionProgress']=100;\r
        }\r
 }\r
 \r

diff --git a/inc/extranet/Controlleur/class.ws.flash.php b/inc/extranet/Controlleur/class.ws.flash.php
index c6f624885445c51f7b5fcdb10a052fe08a30cea1..e3e5de1b30a70b0ffd1e90e083a00413cddd26b8 100644 (file)
--- a/inc/extranet/Controlleur/class.ws.flash.php
+++ b/inc/extranet/Controlleur/class.ws.flash.php
@@ -68,23 +68,32 @@ class wsFlash extends cubeFlashGateway {
 \r
        public function processConversionSession()\r
        {\r
+               $cookies = array(session_name() => session_id());\r
                $http = new cubeHTTP($_SERVER['HTTP_HOST']);\r
                $http->setDataTimeout(3);\r
-               $http->setCookies(array(session_name() => session_id()));\r
-               $http->get('/flash/processConversionSessionAsync');\r
-       }\r
-\r
-       public function getConversionSessionProgress()\r
-       {\r
-               $this->xml->addChild('progress', $_SESSION['conversionSessionProgress']);\r
+               $http->setCookies($cookies);\r
+               try {\r
+                       $http->get('/flash/processConversionSessionAsync');\r
+               }\r
+               catch(Exception $e) {\r
+               }\r
        }\r
 \r
        public function processConversionSessionAsync()\r
        {\r
+               file_put_contents(ROOT . '/test.txt', print_r($_SESSION, true));\r
+               $conversion = new wsConversionSession();\r
                cubePHP::neverStop();\r
-               $conversion = new wsConversionSession(session_id());\r
                $conversion->process();\r
        }\r
+\r
+       public function getConversionSessionProgress()\r
+       {\r
+               if (!isset($_SESSION['conversionSessionProgress'])) {\r
+                       $_SESSION['conversionSessionProgress'] = 0;\r
+               }\r
+               $this->xml->addChild('progress', $_SESSION['conversionSessionProgress']);\r
+       }\r
 }\r
 \r
 ?>
\ No newline at end of file