Changeset 1335330

Timestamp:

01/25/2016 07:47:06 AM (10 years ago)

Author:

infomaniak-dev

Message:

rajout support https

Location:

vod-infomaniak/trunk

Files:

• readme.txt (modified) (2 diffs)
• vod.class.php (modified) (3 diffs)
• vod.template.php (modified) (3 diffs)

vod-infomaniak/trunk/readme.txt

@@ -6 +6 @@
 Requires at least: 2.8.6
 Tested up to: 4.3.1
-Stable tag: 1.3.4
+Stable tag: 1.3.5
 
 
@@ -72 +72 @@
 
 == Changelog ==
+
+= 1.3.5 (25/01/2016) =
+* Prise en compte HTTPS si besoin
 
 = 1.3.4 (27/09/2015) =

vod-infomaniak/trunk/vod.class.php

@@ -6 +6 @@
      * @author Destrem Kevin + Davide Rubini + Arnaud Toullieux
      * @link http://statslive.infomaniak.ch/vod/api/
-     * @version 1.3.4
+     * @version 1.3.5
      * @copyright infomaniak.ch
      */
@@ -16 +16 @@
 
     class EasyVod {
-        public $version = "1.3.3";
+        public $version = "1.3.5";
         private $local_version;
         private $plugin_url;
@@ -328 +328 @@
             //Recuperation des differents parametres
             $iVod = $this->options['vod_api_icodeservice'];
-            $sUrl = "http://vod.infomaniak.com/iframe.php";
+            if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on") {
+                $sProtocol = "https";
+            }else{
+                $sProtocol = "http";
+            }
+            
+            $sUrl = $sProtocol."://vod.infomaniak.com/iframe.php";
+
             $sAccountBase = $this->options['vod_api_id'];
             $sKey = "";

vod-infomaniak/trunk/vod.template.php

@@ -333 +333 @@
             <h2><?php _e('Administration du plugin VOD', 'vod_infomaniak'); ?></h2>
 
-            <iframe frameborder="0" width="512" height="384" src="http://vod.infomaniak.com/iframe.php?url=https://vod.infomaniak.com/redirect/faq_vod/racine-1594/mp4-319/1539_72_1397483621_2934.mp4&duration=&player=299&vod=86&preloadImage=https://vod.infomaniak.com/redirect/faq_vod/racine-1594/mp4-319/1539_72_1397483621_2934.jpg?1438234073197&lg=fr&wmode=direct"></iframe>
+            <iframe frameborder="0" width="512" height="384" src="https://vod.infomaniak.com/iframe.php?url=https://vod.infomaniak.com/redirect/faq_vod/racine-1594/mp4-319/1539_72_1397483621_2934.mp4&duration=&player=299&vod=86&preloadImage=https://vod.infomaniak.com/redirect/faq_vod/racine-1594/mp4-319/1539_72_1397483621_2934.jpg?1438234073197&lg=fr&wmode=direct"></iframe>
 
             <form name="adminForm" action="<?php echo $action_url; ?>" method="post">
@@ -1080 +1080 @@
                         jQuery("#dialog-modal-admin").attr("href", "https://statslive.infomaniak.com/vod/videoDetail.php/g<?php echo $aOptions['vod_api_group'];?>s7i<?php echo $aOptions['vod_api_icodeservice'];?>?iFileCode=" + iVideo);
                         jQuery("#dialog-modal-admin2").attr("href", "https://statslive.infomaniak.com/vod/videoDetail.php/g<?php echo $aOptions['vod_api_group'];?>s7i<?php echo $aOptions['vod_api_icodeservice'];?>?iFileCode=" + iVideo + "&tab=2");
-                        jQuery("#dialog-modal-video").attr("src", "http://vod.infomaniak.com/iframe.php?url=" + urlComplete + "." + sExtension + sParam + "&player=576&vod=214&preloadImage=" + urlComplete + ".jpg");
+                        jQuery("#dialog-modal-video").attr("src", "https://vod.infomaniak.com/iframe.php?url=" + urlComplete + "." + sExtension + sParam + "&player=576&vod=214&preloadImage=" + urlComplete + ".jpg");
 
                         textAccess = "";
@@ -1284 +1284 @@
                     console.log(value);
                     jQuery('#player-info-' + value).show();
-                    jQuery("#player-demo-video").attr("src", "http://vod.infomaniak.com/iframe.php?url=infomaniak_11_vod/demo-2362/mp4-226/big_buck_bunny_720p_h264.mp4&player=" + value + "&vod=<?php echo $aOptions['vod_api_icodeservice'];?>&preloadImage=infomaniak_11_vod/demo-2362/mp4-226/big_buck_bunny_720p_h264.jpg");
+                    jQuery("#player-demo-video").attr("src", "https://vod.infomaniak.com/iframe.php?url=infomaniak_11_vod/demo-2362/mp4-226/big_buck_bunny_720p_h264.mp4&player=" + value + "&vod=<?php echo $aOptions['vod_api_icodeservice'];?>&preloadImage=infomaniak_11_vod/demo-2362/mp4-226/big_buck_bunny_720p_h264.jpg");
                 }
                 PlayerInfo();