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 b2a666cbaeb3c6e53b9b4d11c1d66a99cb14c8cc..c07495b9dc14bae431ec5dd9a0cc091c9bc01dab 100644 (file)
--- 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()