postpromoterpro / post-promoter-pro

includes/EDD_SL_Plugin_Updater.php

Doc Comments +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 	 * @uses api_request()
 	 *
 	 * @param array   $_transient_data Update array build by WordPress.
-	 * @return array Modified update array with custom plugin data.
+	 * @return stdClass Modified update array with custom plugin data.
 	 */
 	public function check_update( $_transient_data ) {
 

Braces +3 added lines, -1 removed lines

@@ -1,7 +1,9 @@
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Allows plugins to use their own update API.

Spacing +77 added lines, -77 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' )) exit;
 
 /**
  * Allows plugins to use their own update API.
@@ -38,11 +38,11 @@ 
 		$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->beta        = ! empty( $this->api_data['beta'] ) ? true : false;
-		$this->cache_key   = md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
+		$this->wp_override = isset($_api_data['wp_override']) ? (bool) $_api_data['wp_override'] : false;
+		$this->beta        = ! empty($this->api_data['beta']) ? true : false;
+		$this->cache_key   = md5( serialize( $this->slug.$this->api_data['license'].$this->beta ) );
 
-		$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 );
-		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 );
+		add_action( 'after_plugin_row_'.$this->name, array( $this, 'show_update_notification' ), 10, 2 );
 		add_action( 'admin_init', array( $this, 'show_changelog' ) );
 
 	}
@@ -83,37 +83,37 @@ 
 
 		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->get_cached_version_info();
 
-		if ( false === $version_info ) {
+		if (false === $version_info) {
 			$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug, 'beta' => $this->beta ) );
 
 			$this->set_version_info_cache( $version_info );
 
 		}
 
-		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           = current_time( 'timestamp' );
-			$_transient_data->checked[ $this->name ] = $this->version;
+			$_transient_data->checked[$this->name] = $this->version;
 
 		}
 
@@ -128,19 +128,19 @@ 
 	 */
 	public function show_update_notification( $file, $plugin ) {
 
-		if ( is_network_admin() ) {
+		if (is_network_admin()) {
 			return;
 		}
 
-		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;
 		}
 
@@ -151,56 +151,56 @@ 
 
 		$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])) {
 
 			$version_info = $this->get_cached_version_info();
 
-			if ( false === $version_info ) {
+			if (false === $version_info) {
 				$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug, 'beta' => $this->beta ) );
 
 				$this->set_version_info_cache( $version_info );
 			}
 
-			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 = current_time( 'timestamp' );
-			$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' );
 			# <tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange">
-			echo '<tr class="plugin-update-tr" id="' . $this->slug . '-update" data-slug="' . $this->slug . '" data-plugin="' . $this->slug . '/' . $file . '">';
+			echo '<tr class="plugin-update-tr" id="'.$this->slug.'-update" data-slug="'.$this->slug.'" data-plugin="'.$this->slug.'/'.$file.'">';
 			echo '<td colspan="3" class="plugin-update colspanchange">';
 			echo '<div class="update-message notice inline notice-warning notice-alt">';
 
-			$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>'
 				);
@@ -208,10 +208,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>'
 				);
 			}
@@ -234,13 +234,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;
 
@@ -255,20 +255,20 @@ 
 			)
 		);
 
-		$cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
+		$cache_key = 'edd_api_request_'.md5( serialize( $this->slug.$this->api_data['license'].$this->beta ) );
 
 		// Get the transient where we store the api request for this plugin for 24 hours
 		$edd_api_request_transient = $this->get_cached_version_info( $cache_key );
 
 		//If we have no transient-saved value, run the API, set a fresh transient with the API value, and return that value too right now.
