gravityview / GravityView

includes/class-ajax.php

Spacing +110 added lines, -110 removed lines

@@ -5,21 +5,21 @@ 
 	function __construct() {
 
 		//get field options
-		add_action( 'wp_ajax_gv_field_options', array( $this, 'get_field_options' ) );
+		add_action('wp_ajax_gv_field_options', array($this, 'get_field_options'));
 
 		// get available fields
-		add_action( 'wp_ajax_gv_available_fields', array( $this, 'get_available_fields_html' ) );
+		add_action('wp_ajax_gv_available_fields', array($this, 'get_available_fields_html'));
 
 		// get active areas
-		add_action( 'wp_ajax_gv_get_active_areas', array( $this, 'get_active_areas' ) );
+		add_action('wp_ajax_gv_get_active_areas', array($this, 'get_active_areas'));
 
 		// get preset fields
-		add_action( 'wp_ajax_gv_get_preset_fields', array( $this, 'get_preset_fields_config' ) );
+		add_action('wp_ajax_gv_get_preset_fields', array($this, 'get_preset_fields_config'));
 
 		// get preset fields
-		add_action( 'wp_ajax_gv_set_preset_form', array( $this, 'create_preset_form' ) );
+		add_action('wp_ajax_gv_set_preset_form', array($this, 'create_preset_form'));
 
-		add_action( 'wp_ajax_gv_sortable_fields_form', array( $this, 'get_sortable_fields' ) );
+		add_action('wp_ajax_gv_sortable_fields_form', array($this, 'get_sortable_fields'));
 	}
 
 	/**
@@ -30,17 +30,17 @@ 
 	 *
 	 * @return bool
 	 */
