← All changes | iframe.php +25 -27 2.7 → 2.9 View file →

		@@ -2,12 +2,12 @@
2	2	/*
3	3	Plugin Name: iframe
4	4	Plugin URI: http://wordpress.org/plugins/iframe/
5	5	Description: [iframe src="http://www.youtube.com/embed/A3PDXmYoF5U" width="100%" height="480"] shortcode
6		-Version: 2.7
	6	+Version: 2.9
7	7	Author: webvitaly
8	8	Author URI: http://web-profile.com.ua/wordpress/plugins/
9		-License: GPLv2 or later
	9	+License: GPLv3
10	10	*/
11	11
12	12
13	13	if ( ! function_exists( 'iframe_unqprfx_embed_shortcode' ) ) :
		@@ -16,8 +16,9 @@
16	16	wp_enqueue_script( 'jquery' );
17	17	}
18	18	add_action( 'wp_enqueue_scripts', 'iframe_unqprfx_enqueue_script' );
19	19
	20	+
20	21	function iframe_unqprfx_embed_shortcode( $atts, $content = null ) {
21	22	$defaults = array(
22	23	'src' => 'http://www.youtube.com/embed/A3PDXmYoF5U',
23	24	'width' => '100%',
		@@ -32,41 +33,38 @@
32	33	$atts[$default] = $value;
33	34	}
34	35	}
35	36
36		- $src_cut = substr( $atts["src"], 0, 35 ); // special case for google maps
37		- if( strpos( $src_cut, 'maps.google' ) ){
38		- $atts["src"] .= '&output=embed';
39		- }
40		-
41	37	// get_params_from_url
42		- if( isset( $atts["get_params_from_url"] ) && ( $atts["get_params_from_url"] == '1' || $atts["get_params_from_url"] == 1 || $atts["get_params_from_url"] == 'true' ) ) {
43		- if( $_GET != NULL ){
44		- if( strpos( $atts["src"], '?' ) ){ // if we already have '?' and GET params
	38	+ if ( isset( $atts["get_params_from_url"] ) && ( $atts["get_params_from_url"] == '1' || $atts["get_params_from_url"] == 1 ) ) {
	39	+ $encode_string = '';
	40	+ if ( $_GET != NULL ) {
	41	+ if ( strpos( $atts["src"], '?' ) ) { // if we already have '?' and GET params
45	42	$encode_string = '&';
46		- }else{
	43	+ } else {
47	44	$encode_string = '?';
48	45	}
49		- foreach( $_GET as $key => $value ){
	46	+ foreach( $_GET as $key => $value ) {
50	47	$encode_string .= $key.'='.$value.'&';
51	48	}
52	49	}
	50	+ $encode_string = rtrim($encode_string, '&'); // remove last '&'
53	51	$atts["src"] .= $encode_string;
54	52	}
55	53
56	54	$html = '';
57		- if( isset( $atts["same_height_as"] ) ){
	55	+ if ( isset( $atts["same_height_as"] ) ) {
58	56	$same_height_as = $atts["same_height_as"];
59		- }else{
	57	+ } else {
60	58	$same_height_as = '';
61	59	}
62	60
63		- if( $same_height_as != '' ){
	61	+ if ( $same_height_as != '' ) {
64	62	$atts["same_height_as"] = '';
65		- if( $same_height_as != 'content' ){ // we are setting the height of the iframe like as target element
66		- if( $same_height_as == 'document' || $same_height_as == 'window' ){ // remove quotes for window or document selectors
	63	+ if ( $same_height_as != 'content' ) { // we are setting the height of the iframe like as target element
	64	+ if ( $same_height_as == 'document' || $same_height_as == 'window' ) { // remove quotes for window or document selectors
67	65	$target_selector = $same_height_as;
68		- }else{
	66	+ } else {
69	67	$target_selector = '"' . $same_height_as . '"';
70	68	}
71	69	$html .= '
72	70	<script>
		@@ -72,13 +70,12 @@
72	70	<script>
73	71	jQuery(function($){
74	72	var target_height = $(' . $target_selector . ').height();
75	73	$("iframe.' . $atts["class"] . '").height(target_height);
76		- //alert(target_height);
77	74	});
78	75	</script>
79	76	';
80		- }else{ // set the actual height of the iframe (show all content of the iframe without scroll)
	77	+ } else { // set the actual height of the iframe (show all content of the iframe without scroll)
81	78	$html .= '
82	79	<script>
83	80	jQuery(function($){
84	81	$("iframe.' . $atts["class"] . '").bind("load", function() {
		@@ -89,13 +86,13 @@
89	86	</script>
90	87	';
91	88	}
92	89	}
93		- $html .= "\n".'<!-- iframe plugin v.2.7 wordpress.org/plugins/iframe/ -->'."\n";
	90	+ $html .= "\n".'<!-- iframe plugin v.2.9 wordpress.org/plugins/iframe/ -->'."\n";
94	91	$html .= '<iframe';
95	92	foreach( $atts as $attr => $value ) {
96		- if( $attr != 'same_height_as' ){ // remove some attributes
97		- if( $value != '' ) { // adding all attributes
	93	+ if ( $attr != 'same_height_as' ) { // remove some attributes
	94	+ if ( $value != '' ) { // adding all attributes
98	95	$html .= ' ' . $attr . '="' . $value . '"';
99	96	} else { // adding empty attributes
100	97	$html .= ' ' . $attr;
101	98	}
		@@ -100,9 +97,9 @@
100	97	$html .= ' ' . $attr;
101	98	}
102	99	}
103	100	}
104		- $html .= '></iframe>';
	101	+ $html .= '></iframe>'."\n";
105	102	return $html;
106	103	}
107	104	add_shortcode( 'iframe', 'iframe_unqprfx_embed_shortcode' );
108	105
		@@ -108,12 +105,13 @@
108	105
109	106
110	107	function iframe_unqprfx_plugin_meta( $links, $file ) { // add 'Plugin page' and 'Donate' links to plugin meta row
111	108	if ( strpos( $file, 'iframe.php' ) !== false ) {
112		- $links = array_merge( $links, array( '<a href="http://web-profile.com.ua/wordpress/plugins/iframe/" title="Plugin page">' . __('Iframe') . '</a>' ) );
113		- $links = array_merge( $links, array( '<a href="http://web-profile.com.ua/donate/" title="Support the development">' . __('Donate') . '</a>' ) );
	109	+ $links = array_merge( $links, array( '<a href="http://web-profile.com.ua/wordpress/plugins/iframe/" title="Plugin page">Iframe</a>' ) );
	110	+ $links = array_merge( $links, array( '<a href="http://web-profile.com.ua/donate/" title="Support the development">Donate</a>' ) );
	111	+ $links = array_merge( $links, array( '<a href="http://codecanyon.net/item/advanced-iframe-pro/5344999?ref=webvitaly">Advanced iFrame Pro</a>' ) );
114	112	}
115	113	return $links;
116	114	}
117	115	add_filter( 'plugin_row_meta', 'iframe_unqprfx_plugin_meta', 10, 2 );
118	116
119		-endif; // end of if(function_exists('iframe_unqprfx_embed_shortcode'))
	117	+endif; // end of (function_exists('iframe_unqprfx_embed_shortcode'))