From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 22 Feb 2010 08:47:55 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=102e6d2e1df4f3219a28d64607d7856d3856887b;p=cubeextranet.git

---

diff --git a/inc/extranet/Controlleur/_common.php b/inc/extranet/Controlleur/_common.php
index 4dab0c9ff..59eb149de 100644
--- 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';
 $__autoload['wsUrl'] = dirname(__FILE__) . '/class.ws.url.php';
 $__autoload['wsDroits'] = dirname(__FILE__) . '/class.ws.droits.php';
+$__autoload['wsConversionSession'] = dirname(__FILE__) . '/class.ws.conversion.session.php';
 
 ?>
\ 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 cba1eb434..de9159e06 100644
--- 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();
 	public function __construct()
 	{
+		if (!isset($_SESSION['conversionSession'])) {
+			$_SESSION['conversionSession'] = array();
+		}
 		$this->documents = $_SESSION['conversionSession'];
 		$_SESSION['conversionSessionProgress'] = 0;
 		unset($_SESSION['conversionSession']);
@@ -11,7 +14,10 @@ class wsConversionSession {
 
 	public function process()
 	{
-		$_SESSION['conversionSessionProgress']=100;
+		for($i = $_SESSION['conversionSessionProgress'];$i <= 100;$i++) {
+			usleep(0.25 * 1000000);
+			$_SESSION['conversionSessionProgress'] = $i;
+		}
 	}
 }
 
diff --git a/inc/extranet/Controlleur/class.ws.flash.php b/inc/extranet/Controlleur/class.ws.flash.php
index e3e5de1b3..3f896cdd8 100644
--- 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());
 		$http = new cubeHTTP($_SERVER['HTTP_HOST']);
 		$http->setDataTimeout(3);
-		$http->setCookies($cookies);
-		try {
-			$http->get('/flash/processConversionSessionAsync');
-		}
-		catch(Exception $e) {
-		}
+		$http->get('/flash/processConversionSessionAsync', array('user_email' => $_SESSION['user_email'], 'user_password' => $_SESSION['user_password']));
 	}
 
 	public function processConversionSessionAsync()
 	{
-		file_put_contents(ROOT . '/test.txt', print_r($_SESSION, true));
-		$conversion = new wsConversionSession();
+		file_put_contents(ROOT . '/test.txt', print_r($_SERVER, true));
 		cubePHP::neverStop();
+		$conversion = new wsConversionSession();
 		$conversion->process();
 	}