Update jetpack, akismet and wordpress-importer

1 files changed, 45 insertions, 33 deletions

diff --git a/plugins/jetpack/modules/widgets/facebook-likebox.php b/plugins/jetpack/modules/widgets/facebook-likebox.php
index f8ab2512..8cb7e02b 100644
--- a/plugins/jetpack/modules/widgets/facebook-likebox.php
+++ b/plugins/jetpack/modules/widgets/facebook-likebox.php
@@ -37,11 +37,11 @@ class WPCOM_Widget_Facebook_LikeBox extends WP_Widget {
 	}
 
 	function widget( $args, $instance ) {
-		
+
 		extract( $args );
-		
+
 		$like_args = $this->normalize_facebook_args( $instance['like_args'] );
-		
+
 		if ( empty( $like_args['href'] ) || ! $this->is_valid_facebook_url( $like_args['href'] ) ) {
 			if ( current_user_can('edit_theme_options') ) {
 				echo $before_widget;
@@ -51,7 +51,7 @@ class WPCOM_Widget_Facebook_LikeBox extends WP_Widget {
 			echo '<!-- Invalid Facebook Page URL -->';
 			return;
 		}
-		
+
 
 		$title    = apply_filters( 'widget_title', $instance['title'] );
 		$page_url = ( is_ssl() ) ? str_replace( 'http://', 'https://', $like_args['href'] ) : $like_args['href'];
@@ -59,16 +59,17 @@ class WPCOM_Widget_Facebook_LikeBox extends WP_Widget {
 		$like_args['show_faces'] = (bool) $like_args['show_faces']         ? 'true' : 'false';
 		$like_args['stream']     = (bool) $like_args['stream']             ? 'true' : 'false';
 		$like_args['force_wall'] = (bool) $like_args['force_wall']         ? 'true' : 'false';
+		$like_args['show_border']= (bool) $like_args['show_border']        ? 'true' : 'false';
 		$like_args['header']     = (bool) $like_args['header']             ? 'true' : 'false';
-		$like_bg_colour          = ( 'dark' == $like_args['colorscheme'] ) ? '#000' : '#fff';
-		
+		$like_bg_colour          = apply_filters( 'jetpack_fb_likebox_bg', ( 'dark' == $like_args['colorscheme'] ? '#000' : '#fff' ), $like_args['colorscheme'] );
+
 		$locale = $this->get_locale();
 		if ( $locale && 'en_US' != $locale )
 			$like_args['locale'] = $locale;
 
 		$like_args = urlencode_deep( $like_args );
 		$like_url  = add_query_arg( $like_args,  sprintf( '%swww.facebook.com/plugins/likebox.php', ( is_ssl() ) ? 'https://' : 'http://' ) );
-		
+
 		echo $before_widget;
 
 		if ( ! empty( $title ) ) :
@@ -85,13 +86,13 @@ class WPCOM_Widget_Facebook_LikeBox extends WP_Widget {
 	}
 
 	function update( $new_instance, $old_instance ) {
-		$instance = array( 
+		$instance = array(
 			'title' => '',
 			'like_args' => $this->get_default_args(),
 		);
 
 		$instance['title'] = trim( strip_tags( stripslashes( $new_instance['title'] ) ) );
-		
+
 		// Set up widget values
 		$instance['like_args'] = array(
 			'href'        => trim( strip_tags( stripslashes( $new_instance['href'] ) ) ),
@@ -100,30 +101,31 @@ class WPCOM_Widget_Facebook_LikeBox extends WP_Widget {
 			'colorscheme' => $new_instance['colorscheme'],
 			'show_faces'  => (bool) $new_instance['show_faces'],
 			'stream'      => (bool) $new_instance['stream'],
+			'show_border' => (bool) $new_instance['show_border'],
 			'header'      => false, // The header just displays "Find us on Facebook"; it's redundant with the title
 			'force_wall'  => (bool) $new_instance['force_wall'],
 		);
-		
+
 		$instance['like_args'] = $this->normalize_facebook_args( $instance['like_args'] );
 
 		return $instance;
 	}
 
 	function form( $instance ) {
-		$instance = wp_parse_args( (array) $instance, array( 
+		$instance = wp_parse_args( (array) $instance, array(
 			'title'     => '',
 			'like_args' => $this->get_default_args()
 		) );
 		$like_args = $this->normalize_facebook_args( $instance['like_args'] );
 		?>
-		
+
 		<p>
 			<label for="<?php echo $this->get_field_id( 'title' ); ?>">
 				<?php _e( 'Title', 'jetpack' ); ?>
 				<input type="text" name="<?php echo $this->get_field_name( 'title' ); ?>" id="<?php echo $this->get_field_id( 'title' ); ?>" value="<?php echo esc_attr( $instance['title'] ); ?>" class="widefat" />
 			</label>
 		</p>
-		
+
 		<p>
 			<label for="<?php echo $this->get_field_id( 'href' ); ?>">
 				<?php _e( 'Facebook Page URL', 'jetpack' ); ?>
@@ -132,21 +134,21 @@ class WPCOM_Widget_Facebook_LikeBox extends WP_Widget {
 				<small><?php _e( 'The Like Box only works with <a href="http://www.facebook.com/help/?faq=174987089221178">Facebook Pages</a>.', 'jetpack' ); ?></small>
 			</label>
 		</p>
-		
+
 		<p>
 			<label for="<?php echo $this->get_field_id( 'width' ); ?>">
 				<?php _e( 'Width', 'jetpack' ); ?>
-				<input type="text" maxlength="3" name="<?php echo $this->get_field_name( 'width' ); ?>" id="<?php echo $this->get_field_id( 'width' ); ?>" value="<?php echo esc_attr( $like_args['width'] ); ?>" style="width: 30px; text-align: center;" />px
+				<input type="number" class="smalltext" min="1" max="999" maxlength="3" name="<?php echo $this->get_field_name( 'width' ); ?>" id="<?php echo $this->get_field_id( 'width' ); ?>" value="<?php echo esc_attr( $like_args['width'] ); ?>" style="text-align: center;" />px
 			</label>
 		</p>
 
 		<p>
 			<label for="<?php echo $this->get_field_id( 'height' ); ?>">
 				<?php _e( 'Height', 'jetpack' ); ?>
-				<input type="text" maxlength="3" name="<?php echo $this->get_field_name( 'height' ); ?>" id="<?php echo $this->get_field_id( 'height' ); ?>" value="<?php echo esc_attr( $like_args['height'] ); ?>" style="width: 30px; text-align: center;" />px
+				<input type="number" class="smalltext" min="1" max="999" maxlength="3" name="<?php echo $this->get_field_name( 'height' ); ?>" id="<?php echo $this->get_field_id( 'height' ); ?>" value="<?php echo esc_attr( $like_args['height'] ); ?>" style="text-align: center;" />px
 			</label>
 		</p>
-		
+
 		<p>
 			<label for="<?php echo $this->get_field_id( 'colorscheme' ); ?>">
 				<?php _e( 'Color Scheme', 'jetpack' ); ?>
@@ -156,8 +158,7 @@ class WPCOM_Widget_Facebook_LikeBox extends WP_Widget {
 				</select>
 			</label>
 		</p>
-		
-		
+
 		<p>
 			<label for="<?php echo $this->get_field_id( 'show_faces' ); ?>">
 				<input type="checkbox" name="<?php echo $this->get_field_name( 'show_faces' ); ?>" id="<?php echo $this->get_field_id( 'show_faces' ); ?>" <?php checked( $like_args['show_faces'] ); ?> />
@@ -166,7 +167,7 @@ class WPCOM_Widget_Facebook_LikeBox extends WP_Widget {
 				<small><?php _e( 'Show profile photos in the plugin.', 'jetpack' ); ?></small>
 			</label>
 		</p>
-		
+
 		<p>
 			<label for="<?php echo $this->get_field_id( 'stream' ); ?>">
 				<input type="checkbox" name="<?php echo $this->get_field_name( 'stream' ); ?>" id="<?php echo $this->get_field_id( 'stream' ); ?>" <?php checked( $like_args['stream'] ); ?> />
@@ -177,6 +178,15 @@ class WPCOM_Widget_Facebook_LikeBox extends WP_Widget {
 		</p>
 
 		<p>
+			<label for="<?php echo $this->get_field_id( 'show_border' ); ?>">
+				<input type="checkbox" name="<?php echo $this->get_field_name( 'show_border' ); ?>" id="<?php echo $this->get_field_id( 'show_border' ); ?>" <?php checked( $like_args['show_border'] ); ?> />
+				<?php _e( 'Show Border', 'jetpack' ); ?>
+				<br />
+				<small><?php _e( 'Show a border around the plugin.', 'jetpack' ); ?></small>
+			</label>
+		</p>
+
+		<p>
 			<label for="<?php echo $this->get_field_id( 'force_wall' ); ?>">
 				<input type="checkbox" name="<?php echo $this->get_field_name( 'force_wall' ); ?>" id="<?php echo $this->get_field_id( 'force_wall' ); ?>" <?php checked( $like_args['force_wall'] ); ?> />
 				<?php _e( 'Show Wall', 'jetpack' ); ?>
@@ -184,10 +194,10 @@ class WPCOM_Widget_Facebook_LikeBox extends WP_Widget {
 				<small><?php _e( 'Show the wall for a Places page rather than friend activity.', 'jetpack' ); ?></small>
 			</label>
 		</p>
-		
+
 		<?php
 	}
-	
+
 	function get_default_args() {
 		$defaults = array(
 			'href'        => '',
@@ -196,13 +206,14 @@ class WPCOM_Widget_Facebook_LikeBox extends WP_Widget {
 			'colorscheme' => $this->default_colorscheme,
 			'show_faces'  => true,
 			'stream'      => false,
+			'show_border' => true,
 			'header'      => false,
 			'force_wall'  => false,
 		);
 
 		return apply_filters( 'jetpack_facebook_likebox_defaults', $defaults );
 	}
-	
+
 	function normalize_facebook_args( $args ) {
 		$args = wp_parse_args( (array) $args, $this->get_default_args() );
 
@@ -219,6 +230,7 @@ class WPCOM_Widget_Facebook_LikeBox extends WP_Widget {
 		$args['colorscheme'] = $this->normalize_text_value( $args['colorscheme'], $this->default_colorscheme, $this->allowed_colorschemes        );
 		$args['show_faces']  = (bool) $args['show_faces'];
 		$args['stream']      = (bool) $args['stream'];
+		$args['show_border'] = (bool) $args['show_border'];
 		$args['force_wall']  = (bool) $args['force_wall'];
 
 		// The height used to be dependent on other widget settings
@@ -233,32 +245,32 @@ class WPCOM_Widget_Facebook_LikeBox extends WP_Widget {
 				$args['height'] = 432;
 			}
 		}
-		
+
 		return $args;
 	}
-	
+
 	function is_valid_facebook_url( $url ) {
 		return ( FALSE !== strpos( $url, 'facebook.com' ) ) ? TRUE : FALSE;
 	}
-	
+
 	function normalize_int_value( $value, $default = 0, $max = 0, $min = 0 ) {
 		$value = (int) $value;
-		
+
 		if ( $max < $value || $min > $value )
 			$value = $default;
-			
+
 		return (int) $value;
 	}
-	
+
 	function normalize_text_value( $value, $default = '', $allowed = array() ) {
 		$allowed = (array) $allowed;
-		
+
 		if ( empty( $value ) || ( ! empty( $allowed ) && ! in_array( $value, $allowed ) ) )
 			$value = $default;
-		
-		return $value; 
+
+		return $value;
 	}
-	
+
 	function guess_locale_from_lang( $lang ) {
 		if ( 'en' == $lang || 'en_US' == $lang || !$lang ) {
 			return 'en_US';