Changeset 1862411

Timestamp:

04/22/2018 04:07:01 AM (8 years ago)

Author:

vibhavsinha

Message:

new player version in plugin

Location:

vdocipher/trunk

Files:

• images (added)
• images/logo.png (added)
• include/js (added)
• include/js/validatewatermark.js (added)
• include/options.php (modified) (5 diffs)
• readme.txt (modified) (3 diffs)
• vdocipher.php (modified) (7 diffs)

vdocipher/trunk/include/options.php

@@ -44 +44 @@
          <?php
             if ((get_option('vdo_embed_version')) == false) {
-            update_option('vdo_embed_version', '0.5');
+            update_option('vdo_embed_version', '1.5.0');
             }
         ?>
@@ -50 +50 @@
         <th scope="row">Player Version</th>
         <td>
-            <?php $vdo_embed_version_vars = array('0.5', '1.0.0', '1.1.0', '1.1.3', '1.2.7', '1.3.3', '1.4.5'); ?>
+            <?php $vdo_embed_version_vars = array('0.5', '1.0.0', '1.1.0', '1.1.3', '1.2.7', '1.3.3', '1.4.5','1.5.0'); ?>
             <select name="vdo_embed_version" id="vdo_embed_version">
                 <?php
@@ -63 +63 @@
                         if($vdo_embed_version_var === '0.5') {
                             $version_old_new = ' (old player)' ; }
-                        else {
-                            $version_old_new = ' (new player)' ; }
+                        elseif ($vdo_embed_version_var === '1.5.0'){
+                            $version_old_new = ' (newest player)' ; }
+                            else {
+                                $version_old_new = ' (new player)' ; }
                     ?>
                     <option value="<?php echo $vdo_embed_version_var; ?>" <?php echo $selected; ?> >
@@ -71 +73 @@
                 <?php } ?>
             </select>
+            <p class="description">It is recommended that you use the latest player version for best video playback.</p>
         </td>
         </tr>
@@ -93 +96 @@
         <th scope="row">Annotation Statement</th>
         <td>
-            <textarea name="vdo_annotate_code" type="textarea" rows="5" cols="60"><?php
+          <div style="display: inline-flex;">
+          <textarea name="vdo_annotate_code" id="vdo_watermarkjson" type="textarea" rows="6" cols="55" style="display: float-left"> <?php
             if (get_option('vdo_annotate_code') != "") {
-                echo get_option('vdo_annotate_code');
-            }
-            ?></textarea>
-            <p class="description">Leave this text blank in case you do not need watermark over all Videos. For details on writing the annotation code <a href="https://www.vdocipher.com/blog/2014/12/add-text-to-videos-with-watermark/" target="_blank">check this out</a></p>
+              echo get_option('vdo_annotate_code');
+              $vdo_annotation_code = get_option('vdo_annotate_code');
+           }
+          ?>
+          </textarea>
+          <p class="description" style="margin-left:20px; position: relative">
+          <span style="color:purple"><b>Sample Code for Dynamic Watermark</b></span><br/>
+          [{'type':'rtext', 'text':' {name}', 'alpha':'0.60', 'color':'0xFF0000','size':'17','interval':'5000'}] <br/>
+          <span style="color:purple"><b>Sample Code for Static Watermark</b></span><br/>
+          [{'type':'text', 'text':'{ip}', 'alpha':'0.5' , 'x':'10', 'y':'100', 'color':'0xFF0000', 'size':'12'}] <br/>
+          </p>
+          </div>
+          <p class="description" id="vdojsonvalidator"></p>
+          <p class="description">Leave this text blank in case you do not need watermark over all videos. For details on writing the annotation code <a href="https://www.vdocipher.com/blog/2014/12/add-text-to-videos-with-watermark/" target="_blank">check this out</a></p>
         </td>
         </tr>
     </table>
+    <?php
+        wp_enqueue_script('vdo_change_player_version',plugin_dir_url(__FILE__).'js/validatewatermark.js');
+        wp_localize_script('vdo_change_player_version', 'vdoVersionData', array(
+          'vdoWatermark' => $vdo_annotation_code
+        )
+      );
+        ?>
 <?php submit_button(); ?>
 </form>

vdocipher/trunk/readme.txt

@@ -1 +1 @@
 === Plugin Name ===
-Contributors: vibhavsinha
+Contributors: vibhavsinha, milangupta4
 Tags: video, DRM, video plugin, sell video, e-learning, movie
 Requires at least: 3.5.1
