From: vincent@cubedesigners.com Date: Mon, 10 Jan 2022 14:30:48 +0000 (+0000) Subject: wip #5010 @1.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=09b7c5a077f74f1046ab738822bea64c69152988;p=cubeextranet.git wip #5010 @1.5 --- diff --git a/inc/ws/Util/html5/master/class.ws.html5.links.php b/inc/ws/Util/html5/master/class.ws.html5.links.php index b2a666cba..c07495b9d 100644 --- a/inc/ws/Util/html5/master/class.ws.html5.links.php +++ b/inc/ws/Util/html5/master/class.ws.html5.links.php @@ -396,15 +396,26 @@ class wsHTML5Link public static function isScorm($linkData) { - return (isset($linkData['scorm']) && $linkData['scorm']) || (self::_isScormLink($linkData['to']) || (isset($linkData['alternative']) && self::_isScormLink($linkData['alternative']))); + if (isset($linkData['scorm']) && $linkData['scorm']) { + return true; + } + if (self::_isScormLink($linkData['to'])) { + return true; + } + if (isset($linkData['alternative']) && self::_isScormLink($linkData['alternative'])) { + return true; + } + return false; } protected static function _isScormLink($url) { - if (strpos($url, 'http://') >= 0 || strpos($url, 'https://') > 0) { - return false; + if (strpos($url, 'http://') !==false || strpos($url, 'https://') !==false) { + $res= false; + }else { + $res = stristr($url, 'scorm'); } - return stristr($url, 'scorm'); + return $res; } public function __construct($id, $init, &$compiler) @@ -1808,7 +1819,7 @@ class inlineSlideshowLink extends slideshowLink public function getAdditionnalContent() { - return parent::getAdditionnalContent(). ' data-slideshow-lib="'.$this->compiler->book->parametres->inlineSlideshowLibrary.'"'; + return parent::getAdditionnalContent() . ' data-slideshow-lib="' . $this->compiler->book->parametres->inlineSlideshowLibrary . '"'; } public function keep()