Version 5.0.4

README.md

@@ -4,14 +4,20 @@
 [![GitHub release](https://img.shields.io/github/release/HitkoDev/Videobox-Joomla.svg)](https://github.com/HitkoDev/Videobox-Joomla/releases/latest)
 [![GitHub total downloads](https://img.shields.io/github/downloads/HitkoDev/Videobox-Joomla/total.svg)](https://github.com/HitkoDev/Videobox-Joomla/releases)
 
-#[Videobox - a lightweight and versitile video player](http://hitko.eu/videobox)
-Videobox is a Joomla! extension for adding video (and audio) to your site. It supports videos from YouTube and Vimeo, as well as music from SoundCloud, Twithc videos and streams, and HTML5 supported video and audio formats. It offers several ways to insert a video, including direct player, pop-up player, and a video gallery. Just put the video link in the Videobox tag and you'll be up & running!
+# [Videobox - a lightweight and versitile video player](https://hitko.eu/videobox)
+Videobox is a Joomla! 3.6 extension for adding video (and audio) to your site. It supports videos from YouTube and Vimeo, as well as music from SoundCloud, Twithc videos and streams, and HTML5 supported video and audio formats. It offers several ways to insert a video, including direct player, pop-up player, and a video gallery. Just put the video link in the Videobox tag and you'll be up & running!
 
-###Box display
-Box display is a great way to insert videos without sacrificing a lot of space for the player. That way it makes your articles straight to the point without unnecessary distractions while keeping the videos right where they belong to. Rather than the huge full-size video player taking up space and distracting the reader, the box display only shows a small video thumbnail with an optional title. When user clicks the thumbnail, the video opens in a lightbox player, or in an inline player. The box element itself behaves just like the photos in your article - you can set it to float to the left or to the right, centre it with margin: 0 auto; or apply any other CSS styling to it.
+ * [Getting started](https://hitko.eu/videobox/getting-started/#htk-videobox-for-joomla)
+ * [Documentation](https://hitko.eu/videobox/documentation/)
+ * [Display methods](https://hitko.eu/videobox/display-methods/)
+ * [Player effects](https://hitko.eu/videobox/player-effects/)
+ * [Video providers](https://hitko.eu/videobox/adapters/)
 
-###Link display
+### [Box display](https://hitko.eu/videobox/display-methods/#htk-box)
+Box display is a great way to insert videos without sacrificing a lot of space for the player. That way it makes your articles straight to the point without unnecessary distractions while keeping the videos right where they belong to. Rather than the huge full-size video player taking up space and distracting the reader, the box display only shows a small video thumbnail with an optional title. When user clicks the thumbnail, the video opens in a lightbox player, or in an inline player. The box element itself behaves just like the photos in your article - you can set it to float to the left or to the right, centre it with ```margin: 0 auto;``` or apply any other CSS styling to it.
+
+### [Link display](https://hitko.eu/videobox/display-methods/#htk-links)
 Box display is great, however it's not ideal when the video is just an irrelevant reference or a note, or when the video itself isn't directly related to the topic. In this case even a small box thumbnail would be irrelevant and distracting for the reader. An ordinary link to the video seems good enough, but when users click it they leave your website. Videobox link display solves that problem - you can still keep the reference, but instead of redirecting users to an external page the link will open a lightbox player directly on your website.
 
-###Gallery display
+### [Gallery display](https://hitko.eu/videobox/display-methods/#htk-gallery)
 In a way, the gallery display is the exact opposite of the box and the link display. It's designed to display a lot of videos in an organised manner, featuring a responsive grid and a built-in pagination. That way you can insert all of your videos at once and let users browse through them quickly. Alternatively a gallery can be displayed as a slider, showing only a few thumbnails at a time. 

build/libraries/videobox/videobox.xml

@@ -10,7 +10,7 @@
     <copyright>Copyright (C) 2016 HtikoDev</copyright>
     <authorEmail>development@hitko.si</authorEmail>
     <authorUrl>https://hitko.eu/videobox/</authorUrl>
-    <version>5.0.2</version>
+    <version>5.0.4</version>
 
     <files>
         <filename>adapter.php</filename>

build/plugins/html5/html5.xml

@@ -9,7 +9,7 @@
     <copyright>Copyright (C) 2016 HtikoDev</copyright>
     <authorEmail>development@hitko.si</authorEmail>
     <authorUrl>https://hitko.eu/videobox/</authorUrl>
-    <version>5.0.2</version>
+    <version>5.0.4</version>
 
     <files>
         <filename plugin="html5">html5.php</filename>

build/plugins/soundcloud/soundcloud.xml

@@ -9,7 +9,7 @@
     <copyright>Copyright (C) 2016 HtikoDev</copyright>
     <authorEmail>development@hitko.si</authorEmail>
     <authorUrl>https://hitko.eu/videobox/</authorUrl>
-    <version>5.0.2</version>
+    <version>5.0.4</version>
 
     <files>
         <filename plugin="soundcloud">soundcloud.php</filename>

build/plugins/twitch/twitch.xml

@@ -9,7 +9,7 @@
     <copyright>Copyright (C) 2016 HtikoDev</copyright>
     <authorEmail>development@hitko.si</authorEmail>
     <authorUrl>https://hitko.eu/videobox/</authorUrl>
-    <version>5.0.2</version>
+    <version>5.0.4</version>
 
     <files>
         <filename plugin="twitch">twitch.php</filename>

build/plugins/videobox/language/en-GB/en-GB.plg_system_videobox.ini

@@ -6,7 +6,7 @@
 ; Projectsite: https://hitko.eu/videobox
 
 PLG_SYSTEM_VIDEOBOX="System - Videobox"
-PLG_SYSTEM_VIDEOBOX_XML_DESCRIPTION="<p>Videobox - Video and audio player, and gallery for Joomla</p><h4>Basic usage</h4><p><code>{videobox}video ID{/videobox}</code><br /><br />Video ID can be either a link to the video or the ID from the link - see <a href="_QQ_"https://hitko.eu/videobox/adapters/"_QQ_" target="_QQ_"_blank"_QQ_" title="_QQ_"adapters documentation"_QQ_">adapters documentation</a> for all supported formats<br />Multiple videos can be inserted at a time, in this case separate video IDs by <strong>|,</strong> (a vertical line and a comma)</p><p>See the <a href="_QQ_"https://hitko.eu/videobox/getting-started/#htk-videobox-for-joomla"_QQ_" target="_QQ_"_blank"_QQ_" title="_QQ_"Getting started"_QQ_">getting started guide</a> and <a href="_QQ_"https://hitko.eu/videobox/documentation/"_QQ_" target="_QQ_"_blank"_QQ_" title="_QQ_"Videobox documentation"_QQ_">Videobox documentation</a> for more informations and examples</p><h4>Property sets</h4><p>Previous versions of Videobox had different settings for different display methods, but since that was pretty messy it's been replaced by property sets. Property sets aren't limited to one display method, since each property set contains complete Videobox configuration. By using <code>{videobox@property-set-key}video ID{/videobox}</code> you can apply that configuration to a specific set of videos.</p>"
+PLG_SYSTEM_VIDEOBOX_XML_DESCRIPTION="<p>Videobox - Video and audio player, and gallery for Joomla</p><h4>Basic usage</h4><p><code>{videobox}video ID{/videobox}</code><br /><br />Video ID can be either a link to the video or the ID from the link - see <a title="_QQ_"adapters documentation"_QQ_" href="_QQ_"https://hitko.eu/videobox/adapters/"_QQ_" target="_QQ_"_blank"_QQ_">adapters documentation</a> for all supported formats<br />Multiple videos can be inserted at a time, in this case separate video IDs by <strong>|,</strong> (a vertical line and a comma)</p><p>See the <a title="_QQ_"Getting started"_QQ_" href="_QQ_"https://hitko.eu/videobox/getting-started/#htk-videobox-for-joomla"_QQ_" target="_QQ_"_blank"_QQ_">getting started guide</a> and <a title="_QQ_"Videobox documentation"_QQ_" href="_QQ_"https://hitko.eu/videobox/documentation/"_QQ_" target="_QQ_"_blank"_QQ_">Videobox documentation</a> for more informations and examples</p><h4>Property sets</h4><p>Previous versions of Videobox had different settings for different display methods, but since that was pretty messy it's been replaced by property sets. Property sets aren't limited to one display method, since each property set contains complete Videobox configuration. By using <code>{videobox@property-set-key}video ID{/videobox}</code> you can apply that configuration to a specific set of videos.</p><h4>Useful links</h4><ul><li><a title="_QQ_"Getting started"_QQ_" href="_QQ_"https://hitko.eu/videobox/getting-started/#htk-videobox-for-joomla"_QQ_" target="_QQ_"_blank"_QQ_">Getting started</a></li><li><a title="_QQ_"Documentation"_QQ_" href="_QQ_"https://hitko.eu/videobox/documentation/"_QQ_" target="_QQ_"_blank"_QQ_">Documentation</a></li><li><a title="_QQ_"Display methods"_QQ_" href="_QQ_"https://hitko.eu/videobox/display-methods/"_QQ_" target="_QQ_"_blank"_QQ_">Display methods</a></li><li><a title="_QQ_"Player effects"_QQ_" href="_QQ_"https://hitko.eu/videobox/player-effects/"_QQ_" target="_QQ_"_blank"_QQ_">Player effects</a></li><li><a title="_QQ_"Video providers (adapters)"_QQ_" href="_QQ_"https://hitko.eu/videobox/adapters/"_QQ_" target="_QQ_"_blank"_QQ_">Video providers (adapters)</a></li></ul><ul><li><a title="_QQ_"Support"_QQ_" href="_QQ_"https://hitko.eu/videobox/support"_QQ_" target="_QQ_"_blank"_QQ_">Support</a></li></ul><br />"
 
 PLG_SYSTEM_VIDEOBOX_PROPERTY_SETS="Property sets"
 PLG_SYSTEM_VIDEOBOX_PROPERTY_SETS_DESC="Property sets let you create different configurations for Videobox. To use a specific configuration, use {videobox@property-set-key}"

build/plugins/videobox/language/en-GB/en-GB.plg_system_videobox.sys.ini

@@ -6,4 +6,5 @@
 ; Projectsite: https://hitko.eu/videobox
 
 PLG_SYSTEM_VIDEOBOX="System - Videobox"
-PLG_SYSTEM_VIDEOBOX_XML_DESCRIPTION="<p>Videobox - Video and audio player, and gallery for Joomla</p>"
+PLG_SYSTEM_VIDEOBOX_XML_DESCRIPTION="<p>Videobox - Video and audio player, and gallery for Joomla</p>"
+PLG_SYSTEM_VIDEOBOX_INSTALL_DESCRIPTION="<h4>Basic usage</h4><p><code>{videobox}video ID{/videobox}</code><br /><br />Video ID can be either a link to the video or the ID from the link - see <a title="_QQ_"adapters documentation"_QQ_" href="_QQ_"https://hitko.eu/videobox/adapters/"_QQ_" target="_QQ_"_blank"_QQ_">adapters documentation</a> for all supported formats<br />Multiple videos can be inserted at a time, in this case separate video IDs by <strong>|,</strong> (a vertical line and a comma)</p><p>See the <a title="_QQ_"Getting started"_QQ_" href="_QQ_"https://hitko.eu/videobox/getting-started/#htk-videobox-for-joomla"_QQ_" target="_QQ_"_blank"_QQ_">getting started guide</a> and <a title="_QQ_"Videobox documentation"_QQ_" href="_QQ_"https://hitko.eu/videobox/documentation/"_QQ_" target="_QQ_"_blank"_QQ_">Videobox documentation</a> for more informations and examples</p><h4>Property sets</h4><p>Previous versions of Videobox had different settings for different display methods, but since that was pretty messy it's been replaced by property sets. Property sets aren't limited to one display method, since each property set contains complete Videobox configuration. By using <code>{videobox@property-set-key}video ID{/videobox}</code> you can apply that configuration to a specific set of videos.</p><h4>Useful links</h4><ul><li><a title="_QQ_"Getting started"_QQ_" href="_QQ_"https://hitko.eu/videobox/getting-started/#htk-videobox-for-joomla"_QQ_" target="_QQ_"_blank"_QQ_">Getting started</a></li><li><a title="_QQ_"Documentation"_QQ_" href="_QQ_"https://hitko.eu/videobox/documentation/"_QQ_" target="_QQ_"_blank"_QQ_">Documentation</a></li><li><a title="_QQ_"Display methods"_QQ_" href="_QQ_"https://hitko.eu/videobox/display-methods/"_QQ_" target="_QQ_"_blank"_QQ_">Display methods</a></li><li><a title="_QQ_"Player effects"_QQ_" href="_QQ_"https://hitko.eu/videobox/player-effects/"_QQ_" target="_QQ_"_blank"_QQ_">Player effects</a></li><li><a title="_QQ_"Video providers (adapters)"_QQ_" href="_QQ_"https://hitko.eu/videobox/adapters/"_QQ_" target="_QQ_"_blank"_QQ_">Video providers (adapters)</a></li></ul><ul><li><a title="_QQ_"Support"_QQ_" href="_QQ_"https://hitko.eu/videobox/support"_QQ_" target="_QQ_"_blank"_QQ_">Support</a></li></ul><br />"

build/plugins/videobox/scripts.php

@@ -25,18 +25,19 @@
 jimport('joomla.form.form');
 jimport('joomla.plugin.helper');
 jimport('joomla.registry.registry');
+jimport('joomla.version');
 
 class plgsystemvideoboxInstallerScript {
 
     function install($parent) {
-        $this->in_up($parent);
+        $this->in_up($parent, 'install');
     }
 
     function update($parent) {
-        $this->in_up($parent);
+        $this->in_up($parent, 'update');
     }
 
-    function in_up($parent) {
+    function in_up($parent, $type) {
 
         $db = JFactory::getDbo();
         $query = $db->getQuery(true);
@@ -55,7 +56,11 @@ function in_up($parent) {
 
             $data = $form->renderFieldset('basic');
             $html = new DOMDocument('1.0', 'UTF-8');
-            $html->loadHTML('<!DOCTYPE html><meta http-equiv="Content-Type" content="text/html; charset=utf-8">'.$data);
+            try {
+                $html->loadHTML('<!DOCTYPE html><meta http-equiv="Content-Type" content="text/html; charset=utf-8">'.$data);
+            } catch (Exception $e) {
+                $html = false;
+            }
             if($html){
                 $xpath = new DOMXpath($html);
                 $fields = $xpath->query("//*[starts-with(@name,'params')]");
@@ -123,6 +128,8 @@ function in_up($parent) {
                 $result = $db->execute();
             }
         }
+
+        echo JText::_('PLG_SYSTEM_VIDEOBOX_INSTALL_DESCRIPTION');
     }
 
     function innerHTML($element) { 
@@ -170,12 +177,10 @@ function splitName($name){
         }
         $n = count($parts);
         for($i = 1; $i < $n; $i++){
-            var_dump($parts[$i], $parts[$i-1].'X');
             if($parts[$i] == $parts[$i-1].'X'){
                 return false;
             }
         }
-        var_dump($parts);
         return $parts;
     }
 
@@ -185,6 +190,14 @@ function uninstall($parent) {
 
     function preflight($type, $parent) {
 
+        $jv = new JVersion();
+        if(!$jv->isCompatible('3.6')) {
+            $typing = 'installing';
+            if($type == 'update') $typing = 'updating';
+            Jerror::raiseWarning(null, 'Please update Joomla! to version 3.6 or later before ' . $typing . ' Videobox');
+            return false;
+        }
+
     }
 
     function postflight($type, $parent) {

build/plugins/videobox/videobox.xml

@@ -9,7 +9,7 @@
     <copyright>Copyright (C) 2016 HtikoDev</copyright>
     <authorEmail>development@hitko.si</authorEmail>
     <authorUrl>https://hitko.eu/videobox/</authorUrl>
-    <version>5.0.2</version>
+    <version>5.0.4</version>
 
     <scriptfile>scripts.php</scriptfile>
 

build/plugins/vimeo/vimeo.xml

@@ -9,7 +9,7 @@
     <copyright>Copyright (C) 2016 HtikoDev</copyright>
     <authorEmail>development@hitko.si</authorEmail>
     <authorUrl>https://hitko.eu/videobox/</authorUrl>
-    <version>5.0.2</version>
+    <version>5.0.4</version>
 
     <files>
         <filename plugin="vimeo">vimeo.php</filename>

build/plugins/youtube/youtube.xml

@@ -9,7 +9,7 @@
     <copyright>Copyright (C) 2016 HtikoDev</copyright>
     <authorEmail>development@hitko.si</authorEmail>
     <authorUrl>https://hitko.eu/videobox/</authorUrl>
-    <version>5.0.2</version>
+    <version>5.0.4</version>
 
     <files>
         <filename plugin="youtube">youtube.php</filename>

gulpfile.js

@@ -184,6 +184,9 @@ gulp.task('pack-parts', [
             .pipe(template(manifestData))
             .pipe(gulp.dest('./dist/packages')),
 
+        gulp.src('./src/scripts.php')
+            .pipe(gulp.dest('./dist/packages')),
+
     ]);
 
 });

package.json

@@ -1,7 +1,7 @@
 {
   "license": "GPL-3.0",
   "readme": "README.md",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "name": "Videobox-Joomla",
   "copyright": "Hitko",
   "homepage": "https://hitko.eu/videobox/",

src/pkg_videobox.xml

@@ -12,6 +12,8 @@
     <authorUrl><%= url %></authorUrl>
     <version><%= version %></version>
 
+    <scriptfile>scripts.php</scriptfile>
+
     <files>
         <file type="library" id="videobox">lib_videobox.zip</file>
         <file type="plugin" id="videobox" group="system">plg_system_videobox.zip</file>

src/plugins/videobox/language/en-GB/en-GB.plg_system_videobox.ini

@@ -6,7 +6,7 @@
 ; Projectsite: https://hitko.eu/videobox
 
 PLG_SYSTEM_VIDEOBOX="System - Videobox"
-PLG_SYSTEM_VIDEOBOX_XML_DESCRIPTION="<p>Videobox - Video and audio player, and gallery for Joomla</p><h4>Basic usage</h4><p><code>{videobox}video ID{/videobox}</code><br /><br />Video ID can be either a link to the video or the ID from the link - see <a href="_QQ_"https://hitko.eu/videobox/adapters/"_QQ_" target="_QQ_"_blank"_QQ_" title="_QQ_"adapters documentation"_QQ_">adapters documentation</a> for all supported formats<br />Multiple videos can be inserted at a time, in this case separate video IDs by <strong>|,</strong> (a vertical line and a comma)</p><p>See the <a href="_QQ_"https://hitko.eu/videobox/getting-started/#htk-videobox-for-joomla"_QQ_" target="_QQ_"_blank"_QQ_" title="_QQ_"Getting started"_QQ_">getting started guide</a> and <a href="_QQ_"https://hitko.eu/videobox/documentation/"_QQ_" target="_QQ_"_blank"_QQ_" title="_QQ_"Videobox documentation"_QQ_">Videobox documentation</a> for more informations and examples</p><h4>Property sets</h4><p>Previous versions of Videobox had different settings for different display methods, but since that was pretty messy it's been replaced by property sets. Property sets aren't limited to one display method, since each property set contains complete Videobox configuration. By using <code>{videobox@property-set-key}video ID{/videobox}</code> you can apply that configuration to a specific set of videos.</p>"
+PLG_SYSTEM_VIDEOBOX_XML_DESCRIPTION="<p>Videobox - Video and audio player, and gallery for Joomla</p><h4>Basic usage</h4><p><code>{videobox}video ID{/videobox}</code><br /><br />Video ID can be either a link to the video or the ID from the link - see <a title="_QQ_"adapters documentation"_QQ_" href="_QQ_"https://hitko.eu/videobox/adapters/"_QQ_" target="_QQ_"_blank"_QQ_">adapters documentation</a> for all supported formats<br />Multiple videos can be inserted at a time, in this case separate video IDs by <strong>|,</strong> (a vertical line and a comma)</p><p>See the <a title="_QQ_"Getting started"_QQ_" href="_QQ_"https://hitko.eu/videobox/getting-started/#htk-videobox-for-joomla"_QQ_" target="_QQ_"_blank"_QQ_">getting started guide</a> and <a title="_QQ_"Videobox documentation"_QQ_" href="_QQ_"https://hitko.eu/videobox/documentation/"_QQ_" target="_QQ_"_blank"_QQ_">Videobox documentation</a> for more informations and examples</p><h4>Property sets</h4><p>Previous versions of Videobox had different settings for different display methods, but since that was pretty messy it's been replaced by property sets. Property sets aren't limited to one display method, since each property set contains complete Videobox configuration. By using <code>{videobox@property-set-key}video ID{/videobox}</code> you can apply that configuration to a specific set of videos.</p><h4>Useful links</h4><ul><li><a title="_QQ_"Getting started"_QQ_" href="_QQ_"https://hitko.eu/videobox/getting-started/#htk-videobox-for-joomla"_QQ_" target="_QQ_"_blank"_QQ_">Getting started</a></li><li><a title="_QQ_"Documentation"_QQ_" href="_QQ_"https://hitko.eu/videobox/documentation/"_QQ_" target="_QQ_"_blank"_QQ_">Documentation</a></li><li><a title="_QQ_"Display methods"_QQ_" href="_QQ_"https://hitko.eu/videobox/display-methods/"_QQ_" target="_QQ_"_blank"_QQ_">Display methods</a></li><li><a title="_QQ_"Player effects"_QQ_" href="_QQ_"https://hitko.eu/videobox/player-effects/"_QQ_" target="_QQ_"_blank"_QQ_">Player effects</a></li><li><a title="_QQ_"Video providers (adapters)"_QQ_" href="_QQ_"https://hitko.eu/videobox/adapters/"_QQ_" target="_QQ_"_blank"_QQ_">Video providers (adapters)</a></li></ul><ul><li><a title="_QQ_"Support"_QQ_" href="_QQ_"https://hitko.eu/videobox/support"_QQ_" target="_QQ_"_blank"_QQ_">Support</a></li></ul><br />"
 
 PLG_SYSTEM_VIDEOBOX_PROPERTY_SETS="Property sets"
 PLG_SYSTEM_VIDEOBOX_PROPERTY_SETS_DESC="Property sets let you create different configurations for Videobox. To use a specific configuration, use {videobox@property-set-key}"