(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 9093e3030b28d4570145388e9f49fb7e99a357d8..386504b66ac98d98f280f5ea0e3ba5cfba40e59e 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -32,14 +32,7 @@ class wsFlash extends cubeFlashGateway {
                        $li->creationDate = $this->args['creationDate'];\r
                        $li->modificationDate = $this->args['modificationDate'];\r
                        $data['localInfos'] = $li;\r
-\r
-                       $ci = new cubeObject();\r
-                       $ci->global=new cubeObject();\r
-                       $ci->resolution = 150;\r
-                       $ci->method = wsDocument::NORMAL;\r
-                       $ci->quality = 85;\r
-\r
-                       $data['conversionInfos'] = $ci;\r
+                       $data['conversionInfos'] = new wsDocumentConversionInfos($this->args['resolution'], $this->args['method'], $this->args['quality']);\r
                        $document = $dao->sauve($data);\r
                        $document->copyOriginal($infos['tmp_name']);\r
                }\r

diff --git a/inc/ws/Metier/class.ws.document.conversioninfos.php b/inc/ws/Metier/class.ws.document.conversioninfos.php
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c6411edd0dc64009b34b98b0c446e92262587f5d 100644 (file)
--- a/inc/ws/Metier/class.ws.document.conversioninfos.php
+++ b/inc/ws/Metier/class.ws.document.conversioninfos.php
@@ -0,0 +1,29 @@
+<?php\r
+\r
+class wsDocumentConversionInfos {\r
+       public $resolution;\r
+       public $method;\r
+       public $quality;\r
+       public $pages;\r
+\r
+       public function __construct($resolution = 150, $method = 0, $quality = 85)\r
+       {\r
+               $this->resolution = $resolution;\r
+               $this->method = $method;\r
+               $this->quality = $quality;\r
+\r
+               $this->pages = array();\r
+       }\r
+\r
+       public function setPagesNumber($n)\r
+       {\r
+               // Set defaults\r
+               for($i = 1;$i <= $n;$n++) {\r
+                       if (!isset($this->pages[$i])) {\r
+                               $this->pages[$i] = new wsDocumentConversionInfos($this->resolution, $this->method, $this->quality);\r
+                       }\r
+               }\r
+       }\r
+}\r
+\r
+?>
\ No newline at end of file