-		if ( empty( $edd_api_request_transient ) ) {
+		if (empty($edd_api_request_transient)) {
 
 			$api_response = $this->api_request( 'plugin_information', $to_send );
 
 			// Expires in 3 hours
 			$this->set_version_info_cache( $api_response, $cache_key );
 
-			if ( false !== $api_response ) {
+			if (false !== $api_response) {
 				$_data = $api_response;
 			}
 
@@ -277,20 +277,20 @@ 
 		}
 
 		// Convert sections into an associative array, since we're getting an object, but Core expects an array.
-		if ( isset( $_data->sections ) && ! is_array( $_data->sections ) ) {
+		if (isset($_data->sections) && ! is_array( $_data->sections )) {
 			$new_sections = array();
-			foreach ( $_data->sections as $key => $key ) {
-				$new_sections[ $key ] = $key;
+			foreach ($_data->sections as $key => $key) {
+				$new_sections[$key] = $key;
 			}
 
 			$_data->sections = $new_sections;
 		}
 
 		// Convert banners into an associative array, since we're getting an object, but Core expects an array.
-		if ( isset( $_data->banners ) && ! is_array( $_data->banners ) ) {
+		if (isset($_data->banners) && ! is_array( $_data->banners )) {
 			$new_banners = array();
-			foreach ( $_data->banners as $key => $key ) {
-				$new_banners[ $key ] = $key;
+			foreach ($_data->banners as $key => $key) {
+				$new_banners[$key] = $key;
 			}
 
 			$_data->banners = $new_banners;
@@ -308,7 +308,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;
@@ -331,44 +331,44 @@ 
 
 		$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,
-			'version'    => isset( $data['version'] ) ? $data['version'] : 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,
+			'version'    => isset($data['version']) ? $data['version'] : false,
 			'slug'       => $data['slug'],
 			'author'     => $data['author'],
 			'url'        => home_url(),
-			'beta'       => ! empty( $data['beta'] ),
+			'beta'       => ! empty($data['beta']),
 		);
 
 		$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;
 		}
 
-		if ( $request && isset( $request->banners ) ) {
+		if ($request && isset($request->banners)) {
 			$request->banners = maybe_unserialize( $request->banners );
 		}
 
-		if( ! empty( $request->sections ) ) {
-			foreach( $request->sections as $key => $section ) {
+		if ( ! empty($request->sections)) {
+			foreach ($request->sections as $key => $section) {
 				$request->$key = (array) $section;
 			}
 		}
@@ -380,54 +380,54 @@ 
 
 		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'] ];
-		$beta         = ! empty( $data['beta'] ) ? true : false;
-		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $beta . '_version_info' );
+		$data         = $edd_plugin_data[$_REQUEST['slug']];
+		$beta         = ! empty($data['beta']) ? true : false;
+		$cache_key    = md5( 'edd_plugin_'.sanitize_key( $_REQUEST['plugin'] ).'_'.$beta.'_version_info' );
 		$version_info = $this->get_cached_version_info( $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(),
-				'beta'       => ! empty( $data['beta'] )
+				'beta'       => ! empty($data['beta'])
 			);
 
 			$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;
 			}
 
-			if( ! empty( $version_info ) ) {
-				foreach( $version_info->sections as $key => $section ) {
+			if ( ! empty($version_info)) {
+				foreach ($version_info->sections as $key => $section) {
 					$version_info->$key = (array) $section;
 				}
 			}
@@ -436,8 +436,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;
@@ -445,13 +445,13 @@ 
 
 	public function get_cached_version_info( $cache_key = '' ) {
 
-		if( empty( $cache_key ) ) {
+		if (empty($cache_key)) {
 			$cache_key = $this->cache_key;
 		}
 
 		$cache = get_option( $cache_key );
 
-		if( empty( $cache['timeout'] ) || current_time( 'timestamp' ) > $cache['timeout'] ) {
+		if (empty($cache['timeout']) || current_time( 'timestamp' ) > $cache['timeout']) {
 			return false; // Cache is expired
 		}
 
@@ -461,7 +461,7 @@ 
 
 	public function set_version_info_cache( $value = '', $cache_key = '' ) {
 
-		if( empty( $cache_key ) ) {
+		if (empty($cache_key)) {
 			$cache_key = $this->cache_key;
 		}
 

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,19 +107,19 @@ 
 
 	$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 = apply_filters( 'ppp_utm_tags', $utm, $post_id, $name );
 
-	$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/libs/linkedin.php

Spacing +33 added lines, -33 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly
-if ( !defined( 'ABSPATH' ) ) {
+if ( ! defined( 'ABSPATH' )) {
 	exit;
 }
 
@@ -11,13 +11,13 @@ 
  * Handles all linkedin functions
  *
  */
-if( !class_exists( 'PPP_Linkedin' ) ) {
+if ( ! class_exists( 'PPP_Linkedin' )) {
 
 	class PPP_Linkedin {
 
 		var $linkedin;
 
-		public function __construct(){
+		public function __construct() {
 			ppp_maybe_start_session();
 		}
 
@@ -28,24 +28,24 @@ 
 		 */
 		public function ppp_load_linkedin() {
 
-				if( !class_exists( 'LinkedIn' ) ) {
-					require_once ( PPP_PATH . '/includes/libs/linkedin/linkedin_oAuth.php' );
+				if ( ! class_exists( 'LinkedIn' )) {
+					require_once (PPP_PATH.'/includes/libs/linkedin/linkedin_oAuth.php');
 				}
 
 
 				ppp_set_social_tokens();
 
-				if ( ! defined( 'LINKEDIN_KEY' ) || ! defined( 'LINKEDIN_SECRET' ) ) {
+				if ( ! defined( 'LINKEDIN_KEY' ) || ! defined( 'LINKEDIN_SECRET' )) {
 					return false;
 				}
 
 				global $ppp_social_settings;
 				$config = array( 'appKey' => LINKEDIN_KEY, 'appSecret' => LINKEDIN_SECRET );
-				if ( isset( $ppp_social_settings['linkedin']->access_token ) ) {
+				if (isset($ppp_social_settings['linkedin']->access_token)) {
 					$config['accessToken'] = $ppp_social_settings['linkedin']->access_token;
 				}
 
-				if ( !$this->linkedin ) {
+				if ( ! $this->linkedin) {
 					$this->linkedin = new LinkedIn( $config );
 				}
 
@@ -60,36 +60,36 @@ 
 			$linkedin = $this->ppp_load_linkedin();
 
 			//when user is going to logged in and verified successfully session will create
-			if ( isset( $_REQUEST['li_access_token'] ) && isset( $_REQUEST['expires_in'] ) ) {
+			if (isset($_REQUEST['li_access_token']) && isset($_REQUEST['expires_in'])) {
 
 				$access_token = $_REQUEST['li_access_token'];
 				$expires_in   = $_REQUEST['expires_in'];
 
-			} elseif ( isset( $_GET['state'] ) && strpos( $_GET['state'], 'ppp-local-keys-li' ) !== false ) {
-				$access_code = isset( $_GET['code'] ) ? $_GET['code'] : false;
+			} elseif (isset($_GET['state']) && strpos( $_GET['state'], 'ppp-local-keys-li' ) !== false) {
+				$access_code = isset($_GET['code']) ? $_GET['code'] : false;
 
-				if ( empty( $access_code ) ) {
+				if (empty($access_code)) {
 					return;
 				}
 
-				$params  = 'grant_type=authorization_code&client_id=' . LINKEDIN_KEY;
-				$params .= '&client_secret=' . LINKEDIN_SECRET;
-				$params .= '&code=' . $access_code;
-				$params .= '&redirect_uri=' . admin_url( 'admin.php?page=ppp-social-settings' );
-				$url = 'https://www.linkedin.com/uas/oauth2/accessToken?' . $params;
+				$params  = 'grant_type=authorization_code&client_id='.LINKEDIN_KEY;
+				$params .= '&client_secret='.LINKEDIN_SECRET;
+				$params .= '&code='.$access_code;
+				$params .= '&redirect_uri='.admin_url( 'admin.php?page=ppp-social-settings' );
+				$url = 'https://www.linkedin.com/uas/oauth2/accessToken?'.$params;
 				$response = json_decode( wp_remote_retrieve_body( wp_remote_post( $url ) ) );
 
-				$access_token = isset( $response->access_token ) ? $response->access_token : false;
-				$expires_in   = isset( $response->expires_in ) ? $response->expires_in : false;
+				$access_token = isset($response->access_token) ? $response->access_token : false;
+				$expires_in   = isset($response->expires_in) ? $response->expires_in : false;
 
 			}
 
-			if ( ! empty( $access_token ) && ! empty( $expires_in ) ) {
+			if ( ! empty($access_token) && ! empty($expires_in)) {
 				global $ppp_social_settings;
 				$ppp_social_settings = get_option( 'ppp_social_settings' );
 
 				//check linkedin class is loaded or not
-				if( !$linkedin ) {
+				if ( ! $linkedin) {
 					return false;
 				}
 
@@ -99,7 +99,7 @@ 
 				$expires_in = (int) $expires_in;
 				$data->expires_on = current_time( 'timestamp' ) + $expires_in;
 
-				update_option( '_ppp_linkedin_refresh', current_time( 'timestamp' ) + round( $expires_in/1.25 ) );
+				update_option( '_ppp_linkedin_refresh', current_time( 'timestamp' ) + round( $expires_in / 1.25 ) );
 
 				$ppp_social_settings['linkedin'] = $data;
 				update_option( 'ppp_social_settings', $ppp_social_settings );
@@ -112,7 +112,7 @@ 
 
 				update_option( 'ppp_social_settings', $ppp_social_settings );
 
-				$url = remove_query_arg( array( 'li_access_token' , 'expires_in' ) );
+				$url = remove_query_arg( array( 'li_access_token', 'expires_in' ) );
 				wp_redirect( $url );
 				die();
 			}
@@ -122,19 +122,19 @@ 
 		 * Get auth url for linkedin
 		 *
 		 */
-		public function ppp_get_linkedin_auth_url ( $return_url ) {
+		public function ppp_get_linkedin_auth_url( $return_url ) {
 
-			if ( ! PPP_LOCAL_TOKENS ) {
+			if ( ! PPP_LOCAL_TOKENS) {
 				$base_url = 'https://postpromoterpro.com/?ppp-social-auth';
-				$url  = $base_url . '&ppp-service=li&ppp-license-key=' . trim( get_option( '_ppp_license_key' ) );
+				$url  = $base_url.'&ppp-service=li&ppp-license-key='.trim( get_option( '_ppp_license_key' ) );
 				$url .= '&nocache';
-				$url .= '&return_url=' . esc_url( $return_url );
+				$url .= '&return_url='.esc_url( $return_url );
 			} else {
 				$url  = 'https://www.linkedin.com/uas/oauth2/authorization?response_type=code';
-				$url .= '&client_id=' . LINKEDIN_KEY;
+				$url .= '&client_id='.LINKEDIN_KEY;
 				$url .= '&scope=w_share%20r_basicprofile';
 				$url .= '&state=ppp-local-keys-li';
-				$url .= '&redirect_uri=' . $return_url;
+				$url .= '&redirect_uri='.$return_url;
 			}
 
 			return $url;
@@ -144,13 +144,13 @@ 
 		 * Share somethign on linkedin
 		 */
 		public function ppp_linkedin_share( $args ) {
-			if ( empty( $args ) ) {
+			if (empty($args)) {
 				return false;
 			}
 
 			$this->ppp_load_linkedin();
 			global $ppp_social_settings;
-			$url = 'https://api.linkedin.com/v1/people/~/shares?oauth2_access_token=' . $ppp_social_settings['linkedin']->access_token;
+			$url = 'https://api.linkedin.com/v1/people/~/shares?oauth2_access_token='.$ppp_social_settings['linkedin']->access_token;
 			$share = array(
 						'content' => array(
 							'title' => $args['title'],
@@ -162,7 +162,7 @@ 
 						)
 						);
 
-			if ( $args['submitted-image-url'] !== false ) {
+			if ($args['submitted-image-url'] !== false) {
 				$share['content']['submitted-image-url'] = $args['submitted-image-url'];
 			}
 
@@ -177,7 +177,7 @@ 
 
 			$this->ppp_load_linkedin();
 			global $ppp_social_settings;
-			$url = 'https://api.linkedin.com/v1/people/~?oauth2_access_token=' . $ppp_social_settings['linkedin']->access_token;
+			$url = 'https://api.linkedin.com/v1/people/~?oauth2_access_token='.$ppp_social_settings['linkedin']->access_token;
 
 			$headers = array( 'x-li-format' => 'json', 'Content-Type' => 'application/json' );
 

includes/libs/facebook.php

Spacing +58 added lines, -58 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly
-if ( !defined( 'ABSPATH' ) ) {
+if ( ! defined( 'ABSPATH' )) {
 	exit;
 }
 
@@ -11,13 +11,13 @@ 
  * Handles all facebook functions
  *
  */
-if( !class_exists( 'PPP_Facebook' ) ) {
+if ( ! class_exists( 'PPP_Facebook' )) {
 
 	class PPP_Facebook {
 
 		var $facebook;
 
-		public function __construct(){
+		public function __construct() {
 			ppp_maybe_start_session();
 		}
 
@@ -30,8 +30,8 @@ 
 		public function ppp_load_facebook() {
 
 
-			if( !class_exists( 'Facebook' ) ) {
-				require_once ( PPP_PATH . '/includes/libs/facebook/facebook.php' );
+			if ( ! class_exists( 'Facebook' )) {
+				require_once (PPP_PATH.'/includes/libs/facebook/facebook.php');
 			}
 
 			ppp_set_social_tokens();
@@ -40,7 +40,7 @@ 
 					'appId' => PPP_FB_APP_ID,
 					'secret' => PPP_FB_APP_SECRET,
 					'cookie' => true
-			));
+			) );
 
 			return true;
 
@@ -55,72 +55,72 @@ 
 			$facebook = $this->ppp_load_facebook();
 
 			//when user is going to logged in and verified successfully session will create
-			if ( isset( $_REQUEST['fb_access_token'] ) && isset( $_REQUEST['expires_in'] ) ) {
+			if (isset($_REQUEST['fb_access_token']) && isset($_REQUEST['expires_in'])) {
 
 				$access_token = $_REQUEST['fb_access_token'];
 				$expires_in   = $_REQUEST['expires_in'];
 
-			} elseif ( isset( $_GET['state'] ) && strpos( $_GET['state'], 'ppp-local-keys-fb' ) !== false ) {
-				$access_code = isset( $_GET['code'] ) ? $_GET['code'] : false;
+			} elseif (isset($_GET['state']) && strpos( $_GET['state'], 'ppp-local-keys-fb' ) !== false) {
+				$access_code = isset($_GET['code']) ? $_GET['code'] : false;
 
-				if ( empty( $access_code ) ) {
+				if (empty($access_code)) {
 					return;
 				}
 
-				$params  = '?client_id=' . PPP_FB_APP_ID;
-				$params .= '&client_secret=' . PPP_FB_APP_SECRET;
-				$params .= '&code=' . $access_code;
-				$params .= '&redirect_uri=' . admin_url( 'admin.php?page=ppp-social-settings' );
-				$url = 'https://graph.facebook.com/oauth/access_token' . $params;
+				$params  = '?client_id='.PPP_FB_APP_ID;
+				$params .= '&client_secret='.PPP_FB_APP_SECRET;
+				$params .= '&code='.$access_code;
+				$params .= '&redirect_uri='.admin_url( 'admin.php?page=ppp-social-settings' );
+				$url = 'https://graph.facebook.com/oauth/access_token'.$params;
 
 				$access_token = '';
 				$expires      = '';
 				parse_str( wp_remote_retrieve_body( wp_remote_post( $url ) ) );
 
-				$access_token = ! empty( $access_token ) ? $access_token : false;
-				$expires_in   = ! empty( $expires ) ? $expires : false;
+				$access_token = ! empty($access_token) ? $access_token : false;
+				$expires_in   = ! empty($expires) ? $expires : false;
 
 			}
 
-			if ( ! empty( $access_token ) ) {
+			if ( ! empty($access_token)) {
 				global $ppp_social_settings;
 				$ppp_social_settings = get_option( 'ppp_social_settings' );
 
 				//check facebook class is loaded or not
-				if( !$facebook ) {
+				if ( ! $facebook) {
 					return false;
 				}
 
 				$data = new stdClass();
 				$data->access_token = $access_token;
 
-				$expires_in = empty( $expires_in ) ? 60 * 24 * 60 * 60 : $expires_in; // days * hours * minutes * seconds
+				$expires_in = empty($expires_in) ? 60 * 24 * 60 * 60 : $expires_in; // days * hours * minutes * seconds
 				$data->expires_on = current_time( 'timestamp' ) + $expires_in;
 
-				update_option( '_ppp_facebook_refresh', current_time( 'timestamp' ) + round( $expires_in/1.25 ) );
+				update_option( '_ppp_facebook_refresh', current_time( 'timestamp' ) + round( $expires_in / 1.25 ) );
 
 				// Now that we have a valid auth, get some user info
 				$user_info = $this->ppp_get_fb_user( $data->access_token );
 
-				if ( $user_info ) {
-					if ( !empty( $user_info->name ) ) {
+				if ($user_info) {
+					if ( ! empty($user_info->name)) {
 						$data->name = $user_info->name;
 					} else {
-						$parsed_name = $user_info->first_name . ' ' . $user_info->last_name;
+						$parsed_name = $user_info->first_name.' '.$user_info->last_name;
 						$data->name = $parsed_name;
 					}
 					$data->userid = $user_info->id;
 					$data->avatar = $this->ppp_fb_get_profile_picture( array( 'type' => 'square' ), $data->userid );
 
-					if ( ! empty( $ppp_social_settings['facebook']->page ) ) {
+					if ( ! empty($ppp_social_settings['facebook']->page)) {
 						$current_page = $ppp_social_settings['facebook']->page;
 						$page_parts   = explode( '|', $current_page );
 
 						$pages = $this->ppp_get_fb_user_pages( $data->access_token );
 
-						foreach ( $pages as $page ) {
-							if ( $page->id == $page_parts[2] ) {
-								$data->page = $page->name . '|' . $page->access_token . '|' . $page->id;
+						foreach ($pages as $page) {
+							if ($page->id == $page_parts[2]) {
+								$data->page = $page->name.'|'.$page->access_token.'|'.$page->id;
 								continue;
 							}
 						}
@@ -133,7 +133,7 @@ 
 				}
 
 
-				$url = remove_query_arg( array( 'fb_access_token' , 'expires_in' ) );
+				$url = remove_query_arg( array( 'fb_access_token', 'expires_in' ) );
 				wp_redirect( $url );
 				die();
 			}
@@ -151,12 +151,12 @@ 
 			$facebook = $this->ppp_load_facebook();
 
 			//check facebook class is exis or not
-			if( !$facebook ) {
+			if ( ! $facebook) {
 				return false;
 			}
 
 			global $ppp_social_settings;
-			$user = json_decode( wp_remote_retrieve_body( wp_remote_get( 'https://graph.facebook.com/me?access_token=' . $access_token ) ) );
+			$user = json_decode( wp_remote_retrieve_body( wp_remote_get( 'https://graph.facebook.com/me?access_token='.$access_token ) ) );
 
 			return $user;
 
@@ -168,27 +168,27 @@ 
 			$facebook = $this->ppp_load_facebook();
 
 			// check facebook cleast is exists or not
-			if( !$facebook ) {
+			if ( ! $facebook) {
 				return false;
 			}
 
 			global $ppp_social_settings;
 			$facebook_settings = $ppp_social_settings['facebook'];
 
-			if ( ! isset( $facebook_settings->available_pages ) ||
-				 ! isset( $facebook_settings->pages_last_updated ) ||
-				 $facebook_settings->pages_last_updated < current_time( 'timestamp' ) ) {
+			if ( ! isset($facebook_settings->available_pages) ||
+				 ! isset($facebook_settings->pages_last_updated) ||
+				 $facebook_settings->pages_last_updated < current_time( 'timestamp' )) {
 
-				$all_pages = json_decode( wp_remote_retrieve_body( wp_remote_get( 'https://graph.facebook.com/me/accounts?access_token=' . $access_token ) ) );
+				$all_pages = json_decode( wp_remote_retrieve_body( wp_remote_get( 'https://graph.facebook.com/me/accounts?access_token='.$access_token ) ) );
 				$pages = array();
 
-				if ( !empty( $all_pages ) ) {
-					foreach ( $all_pages->data as $page ) {
-						if ( in_array( 'CREATE_CONTENT', $page->perms ) ) {
+				if ( ! empty($all_pages)) {
+					foreach ($all_pages->data as $page) {
+						if (in_array( 'CREATE_CONTENT', $page->perms )) {
 							$pages[] = $page;
 
-							if ( ! empty( $ppp_social_settings['facebook']->page ) && strpos( $ppp_social_settings['facebook']->page, $page->id ) ) {
-								$ppp_social_settings['facebook']->page = $page->name . '|' . $page->access_token . '|' . $page->id;
+							if ( ! empty($ppp_social_settings['facebook']->page) && strpos( $ppp_social_settings['facebook']->page, $page->id )) {
+								$ppp_social_settings['facebook']->page = $page->name.'|'.$page->access_token.'|'.$page->id;
 							}
 						}
 					}
@@ -199,7 +199,7 @@ 
 
 				$pages = (object) $pages;
 				$ppp_social_settings['facebook']->available_pages = $pages;
-				$ppp_social_settings['facebook']->pages_last_updated = current_time( 'timestamp' ) + ( HOUR_IN_SECONDS / 4 );
+				$ppp_social_settings['facebook']->pages_last_updated = current_time( 'timestamp' ) + (HOUR_IN_SECONDS / 4);
 				update_option( 'ppp_social_settings', $ppp_social_settings );
 			} else {
 				$pages = $facebook_settings->available_pages;
@@ -221,7 +221,7 @@ 
 			$facebook = $this->ppp_load_facebook();
 
 			//check facebook class is exis or not
-			if( !$facebook ) {
+			if ( ! $facebook) {
 				return false;
 			}
 
@@ -232,27 +232,27 @@ 
 		 * Get auth url for facebook
 		 *
 		 */
-		public function ppp_get_facebook_auth_url ( $return_url ) {
+		public function ppp_get_facebook_auth_url( $return_url ) {
 
 			//load facebook class
 			$facebook = $this->ppp_load_facebook();
 
 			//check facebook class is exis or not
-			if( !$facebook ) {
+			if ( ! $facebook) {
 				return false;
 			}
 
-			if ( ! PPP_LOCAL_TOKENS ) {
+			if ( ! PPP_LOCAL_TOKENS) {
 				$base_url = 'https://postpromoterpro.com/?ppp-social-auth';
-				$url  = $base_url . '&ppp-service=fb&ppp-license-key=' . trim( get_option( '_ppp_license_key' ) );
+				$url  = $base_url.'&ppp-service=fb&ppp-license-key='.trim( get_option( '_ppp_license_key' ) );
 				$url .= '&nocache';
-				$url .= '&return_url=' . esc_url( $return_url );
+				$url .= '&return_url='.esc_url( $return_url );
 			} else {
 				$url  = 'https://graph.facebook.com/oauth/authorize?';
-				$url .= 'client_id=' . PPP_FB_APP_ID;
+				$url .= 'client_id='.PPP_FB_APP_ID;
 				$url .= '&scope=public_profile,publish_actions,manage_pages,publish_pages';
 				$url .= '&state=ppp-local-keys-fb';
-				$url .= '&redirect_uri=' . esc_url( $return_url ) . '&nocache';
+				$url .= '&redirect_uri='.esc_url( $return_url ).'&nocache';
 			}
 
 			return $url;
@@ -264,14 +264,14 @@ 
 		 * Getting the the profile image of the connected Facebook user.
 		 *
 		 */
-		public function ppp_fb_get_profile_picture( $args=array(), $user ) {
+		public function ppp_fb_get_profile_picture( $args = array(), $user ) {
 
-			if( isset( $args['type'] ) && !empty( $args['type'] ) ) {
+			if (isset($args['type']) && ! empty($args['type'])) {
 				$type = $args['type'];
 			} else {
 				$type = 'large';
 			}
-			$url = 'https://graph.facebook.com/' . $user . '/picture?type=' . $type;
+			$url = 'https://graph.facebook.com/'.$user.'/picture?type='.$type;
 			return $url;
 		}
 
@@ -279,7 +279,7 @@ 
 			global $ppp_social_settings;
 			$facebook_settings = $ppp_social_settings['facebook'];
 
-			if ( !isset( $facebook_settings->page ) || strtolower( $facebook_settings->page ) === 'me' ) {
+			if ( ! isset($facebook_settings->page) || strtolower( $facebook_settings->page ) === 'me') {
 				$account      = 'me';
 				$access_token = $facebook_settings->access_token;
 			} else {
@@ -288,9 +288,9 @@ 
 				$access_token = $page_info[1];
 			}
 
-			$url = 'https://graph.facebook.com/' . $account . '/feed?access_token=' . $access_token;
+			$url = 'https://graph.facebook.com/'.$account.'/feed?access_token='.$access_token;
 			$args = array( 'link' => $link, 'message' => $message );
-			if ( !empty( $image ) ) {
+			if ( ! empty($image)) {
 				$args['picture'] = $image;
 			}
 			$results = json_decode( wp_remote_retrieve_body( wp_remote_post( $url, array( 'body' => $args ) ) ) );
@@ -309,7 +309,7 @@ 
 		public function ppp_get_data_from_url( $url ) {
 
 			//Use wp_remote_post and wp_remote_get
-			$data	= wp_remote_retrieve_body( wp_remote_get( $url ) );
+			$data = wp_remote_retrieve_body( wp_remote_get( $url ) );
 
 			return $data;
 		}
@@ -321,7 +321,7 @@ 
 		 */
 		public function clear_og_cache( $post_id ) {
 			$post_url = get_permalink( $post_id );
-			if ( ! empty( $post_url ) ) {
+			if ( ! empty($post_url)) {
 				$args     = array( 'body' => array( 'id' => $post_url, 'scrape' => true ) );
 				$response = json_decode( wp_remote_retrieve_body( wp_remote_post( 'https://graph.facebook.com/', $args ) ) );
 			}

includes/admin/upgrades.php

Spacing +39 added lines, -39 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined( 'ABSPATH' )) {
 	exit;
 }
 
 function ppp_upgrade_notices() {
 
-	if ( isset( $_GET['page'] ) && ( $_GET['page'] == 'ppp-about' || $_GET['page'] == 'ppp-upgrades' ) ) {
+	if (isset($_GET['page']) && ($_GET['page'] == 'ppp-about' || $_GET['page'] == 'ppp-upgrades')) {
 		return; // Don't show notices on the upgrades page
 	}
 
@@ -15,11 +15,11 @@ 
 
 	// Sequential Orders was the first stepped upgrade, so check if we have a stalled upgrade
 	$resume_upgrade = ppp_maybe_resume_upgrade();
-	if ( ! empty( $resume_upgrade ) ) {
+	if ( ! empty($resume_upgrade)) {
 
 		$resume_url = add_query_arg( $resume_upgrade, admin_url( 'index.php' ) );
 		printf(
-			'<div class="error"><p>' . __( 'Post Promoter Pro needs to complete a database upgrade that was previously started, click <a href="%s">here</a> to resume the upgrade.', 'ppp-txt' ) . '</p></div>',
+			'<div class="error"><p>'.__( 'Post Promoter Pro needs to complete a database upgrade that was previously started, click <a href="%s">here</a> to resume the upgrade.', 'ppp-txt' ).'</p></div>',
 			esc_url( $resume_url )
 		);
 
@@ -28,9 +28,9 @@ 
 		// Include all 'Stepped' upgrade process notices in this else statement,
 		// to avoid having a pending, and new upgrade suggested at the same time
 
-		if ( version_compare( $ppp_version, '2.2', '<' ) || ! ppp_has_upgrade_completed( 'upgrade_post_meta' ) ) {
+		if (version_compare( $ppp_version, '2.2', '<' ) || ! ppp_has_upgrade_completed( 'upgrade_post_meta' )) {
 			printf(
-				'<div class="notice notice-info"><p>' . __( 'Post Promoter Pro needs to upgrade share override data, click <a href="%s">here</a> to start the upgrade.', 'ppp-txt' ) . '</p></div>',
+				'<div class="notice notice-info"><p>'.__( 'Post Promoter Pro needs to upgrade share override data, click <a href="%s">here</a> to start the upgrade.', 'ppp-txt' ).'</p></div>',
 				esc_url( admin_url( 'index.php?page=ppp-upgrades&ppp-upgrade=upgrade_post_meta' ) )
 			);
 		}
@@ -52,17 +52,17 @@ 
 	$upgrades_executed = false;
 
 	// We don't have a version yet, so we need to run the upgrader
-	if ( !$ppp_version && PPP_VERSION == '1.3' ) {
+	if ( ! $ppp_version && PPP_VERSION == '1.3') {
 		ppp_v13_upgrades();
 		$upgrades_executed = true;
 	}
 
-	if ( version_compare( $ppp_version, 2.1, '<' ) ) {
+	if (version_compare( $ppp_version, 2.1, '<' )) {
 		ppp_v21_upgrades();
 		$upgrades_executed = true;
 	}
 
-	if ( $upgrades_executed || version_compare( $ppp_version, PPP_VERSION, '<' ) ) {
+	if ($upgrades_executed || version_compare( $ppp_version, PPP_VERSION, '<' )) {
 		set_transient( '_ppp_activation_redirect', '1', 60 );
 		update_option( 'ppp_version', PPP_VERSION );
 	}
@@ -80,7 +80,7 @@ 
 
 	$doing_upgrade = get_option( 'ppp_doing_upgrade', false );
 
-	if ( empty( $doing_upgrade ) ) {
+	if (empty($doing_upgrade)) {
 		return false;
 	}
 
@@ -96,22 +96,22 @@ 
  */
 function ppp_v13_upgrades() {
 	global $ppp_share_settings;
-	$uq_status = ( isset( $ppp_share_settings['ppp_unique_links'] ) && $ppp_share_settings['ppp_unique_links'] == '1' ) ? $ppp_share_settings['ppp_unique_links'] : 0;
-	$ga_status = ( isset( $ppp_share_settings['ppp_ga_tags'] ) && $ppp_share_settings['ppp_ga_tags'] == '1' ) ? $ppp_share_settings['ppp_ga_tags'] : 0;
+	$uq_status = (isset($ppp_share_settings['ppp_unique_links']) && $ppp_share_settings['ppp_unique_links'] == '1') ? $ppp_share_settings['ppp_unique_links'] : 0;
+	$ga_status = (isset($ppp_share_settings['ppp_ga_tags']) && $ppp_share_settings['ppp_ga_tags'] == '1') ? $ppp_share_settings['ppp_ga_tags'] : 0;
 
-	if ( $uq_status ) {
+	if ($uq_status) {
 		$ppp_share_settings['analytics'] = 'unique_links';
-		unset( $ppp_share_settings['ppp_unique_links'] );
-	} elseif ( $ga_status ) {
+		unset($ppp_share_settings['ppp_unique_links']);
+	} elseif ($ga_status) {
 		$ppp_share_settings['analytics'] = 'google_analytics';
-		unset( $ppp_share_settings['ppp_ga_tags'] );
+		unset($ppp_share_settings['ppp_ga_tags']);
 	}
 
 	update_option( 'ppp_share_settings', $ppp_share_settings );
 
 	global $ppp_options;
 	$ppp_options['default_text'] = '{post_title}';
-	$ppp_options['days'] = array( 'day1' => 'on', 'day2' => 'on', 'day3' => 'on', 'day4' => 'on', 'day5' => 'on', 'day6' => 'on');
+	$ppp_options['days'] = array( 'day1' => 'on', 'day2' => 'on', 'day3' => 'on', 'day4' => 'on', 'day5' => 'on', 'day6' => 'on' );
 
 	update_option( 'ppp_options', $ppp_options );
 }
@@ -133,29 +133,29 @@ 
  */
 function ppp_v22_postmeta_upgrade() {
 
-	if( ! current_user_can( PostPromoterPro::get_manage_capability() ) ) {
+	if ( ! current_user_can( PostPromoterPro::get_manage_capability() )) {
 		wp_die( __( 'You do not have permission to do upgrades', 'ppp-txt' ), __( 'Error', 'ppp-txt' ), array( 'response' => 403 ) );
 	}
 
 	ignore_user_abort( true );
 
-	if ( ! ini_get( 'safe_mode' ) ) {
-		@set_time_limit(0);
+	if ( ! ini_get( 'safe_mode' )) {
+		@set_time_limit( 0 );
 	}
 
 	global $wpdb;
 
 
-	$step   = isset( $_GET['step'] ) ? absint( $_GET['step'] ) : 1;
+	$step   = isset($_GET['step']) ? absint( $_GET['step'] ) : 1;
 	$number = 25;
-	$offset = $step == 1 ? 0 : ( $step - 1 ) * $number;
+	$offset = $step == 1 ? 0 : ($step - 1) * $number;
 
-	if ( $step < 2 ) {
+	if ($step < 2) {
 		// Check if we have any payments before moving on
 		$sql = "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_ppp_post_override_data' LIMIT 1";
 		$has_overrides = $wpdb->get_col( $sql );
 
-		if( empty( $has_overrides ) ) {
+		if (empty($has_overrides)) {
 			// We had no payments, just complete
 			update_option( 'ppp_version', preg_replace( '/[^0-9.].*/', '', PPP_VERSION ) );
 			ppp_set_upgrade_complete( 'upgrade_post_meta' );
@@ -164,9 +164,9 @@ 
 		}
 	}
 
-	$total = isset( $_GET['total'] ) ? absint( $_GET['total'] ) : false;
+	$total = isset($_GET['total']) ? absint( $_GET['total'] ) : false;
 
-	if ( empty( $total ) || $total <= 1 ) {
+	if (empty($total) || $total <= 1) {
 		$total_sql = "SELECT COUNT(post_id) as total FROM $wpdb->postmeta WHERE meta_key = '_ppp_post_override_data'";
 		$results   = $wpdb->get_row( $total_sql, 0 );
 
@@ -176,48 +176,48 @@ 
 	$results       = $wpdb->get_results( $wpdb->prepare( "SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = '_ppp_post_override_data' ORDER BY meta_id DESC LIMIT %d,%d;", $offset, $number ) );
 	$new_post_meta = array();
 
-	if ( $results ) {
-		foreach ( $results as $result ) {
+	if ($results) {
+		foreach ($results as $result) {
 
 			$share_key     = 1;
 
 			$override_data = unserialize( $result->meta_value );
 
-			foreach ( $override_data as $day => $values ) {
+			foreach ($override_data as $day => $values) {
 
-				if ( ! isset( $values['enabled'] ) ) {
+				if ( ! isset($values['enabled'])) {
 					continue;
 				}
 
-				$text = ! empty( $values['text'] ) ? $values['text'] : '';
-				$time = ! empty( $values['time'] ) ? $values['time'] : '8:00am';
+				$text = ! empty($values['text']) ? $values['text'] : '';
+				$time = ! empty($values['time']) ? $values['time'] : '8:00am';
 
 				$post          = get_post( $result->post_id );
 				$days_ahead    = substr( $day, -1 );
-				$date          = date( 'm\/d\/Y', strtotime( $post->post_date . '+' . $days_ahead . ' days' ) );
+				$date          = date( 'm\/d\/Y', strtotime( $post->post_date.'+'.$days_ahead.' days' ) );
 				$image         = '';
 				$attachment_id = '';
 
-				if ( ! empty( $values['use_image'] ) ) {
+				if ( ! empty($values['use_image'])) {
 					$thumb_id  = get_post_thumbnail_id( $result->post_id );
 					$thumb_url = wp_get_attachment_image_src( $thumb_id, 'ppp-tw-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' )) {
 						$thumb_url = $thumb_url[0];
 					}
 
-					if ( ! empty( $thumb_id ) && ! empty( $thumb_url ) ) {
+					if ( ! empty($thumb_id) && ! empty($thumb_url)) {
 						$attachment_id = $thumb_id;
 						$image         = $thumb_url;
 					}
 				}
 
-				$new_post_meta[$share_key] = array (
+				$new_post_meta[$share_key] = array(
 					'date'          => $date,
 					'time'          => $time,
 					'text'          => $text,
-					'image'         => ! empty( $image ) ? $image : '',
-					'attachment_id' => ! empty( $attachment_id ) ? $attachment_id : ''
+					'image'         => ! empty($image) ? $image : '',
+					'attachment_id' => ! empty($attachment_id) ? $attachment_id : ''
 				);
 
 				$share_key++;

includes/admin/dashboard.php

Spacing +19 added lines, -19 removed lines

@@ -17,7 +17,7 @@ 
 	 * @since  2.2.3
 	 */
 	public static function init() {
-		if ( ! current_user_can( PostPromoterPro::get_manage_capability() ) ) {
+		if ( ! current_user_can( PostPromoterPro::get_manage_capability() )) {
 			return;
 		}
 
@@ -38,34 +38,34 @@ 
 		$number = self::get_count();
 		$shares = ppp_get_shceduled_crons();
 
-		if ( ! empty( $shares ) ) {
+		if ( ! empty($shares)) {
 			$limited_shares = array_slice( $shares, 0, $number, true );
 			?>
 			<div id="future-tweets" class="activity-block">
 				<h4><?php _e( 'Post-Related shares', 'ppp-tweets' ); ?></h4>
 				<ul>
 				<?php
-				foreach ( $limited_shares as $key => $share ) {
+				foreach ($limited_shares as $key => $share) {
 					$ppp_data = $share;
 					$timestamp = $ppp_data['timestamp'];
 
 					$name_parts = explode( '_', $ppp_data['args'][1] );
-					$service    = isset( $name_parts[3] ) ? $name_parts[3] : 'tw';
-					$builder    = 'ppp_' . $service . '_build_share_message';
+					$service    = isset($name_parts[3]) ? $name_parts[3] : 'tw';
+					$builder    = 'ppp_'.$service.'_build_share_message';
 
 					$post_id    = $ppp_data['args'][0];
-					$date       = $timestamp + ( get_option( 'gmt_offset' ) * 3600 );
+					$date       = $timestamp + (get_option( 'gmt_offset' ) * 3600);
 					$content    = '';
-					if ( function_exists( $builder ) ) {
-						$content    = $builder( $ppp_data['args'][0], $ppp_data['args'][1], false );
+					if (function_exists( $builder )) {
+						$content = $builder( $ppp_data['args'][0], $ppp_data['args'][1], false );
 					}
 
 					$regex   = "@(https?://([-\w\.]+[-\w])+(:\d+)?(/([\w/_\.#-]*(\?\S+)?[^\.\s])?)?)@";
 					$content = preg_replace( $regex, '', $content );
 					?>
 					<li>
-						<span class="meta"><i class="dashicons icon-ppp-<?php echo $service; ?>"></i>&nbsp;<?php echo date_i18n( 'M jS, ' . get_option( 'time_format' ), $date ); ?></span>
-						<a href="<?php echo admin_url( 'post.php?post=' . $post_id . '&action=edit' ); ?>"><?php echo $content; ?></a>
+						<span class="meta"><i class="dashicons icon-ppp-<?php echo $service; ?>"></i>&nbsp;<?php echo date_i18n( 'M jS, '.get_option( 'time_format' ), $date ); ?></span>
+						<a href="<?php echo admin_url( 'post.php?post='.$post_id.'&action=edit' ); ?>"><?php echo $content; ?></a>
 					</li>
 				<?php } ?>
 				</ul>
@@ -87,18 +87,18 @@ 
 			$recent_post    = $recent_posts[0];
 			$post_type      = get_post_type_object( $recent_post['post_type'] );
 			$post_type_name = $post_type->labels->singular_name;
-			$edit_url       = admin_url( 'post.php?post=' . $recent_post['ID'] . '&action=edit' );
+			$edit_url       = admin_url( 'post.php?post='.$recent_post['ID'].'&action=edit' );
 
-			switch( $recent_post['post_status'] ) {
+			switch ($recent_post['post_status']) {
 				case 'draft':
-					$relative_time = __( '<a href="%s">Configure them</a> for your draft ' . $post_type_name, 'ppp-txt' );
+					$relative_time = __( '<a href="%s">Configure them</a> for your draft '.$post_type_name, 'ppp-txt' );
 					break;
 				case 'future':
-					$relative_time = __( '<a href="%s">Schedule one</a> for your upcoming ' . $post_type_name, 'ppp-txt' );
+					$relative_time = __( '<a href="%s">Schedule one</a> for your upcoming '.$post_type_name, 'ppp-txt' );
 					break;
 				case 'publish':
 				default:
-					$relative_time = __( '<a href="%s">Schedule one</a> for your most recent ' . $post_type_name, 'ppp-txt' );
+					$relative_time = __( '<a href="%s">Schedule one</a> for your most recent '.$post_type_name, 'ppp-txt' );
 					break;
 
 			}
@@ -119,7 +119,7 @@ 
 	 * @since  2.2.3
 	 */
 	public static function config() {
-		if ( ! empty( $_POST['number_of_tweets'] ) ) {
+		if ( ! empty($_POST['number_of_tweets'])) {
 			update_option( 'ppp_dashboard_twitter_count', absint( $_POST['number_of_tweets'] ) );
 		}
 
@@ -139,10 +139,10 @@ 
 	private static function get_count() {
 		$stored_count = get_option( 'ppp_dashboard_shares_count' );
 
-		$stored_count = empty( $stored_count ) || ! is_numeric( $stored_count ) ? 5 : absint( $stored_count );
+		$stored_count = empty($stored_count) || ! is_numeric( $stored_count ) ? 5 : absint( $stored_count );
 
-		return ! empty( $stored_count ) ? $stored_count : 5;
+		return ! empty($stored_count) ? $stored_count : 5;
 	}
 
 }
-add_action('wp_dashboard_setup', array('PPP_Dashboard_Shares','init') );
+add_action( 'wp_dashboard_setup', array( 'PPP_Dashboard_Shares', 'init' ) );

includes/admin/actions.php

Spacing +34 added lines, -34 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined( 'ABSPATH' )) {
 	exit;
 }
 
@@ -14,14 +14,14 @@ 
  */
 function ppp_disconnect_social() {
 
-	if ( isset( $_GET['ppp_social_disconnect'] ) && isset( $_GET['ppp_network'] ) ) {
+	if (isset($_GET['ppp_social_disconnect']) && isset($_GET['ppp_network'])) {
 
-		if ( ! current_user_can( PostPromoterPro::get_manage_capability() ) ) {
+		if ( ! current_user_can( PostPromoterPro::get_manage_capability() )) {
 			wp_die( __( 'You do not have permission to view this page', 'ppp-txt' ) );
 		}
 
 		$network = $_GET['ppp_network'];
-		do_action( 'ppp_disconnect-' . $network );
+		do_action( 'ppp_disconnect-'.$network );
 	}
 }
 add_action( 'admin_init', 'ppp_disconnect_social', 10 );
@@ -35,8 +35,8 @@ 
 
 	$tabs = apply_filters( 'ppp_metabox_tabs', array() );
 	$i = 0;
-	foreach ( $tabs as $key => $values ) {
-		if ( $i === 0 ) {
+	foreach ($tabs as $key => $values) {
+		if ($i === 0) {
 			$visibleKey = $key;
 			$class = 'tabs';
 		} else {
@@ -44,7 +44,7 @@ 
 		}
 
 		?><li class="<?php echo $class; ?>"><a href="#<?php echo $key; ?>"><?php
-		if ( $values['class'] !== false ) {
+		if ($values['class'] !== false) {
 			?>
 			<span class="dashicons <?php echo $values['class']; ?>"></span>&nbsp;
 			<?php
@@ -65,15 +65,15 @@ 
 	$tabs = apply_filters( 'ppp_admin_tabs', array() );
 	$i = 0;
 	?><h2 id="ppp-social-connect-tabs" class="nav-tab-wrapper"><?php
-	foreach ( $tabs as $key => $values ) {
-		if ( $i === 0 ) {
+	foreach ($tabs as $key => $values) {
+		if ($i === 0) {
 			$visibleSettingTab = $key;
 			$class = ' nav-tab-active';
 		} else {
 			$class = '';
 		}
 		?><a class="nav-tab<?php echo $class; ?>" href='#<?php echo $key; ?>'><?php
-		if ( $values['class'] !== false ) {
+		if ($values['class'] !== false) {
 			?>
 			<span class="dashicons <?php echo $values['class']; ?>"></span>&nbsp;
 			<?php
@@ -94,14 +94,14 @@ 
 function ppp_generate_metabox_content( $post ) {
 	global $visibleKey;
 	$tab_content = apply_filters( 'ppp_metabox_content', array() );
-	if ( empty( $tab_content ) ) {
+	if (empty($tab_content)) {
 		printf( __( 'No social media accounts active. <a href="%s">Connect with your accounts now</a>.', 'ppp-txt' ), admin_url( 'admin.php?page=ppp-social-settings' ) );
 	} else {
-		foreach ( $tab_content as $service ) {
-			$hidden = ( $visibleKey == $service ) ? '' : ' hidden';
+		foreach ($tab_content as $service) {
+			$hidden = ($visibleKey == $service) ? '' : ' hidden';
 			?>
 			<div class="wp-tab-panel tabs-panel<?php echo $hidden; ?>" id="<?php echo $service; ?>">
-				<?php do_action( 'ppp_generate_metabox_content-' . $service, $post ); ?>
+				<?php do_action( 'ppp_generate_metabox_content-'.$service, $post ); ?>
 			</div>
 			<?php
 		}
@@ -116,14 +116,14 @@ 
 function ppp_generate_social_account_content() {
 	global $visibleSettingTab;
 	$tab_content = apply_filters( 'ppp_admin_social_content', array() );
-	if ( empty( $tab_content ) ) {
+	if (empty($tab_content)) {
 		printf( __( 'No social media accounts active. <a href="%s">Connect with your accounts now</a>.', 'ppp-txt' ), admin_url( 'admin.php?page=ppp-social-settings' ) );
 	} else {
-		foreach ( $tab_content as $service ) {
-			$hidden = ( $visibleSettingTab == $service ) ? '' : ' hidden';
+		foreach ($tab_content as $service) {
+			$hidden = ($visibleSettingTab == $service) ? '' : ' hidden';
 			?>
 			<div class="ppp-social-connect<?php echo $hidden; ?>" id="<?php echo $service; ?>">
-				<?php do_action( 'ppp_connect_display-' . $service ); ?>
+				<?php do_action( 'ppp_connect_display-'.$service ); ?>
 			</div>
 			<?php
 		}
@@ -136,30 +136,30 @@ 
  * @return void
  */
 function ppp_list_view_maybe_take_action() {
-	if ( ! isset( $_GET['page'] ) || $_GET['page'] !== 'ppp-schedule-info' ) {
+	if ( ! isset($_GET['page']) || $_GET['page'] !== 'ppp-schedule-info') {
 		return;
 	}
 
-	if ( ! isset( $_GET['action'] ) ) {
+	if ( ! isset($_GET['action'])) {
 		return;
 	}
 
 	// Get the necessary info for the actions
-	$post_id = isset( $_GET['post_id'] ) ? $_GET['post_id'] : 0;
-	$name    = isset( $_GET['name'] ) ? $_GET['name'] : '';
-	$index   = isset( $_GET['index'] ) ? $_GET['index'] : 0;
-	$delete  = isset( $_GET['delete_too'] ) ? true : false;
+	$post_id = isset($_GET['post_id']) ? $_GET['post_id'] : 0;
+	$name    = isset($_GET['name']) ? $_GET['name'] : '';
+	$index   = isset($_GET['index']) ? $_GET['index'] : 0;
+	$delete  = isset($_GET['delete_too']) ? true : false;
 
-	switch( $_GET['action'] ) {
+	switch ($_GET['action']) {
 		case 'delete_item':
-			if ( ! empty( $post_id ) && ! empty( $name ) || empty( $index ) ) {
-				ppp_remove_scheduled_share( array( (int)$post_id, $name ) ); // Remove the item in cron
+			if ( ! empty($post_id) && ! empty($name) || empty($index)) {
+				ppp_remove_scheduled_share( array( (int) $post_id, $name ) ); // Remove the item in cron
 
 				// Remove the item from postmeta if it exists.
 				$current_post_meta = get_post_meta( $post_id, '_ppp_tweets', true );
 
-				if ( isset( $current_post_meta[$index] ) ) {
-					unset( $current_post_meta[$index] );
+				if (isset($current_post_meta[$index])) {
+					unset($current_post_meta[$index]);
 					update_post_meta( $post_id, '_ppp_tweets', $current_post_meta );
 				}
 
@@ -168,17 +168,17 @@ 
 			}
 			break;
 		case 'share_now':
-			if ( ! empty( $post_id ) && ! empty( $name ) ) {
+			if ( ! empty($post_id) && ! empty($name)) {
 				ppp_share_post( $post_id, $name );
 
-				if ( $delete && ! empty( $index ) ) {
-					ppp_remove_scheduled_share( array( (int)$post_id, $name ) ); // Remove the item in cron
+				if ($delete && ! empty($index)) {
+					ppp_remove_scheduled_share( array( (int) $post_id, $name ) ); // Remove the item in cron
 
 					// Remove the item from postmeta if it exists.
 					$current_post_meta = get_post_meta( $post_id, '_ppp_tweets', true );
 
-					if ( isset( $current_post_meta[$index] ) ) {
-						unset( $current_post_meta[$index] );
+					if (isset($current_post_meta[$index])) {
+						unset($current_post_meta[$index]);
 						update_post_meta( $post_id, '_ppp_tweets', $current_post_meta );
 					}
 

includes/libs/social-loader.php

Spacing +12 added lines, -12 removed lines

@@ -1,33 +1,33 @@
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined( 'ABSPATH' )) {
 	exit;
 }
 
-include_once( PPP_PATH . '/includes/wpme-functions.php' );
+include_once(PPP_PATH.'/includes/wpme-functions.php');
 
 global $ppp_twitter_oauth;
-include_once( PPP_PATH . '/includes/twitter-functions.php' );
-require_once( PPP_PATH . '/includes/libs/twitter.php');
+include_once(PPP_PATH.'/includes/twitter-functions.php');
+require_once(PPP_PATH.'/includes/libs/twitter.php');
 $ppp_twitter_oauth = new PPP_Twitter();
 
 // Also include the user specific Twitter Class ( separate for now )
-require_once( PPP_PATH . '/includes/libs/twitter-user.php' );
+require_once(PPP_PATH.'/includes/libs/twitter-user.php');
 
 global $ppp_facebook_oauth;
-include_once( PPP_PATH . '/includes/facebook-functions.php' );
-require_once( PPP_PATH . '/includes/libs/facebook.php');
+include_once(PPP_PATH.'/includes/facebook-functions.php');
+require_once(PPP_PATH.'/includes/libs/facebook.php');
 $ppp_facebook_oauth = new PPP_Facebook();
 
 global $ppp_bitly_oauth;
-include_once( PPP_PATH . '/includes/bitly-functions.php' );
-require_once( PPP_PATH . '/includes/libs/bitly.php' );
+include_once(PPP_PATH.'/includes/bitly-functions.php');
+require_once(PPP_PATH.'/includes/libs/bitly.php');
 $ppp_bitly_oauth = new PPP_Bitly();
 
 global $ppp_linkedin_oauth;
-include_once( PPP_PATH . '/includes/linkedin-functions.php' );
-require_once( PPP_PATH . '/includes/libs/linkedin.php' );
+include_once(PPP_PATH.'/includes/linkedin-functions.php');
+require_once(PPP_PATH.'/includes/libs/linkedin.php');
 $ppp_linkedin_oauth = new PPP_Linkedin();
 
-include_once( PPP_PATH . '/includes/pinterest-functions.php' );
+include_once(PPP_PATH.'/includes/pinterest-functions.php');

includes/admin/welcome.php

Spacing +30 added lines, -30 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined( 'ABSPATH' )) {
 	exit;
 }
 
@@ -30,9 +30,9 @@ 
 	 * @since 1.2
 	 */
 	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'admin_menus') );
+		add_action( 'admin_menu', array( $this, 'admin_menus' ) );
 		add_action( 'admin_head', array( $this, 'admin_head' ) );
-		add_action( 'admin_init', array( $this, 'welcome'    ) );
+		add_action( 'admin_init', array( $this, 'welcome' ) );
 	}
 
 	/**
@@ -76,7 +76,7 @@ 
 		remove_submenu_page( 'index.php', 'ppp-getting-started' );
 
 		// Badge for welcome page
-		$badge_url = PPP_URL . 'includes/images/ppp-badge.png';
+		$badge_url = PPP_URL.'includes/images/ppp-badge.png';
 		?>
 		<style type="text/css" media="screen">
 		/*<![CDATA[*/
@@ -116,7 +116,7 @@ 
 	 * @return void
 	 */
 	public function tabs() {
-		$selected = isset( $_GET['page'] ) ? $_GET['page'] : 'ppp-about';
+		$selected = isset($_GET['page']) ? $_GET['page'] : 'ppp-about';
 		?>
 		<h1 class="nav-tab-wrapper">
 			<a class="nav-tab <?php echo $selected == 'ppp-about' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'ppp-about' ), 'index.php' ) ) ); ?>">
@@ -134,7 +134,7 @@ 
 	 * @return void
 	 */
 	public function about_screen() {
-		list( $display_version ) = explode( '-', PPP_VERSION );
+		list($display_version) = explode( '-', PPP_VERSION );
 		?>
 		<div class="wrap about-wrap">
 			<h1><?php printf( __( 'Post Promoter Pro %s', 'ppp-txt' ), $display_version ); ?></h1>
@@ -144,59 +144,59 @@ 
 			<?php $this->tabs(); ?>
 
 			<div class="changelog">
-				<h3><?php _e( 'Free Form Tweet Scheduling', 'ppp-txt' );?></h3>
+				<h3><?php _e( 'Free Form Tweet Scheduling', 'ppp-txt' ); ?></h3>
 
 				<div class="feature-section">
 
-					<img src="<?php echo PPP_URL . '/includes/images/screenshots/free-form-tweets.jpg'; ?>" class="ppp-welcome-screenshots"/>
+					<img src="<?php echo PPP_URL.'/includes/images/screenshots/free-form-tweets.jpg'; ?>" class="ppp-welcome-screenshots"/>
 
-					<h4><?php _e( 'More effective, and user friendly.', 'ppp-txt' );?></h4>
-					<p><?php _e( 'No longer do you have to figure out what "Day 1" means. With free form scheduling, you can now create Tweets, days, weeks, or months in the future. Even multiples a day.', 'ppp-txt' );?></p>
-					<p><?php _e( 'Have an old post that you want to promote again? No problem, just go back and add another Scheduled Tweet to the list!', 'ppp-txt' );?></p>
+					<h4><?php _e( 'More effective, and user friendly.', 'ppp-txt' ); ?></h4>
+					<p><?php _e( 'No longer do you have to figure out what "Day 1" means. With free form scheduling, you can now create Tweets, days, weeks, or months in the future. Even multiples a day.', 'ppp-txt' ); ?></p>
+					<p><?php _e( 'Have an old post that you want to promote again? No problem, just go back and add another Scheduled Tweet to the list!', 'ppp-txt' ); ?></p>
 
 				</div>
 			</div>
 
 			<div class="changelog">
-				<h3><?php _e( 'Twitter Cards Support', 'ppp-txt' );?></h3>
+				<h3><?php _e( 'Twitter Cards Support', 'ppp-txt' ); ?></h3>
 
 				<div class="feature-section">
 
-					<img src="<?php echo PPP_URL . '/includes/images/screenshots/twitter-cards.jpg'; ?>" class="ppp-welcome-screenshots"/>
+					<img src="<?php echo PPP_URL.'/includes/images/screenshots/twitter-cards.jpg'; ?>" class="ppp-welcome-screenshots"/>
 
-					<h4><?php _e( 'Increased visibility on Twitter','ppp-txt' );?></h4>
-					<p><?php _e( 'Enable this feature if you want your Tweets to look the best they can.', 'ppp-txt' );?></p>
-					<p><?php _e( 'This is an opt-in setting, so if you have a plugin that already does this, no conflicts will arise upon upgrade.', 'ppp-txt' );?></p>
+					<h4><?php _e( 'Increased visibility on Twitter', 'ppp-txt' ); ?></h4>
+					<p><?php _e( 'Enable this feature if you want your Tweets to look the best they can.', 'ppp-txt' ); ?></p>
+					<p><?php _e( 'This is an opt-in setting, so if you have a plugin that already does this, no conflicts will arise upon upgrade.', 'ppp-txt' ); ?></p>
 
 				</div>
 			</div>
 
 			<div class="changelog">
-				<h3><?php _e( 'Variable Twitter Images', 'ppp-txt' );?></h3>
+				<h3><?php _e( 'Variable Twitter Images', 'ppp-txt' ); ?></h3>
 
 				<div class="feature-section">
 
-					<h4><?php _e( 'Change the image attached to each Tweet','ppp-txt' );?></h4>
-					<p><?php _e( 'Have a few rotating images you want to use for your scheduled Tweets? No problem, Version 2.2 supports changing this for every scheduled Tweet.', 'ppp-txt' );?></p>
+					<h4><?php _e( 'Change the image attached to each Tweet', 'ppp-txt' ); ?></h4>
+					<p><?php _e( 'Have a few rotating images you want to use for your scheduled Tweets? No problem, Version 2.2 supports changing this for every scheduled Tweet.', 'ppp-txt' ); ?></p>
 
 				</div>
 			</div>
 
 			<div class="changelog">
-				<h3><?php _e( 'Additional Updates', 'ppp-txt' );?></h3>
+				<h3><?php _e( 'Additional Updates', 'ppp-txt' ); ?></h3>
 
 				<div class="feature-section col three-col">
 					<div>
-						<h4><?php _e( 'Updated image sizes', 'ppp-txt' );?></h4>
-						<p><?php _e( 'Changed the optimal thumbnail image sizes to meet the 2015 network standards.', 'ppp-txt' );?></p>
+						<h4><?php _e( 'Updated image sizes', 'ppp-txt' ); ?></h4>
+						<p><?php _e( 'Changed the optimal thumbnail image sizes to meet the 2015 network standards.', 'ppp-txt' ); ?></p>
 
-						<h4><?php _e( 'CSS Updates', 'ppp-txt' );?></h4>
-						<p><?php _e( 'Fixed a conflict in the media library CSS.', 'ppp-txt' );?></p>
+						<h4><?php _e( 'CSS Updates', 'ppp-txt' ); ?></h4>
+						<p><?php _e( 'Fixed a conflict in the media library CSS.', 'ppp-txt' ); ?></p>
 					</div>
 
 					<div class="last-feature">
-						<h4><?php _e( 'Improved Facebook Token Refresh', 'ppp-txt' );?></h4>
-						<p><?php _e( 'Fixed a bug with the Facebook token refresh resetting the "Post As", dropdown.', 'ppp-txt' );?></p>
+						<h4><?php _e( 'Improved Facebook Token Refresh', 'ppp-txt' ); ?></h4>
+						<p><?php _e( 'Fixed a bug with the Facebook token refresh resetting the "Post As", dropdown.', 'ppp-txt' ); ?></p>
 					</div>
 				</div>
 			</div>
@@ -216,7 +216,7 @@ 
 	 * @return void
 	 */
 	public function getting_started_screen() {
-		list( $display_version ) = explode( '-', PPP_VERSION );
+		list($display_version) = explode( '-', PPP_VERSION );
 		?>
 		<div class="wrap about-wrap">
 			<h1><?php printf( __( 'Welcome to Post Promoter Pro %s', 'ppp-txt' ), $display_version ); ?></h1>
@@ -242,12 +242,12 @@ 
 	public function welcome() {
 
 		$version_level = explode( '.', PPP_VERSION );
-		if ( count( $version_level ) > 2 ) {
+		if (count( $version_level ) > 2) {
 			return;
 		}
 
 		// Bail if no activation redirect
-		if ( ! get_transient( '_ppp_activation_redirect' ) ) {
+		if ( ! get_transient( '_ppp_activation_redirect' )) {
 			return;
 		}
 
@@ -255,7 +255,7 @@ 
 		delete_transient( '_ppp_activation_redirect' );
 
 		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+		if (is_network_admin() || isset($_GET['activate-multi'])) {
 			return;
 		}