Strategy11 / formidable-forms

classes/models/FrmEDD_SL_Plugin_Updater.php

Indentation +155 added lines, -155 removed lines

@@ -15,23 +15,23 @@ 
  * @version 1.6.3
  */
 class FrmEDD_SL_Plugin_Updater {
-    private $api_url   = '';
-    private $api_data  = array();
-    private $name      = '';
-    private $slug      = '';
-    private $version   = '';
-
-    /**
-     * Class constructor.
-     *
-     * @uses plugin_basename()
-     * @uses hook()
-     *
-     * @param string  $_api_url     The URL pointing to the custom API endpoint.
-     * @param string  $_plugin_file Path to the plugin file.
-     * @param array   $_api_data    Optional data to send with API calls.
-     */
-    public function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
+	private $api_url   = '';
+	private $api_data  = array();
+	private $name      = '';
+	private $slug      = '';
+	private $version   = '';
+
+	/**
+	 * Class constructor.
+	 *
+	 * @uses plugin_basename()
+	 * @uses hook()
+	 *
+	 * @param string  $_api_url     The URL pointing to the custom API endpoint.
+	 * @param string  $_plugin_file Path to the plugin file.
+	 * @param array   $_api_data    Optional data to send with API calls.
+	 */
+	public function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
 		global $frm_edd_plugin_data;
 
 		$this->api_url  = trailingslashit( $_api_url );
@@ -44,159 +44,159 @@ 
 
 		// Set up hooks.
 		$this->init();
-    }
-
-    /**
-     * Set up WordPress filters to hook into WP's update process.
-     *
-     * @uses add_filter()
-     *
-     * @return void
-     */
-    public function init() {
-        add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
-        add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
+	}
+
+	/**
+	 * Set up WordPress filters to hook into WP's update process.
+	 *
+	 * @uses add_filter()
+	 *
+	 * @return void
+	 */
+	public function init() {
+		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
+		add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
 		add_action( 'admin_init', array( $this, 'show_changelog' ) );
-    }
-
-    /**
-     * Check for Updates at the defined API endpoint and modify the update array.
-     *
-     * This function dives into the update API just when WordPress creates its update array,
-     * then adds a custom API call and injects the custom plugin data retrieved from the API.
-     * It is reassembled from parts of the native WordPress plugin update code.
-     * See wp-includes/update.php line 121 for the original wp_update_plugins() function.
-     *
-     * @uses api_request()
-     *
-     * @param array   $_transient_data Update array build by WordPress.
-     * @return array Modified update array with custom plugin data.
-     */
-    public function check_update( $_transient_data ) {
-
-        global $pagenow;
-
-        if ( ! is_object( $_transient_data ) ) {
-            $_transient_data = new stdClass;
-        }
+	}
+
+	/**
+	 * Check for Updates at the defined API endpoint and modify the update array.
+	 *
+	 * This function dives into the update API just when WordPress creates its update array,
+	 * then adds a custom API call and injects the custom plugin data retrieved from the API.
+	 * It is reassembled from parts of the native WordPress plugin update code.
+	 * See wp-includes/update.php line 121 for the original wp_update_plugins() function.
+	 *
+	 * @uses api_request()
+	 *
+	 * @param array   $_transient_data Update array build by WordPress.
+	 * @return array Modified update array with custom plugin data.
+	 */
+	public function check_update( $_transient_data ) {
+
+		global $pagenow;
+
+		if ( ! is_object( $_transient_data ) ) {
+			$_transient_data = new stdClass;
+		}
 
-        if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
+		if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
 
-            $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+			$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
 
-            if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
+			if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
 
-                if ( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+				if ( version_compare( $this->version, $version_info->new_version, '<' ) ) {
 
 					if ( empty( $version_info->plugin ) ) {
 						$version_info->plugin = $this->name;
 					}
 
-                    $_transient_data->response[ $this->name ] = $version_info;
-
-                }
-
-                $_transient_data->last_checked = time();
-                $_transient_data->checked[ $this->name ] = $this->version;
-
-            }
-        }
-
-        return $_transient_data;
-    }
-
-    /**
-     * Updates information on the "View version x.x details" page with custom data.
-     *
-     * @uses api_request()
-     *
-     * @param mixed   $_data
-     * @param string  $_action
-     * @param object  $_args
-     * @return object $_data
-     */
-    public function plugins_api_filter( $_data, $_action = '', $_args = null ) {
-
-        if ( $_action != 'plugin_information' ) {
+					$_transient_data->response[ $this->name ] = $version_info;
 
-            return $_data;
+				}
 
-        }
+				$_transient_data->last_checked = time();
+				$_transient_data->checked[ $this->name ] = $this->version;
 
-        if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
+			}
+		}
 
-            return $_data;
+		return $_transient_data;
+	}
 
-        }
+	/**
+	 * Updates information on the "View version x.x details" page with custom data.
+	 *
+	 * @uses api_request()
+	 *
+	 * @param mixed   $_data
+	 * @param string  $_action
+	 * @param object  $_args
+	 * @return object $_data
+	 */
+	public function plugins_api_filter( $_data, $_action = '', $_args = null ) {
 
-        $to_send = array(
-            'slug'   => $this->slug,
-            'is_ssl' => is_ssl(),
-            'fields' => array(
-                'banners' => false, // These will be supported soon hopefully
-                'reviews' => false,
-            ),
-        );
+		if ( $_action != 'plugin_information' ) {
 
-        $api_response = $this->api_request( 'plugin_information', $to_send );
+			return $_data;
 
-        if ( false !== $api_response ) {
-            $_data = $api_response;
-        }
+		}
 
-        return $_data;
-    }
+		if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
 
+			return $_data;
 
