VOD Infomaniak - Version 1.3.5

Version Description

(25/01/2016) = * Prise en compte HTTPS si besoin

Download this release

Release Info

Developer infomaniak-dev
Plugin Icon wp plugin VOD Infomaniak
Version 1.3.5
Comparing to
See all releases

Code changes from version 1.3.4 to 1.3.5

Files changed (3) hide show
  1. readme.txt +4 -1
  2. vod.class.php +10 -3
  3. vod.template.php +3 -3
readme.txt CHANGED
@@ -5,7 +5,7 @@ Plugin Name: Vod Infomaniak
5
  Tags: video, manage, infomaniak, vod
6
  Requires at least: 2.8.6
7
  Tested up to: 4.3.1
8
- Stable tag: 1.3.4
9
 
10
 
11
 
@@ -72,6 +72,9 @@ Si vous ne trouvez pas de solution à votre question, vous pouvez aussi nous con
72
 
73
  == Changelog ==
74
 
 
 
 
75
  = 1.3.4 (27/09/2015) =
76
  * Force update
77
 
5
  Tags: video, manage, infomaniak, vod
6
  Requires at least: 2.8.6
7
  Tested up to: 4.3.1
8
+ Stable tag: 1.3.5
9
 
10
 
11
 
72
 
73
  == Changelog ==
74
 
75
+ = 1.3.5 (25/01/2016) =
76
+ * Prise en compte HTTPS si besoin
77
+
78
  = 1.3.4 (27/09/2015) =
79
  * Force update
80
 
vod.class.php CHANGED
@@ -5,7 +5,7 @@
5
  *
6
  * @author Destrem Kevin + Davide Rubini + Arnaud Toullieux
7
  * @link http://statslive.infomaniak.ch/vod/api/
8
- * @version 1.3.4
9
  * @copyright infomaniak.ch
10
  */
11
 
@@ -15,7 +15,7 @@
15
  define('VOD_RIGHT_ADMIN', 4);
16
 
17
  class EasyVod {
18
- public $version = "1.3.3";
19
  private $local_version;
20
  private $plugin_url;
21
  private $options;
@@ -327,7 +327,14 @@
327
 
328
  //Recuperation des differents parametres
329
  $iVod = $this->options['vod_api_icodeservice'];
330
- $sUrl = "http://vod.infomaniak.com/iframe.php";
 
 
 
 
 
 
 
331
  $sAccountBase = $this->options['vod_api_id'];
332
  $sKey = "";
333
  if (!empty($aTagParam['tokenfolder']) && !is_numeric($file)) {
5
  *
6
  * @author Destrem Kevin + Davide Rubini + Arnaud Toullieux
7
  * @link http://statslive.infomaniak.ch/vod/api/
8
+ * @version 1.3.5
9
  * @copyright infomaniak.ch
10
  */
11
 
15
  define('VOD_RIGHT_ADMIN', 4);
16
 
17
  class EasyVod {
18
+ public $version = "1.3.5";
19
  private $local_version;
20
  private $plugin_url;
21
  private $options;
327
 
328
  //Recuperation des differents parametres
329
  $iVod = $this->options['vod_api_icodeservice'];
330
+ if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on") {
331
+ $sProtocol = "https";
332
+ }else{
333
+ $sProtocol = "http";
334
+ }
335
+
336
+ $sUrl = $sProtocol."://vod.infomaniak.com/iframe.php";
337
+
338
  $sAccountBase = $this->options['vod_api_id'];
339
  $sKey = "";
340
  if (!empty($aTagParam['tokenfolder']) && !is_numeric($file)) {
vod.template.php CHANGED
@@ -332,7 +332,7 @@
332
  ?>
333
  <h2><?php _e('Administration du plugin VOD', 'vod_infomaniak'); ?></h2>
334
 
335
- <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>
336
 
337
  <form name="adminForm" action="<?php echo $action_url; ?>" method="post">
338
  <input type="hidden" name="submitted" value="1"/>
@@ -1079,7 +1079,7 @@
1079
  jQuery("#dialog-modal-balise").val("[" + sBalise + "]" + url + "." + sExtension + "[/vod]");
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);
1081
  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");
1082
- jQuery("#dialog-modal-video").attr("src", "http://vod.infomaniak.com/iframe.php?url=" + urlComplete + "." + sExtension + sParam + "&player=576&vod=214&preloadImage=" + urlComplete + ".jpg");
1083
 
1084
  textAccess = "";
1085
  if (sAccess != '' && sAccess != 'all') {
@@ -1283,7 +1283,7 @@
1283
  value = jQuery('#selectPlayer').val();
1284
  console.log(value);
1285
  jQuery('#player-info-' + value).show();
1286
- 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");
1287
  }
1288
  PlayerInfo();
1289
  </script>
332
  ?>
333
  <h2><?php _e('Administration du plugin VOD', 'vod_infomaniak'); ?></h2>
334
 
335
+ <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>
336
 
337
  <form name="adminForm" action="<?php echo $action_url; ?>" method="post">
338
  <input type="hidden" name="submitted" value="1"/>
1079
  jQuery("#dialog-modal-balise").val("[" + sBalise + "]" + url + "." + sExtension + "[/vod]");
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);
1081
  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");
1082
+ jQuery("#dialog-modal-video").attr("src", "https://vod.infomaniak.com/iframe.php?url=" + urlComplete + "." + sExtension + sParam + "&player=576&vod=214&preloadImage=" + urlComplete + ".jpg");
1083
 
1084
  textAccess = "";
1085
  if (sAccess != '' && sAccess != 'all') {
1283
  value = jQuery('#selectPlayer').val();
1284
  console.log(value);
1285
  jQuery('#player-info-' + value).show();
1286
+ 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");
1287
  }
1288
  PlayerInfo();
1289
  </script>