postpromoterpro / post-promoter-pro

includes/cron-functions.php

Doc Comments +1 added lines, -1 removed lines

@@ -225,7 +225,7 @@
  * @since  2.3
  * @param  string $date The Date
  * @param  string $time The time
- * @return long         A timestamp
+ * @return integer         A timestamp
  */
 function ppp_generate_timestamp( $date, $time ) {
 	$share_time = explode( ':', $time );

Spacing +23 added lines, -23 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined( 'ABSPATH' )) {
 	exit;
 }
 
@@ -13,23 +13,23 @@ 
  */
 function ppp_schedule_share( $post_id, $post ) {
 	global $ppp_options;
-	$allowed_post_types = isset( $ppp_options['post_types'] ) ? $ppp_options['post_types'] : array();
+	$allowed_post_types = isset($ppp_options['post_types']) ? $ppp_options['post_types'] : array();
 	$allowed_post_types = apply_filters( 'ppp_schedule_share_post_types', $allowed_post_types );
 
-	if ( ! isset( $_POST['post_status'] ) || ! array_key_exists( $post->post_type, $allowed_post_types ) ) {
+	if ( ! isset($_POST['post_status']) || ! array_key_exists( $post->post_type, $allowed_post_types )) {
 		return;
 	}
 
 	ppp_remove_scheduled_shares( $post_id );
 
-	if( ( $_POST['post_status'] == 'publish' && $_POST['original_post_status'] != 'publish' ) || // From anything to published
-		( $_POST['post_status'] == 'future' && $_POST['original_post_status'] == 'future' ) || // Updating a future post
-		( $_POST['post_status'] == 'publish' && $_POST['original_post_status'] == 'publish' ) ) { // Updating an already published post
+	if (($_POST['post_status'] == 'publish' && $_POST['original_post_status'] != 'publish') || // From anything to published
+		($_POST['post_status'] == 'future' && $_POST['original_post_status'] == 'future') || // Updating a future post
+		($_POST['post_status'] == 'publish' && $_POST['original_post_status'] == 'publish')) { // Updating an already published post
 		global $ppp_options, $ppp_social_settings;
 
 		$timestamps = ppp_get_timestamps( $post_id );
 
-		foreach ( $timestamps as $timestamp => $name ) {
+		foreach ($timestamps as $timestamp => $name) {
 			$timestamp = substr( $timestamp, 0, strlen( $timestamp ) - 3 );
 			wp_schedule_single_event( $timestamp, 'ppp_share_post_event', array( $post_id, $name ) );
 		}
@@ -48,7 +48,7 @@ 
 
 	$current_item_shares = ppp_get_shceduled_crons( $post_id );
 
-	foreach ( $current_item_shares as $share ) {
+	foreach ($current_item_shares as $share) {
 		wp_clear_scheduled_hook( 'ppp_share_post_event', array( $post_id, $share['args'][1] ) );
 	}
 
@@ -73,19 +73,19 @@ 
 	$all_crons = get_option( 'cron' );
 	$ppp_crons = array();
 
-	foreach ( $all_crons as $timestamp => $cron ) {
-		if ( ! isset( $cron['ppp_share_post_event'] ) ) {
+	foreach ($all_crons as $timestamp => $cron) {
+		if ( ! isset($cron['ppp_share_post_event'])) {
 			continue;
 		}
 
-		foreach ( $cron['ppp_share_post_event'] as $key => $single_event ) {
+		foreach ($cron['ppp_share_post_event'] as $key => $single_event) {
 			$name_parts = explode( '_', $single_event['args'][1] );
-			if ( false !== $post_id && $post_id != $name_parts[2] ) {
+			if (false !== $post_id && $post_id != $name_parts[2]) {
 				continue;
 			}
 
 			$single_event['timestamp'] = $timestamp;
-			$ppp_crons[ $key ]         = $single_event;
+			$ppp_crons[$key]         = $single_event;
 		}
 
 	}
@@ -103,26 +103,26 @@ 
  *
  */
 function ppp_has_cron_within( $time = 0, $within = 0 ) {
-	if ( empty( $time ) ) {
+	if (empty($time)) {
 		$time = current_time( 'timestamp' );
 	}
 
-	if ( empty( $within ) ) {
+	if (empty($within)) {
 		$within = ppp_get_default_conflict_window();
 	}
 
 	$crons = ppp_get_shceduled_crons();
 
-	if ( empty( $crons ) ) {
+	if (empty($crons)) {
 		return false;
 	}
 
 	$scheduled_times = wp_list_pluck( $crons, 'timestamp' );
 
 	$found_time = false;
-	foreach ( $scheduled_times as $key => $scheduled_time ) {
+	foreach ($scheduled_times as $key => $scheduled_time) {
 		$found_time = ppp_is_time_within( $scheduled_time, $time, $within );
-		if ( $found_time ) {
+		if ($found_time) {
 			break;
 		}
 	}
@@ -144,7 +144,7 @@ 
 	$min = $target_time - $within;
 	$max = $target_time + $within;
 
-	return ( ( $time >= $min ) && ( $time <= $max ) );
+	return (($time >= $min) && ($time <= $max));
 }
 
 /**
@@ -212,7 +212,7 @@ 
  */
 function ppp_unschedule_shares( $new_status, $old_status, $post ) {
 
-	if ( ( $old_status == 'publish' || $old_status == 'future' ) && ( $new_status != 'publish' && $new_status != 'future' ) ) {
+	if (($old_status == 'publish' || $old_status == 'future') && ($new_status != 'publish' && $new_status != 'future')) {
 		ppp_remove_scheduled_shares( $post->ID );
 	}
 
@@ -233,15 +233,15 @@ 
 	$minutes    = (int) substr( $share_time[1], 0, 2 );
 	$ampm       = strtolower( substr( $share_time[1], -2 ) );
 
-	if ( $ampm == 'pm' && $hours != 12 ) {
+	if ($ampm == 'pm' && $hours != 12) {
 		$hours = $hours + 12;
 	}
 
-	if ( $ampm == 'am' && $hours == 12 ) {
+	if ($ampm == 'am' && $hours == 12) {
 		$hours = 00;
 	}
 
-	$offset    = (int) -( get_option( 'gmt_offset' ) );
+	$offset    = (int) -(get_option( 'gmt_offset' ));
 	$hours     = $hours + $offset;
 	$date      = explode( '/', $date );
 	$timestamp = mktime( $hours, $minutes, 0, $date[0], $date[1], $date[2] );

includes/facebook-functions.php

Doc Comments +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
 /**
  * Register Facebook as a service
  * @param  array $services The Currently registered services
- * @return array           The services with Facebook added
+ * @return string[]           The services with Facebook added
  */
 function ppp_fb_register_service( $services = array() ) {
 	$services[] = 'fb';
@@ -190,7 +190,7 @@ 
 /**
  * Add query vars for Facebook
  * @param  array $vars Currenty Query Vars
- * @return array       Query vars array with facebook added
+ * @return string[]       Query vars array with facebook added
  */
 function ppp_fb_query_vars( $vars ) {
 	$vars[] = 'fb_access_token';
@@ -748,7 +748,7 @@ 
  * @since  2.3
  * @param  int     $post_id      Post ID
  * @param  string  $name         The cron name
- * @param  boolean $scheduled    If the item is being fired by a schedule (default, true), or retrieved for display (false)
+ * @param  boolean $is_scheduled    If the item is being fired by a schedule (default, true), or retrieved for display (false)
  * @return string                The formatted link to the post
  */
 function ppp_fb_generate_share_content( $post_id, $name, $is_scheduled = true ) {

Spacing +111 added lines, -111 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined( 'ABSPATH' )) {
 	exit;
 }
 
@@ -12,7 +12,7 @@ 
 function ppp_facebook_enabled() {
 	global $ppp_social_settings;
 
-	if ( isset( $ppp_social_settings['facebook'] ) && !empty( $ppp_social_settings['facebook'] ) ) {
+	if (isset($ppp_social_settings['facebook']) && ! empty($ppp_social_settings['facebook'])) {
 		return true;
 	}
 
@@ -50,10 +50,10 @@ 
  */
 function ppp_fb_account_list_avatar( $string = '' ) {
 
-	if ( ppp_facebook_enabled() ) {
+	if (ppp_facebook_enabled()) {
 		global $ppp_social_settings;
 		$avatar_url = $ppp_social_settings['facebook']->avatar;
-		$string = '<img class="ppp-social-icon" src="' . $avatar_url . '" />';
+		$string = '<img class="ppp-social-icon" src="'.$avatar_url.'" />';
 	}
 
 	return $string;
@@ -67,9 +67,9 @@ 
  */
 function ppp_fb_account_list_name( $string = '' ) {
 
-	if ( ppp_facebook_enabled() ) {
+	if (ppp_facebook_enabled()) {
 		global $ppp_social_settings;
-		$string  = $ppp_social_settings['facebook']->name;
+		$string = $ppp_social_settings['facebook']->name;
 	}
 
 	return $string;
@@ -83,13 +83,13 @@ 
  */
 function ppp_fb_account_list_actions( $string = '' ) {
 
-	if ( ! ppp_facebook_enabled() ) {
+	if ( ! ppp_facebook_enabled()) {
 		global $ppp_facebook_oauth, $ppp_social_settings;
 		$fb_authurl = $ppp_facebook_oauth->ppp_get_facebook_auth_url( admin_url( 'admin.php?page=ppp-social-settings' ) );
 
-		$string .= '<a class="button-primary" href="' . $fb_authurl . '">' . __( 'Connect to Facebook', 'ppp-txt' ) . '</a>';
+		$string .= '<a class="button-primary" href="'.$fb_authurl.'">'.__( 'Connect to Facebook', 'ppp-txt' ).'</a>';
 	} else {
-		$string  .= '<a class="button-primary" href="' . admin_url( 'admin.php?page=ppp-social-settings&ppp_social_disconnect=true&ppp_network=facebook' ) . '" >' . __( 'Disconnect from Facebook', 'ppp-txt' ) . '</a>&nbsp;';
+		$string .= '<a class="button-primary" href="'.admin_url( 'admin.php?page=ppp-social-settings&ppp_social_disconnect=true&ppp_network=facebook' ).'" >'.__( 'Disconnect from Facebook', 'ppp-txt' ).'</a>&nbsp;';
 	}
 
 	return $string;
@@ -103,28 +103,28 @@ 
  */
 function ppp_fb_account_list_extras( $string ) {
 
-	if ( ppp_facebook_enabled() ) {
+	if (ppp_facebook_enabled()) {
 		global $ppp_social_settings, $ppp_facebook_oauth, $ppp_options;
 		$pages = $ppp_facebook_oauth->ppp_get_fb_user_pages( $ppp_social_settings['facebook']->access_token );
-		$selected = isset( $ppp_social_settings['facebook']->page ) ? stripslashes( $ppp_social_settings['facebook']->page ) : 'me';
+		$selected = isset($ppp_social_settings['facebook']->page) ? stripslashes( $ppp_social_settings['facebook']->page ) : 'me';
 
-		if ( !empty( $pages ) ) {
-			$string = '<label>' . __( 'Publish as:', 'ppp-txt' ) . '</label><br />';
+		if ( ! empty($pages)) {
+			$string = '<label>'.__( 'Publish as:', 'ppp-txt' ).'</label><br />';
 			$string .= '<select id="fb-page">';
-			$string .= '<option value="me">' . __( 'Me', 'ppp-txt' ) . '</option>';
-			foreach ( $pages as $page ) {
-				$value = $page->name . '|' . $page->access_token . '|' . $page->id;
-				$string .= '<option ' . selected( $value, $selected, false ) . ' value="' . $value . '">' . $page->name . '</option>';
+			$string .= '<option value="me">'.__( 'Me', 'ppp-txt' ).'</option>';
+			foreach ($pages as $page) {
+				$value = $page->name.'|'.$page->access_token.'|'.$page->id;
+				$string .= '<option '.selected( $value, $selected, false ).' value="'.$value.'">'.$page->name.'</option>';
 			}
 			$string .= '</select><span class="spinner"></span>';
 		}
 
-		if ( ! empty( $ppp_options['enable_debug'] ) ) {
-			$days_left  = absint( round( ( $ppp_social_settings['facebook']->expires_on - current_time( 'timestamp' ) ) / DAY_IN_SECONDS ) );
-			$refresh_in = absint( round( ( get_option( '_ppp_facebook_refresh' ) - current_time( 'timestamp' ) ) / DAY_IN_SECONDS ) );
+		if ( ! empty($ppp_options['enable_debug'])) {
+			$days_left  = absint( round( ($ppp_social_settings['facebook']->expires_on - current_time( 'timestamp' )) / DAY_IN_SECONDS ) );
+			$refresh_in = absint( round( (get_option( '_ppp_facebook_refresh' ) - current_time( 'timestamp' )) / DAY_IN_SECONDS ) );
 
-			$string .= '<br />' . sprintf( __( 'Token expires in %s days' , 'ppp-txt' ), $days_left );
-			$string .= '<br />' . sprintf( __( 'Refresh notice in %s days', 'ppp-txt' ), $refresh_in );
+			$string .= '<br />'.sprintf( __( 'Token expires in %s days', 'ppp-txt' ), $days_left );
+			$string .= '<br />'.sprintf( __( 'Refresh notice in %s days', 'ppp-txt' ), $refresh_in );
 		}
 	}
 
@@ -138,7 +138,7 @@ 
  * @return void
  */
 function ppp_set_fb_token_constants( $social_tokens ) {
-	if ( !empty( $social_tokens ) && property_exists( $social_tokens, 'facebook' ) ) {
+	if ( ! empty($social_tokens) && property_exists( $social_tokens, 'facebook' )) {
 		define( 'PPP_FB_APP_ID', $social_tokens->facebook->app_id );
 		define( 'PPP_FB_APP_SECRET', $social_tokens->facebook->app_secret );
 	}
@@ -152,17 +152,17 @@ 
 function ppp_capture_facebook_oauth() {
 	$should_capture = false;
 
-	if ( isset( $_GET['state'] ) && strpos( $_GET['state'], 'ppp-local-keys-fb' ) !== false ) {
+	if (isset($_GET['state']) && strpos( $_GET['state'], 'ppp-local-keys-fb' ) !== false) {
 		// Local config
 		$should_capture = true;
 	}
 
-	if ( isset( $_REQUEST['fb_access_token'] ) ) {
+	if (isset($_REQUEST['fb_access_token'])) {
 		// Returning from remote config
 		$should_capture = true;
 	}
 
-	if ( $should_capture && ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] == 'ppp-social-settings' ) ) {
+	if ($should_capture && (isset($_REQUEST['page']) && $_REQUEST['page'] == 'ppp-social-settings')) {
 		global $ppp_facebook_oauth;
 		$ppp_facebook_oauth->ppp_initialize_facebook();
 		wp_redirect( admin_url( 'admin.php?page=ppp-social-settings' ) );
@@ -179,8 +179,8 @@ 
 function ppp_disconnect_facebook() {
 	global $ppp_social_settings;
 	$ppp_social_settings = get_option( 'ppp_social_settings' );
-	if ( isset( $ppp_social_settings['facebook'] ) ) {
-		unset( $ppp_social_settings['facebook'] );
+	if (isset($ppp_social_settings['facebook'])) {
+		unset($ppp_social_settings['facebook']);
 		update_option( 'ppp_social_settings', $ppp_social_settings );
 		delete_option( '_ppp_facebook_refresh' );
 	}
@@ -206,13 +206,13 @@ 
  */
 function ppp_fb_execute_refresh() {
 
-	if ( ! ppp_facebook_enabled() ) {
+	if ( ! ppp_facebook_enabled()) {
 		return;
 	}
 
 	$refresh_date = (int) get_option( '_ppp_facebook_refresh', true );
 
-	if ( current_time( 'timestamp' ) > $refresh_date ) {
+	if (current_time( 'timestamp' ) > $refresh_date) {
 		add_action( 'admin_notices', 'ppp_facebook_refresh_notice' );
 	}
 }
@@ -224,12 +224,12 @@ 
  */
 function ppp_facebook_refresh_notice() {
 
-	if ( ! ppp_facebook_enabled() ) {
+	if ( ! ppp_facebook_enabled()) {
 		return;
 	}
 
-	$has_dismissed = get_transient( 'ppp-dismiss-refresh-fb' . get_current_user_id() );
-	if ( false !== $has_dismissed ) {
+	$has_dismissed = get_transient( 'ppp-dismiss-refresh-fb'.get_current_user_id() );
+	if (false !== $has_dismissed) {
 		return;
 	}
 
@@ -240,14 +240,14 @@ 
 
 	$token = $ppp_social_settings['facebook']->access_token;
 	$url = $ppp_facebook_oauth->ppp_get_facebook_auth_url( admin_url( 'admin.php?page=ppp-social-settings' ) );
-	$url = str_replace( '?ppp-social-auth', '?ppp-social-auth&ppp-refresh=true&access_token=' . $token, $url );
+	$url = str_replace( '?ppp-social-auth', '?ppp-social-auth&ppp-refresh=true&access_token='.$token, $url );
 
-	$days_left = (int) round( ( $ppp_social_settings['facebook']->expires_on - current_time( 'timestamp' ) ) / DAY_IN_SECONDS );
+	$days_left = (int) round( ($ppp_social_settings['facebook']->expires_on - current_time( 'timestamp' )) / DAY_IN_SECONDS );
 	?>
 	<div class="notice notice-warning is-dismissible" data-service="fb">
-		<?php if ( $days_left > 0 ): ?>
+		<?php if ($days_left > 0): ?>
 			<p><strong>Post Promoter Pro: </strong><?php printf( __( 'Your Facebook authentication expires in within %d days. Please <a href="%s">refresh access</a>.', 'ppp-txt' ), $days_left, $url ); ?></p>
-		<?php elseif ( $days_left < 1 ): ?>
+		<?php elseif ($days_left < 1): ?>
 			<p><strong>Post Promoter Pro: </strong><?php printf( __( 'Your Facebook authentication has expired. Please <a href="%s">refresh access</a>.', 'ppp-txt' ), $url ); ?></p>
 		<?php endif; ?>
 	</div>
@@ -262,10 +262,10 @@ 
  */
 function ppp_fb_dismiss_notice() {
 
-	$nag = sanitize_key( $_POST[ 'nag' ] );
+	$nag = sanitize_key( $_POST['nag'] );
 
-	if ( $nag === $_POST[ 'nag' ] ) {
-		set_transient( $nag . get_current_user_id(), true, DAY_IN_SECONDS );
+	if ($nag === $_POST['nag']) {
+		set_transient( $nag.get_current_user_id(), true, DAY_IN_SECONDS );
 	}
 
 
@@ -293,18 +293,18 @@ 
  * @param  string  $name    The name of the Cron
  * @return void
  */
-function ppp_fb_scheduled_share(  $post_id = 0, $index = 1, $name = ''  ) {
+function ppp_fb_scheduled_share( $post_id = 0, $index = 1, $name = '' ) {
 	global $ppp_options;
 
 	$link = ppp_generate_link( $post_id, $name );
 
 	$post_meta     = get_post_meta( $post_id, '_ppp_fb_shares', true );
-	$this_share    = $post_meta[ $index ];
-	$attachment_id = isset( $this_share['attachment_id'] ) ? $this_share['attachment_id'] : false;
+	$this_share    = $post_meta[$index];
+	$attachment_id = isset($this_share['attachment_id']) ? $this_share['attachment_id'] : false;
 
 	$share_message = ppp_fb_build_share_message( $post_id, $name );
 
-	if ( empty( $attachment_id ) && ! empty( $this_share['image'] ) ) {
+	if (empty($attachment_id) && ! empty($this_share['image'])) {
 		$media = $this_share['image'];
 	} else {
 		$use_media = ppp_fb_use_media( $post_id, $index );
@@ -361,7 +361,7 @@ 
  */
 function ppp_fb_add_meta_tab( $tabs ) {
 	global $ppp_social_settings;
-	if ( ! ppp_facebook_enabled() ) {
+	if ( ! ppp_facebook_enabled()) {
 		return $tabs;
 	}
 
@@ -378,7 +378,7 @@ 
  */
 function ppp_fb_register_metabox_content( $content ) {
 	global $ppp_social_settings;
-	if ( ! ppp_facebook_enabled() ) {
+	if ( ! ppp_facebook_enabled()) {
 		return $content;
 	}
 
@@ -394,7 +394,7 @@ 
  */
 function ppp_fb_add_metabox_content( $post ) {
 	global $ppp_options, $ppp_share_settings;
-	$default_text = !empty( $ppp_options['default_text'] ) ? $ppp_options['default_text'] : __( 'Social Text', 'ppp-txt' );
+	$default_text = ! empty($ppp_options['default_text']) ? $ppp_options['default_text'] : __( 'Social Text', 'ppp-txt' );
 
 	$ppp_fb_share_on_publish               = get_post_meta( $post->ID, '_ppp_fb_share_on_publish', true );
 	$ppp_share_on_publish_title            = get_post_meta( $post->ID, '_ppp_fb_share_on_publish_title', true );
@@ -403,9 +403,9 @@ 
 
 	$show_share_on_publish = false;
 
-	$share_by_default      = empty( $ppp_share_settings['facebook']['share_on_publish'] ) ? false : true;
+	$share_by_default      = empty($ppp_share_settings['facebook']['share_on_publish']) ? false : true;
 
-	if ( $ppp_fb_share_on_publish == '1' || ( $ppp_fb_share_on_publish == '' && $share_by_default ) ) {
+	if ($ppp_fb_share_on_publish == '1' || ($ppp_fb_share_on_publish == '' && $share_by_default)) {
 		$show_share_on_publish = true;
 	}
 
@@ -414,11 +414,11 @@ 
 		<div class="ppp-post-override-wrap">
 			<p><h3><?php _e( 'Share on Facebook', 'ppp-txt' ); ?></h3></p>
 			<p>
-				<?php $disabled = ( $post->post_status === 'publish' && time() > strtotime( $post->post_date ) ) ? true : false; ?>
+				<?php $disabled = ($post->post_status === 'publish' && time() > strtotime( $post->post_date )) ? true : false; ?>
 				<label for="ppp_fb_share_on_publish"><?php _e( 'Share this post on Facebook&hellip;', 'ppp-txt' ); ?></label>
 				<select name="_ppp_fb_share_on_publish" id="ppp_fb_share_on_publish" class="ppp-toggle-share-on-publish">
-					<option value="-1" <?php selected( true, $show_share_on_publish, true ); ?><?php if ( $disabled ): ?>disabled<?php endif; ?>><?php _e( 'Do not share this post', 'ppp-txt' ); ?></option>
-					<option value="1" <?php selected( true, $show_share_on_publish, true ); ?><?php if ( $disabled ): ?>disabled<?php endif; ?>><?php _e( 'When this post is published', 'ppp-txt' ); ?></option>
+					<option value="-1" <?php selected( true, $show_share_on_publish, true ); ?><?php if ($disabled): ?>disabled<?php endif; ?>><?php _e( 'Do not share this post', 'ppp-txt' ); ?></option>
+					<option value="1" <?php selected( true, $show_share_on_publish, true ); ?><?php if ($disabled): ?>disabled<?php endif; ?>><?php _e( 'When this post is published', 'ppp-txt' ); ?></option>
 					<option value="0" <?php selected( false, $show_share_on_publish, true ); ?>><?php _e( 'After this post is published', 'ppp-txt' ); ?></option>
 				</select>
 			</p>
@@ -434,7 +434,7 @@ 
 								<th style="width: 10px;"></th>
 							</tr>
 						</thead>
-						<tbody id="fb-share-on-publish" class="ppp-share-on-publish" <?php if ( false === $show_share_on_publish ) : echo 'style="display: none;"'; endif; ?>>
+						<tbody id="fb-share-on-publish" class="ppp-share-on-publish" <?php if (false === $show_share_on_publish) : echo 'style="display: none;"'; endif; ?>>
 							<?php
 								$args = array(
 									'text'          => $ppp_share_on_publish_title,
@@ -445,18 +445,18 @@ 
 								ppp_render_fb_share_on_publish_row( $args );
 							?>
 						</tbody>
-						<tbody id="fb-schedule-share" class="ppp-schedule-share" <?php if ( true === $show_share_on_publish ) : echo 'style="display: none;"'; endif; ?>>
+						<tbody id="fb-schedule-share" class="ppp-schedule-share" <?php if (true === $show_share_on_publish) : echo 'style="display: none;"'; endif; ?>>
 							<?php $shares = get_post_meta( $post->ID, '_ppp_fb_shares', true ); ?>
-							<?php if ( ! empty( $shares ) ) : ?>
+							<?php if ( ! empty($shares)) : ?>
 
-								<?php foreach ( $shares as $key => $value ) :
-									$date          = isset( $value['date'] )          ? $value['date']          : '';
-									$time          = isset( $value['time'] )          ? $value['time']          : '';
-									$text          = isset( $value['text'] )          ? $value['text']          : '';
-									$image         = isset( $value['image'] )         ? $value['image']         : '';
-									$attachment_id = isset( $value['attachment_id'] ) ? $value['attachment_id'] : '';
+								<?php foreach ($shares as $key => $value) :
+									$date          = isset($value['date']) ? $value['date'] : '';
+									$time          = isset($value['time']) ? $value['time'] : '';
+									$text          = isset($value['text']) ? $value['text'] : '';
+									$image         = isset($value['image']) ? $value['image'] : '';
+									$attachment_id = isset($value['attachment_id']) ? $value['attachment_id'] : '';
 
-									$args = apply_filters( 'ppp_fb_row_args', compact( 'date','time','text','image','attachment_id' ), $value );
+									$args = apply_filters( 'ppp_fb_row_args', compact( 'date', 'time', 'text', 'image', 'attachment_id' ), $value );
 									?>
 
 									<?php ppp_render_fb_share_row( $key, $args, $post->ID ); ?>
@@ -534,10 +534,10 @@ 
 function ppp_render_fb_share_row( $key, $args = array(), $post_id ) {
 	global $post;
 
-	$share_time     = strtotime( $args['date'] . ' ' . $args['time'] );
+	$share_time     = strtotime( $args['date'].' '.$args['time'] );
 	$readonly       = current_time( 'timestamp' ) > $share_time ? 'readonly="readonly" ' : '';
-	$no_date        = ! empty( $readonly ) ? ' hasDatepicker' : '';
-	$hide           = ! empty( $readonly ) ? 'display: none;' : '';
+	$no_date        = ! empty($readonly) ? ' hasDatepicker' : '';
+	$hide           = ! empty($readonly) ? 'display: none;' : '';
 	?>
 	<tr class="ppp-fb-wrapper ppp-repeatable-row ppp-repeatable-facebook scheduled-row" data-key="<?php echo esc_attr( $key ); ?>">
 		<td>
@@ -567,7 +567,7 @@ 
 		</td>
 
 		<td>
-			<a href="#" class="ppp-repeatable-row ppp-remove-repeatable" data-type="facebook" style="background: url(<?php echo admin_url('/images/xit.gif'); ?>) no-repeat;<?php echo $hide; ?>">&times;</a>
+			<a href="#" class="ppp-repeatable-row ppp-remove-repeatable" data-type="facebook" style="background: url(<?php echo admin_url( '/images/xit.gif' ); ?>) no-repeat;<?php echo $hide; ?>">&times;</a>
 		</td>
 
 	</tr>
@@ -582,23 +582,23 @@ 
  */
 function ppp_fb_save_post_meta_boxes( $post_id, $post ) {
 
-	if ( ! ppp_should_save( $post_id, $post ) ) {
+	if ( ! ppp_should_save( $post_id, $post )) {
 		return;
 	}
 
-	$ppp_fb_share_on_publish            = ( isset( $_REQUEST['_ppp_fb_share_on_publish'] ) )               ? $_REQUEST['_ppp_fb_share_on_publish']               : '-1';
-	$ppp_share_on_publish_title         = ( isset( $_REQUEST['_ppp_fb_share_on_publish_title'] ) )         ? $_REQUEST['_ppp_fb_share_on_publish_title']         : '';
-	$ppp_share_on_publish_image_url     = ( isset( $_REQUEST['_ppp_fb_share_on_publish_image_url'] ) )     ? $_REQUEST['_ppp_fb_share_on_publish_image_url']     : '';
-	$ppp_share_on_publish_attachment_id = ( isset( $_REQUEST['_ppp_fb_share_on_publish_attachment_id'] ) ) ? $_REQUEST['_ppp_fb_share_on_publish_attachment_id'] : '';
+	$ppp_fb_share_on_publish            = (isset($_REQUEST['_ppp_fb_share_on_publish'])) ? $_REQUEST['_ppp_fb_share_on_publish'] : '-1';
+	$ppp_share_on_publish_title         = (isset($_REQUEST['_ppp_fb_share_on_publish_title'])) ? $_REQUEST['_ppp_fb_share_on_publish_title'] : '';
+	$ppp_share_on_publish_image_url     = (isset($_REQUEST['_ppp_fb_share_on_publish_image_url'])) ? $_REQUEST['_ppp_fb_share_on_publish_image_url'] : '';
+	$ppp_share_on_publish_attachment_id = (isset($_REQUEST['_ppp_fb_share_on_publish_attachment_id'])) ? $_REQUEST['_ppp_fb_share_on_publish_attachment_id'] : '';
 
-	update_post_meta( $post_id, '_ppp_fb_share_on_publish',               $ppp_fb_share_on_publish );
-	update_post_meta( $post_id, '_ppp_fb_share_on_publish_title',         $ppp_share_on_publish_title );
-	update_post_meta( $post_id, '_ppp_fb_share_on_publish_image_url',     $ppp_share_on_publish_image_url );
+	update_post_meta( $post_id, '_ppp_fb_share_on_publish', $ppp_fb_share_on_publish );
+	update_post_meta( $post_id, '_ppp_fb_share_on_publish_title', $ppp_share_on_publish_title );
+	update_post_meta( $post_id, '_ppp_fb_share_on_publish_image_url', $ppp_share_on_publish_image_url );
 	update_post_meta( $post_id, '_ppp_fb_share_on_publish_attachment_id', $ppp_share_on_publish_attachment_id );
 
-	$fb_data = ( isset( $_REQUEST['_ppp_fb_shares'] ) && empty( $ppp_fb_share_on_publish ) ) ? $_REQUEST['_ppp_fb_shares'] : array();
-	foreach ( $fb_data as $index => $share ) {
-		$fb_data[ $index ]['text'] = sanitize_text_field( $share['text'] );
+	$fb_data = (isset($_REQUEST['_ppp_fb_shares']) && empty($ppp_fb_share_on_publish)) ? $_REQUEST['_ppp_fb_shares'] : array();
+	foreach ($fb_data as $index => $share) {
+		$fb_data[$index]['text'] = sanitize_text_field( $share['text'] );
 	}
 
 	update_post_meta( $post_id, '_ppp_fb_shares', $fb_data );
@@ -616,9 +616,9 @@ 
 	global $ppp_options;
 
 	$from_meta = get_post_meta( $post->ID, '_ppp_fb_share_on_publish', true );
-	$from_post = isset( $_POST['_ppp_fb_share_on_publish'] ) ? $_POST['_ppp_fb_share_on_publish'] : '0';
+	$from_post = isset($_POST['_ppp_fb_share_on_publish']) ? $_POST['_ppp_fb_share_on_publish'] : '0';
 
-	if ( '1' != $from_meta && '1' != $from_post ) {
+	if ('1' != $from_meta && '1' != $from_post) {
 		return;
 	}
 
@@ -630,28 +630,28 @@ 
 	$image_url     = '';
 
 	// Determine if we're seeing the share on publish in meta or $_POST
-	if ( $from_meta && ! $from_post ) {
-		$title         = get_post_meta( $post->ID, '_ppp_fb_share_on_publish_title',         true );
+	if ($from_meta && ! $from_post) {
+		$title         = get_post_meta( $post->ID, '_ppp_fb_share_on_publish_title', true );
 		$attachment_id = get_post_meta( $post->ID, '_ppp_fb_share_on_publish_attachment_id', true );
-		$image_url     = get_post_meta( $post->ID, '_ppp_fb_share_on_publish_image_url',     true );
+		$image_url     = get_post_meta( $post->ID, '_ppp_fb_share_on_publish_image_url', true );
 	} else {
-		$title         = isset( $_POST['_ppp_fb_share_on_publish_title'] )         ? $_POST['_ppp_fb_share_on_publish_title']         : '';
-		$attachment_id = isset( $_POST['_ppp_fb_share_on_publish_attachment_id'] ) ? $_POST['_ppp_fb_share_on_publish_attachment_id'] : 0;
-		$image_url     = isset( $_POST['_ppp_fb_share_on_publish_image_url'] )     ? $_POST['_ppp_fb_share_on_publish_image_url']     : '';
+		$title         = isset($_POST['_ppp_fb_share_on_publish_title']) ? $_POST['_ppp_fb_share_on_publish_title'] : '';
+		$attachment_id = isset($_POST['_ppp_fb_share_on_publish_attachment_id']) ? $_POST['_ppp_fb_share_on_publish_attachment_id'] : 0;
+		$image_url     = isset($_POST['_ppp_fb_share_on_publish_image_url']) ? $_POST['_ppp_fb_share_on_publish_image_url'] : '';
 	}
 
 	$thumbnail = '';
-	if ( empty( $attachment_id ) && ! empty( $image_url ) ) {
+	if (empty($attachment_id) && ! empty($image_url)) {
 		$thumbnail = $image_url;
 	} else {
 		$thumbnail = ppp_post_has_media( $post->ID, 'fb', true, $attachment_id );
 	}
 
-	$name = 'sharedate_0_' . $post->ID . '_fb';
+	$name = 'sharedate_0_'.$post->ID.'_fb';
 
-	$default_title = isset( $ppp_options['default_text'] ) ? $ppp_options['default_text'] : '';
+	$default_title = isset($ppp_options['default_text']) ? $ppp_options['default_text'] : '';
 	// If an override was found, use it, otherwise try the default text content
-	if ( empty( $title ) && empty( $default_title ) ) {
+	if (empty($title) && empty($default_title)) {
 		$title = get_the_title( $post->ID );
 	}
 
@@ -690,20 +690,20 @@ 
 function ppp_fb_generate_timestamps( $times, $post_id ) {
 	$fb_shares = get_post_meta( $post_id, '_ppp_fb_shares', true );
 
-	if ( empty( $fb_shares ) ) {
+	if (empty($fb_shares)) {
 		$fb_shares = array();
 	}
 
-	foreach ( $fb_shares as $key => $data ) {
-		if ( ! array_filter( $data ) ) {
+	foreach ($fb_shares as $key => $data) {
+		if ( ! array_filter( $data )) {
 			continue;
 		}
 
 		$timestamp = ppp_generate_timestamp( $data['date'], $data['time'] );
 
-		if ( $timestamp > current_time( 'timestamp', 1 ) ) { // Make sure the timestamp we're getting is in the future
-			$time_key           = strtotime( date_i18n( 'd-m-Y H:i:s', $timestamp , true ) ) . '_fb';
-			$times[ $time_key ] = 'sharedate_' . $key . '_' . $post_id . '_fb';
+		if ($timestamp > current_time( 'timestamp', 1 )) { // Make sure the timestamp we're getting is in the future
+			$time_key           = strtotime( date_i18n( 'd-m-Y H:i:s', $timestamp, true ) ).'_fb';
+			$times[$time_key] = 'sharedate_'.$key.'_'.$post_id.'_fb';
 		}
 
 	}
@@ -753,20 +753,20 @@ 
  */
 function ppp_fb_generate_share_content( $post_id, $name, $is_scheduled = true ) {
 	global $ppp_options;
-	$default_text = isset( $ppp_options['default_text'] ) ? $ppp_options['default_text'] : '';
+	$default_text = isset($ppp_options['default_text']) ? $ppp_options['default_text'] : '';
 	$fb_shares    = get_post_meta( $post_id, '_ppp_fb_shares', true );
 
-	if ( $is_scheduled && ! empty( $fb_shares ) ) {
+	if ($is_scheduled && ! empty($fb_shares)) {
 		$name_array    = explode( '_', $name );
 		$index         = $name_array[1];
-		$share_content = $fb_shares[ $index ]['text'];
+		$share_content = $fb_shares[$index]['text'];
 	}
 
 	// If an override was found, use it, otherwise try the default text content
-	$share_content = ( isset( $share_content ) && !empty( $share_content ) ) ? $share_content : $default_text;
+	$share_content = (isset($share_content) && ! empty($share_content)) ? $share_content : $default_text;
 
 	// If the content is still empty, just use the post title
-	$share_content = ( isset( $share_content ) && !empty( $share_content ) ) ? $share_content : get_the_title( $post_id );
+	$share_content = (isset($share_content) && ! empty($share_content)) ? $share_content : get_the_title( $post_id );
 
 	return apply_filters( 'ppp_share_content_fb', $share_content, array( 'post_id' => $post_id ) );
 }
@@ -778,7 +778,7 @@ 
  * @return bool         Whether or not this tweet should contain a media post
  */
 function ppp_fb_use_media( $post_id, $index ) {
-	if ( empty( $post_id ) || empty( $index ) ) {
+	if (empty($post_id) || empty($index)) {
 		return false;
 	}
 
@@ -794,9 +794,9 @@ 
 
 	ppp_set_social_tokens();
 
-	$account = isset( $_POST['account'] ) ? $_POST['account'] : false;
+	$account = isset($_POST['account']) ? $_POST['account'] : false;
 
-	if ( !empty( $account ) ) {
+	if ( ! empty($account)) {
 		$ppp_social_settings['facebook']->page = $account;
 
 		update_option( 'ppp_social_settings', $ppp_social_settings );
@@ -812,14 +812,14 @@ 
 function ppp_fb_calendar_on_publish_event( $events, $post_id ) {
 	$share_on_publish = get_post_meta( $post_id, '_ppp_fb_share_on_publish', true );
 
-	if ( ! empty( $share_on_publish ) ) {
+	if ( ! empty($share_on_publish)) {
 		$share_text = get_post_meta( $post_id, '_ppp_fb_share_on_publish_title', true );
 		$events[] = array(
-			'id' => $post_id . '-share-on-publish',
-			'title' => ( ! empty( $share_text ) ) ? $share_text : ppp_fb_generate_share_content( $post_id, null, false ),
-			'start'     => date_i18n( 'Y-m-d/TH:i:s', strtotime( get_the_date( null, $post_id ) . ' ' . get_the_time( null, $post_id ) ) + 1 ),
-			'end'       => date_i18n( 'Y-m-d/TH:i:s', strtotime( get_the_date( null, $post_id ) . ' ' . get_the_time( null, $post_id ) ) + 1 ),
-			'className' => 'ppp-calendar-item-fb cal-post-' . $post_id,
+			'id' => $post_id.'-share-on-publish',
+			'title' => ( ! empty($share_text)) ? $share_text : ppp_fb_generate_share_content( $post_id, null, false ),
+			'start'     => date_i18n( 'Y-m-d/TH:i:s', strtotime( get_the_date( null, $post_id ).' '.get_the_time( null, $post_id ) ) + 1 ),
+			'end'       => date_i18n( 'Y-m-d/TH:i:s', strtotime( get_the_date( null, $post_id ).' '.get_the_time( null, $post_id ) ) + 1 ),
+			'className' => 'ppp-calendar-item-fb cal-post-'.$post_id,
 			'belongsTo' => $post_id,
 		);
 	}
@@ -830,9 +830,9 @@ 
 
 function ppp_fb_get_post_shares( $items, $post_id ) {
 	$shares = get_post_meta( $post_id, '_ppp_fb_shares', true );
-	if ( empty( $shares ) ) { return $items; }
+	if (empty($shares)) { return $items; }
 
-	foreach ( $shares as $key => $share ) {
+	foreach ($shares as $key => $share) {
 		$items[] = array( 'id' => $key, 'service' => 'fb' );
 	}
 	return $items;

Braces +5 added lines, -2 removed lines

@@ -464,9 +464,12 @@
 
 								<?php endforeach; ?>
 
-							<?php else: ?>
+							<?php else {
+	: ?>
 
-								<?php ppp_render_fb_share_row( 1, array( 'date' => '', 'time' => '', 'text' => '', 'image' => '', 'attachment_id' => '' ), $post->ID, 1 ); ?>
+								<?php ppp_render_fb_share_row( 1, array( 'date' => '', 'time' => '', 'text' => '', 'image' => '', 'attachment_id' => '' ), $post->ID, 1 );
+}
+?>
 
 							<?php endif; ?>
 						</tbody>

includes/libs/class-wp-logging.php

Doc Comments +2 added lines, -2 removed lines

@@ -201,7 +201,7 @@ 
 	 * @since       1.0
 	 *
 	 *
-	 * @return     array
+	 * @return     boolean
 	*/
 
 	private static function valid_type( $type ) {
@@ -299,7 +299,7 @@ 
 	 * @uses 		wp_update_post()
 	 * @uses 		update_post_meta()
 	 *
-	 * @return      bool True if successful, false otherwise
+	 * @return      boolean|null True if successful, false otherwise
 	*/
 	public static function update_log( $log_data = array(), $log_meta = array() ) {
 

Indentation +10 added lines, -10 removed lines

@@ -123,7 +123,7 @@ 
 	 * @since       1.0
 	 *
 	 * @return     array
-	*/
+	 */
 
 	private static function log_types() {
 		$terms = array(
@@ -143,7 +143,7 @@ 
 	 * @uses 		register_post_type()
 	 *
 	 * @return     void
-	*/
+	 */
 
 	public function register_post_type() {
 
@@ -176,7 +176,7 @@ 
 	 * @uses 		wp_insert_term()
 	 *
 	 * @return     void
-	*/
+	 */
 
 	public function register_taxonomy() {
 
@@ -202,7 +202,7 @@ 
 	 *
 	 *
 	 * @return     array
-	*/
+	 */
 
 	private static function valid_type( $type ) {
 		return in_array( $type, self::log_types() );
@@ -221,7 +221,7 @@ 
 	 * @uses 		self::insert_log()
 	 *
 	 * @return      int The ID of the new log entry
-	*/
+	 */
 
 	public static function add( $title = '', $message = '', $parent = 0, $type = null ) {
 
@@ -250,7 +250,7 @@ 
 	 * @uses 		sanitize_key()
 	 *
 	 * @return      int The ID of the newly created log item
-	*/
+	 */
 
 	public static function insert_log( $log_data = array(), $log_meta = array() ) {
 
@@ -300,7 +300,7 @@ 
 	 * @uses 		update_post_meta()
 	 *
 	 * @return      bool True if successful, false otherwise
-	*/
+	 */
 	public static function update_log( $log_data = array(), $log_meta = array() ) {
 
 		do_action( 'wp_pre_update_log', $log_id );
@@ -337,7 +337,7 @@ 
 	 * @uses 		self::get_connected_logs()
 	 *
 	 * @return      array
-	*/
+	 */
 
 	public static function get_logs( $object_id = 0, $type = null, $paged = null ) {
 		return self::get_connected_logs( array( 'post_parent' => $object_id, 'paged' => $paged, 'log_type' => $type ) );
@@ -359,7 +359,7 @@ 
 	 * @uses 	self::valid_type()
 	 *
 	 * @return  array / false
-	*/
+	 */
 
 	public static function get_connected_logs( $args = array() ) {
 
@@ -407,7 +407,7 @@ 
 	 * @uses 	self::valid_type()
 	 *
 	 * @return  int
-	*/
+	 */
 
 	public static function get_log_count( $object_id = 0, $type = null, $meta_query = null ) {
 

Spacing +20 added lines, -20 removed lines

@@ -41,17 +41,17 @@ 
 	 * @uses $this->get_logs_to_prune()     Returns array of posts via get_posts of logs to prune
 	 * @uses $this->prune_old_logs()        Deletes the logs that we don't want anymore
 	 */
-	public function prune_logs(){
+	public function prune_logs() {
 
 		$should_we_prune = apply_filters( 'wp_logging_should_we_prune', false );
 
-		if ( $should_we_prune === false ){
+		if ($should_we_prune === false) {
 			return;
 		}
 
 		$logs_to_prune = $this->get_logs_to_prune();
 
-		if ( isset( $logs_to_prune ) && ! empty( $logs_to_prune ) ){
+		if (isset($logs_to_prune) && ! empty($logs_to_prune)) {
 			$this->prune_old_logs( $logs_to_prune );
 		}
 
@@ -69,11 +69,11 @@ 
 	 *
 	 * @filter wp_logging_force_delete_log         Allows user to override the force delete setting which bypasses the trash
 	 */
-	private function prune_old_logs( $logs ){
+	private function prune_old_logs( $logs ) {
 
 		$force = apply_filters( 'wp_logging_force_delete_log', true );
 
-		foreach( $logs as $l ){
+		foreach ($logs as $l) {
 			wp_delete_post( $l->ID, $force );
 		}
 
@@ -93,7 +93,7 @@ 
 	 * @filter wp_logging_prune_when           Users can change how long ago we are looking for logs to prune
 	 * @filter wp_logging_prune_query_args     Gives users access to change any query args for pruning
 	 */
-	private function get_logs_to_prune(){
+	private function get_logs_to_prune() {
 
 		$how_old = apply_filters( 'wp_logging_prune_when', '2 weeks ago' );
 
@@ -184,8 +184,8 @@ 
 
 		$types = self::log_types();
 
-		foreach ( $types as $type ) {
-			if( ! term_exists( $type, 'wp_log_type' ) ) {
+		foreach ($types as $type) {
+			if ( ! term_exists( $type, 'wp_log_type' )) {
 				wp_insert_term( $type, 'wp_log_type' );
 			}
 		}
@@ -270,15 +270,15 @@ 
 		$log_id = wp_insert_post( $args );
 
 		// set the log type, if any
-		if( $log_data['log_type'] && self::valid_type( $log_data['log_type'] ) ) {
+		if ($log_data['log_type'] && self::valid_type( $log_data['log_type'] )) {
 			wp_set_object_terms( $log_id, $log_data['log_type'], 'wp_log_type', false );
 		}
 
 
 		// set log meta, if any
-		if( $log_id && ! empty( $log_meta ) ) {
-			foreach( (array) $log_meta as $key => $meta ) {
-				update_post_meta( $log_id, '_wp_log_' . sanitize_key( $key ), $meta );
+		if ($log_id && ! empty($log_meta)) {
+			foreach ((array) $log_meta as $key => $meta) {
+				update_post_meta( $log_id, '_wp_log_'.sanitize_key( $key ), $meta );
 			}
 		}
 
@@ -316,10 +316,10 @@ 
 		// store the log entry
 		$log_id = wp_update_post( $args );
 
-		if( $log_id && ! empty( $log_meta ) ) {
-			foreach( (array) $log_meta as $key => $meta ) {
-				if( ! empty( $meta ) )
-					update_post_meta( $log_id, '_wp_log_' . sanitize_key( $key ), $meta );
+		if ($log_id && ! empty($log_meta)) {
+			foreach ((array) $log_meta as $key => $meta) {
+				if ( ! empty($meta))
+					update_post_meta( $log_id, '_wp_log_'.sanitize_key( $key ), $meta );
 			}
 		}
 
@@ -374,7 +374,7 @@ 
 
 		$query_args = wp_parse_args( $args, $defaults );
 
-		if( $query_args['log_type'] && self::valid_type( $query_args['log_type'] ) ) {
+		if ($query_args['log_type'] && self::valid_type( $query_args['log_type'] )) {
 
 			$query_args['tax_query'] = array(
 				array(
@@ -388,7 +388,7 @@ 
 
 		$logs = get_posts( $query_args );
 
-		if( $logs )
+		if ($logs)
 			return $logs;
 
 		// no logs found
@@ -418,7 +418,7 @@ 
 			'post_status'    => 'publish'
 		);
 
-		if( ! empty( $type ) && self::valid_type( $type ) ) {
+		if ( ! empty($type) && self::valid_type( $type )) {
 
 			$query_args['tax_query'] = array(
 				array(
@@ -430,7 +430,7 @@ 
 
 		}
 
-		if( ! empty( $meta_query ) ) {
+		if ( ! empty($meta_query)) {
 			$query_args['meta_query'] = $meta_query;
 		}
 

Braces +6 added lines, -4 removed lines

@@ -318,8 +318,9 @@ 
 
 		if( $log_id && ! empty( $log_meta ) ) {
 			foreach( (array) $log_meta as $key => $meta ) {
-				if( ! empty( $meta ) )
-					update_post_meta( $log_id, '_wp_log_' . sanitize_key( $key ), $meta );
+				if( ! empty( $meta ) ) {
+									update_post_meta( $log_id, '_wp_log_' . sanitize_key( $key ), $meta );
+				}
 			}
 		}
 
@@ -388,8 +389,9 @@ 
 
 		$logs = get_posts( $query_args );
 
-		if( $logs )
-			return $logs;
+		if( $logs ) {
+					return $logs;
+		}
 
 		// no logs found
 		return false;

includes/linkedin-functions.php

Doc Comments +4 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
 /**
  * Registers LinkedIn as a service
  * @param  array $services The registered servcies
- * @return array           With LinkedIn added
+ * @return string[]           With LinkedIn added
  */
 function ppp_li_register_service( $services = array() ) {
 	$services[] = 'li';
@@ -156,7 +156,7 @@ 
 /**
  * Add query vars for Linkedin
  * @param  array $vars Currenty Query Vars
- * @return array       Query vars array with linkedin added
+ * @return string[]       Query vars array with linkedin added
  */
 function ppp_li_query_vars( $vars ) {
 	$vars[] = 'li_access_token';
@@ -286,7 +286,7 @@ 
 /**
  * Add the content box for LinkedIn in the social media settings
  * @param  array $content The existing content blocks
- * @return array          With LinkedIn
+ * @return string[]          With LinkedIn
  */
 function ppp_li_register_admin_social_content( $content ) {
 	$content[] = 'li';
@@ -497,7 +497,6 @@ 
  * @since  2.3
  * @param  int $key        The key in the array
  * @param  array  $args    Arguements for the current post's share data
- * @param  int    $post_id The post ID being edited
  * @return void
  */
 function ppp_render_li_share_row( $key, $args = array() ) {
@@ -740,7 +739,7 @@ 
  * @since  2.3
  * @param  int     $post_id      Post ID
  * @param  string  $name         The cron name
- * @param  boolean $scheduled    If the item is being fired by a schedule (default, true), or retrieved for display (false)
+ * @param  boolean $is_scheduled    If the item is being fired by a schedule (default, true), or retrieved for display (false)
  * @return string                The formatted link to the post
  */
 function ppp_li_generate_share_content( $post_id, $name, $is_scheduled = true ) {

Spacing +112 added lines, -112 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined( 'ABSPATH' )) {
 	exit;
 }
 
@@ -12,7 +12,7 @@ 
 function ppp_linkedin_enabled() {
 	global $ppp_social_settings;
 
-	if ( isset( $ppp_social_settings['linkedin'] ) && !empty( $ppp_social_settings['linkedin'] ) ) {
+	if (isset($ppp_social_settings['linkedin']) && ! empty($ppp_social_settings['linkedin'])) {
 		return true;
 	}
 
@@ -60,10 +60,10 @@ 
  */
 function ppp_li_account_list_name( $string = '' ) {
 
-	if ( ppp_linkedin_enabled() ) {
+	if (ppp_linkedin_enabled()) {
 		global $ppp_social_settings;
-		$string .= $ppp_social_settings['linkedin']->firstName . ' ' . $ppp_social_settings['linkedin']->lastName;
-		$string .= '<br />' . $ppp_social_settings['linkedin']->headline;
+		$string .= $ppp_social_settings['linkedin']->firstName.' '.$ppp_social_settings['linkedin']->lastName;
+		$string .= '<br />'.$ppp_social_settings['linkedin']->headline;
 	}
 
 	return $string;
@@ -77,13 +77,13 @@ 
  */
 function ppp_li_account_list_actions( $string = '' ) {
 
-	if ( ! ppp_linkedin_enabled() ) {
+	if ( ! ppp_linkedin_enabled()) {
 		global $ppp_linkedin_oauth, $ppp_social_settings;
 		$li_authurl = $ppp_linkedin_oauth->ppp_get_linkedin_auth_url( admin_url( 'admin.php?page=ppp-social-settings' ) );
 
-		$string .= '<a class="button-primary" href="' . $li_authurl . '">' . __( 'Connect to Linkedin', 'ppp-txt' ) . '</a>';
+		$string .= '<a class="button-primary" href="'.$li_authurl.'">'.__( 'Connect to Linkedin', 'ppp-txt' ).'</a>';
 	} else {
-		$string  .= '<a class="button-primary" href="' . admin_url( 'admin.php?page=ppp-social-settings&ppp_social_disconnect=true&ppp_network=linkedin' ) . '" >' . __( 'Disconnect from Linkedin', 'ppp-txt' ) . '</a>&nbsp;';
+		$string .= '<a class="button-primary" href="'.admin_url( 'admin.php?page=ppp-social-settings&ppp_social_disconnect=true&ppp_network=linkedin' ).'" >'.__( 'Disconnect from Linkedin', 'ppp-txt' ).'</a>&nbsp;';
 	}
 
 	return $string;
@@ -96,14 +96,14 @@ 
  * @return string         The HTML for the LinkedIn Extras column
  */
 function ppp_li_account_list_extras( $string ) {
-	if ( ppp_linkedin_enabled() ) {
+	if (ppp_linkedin_enabled()) {
 		global $ppp_social_settings, $ppp_options;
-		if ( ! empty( $ppp_options['enable_debug'] ) ) {
-			$days_left  = absint( round( ( $ppp_social_settings['linkedin']->expires_on - current_time( 'timestamp' ) ) / DAY_IN_SECONDS ) );
-			$refresh_in = absint( round( ( get_option( '_ppp_linkedin_refresh' ) - current_time( 'timestamp' ) ) / DAY_IN_SECONDS ) );
+		if ( ! empty($ppp_options['enable_debug'])) {
+			$days_left  = absint( round( ($ppp_social_settings['linkedin']->expires_on - current_time( 'timestamp' )) / DAY_IN_SECONDS ) );
+			$refresh_in = absint( round( (get_option( '_ppp_linkedin_refresh' ) - current_time( 'timestamp' )) / DAY_IN_SECONDS ) );
 
-			$string .= '<br />' . sprintf( __( 'Token expires in %s days' , 'ppp-txt' ), $days_left );
-			$string .= '<br />' . sprintf( __( 'Refresh notice in %s days', 'ppp-txt' ), $refresh_in );
+			$string .= '<br />'.sprintf( __( 'Token expires in %s days', 'ppp-txt' ), $days_left );
+			$string .= '<br />'.sprintf( __( 'Refresh notice in %s days', 'ppp-txt' ), $refresh_in );
 		}
 	}
 
@@ -119,17 +119,17 @@ 
 function ppp_capture_linkedin_oauth() {
 	$should_capture = false;
 
-	if ( isset( $_GET['state'] ) && strpos( $_GET['state'], 'ppp-local-keys-li' ) !== false ) {
+	if (isset($_GET['state']) && strpos( $_GET['state'], 'ppp-local-keys-li' ) !== false) {
 		// Local config
 		$should_capture = true;
 	}
 
-	if ( isset( $_REQUEST['li_access_token'] ) ) {
+	if (isset($_REQUEST['li_access_token'])) {
 		// Returning from remote config
 		$should_capture = true;
 	}
 
-	if ( $should_capture && ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] == 'ppp-social-settings' ) ) {
+	if ($should_capture && (isset($_REQUEST['page']) && $_REQUEST['page'] == 'ppp-social-settings')) {
 		global $ppp_linkedin_oauth;
 		$ppp_linkedin_oauth->ppp_initialize_linkedin();
 		wp_redirect( admin_url( 'admin.php?page=ppp-social-settings' ) );
@@ -145,8 +145,8 @@ 
 function ppp_disconnect_linkedin() {
 	global $ppp_social_settings;
 	$ppp_social_settings = get_option( 'ppp_social_settings' );
-	if ( isset( $ppp_social_settings['linkedin'] ) ) {
-		unset( $ppp_social_settings['linkedin'] );
+	if (isset($ppp_social_settings['linkedin'])) {
+		unset($ppp_social_settings['linkedin']);
 		update_option( 'ppp_social_settings', $ppp_social_settings );
 		delete_option( '_ppp_linkedin_refresh' );
 	}
@@ -172,13 +172,13 @@ 
  */
 function ppp_li_execute_refresh() {
 
-	if ( ! ppp_linkedin_enabled() ) {
+	if ( ! ppp_linkedin_enabled()) {
 		return;
 	}
 
 	$refresh_date = (int) get_option( '_ppp_linkedin_refresh', true );
 
-	if ( current_time( 'timestamp' ) > $refresh_date ) {
+	if (current_time( 'timestamp' ) > $refresh_date) {
 		add_action( 'admin_notices', 'ppp_linkedin_refresh_notice' );
 	}
 }
@@ -190,12 +190,12 @@ 
  */
 function ppp_linkedin_refresh_notice() {
 
-	if ( ! ppp_linkedin_enabled() ) {
+	if ( ! ppp_linkedin_enabled()) {
 		return;
 	}
 
-	$has_dismissed = get_transient( 'ppp-dismiss-refresh-li' . get_current_user_id() );
-	if ( false !== $has_dismissed ) {
+	$has_dismissed = get_transient( 'ppp-dismiss-refresh-li'.get_current_user_id() );
+	if (false !== $has_dismissed) {
 		return;
 	}
 
@@ -206,14 +206,14 @@ 
 
 	$token = $ppp_social_settings['linkedin']->access_token;
 	$url = $ppp_linkedin_oauth->ppp_get_linkedin_auth_url( admin_url( 'admin.php?page=ppp-social-settings' ) );
-	$url = str_replace( '?ppp-social-auth', '?ppp-social-auth&ppp-refresh=true&access_token=' . $token, $url );
+	$url = str_replace( '?ppp-social-auth', '?ppp-social-auth&ppp-refresh=true&access_token='.$token, $url );
 
-	$days_left = (int) round( ( $ppp_social_settings['linkedin']->expires_on - current_time( 'timestamp' ) ) / DAY_IN_SECONDS );
+	$days_left = (int) round( ($ppp_social_settings['linkedin']->expires_on - current_time( 'timestamp' )) / DAY_IN_SECONDS );
 	?>
 	<div class="notice notice-warning is-dismissible" data-service="li">
-		<?php if ( $days_left > 0 ): ?>
+		<?php if ($days_left > 0): ?>
 			<p><strong>Post Promoter Pro: </strong><?php printf( __( 'Your LinkedIn authentication expires in within %d days. Please <a href="%s">refresh access</a>.', 'ppp-txt' ), $days_left, $url ); ?></p>
-		<?php elseif ( $days_left < 1 ): ?>
+		<?php elseif ($days_left < 1): ?>
 			<p><strong>Post Promoter Pro: </strong><?php printf( __( 'Your LinkedIn authentication has expired. Please <a href="%s">refresh access</a>.', 'ppp-txt' ), $url ); ?></p>
 		<?php endif; ?>
 	</div>
@@ -228,10 +228,10 @@ 
  */
 function ppp_li_dismiss_notice() {
 
-	$nag = sanitize_key( $_POST[ 'nag' ] );
+	$nag = sanitize_key( $_POST['nag'] );
 
-	if ( $nag === $_POST[ 'nag' ] ) {
-		set_transient( $nag . get_current_user_id(), true, DAY_IN_SECONDS );
+	if ($nag === $_POST['nag']) {
+		set_transient( $nag.get_current_user_id(), true, DAY_IN_SECONDS );
 	}
 
 
@@ -244,7 +244,7 @@ 
  * @return void
  */
 function ppp_set_li_token_constants( $social_tokens ) {
-	if ( !empty( $social_tokens ) && property_exists( $social_tokens, 'linkedin' ) ) {
+	if ( ! empty($social_tokens) && property_exists( $social_tokens, 'linkedin' )) {
 		define( 'LINKEDIN_KEY', $social_tokens->linkedin->api_key );
 		define( 'LINKEDIN_SECRET', $social_tokens->linkedin->secret_key );
 	}
@@ -261,7 +261,7 @@ 
  */
 function ppp_li_share( $title, $description, $link, $media ) {
 	global $ppp_linkedin_oauth;
-	$args = array (
+	$args = array(
 		'title' => ppp_entities_and_slashes( $title ),
 		'description' => ppp_entities_and_slashes( $description ),
 		'submitted-url' => $link,
@@ -302,7 +302,7 @@ 
  */
 function ppp_li_add_meta_tab( $tabs ) {
 	global $ppp_social_settings;
-	if ( ! ppp_linkedin_enabled() ) {
+	if ( ! ppp_linkedin_enabled()) {
 		return $tabs;
 	}
 
@@ -319,7 +319,7 @@ 
  */
 function ppp_li_register_metabox_content( $content ) {
 	global $ppp_social_settings;
-	if ( ! ppp_linkedin_enabled() ) {
+	if ( ! ppp_linkedin_enabled()) {
 		return $content;
 	}
 
@@ -357,7 +357,7 @@ 
  */
 function ppp_li_add_metabox_content( $post ) {
 	global $ppp_options, $ppp_share_settings;
-	$default_text = !empty( $ppp_options['default_text'] ) ? $ppp_options['default_text'] : __( 'Social Text', 'ppp-txt' );
+	$default_text = ! empty($ppp_options['default_text']) ? $ppp_options['default_text'] : __( 'Social Text', 'ppp-txt' );
 
 	$ppp_li_share_on_publish               = get_post_meta( $post->ID, '_ppp_li_share_on_publish', true );
 	$ppp_share_on_publish_title            = get_post_meta( $post->ID, '_ppp_li_share_on_publish_title', true );
@@ -367,9 +367,9 @@ 
 
 	$show_share_on_publish = false;
 
-	$share_by_default      = empty( $ppp_share_settings['linkedin']['share_on_publish'] ) ? false : true;
+	$share_by_default      = empty($ppp_share_settings['linkedin']['share_on_publish']) ? false : true;
 
-	if ( $ppp_li_share_on_publish == '1' || ( $ppp_li_share_on_publish == '' && $share_by_default ) ) {
+	if ($ppp_li_share_on_publish == '1' || ($ppp_li_share_on_publish == '' && $share_by_default)) {
 		$show_share_on_publish = true;
 	}
 	?>
@@ -377,11 +377,11 @@ 
 		<div class="ppp-post-override-wrap">
 			<p><h3><?php _e( 'Share on LinkedIn', 'ppp-txt' ); ?></h3></p>
 			<p>
-				<?php $disabled = ( $post->post_status === 'publish' && time() > strtotime( $post->post_date ) ) ? true : false; ?>
+				<?php $disabled = ($post->post_status === 'publish' && time() > strtotime( $post->post_date )) ? true : false; ?>
 				<label for="ppp_li_share_on_publish"><?php _e( 'Share this post on LinkedIn&hellip;', 'ppp-txt' ); ?></label>
 				<select name="_ppp_li_share_on_publish" id="ppp_li_share_on_publish" class="ppp-toggle-share-on-publish">
-					<option value="-1" <?php selected( true, $show_share_on_publish, true ); ?><?php if ( $disabled ): ?>disabled<?php endif; ?>><?php _e( 'Do not share this post', 'ppp-txt' ); ?></option>
-					<option value="1" <?php selected( true, $show_share_on_publish, true ); ?><?php if ( $disabled ): ?>disabled<?php endif; ?>><?php _e( 'When this post is published', 'ppp-txt' ); ?></option>
+					<option value="-1" <?php selected( true, $show_share_on_publish, true ); ?><?php if ($disabled): ?>disabled<?php endif; ?>><?php _e( 'Do not share this post', 'ppp-txt' ); ?></option>
+					<option value="1" <?php selected( true, $show_share_on_publish, true ); ?><?php if ($disabled): ?>disabled<?php endif; ?>><?php _e( 'When this post is published', 'ppp-txt' ); ?></option>
 					<option value="0" <?php selected( false, $show_share_on_publish, true ); ?>><?php _e( 'After this post is published', 'ppp-txt' ); ?></option>
 				</select>
 			</p>
@@ -397,7 +397,7 @@ 
 								<th style="width: 10px;"></th>
 							</tr>
 						</thead>
-						<tbody id="li-share-on-publish" class="ppp-share-on-publish" <?php if ( false === $show_share_on_publish ) : echo 'style="display: none;"'; endif; ?>>
+						<tbody id="li-share-on-publish" class="ppp-share-on-publish" <?php if (false === $show_share_on_publish) : echo 'style="display: none;"'; endif; ?>>
 							<?php
 								$args = array(
 									'text'          => $ppp_share_on_publish_title,
@@ -409,19 +409,19 @@ 
 								ppp_render_li_share_on_publish_row( $args );
 							?>
 						</tbody>
-						<tbody id="li-schedule-share" class="ppp-schedule-share" <?php if ( true === $show_share_on_publish ) : echo 'style="display: none;"'; endif; ?>>
+						<tbody id="li-schedule-share" class="ppp-schedule-share" <?php if (true === $show_share_on_publish) : echo 'style="display: none;"'; endif; ?>>
 							<?php $shares = get_post_meta( $post->ID, '_ppp_li_shares', true ); ?>
-							<?php if ( ! empty( $shares ) ) : ?>
+							<?php if ( ! empty($shares)) : ?>
 
-								<?php foreach ( $shares as $key => $value ) :
-									$date          = isset( $value['date'] )          ? $value['date']          : '';
-									$time          = isset( $value['time'] )          ? $value['time']          : '';
-									$text          = isset( $value['text'] )          ? $value['text']          : '';
-									$desc          = isset( $value['desc'] )          ? $value['desc']          : '';
-									$image         = isset( $value['image'] )         ? $value['image']         : '';
-									$attachment_id = isset( $value['attachment_id'] ) ? $value['attachment_id'] : '';
+								<?php foreach ($shares as $key => $value) :
+									$date          = isset($value['date']) ? $value['date'] : '';
+									$time          = isset($value['time']) ? $value['time'] : '';
+									$text          = isset($value['text']) ? $value['text'] : '';
+									$desc          = isset($value['desc']) ? $value['desc'] : '';
+									$image         = isset($value['image']) ? $value['image'] : '';
+									$attachment_id = isset($value['attachment_id']) ? $value['attachment_id'] : '';
 
-									$args = apply_filters( 'ppp_fb_row_args', compact( 'date','time','text', 'desc', 'image','attachment_id' ), $value );
+									$args = apply_filters( 'ppp_fb_row_args', compact( 'date', 'time', 'text', 'desc', 'image', 'attachment_id' ), $value );
 									?>
 
 									<?php ppp_render_li_share_row( $key, $args ); ?>
@@ -457,7 +457,7 @@ 
 function ppp_render_li_share_on_publish_row( $args = array() ) {
 	global $post;
 	$readonly = $post->post_status !== 'publish' ? '' : 'readonly="readonly" ';
-	$disabled = ( $post->post_status === 'publish' && time() > strtotime( $post->post_date ) ) ? true : false;
+	$disabled = ($post->post_status === 'publish' && time() > strtotime( $post->post_date )) ? true : false;
 	?>
 	<tr class="ppp-li-wrapper ppp-repeatable-row on-publish-row">
 		<td colspan="2" class="ppp-on-plublish-date-column">
@@ -485,7 +485,7 @@ 
 	<tr>
 		<td colspan="2"></td>
 		<td colspan="3">
-			<textarea <?php if ( $disabled ): ?>readonly<?php endif; ?> name="_ppp_li_share_on_publish_desc" placeholder="<?php _e( 'Link Description', 'ppp-txt' ); ?>"><?php echo esc_attr( $args['desc'] ); ?></textarea>
+			<textarea <?php if ($disabled): ?>readonly<?php endif; ?> name="_ppp_li_share_on_publish_desc" placeholder="<?php _e( 'Link Description', 'ppp-txt' ); ?>"><?php echo esc_attr( $args['desc'] ); ?></textarea>
 		</td>
 	</tr>
 <?php
@@ -503,10 +503,10 @@ 
 function ppp_render_li_share_row( $key, $args = array() ) {
 	global $post;
 
-	$share_time     = strtotime( $args['date'] . ' ' . $args['time'] );
+	$share_time     = strtotime( $args['date'].' '.$args['time'] );
 	$readonly       = current_time( 'timestamp' ) > $share_time ? 'readonly="readonly" ' : '';
-	$no_date        = ! empty( $readonly ) ? ' hasDatepicker' : '';
-	$hide           = ! empty( $readonly ) ? 'display: none;' : '';
+	$no_date        = ! empty($readonly) ? ' hasDatepicker' : '';
+	$hide           = ! empty($readonly) ? 'display: none;' : '';
 	?>
 	<tr class="ppp-li-wrapper ppp-repeatable-row ppp-repeatable-linkedin scheduled-row" data-key="<?php echo esc_attr( $key ); ?>">
 		<td>
@@ -536,7 +536,7 @@ 
 		</td>
 
 		<td>
-			<a href="#" class="ppp-repeatable-row ppp-remove-repeatable" data-type="linkedin" style="background: url(<?php echo admin_url('/images/xit.gif'); ?>) no-repeat;<?php echo $hide; ?>">&times;</a>
+			<a href="#" class="ppp-repeatable-row ppp-remove-repeatable" data-type="linkedin" style="background: url(<?php echo admin_url( '/images/xit.gif' ); ?>) no-repeat;<?php echo $hide; ?>">&times;</a>
 		</td>
 
 	</tr>
@@ -557,26 +557,26 @@ 
  */
 function ppp_li_save_post_meta_boxes( $post_id, $post ) {
 
-	if ( ! ppp_should_save( $post_id, $post ) ) {
+	if ( ! ppp_should_save( $post_id, $post )) {
 		return;
 	}
 
-	$ppp_li_share_on_publish            = ( isset( $_REQUEST['_ppp_li_share_on_publish'] ) )               ? $_REQUEST['_ppp_li_share_on_publish']               : '-1';
-	$ppp_share_on_publish_title         = ( isset( $_REQUEST['_ppp_li_share_on_publish_title'] ) )         ? $_REQUEST['_ppp_li_share_on_publish_title']         : '';
-	$ppp_share_on_publish_desc          = ( isset( $_REQUEST['_ppp_li_share_on_publish_desc'] ) )          ? $_REQUEST['_ppp_li_share_on_publish_desc']          : '';
-	$ppp_share_on_publish_image_url     = ( isset( $_REQUEST['_ppp_li_share_on_publish_image_url'] ) )     ? $_REQUEST['_ppp_li_share_on_publish_image_url']     : '';
-	$ppp_share_on_publish_attachment_id = ( isset( $_REQUEST['_ppp_li_share_on_publish_attachment_id'] ) ) ? $_REQUEST['_ppp_li_share_on_publish_attachment_id'] : '';
+	$ppp_li_share_on_publish            = (isset($_REQUEST['_ppp_li_share_on_publish'])) ? $_REQUEST['_ppp_li_share_on_publish'] : '-1';
+	$ppp_share_on_publish_title         = (isset($_REQUEST['_ppp_li_share_on_publish_title'])) ? $_REQUEST['_ppp_li_share_on_publish_title'] : '';
+	$ppp_share_on_publish_desc          = (isset($_REQUEST['_ppp_li_share_on_publish_desc'])) ? $_REQUEST['_ppp_li_share_on_publish_desc'] : '';
+	$ppp_share_on_publish_image_url     = (isset($_REQUEST['_ppp_li_share_on_publish_image_url'])) ? $_REQUEST['_ppp_li_share_on_publish_image_url'] : '';
+	$ppp_share_on_publish_attachment_id = (isset($_REQUEST['_ppp_li_share_on_publish_attachment_id'])) ? $_REQUEST['_ppp_li_share_on_publish_attachment_id'] : '';
 
-	update_post_meta( $post_id, '_ppp_li_share_on_publish',               $ppp_li_share_on_publish );
-	update_post_meta( $post_id, '_ppp_li_share_on_publish_title',         $ppp_share_on_publish_title );
-	update_post_meta( $post_id, '_ppp_li_share_on_publish_desc',          $ppp_share_on_publish_desc );
-	update_post_meta( $post_id, '_ppp_li_share_on_publish_image_url',     $ppp_share_on_publish_image_url );
+	update_post_meta( $post_id, '_ppp_li_share_on_publish', $ppp_li_share_on_publish );
+	update_post_meta( $post_id, '_ppp_li_share_on_publish_title', $ppp_share_on_publish_title );
+	update_post_meta( $post_id, '_ppp_li_share_on_publish_desc', $ppp_share_on_publish_desc );
+	update_post_meta( $post_id, '_ppp_li_share_on_publish_image_url', $ppp_share_on_publish_image_url );
 	update_post_meta( $post_id, '_ppp_li_share_on_publish_attachment_id', $ppp_share_on_publish_attachment_id );
 
-	$li_data = ( isset( $_REQUEST['_ppp_li_shares'] ) && empty( $ppp_li_share_on_publish ) ) ? $_REQUEST['_ppp_li_shares'] : array();
-	foreach ( $li_data as $index => $share ) {
-		$li_data[ $index ]['text'] = sanitize_text_field( $share['text'] );
-		$li_data[ $index ]['desc'] = sanitize_text_field( $share['desc'] );
+	$li_data = (isset($_REQUEST['_ppp_li_shares']) && empty($ppp_li_share_on_publish)) ? $_REQUEST['_ppp_li_shares'] : array();
+	foreach ($li_data as $index => $share) {
+		$li_data[$index]['text'] = sanitize_text_field( $share['text'] );
+		$li_data[$index]['desc'] = sanitize_text_field( $share['desc'] );
 	}
 
 	update_post_meta( $post_id, '_ppp_li_shares', $li_data );
@@ -593,9 +593,9 @@ 
 function ppp_li_share_on_publish( $new_status, $old_status, $post ) {
 	global $ppp_options;
 	$from_meta = get_post_meta( $post->ID, '_ppp_li_share_on_publish', true );
-	$from_post = isset( $_POST['_ppp_li_share_on_publish'] ) ? $_POST['_ppp_li_share_on_publish']: '0';
+	$from_post = isset($_POST['_ppp_li_share_on_publish']) ? $_POST['_ppp_li_share_on_publish'] : '0';
 
-	if ( '1' != $from_meta && '1' != $from_post ) {
+	if ('1' != $from_meta && '1' != $from_post) {
 		return;
 	}
 
@@ -608,30 +608,30 @@ 
 	$image_url     = '';
 
 	// Determine if we're seeing the share on publish in meta or $_POST
-	if ( $from_meta && ! $from_post ) {
-		$title         = get_post_meta( $post->ID, '_ppp_li_share_on_publish_title'        , true );
-		$desc          = get_post_meta( $post->ID, '_ppp_li_share_on_publish_desc'         , true );
+	if ($from_meta && ! $from_post) {
+		$title         = get_post_meta( $post->ID, '_ppp_li_share_on_publish_title', true );
+		$desc          = get_post_meta( $post->ID, '_ppp_li_share_on_publish_desc', true );
 		$attachment_id = get_post_meta( $post->ID, '_ppp_li_share_on_publish_attachment_id', true );
-		$image_url     = get_post_meta( $post->ID, '_ppp_li_share_on_publish_image_url'    , true );
+		$image_url     = get_post_meta( $post->ID, '_ppp_li_share_on_publish_image_url', true );
 	} else {
-		$title         = isset( $_POST['_ppp_li_share_on_publish_title'] )         ? $_POST['_ppp_li_share_on_publish_title']         : '';
-		$desc          = isset( $_POST['_ppp_li_share_on_publish_desc'] )          ? $_POST['_ppp_li_share_on_publish_desc']          : false;
-		$attachment_id = isset( $_POST['_ppp_li_share_on_publish_attachment_id'] ) ? $_POST['_ppp_li_share_on_publish_attachment_id'] : 0;
-		$image_url     = isset( $_POST['_ppp_li_share_on_publish_image_url'] )     ? $_POST['_ppp_li_share_on_publish_image_url']     : '';
+		$title         = isset($_POST['_ppp_li_share_on_publish_title']) ? $_POST['_ppp_li_share_on_publish_title'] : '';
+		$desc          = isset($_POST['_ppp_li_share_on_publish_desc']) ? $_POST['_ppp_li_share_on_publish_desc'] : false;
+		$attachment_id = isset($_POST['_ppp_li_share_on_publish_attachment_id']) ? $_POST['_ppp_li_share_on_publish_attachment_id'] : 0;
+		$image_url     = isset($_POST['_ppp_li_share_on_publish_image_url']) ? $_POST['_ppp_li_share_on_publish_image_url'] : '';
 	}
 
 	$thumbnail = '';
-	if ( empty( $attachment_id ) && ! empty( $image_url ) ) {
+	if (empty($attachment_id) && ! empty($image_url)) {
 		$thumbnail = $image_url;
 	} else {
 		$thumbnail = ppp_post_has_media( $post->ID, 'li', true, $attachment_id );
 	}
 
-	$name = 'sharedate_0_' . $post->ID . '_li';
+	$name = 'sharedate_0_'.$post->ID.'_li';
 
-	$default_title = isset( $ppp_options['default_text'] ) ? $ppp_options['default_text'] : '';
+	$default_title = isset($ppp_options['default_text']) ? $ppp_options['default_text'] : '';
 	// If an override was found, use it, otherwise try the default text content
-	if ( empty( $title ) && empty( $default_title ) ) {
+	if (empty($title) && empty($default_title)) {
 		$title = get_the_title( $post->ID );
 	}
 
@@ -665,18 +665,18 @@ 
  * @param  string  $name    The name of the Cron
  * @return void
  */
-function ppp_li_scheduled_share(  $post_id = 0, $index = 1, $name = ''  ) {
+function ppp_li_scheduled_share( $post_id = 0, $index = 1, $name = '' ) {
 	global $ppp_options;
 
 	$link = ppp_generate_link( $post_id, $name );
 
 	$post_meta     = get_post_meta( $post_id, '_ppp_li_shares', true );
-	$this_share    = $post_meta[ $index ];
-	$attachment_id = isset( $this_share['attachment_id'] ) ? $this_share['attachment_id'] : false;
+	$this_share    = $post_meta[$index];
+	$attachment_id = isset($this_share['attachment_id']) ? $this_share['attachment_id'] : false;
 
 	$share_message = ppp_li_build_share_message( $post_id, $name );
 
-	if ( empty( $attachment_id ) && ! empty( $this_share['image'] ) ) {
+	if (empty($attachment_id) && ! empty($this_share['image'])) {
 		$media = $this_share['image'];
 	} else {
 		$use_media = ppp_li_use_media( $post_id, $index );
@@ -712,7 +712,7 @@ 
  * @return bool         Whether or not this tweet should contain a media post
  */
 function ppp_li_use_media( $post_id, $index ) {
-	if ( empty( $post_id ) || empty( $index ) ) {
+	if (empty($post_id) || empty($index)) {
 		return false;
 	}
 
@@ -745,20 +745,20 @@ 
  */
 function ppp_li_generate_share_content( $post_id, $name, $is_scheduled = true ) {
 	global $ppp_options;
-	$default_text = isset( $ppp_options['default_text'] ) ? $ppp_options['default_text'] : '';
+	$default_text = isset($ppp_options['default_text']) ? $ppp_options['default_text'] : '';
 	$li_shares    = get_post_meta( $post_id, '_ppp_li_shares', true );
 
-	if ( $is_scheduled && ! empty( $li_shares ) ) {
+	if ($is_scheduled && ! empty($li_shares)) {
 		$name_array    = explode( '_', $name );
 		$index         = $name_array[1];
-		$share_content = $li_shares[ $index ]['text'];
+		$share_content = $li_shares[$index]['text'];
 	}
 
 	// If an override was found, use it, otherwise try the default text content
-	$share_content = ( isset( $share_content ) && !empty( $share_content ) ) ? $share_content : $default_text;
+	$share_content = (isset($share_content) && ! empty($share_content)) ? $share_content : $default_text;
 
 	// If the content is still empty, just use the post title
-	$share_content = ( isset( $share_content ) && !empty( $share_content ) ) ? $share_content : get_the_title( $post_id );
+	$share_content = (isset($share_content) && ! empty($share_content)) ? $share_content : get_the_title( $post_id );
 
 	return apply_filters( 'ppp_share_content_li', $share_content, array( 'post_id' => $post_id ) );
 }
@@ -775,8 +775,8 @@ 
 	$description = '';
 	$li_shares   = get_post_meta( $post_id, '_ppp_li_shares', true );
 
-	if ( ! empty( $li_shares[ $index ] ) ) {
-		$description = ! empty( $li_shares[ $index ]['desc'] ) ? $li_shares[ $index ]['desc'] : '';
+	if ( ! empty($li_shares[$index])) {
+		$description = ! empty($li_shares[$index]['desc']) ? $li_shares[$index]['desc'] : '';
 	}
 
 	return $description;
@@ -793,20 +793,20 @@ 
 function ppp_li_generate_timestamps( $times, $post_id ) {
 	$li_shares = get_post_meta( $post_id, '_ppp_li_shares', true );
 
-	if ( empty( $li_shares ) ) {
+	if (empty($li_shares)) {
 		$li_shares = array();
 	}
 
-	foreach ( $li_shares as $key => $data ) {
-		if ( ! array_filter( $data ) ) {
+	foreach ($li_shares as $key => $data) {
+		if ( ! array_filter( $data )) {
 			continue;
 		}
 
 		$timestamp = ppp_generate_timestamp( $data['date'], $data['time'] );
 
-		if ( $timestamp > current_time( 'timestamp', 1 ) ) { // Make sure the timestamp we're getting is in the future
-			$time_key           = strtotime( date_i18n( 'd-m-Y H:i:s', $timestamp , true ) ) . '_li';
-			$times[ $time_key ] = 'sharedate_' . $key . '_' . $post_id . '_li';
+		if ($timestamp > current_time( 'timestamp', 1 )) { // Make sure the timestamp we're getting is in the future
+			$time_key           = strtotime( date_i18n( 'd-m-Y H:i:s', $timestamp, true ) ).'_li';
+			$times[$time_key] = 'sharedate_'.$key.'_'.$post_id.'_li';
 		}
 
 	}
@@ -826,14 +826,14 @@ 
 function ppp_li_calendar_on_publish_event( $events, $post_id ) {
 	$share_on_publish = get_post_meta( $post_id, '_ppp_li_share_on_publish', true );
 
-	if ( ! empty( $share_on_publish ) ) {
+	if ( ! empty($share_on_publish)) {
 		$share_text = get_post_meta( $post_id, '_ppp_li_share_on_publish_title', true );
 		$events[] = array(
-			'id'        => $post_id . '-share-on-publish',
-			'title'     => ( ! empty( $share_text ) ) ? $share_text : ppp_li_generate_share_content( $post_id, null, false ),
-			'start'     => date_i18n( 'Y-m-d/TH:i:s', strtotime( get_the_date( null, $post_id ) . ' ' . get_the_time( null, $post_id ) ) + 1 ),
-			'end'       => date_i18n( 'Y-m-d/TH:i:s', strtotime( get_the_date( null, $post_id ) . ' ' . get_the_time( null, $post_id ) ) + 1 ),
-			'className' => 'ppp-calendar-item-li cal-post-' . $post_id,
+			'id'        => $post_id.'-share-on-publish',
+			'title'     => ( ! empty($share_text)) ? $share_text : ppp_li_generate_share_content( $post_id, null, false ),
+			'start'     => date_i18n( 'Y-m-d/TH:i:s', strtotime( get_the_date( null, $post_id ).' '.get_the_time( null, $post_id ) ) + 1 ),
+			'end'       => date_i18n( 'Y-m-d/TH:i:s', strtotime( get_the_date( null, $post_id ).' '.get_the_time( null, $post_id ) ) + 1 ),
+			'className' => 'ppp-calendar-item-li cal-post-'.$post_id,
 			'belongsTo' => $post_id,
 		);
 	}
@@ -844,9 +844,9 @@ 
 
 function ppp_li_get_post_shares( $items, $post_id ) {
 	$shares = get_post_meta( $post_id, '_ppp_li_shares', true );
-	if ( empty( $shares ) ) { return $items; }
+	if (empty($shares)) { return $items; }
 
-	foreach ( $shares as $key => $share ) {
+	foreach ($shares as $key => $share) {
 		$items[] = array( 'id' => $key, 'service' => 'li' );
 	}
 	return $items;

Braces +5 added lines, -2 removed lines

@@ -429,9 +429,12 @@
 
 								<?php endforeach; ?>
 
-							<?php else: ?>
+							<?php else {
+	: ?>
 
-								<?php ppp_render_li_share_row( 1, array( 'date' => '', 'time' => '', 'text' => '', 'desc' => '', 'image' => '', 'attachment_id' => '' ) ); ?>
+								<?php ppp_render_li_share_row( 1, array( 'date' => '', 'time' => '', 'text' => '', 'desc' => '', 'image' => '', 'attachment_id' => '' ) );
+}
+?>
 
 							<?php endif; ?>
 						</tbody>

post-promoter-pro.php

Doc Comments +3 added lines, -3 removed lines

@@ -320,7 +320,7 @@ 
 
 	/**
 	 * Deactivates the license key
-	 * @return void
+	 * @return null|false
 	 */
 	public function deactivate_license() {
 		// listen for our activate button to be clicked
@@ -364,7 +364,7 @@ 
 
 	/**
 	 * Activates the license key provided
-	 * @return void
+	 * @return null|false
 	 */
 	public function activate_license() {
 		// listen for our activate button to be clicked
@@ -434,7 +434,7 @@ 
 	 *
 	 * @since  2.3
 	 * @param  array $log_types Array of log types
-	 * @return array
+	 * @return string[]
 	 */
 	public function register_log_type( $log_types ) {
 		$types[] = 'ppp_share';

Spacing +45 added lines, -45 removed lines

@@ -16,9 +16,9 @@ 
 
 define( 'PPP_STORE_URL', 'https://postpromoterpro.com' );
 define( 'PPP_PLUGIN_NAME', 'Post Promoter Pro' );
-if( !class_exists( 'EDD_SL_Plugin_Updater' ) ) {
+if ( ! class_exists( 'EDD_SL_Plugin_Updater' )) {
 	// load our custom updater
-	include( PPP_PATH . '/includes/EDD_SL_Plugin_Updater.php' );
+	include(PPP_PATH.'/includes/EDD_SL_Plugin_Updater.php');
 }
 
 class PostPromoterPro {
@@ -27,27 +27,27 @@ 
 	private function __construct() {
 		add_action( 'init', array( $this, 'ppp_loaddomain' ), 1 );
 
-		if ( ! is_callable( 'curl_init' ) ) {
+		if ( ! is_callable( 'curl_init' )) {
 			add_action( 'admin_notices', array( $this, 'no_curl' ) );
 		} else {
 			global $ppp_options, $ppp_social_settings, $ppp_share_settings;
 
-			include PPP_PATH . '/includes/general-functions.php';
-			include PPP_PATH . '/includes/share-functions.php';
-			include PPP_PATH . '/includes/cron-functions.php';
-			include PPP_PATH . '/includes/filters.php';
-			include PPP_PATH . '/includes/libs/social-loader.php';
-			include PPP_PATH . '/includes/libs/class-wp-logging.php';
-
-			if ( is_admin() ) {
-				include PPP_PATH . '/includes/admin/upgrades.php';
-				include PPP_PATH . '/includes/admin/do-upgrades.php';
-				include PPP_PATH . '/includes/admin/actions.php';
-				include PPP_PATH . '/includes/admin/admin-pages.php';
-				include PPP_PATH . '/includes/admin/admin-ajax.php';
-				include PPP_PATH . '/includes/admin/meta-boxes.php';
-				include PPP_PATH . '/includes/admin/welcome.php';
-				include PPP_PATH . '/includes/admin/dashboard.php';
+			include PPP_PATH.'/includes/general-functions.php';
+			include PPP_PATH.'/includes/share-functions.php';
+			include PPP_PATH.'/includes/cron-functions.php';
+			include PPP_PATH.'/includes/filters.php';
+			include PPP_PATH.'/includes/libs/social-loader.php';
+			include PPP_PATH.'/includes/libs/class-wp-logging.php';
+
+			if (is_admin()) {
+				include PPP_PATH.'/includes/admin/upgrades.php';
+				include PPP_PATH.'/includes/admin/do-upgrades.php';
+				include PPP_PATH.'/includes/admin/actions.php';
+				include PPP_PATH.'/includes/admin/admin-pages.php';
+				include PPP_PATH.'/includes/admin/admin-ajax.php';
+				include PPP_PATH.'/includes/admin/meta-boxes.php';
+				include PPP_PATH.'/includes/admin/welcome.php';
+				include PPP_PATH.'/includes/admin/dashboard.php';
 			}
 
 			register_activation_hook( PPP_FILE, array( $this, 'activation_setup' ) );
@@ -67,7 +67,7 @@ 
 	 * @access public
 	 */
 	public static function getInstance() {
-		if ( !self::$ppp_instance ) {
+		if ( ! self::$ppp_instance) {
 			self::$ppp_instance = new PostPromoterPro();
 		}
 
@@ -92,7 +92,7 @@ 
 	 */
 	public function activation_setup() {
 		// If the settings already exist, don't do this
-		if ( get_option( 'ppp_options' ) ) {
+		if (get_option( 'ppp_options' )) {
 			return;
 		}
 
@@ -110,7 +110,7 @@ 
 	}
 
 	private function hooks() {
-		if ( is_admin() ) {
+		if (is_admin()) {
 			add_action( 'admin_init', array( $this, 'ppp_register_settings' ) );
 			add_action( 'admin_init', 'ppp_upgrade_plugin', 1 );
 
@@ -127,8 +127,8 @@ 
 		}
 
 		add_action( 'init', array( $this, 'get_actions' ) );
-		add_action( 'save_post', 'ppp_schedule_share', 99, 2);
-		add_action( 'transition_post_status', 'ppp_share_on_publish', 99, 3);
+		add_action( 'save_post', 'ppp_schedule_share', 99, 2 );
+		add_action( 'transition_post_status', 'ppp_share_on_publish', 99, 3 );
 		add_action( 'init', 'ppp_add_image_sizes' );
 		add_filter( 'wp_log_types', array( $this, 'register_log_type' ), 10, 1 );
 	}
@@ -151,15 +151,15 @@ 
 
 		$allowed_pages = apply_filters( 'ppp_admin_scripts_pages', $allowed_pages, $hook );
 
-		if ( ! in_array( $hook, $allowed_pages ) ) {
+		if ( ! in_array( $hook, $allowed_pages )) {
 			return;
 		}
 
 		wp_enqueue_script( 'jquery-ui-core' );
 		wp_enqueue_script( 'jquery-ui-datepicker' );
 
-		$jquery_ui_timepicker_path = PPP_URL . 'includes/scripts/libs/jquery-ui-timepicker-addon.js';
-		wp_enqueue_script( 'ppp_timepicker_js', $jquery_ui_timepicker_path , array( 'jquery', 'jquery-ui-core' ), PPP_VERSION, true );
+		$jquery_ui_timepicker_path = PPP_URL.'includes/scripts/libs/jquery-ui-timepicker-addon.js';
+		wp_enqueue_script( 'ppp_timepicker_js', $jquery_ui_timepicker_path, array( 'jquery', 'jquery-ui-core' ), PPP_VERSION, true );
 		wp_enqueue_script( 'ppp_core_custom_js', PPP_URL.'includes/scripts/js/ppp_custom.js', 'jquery', PPP_VERSION, true );
 
 	}
@@ -168,11 +168,11 @@ 
 
 		// List of people who make it impossible to override their jQuery UI as it's in their core CSS...so only
 		// load ours if they don't exist
-		if ( ! wp_style_is( 'ot-admin-css' ) && ! wp_style_is( 'jquery-ui-css' ) ) {
+		if ( ! wp_style_is( 'ot-admin-css' ) && ! wp_style_is( 'jquery-ui-css' )) {
 			wp_enqueue_style( 'jquery-ui-css', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/themes/flick/jquery-ui.css' );
 		}
 
-		wp_register_style( 'ppp_admin_css', PPP_URL . 'includes/scripts/css/admin-style.css', false, PPP_VERSION );
+		wp_register_style( 'ppp_admin_css', PPP_URL.'includes/scripts/css/admin-style.css', false, PPP_VERSION );
 		wp_enqueue_style( 'ppp_admin_css' );
 
 	}
@@ -185,7 +185,7 @@ 
 	 * @access public
 	 */
 	public function plugin_settings_links( $links, $file ) {
-		if ( $file != PPP_FILE ) {
+		if ($file != PPP_FILE) {
 			return $links;
 		}
 
@@ -279,22 +279,22 @@ 
 	 */
 	public function plugin_updater() {
 
-		if ( defined( 'NO_AUTO_UPDATE' ) && true === NO_AUTO_UPDATE ) {
+		if (defined( 'NO_AUTO_UPDATE' ) && true === NO_AUTO_UPDATE) {
 			return;
 		}
 
 		$license_key = trim( get_option( '_ppp_license_key' ) );
 
-		if ( empty( $license_key ) ) {
+		if (empty($license_key)) {
 			add_action( 'admin_notices', array( $this, 'no_license_nag' ) );
 			return;
 		}
 
 		// setup the updater
 		$edd_updater = new EDD_SL_Plugin_Updater( PPP_STORE_URL, __FILE__, array(
-				'version'   => PPP_VERSION,         // current version number
-				'license'   => $license_key,        // license key (used get_option above to retrieve from DB)
-				'item_name' => PPP_PLUGIN_NAME,     // name of this plugin
+				'version'   => PPP_VERSION, // current version number
+				'license'   => $license_key, // license key (used get_option above to retrieve from DB)
+				'item_name' => PPP_PLUGIN_NAME, // name of this plugin
 				'author'    => 'Post Promoter Pro'  // author of this plugin
 			)
 		);
@@ -324,10 +324,10 @@ 
 	 */
 	public function deactivate_license() {
 		// listen for our activate button to be clicked
-		if( isset( $_POST['ppp_license_deactivate'] ) ) {
+		if (isset($_POST['ppp_license_deactivate'])) {
 
 			// run a quick security check
-			if( ! check_admin_referer( 'ppp_deactivate_nonce', 'ppp_deactivate_nonce' ) ) {
+			if ( ! check_admin_referer( 'ppp_deactivate_nonce', 'ppp_deactivate_nonce' )) {
 				return;
 			}
 			// get out if we didn't click the Activate button
@@ -347,7 +347,7 @@ 
 			$response = wp_remote_get( add_query_arg( $api_params, PPP_STORE_URL ), array( 'timeout' => 15, 'sslverify' => false ) );
 
 			// make sure the response came back okay
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error( $response )) {
 				return false;
 			}
 
@@ -355,7 +355,7 @@ 
 			$license_data = json_decode( wp_remote_retrieve_body( $response ) );
 
 			// $license_data->license will be either "deactivated" or "failed"
-			if( $license_data->license == 'deactivated' ) {
+			if ($license_data->license == 'deactivated') {
 				delete_option( '_ppp_license_key_status' );
 			}
 
@@ -368,10 +368,10 @@ 
 	 */
 	public function activate_license() {
 		// listen for our activate button to be clicked
-		if( isset( $_POST['ppp_license_activate'] ) ) {
+		if (isset($_POST['ppp_license_activate'])) {
 
 			// run a quick security check
-			if( ! check_admin_referer( 'ppp_activate_nonce', 'ppp_activate_nonce' ) ) {
+			if ( ! check_admin_referer( 'ppp_activate_nonce', 'ppp_activate_nonce' )) {
 				return;
 			}
 			// get out if we didn't click the Activate button
@@ -391,7 +391,7 @@ 
 			$response = wp_remote_get( add_query_arg( $api_params, PPP_STORE_URL ), array( 'timeout' => 15, 'sslverify' => false ) );
 
 			// make sure the response came back okay
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error( $response )) {
 				return false;
 			}
 
@@ -412,7 +412,7 @@ 
 	 */
 	public function ppp_sanitize_license( $new ) {
 		$old = get_option( '_ppp_license_key' );
-		if( $old && $old != $new ) {
+		if ($old && $old != $new) {
 			delete_option( '_ppp_license_key_status' ); // new license has been entered, so must reactivate
 		}
 		return $new;
@@ -424,8 +424,8 @@ 
 	 * @return void
 	 */
 	public function get_actions() {
-		if ( isset( $_GET['ppp_action'] ) ) {
-			do_action( 'ppp_' . $_GET['ppp_action'], $_GET );
+		if (isset($_GET['ppp_action'])) {
+			do_action( 'ppp_'.$_GET['ppp_action'], $_GET );
 		}
 	}
 

includes/filters.php

Spacing +13 added lines, -13 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined( 'ABSPATH' )) {
 	exit;
 }
 
@@ -28,8 +28,8 @@ 
  */
 function ppp_replace_text_tokens( $string, $args = array() ) {
 	$tokens = wp_list_pluck( ppp_get_text_tokens(), 'token' );
-	foreach ( $tokens as $key => $token ) {
-		$string = apply_filters( 'ppp_replace_token-' . $token, $string, $args );
+	foreach ($tokens as $key => $token) {
+		$string = apply_filters( 'ppp_replace_token-'.$token, $string, $args );
 	}
 
 	return $string;
@@ -43,7 +43,7 @@ 
  * @return string         The string with the token {post_title} replaced
  */
 function ppp_post_title_token( $string, $args ) {
-	if ( !isset( $args['post_id'] ) ) {
+	if ( ! isset($args['post_id'])) {
 		return $string;
 	}
 
@@ -71,11 +71,11 @@ 
  */
 function ppp_generate_unique_link( $share_link, $post_id, $name ) {
 	$name_parts = explode( '_', $name );
-	$share_link .= strpos( $share_link, '?' ) ? '&' : '?' ;
+	$share_link .= strpos( $share_link, '?' ) ? '&' : '?';
 
 	$query_string_var = apply_filters( 'ppp_query_string_var', 'ppp' );
 
-	$share_link .= $query_string_var . '=' . $post_id . '-' . $name_parts[1];
+	$share_link .= $query_string_var.'='.$post_id.'-'.$name_parts[1];
 
 	return $share_link;
 }
@@ -90,9 +90,9 @@ 
  */
 function ppp_generate_google_utm_link( $share_link, $post_id, $name ) {
 	$name_parts = explode( '_', $name );
-	$service = isset( $name_parts[3] ) ? $name_parts[3] : 'tw';
+	$service = isset($name_parts[3]) ? $name_parts[3] : 'tw';
 
-	switch( $service ) {
+	switch ($service) {
 		case 'li':
 			$network = 'LinkedIn';
 			break;
@@ -107,17 +107,17 @@ 
 
 	$utm['source']   = $network;
 	$utm['medium']   = 'social';
-	$utm['term']     =  ppp_get_post_slug_by_id( $post_id );
+	$utm['term']     = ppp_get_post_slug_by_id( $post_id );
 	$utm['content']  = $name_parts[1]; // The day after publishing
 	$utm['campaign'] = 'PostPromoterPro';
 
-	$utm_string  = strpos( $share_link, '?' ) ? '&' : '?' ;
+	$utm_string = strpos( $share_link, '?' ) ? '&' : '?';
 	$first = true;
-	foreach ( $utm as $key => $value ) {
-		if ( !$first ) {
+	foreach ($utm as $key => $value) {
+		if ( ! $first) {
 			$utm_string .= '&';
 		}
-		$utm_string .= 'utm_' . $key . '=' . $value;
+		$utm_string .= 'utm_'.$key.'='.$value;
 		$first = false;
 	}
 

includes/twitter-functions.php

Spacing +118 added lines, -118 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined( 'ABSPATH' )) {
 	exit;
 }
 
@@ -12,7 +12,7 @@ 
 function ppp_twitter_enabled() {
 	global $ppp_social_settings;
 
-	if ( isset( $ppp_social_settings['twitter'] ) && !empty( $ppp_social_settings['twitter'] ) ) {
+	if (isset($ppp_social_settings['twitter']) && ! empty($ppp_social_settings['twitter'])) {
 		return true;
 	}
 
@@ -50,10 +50,10 @@ 
  */
 function ppp_tw_account_list_avatar( $string = '' ) {
 
-	if ( ppp_twitter_enabled() ) {
+	if (ppp_twitter_enabled()) {
 		global $ppp_social_settings;
 		$avatar_url = $ppp_social_settings['twitter']['user']->profile_image_url_https;
-		$string .= '<img class="ppp-social-icon" src="' . $avatar_url . '" />';
+		$string .= '<img class="ppp-social-icon" src="'.$avatar_url.'" />';
 	}
 
 	return $string;
@@ -67,7 +67,7 @@ 
  */
 function ppp_tw_account_list_name( $string = '' ) {
 
-	if ( ppp_twitter_enabled() ) {
+	if (ppp_twitter_enabled()) {
 		global $ppp_social_settings;
 		$string .= $ppp_social_settings['twitter']['user']->name;
 	}
@@ -83,15 +83,15 @@ 
  */
 function ppp_tw_account_list_actions( $string = '' ) {
 
-	if ( ! ppp_twitter_enabled() ) {
+	if ( ! ppp_twitter_enabled()) {
 		global $ppp_twitter_oauth, $ppp_social_settings;
 		$tw_auth = $ppp_twitter_oauth->ppp_verify_twitter_credentials();
 		$tw_authurl = $ppp_twitter_oauth->ppp_get_twitter_auth_url();
 
-		$string .= '<a href="' . $tw_authurl . '"><img src="' . PPP_URL . '/includes/images/sign-in-with-twitter-gray.png" /></a>';
+		$string .= '<a href="'.$tw_authurl.'"><img src="'.PPP_URL.'/includes/images/sign-in-with-twitter-gray.png" /></a>';
 	} else {
-		$string .= '<a class="button-primary" href="' . admin_url( 'admin.php?page=ppp-social-settings&ppp_social_disconnect=true&ppp_network=twitter' ) . '" >' . __( 'Disconnect from Twitter', 'ppp-txt' ) . '</a>&nbsp;';
-		$string .= '<a class="button-secondary" href="https://twitter.com/settings/applications" target="blank">' . __( 'Revoke Access via Twitter', 'ppp-txt' ) . '</a>';
+		$string .= '<a class="button-primary" href="'.admin_url( 'admin.php?page=ppp-social-settings&ppp_social_disconnect=true&ppp_network=twitter' ).'" >'.__( 'Disconnect from Twitter', 'ppp-txt' ).'</a>&nbsp;';
+		$string .= '<a class="button-secondary" href="https://twitter.com/settings/applications" target="blank">'.__( 'Revoke Access via Twitter', 'ppp-txt' ).'</a>';
 	}
 
 	return $string;
@@ -103,13 +103,13 @@ 
  * @return void
  */
 function ppp_capture_twitter_oauth() {
-	if ( isset( $_REQUEST['oauth_verifier'] ) && isset( $_REQUEST['oauth_token'] ) ) {
+	if (isset($_REQUEST['oauth_verifier']) && isset($_REQUEST['oauth_token'])) {
 		$current_screen = get_current_screen();
-		if ( 'user-edit' === $current_screen->base ) {
-			$user_id = ! empty( $_GET['user_id'] ) && is_numeric( $_GET['user_id'] ) ? $_GET['user_id'] : false;
+		if ('user-edit' === $current_screen->base) {
+			$user_id = ! empty($_GET['user_id']) && is_numeric( $_GET['user_id'] ) ? $_GET['user_id'] : false;
 			$twitter = new PPP_Twitter_User( $user_id );
 			$twitter->init();
-			$redirect = admin_url( 'user-edit.php?updated=1&user_id=' . $user_id );
+			$redirect = admin_url( 'user-edit.php?updated=1&user_id='.$user_id );
 		} else {
 			global $ppp_twitter_oauth;
 			$ppp_twitter_oauth->ppp_initialize_twitter();
@@ -127,17 +127,17 @@ 
  * @return void
  */
 function ppp_disconnect_twitter() {
-	if ( ! empty( $_GET['user_id'] ) ) {
+	if ( ! empty($_GET['user_id'])) {
 		$user_id = (int) sanitize_text_field( $_GET['user_id'] );
-		if ( $user_id !== get_current_user_id() || ! current_user_can( 'manage_options' ) ) {
+		if ($user_id !== get_current_user_id() || ! current_user_can( 'manage_options' )) {
 			wp_die( __( 'Unable to disconnect Twitter account', 'ppp-txt' ) );
 		}
 		delete_user_meta( $user_id, '_ppp_twitter_data' );
 	} else {
 		global $ppp_social_settings;
 		$ppp_social_settings = get_option( 'ppp_social_settings' );
-		if ( isset( $ppp_social_settings['twitter'] ) ) {
-			unset( $ppp_social_settings['twitter'] );
+		if (isset($ppp_social_settings['twitter'])) {
+			unset($ppp_social_settings['twitter']);
 			update_option( 'ppp_social_settings', $ppp_social_settings );
 		}
 	}
@@ -168,12 +168,12 @@ 
 	global $ppp_options, $wp_logs, $wp_filter;
 
 	$post_meta     = get_post_meta( $post_id, '_ppp_tweets', true );
-	$this_share    = $post_meta[ $index ];
-	$attachment_id = isset( $this_share['attachment_id'] ) ? $this_share['attachment_id'] : false;
+	$this_share    = $post_meta[$index];
+	$attachment_id = isset($this_share['attachment_id']) ? $this_share['attachment_id'] : false;
 
 	$share_message = ppp_tw_build_share_message( $post_id, $name );
 
-	if ( empty( $attachment_id ) && ! empty( $this_share['image'] ) ) {
+	if (empty($attachment_id) && ! empty($this_share['image'])) {
 		$media = $this_share['image'];
 	} else {
 		$use_media = ppp_tw_use_media( $post_id, $index );
@@ -199,12 +199,12 @@ 
 
 	update_post_meta( $log_entry, '_ppp_share_status', $status );
 
-	if ( ! empty( $status->id_str ) ) {
+	if ( ! empty($status->id_str)) {
 		$post      = get_post( $post_id );
 		$author_id = $post->post_author;
 		$author_rt = get_user_meta( $author_id, '_ppp_share_scheduled', true );
 
-		if ( $author_rt ) {
+		if ($author_rt) {
 			$twitter_user = new PPP_Twitter_User( $author_id );
 			$twitter_user->retweet( $status->id_str );
 		}
@@ -224,9 +224,9 @@ 
 function ppp_tw_build_share_message( $post_id, $name, $scheduled = true, $include_link = true ) {
 	$share_content = ppp_tw_generate_share_content( $post_id, $name );
 
-	if ( $include_link ) {
+	if ($include_link) {
 		$share_link    = ppp_generate_link( $post_id, $name, $scheduled );
-		$share_content = $share_content . ' ' . $share_link;
+		$share_content = $share_content.' '.$share_link;
 	}
 
 	return apply_filters( 'ppp_tw_build_share_message', $share_content );
@@ -240,10 +240,10 @@ 
  */
 function ppp_tw_generate_share_content( $post_id, $name, $is_scheduled = true ) {
 	global $ppp_options;
-	$default_text = isset( $ppp_options['default_text'] ) ? $ppp_options['default_text'] : '';
+	$default_text = isset($ppp_options['default_text']) ? $ppp_options['default_text'] : '';
 	$ppp_tweets   = get_post_meta( $post_id, '_ppp_tweets', true );
 
-	if ( $is_scheduled && ! empty( $ppp_tweets ) ) {
+	if ($is_scheduled && ! empty($ppp_tweets)) {
 		$ppp_post_override_data = get_post_meta( $post_id, '_ppp_post_override_data', true );
 		$name_array    = explode( '_', $name );
 		$index         = $name_array[1];
@@ -251,10 +251,10 @@ 
 	}
 
 	// If an override was found, use it, otherwise try the default text content
-	$share_content = ( isset( $share_content ) && !empty( $share_content ) ) ? $share_content : $default_text;
+	$share_content = (isset($share_content) && ! empty($share_content)) ? $share_content : $default_text;
 
 	// If the content is still empty, just use the post title
-	$share_content = ( isset( $share_content ) && !empty( $share_content ) ) ? $share_content : get_the_title( $post_id );
+	$share_content = (isset($share_content) && ! empty($share_content)) ? $share_content : get_the_title( $post_id );
 
 	return apply_filters( 'ppp_share_content', $share_content, array( 'post_id' => $post_id ) );
 }
@@ -266,12 +266,12 @@ 
  * @return bool         Whether or not this tweet should contain a media post
  */
 function ppp_tw_use_media( $post_id, $index ) {
-	if ( empty( $post_id ) || empty( $index ) ) {
+	if (empty($post_id) || empty($index)) {
 		return false;
 	}
 
 	$share_data = get_post_meta( $post_id, '_ppp_tweets', true );
-	$use_media  = ! empty( $share_data[$index]['attachment_id'] ) || ! empty( $share_data[$index]['image'] ) ? true : false;
+	$use_media  = ! empty($share_data[$index]['attachment_id']) || ! empty($share_data[$index]['image']) ? true : false;
 
 	return $use_media;
 }
@@ -282,7 +282,7 @@ 
  * @return void
  */
 function ppp_set_tw_token_constants( $social_tokens ) {
-	if ( !empty( $social_tokens ) && property_exists( $social_tokens, 'twitter' ) ) {
+	if ( ! empty($social_tokens) && property_exists( $social_tokens, 'twitter' )) {
 		define( 'PPP_TW_CONSUMER_KEY', $social_tokens->twitter->consumer_token );
 		define( 'PPP_TW_CONSUMER_SECRET', $social_tokens->twitter->consumer_secret );
 	}
@@ -320,7 +320,7 @@ 
  */
 function ppp_tw_add_meta_tab( $tabs ) {
 	global $ppp_social_settings;
-	if ( !isset( $ppp_social_settings['twitter'] ) ) {
+	if ( ! isset($ppp_social_settings['twitter'])) {
 		return $tabs;
 	}
 
@@ -337,7 +337,7 @@ 
  */
 function ppp_tw_register_metabox_content( $content ) {
 	global $ppp_social_settings;
-	if ( !isset( $ppp_social_settings['twitter'] ) ) {
+	if ( ! isset($ppp_social_settings['twitter'])) {
 		return $content;
 	}
 
@@ -396,16 +396,16 @@ 
 							<tbody>
 								<?php ppp_render_tweet_share_on_publish_row(); ?>
 								<?php $tweets = get_post_meta( $post->ID, '_ppp_tweets', true ); ?>
-								<?php if ( ! empty( $tweets ) ) : ?>
+								<?php if ( ! empty($tweets)) : ?>
 
-									<?php foreach ( $tweets as $key => $value ) :
-										$date          = isset( $value['date'] )          ? $value['date']          : '';
-										$time          = isset( $value['time'] )          ? $value['time']          : '';
-										$text          = isset( $value['text'] )          ? $value['text']          : '';
-										$image         = isset( $value['image'] )         ? $value['image']         : '';
-										$attachment_id = isset( $value['attachment_id'] ) ? $value['attachment_id'] : '';
+									<?php foreach ($tweets as $key => $value) :
+										$date          = isset($value['date']) ? $value['date'] : '';
+										$time          = isset($value['time']) ? $value['time'] : '';
+										$text          = isset($value['text']) ? $value['text'] : '';
+										$image         = isset($value['image']) ? $value['image'] : '';
+										$attachment_id = isset($value['attachment_id']) ? $value['attachment_id'] : '';
 
-										$args = apply_filters( 'ppp_tweet_row_args', compact( 'date','time','text','image','attachment_id' ), $value );
+										$args = apply_filters( 'ppp_tweet_row_args', compact( 'date', 'time', 'text', 'image', 'attachment_id' ), $value );
 										?>
 
 										<?php ppp_render_tweet_row( $key, $args, $post->ID ); ?>
@@ -414,7 +414,7 @@ 
 									<?php endforeach; ?>
 
 									<?php
-									if ( ! empty( $has_past_shares ) && count ( $tweets ) == $has_past_shares ) {
+									if ( ! empty($has_past_shares) && count( $tweets ) == $has_past_shares) {
 										$args = array(
 											'date'          => '',
 											'time'          => '',
@@ -437,7 +437,7 @@ 
 								<tr>
 									<td class="submit" colspan="4" style="float: none; clear:both; background:#fff;">
 										<a class="button-secondary ppp-add-repeatable" style="margin: 6px 0;"><?php _e( 'Add New Tweet', 'ppp-txt' ); ?></a>
-										<?php if ( ! empty( $has_past_shares ) ) : ?>
+										<?php if ( ! empty($has_past_shares)) : ?>
 											<a class="button-secondary ppp-view-all" style="margin: 6px 0;"><?php _e( 'Toggle Past Tweets', 'ppp-txt' ); ?></a>
 										<?php endif; ?>
 									</td>
@@ -463,38 +463,38 @@ 
  */
 function ppp_render_tweet_share_on_publish_row() {
 	global $post, $ppp_share_settings;
-	$default_text = !empty( $ppp_options['default_text'] ) ? $ppp_options['default_text'] : __( 'Social Text', 'ppp-txt' );
+	$default_text = ! empty($ppp_options['default_text']) ? $ppp_options['default_text'] : __( 'Social Text', 'ppp-txt' );
 
 	$ppp_post_exclude = get_post_meta( $post->ID, '_ppp_post_exclude', true );
 
 	$ppp_share_on_publish  = get_post_meta( $post->ID, '_ppp_share_on_publish', true );
 	$show_share_on_publish = false;
 
-	$share_by_default      = empty( $ppp_share_settings['twitter']['share_on_publish'] ) ? false : true;
+	$share_by_default      = empty($ppp_share_settings['twitter']['share_on_publish']) ? false : true;
 
-	if ( $ppp_share_on_publish == '1' || ( $ppp_share_on_publish == '' && $share_by_default ) ) {
+	if ($ppp_share_on_publish == '1' || ($ppp_share_on_publish == '' && $share_by_default)) {
 		$show_share_on_publish = true;
 	}
 
 	$ppp_share_on_publish_text          = get_post_meta( $post->ID, '_ppp_share_on_publish_text', true );
 	$ppp_share_on_publish_include_image = get_post_meta( $post->ID, '_ppp_share_on_publish_include_image', true );
 
-	$disabled = ( $post->post_status === 'publish' && time() > strtotime( $post->post_date ) ) ? true : false;
+	$disabled = ($post->post_status === 'publish' && time() > strtotime( $post->post_date )) ? true : false;
 	?>
 	<tr class="ppp-tweet-wrapper ppp-repeatable-row on-publish-row">
 		<td colspan="2" class="ppp-on-plublish-date-column">
-			<input <?php if ( $disabled ): ?>readonly<?php endif; ?> type="checkbox" name="_ppp_share_on_publish" id="ppp_share_on_publish" value="1" <?php checked( true, $show_share_on_publish, true ); ?> />
+			<input <?php if ($disabled): ?>readonly<?php endif; ?> type="checkbox" name="_ppp_share_on_publish" id="ppp_share_on_publish" value="1" <?php checked( true, $show_share_on_publish, true ); ?> />
 			&nbsp;<label for="ppp_share_on_publish"><?php _e( 'Tweet On Publish', 'ppp-txt' ); ?></label>
 		</td>
 
 		<td>
-			<input <?php if ( $disabled ): ?>readonly<?php endif; ?> class="ppp-tweet-text-repeatable" type="text" name="_ppp_share_on_publish_text" value="<?php echo esc_attr( $ppp_share_on_publish_text ); ?>" />
-			<?php $length = ! empty( $args['text'] ) ? strlen( $args['text'] ) : 0; ?>
+			<input <?php if ($disabled): ?>readonly<?php endif; ?> class="ppp-tweet-text-repeatable" type="text" name="_ppp_share_on_publish_text" value="<?php echo esc_attr( $ppp_share_on_publish_text ); ?>" />
+			<?php $length = ! empty($args['text']) ? strlen( $args['text'] ) : 0; ?>
 			&nbsp;<span class="ppp-text-length"><?php echo $length; ?></span>
 		</td>
 
 		<td style="width: 200px" colspan="2">
-			<input class="ppp-tw-featured-image-input" <?php if ( $disabled ): ?>readonly<?php endif; ?> id="ppp-share-on-publish-image" type="checkbox" name="_ppp_share_on_publish_include_image" value="1" <?php checked( '1', $ppp_share_on_publish_include_image, true ); ?>/>
+			<input class="ppp-tw-featured-image-input" <?php if ($disabled): ?>readonly<?php endif; ?> id="ppp-share-on-publish-image" type="checkbox" name="_ppp_share_on_publish_include_image" value="1" <?php checked( '1', $ppp_share_on_publish_include_image, true ); ?>/>
 			&nbsp;<label for="ppp-share-on-publish-image"><?php _e( 'Featured Image', 'ppp-txt' ); ?></label>
 		</td>
 
@@ -513,13 +513,13 @@ 
 function ppp_render_tweet_row( $key, $args = array(), $post_id ) {
 	global $post, $has_past_shares;
 
-	$share_time     = strtotime( $args['date'] . ' ' . $args['time'] );
+	$share_time     = strtotime( $args['date'].' '.$args['time'] );
 	$readonly       = current_time( 'timestamp' ) > $share_time ? 'readonly="readonly" ' : false;
-	$no_date        = ! empty( $readonly ) ? ' hasDatepicker' : '';
-	$hide           = ! empty( $readonly ) ? 'display: none;' : '';
-	$shared         = ! empty( $readonly ) ? 'past-share' : '';
+	$no_date        = ! empty($readonly) ? ' hasDatepicker' : '';
+	$hide           = ! empty($readonly) ? 'display: none;' : '';
+	$shared         = ! empty($readonly) ? 'past-share' : '';
 
-	if ( ! empty( $readonly ) ) {
+	if ( ! empty($readonly)) {
 		$has_past_shares++;
 	}
 	?>
@@ -534,7 +534,7 @@ 
 
 		<td>
 			<input <?php echo $readonly; ?>class="ppp-tweet-text-repeatable" type="text" name="_ppp_tweets[<?php echo $key; ?>][text]" value="<?php echo esc_attr( $args['text'] ); ?>" />
-			<?php $length = ! empty( $args['text'] ) ? strlen( $args['text'] ) : 0; ?>
+			<?php $length = ! empty($args['text']) ? strlen( $args['text'] ) : 0; ?>
 			&nbsp;<span class="ppp-text-length"><?php echo $length; ?></span>
 		</td>
 
@@ -553,7 +553,7 @@ 
 		</td>
 
 		<td>
-			<a href="#" class="ppp-repeatable-row ppp-remove-repeatable" data-type="twitter" style="background: url(<?php echo admin_url('/images/xit.gif'); ?>) no-repeat;<?php echo $hide; ?>">&times;</a>
+			<a href="#" class="ppp-repeatable-row ppp-remove-repeatable" data-type="twitter" style="background: url(<?php echo admin_url( '/images/xit.gif' ); ?>) no-repeat;<?php echo $hide; ?>">&times;</a>
 		</td>
 
 	</tr>
@@ -568,24 +568,24 @@ 
  */
 function ppp_tw_save_post_meta_boxes( $post_id, $post ) {
 
-	if ( ! ppp_should_save( $post_id, $post ) ) {
+	if ( ! ppp_should_save( $post_id, $post )) {
 		return;
 	}
 
-	$ppp_post_exclude = ( isset( $_REQUEST['_ppp_post_exclude'] ) ) ? $_REQUEST['_ppp_post_exclude'] : '0';
+	$ppp_post_exclude = (isset($_REQUEST['_ppp_post_exclude'])) ? $_REQUEST['_ppp_post_exclude'] : '0';
 
-	$ppp_share_on_publish = ( isset( $_REQUEST['_ppp_share_on_publish'] ) ) ? $_REQUEST['_ppp_share_on_publish'] : '0';
-	$ppp_share_on_publish_text = ( isset( $_REQUEST['_ppp_share_on_publish_text'] ) ) ? $_REQUEST['_ppp_share_on_publish_text'] : '';
-	$ppp_share_on_publish_include_image = ( isset( $_REQUEST['_ppp_share_on_publish_include_image'] ) ) ? $_REQUEST['_ppp_share_on_publish_include_image'] : '';
+	$ppp_share_on_publish = (isset($_REQUEST['_ppp_share_on_publish'])) ? $_REQUEST['_ppp_share_on_publish'] : '0';
+	$ppp_share_on_publish_text = (isset($_REQUEST['_ppp_share_on_publish_text'])) ? $_REQUEST['_ppp_share_on_publish_text'] : '';
+	$ppp_share_on_publish_include_image = (isset($_REQUEST['_ppp_share_on_publish_include_image'])) ? $_REQUEST['_ppp_share_on_publish_include_image'] : '';
 
 
 	update_post_meta( $post_id, '_ppp_share_on_publish', $ppp_share_on_publish );
 	update_post_meta( $post_id, '_ppp_share_on_publish_text', $ppp_share_on_publish_text );
 	update_post_meta( $post_id, '_ppp_share_on_publish_include_image', $ppp_share_on_publish_include_image );
 
-	$tweet_data = isset( $_REQUEST['_ppp_tweets'] ) ? $_REQUEST['_ppp_tweets'] : array();
-	foreach ( $tweet_data as $index => $tweet ) {
-		$tweet_data[ $index ]['text'] = sanitize_text_field( $tweet['text'] );
+	$tweet_data = isset($_REQUEST['_ppp_tweets']) ? $_REQUEST['_ppp_tweets'] : array();
+	foreach ($tweet_data as $index => $tweet) {
+		$tweet_data[$index]['text'] = sanitize_text_field( $tweet['text'] );
 	}
 	update_post_meta( $post_id, '_ppp_tweets', $tweet_data );
 
@@ -603,28 +603,28 @@ 
 	global $ppp_options;
 
 	$from_meta = get_post_meta( $post->ID, '_ppp_share_on_publish', true );
-	$from_post = isset( $_POST['_ppp_share_on_publish'] );
+	$from_post = isset($_POST['_ppp_share_on_publish']);
 
-	if ( empty( $from_meta ) && empty( $from_post ) ) {
+	if (empty($from_meta) && empty($from_post)) {
 		return;
 	}
 
 	// Determine if we're seeing the share on publish in meta or $_POST
-	if ( $from_meta && !$from_post ) {
+	if ($from_meta && ! $from_post) {
 		$ppp_share_on_publish_text = get_post_meta( $post->ID, '_ppp_share_on_publish_text', true );
 		$use_media = get_post_meta( $post->ID, '_ppp_share_on_publish_include_image', true );
 	} else {
-		$ppp_share_on_publish_text = isset( $_POST['_ppp_share_on_publish_text'] ) ? $_POST['_ppp_share_on_publish_text'] : '';
-		$use_media = isset( $_POST['_ppp_share_on_publish_include_image'] ) ? $_POST['_ppp_share_on_publish_include_image'] : false;
+		$ppp_share_on_publish_text = isset($_POST['_ppp_share_on_publish_text']) ? $_POST['_ppp_share_on_publish_text'] : '';
+		$use_media = isset($_POST['_ppp_share_on_publish_include_image']) ? $_POST['_ppp_share_on_publish_include_image'] : false;
 	}
 
-	$share_content = ( !empty( $ppp_share_on_publish_text ) ) ? $ppp_share_on_publish_text : ppp_tw_generate_share_content( $post->ID, null, false );
+	$share_content = ( ! empty($ppp_share_on_publish_text)) ? $ppp_share_on_publish_text : ppp_tw_generate_share_content( $post->ID, null, false );
 	$share_content = apply_filters( 'ppp_share_content', $share_content, array( 'post_id' => $post->ID ) );
-	$name = 'sharedate_0_' . $post->ID;
+	$name = 'sharedate_0_'.$post->ID;
 	$media = ppp_post_has_media( $post->ID, 'tw', $use_media );
 	$share_link = ppp_generate_link( $post->ID, $name, true );
 
-	$status = ppp_send_tweet( $share_content . ' ' . $share_link, $post->ID, $media );
+	$status = ppp_send_tweet( $share_content.' '.$share_link, $post->ID, $media );
 
 	$log_title = ppp_tw_build_share_message( $post->ID, $name, false, false );
 
@@ -641,11 +641,11 @@ 
 
 	$log_entry = WP_Logging::insert_log( $log_data, $log_meta );
 
-	if ( ! empty( $status->id_str ) ) {
+	if ( ! empty($status->id_str)) {
 		$author_id = $post->post_author;
 		$author_rt = get_user_meta( $author_id, '_ppp_share_on_publish', true );
 
-		if ( $author_rt ) {
+		if ($author_rt) {
 			$twitter_user = new PPP_Twitter_User( $author_id );
 			$twitter_user->retweet( $status->id_str );
 		}
@@ -665,20 +665,20 @@ 
 function ppp_tw_generate_timestamps( $times, $post_id ) {
 	$ppp_tweets = get_post_meta( $post_id, '_ppp_tweets', true );
 
-	if ( empty( $ppp_tweets ) ) {
+	if (empty($ppp_tweets)) {
 		$ppp_tweets = array();
 	}
 
-	foreach ( $ppp_tweets as $key => $data ) {
-		if ( ! array_filter( $data ) ) {
+	foreach ($ppp_tweets as $key => $data) {
+		if ( ! array_filter( $data )) {
 			continue;
 		}
 
 		$timestamp = ppp_generate_timestamp( $data['date'], $data['time'] );
 
-		if ( $timestamp > current_time( 'timestamp', 1 ) ) { // Make sure the timestamp we're getting is in the future
-			$time_key           = strtotime( date_i18n( 'd-m-Y H:i:s', $timestamp , true ) ) . '_tw';
-			$times[ $time_key ] = 'sharedate_' . $key . '_' . $post_id . '_tw';
+		if ($timestamp > current_time( 'timestamp', 1 )) { // Make sure the timestamp we're getting is in the future
+			$time_key           = strtotime( date_i18n( 'd-m-Y H:i:s', $timestamp, true ) ).'_tw';
+			$times[$time_key] = 'sharedate_'.$key.'_'.$post_id.'_tw';
 		}
 
 	}
@@ -698,7 +698,7 @@ 
 
 	$ret = false;
 
-	if ( ! empty( $ppp_share_settings['twitter']['cards_enabled'] ) ) {
+	if ( ! empty($ppp_share_settings['twitter']['cards_enabled'])) {
 		$ret = true;
 	}
 
@@ -713,13 +713,13 @@ 
  */
 function ppp_tw_card_meta() {
 
-	if ( ! is_single() || ! ppp_twitter_enabled() || ! ppp_tw_cards_enabled() ) {
+	if ( ! is_single() || ! ppp_twitter_enabled() || ! ppp_tw_cards_enabled()) {
 		return;
 	}
 
 	global $post, $ppp_options;
 
-	if ( ! array_key_exists( $post->post_type, $ppp_options['post_types'] ) ) {
+	if ( ! array_key_exists( $post->post_type, $ppp_options['post_types'] )) {
 		return;
 	}
 
@@ -737,20 +737,20 @@ 
 
 	$return = '';
 
-	if ( ! is_single() || ! ppp_tw_cards_enabled() ) {
+	if ( ! is_single() || ! ppp_tw_cards_enabled()) {
 		return $return;
 	}
 
 	global $post, $ppp_social_settings;
 
 
-	if ( empty( $post ) ) {
+	if (empty($post)) {
 		return;
 	}
 
 	$elements = ppp_tw_default_meta_elements();
-	foreach ( $elements as $name => $content ) {
-		$return .= '<meta name="' . $name . '" content="' . $content . '" />' . "\n";
+	foreach ($elements as $name => $content) {
+		$return .= '<meta name="'.$name.'" content="'.$content.'" />'."\n";
 	}
 
 	return apply_filters( 'ppp_tw_card_meta', $return );
@@ -770,22 +770,22 @@ 
 	$elements = array();
 
 	$image_url = ppp_post_has_media( $post->ID, 'tw', true );
-	if ( $image_url ) {
+	if ($image_url) {
 		$elements['twitter:card']      = 'summary_large_image';
 		$elements['twitter:image:src'] = $image_url;
 	} else {
 		$elements['twitter:card'] = 'summary';
 	}
 
-	$elements['twitter:site']        = '@' . $ppp_social_settings['twitter']['user']->screen_name;
+	$elements['twitter:site']        = '@'.$ppp_social_settings['twitter']['user']->screen_name;
 	$elements['twitter:title']       = esc_attr( strip_tags( $post->post_title ) );
 	$elements['twitter:description'] = esc_attr( ppp_tw_get_card_description() );
 
 	$author_twitter_handle = get_user_meta( $post->post_author, 'twitter', true );
-	if ( ! empty( $author_twitter_handle ) ) {
+	if ( ! empty($author_twitter_handle)) {
 
-		if ( strpos( $author_twitter_handle, '@' ) === false ) {
-			$author_twitter_handle = '@' . $author_twitter_handle;
+		if (strpos( $author_twitter_handle, '@' ) === false) {
+			$author_twitter_handle = '@'.$author_twitter_handle;
 		}
 
 		$elements['twitter:creator'] = esc_attr( strip_tags( $author_twitter_handle ) );
@@ -804,13 +804,13 @@ 
 function ppp_tw_get_card_description() {
 	global $post;
 
-	if ( ! is_single() || empty( $post ) ) {
+	if ( ! is_single() || empty($post)) {
 		return false;
 	}
 
 	$excerpt = $post->post_excerpt;
 
-	if ( empty( $excerpt ) ) {
+	if (empty($excerpt)) {
 		$excerpt = ppp_tw_format_card_description( $post->content );
 	}
 
@@ -828,10 +828,10 @@ 
 	$max_len = apply_filters( 'ppp_tw_cart_desc_length', 200 );
 	$excerpt = strip_tags( $excerpt );
 
-	if ( strlen( $excerpt ) > $max_len ) {
+	if (strlen( $excerpt ) > $max_len) {
 		$excerpt_pre = substr( $excerpt, 0, $max_len );
 		$last_space  = strrpos( $excerpt_pre, ' ' );
-		$excerpt     = substr( $excerpt_pre, 0, $last_space ) . '...';
+		$excerpt     = substr( $excerpt_pre, 0, $last_space ).'...';
 	}
 
 	return $excerpt;
@@ -846,7 +846,7 @@ 
  */
 function ppp_tw_add_contact_method( $user_contactmethods ) {
 
-	if ( ! isset( $user_contactmethods['twitter'] ) ) {
+	if ( ! isset($user_contactmethods['twitter'])) {
 		$user_contactmethods['twitter'] = __( 'Twitter', 'ppp-txt' );
 	}
 	// Returns the contact methods
@@ -864,11 +864,11 @@ 
  */
 function ppp_tw_profile_settings( $user ) {
 
-	if ( $user->ID == get_current_user_id() && ! current_user_can( 'edit_posts' ) ) {
+	if ($user->ID == get_current_user_id() && ! current_user_can( 'edit_posts' )) {
 		return;
 	}
 
-	if ( $user->ID !== get_current_user_id() && ! current_user_can( 'manage_options' ) ) {
+	if ($user->ID !== get_current_user_id() && ! current_user_can( 'manage_options' )) {
 		return;
 	}
 
@@ -882,16 +882,16 @@ 
 			<?php
 			$twitter = new PPP_Twitter_User( get_current_user_id() );
 			$tw_user = get_user_meta( $user->ID, '_ppp_twitter_data', true );
-			if ( empty( $tw_user ) ) {
-				$tw_authurl = $twitter->get_auth_url( admin_url( 'user-edit.php?user_id=' . $user->ID ) );
+			if (empty($tw_user)) {
+				$tw_authurl = $twitter->get_auth_url( admin_url( 'user-edit.php?user_id='.$user->ID ) );
 
-				echo '<a href="' . $tw_authurl . '"><img src="' . PPP_URL . '/includes/images/sign-in-with-twitter-gray.png" /></a>';
+				echo '<a href="'.$tw_authurl.'"><img src="'.PPP_URL.'/includes/images/sign-in-with-twitter-gray.png" /></a>';
 			} else {
 				$connected = true;
 				?>
 				<p><strong><?php _e( 'Signed in as', 'ppp-txt' ); ?>: </strong><?php echo $tw_user['user']->screen_name; ?></p>
 				<p>
-					<a class="button-primary" href="<?php echo admin_url( 'user-edit.php?user_id=' . $user->ID . '&ppp_social_disconnect=true&ppp_network=twitter&user_id=' . $user->ID ); ?>" ><?php _e( 'Disconnect from Twitter', 'ppp-txt' ); ?></a>&nbsp;
+					<a class="button-primary" href="<?php echo admin_url( 'user-edit.php?user_id='.$user->ID.'&ppp_social_disconnect=true&ppp_network=twitter&user_id='.$user->ID ); ?>" ><?php _e( 'Disconnect from Twitter', 'ppp-txt' ); ?></a>&nbsp;
 					<a class="button-secondary" href="https://twitter.com/settings/applications" target="blank"><?php _e( 'Revoke Access via Twitter', 'ppp-txt' ); ?></a>
 				</p>
 				<?php
@@ -900,10 +900,10 @@ 
 			</td>
 		</tr>
 
-		<?php if ( $connected ) : ?>
+		<?php if ($connected) : ?>
 		<?php
 			$share_on_publish = get_user_meta( $user->ID, '_ppp_share_on_publish', true );
-			$share_scheduled  = get_user_meta( $user->ID, '_ppp_share_scheduled' , true );
+			$share_scheduled  = get_user_meta( $user->ID, '_ppp_share_scheduled', true );
 		?>
 		<tr>
 			<th><?php _e( 'Sharing Options', 'ppp-txt' ); ?></th>
@@ -936,11 +936,11 @@ 
  */
 function ppp_tw_save_profile( $user_id ) {
 
-	$share_on_publish = ! empty( $_POST['share_on_publish'] ) ? true : false;
-	$share_scheduled  = ! empty( $_POST['share_scheduled'] )  ? true : false;
+	$share_on_publish = ! empty($_POST['share_on_publish']) ? true : false;
+	$share_scheduled  = ! empty($_POST['share_scheduled']) ? true : false;
 
 	update_user_meta( $user_id, '_ppp_share_on_publish', $share_on_publish );
-	update_user_meta( $user_id, '_ppp_share_scheduled' , $share_scheduled  );
+	update_user_meta( $user_id, '_ppp_share_scheduled', $share_scheduled );
 
 }
 add_action( 'personal_options_update', 'ppp_tw_save_profile' );
@@ -949,14 +949,14 @@ 
 function ppp_tw_calendar_on_publish_event( $events, $post_id ) {
 	$share_on_publish = get_post_meta( $post_id, '_ppp_share_on_publish', true );
 
-	if ( ! empty( $share_on_publish ) ) {
+	if ( ! empty($share_on_publish)) {
 		$share_text = get_post_meta( $post_id, '_ppp_share_on_publish_text', true );
 		$events[] = array(
-			'id' => $post_id . '-share-on-publish',
-			'title' => ( ! empty( $share_text ) ) ? $share_text : ppp_tw_generate_share_content( $post_id, null, false ),
-			'start'     => date_i18n( 'Y-m-d/TH:i:s', strtotime( get_the_date( null, $post_id ) . ' ' . get_the_time( null, $post_id ) ) + 1 ),
-			'end'       => date_i18n( 'Y-m-d/TH:i:s', strtotime( get_the_date( null, $post_id ) . ' ' . get_the_time( null, $post_id ) ) + 1 ),
-			'className' => 'ppp-calendar-item-tw cal-post-' . $post_id,
+			'id' => $post_id.'-share-on-publish',
+			'title' => ( ! empty($share_text)) ? $share_text : ppp_tw_generate_share_content( $post_id, null, false ),
+			'start'     => date_i18n( 'Y-m-d/TH:i:s', strtotime( get_the_date( null, $post_id ).' '.get_the_time( null, $post_id ) ) + 1 ),
+			'end'       => date_i18n( 'Y-m-d/TH:i:s', strtotime( get_the_date( null, $post_id ).' '.get_the_time( null, $post_id ) ) + 1 ),
+			'className' => 'ppp-calendar-item-tw cal-post-'.$post_id,
 			'belongsTo' => $post_id,
 		);
 	}
@@ -967,9 +967,9 @@ 
 
 function ppp_tw_get_post_shares( $items, $post_id ) {
 	$tweets = get_post_meta( $post_id, '_ppp_tweets', true );
-	if ( empty( $tweets ) ) { return $items; }
+	if (empty($tweets)) { return $items; }
 
-	foreach ( $tweets as $key => $tweet ) {
+	foreach ($tweets as $key => $tweet) {
 		$items[] = array( 'id' => $key, 'service' => 'tw' );
 	}
 	return $items;

includes/share-functions.php

Spacing +40 added lines, -40 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined( 'ABSPATH' )) {
 	exit;
 }
 
@@ -16,17 +16,17 @@ 
  */
 function ppp_share_on_publish( $new_status, $old_status, $post ) {
 	// don't publish password protected posts
-	if ( '' !== $post->post_password ) {
+	if ('' !== $post->post_password) {
 		return;
 	}
 
-	if ( $new_status == 'publish' && $old_status != 'publish' ) {
+	if ($new_status == 'publish' && $old_status != 'publish') {
 		global $ppp_options;
 
-		$allowed_post_types = isset( $ppp_options['post_types'] ) ? $ppp_options['post_types'] : array();
+		$allowed_post_types = isset($ppp_options['post_types']) ? $ppp_options['post_types'] : array();
 		$allowed_post_types = apply_filters( 'ppp_schedule_share_post_types', $allowed_post_types );
 
-		if ( !isset( $post->post_status ) || !array_key_exists( $post->post_type, $allowed_post_types ) ) {
+		if ( ! isset($post->post_status) || ! array_key_exists( $post->post_type, $allowed_post_types )) {
 			return false;
 		}
 
@@ -57,20 +57,20 @@ 
 
 	// If we've already started to share this, don't share it again.
 	// Compensates for wp-cron's race conditions
-	if ( get_transient( 'ppp_sharing' . $name ) === 'true' ) {
+	if (get_transient( 'ppp_sharing'.$name ) === 'true') {
 		return;
 	}
 
 	// For 10 seconds, don't allow another share to go for this post
-	set_transient( 'ppp_sharing' . $name, 'true', 10 );
+	set_transient( 'ppp_sharing'.$name, 'true', 10 );
 
 	$name_parts = explode( '_', $name );
 	$index      = $name_parts[1];
-	$service    = isset( $name_parts[3] ) ? $name_parts[3] : 'tw';
+	$service    = isset($name_parts[3]) ? $name_parts[3] : 'tw';
 
 	// If we're fired on a cron, check for stale cron runs
-	if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
-		switch( $service ) {
+	if (defined( 'DOING_CRON' ) && DOING_CRON) {
+		switch ($service) {
 			case 'tw':
 				$post_meta = get_post_meta( $post_id, '_ppp_tweets', true );
 				break;
@@ -85,20 +85,20 @@ 
 		}
 
 		$share_data = array();
-		if ( isset( $post_meta[ $index ] ) ) {
-			$share_data = $post_meta[ $index ];
+		if (isset($post_meta[$index])) {
+			$share_data = $post_meta[$index];
 		}
 
 		$timestamp = ppp_generate_timestamp( $share_data['date'], $share_data['time'] );
 
 		// If the current time is more than 60 minutes (filterable) overdue, don't fire the share
 		$share_buffer = apply_filters( 'ppp_share_buffer', HOUR_IN_SECONDS );
-		if ( ( current_time( 'timestamp', 1 ) - $timestamp ) > $share_buffer ) {
+		if ((current_time( 'timestamp', 1 ) - $timestamp) > $share_buffer) {
 			return;
 		}
 	}
 
-	do_action( 'ppp_share_scheduled_' . $service, $post_id, $index, $name );
+	do_action( 'ppp_share_scheduled_'.$service, $post_id, $index, $name );
 
 }
 
@@ -107,26 +107,26 @@ 
  * @return void
  */
 function ppp_set_social_tokens() {
-	if ( ( defined( 'PPP_TW_CONSUMER_KEY' ) && defined( 'PPP_TW_CONSUMER_SECRET' ) ) ||
-	     ( defined( 'LINKEDIN_KEY' ) && defined( 'LINKEDIN_SECRET' ) ) ||
-	     ( defined( 'bitly_clientid' ) && defined( 'bitly_secret' ) ) ||
-	     ( defined( 'PPP_FB_APP_ID' ) && defined( 'PPP_FB_APP_SECRET' ) )
+	if ((defined( 'PPP_TW_CONSUMER_KEY' ) && defined( 'PPP_TW_CONSUMER_SECRET' )) ||
+	     (defined( 'LINKEDIN_KEY' ) && defined( 'LINKEDIN_SECRET' )) ||
+	     (defined( 'bitly_clientid' ) && defined( 'bitly_secret' )) ||
+	     (defined( 'PPP_FB_APP_ID' ) && defined( 'PPP_FB_APP_SECRET' ))
 	   ) {
 		return;
 	}
 
 	$social_tokens = ppp_has_local_tokens();
 
-	if ( false === $social_tokens ) {
+	if (false === $social_tokens) {
 		define( 'PPP_LOCAL_TOKENS', false );
 		$social_tokens = get_transient( 'ppp_social_tokens' );
 
-		if ( ! $social_tokens ) {
+		if ( ! $social_tokens) {
 			$license = trim( get_option( '_ppp_license_key' ) );
-			$url = PPP_STORE_URL . '/?ppp-get-tokens&ppp-license-key=' . $license . '&ver=' . md5( time() . $license );
+			$url = PPP_STORE_URL.'/?ppp-get-tokens&ppp-license-key='.$license.'&ver='.md5( time().$license );
 			$response = wp_remote_get( $url, array( 'timeout' => 15, 'sslverify' => false ) );
 
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error( $response )) {
 				return false;
 			}
 
@@ -138,16 +138,16 @@ 
 		define( 'PPP_LOCAL_TOKENS', true );
 		delete_transient( 'ppp_social_tokens' );
 
-		if ( isset( $social_tokens->options ) ) {
-			foreach ( $social_tokens->options as $constant => $value ) {
+		if (isset($social_tokens->options)) {
+			foreach ($social_tokens->options as $constant => $value) {
 
 				$constant = strtoupper( $constant );
 
-				if ( defined( $constant ) ) {
+				if (defined( $constant )) {
 					continue;
 				}
 
-				switch( $constant ) {
+				switch ($constant) {
 
 					case 'NO_AUTO_UPDATE':
 						// Avoid the call to the API to check for software updates
@@ -160,7 +160,7 @@ 
 		}
 	}
 
-	if ( false === PPP_LOCAL_TOKENS && ! isset( $social_tokens->error ) && ( isset( $social_tokens->twitter ) || isset( $social_tokens->facebook ) || isset( $social_tokens->linkedin ) ) ) {
+	if (false === PPP_LOCAL_TOKENS && ! isset($social_tokens->error) && (isset($social_tokens->twitter) || isset($social_tokens->facebook) || isset($social_tokens->linkedin))) {
 		set_transient( 'ppp_social_tokens', $social_tokens, WEEK_IN_SECONDS );
 	}
 
@@ -173,22 +173,22 @@ 
  */
 function ppp_has_local_tokens() {
 
-	$token_file   = apply_filters( 'ppp_local_social_token_path', ppp_get_upload_path() . '/ppp-social-tokens.json' );
+	$token_file   = apply_filters( 'ppp_local_social_token_path', ppp_get_upload_path().'/ppp-social-tokens.json' );
 	$local_tokens = false;
 
-	if ( ! file_exists( $token_file ) ) {
+	if ( ! file_exists( $token_file )) {
 		return $local_tokens;
 	}
 
 	$local_tokens = json_decode( file_get_contents( $token_file ) );
 
 	// Failed to parse as JSON
-	if ( false === $local_tokens ) {
+	if (false === $local_tokens) {
 		return $local_tokens;
 	}
 
 	// No social tokens found in the format we accept or it was empty
-	if ( empty( $local_tokens ) || ( ! isset( $local_tokens->twitter ) || ! isset( $local_tokens->facebook ) || ! isset( $local_tokens->linkedin ) ) ) {
+	if (empty($local_tokens) || ( ! isset($local_tokens->twitter) || ! isset($local_tokens->facebook) || ! isset($local_tokens->linkedin))) {
 		return false;
 	}
 
@@ -206,13 +206,13 @@ 
 	global $ppp_share_settings;
 	$share_link = get_permalink( $post_id );
 
-	if ( ppp_link_tracking_enabled() ) {
+	if (ppp_link_tracking_enabled()) {
 		$share_link = ppp_generate_link_tracking( $share_link, $post_id, $name );
 	}
 
-	if ( ppp_is_shortener_enabled() && $scheduled ) {
+	if (ppp_is_shortener_enabled() && $scheduled) {
 		$shortener_name = $ppp_share_settings['shortener'];
-		$share_link = apply_filters( 'ppp_apply_shortener-' . $shortener_name, $share_link );
+		$share_link = apply_filters( 'ppp_apply_shortener-'.$shortener_name, $share_link );
 	}
 
 
@@ -227,13 +227,13 @@ 
  * @return string             The URL to post, with proper analytics applied if necessary
  */
 function ppp_generate_link_tracking( $share_link, $post_id, $name ) {
-	if ( ppp_link_tracking_enabled() ) {
+	if (ppp_link_tracking_enabled()) {
 		global $ppp_share_settings;
 		$link_tracking_type = $ppp_share_settings['analytics'];
 
 		// Given the setting name, devs can extend this and apply a filter of ppp_analytics-[setting value]
 		// to apply their own rules for link tracking
-		$share_link = apply_filters( 'ppp_analytics-' . $link_tracking_type, $share_link, $post_id, $name );
+		$share_link = apply_filters( 'ppp_analytics-'.$link_tracking_type, $share_link, $post_id, $name );
 	}
 
 	$share_link = apply_filters( 'ppp_generate_link_tracking', $share_link, $post_id, $name );
@@ -249,14 +249,14 @@ 
  * @return mixed             If a thumbnail is found returns the URL, otherwise returns false
  */
 function ppp_post_has_media( $post_id, $network, $use_media, $attachment_id = false ) {
-	if ( !$use_media || empty( $post_id ) || empty( $network ) ) {
+	if ( ! $use_media || empty($post_id) || empty($network)) {
 		return false;
 	}
 
-	$thumb_id = empty( $attachment_id ) ? get_post_thumbnail_id( $post_id ) : $attachment_id;
-	$thumb_url = wp_get_attachment_image_src( $thumb_id, 'ppp-' . $network . '-share-image', true );
+	$thumb_id = empty($attachment_id) ? get_post_thumbnail_id( $post_id ) : $attachment_id;
+	$thumb_url = wp_get_attachment_image_src( $thumb_id, 'ppp-'.$network.'-share-image', true );
 
-	if ( isset( $thumb_url[0] ) && ! empty( $thumb_url[0] ) && !strpos( $thumb_url[0], 'wp-includes/images/media/default.png' ) ) {
+	if (isset($thumb_url[0]) && ! empty($thumb_url[0]) && ! strpos( $thumb_url[0], 'wp-includes/images/media/default.png' )) {
 		return $thumb_url[0];
 	}
 

includes/EDD_SL_Plugin_Updater.php

Spacing +54 added lines, -54 removed lines

@@ -4,7 +4,7 @@ 
 //set_site_transient( 'update_plugins', null );
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' )) exit;
 
 /**
  * Allows plugins to use their own update API.
@@ -40,9 +40,9 @@ 
 		$this->name        = plugin_basename( $_plugin_file );
 		$this->slug        = basename( $_plugin_file, '.php' );
 		$this->version     = $_api_data['version'];
-		$this->wp_override = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false;
+		$this->wp_override = isset($_api_data['wp_override']) ? (bool) $_api_data['wp_override'] : false;
 
-		$edd_plugin_data[ $this->slug ] = $this->api_data;
+		$edd_plugin_data[$this->slug] = $this->api_data;
 
 		// Set up hooks.
 		$this->init();
@@ -60,8 +60,8 @@ 
 
 		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
 		add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
-		remove_action( 'after_plugin_row_' . $this->name, 'wp_plugin_update_row', 10, 2 );
-		add_action( 'after_plugin_row_' . $this->name, array( $this, 'show_update_notification' ), 10, 2 );
+		remove_action( 'after_plugin_row_'.$this->name, 'wp_plugin_update_row', 10, 2 );
+		add_action( 'after_plugin_row_'.$this->name, array( $this, 'show_update_notification' ), 10, 2 );
 		add_action( 'admin_init', array( $this, 'show_changelog' ) );
 
 	}
@@ -83,30 +83,30 @@ 
 
 		global $pagenow;
 
-		if ( ! is_object( $_transient_data ) ) {
+		if ( ! is_object( $_transient_data )) {
 			$_transient_data = new stdClass;
 		}
 
-		if ( 'plugins.php' == $pagenow && is_multisite() ) {
+		if ('plugins.php' == $pagenow && is_multisite()) {
 			return $_transient_data;
 		}
 
-		if ( ! empty( $_transient_data->response ) && ! empty( $_transient_data->response[ $this->name ] ) && false === $this->wp_override ) {
+		if ( ! empty($_transient_data->response) && ! empty($_transient_data->response[$this->name]) && false === $this->wp_override) {
 			return $_transient_data;
 		}
 
 		$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
 
-		if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
+		if (false !== $version_info && is_object( $version_info ) && isset($version_info->new_version)) {
 
-			if ( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+			if (version_compare( $this->version, $version_info->new_version, '<' )) {
 
-				$_transient_data->response[ $this->name ] = $version_info;
+				$_transient_data->response[$this->name] = $version_info;
 
 			}
 
 			$_transient_data->last_checked           = time();
-			$_transient_data->checked[ $this->name ] = $this->version;
+			$_transient_data->checked[$this->name] = $this->version;
 
 		}
 
@@ -121,15 +121,15 @@ 
 	 */
 	public function show_update_notification( $file, $plugin ) {
 
-		if( ! current_user_can( 'update_plugins' ) ) {
+		if ( ! current_user_can( 'update_plugins' )) {
 			return;
 		}
 
-		if( ! is_multisite() ) {
+		if ( ! is_multisite()) {
 			return;
 		}
 
-		if ( $this->name != $file ) {
+		if ($this->name != $file) {
 			return;
 		}
 
@@ -140,55 +140,55 @@ 
 
 		$update_cache = is_object( $update_cache ) ? $update_cache : new stdClass();
 
-		if ( empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) {
+		if (empty($update_cache->response) || empty($update_cache->response[$this->name])) {
 
-			$cache_key    = md5( 'edd_plugin_' . sanitize_key( $this->name ) . '_version_info' );
+			$cache_key    = md5( 'edd_plugin_'.sanitize_key( $this->name ).'_version_info' );
 			$version_info = get_transient( $cache_key );
 
-			if( false === $version_info ) {
+			if (false === $version_info) {
 
 				$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
 
 				set_transient( $cache_key, $version_info, 3600 );
 			}
 
-			if( ! is_object( $version_info ) ) {
+			if ( ! is_object( $version_info )) {
 				return;
 			}
 
-			if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+			if (version_compare( $this->version, $version_info->new_version, '<' )) {
 
-				$update_cache->response[ $this->name ] = $version_info;
+				$update_cache->response[$this->name] = $version_info;
 
 			}
 
 			$update_cache->last_checked = time();
-			$update_cache->checked[ $this->name ] = $this->version;
+			$update_cache->checked[$this->name] = $this->version;
 
 			set_site_transient( 'update_plugins', $update_cache );
 
 		} else {
 
-			$version_info = $update_cache->response[ $this->name ];
+			$version_info = $update_cache->response[$this->name];
 
 		}
 
 		// Restore our filter
 		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
 
-		if ( ! empty( $update_cache->response[ $this->name ] ) && version_compare( $this->version, $version_info->new_version, '<' ) ) {
+		if ( ! empty($update_cache->response[$this->name]) && version_compare( $this->version, $version_info->new_version, '<' )) {
 
 			// build a plugin list row, with update notification
 			$wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
-			echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
+			echo '<tr class="plugin-update-tr"><td colspan="'.$wp_list_table->get_column_count().'" class="plugin-update colspanchange"><div class="update-message">';
 
-			$changelog_link = self_admin_url( 'index.php?edd_sl_action=view_plugin_changelog&plugin=' . $this->name . '&slug=' . $this->slug . '&TB_iframe=true&width=772&height=911' );
+			$changelog_link = self_admin_url( 'index.php?edd_sl_action=view_plugin_changelog&plugin='.$this->name.'&slug='.$this->slug.'&TB_iframe=true&width=772&height=911' );
 
-			if ( empty( $version_info->download_link ) ) {
+			if (empty($version_info->download_link)) {
 				printf(
 					__( 'There is a new version of %1$s available. %2$sView version %3$s details%4$s.', 'easy-digital-downloads' ),
 					esc_html( $version_info->name ),
-					'<a target="_blank" class="thickbox" href="' . esc_url( $changelog_link ) . '">',
+					'<a target="_blank" class="thickbox" href="'.esc_url( $changelog_link ).'">',
 					esc_html( $version_info->new_version ),
 					'</a>'
 				);
@@ -196,10 +196,10 @@ 
 				printf(
 					__( 'There is a new version of %1$s available. %2$sView version %3$s details%4$s or %5$supdate now%6$s.', 'easy-digital-downloads' ),
 					esc_html( $version_info->name ),
-					'<a target="_blank" class="thickbox" href="' . esc_url( $changelog_link ) . '">',
+					'<a target="_blank" class="thickbox" href="'.esc_url( $changelog_link ).'">',
 					esc_html( $version_info->new_version ),
 					'</a>',
-					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) .'">',
+					'<a href="'.esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ).$this->name, 'upgrade-plugin_'.$this->name ) ).'">',
 					'</a>'
 				);
 			}
@@ -224,13 +224,13 @@ 
 	public function plugins_api_filter( $_data, $_action = '', $_args = null ) {
 
 
-		if ( $_action != 'plugin_information' ) {
+		if ($_action != 'plugin_information') {
 
 			return $_data;
 
 		}
 
-		if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
+		if ( ! isset($_args->slug) || ($_args->slug != $this->slug)) {
 
 			return $_data;
 
@@ -247,7 +247,7 @@ 
 
 		$api_response = $this->api_request( 'plugin_information', $to_send );
 
-		if ( false !== $api_response ) {
+		if (false !== $api_response) {
 			$_data = $api_response;
 		}
 
@@ -264,7 +264,7 @@ 
 	 */
 	public function http_request_args( $args, $url ) {
 		// If it is an https request and we are performing a package download, disable ssl verification
-		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
+		if (strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' )) {
 			$args['sslverify'] = false;
 		}
 		return $args;
@@ -287,19 +287,19 @@ 
 
 		$data = array_merge( $this->api_data, $_data );
 
-		if ( $data['slug'] != $this->slug ) {
+		if ($data['slug'] != $this->slug) {
 			return;
 		}
 
-		if( $this->api_url == trailingslashit (home_url() ) ) {
+		if ($this->api_url == trailingslashit( home_url() )) {
 			return false; // Don't allow a plugin to ping itself
 		}
 
 		$api_params = array(
 			'edd_action' => 'get_version',
-			'license'    => ! empty( $data['license'] ) ? $data['license'] : '',
-			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
-			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
+			'license'    => ! empty($data['license']) ? $data['license'] : '',
+			'item_name'  => isset($data['item_name']) ? $data['item_name'] : false,
+			'item_id'    => isset($data['item_id']) ? $data['item_id'] : false,
 			'slug'       => $data['slug'],
 			'author'     => $data['author'],
 			'url'        => home_url()
@@ -307,11 +307,11 @@ 
 
 		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
 
-		if ( ! is_wp_error( $request ) ) {
+		if ( ! is_wp_error( $request )) {
 			$request = json_decode( wp_remote_retrieve_body( $request ) );
 		}
 
-		if ( $request && isset( $request->sections ) ) {
+		if ($request && isset($request->sections)) {
 			$request->sections = maybe_unserialize( $request->sections );
 		} else {
 			$request = false;
@@ -324,32 +324,32 @@ 
 
 		global $edd_plugin_data;
 
-		if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
+		if (empty($_REQUEST['edd_sl_action']) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action']) {
 			return;
 		}
 
-		if( empty( $_REQUEST['plugin'] ) ) {
+		if (empty($_REQUEST['plugin'])) {
 			return;
 		}
 
-		if( empty( $_REQUEST['slug'] ) ) {
+		if (empty($_REQUEST['slug'])) {
 			return;
 		}
 
-		if( ! current_user_can( 'update_plugins' ) ) {
+		if ( ! current_user_can( 'update_plugins' )) {
 			wp_die( __( 'You do not have permission to install plugin updates', 'easy-digital-downloads' ), __( 'Error', 'easy-digital-downloads' ), array( 'response' => 403 ) );
 		}
 
-		$data         = $edd_plugin_data[ $_REQUEST['slug'] ];
-		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_version_info' );
+		$data         = $edd_plugin_data[$_REQUEST['slug']];
+		$cache_key    = md5( 'edd_plugin_'.sanitize_key( $_REQUEST['plugin'] ).'_version_info' );
 		$version_info = get_transient( $cache_key );
 
-		if( false === $version_info ) {
+		if (false === $version_info) {
 
 			$api_params = array(
 				'edd_action' => 'get_version',
-				'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
-				'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
+				'item_name'  => isset($data['item_name']) ? $data['item_name'] : false,
+				'item_id'    => isset($data['item_id']) ? $data['item_id'] : false,
 				'slug'       => $_REQUEST['slug'],
 				'author'     => $data['author'],
 				'url'        => home_url()
@@ -357,11 +357,11 @@ 
 
 			$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
 
-			if ( ! is_wp_error( $request ) ) {
+			if ( ! is_wp_error( $request )) {
 				$version_info = json_decode( wp_remote_retrieve_body( $request ) );
 			}
 
-			if ( ! empty( $version_info ) && isset( $version_info->sections ) ) {
+			if ( ! empty($version_info) && isset($version_info->sections)) {
 				$version_info->sections = maybe_unserialize( $version_info->sections );
 			} else {
 				$version_info = false;
@@ -371,8 +371,8 @@ 
 
 		}
 
-		if( ! empty( $version_info ) && isset( $version_info->sections['changelog'] ) ) {
-			echo '<div style="background:#fff;padding:10px;">' . $version_info->sections['changelog'] . '</div>';
+		if ( ! empty($version_info) && isset($version_info->sections['changelog'])) {
+			echo '<div style="background:#fff;padding:10px;">'.$version_info->sections['changelog'].'</div>';
 		}
 
 		exit;

Braces +3 added lines, -1 removed lines

@@ -4,7 +4,9 @@
 //set_site_transient( 'update_plugins', null );
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Allows plugins to use their own update API.