From faf2d92abac408b66649c6339758f3b16017bbc0 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Fri, 27 Jan 2012 09:17:02 +0000 Subject: [PATCH] --- inc/ws/Controlleur/class.ws.maintenance.php | 4 +++ inc/ws/Metier/class.ws.book.parametres.php | 4 +-- inc/ws/Metier/class.ws.lang.php | 32 ++++++++++++++++++- inc/ws/Util/packager/_common.php | 1 + .../Util/packager/class.ws.packager.html.php | 2 +- inc/ws/Util/packager/class.ws.packager.v1.php | 23 +++++++++++++ 6 files changed, 62 insertions(+), 4 deletions(-) diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php index 8a846444d..d36ce6db8 100644 --- a/inc/ws/Controlleur/class.ws.maintenance.php +++ b/inc/ws/Controlleur/class.ws.maintenance.php @@ -635,6 +635,10 @@ class wsMaintenance { } } + public static function getV1Translations() { + wsLang::getV1Translations(); + } + } ?> \ 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 e92c54306..b389d7552 100644 --- 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')); // . $this->fields['pdf'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer les fonctions de téléchargement")); - $this->fields['pdfComplex'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Téchargement de PDF avancé'), 'grade' => 3); - $this->fields['offlineExport'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Téléchargement des versions offline'), 'grade' => 3); + $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); + $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); $this->forms['pdf'] = array('label' => __('Fonction de téléchargement'), 'fieldsnames' => array('pdf', 'pdfComplex', 'offlineExport')); // . diff --git a/inc/ws/Metier/class.ws.lang.php b/inc/ws/Metier/class.ws.lang.php index effdf1fba..52c91b7ab 100644 --- 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, 'one page per sheet' => 27, 'two pages per sheet' => 28, - 'print' => 29, + 'print-' => 29, 'close' => 30, 'your name' => 31, 'the message' => 32, @@ -91,6 +91,8 @@ class wsLang extends cubeMetier { $new++; } } + $res[29] = $res[5]; + ksort($res); return $res; } @@ -115,6 +117,34 @@ class wsLang extends cubeMetier { return $xml; } + public static function getV1Translations() { + global $core; + $r = $core->con->select('SELECT * FROM langues'); + while ($r->fetch()) { + $trads = json_decode($r->traductions, true); + $xml = simplexml_load_file('http://ws.fluidbook.com/lang/' . $r->lang_id . '/lang.xml'); + if ($xml === false) { + continue; + } + + $i = 1; + foreach ($xml as $tradText) { + $t = (string) $tradText; + $transid = array_search($i, self::$idtonew); + if (!isset($trads[$transid])) { + $trads[$transid] = $t; + } + + $i++; + } + + + $c = $core->con->openCursor('langues'); + $c->traductions = json_encode($trads); + $c->update('WHERE lang_id = \'' . $core->con->escape($r->lang_id) . '\''); + } + } + } ?> \ No newline at end of file diff --git a/inc/ws/Util/packager/_common.php b/inc/ws/Util/packager/_common.php index 0f48af8ff..94ebde2d9 100644 --- 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'; $__autoload['wsPackagerHTML'] = dirname(__FILE__) . '/class.ws.packager.html.php'; $__autoload['wsPackagerWinEXE'] = dirname(__FILE__) . '/class.ws.packager.win.exe.php'; +$__autoload['wsPackagerWinINST'] = dirname(__FILE__) . '/class.ws.packager.win.inst.php'; $__autoload['wsPackagerWinCD'] = dirname(__FILE__) . '/class.ws.packager.win.cd.php'; $__autoload['wsPackagerMacEXE'] = dirname(__FILE__) . '/class.ws.packager.mac.exe.php'; $__autoload['wsPackagerAIR'] = dirname(__FILE__) . '/class.ws.packager.air.php'; diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php index b0e9a445f..63a26b99c 100644 --- 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() { parent::preparePackage(); - if ($this->book->parametres->offlineExport) { + if ($this->book->parametres->offlineExport && $this->book->parametres->pdfComplex) { $versions = array('win-ins' => 'exe', 'mac-exe' => 'zip'); foreach ($versions as $v => $ext) { $a = wsPackager::package($this->book_id, $v); diff --git a/inc/ws/Util/packager/class.ws.packager.v1.php b/inc/ws/Util/packager/class.ws.packager.v1.php index 90d8d4e36..5f808b9e9 100644 --- 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() { -- 2.39.5