postpromoterpro / post-promoter-pro

includes/libs/twitter-user.php

Spacing +23 added lines, -23 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly
-if ( !defined( 'ABSPATH' ) ) {
+if ( ! defined( 'ABSPATH' )) {
 	exit;
 }
 
@@ -11,7 +11,7 @@ 
  * Handles all twitter functions
  *
  */
-if( !class_exists( 'PPP_Twitter_User' ) ) {
+if ( ! class_exists( 'PPP_Twitter_User' )) {
 
 	class PPP_Twitter_User {
 
@@ -19,7 +19,7 @@ 
 			ppp_maybe_start_session();
 			$this->user_id = $_user_id;
 
-			if ( ! empty( $this->user_id ) ) {
+			if ( ! empty($this->user_id)) {
 				$this->verify_credentials();
 			}
 		}
@@ -30,13 +30,13 @@ 
 		 * Handles to load twitter class
 		 */
 		public function load() {
-				if( !class_exists( 'TwitterOAuth' ) ) {
-					require_once ( PPP_PATH . '/includes/libs/twitter/twitteroauth.php' );
+				if ( ! class_exists( 'TwitterOAuth' )) {
+					require_once (PPP_PATH.'/includes/libs/twitter/twitteroauth.php');
 				}
 
 				ppp_set_social_tokens();
 
-				if ( ! defined( 'PPP_TW_CONSUMER_KEY' ) || ! defined( 'PPP_TW_CONSUMER_SECRET' ) ) {
+				if ( ! defined( 'PPP_TW_CONSUMER_KEY' ) || ! defined( 'PPP_TW_CONSUMER_SECRET' )) {
 					return false;
 				}
 
@@ -56,7 +56,7 @@ 
 		public function init() {
 
 			//when user is going to logged in in twitter and verified successfully session will create
-			if ( isset( $_REQUEST['oauth_verifier'] ) ) {
+			if (isset($_REQUEST['oauth_verifier'])) {
 
 				//load twitter class
 				$twitter       = $this->load();
@@ -67,13 +67,13 @@ 
 
 				//session for verifier
 				$verifier['oauth_verifier']       = $_REQUEST['oauth_verifier'];
-				$_SESSION[ 'ppp_twt_user_cache' ] = $verifier;
+				$_SESSION['ppp_twt_user_cache'] = $verifier;
 
 				//getting user data from twitter
 				$response = $this->twitter->get( 'account/verify_credentials' );
 
 				//if user data get successfully
-				if ( $response->id_str ) {
+				if ($response->id_str) {
 					$data['user'] = $response;
 					$data['user']->accessToken = $ppp_tw_access_token;
 
@@ -86,7 +86,7 @@ 
 			$this->load();
 
 			$user_settings = get_user_meta( $this->user_id, '_ppp_twitter_data', true );
-			if ( ! empty( $user_settings ) ) {
+			if ( ! empty($user_settings)) {
 
 				$this->twitter = new TwitterOAuth(
 					PPP_TW_CONSUMER_KEY,
@@ -95,10 +95,10 @@ 
 					$user_settings['user']->accessToken['oauth_token_secret']
 				);
 
-				$response = $this->twitter->get('account/verify_credentials');
-				if ( is_object( $response ) && property_exists( $response, 'errors' ) && count( $response->errors ) > 0 ) {
-					foreach ( $response->errors as $error ) {
-						if ( $error->code == 89 ) { // Expired or revoked tokens
+				$response = $this->twitter->get( 'account/verify_credentials' );
+				if (is_object( $response ) && property_exists( $response, 'errors' ) && count( $response->errors ) > 0) {
+					foreach ($response->errors as $error) {
+						if ($error->code == 89) { // Expired or revoked tokens
 
 							$this->revoke_access();
 
@@ -115,9 +115,9 @@ 
 		 * Get auth url for twitter
 		 *
 		 */
-		public function get_auth_url ( $return_url = '' ) {
+		public function get_auth_url( $return_url = '' ) {
 
-			if ( empty( $return_url ) ) {
+			if (empty($return_url)) {
 				$return_url = admin_url( 'admin.php?page=ppp-social-settings' );
 			}
 
@@ -126,7 +126,7 @@ 
 			$request_token = $this->twitter->getRequestToken( 'oob' );
 
 			// If last connection failed don't display authorization link.
-			switch( $this->twitter->http_code ) {
+			switch ($this->twitter->http_code) {
 				case 200:
 					$_SESSION['ppp_user_twt_oauth_token']        = $request_token['oauth_token'];
 					$_SESSION['ppp_user_twt_oauth_token_secret'] = $request_token['oauth_token_secret'];
@@ -143,14 +143,14 @@ 
 		}
 
 		public function send_tweet( $message = '', $media = null ) {
-			if ( empty( $message ) ) {
+			if (empty($message)) {
 				return false;
 			}
 
 			$verify = $this->verify_credentials();
-			if ( $verify === true ) {
+			if ($verify === true) {
 				$args = array();
-				if ( ! empty( $media ) ) {
+				if ( ! empty($media)) {
 					$endpoint = 'statuses/update_with_media';
 					$args['media[]'] = wp_remote_retrieve_body( wp_remote_get( $media ) );
 				} else {
@@ -165,13 +165,13 @@ 
 		}
 
 		public function retweet( $tweet_id ) {
-			if ( empty( $tweet_id ) ) {
+			if (empty($tweet_id)) {
 				return false;
 			}
 
 			$verify = $this->verify_credentials();
-			if ( $verify === true ) {
-				$endpoint = 'statuses/retweet/' . $tweet_id;
+			if ($verify === true) {
+				$endpoint = 'statuses/retweet/'.$tweet_id;
 
 				return $this->twitter->post( $endpoint, array(), true );
 			} else {

includes/twitter-functions.php

Spacing +143 added lines, -143 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,17 +83,17 @@ 
  */
 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 .= '<span id="tw-oob-auth-link-wrapper"><a id="tw-oob-auth-link" href="' . $tw_authurl . '" target="_blank"><img src="' . PPP_URL . '/includes/images/sign-in-with-twitter-gray.png" /></a></span>';
-		$string .= '<span style="display:none;" id="tw-oob-pin-notice">' . __( 'You are being directed to Twitter to authenticate. When complete, return here and enter the PIN you were provided.', 'ppp-txt' ) . '</span>';
-		$string .= '<span style="display:none;" id="tw-oob-pin-wrapper"><input type="text" size="10" placeholder="Enter your PIN" value="" id="tw-oob-pin" data-nonce="' . wp_create_nonce( 'ppp-tw-pin' ) . '" data-user="0" /> <a href="#" class="button-secondary tw-oob-pin-submit">' . __( 'Submit', 'ppp-txt' ) . '</a><span class="spinner"></span></span>';
+		$string .= '<span id="tw-oob-auth-link-wrapper"><a id="tw-oob-auth-link" href="'.$tw_authurl.'" target="_blank"><img src="'.PPP_URL.'/includes/images/sign-in-with-twitter-gray.png" /></a></span>';
+		$string .= '<span style="display:none;" id="tw-oob-pin-notice">'.__( 'You are being directed to Twitter to authenticate. When complete, return here and enter the PIN you were provided.', 'ppp-txt' ).'</span>';
+		$string .= '<span style="display:none;" id="tw-oob-pin-wrapper"><input type="text" size="10" placeholder="Enter your PIN" value="" id="tw-oob-pin" data-nonce="'.wp_create_nonce( 'ppp-tw-pin' ).'" data-user="0" /> <a href="#" class="button-secondary tw-oob-pin-submit">'.__( 'Submit', 'ppp-txt' ).'</a><span class="spinner"></span></span>';
 	} 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;
@@ -106,27 +106,27 @@ 
 
 	ppp_set_social_tokens();
 
-	$nonce = isset( $_POST['nonce'] ) ? sanitize_text_field( $_POST['nonce'] ) : '';
+	$nonce = isset($_POST['nonce']) ? sanitize_text_field( $_POST['nonce'] ) : '';
 	$nonce_verified = wp_verify_nonce( $nonce, 'ppp-tw-pin' );
 
-	if ( ! $nonce_verified ) {
+	if ( ! $nonce_verified) {
 		wp_die();
 	}
 
-	$pin = isset( $_POST['pin'] ) ? absint( $_POST['pin'] ) : false;
+	$pin = isset($_POST['pin']) ? absint( $_POST['pin'] ) : false;
 
-	if ( empty( $pin ) ) {
+	if (empty($pin)) {
 		wp_die();
 	}
 
 	$_REQUEST['oauth_verifier'] = $pin;
 
-	if ( empty( $_POST['user_auth'] ) ) {
+	if (empty($_POST['user_auth'])) {
 		$twitter = new PPP_Twitter;
 		$twitter->ppp_initialize_twitter();
 		$settings = get_option( 'ppp_social_settings', true );
 
-		if ( ! empty( $settings['twitter']['user']->id ) ) {
+		if ( ! empty($settings['twitter']['user']->id)) {
 			echo 1;
 		} else {
 			echo 0;
@@ -136,7 +136,7 @@ 
 		$twitter->init();
 
 		$user = get_user_meta( get_current_user_id(), '_ppp_twitter_data', true );
-		if ( ! empty( $user['user']->id ) ) {
+		if ( ! empty($user['user']->id)) {
 			echo 1;
 		} else {
 			echo 0;
@@ -152,13 +152,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();
@@ -176,17 +176,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( PostPromoterPro::get_manage_capability() ) ) {
+		if ($user_id !== get_current_user_id() || ! current_user_can( PostPromoterPro::get_manage_capability() )) {
 			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 );
 		}
 	}
@@ -217,12 +217,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 );
@@ -249,12 +249,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 );
 		}
@@ -275,8 +275,8 @@ 
 		);
 		$other_rt = get_users( $args );
 
-		if ( $other_rt ){
-			foreach ( $other_rt as $user ) {
+		if ($other_rt) {
+			foreach ($other_rt as $user) {
 				$twitter_user = new PPP_Twitter_User( $user->ID );
 				$twitter_user->retweet( $status->id_str );
 			}
@@ -296,9 +296,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, $scheduled );
 
-	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 );
@@ -312,22 +312,22 @@ 
  */
 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 ( ! empty( $ppp_tweets ) ) {
+	if ( ! empty($ppp_tweets)) {
 		$name_array    = explode( '_', $name );
 		$index         = $name_array[1];
-		if ( isset( $ppp_tweets[ $index ] ) ) {
-			$share_content = $ppp_tweets[ $index ]['text'];
+		if (isset($ppp_tweets[$index])) {
+			$share_content = $ppp_tweets[$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', $share_content, array( 'post_id' => $post_id ) );
 }
@@ -339,12 +339,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;
 }
@@ -355,7 +355,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 );
 	}
@@ -393,7 +393,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;
 	}
 
@@ -410,7 +410,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;
 	}
 
@@ -469,16 +469,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 ); ?>
@@ -487,7 +487,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'          => '',
@@ -510,7 +510,7 @@ 
 								<tr class="ppp-add-repeatable-wrapper">
 									<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>
@@ -536,38 +536,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['share_on_publish'][ $post->post_type ]['twitter'] ) ? false : true;
+	$share_by_default      = empty($ppp_share_settings['share_on_publish'][$post->post_type]['twitter']) ? 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>
-			<textarea <?php if ( $disabled ): ?>readonly<?php endif; ?> class="ppp-tweet-text-repeatable" type="text" name="_ppp_share_on_publish_text"><?php echo esc_attr( $ppp_share_on_publish_text ); ?></textarea>
-			<?php $length = ! empty( $ppp_share_on_publish_text ) ? strlen( $ppp_share_on_publish_text ) : 0; ?>
+			<textarea <?php if ($disabled): ?>readonly<?php endif; ?> class="ppp-tweet-text-repeatable" type="text" name="_ppp_share_on_publish_text"><?php echo esc_attr( $ppp_share_on_publish_text ); ?></textarea>
+			<?php $length = ! empty($ppp_share_on_publish_text) ? strlen( $ppp_share_on_publish_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>
 
@@ -586,7 +586,7 @@ 
 function ppp_render_tweet_row( $key, $args = array(), $post_id ) {
 	global $post, $has_past_shares;
 
-	if ( ! empty( $args['date'] ) && ! empty( $args['time'] ) ) {
+	if ( ! empty($args['date']) && ! empty($args['time'])) {
 		$share_time = ppp_generate_timestamp( $args['date'], $args['time'] );
 		$readonly   = ppp_generate_timestamp() > $share_time ? 'readonly="readonly" ' : false;
 	} else {
@@ -594,11 +594,11 @@ 
 		$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++;
 	}
 	?>
@@ -613,7 +613,7 @@ 
 
 		<td>
 			<textarea class="ppp-tweet-text-repeatable" type="text" name="_ppp_tweets[<?php echo $key; ?>][text]" <?php echo $readonly; ?>><?php echo esc_attr( $args['text'] ); ?></textarea>
-			<?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>
 
@@ -648,24 +648,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 );
 
@@ -682,29 +682,29 @@ 
 function ppp_tw_share_on_publish( $new_status, $old_status, $post ) {
 	global $ppp_options;
 
-	$from_meta = ! empty( $_POST['ppp_post_edit'] ) ? false : get_post_meta( $post->ID, '_ppp_share_on_publish', true );
-	$from_post = isset( $_POST['_ppp_share_on_publish'] );
+	$from_meta = ! empty($_POST['ppp_post_edit']) ? false : get_post_meta( $post->ID, '_ppp_share_on_publish', true );
+	$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 );
 
@@ -722,11 +722,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 );
 		}
@@ -747,8 +747,8 @@ 
 		);
 		$other_rt = get_users( $args );
 
-		if ( $other_rt ){
-			foreach ( $other_rt as $user ) {
+		if ($other_rt) {
+			foreach ($other_rt as $user) {
 				$twitter_user = new PPP_Twitter_User( $user->ID );
 				$twitter_user->retweet( $status->id_str );
 			}
@@ -769,20 +769,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';
 		}
 
 	}
@@ -802,7 +802,7 @@ 
 
 	$ret = false;
 
-	if ( ! empty( $ppp_share_settings['twitter']['cards_enabled'] ) ) {
+	if ( ! empty($ppp_share_settings['twitter']['cards_enabled'])) {
 		$ret = true;
 	}
 
@@ -817,13 +817,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;
 	}
 
@@ -841,20 +841,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 );
@@ -874,15 +874,15 @@ 
 	$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;
 
 		$thumb_id = ppp_get_attachment_id_from_image_url( $image_url );
-		if ( ! empty( $thumb_id ) ) {
+		if ( ! empty($thumb_id)) {
 			$alt_text = ppp_get_attachment_alt_text( $thumb_id );
 			// When adding media via the WP Uploader, any 'alt text' supplied will be used as the accessible alt text.
-			if ( ! empty( $alt_text ) ) {
+			if ( ! empty($alt_text)) {
 				$elements['twitter:image:alt'] = esc_attr( $alt_text );
 			}
 		}
@@ -890,15 +890,15 @@ 
 		$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 ) );
@@ -917,13 +917,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->post_content );
 	}
 
@@ -941,10 +941,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;
@@ -959,7 +959,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
@@ -978,15 +978,15 @@ 
 function ppp_tw_profile_settings( $user ) {
 	global $ppp_social_settings;
 
-	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( PostPromoterPro::get_manage_capability() ) ) {
+	if ($user->ID !== get_current_user_id() && ! current_user_can( PostPromoterPro::get_manage_capability() )) {
 		return;
 	}
 
-	if ( ! isset( $ppp_social_settings['twitter'] ) || is_null( $ppp_social_settings['twitter'] ) ) {
+	if ( ! isset($ppp_social_settings['twitter']) || is_null( $ppp_social_settings['twitter'] )) {
 		return;
 	}
 
@@ -1001,12 +1001,12 @@ 
 			$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 ) );
 
-				$string  = '<span id="tw-oob-auth-link-wrapper"><a id="tw-oob-auth-link" href="' . $tw_authurl . '" target="_blank"><img src="' . PPP_URL . '/includes/images/sign-in-with-twitter-gray.png" /></a></span>';
-				$string .= '<span style="display:none;" id="tw-oob-pin-notice">' . __( 'You are being directed to Twitter to authenticate. When complete, return here and enter the PIN you were provided.', 'ppp-txt' ) . '</span>';
-				$string .= '<span style="display:none;" id="tw-oob-pin-wrapper"><input type="text" size="10" placeholder="Enter your PIN" value="" id="tw-oob-pin" data-nonce="' . wp_create_nonce( 'ppp-tw-pin' ) . '" data-user="1" /> <a href="#" class="button-secondary tw-oob-pin-submit">' . __( 'Submit', 'ppp-txt' ) . '</a><span class="spinner"></span></span>';
+				$string  = '<span id="tw-oob-auth-link-wrapper"><a id="tw-oob-auth-link" href="'.$tw_authurl.'" target="_blank"><img src="'.PPP_URL.'/includes/images/sign-in-with-twitter-gray.png" /></a></span>';
+				$string .= '<span style="display:none;" id="tw-oob-pin-notice">'.__( 'You are being directed to Twitter to authenticate. When complete, return here and enter the PIN you were provided.', 'ppp-txt' ).'</span>';
+				$string .= '<span style="display:none;" id="tw-oob-pin-wrapper"><input type="text" size="10" placeholder="Enter your PIN" value="" id="tw-oob-pin" data-nonce="'.wp_create_nonce( 'ppp-tw-pin' ).'" data-user="1" /> <a href="#" class="button-secondary tw-oob-pin-submit">'.__( 'Submit', 'ppp-txt' ).'</a><span class="spinner"></span></span>';
 				$string .= '<input type="hidden" name="ppp_user_auth" value="1" />';
 
 				echo $string;
@@ -1015,7 +1015,7 @@ 
 				?>
 				<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
@@ -1024,12 +1024,12 @@ 
 			</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 );
 			$share_others_on_publish 	= get_user_meta( $user->ID, '_ppp_share_others_on_publish', true );
-			$share_others_scheduled  	= get_user_meta( $user->ID, '_ppp_share_others_scheduled' , true );
+			$share_others_scheduled  	= get_user_meta( $user->ID, '_ppp_share_others_scheduled', true );
 		?>
 		<tr>
 			<th><?php _e( 'Sharing Options', 'ppp-txt' ); ?></th>
@@ -1077,19 +1077,19 @@ 
 function ppp_tw_save_profile( $user_id ) {
 	global $ppp_social_settings;
 
-	if ( ! isset( $ppp_social_settings['twitter'] ) || is_null( $ppp_social_settings['twitter'] ) ) {
+	if ( ! isset($ppp_social_settings['twitter']) || is_null( $ppp_social_settings['twitter'] )) {
 		return;
 	}
 
-	$share_on_publish 			= ! empty( $_POST['share_on_publish'] ) ? true : false;
-	$share_scheduled  			= ! empty( $_POST['share_scheduled'] )  ? true : false;
-	$share_others_on_publish 	= ! empty( $_POST['share_others_on_publish'] ) ? true : false;
-	$share_others_scheduled  	= ! empty( $_POST['share_others_scheduled'] )  ? true : false;
+	$share_on_publish 			= ! empty($_POST['share_on_publish']) ? true : false;
+	$share_scheduled  			= ! empty($_POST['share_scheduled']) ? true : false;
+	$share_others_on_publish 	= ! empty($_POST['share_others_on_publish']) ? true : false;
+	$share_others_scheduled  	= ! empty($_POST['share_others_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 );
 	update_user_meta( $user_id, '_ppp_share_others_on_publish', $share_others_on_publish );
-	update_user_meta( $user_id, '_ppp_share_others_scheduled', $share_others_scheduled  );
+	update_user_meta( $user_id, '_ppp_share_others_scheduled', $share_others_scheduled );
 
 }
 add_action( 'personal_options_update', 'ppp_tw_save_profile' );
@@ -1098,14 +1098,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,
 		);
 	}
@@ -1116,9 +1116,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;