(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 8a846444dc9be993b8e6941530f3645c0d50f26a..d36ce6db84dc31eaefc60686a8447bf7b4d13783 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -635,6 +635,10 @@ class wsMaintenance {
                }\r
        }\r
 \r
+       public static function getV1Translations() {\r
+               wsLang::getV1Translations();\r
+       }\r
+\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index e92c54306b48dfffb6702c28521b6ea83d042171..b389d75527d12262b671250123e26fed54904ec6 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -99,8 +99,8 @@ class wsBookParametres extends wsParametres {
                        'fieldsnames' => array('preload'));\r
                // .\r
                $this->fields['pdf'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer les fonctions de téléchargement"));\r
-               $this->fields['pdfComplex'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Téchargement de PDF avancé'), 'grade' => 3);\r
-               $this->fields['offlineExport'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Téléchargement des versions offline'), 'grade' => 3);\r
+               $this->fields['pdfComplex'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Téchargement de PDF avancé'), "hint" => __("Permet à l'utilisateur de sélectionner les pages qu'il souhaite télécharger"), 'grade' => 3);\r
+               $this->fields['offlineExport'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Téléchargement des versions offline'), "hint" => __('Valable si le téléchargement avancé est activé'), 'grade' => 3);\r
                $this->forms['pdf'] = array('label' => __('Fonction de téléchargement'),\r
                        'fieldsnames' => array('pdf', 'pdfComplex', 'offlineExport'));\r
                // .\r

diff --git a/inc/ws/Metier/class.ws.lang.php b/inc/ws/Metier/class.ws.lang.php
index effdf1fba20973396c60cc478d7c321aea02201a..52c91b7abbf7ba272927486325f59e8912e1e520 100644 (file)
--- a/inc/ws/Metier/class.ws.lang.php
+++ b/inc/ws/Metier/class.ws.lang.php
@@ -30,7 +30,7 @@ class wsLang extends cubeMetier {
                'between pages' => 26,\r
                'one page per sheet' => 27,\r
                'two pages per sheet' => 28,\r
-               'print' => 29,\r
+               'print-' => 29,\r
                'close' => 30,\r
                'your name' => 31,\r
                'the message' => 32,\r
@@ -91,6 +91,8 @@ class wsLang extends cubeMetier {
                                $new++;\r
                        }\r
                }\r
+               $res[29] = $res[5];\r
+\r
                ksort($res);\r
                return $res;\r
        }\r
@@ -115,6 +117,34 @@ class wsLang extends cubeMetier {
                return $xml;\r
        }\r
 \r
+       public static function getV1Translations() {\r
+               global $core;\r
+               $r = $core->con->select('SELECT * FROM langues');\r
+               while ($r->fetch()) {\r
+                       $trads = json_decode($r->traductions, true);\r
+                       $xml = simplexml_load_file('http://ws.fluidbook.com/lang/' . $r->lang_id . '/lang.xml');\r
+                       if ($xml === false) {\r
+                               continue;\r
+                       }\r
+\r
+                       $i = 1;\r
+                       foreach ($xml as $tradText) {\r
+                               $t = (string) $tradText;\r
+                               $transid = array_search($i, self::$idtonew);\r
+                               if (!isset($trads[$transid])) {\r
+                                       $trads[$transid] = $t;\r
+                               }\r
+\r
+                               $i++;\r
+                       }\r
+\r
+\r
+                       $c = $core->con->openCursor('langues');\r
+                       $c->traductions = json_encode($trads);\r
+                       $c->update('WHERE lang_id = \'' . $core->con->escape($r->lang_id) . '\'');\r
+               }\r
+       }\r
+\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/Util/packager/_common.php b/inc/ws/Util/packager/_common.php
index 0f48af8ffdc94fac451a2c560bd95b846db9e31a..94ebde2d9e086bc1f6bc6e589c74f24cedc12b78 100644 (file)
--- a/inc/ws/Util/packager/_common.php
+++ b/inc/ws/Util/packager/_common.php
@@ -3,6 +3,7 @@
 $__autoload['wsPackager'] = dirname(__FILE__) . '/class.ws.packager.php';\r
 $__autoload['wsPackagerHTML'] = dirname(__FILE__) . '/class.ws.packager.html.php';\r
 $__autoload['wsPackagerWinEXE'] = dirname(__FILE__) . '/class.ws.packager.win.exe.php';\r
+$__autoload['wsPackagerWinINST'] = dirname(__FILE__) . '/class.ws.packager.win.inst.php';\r
 $__autoload['wsPackagerWinCD'] = dirname(__FILE__) . '/class.ws.packager.win.cd.php';\r
 $__autoload['wsPackagerMacEXE'] = dirname(__FILE__) . '/class.ws.packager.mac.exe.php';\r
 $__autoload['wsPackagerAIR'] = dirname(__FILE__) . '/class.ws.packager.air.php';\r

diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index b0e9a445f780566768f93688c6fd0b7c0afb18ad..63a26b99c522871729cac2a130968715961d2f3b 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.html.php
@@ -20,7 +20,7 @@ class wsPackagerHTML extends wsPackager {
        protected function preparePackage() {\r
                parent::preparePackage();\r
 \r
-               if ($this->book->parametres->offlineExport) {\r
+               if ($this->book->parametres->offlineExport && $this->book->parametres->pdfComplex) {\r
                        $versions = array('win-ins' => 'exe', 'mac-exe' => 'zip');\r
                        foreach ($versions as $v => $ext) {\r
                                $a = wsPackager::package($this->book_id, $v);\r

diff --git a/inc/ws/Util/packager/class.ws.packager.v1.php b/inc/ws/Util/packager/class.ws.packager.v1.php
index 90d8d4e36e2304f3cd55d3ec37e635f54add5f1b..5f808b9e9cab1ac8b7bb9ac9fd10fe9c9f28a326 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.v1.php
+++ b/inc/ws/Util/packager/class.ws.packager.v1.php
@@ -196,7 +196,30 @@ class wsPackagerV1 extends wsPackagerHTML {
        }
 
        public function copyTheme() {
+               $files = array('logoLoader' => 'logoLoader.png',
+                       'backgroundImage' => 'backgroundImg.jpg',
+                       'logo' => 'menu_clientLogo.png',
+                       'menuImage' => 'menu_back.png');
+
+               $images = $this->vdir . '/images';
+               if (!file_exists($images)) {
+                       mkdir($images, 0777, true);
+               }
+
+               foreach ($files as $param => $file) {
+                       $src = $this->themeRoot . '/' . $this->theme->parametres->$param;
+                       if (!file_exists($src) || !is_file($src)) {
+                               $src = WS_THEMES . '/spacer.png';
+                       }
+                       copy($src, $images . '/' . $file);
+               }
+
+               $cp = new cubeCommandLine('cp');
+               $cp->setArg(null, WS_ICONS .'/'. $this->theme->parametres->iconSet . '/v1/*');
+               $cp->setArg(null, $this->vdir . '/images');
+               $cp->execute();
                
+               fb($cp->output);
        }
 
        protected function copyLang() {