(no commit message)

diff --git a/inc/extranet/Controlleur/class.extranet.core.php b/inc/extranet/Controlleur/class.extranet.core.php
index 79001320ddc17e83694adbbf1f9188887b1c9ece..ee835ed1602e0b6caf8873522d72fd2547faef11 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.core.php
+++ b/inc/extranet/Controlleur/class.extranet.core.php
@@ -135,6 +135,7 @@ class extranetCore extends cubeCore {
                $db->utilisateurs->ws_password('varchar', 40, false);\r
                $db->utilisateurs->ws_admin('integer', 0, false, 1);\r
                $db->utilisateurs->ws_id('integer', 0, true);\r
+               $db->utilisateurs->ws_settings('text', 0, false);\r
                // Clés\r
                $db->utilisateurs->primary('pk_utilisateurs', 'utilisateur_id');\r
                $db->utilisateurs->unique('unique_utilisateurs_email', 'email');\r

diff --git a/inc/extranet/DAO/class.extranet.dao.utilisateur.php b/inc/extranet/DAO/class.extranet.dao.utilisateur.php
index 6ad83bcbc609b11960a59dfbd1024f0058049699..4927f5b0233e306583bba08013c9b9aef867ff00 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.utilisateur.php
+++ b/inc/extranet/DAO/class.extranet.dao.utilisateur.php
@@ -41,6 +41,11 @@ class extranetDAOUtilisateur extends extranetDAO {
                $utilisateur->entreprise = $r->entreprise;\r
                $utilisateur->collegues = array();\r
                $utilisateur->ws_grade = $r->ws_grade;\r
+               if ($r->ws_settings != '') {\r
+                       $utilisateur->ws_settings = unserialize($r->ws_settings);\r
+               } else {\r
+                       $utilisateur->ws_settings = array('resolution' => 150, 'method' => 0, 'quality' => 85, 'objects' => 1800);\r
+               }\r
 \r
                return $utilisateur;\r
        }\r
@@ -67,7 +72,8 @@ class extranetDAOUtilisateur extends extranetDAO {
                $utilisateur->settings = array();\r
                $utilisateur->notes = '';\r
                $utilisateur->entreprise = 0;\r
-               $utilisateur->ws_grade=0;\r
+               $utilisateur->ws_grade = 0;\r
+               $utilisateur->ws_settings = array('resolution' => 150, 'method' => 0, 'quality' => 85, 'objects' => 1800);\r
                return $utilisateur;\r
        }\r
 \r
@@ -186,6 +192,13 @@ class extranetDAOUtilisateur extends extranetDAO {
                return $c->update('WHERE utilisateur_id=\'' . $this->con->escape($utilisateur_id) . '\'');\r
        }\r
 \r
+       public function sauveWSSettings($utilisateur_id, $datas)\r
+       {\r
+               $c = $this->con->openCursor('utilisateurs');\r
+               $c->ws_settings = serialize($datas);\r
+               return $c->update('WHERE utilisateur_id=\'' . $this->con->escape($utilisateur_id) . '\'');\r
+       }\r
+\r
        public function sauvePreferences($utilisateur)\r
        {\r
                if ($utilisateur) {\r

diff --git a/inc/extranet/Metier/class.extranet.utilisateur.php b/inc/extranet/Metier/class.extranet.utilisateur.php
index 628a1bd10dff839297504020228af0482a0742b3..ae0df915df109c96993222d196f039e99427f0a8 100644 (file)
--- a/inc/extranet/Metier/class.extranet.utilisateur.php
+++ b/inc/extranet/Metier/class.extranet.utilisateur.php
@@ -25,6 +25,7 @@ class extranetUtilisateur extends cubeMetier {
        protected $collegues;\r
        protected $ws_admin;\r
        protected $ws_grade;\r
+       protected $ws_settings;\r
 \r
        public function getEmail()\r
        {\r

diff --git a/inc/ws/Controlleur/class.ws.conversion.session.php b/inc/ws/Controlleur/class.ws.conversion.session.php
index de01833668d60d00163d1373120e2e5dc58c994e..136f94978d858b7081b4bceabf0fa01bfe78d4ce 100644 (file)
--- a/inc/ws/Controlleur/class.ws.conversion.session.php
+++ b/inc/ws/Controlleur/class.ws.conversion.session.php
@@ -40,18 +40,18 @@ class wsConversionSession {
                global $core;\r
 \r
                $dao = new wsDAODocument($core->con);\r
-               $this->documents = $dao->selectInList($this->documentsId);\r
-               $this->updateCountPages();\r
+               $docs = $dao->selectInList($this->documentsId);\r
+\r
+               foreach($docs as $doc) {\r
+                       trigger_error($doc->document_id);\r
+                       $this->documents[$doc->document_id] = $doc;\r
+               }\r
                $inited = true;\r
        }\r
 \r
        public function getDocumentById($id)\r
        {\r
-               foreach($this->documents as $doc) {\r
-                       if ($doc->document_id == $id) {\r
-                               return $doc;\r
-                       }\r
-               }\r
+               return $this->documents[$id];\r
        }\r
 \r
        public function process()\r
@@ -63,12 +63,14 @@ class wsConversionSession {
                $dao = new wsDAODocument($core->con);\r
                $daobook = new wsDAOBook($core->con);\r
 \r
+               trigger_error(count($this->documents));\r
+\r
                foreach($this->documents as $doc) {\r
                        $this->currentDoc = $doc;\r
                        $this->serialize();\r
                        $this->currentDoc->globalOperations();\r
-                       $this->currentDoc = $dao->updateFromObject($this->currentDoc);\r
                        $this->updateCountPages();\r
+                       $this->currentDoc = $dao->updateFromObject($this->currentDoc);\r
 \r
                        for($i = 1;$i <= $doc->generalInfos['pages'];$i++) {\r
                                $this->currentDocPage = $i;\r
@@ -97,8 +99,10 @@ class wsConversionSession {
                        if ($pages == 'all') {\r
                                $doc = $this->getDocumentById($id);\r
                                $this->totalPages += $doc->generalInfos['pages'];\r
+                               trigger_error('all : ' . $doc->generalInfos['pages']);\r
                        } else {\r
                                $this->totalPages += count($pages);\r
+                               trigger_error($pages);\r
                        }\r
                }\r
                $this->totalDoc = count($this->documents);\r

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 0253a3914b6057b3b958e4cd09f649bf36b4af94..1aedfd88d0d38e03193210c1f60e226e95b77f3b 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -9,6 +9,26 @@ class wsFlash extends cubeFlashGateway {
                $gateway = new $n($core->con, $args);\r
        }\r
 \r
+       public function saveConversionSettings()\r
+       {\r
+               global $core;\r
+               $dao = new extranetDAOUtilisateur($core->con);\r
+               $datas = array('resolution' => $this->args['resolution'],\r
+                       'objects' => $this->args['objects'],\r
+                       'method' => $this->args['method'],\r
+                       'quality' => $this->args['quality']);\r
+               $dao->sauveWSSettings($core->user->utilisateur_id, $datas);\r
+       }\r
+\r
+       public function getConversionSettings()\r
+       {\r
+               global $core;\r
+               $this->xml->addChild('resolution', $core->user->ws_settings['resolution']);\r
+               $this->xml->addChild('quality', $core->user->ws_settings['quality']);\r
+               $this->xml->addChild('method', $core->user->ws_settings['method']);\r
+               $this->xml->addChild('objects', $core->user->ws_settings['objects']);\r
+       }\r
+\r
        public function uploadDocument()\r
        {\r
                cubePHP::neverStop();\r

diff --git a/inc/ws/Metier/class.ws.document.conversioninfos.php b/inc/ws/Metier/class.ws.document.conversioninfos.php
index 717a4ae19dc329e7ff4c543b81c52f70556374b0..e39735f5e4ed3e21111589ce636578e64274afda 100644 (file)
--- a/inc/ws/Metier/class.ws.document.conversioninfos.php
+++ b/inc/ws/Metier/class.ws.document.conversioninfos.php
@@ -21,7 +21,7 @@ class wsDocumentConversionInfos {
        public function setPageNumber($n)\r
        {\r
                // Set defaults\r
-               for($i = 1;$i <= $n;$n++) {\r
+               for($i = 1;$i <= $n;$i++) {\r
                        if (!isset($this->pages[$i])) {\r
                                $this->pages[$i] = new wsDocumentConversionInfos($this->resolution, $this->method, $this->quality, $this->objects);\r
                        }\r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 5d025bc6873c9e0d86123fe1e9831a8c2e59265b..5d82480d5018831d2c324bf415a7e546866e5446 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -475,7 +475,7 @@ class wsDocument extends cubeMetier {
 \r
        public function makeSWFFiles($page, $resolution = null, $quality = null, $storeAllChars = null, $maxObjects = 1800, $method = null)\r
        {\r
-               $conversionSettings = $this->conversionInfos[$page];\r
+               $conversionSettings = $this->conversionInfos->pages[$page];\r
                if (is_null($storeAllChars)) {\r
                        $storeAllChars = true;\r
                }\r

diff --git a/swf/_src/assets/settings.png b/swf/_src/assets/settings.png
new file mode 100644 (file)
index 0000000..9aef034
Binary files /dev/null and b/swf/_src/assets/settings.png differ

diff --git a/swf/_src/composerLibrary.swc b/swf/_src/composerLibrary.swc
index 429449305be837c2cb67bbde7e8b7f8a56df4bc2..8a3497e292b1be82b487507f880c73f0644fbc32 100644 (file)
Binary files a/swf/_src/composerLibrary.swc and b/swf/_src/composerLibrary.swc differ

diff --git a/swf/_src/wsComposerLibrary.fla b/swf/_src/wsComposerLibrary.fla
index dea9a003ebc42aad11f40d6f8908703989054cd8..b5f3d0c43c521cd78245ba92fee2c3d0a65553bc 100644 (file)
Binary files a/swf/_src/wsComposerLibrary.fla and b/swf/_src/wsComposerLibrary.fla differ