← All changes | vdocipher.php +21 -95 1.20 → 1.11 View file →

		@@ -2,9 +2,9 @@
2	2	/**
3	3	* Plugin Name: VdoCipher
4	4	* Plugin URI: http://www.vdocipher.com
5	5	* Description: Secured video hosting for wordpress
6		- * Version: 1.20
	6	+ * Version: 1.10
7	7	* Author: VdoCipher
8	8	* Author URI: http://www.vdocipher.com
9	9	* License: GPL2
10	10	*/
		@@ -46,15 +46,11 @@
46	46	'height' => get_option('vdo_default_height') . "px",
47	47	'id' => 'id',
48	48	'no_annotate'=> false,
49	49	'version'=> 0,
50		- 'player_tech'=> ''
51	50	),
52	51	$atts
53	52	));
54		- if((get_option('vdo_default_height')) == 'auto') {
55		- $height = 'auto';
56		- }
57	53	if (!$atts['id']) {
58	54	if (!$atts['title']) {
59	55	return "Required argument id for embedded video not found.";
60	56	}
		@@ -117,85 +113,25 @@
117	113	$version = 0;
118	114	if (isset($atts['version'])) {
119	115	$version = $atts['version'];
120	116	}
121		- if ((get_option('vdo_embed_version')) == false) {
122		- update_option('vdo_embed_version', '1.5.0');
	117	+ $output = "<div id='vdo$OTP' style='height:$height;width:$width;max-width:100%' ></div>";
	118	+ $output .= "<script> (function(v,i,d,e,o){v[o]=v[o]||{}; v[o].add = v[o].add || function V(a){".
	119	+ " (v[o].d=v[o].d||[]).push(a);};";
	120	+ $output .= "if(!v[o].l) { v[o].l=1*new Date(); a=i.createElement(d), m=i.getElementsByTagName(d)[0]; a.async=1; ".
	121	+ "a.src=e; m.parentNode.insertBefore(a,m);}";
	122	+ $output .= " })(window,document,'script','//de122v0opjemw.cloudfront.net/vdo.js','vdo'); vdo.add({ ";
	123	+ $output .= "o: '$OTP', ";
	124	+ if ($version == 32) {
	125	+ $output .= "version: '$version' ";
123	126	}
124		- if ((get_option('vdo_player_theme')) == false) {
125		- update_option('vdo_player_theme','9ae8bbe8dd964ddc9bdb932cca1cb59a');
126		- }
127		- $vdo_embed_version_str = get_option('vdo_embed_version');
128		- $vdo_player_theme = get_option('vdo_player_theme');
129		-
130		- // tech override custom names start
131		- switch ($player_tech) {
132		- case "flash":
133		- $player_tech = "*,-dash";
134		- break;
135		- case "nohtml5":
136		- $player_tech = "*,-dash";
137		- break;
138		- case "noflash":
139		- $player_tech = "*,-hss";
140		- break;
141		- case "nozen":
142		- $player_tech = "*,-zen";
143		- break;
144		- case "noios":
145		- $player_tech = "*,-hlse";
146		- break;
147		- default:
148		- break;
149		- }
150		- // tech override ends
151		-
152		- // Old Embed Code
153		- if($vdo_embed_version_str === '0.5') {
154		- $output = "<div id='vdo$OTP' style='height:$height;width:$width;max-width:100%' ></div>";
155		- $output .= "<script> (function(v,i,d,e,o){v[o]=v[o]||{}; v[o].add = v[o].add || function V(a){".
156		- " (v[o].d=v[o].d||[]).push(a);};";
157		- $output .= "if(!v[o].l) { v[o].l=1*new Date(); a=i.createElement(d), m=i.getElementsByTagName(d)[0]; a.async=1; ".
158		- "a.src=e; m.parentNode.insertBefore(a,m);}";
159		- $output .= " })(window,document,'script','//de122v0opjemw.cloudfront.net/vdo.js','vdo'); vdo.add({ ";
160		- $output .= "o: '$OTP', ";
161		- if ($version == 32) {
162		- $output .= "version: '$version' ";
163		- }
164		- $output .= "}); </script>";
165		- }
166		- //New embed code
167		- else {
168		- $output .= "<div id='vdo$OTP' style='height:$height;width:$width;max-width:100%' ></div>";
169		- $output .= "<script>(function(v,i,d,e,o){v[o]=v[o]||{}; v[o].add = v[o].add || function V(a){ (v[o].d=v[o].d||[]).push(a);};";
170		- $output .= "if(!v[o].l) { v[o].l=1*new Date(); a=i.createElement(d), m=i.getElementsByTagName(d)[0];";
171		- $output .= "a.async=1; a.src=e; m.parentNode.insertBefore(a,m);}";
172		- $output .= "})(window,document,'script','https://d1z78r8i505acl.cloudfront.net/playerAssets/";
173		- $output .= "$vdo_embed_version_str";
174		- $output .= "/vdo.js','vdo');";
175		- $output .= "vdo.add({";
176		- $output .= "otp: '$OTP',";
177		- $output .= "playbackInfo: btoa(JSON.stringify({";
178		- $output .= "videoId: '$video'})),";
179		- $output .= "theme: '$vdo_player_theme',";
180		- if($player_tech !== ''){
181		- $output .= "techoverride: [" ;
182		- $techarray = explode(',', $player_tech);
183		- for($i = 0; $i < sizeof($techarray); $i++){
184		- $output .= "'$techarray[$i]'";
185		- if($i !== sizeof($techarray)-1)
186		- $output .= ", ";
187		- }
188		- $output .= "],";
189		- }
190		- $output .= "container: document.querySelector('#vdo$OTP'),});";
191		- $output .= "</script>";
192		- }
	127	+ $output .= "}); </script>";
193	128	return $output;
194	129	}
195	130
196	131	add_shortcode('vdo', 'vdo_shortcode');
197	132
	133	+
198	134	/// adding the settings link
199	135	$plugin = plugin_basename(__FILE__);
200	136	add_filter("plugin_action_links_$plugin", 'vdo_settings_link');
201	137
		@@ -200,13 +136,14 @@
200	136	add_filter("plugin_action_links_$plugin", 'vdo_settings_link');
201	137
202	138	function vdo_settings_link($links)
203	139	{
204		- $settings_link = '<a href="options-general.php?page=vdocipher">Settings</a>';
	140	+ $settings_link = '<a href="options-general.php?page=vdocipher.php">Settings</a>';
205	141	array_unshift($links, $settings_link);
206	142	return $links;
207	143	}
208	144
	145	+
209	146	/// add the menu item and register settings
210	147	if (is_admin()) { // admin actions
211	148	add_action('admin_menu', 'vdo_menu');
212	149	add_action('admin_init', 'register_vdo_settings');
		@@ -214,17 +151,17 @@
214	151	// non-admin enqueues, actions, and filters
215	152	}
216	153	function vdo_menu()
217	154	{
218		- add_menu_page('VdoCipher Options', 'VdoCipher', 'manage_options', 'vdocipher', 'vdo_options', plugin_dir_url(__FILE__).'images/logo.png');
	155	+ add_options_page('VdoCipher Options', 'VdoCipher', 'manage_options', 'vdocipher', 'vdo_options');
219	156	}
220	157	function vdo_options()
221	158	{
222	159	if (!get_option('vdo_default_height')) {
223		- update_option('vdo_default_height', 'auto');
	160	+ update_option('vdo_default_height', '360');
224	161	}
225	162	if (!get_option('vdo_default_width')) {
226		- update_option('vdo_default_width', '1280');
	163	+ update_option('vdo_default_width', '640');
227	164	}
228	165	$vdo_client_key = get_option('vdo_client_key');
229	166	if (!$vdo_client_key && strlen($vdo_client_key) != 64) {
230	167	vdo_show_form_client_key();
		@@ -241,10 +178,8 @@
241	178	register_setting('vdo_option-group', 'vdo_client_key');
242	179	register_setting('vdo_option-group', 'vdo_default_height');
243	180	register_setting('vdo_option-group', 'vdo_default_width');
244	181	register_setting('vdo_option-group', 'vdo_annotate_code');
245		- register_setting('vdo_option-group', 'vdo_embed_version');
246		- register_setting('vdo_option-group', 'vdo_player_theme');
247	182	}
248	183
249	184	/// adding a section for asking for the client key
250	185	function vdo_show_form_client_key()
		@@ -257,25 +192,16 @@
257	192	delete_option('vdo_client_key');
258	193	delete_option('vdo_default_width');
259	194	delete_option('vdo_default_height');
260	195	delete_option('vdo_annotate_code');
261		- delete_option('vdo_embed_version');
262		- delete_option('vdo_player_theme');
263	196	}
264	197	function vdo_activate()
265	198	{
266		- if ((get_option('vdo_default_height')) == false) {
267		- update_option('vdo_default_height', 'auto');
	199	+ if (!get_option('vdo_default_height')) {
	200	+ update_option('vdo_default_height', '400');
268	201	}
269		- if ((get_option('vdo_default_width')) == false) {
270		- update_option('vdo_default_width', '1280');
271		- }
272		- //https://stackoverflow.com/a/2173318/5022684
273		- if ((get_option('vdo_embed_version')) == false) {
274		- update_option('vdo_embed_version', '1.5.0');
275		- }
276		- if ((get_option('vdo_player_theme')) == false) {
277		- update_option('vdo_player_theme','9ae8bbe8dd964ddc9bdb932cca1cb59a');
	202	+ if (!get_option('vdo_default_width')) {
	203	+ update_option('vdo_default_width', '640');
278	204	}
279	205	}
280	206	register_activation_hook(__FILE__, 'vdo_activate');
281	207	function vdo_admin_notice()