-Tested up to: 4.9.1
-Stable tag: 1.19
+Tested up to: 4.9.5
+Stable tag: 1.20
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -62 +62 @@
 == Changelog ==
 
+= 1.20 =
+* default player version set to 1.5.0
+* corrected bugs
+* height auto available
+* player tech over-ride enabled to play exclusively html5, flash, zen player
+
 = 1.19 =
 * add new player
@@ -108 +114 @@
 == Upgrade Notice ==
 
+= 1.20 =
+* default player version set to 1.5.0
+* corrected bugs
+* height auto available
+* player tech over-ride enabled to play exclusively html5, flash, zen player
+
 = 1.17 =
 * updated player theme

vdocipher/trunk/vdocipher.php

@@ -4 +4 @@
  * Plugin URI: http://www.vdocipher.com
  * Description: Secured video hosting for wordpress
- * Version: 1.19
+ * Version: 1.20
  * Author: VdoCipher
  * Author URI: http://www.vdocipher.com
@@ -48 +48 @@
                     'no_annotate'=> false,
                     'version'=> 0,
+                    'player_tech'=> ''
                     ),
         $atts
     ));
+    if((get_option('vdo_default_height')) == 'auto') {
+      $height = 'auto';
+    }
     if (!$atts['id']) {
         if (!$atts['title']) {
@@ -116 +120 @@
     }
     if ((get_option('vdo_embed_version')) == false) {
-        update_option('vdo_embed_version', '0.5');
+        update_option('vdo_embed_version', '1.5.0');
     }
     if ((get_option('vdo_player_theme')) == false) {
@@ -123 +127 @@
     $vdo_embed_version_str = get_option('vdo_embed_version');
     $vdo_player_theme = get_option('vdo_player_theme');
+
+    // tech override custom names start
+    switch ($player_tech) {
+        case "flash":
+            $player_tech = "*,-dash";
+            break;
+        case "nohtml5":
+            $player_tech = "*,-dash";
+            break;
+        case "noflash":
+            $player_tech = "*,-hss";
+            break;
+        case "nozen":
+            $player_tech = "*,-zen";
+            break;
+        case "noios":
+            $player_tech = "*,-hlse";
+            break;
+        default:
+            break;
+    }
+    // tech override ends
 
     // Old Embed Code
@@ -152 +178 @@
         $output .= "videoId: '$video'})),";
         $output .= "theme: '$vdo_player_theme',";
+        if($player_tech !== ''){
+          $output .= "techoverride: [" ;
+          $techarray = explode(',', $player_tech);
+          for($i = 0; $i < sizeof($techarray); $i++){
+            $output .= "'$techarray[$i]'";
+            if($i !== sizeof($techarray)-1)
+                $output .= ", ";
+          }
+          $output .= "],";
+        }
         $output .= "container: document.querySelector('#vdo$OTP'),});";
         $output .= "</script>";
@@ -180 +216 @@
 function vdo_menu()
 {
-    add_menu_page('VdoCipher Options', 'VdoCipher', 'manage_options', 'vdocipher', 'vdo_options');
+    add_menu_page('VdoCipher Options', 'VdoCipher', 'manage_options', 'vdocipher', 'vdo_options', plugin_dir_url(__FILE__).'images/logo.png');
 }
 function vdo_options()
 {
     if (!get_option('vdo_default_height')) {
-        update_option('vdo_default_height', '360');
+        update_option('vdo_default_height', 'auto');
     }
     if (!get_option('vdo_default_width')) {
-        update_option('vdo_default_width', '640');
+        update_option('vdo_default_width', '1280');
     }
     $vdo_client_key = get_option('vdo_client_key');
@@ -229 +265 @@
 {
     if ((get_option('vdo_default_height')) == false) {
-        update_option('vdo_default_height', '360');
+        update_option('vdo_default_height', 'auto');
     }
     if ((get_option('vdo_default_width')) == false) {
-        update_option('vdo_default_width', '640');
+        update_option('vdo_default_width', '1280');
     }
     //https://stackoverflow.com/a/2173318/5022684
     if ((get_option('vdo_embed_version')) == false) {
-        update_option('vdo_embed_version', '0.5');
+        update_option('vdo_embed_version', '1.5.0');
     }
     if ((get_option('vdo_player_theme')) == false) {