(no commit message)

diff --git a/inc/extranet/Controlleur/_common.php b/inc/extranet/Controlleur/_common.php
index 4dab0c9ff968fa2309bf3491900c579269880d4d..59eb149de790df95cf432f851b3e788846d0cfe2 100644 (file)
--- a/inc/extranet/Controlleur/_common.php
+++ b/inc/extranet/Controlleur/_common.php
@@ -11,5 +11,6 @@ $__autoload['extranetPageChiffres'] = dirname(__FILE__) . '/class.extranet.page.
 $__autoload['wsFlash'] = dirname(__FILE__) . '/class.ws.flash.php';\r
 $__autoload['wsUrl'] = dirname(__FILE__) . '/class.ws.url.php';\r
 $__autoload['wsDroits'] = dirname(__FILE__) . '/class.ws.droits.php';\r
+$__autoload['wsConversionSession'] = dirname(__FILE__) . '/class.ws.conversion.session.php';\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/extranet/Controlleur/class.ws.conversion.session.php b/inc/extranet/Controlleur/class.ws.conversion.session.php
index cba1eb434ffeefee7146aea55f324ab60063164b..de9159e062172792aeeba294abdb85c5ce23da9a 100644 (file)
--- a/inc/extranet/Controlleur/class.ws.conversion.session.php
+++ b/inc/extranet/Controlleur/class.ws.conversion.session.php
@@ -4,6 +4,9 @@ class wsConversionSession {
        public $documents = array();\r
        public function __construct()\r
        {\r
+               if (!isset($_SESSION['conversionSession'])) {\r
+                       $_SESSION['conversionSession'] = array();\r
+               }\r
                $this->documents = $_SESSION['conversionSession'];\r
                $_SESSION['conversionSessionProgress'] = 0;\r
                unset($_SESSION['conversionSession']);\r
@@ -11,7 +14,10 @@ class wsConversionSession {
 \r
        public function process()\r
        {\r
-               $_SESSION['conversionSessionProgress']=100;\r
+               for($i = $_SESSION['conversionSessionProgress'];$i <= 100;$i++) {\r
+                       usleep(0.25 * 1000000);\r
+                       $_SESSION['conversionSessionProgress'] = $i;\r
+               }\r
        }\r
 }\r
 \r

diff --git a/inc/extranet/Controlleur/class.ws.flash.php b/inc/extranet/Controlleur/class.ws.flash.php
index e3e5de1b30a70b0ffd1e90e083a00413cddd26b8..3f896cdd8487bc8f5af83f13c026edc97d9d0240 100644 (file)
--- a/inc/extranet/Controlleur/class.ws.flash.php
+++ b/inc/extranet/Controlleur/class.ws.flash.php
@@ -71,19 +71,14 @@ class wsFlash extends cubeFlashGateway {
                $cookies = array(session_name() => session_id());\r
                $http = new cubeHTTP($_SERVER['HTTP_HOST']);\r
                $http->setDataTimeout(3);\r
-               $http->setCookies($cookies);\r
-               try {\r
-                       $http->get('/flash/processConversionSessionAsync');\r
-               }\r
-               catch(Exception $e) {\r
-               }\r
+               $http->get('/flash/processConversionSessionAsync', array('user_email' => $_SESSION['user_email'], 'user_password' => $_SESSION['user_password']));\r
        }\r
 \r
        public function processConversionSessionAsync()\r
        {\r
-               file_put_contents(ROOT . '/test.txt', print_r($_SESSION, true));\r
-               $conversion = new wsConversionSession();\r
+               file_put_contents(ROOT . '/test.txt', print_r($_SERVER, true));\r
                cubePHP::neverStop();\r
+               $conversion = new wsConversionSession();\r
                $conversion->process();\r
        }\r
 \r