update plugins

1 files changed, 66 insertions, 62 deletions

diff --git a/plugins/jetpack/modules/sharedaddy/sharing.php b/plugins/jetpack/modules/sharedaddy/sharing.php
index 3dd6f8d4..118f851c 100644
--- a/plugins/jetpack/modules/sharedaddy/sharing.php
+++ b/plugins/jetpack/modules/sharedaddy/sharing.php
@@ -6,7 +6,7 @@ class Sharing_Admin {
 			define( 'WP_SHARING_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
 			define( 'WP_SHARING_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 		}
-		
+
 		require_once WP_SHARING_PLUGIN_DIR.'sharing-service.php';
 
 		add_action( 'admin_init', array( &$this, 'admin_init' ) );
@@ -21,16 +21,16 @@ class Sharing_Admin {
 		add_action( 'wp_ajax_sharing_new_service', array( &$this, 'ajax_new_service' ) );
 		add_action( 'wp_ajax_sharing_delete_service', array( &$this, 'ajax_delete_service' ) );
 	}
-	
+
 	public function sharing_head() {
 		wp_enqueue_script( 'sharing-js', WP_SHARING_PLUGIN_URL.'admin-sharing.js', array( 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-form' ), 2 );
-		wp_enqueue_style( 'sharing-admin', WP_SHARING_PLUGIN_URL.'admin-sharing.css', false, WP_SHARING_PLUGIN_VERSION );
-		wp_enqueue_style( 'sharing', WP_SHARING_PLUGIN_URL.'sharing.css', false, WP_SHARING_PLUGIN_VERSION );
-		wp_enqueue_script( 'sharing-js-fe', WP_SHARING_PLUGIN_URL . 'sharing.js', array( ), 2 );
+		wp_enqueue_style( 'sharing-admin', WP_SHARING_PLUGIN_URL.'admin-sharing.css', false, JETPACK__VERSION );
+		wp_enqueue_style( 'sharing', WP_SHARING_PLUGIN_URL.'sharing.css', false, JETPACK__VERSION );
+		wp_enqueue_script( 'sharing-js-fe', WP_SHARING_PLUGIN_URL . 'sharing.js', array( ), 3 );
 
 		add_thickbox();
 	}
-	
+
 	public function admin_init() {
 		if ( isset( $_GET['page'] ) && ( $_GET['page'] == 'sharing.php' || $_GET['page'] == 'sharing' ) )
 			$this->process_requests();
@@ -41,29 +41,35 @@ class Sharing_Admin {
 			$sharer = new Sharing_Service();
 			$sharer->set_global_options( $_POST );
 			do_action( 'sharing_admin_update' );
-			
+
 			wp_safe_redirect( admin_url( 'options-general.php?page=sharing&update=saved' ) );
 			die();
 		}
 	}
-	
+
 	public function subscription_menu( $user ) {
+		if ( !defined( 'IS_WPCOM' ) || !IS_WPCOM ) {
+			$active = Jetpack::get_active_modules();
+			if ( !in_array( 'publicize', $active ) && !current_user_can( 'manage_options' ) )
+				return;
+		}
+
 		add_submenu_page( 'options-general.php', __( 'Sharing Settings', 'jetpack' ), __( 'Sharing', 'jetpack' ), 'publish_posts', 'sharing', array( &$this, 'management_page' ) );
 	}
-	
+
 	public function ajax_save_services() {
 		if ( isset( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'sharing-options' ) && isset( $_POST['hidden'] ) && isset( $_POST['visible'] ) ) {
 			$sharer = new Sharing_Service();
-			
+
 			$sharer->set_blog_services( explode( ',', $_POST['visible'] ), explode( ',', $_POST['hidden'] ) );
 			die();
 		}
 	}
-	
+
 	public function ajax_new_service() {
 		if ( isset( $_POST['_wpnonce'] ) && isset( $_POST['sharing_name'] ) && isset( $_POST['sharing_url'] ) && isset( $_POST['sharing_icon'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'sharing-new_service' ) ) {
 			$sharer = new Sharing_Service();
-			if ( $service = $sharer->new_service( $_POST['sharing_name'], $_POST['sharing_url'], $_POST['sharing_icon'] ) ) {
+			if ( $service = $sharer->new_service( stripslashes( $_POST['sharing_name'] ), stripslashes( $_POST['sharing_url'] ), stripslashes( $_POST['sharing_icon'] ) ) ) {
 				$this->output_service( $service->get_id(), $service );
 				echo '<!--->';
 				$service->button_style = 'icon-text';
@@ -76,14 +82,14 @@ class Sharing_Admin {
 		// Fail
 		die( '1' );
 	}
-	
+
 	public function ajax_delete_service() {
 		if ( isset( $_POST['_wpnonce'] ) && isset( $_POST['service'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'sharing-options_'.$_POST['service'] ) ) {
 			$sharer = new Sharing_Service();
 			$sharer->delete_service( $_POST['service'] );
 		}
 	}
-	
+
 	public function ajax_save_options() {
 		if ( isset( $_POST['_wpnonce'] ) && isset( $_POST['service'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'sharing-options_'.$_POST['service'] ) ) {
 			$sharer = new Sharing_Service();
@@ -102,29 +108,23 @@ class Sharing_Admin {
 			die();
 		}
 	}
-	
+
 	public function output_preview( $service ) {
 		$klasses = array( 'advanced', 'preview-item' );
-		
-		if (
-				'googleplus1' == $service->shortname
-			||
-				$service->button_style != 'text'
-			||
-				$service->has_custom_button_style()
-		) {
+
+		if ( $service->button_style != 'text' || $service->has_custom_button_style() ) {
 			$klasses[] = 'preview-'.$service->get_class();
 			$klasses[] = 'share-'.$service->get_class();
-			
+
 			if ( $service->get_class() != $service->get_id() )
 				$klasses[] = 'preview-'.$service->get_id();
 		}
-			
+
 		echo '<li class="'.implode( ' ', $klasses ).'">';
 		echo $service->display_preview();
 		echo '</li>';
 	}
-	
+
 	public function output_service( $id, $service, $show_dropdown = false ) {
 ?>
 	<li class="service advanced share-<?php echo $service->get_class(); ?>" id="<?php echo $service->get_id(); ?>">
@@ -161,21 +161,21 @@ class Sharing_Admin {
 	<div class="wrap">
 	  	<div class="icon32" id="icon-options-general"><br /></div>
 	  	<h2><?php _e( 'Sharing Settings', 'jetpack' ); ?></h2>
-	  	
+
 		<?php do_action( 'pre_admin_screen_sharing' ) ?>
-		
+
 		<?php if ( current_user_can( 'manage_options' ) ) : ?>
-		
-	  	<h3><?php _e( 'Sharing Buttons' ) ?></h3>
-	  	<p><?php _e( 'Add sharing buttons to your blog and allow your visitors to share posts with their friends.' ) ?></p>
-	  	
+
+	  	<h3><?php _e( 'Sharing Buttons', 'jetpack' ) ?></h3>
+	  	<p><?php _e( 'Add sharing buttons to your blog and allow your visitors to share posts with their friends.', 'jetpack' ) ?></p>
+
 	  	<div id="services-config">
 	  		<table id="available-services">
 					<tr>
 		  			<td class="description">
 		  				<h3><?php _e( 'Available Services', 'jetpack' ); ?></h3>
 		  				<p><?php _e( "Drag and drop the services you'd like to enable into the box below.", 'jetpack' ); ?></p>
-		  				<p><a href="#TB_inline?height=395&amp;width=600&amp;inlineId=new-service" title="<?php echo esc_attr( __( 'Add a new service', 'jetpack' ) ); ?>" class="thickbox"><?php _e( 'Add a new service', 'jetpack' ); ?></a></p>
+		  				<p><a href="#TB_inline?height=395&amp;width=600&amp;inlineId=new-service" title="<?php echo esc_attr( __( 'Add a new service', 'jetpack' ) ); ?>" class="thickbox" id="add-a-new-service"><?php _e( 'Add a new service', 'jetpack' ); ?></a></p>
 		  			</td>
 		  			<td class="services">
 		  				<ul class="services-available" style="height: 100px;">
@@ -186,11 +186,15 @@ class Sharing_Admin {
 									?>
 	  						<?php endforeach; ?>
 		  				</ul>
+						<?php
+			  				if ( -1 == get_option( 'blog_public' ) )
+								echo '<p><strong>'.__( 'Please note that your services have been restricted because your site is private.', 'jetpack' ).'</strong></p>';
+		  				?>
 		  				<br class="clearing" />
 		  			</td>
 					</tr>
 	  		</table>
-	
+
   			<table id="enabled-services">
   				<tr>
   					<td class="description">
@@ -201,19 +205,19 @@ class Sharing_Admin {
 						<p><?php _e( 'Services dragged here will appear individually.', 'jetpack' ); ?></p>
   					</td>
 	  				<td class="services" id="share-drop-target">
-			  				<h2 id="drag-instructions" <?php if ( count( $enabled['visible'] ) > 0 ) echo ' style="display: none"'; ?>><?php _e( 'Drag and drop available services here', 'jetpack' ); ?></h2>
-			  				
+			  				<h2 id="drag-instructions" <?php if ( count( $enabled['visible'] ) > 0 ) echo ' style="display: none"'; ?>><?php _e( 'Drag and drop available services here.', 'jetpack' ); ?></h2>
+
 								<ul class="services-enabled">
 									<?php foreach ( $enabled['visible'] as $id => $service ) : ?>
 										<?php $this->output_service( $id, $service, true ); ?>
 									<?php endforeach; ?>
-									
+
 									<li class="end-fix"></li>
 								</ul>
-					</td>	  			
+					</td>
 					<td id="hidden-drop-target" class="services">
 			  				<p><?php _e( 'Services dragged here will be hidden behind a share button.', 'jetpack' ); ?></p>
-			  				
+
 			  				<ul class="services-hidden">
 									<?php foreach ( $enabled['hidden'] as $id => $service ) : ?>
 										<?php $this->output_service( $id, $service, true ); ?>
@@ -222,8 +226,8 @@ class Sharing_Admin {
 			  				</ul>
 					</td>
 				</tr>
-			</table>						  			
-				
+			</table>
+
 			<table id="live-preview">
 				<tr>
 					<td class="description">
@@ -240,12 +244,12 @@ class Sharing_Admin {
 					                <?php foreach ( $enabled['visible'] as $id => $service ) : ?>
 										<?php $this->output_preview( $service ); ?>
 									<?php endforeach; ?>
-					
+
 									<?php if ( count( $enabled['hidden'] ) > 0 ) : ?>
 					                <li class="advanced"><a href="#" class="sharing-anchor sd-button share-more"><span><?php _e( 'More', 'jetpack' ); ?></span></a></li>
 					                <?php endif; ?>
 					            </ul>
-					            
+
 					            <?php if ( count( $enabled['hidden'] ) > 0 ) : ?>
 								<div class="sharing-hidden">
 									<div class="inner" style="display: none; <?php echo count( $enabled['hidden'] ) == 1 ? 'width:150px;' : ''; ?>">
@@ -254,18 +258,18 @@ class Sharing_Admin {
 									<?php else: ?>
 										<ul>
 									<?php endif; ?>
-	
+
 									<?php foreach ( $enabled['hidden'] as $id => $service ) {
 											$this->output_preview( $service );
 										}?>
-										</ul>						            
+										</ul>
 									</div>
 								</div>
 								<?php endif; ?>
 
 								<ul class="archive" style="display:none;">
-								<?php 
-									foreach ( $sharer->get_all_services_blog() as $id => $service ) : 
+								<?php
+									foreach ( $sharer->get_all_services_blog() as $id => $service ) :
 										if ( isset( $enabled['visible'][$id] ) )
 											$service = $enabled['visible'][$id];
 										elseif ( isset( $enabled['hidden'][$id] ) )
@@ -284,7 +288,7 @@ class Sharing_Admin {
 					</td>
 				</tr>
 			</table>
-				
+
 				<form method="post" action="<?php echo admin_url( 'admin-ajax.php' ); ?>" id="save-enabled-shares">
 					<input type="hidden" name="action" value="sharing_save_services" />
 					<input type="hidden" name="visible" value="<?php echo implode( ',', array_keys( $enabled['visible'] ) ); ?>" />
@@ -322,7 +326,7 @@ class Sharing_Admin {
 	  						</select>
 	  					</td>
 	  				</tr>
-	  				<tr valign="top">
+	  				<?php echo apply_filters( 'sharing_show_buttons_on_row_start', '<tr valign="top">' ); ?>
 	  					<th scope="row"><label><?php _e( 'Show buttons on', 'jetpack' ); ?></label></th>
 	  					<td>
 						<?php
@@ -338,19 +342,19 @@ class Sharing_Admin {
 							<?php if ( $br ) echo '<br />'; ?><label><input type="checkbox"<?php checked( in_array( $show, $global['show'] ) ); ?> name="show[]" value="<?php echo esc_attr( $show ); ?>" /> <?php echo esc_html( $label ); ?></label>
 						<?php	$br = true; endforeach; ?>
 	  					</td>
-	  				</tr>
-	  				
+	  				<?php echo apply_filters( 'sharing_show_buttons_on_row_end', '</tr>' ); ?>
+
 	  				<?php do_action( 'sharing_global_options' ); ?>
 	  			</tbody>
 	  		</table>
-	  	
+
 		  	<p class="submit">
 					<input type="submit" name="submit" class="button-primary" value="<?php _e( 'Save Changes', 'jetpack' ); ?>" />
 				</p>
-				
+
 				<input type="hidden" name="_wpnonce" value="<?php echo wp_create_nonce( 'sharing-options' );?>" />
 	  	</form>
-	  
+
 	  <div id="new-service" style="display: none">
 	  	<form method="post" action="<?php echo admin_url( 'admin-ajax.php' ); ?>" id="new-service-form">
 	  		<table class="form-table">
@@ -365,9 +369,9 @@ class Sharing_Admin {
 	  					<th scope="row" width="100"><label><?php _e( 'Sharing URL', 'jetpack' ); ?></label></th>
 	  					<td>
 	  						<input type="text" name="sharing_url" id="new_sharing_url" size="40" />
-	  						
+
 	  						<p><?php _e( 'You can add the following variables to your service sharing URL:', 'jetpack' ); ?><br/>
-	  						<code>%post_title%</code>, <code>%post_url%</code>, <code>%post_full_url%</code>, <code>%post_excerpt%</code>, <code>%post_full_url%</code>, <code>%post_tags%</code></p>
+	  						<code>%post_title%</code>, <code>%post_url%</code>, <code>%post_full_url%</code>, <code>%post_excerpt%</code>, <code>%post_tags%</code></p>
 	  					</td>
 	  				</tr>
 	  				<tr valign="top">
@@ -384,7 +388,7 @@ class Sharing_Admin {
 	  						<img src="<?php echo admin_url( 'images/loading.gif' ); ?>" width="16" height="16" alt="loading" style="vertical-align: middle; display: none" />
 	  					</td>
 	  				</tr>
-	  				
+
 	  				<?php do_action( 'sharing_new_service_form' ); ?>
 	  			</tbody>
 	  		</table>
@@ -394,18 +398,18 @@ class Sharing_Admin {
 				<div class="inerror" style="display: none; margin-top: 15px">
 					<p><?php _e( 'An error occurred creating your new sharing service - please check you gave valid details.', 'jetpack' ); ?></p>
 				</div>
-	  	
+
 	  		<input type="hidden" name="action" value="sharing_new_service" />
-				<input type="hidden" name="_wpnonce" value="<?php echo wp_create_nonce( 'sharing-new_service' );?>" />
+			<input type="hidden" name="_wpnonce" value="<?php echo wp_create_nonce( 'sharing-new_service' );?>" />
 	  	</form>
 	   </div>
-	   
-	   
+
+
 	   <?php endif; ?>
 
 
 	</div>
-	
+
 	<script type="text/javascript">
 		var sharing_loading_icon = '<?php echo esc_js( admin_url( "/images/loading.gif" ) ); ?>';
 		<?php if ( isset( $_GET['create_new_service'] ) && 'true' == $_GET['create_new_service'] ) : ?>