From be9da4334960971a6213ebcde329a4902b985e42 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Wed, 5 May 2021 17:01:48 +0000 Subject: [PATCH] wait #4452 @1.5 --- inc/ws/Controlleur/class.ws.maintenance.php | 4 +-- inc/ws/Metier/class.ws.book.parametres.php | 13 ++++++--- inc/ws/Metier/class.ws.document.php | 5 ++-- .../Util/packager/class.ws.packager.html.php | 29 ++++--------------- .../packager/class.ws.packager.phonegap.php | 2 -- inc/ws/Util/packager/class.ws.packager.php | 5 +++- 6 files changed, 24 insertions(+), 34 deletions(-) diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php index 4450d3ba6..f0c2f65e1 100644 --- a/inc/ws/Controlleur/class.ws.maintenance.php +++ b/inc/ws/Controlleur/class.ws.maintenance.php @@ -1109,7 +1109,7 @@ class wsMaintenance public static function installWescoVentes() { $exporter = new wsExporter(); - $exporter->export(18479, $x, 'install_ftp', 'online', "wescogrolj-catalogca:b9uA7U72eW@ftp.cluster023.hosting.ovh.net", ''); + $exporter->export(19670, $x, 'install_ftp', 'online', "wescogrolj-catalogca:b9uA7U72eW@ftp.cluster023.hosting.ovh.net", ''); header('Location: https://agefard:TB6x9gg9@wesco-group.com/download/Catalogues/Wesco_Rapport_ventes_0-12-ans/'); exit; } @@ -1490,7 +1490,7 @@ class wsMaintenance $eans = array_unique($eans); sort($eans); - $working = WS_BOOKS . '/working/' . $book . '/commerce/opt/'; + $working =wsBook::getAssetDirOfBook($book,'/commerce/opt/'); $res = [['EAN', 'front', 'angle', '360']]; foreach ($eans as $ean) { $res[] = [$ean . " ", file_exists($working . '/' . $ean . '-front.jpg') ? 'Y' : 'N', file_exists($working . '/' . $ean . '-angle.jpg') ? 'Y' : 'N', file_exists($working . '/' . $ean . '-360.mp4') ? 'Y' : 'N']; diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index 2c52bae67..5e8fcb62c 100644 --- a/inc/ws/Metier/class.ws.book.parametres.php +++ b/inc/ws/Metier/class.ws.book.parametres.php @@ -219,6 +219,12 @@ class wsBookParametres extends wsParametres 'fieldsnames' => ['assetsDir', 'linksAssets'] ]; /** * */ + $this->fields['stats'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les statistiques Fluidbook'), 'grade' => 3); + $this->fields['googleAnalytics'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Code Google Analytics'), 'size' => 10); + $this->forms['basicStats']=[ + 'label'=>__('Statistiques'), + 'fieldsnames'=>['stats','googleAnalytics'], + ]; $this->fields['email_title'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Titre de l'email") . ' "' . __('Envoyer à un ami') . '"', 'hint' => __('Laisser vide pour utiliser la valeur par défaut')); $this->fields['email_body'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __("Corps de l'email") . ' "' . __('Envoyer à un ami') . '"', 'hint' => __('Laisser vide pour utiliser la valeur par défaut')); @@ -433,11 +439,10 @@ class wsBookParametres extends wsParametres $this->forms['zoom'] = array('label' => __('Zoom'), 'fieldsnames' => array('zoomWheel', '|', 'zoom', 'zoomw')); // . - $this->fields['stats'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Activer les statistiques Fluidbook'), 'grade' => 3); + $this->fields['stats_score'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Afficher les scores dans les rapports'), 'grade' => 5); $this->fields['stats_exclude_ip'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Exclure les IP suivantes des statistiques'), 'grade' => 3, 'hint' => sprintf(__('Indiquer une adresse ip de la forme %s par ligne'), 'www.xxx.yyy.zzz')); $this->fields['relay_url_params'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Relayer les paramètres d\'url dans les liens sortants'), 'grade' => 3]; - $this->fields['googleAnalytics'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Code Google Analytics'), 'size' => 10); $this->fields['gtag_additional_code'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Code additionnel Google Tag Manager')); $this->fields['googleAnalyticsCustom'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Code Stats personnalisé (placé avant fermeture de head)')); $this->fields['statsCustom'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Code Stats personnalisé (placé avant fermeture du body)')); @@ -447,8 +452,8 @@ class wsBookParametres extends wsParametres $this->fields['tagcommander_prod'] = ['type' => 'boolean', 'default' => true, 'editable' => true, 'label' => 'Production', 'grade' => 3]; $this->fields['tagcommander_plan'] = ['type' => 'freefile', 'default' => '', 'editable' => true, 'label' => 'Plan de taggage "Tag commander"', 'grade' => 3]; $this->fields['tagcommander_default_vars'] = ['type' => 'textarea', 'default' => '', 'editable' => true, 'label' => 'Variables par défaut', 'grade' => 3]; - $this->forms['stats'] = array('label' => __('Statistiques'), - 'fieldsnames' => array('stats', 'stats_score', 'stats_exclude_ip', '|', 'relay_url_params', '|', 'googleAnalytics', 'gtag_additional_code', '|', 'googleAnalyticsCustom', 'statsCustom', '|', 'xiti', 'xiti_page', '|', 'tagcommander_id', 'tagcommander_prod', 'tagcommander_plan', 'tagcommander_default_vars')); + $this->forms['stats'] = array('label' => __('Statistiques avancées'), + 'fieldsnames' => array( 'stats_score', 'stats_exclude_ip', '|', 'relay_url_params', '|', 'gtag_additional_code', '|', 'googleAnalyticsCustom', 'statsCustom', '|', 'xiti', 'xiti_page', '|', 'tagcommander_id', 'tagcommander_prod', 'tagcommander_plan', 'tagcommander_default_vars')); $this->fields['displayChaptersPopup'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Always display chapters in a popup'), 'grade' => 1); $this->fields['displayChaptersIcon'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Affiche l'icône du sommaire"), 'grade' => 1); diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php index 0839cdbb1..ae37c2071 100644 --- a/inc/ws/Metier/class.ws.document.php +++ b/inc/ws/Metier/class.ws.document.php @@ -597,8 +597,9 @@ class wsDocument extends cubeMetier public function makeTextSVGFile($page, $out, $force = false) { $in = $this->makeSVGFile($page); - wsPDFConvert::makeTextSVGFile($in, $out); - wsTools::optimizeSVG($out, $out); + $inter = str_replace('to', 'tp', $out); + wsPDFConvert::makeTextSVGFile($in, $inter); + wsTools::optimizeSVG($inter, $out); } public function makeOptimizedSVGFile($page, $resolution, $out) diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php index 6a77db49c..078985409 100644 --- a/inc/ws/Util/packager/class.ws.packager.html.php +++ b/inc/ws/Util/packager/class.ws.packager.html.php @@ -8,6 +8,7 @@ class wsPackagerHTML extends wsPackager protected $_allowNeworking = 'all'; protected $_ext = 'html'; protected $_disableScorm = true; + protected $_compileOnConstruct = false; public function __construct($book_id, $vdir = null, $whole = true) { @@ -15,16 +16,6 @@ class wsPackagerHTML extends wsPackager $this->version = 'html'; } - protected function getMinFlashVersion() - { - return '10.0.22'; - } - - protected function getSWFFiles() - { - return array('index.swf', 'player.swf'); - } - protected function preparePackage() { parent::preparePackage(); @@ -40,10 +31,10 @@ class wsPackagerHTML extends wsPackager $this->copyFluidbookFiles(); $this->mergeJavascript(); - $others = array('fluidbook.js', 'getflash.gif', 'index.html', 'style.css'); - $others = array_merge($others, $this->getSWFFiles()); - - $this->copyOtherFiles($others); +// $others = array('fluidbook.js', 'getflash.gif', 'index.html', 'style.css'); +// $others = array_merge($others, $this->getSWFFiles()); +// +// $this->copyOtherFiles($others); if (!file_exists($this->vdir . '/pages')) { mkdir($this->vdir . '/pages/', 0777, true); @@ -130,19 +121,11 @@ class wsPackagerHTML extends wsPackager 'statsfooter' => $statsfooter, 'facebook' => $facebook, 'bgcolor' => $this->theme->parametres->loadingBackColor, - 'redirectMobile' => $redirectMobile, - 'redirectPDF' => $redirectPDF, 'junk' => TIME, 'robots' => $robots, 'favicon' => $favicon, - 'flashversion' => $this->getMinFlashVersion(), - 'fv' => json_encode($this->getFlashvars()), 'alwaysHTML5' => $alwaysHTML5, 'keywords' => $keywords, - 'allowNetworking' => $this->_allowNeworking, - 'redirectIfFlashNotInstalled' => in_array($html5priority, array('true', 'notinstalled')) ? 'true' : 'false', - 'redirectIfFlashBlocked' => $html5priority == 'true' ? 'true' : 'false', - 'flash_blocked_wait' => $this->book->parametres->flashBlockedWait, ); $this->origHTML = $this->book->parametres->htmlPrepend . file_get_contents($this->vdir . '/index.html'); @@ -292,7 +275,7 @@ class wsPackagerHTML extends wsPackager // $filesToDelete[] = 'data/background/*/p*.jpg'; // $filesToDelete[] = 'data/contents/p*.svg'; // } - $htmlFiles = array('index', 'widget'); + $htmlFiles = array('index'); foreach ($htmlFiles as $name) { $html = $book->parametres->htmlPrepend . file_get_contents($dest . '/' . $name . '.html'); diff --git a/inc/ws/Util/packager/class.ws.packager.phonegap.php b/inc/ws/Util/packager/class.ws.packager.phonegap.php index c23ee9c51..599ddbfc6 100644 --- a/inc/ws/Util/packager/class.ws.packager.phonegap.php +++ b/inc/ws/Util/packager/class.ws.packager.phonegap.php @@ -311,5 +311,3 @@ function imagecreatefromfile($file) { $function = "imagecreatefrom" . $format; return $function($file); } - -?> diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php index 10b8d02fe..4d4e88464 100644 --- a/inc/ws/Util/packager/class.ws.packager.php +++ b/inc/ws/Util/packager/class.ws.packager.php @@ -16,6 +16,7 @@ class wsPackager protected $workingDir; protected $whole = true; protected $_clean = true; + protected $_compileOnConstruct=true; public $cleanOnDestruct = true; public static function package($book_id, $version, $zip = true, $cleanOnDestruct = true) @@ -73,7 +74,9 @@ class wsPackager $this->workingDir = $this->book->getAssetDir(); - $this->compile(); + if($this->_compileOnConstruct) { + $this->compile(); + } } protected function compile() -- 2.39.5