gravityview / GravityView

includes/class-gravityview-template.php

Spacing +36 added lines, -36 removed lines

@@ -37,15 +37,15 @@ 
 	public $active_areas;
 
 
-	function __construct( $id, $settings = array(), $field_options = array(), $areas = array() ) {
+	function __construct($id, $settings = array(), $field_options = array(), $areas = array()) {
 
-		if ( empty( $id ) ) {
+		if (empty($id)) {
 			return;
 		}
 
 		$this->template_id = $id;
 
-		$this->merge_defaults( $settings );
+		$this->merge_defaults($settings);
 
 		$this->field_options = $field_options;
 		$this->active_areas  = $areas;
@@ -60,25 +60,25 @@ 
 	 */
 	private function add_hooks() {
 
-		add_filter( 'gravityview_register_directory_template', array( $this, 'register_template' ) );
+		add_filter('gravityview_register_directory_template', array($this, 'register_template'));
 
 		// presets hooks:
 		// form xml
-		add_filter( 'gravityview_template_formxml', array( $this, 'assign_form_xml' ), 10, 2 );
+		add_filter('gravityview_template_formxml', array($this, 'assign_form_xml'), 10, 2);
 		// fields config xml
-		add_filter( 'gravityview_template_fieldsxml', array( $this, 'assign_fields_xml' ), 10, 2 );
+		add_filter('gravityview_template_fieldsxml', array($this, 'assign_fields_xml'), 10, 2);
 
 		// assign active areas
-		add_filter( 'gravityview_template_active_areas', array( $this, 'assign_active_areas' ), 10, 3 );
+		add_filter('gravityview_template_active_areas', array($this, 'assign_active_areas'), 10, 3);
 
 		// field options
-		add_filter( 'gravityview_template_field_options', array( $this, 'assign_field_options' ), 10, 4 );
+		add_filter('gravityview_template_field_options', array($this, 'assign_field_options'), 10, 4);
 
 		// template slug
-		add_filter( "gravityview_template_slug_{$this->template_id}", array( $this, 'assign_view_slug' ), 10, 2 );
+		add_filter("gravityview_template_slug_{$this->template_id}", array($this, 'assign_view_slug'), 10, 2);
 
 		// register template CSS
-		add_action( 'wp_enqueue_scripts', array( $this, 'register_styles' ) );
+		add_action('wp_enqueue_scripts', array($this, 'register_styles'));
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 	 *
 	 * @return array                Merged template settings.
 	 */
-	private function merge_defaults( $settings = array() ) {
+	private function merge_defaults($settings = array()) {
 
 		$defaults = array(
 			'slug'          => '',
@@ -105,7 +105,7 @@ 
 			'preset_fields' => ''
 		);
 
-		$this->settings = wp_parse_args( $settings, $defaults );
+		$this->settings = wp_parse_args($settings, $defaults);
 
 		return $this->settings;
 	}
@@ -119,8 +119,8 @@ 
 	 *
 	 * @return array Array of templates available for GV
 	 */
-	public function register_template( $templates ) {
-		$templates[ $this->template_id ] = $this->settings;
+	public function register_template($templates) {
+		$templates[$this->template_id] = $this->settings;
 
 		return $templates;
 	}
@@ -136,17 +136,17 @@ 
 	 *
 	 * @return array Array of active areas
 	 */
-	public function assign_active_areas( $areas, $template = '', $context = 'directory' ) {
-		if ( $this->template_id === $template ) {
-			$areas = $this->get_active_areas( $context );
+	public function assign_active_areas($areas, $template = '', $context = 'directory') {
+		if ($this->template_id === $template) {
+			$areas = $this->get_active_areas($context);
 		}
 
 		return $areas;
 	}
 
-	public function get_active_areas( $context ) {
-		if ( isset( $this->active_areas[ $context ] ) ) {
-			return $this->active_areas[ $context ];
+	public function get_active_areas($context) {
+		if (isset($this->active_areas[$context])) {
+			return $this->active_areas[$context];
 		} else {
 			return $this->active_areas;
 		}
@@ -163,21 +163,21 @@ 
 	 *
 	 * @return array Array of field options
 	 */
-	public function assign_field_options( $field_options, $template_id, $field_id = NULL, $context = 'directory' ) {
+	public function assign_field_options($field_options, $template_id, $field_id = NULL, $context = 'directory') {
 
-		if ( $this->template_id === $template_id ) {
+		if ($this->template_id === $template_id) {
 
-			foreach ( $this->field_options as $key => $field_option ) {
+			foreach ($this->field_options as $key => $field_option) {
 
-				$field_context = rgar( $field_option, 'context' );
+				$field_context = rgar($field_option, 'context');
 
 				// Does the field option only apply to a certain context?
 				// You can define multiple contexts as an array:  `context => array("directory", "single")`
-				$context_matches = is_array( $field_context ) ? in_array( $context, $field_context ) : $context === $field_context;
+				$context_matches = is_array($field_context) ? in_array($context, $field_context) : $context === $field_context;
 
 				// If the context matches (or isn't defined), add the field options.
-				if ( $context_matches ) {
-					$field_options[ $key ] = $field_option;
+				if ($context_matches) {
+					$field_options[$key] = $field_option;
 				}
 			}
 		}
@@ -192,8 +192,8 @@ 
 	 * @see GravityView_Admin_Views::create_preset_form()
 	 * @return string                Path to XML file
 	 */
-	public function assign_form_xml( $xml = '', $template = '' ) {
-		if ( $this->settings['type'] === 'preset' && ! empty( $this->settings['preset_form'] ) && $this->template_id === $template ) {
+	public function assign_form_xml($xml = '', $template = '') {
+		if ($this->settings['type'] === 'preset' && !empty($this->settings['preset_form']) && $this->template_id === $template) {
 			return $this->settings['preset_form'];
 		}
 
@@ -206,8 +206,8 @@ 
 	 * @see GravityView_Admin_Views::pre_get_form_fields()
 	 * @return string                Path to XML file
 	 */
-	public function assign_fields_xml( $xml = '', $template = '' ) {
-		if ( $this->settings['type'] === 'preset' && ! empty( $this->settings['preset_fields'] ) && $this->template_id === $template ) {
+	public function assign_fields_xml($xml = '', $template = '') {
+		if ($this->settings['type'] === 'preset' && !empty($this->settings['preset_fields']) && $this->template_id === $template) {
 			return $this->settings['preset_fields'];
 		}
 
@@ -224,12 +224,12 @@ 
 	 *
 	 * @return string
 	 */
-	public function assign_view_slug( $default, $context ) {
+	public function assign_view_slug($default, $context) {
 
-		if ( ! empty( $this->settings['slug'] ) ) {
+		if (!empty($this->settings['slug'])) {
 			return $this->settings['slug'];
 		}
-		if ( ! empty( $default ) ) {
+		if (!empty($default)) {
 			return $default;
 		}
 
@@ -244,8 +244,8 @@ 
 	 * @return void
 	 */
 	public function register_styles() {
-		if ( ! empty( $this->settings['css_source'] ) ) {
-			wp_register_style( 'gravityview_style_' . $this->template_id, $this->settings['css_source'], array(), GravityView_Plugin::version, 'all' );
+		if (!empty($this->settings['css_source'])) {
+			wp_register_style('gravityview_style_'.$this->template_id, $this->settings['css_source'], array(), GravityView_Plugin::version, 'all');
 		}
 	}
 

includes/class-gv-license-handler.php

Spacing +86 added lines, -86 removed lines

@@ -33,14 +33,14 @@ 
 	 *
 	 * @return GV_License_Handler
 	 */
-	public static function get_instance( GravityView_Settings $GFAddOn ) {
-		if( empty( self::$instance ) ) {
-			self::$instance = new self( $GFAddOn );
+	public static function get_instance(GravityView_Settings $GFAddOn) {
+		if (empty(self::$instance)) {
+			self::$instance = new self($GFAddOn);
 		}
 		return self::$instance;
 	}
 	
-	private function __construct( GravityView_Settings $GFAddOn ) {
+	private function __construct(GravityView_Settings $GFAddOn) {
 
 		$this->Addon = $GFAddOn;
 
@@ -50,25 +50,25 @@ 
 	}
 
 	private function add_hooks() {
-		add_action( 'wp_ajax_gravityview_license', array( $this, 'license_call' ) );
+		add_action('wp_ajax_gravityview_license', array($this, 'license_call'));
 	}
 
-	function settings_edd_license_activation( $field, $echo ) {
+	function settings_edd_license_activation($field, $echo) {
 
-		wp_enqueue_script( 'gv-admin-edd-license', GRAVITYVIEW_URL . 'assets/js/admin-edd-license.js', array( 'jquery' ) );
+		wp_enqueue_script('gv-admin-edd-license', GRAVITYVIEW_URL.'assets/js/admin-edd-license.js', array('jquery'));
 
-		$status = trim( $this->Addon->get_app_setting( 'license_key_status' ) );
-		$key = trim( $this->Addon->get_app_setting( 'license_key' ) );
+		$status = trim($this->Addon->get_app_setting('license_key_status'));
+		$key = trim($this->Addon->get_app_setting('license_key'));
 
-		if( !empty( $key ) ) {
-			$response = $this->Addon->get_app_setting( 'license_key_response' );
-			$response = is_array( $response ) ? (object) $response : json_decode( $response );
+		if (!empty($key)) {
+			$response = $this->Addon->get_app_setting('license_key_response');
+			$response = is_array($response) ? (object)$response : json_decode($response);
 		} else {
 			$response = array();
 		}
 
-		wp_localize_script( 'gv-admin-edd-license', 'GVGlobals', array(
-			'license_box' => $this->get_license_message( $response )
+		wp_localize_script('gv-admin-edd-license', 'GVGlobals', array(
+			'license_box' => $this->get_license_message($response)
 		));
 
 
@@ -85,7 +85,7 @@ 
 				'value' => __('Deactivate License', 'gravityview'),
 				'data-pending_text' => __('Deactivating license…', 'gravityview'),
 				'data-edd_action' => 'deactivate_license',
-				'class' => ( empty( $status ) ? 'button-primary hide' : 'button-primary' ),
+				'class' => (empty($status) ? 'button-primary hide' : 'button-primary'),
 			),
 			array(
 				'name'  => 'edd-check',
@@ -100,19 +100,19 @@ 
 
 		$class = 'button gv-edd-action';
 
-		$class .= ( !empty( $key ) && $status !== 'valid' ) ? '' : ' hide';
+		$class .= (!empty($key) && $status !== 'valid') ? '' : ' hide';
 
-		$disabled_attribute = GVCommon::has_cap( 'gravityview_edit_settings' ) ? false : 'disabled';
+		$disabled_attribute = GVCommon::has_cap('gravityview_edit_settings') ? false : 'disabled';
 
 		$submit = '<div class="gv-edd-button-wrapper">';
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 			$field['type'] = 'button';
-			$field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class;
+			$field['class'] = isset($field['class']) ? $field['class'].' '.$class : $class;
 			$field['style'] = 'margin-left: 10px;';
-			if( $disabled_attribute ) {
+			if ($disabled_attribute) {
 				$field['disabled'] = $disabled_attribute;
 			}
-			$submit .= $this->Addon->settings_submit( $field, $echo );
+			$submit .= $this->Addon->settings_submit($field, $echo);
 		}
 		$submit .= '</div>';
 
@@ -126,8 +126,8 @@ 
 	 */
 	private function setup_edd() {
 
-		if( !class_exists('EDD_SL_Plugin_Updater') ) {
-			require_once( GRAVITYVIEW_DIR . 'includes/lib/EDD_SL_Plugin_Updater.php');
+		if (!class_exists('EDD_SL_Plugin_Updater')) {
+			require_once(GRAVITYVIEW_DIR.'includes/lib/EDD_SL_Plugin_Updater.php');
 		}
 
 		// setup the updater
@@ -149,10 +149,10 @@ 
 	 *
 	 * @return array
 	 */
-	function _get_edd_settings( $action = '', $license = '' ) {
+	function _get_edd_settings($action = '', $license = '') {
 
 		// retrieve our license key from the DB
-		$license_key = empty( $license ) ? trim( $this->Addon->get_app_setting( 'license_key' ) ) : $license;
+		$license_key = empty($license) ? trim($this->Addon->get_app_setting('license_key')) : $license;
 
 		$settings = array(
 			'version'   => self::version,
@@ -163,11 +163,11 @@ 
 			'url'       => home_url(),
 		);
 
-		if( !empty( $action ) ) {
-			$settings['edd_action'] = esc_attr( $action );
+		if (!empty($action)) {
+			$settings['edd_action'] = esc_attr($action);
 		}
 
-		$settings = array_map( 'urlencode', $settings );
+		$settings = array_map('urlencode', $settings);
 
 		return $settings;
 	}
@@ -176,27 +176,27 @@ 
 	 * Perform the call
 	 * @return array|WP_Error
 	 */
-	private function _license_get_remote_response( $data, $license = '' ) {
+	private function _license_get_remote_response($data, $license = '') {
 
-		$api_params = $this->_get_edd_settings( $data['edd_action'], $license );
+		$api_params = $this->_get_edd_settings($data['edd_action'], $license);
 
-		$url = add_query_arg( $api_params, self::url );
+		$url = add_query_arg($api_params, self::url);
 
-		$response = wp_remote_get( $url, array(
+		$response = wp_remote_get($url, array(
 			'timeout'   => 15,
 			'sslverify' => false,
 		));
 
-		if ( is_wp_error( $response ) ) {
+		if (is_wp_error($response)) {
 			return array();
 		}
 
-		$license_data = json_decode( wp_remote_retrieve_body( $response ) );
+		$license_data = json_decode(wp_remote_retrieve_body($response));
 
 		// Not JSON
-		if ( empty( $license_data ) ) {
+		if (empty($license_data)) {
 
-			delete_transient( 'gravityview_' . esc_attr( $data['field_id'] ) . '_valid' );
+			delete_transient('gravityview_'.esc_attr($data['field_id']).'_valid');
 
 			// Change status
 			return array();
@@ -216,14 +216,14 @@ 
 	 *
 	 * @return string
 	 */
-	function get_license_message( $license_data ) {
+	function get_license_message($license_data) {
 
-		if( empty( $license_data ) ) {
+		if (empty($license_data)) {
 			$class = 'hide';
 			$message = '';
 		} else {
 
-			if( ! empty( $license_data->error ) ) {
+			if (!empty($license_data->error)) {
 				$class = 'error';
 				$string_key = $license_data->error;
 			} else {
@@ -231,10 +231,10 @@ 
 				$string_key = $license_data->license;
 			}
 
-			$message = sprintf( '<p><strong>%s: %s</strong></p>', $this->strings('status'), $this->strings( $string_key, $license_data ) );
+			$message = sprintf('<p><strong>%s: %s</strong></p>', $this->strings('status'), $this->strings($string_key, $license_data));
 		}
 
-		return $this->generate_license_box( $message, $class );
+		return $this->generate_license_box($message, $class);
 	}
 
 	/**
@@ -246,11 +246,11 @@ 
 	 *
 	 * @return string
 	 */
-	private function generate_license_box( $message, $class = '' ) {
+	private function generate_license_box($message, $class = '') {
 
 		$template = '<div id="gv-edd-status" class="gv-edd-message inline %s">%s</div>';
 
-		$output = sprintf( $template, esc_attr( $class ), $message );
+		$output = sprintf($template, esc_attr($class), $message);
 
 		return $output;
 	}
@@ -270,63 +270,63 @@ 
 	 *
 	 * @return mixed|string|void
 	 */
-	public function license_call( $array = array() ) {
+	public function license_call($array = array()) {
 
-		$is_ajax = ( defined('DOING_AJAX') && DOING_AJAX );
-		$data = empty( $array ) ? $_POST['data'] : $array;
-		$has_cap = GVCommon::has_cap( 'gravityview_edit_settings' );
+		$is_ajax = (defined('DOING_AJAX') && DOING_AJAX);
+		$data = empty($array) ? $_POST['data'] : $array;
+		$has_cap = GVCommon::has_cap('gravityview_edit_settings');
 
-		if ( $is_ajax && empty( $data['license'] ) ) {
-			die( - 1 );
+		if ($is_ajax && empty($data['license'])) {
+			die( -1 );
 		}
 
 		// If the user isn't allowed to edit settings, show an error message
-		if( ! $has_cap ) {
+		if (!$has_cap) {
 			$license_data = new stdClass();
 			$license_data->error = 'capability';
-			$license_data->message = $this->get_license_message( $license_data );
-			$json = json_encode( $license_data );
+			$license_data->message = $this->get_license_message($license_data);
+			$json = json_encode($license_data);
 		} else {
 
-			$license      = esc_attr( rgget( 'license', $data ) );
-			$license_data = $this->_license_get_remote_response( $data, $license );
+			$license      = esc_attr(rgget('license', $data));
+			$license_data = $this->_license_get_remote_response($data, $license);
 
 			// Empty is returned when there's an error.
-			if ( empty( $license_data ) ) {
-				if ( $is_ajax ) {
-					exit( json_encode( array() ) );
+			if (empty($license_data)) {
+				if ($is_ajax) {
+					exit(json_encode(array()));
 				} else { // Non-ajax call
-					return json_encode( array() );
+					return json_encode(array());
 				}
 			}
 
-			$license_data->message = $this->get_license_message( $license_data );
+			$license_data->message = $this->get_license_message($license_data);
 
-			$json = json_encode( $license_data );
+			$json = json_encode($license_data);
 
-			$update_license = ( ! isset( $data['update'] ) || ! empty( $data['update'] ) );
+			$update_license = (!isset($data['update']) || !empty($data['update']));
 
-			$is_check_action_button = ( 'check_license' === $data['edd_action'] && defined( 'DOING_AJAX' ) && DOING_AJAX );
+			$is_check_action_button = ('check_license' === $data['edd_action'] && defined('DOING_AJAX') && DOING_AJAX);
 
 			// Failed is the response from trying to de-activate a license and it didn't work.
 			// This likely happened because people entered in a different key and clicked "Deactivate",
 			// meaning to deactivate the original key. We don't want to save this response, since it is
 			// most likely a mistake.
-			if ( $license_data->license !== 'failed' && ! $is_check_action_button && $update_license ) {
+			if ($license_data->license !== 'failed' && !$is_check_action_button && $update_license) {
 
-				if ( ! empty( $data['field_id'] ) ) {
-					set_transient( 'gravityview_' . esc_attr( $data['field_id'] ) . '_valid', $license_data, DAY_IN_SECONDS );
+				if (!empty($data['field_id'])) {
+					set_transient('gravityview_'.esc_attr($data['field_id']).'_valid', $license_data, DAY_IN_SECONDS);
 				}
 
-				$this->license_call_update_settings( $license_data, $data );
+				$this->license_call_update_settings($license_data, $data);
 
 			}
 		} // End $has_cap
 
-		if ( $is_ajax ) {
-			exit( $json );
+		if ($is_ajax) {
+			exit($json);
 		} else { // Non-ajax call
-			return ( rgget('format', $data ) === 'object' ) ? $license_data : $json;
+			return (rgget('format', $data) === 'object') ? $license_data : $json;
 		}
 	}
 
@@ -335,16 +335,16 @@ 
 	 * @param object $license_data
 	 * @return void
 	 */
-	private function license_call_update_settings( $license_data, $data ) {
+	private function license_call_update_settings($license_data, $data) {
 
 		// Update option with passed data license
 		$settings = $this->Addon->get_app_settings();
 
-        $settings['license_key'] = $license_data->license_key = trim( $data['license'] );
+        $settings['license_key'] = $license_data->license_key = trim($data['license']);
 		$settings['license_key_status'] = $license_data->license;
 		$settings['license_key_response'] = (array)$license_data;
 
-		$this->Addon->update_app_settings( $settings );
+		$this->Addon->update_app_settings($settings);
 	}
 
 	/**
@@ -353,8 +353,8 @@ 
 	 * @param  object|null $license_data Object with license data
 	 * @return string Renewal or account URL
 	 */
-	private function get_license_renewal_url( $license_data ) {
-		$renew_license_url = ( ! empty( $license_data ) && !empty( $license_data->license_key ) ) ? sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s&utm_source=admin_notice&utm_medium=admin&utm_content=expired&utm_campaign=Activation', $license_data->license_key ) : 'https://gravityview.co/account/';
+	private function get_license_renewal_url($license_data) {
+		$renew_license_url = (!empty($license_data) && !empty($license_data->license_key)) ? sprintf('https://gravityview.co/checkout/?download_id=17&edd_license_key=%s&utm_source=admin_notice&utm_medium=admin&utm_content=expired&utm_campaign=Activation', $license_data->license_key) : 'https://gravityview.co/account/';
 		return $renew_license_url;
 	}
 
@@ -364,7 +364,7 @@ 
 	 * @param  object|null $license_data Object with license data
 	 * @return array          Modified array of content
 	 */
-	public function strings( $status = NULL, $license_data = null ) {
+	public function strings($status = NULL, $license_data = null) {
 
 
 		$strings = array(
@@ -372,14 +372,14 @@ 
 			'error' => esc_html__('There was an error processing the request.', 'gravityview'),
 			'failed'  => esc_html__('Could not deactivate the license. The license key you attempted to deactivate may not be active or valid.', 'gravityview'),
 			'site_inactive' => esc_html__('The license key is valid, but it has not been activated for this site.', 'gravityview'),
-			'no_activations_left' => esc_html__('Invalid: this license has reached its activation limit.', 'gravityview') . ' ' . sprintf( esc_html__('You can manage license activations %son your GravityView account page%s.', 'gravityview'), '<a href="https://gravityview.co/account/#licenses">', '</a>' ),
+			'no_activations_left' => esc_html__('Invalid: this license has reached its activation limit.', 'gravityview').' '.sprintf(esc_html__('You can manage license activations %son your GravityView account page%s.', 'gravityview'), '<a href="https://gravityview.co/account/#licenses">', '</a>'),
 			'deactivated' => esc_html__('The license has been deactivated.', 'gravityview'),
 			'valid' => esc_html__('The license key is valid and active.', 'gravityview'),
 			'invalid' => esc_html__('The license key entered is invalid.', 'gravityview'),
 			'missing' => esc_html__('The license key was not defined.', 'gravityview'),
 			'revoked' => esc_html__('This license key has been revoked.', 'gravityview'),
-			'expired' => sprintf( esc_html__('This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview'), '<a href="'. esc_url( $this->get_license_renewal_url( $license_data ) ) .'">', '</a>' ),
-			'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ),
+			'expired' => sprintf(esc_html__('This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview'), '<a href="'.esc_url($this->get_license_renewal_url($license_data)).'">', '</a>'),
+			'capability' => esc_html__('You don\'t have the ability to edit plugin settings.', 'gravityview'),
 
 			'verifying_license' => esc_html__('Verifying license&hellip;', 'gravityview'),
 			'activate_license' => esc_html__('Activate License', 'gravityview'),
@@ -387,33 +387,33 @@ 
 			'check_license' => esc_html__('Verify License', 'gravityview'),
 		);
 
-		if( empty( $status ) ) {
+		if (empty($status)) {
 			return $strings;
 		}
 
-		if( isset( $strings[ $status ] ) ) {
-			return $strings[ $status ];
+		if (isset($strings[$status])) {
+			return $strings[$status];
 		}
 
 		return NULL;
 	}
 
-	public function validate_license_key( $value, $field ) {
+	public function validate_license_key($value, $field) {
 
 		// No license? No status.
-		if( empty( $value ) ) {
+		if (empty($value)) {
 			return NULL;
 		}
 
 		$response = $this->license_call(array(
-			'license' => $this->Addon->get_app_setting( 'license_key' ),
+			'license' => $this->Addon->get_app_setting('license_key'),
 			'edd_action' => 'check_license',
 			'field_id' => $field['name'],
 		));
 
-		$response = is_string( $response ) ? json_decode( $response, true ) : $response;
+		$response = is_string($response) ? json_decode($response, true) : $response;
 
-		switch( $response['license'] ) {
+		switch ($response['license']) {
 			case 'valid':
 				$return = true;
 				break;

includes/class-gvlogic-shortcode.php

Spacing +38 added lines, -38 removed lines

@@ -5,13 +5,13 @@ 
  */
 class GVLogic_Shortcode {
 
-	private static $SUPPORTED_SCALAR_OPERATORS = array( 'is', 'isnot', 'contains', 'starts_with', 'ends_with' );
+	private static $SUPPORTED_SCALAR_OPERATORS = array('is', 'isnot', 'contains', 'starts_with', 'ends_with');
 
-	private static $SUPPORTED_NUMERIC_OPERATORS = array( 'greater_than', 'less_than' );
+	private static $SUPPORTED_NUMERIC_OPERATORS = array('greater_than', 'less_than');
 
-	private static $SUPPORTED_ARRAY_OPERATORS = array( 'in', 'not_in', 'isnot', 'contains' );
+	private static $SUPPORTED_ARRAY_OPERATORS = array('in', 'not_in', 'isnot', 'contains');
 
-	private static $SUPPORTED_CUSTOM_OPERATORS = array( 'equals', 'greater_than_or_is', 'greater_than_or_equals', 'less_than_or_is', 'less_than_or_equals', 'not_contains' );
+	private static $SUPPORTED_CUSTOM_OPERATORS = array('equals', 'greater_than_or_is', 'greater_than_or_equals', 'less_than_or_is', 'less_than_or_equals', 'not_contains');
 
 	/**
 	 * Attributes passed to the shortcode
@@ -85,7 +85,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if( empty( self::$instance ) ) {
+		if (empty(self::$instance)) {
 			self::$instance = new self;
 		}
 
@@ -105,7 +105,7 @@ 
 	 * @return void
 	 */
 	function add_hooks() {
-		add_shortcode( 'gvlogic', array( $this, 'shortcode' ) );
+		add_shortcode('gvlogic', array($this, 'shortcode'));
 	}
 
 	/**
@@ -114,14 +114,14 @@ 
 	 *
 	 * @return array
 	 */
-	function get_operators( $with_values = false ) {
+	function get_operators($with_values = false) {
 
-		$operators = array_merge( self::$SUPPORTED_ARRAY_OPERATORS, self::$SUPPORTED_NUMERIC_OPERATORS, self::$SUPPORTED_SCALAR_OPERATORS, self::$SUPPORTED_CUSTOM_OPERATORS );
+		$operators = array_merge(self::$SUPPORTED_ARRAY_OPERATORS, self::$SUPPORTED_NUMERIC_OPERATORS, self::$SUPPORTED_SCALAR_OPERATORS, self::$SUPPORTED_CUSTOM_OPERATORS);
 
-		if( $with_values ) {
+		if ($with_values) {
 			$operators_with_values = array();
-			foreach( $operators as $key ) {
-				$operators_with_values[ $key ] = '';
+			foreach ($operators as $key) {
+				$operators_with_values[$key] = '';
 			}
 			return $operators_with_values;
 		} else {
@@ -135,16 +135,16 @@ 
 	 *
 	 * @return bool True: it's an allowed operation type and was added. False: invalid operation type
 	 */
-	function set_operation( $operation = '' ) {
+	function set_operation($operation = '') {
 
-		if( empty( $operation ) ) {
+		if (empty($operation)) {
 			return false;
 		}
 
-		$operators = $this->get_operators( false );
+		$operators = $this->get_operators(false);
 
-		if( !in_array( $operation, $operators ) ) {
-			do_action( 'gravityview_log_debug', __METHOD__ .' Attempted to add invalid operation type.', $operation );
+		if (!in_array($operation, $operators)) {
+			do_action('gravityview_log_debug', __METHOD__.' Attempted to add invalid operation type.', $operation);
 			return false;
 		}
 
@@ -164,11 +164,11 @@ 
 	 */
 	function setup_operation_and_comparison() {
 
-		foreach( $this->atts as $key => $value ) {
+		foreach ($this->atts as $key => $value) {
 
-			$valid = $this->set_operation( $key );
+			$valid = $this->set_operation($key);
 
-			if( $valid ) {
+			if ($valid) {
 				$this->comparison = $value;
 				return true;
 			}
@@ -184,10 +184,10 @@ 
 	 *
 	 * @return string|null
 	 */
-	public function shortcode( $atts = array(), $content = NULL, $shortcode_tag = '' ) {
+	public function shortcode($atts = array(), $content = NULL, $shortcode_tag = '') {
 
 		// Don't process except on frontend
-		if ( GravityView_Plugin::is_admin() ) {
+		if (GravityView_Plugin::is_admin()) {
 			return null;
 		}
 
@@ -198,16 +198,16 @@ 
 		$this->parse_atts();
 
 		// We need an "if"
-		if( false === $this->if ) {
-			do_action( 'gravityview_log_error', __METHOD__.' $atts->if is empty.', $this->atts );
+		if (false === $this->if) {
+			do_action('gravityview_log_error', __METHOD__.' $atts->if is empty.', $this->atts);
 			return null;
 		}
 
 		$setup = $this->setup_operation_and_comparison();
 
 		// We need an operation and comparison value
-		if( ! $setup ) {
-			do_action( 'gravityview_log_error', __METHOD__.' No valid operators were passed.', $this->atts );
+		if (!$setup) {
+			do_action('gravityview_log_error', __METHOD__.' No valid operators were passed.', $this->atts);
 			return null;
 		}
 
@@ -228,7 +228,7 @@ 
 	 * @return boolean True: yep; false: nope
 	 */
 	function set_is_match() {
-		$this->is_match = GVCommon::matches_operation( $this->if, $this->comparison, $this->operation );
+		$this->is_match = GVCommon::matches_operation($this->if, $this->comparison, $this->operation);
 	}
 
 	/**
@@ -238,23 +238,23 @@ 
 	 */
 	function get_output() {
 
-		if( $this->is_match ) {
+		if ($this->is_match) {
 			$output = $this->content;
 		} else {
 			$output = $this->else_content;
 		}
 
 		// Get recursive!
-		$output = do_shortcode( $output );
+		$output = do_shortcode($output);
 
 		/**
 		 * @filter `gravityview/gvlogic/output` Modify the [gvlogic] output
 		 * @param string $output HTML/text output
 		 * @param GVLogic_Shortcode $this This class
 		 */
-		$output = apply_filters('gravityview/gvlogic/output', $output, $this );
+		$output = apply_filters('gravityview/gvlogic/output', $output, $this);
 
-		do_action( 'gravityview_log_debug', __METHOD__ .' Output: ', $output );
+		do_action('gravityview_log_debug', __METHOD__.' Output: ', $output);
 
 		return $output;
 	}
@@ -268,13 +268,13 @@ 
 	 */
 	function set_content_and_else_content() {
 
-		$content = explode( '[else]', $this->passed_content );
+		$content = explode('[else]', $this->passed_content);
 
 		$this->content = $content[0];
 
-		$else_attr = isset( $this->atts['else'] ) ? $this->atts['else'] : NULL;
+		$else_attr = isset($this->atts['else']) ? $this->atts['else'] : NULL;
 
-		$this->else_content = isset( $content[1] ) ? $content[1] : $else_attr;
+		$this->else_content = isset($content[1]) ? $content[1] : $else_attr;
 	}
 
 	/**
@@ -288,19 +288,19 @@ 
 			'else' => false,
 		);
 
-		$supported_args = $supported + $this->get_operators( true );
+		$supported_args = $supported + $this->get_operators(true);
 
 		// Whittle down the attributes to only valid pairs
-		$this->atts = shortcode_atts( $supported_args, $this->passed_atts, $this->shortcode );
+		$this->atts = shortcode_atts($supported_args, $this->passed_atts, $this->shortcode);
 
 		// Only keep the passed attributes after making sure that they're valid pairs
-		$this->atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( $this->passed_atts, $this->atts ) : $this->atts;
+		$this->atts = function_exists('array_intersect_key') ? array_intersect_key($this->passed_atts, $this->atts) : $this->atts;
 
 		// Strip whitespace if it's not default false
-		$this->if = is_string( $this->atts['if'] ) ? trim( $this->atts['if'] ) : false;
+		$this->if = is_string($this->atts['if']) ? trim($this->atts['if']) : false;
 
 		// Make sure the "if" isn't processed in self::setup_operation_and_comparison()
-		unset( $this->atts['if'] );
+		unset($this->atts['if']);
 	}
 }
 

includes/class-oembed.php

Spacing +47 added lines, -47 removed lines

@@ -10,7 +10,7 @@ 
  * @since 1.6
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
@@ -32,7 +32,7 @@ 
 
 	private function initialize() {
 
-		add_action( 'init', array( $this, 'register_handler' ) );
+		add_action('init', array($this, 'register_handler'));
 
 	}
 
@@ -42,7 +42,7 @@ 
 	 */
 	static function getInstance() {
 
-		if( empty( self::$instance ) ) {
+		if (empty(self::$instance)) {
 			self::$instance = new self;
 
 			self::$instance->initialize();
@@ -59,7 +59,7 @@ 
 	 */
 	function register_handler() {
 
-		wp_embed_register_handler( 'gravityview_entry', $this->get_handler_regex(), array( $this, 'render_handler' ), 20000 );
+		wp_embed_register_handler('gravityview_entry', $this->get_handler_regex(), array($this, 'render_handler'), 20000);
 
 	}
 
@@ -80,16 +80,16 @@ 
 		 * @filter `gravityview_slug` Modify the url part for a View. [Read the doc](http://docs.gravityview.co/article/62-changing-the-view-slug)
 		 * @param string $rewrite_slug The slug shown in the URL
 		 */
-		$rewrite_slug = apply_filters( 'gravityview_slug', 'view' );
+		$rewrite_slug = apply_filters('gravityview_slug', 'view');
 
 		// Only support embeds for current site
-		$prefix = trailingslashit( home_url() );
+		$prefix = trailingslashit(home_url());
 
 		// Using permalinks
-		$using_permalinks = $prefix . "(?P<is_cpt>{$rewrite_slug})?/?(?P<slug>.+?)/{$entry_var_name}/(?P<entry_slug>.+?)/?\$";
+		$using_permalinks = $prefix."(?P<is_cpt>{$rewrite_slug})?/?(?P<slug>.+?)/{$entry_var_name}/(?P<entry_slug>.+?)/?\$";
 
 		// Not using permalinks
-		$not_using_permalinks = $prefix . "(?:index.php)?\?(?P<is_cpt2>[^=]+)=(?P<slug2>[^&]+)&entry=(?P<entry_slug2>[^&]+)\$";
+		$not_using_permalinks = $prefix."(?:index.php)?\?(?P<is_cpt2>[^=]+)=(?P<slug2>[^&]+)&entry=(?P<entry_slug2>[^&]+)\$";
 
 		// Catch either
 		$match_regex = "(?:{$using_permalinks}|{$not_using_permalinks})";
@@ -109,11 +109,11 @@ 
 	 * @param string $slug The name of a post, used as backup way of checking for post ID
 	 * @return int 0 if not found; int of URL post ID otherwise
 	 */
-	private function get_postid_from_url_and_slug( $url = '', $slug = '' ) {
+	private function get_postid_from_url_and_slug($url = '', $slug = '') {
 
-		$post_id = url_to_postid( $url );
+		$post_id = url_to_postid($url);
 
-		if( empty( $post_id ) ) {
+		if (empty($post_id)) {
 
 			$args = array(
 				'post_status' => 'publish',
@@ -121,9 +121,9 @@ 
 				'post_type' => array('any', 'gravityview'),
 			);
 
-			$posts = get_posts( $args );
+			$posts = get_posts($args);
 
-			if( !empty( $posts ) ) {
+			if (!empty($posts)) {
 				$post_id = $posts[0]->ID;
 			}
 		}
@@ -154,20 +154,20 @@ 
 	 * @param array $rawattr The original unmodified attributes.
 	 * @return string The embed HTML.
 	 */
-	public function render_handler( $matches, $attr, $url, $rawattr ) {
+	public function render_handler($matches, $attr, $url, $rawattr) {
 
 		// If not using permalinks, re-assign values for matching groups
-		if( !empty( $matches['entry_slug2'] ) ) {
+		if (!empty($matches['entry_slug2'])) {
 			$matches['is_cpt'] = $matches['is_cpt2'];
 			$matches['slug'] = $matches['slug2'];
 			$matches['entry_slug'] = $matches['entry_slug2'];
-			unset( $matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2'] );
+			unset($matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2']);
 		}
 
 		// No Entry was found
-		if( empty( $matches['entry_slug'] ) ) {
+		if (empty($matches['entry_slug'])) {
 
-			do_action('gravityview_log_error', 'GravityView_oEmbed[render_handler] $entry_slug not parsed by regex.', $matches );
+			do_action('gravityview_log_error', 'GravityView_oEmbed[render_handler] $entry_slug not parsed by regex.', $matches);
 
 			return '';
 		}
@@ -175,17 +175,17 @@ 
 		$return = '';
 
 		// Setup the data used
-		$this->set_vars( $matches, $attr, $url, $rawattr );
+		$this->set_vars($matches, $attr, $url, $rawattr);
 
-		if( is_admin() && !$this->is_full_oembed_preview ) {
-			$return = $this->render_admin( $matches, $attr, $url, $rawattr );
+		if (is_admin() && !$this->is_full_oembed_preview) {
+			$return = $this->render_admin($matches, $attr, $url, $rawattr);
 		} else {
 
-			if( $this->is_full_oembed_preview ) {
+			if ($this->is_full_oembed_preview) {
 				$return .= $this->generate_preview_notice();
 			}
 
-			$return .= $this->render_frontend( $matches, $attr, $url, $rawattr );
+			$return .= $this->render_frontend($matches, $attr, $url, $rawattr);
 		}
 
 		return $return;
@@ -199,9 +199,9 @@ 
 	 */
 	private function generate_preview_notice() {
 		$floaty = GravityView_Admin::get_floaty();
-		$title = esc_html__( 'This will look better when it is embedded.', 'gravityview' );
+		$title = esc_html__('This will look better when it is embedded.', 'gravityview');
 		$message = esc_html__('Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview');
-		return '<div class="updated notice">'. $floaty. '<h3>'.$title.'</h3><p>'.$message.'</p><br style="clear:both;" /></div>';
+		return '<div class="updated notice">'.$floaty.'<h3>'.$title.'</h3><p>'.$message.'</p><br style="clear:both;" /></div>';
 	}
 
 	/**
@@ -212,18 +212,18 @@ 
 	 *
 	 * @see render_handler
 	 */
-	private function set_vars( $matches, $attr, $url, $rawattr ) {
+	private function set_vars($matches, $attr, $url, $rawattr) {
 
 		$this->entry_id = $matches['entry_slug'];
 
-		$post_id = $this->get_postid_from_url_and_slug( $url, $matches['slug'] );
+		$post_id = $this->get_postid_from_url_and_slug($url, $matches['slug']);
 
 		// The URL didn't have the View Custom Post Type structure.
-		if( empty( $matches['is_cpt'] ) || $matches['is_cpt'] !== 'gravityview' ) {
+		if (empty($matches['is_cpt']) || $matches['is_cpt'] !== 'gravityview') {
 
-			do_action('gravityview_log_debug', 'GravityView_oEmbed[render_handler] Embedding an entry inside a post or page', $matches );
+			do_action('gravityview_log_debug', 'GravityView_oEmbed[render_handler] Embedding an entry inside a post or page', $matches);
 
-			$this->view_id = GravityView_View_Data::getInstance()->maybe_get_view_id( $post_id );
+			$this->view_id = GravityView_View_Data::getInstance()->maybe_get_view_id($post_id);
 
 		} else {
 
@@ -232,7 +232,7 @@ 
 		}
 
 		// The inline content has $_POST['type'] set to "embed", while the "Add Media" modal doesn't set that.
-		$this->is_full_oembed_preview = ( isset( $_POST['action'] ) && $_POST['action'] === 'parse-embed' && !isset( $_POST['type'] ) );
+		$this->is_full_oembed_preview = (isset($_POST['action']) && $_POST['action'] === 'parse-embed' && !isset($_POST['type']));
 	}
 
 	/**
@@ -244,15 +244,15 @@ 
 	 * @param array $rawattr The original unmodified attributes.
 	 * @return string The embed HTML.
 	 */
-	private function render_admin( $matches, $attr, $url, $rawattr ) {
+	private function render_admin($matches, $attr, $url, $rawattr) {
 		global $wp_version;
 
 		// Floaty the astronaut
 		$image = GravityView_Admin::get_floaty();
 
-		$embed_heading = sprintf( esc_html__('Embed Entry %d', 'gravityview'), $this->entry_id );
+		$embed_heading = sprintf(esc_html__('Embed Entry %d', 'gravityview'), $this->entry_id);
 
-		$embed_text = sprintf( esc_html__('This entry will be displayed as it is configured in View %d', 'gravityview'), $this->view_id );
+		$embed_text = sprintf(esc_html__('This entry will be displayed as it is configured in View %d', 'gravityview'), $this->view_id);
 
 		return '
 		<div class="loading-placeholder" style="background-color:#e6f0f5;">
@@ -268,21 +268,21 @@ 
 	private function generate_entry_output() {
 
 		// Tell get_gravityview() to display a single entry
-		add_filter( 'gravityview/is_single_entry', array( $this, 'set_single_entry_id' ) );
+		add_filter('gravityview/is_single_entry', array($this, 'set_single_entry_id'));
 
 		ob_start();
 
 		// Print the entry as configured in View
-		the_gravityview( $this->view_id );
+		the_gravityview($this->view_id);
 
 		$view_html = ob_get_clean();
 
 		// Clean up the filter
-		remove_filter( 'gravityview/is_single_entry', array( $this, 'set_single_entry_id' ) );
+		remove_filter('gravityview/is_single_entry', array($this, 'set_single_entry_id'));
 
 		// Strip the new lines that are generated--when editing an entry in particular, scripts are printed that
 		// then are passed through wpautop() and everything looks terrible.
-		$view_html = str_replace( "\n", ' ', $view_html );
+		$view_html = str_replace("\n", ' ', $view_html);
 
 		return $view_html;
 	}
@@ -296,7 +296,7 @@ 
 	 *
 	 * @return int The current entry ID
 	 */
-	public function set_single_entry_id( $is_single_entry = false ) {
+	public function set_single_entry_id($is_single_entry = false) {
 
 		return $this->entry_id;
 	}
@@ -310,17 +310,17 @@ 
 	 * @param array $rawattr The original unmodified attributes.
 	 * @return string The embed HTML.
 	 */
-	private function render_frontend( $matches, $attr, $url, $rawattr ) {
+	private function render_frontend($matches, $attr, $url, $rawattr) {
 
 		// If it's already been parsed, don't re-output it.
-		if( !empty( $this->output[ $this->entry_id ] ) ) {
-			return $this->output[ $this->entry_id ];
+		if (!empty($this->output[$this->entry_id])) {
+			return $this->output[$this->entry_id];
 		}
 
 		$entry_output = $this->generate_entry_output();
 
 		// Wrap a container div around the output to allow for custom styling
-		$output = sprintf('<div class="gravityview-oembed gravityview-oembed-entry gravityview-oembed-entry-'.$this->entry_id.'">%s</div>', $entry_output );
+		$output = sprintf('<div class="gravityview-oembed gravityview-oembed-entry gravityview-oembed-entry-'.$this->entry_id.'">%s</div>', $entry_output);
 
 		/**
 		 * @filter `gravityview/oembed/entry` Filter the output of the oEmbed entry embed
@@ -333,13 +333,13 @@ 
 		 *  @var string $url The original URL that was matched by the regex. \n
 		 *  @var array $rawattr The original unmodified attributes.
 		 */
-		$output = apply_filters('gravityview/oembed/entry', $output, $this, compact( $entry_output, $matches, $attr, $url, $rawattr ) );
+		$output = apply_filters('gravityview/oembed/entry', $output, $this, compact($entry_output, $matches, $attr, $url, $rawattr));
 
-		unset( $entry_output );
+		unset($entry_output);
 
-		$this->output[ $this->entry_id ] = $output;
+		$this->output[$this->entry_id] = $output;
 
-		return $this->output[ $this->entry_id ];
+		return $this->output[$this->entry_id];
 
 	}
 

includes/class-post-types.php

Spacing +37 added lines, -37 removed lines

@@ -17,10 +17,10 @@ 
 
 		// Load custom post types. It's a static method.
 		// Load even when invalid to allow for export
-		add_action( 'init', array( 'GravityView_Post_Types', 'init_post_types' ) );
+		add_action('init', array('GravityView_Post_Types', 'init_post_types'));
 
-		if( GravityView_Compatibility::is_valid() ) {
-			add_action( 'init', array( 'GravityView_Post_Types', 'init_rewrite' ) );
+		if (GravityView_Compatibility::is_valid()) {
+			add_action('init', array('GravityView_Post_Types', 'init_rewrite'));
 		}
 	}
 
@@ -39,11 +39,11 @@ 
 		 * @since 1.13
 		 * @param boolean $is_hierarchical Default: false
 		 */
-		$is_hierarchical = (bool)apply_filters( 'gravityview_is_hierarchical', false );
+		$is_hierarchical = (bool)apply_filters('gravityview_is_hierarchical', false);
 
-		$supports = array( 'title', 'revisions' );
+		$supports = array('title', 'revisions');
 
-		if( $is_hierarchical ) {
+		if ($is_hierarchical) {
 			$supports[] = 'page-attributes';
 		}
 
@@ -54,30 +54,30 @@ 
 		 * @param array $supports Array of features associated with a functional area of the edit screen. Default: 'title', 'revisions'. If $is_hierarchical, also 'page-attributes'
 		 * @param[in] boolean $is_hierarchical Do Views support parent/child relationships? See `gravityview_is_hierarchical` filter.
 		 */
-		$supports = apply_filters( 'gravityview_post_type_support', $supports, $is_hierarchical );
+		$supports = apply_filters('gravityview_post_type_support', $supports, $is_hierarchical);
 
 		//Register Custom Post Type - gravityview
 		$labels = array(
-			'name'                => _x( 'Views', 'Post Type General Name', 'gravityview' ),
-			'singular_name'       => _x( 'View', 'Post Type Singular Name', 'gravityview' ),
-			'menu_name'           => _x( 'Views', 'Menu name', 'gravityview' ),
-			'parent_item_colon'   => __( 'Parent View:', 'gravityview' ),
-			'all_items'           => __( 'All Views', 'gravityview' ),
-			'view_item'           => _x( 'View', 'View Item', 'gravityview' ),
-			'add_new_item'        => __( 'Add New View', 'gravityview' ),
-			'add_new'             => __( 'New View', 'gravityview' ),
-			'edit_item'           => __( 'Edit View', 'gravityview' ),
-			'update_item'         => __( 'Update View', 'gravityview' ),
-			'search_items'        => __( 'Search Views', 'gravityview' ),
+			'name'                => _x('Views', 'Post Type General Name', 'gravityview'),
+			'singular_name'       => _x('View', 'Post Type Singular Name', 'gravityview'),
+			'menu_name'           => _x('Views', 'Menu name', 'gravityview'),
+			'parent_item_colon'   => __('Parent View:', 'gravityview'),
+			'all_items'           => __('All Views', 'gravityview'),
+			'view_item'           => _x('View', 'View Item', 'gravityview'),
+			'add_new_item'        => __('Add New View', 'gravityview'),
+			'add_new'             => __('New View', 'gravityview'),
+			'edit_item'           => __('Edit View', 'gravityview'),
+			'update_item'         => __('Update View', 'gravityview'),
+			'search_items'        => __('Search Views', 'gravityview'),
 			'not_found'           => self::no_views_text(),
-			'not_found_in_trash'  => __( 'No Views found in Trash', 'gravityview' ),
-			'filter_items_list'     => __( 'Filter Views list', 'gravityview' ),
-			'items_list_navigation' => __( 'Views list navigation', 'gravityview' ),
-			'items_list'            => __( 'Views list', 'gravityview' ),
+			'not_found_in_trash'  => __('No Views found in Trash', 'gravityview'),
+			'filter_items_list'     => __('Filter Views list', 'gravityview'),
+			'items_list_navigation' => __('Views list navigation', 'gravityview'),
+			'items_list'            => __('Views list', 'gravityview'),
 		);
 		$args = array(
-			'label'               => __( 'view', 'gravityview' ),
-			'description'         => __( 'Create views based on a Gravity Forms form', 'gravityview' ),
+			'label'               => __('view', 'gravityview'),
+			'description'         => __('Create views based on a Gravity Forms form', 'gravityview'),
 			'labels'              => $labels,
 			'supports'            => $supports,
 			'hierarchical'        => $is_hierarchical,
@@ -88,7 +88,7 @@ 
 			 * @param[in,out] boolean `true`: allow Views to be accessible directly. `false`: Only allow Views to be embedded via shortcode. Default: `true`
 			 * @param int $view_id The ID of the View currently being requested. `0` for general setting
 			 */
-			'public'              => apply_filters( 'gravityview_direct_access', GravityView_Compatibility::is_valid(), 0 ),
+			'public'              => apply_filters('gravityview_direct_access', GravityView_Compatibility::is_valid(), 0),
 			'show_ui'             => GravityView_Compatibility::is_valid(),
 			'show_in_menu'        => GravityView_Compatibility::is_valid(),
 			'show_in_nav_menus'   => true,
@@ -101,7 +101,7 @@ 
 			 * @since 1.7.3
 			 * @param boolean False: don't have frontend archive; True: yes, have archive. Default: false
 			 */
-			'has_archive'         => apply_filters( 'gravityview_has_archive', false ),
+			'has_archive'         => apply_filters('gravityview_has_archive', false),
 			'exclude_from_search' => true,
 			'rewrite'             => array(
 				/**
@@ -109,13 +109,13 @@ 
 				 * @see http://docs.gravityview.co/article/62-changing-the-view-slug
 				 * @param string $slug The slug shown in the URL
 				 */
-				'slug' => apply_filters( 'gravityview_slug', 'view' )
+				'slug' => apply_filters('gravityview_slug', 'view')
 			),
 			'capability_type'     => 'gravityview',
 			'map_meta_cap'        => true,
 		);
 
-		register_post_type( 'gravityview', $args );
+		register_post_type('gravityview', $args);
 
 	}
 
@@ -131,7 +131,7 @@ 
 		$endpoint = self::get_entry_var_name();
 
 		//add_permastruct( "{$endpoint}", $endpoint.'/%'.$endpoint.'%/?', true);
-		add_rewrite_endpoint( "{$endpoint}", EP_ALL );
+		add_rewrite_endpoint("{$endpoint}", EP_ALL);
 	}
 
 	/**
@@ -147,9 +147,9 @@ 
 		 * @filter `gravityview_directory_endpoint` Change the slug used for single entries
 		 * @param[in,out] string $endpoint Slug to use when accessing single entry. Default: `entry`
 		 */
-		$endpoint = apply_filters( 'gravityview_directory_endpoint', 'entry' );
+		$endpoint = apply_filters('gravityview_directory_endpoint', 'entry');
 
-		return sanitize_title( $endpoint );
+		return sanitize_title($endpoint);
 	}
 
 	/**
@@ -159,20 +159,20 @@ 
 	 */
 	static function no_views_text() {
 
-		if( !class_exists( 'GravityView_Admin' ) ) {
-			require_once( GRAVITYVIEW_DIR .'includes/class-admin.php' );
+		if (!class_exists('GravityView_Admin')) {
+			require_once(GRAVITYVIEW_DIR.'includes/class-admin.php');
 		}
 
 		// Floaty the astronaut
 		$image = GravityView_Admin::get_floaty();
 
-		if( GVCommon::has_cap( 'edit_gravityviews' ) ) {
-			$output = sprintf( esc_attr__( "%sYou don't have any active views. Let&rsquo;s go %screate one%s!%s\n\nIf you feel like you're lost in space and need help getting started, check out the %sGetting Started%s page.", 'gravityview' ), '<h3>', '<a href="' . admin_url( 'post-new.php?post_type=gravityview' ) . '">', '</a>', '</h3>', '<a href="' . admin_url( 'edit.php?post_type=gravityview&page=gv-getting-started' ) . '">', '</a>' );
+		if (GVCommon::has_cap('edit_gravityviews')) {
+			$output = sprintf(esc_attr__("%sYou don't have any active views. Let&rsquo;s go %screate one%s!%s\n\nIf you feel like you're lost in space and need help getting started, check out the %sGetting Started%s page.", 'gravityview'), '<h3>', '<a href="'.admin_url('post-new.php?post_type=gravityview').'">', '</a>', '</h3>', '<a href="'.admin_url('edit.php?post_type=gravityview&page=gv-getting-started').'">', '</a>');
 		} else {
-			$output = esc_attr__( 'There are no active Views', 'gravityview' );
+			$output = esc_attr__('There are no active Views', 'gravityview');
 		}
 
-		return $image . wpautop( $output );
+		return $image.wpautop($output);
 	}
 
 

includes/connector-functions.php

Spacing +53 added lines, -53 removed lines

@@ -21,8 +21,8 @@ 
  * @param mixed $form_id
  * @return mixed False: no form ID specified or Gravity Forms isn't active. Array: Form returned from Gravity Forms
  */
-function gravityview_get_form( $form_id ) {
-	return GVCommon::get_form( $form_id );
+function gravityview_get_form($form_id) {
+	return GVCommon::get_form($form_id);
 }
 
 
@@ -32,8 +32,8 @@ 
  * @param  int|string $entry_slug Entry slug
  * @return array           Gravity Forms form array
  */
-function gravityview_get_form_from_entry_id( $entry_slug ) {
-	return GVCommon::get_form_from_entry_id( $entry_slug );
+function gravityview_get_form_from_entry_id($entry_slug) {
+	return GVCommon::get_form_from_entry_id($entry_slug);
 }
 
 /**
@@ -56,8 +56,8 @@ 
  * @param string|array $form_id (default: '') or $form object
  * @return array
  */
-function gravityview_get_form_fields( $form = '', $add_default_properties = false, $include_parent_field = true ) {
-	return GVCommon::get_form_fields( $form, $add_default_properties, $include_parent_field );
+function gravityview_get_form_fields($form = '', $add_default_properties = false, $include_parent_field = true) {
+	return GVCommon::get_form_fields($form, $add_default_properties, $include_parent_field);
 }
 
 /**
@@ -65,8 +65,8 @@ 
  * @param  string $form_id (default: '')
  * @return array
  */
-function gravityview_get_entry_meta( $form_id, $only_default_column = true ) {
-	return GVCommon::get_entry_meta( $form_id, $only_default_column );
+function gravityview_get_entry_meta($form_id, $only_default_column = true) {
+	return GVCommon::get_entry_meta($form_id, $only_default_column);
 }
 
 /**
@@ -77,8 +77,8 @@ 
  * @since  1.1.6
  * @return array          Array of entry IDs
  */
-function gravityview_get_entry_ids( $form_id, $search_criteria = array() ) {
-	return GVCommon::get_entry_ids( $form_id, $search_criteria );
+function gravityview_get_entry_ids($form_id, $search_criteria = array()) {
+	return GVCommon::get_entry_ids($form_id, $search_criteria);
 }
 
 
@@ -93,8 +93,8 @@ 
  * @param mixed &$total (default: null)
  * @return mixed False: Error fetching entries. Array: Multi-dimensional array of Gravity Forms entry arrays
  */
-function gravityview_get_entries( $form_ids = null, $passed_criteria = null, &$total = null ) {
-	return GVCommon::get_entries( $form_ids, $passed_criteria, $total );
+function gravityview_get_entries($form_ids = null, $passed_criteria = null, &$total = null) {
+	return GVCommon::get_entries($form_ids, $passed_criteria, $total);
 }
 
 /**
@@ -108,8 +108,8 @@ 
  * @param boolean $check_entry_display Check whether the entry is visible for the current View configuration. Default: true {@since 1.14}
  * @return array|boolean
  */
-function gravityview_get_entry( $entry_slug, $force_allow_ids = false, $check_entry_display = true ) {
-	return GVCommon::get_entry( $entry_slug, $force_allow_ids, $check_entry_display );
+function gravityview_get_entry($entry_slug, $force_allow_ids = false, $check_entry_display = true) {
+	return GVCommon::get_entry($entry_slug, $force_allow_ids, $check_entry_display);
 }
 
 /**
@@ -120,8 +120,8 @@ 
  * @param mixed $field_id
  * @return string
  */
-function gravityview_get_field_label( $form, $field_id ) {
-	return GVCommon::get_field_label( $form, $field_id );
+function gravityview_get_field_label($form, $field_id) {
+	return GVCommon::get_field_label($form, $field_id);
 }
 
 
@@ -137,8 +137,8 @@ 
  * @param string|int $field_id
  * @return array
  */
-function gravityview_get_field( $form, $field_id ) {
-	return GVCommon::get_field( $form, $field_id );
+function gravityview_get_field($form, $field_id) {
+	return GVCommon::get_field($form, $field_id);
 }
 
 
@@ -151,16 +151,16 @@ 
  * @param  WP_Post      $post WordPress post object
  * @return boolean           True: yep, GravityView; No: not!
  */
-function has_gravityview_shortcode( $post = NULL ) {
-	return GVCommon::has_gravityview_shortcode( $post );
+function has_gravityview_shortcode($post = NULL) {
+	return GVCommon::has_gravityview_shortcode($post);
 }
 
 /**
  * Placeholder until the recursive has_shortcode() patch is merged
  * @see https://core.trac.wordpress.org/ticket/26343#comment:10
  */
-function gravityview_has_shortcode_r( $content, $tag = 'gravityview' ) {
-	return GVCommon::has_shortcode_r( $content, $tag );
+function gravityview_has_shortcode_r($content, $tag = 'gravityview') {
+	return GVCommon::has_shortcode_r($content, $tag);
 }
 
 /**
@@ -168,8 +168,8 @@ 
  * @param  int $form_id Gravity Forms form ID
  * @return array          Array with view details
  */
-function gravityview_get_connected_views( $form_id ) {
-	return GVCommon::get_connected_views( $form_id );
+function gravityview_get_connected_views($form_id) {
+	return GVCommon::get_connected_views($form_id);
 }
 
 /**
@@ -179,8 +179,8 @@ 
  *
  * @return int
  */
-function gravityview_get_form_id( $view_id ) {
-	return GVCommon::get_meta_form_id( $view_id );
+function gravityview_get_form_id($view_id) {
+	return GVCommon::get_meta_form_id($view_id);
 }
 
 /**
@@ -192,8 +192,8 @@ 
  *
  * @return string GravityView_Template::template_id value. Empty string if not.
  */
-function gravityview_get_template_id( $post_id ) {
-	return GVCommon::get_meta_template_id( $post_id );
+function gravityview_get_template_id($post_id) {
+	return GVCommon::get_meta_template_id($post_id);
 }
 
 /**
@@ -203,8 +203,8 @@ 
  * @param  int $post_id View ID
  * @return array          Associative array of settings with plugin defaults used if not set by the View
  */
-function gravityview_get_template_settings( $post_id ) {
-	return GVCommon::get_template_settings( $post_id );
+function gravityview_get_template_settings($post_id) {
+	return GVCommon::get_template_settings($post_id);
 }
 
 /**
@@ -216,8 +216,8 @@ 
  * @param  string $key     Key for the setting
  * @return mixed|null          Setting value, or NULL if not set.
  */
-function gravityview_get_template_setting( $post_id, $key ) {
-	return GVCommon::get_template_setting( $post_id, $key );
+function gravityview_get_template_setting($post_id, $key) {
+	return GVCommon::get_template_setting($post_id, $key);
 }
 
 /**
@@ -231,7 +231,7 @@ 
 	 * @filter `gravityview_register_directory_template` Fetch available View templates
 	 * @param array $templates Templates to show
 	 */
-	$templates = apply_filters( 'gravityview_register_directory_template', array() );
+	$templates = apply_filters('gravityview_register_directory_template', array());
 
 	return $templates;
 }
@@ -266,8 +266,8 @@ 
  * @param  int $post_id View ID
  * @return array          Multi-array of fields with first level being the field zones. See code comment.
  */
-function gravityview_get_directory_fields( $post_id ) {
-	return GVCommon::get_directory_fields( $post_id );
+function gravityview_get_directory_fields($post_id) {
+	return GVCommon::get_directory_fields($post_id);
 }
 
 /**
@@ -278,8 +278,8 @@ 
  * @param string $current Field ID of field used to sort
  * @return string         html
  */
-function gravityview_get_sortable_fields( $formid, $current = '' ) {
-	return GVCommon::get_sortable_fields( $formid, $current );
+function gravityview_get_sortable_fields($formid, $current = '') {
+	return GVCommon::get_sortable_fields($formid, $current);
 }
 
 
@@ -289,8 +289,8 @@ 
  * @param  mixed $field_id Field ID or Field array
  * @return string field type
  */
-function gravityview_get_field_type(  $form = null , $field_id = '' ) {
-	return GVCommon::get_field_type(  $form, $field_id );
+function gravityview_get_field_type($form = null, $field_id = '') {
+	return GVCommon::get_field_type($form, $field_id);
 }
 
 
@@ -302,15 +302,15 @@ 
  * @param array $atts (default: array())
  * @return string HTML of the output. Empty string if $view_id is empty.
  */
-function get_gravityview( $view_id = '', $atts = array() ) {
-	if( !empty( $view_id ) ) {
+function get_gravityview($view_id = '', $atts = array()) {
+	if (!empty($view_id)) {
 		$atts['id'] = $view_id;
-		$args = wp_parse_args( $atts, GravityView_View_Data::get_default_args() );
+		$args = wp_parse_args($atts, GravityView_View_Data::get_default_args());
 		$GravityView_frontend = GravityView_frontend::getInstance();
-		$GravityView_frontend->setGvOutputData( GravityView_View_Data::getInstance( $view_id ) );
-		$GravityView_frontend->set_context_view_id( $view_id );
+		$GravityView_frontend->setGvOutputData(GravityView_View_Data::getInstance($view_id));
+		$GravityView_frontend->set_context_view_id($view_id);
 		$GravityView_frontend->set_entry_data();
-		return $GravityView_frontend->render_view( $args );
+		return $GravityView_frontend->render_view($args);
 	}
 	return '';
 }
@@ -323,8 +323,8 @@ 
  * @param array $atts (default: array())
  * @return void
  */
-function the_gravityview( $view_id = '', $atts = array() ) {
-	echo get_gravityview( $view_id, $atts );
+function the_gravityview($view_id = '', $atts = array()) {
+	echo get_gravityview($view_id, $atts);
 }
 
 
@@ -345,17 +345,17 @@ 
  * @param array $form Gravity Forms form
  * @param array $view_fields GravityView fields array
  */
-function gravityview_view_has_single_checkbox_or_radio( $form, $view_fields ) {
+function gravityview_view_has_single_checkbox_or_radio($form, $view_fields) {
 
-	if( $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) {
+	if ($form_fields = GFFormsModel::get_fields_by_type($form, array('checkbox', 'radio'))) {
 
 		/** @var GF_Field_Radio|GF_Field_Checkbox $form_field */
-		foreach( $form_fields as $form_field ) {
+		foreach ($form_fields as $form_field) {
 			$field_id = $form_field->id;
-			foreach( $view_fields as $zone ) {
-				foreach( $zone as $field ) {
+			foreach ($view_fields as $zone) {
+				foreach ($zone as $field) {
 					// If it's an input, not the parent and the parent ID matches a checkbox or radio
-					if( ( strpos( $field['id'], '.' ) > 0 ) && floor( $field['id'] ) === floor( $field_id ) ) {
+					if ((strpos($field['id'], '.') > 0) && floor($field['id']) === floor($field_id)) {
 						return true;
 					}
 				}

includes/default-widgets.php

Spacing +1 added lines, -1 removed lines

@@ -5,4 +5,4 @@
  * @deprecated 1.7.5
  */
 
-include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
+include_once(GRAVITYVIEW_DIR.'includes/widgets/class-gravityview-widget.php');

includes/extensions/delete-entry/class-delete-entry.php

Spacing +120 added lines, -120 removed lines

@@ -12,7 +12,7 @@ 
  * @copyright Copyright 2014, Katz Web Services, Inc.
  */
 
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
 	die;
 }
 
@@ -30,7 +30,7 @@ 
 
 	function __construct() {
 
-		self::$file = plugin_dir_path( __FILE__ );
+		self::$file = plugin_dir_path(__FILE__);
 
 		$this->add_hooks();
 	}
@@ -39,22 +39,22 @@ 
 	 * @since 1.9.2
 	 */
 	private function add_hooks() {
-		add_action( 'wp', array( $this, 'process_delete' ), 10000 );
+		add_action('wp', array($this, 'process_delete'), 10000);
 
-		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field'), 10, 3 );
+		add_filter('gravityview_entry_default_fields', array($this, 'add_default_field'), 10, 3);
 
-		add_action( 'gravityview_before', array( $this, 'display_message' ) );
+		add_action('gravityview_before', array($this, 'display_message'));
 
 		// For the Delete Entry Link, you don't want visible to all users.
-		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps'), 10, 5 );
+		add_filter('gravityview_field_visibility_caps', array($this, 'modify_visibility_caps'), 10, 5);
 
 		// Modify the field options based on the name of the field type
-		add_filter( 'gravityview_template_delete_link_options', array( $this, 'delete_link_field_options' ), 10, 5 );
+		add_filter('gravityview_template_delete_link_options', array($this, 'delete_link_field_options'), 10, 5);
 
 		// add template path to check for field
-		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
+		add_filter('gravityview_template_paths', array($this, 'add_template_path'));
 
-		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button'), 10, 3 );
+		add_action('gravityview/edit-entry/publishing-action/after', array($this, 'add_delete_button'), 10, 3);
 	}
 
 	/**
@@ -65,7 +65,7 @@ 
 	 */
 	static function getInstance() {
 
-		if( empty( self::$instance ) ) {
+		if (empty(self::$instance)) {
 			self::$instance = new self;
 		}
 
@@ -78,11 +78,11 @@ 
 	 * @since  1.5.1
 	 * @param array $file_paths List of template paths ordered
 	 */
-	function add_template_path( $file_paths ) {
+	function add_template_path($file_paths) {
 
 		// Index 100 is the default GravityView template path.
 		// Index 110 is Edit Entry link
-		$file_paths[ 115 ] = self::$file;
+		$file_paths[115] = self::$file;
 
 		return $file_paths;
 	}
@@ -98,17 +98,17 @@ 
 	 * @param  [type] $input_type    [description]
 	 * @return [type]                [description]
 	 */
-	function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
+	function delete_link_field_options($field_options, $template_id, $field_id, $context, $input_type) {
 
 		// Always a link, never a filter
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
+		unset($field_options['show_as_link'], $field_options['search_filter']);
 
 		// Delete Entry link should only appear to visitors capable of editing entries
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
+		unset($field_options['only_loggedin'], $field_options['only_loggedin_cap']);
 
 		$add_option['delete_link'] = array(
 			'type' => 'text',
-			'label' => __( 'Delete Link Text', 'gravityview' ),
+			'label' => __('Delete Link Text', 'gravityview'),
 			'desc' => NULL,
 			'value' => __('Delete Entry', 'gravityview'),
 			'merge_tags' => true,
@@ -116,15 +116,15 @@ 
 
 		$field_options['allow_edit_cap'] = array(
 			'type' => 'select',
-			'label' => __( 'Allow the following users to delete the entry:', 'gravityview' ),
-			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
+			'label' => __('Allow the following users to delete the entry:', 'gravityview'),
+			'choices' => GravityView_Render_Settings::get_cap_choices($template_id, $field_id, $context, $input_type),
 			'tooltip' => 'allow_edit_cap',
 			'class' => 'widefat',
 			'value' => 'read', // Default: entry creator
 		);
 
 
-		return array_merge( $add_option, $field_options );
+		return array_merge($add_option, $field_options);
 	}
 
 
@@ -136,7 +136,7 @@ 
 	 * @param  string|array $form form_ID or form object
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
 	 */
-	function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
+	function add_default_field($entry_default_fields, $form = array(), $zone = '') {
 
 		$entry_default_fields['delete_link'] = array(
 			'label' => __('Delete Entry', 'gravityview'),
@@ -152,10 +152,10 @@ 
 	 * @since 1.5.1
 	 * @param array $available_fields
 	 */
-	function add_available_field( $available_fields = array() ) {
+	function add_available_field($available_fields = array()) {
 
 		$available_fields['delete_link'] = array(
-			'label_text' => __( 'Delete Entry', 'gravityview' ),
+			'label_text' => __('Delete Entry', 'gravityview'),
 			'field_id' => 'delete_link',
 			'label_type' => 'field',
 			'input_type' => 'delete_link',
@@ -177,15 +177,15 @@ 
 	 * @param  string      $input_type  (textarea, list, select, etc.)
 	 * @return array                   Array of field options with `label`, `value`, `type`, `default` keys
 	 */
-	public function modify_visibility_caps( $visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
+	public function modify_visibility_caps($visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '') {
 
 		$caps = $visibility_caps;
 
 		// If we're configuring fields in the edit context, we want a limited selection
-		if( $field_id === 'delete_link' ) {
+		if ($field_id === 'delete_link') {
 
 			// Remove other built-in caps.
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
+			unset($caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts']);
 
 			$caps['read'] = _x('Entry Creator', 'User capability', 'gravityview');
 		}
@@ -199,8 +199,8 @@ 
 	 * @since 1.5.1
 	 * @param [type] $entry [description]
 	 */
-	function set_entry( $entry = null ) {
-		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[0] : $entry;
+	function set_entry($entry = null) {
+		$this->entry = empty($entry) ? GravityView_View::getInstance()->entries[0] : $entry;
 	}
 
 	/**
@@ -210,8 +210,8 @@ 
 	 * @param  int $entry_id Entry ID
 	 * @return string           Key used to validate request
 	 */
-	public static function get_nonce_key( $entry_id ) {
-		return sprintf( 'delete_%s', $entry_id );
+	public static function get_nonce_key($entry_id) {
+		return sprintf('delete_%s', $entry_id);
 	}
 
 
@@ -224,30 +224,30 @@ 
 	 * @param  array      $entry Gravity Forms entry array
 	 * @return string|null             If directory link is valid, the URL to process the delete request. Otherwise, `NULL`.
 	 */
-	public static function get_delete_link( $entry, $view_id = 0, $post_id = null ) {
+	public static function get_delete_link($entry, $view_id = 0, $post_id = null) {
 
-		self::getInstance()->set_entry( $entry );
+		self::getInstance()->set_entry($entry);
 
-        $base = GravityView_API::directory_link( $post_id, true );
+        $base = GravityView_API::directory_link($post_id, true);
 
-		if( empty( $base ) ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' - Post ID does not exist: '.$post_id );
+		if (empty($base)) {
+			do_action('gravityview_log_error', __METHOD__.' - Post ID does not exist: '.$post_id);
 			return NULL;
 		}
 
 		// Use the slug instead of the ID for consistent security
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
+		$entry_slug = GravityView_API::get_entry_slug($entry['id'], $entry);
 
-        $view_id = empty( $view_id ) ? gravityview_get_view_id() : $view_id;
+        $view_id = empty($view_id) ? gravityview_get_view_id() : $view_id;
 
-		$actionurl = add_query_arg( array(
+		$actionurl = add_query_arg(array(
 			'action'	=> 'delete',
 			'entry_id'		=> $entry_slug,
 			'gvid' => $view_id,
             'view_id' => $view_id,
-		), $base );
+		), $base);
 
-		$url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' );
+		$url = wp_nonce_url($actionurl, 'delete_'.$entry_slug, 'delete');
 
 		return $url;
 	}
@@ -261,10 +261,10 @@ 
 	 * @param array $entry   Gravity Forms entry array
 	 * @param int $view_id GravityView View ID
 	 */
-	function add_delete_button( $form = array(), $entry = array(), $view_id = NULL ) {
+	function add_delete_button($form = array(), $entry = array(), $view_id = NULL) {
 
 		// Only show the link to those who are allowed to see it.
-		if( !self::check_user_cap_delete_entry( $entry ) ) {
+		if (!self::check_user_cap_delete_entry($entry)) {
 			return;
 		}
 
@@ -272,10 +272,10 @@ 
 		 * @filter `gravityview/delete-entry/show-delete-button` Should the Delete button be shown in the Edit Entry screen?
 		 * @param boolean $show_entry Default: true
 		 */
-		$show_delete_button = apply_filters( 'gravityview/delete-entry/show-delete-button', true );
+		$show_delete_button = apply_filters('gravityview/delete-entry/show-delete-button', true);
 
 		// If the button is hidden by the filter, don't show.
-		if( !$show_delete_button ) {
+		if (!$show_delete_button) {
 			return;
 		}
 
@@ -285,7 +285,7 @@ 
 			'onclick' => self::get_confirm_dialog(),
 		);
 
-		echo gravityview_get_link( self::get_delete_link( $entry, $view_id ), esc_attr__( 'Delete', 'gravityview' ), $attributes );
+		echo gravityview_get_link(self::get_delete_link($entry, $view_id), esc_attr__('Delete', 'gravityview'), $attributes);
 
 	}
 
@@ -305,39 +305,39 @@ 
 	function process_delete() {
 
 		// If the form is submitted
-		if( RGForms::get("action") === "delete") {
+		if (RGForms::get("action") === "delete") {
 
-			$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
+			$nonce_key = self::get_nonce_key($_GET['entry_id']);
 
 			// Make sure it's a valid request
-			check_admin_referer( $nonce_key, 'delete' );
+			check_admin_referer($nonce_key, 'delete');
 
 			// Get the entry slug
-			$entry_slug = esc_attr( $_GET['entry_id'] );
+			$entry_slug = esc_attr($_GET['entry_id']);
 
 			// See if there's an entry there
-			$entry = gravityview_get_entry( $entry_slug );
+			$entry = gravityview_get_entry($entry_slug);
 
-			if( $entry ) {
+			if ($entry) {
 
-				$has_permission = $this->user_can_delete_entry( $entry );
+				$has_permission = $this->user_can_delete_entry($entry);
 
-				if( is_wp_error( $has_permission ) ) {
+				if (is_wp_error($has_permission)) {
 
 					$messages = array(
-						'message' => urlencode( $has_permission->get_error_message() ),
+						'message' => urlencode($has_permission->get_error_message()),
 						'status' => 'error',
 					);
 
 				} else {
 
 					// Delete the entry
-					$delete_response = $this->delete_or_trash_entry( $entry['id'] );
+					$delete_response = $this->delete_or_trash_entry($entry['id']);
 
-					if( is_wp_error( $delete_response ) ) {
+					if (is_wp_error($delete_response)) {
 
 						$messages = array(
-							'message' => urlencode( $delete_response->get_error_message() ),
+							'message' => urlencode($delete_response->get_error_message()),
 							'status' => 'error',
 						);
 
@@ -353,18 +353,18 @@ 
 
 			} else {
 
-				do_action('gravityview_log_debug', __METHOD__ . ' Delete entry failed: there was no entry with the entry slug '. $entry_slug );
+				do_action('gravityview_log_debug', __METHOD__.' Delete entry failed: there was no entry with the entry slug '.$entry_slug);
 
 				$messages = array(
-					'message' => urlencode( __('The entry does not exist.', 'gravityview') ),
+					'message' => urlencode(__('The entry does not exist.', 'gravityview')),
 					'status' => 'error',
 				);
 			}
 
-			$redirect_to_base = esc_url_raw( remove_query_arg( array( 'action' ) ) );
-			$redirect_to = add_query_arg( $messages, $redirect_to_base );
+			$redirect_to_base = esc_url_raw(remove_query_arg(array('action')));
+			$redirect_to = add_query_arg($messages, $redirect_to_base);
 
-			wp_safe_redirect( $redirect_to );
+			wp_safe_redirect($redirect_to);
 
 			exit();
 
@@ -384,9 +384,9 @@ 
 		 * @since 1.13.1
 		 * @param string $delete_mode Delete mode: `trash` or `delete`. Default: `delete`
 		 */
-		$delete_mode = apply_filters( 'gravityview/delete-entry/mode', 'delete' );
+		$delete_mode = apply_filters('gravityview/delete-entry/mode', 'delete');
 
-		return ( 'trash' === $delete_mode ) ? 'trash' : 'delete';
+		return ('trash' === $delete_mode) ? 'trash' : 'delete';
 	}
 
 	/**
@@ -394,37 +394,37 @@ 
 	 * @see GFAPI::delete_entry()
 	 * @return WP_Error|boolean GFAPI::delete_entry() returns a WP_Error on error
 	 */
-	private function delete_or_trash_entry( $entry_id ) {
+	private function delete_or_trash_entry($entry_id) {
 
 		$mode = $this->get_delete_mode();
 
-		if( 'delete' === $mode ) {
+		if ('delete' === $mode) {
 
-			do_action( 'gravityview_log_debug', __METHOD__ . ' Starting delete entry: ', $entry_id );
+			do_action('gravityview_log_debug', __METHOD__.' Starting delete entry: ', $entry_id);
 
 			// Delete the entry
-			$delete_response = GFAPI::delete_entry( $entry_id );
+			$delete_response = GFAPI::delete_entry($entry_id);
 
-			if( ! is_wp_error( $delete_response ) ) {
+			if (!is_wp_error($delete_response)) {
 				$delete_response = 'deleted';
 			}
 
-			do_action( 'gravityview_log_debug', __METHOD__ . ' Delete response: ', $delete_response );
+			do_action('gravityview_log_debug', __METHOD__.' Delete response: ', $delete_response);
 
 		} else {
 
-			do_action( 'gravityview_log_debug', __METHOD__ . ' Starting trash entry: ', $entry_id );
+			do_action('gravityview_log_debug', __METHOD__.' Starting trash entry: ', $entry_id);
 
-			$trashed = GFAPI::update_entry_property( $entry_id, 'status', 'trash' );
+			$trashed = GFAPI::update_entry_property($entry_id, 'status', 'trash');
 			new GravityView_Cache;
 
-			if( ! $trashed ) {
-				$delete_response = new WP_Error( 'trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview' ) );
+			if (!$trashed) {
+				$delete_response = new WP_Error('trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview'));
 			} else {
 				$delete_response = 'trashed';
 			}
 
-			do_action( 'gravityview_log_debug', __METHOD__ . ' Trashed? ', $delete_response );
+			do_action('gravityview_log_debug', __METHOD__.' Trashed? ', $delete_response);
 		}
 
 		return $delete_response;
@@ -439,13 +439,13 @@ 
 	public function verify_nonce() {
 
 		// No delete entry request was made
-		if( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
+		if (empty($_GET['entry_id']) || empty($_GET['delete'])) {
 			return false;
 		}
 
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
+		$nonce_key = self::get_nonce_key($_GET['entry_id']);
 
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
+		$valid = wp_verify_nonce($_GET['delete'], $nonce_key);
 
 		/**
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -454,7 +454,7 @@ 
 		 * @param int|boolean $valid False if invalid; 1 or 2 when nonce was generated
 		 * @param string $nonce_key Name of nonce action used in wp_verify_nonce. $_GET['delete'] holds the nonce value itself. Default: `delete_{entry_id}`
 		 */
-		$valid = apply_filters( 'gravityview/delete-entry/verify_nonce', $valid, $nonce_key );
+		$valid = apply_filters('gravityview/delete-entry/verify_nonce', $valid, $nonce_key);
 
 		return $valid;
 	}
@@ -473,9 +473,9 @@ 
 		 * @filter `gravityview/delete-entry/confirm-text` Modify the Delete Entry Javascript confirmation text
 		 * @param string $confirm Default: "Are you sure you want to delete this entry? This cannot be undone."
 		 */
-		$confirm = apply_filters( 'gravityview/delete-entry/confirm-text', $confirm );
+		$confirm = apply_filters('gravityview/delete-entry/confirm-text', $confirm);
 
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
+		return 'return window.confirm(\''.esc_js($confirm).'\');';
 	}
 
 	/**
@@ -489,34 +489,34 @@ 
 	 * @param  array $entry Gravity Forms entry array
 	 * @return boolean|WP_Error        True: can edit form. WP_Error: nope.
 	 */
-	function user_can_delete_entry( $entry = array() ) {
+	function user_can_delete_entry($entry = array()) {
 
 		$error = NULL;
 
-		if( ! $this->verify_nonce() ) {
-			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview');
+		if (!$this->verify_nonce()) {
+			$error = __('The link to delete this entry is not valid; it may have expired.', 'gravityview');
 		}
 
-		if( ! self::check_user_cap_delete_entry( $entry ) ) {
-			$error = __( 'You do not have permission to delete this entry.', 'gravityview');
+		if (!self::check_user_cap_delete_entry($entry)) {
+			$error = __('You do not have permission to delete this entry.', 'gravityview');
 		}
 
-		if( $entry['status'] === 'trash' ) {
-			if( 'trash' === $this->get_delete_mode() ) {
-				$error = __( 'The entry is already in the trash.', 'gravityview' );
+		if ($entry['status'] === 'trash') {
+			if ('trash' === $this->get_delete_mode()) {
+				$error = __('The entry is already in the trash.', 'gravityview');
 			} else {
-				$error = __( 'You cannot delete the entry; it is already in the trash.', 'gravityview' );
+				$error = __('You cannot delete the entry; it is already in the trash.', 'gravityview');
 			}
 		}
 
 		// No errors; everything's fine here!
-		if( empty( $error ) ) {
+		if (empty($error)) {
 			return true;
 		}
 
-		do_action('gravityview_log_error', 'GravityView_Delete_Entry[user_can_delete_entry]' . $error );
+		do_action('gravityview_log_error', 'GravityView_Delete_Entry[user_can_delete_entry]'.$error);
 
-		return new WP_Error( 'gravityview-delete-entry-permissions', $error );
+		return new WP_Error('gravityview-delete-entry-permissions', $error);
 	}
 
 
@@ -531,77 +531,77 @@ 
 	 * @param int $view_id Pass a View ID to check caps against. If not set, check against current View (optional)
 	 * @return bool
 	 */
-	public static function check_user_cap_delete_entry( $entry, $field = array(), $view_id = 0 ) {
+	public static function check_user_cap_delete_entry($entry, $field = array(), $view_id = 0) {
 		$gravityview_view = GravityView_View::getInstance();
 
 		$current_user = wp_get_current_user();
 
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL;
+		$entry_id = isset($entry['id']) ? $entry['id'] : NULL;
 
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
-		if( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
+		if (GVCommon::has_cap(array('gravityforms_delete_entries', 'gravityview_delete_others_entries'), $entry_id)) {
 
-			do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' );
+			do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.');
 
 			return true;
 		}
 
 
 		// If field options are passed, check if current user can view the link
-		if( !empty( $field ) ) {
+		if (!empty($field)) {
 
 			// If capability is not defined, something is not right!
-			if( empty( $field['allow_edit_cap'] ) ) {
+			if (empty($field['allow_edit_cap'])) {
 
-				do_action( 'gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Cannot read delete entry field caps', $field );
+				do_action('gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Cannot read delete entry field caps', $field);
 
 				return false;
 			}
 
-			if( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
+			if (GVCommon::has_cap($field['allow_edit_cap'])) {
 
 				// Do not return true if cap is read, as we need to check if the current user created the entry
-				if( $field['allow_edit_cap'] !== 'read' ) {
+				if ($field['allow_edit_cap'] !== 'read') {
 					return true;
 				}
 
 			} else {
 
-				do_action( 'gravityview_log_debug', sprintf( 'GravityView_Delete_Entry[check_user_cap_delete_entry] User %s is not authorized to view delete entry link ', $current_user->ID ) );
+				do_action('gravityview_log_debug', sprintf('GravityView_Delete_Entry[check_user_cap_delete_entry] User %s is not authorized to view delete entry link ', $current_user->ID));
 
 				return false;
 			}
 
 		}
 
-		if( !isset( $entry['created_by'] ) ) {
+		if (!isset($entry['created_by'])) {
 
 			do_action('gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Entry `created_by` doesn\'t exist.');
 
 			return false;
 		}
 
-		$view_id = empty( $view_id ) ? $gravityview_view->getViewId() : $view_id;
+		$view_id = empty($view_id) ? $gravityview_view->getViewId() : $view_id;
 
 		// Only checks user_delete view option if view is already set
-		if( $view_id ) {
+		if ($view_id) {
 
-			$current_view = gravityview_get_current_view_data( $view_id );
+			$current_view = gravityview_get_current_view_data($view_id);
 
-			$user_delete = isset( $current_view['atts']['user_delete'] ) ? $current_view['atts']['user_delete'] : false;
+			$user_delete = isset($current_view['atts']['user_delete']) ? $current_view['atts']['user_delete'] : false;
 
-			if( empty( $user_delete ) ) {
+			if (empty($user_delete)) {
 
-				do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] User Delete is disabled. Returning false.' );
+				do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] User Delete is disabled. Returning false.');
 
 				return false;
 			}
 		}
 
 		// If the logged-in user is the same as the user who created the entry, we're good.
-		if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
+		if (is_user_logged_in() && intval($current_user->ID) === intval($entry['created_by'])) {
 
-			do_action('gravityview_log_debug', sprintf( 'GravityView_Delete_Entry[check_user_cap_delete_entry] User %s created the entry.', $current_user->ID ) );
+			do_action('gravityview_log_debug', sprintf('GravityView_Delete_Entry[check_user_cap_delete_entry] User %s created the entry.', $current_user->ID));
 
 			return true;
 		}
@@ -622,27 +622,27 @@ 
 	 * @param int $current_view_id The ID of the View being rendered
 	 * @return void
 	 */
-	public function display_message( $current_view_id = 0 ) {
+	public function display_message($current_view_id = 0) {
 
-		if( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
+		if (empty($_GET['status']) || !self::verify_nonce()) {
 			return;
 		}
 
 		// Entry wasn't deleted from current View
-		if( intval( $_GET['gvid'] ) !== intval( $current_view_id ) ) {
+		if (intval($_GET['gvid']) !== intval($current_view_id)) {
 			return;
 		}
 
-		$status = esc_attr( $_GET['status'] );
+		$status = esc_attr($_GET['status']);
 		$message_from_url = rgget('message');
-		$message_from_url = urldecode( stripslashes_deep( $message_from_url ) );
+		$message_from_url = urldecode(stripslashes_deep($message_from_url));
 		$class = '';
 
-		switch ( $status ) {
+		switch ($status) {
 			case 'error':
 				$class = ' gv-error error';
 				$error_message = __('There was an error deleting the entry: %s', 'gravityview');
-				$message = sprintf( $error_message, $message_from_url );
+				$message = sprintf($error_message, $message_from_url);
 				break;
 			case 'trashed':
 				$message = __('The entry was successfully moved to the trash.', 'gravityview');
@@ -659,10 +659,10 @@ 
 		 * @param string $status Message status (`error` or `success`)
 		 * @param string $message_from_url The original error message, if any, without the "There was an error deleting the entry:" prefix
 		 */
-		$message = apply_filters( 'gravityview/delete-entry/message', esc_attr( $message ), $status, $message_from_url );
+		$message = apply_filters('gravityview/delete-entry/message', esc_attr($message), $status, $message_from_url);
 
 		// DISPLAY ERROR/SUCCESS MESSAGE
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
+		echo '<div class="gv-notice'.esc_attr($class).'">'.$message.'</div>';
 	}
 
 

includes/extensions/delete-entry/fields/delete_link.php

Spacing +6 added lines, -6 removed lines

@@ -4,21 +4,21 @@
 
 $view_id = $gravityview_view->getViewId();
 
-extract( $gravityview_view->getCurrentField() );
+extract($gravityview_view->getCurrentField());
 
 // Only show the link to logged-in users with the rigth caps.
-if( !GravityView_Delete_Entry::check_user_cap_delete_entry( $entry, $field_settings ) ) {
+if (!GravityView_Delete_Entry::check_user_cap_delete_entry($entry, $field_settings)) {
 	return;
 }
 
-$link_text = empty( $field_settings['delete_link'] ) ? __('Delete Entry', 'gravityview') : $field_settings['delete_link'];
+$link_text = empty($field_settings['delete_link']) ? __('Delete Entry', 'gravityview') : $field_settings['delete_link'];
 
-$link_text = apply_filters( 'gravityview_entry_link', GravityView_API::replace_variables( $link_text, $form, $entry ) );
+$link_text = apply_filters('gravityview_entry_link', GravityView_API::replace_variables($link_text, $form, $entry));
 
-$href = GravityView_Delete_Entry::get_delete_link( $entry, $view_id );
+$href = GravityView_Delete_Entry::get_delete_link($entry, $view_id);
 
 $attributes = array(
 	'onclick' => GravityView_Delete_Entry::get_confirm_dialog()
 );
 
-echo gravityview_get_link( $href, $link_text, $attributes );
+echo gravityview_get_link($href, $link_text, $attributes);