wait #4248 @0.75

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index c45f815d877af73f4ba71c20529bf063df4efb7e..390cc808ce8ff6d213b09d4979cdf61e5b6e8653 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -1407,11 +1407,11 @@ class wsMaintenance
         if ($platform === 'windows') {
             $p = 'windows-x32';
             $exe = 'workshop';
-            $version='0.50.2';
+            $version = '0.50.2';
         } else if ($platform === 'mac') {
             $p = 'mac-x64';
             $exe = 'Fluidbook Workshop';
-            $version='0.50.2';
+            $version = '0.50.2';
         }
 
         $path = ROOT . '/desktop';
@@ -1426,7 +1426,7 @@ class wsMaintenance
         $cl->setArg('title', 'Fluidbook Workshop');
         $cl->setArg('output-dir', $outpath);
         $cl->setArg('nw-version', $version);
-        $cl->setArg('sdk-build');
+        //$cl->setArg('sdk-build');
         $cl->setArg('main', 'index.html');
         $cl->setArg('package-json');
         //$cl->setArg('name', 'FluidbookWorkshop.exe');
@@ -1469,11 +1469,41 @@ class wsMaintenance
         }
     }
 
-    public static function themeParams(){
-        $parent=new wsTheme();
-        $t=new wsThemeParametres($parent);
+    public static function themeParams()
+    {
+        $parent = new wsTheme();
+        $t = new wsThemeParametres($parent);
         $t->generateV3Form(false);
     }
+
+    public static function processPage($args)
+    {
+        global $core;
+
+        $book_id = $args[0];
+        $page = $args[1];
+
+        $daoBook = new wsDAOBook($core->con);
+        $book = $daoBook->selectById($book_id);
+
+        $files = [
+            ['jpg', '300', true, true, 'html'],
+            ['jpg', '150', true, true, 'html'],
+            ['jpg', '150', false, true, 'html'],
+            ['jpg', '150', false, true, 'html'],
+            ['swf', '150', true, true, ''],
+            ['svg', '150', true, false, 'html'],
+            ['svg', '300', true, false, 'html'],
+            ['svg', '150', true, true, 'html'],
+            ['svg', '200', true, true, 'html'],
+        ];
+
+
+        foreach ($files as $file) {
+            $book->getFile($page, $file[0], $file[1], $file[2], $file[3], $file[4], true);
+        }
+
+    }
 }
 
 

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 930e4fda2a627e525a4ad86a180aeecad50bb808..5b35a53556288edcaa9a61b2a00cf3cf24f59c10 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -192,6 +192,9 @@ class wsBookParametres extends wsParametres
         $this->fields['mobileIconVector'] = array('type' => 'boolean', 'default' => true, 'editable' => false, 'label' => __('Utiliser les icônes vectorielles'));
 //        $this->forms['mobile'] = array('label' => __('Version HTML5'),
 //            'fieldsnames' => array('alwaysHTML5', 'html5priority', 'flashBlockedWait', 'mobileIconVector', 'mobileServerConfig'));
+        $this->fields['externalArchivesBack'] = array('type' => 'freefile', 'default' => '', 'editable' => true,
+            'label' => __('Image de fond'), 'grade' => 3, 'fileFilter' => $imageFilter);
+        $this->fields['archivesLink'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Lien'), 'grade' => 5);
         /** **/
 
         $this->fields['version'] = array('type' => 'combo', 'default' => '2', 'editable' => true, 'label' => __('Version'), 'datas' => array('1' => '1', '2' => '2'), 'grade' => 3);
@@ -620,13 +623,9 @@ class wsBookParametres extends wsParametres
         //.
         $this->fields['externalArchives'] = array('type' => 'freefile', 'default' => '', 'editable' => true,
             'label' => __('Archives'), 'grade' => 3, 'fileFilter' => $imageFilter);
-        $this->fields['externalArchivesBack'] = array('type' => 'freefile', 'default' => '', 'editable' => true,
-            'label' => __('Image de fond'), 'grade' => 3, 'fileFilter' => $imageFilter);
-        $this->fields['archivesLink'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Lien'), 'grade' => 5);
         $this->fields['archivesLabel'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Label'), 'grade' => 5);
-
         $this->forms['archives'] = array('label' => __('Archives'),
-            'fieldsnames' => array('externalArchives', 'externalArchivesBack', '|', 'archivesLink', 'archivesLabel'));
+            'fieldsnames' => array('externalArchives', 'archivesLabel'));
         // .
         $this->fields['form'] = array('type' => 'combo', 'default' => '', 'editable' => true, 'grade' => 5, 'label' => __('Formulaire'), 'datas' =>
             array(__('Aucun') => '',

diff --git a/inc/ws/Metier/class.ws.book.php b/inc/ws/Metier/class.ws.book.php
index b76a736c9bb799208efcb62d0a47e6b9046660c3..8f3d9f6f30ee688542fd2a037c5b7bad92728dc6 100644 (file)
--- a/inc/ws/Metier/class.ws.book.php
+++ b/inc/ws/Metier/class.ws.book.php
@@ -84,7 +84,7 @@ class wsBook extends cubeMetier
         return $this->$varname;\r
     }\r
 \r
-    public function getFile($page, $format = 'jpg', $resolution = 150, $withText = true, $withGraphics = true, $version = 'html')\r
+    public function getFile($page, $format = 'jpg', $resolution = 150, $withText = true, $withGraphics = true, $version = 'html',$force=false)\r
     {\r
         $p = wsDAOBook::getDocumentPage($this->book_id, $page);\r
         if (!isset($this->_docs[$p['document_id']])) {\r
@@ -93,7 +93,7 @@ class wsBook extends cubeMetier
             $this->_docs[$p['document_id']] = $dao->selectById($p['document_id']);\r
         }\r
         $doc = $this->_docs[$p['document_id']];\r
-        return $doc->getFile($p['document_page'], $format, $resolution, $withText, $withGraphics, $version);\r
+        return $doc->getFile($p['document_page'], $format, $resolution, $withText, $withGraphics, $version,$force);\r
     }\r
 \r
     public function getThumbFile($page, $format)\r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 9e57934d8c571a1449938ae6804a7c9fc56b901d..c5e19579853fbfb40c8ad65f8ba023e1447b38fd 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -410,7 +410,7 @@ class wsDocument extends cubeMetier
                 $file .= '-' . $resolution;
             }
             $file .= '.svg';
-            $reffile = $this->makeSVGFile($page);
+            $reffile = $this->makeSVGFile($page, $force);
             $minsize = 100;
         } else if ($format === 'png' || $format === 'jpg') {
             $prefix = $withText ? 't' : 'h';