diff options
Diffstat (limited to 'plugins/jetpack/modules/shortcodes/googlemaps.php')
| -rw-r--r-- | plugins/jetpack/modules/shortcodes/googlemaps.php | 50 |
1 files changed, 37 insertions, 13 deletions
diff --git a/plugins/jetpack/modules/shortcodes/googlemaps.php b/plugins/jetpack/modules/shortcodes/googlemaps.php index 224654fa..404e0659 100644 --- a/plugins/jetpack/modules/shortcodes/googlemaps.php +++ b/plugins/jetpack/modules/shortcodes/googlemaps.php @@ -6,38 +6,43 @@ * into the [googlemaps http://...] shortcode format */ function jetpack_googlemaps_embed_to_short_code( $content ) { - if ( false === strpos( $content, 'maps.google.' ) && false === strpos( $content, 'google.com/maps' ) ) + + if ( false === strpos( $content, 'maps.google.' ) && 1 !== preg_match( '@google\.[^/]+/maps?@', $content ) ) return $content; // IE and TinyMCE format things differently // <iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="<a href="https://maps.google.co.uk/maps/ms?msa=0&amp;msid=206216869547772496318.0004bf5f0ff25aea47bd9&amp;hl=en&amp;ie=UTF8&amp;t=m&amp;ll=50.91917,-1.398808&amp;spn=0.013225,0.011794&amp;output=embed"></iframe><br">https://maps.google.co.uk/maps/ms?msa=0&amp;msid=206216869547772496318.0004bf5f0ff25aea47bd9&amp;hl=en&amp;ie=UTF8&amp;t=m&amp;ll=50.91917,-1.398808&amp;spn=0.013225,0.011794&amp;output=embed"></iframe><br</a> /><small>View <a href="<a href="https://maps.google.co.uk/maps/ms?msa=0&amp;msid=206216869547772496318.0004bf5f0ff25aea47bd9&amp;hl=en&amp;ie=UTF8&amp;t=m&amp;ll=50.91917,-1.398808&amp;spn=0.013225,0.011794&amp;source=embed">https://maps.google.co.uk/maps/ms?msa=0&amp;msid=206216869547772496318.0004bf5f0ff25aea47bd9&amp;hl=en&amp;ie=UTF8&amp;t=m&amp;ll=50.91917,-1.398808&amp;spn=0.013225,0.011794&amp;source=embed</a>" style="color:#0000FF;text-align:left">OARA Membership Discount Map</a> in a larger map</small> if ( strpos( $content, 'src="<a href="' ) !== false ) { - $content = preg_replace_callback( '#<iframe\s[^&]*?(?:&(?!gt;)[^&]*?)*?src="<a href="https?://.*?\.google\.(.*?)/(.*?)\?(.+?)"[^&]*?(?:&(?!gt;)[^&]*?)*?>\s*</iframe><br">[^"]*?">\s*</iframe><br</a>\s*/>\s*<small>.*?</small>#i', 'jetpack_googlemaps_embed_to_short_code_callback', $content ); + $content = preg_replace_callback( '#<iframe\s[^&]*?(?:&(?!gt;)[^&]*?)*?src="<a href="https?://(.*)?\.google\.(.*?)/(.*?)\?(.+?)"[^&]*?(?:&(?!gt;)[^&]*?)*?>\s*</iframe><br">[^"]*?">\s*</iframe>(?:<br</a>\s*/>\s*<small>.*?</small>)?#i', 'jetpack_googlemaps_embed_to_short_code_callback', $content ); return $content; } - $content = preg_replace_callback( '!\<iframe\s[^>]*?src="https?://.*?\.google\.(.*?)/(.*?)\?(.+?)"[^>]*?\>\s*\</iframe\>\s*(?:\<br\s*/?\>)?\s*\<small\>.*?\</small\>!i', 'jetpack_googlemaps_embed_to_short_code_callback', $content ); + $content = preg_replace_callback( '!\<iframe\s[^>]*?src="https?://(.*)?\.google\.(.*?)/(.*?)\?(.+?)"[^>]*?\>\s*\</iframe\>(?:\s*(?:\<br\s*/?\>)?\s*\<small\>.*?\</small\>)?!i', 'jetpack_googlemaps_embed_to_short_code_callback', $content ); - $content = preg_replace_callback( '#<iframe\s[^&]*?(?:&(?!gt;)[^&]*?)*?src="https?://.*?\.google\.(.*?)/(.*?)\?(.+?)"[^&]*?(?:&(?!gt;)[^&]*?)*?>\s*</iframe>\s*(?:<br\s*/?>)?\s*<small>.*?</small>#i', 'jetpack_googlemaps_embed_to_short_code_callback', $content ); + $content = preg_replace_callback( '#<iframe\s[^&]*?(?:&(?!gt;)[^&]*?)*?src="https?://(.*)?\.google\.(.*?)/(.*?)\?(.+?)"[^&]*?(?:&(?!gt;)[^&]*?)*?>\s*</iframe>(?:\s*(?:<br\s*/?>)?\s*<small>.*?</small>)?#i', 'jetpack_googlemaps_embed_to_short_code_callback', $content ); return $content; } function jetpack_googlemaps_embed_to_short_code_callback( $match ) { - if ( preg_match( '/\bwidth=[\'"](\d+)/', $match[0], $width ) ) { - $width = (int) $width[1]; + + if ( preg_match( '/\bwidth=[\'"](\d+)(%)?/', $match[0], $width ) ) { + $percent = ! empty( $width[2] ) ? '%' : ''; + $width = absint( $width[1] ) . $percent; } else { $width = 425; } - if ( preg_match( '/\bheight=[\'"](\d+)/', $match[0], $height ) ) { - $height = (int) $height[1]; + if ( preg_match( '/\bheight=[\'"](\d+)(%)?/', $match[0], $height ) ) { + $percent = ! empty( $height[2] ) ? '%' : ''; + $height = absint( $height[1] ) . $percent; } else { $height = 350; } - $url = "https://maps.google.{$match[1]}/{$match[2]}?{$match[3]}&w={$width}&h={$height}"; + $url = "https://{$match[1]}.google.{$match[2]}/{$match[3]}?{$match[4]}&w={$width}&h={$height}"; + /** This action is documented in modules/shortcodes/youtube.php */ do_action( 'jetpack_embed_to_shortcode', 'googlemaps', $url ); return "[googlemaps $url]"; @@ -45,8 +50,15 @@ function jetpack_googlemaps_embed_to_short_code_callback( $match ) { add_filter( 'pre_kses', 'jetpack_googlemaps_embed_to_short_code' ); +/** + * [googlemaps] shortcode + * + * Example usage: + * [googlemaps http://maps.google.com/maps?f=q&hl=en&geocode=&q=San+Francisco,+CA&sll=43.469466,-83.998504&sspn=0.01115,0.025942&g=San+Francisco,+CA&ie=UTF8&z=12&iwloc=addr&ll=37.808156,-122.402458&output=embed&s=AARTsJp56EajYksz3JXgNCwT3LJnGsqqAQ&w=425&h=350] + * [googlemaps https://mapsengine.google.com/map/embed?mid=zbBhkou4wwtE.kUmp8K6QJ7SA&w=640&h=480] + */ function jetpack_googlemaps_shortcode( $atts ) { - if ( !isset($atts[0]) || apply_filters( 'jetpack_bail_on_shortcode', false, 'googlemaps' ) ) + if ( !isset($atts[0]) ) return ''; $params = ltrim( $atts[0], '=' ); @@ -54,7 +66,7 @@ function jetpack_googlemaps_shortcode( $atts ) { $width = 425; $height = 350; - if ( preg_match( '!^https?://maps\.google(\.co|\.com)?(\.[a-z]+)?/.*?(\?.+)!i', $params, $match ) ) { + if ( preg_match( '!^https?://(www|maps|mapsengine)\.google(\.co|\.com)?(\.[a-z]+)?/.*?(\?.+)!i', $params, $match ) ) { $params = str_replace( '&amp;', '&', $params ); $params = str_replace( '&', '&', $params ); parse_str( $params, $arg ); @@ -79,9 +91,21 @@ function jetpack_googlemaps_shortcode( $atts ) { if( is_ssl() ) $url = str_replace( 'http://', 'https://', $url ); - $link_url = preg_replace( '!output=embed!', 'source=embed', $url ); + $css_class = 'googlemaps'; + + if ( ! empty( $atts['align'] ) && in_array( strtolower( $atts['align'] ), array( 'left', 'center', 'right' ), true ) ) { + $atts['align'] = strtolower( $atts['align'] ); + + if ( $atts['align'] === 'left' ) { + $css_class .= ' alignleft'; + } elseif ( $atts['align'] === 'center' ) { + $css_class .= ' aligncenter'; + } elseif ( $atts['align'] === 'right' ) { + $css_class .= ' alignright'; + } + } - return '<div class="googlemaps"><iframe width="' . $width . '" height="' . $height . '" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="' . $url . '"></iframe><br /><small><a href="' . $link_url . '" style="text-align:left">View Larger Map</a></small></div>'; + return '<div class="' . esc_attr( $css_class ) . '"><iframe width="' . $width . '" height="' . $height . '" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="' . $url . '"></iframe></div>'; } } add_shortcode( 'googlemaps', 'jetpack_googlemaps_shortcode' ); |