-	private function _exit( $mixed = NULL ) {
+	private function _exit($mixed = NULL) {
 
 		/**
 		 * Don't exit if we're running test suite.
 		 * @since 1.15
 		 */
-		if( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) {
+		if (defined('DOING_GRAVITYVIEW_TESTS') && DOING_GRAVITYVIEW_TESTS) {
 			return $mixed;
 		}
 
-		exit( $mixed );
+		exit($mixed);
 	}
 
 	/** -------- AJAX ---------- */
@@ -50,8 +50,8 @@ 
 	 * @return void
 	 */
 	function check_ajax_nonce() {
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxviews' ) ) {
-			$this->_exit( false );
+		if (!isset($_POST['nonce']) || !wp_verify_nonce($_POST['nonce'], 'gravityview_ajaxviews')) {
+			$this->_exit(false);
 		}
 	}
 
@@ -67,20 +67,20 @@ 
 		//check nonce
 		$this->check_ajax_nonce();
 
-		$context = isset($_POST['context']) ? esc_attr( $_POST['context'] ) : 'directory';
+		$context = isset($_POST['context']) ? esc_attr($_POST['context']) : 'directory';
 
 		// If Form was changed, JS sends form ID, if start fresh, JS sends template_id
-		if( !empty( $_POST['form_id'] ) ) {
-			do_action( 'gravityview_render_available_fields', (int) $_POST['form_id'], $context );
+		if (!empty($_POST['form_id'])) {
+			do_action('gravityview_render_available_fields', (int)$_POST['form_id'], $context);
 			$this->_exit();
-		} elseif( !empty( $_POST['template_id'] ) ) {
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
-			do_action( 'gravityview_render_available_fields', $form, $context );
+		} elseif (!empty($_POST['template_id'])) {
+			$form = GravityView_Ajax::pre_get_form_fields($_POST['template_id']);
+			do_action('gravityview_render_available_fields', $form, $context);
 			$this->_exit();
 		}
 
 		//if everything fails..
-		$this->_exit( false );
+		$this->_exit(false);
 	}
 
 
@@ -94,21 +94,21 @@ 
 	function get_active_areas() {
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
-			$this->_exit( false );
+		if (empty($_POST['template_id'])) {
+			$this->_exit(false);
 		}
 
 		ob_start();
-		do_action( 'gravityview_render_directory_active_areas', $_POST['template_id'], 'directory', '', true );
+		do_action('gravityview_render_directory_active_areas', $_POST['template_id'], 'directory', '', true);
 		$response['directory'] = ob_get_clean();
 
 		ob_start();
-		do_action( 'gravityview_render_directory_active_areas',  $_POST['template_id'], 'single', '', true );
+		do_action('gravityview_render_directory_active_areas', $_POST['template_id'], 'single', '', true);
 		$response['single'] = ob_get_clean();
 
-		$response = array_map( 'gravityview_strip_whitespace', $response );
+		$response = array_map('gravityview_strip_whitespace', $response);
 
-		$this->_exit( json_encode( $response ) );
+		$this->_exit(json_encode($response));
 	}
 
 	/**
@@ -119,49 +119,49 @@ 
 
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
-			$this->_exit( false );
+		if (empty($_POST['template_id'])) {
+			$this->_exit(false);
 		}
 
 		// get the fields xml config file for this specific preset
-		$preset_fields_path = apply_filters( 'gravityview_template_fieldsxml', array(), $_POST['template_id'] );
+		$preset_fields_path = apply_filters('gravityview_template_fieldsxml', array(), $_POST['template_id']);
 		// import fields
-		if( !empty( $preset_fields_path ) ) {
-			$presets = $this->import_fields( $preset_fields_path );
+		if (!empty($preset_fields_path)) {
+			$presets = $this->import_fields($preset_fields_path);
 		} else {
-			$presets = array( 'widgets' => array(), 'fields' => array() );
+			$presets = array('widgets' => array(), 'fields' => array());
 		}
 
-		$template_id = esc_attr( $_POST['template_id'] );
+		$template_id = esc_attr($_POST['template_id']);
 
 		// template areas
-		$template_areas_directory = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'directory' );
-        $template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' );
+		$template_areas_directory = apply_filters('gravityview_template_active_areas', array(), $template_id, 'directory');
+        $template_areas_single = apply_filters('gravityview_template_active_areas', array(), $template_id, 'single');
 
 		// widget areas
 		$default_widget_areas = GravityView_Plugin::get_default_widget_areas();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets['widgets'] );
+		do_action('gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets['widgets']);
 		$response['header'] = ob_get_clean();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets['widgets'] );
+		do_action('gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets['widgets']);
 		$response['footer'] = ob_get_clean();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets['fields'] );
+		do_action('gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets['fields']);
 		$response['directory'] = ob_get_clean();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets['fields'] );
+		do_action('gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets['fields']);
 		$response['single'] = ob_get_clean();
 
-		$response = array_map( 'gravityview_strip_whitespace', $response );
+		$response = array_map('gravityview_strip_whitespace', $response);
 
-		do_action( 'gravityview_log_debug', '[get_preset_fields_config] AJAX Response', $response );
+		do_action('gravityview_log_debug', '[get_preset_fields_config] AJAX Response', $response);
 
-		$this->_exit( json_encode( $response ) );
+		$this->_exit(json_encode($response));
 	}
 
 	/**
@@ -173,26 +173,26 @@ 
 
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
-			do_action( 'gravityview_log_error', '[create_preset_form] Cannot create preset form; the template_id is empty.' );
-			$this->_exit( false );
+		if (empty($_POST['template_id'])) {
+			do_action('gravityview_log_error', '[create_preset_form] Cannot create preset form; the template_id is empty.');
+			$this->_exit(false);
 		}
 
 		// get the xml for this specific template_id
-		$preset_form_xml_path = apply_filters( 'gravityview_template_formxml', '', $_POST['template_id'] );
+		$preset_form_xml_path = apply_filters('gravityview_template_formxml', '', $_POST['template_id']);
 
 		// import form
-		$form = $this->import_form( $preset_form_xml_path );
+		$form = $this->import_form($preset_form_xml_path);
 
 		// get the form ID
-		if( false === $form ) {
+		if (false === $form) {
 			// send error to user
-			do_action( 'gravityview_log_error', '[create_preset_form] Error importing form for template id: ' . (int) $_POST['template_id'] );
+			do_action('gravityview_log_error', '[create_preset_form] Error importing form for template id: '.(int)$_POST['template_id']);
 
-			$this->_exit( false );
+			$this->_exit(false);
 		}
 
-		$this->_exit( '<option value="'.esc_attr( $form['id'] ).'" selected="selected">'.esc_html( $form['title'] ).'</option>' );
+		$this->_exit('<option value="'.esc_attr($form['id']).'" selected="selected">'.esc_html($form['title']).'</option>');
 
 	}
 
@@ -202,24 +202,24 @@ 
 	 * @param  string $xml_or_json_path Path to form XML or JSON file
 	 * @return int|bool       Imported form ID or false
 	 */
-	function import_form( $xml_or_json_path = '' ) {
+	function import_form($xml_or_json_path = '') {
 
-		do_action( 'gravityview_log_debug', '[import_form] Import Preset Form. (File)', $xml_or_json_path );
+		do_action('gravityview_log_debug', '[import_form] Import Preset Form. (File)', $xml_or_json_path);
 
-		if( empty( $xml_or_json_path ) || !class_exists('GFExport') || !file_exists( $xml_or_json_path ) ) {
-			do_action( 'gravityview_log_error', '[import_form] Class GFExport or file not found. file: ', $xml_or_json_path );
+		if (empty($xml_or_json_path) || !class_exists('GFExport') || !file_exists($xml_or_json_path)) {
+			do_action('gravityview_log_error', '[import_form] Class GFExport or file not found. file: ', $xml_or_json_path);
 			return false;
 		}
 
 		// import form
 		$forms = '';
-		$count = GFExport::import_file( $xml_or_json_path, $forms );
+		$count = GFExport::import_file($xml_or_json_path, $forms);
 
-		do_action( 'gravityview_log_debug', '[import_form] Importing form (Result)', $count );
-		do_action( 'gravityview_log_debug', '[import_form] Importing form (Form) ', $forms );
+		do_action('gravityview_log_debug', '[import_form] Importing form (Result)', $count);
+		do_action('gravityview_log_debug', '[import_form] Importing form (Form) ', $forms);
 
-		if( $count != 1 || empty( $forms[0]['id'] ) ) {
-			do_action( 'gravityview_log_error', '[import_form] Form Import Failed!' );
+		if ($count != 1 || empty($forms[0]['id'])) {
+			do_action('gravityview_log_error', '[import_form] Form Import Failed!');
 			return false;
 		}
 
@@ -238,26 +238,26 @@ 
 	function get_field_options() {
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template'] ) || empty( $_POST['area'] ) || empty( $_POST['field_id'] ) || empty( $_POST['field_type'] ) ) {
-			do_action( 'gravityview_log_error', '[get_field_options] Required fields were not set in the $_POST request. ' );
-			$this->_exit( false );
+		if (empty($_POST['template']) || empty($_POST['area']) || empty($_POST['field_id']) || empty($_POST['field_type'])) {
+			do_action('gravityview_log_error', '[get_field_options] Required fields were not set in the $_POST request. ');
+			$this->_exit(false);
 		}
 
 		// Fix apostrophes added by JSON response
-		$_post = array_map( 'stripslashes_deep', $_POST );
+		$_post = array_map('stripslashes_deep', $_POST);
 
 		// Sanitize
-		$_post = array_map( 'esc_attr', $_post );
+		$_post = array_map('esc_attr', $_post);
 
 		// The GF type of field: `product`, `name`, `creditcard`, `id`, `text`
-		$input_type = isset($_post['input_type']) ? esc_attr( $_post['input_type'] ) : NULL;
-		$context = isset($_post['context']) ? esc_attr( $_post['context'] ) : NULL;
+		$input_type = isset($_post['input_type']) ? esc_attr($_post['input_type']) : NULL;
+		$context = isset($_post['context']) ? esc_attr($_post['context']) : NULL;
 
-		$response = GravityView_Render_Settings::render_field_options( $_post['field_type'], $_post['template'], $_post['field_id'], $_post['field_label'], $_post['area'], $input_type, '', '', $context  );
+		$response = GravityView_Render_Settings::render_field_options($_post['field_type'], $_post['template'], $_post['field_id'], $_post['field_label'], $_post['area'], $input_type, '', '', $context);
 
-		$response = gravityview_strip_whitespace( $response );
+		$response = gravityview_strip_whitespace($response);
 
-		$this->_exit( $response );
+		$this->_exit($response);
 	}
 
 	/**
@@ -274,23 +274,23 @@ 
 		$form = '';
 
 		// if form id is set, use it, else, get form from preset
-		if( !empty( $_POST['form_id'] ) ) {
+		if (!empty($_POST['form_id'])) {
 
-			$form = (int) $_POST['form_id'];
+			$form = (int)$_POST['form_id'];
 
 		}
 		// get form from preset
-		elseif( !empty( $_POST['template_id'] ) ) {
+		elseif (!empty($_POST['template_id'])) {
 
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			$form = GravityView_Ajax::pre_get_form_fields($_POST['template_id']);
 
 		}
 
-		$response = gravityview_get_sortable_fields( $form );
+		$response = gravityview_get_sortable_fields($form);
 
-		$response = gravityview_strip_whitespace( $response );
+		$response = gravityview_strip_whitespace($response);
 
-		$this->_exit( $response );
+		$this->_exit($response);
 	}
 
 	/**
@@ -298,35 +298,35 @@ 
 	 * @param  string $template_id Preset template
 	 *
 	 */
-	static function pre_get_form_fields( $template_id = '') {
+	static function pre_get_form_fields($template_id = '') {
 
-		if( empty( $template_id ) ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' - Template ID not set.' );
+		if (empty($template_id)) {
+			do_action('gravityview_log_error', __METHOD__.' - Template ID not set.');
 			return false;
 		} else {
-			$form_file = apply_filters( 'gravityview_template_formxml', '', $template_id );
-			if( !file_exists( $form_file )  ) {
-				do_action( 'gravityview_log_error', __METHOD__ . ' - Importing Form Fields for preset ['. $template_id .']. File not found. file: ' . $form_file );
+			$form_file = apply_filters('gravityview_template_formxml', '', $template_id);
+			if (!file_exists($form_file)) {
+				do_action('gravityview_log_error', __METHOD__.' - Importing Form Fields for preset ['.$template_id.']. File not found. file: '.$form_file);
 				return false;
 			}
 		}
 
 		// Load xml parser (from GravityForms)
-		if( class_exists( 'GFCommon' ) ) {
-			$xml_parser = GFCommon::get_base_path() . '/xml.php';
+		if (class_exists('GFCommon')) {
+			$xml_parser = GFCommon::get_base_path().'/xml.php';
 		} else {
-			$xml_parser = trailingslashit( WP_PLUGIN_DIR ) . 'gravityforms/xml.php';
+			$xml_parser = trailingslashit(WP_PLUGIN_DIR).'gravityforms/xml.php';
 		}
 
-		if( file_exists( $xml_parser ) ) {
-			require_once( $xml_parser );
+		if (file_exists($xml_parser)) {
+			require_once($xml_parser);
 		} else {
-			do_action( 'gravityview_log_debug', __METHOD__ . ' - Gravity Forms XML Parser not found.', $xml_parser );
+			do_action('gravityview_log_debug', __METHOD__.' - Gravity Forms XML Parser not found.', $xml_parser);
 			return false;
 		}
 
 		// load file
-		$xmlstr = file_get_contents( $form_file );
+		$xmlstr = file_get_contents($form_file);
 
         $options = array(
             "page" => array("unserialize_as_array" => true),
@@ -345,21 +345,21 @@ 
 		$xml = new RGXML($options);
         $forms = $xml->unserialize($xmlstr);
 
-        if( !$forms ) {
-        	do_action( 'gravityview_log_error', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. Error importing file. (File)', $form_file );
+        if (!$forms) {
+        	do_action('gravityview_log_error', '[pre_get_available_fields] Importing Form Fields for preset ['.$template_id.']. Error importing file. (File)', $form_file);
         	return false;
         }
 
-        if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
+        if (!empty($forms[0]) && is_array($forms[0])) {
         	$form = $forms[0];
         }
 
-        if( empty( $form ) ) {
-        	do_action( 'gravityview_log_error', '[pre_get_available_fields] $form not set.', $forms );
+        if (empty($form)) {
+        	do_action('gravityview_log_error', '[pre_get_available_fields] $form not set.', $forms);
         	return false;
         }
 
-        do_action( 'gravityview_log_debug', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. (Form)', $form );
+        do_action('gravityview_log_debug', '[pre_get_available_fields] Importing Form Fields for preset ['.$template_id.']. (Form)', $form);
 
         return $form;
 
@@ -371,46 +371,46 @@ 
 	 * @param  string $file path to file
 	 * @return array       Fields config array (unserialized)
 	 */
-	function import_fields( $file ) {
+	function import_fields($file) {
 
-		if( empty( $file ) || !file_exists(  $file ) ) {
-			do_action( 'gravityview_log_error', '[import_fields] Importing Preset Fields. File not found. (File)', $file );
+		if (empty($file) || !file_exists($file)) {
+			do_action('gravityview_log_error', '[import_fields] Importing Preset Fields. File not found. (File)', $file);
 			return false;
 		}
 
-		if( !class_exists('WXR_Parser') ) {
-			include_once GRAVITYVIEW_DIR . 'includes/lib/xml-parsers/parsers.php';
+		if (!class_exists('WXR_Parser')) {
+			include_once GRAVITYVIEW_DIR.'includes/lib/xml-parsers/parsers.php';
 		}
 
 		$parser = new WXR_Parser();
-		$presets = $parser->parse( $file );
+		$presets = $parser->parse($file);
 
-		if(is_wp_error( $presets )) {
-			do_action( 'gravityview_log_error', '[import_fields] Importing Preset Fields failed. Threw WP_Error.', $presets );
+		if (is_wp_error($presets)) {
+			do_action('gravityview_log_error', '[import_fields] Importing Preset Fields failed. Threw WP_Error.', $presets);
 			return false;
 		}
 
-		if( empty( $presets['posts'][0]['postmeta'] ) && !is_array( $presets['posts'][0]['postmeta'] ) ) {
-			do_action( 'gravityview_log_error', '[import_fields] Importing Preset Fields failed. Meta not found in file.', $file );
+		if (empty($presets['posts'][0]['postmeta']) && !is_array($presets['posts'][0]['postmeta'])) {
+			do_action('gravityview_log_error', '[import_fields] Importing Preset Fields failed. Meta not found in file.', $file);
 			return false;
 		}
 
-		do_action( 'gravityview_log_debug', '[import_fields] postmeta', $presets['posts'][0]['postmeta'] );
+		do_action('gravityview_log_debug', '[import_fields] postmeta', $presets['posts'][0]['postmeta']);
 
 		$fields = $widgets = array();
-		foreach( $presets['posts'][0]['postmeta'] as $meta ) {
+		foreach ($presets['posts'][0]['postmeta'] as $meta) {
 			switch ($meta['key']) {
 				case '_gravityview_directory_fields':
-					$fields = maybe_unserialize( $meta['value'] );
+					$fields = maybe_unserialize($meta['value']);
 					break;
 				case '_gravityview_directory_widgets':
-					$widgets = maybe_unserialize( $meta['value'] );
+					$widgets = maybe_unserialize($meta['value']);
 					break;
 			}
 		}
 
-		do_action( 'gravityview_log_debug', '[import_fields] Imported Preset (Fields)', $fields );
-		do_action( 'gravityview_log_debug', '[import_fields] Imported Preset (Widgets)', $widgets );
+		do_action('gravityview_log_debug', '[import_fields] Imported Preset (Fields)', $fields);
+		do_action('gravityview_log_debug', '[import_fields] Imported Preset (Widgets)', $widgets);
 
 		return array(
 			'fields' => $fields,

includes/class-api.php

Spacing +224 added lines, -224 removed lines

@@ -23,36 +23,36 @@ 
 	 * @param boolean $force_show_label Whether to always show the label, regardless of field settings
 	 * @return string
 	 */
-	public static function field_label( $field, $entry = array(), $force_show_label = false ) {
+	public static function field_label($field, $entry = array(), $force_show_label = false) {
 		$gravityview_view = GravityView_View::getInstance();
 
 		$form = $gravityview_view->getForm();
 
 		$label = '';
 
-		if( !empty( $field['show_label'] ) || $force_show_label ) {
+		if (!empty($field['show_label']) || $force_show_label) {
 
 			$label = $field['label'];
 
 			// Support Gravity Forms 1.9+
-			if( class_exists( 'GF_Field' ) ) {
+			if (class_exists('GF_Field')) {
 
-				$field_object = RGFormsModel::get_field( $form, $field['id'] );
+				$field_object = RGFormsModel::get_field($form, $field['id']);
 
-				if( $field_object ) {
+				if ($field_object) {
 
-					$input = GFFormsModel::get_input( $field_object, $field['id'] );
+					$input = GFFormsModel::get_input($field_object, $field['id']);
 
 					// This is a complex field, with labels on a per-input basis
-					if( $input ) {
+					if ($input) {
 
 						// Does the input have a custom label on a per-input basis? Otherwise, default label.
-						$label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
+						$label = !empty($input['customLabel']) ? $input['customLabel'] : $input['label'];
 
 					} else {
 
 						// This is a field with one label
-						$label = $field_object->get_field_label( true, $field['label'] );
+						$label = $field_object->get_field_label(true, $field['label']);
 
 					}
 
@@ -61,9 +61,9 @@ 
 			}
 
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
-			if ( !empty( $field['custom_label'] ) ) {
+			if (!empty($field['custom_label'])) {
 
-				$label = self::replace_variables( $field['custom_label'], $form, $entry );
+				$label = self::replace_variables($field['custom_label'], $form, $entry);
 
 			}
 
@@ -72,7 +72,7 @@ 
 			 * @param[in,out] string $appended_content Content you can add after a label. Empty by default.
 			 * @param[in] array $field GravityView field array
 			 */
-			$label .= apply_filters( 'gravityview_render_after_label', '', $field );
+			$label .= apply_filters('gravityview_render_after_label', '', $field);
 
 		} // End $field['show_label']
 
@@ -84,7 +84,7 @@ 
 		 * @param[in] array $form Gravity Forms form array
 		 * @param[in] array $entry Gravity Forms entry array
 		 */
-		$label = apply_filters( 'gravityview/template/field_label', $label, $field, $form, $entry );
+		$label = apply_filters('gravityview/template/field_label', $label, $field, $form, $entry);
 
 		return $label;
 	}
@@ -99,8 +99,8 @@ 
 	 * @param  array      $entry        GF Entry array
 	 * @return string                  Text with variables maybe replaced
 	 */
-	public static function replace_variables($text, $form, $entry ) {
-		return GravityView_Merge_Tags::replace_variables( $text, $form, $entry );
+	public static function replace_variables($text, $form, $entry) {
+		return GravityView_Merge_Tags::replace_variables($text, $form, $entry);
 	}
 
 	/**
@@ -113,19 +113,19 @@ 
 	 *
 	 * @return string|null If not empty, string in $format format. Otherwise, null.
 	 */
-	public static function field_width( $field, $format = '%d%%' ) {
+	public static function field_width($field, $format = '%d%%') {
 
 		$width = NULL;
 
-		if( !empty( $field['width'] ) ) {
-			$width = absint( $field['width'] );
+		if (!empty($field['width'])) {
+			$width = absint($field['width']);
 
 			// If using percentages, limit to 100%
-			if( '%d%%' === $format && $width > 100 ) {
+			if ('%d%%' === $format && $width > 100) {
 				$width = 100;
 			}
 
-			$width = sprintf( $format, $width );
+			$width = sprintf($format, $width);
 		}
 
 		return $width;
@@ -139,38 +139,38 @@ 
 	 * @param mixed $field
 	 * @return string
 	 */
-	public static function field_class( $field, $form = NULL, $entry = NULL ) {
+	public static function field_class($field, $form = NULL, $entry = NULL) {
 		$gravityview_view = GravityView_View::getInstance();
 
 		$classes = array();
 
-		if( !empty( $field['custom_class'] ) ) {
+		if (!empty($field['custom_class'])) {
 
             $custom_class = $field['custom_class'];
 
-            if( !empty( $entry ) ) {
+            if (!empty($entry)) {
 
                 // We want the merge tag to be formatted as a class. The merge tag may be
                 // replaced by a multiple-word value that should be output as a single class.
                 // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
                 add_filter('gform_merge_tag_filter', 'sanitize_html_class');
 
-                $custom_class = self::replace_variables( $custom_class, $form, $entry);
+                $custom_class = self::replace_variables($custom_class, $form, $entry);
 
                 // And then we want life to return to normal
                 remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
             }
 
 			// And now we want the spaces to be handled nicely.
-			$classes[] = gravityview_sanitize_html_class( $custom_class );
+			$classes[] = gravityview_sanitize_html_class($custom_class);
 
 		}
 
-		if(!empty($field['id'])) {
-			if( !empty( $form ) && !empty( $form['id'] ) ) {
+		if (!empty($field['id'])) {
+			if (!empty($form) && !empty($form['id'])) {
 				$form_id = '-'.$form['id'];
 			} else {
-				$form_id = $gravityview_view->getFormId() ? '-'. $gravityview_view->getFormId() : '';
+				$form_id = $gravityview_view->getFormId() ? '-'.$gravityview_view->getFormId() : '';
 			}
 
 			$classes[] = 'gv-field'.$form_id.'-'.$field['id'];
@@ -191,21 +191,21 @@ 
 	 * @param array $entry Gravity Forms entry array
 	 * @return string Sanitized unique HTML `id` attribute for the field
 	 */
-	public static function field_html_attr_id( $field, $form = array(), $entry = array() ) {
+	public static function field_html_attr_id($field, $form = array(), $entry = array()) {
 		$gravityview_view = GravityView_View::getInstance();
 		$id = $field['id'];
 
-		if ( ! empty( $id ) ) {
-			if ( ! empty( $form ) && ! empty( $form['id'] ) ) {
-				$form_id = '-' . $form['id'];
+		if (!empty($id)) {
+			if (!empty($form) && !empty($form['id'])) {
+				$form_id = '-'.$form['id'];
 			} else {
-				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
+				$form_id = $gravityview_view->getFormId() ? '-'.$gravityview_view->getFormId() : '';
 			}
 
-			$id = 'gv-field' . $form_id . '-' . $field['id'];
+			$id = 'gv-field'.$form_id.'-'.$field['id'];
 		}
 
-		return esc_attr( $id );
+		return esc_attr($id);
 	}
 
 
@@ -217,15 +217,15 @@ 
 	 * @param integer $field
 	 * @return null|string
 	 */
-	public static function field_value( $entry, $field_settings, $format = 'html' ) {
+	public static function field_value($entry, $field_settings, $format = 'html') {
 
-		if( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) {
+		if (empty($entry['form_id']) || empty($field_settings['id'])) {
 			return NULL;
 		}
 
 		$gravityview_view = GravityView_View::getInstance();
 
-		if( class_exists( 'GFCache' ) ) {
+		if (class_exists('GFCache')) {
 			/**
 			 * Gravity Forms' GFCache function was thrashing the database, causing double the amount of time for the field_value() method to run.
 			 *
@@ -240,18 +240,18 @@ 
 			 * @param boolean false Tell Gravity Forms not to store this as a transient
 			 * @param  int 0 Time to store the value. 0 is maximum amount of time possible.
 			 */
-			GFCache::set( "GFFormsModel::get_lead_field_value_" . $entry["id"] . "_" . $field_settings["id"], false, false, 0 );
+			GFCache::set("GFFormsModel::get_lead_field_value_".$entry["id"]."_".$field_settings["id"], false, false, 0);
 		}
 
 		$field_id = $field_settings['id'];
 
 		$form = $gravityview_view->getForm();
 
-		$field = gravityview_get_field( $form, $field_id );
+		$field = gravityview_get_field($form, $field_id);
 
 		$field_type = RGFormsModel::get_input_type($field);
 
-		if( $field_type ) {
+		if ($field_type) {
 			$field_type = $field['type'];
 			$value = RGFormsModel::get_lead_field_value($entry, $field);
 		} else {
@@ -266,15 +266,15 @@ 
 
 		$display_value = GFCommon::get_lead_field_display($field, $value, $entry["currency"], false, $format);
 
-		if( $errors = ob_get_clean() ) {
-			do_action( 'gravityview_log_error', 'GravityView_API[field_value] Errors when calling GFCommon::get_lead_field_display()', $errors );
+		if ($errors = ob_get_clean()) {
+			do_action('gravityview_log_error', 'GravityView_API[field_value] Errors when calling GFCommon::get_lead_field_display()', $errors);
 		}
 
 		$display_value = apply_filters("gform_entry_field_value", $display_value, $field, $entry, $form);
 
 		// prevent the use of merge_tags for non-admin fields
-		if( !empty( $field['adminOnly'] ) ) {
-			$display_value = self::replace_variables( $display_value, $form, $entry );
+		if (!empty($field['adminOnly'])) {
+			$display_value = self::replace_variables($display_value, $form, $entry);
 		}
 
 		// Check whether the field exists in /includes/fields/{$field_type}.php
@@ -282,7 +282,7 @@ 
 		$field_exists = $gravityview_view->locate_template("fields/{$field_type}.php");
 
 		// Set the field data to be available in the templates
-		$gravityview_view->setCurrentField( array(
+		$gravityview_view->setCurrentField(array(
 			'form' => $form,
 			'field_id' => $field_id,
 			'field' => $field,
@@ -294,13 +294,13 @@ 
 			'field_type' => $field_type, /** {@since 1.6} **/
 		));
 
-		if( $field_exists ) {
+		if ($field_exists) {
 
-			do_action( 'gravityview_log_debug', sprintf('[field_value] Rendering %s', $field_exists ) );
+			do_action('gravityview_log_debug', sprintf('[field_value] Rendering %s', $field_exists));
 
 			ob_start();
 
-			load_template( $field_exists, false );
+			load_template($field_exists, false);
 
 			$output = ob_get_clean();
 
@@ -319,11 +319,11 @@ 
 		 * Fields can override this by modifying the field data variable inside the field. See /templates/fields/post_image.php for an example.
 		 *
 		 */
-		if( !empty( $field_settings['show_as_link'] ) ) {
+		if (!empty($field_settings['show_as_link'])) {
 
-			$link_atts = empty( $field_settings['new_window'] ) ? array() : array( 'target' => '_blank' );
+			$link_atts = empty($field_settings['new_window']) ? array() : array('target' => '_blank');
 
-			$output = self::entry_link_html( $entry, $output, $link_atts, $field_settings );
+			$output = self::entry_link_html($entry, $output, $link_atts, $field_settings);
 
 		}
 
@@ -334,7 +334,7 @@ 
 		 * @param array  $entry The GF entry array
 		 * @param  array $field_settings Settings for the particular GV field
 		 */
-		$output = apply_filters( 'gravityview_field_entry_value_'.$field_type, $output, $entry, $field_settings, $gravityview_view->getCurrentField() );
+		$output = apply_filters('gravityview_field_entry_value_'.$field_type, $output, $entry, $field_settings, $gravityview_view->getCurrentField());
 
 		/**
 		 * @filter `gravityview_field_entry_value` Modify the field value output for all field types
@@ -343,7 +343,7 @@ 
 		 * @param  array $field_settings Settings for the particular GV field
 		 * @param array $field_data  {@since 1.6}
 		 */
-		$output = apply_filters( 'gravityview_field_entry_value', $output, $entry, $field_settings, $gravityview_view->getCurrentField() );
+		$output = apply_filters('gravityview_field_entry_value', $output, $entry, $field_settings, $gravityview_view->getCurrentField());
 
 		return $output;
 	}
@@ -357,18 +357,18 @@ 
 	 * @param array $entry Gravity Forms entry array
 	 * @param array $field_settings Array of field settings. Optional, but passed to the `gravityview_field_entry_link` filter
 	 */
-	public static function entry_link_html( $entry = array(), $anchor_text = '', $passed_tag_atts = array(), $field_settings = array() ) {
+	public static function entry_link_html($entry = array(), $anchor_text = '', $passed_tag_atts = array(), $field_settings = array()) {
 
-		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry['id'] ) ) {
+		if (empty($entry) || !is_array($entry) || !isset($entry['id'])) {
 
-			do_action( 'gravityview_log_debug', 'GravityView_API[entry_link_tag] Entry not defined; returning null', $entry );
+			do_action('gravityview_log_debug', 'GravityView_API[entry_link_tag] Entry not defined; returning null', $entry);
 
 			return NULL;
 		}
 
-		$href = self::entry_link( $entry );
+		$href = self::entry_link($entry);
 
-		$link = gravityview_get_link( $href, $anchor_text, $passed_tag_atts );
+		$link = gravityview_get_link($href, $anchor_text, $passed_tag_atts);
 
 		/**
 		 * @filter `gravityview_field_entry_link` Modify the link HTML
@@ -377,7 +377,7 @@ 
 		 * @param array  $entry The GF entry array
 		 * @param  array $field_settings Settings for the particular GV field
 		 */
-		$output = apply_filters( 'gravityview_field_entry_link', $link, $href, $entry, $field_settings );
+		$output = apply_filters('gravityview_field_entry_link', $link, $href, $entry, $field_settings);
 
 		return $output;
 	}
@@ -392,11 +392,11 @@ 
 
 		$is_search = false;
 
-		if( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
+		if ($gravityview_view && ($gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search)) {
 			$is_search = true;
 		}
 
-		if($is_search) {
+		if ($is_search) {
 			$output = __('This search returned no results.', 'gravityview');
 		} else {
 			$output = __('No entries match your request.', 'gravityview');
@@ -407,7 +407,7 @@ 
 		 * @param string $output The existing "No Entries" text
 		 * @param boolean $is_search Is the current page a search result, or just a multiple entries screen?
 		 */
-		$output = apply_filters( 'gravitview_no_entries_text', $output, $is_search);
+		$output = apply_filters('gravitview_no_entries_text', $output, $is_search);
 
 		return $wpautop ? wpautop($output) : $output;
 	}
@@ -421,42 +421,42 @@ 
 	 * @param boolean $add_query_args Add pagination and sorting arguments
 	 * @return string      Permalink to multiple entries view
 	 */
-	public static function directory_link( $post_id = NULL, $add_query_args = true ) {
+	public static function directory_link($post_id = NULL, $add_query_args = true) {
 		global $post;
 
 		$gravityview_view = GravityView_View::getInstance();
 
-		if( empty( $post_id ) ) {
+		if (empty($post_id)) {
 
 			$post_id = false;
 
 			// DataTables passes the Post ID
-			if( defined('DOING_AJAX') && DOING_AJAX ) {
+			if (defined('DOING_AJAX') && DOING_AJAX) {
 
-				$post_id = isset( $_POST['post_id'] ) ? (int)$_POST['post_id'] : false;
+				$post_id = isset($_POST['post_id']) ? (int)$_POST['post_id'] : false;
 
 			} else {
 
 				// The Post ID has been passed via the shortcode
-				if( !empty( $gravityview_view ) && $gravityview_view->getPostId() ) {
+				if (!empty($gravityview_view) && $gravityview_view->getPostId()) {
 
 					$post_id = $gravityview_view->getPostId();
 
 				} else {
 
 					// This is a GravityView post type
-					if( GravityView_frontend::getInstance()->is_gravityview_post_type ) {
+					if (GravityView_frontend::getInstance()->is_gravityview_post_type) {
 
-						$post_id = isset( $gravityview_view ) ? $gravityview_view->getViewId() : $post->ID;
+						$post_id = isset($gravityview_view) ? $gravityview_view->getViewId() : $post->ID;
 
 					} else {
 
 						// This is an embedded GravityView; use the embedded post's ID as the base.
-						if( GravityView_frontend::getInstance()->post_has_shortcode && is_a( $post, 'WP_Post' ) ) {
+						if (GravityView_frontend::getInstance()->post_has_shortcode && is_a($post, 'WP_Post')) {
 
 							$post_id = $post->ID;
 
-						} elseif( $gravityview_view->getViewId() ) {
+						} elseif ($gravityview_view->getViewId()) {
 
 							// The GravityView has been embedded in a widget or in a template, and
 							// is not in the current content. Thus, we defer to the View's own ID.
@@ -471,39 +471,39 @@ 
 		}
 
 		// No post ID, get outta here.
-		if( empty( $post_id ) ) {
+		if (empty($post_id)) {
 			return NULL;
 		}
 
 		// If we've saved the permalink in memory, use it
 		// @since 1.3
-		$link = wp_cache_get( 'gv_directory_link_'.$post_id );
+		$link = wp_cache_get('gv_directory_link_'.$post_id);
 
-		if( empty( $link ) ) {
+		if (empty($link)) {
 
-			$link = get_permalink( $post_id );
+			$link = get_permalink($post_id);
 
 			// If not yet saved, cache the permalink.
 			// @since 1.3
-			wp_cache_set( 'gv_directory_link_'.$post_id, $link );
+			wp_cache_set('gv_directory_link_'.$post_id, $link);
 
 		}
 
 		// Deal with returning to proper pagination for embedded views
-		if( $link && $add_query_args ) {
+		if ($link && $add_query_args) {
 
 			$args = array();
 
-			if( $pagenum = rgget('pagenum') ) {
-				$args['pagenum'] = intval( $pagenum );
+			if ($pagenum = rgget('pagenum')) {
+				$args['pagenum'] = intval($pagenum);
 			}
 
-			if( $sort = rgget('sort') ) {
+			if ($sort = rgget('sort')) {
 				$args['sort'] = $sort;
 				$args['dir'] = rgget('dir');
 			}
 
-			$link = add_query_arg( $args, $link );
+			$link = add_query_arg($args, $link);
 		}
 
 		return $link;
@@ -520,10 +520,10 @@ 
 	 * @param  array  $entry        Entry data passed to provide additional information when generating the hash. Optional - don't rely on it being available.
 	 * @return string               Hashed unique value for entry
 	 */
-	private static function get_custom_entry_slug( $id, $entry = array() ) {
+	private static function get_custom_entry_slug($id, $entry = array()) {
 
 		// Generate an unique hash to use as the default value
-		$slug = substr( wp_hash( $id, 'gravityview'.$id ), 0, 8 );
+		$slug = substr(wp_hash($id, 'gravityview'.$id), 0, 8);
 
 		/**
 		 * @filter `gravityview_entry_slug` Modify the unique hash ID generated, if you want to improve usability or change the format. This will allow for custom URLs, such as `{entryid}-{first-name}` or even, if unique, `{first-name}-{last-name}`
@@ -531,14 +531,14 @@ 
 		 * @param  string $id The entry ID
 		 * @param  array $entry Entry data array. May be empty.
 		 */
-		$slug = apply_filters( 'gravityview_entry_slug', $slug, $id, $entry );
+		$slug = apply_filters('gravityview_entry_slug', $slug, $id, $entry);
 
 		// Make sure we have something - use the original ID as backup.
-		if( empty( $slug ) ) {
+		if (empty($slug)) {
 			$slug = $id;
 		}
 
-		return sanitize_title( $slug );
+		return sanitize_title($slug);
 	}
 
 	/**
@@ -552,7 +552,7 @@ 
 	 * @param  array  $entry        Gravity Forms Entry array, optional. Used only to provide data to customize the `gravityview_entry_slug` filter
 	 * @return string               Unique slug ID, passed through `sanitize_title()`
 	 */
-	public static function get_entry_slug( $id_or_string, $entry = array() ) {
+	public static function get_entry_slug($id_or_string, $entry = array()) {
 
 		/**
 		 * Default: use the entry ID as the unique identifier
@@ -563,32 +563,32 @@ 
 		 * @filter `gravityview_custom_entry_slug` Whether to enable and use custom entry slugs.
 		 * @param boolean True: Allow for slugs based on entry values. False: always use entry IDs (default)
 		 */
-		$custom = apply_filters('gravityview_custom_entry_slug', false );
+		$custom = apply_filters('gravityview_custom_entry_slug', false);
 
 		// If we're using custom slug...
-		if ( $custom ) {
+		if ($custom) {
 
 			// Get the entry hash
-			$hash = self::get_custom_entry_slug( $id_or_string, $entry );
+			$hash = self::get_custom_entry_slug($id_or_string, $entry);
 
 			// See if the entry already has a hash set
-			$value = gform_get_meta( $id_or_string, 'gravityview_unique_id' );
+			$value = gform_get_meta($id_or_string, 'gravityview_unique_id');
 
 			// If it does have a hash set, and the hash is expected, use it.
 			// This check allows users to change the hash structure using the
 			// gravityview_entry_hash filter and have the old hashes expire.
-			if( empty( $value ) || $value !== $hash ) {
+			if (empty($value) || $value !== $hash) {
 
-				gform_update_meta( $id_or_string, 'gravityview_unique_id', $hash );
+				gform_update_meta($id_or_string, 'gravityview_unique_id', $hash);
 
 			}
 
 			$slug = $hash;
 
-			unset( $value, $hash );
+			unset($value, $hash);
 		}
 
-		return sanitize_title( $slug );
+		return sanitize_title($slug);
 	}
 
     /**
@@ -599,18 +599,18 @@ 
      * @param $entry array Gravity Forms entry object
      * @param $form array Gravity Forms form object
      */
-    public static function entry_create_custom_slug( $entry, $form ) {
+    public static function entry_create_custom_slug($entry, $form) {
         /**
          * @filter `gravityview_custom_entry_slug` On entry creation, check if we are using the custom entry slug feature and update the meta
          * @param boolean $custom Should we process the custom entry slug?
          */
-        $custom = apply_filters( 'gravityview_custom_entry_slug', false );
-        if( $custom ) {
+        $custom = apply_filters('gravityview_custom_entry_slug', false);
+        if ($custom) {
             // create the gravityview_unique_id and save it
 
             // Get the entry hash
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash );
+            $hash = self::get_custom_entry_slug($entry['id'], $entry);
+            gform_update_meta($entry['id'], 'gravityview_unique_id', $hash);
 
         }
     }
@@ -625,55 +625,55 @@ 
 	 * @param boolean $add_directory_args True: Add args to help return to directory; False: only include args required to get to entry {@since 1.7.3}
 	 * @return string          Link to the entry with the directory parent slug
 	 */
-	public static function entry_link( $entry, $post_id = NULL, $add_directory_args = true ) {
+	public static function entry_link($entry, $post_id = NULL, $add_directory_args = true) {
 
-		if( ! empty( $entry ) && ! is_array( $entry ) ) {
-			$entry = GVCommon::get_entry( $entry );
-		} else if( empty( $entry ) ) {
+		if (!empty($entry) && !is_array($entry)) {
+			$entry = GVCommon::get_entry($entry);
+		} else if (empty($entry)) {
 			$entry = GravityView_frontend::getInstance()->getEntry();
 		}
 
 		// Second parameter used to be passed as $field; this makes sure it's not an array
-		if( !is_numeric( $post_id ) ) {
+		if (!is_numeric($post_id)) {
 			$post_id = NULL;
 		}
 
 		// Get the permalink to the View
-		$directory_link = self::directory_link( $post_id, false );
+		$directory_link = self::directory_link($post_id, false);
 
 		// No post ID? Get outta here.
-		if( empty( $directory_link ) ) {
+		if (empty($directory_link)) {
 			return '';
 		}
 
 		$query_arg_name = GravityView_Post_Types::get_entry_var_name();
 
-		$entry_slug = self::get_entry_slug( $entry['id'], $entry );
+		$entry_slug = self::get_entry_slug($entry['id'], $entry);
 
-		if( get_option('permalink_structure') && !is_preview() ) {
+		if (get_option('permalink_structure') && !is_preview()) {
 
 			$args = array();
 
-			$directory_link = trailingslashit( $directory_link ) . $query_arg_name . '/'. $entry_slug .'/';
+			$directory_link = trailingslashit($directory_link).$query_arg_name.'/'.$entry_slug.'/';
 
 		} else {
 
-			$args = array( $query_arg_name => $entry_slug );
+			$args = array($query_arg_name => $entry_slug);
 		}
 
 		/**
 		 * @since 1.7.3
 		 */
-		if( $add_directory_args ) {
+		if ($add_directory_args) {
 
-			if( !empty( $_GET['pagenum'] ) ) {
-				$args['pagenum'] = intval( $_GET['pagenum'] );
+			if (!empty($_GET['pagenum'])) {
+				$args['pagenum'] = intval($_GET['pagenum']);
 			}
 
 			/**
 			 * @since 1.7
 			 */
-			if( $sort = rgget('sort') ) {
+			if ($sort = rgget('sort')) {
 				$args['sort'] = $sort;
 				$args['dir'] = rgget('dir');
 			}
@@ -685,11 +685,11 @@ 
 		 * has the view id so that Advanced Filters can be applied correctly when rendering the single view
 		 * @see GravityView_frontend::get_context_view_id()
 		 */
-		if( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() ) {
+		if (class_exists('GravityView_View_Data') && GravityView_View_Data::getInstance()->has_multiple_views()) {
 			$args['gvid'] = gravityview_get_view_id();
 		}
 
-		return add_query_arg( $args, $directory_link );
+		return add_query_arg($args, $directory_link);
 
 	}
 
@@ -699,54 +699,54 @@ 
 
 // inside loop functions
 
-function gv_label( $field, $entry = NULL ) {
-	return GravityView_API::field_label( $field, $entry );
+function gv_label($field, $entry = NULL) {
+	return GravityView_API::field_label($field, $entry);
 }
 
-function gv_class( $field, $form = NULL, $entry = array() ) {
-	return GravityView_API::field_class( $field, $form, $entry  );
+function gv_class($field, $form = NULL, $entry = array()) {
+	return GravityView_API::field_class($field, $form, $entry);
 }
 
-function gv_container_class( $class = '' ) {
+function gv_container_class($class = '') {
 
 	$default = ' gv-container';
 
-	if( GravityView_View::getInstance()->isHideUntilSearched() ) {
+	if (GravityView_View::getInstance()->isHideUntilSearched()) {
 		$default .= ' hidden';
 	}
 
-	$class = apply_filters( 'gravityview/render/container/class', $class . $default );
+	$class = apply_filters('gravityview/render/container/class', $class.$default);
 
-	$class = gravityview_sanitize_html_class( $class );
+	$class = gravityview_sanitize_html_class($class);
 
 	echo $class;
 }
 
-function gv_value( $entry, $field ) {
+function gv_value($entry, $field) {
 
-	$value = GravityView_API::field_value( $entry, $field );
+	$value = GravityView_API::field_value($entry, $field);
 
-	if( $value === '') {
+	if ($value === '') {
 		/**
 		 * @filter `gravityview_empty_value` What to display when a field is empty
 		 * @param string $value (empty string)
 		 */
-		$value = apply_filters( 'gravityview_empty_value', '' );
+		$value = apply_filters('gravityview_empty_value', '');
 	}
 
 	return $value;
 }
 
-function gv_directory_link( $post = NULL, $add_pagination = true ) {
-	return GravityView_API::directory_link( $post, $add_pagination );
+function gv_directory_link($post = NULL, $add_pagination = true) {
+	return GravityView_API::directory_link($post, $add_pagination);
 }
 
-function gv_entry_link( $entry, $post_id = NULL ) {
-	return GravityView_API::entry_link( $entry, $post_id );
+function gv_entry_link($entry, $post_id = NULL) {
+	return GravityView_API::entry_link($entry, $post_id);
 }
 
 function gv_no_results($wpautop = true) {
-	return GravityView_API::no_results( $wpautop );
+	return GravityView_API::no_results($wpautop);
 }
 
 /**
@@ -758,21 +758,21 @@ 
 
 	$href = gv_directory_link();
 
-	if( empty( $href ) ) { return NULL; }
+	if (empty($href)) { return NULL; }
 
 	// calculate link label
 	$gravityview_view = GravityView_View::getInstance();
 
-	$label = $gravityview_view->getBackLinkLabel() ? $gravityview_view->getBackLinkLabel() : __( '← Go back', 'gravityview' );
+	$label = $gravityview_view->getBackLinkLabel() ? $gravityview_view->getBackLinkLabel() : __('← Go back', 'gravityview');
 
 	/**
 	 * @filter `gravityview_go_back_label` Modify the back link text
 	 * @since 1.0.9
 	 * @param string $label Existing label text
 	 */
-	$label = apply_filters( 'gravityview_go_back_label', $label );
+	$label = apply_filters('gravityview_go_back_label', $label);
 
-	$link = gravityview_get_link( $href, esc_html( $label ), array(
+	$link = gravityview_get_link($href, esc_html($label), array(
 		'data-viewid' => $gravityview_view->getViewId()
 	));
 
@@ -791,9 +791,9 @@ 
  * @param  string 	$display_value The value generated by Gravity Forms
  * @return string                Value
  */
-function gravityview_get_field_value( $entry, $field_id, $display_value ) {
+function gravityview_get_field_value($entry, $field_id, $display_value) {
 
-	if( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
+	if (floatval($field_id) === floor(floatval($field_id))) {
 
 		// For the complete field value as generated by Gravity Forms
 		return $display_value;
@@ -801,7 +801,7 @@ 
 	} else {
 
 		// For one part of the address (City, ZIP, etc.)
-		return isset( $entry[ $field_id ] ) ? $entry[ $field_id ] : '';
+		return isset($entry[$field_id]) ? $entry[$field_id] : '';
 
 	}
 
@@ -817,48 +817,48 @@ 
  * @param  string      $taxonomy Type of term (`post_tag` or `category`)
  * @return string                CSV of linked terms
  */
-function gravityview_convert_value_to_term_list( $value, $taxonomy = 'post_tag' ) {
+function gravityview_convert_value_to_term_list($value, $taxonomy = 'post_tag') {
 
 	$output = array();
 
-	$terms = explode( ', ', $value );
+	$terms = explode(', ', $value);
 
-	foreach ($terms as $term_name ) {
+	foreach ($terms as $term_name) {
 
 		// If we're processing a category,
-		if( $taxonomy === 'category' ) {
+		if ($taxonomy === 'category') {
 
 			// Use rgexplode to prevent errors if : doesn't exist
-			list( $term_name, $term_id ) = rgexplode( ':', $value, 2 );
+			list($term_name, $term_id) = rgexplode(':', $value, 2);
 
 			// The explode was succesful; we have the category ID
-			if( !empty( $term_id )) {
-				$term = get_term_by( 'id', $term_id, $taxonomy );
+			if (!empty($term_id)) {
+				$term = get_term_by('id', $term_id, $taxonomy);
 			} else {
 			// We have to fall back to the name
-				$term = get_term_by( 'name', $term_name, $taxonomy );
+				$term = get_term_by('name', $term_name, $taxonomy);
 			}
 
 		} else {
 			// Use the name of the tag to get the full term information
-			$term = get_term_by( 'name', $term_name, $taxonomy );
+			$term = get_term_by('name', $term_name, $taxonomy);
 		}
 
 		// There's still a tag/category here.
-		if( $term ) {
+		if ($term) {
 
-			$term_link = get_term_link( $term, $taxonomy );
+			$term_link = get_term_link($term, $taxonomy);
 
 			// If there was an error, continue to the next term.
-			if ( is_wp_error( $term_link ) ) {
+			if (is_wp_error($term_link)) {
 			    continue;
 			}
 
-			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
+			$output[] = gravityview_get_link($term_link, esc_html($term->name));
 		}
 	}
 
-	return implode(', ', $output );
+	return implode(', ', $output);
 }
 
 /**
@@ -868,12 +868,12 @@ 
  * @param  string      $taxonomy Taxonomy of term to fetch.
  * @return string                String with terms
  */
-function gravityview_get_the_term_list( $post_id, $link = true, $taxonomy = 'post_tag' ) {
+function gravityview_get_the_term_list($post_id, $link = true, $taxonomy = 'post_tag') {
 
-	$output = get_the_term_list( $post_id, $taxonomy, NULL, ', ' );
+	$output = get_the_term_list($post_id, $taxonomy, NULL, ', ');
 
-	if( empty( $link ) ) {
-		return strip_tags( $output);
+	if (empty($link)) {
+		return strip_tags($output);
 	}
 
 	return $output;
@@ -892,17 +892,17 @@ 
 	$fe = GravityView_frontend::getInstance();
 
 	// Solve problem when loading content via admin-ajax.php
-	if( ! $fe->getGvOutputData() ) {
+	if (!$fe->getGvOutputData()) {
 
-		do_action( 'gravityview_log_debug', '[gravityview_get_current_views] gv_output_data not defined; parsing content.' );
+		do_action('gravityview_log_debug', '[gravityview_get_current_views] gv_output_data not defined; parsing content.');
 
 		$fe->parse_content();
 	}
 
 	// Make 100% sure that we're dealing with a properly called situation
-	if( !is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
+	if (!is_a($fe->getGvOutputData(), 'GravityView_View_Data')) {
 
-		do_action( 'gravityview_log_debug', '[gravityview_get_current_views] gv_output_data not an object or get_view not callable.', $fe->getGvOutputData() );
+		do_action('gravityview_log_debug', '[gravityview_get_current_views] gv_output_data not an object or get_view not callable.', $fe->getGvOutputData());
 
 		return array();
 	}
@@ -916,18 +916,18 @@ 
  * @see  GravityView_View_Data::get_view()
  * @return array View data with `id`, `view_id`, `form_id`, `template_id`, `atts`, `fields`, `widgets`, `form` keys.
  */
-function gravityview_get_current_view_data( $view_id = 0 ) {
+function gravityview_get_current_view_data($view_id = 0) {
 
 	$fe = GravityView_frontend::getInstance();
 
-	if( ! $fe->getGvOutputData() ) { return array(); }
+	if (!$fe->getGvOutputData()) { return array(); }
 
 	// If not set, grab the current view ID
-	if( empty( $view_id ) ) {
+	if (empty($view_id)) {
 		$view_id = $fe->get_context_view_id();
 	}
 
-	return $fe->getGvOutputData()->get_view( $view_id );
+	return $fe->getGvOutputData()->get_view($view_id);
 }
 
 // Templates' hooks
@@ -936,7 +936,7 @@ 
 	 * @action `gravityview_before` Display content before a View. Used to render widget areas. Rendered outside the View container `<div>`
 	 * @param int $view_id The ID of the View being displayed
 	 */
-	do_action( 'gravityview_before', gravityview_get_view_id() );
+	do_action('gravityview_before', gravityview_get_view_id());
 }
 
 function gravityview_header() {
@@ -944,7 +944,7 @@ 
 	 * @action `gravityview_header` Prepend content to the View container `<div>`
 	 * @param int $view_id The ID of the View being displayed
 	 */
-	do_action( 'gravityview_header', gravityview_get_view_id() );
+	do_action('gravityview_header', gravityview_get_view_id());
 }
 
 function gravityview_footer() {
@@ -952,7 +952,7 @@ 
 	 * @action `gravityview_after` Display content after a View. Used to render footer widget areas. Rendered outside the View container `<div>`
 	 * @param int $view_id The ID of the View being displayed
 	 */
-	do_action( 'gravityview_footer', gravityview_get_view_id() );
+	do_action('gravityview_footer', gravityview_get_view_id());
 }
 
 function gravityview_after() {
@@ -960,7 +960,7 @@ 
 	 * @action `gravityview_after` Append content to the View container `<div>`
 	 * @param int $view_id The ID of the View being displayed
 	 */
-	do_action( 'gravityview_after', gravityview_get_view_id() );
+	do_action('gravityview_after', gravityview_get_view_id());
 }
 
 /**
@@ -986,13 +986,13 @@ 
 	 * The Edit Entry functionality overrides this value.
 	 * @param boolean $is_edit_entry
 	 */
-	$is_edit_entry = apply_filters( 'gravityview_is_edit_entry', false );
+	$is_edit_entry = apply_filters('gravityview_is_edit_entry', false);
 
-	if( $is_edit_entry ) {
+	if ($is_edit_entry) {
 		$context = 'edit';
-	} else if( class_exists( 'GravityView_frontend' ) && $single = GravityView_frontend::is_single_entry() ) {
+	} else if (class_exists('GravityView_frontend') && $single = GravityView_frontend::is_single_entry()) {
 		$context = 'single';
-	} else if( class_exists( 'GravityView_View' ) ) {
+	} else if (class_exists('GravityView_View')) {
 		$context = GravityView_View::getInstance()->getContext();
 	}
 
@@ -1017,18 +1017,18 @@ 
  * @param  string $gv_class Field class to add to the output HTML
  * @return array           Array of file output, with `file_path` and `html` keys (see comments above)
  */
-function gravityview_get_files_array( $value, $gv_class = '' ) {
+function gravityview_get_files_array($value, $gv_class = '') {
 	/** @define "GRAVITYVIEW_DIR" "../" */
 
-	if( !class_exists( 'GravityView_Field' ) ) {
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field.php' );
+	if (!class_exists('GravityView_Field')) {
+		include_once(GRAVITYVIEW_DIR.'includes/fields/class-gravityview-field.php');
 	}
 
-	if( !class_exists( 'GravityView_Field_FileUpload' ) ) {
-		include_once( GRAVITYVIEW_DIR .'includes/fields/fileupload.php' );
+	if (!class_exists('GravityView_Field_FileUpload')) {
+		include_once(GRAVITYVIEW_DIR.'includes/fields/fileupload.php');
 	}
 
-	return GravityView_Field_FileUpload::get_files_array( $value, $gv_class );
+	return GravityView_Field_FileUpload::get_files_array($value, $gv_class);
 }
 
 /**
@@ -1042,16 +1042,16 @@ 
  * @param  string $address Address
  * @return string          URL of link to map of address
  */
-function gravityview_get_map_link( $address ) {
+function gravityview_get_map_link($address) {
 
-	$address_qs = str_replace( array( '<br />', "\n" ), ' ', $address ); // Replace \n with spaces
-	$address_qs = urlencode( $address_qs );
+	$address_qs = str_replace(array('<br />', "\n"), ' ', $address); // Replace \n with spaces
+	$address_qs = urlencode($address_qs);
 
 	$url = "https://maps.google.com/maps?q={$address_qs}";
 
-	$link_text = esc_html__( 'Map It', 'gravityview' );
+	$link_text = esc_html__('Map It', 'gravityview');
 
-	$link = gravityview_get_link( $url, $link_text, 'class=map-it-link' );
+	$link = gravityview_get_link($url, $link_text, 'class=map-it-link');
 
 	/**
 	 * @filter `gravityview_map_link` Modify the map link generated. You can use a different mapping service, for example.
@@ -1059,7 +1059,7 @@ 
 	 * @param[in] string $address Address to generate link for
 	 * @param[in] string $url URL generated by the function
 	 */
-	$link = apply_filters( 'gravityview_map_link', $link, $address, $url );
+	$link = apply_filters('gravityview_map_link', $link, $address, $url);
 
 	return $link;
 }
@@ -1080,7 +1080,7 @@ 
  * @param  array $passed_args Associative array with field data. `field` and `form` are required.
  * @return string Field output. If empty value and hide empty is true, return empty.
  */
-function gravityview_field_output( $passed_args ) {
+function gravityview_field_output($passed_args) {
 	$defaults = array(
 		'entry' => null,
 		'field' => null,
@@ -1092,7 +1092,7 @@ 
 		'zone_id' => null,
 	);
 
-	$args = wp_parse_args( $passed_args, $defaults );
+	$args = wp_parse_args($passed_args, $defaults);
 
 	/**
 	 * @filter `gravityview/field_output/args` Modify the args before generation begins
@@ -1100,15 +1100,15 @@ 
 	 * @param array $args Associative array; `field` and `form` is required.
 	 * @param array $passed_args Original associative array with field data. `field` and `form` are required.
 	 */
-	$args = apply_filters( 'gravityview/field_output/args', $args, $passed_args );
+	$args = apply_filters('gravityview/field_output/args', $args, $passed_args);
 
 	// Required fields.
-	if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
-		do_action( 'gravityview_log_error', '[gravityview_field_output] Field or form are empty.', $args );
+	if (empty($args['field']) || empty($args['form'])) {
+		do_action('gravityview_log_error', '[gravityview_field_output] Field or form are empty.', $args);
 		return '';
 	}
 
-	$entry = empty( $args['entry'] ) ? array() : $args['entry'];
+	$entry = empty($args['entry']) ? array() : $args['entry'];
 
 	/**
 	 * Create the content variables for replacing.
@@ -1124,36 +1124,36 @@ 
 		'field_id' => '',
 	);
 
-	$context['value'] = gv_value( $entry, $args['field'] );
+	$context['value'] = gv_value($entry, $args['field']);
 
 	// If the value is empty and we're hiding empty, return empty.
-	if ( $context['value'] === '' && ! empty( $args['hide_empty'] ) ) {
+	if ($context['value'] === '' && !empty($args['hide_empty'])) {
 		return '';
 	}
 
-	if ( $context['value'] !== '' && ! empty( $args['wpautop'] ) ) {
-		$context['value'] = wpautop( $context['value'] );
+	if ($context['value'] !== '' && !empty($args['wpautop'])) {
+		$context['value'] = wpautop($context['value']);
 	}
 
 	// Get width setting, if exists
-	$context['width'] = GravityView_API::field_width( $args['field'] );
+	$context['width'] = GravityView_API::field_width($args['field']);
 
 	// If replacing with CSS inline formatting, let's do it.
-	$context['width:style'] = GravityView_API::field_width( $args['field'], 'width:' . $context['width'] . '%;' );
+	$context['width:style'] = GravityView_API::field_width($args['field'], 'width:'.$context['width'].'%;');
 
 	// Grab the Class using `gv_class`
-	$context['class'] = gv_class( $args['field'], $args['form'], $entry );
-	$context['field_id'] = GravityView_API::field_html_attr_id( $args['field'], $args['form'], $entry );
+	$context['class'] = gv_class($args['field'], $args['form'], $entry);
+	$context['field_id'] = GravityView_API::field_html_attr_id($args['field'], $args['form'], $entry);
 
 	// Get field label if needed
-	if ( ! empty( $args['label_markup'] ) ) {
-		$context['label'] = str_replace( array( '{{label}}', '{{ label }}' ), '<span class="gv-field-label">{{ label_value }}</span>', $args['label_markup'] );
+	if (!empty($args['label_markup'])) {
+		$context['label'] = str_replace(array('{{label}}', '{{ label }}'), '<span class="gv-field-label">{{ label_value }}</span>', $args['label_markup']);
 	}
 
 	// Default Label value
-	$context['label_value'] = gv_label( $args['field'], $entry );
+	$context['label_value'] = gv_label($args['field'], $entry);
 
-	if ( empty( $context['label'] ) && ! empty( $context['label_value'] ) ){
+	if (empty($context['label']) && !empty($context['label_value'])) {
 		$context['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
 	}
 
@@ -1163,37 +1163,37 @@ 
 	 * @param string $markup The HTML for the markup
 	 * @param array $args All args for the field output
 	 */
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args );
+	$html = apply_filters('gravityview/field_output/pre_html', $args['markup'], $args);
 
 	/**
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
 	 * @since 1.11
 	 * @param string $open_tag Open tag for template content placeholders. Default: `{{`
 	 */
-	$open_tag = apply_filters( 'gravityview/field_output/open_tag', '{{', $args );
+	$open_tag = apply_filters('gravityview/field_output/open_tag', '{{', $args);
 
 	/**
 	 * @filter `gravityview/field_output/close_tag` Modify the closing tags for the template content placeholders
 	 * @since 1.11
 	 * @param string $close_tag Close tag for template content placeholders. Default: `}}`
 	 */
-	$close_tag = apply_filters( 'gravityview/field_output/close_tag', '}}', $args );
+	$close_tag = apply_filters('gravityview/field_output/close_tag', '}}', $args);
 
 	/**
 	 * Loop through each of the tags to replace and replace both `{{tag}}` and `{{ tag }}` with the values
 	 * @since 1.11
 	 */
-	foreach ( $context as $tag => $value ) {
+	foreach ($context as $tag => $value) {
 
 		// If the tag doesn't exist just skip it
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
+		if (false === strpos($html, $open_tag.$tag.$close_tag) && false === strpos($html, $open_tag.' '.$tag.' '.$close_tag)) {
 			continue;
 		}
 
 		// Array to search
 		$search = array(
-			$open_tag . $tag . $close_tag,
-			$open_tag . ' ' . $tag . ' ' . $close_tag,
+			$open_tag.$tag.$close_tag,
+			$open_tag.' '.$tag.' '.$close_tag,
 		);
 
 		/**
@@ -1202,26 +1202,26 @@ 
 		 * @param string $value The content to be shown instead of the {{tag}} placeholder
 		 * @param array $args Arguments passed to the function
 		 */
-		$value = apply_filters( 'gravityview/field_output/context/' . $tag, $value, $args );
+		$value = apply_filters('gravityview/field_output/context/'.$tag, $value, $args);
 
 		// Finally do the replace
-		$html = str_replace( $search, $value, $html );
+		$html = str_replace($search, $value, $html);
 	}
 
 	/**
 	 * @todo  Depricate `gravityview_field_output`
 	 */
-	$html = apply_filters( 'gravityview_field_output', $html, $args );
+	$html = apply_filters('gravityview_field_output', $html, $args);
 
 	/**
 	 * @filter `gravityview/field_output/html` Modify field HTML output
 	 * @param string $html Existing HTML output
 	 * @param array $args Arguments passed to the function
 	 */
-	$html = apply_filters( 'gravityview/field_output/html', $html, $args );
+	$html = apply_filters('gravityview/field_output/html', $html, $args);
 
 	// Just free up a tiny amount of memory
-	unset( $value, $args, $passed_args, $entry, $context, $search, $open_tag, $tag, $close_tag );
+	unset($value, $args, $passed_args, $entry, $context, $search, $open_tag, $tag, $close_tag);
 
 	return $html;
 }
@@ -1239,18 +1239,18 @@ 
  *
  * @return string html attribute or empty string
  */
-function gv_selected( $value, $current, $echo = true, $type = 'selected' ) {
+function gv_selected($value, $current, $echo = true, $type = 'selected') {
 
 	$output = '';
-	if( is_array( $current ) ) {
-		if( in_array( $value, $current ) ) {
-			$output = __checked_selected_helper( true, true, false, $type );
+	if (is_array($current)) {
+		if (in_array($value, $current)) {
+			$output = __checked_selected_helper(true, true, false, $type);
 		}
 	} else {
-		$output = __checked_selected_helper( $value, $current, false, $type );
+		$output = __checked_selected_helper($value, $current, false, $type);
 	}
 
-	if( $echo ) {
+	if ($echo) {
 		echo $output;
 	}
 

includes/class-cache.php

Spacing +101 added lines, -101 removed lines

@@ -32,18 +32,18 @@ 
 	 * @since 1.13.1
 	 * @var array Columns in the database for leads
 	 */
-	private $lead_db_columns = array( 'id', 'form_id', 'post_id', 'date_created', 'is_starred', 'is_read', 'ip', 'source_url', 'user_agent', 'currency', 'payment_status', 'payment_date', 'payment_amount', 'transaction_id', 'is_fulfilled', 'created_by', 'transaction_type', 'status' );
+	private $lead_db_columns = array('id', 'form_id', 'post_id', 'date_created', 'is_starred', 'is_read', 'ip', 'source_url', 'user_agent', 'currency', 'payment_status', 'payment_date', 'payment_amount', 'transaction_id', 'is_fulfilled', 'created_by', 'transaction_type', 'status');
 
 	/**
 	 *
 	 * @param array|int $form_ids Form ID or array of form IDs used in a request
 	 * @param array $args Extra request parameters used to generate the query. This is used to generate the unique transient key.
 	 */
-	function __construct( $form_ids = NULL, $args = array() ) {
+	function __construct($form_ids = NULL, $args = array()) {
 
 		$this->add_hooks();
 
-		if ( ! is_null( $form_ids ) ) {
+		if (!is_null($form_ids)) {
 
 			$this->form_ids = $form_ids;
 
@@ -59,31 +59,31 @@ 
 	function add_hooks() {
 
 		// Schedule cleanup of expired transients
-		add_action( 'wp', array( $this, 'schedule_transient_cleanup' ) );
+		add_action('wp', array($this, 'schedule_transient_cleanup'));
 
 		// Hook in to the scheduled cleanup, if scheduled
-		add_action( 'gravityview-expired-transients', array( $this, 'delete_expired_transients' ) );
+		add_action('gravityview-expired-transients', array($this, 'delete_expired_transients'));
 
 		// Trigger this when you need to prevent any results from being cached with forms that have been modified
-		add_action( 'gravityview_clear_form_cache', array( $this, 'blacklist_add' ) );
+		add_action('gravityview_clear_form_cache', array($this, 'blacklist_add'));
 
 		/**
 		 * @since 1.14
 		 */
-		add_action( 'gravityview_clear_entry_cache', array( $this, 'entry_status_changed' ) );
+		add_action('gravityview_clear_entry_cache', array($this, 'entry_status_changed'));
 
-		add_action( 'gform_after_update_entry', array( $this, 'entry_updated' ), 10, 2 );
+		add_action('gform_after_update_entry', array($this, 'entry_updated'), 10, 2);
 
-		add_action( 'gform_entry_created', array( $this, 'entry_created' ), 10, 2 );
+		add_action('gform_entry_created', array($this, 'entry_created'), 10, 2);
 
 		/**
 		 * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
 		 */
-		foreach( $this->lead_db_columns as $column ) {
-			add_action( 'gform_update_' . $column, array( $this, 'entry_status_changed' ), 10, 3 );
+		foreach ($this->lead_db_columns as $column) {
+			add_action('gform_update_'.$column, array($this, 'entry_status_changed'), 10, 3);
 		}
 
-		add_action( 'gform_delete_lead', array( $this, 'entry_status_changed' ), 10 );
+		add_action('gform_delete_lead', array($this, 'entry_status_changed'), 10);
 	}
 
 	/**
@@ -99,22 +99,22 @@ 
 	 *
 	 * @return void
 	 */
-	public function entry_status_changed( $lead_id, $property_value = '', $previous_value = '' ) {
+	public function entry_status_changed($lead_id, $property_value = '', $previous_value = '') {
 
 		/** @var array $entry */
-		$entry = GFAPI::get_entry( $lead_id );
+		$entry = GFAPI::get_entry($lead_id);
 
-		if ( is_wp_error( $entry ) ) {
+		if (is_wp_error($entry)) {
 
 			/** @var WP_Error $entry */
-			do_action( 'gravityview_log_error', __METHOD__ . ' Could not retrieve entry ' . $lead_id . ' to delete it: ' . $entry->get_error_message() );
+			do_action('gravityview_log_error', __METHOD__.' Could not retrieve entry '.$lead_id.' to delete it: '.$entry->get_error_message());
 
 			return;
 		}
 
-		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry['form_id'] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
+		do_action('gravityview_log_debug', __METHOD__.' adding form '.$entry['form_id'].' to blacklist because entry #'.$lead_id.' was deleted', array('value' => $property_value, 'previous' => $previous_value));
 		
-		$this->blacklist_add( $entry['form_id'] );
+		$this->blacklist_add($entry['form_id']);
 	}
 
 	/**
@@ -125,11 +125,11 @@ 
 	 *
 	 * @return void
 	 */
-	public function entry_updated( $form, $lead_id ) {
+	public function entry_updated($form, $lead_id) {
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form['id'] . ' to blacklist because entry #' . $lead_id . ' was updated' );
+		do_action('gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form '.$form['id'].' to blacklist because entry #'.$lead_id.' was updated');
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add($form['id']);
 	}
 
 	/**
@@ -142,11 +142,11 @@ 
 	 *
 	 * @return void
 	 */
-	public function entry_created( $entry, $form ) {
+	public function entry_created($entry, $form) {
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form['id'] . ' to blacklist because entry #' . $entry['id'] . ' was created' );
+		do_action('gravityview_log_debug', 'GravityView_Cache[entry_created] adding form '.$form['id'].' to blacklist because entry #'.$entry['id'].' was created');
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add($form['id']);
 	}
 
 	/**
@@ -156,20 +156,20 @@ 
 	 *
 	 * @return string           Prefix for the cache string used in set_key()
 	 */
-	protected function get_cache_key_prefix( $form_ids = NULL ) {
+	protected function get_cache_key_prefix($form_ids = NULL) {
 
-		if ( is_null( $form_ids ) ) {
+		if (is_null($form_ids)) {
 			$form_ids = $this->form_ids;
 		}
 
 		// Normally just one form, but supports multiple forms
 		//
 		// Array of IDs 12, 5, 14 would result in `f-12f-5f-14`
-		$forms = 'f:' . implode( '&f:', (array) $form_ids );
+		$forms = 'f:'.implode('&f:', (array)$form_ids);
 
 		// Prefix for transient keys
 		// Now the prefix would be: `gv-cache-f-12f-5f-14`
-		return 'gv-cache-' . $forms . '-';
+		return 'gv-cache-'.$forms.'-';
 
 	}
 
@@ -179,17 +179,17 @@ 
 	protected function set_key() {
 
 		// Don't set key if no forms have been set.
-		if ( empty( $this->form_ids ) ) {
+		if (empty($this->form_ids)) {
 			return;
 		}
 
-		$key = $this->get_cache_key_prefix() . sha1( serialize( $this->args ) );
+		$key = $this->get_cache_key_prefix().sha1(serialize($this->args));
 
 		// The transient name column can handle up to 64 characters.
 		// The `_transient_timeout_` prefix that is prepended to the string is 11 characters.
 		// 64 - 19 = 45
 		// We make sure the key isn't too long or else WP doesn't store data.
-		$this->key = substr( $key, 0, 45 );
+		$this->key = substr($key, 0, 45);
 	}
 
 	/**
@@ -210,24 +210,24 @@ 
 	 *
 	 * @return boolean           False if value was not updated and true if value was updated.
 	 */
-	public function blacklist_add( $form_ids ) {
+	public function blacklist_add($form_ids) {
 
-		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
+		$blacklist = get_option(self::BLACKLIST_OPTION_NAME, array());
 
-		$form_ids = is_array( $form_ids ) ? $form_ids : array( $form_ids );
+		$form_ids = is_array($form_ids) ? $form_ids : array($form_ids);
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[blacklist_add] Adding form IDs to cache blacklist', array(
+		do_action('gravityview_log_debug', 'GravityView_Cache[blacklist_add] Adding form IDs to cache blacklist', array(
 			'$form_ids'  => $form_ids,
 			'$blacklist' => $blacklist
-		) );
+		));
 
 		// Add the passed form IDs
-		$blacklist = array_merge( $blacklist, $form_ids );
+		$blacklist = array_merge($blacklist, $form_ids);
 
 		// Don't duplicate
-		$blacklist = array_unique( $blacklist );
+		$blacklist = array_unique($blacklist);
 
-		return update_option( self::BLACKLIST_OPTION_NAME, $blacklist );
+		return update_option(self::BLACKLIST_OPTION_NAME, $blacklist);
 
 	}
 
@@ -238,19 +238,19 @@ 
 	 *
 	 * @return boolean           Whether the removal was successful
 	 */
-	public function blacklist_remove( $form_ids ) {
+	public function blacklist_remove($form_ids) {
 
-		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
+		$blacklist = get_option(self::BLACKLIST_OPTION_NAME, array());
 
-		$updated_list = array_diff( $blacklist, (array) $form_ids );
+		$updated_list = array_diff($blacklist, (array)$form_ids);
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[blacklist_remove] Removing form IDs from cache blacklist', array(
+		do_action('gravityview_log_debug', 'GravityView_Cache[blacklist_remove] Removing form IDs from cache blacklist', array(
 			'$form_ids'     => $form_ids,
 			'$blacklist'    => $blacklist,
 			'$updated_list' => $updated_list
-		) );
+		));
 
-		return update_option( self::BLACKLIST_OPTION_NAME, $updated_list );
+		return update_option(self::BLACKLIST_OPTION_NAME, $updated_list);
 	}
 
 
@@ -261,25 +261,25 @@ 
 	 *
 	 * @return [type] [description]
 	 */
-	function in_blacklist( $form_ids = NULL ) {
+	function in_blacklist($form_ids = NULL) {
 
-		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
+		$blacklist = get_option(self::BLACKLIST_OPTION_NAME, array());
 
 		// Use object var if exists
-		$form_ids = is_null( $form_ids ) ? $this->form_ids : $form_ids;
+		$form_ids = is_null($form_ids) ? $this->form_ids : $form_ids;
 
-		if ( empty( $form_ids ) ) {
+		if (empty($form_ids)) {
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[in_blacklist] Did not add form to blacklist; empty form ID', $form_ids );
+			do_action('gravityview_log_debug', 'GravityView_Cache[in_blacklist] Did not add form to blacklist; empty form ID', $form_ids);
 
 			return false;
 		}
 
-		foreach ( (array) $form_ids as $form_id ) {
+		foreach ((array)$form_ids as $form_id) {
 
-			if ( in_array( $form_id, $blacklist ) ) {
+			if (in_array($form_id, $blacklist)) {
 
-				do_action( 'gravityview_log_debug', 'GravityView_Cache[in_blacklist] Form #' . esc_attr( $form_id ) . ' is in the cache blacklist' );
+				do_action('gravityview_log_debug', 'GravityView_Cache[in_blacklist] Form #'.esc_attr($form_id).' is in the cache blacklist');
 
 				return true;
 			}
@@ -296,35 +296,35 @@ 
 	 *
 	 * @return mixed      False: Not using cache or cache was a WP_Error object; NULL: no results found; Mixed: cache value
 	 */
-	public function get( $key = NULL ) {
+	public function get($key = NULL) {
 
-		$key = is_null( $key ) ? $this->key : $key;
+		$key = is_null($key) ? $this->key : $key;
 
-		if ( ! $this->use_cache() ) {
+		if (!$this->use_cache()) {
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[get] Not using cached results because of GravityView_Cache->use_cache() results' );
+			do_action('gravityview_log_debug', 'GravityView_Cache[get] Not using cached results because of GravityView_Cache->use_cache() results');
 
 			return false;
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[get] Fetching request with transient key ' . $key );
+		do_action('gravityview_log_debug', 'GravityView_Cache[get] Fetching request with transient key '.$key);
 
-		$result = get_transient( $key );
+		$result = get_transient($key);
 
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[get] Fetching request resulted in error:', $result );
+			do_action('gravityview_log_debug', 'GravityView_Cache[get] Fetching request resulted in error:', $result);
 
 			return false;
 
-		} elseif ( $result ) {
+		} elseif ($result) {
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[get] Cached results found for  transient key ' . $key );
+			do_action('gravityview_log_debug', 'GravityView_Cache[get] Cached results found for  transient key '.$key);
 
 			return $result;
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[get] No cached results found for  transient key ' . $key );
+		do_action('gravityview_log_debug', 'GravityView_Cache[get] No cached results found for  transient key '.$key);
 
 		return NULL;
 
@@ -338,24 +338,24 @@ 
 	 * @param [type] $content     [description]
 	 * @param [type] $filter_name Name used to modify the cache time. Will be set to `gravityview_cache_time_{$filter_name}`.
 	 */
-	public function set( $content, $filter_name = '' ) {
+	public function set($content, $filter_name = '') {
 
 		// Don't cache empty results
-		if ( ! empty( $content ) ) {
+		if (!empty($content)) {
 
 			/**
 			 * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
 			 * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
 			 */
-			$cache_time = (int) apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
+			$cache_time = (int)apply_filters('gravityview_cache_time_'.$filter_name, DAY_IN_SECONDS);
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[set] Setting cache with transient key ' . $this->key . ' for ' . $cache_time . ' seconds' );
+			do_action('gravityview_log_debug', 'GravityView_Cache[set] Setting cache with transient key '.$this->key.' for '.$cache_time.' seconds');
 
-			return set_transient( $this->key, $content, $cache_time );
+			return set_transient($this->key, $content, $cache_time);
 
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[set] Cache not set; content is empty' );
+		do_action('gravityview_log_debug', 'GravityView_Cache[set] Cache not set; content is empty');
 
 		return false;
 
@@ -371,39 +371,39 @@ 
 	 *
 	 * @return [type]           [description]
 	 */
-	public function delete( $form_ids = NULL ) {
+	public function delete($form_ids = NULL) {
 		global $wpdb;
 
 		// Use object var if exists
-		$form_ids = is_null( $form_ids ) ? $this->form_ids : $form_ids;
+		$form_ids = is_null($form_ids) ? $this->form_ids : $form_ids;
 
-		if ( empty( $form_ids ) ) {
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[delete] Did not delete cache; empty form IDs' );
+		if (empty($form_ids)) {
+			do_action('gravityview_log_debug', 'GravityView_Cache[delete] Did not delete cache; empty form IDs');
 
 			return;
 		}
 
-		foreach ( (array) $form_ids as $form_id ) {
+		foreach ((array)$form_ids as $form_id) {
 
-			$key = $this->get_cache_key_prefix( $form_id );
+			$key = $this->get_cache_key_prefix($form_id);
 
 			// WordPress 4.0+
-			if ( is_callable( array( $wpdb, 'esc_like' ) ) ) {
-				$key = $wpdb->esc_like( $key );
+			if (is_callable(array($wpdb, 'esc_like'))) {
+				$key = $wpdb->esc_like($key);
 			} else {
-				$key = like_escape( $key );
+				$key = like_escape($key);
 			}
 
-			$key = "%" . $key . "%";
+			$key = "%".$key."%";
 
-			$sql = $wpdb->prepare( "DELETE FROM {$wpdb->options} WHERE `option_name` LIKE %s", $key );
+			$sql = $wpdb->prepare("DELETE FROM {$wpdb->options} WHERE `option_name` LIKE %s", $key);
 
-			$result = $wpdb->query( $sql );
+			$result = $wpdb->query($sql);
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[delete] Deleting cache for form #' . $form_id, array(
+			do_action('gravityview_log_debug', 'GravityView_Cache[delete] Deleting cache for form #'.$form_id, array(
 				$sql,
-				sprintf( 'Deleted results: %d', $result )
-			) );
+				sprintf('Deleted results: %d', $result)
+			));
 		}
 
 	}
@@ -421,14 +421,14 @@ 
 		 * @filter `gravityview_cleanup_transients` Override GravityView cleanup of transients by setting this to false
 		 * @param boolean $cleanup Whether to run the GravityView auto-cleanup of transients. Default: `true`
 		 */
-		$cleanup = apply_filters( 'gravityview_cleanup_transients', true );
+		$cleanup = apply_filters('gravityview_cleanup_transients', true);
 
-		if ( ! $cleanup ) {
+		if (!$cleanup) {
 			return;
 		}
 
-		if ( ! wp_next_scheduled( 'gravityview-expired-transients' ) ) {
-			wp_schedule_event( time(), 'daily', 'gravityview-expired-transients' );
+		if (!wp_next_scheduled('gravityview-expired-transients')) {
+			wp_schedule_event(time(), 'daily', 'gravityview-expired-transients');
 		}
 	}
 
@@ -453,7 +453,7 @@ 
 		$threshold = time() - 60;
 
 		// get table name for options on specified blog
-		$table = $wpdb->get_blog_prefix( $blog_id ) . 'options';
+		$table = $wpdb->get_blog_prefix($blog_id).'options';
 
 		// delete expired transients, using the paired timeout record to find them
 		$sql = "
@@ -464,7 +464,7 @@ 
 			and t1.option_value < '$threshold'
 		";
 
-		$num_results = $wpdb->query( $sql );
+		$num_results = $wpdb->query($sql);
 
 		// delete orphaned transient expirations
 		// also delete NextGEN Gallery 2.x display cache timeout aliases
@@ -479,9 +479,9 @@ 
 			and option_value < '$threshold'
 		";
 
-		$num_results += $wpdb->query( $sql );
+		$num_results += $wpdb->query($sql);
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[delete_expired_transients] Deleted ' . $num_results . ' expired transient records from the database' );
+		do_action('gravityview_log_debug', 'GravityView_Cache[delete_expired_transients] Deleted '.$num_results.' expired transient records from the database');
 	}
 
 	/**
@@ -495,11 +495,11 @@ 
 
 		$use_cache = true;
 
-		if ( GVCommon::has_cap( 'edit_gravityviews' ) ) {
+		if (GVCommon::has_cap('edit_gravityviews')) {
 
-			if ( isset( $_GET['cache'] ) || isset( $_GET['nocache'] ) ) {
+			if (isset($_GET['cache']) || isset($_GET['nocache'])) {
 
-				do_action( 'gravityview_log_debug', 'GravityView_Cache[use_cache] Not using cache: ?cache or ?nocache is in the URL' );
+				do_action('gravityview_log_debug', 'GravityView_Cache[use_cache] Not using cache: ?cache or ?nocache is in the URL');
 
 				$use_cache = false;
 			}
@@ -507,13 +507,13 @@ 
 		}
 
 		// Has the form been flagged as having changed items in it?
-		if ( $this->in_blacklist() ) {
+		if ($this->in_blacklist()) {
 
 			// Delete caches for all items with form IDs XYZ
-			$this->delete( $this->form_ids );
+			$this->delete($this->form_ids);
 
 			// Remove the form from
-			$this->blacklist_remove( $this->form_ids );
+			$this->blacklist_remove($this->form_ids);
 
 		}
 
@@ -524,9 +524,9 @@ 
 		 * @param[out,in]  boolean $use_cache Previous setting
 		 * @param[out] GravityView_Cache $this The GravityView_Cache object
 		 */
-		$use_cache = apply_filters( 'gravityview_use_cache', $use_cache, $this );
+		$use_cache = apply_filters('gravityview_use_cache', $use_cache, $this);
 
-		return (boolean) $use_cache;
+		return (boolean)$use_cache;
 	}
 
 }

includes/class-common.php

Spacing +288 added lines, -288 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 /** If this file is called directly, abort. */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
@@ -25,17 +25,17 @@ 
 	 * @param mixed $form_id
 	 * @return mixed False: no form ID specified or Gravity Forms isn't active. Array: Form returned from Gravity Forms
 	 */
-	public static function get_form( $form_id ) {
-		if ( empty( $form_id ) ) {
+	public static function get_form($form_id) {
+		if (empty($form_id)) {
 			return false;
 		}
 
-		if ( class_exists( 'GFAPI' ) ) {
-			return GFAPI::get_form( $form_id );
+		if (class_exists('GFAPI')) {
+			return GFAPI::get_form($form_id);
 		}
 
-		if ( class_exists( 'RGFormsModel' ) ) {
-			return RGFormsModel::get_form( $form_id );
+		if (class_exists('RGFormsModel')) {
+			return RGFormsModel::get_form($form_id);
 		}
 
 		return false;
@@ -54,8 +54,8 @@ 
 	 *
 	 * @return bool True: user has at least one passed capability; False: user does not have any defined capabilities
 	 */
-	public static function has_cap( $caps = '', $object_id = null, $user_id = null ) {
-		return GravityView_Roles_Capabilities::has_cap( $caps, $object_id, $user_id );
+	public static function has_cap($caps = '', $object_id = null, $user_id = null) {
+		return GravityView_Roles_Capabilities::has_cap($caps, $object_id, $user_id);
 	}
 
 	/**
@@ -66,14 +66,14 @@ 
 	 * @param array|GF_Fields $field Gravity Forms field or array
 	 * @return array Array version of $field
 	 */
-	public static function get_field_array( $field ) {
+	public static function get_field_array($field) {
 
-		if ( class_exists( 'GF_Fields' ) ) {
+		if (class_exists('GF_Fields')) {
 
-			$field_object = GF_Fields::create( $field );
+			$field_object = GF_Fields::create($field);
 
 			// Convert the field object in 1.9 to an array for backward compatibility
-			$field_array = get_object_vars( $field_object );
+			$field_array = get_object_vars($field_object);
 
 		} else {
 			$field_array = $field;
@@ -100,9 +100,9 @@ 
 		 * @filter `gravityview/get_all_views/params` Modify the parameters sent to get all views.
 		 * @param[in,out]  array $params Array of parameters to pass to `get_posts()`
 		 */
-		$views_params = apply_filters( 'gravityview/get_all_views/params', $params );
+		$views_params = apply_filters('gravityview/get_all_views/params', $params);
 
-		$views = get_posts( $views_params );
+		$views = get_posts($views_params);
 
 		return $views;
 	}
@@ -113,11 +113,11 @@ 
 	 * @param  int|string $entry_slug Entry slug
 	 * @return array           Gravity Forms form array
 	 */
-	public static function get_form_from_entry_id( $entry_slug ) {
+	public static function get_form_from_entry_id($entry_slug) {
 
-		$entry = self::get_entry( $entry_slug, true );
+		$entry = self::get_entry($entry_slug, true);
 
-		$form = self::get_form( $entry['form_id'] );
+		$form = self::get_form($entry['form_id']);
 
 		return $form;
 	}
@@ -129,7 +129,7 @@ 
 	 * @param  string $slug The entry slug, as returned by GravityView_API::get_entry_slug()
 	 * @return int|null       The entry ID, if exists; `NULL` if not
 	 */
-	public static function get_entry_id_from_slug( $slug ) {
+	public static function get_entry_id_from_slug($slug) {
 		global $wpdb;
 
 		$search_criteria = array(
@@ -148,9 +148,9 @@ 
 			'page_size' => 1,
 		);
 
-		$results = GFAPI::get_entries( 0, $search_criteria, null, $paging );
+		$results = GFAPI::get_entries(0, $search_criteria, null, $paging);
 
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
+		$result = (!empty($results) && !empty($results[0]['id'])) ? $results[0]['id'] : null;
 
 		return $result;
 	}
@@ -164,11 +164,11 @@ 
 	 * @return array (id, title)
 	 */
 	public static function get_forms() {
-		if ( class_exists( 'RGFormsModel' ) ) {
-			$gf_forms = RGFormsModel::get_forms( null, 'title' );
+		if (class_exists('RGFormsModel')) {
+			$gf_forms = RGFormsModel::get_forms(null, 'title');
 			$forms = array();
-			foreach ( $gf_forms as $form ) {
-				$forms[] = array( 'id' => $form->id, 'title' => $form->title );
+			foreach ($gf_forms as $form) {
+				$forms[] = array('id' => $form->id, 'title' => $form->title);
 			}
 			return $forms;
 		}
@@ -182,10 +182,10 @@ 
 	 * @param string|array $form_id (default: '') or $form object
 	 * @return array
 	 */
-	public static function get_form_fields( $form = '', $add_default_properties = false, $include_parent_field = true ) {
+	public static function get_form_fields($form = '', $add_default_properties = false, $include_parent_field = true) {
 
-		if ( ! is_array( $form ) ) {
-			$form = self::get_form( $form );
+		if (!is_array($form)) {
+			$form = self::get_form($form);
 		}
 
 		$fields = array();
@@ -195,56 +195,56 @@ 
 		$has_poll_fields = false;
 
 		// If GF_Field exists, we're using GF 1.9+, where add_default_properties has been deprecated.
-		if ( false === class_exists( 'GF_Field' ) && $add_default_properties ) {
-			$form = RGFormsModel::add_default_properties( $form );
+		if (false === class_exists('GF_Field') && $add_default_properties) {
+			$form = RGFormsModel::add_default_properties($form);
 		}
 
-		if ( $form ) {
-			foreach ( $form['fields'] as $field ) {
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
-					$fields[ $field['id'] ] = array(
-						'label' => rgar( $field, 'label' ),
+		if ($form) {
+			foreach ($form['fields'] as $field) {
+				if ($include_parent_field || empty($field['inputs'])) {
+					$fields[$field['id']] = array(
+						'label' => rgar($field, 'label'),
 						'parent' => null,
-						'type' => rgar( $field, 'type' ),
-						'adminLabel' => rgar( $field, 'adminLabel' ),
-						'adminOnly' => rgar( $field, 'adminOnly' ),
+						'type' => rgar($field, 'type'),
+						'adminLabel' => rgar($field, 'adminLabel'),
+						'adminOnly' => rgar($field, 'adminOnly'),
 					);
 				}
 
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
-					foreach ( $field['inputs'] as $input ) {
+				if ($add_default_properties && !empty($field['inputs'])) {
+					foreach ($field['inputs'] as $input) {
                         /**
                          * @hack
                          * In case of email/email confirmation, the input for email has the same id as the parent field
                          */
-                        if( 'email' == rgar( $field, 'type' ) && false === strpos( $input['id'], '.' ) ) {
+                        if ('email' == rgar($field, 'type') && false === strpos($input['id'], '.')) {
                             continue;
                         }
-						$fields[ (string)$input['id'] ] = array(
-							'label' => rgar( $input, 'label' ),
-							'customLabel' => rgar( $input, 'customLabel' ),
+						$fields[(string)$input['id']] = array(
+							'label' => rgar($input, 'label'),
+							'customLabel' => rgar($input, 'customLabel'),
 							'parent' => $field,
-							'type' => rgar( $field, 'type' ),
-							'adminLabel' => rgar( $field, 'adminLabel' ),
-							'adminOnly' => rgar( $field, 'adminOnly' ),
+							'type' => rgar($field, 'type'),
+							'adminLabel' => rgar($field, 'adminLabel'),
+							'adminOnly' => rgar($field, 'adminOnly'),
 						);
 					}
 				}
 
 				/** @since 1.14 */
-				if( 'list' === $field['type'] && !empty( $field['enableColumns'] ) ) {
+				if ('list' === $field['type'] && !empty($field['enableColumns'])) {
 
-					foreach ( (array)$field['choices'] as $key => $input ) {
+					foreach ((array)$field['choices'] as $key => $input) {
 
-						$input_id = sprintf( '%d.%d', $field['id'], $key ); // {field_id}.{column_key}
+						$input_id = sprintf('%d.%d', $field['id'], $key); // {field_id}.{column_key}
 
-						$fields[ $input_id ] = array(
-							'label'       => rgar( $input, 'text' ),
+						$fields[$input_id] = array(
+							'label'       => rgar($input, 'text'),
 							'customLabel' => '',
 							'parent'      => $field,
-							'type'        => rgar( $field, 'type' ),
-							'adminLabel'  => rgar( $field, 'adminLabel' ),
-							'adminOnly'   => rgar( $field, 'adminOnly' ),
+							'type'        => rgar($field, 'type'),
+							'adminLabel'  => rgar($field, 'adminLabel'),
+							'adminOnly'   => rgar($field, 'adminOnly'),
 						);
 					}
 				}
@@ -252,27 +252,27 @@ 
 				/**
 				 * @since 1.8
 				 */
-				if( 'quiz' === $field['type'] ) {
+				if ('quiz' === $field['type']) {
 					$has_quiz_fields = true;
 				}
 
 				/**
 				 * @since 1.8
 				 */
-				if( 'poll' === $field['type'] ) {
+				if ('poll' === $field['type']) {
 					$has_poll_fields = true;
 				}
 
-				if( GFCommon::is_product_field( $field['type'] ) ){
+				if (GFCommon::is_product_field($field['type'])) {
 					$has_product_fields = true;
 				}
 
 				/**
 				 * @hack Version 1.9
 				 */
-				$field_for_is_post_field = class_exists( 'GF_Fields' ) ? (object) $field : (array) $field;
+				$field_for_is_post_field = class_exists('GF_Fields') ? (object)$field : (array)$field;
 
-				if ( GFCommon::is_post_field( $field_for_is_post_field ) ) {
+				if (GFCommon::is_post_field($field_for_is_post_field)) {
 					$has_post_fields = true;
 				}
 			}
@@ -281,47 +281,47 @@ 
 		/**
 		 * @since 1.7
 		 */
-		if ( $has_post_fields ) {
+		if ($has_post_fields) {
 			$fields['post_id'] = array(
-				'label' => __( 'Post ID', 'gravityview' ),
+				'label' => __('Post ID', 'gravityview'),
 				'type' => 'post_id',
 			);
 		}
 
-		if ( $has_product_fields ) {
+		if ($has_product_fields) {
 
 			$fields['payment_status'] = array(
-				'label' => __( 'Payment Status', 'gravityview' ),
+				'label' => __('Payment Status', 'gravityview'),
 				'type' => 'payment_status',
 			);
 
 			$fields['payment_date'] = array(
-				'label' => __( 'Payment Date', 'gravityview' ),
+				'label' => __('Payment Date', 'gravityview'),
 				'type' => 'payment_date',
 			);
 
 			$fields['payment_amount'] = array(
-				'label' => __( 'Payment Amount', 'gravityview' ),
+				'label' => __('Payment Amount', 'gravityview'),
 				'type' => 'payment_amount',
 			);
 
 			$fields['payment_method'] = array(
-				'label' => __( 'Payment Method', 'gravityview' ),
+				'label' => __('Payment Method', 'gravityview'),
 				'type' => 'payment_method',
 			);
 
 			$fields['is_fulfilled'] = array(
-				'label' => __( 'Is Fulfilled', 'gravityview' ),
+				'label' => __('Is Fulfilled', 'gravityview'),
 				'type' => 'is_fulfilled',
 			);
 
 			$fields['transaction_id'] = array(
-				'label' => __( 'Transaction ID', 'gravityview' ),
+				'label' => __('Transaction ID', 'gravityview'),
 				'type' => 'transaction_id',
 			);
 
 			$fields['transaction_type'] = array(
-				'label' => __( 'Transaction Type', 'gravityview' ),
+				'label' => __('Transaction Type', 'gravityview'),
 				'type' => 'transaction_type',
 			);
 
@@ -330,27 +330,27 @@ 
 		/**
 		 * @since 1.8
 		 */
-		if( $has_quiz_fields ) {
+		if ($has_quiz_fields) {
 
-			$fields['gquiz_score']   = array(
-				'label' => __( 'Quiz Score Total', 'gravityview' ),
+			$fields['gquiz_score'] = array(
+				'label' => __('Quiz Score Total', 'gravityview'),
 				'type'  => 'quiz_score',
-				'desc'  => __( 'Displays the number of correct Quiz answers the user submitted.', 'gravityview' ),
+				'desc'  => __('Displays the number of correct Quiz answers the user submitted.', 'gravityview'),
 			);
 			$fields['gquiz_percent'] = array(
-				'label' => __( 'Quiz Percentage Grade', 'gravityview' ),
+				'label' => __('Quiz Percentage Grade', 'gravityview'),
 				'type'  => 'quiz_percent',
-				'desc'  => __( 'Displays the percentage of correct Quiz answers the user submitted.', 'gravityview' ),
+				'desc'  => __('Displays the percentage of correct Quiz answers the user submitted.', 'gravityview'),
 			);
-			$fields['gquiz_grade']   = array(
-				'label' => __( 'Quiz Letter Grade', 'gravityview' ),
+			$fields['gquiz_grade'] = array(
+				'label' => __('Quiz Letter Grade', 'gravityview'),
 				'type'  => 'quiz_grade',
-				'desc'  => __( 'Displays the Grade the user achieved based on Letter Grading configured in the Quiz Settings.', 'gravityview' ),
+				'desc'  => __('Displays the Grade the user achieved based on Letter Grading configured in the Quiz Settings.', 'gravityview'),
 			);
 			$fields['gquiz_is_pass'] = array(
-				'label' => __( 'Quiz Pass/Fail', 'gravityview' ),
+				'label' => __('Quiz Pass/Fail', 'gravityview'),
 				'type'  => 'quiz_is_pass',
-				'desc'  => __( 'Displays either Passed or Failed based on the Pass/Fail settings configured in the Quiz Settings.', 'gravityview' ),
+				'desc'  => __('Displays either Passed or Failed based on the Pass/Fail settings configured in the Quiz Settings.', 'gravityview'),
 			);
 		}
 
@@ -364,15 +364,15 @@ 
 	 * @param  string $form_id (default: '')
 	 * @return array
 	 */
-	public static function get_entry_meta( $form_id, $only_default_column = true ) {
+	public static function get_entry_meta($form_id, $only_default_column = true) {
 
-		$extra_fields = GFFormsModel::get_entry_meta( $form_id );
+		$extra_fields = GFFormsModel::get_entry_meta($form_id);
 
 		$fields = array();
 
-		foreach ( $extra_fields as $key => $field ){
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
+		foreach ($extra_fields as $key => $field) {
+			if (!empty($only_default_column) && !empty($field['is_default_column'])) {
+				$fields[$key] = array('label' => $field['label'], 'type' => 'entry_meta');
 			}
 		}
 
@@ -388,13 +388,13 @@ 
 	 * @since  1.1.6
 	 * @return array          Array of entry IDs
 	 */
-	public static function get_entry_ids( $form_id, $search_criteria = array() ) {
+	public static function get_entry_ids($form_id, $search_criteria = array()) {
 
-		if ( ! class_exists( 'GFFormsModel' ) ) {
+		if (!class_exists('GFFormsModel')) {
 			return;
 		}
 
-		return GFFormsModel::search_lead_ids( $form_id, $search_criteria );
+		return GFFormsModel::search_lead_ids($form_id, $search_criteria);
 	}
 
 	/**
@@ -406,33 +406,33 @@ 
 	 * @param null $form_ids array Gravity Forms form IDs
 	 * @return array|mixed|void
 	 */
-	public static function calculate_get_entries_criteria( $passed_criteria = null, $form_ids = null ) {
+	public static function calculate_get_entries_criteria($passed_criteria = null, $form_ids = null) {
 
 		$search_criteria_defaults = array(
 			'search_criteria' => null,
 			'sorting' => null,
 			'paging' => null,
-			'cache' => (isset( $passed_criteria['cache'] ) ? $passed_criteria['cache'] : true),
+			'cache' => (isset($passed_criteria['cache']) ? $passed_criteria['cache'] : true),
 		);
 
-		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
+		$criteria = wp_parse_args($passed_criteria, $search_criteria_defaults);
 
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) ) {
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
+		if (!empty($criteria['search_criteria']['field_filters'])) {
+			foreach ($criteria['search_criteria']['field_filters'] as &$filter) {
 
-				if ( ! is_array( $filter ) ) {
+				if (!is_array($filter)) {
 					continue;
 				}
 
 				// By default, we want searches to be wildcard for each field.
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
+				$filter['operator'] = empty($filter['operator']) ? 'contains' : $filter['operator'];
 
 				/**
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
 				 * @param string $operator Existing search operator
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
 				 */
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
+				$filter['operator'] = apply_filters('gravityview_search_operator', $filter['operator'], $filter);
 			}
 		}
 
@@ -440,32 +440,32 @@ 
 		 * Prepare date formats to be in Gravity Forms DB format;
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
 		 */
-		foreach ( array('start_date', 'end_date' ) as $key ) {
+		foreach (array('start_date', 'end_date') as $key) {
 
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
+			if (!empty($criteria['search_criteria'][$key])) {
 
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
-				$date = date_create( $criteria['search_criteria'][ $key ] );
+				$date = date_create($criteria['search_criteria'][$key]);
 
-				if ( $date ) {
+				if ($date) {
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
+					$criteria['search_criteria'][$key] = $date->format('Y-m-d H:i:s');
 				} else {
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
-					unset( $criteria['search_criteria'][ $key ] );
+					unset($criteria['search_criteria'][$key]);
 
-					do_action( 'gravityview_log_error', '[filter_get_entries_criteria] '.$key.' Date format not valid:', $criteria['search_criteria'][ $key ] );
+					do_action('gravityview_log_error', '[filter_get_entries_criteria] '.$key.' Date format not valid:', $criteria['search_criteria'][$key]);
 				}
 			}
 		}
 
 
 		// When multiple views are embedded, OR single entry, calculate the context view id and send it to the advanced filter
-		if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() || GravityView_frontend::getInstance()->single_entry ) {
+		if (class_exists('GravityView_View_Data') && GravityView_View_Data::getInstance()->has_multiple_views() || GravityView_frontend::getInstance()->single_entry) {
 			$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
-		} elseif ( 'delete' === RGForms::get( 'action' ) ) {
-			$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? $_GET['view_id'] : null;
-		} elseif( !isset( $criteria['context_view_id'] ) ) {
+		} elseif ('delete' === RGForms::get('action')) {
+			$criteria['context_view_id'] = isset($_GET['view_id']) ? $_GET['view_id'] : null;
+		} elseif (!isset($criteria['context_view_id'])) {
             // Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget)
 			$criteria['context_view_id'] = null;
 		}
@@ -476,7 +476,7 @@ 
 		 * @param array $form_ids Forms to search
 		 * @param int $view_id ID of the view being used to search
 		 */
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
+		$criteria = apply_filters('gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id']);
 
 		return $criteria;
 
@@ -494,32 +494,32 @@ 
 	 * @param mixed &$total Optional. An output parameter containing the total number of entries. Pass a non-null value to generate the total count. (default: null)
 	 * @return mixed False: Error fetching entries. Array: Multi-dimensional array of Gravity Forms entry arrays
 	 */
-	public static function get_entries( $form_ids = null, $passed_criteria = null, &$total = null ) {
+	public static function get_entries($form_ids = null, $passed_criteria = null, &$total = null) {
 
 		// Filter the criteria before query (includes Adv Filter)
-		$criteria = self::calculate_get_entries_criteria( $passed_criteria, $form_ids );
+		$criteria = self::calculate_get_entries_criteria($passed_criteria, $form_ids);
 
-		do_action( 'gravityview_log_debug', '[gravityview_get_entries] Final Parameters', $criteria );
+		do_action('gravityview_log_debug', '[gravityview_get_entries] Final Parameters', $criteria);
 
 		// Return value
 		$return = null;
 
-		if ( ! empty( $criteria['cache'] ) ) {
+		if (!empty($criteria['cache'])) {
 
-			$Cache = new GravityView_Cache( $form_ids, $criteria );
+			$Cache = new GravityView_Cache($form_ids, $criteria);
 
-			if ( $entries = $Cache->get() ) {
+			if ($entries = $Cache->get()) {
 
 				// Still update the total count when using cached results
-				if ( ! is_null( $total ) ) {
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
+				if (!is_null($total)) {
+					$total = GFAPI::count_entries($form_ids, $criteria['search_criteria']);
 				}
 
 				$return = $entries;
 			}
 		}
 
-		if ( is_null( $return ) && class_exists( 'GFAPI' ) && ( is_numeric( $form_ids ) || is_array( $form_ids ) ) ) {
+		if (is_null($return) && class_exists('GFAPI') && (is_numeric($form_ids) || is_array($form_ids))) {
 
 			/**
 			 * @filter `gravityview_pre_get_entries` Define entries to be used before GFAPI::get_entries() is called
@@ -529,24 +529,24 @@ 
 			 * @param array $passed_criteria The original search criteria passed to `GVCommon::get_entries()`
 			 * @param  int|null $total Optional. An output parameter containing the total number of entries. Pass a non-null value to generate
 			 */
-			$entries = apply_filters( 'gravityview_before_get_entries', null, $criteria, $passed_criteria, $total );
+			$entries = apply_filters('gravityview_before_get_entries', null, $criteria, $passed_criteria, $total);
 
 			// No entries returned from gravityview_before_get_entries
-			if( is_null( $entries ) ) {
+			if (is_null($entries)) {
 
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
+				$entries = GFAPI::get_entries($form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total);
 
-				if ( is_wp_error( $entries ) ) {
-					do_action( 'gravityview_log_error', $entries->get_error_message(), $entries );
+				if (is_wp_error($entries)) {
+					do_action('gravityview_log_error', $entries->get_error_message(), $entries);
 
 					return false;
 				}
 			}
 
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
+			if (!empty($criteria['cache']) && isset($Cache)) {
 
 				// Cache results
-				$Cache->set( $entries, 'entries' );
+				$Cache->set($entries, 'entries');
 
 			}
 
@@ -560,7 +560,7 @@ 
 		 * @param array $passed_criteria The original search criteria passed to `GVCommon::get_entries()`
 		 * @param  int|null $total Optional. An output parameter containing the total number of entries. Pass a non-null value to generate
 		 */
-		$return = apply_filters( 'gravityview_entries', $return, $criteria, $passed_criteria, $total );
+		$return = apply_filters('gravityview_entries', $return, $criteria, $passed_criteria, $total);
 
 		return $return;
 	}
@@ -577,15 +577,15 @@ 
 	 * @param boolean $check_entry_display Check whether the entry is visible for the current View configuration. Default: true. {@since 1.14}
 	 * @return array|boolean
 	 */
-	public static function get_entry( $entry_slug, $force_allow_ids = false, $check_entry_display = true ) {
+	public static function get_entry($entry_slug, $force_allow_ids = false, $check_entry_display = true) {
 
-		if ( class_exists( 'GFAPI' ) && ! empty( $entry_slug ) ) {
+		if (class_exists('GFAPI') && !empty($entry_slug)) {
 
 			/**
 			 * @filter `gravityview_custom_entry_slug` Whether to enable and use custom entry slugs.
 			 * @param boolean True: Allow for slugs based on entry values. False: always use entry IDs (default)
 			 */
-			$custom_slug = apply_filters( 'gravityview_custom_entry_slug', false );
+			$custom_slug = apply_filters('gravityview_custom_entry_slug', false);
 
 			/**
 			 * @filter `gravityview_custom_entry_slug_allow_id` When using a custom slug, allow access to the entry using the original slug (the Entry ID).
@@ -593,38 +593,38 @@ 
 			 * - If enabled, you could access using the custom slug OR the entry id (example: `/entry/custom-slug/` OR `/entry/123/`)
 			 * @param boolean $custom_slug_id_access True: allow accessing the slug by ID; False: only use the slug passed to the method.
 			 */
-			$custom_slug_id_access = $force_allow_ids || apply_filters( 'gravityview_custom_entry_slug_allow_id', false );
+			$custom_slug_id_access = $force_allow_ids || apply_filters('gravityview_custom_entry_slug_allow_id', false);
 
 			/**
 			 * If we're using custom entry slugs, we do a meta value search
 			 * instead of doing a straightup ID search.
 			 */
-			if ( $custom_slug ) {
+			if ($custom_slug) {
 
-				$entry_id = self::get_entry_id_from_slug( $entry_slug );
+				$entry_id = self::get_entry_id_from_slug($entry_slug);
 
 			}
 
 			// If custom slug is off, search using the entry ID
 			// ID allow ID access is on, also use entry ID as a backup
-			if ( empty( $custom_slug ) || ! empty( $custom_slug_id_access ) ) {
+			if (empty($custom_slug) || !empty($custom_slug_id_access)) {
 				// Search for IDs matching $entry_slug
 				$entry_id = $entry_slug;
 			}
 
-			if ( empty( $entry_id ) ) {
+			if (empty($entry_id)) {
 				return false;
 			}
 
 			// fetch the entry
-			$entry = GFAPI::get_entry( $entry_id );
+			$entry = GFAPI::get_entry($entry_id);
 
-			if( $check_entry_display ) {
+			if ($check_entry_display) {
 				// Is the entry allowed
-				$entry = self::check_entry_display( $entry );
+				$entry = self::check_entry_display($entry);
 			}
 
-			return is_wp_error( $entry ) ? false : $entry;
+			return is_wp_error($entry) ? false : $entry;
 
 		}
 
@@ -648,51 +648,51 @@ 
 	 *
 	 * @return bool True: matches, false: not matches
 	 */
-	public static function matches_operation( $val1, $val2, $operation ) {
+	public static function matches_operation($val1, $val2, $operation) {
 
 		$value = false;
 
-		if( 'context' === $val1 ) {
+		if ('context' === $val1) {
 
-			$matching_contexts = array( $val2 );
+			$matching_contexts = array($val2);
 
 			// We allow for non-standard contexts.
-			switch( $val2 ) {
+			switch ($val2) {
 				// Check for either single or edit
 				case 'singular':
-					$matching_contexts = array( 'single', 'edit' );
+					$matching_contexts = array('single', 'edit');
 					break;
 				// Use multiple as alias for directory for consistency
 				case 'multiple':
-					$matching_contexts = array( 'directory' );
+					$matching_contexts = array('directory');
 					break;
 			}
 
-			$val1 = in_array( gravityview_get_context(), $matching_contexts ) ? $val2 : false;
+			$val1 = in_array(gravityview_get_context(), $matching_contexts) ? $val2 : false;
 		}
 
-		switch ( $operation ) {
+		switch ($operation) {
 			case 'equals':
-				$value = GFFormsModel::matches_operation( $val1, $val2, 'is' );
+				$value = GFFormsModel::matches_operation($val1, $val2, 'is');
 				break;
 			case 'greater_than_or_is':
 			case 'greater_than_or_equals':
-				$is    = GFFormsModel::matches_operation( $val1, $val2, 'is' );
-				$gt    = GFFormsModel::matches_operation( $val1, $val2, 'greater_than' );
-				$value = ( $is || $gt );
+				$is    = GFFormsModel::matches_operation($val1, $val2, 'is');
+				$gt    = GFFormsModel::matches_operation($val1, $val2, 'greater_than');
+				$value = ($is || $gt);
 				break;
 			case 'less_than_or_is':
 			case 'less_than_or_equals':
-				$is    = GFFormsModel::matches_operation( $val1, $val2, 'is' );
-				$gt    = GFFormsModel::matches_operation( $val1, $val2, 'less_than' );
-				$value = ( $is || $gt );
+				$is    = GFFormsModel::matches_operation($val1, $val2, 'is');
+				$gt    = GFFormsModel::matches_operation($val1, $val2, 'less_than');
+				$value = ($is || $gt);
 				break;
 			case 'not_contains':
-				$contains = GFFormsModel::matches_operation( $val1, $val2, 'contains' );
-				$value    = ! $contains;
+				$contains = GFFormsModel::matches_operation($val1, $val2, 'contains');
+				$value    = !$contains;
 				break;
 			default:
-				$value = GFFormsModel::matches_operation( $val1, $val2, $operation );
+				$value = GFFormsModel::matches_operation($val1, $val2, $operation);
 		}
 
 		return $value;
@@ -709,31 +709,31 @@ 
 	 * @param array $entry Gravity Forms Entry object
 	 * @return bool|array Returns 'false' if entry is not valid according to the view search filters (Adv Filter)
 	 */
-	public static function check_entry_display( $entry ) {
+	public static function check_entry_display($entry) {
 
-		if ( ! $entry || is_wp_error( $entry ) ) {
-			do_action( 'gravityview_log_debug', __METHOD__ . ' Entry was not found.', $entry );
+		if (!$entry || is_wp_error($entry)) {
+			do_action('gravityview_log_debug', __METHOD__.' Entry was not found.', $entry);
 			return false;
 		}
 
-		if ( empty( $entry['form_id'] ) ) {
-			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry is empty! Entry:', $entry );
+		if (empty($entry['form_id'])) {
+			do_action('gravityview_log_debug', '[apply_filters_to_entry] Entry is empty! Entry:', $entry);
 			return false;
 		}
 
 		$criteria = self::calculate_get_entries_criteria();
 
-		if ( empty( $criteria['search_criteria'] ) || ! is_array( $criteria['search_criteria'] ) ) {
-			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No search criteria found:', $criteria );
+		if (empty($criteria['search_criteria']) || !is_array($criteria['search_criteria'])) {
+			do_action('gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No search criteria found:', $criteria);
 			return $entry;
 		}
 
 		$search_criteria = $criteria['search_criteria'];
-		unset( $criteria );
+		unset($criteria);
 
 		// check entry status
-		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria['status'] != $entry['status'] ) {
-			do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry['status'] ), $search_criteria );
+		if (array_key_exists('status', $search_criteria) && $search_criteria['status'] != $entry['status']) {
+			do_action('gravityview_log_debug', sprintf('[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry['status']), $search_criteria);
 			return false;
 		}
 
@@ -741,53 +741,53 @@ 
 		// @todo: Does it make sense to apply the Date create filters to the single entry?
 
 		// field_filters
-		if ( empty( $search_criteria['field_filters'] ) || ! is_array( $search_criteria['field_filters'] ) ) {
-			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No field filters criteria found:', $search_criteria );
+		if (empty($search_criteria['field_filters']) || !is_array($search_criteria['field_filters'])) {
+			do_action('gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No field filters criteria found:', $search_criteria);
 			return $entry;
 		}
 
 		$filters = $search_criteria['field_filters'];
-		unset( $search_criteria );
+		unset($search_criteria);
 
-		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters['mode'] ) : 'all';
-		unset( $filters['mode'] );
+		$mode = array_key_exists('mode', $filters) ? strtolower($filters['mode']) : 'all';
+		unset($filters['mode']);
 
-		$form = self::get_form( $entry['form_id'] );
+		$form = self::get_form($entry['form_id']);
 
-		foreach ( $filters as $filter ) {
+		foreach ($filters as $filter) {
 
-			if ( ! isset( $filter['key'] ) ) {
+			if (!isset($filter['key'])) {
 				continue;
 			}
 
 			$k = $filter['key'];
 
-			if ( in_array( $k, array( 'created_by', 'payment_status' ) ) ) {
-				$field_value = $entry[ $k ];
+			if (in_array($k, array('created_by', 'payment_status'))) {
+				$field_value = $entry[$k];
 				$field = null;
 			} else {
-				$field = self::get_field( $form, $k );
-				$field_value  = GFFormsModel::get_lead_field_value( $entry, $field );
+				$field = self::get_field($form, $k);
+				$field_value = GFFormsModel::get_lead_field_value($entry, $field);
 			}
 
-			$operator = isset( $filter['operator'] ) ? strtolower( $filter['operator'] ) : 'is';
-			$is_value_match = GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field );
+			$operator = isset($filter['operator']) ? strtolower($filter['operator']) : 'is';
+			$is_value_match = GFFormsModel::is_value_match($field_value, $filter['value'], $operator, $field);
 
 			// verify if we are already free to go!
-			if ( ! $is_value_match && 'all' === $mode ) {
-				do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry cannot be displayed. Failed one criteria for ALL mode', $filter );
+			if (!$is_value_match && 'all' === $mode) {
+				do_action('gravityview_log_debug', '[apply_filters_to_entry] Entry cannot be displayed. Failed one criteria for ALL mode', $filter);
 				return false;
-			} elseif ( $is_value_match && 'any' === $mode ) {
+			} elseif ($is_value_match && 'any' === $mode) {
 				return $entry;
 			}
 		}
 
 		// at this point, if in ALL mode, then entry is approved - all conditions were met.
 		// Or, for ANY mode, means none of the conditions were satisfied, so entry is not approved
-		if ( 'all' === $mode ) {
+		if ('all' === $mode) {
 			return $entry;
 		} else {
-			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters );
+			do_action('gravityview_log_debug', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters);
 			return false;
 		}
 
@@ -802,14 +802,14 @@ 
 	 * @param string $field_id
 	 * @return string
 	 */
-	public static function get_field_label( $form = array(), $field_id = '' ) {
+	public static function get_field_label($form = array(), $field_id = '') {
 
-		if ( empty( $form ) || empty( $field_id ) ) {
+		if (empty($form) || empty($field_id)) {
 			return '';
 		}
 
-		$field = self::get_field( $form, $field_id );
-		return isset( $field['label'] ) ?  $field['label'] : '';
+		$field = self::get_field($form, $field_id);
+		return isset($field['label']) ? $field['label'] : '';
 
 	}
 
@@ -826,9 +826,9 @@ 
 	 * @param string|int $field_id
 	 * @return array|null Array: Gravity Forms field array; NULL: Gravity Forms GFFormsModel does not exist
 	 */
-	public static function get_field( $form, $field_id ) {
-		if ( class_exists( 'GFFormsModel' ) ){
-			return GFFormsModel::get_field( $form, $field_id );
+	public static function get_field($form, $field_id) {
+		if (class_exists('GFFormsModel')) {
+			return GFFormsModel::get_field($form, $field_id);
 		} else {
 			return null;
 		}
@@ -844,16 +844,16 @@ 
 	 * @param  WP_Post      $post WordPress post object
 	 * @return boolean           True: yep, GravityView; No: not!
 	 */
-	public static function has_gravityview_shortcode( $post = null ) {
-		if ( ! is_a( $post, 'WP_Post' ) ) {
+	public static function has_gravityview_shortcode($post = null) {
+		if (!is_a($post, 'WP_Post')) {
 			return false;
 		}
 
-		if ( 'gravityview' === get_post_type( $post ) ) {
+		if ('gravityview' === get_post_type($post)) {
 			return true;
 		}
 
-		return self::has_shortcode_r( $post->post_content, 'gravityview' ) ? true : false;
+		return self::has_shortcode_r($post->post_content, 'gravityview') ? true : false;
 
 	}
 
@@ -864,27 +864,27 @@ 
 	 * @param string $content Content to check whether there's a shortcode
 	 * @param string $tag Current shortcode tag
 	 */
-	public static function has_shortcode_r( $content, $tag = 'gravityview' ) {
-		if ( false === strpos( $content, '[' ) ) {
+	public static function has_shortcode_r($content, $tag = 'gravityview') {
+		if (false === strpos($content, '[')) {
 			return false;
 		}
 
-		if ( shortcode_exists( $tag ) ) {
+		if (shortcode_exists($tag)) {
 
 			$shortcodes = array();
 
-			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
-			if ( empty( $matches ) ){
+			preg_match_all('/'.get_shortcode_regex().'/s', $content, $matches, PREG_SET_ORDER);
+			if (empty($matches)) {
 				return false;
 			}
 
-			foreach ( $matches as $shortcode ) {
-				if ( $tag === $shortcode[2] ) {
+			foreach ($matches as $shortcode) {
+				if ($tag === $shortcode[2]) {
 
 					// Changed this to $shortcode instead of true so we get the parsed atts.
 					$shortcodes[] = $shortcode;
 
-				} else if ( isset( $shortcode[5] ) && $result = self::has_shortcode_r( $shortcode[5], $tag ) ) {
+				} else if (isset($shortcode[5]) && $result = self::has_shortcode_r($shortcode[5], $tag)) {
 					$shortcodes = $result;
 				}
 			}
@@ -908,7 +908,7 @@ 
 	 *
 	 * @return array          Array with view details, as returned by get_posts()
 	 */
-	public static function get_connected_views( $form_id, $args = array() ) {
+	public static function get_connected_views($form_id, $args = array()) {
 
 		$defaults = array(
 			'post_type' => 'gravityview',
@@ -917,9 +917,9 @@ 
 			'meta_value' => (int)$form_id,
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$views = get_posts( $args );
+		$views = get_posts($args);
 
 		return $views;
 	}
@@ -931,8 +931,8 @@ 
 	 *
 	 * @return string ID of the connected Form, if exists. Empty string if not.
 	 */
-	public static function get_meta_form_id( $view_id ) {
-		return get_post_meta( $view_id, '_gravityview_form_id', true );
+	public static function get_meta_form_id($view_id) {
+		return get_post_meta($view_id, '_gravityview_form_id', true);
 	}
 
 	/**
@@ -944,8 +944,8 @@ 
 	 *
 	 * @return string GravityView_Template::template_id value. Empty string if not.
 	 */
-	public static function get_meta_template_id( $view_id ) {
-		return get_post_meta( $view_id, '_gravityview_directory_template', true );
+	public static function get_meta_template_id($view_id) {
+		return get_post_meta($view_id, '_gravityview_directory_template', true);
 	}
 
 
@@ -956,15 +956,15 @@ 
 	 * @param  int $post_id View ID
 	 * @return array          Associative array of settings with plugin defaults used if not set by the View
 	 */
-	public static function get_template_settings( $post_id ) {
+	public static function get_template_settings($post_id) {
 
-		$settings = get_post_meta( $post_id, '_gravityview_template_settings', true );
+		$settings = get_post_meta($post_id, '_gravityview_template_settings', true);
 
-		if ( class_exists( 'GravityView_View_Data' ) ) {
+		if (class_exists('GravityView_View_Data')) {
 
 			$defaults = GravityView_View_Data::get_default_args();
 
-			return wp_parse_args( (array)$settings, $defaults );
+			return wp_parse_args((array)$settings, $defaults);
 
 		}
 
@@ -981,12 +981,12 @@ 
 	 * @param  string $key     Key for the setting
 	 * @return mixed|null          Setting value, or NULL if not set.
 	 */
-	public static function get_template_setting( $post_id, $key ) {
+	public static function get_template_setting($post_id, $key) {
 
-		$settings = self::get_template_settings( $post_id );
+		$settings = self::get_template_settings($post_id);
 
-		if ( isset( $settings[ $key ] ) ) {
-			return $settings[ $key ];
+		if (isset($settings[$key])) {
+			return $settings[$key];
 		}
 
 		return null;
@@ -1022,8 +1022,8 @@ 
 	 * @param  int $post_id View ID
 	 * @return array          Multi-array of fields with first level being the field zones. See code comment.
 	 */
-	public static function get_directory_fields( $post_id ) {
-		return get_post_meta( $post_id, '_gravityview_directory_fields', true );
+	public static function get_directory_fields($post_id) {
+		return get_post_meta($post_id, '_gravityview_directory_fields', true);
 	}
 
 
@@ -1034,25 +1034,25 @@ 
 	 * @param  int $formid Form ID
 	 * @return string         html
 	 */
-	public static function get_sortable_fields( $formid, $current = '' ) {
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>';
+	public static function get_sortable_fields($formid, $current = '') {
+		$output = '<option value="" '.selected('', $current, false).'>'.esc_html__('Default', 'gravityview').'</option>';
 
-		if ( empty( $formid ) ) {
+		if (empty($formid)) {
 			return $output;
 		}
 
-		$fields = self::get_sortable_fields_array( $formid );
+		$fields = self::get_sortable_fields_array($formid);
 
-		if ( ! empty( $fields ) ) {
+		if (!empty($fields)) {
 
-			$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null );
+			$blacklist_field_types = apply_filters('gravityview_blacklist_field_types', array('list', 'textarea'), null);
 
-			foreach ( $fields as $id => $field ) {
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
+			foreach ($fields as $id => $field) {
+				if (in_array($field['type'], $blacklist_field_types)) {
 					continue;
 				}
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
+				$output .= '<option value="'.$id.'" '.selected($id, $current, false).'>'.esc_attr($field['label']).'</option>';
 			}
 		}
 
@@ -1070,27 +1070,27 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_sortable_fields_array( $formid, $blacklist = array( 'list', 'textarea' ) ) {
+	public static function get_sortable_fields_array($formid, $blacklist = array('list', 'textarea')) {
 
 		// Get fields with sub-inputs and no parent
-		$fields = self::get_form_fields( $formid, true, false );
+		$fields = self::get_form_fields($formid, true, false);
 
 		$date_created = array(
 			'date_created' => array(
 				'type' => 'date_created',
-				'label' => __( 'Date Created', 'gravityview' ),
+				'label' => __('Date Created', 'gravityview'),
 			),
 		);
 
         $fields = $date_created + $fields;
 
-		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
+		$blacklist_field_types = apply_filters('gravityview_blacklist_field_types', $blacklist, NULL);
 
 		// TODO: Convert to using array_filter
-		foreach( $fields as $id => $field ) {
+		foreach ($fields as $id => $field) {
 
-			if( in_array( $field['type'], $blacklist_field_types ) ) {
-				unset( $fields[ $id ] );
+			if (in_array($field['type'], $blacklist_field_types)) {
+				unset($fields[$id]);
 			}
 		}
 
@@ -1100,7 +1100,7 @@ 
          * @param array $fields Sub-set of GF form fields that are sortable
          * @param int $formid The Gravity Forms form ID that the fields are from
          */
-        $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
+        $fields = apply_filters('gravityview/common/sortable_fields', $fields, $formid);
 
 		return $fields;
 	}
@@ -1111,15 +1111,15 @@ 
 	 * @param  mixed $field_id Field ID or Field array
 	 * @return string field type
 	 */
-	public static function get_field_type( $form = null, $field_id = '' ) {
+	public static function get_field_type($form = null, $field_id = '') {
 
-		if ( ! empty( $field_id ) && ! is_array( $field_id ) ) {
-			$field = self::get_field( $form, $field_id );
+		if (!empty($field_id) && !is_array($field_id)) {
+			$field = self::get_field($form, $field_id);
 		} else {
 			$field = $field_id;
 		}
 
-		return class_exists( 'RGFormsModel' ) ? RGFormsModel::get_input_type( $field ) : '';
+		return class_exists('RGFormsModel') ? RGFormsModel::get_input_type($field) : '';
 
 	}
 
@@ -1130,22 +1130,22 @@ 
 	 * @param  int|array  $field field key or field array
 	 * @return boolean
 	 */
-	public static function is_field_numeric(  $form = null, $field = '' ) {
+	public static function is_field_numeric($form = null, $field = '') {
 
 		/**
 		 * @filter `gravityview/common/numeric_types` What types of fields are numeric?
 		 * @since 1.5.2
 		 * @param array $numeric_types Fields that are numeric. Default: `[ number, time ]`
 		 */
-		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
+		$numeric_types = apply_filters('gravityview/common/numeric_types', array('number', 'time'));
 
-		if ( ! is_array( $form ) && ! is_array( $field ) ) {
-			$form = self::get_form( $form );
+		if (!is_array($form) && !is_array($field)) {
+			$form = self::get_form($form);
 		}
 
-		$type = self::get_field_type( $form, $field );
+		$type = self::get_field_type($form, $field);
 
-		return in_array( $type, $numeric_types );
+		return in_array($type, $numeric_types);
 
 	}
 
@@ -1163,19 +1163,19 @@ 
 	 *
 	 * @return string Content, encrypted
 	 */
-	public static function js_encrypt( $content, $message = '' ) {
+	public static function js_encrypt($content, $message = '') {
 
 		$output = $content;
 
-		if ( ! class_exists( 'StandalonePHPEnkoder' ) ) {
-			include_once( GRAVITYVIEW_DIR . 'includes/lib/standalone-phpenkoder/StandalonePHPEnkoder.php' );
+		if (!class_exists('StandalonePHPEnkoder')) {
+			include_once(GRAVITYVIEW_DIR.'includes/lib/standalone-phpenkoder/StandalonePHPEnkoder.php');
 		}
 
-		if ( class_exists( 'StandalonePHPEnkoder' ) ) {
+		if (class_exists('StandalonePHPEnkoder')) {
 
 			$enkoder = new StandalonePHPEnkoder;
 
-			$message = empty( $message ) ? __( 'Email hidden; Javascript is required.', 'gravityview' ) : $message;
+			$message = empty($message) ? __('Email hidden; Javascript is required.', 'gravityview') : $message;
 
 			/**
 			 * @filter `gravityview/phpenkoder/msg` Modify the message shown when Javascript is disabled and an encrypted email field is displayed
@@ -1183,9 +1183,9 @@ 
 			 * @param string $message Existing message
 			 * @param string $content Content to encrypt
 			 */
-			$enkoder->enkode_msg = apply_filters( 'gravityview/phpenkoder/msg', $message, $content );
+			$enkoder->enkode_msg = apply_filters('gravityview/phpenkoder/msg', $message, $content);
 
-			$output = $enkoder->enkode( $content );
+			$output = $enkoder->enkode($content);
 		}
 
 		return $output;
@@ -1202,25 +1202,25 @@ 
 	 *
 	 * @author rubo77 at https://gist.github.com/rubo77/6821632
 	 **/
-	public static function gv_parse_str( $string, &$result ) {
-		if ( empty( $string ) ) {
+	public static function gv_parse_str($string, &$result) {
+		if (empty($string)) {
 			return false;
 		}
 
 		$result = array();
 
 		// find the pairs "name=value"
-		$pairs = explode( '&', $string );
+		$pairs = explode('&', $string);
 
-		foreach ( $pairs as $pair ) {
+		foreach ($pairs as $pair) {
 			// use the original parse_str() on each element
-			parse_str( $pair, $params );
+			parse_str($pair, $params);
 
-			$k = key( $params );
-			if ( ! isset( $result[ $k ] ) ) {
+			$k = key($params);
+			if (!isset($result[$k])) {
 				$result += $params;
-			} elseif ( array_key_exists( $k, $params ) && is_array( $params[ $k ] ) ) {
-				$result[ $k ] = self::array_merge_recursive_distinct( $result[ $k ], $params[ $k ] );
+			} elseif (array_key_exists($k, $params) && is_array($params[$k])) {
+				$result[$k] = self::array_merge_recursive_distinct($result[$k], $params[$k]);
 			}
 		}
 		return true;
@@ -1242,7 +1242,7 @@ 
 	 *
 	 * @return string HTML output of anchor link. If empty $href, returns NULL
 	 */
-	public static function get_link_html( $href = '', $anchor_text = '', $atts = array() ) {
+	public static function get_link_html($href = '', $anchor_text = '', $atts = array()) {
 
 		// Supported attributes for anchor tags. HREF left out intentionally.
 		$allowed_atts = array(
@@ -1278,31 +1278,31 @@ 
 		 * @filter `gravityview/get_link/allowed_atts` Modify the attributes that are allowed to be used in generating links
 		 * @param array $allowed_atts Array of attributes allowed
 		 */
-		$allowed_atts = apply_filters( 'gravityview/get_link/allowed_atts', $allowed_atts );
+		$allowed_atts = apply_filters('gravityview/get_link/allowed_atts', $allowed_atts);
 
 		// Make sure the attributes are formatted as array
-		$passed_atts = wp_parse_args( $atts );
+		$passed_atts = wp_parse_args($atts);
 
 		// Make sure the allowed attributes are only the ones in the $allowed_atts list
-		$final_atts = shortcode_atts( $allowed_atts, $passed_atts );
+		$final_atts = shortcode_atts($allowed_atts, $passed_atts);
 
 		// Remove attributes with empty values
-		$final_atts = array_filter( $final_atts );
+		$final_atts = array_filter($final_atts);
 
 		// If the href wasn't passed as an attribute, use the value passed to the function
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
+		if (empty($final_atts['href']) && !empty($href)) {
 			$final_atts['href'] = $href;
 		}
 
-		$final_atts['href'] = esc_url_raw( $href );
+		$final_atts['href'] = esc_url_raw($href);
 
 		// For each attribute, generate the code
 		$output = '';
-		foreach ( $final_atts as $attr => $value ) {
-			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
+		foreach ($final_atts as $attr => $value) {
+			$output .= sprintf(' %s="%s"', $attr, esc_attr($value));
 		}
 
-		$output = '<a'. $output .'>'. $anchor_text .'</a>';
+		$output = '<a'.$output.'>'.$anchor_text.'</a>';
 
 		return $output;
 	}
@@ -1321,14 +1321,14 @@ 
 	 * @author Daniel <daniel (at) danielsmedegaardbuus (dot) dk>
 	 * @author Gabriel Sobrinho <gabriel (dot) sobrinho (at) gmail (dot) com>
 	 */
-	public static function array_merge_recursive_distinct( array &$array1, array &$array2 ) {
+	public static function array_merge_recursive_distinct(array &$array1, array &$array2) {
 		$merged = $array1;
 
-		foreach ( $array2 as $key => &$value )  {
-			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
-				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
+		foreach ($array2 as $key => &$value) {
+			if (is_array($value) && isset($merged[$key]) && is_array($merged[$key])) {
+				$merged[$key] = self::array_merge_recursive_distinct($merged[$key], $value);
 			} else {
-				$merged[ $key ] = $value;
+				$merged[$key] = $value;
 			}
 		}
 
@@ -1342,26 +1342,26 @@ 
 	 * @param array $args Arguments to modify the user query. See get_users() {@since 1.14}
 	 * @return array Array of WP_User objects.
 	 */
-	public static function get_users( $context = 'change_entry_creator', $args = array() ) {
+	public static function get_users($context = 'change_entry_creator', $args = array()) {
 
 		$default_args = array(
 			'number' => 2000,
 			'orderby' => 'display_name',
 			'order' => 'ASC',
-			'fields' => array( 'ID', 'display_name', 'user_login', 'user_nicename' )
+			'fields' => array('ID', 'display_name', 'user_login', 'user_nicename')
 		);
 
 		// Merge in the passed arg
-		$get_users_settings = wp_parse_args( $args, $default_args );
+		$get_users_settings = wp_parse_args($args, $default_args);
 
 		/**
 		 * @filter `gravityview/get_users/{$context}` There are issues with too many users using [get_users()](http://codex.wordpress.org/Function_Reference/get_users) where it breaks the select. We try to keep it at a reasonable number. \n
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
 		 */
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
+		$get_users_settings = apply_filters('gravityview/get_users/'.$context, apply_filters('gravityview_change_entry_creator_user_parameters', $get_users_settings));
 
-		return get_users( $get_users_settings );
+		return get_users($get_users_settings);
 	}
 
 
@@ -1373,8 +1373,8 @@ 
      *
      * @return string
      */
-    public static function generate_notice( $notice, $class = '' ) {
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
+    public static function generate_notice($notice, $class = '') {
+        return '<div class="gv-notice '.gravityview_sanitize_html_class($class).'">'.$notice.'</div>';
     }
 
 
@@ -1396,6 +1396,6 @@ 
  *
  * @return string HTML output of anchor link. If empty $href, returns NULL
  */
-function gravityview_get_link( $href = '', $anchor_text = '', $atts = array() ) {
-	return GVCommon::get_link_html( $href, $anchor_text, $atts );
+function gravityview_get_link($href = '', $anchor_text = '', $atts = array()) {
+	return GVCommon::get_link_html($href, $anchor_text, $atts);
 }

includes/class-data.php

Spacing +164 added lines, -164 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 /** If this file is called directly, abort. */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
@@ -15,14 +15,14 @@ 
 	 *
 	 * @param null $passed_post
 	 */
-	private function __construct( $passed_post = NULL ) {
+	private function __construct($passed_post = NULL) {
 
-		if( !empty( $passed_post ) ) {
+		if (!empty($passed_post)) {
 
-			$id_or_id_array = $this->maybe_get_view_id( $passed_post );
+			$id_or_id_array = $this->maybe_get_view_id($passed_post);
 
-			if( !empty( $id_or_id_array ) ) {
-				$this->add_view( $id_or_id_array );
+			if (!empty($id_or_id_array)) {
+				$this->add_view($id_or_id_array);
 			}
 		}
 
@@ -34,7 +34,7 @@ 
 	public function has_multiple_views() {
 
 		//multiple views
-		return count( $this->get_views() ) > 1 ? true : false;
+		return count($this->get_views()) > 1 ? true : false;
 	}
 
 
@@ -52,37 +52,37 @@ 
 	 *
 	 * @return int|null|array ID of the View. If there are multiple views in the content, array of IDs parsed.
 	 */
-	public function maybe_get_view_id( $passed_post ) {
+	public function maybe_get_view_id($passed_post) {
 
 		$ids = array();
 
-		if( ! empty( $passed_post ) ) {
+		if (!empty($passed_post)) {
 
-			if( is_numeric( $passed_post ) ) {
-				$passed_post = get_post( $passed_post );
+			if (is_numeric($passed_post)) {
+				$passed_post = get_post($passed_post);
 			}
 
 			// Convert WP_Posts into WP_Posts[] array
-			if( $passed_post instanceof WP_Post ) {
-				$passed_post = array( $passed_post );
+			if ($passed_post instanceof WP_Post) {
+				$passed_post = array($passed_post);
 			}
 
-			if( is_array( $passed_post ) ) {
+			if (is_array($passed_post)) {
 
-				foreach ( $passed_post as &$post) {
-					if( ( get_post_type( $post ) === 'gravityview' ) ) {
+				foreach ($passed_post as &$post) {
+					if ((get_post_type($post) === 'gravityview')) {
 						$ids[] = $post->ID;
-					} else{
+					} else {
 						// Parse the Post Content
-						$id = $this->parse_post_content( $post->post_content );
-						if( $id ) {
-							$ids = array_merge( $ids, (array) $id );
+						$id = $this->parse_post_content($post->post_content);
+						if ($id) {
+							$ids = array_merge($ids, (array)$id);
 						}
 
 						// Parse the Post Meta
-						$id = $this->parse_post_meta( $post->ID );
-						if( $id ) {
-							$ids = array_merge( $ids, (array) $id );
+						$id = $this->parse_post_meta($post->ID);
+						if ($id) {
+							$ids = array_merge($ids, (array)$id);
 						}
 					}
 
@@ -90,33 +90,33 @@ 
 
 			} else {
 
-				if ( is_string( $passed_post ) ) {
+				if (is_string($passed_post)) {
 
-					$id = $this->parse_post_content( $passed_post );
-					if( $id ) {
-						$ids = array_merge( $ids, (array) $id );
+					$id = $this->parse_post_content($passed_post);
+					if ($id) {
+						$ids = array_merge($ids, (array)$id);
 					}
 
 				} else {
-					$id = $this->get_id_from_atts( $passed_post );
-					$ids[] = intval( $id );
+					$id = $this->get_id_from_atts($passed_post);
+					$ids[] = intval($id);
 				}
 			}
 		}
 
-		if( empty($ids) ) {
+		if (empty($ids)) {
 			return NULL;
 		}
 
 		// If it's just one ID, return that.
 		// Otherwise, return array of IDs
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
+		return (sizeof($ids) === 1) ? $ids[0] : $ids;
 	}
 
-	public static function getInstance( $passed_post = NULL ) {
+	public static function getInstance($passed_post = NULL) {
 
-		if( empty( self::$instance ) ) {
-			self::$instance = new GravityView_View_Data( $passed_post );
+		if (empty(self::$instance)) {
+			self::$instance = new GravityView_View_Data($passed_post);
 		}
 
 		return self::$instance;
@@ -126,25 +126,25 @@ 
 		return $this->views;
 	}
 
-	function get_view( $view_id, $atts = NULL ) {
+	function get_view($view_id, $atts = NULL) {
 
-		if( ! is_numeric( $view_id) ) {
-			do_action('gravityview_log_error', sprintf('GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id) );
+		if (!is_numeric($view_id)) {
+			do_action('gravityview_log_error', sprintf('GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id));
 			return false;
 		}
 
 		// Backup: the view hasn't been fetched yet. Doing it now.
-		if ( ! isset( $this->views[ $view_id ] ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] View #%s not set yet.', $view_id) );
-			return $this->add_view( $view_id, $atts );
+		if (!isset($this->views[$view_id])) {
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] View #%s not set yet.', $view_id));
+			return $this->add_view($view_id, $atts);
 		}
 
-		if ( empty( $this->views[ $view_id ] ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id) );
+		if (empty($this->views[$view_id])) {
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id));
 			return false;
 		}
 
-		return $this->views[ $view_id ];
+		return $this->views[$view_id];
 	}
 
 	/**
@@ -156,8 +156,8 @@ 
 	 * @return   bool          True if the post exists; otherwise, false.
 	 * @since    1.0.0
 	 */
-	function view_exists( $view_id ) {
-		return is_string( get_post_status( $view_id ) );
+	function view_exists($view_id) {
+		return is_string(get_post_status($view_id));
 	}
 
 	/**
@@ -168,56 +168,56 @@ 
 	 * @param array|string $atts Combine other attributes (eg. from shortcode) with the view settings (optional)
 	 * @return type
 	 */
-	function add_view( $view_id, $atts = NULL ) {
+	function add_view($view_id, $atts = NULL) {
 
 		// Handle array of IDs
-		if( is_array( $view_id ) ) {
-			foreach( $view_id as $id ) {
+		if (is_array($view_id)) {
+			foreach ($view_id as $id) {
 
-				$this->add_view( $id, $atts );
+				$this->add_view($id, $atts);
 			}
 
 			return $this->views;
 		}
 
 		// The view has been set already; returning stored view.
-		if ( !empty( $this->views[ $view_id ] ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id) );
-			return $this->views[ $view_id ];
+		if (!empty($this->views[$view_id])) {
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id));
+			return $this->views[$view_id];
 		}
 
-		if( ! $this->view_exists( $view_id ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id) );
+		if (!$this->view_exists($view_id)) {
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id));
 			return false;
 		}
 
-		$form_id = gravityview_get_form_id( $view_id );
+		$form_id = gravityview_get_form_id($view_id);
 
-		if( empty( $form_id ) ) {
+		if (empty($form_id)) {
 
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id) );
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id));
 
 			return false;
 		}
 
 		// Get the settings for the View ID
-		$view_settings = gravityview_get_template_settings( $view_id );
+		$view_settings = gravityview_get_template_settings($view_id);
 
-		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id), $view_settings );
+		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id), $view_settings);
 
 		// Merge the view settings with the defaults
-		$view_defaults = wp_parse_args( $view_settings, self::get_default_args() );
+		$view_defaults = wp_parse_args($view_settings, self::get_default_args());
 
-		do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults );
+		do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults);
 
-		if( ! empty( $atts ) && is_array( $atts ) ) {
+		if (!empty($atts) && is_array($atts)) {
 
-			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging  with the $view_defaults', $atts );
+			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging  with the $view_defaults', $atts);
 
 			// Get the settings from the shortcode and merge them with defaults.
-			$atts = shortcode_atts( $view_defaults, $atts );
+			$atts = shortcode_atts($view_defaults, $atts);
 
-			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging  with the $view_defaults', $atts );
+			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging  with the $view_defaults', $atts);
 
 		} else {
 
@@ -226,24 +226,24 @@ 
 
 		}
 
-		unset( $atts['id'], $view_defaults, $view_settings );
+		unset($atts['id'], $view_defaults, $view_settings);
 
 		$data = array(
 			'id' => $view_id,
 			'view_id' => $view_id,
 			'form_id' => $form_id,
-			'template_id' => gravityview_get_template_id( $view_id ),
+			'template_id' => gravityview_get_template_id($view_id),
 			'atts' => $atts,
-			'fields' => $this->get_fields( $view_id ),
-			'widgets' => get_post_meta( $view_id, '_gravityview_directory_widgets', true ),
-			'form' => gravityview_get_form( $form_id ),
+			'fields' => $this->get_fields($view_id),
+			'widgets' => get_post_meta($view_id, '_gravityview_directory_widgets', true),
+			'form' => gravityview_get_form($form_id),
 		);
 
-		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] View #%s being added.', $view_id), $data );
+		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] View #%s being added.', $view_id), $data);
 
-		$this->views[ $view_id ] = $data;
+		$this->views[$view_id] = $data;
 
-		return $this->views[ $view_id ];
+		return $this->views[$view_id];
 	}
 
 	/**
@@ -253,14 +253,14 @@ 
 	 * @param  int $view_id View ID
 	 * @return array          Array of fields as passed by `gravityview_get_directory_fields()`
 	 */
-	function get_fields( $view_id ) {
+	function get_fields($view_id) {
 
-		$dir_fields = gravityview_get_directory_fields( $view_id );
-		do_action( 'gravityview_log_debug', '[render_view] Fields: ', $dir_fields );
+		$dir_fields = gravityview_get_directory_fields($view_id);
+		do_action('gravityview_log_debug', '[render_view] Fields: ', $dir_fields);
 
 		// remove fields according to visitor visibility permissions (if logged-in)
-		$dir_fields = $this->filter_fields( $dir_fields );
-		do_action( 'gravityview_log_debug', '[render_view] Fields after visibility filter: ', $dir_fields );
+		$dir_fields = $this->filter_fields($dir_fields);
+		do_action('gravityview_log_debug', '[render_view] Fields after visibility filter: ', $dir_fields);
 
 		return $dir_fields;
 	}
@@ -272,18 +272,18 @@ 
 	 * @param array $dir_fields
 	 * @return array
 	 */
-	private function filter_fields( $dir_fields ) {
+	private function filter_fields($dir_fields) {
 
-		if( empty( $dir_fields ) || !is_array( $dir_fields ) ) {
+		if (empty($dir_fields) || !is_array($dir_fields)) {
 			return $dir_fields;
 		}
 
-		foreach( $dir_fields as $area => $fields ) {
+		foreach ($dir_fields as $area => $fields) {
 
-			foreach( (array)$fields as $uniqid => $properties ) {
+			foreach ((array)$fields as $uniqid => $properties) {
 
-				if( $this->hide_field_check_conditions( $properties ) ) {
-					unset( $dir_fields[ $area ][ $uniqid ] );
+				if ($this->hide_field_check_conditions($properties)) {
+					unset($dir_fields[$area][$uniqid]);
 				}
 
 			}
@@ -301,31 +301,31 @@ 
 	 * @param array $properties
 	 * @return void|boolean (field should be hidden) or false (field should be presented)
 	 */
-	private function hide_field_check_conditions( $properties ) {
+	private function hide_field_check_conditions($properties) {
 
 		// logged-in visibility
-		if( ! empty( $properties['only_loggedin'] ) && ! GVCommon::has_cap( $properties['only_loggedin_cap'] ) ) {
+		if (!empty($properties['only_loggedin']) && !GVCommon::has_cap($properties['only_loggedin_cap'])) {
 			return true;
 		}
 
 		return false;
 	}
 
-	function get_id_from_atts( $atts ) {
+	function get_id_from_atts($atts) {
 
-		$atts = is_array( $atts ) ? $atts : shortcode_parse_atts( $atts );
+		$atts = is_array($atts) ? $atts : shortcode_parse_atts($atts);
 
 		// Get the settings from the shortcode and merge them with defaults.
-		$atts = wp_parse_args( $atts, self::get_default_args() );
+		$atts = wp_parse_args($atts, self::get_default_args());
 
-		$view_id = ! empty( $atts['view_id'] ) ? (int)$atts['view_id'] : NULL;
+		$view_id = !empty($atts['view_id']) ? (int)$atts['view_id'] : NULL;
 
-		if( empty( $view_id ) && !empty( $atts['id'] ) ) {
+		if (empty($view_id) && !empty($atts['id'])) {
 			$view_id = (int)$atts['id'];
 		}
 
-		if( empty( $view_id ) ) {
-			do_action('gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts );
+		if (empty($view_id)) {
+			do_action('gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts);
 			return;
 		}
 
@@ -341,50 +341,50 @@ 
 	 * @param  string $content $post->post_content content
 	 * @return int|null|array If a single View is found, the ID of the View. If there are multiple views in the content, array of IDs parsed. If not found, NULL
 	 */
-	function parse_post_content( $content ) {
+	function parse_post_content($content) {
 
 		/**
 		 * @hack This is so that the shortcode is registered for the oEmbed preview in the Admin
 		 * @since 1.6
 		 */
-		if( ! shortcode_exists('gravityview') && class_exists( 'GravityView_Shortcode' ) ) {
+		if (!shortcode_exists('gravityview') && class_exists('GravityView_Shortcode')) {
 			new GravityView_Shortcode;
 		}
 
-		$shortcodes = gravityview_has_shortcode_r( $content, 'gravityview' );
+		$shortcodes = gravityview_has_shortcode_r($content, 'gravityview');
 
-		if( empty( $shortcodes ) ) {
+		if (empty($shortcodes)) {
 			return NULL;
 		}
 
-		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes );
+		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes);
 
 		$ids = array();
 
 		foreach ($shortcodes as $key => $shortcode) {
 
-			$args = shortcode_parse_atts( $shortcode[3] );
+			$args = shortcode_parse_atts($shortcode[3]);
 
-			if( empty( $args['id'] ) ) {
-				do_action('gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts for Post #%s (Atts)', $post->ID ), $shortcode );
+			if (empty($args['id'])) {
+				do_action('gravityview_log_error', sprintf('GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts for Post #%s (Atts)', $post->ID), $shortcode);
 				continue;
 			}
 
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args['id']), $args );
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args['id']), $args);
 
 			// Store the View to the object for later fetching.
-			$this->add_view( $args['id'], $args );
+			$this->add_view($args['id'], $args);
 
 			$ids[] = $args['id'];
 		}
 
-		if( empty($ids) ) {
+		if (empty($ids)) {
 			return NULL;
 		}
 
 		// If it's just one ID, return that.
 		// Otherwise, return array of IDs
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
+		return (sizeof($ids) === 1) ? $ids[0] : $ids;
 
 	}
 
@@ -395,7 +395,7 @@ 
 	 * @param int $post_id WP_Post ID
 	 * @return int|null|array If a single View is found, the ID of the View. If there are multiple views in the content, array of IDs parsed. If not found, or meta not parsed, NULL
 	 */
-	private function parse_post_meta( $post_id ) {
+	private function parse_post_meta($post_id) {
 
 		/**
 		 * @filter `gravityview/data/parse/meta_keys` Define meta keys to parse to check for GravityView shortcode content
@@ -403,32 +403,32 @@ 
 		 * @param[in,out] array $meta_keys Array of key values to check. If empty, do not check. Default: empty array
 		 * @param[in] int $post_id ID of the post being checked
 		 */
-		$meta_keys = (array)apply_filters( 'gravityview/data/parse/meta_keys', array(), $post_id );
+		$meta_keys = (array)apply_filters('gravityview/data/parse/meta_keys', array(), $post_id);
 
-		if( empty( $meta_keys ) ) {
+		if (empty($meta_keys)) {
 			return NULL;
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_View_Data[parse_post_meta] Search for GravityView shortcodes on the following custom fields keys:', $meta_keys );
+		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_meta] Search for GravityView shortcodes on the following custom fields keys:', $meta_keys);
 
 		$meta_content = '';
 
-		foreach( $meta_keys as $key ) {
-			$meta = get_post_meta( $post_id, $key , true );
-			if( ! is_string( $meta ) ) {
+		foreach ($meta_keys as $key) {
+			$meta = get_post_meta($post_id, $key, true);
+			if (!is_string($meta)) {
 				continue;
 			}
-			$meta_content .= $meta . ' ';
+			$meta_content .= $meta.' ';
 		}
 
-		if( empty( $meta_content ) ) {
-			do_action('gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id ), $meta_keys );
+		if (empty($meta_content)) {
+			do_action('gravityview_log_error', sprintf('GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id), $meta_keys);
 			return NULL;
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_View_Data[parse_post_meta] Combined content retrieved from custom fields:', $meta_content );
+		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_meta] Combined content retrieved from custom fields:', $meta_content);
 
-		return $this->parse_post_content( $meta_content );
+		return $this->parse_post_content($meta_content);
 
 	}
 
@@ -444,61 +444,61 @@ 
 	 *
 	 * @return bool|WP_Error If valid, returns true. If invalid, returns WP_Error containing error message.
 	 */
-	public static function is_valid_embed_id( $post_id = '', $view_id = '', $empty_is_valid = true ) {
+	public static function is_valid_embed_id($post_id = '', $view_id = '', $empty_is_valid = true) {
 
 		$message = NULL;
 
 		// Not invalid if not set!
-		if( empty( $post_id ) || empty( $view_id ) ) {
+		if (empty($post_id) || empty($view_id)) {
 
-			if( $empty_is_valid ) {
+			if ($empty_is_valid) {
 				return true;
 			}
 
-			$message = esc_html__( 'The ID is required.', 'gravityview' );
+			$message = esc_html__('The ID is required.', 'gravityview');
 		}
 
-		if( ! $message ) {
-			$status = get_post_status( $post_id );
+		if (!$message) {
+			$status = get_post_status($post_id);
 
 			// Nothing exists with that post ID.
-			if ( ! is_numeric( $post_id ) ) {
-				$message = esc_html__( 'You did not enter a number. The value entered should be a number, representing the ID of the post or page the View is embedded on.', 'gravityview' );
+			if (!is_numeric($post_id)) {
+				$message = esc_html__('You did not enter a number. The value entered should be a number, representing the ID of the post or page the View is embedded on.', 'gravityview');
 
 				// @todo Convert to generic article about Embed IDs
-				$message .= ' ' . gravityview_get_link( 'http://docs.gravityview.co/article/222-the-search-widget', __( 'Learn more&hellip;', 'gravityview' ), 'target=_blank' );
+				$message .= ' '.gravityview_get_link('http://docs.gravityview.co/article/222-the-search-widget', __('Learn more&hellip;', 'gravityview'), 'target=_blank');
 			}
 		}
 
-		if( ! $message ) {
+		if (!$message) {
 
 			// Nothing exists with that post ID.
-			if ( empty( $status ) || in_array( $status, array( 'revision', 'attachment' ) ) ) {
-				$message = esc_html__( 'There is no post or page with that ID.', 'gravityview' );
+			if (empty($status) || in_array($status, array('revision', 'attachment'))) {
+				$message = esc_html__('There is no post or page with that ID.', 'gravityview');
 			}
 
 		}
 
-		if( ! $message ) {
-			$view_ids_in_post = GravityView_View_Data::getInstance()->maybe_get_view_id( $post_id );
+		if (!$message) {
+			$view_ids_in_post = GravityView_View_Data::getInstance()->maybe_get_view_id($post_id);
 
 			// The post or page specified does not contain the shortcode.
-			if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) {
-				$message = sprintf( esc_html__( 'The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview' ), '<br /><code>[gravityview id="' . intval( $view_id ) . '"]</code>' );
+			if (false === in_array($view_id, (array)$view_ids_in_post)) {
+				$message = sprintf(esc_html__('The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview'), '<br /><code>[gravityview id="'.intval($view_id).'"]</code>');
 			}
 		}
 
-		if( ! $message ) {
+		if (!$message) {
 
 			// It's a View
-			if( 'gravityview' === get_post_type( $post_id ) ) {
-				$message = esc_html__( 'The ID is already a View.', 'gravityview' );;
+			if ('gravityview' === get_post_type($post_id)) {
+				$message = esc_html__('The ID is already a View.', 'gravityview'); ;
 			}
 
 		}
 
-		if( $message ) {
-			return new WP_Error( 'invalid_embed_id', $message );
+		if ($message) {
+			return new WP_Error('invalid_embed_id', $message);
 		}
 
 		return true;
@@ -510,13 +510,13 @@ 
 	 * @param  boolean $with_details Include details
 	 * @return mixed|array                If using $with_details, return array. Otherwise, mixed.
 	 */
-	public static function get_default_arg( $key, $with_details = false ) {
+	public static function get_default_arg($key, $with_details = false) {
 
-		$args = self::get_default_args( $with_details );
+		$args = self::get_default_args($with_details);
 
-		if( !isset( $args[ $key ] ) ) { return NULL; }
+		if (!isset($args[$key])) { return NULL; }
 
-		return $args[ $key ];
+		return $args[$key];
 	}
 
 	/**
@@ -535,13 +535,13 @@ 
 	 *      @param[out] array  $options Array of values to use when generating select, multiselect, radio, or checkboxes fields
 	 *      @param[out] boolean $full_width True: Display the input and label together when rendering. False: Display label and input in separate columns when rendering.
 	 */
-	public static function get_default_args( $with_details = false, $group = NULL ) {
+	public static function get_default_args($with_details = false, $group = NULL) {
 
 		/**
 		 * @filter `gravityview_default_args` Modify the default settings for new Views
 		 * @param[in,out] array $default_args Array of default args.
 		 */
-		$default_settings = apply_filters( 'gravityview_default_args', array(
+		$default_settings = apply_filters('gravityview_default_args', array(
 			'id' => array(
 				'label' => __('View ID', 'gravityview'),
 				'type' => 'number',
@@ -559,7 +559,7 @@ 
 				'show_in_shortcode' => true,
 			),
 			'lightbox' => array(
-				'label' => __( 'Enable lightbox for images', 'gravityview' ),
+				'label' => __('Enable lightbox for images', 'gravityview'),
 				'type' => 'checkbox',
 				'group'	=> 'default',
 				'value' => 1,
@@ -567,29 +567,29 @@ 
 				'show_in_shortcode' => true,
 			),
 			'show_only_approved' => array(
-				'label' => __( 'Show only approved entries', 'gravityview' ),
+				'label' => __('Show only approved entries', 'gravityview'),
 				'type' => 'checkbox',
 				'group'	=> 'default',
 				'value' => 0,
 				'show_in_shortcode' => false,
 			),
 			'hide_until_searched' => array(
-				'label' => __( 'Hide View data until search is performed', 'gravityview' ),
+				'label' => __('Hide View data until search is performed', 'gravityview'),
 				'type' => 'checkbox',
 				'group'	=> 'default',
-				'tooltip' => __( 'When enabled it will only show any View entries after a search is performed.', 'gravityview' ),
+				'tooltip' => __('When enabled it will only show any View entries after a search is performed.', 'gravityview'),
 				'value' => 0,
 				'show_in_shortcode' => false,
 			),
 			'hide_empty' => array(
-				'label' 	=> __( 'Hide empty fields', 'gravityview' ),
+				'label' 	=> __('Hide empty fields', 'gravityview'),
 				'group'	=> 'default',
 				'type'	=> 'checkbox',
 				'value' => 1,
 				'show_in_shortcode' => false,
 			),
 			'user_edit' => array(
-				'label'	=> __( 'Allow User Edit', 'gravityview' ),
+				'label'	=> __('Allow User Edit', 'gravityview'),
 				'group'	=> 'default',
 				'desc'	=> __('Allow logged-in users to edit entries they created.', 'gravityview'),
 				'value'	=> 0,
@@ -598,7 +598,7 @@ 
 				'show_in_shortcode' => true,
 			),
 			'user_delete' => array(
-				'label'	=> __( 'Allow User Delete', 'gravityview' ),
+				'label'	=> __('Allow User Delete', 'gravityview'),
 				'group'	=> 'default',
 				'desc'	=> __('Allow logged-in users to delete entries they created.', 'gravityview'),
 				'value'	=> 0,
@@ -612,8 +612,8 @@ 
 				'value' => '',
 				'group'	=> 'sort',
 				'options' => array(
-					'' => __( 'Default', 'gravityview'),
-					'date_created' => __( 'Date Created', 'gravityview'),
+					'' => __('Default', 'gravityview'),
+					'date_created' => __('Date Created', 'gravityview'),
 				),
 				'show_in_shortcode' => true,
 			),
@@ -630,19 +630,19 @@ 
 				'show_in_shortcode' => true,
 			),
 			'sort_columns' => array(
-				'label' 	=> __( 'Enable sorting by column', 'gravityview' ),
-				'left_label' => __( 'Column Sorting', 'gravityview' ),
+				'label' 	=> __('Enable sorting by column', 'gravityview'),
+				'left_label' => __('Column Sorting', 'gravityview'),
 				'type' => 'checkbox',
 				'value' => false,
 				'group'	=> 'sort',
 				'tooltip' => NULL,
 				'show_in_shortcode' => true,
-				'show_in_template' => array( 'default_table' ),
+				'show_in_template' => array('default_table'),
 			),
 			'start_date' => array(
 				'label' 	=> __('Filter by Start Date', 'gravityview'),
 				'class'	=> 'gv-datepicker',
-				'desc'	=> __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
+				'desc'	=> __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview'),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
@@ -651,7 +651,7 @@ 
 			'end_date' => array(
 				'label' 	=> __('Filter by End Date', 'gravityview'),
 				'class'	=> 'gv-datepicker',
-				'desc'	=> __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
+				'desc'	=> __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview'),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
@@ -711,12 +711,12 @@ 
 		));
 
 		// By default, we only want the key => value pairing, not the whole array.
-		if( empty( $with_details ) ) {
+		if (empty($with_details)) {
 
 			$defaults = array();
 
-			foreach( $default_settings as $key => $value ) {
-				$defaults[ $key ] = $value['value'];
+			foreach ($default_settings as $key => $value) {
+				$defaults[$key] = $value['value'];
 			}
 
 			return $defaults;
@@ -729,9 +729,9 @@ 
 
 				// If the $group argument is set for the method,
 				// ignore any settings that aren't in that group.
-				if( !empty( $group ) && is_string( $group ) ) {
-					if( empty( $value['group'] ) || $value['group'] !== $group ) {
-						unset( $default_settings[ $key ] );
+				if (!empty($group) && is_string($group)) {
+					if (empty($value['group']) || $value['group'] !== $group) {
+						unset($default_settings[$key]);
 					}
 				}
 

includes/class-debug-bar.php

Spacing +31 added lines, -31 removed lines

@@ -21,12 +21,12 @@ 
 	function init() {
 
 		$icon = is_admin() ? '<i class="icon gv-icon-astronaut-head"></i>&nbsp;' : NULL;
-		$this->title( $icon . __('GravityView', 'gravityview') );
+		$this->title($icon.__('GravityView', 'gravityview'));
 	}
 
 	function get_warnings() {
 
-		if( is_null( $this->warnings ) ) {
+		if (is_null($this->warnings)) {
 			$this->warnings = GravityView_Logging::get_errors();
 		}
 
@@ -35,7 +35,7 @@ 
 
 	function get_notices() {
 
-		if( is_null( $this->notices ) ) {
+		if (is_null($this->notices)) {
 			$this->notices = GravityView_Logging::get_notices();
 		}
 
@@ -50,8 +50,8 @@ 
 	 * Should the panel be shown? If there are notices or warnings, yes.
 	 * @return boolean true: show panel; false: hide panel
 	 */
-	function set_visible( $visible = '' ) {
-		$this->_visible = ( count( $this->get_notices() ) || count( $this->get_warnings() ) );
+	function set_visible($visible = '') {
+		$this->_visible = (count($this->get_notices()) || count($this->get_warnings()));
 	}
 
 	/**
@@ -83,42 +83,42 @@ 
 		</style>
 		<div id='debug-bar-gravityview'>";
 
-		$output .= '<img src="'.plugins_url('assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ).'" class="alignright" alt="" width="100" height="132" />';
+		$output .= '<img src="'.plugins_url('assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE).'" class="alignright" alt="" width="100" height="132" />';
 
 
 		$warnings = $this->get_warnings();
 		$notices = $this->get_notices();
 
-		if(count($warnings)) {
+		if (count($warnings)) {
 			$output .= '<h3><span>'.__('Warnings', 'gravityview').'</span></h3>';
 			$output .= '<ol>';
-			foreach ( $warnings as $key => $notice) {
-				if(empty($notice['message'])) { continue; }
-				$output .= '<li><a href="#'.sanitize_html_class( 'gv-warning-' . $key ).'">'.strip_tags($notice['message']).'</a></li>';
+			foreach ($warnings as $key => $notice) {
+				if (empty($notice['message'])) { continue; }
+				$output .= '<li><a href="#'.sanitize_html_class('gv-warning-'.$key).'">'.strip_tags($notice['message']).'</a></li>';
 			}
 			$output .= '</ol><hr />';
 		}
-		if(count($notices)) {
+		if (count($notices)) {
 			$output .= '<h3><span>'.__('Logs', 'gravityview').'</span></h3>';
 			$output .= '<ol>';
-			foreach ( $notices as $key => $notice) {
-				if(empty($notice['message'])) { continue; }
-				$output .= '<li><a href="#'.sanitize_html_class( 'gv-notice-' . $key ).'">'.strip_tags($notice['message']).'</a></li>';
+			foreach ($notices as $key => $notice) {
+				if (empty($notice['message'])) { continue; }
+				$output .= '<li><a href="#'.sanitize_html_class('gv-notice-'.$key).'">'.strip_tags($notice['message']).'</a></li>';
 			}
 			$output .= '</ol><hr />';
 		}
 
-		if ( count( $warnings ) ) {
+		if (count($warnings)) {
 			$output .= '<h3>Warnings</h3>';
 			$output .= '<ol class="debug-bar-php-list">';
-			foreach ( $warnings as $key => $notice) { $output .= $this->render_item( $notice, 'gv-warning-'  . $key ); }
+			foreach ($warnings as $key => $notice) { $output .= $this->render_item($notice, 'gv-warning-'.$key); }
 			$output .= '</ol>';
 		}
 
-		if ( count( $notices ) ) {
+		if (count($notices)) {
 			$output .= '<h3>Notices</h3>';
 			$output .= '<ol class="debug-bar-php-list">';
-			foreach ( $notices as $key => $notice) { $output .= $this->render_item( $notice, 'gv-notice-' . $key ); }
+			foreach ($notices as $key => $notice) { $output .= $this->render_item($notice, 'gv-notice-'.$key); }
 			$output .= '</ol>';
 		}
 
@@ -133,12 +133,12 @@ 
 	 * @return string       Escaped HTML
 	 */
 	function esc_html_recursive($item) {
-		if(is_object($item)) {
-			foreach($item as $key => $value) {
+		if (is_object($item)) {
+			foreach ($item as $key => $value) {
 				$item->{$key} = $this->esc_html_recursive($value);
 			}
-		} else if(is_array($item)) {
-			foreach($item as $key => $value) {
+		} else if (is_array($item)) {
+			foreach ($item as $key => $value) {
 				$item[$key] = $this->esc_html_recursive($value);
 			}
 		} else {
@@ -154,31 +154,31 @@ 
 	 * @param  string $anchor The anchor ID for the item
 	 * @return string         HTML output
 	 */
-	function render_item( $notice, $anchor = '' ) {
+	function render_item($notice, $anchor = '') {
 
 		$output = '';
 
-		if(!empty($notice['message'])) {
-			$output .= '<a id="'.sanitize_html_class( $anchor ).'"></a>';
+		if (!empty($notice['message'])) {
+			$output .= '<a id="'.sanitize_html_class($anchor).'"></a>';
 			$output .= "<li class='debug-bar-php-notice'>";
 		}
 
 		$output .= '<div class="clear"></div>';
 
 		// Title
-		$output .= '<div class="gravityview-debug-bar-title">'.esc_attr( $notice['message'] ).'</div>';
+		$output .= '<div class="gravityview-debug-bar-title">'.esc_attr($notice['message']).'</div>';
 
 		// Debugging Output
-		if( empty( $notice['data'] ) ) {
-			if( !is_null( $notice['data'] ) ) {
-				$output .= '<em>'._x('Empty', 'Debugging output data is empty.', 'gravityview' ).'</em>';
+		if (empty($notice['data'])) {
+			if (!is_null($notice['data'])) {
+				$output .= '<em>'._x('Empty', 'Debugging output data is empty.', 'gravityview').'</em>';
 			}
 		}
 		else {
-			$output .= sprintf( '<pre>%s</pre>', print_r($this->esc_html_recursive( $notice['data'] ), true) );
+			$output .= sprintf('<pre>%s</pre>', print_r($this->esc_html_recursive($notice['data']), true));
 		}
 
-		if(!empty($notice['message'])) {
+		if (!empty($notice['message'])) {
 			$output .= '</li>';
 		}
 

includes/class-frontend-views.php

Spacing +263 added lines, -263 removed lines

@@ -20,7 +20,7 @@ 
 	 * @since 1.7.4.1
 	 * @var array
 	 */
-	private static $search_parameters = array( 'gv_search', 'gv_start', 'gv_end', 'gv_id', 'gv_by', 'filter_*' );
+	private static $search_parameters = array('gv_search', 'gv_start', 'gv_end', 'gv_id', 'gv_by', 'filter_*');
 
 	/**
 	 * Is the currently viewed post a `gravityview` post type?
@@ -85,18 +85,18 @@ 
 	private function __construct() {}
 
 	private function initialize() {
-		add_action( 'wp', array( $this, 'parse_content'), 11 );
-		add_action( 'template_redirect', array( $this, 'set_entry_data'), 1 );
+		add_action('wp', array($this, 'parse_content'), 11);
+		add_action('template_redirect', array($this, 'set_entry_data'), 1);
 
 		// Enqueue scripts and styles after GravityView_Template::register_styles()
-		add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 20 );
+		add_action('wp_enqueue_scripts', array($this, 'add_scripts_and_styles'), 20);
 
 		// Enqueue and print styles in the footer. Added 1 priorty so stuff gets printed at 10 priority.
-		add_action( 'wp_print_footer_scripts', array( $this, 'add_scripts_and_styles' ), 1 );
+		add_action('wp_print_footer_scripts', array($this, 'add_scripts_and_styles'), 1);
 
-		add_filter( 'the_title', array( $this, 'single_entry_title' ), 1, 2 );
-		add_filter( 'the_content', array( $this, 'insert_view_in_content' ) );
-		add_filter( 'comments_open', array( $this, 'comments_open' ), 10, 2 );
+		add_filter('the_title', array($this, 'single_entry_title'), 1, 2);
+		add_filter('the_content', array($this, 'insert_view_in_content'));
+		add_filter('comments_open', array($this, 'comments_open'), 10, 2);
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public static function getInstance() {
 
-		if ( empty( self::$instance ) ) {
+		if (empty(self::$instance)) {
 			self::$instance = new self;
 			self::$instance->initialize();
 		}
@@ -123,7 +123,7 @@ 
 	/**
 	 * @param GravityView_View_Data $gv_output_data
 	 */
-	public function setGvOutputData( $gv_output_data ) {
+	public function setGvOutputData($gv_output_data) {
 		$this->gv_output_data = $gv_output_data;
 	}
 
@@ -137,7 +137,7 @@ 
 	/**
 	 * @param boolean $is_search
 	 */
-	public function setIsSearch( $is_search ) {
+	public function setIsSearch($is_search) {
 		$this->is_search = $is_search;
 	}
 
@@ -152,7 +152,7 @@ 
 	 * Sets the single entry ID and also the entry
 	 * @param bool|int $single_entry
 	 */
-	public function setSingleEntry( $single_entry ) {
+	public function setSingleEntry($single_entry) {
 
 		$this->single_entry = $single_entry;
 
@@ -169,10 +169,10 @@ 
 	 * Set the current entry
 	 * @param array|int $entry Entry array or entry ID
 	 */
-	public function setEntry( $entry ) {
+	public function setEntry($entry) {
 
-		if ( ! is_array( $entry ) ) {
-			$entry = GVCommon::get_entry( $entry );
+		if (!is_array($entry)) {
+			$entry = GVCommon::get_entry($entry);
 		}
 
 		$this->entry = $entry;
@@ -188,7 +188,7 @@ 
 	/**
 	 * @param int $post_id
 	 */
-	public function setPostId( $post_id ) {
+	public function setPostId($post_id) {
 		$this->post_id = $post_id;
 	}
 
@@ -202,7 +202,7 @@ 
 	/**
 	 * @param boolean $post_has_shortcode
 	 */
-	public function setPostHasShortcode( $post_has_shortcode ) {
+	public function setPostHasShortcode($post_has_shortcode) {
 		$this->post_has_shortcode = $post_has_shortcode;
 	}
 
@@ -216,7 +216,7 @@ 
 	/**
 	 * @param boolean $is_gravityview_post_type
 	 */
-	public function setIsGravityviewPostType( $is_gravityview_post_type ) {
+	public function setIsGravityviewPostType($is_gravityview_post_type) {
 		$this->is_gravityview_post_type = $is_gravityview_post_type;
 	}
 
@@ -227,13 +227,13 @@ 
 	 *
 	 * @param null $view_id
 	 */
-	public function set_context_view_id( $view_id = null ) {
+	public function set_context_view_id($view_id = null) {
 
-		if ( ! empty( $view_id ) ) {
+		if (!empty($view_id)) {
 
 			$this->context_view_id = $view_id;
 
-		} elseif ( isset( $_GET['gvid'] ) && $this->getGvOutputData()->has_multiple_views() ) {
+		} elseif (isset($_GET['gvid']) && $this->getGvOutputData()->has_multiple_views()) {
 			/**
 			 * used on a has_multiple_views context
 			 * @see GravityView_API::entry_link
@@ -241,10 +241,10 @@ 
 			 */
 			$this->context_view_id = $_GET['gvid'];
 
-		} elseif ( ! $this->getGvOutputData()->has_multiple_views() )  {
-			$array_keys = array_keys( $this->getGvOutputData()->get_views() );
-			$this->context_view_id = array_pop( $array_keys );
-			unset( $array_keys );
+		} elseif (!$this->getGvOutputData()->has_multiple_views()) {
+			$array_keys = array_keys($this->getGvOutputData()->get_views());
+			$this->context_view_id = array_pop($array_keys);
+			unset($array_keys);
 		}
 
 	}
@@ -265,31 +265,31 @@ 
 	 * @param  array  $wp Passed in the `wp` hook. Not used.
 	 * @return void
 	 */
-	function parse_content( $wp = array() ) {
+	function parse_content($wp = array()) {
 		global $post;
 
 		// If in admin and NOT AJAX request, get outta here.
-		if ( GravityView_Plugin::is_admin() )  {
+		if (GravityView_Plugin::is_admin()) {
 			return;
 		}
 
 		// Calculate requested Views
-		$this->setGvOutputData( GravityView_View_Data::getInstance( $post ) );
+		$this->setGvOutputData(GravityView_View_Data::getInstance($post));
 
 		// !important: we need to run this before getting single entry (to kick the advanced filter)
 		$this->set_context_view_id();
 
-		$this->setIsGravityviewPostType( get_post_type( $post ) === 'gravityview' );
+		$this->setIsGravityviewPostType(get_post_type($post) === 'gravityview');
 
-		$post_id = $this->getPostId() ? $this->getPostId() : (isset( $post ) ? $post->ID : null );
-		$this->setPostId( $post_id );
-		$post_has_shortcode = ! empty( $post->post_content ) ? gravityview_has_shortcode_r( $post->post_content, 'gravityview' ) : false;
-		$this->setPostHasShortcode( $this->isGravityviewPostType() ? null : ! empty( $post_has_shortcode ) );
+		$post_id = $this->getPostId() ? $this->getPostId() : (isset($post) ? $post->ID : null);
+		$this->setPostId($post_id);
+		$post_has_shortcode = !empty($post->post_content) ? gravityview_has_shortcode_r($post->post_content, 'gravityview') : false;
+		$this->setPostHasShortcode($this->isGravityviewPostType() ? null : !empty($post_has_shortcode));
 
 		// check if the View is showing search results (only for multiple entries View)
-		$this->setIsSearch( $this->is_searching() );
+		$this->setIsSearch($this->is_searching());
 
-		unset( $entry, $post_id, $post_has_shortcode );
+		unset($entry, $post_id, $post_has_shortcode);
 	}
 
 	/**
@@ -297,8 +297,8 @@ 
 	 */
 	function set_entry_data() {
 		$entry_id = self::is_single_entry();
-		$this->setSingleEntry( $entry_id );
-		$this->setEntry( $entry_id );
+		$this->setSingleEntry($entry_id);
+		$this->setEntry($entry_id);
 	}
 
 	/**
@@ -311,31 +311,31 @@ 
 	function is_searching() {
 
 		// It's a single entry, not search
-		if ( $this->getSingleEntry() ) {
+		if ($this->getSingleEntry()) {
 			return false;
 		}
 
 		// No $_GET parameters
-		if ( empty( $_GET ) || ! is_array( $_GET ) ) {
+		if (empty($_GET) || !is_array($_GET)) {
 			return false;
 		}
 
 		// Remove empty values
-		$get = array_filter( $_GET );
+		$get = array_filter($_GET);
 
 		// If the $_GET parameters are empty, it's no search.
-		if ( empty( $get ) ) {
+		if (empty($get)) {
 			return false;
 		}
 
-		$search_keys = array_keys( $get );
+		$search_keys = array_keys($get);
 
-		$search_match = implode( '|', self::$search_parameters );
+		$search_match = implode('|', self::$search_parameters);
 
-		foreach ( $search_keys as $search_key ) {
+		foreach ($search_keys as $search_key) {
 
 			// Analyze the search key $_GET parameter and see if it matches known GV args
-			if ( preg_match( '/(' . $search_match . ')/i', $search_key ) ) {
+			if (preg_match('/('.$search_match.')/i', $search_key)) {
 				return true;
 			}
 		}
@@ -350,11 +350,11 @@ 
 	 * @param  int $passed_post_id Post ID
 	 * @return string          (modified) title
 	 */
-	public function single_entry_title( $title, $passed_post_id = null ) {
+	public function single_entry_title($title, $passed_post_id = null) {
 		global $post;
 
 		// If this is the directory view, return.
-		if ( ! $this->getSingleEntry() ) {
+		if (!$this->getSingleEntry()) {
 			return $title;
 		}
 
@@ -365,44 +365,44 @@ 
 		 * @param boolean $in_the_loop Whether to apply the filter to the menu title and the meta tag <title> - outside the loop
 		 * @param array $entry Current entry
 		 */
-		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop' , in_the_loop(), $entry );
+		$apply_outside_loop = apply_filters('gravityview/single/title/out_loop', in_the_loop(), $entry);
 
-		if ( ! $apply_outside_loop ) {
+		if (!$apply_outside_loop) {
 			return $title;
 		}
 
 		// User reported WooCommerce doesn't pass two args.
-		if ( empty( $passed_post_id ) )  {
+		if (empty($passed_post_id)) {
 			return $title;
 		}
 
 		// Don't modify the title for anything other than the current view/post.
 		// This is true for embedded shortcodes and Views.
-		if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) {
+		if (is_object($post) && (int)$post->ID !== (int)$passed_post_id) {
 			return $title;
 		}
 
 		$context_view_id = $this->get_context_view_id();
 
-		if ( $this->getGvOutputData()->has_multiple_views() && ! empty( $context_view_id ) ) {
-			$view_meta = $this->getGvOutputData()->get_view( $context_view_id );
+		if ($this->getGvOutputData()->has_multiple_views() && !empty($context_view_id)) {
+			$view_meta = $this->getGvOutputData()->get_view($context_view_id);
 		} else {
-			foreach ( $this->getGvOutputData()->get_views() as $view_id => $view_data ) {
-				if ( intval( $view_data['form_id'] ) === intval( $entry['form_id'] ) ) {
+			foreach ($this->getGvOutputData()->get_views() as $view_id => $view_data) {
+				if (intval($view_data['form_id']) === intval($entry['form_id'])) {
 					$view_meta = $view_data;
 					break;
 				}
 			}
 		}
 
-		if ( ! empty( $view_meta['atts']['single_title'] ) ) {
+		if (!empty($view_meta['atts']['single_title'])) {
 
 			$title = $view_meta['atts']['single_title'];
 
 			// We are allowing HTML in the fields, so no escaping the output
-			$title = GravityView_API::replace_variables( $title, $view_meta['form'], $entry );
+			$title = GravityView_API::replace_variables($title, $view_meta['form'], $entry);
 
-			$title = do_shortcode( $title );
+			$title = do_shortcode($title);
 		}
 
 		return $title;
@@ -417,38 +417,38 @@ 
 	 * @param mixed $content
 	 * @return string Add the View output into View CPT content
 	 */
-	public function insert_view_in_content( $content ) {
+	public function insert_view_in_content($content) {
 
 		// Plugins may run through the content in the header. WP SEO does this for its OpenGraph functionality.
-		if ( ! did_action( 'loop_start' ) ) {
+		if (!did_action('loop_start')) {
 
-			do_action( 'gravityview_log_debug', '[insert_view_in_content] Not processing yet: loop_start hasn\'t run yet. Current action:', current_filter() );
+			do_action('gravityview_log_debug', '[insert_view_in_content] Not processing yet: loop_start hasn\'t run yet. Current action:', current_filter());
 
 			return $content;
 		}
 
 		//	We don't want this filter to run infinite loop on any post content fields
-		remove_filter( 'the_content', array( $this, 'insert_view_in_content' ) );
+		remove_filter('the_content', array($this, 'insert_view_in_content'));
 
 		// Otherwise, this is called on the Views page when in Excerpt mode.
-		if ( is_admin() ) {
+		if (is_admin()) {
 			return $content;
 		}
 
-		if ( $this->isGravityviewPostType() ) {
+		if ($this->isGravityviewPostType()) {
 
 			/** @since 1.7.4 */
-			if ( is_preview() && ! gravityview_get_form_id( $this->post_id ) ) {
-				$content .= __( 'When using a Start Fresh template, you must save the View before a Preview is available.', 'gravityview' );
+			if (is_preview() && !gravityview_get_form_id($this->post_id)) {
+				$content .= __('When using a Start Fresh template, you must save the View before a Preview is available.', 'gravityview');
 			} else {
-				foreach ( $this->getGvOutputData()->get_views() as $view_id => $data ) {
-					$content .= $this->render_view( array( 'id' => $view_id ) );
+				foreach ($this->getGvOutputData()->get_views() as $view_id => $data) {
+					$content .= $this->render_view(array('id' => $view_id));
 				}
 			}
 		}
 
 		//	Add the filter back in
-		add_filter( 'the_content', array( $this, 'insert_view_in_content' ) );
+		add_filter('the_content', array($this, 'insert_view_in_content'));
 
 		return $content;
 	}
@@ -459,9 +459,9 @@ 
 	 * @param  int $post_id Post ID
 	 * @return boolean
 	 */
-	public function comments_open( $open, $post_id ) {
+	public function comments_open($open, $post_id) {
 
-		if ( $this->isGravityviewPostType() ) {
+		if ($this->isGravityviewPostType()) {
 			$open = false;
 		}
 
@@ -471,7 +471,7 @@ 
 		 * @param  boolean $open Open or closed status
 		 * @param  int $post_id Post ID to set comment status for
 		 */
-		$open = apply_filters( 'gravityview/comments_open', $open, $post_id );
+		$open = apply_filters('gravityview/comments_open', $open, $post_id);
 
 		return $open;
 	}
@@ -498,55 +498,55 @@ 
 	 *
 	 * @return string|null HTML output of a View, NULL if View isn't found
 	 */
-	public function render_view( $passed_args ) {
+	public function render_view($passed_args) {
 
 		// validate attributes
-		if ( empty( $passed_args['id'] ) ) {
-			do_action( 'gravityview_log_error', '[render_view] Returning; no ID defined.', $passed_args );
+		if (empty($passed_args['id'])) {
+			do_action('gravityview_log_error', '[render_view] Returning; no ID defined.', $passed_args);
 			return null;
 		}
 
 		// Solve problem when loading content via admin-ajax.php
 		// @hack
-		if ( ! $this->getGvOutputData() ) {
+		if (!$this->getGvOutputData()) {
 
-			do_action( 'gravityview_log_error', '[render_view] gv_output_data not defined; parsing content.', $passed_args );
+			do_action('gravityview_log_error', '[render_view] gv_output_data not defined; parsing content.', $passed_args);
 
 			$this->parse_content();
 		}
 
 		// Make 100% sure that we're dealing with a properly called situation
-		if ( ! is_object( $this->getGvOutputData() ) || ! is_callable( array( $this->getGvOutputData(), 'get_view' ) ) ) {
+		if (!is_object($this->getGvOutputData()) || !is_callable(array($this->getGvOutputData(), 'get_view'))) {
 
-			do_action( 'gravityview_log_error', '[render_view] gv_output_data not an object or get_view not callable.', $this->getGvOutputData() );
+			do_action('gravityview_log_error', '[render_view] gv_output_data not an object or get_view not callable.', $this->getGvOutputData());
 
 			return null;
 		}
 
 		$view_id = $passed_args['id'];
 
-		$view_data = $this->getGvOutputData()->get_view( $view_id, $passed_args );
+		$view_data = $this->getGvOutputData()->get_view($view_id, $passed_args);
 
-		do_action( 'gravityview_log_debug', '[render_view] View Data: ', $view_data );
+		do_action('gravityview_log_debug', '[render_view] View Data: ', $view_data);
 
-		do_action( 'gravityview_log_debug', '[render_view] Init View. Arguments: ', $passed_args );
+		do_action('gravityview_log_debug', '[render_view] Init View. Arguments: ', $passed_args);
 
 		// The passed args were always winning, even if they were NULL.
 		// This prevents that. Filters NULL, FALSE, and empty strings.
-		$passed_args = array_filter( $passed_args, 'strlen' );
+		$passed_args = array_filter($passed_args, 'strlen');
 
 		//Override shortcode args over View template settings
-		$atts = wp_parse_args( $passed_args, $view_data['atts'] );
+		$atts = wp_parse_args($passed_args, $view_data['atts']);
 
-		do_action( 'gravityview_log_debug', '[render_view] Arguments after merging with View settings: ', $atts );
+		do_action('gravityview_log_debug', '[render_view] Arguments after merging with View settings: ', $atts);
 
 		// It's password protected and you need to log in.
-		if ( post_password_required( $view_id ) ) {
+		if (post_password_required($view_id)) {
 
-			do_action( 'gravityview_log_error', sprintf( '[render_view] Returning: View %d is password protected.', $view_id ) );
+			do_action('gravityview_log_error', sprintf('[render_view] Returning: View %d is password protected.', $view_id));
 
 			// If we're in an embed or on an archive page, show the password form
-			if ( get_the_ID() !== $view_id ) {
+			if (get_the_ID() !== $view_id) {
 				return get_the_password_form();
 			}
 
@@ -558,11 +558,11 @@ 
 		 * Don't render View if user isn't allowed to see it
 		 * @since 1.15
 		 */
-		if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
+		if (is_user_logged_in() && false === GVCommon::has_cap('read_gravityview', $view_id)) {
 			return null;
 		}
 
-		if( $this->isGravityviewPostType() ) {
+		if ($this->isGravityviewPostType()) {
 
 			/**
 			 * @filter `gravityview_direct_access` Should Views be directly accessible, or only visible using the shortcode?
@@ -572,12 +572,12 @@ 
 			 * @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
 			 */
-			$direct_access = apply_filters( 'gravityview_direct_access', true, $view_id );
+			$direct_access = apply_filters('gravityview_direct_access', true, $view_id);
 
-			$embed_only = ! empty( $atts['embed_only'] );
+			$embed_only = !empty($atts['embed_only']);
 
-			if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
-				return __( 'You are not allowed to view this content.', 'gravityview' );
+			if (!$direct_access || ($embed_only && !GVCommon::has_cap('read_private_gravityviews'))) {
+				return __('You are not allowed to view this content.', 'gravityview');
 			}
 		}
 
@@ -589,137 +589,137 @@ 
 		 */
 		global $gravityview_view;
 
-		$gravityview_view = new GravityView_View( $view_data );
+		$gravityview_view = new GravityView_View($view_data);
 
-		$post_id = ! empty( $atts['post_id'] ) ? intval( $atts['post_id'] ) : $this->getPostId();
+		$post_id = !empty($atts['post_id']) ? intval($atts['post_id']) : $this->getPostId();
 
-		$gravityview_view->setPostId( $post_id );
+		$gravityview_view->setPostId($post_id);
 
-		if ( ! $this->getSingleEntry() ) {
+		if (!$this->getSingleEntry()) {
 
 			// user requested Directory View
-			do_action( 'gravityview_log_debug', '[render_view] Executing Directory View' );
+			do_action('gravityview_log_debug', '[render_view] Executing Directory View');
 
 			//fetch template and slug
-			$view_slug = apply_filters( 'gravityview_template_slug_'. $view_data['template_id'], 'table', 'directory' );
+			$view_slug = apply_filters('gravityview_template_slug_'.$view_data['template_id'], 'table', 'directory');
 
-			do_action( 'gravityview_log_debug', '[render_view] View template slug: ', $view_slug );
+			do_action('gravityview_log_debug', '[render_view] View template slug: ', $view_slug);
 
 			/**
 			 * Disable fetching initial entries for views that don't need it (DataTables)
 			 */
-			$get_entries = apply_filters( 'gravityview_get_view_entries_'.$view_slug, true );
+			$get_entries = apply_filters('gravityview_get_view_entries_'.$view_slug, true);
 
 			/**
 			 * Hide View data until search is performed
 			 * @since 1.5.4
 			 */
-			if ( ! empty( $atts['hide_until_searched'] ) && ! $this->isSearch() ) {
-				$gravityview_view->setHideUntilSearched( true );
+			if (!empty($atts['hide_until_searched']) && !$this->isSearch()) {
+				$gravityview_view->setHideUntilSearched(true);
 				$get_entries = false;
 			}
 
 
-			if ( $get_entries ) {
+			if ($get_entries) {
 
-				if ( ! empty( $atts['sort_columns'] ) ) {
+				if (!empty($atts['sort_columns'])) {
 					// add filter to enable column sorting
-					add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ) , 100, 3 );
+					add_filter('gravityview/template/field_label', array($this, 'add_columns_sort_links'), 100, 3);
 				}
 
-				$view_entries = self::get_view_entries( $atts, $view_data['form_id'] );
+				$view_entries = self::get_view_entries($atts, $view_data['form_id']);
 
-				do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries['count'], sizeof( $view_entries['entries'] ) ) );
+				do_action('gravityview_log_debug', sprintf('[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries['count'], sizeof($view_entries['entries'])));
 
 			} else {
 
-				$view_entries = array( 'count' => null, 'entries' => null, 'paging' => null );
+				$view_entries = array('count' => null, 'entries' => null, 'paging' => null);
 
-				do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_'.$view_slug.'` is false' );
+				do_action('gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_'.$view_slug.'` is false');
 			}
 
-			$gravityview_view->setPaging( $view_entries['paging'] );
-			$gravityview_view->setContext( 'directory' );
-			$sections = array( 'header', 'body', 'footer' );
+			$gravityview_view->setPaging($view_entries['paging']);
+			$gravityview_view->setContext('directory');
+			$sections = array('header', 'body', 'footer');
 
 		} else {
 
 			// user requested Single Entry View
-			do_action( 'gravityview_log_debug', '[render_view] Executing Single View' );
+			do_action('gravityview_log_debug', '[render_view] Executing Single View');
 
-			do_action( 'gravityview_render_entry_'.$view_data['id'] );
+			do_action('gravityview_render_entry_'.$view_data['id']);
 
 			$entry = $this->getEntry();
 
 			// You are not permitted to view this entry.
-			if ( empty( $entry ) || ! self::is_entry_approved( $entry, $atts ) ) {
+			if (empty($entry) || !self::is_entry_approved($entry, $atts)) {
 
-				do_action( 'gravityview_log_debug', '[render_view] Entry does not exist. This may be because of View filters limiting access.' );
+				do_action('gravityview_log_debug', '[render_view] Entry does not exist. This may be because of View filters limiting access.');
 
 				/**
 				 * @since 1.6
 				 */
-				echo esc_attr( apply_filters( 'gravityview/render/entry/not_visible', __( 'You have attempted to view an entry that is not visible or may not exist.', 'gravityview' ) ) );
+				echo esc_attr(apply_filters('gravityview/render/entry/not_visible', __('You have attempted to view an entry that is not visible or may not exist.', 'gravityview')));
 
 				return null;
 			}
 
 			// We're in single view, but the view being processed is not the same view the single entry belongs to.
 			// important: do not remove this as it prevents fake attempts of displaying entries from other views/forms
-			if ( $this->getGvOutputData()->has_multiple_views() && $view_id != $this->get_context_view_id() ) {
-				do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: '. $view_id );
+			if ($this->getGvOutputData()->has_multiple_views() && $view_id != $this->get_context_view_id()) {
+				do_action('gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: '.$view_id);
 				return null;
 			}
 
 			//fetch template and slug
-			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data['template_id'], 'table', 'single' );
-			do_action( 'gravityview_log_debug', '[render_view] View single template slug: ', $view_slug );
+			$view_slug = apply_filters('gravityview_template_slug_'.$view_data['template_id'], 'table', 'single');
+			do_action('gravityview_log_debug', '[render_view] View single template slug: ', $view_slug);
 
 			//fetch entry detail
 			$view_entries['count'] = 1;
 			$view_entries['entries'][] = $entry;
-			do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries['entries'] );
+			do_action('gravityview_log_debug', '[render_view] Get single entry: ', $view_entries['entries']);
 
-			$back_link_label = isset( $atts['back_link_label'] ) ? $atts['back_link_label'] : null;
+			$back_link_label = isset($atts['back_link_label']) ? $atts['back_link_label'] : null;
 
 			// set back link label
-			$gravityview_view->setBackLinkLabel( $back_link_label );
-			$gravityview_view->setContext( 'single' );
-			$sections = array( 'single' );
+			$gravityview_view->setBackLinkLabel($back_link_label);
+			$gravityview_view->setContext('single');
+			$sections = array('single');
 
 		}
 
 		// add template style
-		self::add_style( $view_data['template_id'] );
+		self::add_style($view_data['template_id']);
 
 		// Prepare to render view and set vars
-		$gravityview_view->setEntries( $view_entries['entries'] );
-		$gravityview_view->setTotalEntries( $view_entries['count'] );
+		$gravityview_view->setEntries($view_entries['entries']);
+		$gravityview_view->setTotalEntries($view_entries['count']);
 
 		// If Edit
-		if ( 'edit' === gravityview_get_context() ) {
+		if ('edit' === gravityview_get_context()) {
 
-			do_action( 'gravityview_log_debug', '[render_view] Edit Entry ' );
+			do_action('gravityview_log_debug', '[render_view] Edit Entry ');
 
-			do_action( 'gravityview_edit_entry', $this->getGvOutputData() );
+			do_action('gravityview_edit_entry', $this->getGvOutputData());
 
 			return ob_get_clean();
 
 		} else {
 			// finaly we'll render some html
-			$sections = apply_filters( 'gravityview_render_view_sections', $sections, $view_data['template_id'] );
+			$sections = apply_filters('gravityview_render_view_sections', $sections, $view_data['template_id']);
 
-			do_action( 'gravityview_log_debug', '[render_view] Sections to render: ', $sections );
-			foreach ( $sections as $section ) {
-				do_action( 'gravityview_log_debug', '[render_view] Rendering '. $section . ' section.' );
-				$gravityview_view->render( $view_slug, $section, false );
+			do_action('gravityview_log_debug', '[render_view] Sections to render: ', $sections);
+			foreach ($sections as $section) {
+				do_action('gravityview_log_debug', '[render_view] Rendering '.$section.' section.');
+				$gravityview_view->render($view_slug, $section, false);
 			}
 		}
 
 		//@todo: check why we need the IF statement vs. print the view id always.
-		if ( $this->isGravityviewPostType() || $this->isPostHasShortcode() ) {
+		if ($this->isGravityviewPostType() || $this->isPostHasShortcode()) {
 			// Print the View ID to enable proper cookie pagination
-			echo '<input type="hidden" class="gravityview-view-id" value="' . esc_attr( $view_id ) . '">';
+			echo '<input type="hidden" class="gravityview-view-id" value="'.esc_attr($view_id).'">';
 		}
 		$output = ob_get_clean();
 
@@ -741,23 +741,23 @@ 
 	 * @param  array      $search_criteria Search being performed, if any
 	 * @return array                       Modified `$search_criteria` array
 	 */
-	public static function process_search_dates( $args, $search_criteria = array() ) {
+	public static function process_search_dates($args, $search_criteria = array()) {
 
 		$return_search_criteria = $search_criteria;
 
-		foreach ( array( 'start_date', 'end_date' ) as $key ) {
+		foreach (array('start_date', 'end_date') as $key) {
 
 
 			// Is the start date or end date set in the view or shortcode?
 			// If so, we want to make sure that the search doesn't go outside the bounds defined.
-			if ( ! empty( $args[ $key ] ) ) {
+			if (!empty($args[$key])) {
 
 				// Get a timestamp and see if it's a valid date format
-				$date = strtotime( $args[ $key ] );
+				$date = strtotime($args[$key]);
 
 				// The date was invalid
-				if ( empty( $date ) ) {
-					do_action( 'gravityview_log_error', __METHOD__ . ' Invalid ' . $key . ' date format: ' . $args[ $key ] );
+				if (empty($date)) {
+					do_action('gravityview_log_error', __METHOD__.' Invalid '.$key.' date format: '.$args[$key]);
 					continue;
 				}
 
@@ -765,12 +765,12 @@ 
 				$datetime_format = 'Y-m-d H:i:s';
 				$search_is_outside_view_bounds = false;
 
-				if( ! empty( $search_criteria[ $key ] ) ) {
+				if (!empty($search_criteria[$key])) {
 
-					$search_date = strtotime( $search_criteria[ $key ] );
+					$search_date = strtotime($search_criteria[$key]);
 
 					// The search is for entries before the start date defined by the settings
-					switch ( $key ) {
+					switch ($key) {
 						case 'end_date':
 							/**
 							 * If the end date is formatted as 'Y-m-d', it should be formatted without hours and seconds
@@ -780,28 +780,28 @@ 
 							 *
 							 * @see GFFormsModel::get_date_range_where
 							 */
-							$datetime_format               = gravityview_is_valid_datetime( $args[ $key ] ) ? 'Y-m-d' : 'Y-m-d H:i:s';
-							$search_is_outside_view_bounds = ( $search_date > $date );
+							$datetime_format               = gravityview_is_valid_datetime($args[$key]) ? 'Y-m-d' : 'Y-m-d H:i:s';
+							$search_is_outside_view_bounds = ($search_date > $date);
 							break;
 						case 'start_date':
-							$search_is_outside_view_bounds = ( $search_date < $date );
+							$search_is_outside_view_bounds = ($search_date < $date);
 							break;
 					}
 				}
 
 				// If there is no search being performed, or if there is a search being performed that's outside the bounds
-				if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) {
+				if (empty($search_criteria[$key]) || $search_is_outside_view_bounds) {
 
 					// Then we override the search and re-set the start date
-					$return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true );
+					$return_search_criteria[$key] = date_i18n($datetime_format, $date, true);
 				}
 			}
 		}
 
-		if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) {
+		if (isset($return_search_criteria['start_date']) && isset($return_search_criteria['end_date'])) {
 			// The start date is AFTER the end date. This will result in no results, but let's not force the issue.
-			if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) {
-				do_action( 'gravityview_log_error', __METHOD__ . ' Invalid search: the start date is after the end date.', $return_search_criteria );
+			if (strtotime($return_search_criteria['start_date']) > strtotime($return_search_criteria['end_date'])) {
+				do_action('gravityview_log_error', __METHOD__.' Invalid search: the start date is after the end date.', $return_search_criteria);
 			}
 		}
 
@@ -816,13 +816,13 @@ 
 	 * @param  array      $search_criteria Search being performed, if any
 	 * @return array                       Modified `$search_criteria` array
 	 */
-	public static function process_search_only_approved( $args, $search_criteria ) {
+	public static function process_search_only_approved($args, $search_criteria) {
 
-		if ( ! empty( $args['show_only_approved'] ) ) {
-			$search_criteria['field_filters'][] = array( 'key' => 'is_approved', 'value' => 'Approved' );
+		if (!empty($args['show_only_approved'])) {
+			$search_criteria['field_filters'][] = array('key' => 'is_approved', 'value' => 'Approved');
 			$search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met
 
-			do_action( 'gravityview_log_debug', '[process_search_only_approved] Search Criteria if show only approved: ', $search_criteria );
+			do_action('gravityview_log_debug', '[process_search_only_approved] Search Criteria if show only approved: ', $search_criteria);
 		}
 
 		return $search_criteria;
@@ -842,16 +842,16 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function is_entry_approved( $entry, $args = array() ) {
+	public static function is_entry_approved($entry, $args = array()) {
 
-		if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) {
+		if (empty($entry['id']) || (array_key_exists('show_only_approved', $args) && !$args['show_only_approved'])) {
 			// is implicitly approved if entry is null or View settings doesn't require to check for approval
 			return true;
 		}
 
-		$is_approved = gform_get_meta( $entry['id'], 'is_approved' );
+		$is_approved = gform_get_meta($entry['id'], 'is_approved');
 
-		if ( $is_approved ) {
+		if ($is_approved) {
 			return true;
 		}
 
@@ -872,47 +872,47 @@ 
 	 * @param  int $form_id Gravity Forms form ID
 	 * @return array          Array of search parameters, formatted in Gravity Forms mode, using `status` key set to "active" by default, `field_filters` array with `key`, `value` and `operator` keys.
 	 */
-	public static function get_search_criteria( $args, $form_id ) {
+	public static function get_search_criteria($args, $form_id) {
 
 		// Search Criteria
-		$search_criteria = apply_filters( 'gravityview_fe_search_criteria', array( 'field_filters' => array() ), $form_id );
+		$search_criteria = apply_filters('gravityview_fe_search_criteria', array('field_filters' => array()), $form_id);
 
 		$original_search_criteria = $search_criteria;
 
-		do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', $search_criteria );
+		do_action('gravityview_log_debug', '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', $search_criteria);
 
 		// implicity search
-		if ( ! empty( $args['search_value'] ) ) {
+		if (!empty($args['search_value'])) {
 
 			// Search operator options. Options: `is` or `contains`
-			$operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains';
+			$operator = !empty($args['search_operator']) && in_array($args['search_operator'], array('is', 'isnot', '>', '<', 'contains')) ? $args['search_operator'] : 'contains';
 
 			$search_criteria['field_filters'][] = array(
-				'key' => rgget( 'search_field', $args ), // The field ID to search
-				'value' => esc_attr( $args['search_value'] ), // The value to search
+				'key' => rgget('search_field', $args), // The field ID to search
+				'value' => esc_attr($args['search_value']), // The value to search
 				'operator' => $operator,
 			);
 		}
 
-		if( $search_criteria !== $original_search_criteria ) {
-			do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after implicity search: ', $search_criteria );
+		if ($search_criteria !== $original_search_criteria) {
+			do_action('gravityview_log_debug', '[get_search_criteria] Search Criteria after implicity search: ', $search_criteria);
 		}
 
 		// Handle setting date range
-		$search_criteria = self::process_search_dates( $args, $search_criteria );
+		$search_criteria = self::process_search_dates($args, $search_criteria);
 
-		if( $search_criteria !== $original_search_criteria ) {
-			do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after date params: ', $search_criteria );
+		if ($search_criteria !== $original_search_criteria) {
+			do_action('gravityview_log_debug', '[get_search_criteria] Search Criteria after date params: ', $search_criteria);
 		}
 
 		// remove not approved entries
-		$search_criteria = self::process_search_only_approved( $args, $search_criteria );
+		$search_criteria = self::process_search_only_approved($args, $search_criteria);
 
 		/**
 		 * @filter `gravityview_status` Modify entry status requirements to be included in search results.
 		 * @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash`
 		 */
-		$search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args );
+		$search_criteria['status'] = apply_filters('gravityview_status', 'active', $args);
 
 		return $search_criteria;
 	}
@@ -946,29 +946,29 @@ 
 	 * @param int $form_id Gravity Forms Form ID
 	 * @return array Associative array with `count`, `entries`, and `paging` keys. `count` has the total entries count, `entries` is an array with Gravity Forms full entry data, `paging` is an array with `offset` and `page_size` keys
 	 */
-	public static function get_view_entries( $args, $form_id ) {
+	public static function get_view_entries($args, $form_id) {
 
-		do_action( 'gravityview_log_debug', '[get_view_entries] init' );
+		do_action('gravityview_log_debug', '[get_view_entries] init');
 		// start filters and sorting
 
 		/**
 		 * Process search parameters
 		 * @var array
 		 */
-		$search_criteria = self::get_search_criteria( $args, $form_id );
+		$search_criteria = self::get_search_criteria($args, $form_id);
 
 		// Paging & offset
-		$page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : apply_filters( 'gravityview_default_page_size', 25 );
+		$page_size = !empty($args['page_size']) ? intval($args['page_size']) : apply_filters('gravityview_default_page_size', 25);
 
 		if ( -1 === $page_size ) {
 			$page_size = PHP_INT_MAX;
 		}
 
-		if ( isset( $args['offset'] ) ) {
-			$offset = intval( $args['offset'] );
+		if (isset($args['offset'])) {
+			$offset = intval($args['offset']);
 		} else {
-			$curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] );
-			$offset = ( $curr_page - 1 ) * $page_size;
+			$curr_page = empty($_GET['pagenum']) ? 1 : intval($_GET['pagenum']);
+			$offset = ($curr_page - 1) * $page_size;
 		}
 
 		$paging = array(
@@ -976,16 +976,16 @@ 
 			'page_size' => $page_size,
 		);
 
-		do_action( 'gravityview_log_debug', '[get_view_entries] Paging: ', $paging );
+		do_action('gravityview_log_debug', '[get_view_entries] Paging: ', $paging);
 
 		// Sorting
-		$sorting = self::updateViewSorting( $args, $form_id );
+		$sorting = self::updateViewSorting($args, $form_id);
 
 		$parameters = array(
 			'search_criteria' => $search_criteria,
 			'sorting' => $sorting,
 			'paging' => $paging,
-			'cache' => isset( $args['cache'] ) ? $args['cache'] : true,
+			'cache' => isset($args['cache']) ? $args['cache'] : true,
 		);
 
 		/**
@@ -1003,22 +1003,22 @@ 
 		 * }
 		 * @param int $form_id ID of Gravity Forms form
 		 */
-		$parameters = apply_filters( 'gravityview_get_entries', $parameters, $args, $form_id );
+		$parameters = apply_filters('gravityview_get_entries', $parameters, $args, $form_id);
 
 		/**
 		 * @filter `gravityview_get_entries_{View ID}` Filter get entries criteria
 		 * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys.
 		 * @param array $args View configuration args.
 		 */
-		$parameters = apply_filters( 'gravityview_get_entries_'.$args['id'], $parameters, $args, $form_id );
+		$parameters = apply_filters('gravityview_get_entries_'.$args['id'], $parameters, $args, $form_id);
 
-		do_action( 'gravityview_log_debug', '[get_view_entries] $parameters passed to gravityview_get_entries(): ', $parameters );
+		do_action('gravityview_log_debug', '[get_view_entries] $parameters passed to gravityview_get_entries(): ', $parameters);
 
 		//fetch entries
 		$count = 0;
-		$entries = gravityview_get_entries( $form_id, $parameters, $count );
+		$entries = gravityview_get_entries($form_id, $parameters, $count);
 
-		do_action( 'gravityview_log_debug', sprintf( '[get_view_entries] Get Entries. Found: %s entries', $count ), $entries );
+		do_action('gravityview_log_debug', sprintf('[get_view_entries] Get Entries. Found: %s entries', $count), $entries);
 
 		/**
 		 * @filter `gravityview_view_entries` Filter the entries output to the View
@@ -1026,7 +1026,7 @@ 
 		 * @param array $args View settings associative array
 		 * @var array
 		 */
-		$entries = apply_filters( 'gravityview_view_entries', $entries, $args );
+		$entries = apply_filters('gravityview_view_entries', $entries, $args);
 
 		/**
 		 * @filter `gravityview/view/entries` Filter the entries output to the View
@@ -1034,7 +1034,7 @@ 
 		 * @param array $args View settings associative array
 		 * @since 1.5.2
 		 */
-		return apply_filters( 'gravityview/view/entries', compact( 'count', 'entries', 'paging' ), $args );
+		return apply_filters('gravityview/view/entries', compact('count', 'entries', 'paging'), $args);
 
 	}
 
@@ -1048,24 +1048,24 @@ 
 	 * @param int $form_id The ID of the form used to sort
 	 * @return array $sorting Array with `key`, `direction` and `is_numeric` keys
 	 */
-	public static function updateViewSorting( $args, $form_id ) {
+	public static function updateViewSorting($args, $form_id) {
 		$sorting = array();
-		$sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : rgar( $args, 'sort_field' );
-		$sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : rgar( $args, 'sort_direction' );
+		$sort_field_id = isset($_GET['sort']) ? $_GET['sort'] : rgar($args, 'sort_field');
+		$sort_direction = isset($_GET['dir']) ? $_GET['dir'] : rgar($args, 'sort_direction');
 
-		$sort_field_id = self::_override_sorting_id_by_field_type( $sort_field_id, $form_id );
+		$sort_field_id = self::_override_sorting_id_by_field_type($sort_field_id, $form_id);
 
-		if ( ! empty( $sort_field_id ) ) {
+		if (!empty($sort_field_id)) {
 			$sorting = array(
 				'key' => $sort_field_id,
-				'direction' => strtolower( $sort_direction ),
-				'is_numeric' => GVCommon::is_field_numeric( $form_id, $sort_field_id )
+				'direction' => strtolower($sort_direction),
+				'is_numeric' => GVCommon::is_field_numeric($form_id, $sort_field_id)
 			);
 		}
 
-		GravityView_View::getInstance()->setSorting( $sorting );
+		GravityView_View::getInstance()->setSorting($sorting);
 
-		do_action( 'gravityview_log_debug', '[updateViewSorting] Sort Criteria : ', $sorting );
+		do_action('gravityview_log_debug', '[updateViewSorting] Sort Criteria : ', $sorting);
 
 		return $sorting;
 
@@ -1085,17 +1085,17 @@ 
 	 *
 	 * @return string Possibly modified sorting ID
 	 */
-	private static function _override_sorting_id_by_field_type( $sort_field_id, $form_id ) {
+	private static function _override_sorting_id_by_field_type($sort_field_id, $form_id) {
 
-		$form = GFAPI::get_form( $form_id );
+		$form = GFAPI::get_form($form_id);
 
-		$sort_field = GFFormsModel::get_field( $form, $sort_field_id );
+		$sort_field = GFFormsModel::get_field($form, $sort_field_id);
 
-		switch ( $sort_field['type'] ) {
+		switch ($sort_field['type']) {
 
 			case 'address':
 				// Sorting by full address
-				if ( floatval( $sort_field_id ) === floor( $sort_field_id ) ) {
+				if (floatval($sort_field_id) === floor($sort_field_id)) {
 
 					/**
 					 * Override how to sort when sorting address
@@ -1106,9 +1106,9 @@ 
 					 * @param string $sort_field_id Field used for sorting
 					 * @param int $form_id GF Form ID
 					 */
-					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
+					$address_part = apply_filters('gravityview/sorting/address', 'city', $sort_field_id, $form_id);
 
-					switch( strtolower( $address_part ) ){
+					switch (strtolower($address_part)) {
 						case 'street':
 							$sort_field_id .= '.1';
 							break;
@@ -1134,7 +1134,7 @@ 
 				break;
 			case 'name':
 				// Sorting by full name, not first, last, etc.
-				if ( floatval( $sort_field_id ) === floor( $sort_field_id ) ) {
+				if (floatval($sort_field_id) === floor($sort_field_id)) {
 					/**
 					 * @filter `gravityview/sorting/full-name` Override how to sort when sorting full name.
 					 * @since 1.7.4
@@ -1142,9 +1142,9 @@ 
 					 * @param[in] string $sort_field_id Field used for sorting
 					 * @param[in] int $form_id GF Form ID
 					 */
-					$name_part = apply_filters( 'gravityview/sorting/full-name', 'first', $sort_field_id, $form_id );
+					$name_part = apply_filters('gravityview/sorting/full-name', 'first', $sort_field_id, $form_id);
 
-					if ( 'last' === strtolower( $name_part ) ) {
+					if ('last' === strtolower($name_part)) {
 						$sort_field_id .= '.6';
 					} else {
 						$sort_field_id .= '.3';
@@ -1163,7 +1163,7 @@ 
 				 * @param[in,out] string $name_part Field used for sorting
 				 * @param[in] int $form_id GF Form ID
 				 */
-				$sort_field_id = apply_filters( 'gravityview/sorting/time', $sort_field_id, $form_id );
+				$sort_field_id = apply_filters('gravityview/sorting/time', $sort_field_id, $form_id);
 				break;
 		}
 
@@ -1178,7 +1178,7 @@ 
 
 		$var_name = GravityView_Post_Types::get_entry_var_name();
 
-		$single_entry = get_query_var( $var_name );
+		$single_entry = get_query_var($var_name);
 
 		/**
 		 * Modify the entry that is being displayed.
@@ -1186,9 +1186,9 @@ 
 		 * @internal Should only be used by things like the oEmbed functionality.
 		 * @since 1.6
 		 */
-		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
+		$single_entry = apply_filters('gravityview/is_single_entry', $single_entry);
 
-		if ( empty( $single_entry ) ){
+		if (empty($single_entry)) {
 			return false;
 		} else {
 			return $single_entry;
@@ -1205,38 +1205,38 @@ 
 	public function add_scripts_and_styles() {
 		global $post, $posts;
 		// enqueue template specific styles
-		if ( $this->getGvOutputData() ) {
+		if ($this->getGvOutputData()) {
 
 			$views = $this->getGvOutputData()->get_views();
 
-			foreach ( $views as $view_id => $data ) {
+			foreach ($views as $view_id => $data) {
 
 				/**
 				 * Don't enqueue the scripts or styles if it's not going to be displayed.
 				 * @since 1.15
 				 */
-				if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
+				if (is_user_logged_in() && false === GVCommon::has_cap('read_gravityview', $view_id)) {
 					continue;
 				}
 
 				// By default, no thickbox
-				$js_dependencies = array( 'jquery', 'gravityview-jquery-cookie' );
+				$js_dependencies = array('jquery', 'gravityview-jquery-cookie');
 				$css_dependencies = array();
 
 				// If the thickbox is enqueued, add dependencies
-				if ( ! empty( $data['atts']['lightbox'] ) ) {
+				if (!empty($data['atts']['lightbox'])) {
 
 					/**
 					 * @filter `gravity_view_lightbox_script` Override the lightbox script to enqueue. Default: `thickbox`
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of it here.
 					 */
-					$js_dependencies[] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' );
+					$js_dependencies[] = apply_filters('gravity_view_lightbox_script', 'thickbox');
 
 					/**
 					 * @filter `gravity_view_lightbox_style` Modify the lightbox CSS slug. Default: `thickbox`
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of its CSS file here.
 					 */
-					$css_dependencies[] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' );
+					$css_dependencies[] = apply_filters('gravity_view_lightbox_style', 'thickbox');
 				}
 
 				/**
@@ -1244,34 +1244,34 @@ 
 				 * @see https://github.com/katzwebservices/GravityView/issues/536
 				 * @since 1.15
 				 */
-				if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) {
+				if (gravityview_view_has_single_checkbox_or_radio($data['form'], $data['fields'])) {
 					$css_dependencies[] = 'dashicons';
 				}
 
-				wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'includes/lib/jquery-cookie/jquery_cookie.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
+				wp_register_script('gravityview-jquery-cookie', plugins_url('includes/lib/jquery-cookie/jquery_cookie.js', GRAVITYVIEW_FILE), array('jquery'), GravityView_Plugin::version, true);
 
-				$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+				$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
-				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ) , GravityView_Plugin::version, true );
+				wp_register_script('gravityview-fe-view', plugins_url('assets/js/fe-views'.$script_debug.'.js', GRAVITYVIEW_FILE), apply_filters('gravityview_js_dependencies', $js_dependencies), GravityView_Plugin::version, true);
 
-				wp_enqueue_script( 'gravityview-fe-view' );
+				wp_enqueue_script('gravityview-fe-view');
 
-				if ( ! empty( $data['atts']['sort_columns'] ) ) {
-					wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
+				if (!empty($data['atts']['sort_columns'])) {
+					wp_enqueue_style('gravityview_font', plugins_url('assets/css/font.css', GRAVITYVIEW_FILE), $css_dependencies, GravityView_Plugin::version, 'all');
 				}
 
-				wp_enqueue_style( 'gravityview_default_style', plugins_url( 'templates/css/gv-default-styles.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
+				wp_enqueue_style('gravityview_default_style', plugins_url('templates/css/gv-default-styles.css', GRAVITYVIEW_FILE), $css_dependencies, GravityView_Plugin::version, 'all');
 
-				self::add_style( $data['template_id'] );
+				self::add_style($data['template_id']);
 
 			}
 
-			if ( 'wp_print_footer_scripts' === current_filter() ) {
+			if ('wp_print_footer_scripts' === current_filter()) {
 
 				$js_localization = array(
 					'cookiepath' => COOKIEPATH,
-					'clear' => _x( 'Clear', 'Clear all data from the form', 'gravityview' ),
-					'reset' => _x( 'Reset', 'Reset the search form to the state that existed on page load', 'gravityview' ),
+					'clear' => _x('Clear', 'Clear all data from the form', 'gravityview'),
+					'reset' => _x('Reset', 'Reset the search form to the state that existed on page load', 'gravityview'),
 				);
 
 				/**
@@ -1279,9 +1279,9 @@ 
 				 * @param array $js_localization The data padded to the Javascript file
 				 * @param array $views Array of View data arrays with View settings
 				 */
-				$js_localization = apply_filters( 'gravityview_js_localization', $js_localization, $views );
+				$js_localization = apply_filters('gravityview_js_localization', $js_localization, $views);
 
-				wp_localize_script( 'gravityview-fe-view', 'gvGlobals', $js_localization );
+				wp_localize_script('gravityview-fe-view', 'gvGlobals', $js_localization);
 			}
 		}
 	}
@@ -1290,15 +1290,15 @@ 
 	 * Add template extra style if exists
 	 * @param string $template_id
 	 */
-	public static function add_style( $template_id ) {
+	public static function add_style($template_id) {
 
-		if ( ! empty( $template_id ) && wp_style_is( 'gravityview_style_' . $template_id, 'registered' ) ) {
-			do_action( 'gravityview_log_debug', sprintf( '[add_style] Adding extra template style for %s', $template_id ) );
-			wp_enqueue_style( 'gravityview_style_' . $template_id );
-		} elseif ( empty( $template_id ) ) {
-			do_action( 'gravityview_log_error', '[add_style] Cannot add template style; template_id is empty' );
+		if (!empty($template_id) && wp_style_is('gravityview_style_'.$template_id, 'registered')) {
+			do_action('gravityview_log_debug', sprintf('[add_style] Adding extra template style for %s', $template_id));
+			wp_enqueue_style('gravityview_style_'.$template_id);
+		} elseif (empty($template_id)) {
+			do_action('gravityview_log_error', '[add_style] Cannot add template style; template_id is empty');
 		} else {
-			do_action( 'gravityview_log_error', sprintf( '[add_style] Cannot add template style; %s is not registered', 'gravityview_style_'.$template_id ) );
+			do_action('gravityview_log_error', sprintf('[add_style] Cannot add template style; %s is not registered', 'gravityview_style_'.$template_id));
 		}
 
 	}
@@ -1317,17 +1317,17 @@ 
 	 *
 	 * @return string Field Label
 	 */
-	public function add_columns_sort_links( $label = '', $field, $form ) {
+	public function add_columns_sort_links($label = '', $field, $form) {
 
 		/**
 		 * Not a table-based template; don't add sort icons
 		 * @since 1.12
 		 */
-		if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
+		if (!preg_match('/table/ism', GravityView_View::getInstance()->getTemplatePartSlug())) {
 			return $label;
 		}
 
-		if ( ! $this->is_field_sortable( $field['id'], $form ) ) {
+		if (!$this->is_field_sortable($field['id'], $form)) {
 			return $label;
 		}
 
@@ -1335,16 +1335,16 @@ 
 
 		$class = 'gv-sort icon';
 
-		$sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] );
+		$sort_field_id = self::_override_sorting_id_by_field_type($field['id'], $form['id']);
 
 		$sort_args = array(
 			'sort' => $field['id'],
 			'dir' => 'asc',
 		);
 
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
+		if (!empty($sorting['key']) && (string)$sort_field_id === (string)$sorting['key']) {
 			//toggle sorting direction.
-			if ( 'asc' === $sorting['direction'] ) {
+			if ('asc' === $sorting['direction']) {
 				$sort_args['dir'] = 'desc';
 				$class .= ' gv-icon-sort-desc';
 			} else {
@@ -1355,9 +1355,9 @@ 
 			$class .= ' gv-icon-caret-up-down';
 		}
 
-		$url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) );
+		$url = add_query_arg($sort_args, remove_query_arg(array('pagenum')));
 
-		return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a>&nbsp;'. $label;
+		return '<a href="'.esc_url_raw($url).'" class="'.$class.'" ></a>&nbsp;'.$label;
 
 	}
 
@@ -1371,10 +1371,10 @@ 
 	 *
 	 * @return bool True: Yes, field is sortable; False: not sortable
 	 */
-	public function is_field_sortable( $field_id = '', $form ) {
+	public function is_field_sortable($field_id = '', $form) {
 
-		if( is_numeric( $field_id ) ) {
-			$field = GFFormsModel::get_field( $form, $field_id );
+		if (is_numeric($field_id)) {
+			$field = GFFormsModel::get_field($form, $field_id);
 			$field_id = $field->type;
 		}
 
@@ -1390,13 +1390,13 @@ 
 		 * Modify what fields should never be sortable.
 		 * @since 1.7
 		 */
-		$not_sortable = apply_filters( 'gravityview/sortable/field_blacklist', $not_sortable, $field_id, $form );
+		$not_sortable = apply_filters('gravityview/sortable/field_blacklist', $not_sortable, $field_id, $form);
 
-		if ( in_array( $field_id, $not_sortable ) ) {
+		if (in_array($field_id, $not_sortable)) {
 			return false;
 		}
 
-		return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
+		return apply_filters("gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters("gravityview/sortable/field_{$field_id}", true, $form));
 
 	}
 

includes/class-gravityview-admin-bar.php

Spacing +17 added lines, -17 removed lines

@@ -23,8 +23,8 @@ 
 	 * @since 1.13
 	 */
 	private function add_hooks() {
-		add_action( 'add_admin_bar_menus', array( $this, 'remove_links' ), 80 );
-		add_action( 'admin_bar_menu', array( $this, 'add_links' ), 85 );
+		add_action('add_admin_bar_menus', array($this, 'remove_links'), 80);
+		add_action('admin_bar_menu', array($this, 'add_links'), 85);
 	}
 
 	/**
@@ -55,15 +55,15 @@ 
 
 		$entry_id = $this->gravityview_view->getSingleEntry();
 
-		if ( $entry_id && GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ), $entry_id ) ) {
+		if ($entry_id && GVCommon::has_cap(array('gravityforms_edit_entries', 'gravityview_edit_entries'), $entry_id)) {
 
 			$entry = $this->gravityview_view->getEntry();
 
-			$wp_admin_bar->add_menu( array(
+			$wp_admin_bar->add_menu(array(
 				'id' => 'edit-entry',
-				'title' => __( 'Edit Entry', 'gravityview' ),
-				'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_entries&screen_mode=edit&view=entry&id=%d&lid=%d', $entry['form_id'], $entry['id'] ) ) ),
-			) );
+				'title' => __('Edit Entry', 'gravityview'),
+				'href' => esc_url_raw(admin_url(sprintf('admin.php?page=gf_entries&screen_mode=edit&view=entry&id=%d&lid=%d', $entry['form_id'], $entry['id']))),
+			));
 
 		}
 	}
@@ -78,7 +78,7 @@ 
 		/** @var WP_Admin_Bar $wp_admin_bar */
 		global $wp_admin_bar;
 
-		if( GVCommon::has_cap('edit_gravityviews') ) {
+		if (GVCommon::has_cap('edit_gravityviews')) {
 
 			$view_data = GravityView_View_Data::getInstance();
 
@@ -86,15 +86,15 @@ 
 
 			// If there is a View embed, shor Edit View link.
 			// todo: Support multiple View embeds with a drop-down menu
-			if ( ! $this->gravityview_view->isGravityviewPostType() && ! empty( $views ) && ! $view_data->has_multiple_views() ) {
-				$view = reset( $views );
+			if (!$this->gravityview_view->isGravityviewPostType() && !empty($views) && !$view_data->has_multiple_views()) {
+				$view = reset($views);
 
-				if( GVCommon::has_cap( 'edit_gravityview', $view['id'] ) ) {
-					$wp_admin_bar->add_menu( array(
+				if (GVCommon::has_cap('edit_gravityview', $view['id'])) {
+					$wp_admin_bar->add_menu(array(
 						'id'    => 'edit-view',
-						'title' => __( 'Edit View', 'gravityview' ),
-						'href'  => esc_url_raw( admin_url( sprintf( 'post.php?post=%d&action=edit', $view['id'] ) ) ),
-					) );
+						'title' => __('Edit View', 'gravityview'),
+						'href'  => esc_url_raw(admin_url(sprintf('post.php?post=%d&action=edit', $view['id']))),
+					));
 				}
 			}
 		}
@@ -108,8 +108,8 @@ 
 	function remove_links() {
 
 		// If we're on the single entry page, we don't want to cause confusion.
-		if ( is_admin() || ( $this->gravityview_view->getSingleEntry() && ! $this->gravityview_view->isGravityviewPostType() ) ) {
-			remove_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 );
+		if (is_admin() || ($this->gravityview_view->getSingleEntry() && !$this->gravityview_view->isGravityviewPostType())) {
+			remove_action('admin_bar_menu', 'wp_admin_bar_edit_menu', 80);
 		}
 	}
 }

includes/class-gravityview-admin-duplicate-view.php

Spacing +71 added lines, -71 removed lines

@@ -15,12 +15,12 @@ 
 	function __construct() {
 
 		// Only run on Admin
-		if ( !is_admin() ) {
+		if (!is_admin()) {
 			return;
 		}
 
 		// If the Duplicate Post plugin is active, don't run.
-		if( defined('DUPLICATE_POST_CURRENT_VERSION') ) {
+		if (defined('DUPLICATE_POST_CURRENT_VERSION')) {
 			return;
 		}
 
@@ -33,18 +33,18 @@ 
 	 * @return void
 	 */
 	private function add_hooks() {
-		add_filter( 'post_row_actions', array( $this, 'make_duplicate_link_row' ), 10, 2 );
+		add_filter('post_row_actions', array($this, 'make_duplicate_link_row'), 10, 2);
 
 		/**
 		 * Connect actions to functions
 		 */
-		add_action( 'admin_action_duplicate_view', array( $this, 'save_as_new_view' ) );
-		add_action( 'admin_action_duplicate_view_as_draft', array( $this, 'save_as_new_view_draft' ) );
+		add_action('admin_action_duplicate_view', array($this, 'save_as_new_view'));
+		add_action('admin_action_duplicate_view_as_draft', array($this, 'save_as_new_view_draft'));
 
 		// Using our action hooks to copy meta fields
-		add_action( 'gv_duplicate_view', array( $this, 'copy_view_meta_info' ), 10, 2 );
+		add_action('gv_duplicate_view', array($this, 'copy_view_meta_info'), 10, 2);
 
-		add_filter( 'gravityview_connected_form_links', array( $this, 'connected_form_links' ), 10, 2 );
+		add_filter('gravityview_connected_form_links', array($this, 'connected_form_links'), 10, 2);
 	}
 
 	/**
@@ -55,15 +55,15 @@ 
 	 *
 	 * @return array If it's the All Views page, return unedited. Otherwise, add a link to create cloned draft of View
 	 */
-	function connected_form_links( $links = array(), $form = array() ) {
+	function connected_form_links($links = array(), $form = array()) {
 		/** @global WP_Post $post */
 		global $post;
 
 		// We only want to add Clone links to the Edit View metabox
-		if( !$this->is_all_views_page() ) {
+		if (!$this->is_all_views_page()) {
 
-			if( $duplicate_links = $this->make_duplicate_link_row( array(), $post ) ) {
-				$links[] = '<span>' . $duplicate_links['edit_as_new_draft'] . '</span>';
+			if ($duplicate_links = $this->make_duplicate_link_row(array(), $post)) {
+				$links[] = '<span>'.$duplicate_links['edit_as_new_draft'].'</span>';
 			}
 
 		}
@@ -88,12 +88,12 @@ 
 	 *
 	 * @since 1.6
 	 */
-	private function current_user_can_copy( $post ) {
+	private function current_user_can_copy($post) {
 
-		$id = is_object( $post ) ? $post->ID : $post;
+		$id = is_object($post) ? $post->ID : $post;
 
 		// Can't edit this current View
-		return GVCommon::has_cap( 'copy_gravityviews', $id );
+		return GVCommon::has_cap('copy_gravityviews', $id);
 
 	}
 
@@ -104,10 +104,10 @@ 
 	 * @param string $status The post status
 	 * @since 1.6
 	 */
-	private function create_duplicate( $post, $status = '' ) {
+	private function create_duplicate($post, $status = '') {
 
 		// We only want to clone Views
-		if ( $post->post_type !== 'gravityview' ) {
+		if ($post->post_type !== 'gravityview') {
 			return;
 		}
 
@@ -119,7 +119,7 @@ 
 		 * @param string|null If string, the status to set for the new View. If empty, use existing View status.
 		 * @param WP_Post $post View being cloned
 		 */
-		$new_view_status = apply_filters('gravityview/duplicate-view/status', $status, $post );
+		$new_view_status = apply_filters('gravityview/duplicate-view/status', $status, $post);
 
 		$new_view = array(
 			'menu_order'     => $post->menu_order,
@@ -131,7 +131,7 @@ 
 			'post_mime_type' => $post->post_mime_type,
 			'post_parent'    => $post->post_parent,
 			'post_password'  => $post->post_password,
-			'post_status'    => ( empty( $new_view_status ) ) ? $post->post_status : $new_view_status,
+			'post_status'    => (empty($new_view_status)) ? $post->post_status : $new_view_status,
 			'post_title'     => $post->post_title,
 			'post_type'      => $post->post_type,
 		);
@@ -142,11 +142,11 @@ 
 		 * @param boolean $copy_date Whether the copy the date from the existing View. Default: `false`
 		 * @param WP_Post $post View being cloned
 		 */
-		$copy_date = apply_filters('gravityview/duplicate-view/copy-date', false, $post );
+		$copy_date = apply_filters('gravityview/duplicate-view/copy-date', false, $post);
 
-		if ( $copy_date ) {
+		if ($copy_date) {
 			$new_view['post_date']     = $new_post_date = $post->post_date;
-			$new_view['post_date_gmt'] = get_gmt_from_date( $new_post_date );
+			$new_view['post_date_gmt'] = get_gmt_from_date($new_post_date);
 		}
 
 		/**
@@ -155,15 +155,15 @@ 
 		 * @param array $new_view Array of settings to be passed to wp_insert_post()
 		 * @param WP_Post $post View being cloned
 		 */
-		$new_view = apply_filters('gravityview/duplicate-view/new-view', $new_view, $post );
+		$new_view = apply_filters('gravityview/duplicate-view/new-view', $new_view, $post);
 
 		// Magic happens here.
-		$new_view_id = wp_insert_post( $new_view );
+		$new_view_id = wp_insert_post($new_view);
 
 		// If the copy is published or scheduled, we have to set a proper slug.
-		if ( $new_view_status == 'publish' || $new_view_status == 'future' ) {
+		if ($new_view_status == 'publish' || $new_view_status == 'future') {
 
-			$view_name = wp_unique_post_slug( $post->post_name, $new_view_id, $new_view_status, $post->post_type, $post->post_parent );
+			$view_name = wp_unique_post_slug($post->post_name, $new_view_id, $new_view_status, $post->post_type, $post->post_parent);
 
 			$new_view_name_array = array(
 				'ID' => $new_view_id,
@@ -171,7 +171,7 @@ 
 			);
 
 			// Update the post into the database
-			wp_update_post( $new_view_name_array );
+			wp_update_post($new_view_name_array);
 		}
 
 		/**
@@ -181,11 +181,11 @@ 
 		 * @param int $new_view_id The ID of the newly created View
 		 * @param WP_Post The View that was just cloned
 		 */
-		do_action( 'gv_duplicate_view', $new_view_id, $post );
+		do_action('gv_duplicate_view', $new_view_id, $post);
 
-		delete_post_meta( $new_view_id, '_dp_original' );
+		delete_post_meta($new_view_id, '_dp_original');
 
-		add_post_meta( $new_view_id, '_dp_original', $post->ID, false );
+		add_post_meta($new_view_id, '_dp_original', $post->ID, false);
 
 		return $new_view_id;
 	}
@@ -200,23 +200,23 @@ 
 	 *
 	 * @return void
 	 */
-	public function copy_view_meta_info( $new_id, $post ) {
+	public function copy_view_meta_info($new_id, $post) {
 
-		$post_meta_keys = get_post_custom_keys( $post->ID );
+		$post_meta_keys = get_post_custom_keys($post->ID);
 
-		if ( empty( $post_meta_keys ) ) {
+		if (empty($post_meta_keys)) {
 			return;
 		}
 
-		foreach ( $post_meta_keys as $meta_key ) {
+		foreach ($post_meta_keys as $meta_key) {
 
-			$meta_values = get_post_custom_values( $meta_key, $post->ID );
+			$meta_values = get_post_custom_values($meta_key, $post->ID);
 
-			foreach ( $meta_values as $meta_value ) {
+			foreach ($meta_values as $meta_value) {
 
-				$meta_value = maybe_unserialize( $meta_value );
+				$meta_value = maybe_unserialize($meta_value);
 
-				add_post_meta( $new_id, $meta_key, $meta_value );
+				add_post_meta($new_id, $meta_key, $meta_value);
 			}
 		}
 	}
@@ -228,22 +228,22 @@ 
 	 * @param array $actions Row action links. Defaults are 'Edit', 'Quick Edit', 'Restore, 'Trash', 'Delete Permanently', 'Preview', and 'View'
 	 * @param WP_Post $post
 	 */
-	public function make_duplicate_link_row( $actions, $post ) {
+	public function make_duplicate_link_row($actions, $post) {
 
 		// Only process on GravityView Views
-		if ( get_post_type( $post ) === 'gravityview' && $this->current_user_can_copy( $post ) ) {
+		if (get_post_type($post) === 'gravityview' && $this->current_user_can_copy($post)) {
 
-			$clone_link = $this->get_clone_view_link( $post->ID, 'display', false );
-			$clone_text = __( 'Clone', 'gravityview' );
-			$clone_title = __( 'Clone this View', 'gravityview' );
+			$clone_link = $this->get_clone_view_link($post->ID, 'display', false);
+			$clone_text = __('Clone', 'gravityview');
+			$clone_title = __('Clone this View', 'gravityview');
 
-			$actions['clone'] = gravityview_get_link( $clone_link, $clone_text, 'title='.$clone_title );
+			$actions['clone'] = gravityview_get_link($clone_link, $clone_text, 'title='.$clone_title);
 
-			$clone_draft_link = $this->get_clone_view_link( $post->ID );
-			$clone_draft_text = $this->is_all_views_page() ? __( 'New Draft', 'gravityview' ) : __( 'Clone View', 'gravityview' );
-			$clone_draft_title = __( 'Copy as a new draft View', 'gravityview' );
+			$clone_draft_link = $this->get_clone_view_link($post->ID);
+			$clone_draft_text = $this->is_all_views_page() ? __('New Draft', 'gravityview') : __('Clone View', 'gravityview');
+			$clone_draft_title = __('Copy as a new draft View', 'gravityview');
 
-			$actions['edit_as_new_draft'] = gravityview_get_link( $clone_draft_link, esc_html( $clone_draft_text ), 'title='.$clone_draft_title );
+			$actions['edit_as_new_draft'] = gravityview_get_link($clone_draft_link, esc_html($clone_draft_text), 'title='.$clone_draft_title);
 		}
 
 		return $actions;
@@ -259,31 +259,31 @@ 
 	 * @param string $draft Optional, default to true
 	 * @return string
 	 */
-	private function get_clone_view_link( $id = 0, $context = 'display', $draft = true ) {
+	private function get_clone_view_link($id = 0, $context = 'display', $draft = true) {
 
 		// Make sure they have permission
-		if ( false === $this->current_user_can_copy( $id ) ) {
+		if (false === $this->current_user_can_copy($id)) {
 			return '';
 		}
 
 		// Verify the View exists
-		if ( !$view = get_post( $id ) ) {
+		if (!$view = get_post($id)) {
 			return '';
 		}
 
 		$action_name = $draft ? "duplicate_view_as_draft" : "duplicate_view";
 
-		$action = '?action=' . $action_name . '&post=' . $view->ID;
+		$action = '?action='.$action_name.'&post='.$view->ID;
 
-		if ( 'display' == $context ) {
-			$action = esc_html( $action );
+		if ('display' == $context) {
+			$action = esc_html($action);
 		}
 
-		$post_type_object = get_post_type_object( $view->post_type );
+		$post_type_object = get_post_type_object($view->post_type);
 
 		/** If there's no gravityview post type for some reason, abort! */
-		if ( !$post_type_object ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' No gravityview post type exists when trying to clone the View.', $view );
+		if (!$post_type_object) {
+			do_action('gravityview_log_error', __METHOD__.' No gravityview post type exists when trying to clone the View.', $view);
 			return '';
 		}
 
@@ -294,7 +294,7 @@ 
 		 * @param int $view_id View ID
 		 * @param string $context How to display the link. If "display", the URL is run through esc_html(). Default: `display`
 		 */
-		$clone_view_link = apply_filters( 'gravityview/duplicate-view/get_clone_view_link', admin_url( "admin.php". $action ), $view->ID, $context );
+		$clone_view_link = apply_filters('gravityview/duplicate-view/get_clone_view_link', admin_url("admin.php".$action), $view->ID, $context);
 
 		return $clone_view_link;
 	}
@@ -308,7 +308,7 @@ 
 	 * @return void
 	 */
 	public function save_as_new_view_draft() {
-		$this->save_as_new_view( 'draft' );
+		$this->save_as_new_view('draft');
 	}
 
 	/**
@@ -319,38 +319,38 @@ 
 	 * @param string $status The status to set for the new View
 	 * @return void
 	 */
-	public function save_as_new_view( $status = '' ) {
+	public function save_as_new_view($status = '') {
 
-		if ( ! ( isset( $_GET['post'] ) || isset( $_POST['post'] ) ) ) {
-			wp_die( __( 'No post to duplicate has been supplied!', 'gravityview' ) );
+		if (!(isset($_GET['post']) || isset($_POST['post']))) {
+			wp_die(__('No post to duplicate has been supplied!', 'gravityview'));
 		}
 
 		// Get the original post
-		$id   = ( isset( $_GET['post'] ) ? $_GET['post'] : $_POST['post'] );
+		$id = (isset($_GET['post']) ? $_GET['post'] : $_POST['post']);
 
-		if( ! $this->current_user_can_copy( $id ) ) {
-			wp_die( __( 'You don\'t have permission to copy this View.', 'gravityview' ) );
+		if (!$this->current_user_can_copy($id)) {
+			wp_die(__('You don\'t have permission to copy this View.', 'gravityview'));
 		}
 
-		$post = get_post( $id );
+		$post = get_post($id);
 
 		// Copy the post and insert it
-		if ( isset( $post ) && $post != NULL ) {
+		if (isset($post) && $post != NULL) {
 
-			$new_id = $this->create_duplicate( $post, $status );
+			$new_id = $this->create_duplicate($post, $status);
 
-			if ( $status == '' ) {
+			if ($status == '') {
 				// Redirect to the post list screen
-				wp_redirect( admin_url( 'edit.php?post_type=' . $post->post_type ) );
+				wp_redirect(admin_url('edit.php?post_type='.$post->post_type));
 			} else {
 				// Redirect to the edit screen for the new draft post
-				wp_redirect( admin_url( 'post.php?action=edit&post=' . $new_id ) );
+				wp_redirect(admin_url('post.php?action=edit&post='.$new_id));
 			}
 			exit;
 
 		} else {
 
-			wp_die( sprintf( esc_attr__( 'Copy creation failed, could not find original View with ID #%d', 'gravityview' ), $id ) );
+			wp_die(sprintf(esc_attr__('Copy creation failed, could not find original View with ID #%d', 'gravityview'), $id));
 
 		}
 	}