← All changes | vdocipher.php +24 -117 1.22 → 1.11 View file →

		@@ -1,12 +1,12 @@
1	1	<?php
2	2	/**
3	3	* Plugin Name: VdoCipher
4		- * Plugin URI: https://www.vdocipher.com
	4	+ * Plugin URI: http://www.vdocipher.com
5	5	* Description: Secured video hosting for wordpress
6		- * Version: 1.22
	6	+ * Version: 1.10
7	7	* Author: VdoCipher
8		- * Author URI: https://www.vdocipher.com
	8	+ * Author URI: http://www.vdocipher.com
9	9	* License: GPL2
10	10	*/
11	11
12	12	if (__FILE__ == $_SERVER['SCRIPT_FILENAME']) {
		@@ -24,9 +24,9 @@
24	24	}
25	25
26	26	$getData = http_build_query($params);
27	27	$posts["clientSecretKey"] = $client_key;
28		- $url = "https://api.vdocipher.com/v2/$action/?$getData";
	28	+ $url = "http://api.vdocipher.com/v2/$action/?$getData";
29	29	$response = wp_safe_remote_post($url, array(
30	30	'method' => 'POST',
31	31	'body' => $posts
32	32	));
		@@ -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,92 +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.6.4');
	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		- } else {
166		- //New embed code
167		- if ($player_tech === '') {
168		- if (get_option(vdo_watermark_flash_html) === 'flash') {
169		- $player_tech = "*,-dash";
170		- }
171		- }
172		- $output .= "<div id='vdo$OTP' style='height:$height;width:$width;max-width:100%' ></div>";
173		- $output .= "<script>(function(v,i,d,e,o){v[o]=v[o]||{}; v[o].add = v[o].add || function V(a){".
174		- "(v[o].d=v[o].d||[]).push(a);};";
175		- $output .= "if(!v[o].l) { v[o].l=1*new Date(); a=i.createElement(d), m=i.getElementsByTagName(d)[0];";
176		- $output .= "a.async=1; a.src=e; m.parentNode.insertBefore(a,m);}";
177		- $output .= "})(window,document,'script','https://d1z78r8i505acl.cloudfront.net/playerAssets/";
178		- $output .= "$vdo_embed_version_str";
179		- $output .= "/vdo.js','vdo');";
180		- $output .= "vdo.add({";
181		- $output .= "otp: '$OTP',";
182		- $output .= "playbackInfo: btoa(JSON.stringify({";
183		- $output .= "videoId: '$video'})),";
184		- $output .= "theme: '$vdo_player_theme',";
185		- if ($player_tech !== '') {
186		- $output .= "techoverride: [" ;
187		- $techarray = explode(',', $player_tech);
188		- for ($i = 0; $i < sizeof($techarray); $i++) {
189		- $techStr = $techarray[$i];
190		- $output .= "'$techStr'";
191		- if ($i !== sizeof($techarray)-1) {
192		- $output .= ", ";
193		- }
194		- }
195		- $output .= "],";
196		- }
197		- $output .= "container: document.querySelector('#vdo$OTP'),});";
198		- $output .= "</script>";
199		- }
	127	+ $output .= "}); </script>";
200	128	return $output;
201	129	}
202	130
203	131	add_shortcode('vdo', 'vdo_shortcode');
204	132
	133	+
205	134	/// adding the settings link
206	135	$plugin = plugin_basename(__FILE__);
207	136	add_filter("plugin_action_links_$plugin", 'vdo_settings_link');
208	137
		@@ -207,13 +136,14 @@
207	136	add_filter("plugin_action_links_$plugin", 'vdo_settings_link');
208	137
209	138	function vdo_settings_link($links)
210	139	{
211		- $settings_link = '<a href="options-general.php?page=vdocipher">Settings</a>';
	140	+ $settings_link = '<a href="options-general.php?page=vdocipher.php">Settings</a>';
212	141	array_unshift($links, $settings_link);
213	142	return $links;
214	143	}
215	144
	145	+
216	146	/// add the menu item and register settings
217	147	if (is_admin()) { // admin actions
218	148	add_action('admin_menu', 'vdo_menu');
219	149	add_action('admin_init', 'register_vdo_settings');
		@@ -221,24 +151,17 @@
221	151	// non-admin enqueues, actions, and filters
222	152	}
223	153	function vdo_menu()
224	154	{
225		- add_menu_page(
226		- 'VdoCipher Options',
227		- 'VdoCipher',
228		- 'manage_options',
229		- 'vdocipher',
230		- 'vdo_options',
231		- plugin_dir_url(__FILE__).'images/logo.png'
232		- );
	155	+ add_options_page('VdoCipher Options', 'VdoCipher', 'manage_options', 'vdocipher', 'vdo_options');
233	156	}
234	157	function vdo_options()
235	158	{
236	159	if (!get_option('vdo_default_height')) {
237		- update_option('vdo_default_height', 'auto');
	160	+ update_option('vdo_default_height', '360');
238	161	}
239	162	if (!get_option('vdo_default_width')) {
240		- update_option('vdo_default_width', '1280');
	163	+ update_option('vdo_default_width', '640');
241	164	}
242	165	$vdo_client_key = get_option('vdo_client_key');
243	166	if (!$vdo_client_key && strlen($vdo_client_key) != 64) {
244	167	vdo_show_form_client_key();
		@@ -255,11 +178,8 @@
255	178	register_setting('vdo_option-group', 'vdo_client_key');
256	179	register_setting('vdo_option-group', 'vdo_default_height');
257	180	register_setting('vdo_option-group', 'vdo_default_width');
258	181	register_setting('vdo_option-group', 'vdo_annotate_code');
259		- register_setting('vdo_option-group', 'vdo_embed_version');
260		- register_setting('vdo_option-group', 'vdo_player_theme');
261		- register_setting('vdo_option-group', 'vdo_watermark_flash_html');
262	182	}
263	183
264	184	/// adding a section for asking for the client key
265	185	function vdo_show_form_client_key()
		@@ -272,29 +192,16 @@
272	192	delete_option('vdo_client_key');
273	193	delete_option('vdo_default_width');
274	194	delete_option('vdo_default_height');
275	195	delete_option('vdo_annotate_code');
276		- delete_option('vdo_embed_version');
277		- delete_option('vdo_player_theme');
278		- delete_option('vdo_watermark_flash_html');
279	196	}
280	197	function vdo_activate()
281	198	{
282		- if ((get_option('vdo_default_height')) == false) {
283		- update_option('vdo_default_height', 'auto');
	199	+ if (!get_option('vdo_default_height')) {
	200	+ update_option('vdo_default_height', '400');
284	201	}
285		- if ((get_option('vdo_default_width')) == false) {
286		- update_option('vdo_default_width', '1280');
287		- }
288		- //https://stackoverflow.com/a/2173318/5022684
289		- if ((get_option('vdo_embed_version')) == false) {
290		- update_option('vdo_embed_version', '1.6.4');
291		- }
292		- if ((get_option('vdo_player_theme')) == false) {
293		- update_option('vdo_player_theme', '9ae8bbe8dd964ddc9bdb932cca1cb59a');
294		- }
295		- if ((get_option('vdo_watermark_flash_html')) == false) {
296		- update_option('vdo_watermark_flash_html', 'html5');
	202	+ if (!get_option('vdo_default_width')) {
	203	+ update_option('vdo_default_width', '640');
297	204	}
298	205	}
299	206	register_activation_hook(__FILE__, 'vdo_activate');
300	207	function vdo_admin_notice()