-    /**
-     * Disable SSL verification in order to prevent download update failures
-     *
-     * @param array   $args
-     * @param string  $url
-     * @return object $array
-     */
-    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' ) ) {
-            $args['sslverify'] = false;
-        }
-        return $args;
-    }
+		}
 
-    /**
-     * Calls the API and, if successfull, returns the object delivered by the API.
-     *
-     * @uses get_bloginfo()
-     * @uses wp_remote_post()
-     * @uses is_wp_error()
-     *
-     * @param string  $_action The requested action.
-     * @param array   $_data   Parameters for the API action.
-     * @return false|object
-     */
-    private function api_request( $_action, $_data ) {
+		$to_send = array(
+			'slug'   => $this->slug,
+			'is_ssl' => is_ssl(),
+			'fields' => array(
+				'banners' => false, // These will be supported soon hopefully
+				'reviews' => false,
+			),
+		);
 
-        global $wp_version;
+		$api_response = $this->api_request( 'plugin_information', $to_send );
 
-        $data = array_merge( $this->api_data, $_data );
+		if ( false !== $api_response ) {
+			$_data = $api_response;
+		}
 
-        if ( $data['slug'] != $this->slug ) {
-            return;
+		return $_data;
+	}
+
+
+	/**
+	 * Disable SSL verification in order to prevent download update failures
+	 *
+	 * @param array   $args
+	 * @param string  $url
+	 * @return object $array
+	 */
+	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' ) ) {
+			$args['sslverify'] = false;
+		}
+		return $args;
+	}
+
+	/**
+	 * Calls the API and, if successfull, returns the object delivered by the API.
+	 *
+	 * @uses get_bloginfo()
+	 * @uses wp_remote_post()
+	 * @uses is_wp_error()
+	 *
+	 * @param string  $_action The requested action.
+	 * @param array   $_data   Parameters for the API action.
+	 * @return false|object
+	 */
+	private function api_request( $_action, $_data ) {
+
+		global $wp_version;
+
+		$data = array_merge( $this->api_data, $_data );
+
+		if ( $data['slug'] != $this->slug ) {
+			return;
 		}
 
-        if ( $this->api_url == home_url() ) {
-            return false; // Don't allow a plugin to ping itself
-        }
+		if ( $this->api_url == 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,
-            'slug'       => $data['slug'],
-            'author'     => $data['author'],
-            'url'        => home_url(),
-        );
+		$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,
+			'slug'       => $data['slug'],
+			'author'     => $data['author'],
+			'url'        => home_url(),
+		);
 
 		$cache_key = 'edd_plugin_' . md5( sanitize_key( $api_params['license'] . $this->version ) . '_' . $api_params['edd_action'] );
 		$cached_response = get_transient( $cache_key );
@@ -205,24 +205,24 @@ 
 			return $cached_response;
 		}
 
-        $request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
+		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
 
-        if ( ! is_wp_error( $request ) ) {
-            $request = json_decode( wp_remote_retrieve_body( $request ) );
-        }
+		if ( ! is_wp_error( $request ) ) {
+			$request = json_decode( wp_remote_retrieve_body( $request ) );
+		}
 
-        if ( $request && isset( $request->sections ) ) {
-            $request->sections = maybe_unserialize( $request->sections );
+		if ( $request && isset( $request->sections ) ) {
+			$request->sections = maybe_unserialize( $request->sections );
 			set_transient( $cache_key, $request, DAY_IN_SECONDS );
-        } else {
-            $request = false;
+		} else {
+			$request = false;
 			set_transient( $cache_key, 0, DAY_IN_SECONDS );
-        }
+		}
 
-        return $request;
-    }
+		return $request;
+	}
 
-    public function show_changelog() {
+	public function show_changelog() {
 
 		global $frm_edd_plugin_data;
 
@@ -278,5 +278,5 @@ 
 		}
 
 		exit;
-    }
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -40,7 +40,7 @@ 
 		$this->slug     = basename( $_plugin_file, '.php' );
 		$this->version  = $_api_data['version'];
 
-		$frm_edd_plugin_data[ $this->slug ] = $this->api_data;
+		$frm_edd_plugin_data[$this->slug] = $this->api_data;
 
 		// Set up hooks.
 		$this->init();
@@ -80,7 +80,7 @@ 
             $_transient_data = new stdClass;
         }
 
-        if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
+        if ( empty( $_transient_data->response ) || empty( $_transient_data->response[$this->name] ) ) {
 
             $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
 
@@ -92,12 +92,12 @@ 
 						$version_info->plugin = $this->name;
 					}
 
-                    $_transient_data->response[ $this->name ] = $version_info;
+                    $_transient_data->response[$this->name] = $version_info;
 
                 }
 
                 $_transient_data->last_checked = time();
-                $_transient_data->checked[ $this->name ] = $this->version;
+                $_transient_data->checked[$this->name] = $this->version;
 
             }
         }
@@ -242,7 +242,7 @@ 
 			wp_die( __( 'You do not have permission to install plugin updates', 'formidable' ), __( 'Error', 'formidable' ), array( 'response' => 403 ) );
 		}
 
-		$data         = $frm_edd_plugin_data[ $_REQUEST['slug'] ];
+		$data         = $frm_edd_plugin_data[$_REQUEST['slug']];
 		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_version_info' );
 		$version_info = get_transient( $cache_key );
 
@@ -273,7 +273,7 @@ 
 
 		}
 
-		if( ! empty( $version_info ) && isset( $version_info->sections['changelog'] ) ) {
+		if ( ! empty( $version_info ) && isset( $version_info->sections['changelog'] ) ) {
 			echo '<div style="background:#fff;padding:10px;">' . $version_info->sections['changelog'] . '</div>';
 		}