From a94f92be740c5bf7bb6b6ea2a2ac1215233c7b7a Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Thu, 28 Jun 2018 17:19:06 +0000 Subject: [PATCH] wip #2116 @3 --- inc/ws/Metier/class.ws.book.parametres.php | 7 +- inc/ws/Util/class.ws.util.php | 45 +- .../class.ws.html5.compiler.php | 176 +- .../html5/diaporama/class.ws.html5.links.php | 1644 ----------------- .../Util/packager/class.ws.packager.html.php | 4 +- 5 files changed, 167 insertions(+), 1709 deletions(-) rename inc/ws/Util/html5/{diaporama => advancedseo}/class.ws.html5.compiler.php (95%) delete mode 100644 inc/ws/Util/html5/diaporama/class.ws.html5.links.php diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index ee9ac8cf5..5af5e9fe9 100644 --- a/inc/ws/Metier/class.ws.book.parametres.php +++ b/inc/ws/Metier/class.ws.book.parametres.php @@ -57,6 +57,10 @@ class wsBookParametres extends wsParametres $soundFilter->name = __('Fichier sonore') . ' (*.mp3, *.wav)'; $soundFilter->extensions = '*.mp3;*.wav'; + $seoFilter = new stdClass(); + $seoFilter->name = __('Fichier Excel') . ' (.xlsx)'; + $seoFilter->extensions = '*.xlsx'; + $branches = array('master : git (stable)' => 'stable', 'master : local (dev)' => 'dev'); $gitbranches = json_decode(file_get_contents(WS_CACHE . '/activebranches')); @@ -479,9 +483,10 @@ class wsBookParametres extends wsParametres $this->fields['seoRobots'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Autoriser le parcours par les moteurs de recherche')); $this->fields['seoDescription'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Meta tag Description')); $this->fields['seoKeywords'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Meta tag Keywords')); + $this->fields['seoAdvanced'] = ['type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Données SEO par page'), 'grade' => 5, 'fileFilter' => $seoFilter]; $this->forms['seo'] = array('label' => __('Optimisation pour les moteurs de recherche'), - 'fieldsnames' => array('seoVersion', 'seoRobots', 'seoDescription', "seoKeywords")); + 'fieldsnames' => array('seoVersion', 'seoRobots', 'seoDescription', "seoKeywords", '|', 'seoAdvanced')); $this->fields['home'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Accueil de l'interface multibrochure"), 'grade' => 5); $this->fields['multilang'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Langues'), 'hint' => __('Code langue') . ',' . __('Code pays') . ',' . __('URL')); diff --git a/inc/ws/Util/class.ws.util.php b/inc/ws/Util/class.ws.util.php index dfde704b8..209bffb0f 100644 --- a/inc/ws/Util/class.ws.util.php +++ b/inc/ws/Util/class.ws.util.php @@ -2,16 +2,25 @@ class wsUtil { - public static function excelToArray($excelFile) + public static function excelToArray($excelFile, $assoc = false) { $worksheets = array(); + if ($assoc) { + $cacheBase = WS_CACHE . '/xlsx2assocarray/'; + } else { + $cacheBase = WS_CACHE . '/xlsx2array/'; + } + if (!file_exists($cacheBase)) { + mkdir($cacheBase, 0777, true); + } + if (CubeIT_Util_Url::isDistant($excelFile)) { $tmp = CubeIT_Files::tempnam(); copy($excelFile, $tmp); $hash = hash_file('sha256', $tmp); - $dest = WS_CACHE . '/xlsx2array/' . $hash . '.xlsx'; + $dest = $cacheBase . $hash . '.xlsx'; if (!file_exists($dest)) { copy($tmp, $dest); @@ -22,9 +31,9 @@ class wsUtil return array(); } - $cacheFile = WS_CACHE . '/xlsx2array/' . sha1($excelFile . '/' . filemtime($excelFile)); + $cacheFile = $cacheBase . sha1($excelFile . '/' . filemtime($excelFile)); - if (file_exists($cacheFile)) { + if (file_exists($cacheFile) && !$assoc) { $worksheets = json_decode(file_get_contents($cacheFile), true); } else { set_time_limit(0); @@ -41,7 +50,11 @@ class wsUtil $title = cubeCountry::getCountry($title); } - $worksheets[$title] = $worksheet->toArray(null, true, true); + if ($assoc) { + $worksheets[$title] = $worksheet->toArray(null, true, true); + } else { + $worksheets[$title] = self::_assocSheet($worksheet->toArray(null, true, true)); + } } file_put_contents($cacheFile, json_encode($worksheets)); } @@ -49,6 +62,28 @@ class wsUtil return $worksheets; } + protected static function _assocSheet($s) + { + $res = []; + $colslabels = []; + foreach ($s[0] as $j => $collabel) { + if (trim($collabel) == '') { + continue; + } + $colslabels[$j] = $collabel; + } + for ($i = 1; $i < count($s); $i++) { + $r = []; + foreach ($colslabels as $j => $collabel) { + $r[$collabel] = $s[$i][$j]; + } + $res[] = $r; + } + + return $res; + } + + public static function atlanticReferences($references, $dir, $log = null, $copy = 'copy') { if (!file_exists($dir)) { diff --git a/inc/ws/Util/html5/diaporama/class.ws.html5.compiler.php b/inc/ws/Util/html5/advancedseo/class.ws.html5.compiler.php similarity index 95% rename from inc/ws/Util/html5/diaporama/class.ws.html5.compiler.php rename to inc/ws/Util/html5/advancedseo/class.ws.html5.compiler.php index 1867c1761..559a8ba88 100644 --- a/inc/ws/Util/html5/diaporama/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/advancedseo/class.ws.html5.compiler.php @@ -1,6 +1,7 @@ array('ExternalFileUtil'), - 'android' => array('webintent')); + 'android' => array('webintent')); public $pluginCSS = array(); public $pluginJs = array(); public $htmlmultimedia = array(); @@ -161,9 +162,11 @@ class wsHTML5Compiler { protected $beginBody = array(); protected $seoArticles = []; protected $securityPolicyWhitelist = ['*.google-analytics.com', '*.youtube.com', '*.ytimg.com']; + protected $seoAdvanced = null; - function __construct($book_id, $version = 'stable', $phonegap = false, $phonegapVersion = 'latest', $dir = null, $standalone = false, $appcache = false, $home = false) { + function __construct($book_id, $version = 'stable', $phonegap = false, $phonegapVersion = 'latest', $dir = null, $standalone = false, $appcache = false, $home = false) + { global $core; $this->phonegapVersion = wsHTML5::getPhonegapVersion($phonegapVersion); @@ -245,13 +248,15 @@ class wsHTML5Compiler { $this->log('Defined dimensions'); } - public function initConfig() { + public function initConfig() + { $this->config = cubeObject::merge($this->book->parametres->toStandardObject(), $this->theme->parametres->toStandardObject()); $this->config->rasterizePages = cubeArray::parseRange($this->config->rasterizePages); $this->config->vectorPages = array_diff(cubeArray::parseRange($this->config->vectorPages), $this->config->rasterizePages); } - public function log($step) { + public function log($step) + { $currenttime = microtime(true); if (null === $this->logfp) { $this->logfp = fopen('/var/log/extranet/htmlconversions/' . $this->book_id . '.log', 'w+'); @@ -266,7 +271,8 @@ class wsHTML5Compiler { $this->logtime = $currenttime; } - public function addFacebookSDK() { + public function addFacebookSDK() + { $lang = str_replace('-', '_', $this->book->lang); $e = explode('_', $lang); if (count($e) > 1) { @@ -292,11 +298,13 @@ class wsHTML5Compiler { $this->securityPolicyWhitelist[] = 'data:'; } - public function addPageLabel($page, $label) { + public function addPageLabel($page, $label) + { $this->pageLabels[$label] = $page; } - public function getResolutions() { + public function getResolutions() + { $res = []; foreach (self::$resolutions as $r) { if ($r > $this->maxRes) { @@ -310,11 +318,13 @@ class wsHTML5Compiler { return $res; } - public function getCssScale() { + public function getCssScale() + { return $this->cssScale; } - public function virtualToPhysical($virtual) { + public function virtualToPhysical($virtual) + { if (isset($this->pageLabels[$virtual])) { return $virtual; } @@ -325,7 +335,8 @@ class wsHTML5Compiler { return $p + 1; } - public function compile($delete = true) { + public function compile($delete = true) + { $this->log('Start compile process'); @@ -362,7 +373,8 @@ class wsHTML5Compiler { $this->log('Files Synced'); } - protected function loadPlugins() { + protected function loadPlugins() + { $e = explode("\n", $this->book->parametres->mobilePlugins); $main = array_pop($this->jsFiles); @@ -400,7 +412,8 @@ class wsHTML5Compiler { array_push($this->jsFiles, $main); } - public function getVideosFormats($poster = true) { + public function getVideosFormats($poster = true) + { $res = []; // // if (!$this->phonegap) { @@ -426,7 +439,8 @@ class wsHTML5Compiler { * Duplicate paths are ignored. * @param $path */ - public function addJs($path, $collection = null) { + public function addJs($path, $collection = null) + { if (null === $collection) { // If JS is external, it will be included via the pluginJs collection @@ -445,20 +459,23 @@ class wsHTML5Compiler { * @param $path The path of the file relative to the /style folder, without any extension * @param $extra_files Optional array of extra files that should be copied across for use during LESS compilation */ - public function addLess($path) { + public function addLess($path) + { if (!in_array($path, $this->lessFiles)) { $this->lessFiles[] = $path; } } - protected function writeSounds() { + protected function writeSounds() + { if ($this->book->parametres->soundTheme == '') { return; } $this->vdir->copyDirectory(WS_SOUNDS . '/' . $this->book->parametres->soundTheme, 'data/sounds'); } - protected function writeIndex() { + protected function writeIndex() + { global $core; $html = file_get_contents($this->assets . '/_index.html'); @@ -471,9 +488,9 @@ class wsHTML5Compiler { $signature = $daoSignature->selectById($this->book->parametres->signature); $exportSignature = array('main' => $signature->main, - 'mainLink' => $signature->mainLink, - 'partner' => $signature->partner, - 'partnerLink' => $signature->partnerLink); + 'mainLink' => $signature->mainLink, + 'partner' => $signature->partner, + 'partnerLink' => $signature->partnerLink); $credits = ''; if ($signature->partner != '') { @@ -676,7 +693,8 @@ class wsHTML5Compiler { } } - function writeSEO() { + function writeSEO() + { foreach ($this->seoArticles as $seoArticle) { $html = file_get_contents($this->assets . '/_seo.html'); $a = $seoArticle; @@ -693,6 +711,19 @@ class wsHTML5Compiler { } $this->vdir->file_put_contents('p/' . $seoArticle['url'], $html); } + + // Define default seo contents + $seoContents = []; + + foreach ($this->pages as $page => $infos) { + $c = ['page' => $page, + 'text' => file_get_contents(wsDocument::getDir($infos['document_id']) . 'h' . $infos['document_page'] . '.txt')]; + $seoContents[$page] = $c; + } + + if ($this->book->parametres->seoAdvanced) { + $this->seoAdvanced = wsUtil::excelToArray($this->wdir . '/' . $this->book->parametres->seoAdvanced,true); + } } protected function writeScorm() @@ -713,6 +744,7 @@ class wsHTML5Compiler { if (!$this->book->parametres->scorm_org) { $this->book->parametres->scorm_org = 'Fluidbook'; } + $vars = array('scorm_id', 'scorm_org', 'scorm_title'); foreach ($vars as $v) { $manifest = str_replace('$' . $v, $this->book->parametres->$v, $manifest); @@ -735,7 +767,8 @@ class wsHTML5Compiler { } } - protected function writePrint() { + protected function writePrint() + { if (!$this->book->parametres->print && !$this->book->parametres->pdf) { return; @@ -745,7 +778,8 @@ class wsHTML5Compiler { return ''; } - protected function addFilesInfos($key, $file) { + protected function addFilesInfos($key, $file) + { if (!file_exists($file)) { return; } @@ -761,7 +795,8 @@ class wsHTML5Compiler { $this->config->filesInfos[$key] = $infos; } - protected function __($str) { + protected function __($str) + { if (!isset($this->config->l10n)) { $this->writeLangs(); } @@ -773,7 +808,8 @@ class wsHTML5Compiler { } } - protected function writeLangs() { + protected function writeLangs() + { global $core; $daoLang = new wsDAOLang($core->con); $lang = $daoLang->selectById($this->book->lang); @@ -814,7 +850,8 @@ class wsHTML5Compiler { } } - protected function writeExtras() { + protected function writeExtras() + { if ($this->theme->parametres->afterSearch != '') { $this->vdir->copy($this->themeRoot . '/' . $this->theme->parametres->afterSearch, 'data/images/' . $this->theme->parametres->afterSearch); } @@ -840,7 +877,8 @@ class wsHTML5Compiler { } - protected function writeLinks() { + protected function writeLinks() + { global $core; if ($this->book->parametres->customLinkClass == 'WescoSalesLink') { @@ -979,11 +1017,13 @@ class wsHTML5Compiler { return $css; } - public function addSEOArticle($page, $title, $intro, $image) { + public function addSEOArticle($page, $title, $intro, $image) + { $this->seoArticles[$title] = ['title' => $title, 'description' => $intro, 'image' => $image, 'content' => '', 'page' => $page, 'url' => CubeIT_Text::str2URL($title) . '.html']; } - public function _sortLinks($a, $b) { + public function _sortLinks($a, $b) + { $priorities = array(26 => 1); $pa = isset($priorities[$a['type']]) ? $priorities[$a['type']] : 0; @@ -991,7 +1031,8 @@ class wsHTML5Compiler { return $pb - $pa; } - public function addBookmarkGroup($link) { + public function addBookmarkGroup($link) + { if ($link['left'] > $this->book->parametres->width) { //$link['page']++; } @@ -1002,12 +1043,14 @@ class wsHTML5Compiler { $this->config->bookmarkGroups[] = array('page' => ($link['page']), 'nb' => $link['to'], 'name' => $link['extra']); } - public function addAudiodescription($link) { + public function addAudiodescription($link) + { $this->config->audiodescription[$link['page']] = $link['to']; $this->copyLinkFile($link['to'], 'data/audiodescription/'); } - protected function writeJs() { + protected function writeJs() + { $config = $this->writeConfig(); $this->vdir->file_put_contents('data/datas.js', $config); $finals = array('fluidbook' => $this->jsFiles); @@ -1085,7 +1128,8 @@ class wsHTML5Compiler { } - public function writeTexts() { + public function writeTexts() + { $this->daoBook->makeTextsIndexes($this->book, $this->pages, $index, $textes, true); $this->vdir->file_put_contents('data/search.index.js', 'var INDEX=' . $index . ';' . "\r"); if ($this->book->parametres->highlightResults) { @@ -1096,7 +1140,8 @@ class wsHTML5Compiler { } } - public function supportSVG() { + public function supportSVG() + { if (!$this->phonegap) { return false; } else if ($this->phonegap == 'ios') { @@ -1106,7 +1151,8 @@ class wsHTML5Compiler { } } - protected function writeConfig() { + protected function writeConfig() + { $this->config->numerotation = explode(',', $this->book->numerotation); $this->config->id = $this->book->book_id; $this->config->cid = $this->book->cid; @@ -1187,11 +1233,13 @@ class wsHTML5Compiler { return 'var DATAS=' . json_encode($this->config) . ';' . "\n"; } - protected function writeManifest() { + protected function writeManifest() + { $res = array(); } - protected function writeIcons() { + protected function writeIcons() + { $res = array(); // Get the colors used to colorize graphics if ($this->theme->parametres->colorizeIcons) { @@ -1209,10 +1257,10 @@ class wsHTML5Compiler { $arrowsColor = $this->theme->parametres->arrowsColor; // Set the icon list with the color $icons = array('interface-down' => $arrowsColor, 'interface-close' => $arrowsColor, - 'interface-audio-description-on' => $arrowsColor, 'interface-audio-description-off' => $arrowsColor, - 'help-fingers' => $couleurI, 'help-mouse' => $couleurI, - 'bookmark-left-off' => $bookmarksDisabledColors, 'bookmark-left-on' => $bookmarksEnabledColors, - 'bookmark-right-off' => $bookmarksDisabledColors, 'bookmark-right-on' => $bookmarksEnabledColors + 'interface-audio-description-on' => $arrowsColor, 'interface-audio-description-off' => $arrowsColor, + 'help-fingers' => $couleurI, 'help-mouse' => $couleurI, + 'bookmark-left-off' => $bookmarksDisabledColors, 'bookmark-left-on' => $bookmarksEnabledColors, + 'bookmark-right-off' => $bookmarksDisabledColors, 'bookmark-right-on' => $bookmarksEnabledColors ); $this->config->iconsDimensions = array(); @@ -1227,7 +1275,8 @@ class wsHTML5Compiler { return $res; } - protected function writeImages() { + protected function writeImages() + { global $core; switch ($this->book->parametres->mobileVersion) { @@ -1309,7 +1358,8 @@ class wsHTML5Compiler { $this->log('Made thumbnails'); } - public function makeThumbSprites(array $thumbs) { + public function makeThumbSprites(array $thumbs) + { $cols = 10; $rows = 10; $perSprite = $cols * $rows; @@ -1346,7 +1396,8 @@ class wsHTML5Compiler { return $res; } - protected function _makeCover($orig) { + protected function _makeCover($orig) + { $size = CubeIT_Image::getimagesize($orig); $w = $size[0]; $h = $size[1]; @@ -1373,11 +1424,13 @@ class wsHTML5Compiler { unlink($tmp); } - protected function _lessBoolean($val) { + protected function _lessBoolean($val) + { return $val ? 'true' : 'false'; } - protected function writeCSS($file, $links) { + protected function writeCSS($file, $links) + { $res = array(); $lessContents = ''; @@ -1581,7 +1634,8 @@ class wsHTML5Compiler { return count($res); } - protected function _writeLess($variables, $lessContents = '') { + protected function _writeLess($variables, $lessContents = '') + { if ($this->widget) { $this->lessFiles[] = 'widget'; } @@ -1633,7 +1687,8 @@ class wsHTML5Compiler { } } - protected function _cssBackground() { + protected function _cssBackground() + { $body = '#background,#splash{'; $body .= 'background-color:#' . $this->theme->parametres->backgroundColor . ' !important;'; switch ($this->theme->parametres->repeat) { @@ -1694,7 +1749,8 @@ class wsHTML5Compiler { return $body; } - public static function writeCSSUA($property, $value) { + public static function writeCSSUA($property, $value) + { $res = array(); foreach (self::$uaPrefixes as $prefix) { $res[] = $prefix . $property . ':' . $value; @@ -1702,7 +1758,8 @@ class wsHTML5Compiler { return implode(';', $res); } - protected function base62($val) { + protected function base62($val) + { $chars = '0123456789abcdefghijklmnopqrstuvwxyz'; $base = strlen($chars); $str = ''; @@ -1714,11 +1771,13 @@ class wsHTML5Compiler { return $str; } - public function copyLinkDir($source, $dest) { + public function copyLinkDir($source, $dest) + { $this->vdir->copyDirectory($source, $dest); } - public function simpleCopyLinkFile($source, $dest, $addVdir = true) { + public function simpleCopyLinkFile($source, $dest, $addVdir = true) + { if ($addVdir) { $dest = $dest; } @@ -1739,11 +1798,11 @@ class wsHTML5Compiler { $this->addLess('videojs/videojs'); } - public function copyLinkFile($source, $dest, $video = false) { + public function copyLinkFile($source, $dest, $video = false) + { if ($video && $this->book->parametres->mobileVideosPath != '') { } - $origDir = $this->wdir; $types = $this->getVideosFormats(); if ($video) { @@ -1770,12 +1829,14 @@ class wsHTML5Compiler { } } - public function __destruct() { + public function __destruct() + { } - public function unzipFile($file, $moveAssets = false, $baseDir = null) { + public function unzipFile($file, $moveAssets = false, $baseDir = null) + { $fdir = is_null($baseDir) ? 'data/links/' . str_replace('.', '_', $file) : $baseDir; $tmp = CubeIT_Files::tmpdir(); @@ -1799,7 +1860,8 @@ class wsHTML5Compiler { return array('dir' => $dir, 'fdir' => $fdir); } - public function getConfigZIP($d) { + public function getConfigZIP($d) + { $res = array('width' => 0, 'height' => 0); if (file_exists($d . '/index.html')) { $doc = new DOMDocument(); diff --git a/inc/ws/Util/html5/diaporama/class.ws.html5.links.php b/inc/ws/Util/html5/diaporama/class.ws.html5.links.php deleted file mode 100644 index 48d4ec183..000000000 --- a/inc/ws/Util/html5/diaporama/class.ws.html5.links.php +++ /dev/null @@ -1,1644 +0,0 @@ -book->parametres->customLinkClass) { - case 'WescoLink': - return new wescoLink($id, $init, $compiler); - case 'HaguenauManifLink': - return new haguenauManifLink($id, $init, $compiler); - case 'FLFLink': - return new flfLink($id, $init, $compiler); - case 'InpesPopinLink': - return new inpesPopinLink($id, $init, $compiler); - case 'PierronLink': - return new pierronLink($id, $init, $compiler); - case 'WescoSalesLink': - return new wescoSalesLink($id, $init, $compiler); - case 'AtlanticDownloadLink': - return new atlanticDownloadLink($id, $init, $compiler); - } - break; - case 8: - case 9: - return null; - case 10: - if ($init['inline']) { - return new webVideoLink($id, $init, $compiler); - } else { - return new webVideoPopupLink($id, $init, $compiler); - } - case 11: - return new actionLink($id, $init, $compiler); - case 12: - switch ($compiler->book->parametres->basketManager) { - case 'Remarkable': - return new remarkableCartLink($id, $init, $compiler); - break; - default : - return new cartLink($id, $init, $compiler); - break; - } - case 13: // zoom area - return new zoomLink($id, $init, $compiler); - case 14: - return new colorLink($id, $init, $compiler); - case 15: - - if (stristr($init['to'], '.zip')) { - return new inlineSlideshowLink($id, $init, $compiler); - } else { - return new imageLink($id, $init, $compiler); - } - case 16: - return new fileLink($id, $init, $compiler); - case 17: - if ($init['inline']) { - return new audioLink($id, $init, $compiler); - } else { - return new audioPopupLink($id, $init, $compiler); - } - case 18: - return new tooltipLink($id, $init, $compiler); - case 19: - break; - case 20: - $compiler->addBookmarkGroup($init); - break; - case 21: - case 6: - return self::getMultimediaInstance($id, $init, $compiler); - case 23: - return new statsTagLink($id, $init, $compiler); - case 24: - return new phoneLink($id, $init, $compiler); - case 25: - $compiler->addAudiodescription($init); - break; - case 26: - $compiler->addPageLabel($init['page'], $init['to']); - break; - case 27: - return new eventOverlayLink($id, $init, $compiler); - break; - case 29: - return new facebookLikeLink($id, $init, $compiler); - break; - case 30: - return new slideshowLink($id, $init, $compiler); - break; - default: - return null; - } - } - - public static function getMultimediaInstance($id, $init, &$compiler) - { - if ($init['alternative'] == '') { - return null; - } - - $ext = mb_strtolower(files::getExtension($init['alternative'])); - - if (in_array($ext, array('oam', 'zip', 'html')) || substr($init['alternative'], 0, 4) == 'http') { - if ($init['inline']) { - return new htmlMultimediaLink($id, $init, $compiler); - } else { - return new htmlMultimediaPopupLink($id, $init, $compiler); - } - } else if (in_array($ext, array('gif', 'jpeg', 'jpg', 'png', 'svg'))) { - if ($init['inline']) { - return new htmlMultimediaImage($id, $init, $compiler); - } else { - return new htmlMultimediaPopupImage($id, $init, $compiler); - } - } - return null; - } - - public function __construct($id, $init, &$compiler) - { - $this->_init = $init; - foreach ($init as $k => $v) { - if ($k == 'extra' && CubeIT_Util_Json::isJson($v)) { - $v = CubeIT_Util_Json::decode($v); - } - $this->$k = $v; - } - if (!$this->video_width) { - $this->video_width = $this->width; - } - if (!$this->video_height) { - $this->video_height = $this->height; - } - - - if ($this->target == '') { - $this->target = '_blank'; - } - $this->wdir = WS_BOOKS . '/working/' . $compiler->book_id . '/'; - $this->id = $id; - $this->compiler = $compiler; - } - - public function getDefaultTooltip() - { - return false; - } - - public function getTooltip() - { - if (is_null($this->infobulle) || !$this->infobulle) { - if ($this->getDefaultTooltip() === false) { - return; - } - return '~' . $this->getDefaultTooltip(); - } - return $this->infobulle; - } - - public function getHTMLContainer() - { - return '
getAdditionnalContent() . '>' . $this->getHTMLContent() . '
'; - } - - public function getHTMLContainerClass() - { - $res = trim('link ' . $this->class); - if (intval($this->page) % 2 == 1) { - $res .= ' odd'; - } - return $res; - } - - public function getHTMLContent() - { - return ''; - } - - public function getAdditionnalContent() - { - return ''; - - } - - public function getClasses() - { - return array(); - } - - public function copyExternalFile($file, $video = false) - { - $this->compiler->copyLinkFile($file, 'data/links/', $video); - } - - public function copyExternalDir($dir, $dest = 'data/links') - { - $this->compiler->copyLinkDir($dir, $dest); - } - - public function unzipFile($file, $moveAssets = false) - { - return $this->compiler->unzipFile($file, $moveAssets); - } - - public function getCssScale() - { - if (is_int($this->page)) { - return $this->compiler->getCssScale(); - } else { - return 1; - } - } - - public function getCSSZIndex() - { - $zindex = (($this->zindex + 1) * 1000) - min(999, round(($this->width * $this->height) / 300)); - return 'z-index:' . $zindex . ';'; - } - - public function getCSSContainer() - { - if (!($this instanceof contentLink) && intval($this->page) % 2 == 1) { - $this->page--; - $this->left += $this->compiler->width; - } - - $css = '#l_' . $this->id . '{'; - $css .= 'left:' . round($this->left * $this->getCssScale()) . 'px;top:' . round($this->top * $this->getCssScale()) . 'px;'; - $css .= 'width:' . round($this->width * $this->getCssScale()) . 'px;height:' . round($this->height * $this->getCssScale()) . 'px;'; - $css .= $this->getCSSZIndex(); - $origin = false; - if ($this->rot) { - $css .= wsHTML5::writeCSSUA('transform', 'rotate(' . $this->rot . 'deg)'); - $origin = true; - } - if (isset($this->extra->skewX)) { - $css .= wsHTML5::writeCSSUA('transform', 'skewX(' . $this->extra->skewX . 'deg)'); - $origin = true; - } - - $css .= $this->getCSS(); - $css .= '}'; - return $css; - } - - public function getCSS() - { - return ''; - } - - public function keep() - { - return false; - } - - public static function getUniversalLocation($loc, $css = false) - { - $datas = parse_url($loc); - - if (isset($datas['scheme']) && !is_null($datas['scheme']) || strpos($loc, '#') === 0) { - return $loc; - } else { - if ($css) { - return '../links/' . $loc; - } else { - return 'data/links/' . $loc; - } - } - } - -} - -class normalLink extends wsHTML5Link -{ - - public function getHTMLContent() - { - $class = $this->getClasses(); - if ($this->display_area) { - $class[] = 'displayArea'; - } - $c = ''; - if (count($class)) { - $c = ' class="' . implode(' ', $class) . '"'; - } - $tooltip = ''; - $t = $this->getTooltip(); - if ($t !== false) { - $tooltip = ' data-tooltip="' . $t . '"'; - } - return 'getAdditionnalContent() . $this->getTrack() . '>'; - } - - public function getTrack() - { - return ''; - } - - public function getURL() - { - return '#'; - } - - public function getTarget() - { - return '_self'; - } - -} - -class tooltipLink extends normalLink -{ - public function getClasses() - { - return array_merge(array('lazy'), parent::getClasses()); - } - - public function getAdditionnalContent() - { - $res = parent::getAdditionnalContent(); - $res .= ' data-tooltip-maxwidth="' . $this->compiler->book->parametres->linkTooltipMaxWidth . '" '; - $res .= ' data-tooltip-touch="1" '; - return $res; - } - - public function getURL() - { - return '#'; - } -} - -class htmlMultimediaImage extends wsHTML5Link -{ - public $zindex = 2; - - public function getHTMLContainerClass() - { - return parent::getHTMLContainerClass() . ' multimedia notinteractive'; - } - - public function getHTMLContent() - { - $w = $this->width; - $h = $this->height; - $this->copyExternalFile($this->alternative); - $alt = ''; - return $alt; - } - -} - -class htmlMultimediaPopupLink extends htmlMultimediaPopupImage -{ - - public function getAdditionnalContent() - { - $i = $this->_init; - $i['inline'] = true; - $i['in_popup'] = true; - $i['width'] = $i['video_width']; - $i['height'] = $i['video_height']; - - $l = self::getMultimediaInstance($this->id . '_content', $i, $this->compiler); - $markup = $l->getHTMLContainer(); - return ' data-multimedia="' . rawurlencode($markup) . '" '; - } -} - - -class htmlMultimediaPopupImage extends normalLink -{ - - public function getURL() - { - $this->copyExternalFile($this->alternative); - $read = ($this->read_mode) ? 'r_' : ''; - return '#/multimedia/' . $read . md5($this->alternative); - } - - - public function getAdditionnalContent() - { - $res = parent::getAdditionnalContent(); - $dim = getimagesize($this->wdir . '/' . $this->alternative); - - $markup = '
'; - $read = ''; - if ($this->read_mode) { - $read = ' data-readmode="1"'; - } - return $res . ' ' . $read . ' data-multimedia="' . rawurlencode($markup) . '" '; - } - - public function keep() - { - return true; - } - -} - -class contentLink extends wsHTML5Link -{ - public $zindex = 1; - - public function getHTMLContainerClass() - { - return parent::getHTMLContainerClass() . ' contentLink'; - } - -} - -class eventOverlayLink extends wsHTML5Link -{ - public $zindex = 3; - - public function getHTMLContainerClass() - { - return parent::getHTMLContainerClass() . ' eventOverlayLink'; - } - - public function getHTMLContent() - { - return '
'; - } -} - -class webLink extends normalLink -{ - public function getURL() - { - $res = str_replace('"', '\'', wsHTML5Link::getUniversalLocation($this->to)); - return $res; - } - - public function getTarget() - { - if (strpos($this->getURL(), 'javascript:') === 0) { - return '_self'; - } - return $this->target; - } - - public function getTrack() - { - return ' data-track="' . $this->getURL() . '"'; - } - - public function getCSS() - { - - } - - public function getDefaultTooltip() - { - return 'click to open the link'; - } - -} - -class mailLink extends normalLink -{ - - public function getURL() - { - return 'mailto:' . $this->to; - } - - public function getTrack() - { - return ' data-track="' . $this->to . '"'; - } - - public function getTarget() - { - return '_self'; - } - - public function getDefaultTooltip() - { - return 'click to send an e-mail'; - } - -} - -class phoneLink extends mailLink -{ - - public function getURL() - { - return 'tel:' . $this->to; - } - - public function getTarget() - { - return '_blank'; - } - - public function getDefaultTooltip() - { - return 'click to call this number'; - } - -} - -class internalLink extends normalLink -{ - - public function getURL() - { - return '#/page/' . $this->getPage(); - } - - public function getPage() - { - if ($this->numerotation == 'physical') { - return $this->to; - } else { - return $this->compiler->virtualToPhysical($this->to); - } - } - - public function getDefaultTooltip() - { - return 'go to page'; - } - -} - -class videoLink extends wsHTML5Link -{ - public $zindex = 2; - - public static function addVideoJS($compiler) - { - $compiler->addVideoJs(); - } - - public function getClasses() - { - return array_merge(['videoLink'], parent::getClasses()); - } - - public function getHTMLContent() - { - - - $this->copyExternalFile($this->to, true); - - $w = round($this->width * $this->getCssScale()); - $h = round($this->height * $this->getCssScale()); - - // Note: width and height for the video is normally measured from the - // preview frame for local files or set to 1280 x 720 for web videos. - // The $w and $h variables here seem to be null generally... - - return $this->makeVideoTag($this, $w, $h, $this->compiler); - } - - public static function makeVideoTag($linkDatas, $w = null, $h = null, $compiler = null) - { - static::addVideoJS($compiler); - - $attributes = static::getVideoAttributes($linkDatas, $w, $h, $compiler); - - $res = '
$value) { - $res .= " data-{$name}='{$value}'"; - } - $res .= '>
'; - - return $res; - } - - public static function getVideoAttributes($data, $w = null, $h = null, $compiler = null) - { - - $file = $data->to; - $e = explode('.', $file); - $ext = array_pop($e); - $basename = implode('.', $e); - - $attr['name'] = $basename; - $attr['id'] = 'video_' . $data->id; - $attr['autoplay'] = ($data->video_auto_start ? '1' : '0'); - $attr['controls'] = ($data->video_controls ? '1' : '0'); - $attr['loop'] = ($data->video_loop ? '1' : '0'); - $attr['sound'] = ($data->video_sound_on ? '1' : '0'); - - if (!is_null($w) && !is_null($h)) { - $attr['width'] = $w; - $attr['height'] = $h; - - } else if (!is_null($compiler)) { - // Get video dimensions from thumbnail if possible (locally uploaded files) - $path = WS_BOOKS . '/working/' . $compiler->book_id . '/' . $basename . '.jpg'; - $dim = getimagesize($path); - $attr['width'] = $dim[0]; - $attr['height'] = $dim[1]; - } - - return $attr; - } - -} - -class videoPopupLink extends normalLink -{ - - public function getURL() - { - $this->copyExternalFile($this->to, true); - $file = $this->to; - $e = explode('.', $file); - $ext = array_pop($e); - $basename = implode('.', $e); - - return '#/video/' . $basename; - } - - public function getAdditionnalContent() - { - $this->video_auto_start = true; // Videos should always autoplay - return ' data-video="' . rawurlencode(videoLink::makeVideoTag($this, null, null, $this->compiler)) . '" '; - } - - public function keep() - { - return true; - } - - public function getDefaultTooltip() - { - return 'click to play the video'; - } - -} - -class audioPopupLink extends normalLink -{ - - public function getURL() - { - $this->copyExternalFile($this->to, false); - $file = $this->to; - $e = explode('.', $file); - $ext = array_pop($e); - $basename = implode('.', $e); - - return '#/audio/' . $basename; - } - - public function getAdditionnalContent() - { - return ' data-audio="' . rawurlencode(audioLink::makeAudioTag($this, null, null, $this->compiler)) . '" '; - } - - public function keep() - { - return true; - } - - public function getDefaultTooltip() - { - return 'click to play the audio'; - } - -} - -class webVideoLink extends videoLink -{ - - public static function getVideoAttributes($data, $w = null, $h = null, $compiler = null) - { - $attributes = parent::getVideoAttributes($data, $w, $h, $compiler); - - // Since the admin interface doesn't offer options for setting controls or sound, we will set some defaults here - $attributes['controls'] = '1'; - $attributes['sound'] = '1'; - - $attributes['setup'] = static::getVideoSetup($data, $compiler); - - return $attributes; - } - - public static function getVideoSetup($data, $compiler) - { - - static::addVideoJS($compiler); // Ensure videoJS core is included first - - switch ($data->video_service) { - case 0: // YouTube - $compiler->addJs('js/libs/videojs/Youtube.js'); - // $compiler->addJs('https://rawgit.com/videojs/videojs-youtube/master/dist/Youtube.js'); - $setup = [ - 'techOrder' => ['youtube'], - 'sources' => [ - [ - 'type' => 'video/youtube', - 'src' => 'https://www.youtube.com/watch?v=' . $data->to - ] - ] - ]; - break; - case 1: // Dailymotion - // Todo: add local version of script... - // Note: this plugin doesn't seem to work currently so it is not included - //$compiler->addJs('https://rawgit.com/benjipott/video.js-dailymotion/master/dist-test/videojs-dailymotion.js'); - $setup = [ - // 'techOrder' => ['dailymotion'], - // 'sources' => [ - // [ - // 'src' => 'http://www.dailymotion.com/video/' . $data->to - // ] - // ] - ]; - break; - case 2: // Vimeo - // Todo: add local version of script... - // Note: Vimeo plugin doesn't seem to be working currently - might need updates to work with latest VideoJS module - //$compiler->addJs('https://rawgit.com/videojs/videojs-vimeo/master/dist/videojs-vimeo.min.js'); - $setup = [ - // 'techOrder' => ['vimeo'], - // 'sources' => [ - // [ - // 'type' => 'vimeo/vimeo', - // 'src' => 'https://www.vimeo.com/' . $data->to - // ] - // ] - ]; - break; - default: - $setup = []; - } - - return json_encode($setup, JSON_UNESCAPED_SLASHES); - - } - - public function getHTMLContent() - { - - if ($this->video_service !== 0) { - return $this->getEmbed(); - } - - $w = round($this->width * $this->getCssScale()); - $h = round($this->height * $this->getCssScale()); - - return $this->makeVideoTag($this, $w, $h, $this->compiler); - } - - public function getEmbed() - { - return ''; - } - - public function getEmbedURL() - { - if ($this->video_service == 0) { - $url = 'https://www.youtube.com/embed/' . $this->to . '?html5=1'; - } elseif ($this->video_service == 1) { - $url = 'https://www.dailymotion.com/embed/video/' . $this->to; - } elseif ($this->video_service == 2) { - $url = 'https://player.vimeo.com/video/' . $this->to; - } elseif ($this->video_service == 3) { - list($playerId, $videoId) = explode('|', $this->to); - $url = 'https://link.brightcove.com/services/player/bcpid' . $playerId . '?bctid=' . $videoId . '&autoStart=false&width=100%25&height=100%25'; - } - return $url; - } - -} - -class actionLink extends internalLink -{ - protected $_share = array('facebook', 'twitter', 'googleplus', 'linkedin', 'viadeo'); - - public function getURL() - { - return '#'; - } - - public function getClasses() - { - if (in_array($this->to, $this->_share)) { - return array_merge(array('share'), parent::getClasses()); - } else { - return parent::getClasses(); - } - } - - public function getAdditionnalContent() - { - $res = parent::getAdditionnalContent(); - if (is_object($this->extra) || is_array($this->extra)) { - $extra = json_encode($this->extra); - } else { - $extra = $this->extra; - } - if ($extra) { - $res .= ' data-extra="' . htmlspecialchars($extra, ENT_QUOTES) . '"'; - } - - if (in_array($this->to, $this->_share)) { - $res .= ' data-service="' . $this->to . '" '; - } else { - $res .= /*parent::getClasses()*/ - ' data-action="' . $this->to . '" '; - } - return $res; - } - - public function getDefaultTooltip() - { - return false; - } - - -} - -class cartLink extends normalLink -{ - - public function getURL() - { - return '#'; - } - - public function getDefaultTooltip() - { - return 'add to cart'; - } - - public function getAdditionnalContent() - { - $res = parent::getAdditionnalContent(); - $res .= 'data-cart-ref="' . $this->to . '" '; - return $res; - } -} - -class remarkableCartLink extends cartLink -{ - -} - -class colorLink extends contentLink -{ - - public function getCSS() - { - return 'background-color:' . wsHTML5::colorToCSS($this->to) . ';'; - } - -} - -class imageLink extends contentLink -{ - - public function getCSS() - { - $this->copyExternalFile($this->to); - return 'background-image:url(' . wsHTML5Link::getUniversalLocation($this->to, true) . ');background-size:100% 100%;background-repeat:no-repeat;'; - } - -} - -class inlineSlideshowLink extends contentLink -{ - public function getHTMLContent() - { - $d = $this->unzipFile($this->to, false); - $this->compiler->vdir->copyDirectory($d['dir'], $d['fdir']); - - $iterator = CubeIT_Files::getRecursiveDirectoryIterator($d['dir']); - - $files = array(); - foreach ($iterator as $f) { - /* @var $f SplFileInfo */ - $files[] = $f->getFilename(); - } - sort($files); - $f = htmlspecialchars(json_encode($files), ENT_QUOTES); - - return '
'; - } -} - -class fileLink extends normalLink -{ - - public function getURL() - { - if ($this->compiler->book->parametres->linkFilePrefix && !CubeIT_Util_Url::isDistant($this->to)) { - return $this->compiler->book->parametres->linkFilePrefix . $this->to; - } - $this->copyExternalFile($this->to); - return wsHTML5Link::getUniversalLocation($this->to); - } - - public function getTarget() - { - return '_blank'; - } - - public function getDefaultTooltip() - { - return 'click to open the file'; - } - -} - -class facebookLikeLink extends wsHTML5Link -{ - public function getHTMLContent() - { - $this->compiler->addFacebookSDK(); - return '
'; - } -} - -class htmlMultimediaLink extends wsHTML5Link -{ - - protected $_config = null; - protected $_content = ''; - protected $_url; - protected $_externalIframe = false; - public $zindex = 2; - - public function getHTMLContent() - { - if ($this->_content == '') { - $ext = files::getExtension($this->alternative); - - if ($ext == 'oam') { - $d = $this->unzipFile($this->alternative, true); - $this->_config = $this->getConfigOAM($d['dir']); - $this->copyExternalDir($d['dir'], $d['fdir']); - } elseif ($ext == 'zip') { - $d = $this->unzipFile($this->alternative, false); - $this->_config = $this->getConfigZIP($d['dir']); - $html = file_get_contents($d['dir'] . '/index.html'); - $html = str_replace('var pRatio = window.devicePixelRatio || 1,', 'var pRatio = 0.5,', $html); - $this->copyExternalDir($d['dir'], $d['fdir']); - $this->_config['lowDef'] = 'index_ld.html'; - $this->compiler->vdir->file_put_contents($d['fdir'] . '/' . $this->_config['lowDef'], $html); - } elseif ($ext == 'html') { - $fdir = 'data/links'; - $dir = $fdir; - - $d = array('fdir' => $fdir, 'dir' => $dir); - - $this->compiler->vdir->copy($this->compiler->wdir . '/' . $this->alternative, $d['dir'] . '/' . $this->alternative); - $this->_config = $this->getConfigHTML($d['dir'], $this->alternative); - $this->copyExternalFile($d['dir'] . '/' . $this->alternative); - } - if (substr($this->alternative, 0, 4) == 'http') { - $this->_url = $this->_externalIframe = $this->alternative; - $this->_config = array('html' => false, 'width' => $this->width, 'height' => $this->height); - } - - if ($this->_config['width'] == 0) { - $this->_config['width'] = $this->width; - } - if ($this->_config['height'] == 0) { - $this->_config['height'] = $this->height; - } - - $res = ''; - if ($this->_config['html']) { - $this->_url = $d['fdir'] . '/' . $this->_config['html']; - if ($this->extra) { - $this->_url .= '?' . $this->extra; - } - - $iw = $this->_config['width']; - $ih = $this->_config['height']; - - $ld = ''; - if (isset($this->_config['lowDef'])) { - $ld = ' data-ld="' . str_replace('index.html', $this->_config['lowDef'], $this->_url) . '" '; - } - - $res = ''; - } - if ($this->_externalIframe !== false) { - $s = $this->in_popup ? 1 : $this->getCssScale(); - $iw = $this->_config['width'] * $s; - $ih = $this->_config['height'] * $s; - $res = ''; - } - - foreach ($this->_config['inject'] as $i) { - $infos = ['path' => 'data/links/' . str_replace('.', '_', $this->alternative) . '/']; - $i = str_replace('$id', '"#l_' . $this->id . '"', $i); - $i = str_replace('$init', CubeIT_Util_Json::encode($infos), $i); - $this->compiler->htmlmultimedia[] = $i; - } - - foreach ($this->_config['injectcss'] as $i) { - - } - - foreach ($this->_config['injectjs'] as $i) { - $this->compiler->pluginJs[] = $d['fdir'] . '/' . $i; - } - - - $this->_content = $res; - } - return $this->_content; - } - - public function getHTMLContainerClass() - { - $res = parent::getHTMLContainerClass() . ' multimedia'; - if (!$this->interactive) { - $res .= ' notinteractive'; - } - - return $res; - } - - - protected function _correctFiles($dir) - { - $files = CubeIT_Files::getRecursiveDirectoryIterator($dir); - foreach ($files as $f) { - /* @var $f SplFileInfo */ - if ($f->getExtension() == 'js') { - $this->_correctFile($f); - } - } - } - - public function getCSSContainer() - { - if (!($this instanceof contentLink) && $this->page % 2 == 1) { - $this->page--; - $this->left += $this->compiler->width; - } - - $css = '#l_' . $this->id . '{'; - $css .= 'left:' . $this->left * $this->getCssScale() . 'px;top:' . $this->top * $this->getCssScale() . 'px;'; - $css .= 'width:' . $this->_config['width'] . 'px;height:' . $this->_config['height'] . 'px;'; - $css .= $this->getCSSZIndex(); - $css .= $this->getCSS(); - $css .= '}'; - if ($this->_externalIframe !== false && $this->in_popup) { - $css .= '#l_' . $this->id . '>iframe{' . wsHTML5::writeCSSUA('transform', 'scale(' . $this->getCssScale() . ')') . '}'; - } - return $css; - } - - public function getCSS() - { - $sx = ($this->width / ($this->_config['width'])) * $this->getCssScale(); - $sy = ($this->height / ($this->_config['height'])) * $this->getCssScale(); - - $res = wsHTML5::writeCSSUA('transform', 'scale(' . $sx . ',' . $sy . ')'); - $res .= wsHTML5::writeCSSUA('transform-origin', '0% 0%'); - - if (!$this->_config['html']) { - return ''; - } - return $res; - } - - public function getConfigZIP($d) - { - return $this->compiler->getConfigZIP($d); - } - - public function getConfigHTML($d, $html) - { - $res = array('width' => $this->video_width, 'height' => $this->video_height); - $r = array('html' => $html, 'inject' => array(), 'injectcss' => array(), 'injectjs' => array()); - - return array_merge($res, $r); - } - - public function getConfigOAM($d) - { - $x = simplexml_load_file($d . '/config.xml'); - $config = (string)$x->oamfile['src']; - $config = str_replace('/Assets', '', $d . '/' . $config); - $x = simplexml_load_file($config, 'SimpleXMLElement', LIBXML_NOCDATA); - $c = CubeIT_Util_Xml::toObject($x); - - $props = array('default-width' => 'width', 'default-height' => 'height', 'html-page' => 'html'); - - - $res = array('inject' => array(), 'injectcss' => array(), 'injectjs' => array(), 'content' => trim($c->content), 'name' => $c->_name, 'assets' => array()); - foreach ($c->properties->property as $p) { - if (isset($props[$p->_name])) { - $res[$props[$p->_name]] = $p->_defaultValue; - } - } - foreach ($c->require as $r) { - if ($r->_type == 'folder') { - continue; - } - $res['assets'][] = $r->_src; - } - return $res; - } - -} - -class webVideoPopupLink extends videoPopupLink -{ - - // public function getURL() { - // if ($this->video_service == 0) { - // $service = 'youtube'; - // } elseif ($this->video_service == 1) { - // $service = 'dailymotion'; - // } elseif ($this->video_service == 2) { - // $service = 'vimeo'; - // } elseif ($this->video_service == 3) { - // $service = 'brightcove'; - // } - // return '#/webvideo/' . $service . '/' . $this->to; - // } - - public function getURL() - { - - switch ($this->video_service) { - case 1: // Dailymotion - return '#/webvideo/dailymotion/' . $this->to; - break; - case 2: // Vimeo - return '#/webvideo/vimeo/' . $this->to; - break; - default: - return '#/video/' . $this->to; - } - } - - public function getAdditionnalContent() - { - $this->video_auto_start = true; // Videos should always autoplay - return ' data-video="' . rawurlencode(webVideoLink::makeVideoTag($this, 1280, 720, $this->compiler)) . '" '; - } - -} - -class audioLink extends wsHTML5Link -{ - - public function getHTMLContent() - { - $this->copyExternalFile($this->to); - - $w = round($this->width * $this->getCssScale()); - $h = round($this->height * $this->getCssScale()); - - return self::makeAudioTag($this, $w, $h, $this->compiler); - } - - public function getCSSContainer() - { - $css = parent::getCSSContainer(); - $css .= '#l_' . $this->id . ' audio{'; - $css .= 'width:' . round($this->width * $this->getCssScale()) . 'px;'; - $css .= 'height:' . round($this->height * $this->getCssScale()) . 'px;'; - $css .= 'display:block;'; - $css .= '}'; - return $css; - } - - public static function makeAudioTag($linkDatas, $w = null, $h = null, $compiler = null) - { - $res = ''; - return $res; - } - -} - -class wescoLink extends normalLink -{ - - public function getURL() - { - return 'https://workshop.fluidbook.com/services/wescoRef?ref=' . $this->to; - } - - public function getTarget() - { - return '_blank'; - } - -} - -class pierronLink extends normalLink -{ - - public function getURL() - { - return 'https://workshop.fluidbook.com/services/pierronRef?ref=' . $this->to; - } - - public function getTarget() - { - return '_blank'; - } - -} - -class wescoSalesLink extends normalLink -{ - public function getUrl() - { - return '#'; - } - - public function getAdditionnalContent() - { - return parent::getAdditionnalContent() . ' data-wescosales-ref="' . $this->to . '" '; - } - - public function getTooltip() - { - return 'Consulter les ventes de ce produit'; - } -} - -class atlanticDownloadLink extends normalLink -{ - public function getUrl() - { - return '#'; - } - - public function getAdditionnalContent() - { - return parent::getAdditionnalContent() . ' data-atlanticdownload-ref="' . $this->to . '" '; - } - - public function getTooltip() - { - return 'Télécharger les documents'; - } -} - -class inpesPopinLink extends htmlMultimediaLink -{ - - public function getHTMLContent() - { - $this->alternative = $this->to; - $c = parent::getHTMLContent(); - - $class = $this->getClasses(); - if ($this->display_area) { - $class[] = 'displayArea'; - } - $c = ''; - if (count($class)) { - $c = ' class="' . implode(' ', $class) . '"'; - } - $tooltip = ''; - $t = $this->getTooltip(); - if ($t !== false) { - $tooltip = ' data-tooltip="' . $t . '"'; - } - return 'getAdditionnalContent() . '>'; - } - - public function getCSSContainer() - { - if (!($this instanceof contentLink) && $this->page % 2 == 1) { - $this->page--; - $this->left += $this->compiler->width; - } - - $css = '#l_' . $this->id . '{'; - $css .= 'left:' . $this->left * $this->getCssScale() . 'px;top:' . $this->top * $this->getCssScale() . 'px;'; - $css .= 'width:' . $this->width * $this->getCssScale() . 'px;height:' . $this->height * $this->getCssScale() . 'px;'; - $css .= $this->getCSSZIndex(); - if ($this->rot) { - $css .= wsHTML5::writeCSSUA('transform', 'rotate(' . $this->rot . 'deg)'); - $css .= wsHTML5::writeCSSUA('transform-origin', '0% 0%'); - } - $css .= $this->getCSS(); - $css .= '}'; - return $css; - } - - public function getCSS() - { - return ""; - } - - public function getClasses() - { - $res = parent::getClasses(); - $res[] = 'popin'; - return $res; - } - - public function getAdditionnalContent() - { - $res = parent::getAdditionnalContent(); - $res .= ' data-src="' . $this->_url . '" data-width="900" data-height="650"'; - return $res; - } - -} - -class statsTagLink extends wsHTML5Link -{ - public function __construct($id, $init, &$compiler) - { - parent::__construct($id, $init, $compiler); - $this->width = 1; - $this->height = 1; - } - - public function getHTMLContent() - { - return str_replace('%tag%', $this->to, $this->compiler->book->parametres->xiti_page); - } -} - -class flfLink extends wescoLink -{ - - public function getURL() - { - return 'https://workshop.fluidbook.com/services/flfRef?ref=' . $this->to; - } - - public function getTarget() - { - return '_blank'; - } - - public function getTooltip() - { - return 'Accéder à la fiche du stage sur notre site flf.fr'; - } - -} - -class haguenauManifLink extends internalLink -{ - - public function getPage() - { - $fiches = array( - "1" => 7, "2" => 8, "3" => 14, "4" => 16, "5" => 17, "6" => 18, "7" => 19, "8" => 20, "9" => 22, "10" => 23, "11" => 24, "12" => 27 - , "13" => 29, "14" => 32, "15" => 34, "16" => 37, "17" => 38, "18" => 41, "19" => 43, - "20" => 45, "21" => 46, "22" => 52, "23" => 53, "24" => 54, "25" => 56, "26" => 59, "27" => 60 - ); - return $fiches[$this->to]; - } - -} - -class zoomLink extends normalLink -{ - - public function getHTMLContainerClass() - { - return parent::getHTMLContainerClass() . ' zoomarea'; - } - - public function getDefaultTooltip() - { - return 'zoom in'; - } - - public function __construct($id, $init, $compiler) - { - parent::__construct($id, $init, $compiler); - } - - public function getAdditionnalContent() - { - $res = parent::getAdditionnalContent(); - - // Data attributes - $attributes = [ - 'maxzoom' => $this->to, - 'width' => round($this->width), - 'height' => round($this->height) - ]; - - // Set data attributes - foreach ($attributes as $key => $val) { - $res .= ' data-' . $key . '="' . $val . '"'; - } - - $this->generateImage(); - - return $res; - } - - public function generateImage() - { - - $maxzoom = ((int)$this->to !== 0) ? $this->to : 2; // Max zoom level might not always be set in the link editor - $maxzoom = min($maxzoom, 4.166666667); - - // TODO: Consider generating higher-res images (eg. 2x) for HiDPI screens. Maybe some extra optimisations can be done on the larger images... - - $extractOptions = [ - // The Poppler::extractArea function accepts a resolution setting and uses that to determine the - // scale factor on the extracted images. It does so by dividing by 72, so we can pass our own scale - // factor by setting the resolution to 72 * $maxzoom - 'resolution' => 72 * $maxzoom - ]; - - // Round all link co-ordinates because there seems to be a problem with the the Workshop link editor - // where link "left" values (and maybe others) change fractionally upon saves. This causes problems later when - // extracting the zoom images from the PDF because it causes a cache-miss and the images are regenerated again. - $x = round($this->left); - $y = round($this->top); - $w = round($this->width); - $h = round($this->height); - $bookwidth = round($this->compiler->book->parametres->width); - - //error_log("--- Book Width: $bookwidth ---"); - - $p = wsDAOBook::getDocumentPage($this->compiler->book_id, $this->page); - $pdfpath = wsDocument::getDir($p['document_id']) . 'original.pdf'; - - $left = CubeIT_Files::tempnam(); - $leftfile = CubeIT_CommandLine_Poppler::extractArea($pdfpath, - $p['document_page'], - array('x' => $x, 'y' => $y, 'width' => $w, 'height' => $h), - $left, $extractOptions, WS_CACHE . '/zoomarea/' . $this->compiler->book_id . '/'); - - if (($x + $w) > $bookwidth) { - $p = wsDAOBook::getDocumentPage($this->compiler->book_id, $this->page + 1); - $pdfpath = wsDocument::getDir($p['document_id']) . 'original.pdf'; - $diff = ($w + $x) - $bookwidth; - $right = CubeIT_Files::tempnam(); - $rightfile = CubeIT_CommandLine_Poppler::extractArea($pdfpath, - $p['document_page'], - array('x' => 0, 'y' => $y, 'width' => $diff, 'height' => $h), - $right, $extractOptions, WS_CACHE . '/zoomarea/' . $this->compiler->book_id . '/'); - - $both = CubeIT_Files::tempnam() . '.jpg'; - CubeIT_CommandLine_Imagemagick::append(array($leftfile, $rightfile), $both, 'horizontal'); - } else { - $both = $leftfile; - } - - $this->compiler->simpleCopyLinkFile($both, 'data/links/zoom_' . $this->id . '.jpg'); - - // Perform tidy up and delete temporary files if they exist - $files_to_delete = ['left', 'leftfile', 'right', 'rightfile', 'both']; - foreach ($files_to_delete as $file) { - if (isset($$file)) { - $this->compiler->vdir->addTemp($$file); - } - } - } - - - public function getClasses() - { - return array_merge(['zoomPopup'], parent::getClasses()); - } -} - - -class slideshowLink extends normalLink -{ - - protected $path; - protected $path_absolute; - - public function getURL() - { - - if (empty($this->to)) { - return ''; - } - - $d = $this->unzipFile($this->to, false); - $this->copyExternalDir($d['dir'], $d['fdir']); - - $this->path = $d['fdir']; - $this->path_absolute = $this->compiler->vdir->path($d['fdir']); - - return '#/slideshow/' . $this->uid; - } - - public function getAdditionnalContent() - { - return ' data-slideshow="' . rawurlencode($this->generateSlideshow()) . '" '; - } - -// public function keep() { -// return true; -// } - - public function getDefaultTooltip() - { - return 'view slideshow'; - } - - public function generateSlideshow() - { - - $this->compiler->addJs('js/libs/slick/slick.js'); - $this->compiler->addLess('slick/slick-bundle'); - $this->compiler->addLess('fluidbook.slideshow'); - - $extensions = ['jpg', 'png', 'jpeg', 'gif']; - - $slideshowID = 'slideshow_' . $this->uid; - $XML_path = $this->path_absolute . '/slideshow.xml'; // Optional file so it may not exist - - $this->getURL(); - - $slides = []; - // If the zip file contained a slideshow.xml file, use that for fetching images and their captions - if (file_exists($XML_path)) { - $slideshow_XML = simplexml_load_file($XML_path); - $slideshowData = CubeIT_Util_Xml::toObject($slideshow_XML); - foreach ($slideshowData->image as $img) { - $full_path = $this->path_absolute . '/' . $img->_name; - $slides[] = ['caption' => $img->_caption, 'path' => $full_path]; - } - } else { - // Or by default, just get all the images that were in the zip file... - $afiles = CubeIT_Files::getRecursiveDirectoryIterator($this->path_absolute); - - foreach ($afiles as $afile) { - /** @var SplFileInfo $afile */ - if (!$afile->isFile()) { - continue; - } - $ext = mb_strtolower($afile->getExtension()); - if (!in_array($ext, $extensions)) { - continue; - } - $slides[] = ['path' => $afile->getPathname(), 'caption' => null]; - uasort($slides, [$this, '_orderSlidesByFilename']); - } - } - - $res = ''; - foreach ($slides as $slide) { - $res .= '
'; - $res .= ''; - if (null !== $slide['caption']) { - $res .= '

' . $slide['caption'] . '

'; - } - $res .= '
'; // .fb-slideshow-slide - } - - $res = '
' . $res . '
'; - - $res .= ''; - - return $res; - } - - - protected function _orderSlidesByFilename($a, $b) - { - return strcmp($a['path'], $b['path']); - } -} diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php index 20c17ed34..73e953f43 100644 --- a/inc/ws/Util/packager/class.ws.packager.html.php +++ b/inc/ws/Util/packager/class.ws.packager.html.php @@ -174,7 +174,7 @@ class wsPackagerHTML extends wsPackager { } $alt = ''; - $htmlfile = wsDocument::getDir($infos['document_id']) . 'h' . $infos['document_page'] . '.txt'; + if ($seoVersion && CubeIT_Util_Gzip::file_exists($htmlfile)) { $html = CubeIT_Util_Gzip::file_get_contents($htmlfile); @@ -291,7 +291,7 @@ class wsPackagerHTML extends wsPackager { if ($zip) { return $this->zip(); } - return $this->vdir; + return $this->getFinalPackageDir(); } protected function makeHTMLNav($root) { -- 2.39.5