gravityview / GravityView

includes/class-gravityview-roles-capabilities.php

Spacing +57 added lines, -57 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GravityView Roles Class
@@ -33,7 +33,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if( ! self::$instance ) {
+		if (!self::$instance) {
 			self::$instance = new self;
 		}
 
@@ -53,10 +53,10 @@ 
 	 * @since 1.15
 	 */
 	private function add_hooks() {
-		add_filter( 'members_get_capabilities', array( 'GravityView_Roles_Capabilities', 'merge_with_all_caps' ) );
-		add_action( 'members_register_cap_groups', array( $this, 'members_register_cap_group' ), 20 );
-		add_filter( 'user_has_cap', array( $this, 'filter_user_has_cap' ), 10, 4 );
-        add_action( 'admin_init', array( $this, 'add_caps') );
+		add_filter('members_get_capabilities', array('GravityView_Roles_Capabilities', 'merge_with_all_caps'));
+		add_action('members_register_cap_groups', array($this, 'members_register_cap_group'), 20);
+		add_filter('user_has_cap', array($this, 'filter_user_has_cap'), 10, 4);
+        add_action('admin_init', array($this, 'add_caps'));
 	}
 
 
@@ -74,28 +74,28 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function filter_user_has_cap( $usercaps = array(), $caps = array(), $args = array(), $user = NULL ) {
+	public function filter_user_has_cap($usercaps = array(), $caps = array(), $args = array(), $user = NULL) {
 
 		// Empty caps_to_check array
-		if( ! $usercaps || ! $caps ) {
+		if (!$usercaps || !$caps) {
 			return $usercaps;
 		}
 
 		/**
 		 * Enable all GravityView caps_to_check if `gravityview_full_access` is enabled
 		 */
-		if( ! empty( $usercaps['gravityview_full_access'] ) ) {
+		if (!empty($usercaps['gravityview_full_access'])) {
 
 			$all_gravityview_caps = self::all_caps();
 
-			foreach( $all_gravityview_caps as $gv_cap ) {
-				$usercaps[ $gv_cap ] = true;
+			foreach ($all_gravityview_caps as $gv_cap) {
+				$usercaps[$gv_cap] = true;
 			}
 
-			unset( $all_gravityview_caps );
+			unset($all_gravityview_caps);
 		}
 
-		$usercaps = $this->add_gravity_forms_usercaps_to_gravityview_caps( $usercaps );
+		$usercaps = $this->add_gravity_forms_usercaps_to_gravityview_caps($usercaps);
 
 		return $usercaps;
 	}
@@ -114,7 +114,7 @@ 
 	 *
 	 * @return array
 	 */
-	private function add_gravity_forms_usercaps_to_gravityview_caps( $usercaps ) {
+	private function add_gravity_forms_usercaps_to_gravityview_caps($usercaps) {
 
 		$gf_to_gv_caps = array(
 			'gravityforms_edit_entries'     => 'gravityview_edit_others_entries',
@@ -122,9 +122,9 @@ 
 			'gravityforms_edit_entry_notes' => 'gravityview_edit_others_entry_notes',
 		);
 
-		foreach ( $gf_to_gv_caps as $gf_cap => $gv_cap ) {
-			if ( isset( $usercaps[ $gf_cap ] ) && ! isset( $usercaps[ $gv_cap ] ) ) {
-				$usercaps[ $gv_cap ] = $usercaps[ $gf_cap ];
+		foreach ($gf_to_gv_caps as $gf_cap => $gv_cap) {
+			if (isset($usercaps[$gf_cap]) && !isset($usercaps[$gv_cap])) {
+				$usercaps[$gv_cap] = $usercaps[$gf_cap];
 			}
 		}
 
@@ -138,17 +138,17 @@ 
 	 * @return void
 	 */
 	function members_register_cap_group() {
-		if ( function_exists( 'members_register_cap_group' ) ) {
+		if (function_exists('members_register_cap_group')) {
 
 			$args = array(
-				'label'         => __( 'GravityView', 'gravityview' ),
+				'label'         => __('GravityView', 'gravityview'),
 				'icon'          => 'gv-icon-astronaut-head',
 				'caps'          => self::all_caps(),
 				'merge_added'   => true,
 				'diff_added'    => false,
 			);
 
-			members_register_cap_group( 'gravityview', $args );
+			members_register_cap_group('gravityview', $args);
 		}
 	}
 
@@ -159,11 +159,11 @@ 
 	 * @param array $caps Existing capabilities
 	 * @return array Modified capabilities array
 	 */
-	public static function merge_with_all_caps( $caps ) {
+	public static function merge_with_all_caps($caps) {
 
-		$return_caps = array_merge( $caps, self::all_caps() );
+		$return_caps = array_merge($caps, self::all_caps());
 
-		return array_unique( $return_caps );
+		return array_unique($return_caps);
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 	private function wp_roles() {
 		global $wp_roles;
 
-		if ( ! isset( $wp_roles ) ) {
+		if (!isset($wp_roles)) {
 			$wp_roles = new WP_Roles();
 		}
 
@@ -196,7 +196,7 @@ 
 
 		$wp_roles = $this->wp_roles();
 
-		if ( is_object( $wp_roles ) ) {
+		if (is_object($wp_roles)) {
 
 			$_use_db_backup = $wp_roles->use_db;
 
@@ -206,11 +206,11 @@ 
 			 */
 			$wp_roles->use_db = false;
 
-			$capabilities = self::all_caps( false, false );
+			$capabilities = self::all_caps(false, false);
 
-			foreach ( $capabilities as $role_slug => $role_caps ) {
-				foreach ( $role_caps as $cap ) {
-					$wp_roles->add_cap( $role_slug, $cap );
+			foreach ($capabilities as $role_slug => $role_caps) {
+				foreach ($role_caps as $cap) {
+					$wp_roles->add_cap($role_slug, $cap);
 				}
 			}
 
@@ -219,7 +219,7 @@ 
 			 *
 			 * @see WP_Roles::add_cap() Original code
 			 */
-			update_option( $wp_roles->role_key, $wp_roles->roles );
+			update_option($wp_roles->role_key, $wp_roles->roles);
 
 			/**
 			 * Restore previous $use_db setting
@@ -240,7 +240,7 @@ 
 	 *
 	 * @return array If $role is set, flat array of caps_to_check. Otherwise, a multi-dimensional array of roles and their caps_to_check with the following keys: 'administrator', 'editor', 'author', 'contributor', 'subscriber'
 	 */
-	public static function all_caps( $single_role = false, $flat_array = true ) {
+	public static function all_caps($single_role = false, $flat_array = true) {
 
 		// Change settings
 		$administrator_caps = array(
@@ -297,20 +297,20 @@ 
 		);
 
 		$subscriber = $subscriber_caps;
-		$contributor = array_merge( $contributor_caps, $subscriber_caps );
-		$author = array_merge( $author_caps, $contributor_caps, $subscriber_caps );
-		$editor = array_merge( $editor_caps, $author_caps, $contributor_caps, $subscriber_caps );
-		$administrator = array_merge( $administrator_caps, $editor_caps, $author_caps, $contributor_caps, $subscriber_caps );
+		$contributor = array_merge($contributor_caps, $subscriber_caps);
+		$author = array_merge($author_caps, $contributor_caps, $subscriber_caps);
+		$editor = array_merge($editor_caps, $author_caps, $contributor_caps, $subscriber_caps);
+		$administrator = array_merge($administrator_caps, $editor_caps, $author_caps, $contributor_caps, $subscriber_caps);
 		$all = $administrator;
 
 		// If role is set, return caps_to_check for just that role.
-		if( $single_role ) {
-			$caps = isset( ${$single_role} ) ? ${$single_role} : false;
-			return $flat_array ? $caps : array( $single_role => $caps );
+		if ($single_role) {
+			$caps = isset(${$single_role} ) ? ${$single_role} : false;
+			return $flat_array ? $caps : array($single_role => $caps);
 		}
 
 		// Otherwise, return multi-dimensional array of all caps_to_check
-		return $flat_array ? $all : compact( 'administrator', 'editor', 'author', 'contributor', 'subscriber' );
+		return $flat_array ? $all : compact('administrator', 'editor', 'author', 'contributor', 'subscriber');
 	}
 
 	/**
@@ -330,25 +330,25 @@ 
 	 *
 	 * @return bool True: user has at least one passed capability; False: user does not have any defined capabilities
 	 */
-	public static function has_cap( $caps_to_check = '', $object_id = null, $user_id = null ) {
+	public static function has_cap($caps_to_check = '', $object_id = null, $user_id = null) {
 
 		$has_cap = false;
 
-		if( empty( $caps_to_check ) ) {
+		if (empty($caps_to_check)) {
 			return $has_cap;
 		}
 
 		// Add full access caps for GV & GF
-		$caps_to_check = self::maybe_add_full_access_caps( $caps_to_check );
+		$caps_to_check = self::maybe_add_full_access_caps($caps_to_check);
 
-		foreach ( $caps_to_check as $cap ) {
-			if( ! is_null( $object_id ) ) {
-				$has_cap = $user_id ? user_can( $user_id, $cap, $object_id ) : current_user_can( $cap, $object_id );
+		foreach ($caps_to_check as $cap) {
+			if (!is_null($object_id)) {
+				$has_cap = $user_id ? user_can($user_id, $cap, $object_id) : current_user_can($cap, $object_id);
 			} else {
-				$has_cap = $user_id ? user_can( $user_id, $cap ) : current_user_can( $cap );
+				$has_cap = $user_id ? user_can($user_id, $cap) : current_user_can($cap);
 			}
 			// At the first successful response, stop checking
-			if( $has_cap ) {
+			if ($has_cap) {
 				break;
 			}
 		}
@@ -365,25 +365,25 @@ 
 	 *
 	 * @return array
 	 */
-	public static function maybe_add_full_access_caps( $caps_to_check = array() ) {
+	public static function maybe_add_full_access_caps($caps_to_check = array()) {
 
 		$caps_to_check = (array)$caps_to_check;
 
 		$all_gravityview_caps = self::all_caps();
 
 		// Are there any $caps_to_check that are from GravityView?
-		if( $has_gravityview_caps = array_intersect( $caps_to_check, $all_gravityview_caps ) ) {
+		if ($has_gravityview_caps = array_intersect($caps_to_check, $all_gravityview_caps)) {
 			$caps_to_check[] = 'gravityview_full_access';
 		}
 
-		$all_gravity_forms_caps = class_exists( 'GFCommon' ) ? GFCommon::all_caps() : array();
+		$all_gravity_forms_caps = class_exists('GFCommon') ? GFCommon::all_caps() : array();
 
 		// Are there any $caps_to_check that are from Gravity Forms?
-		if( $all_gravity_forms_caps = array_intersect( $caps_to_check, $all_gravity_forms_caps ) ) {
+		if ($all_gravity_forms_caps = array_intersect($caps_to_check, $all_gravity_forms_caps)) {
 			$caps_to_check[] = 'gform_full_access';
 		}
 
-		return array_unique( $caps_to_check );
+		return array_unique($caps_to_check);
 	}
 
 	/**
@@ -396,19 +396,19 @@ 
 
 		$wp_roles = $this->wp_roles();
 
-		if ( is_object( $wp_roles ) ) {
+		if (is_object($wp_roles)) {
 
 			/** Remove all GravityView caps_to_check from all roles */
 			$capabilities = self::all_caps();
 
 			// Loop through each role and remove GV caps_to_check
-			foreach( $wp_roles->get_names() as $role_slug => $role_name ) {
-				foreach ( $capabilities as $cap ) {
-					$wp_roles->remove_cap( $role_slug, $cap );
+			foreach ($wp_roles->get_names() as $role_slug => $role_name) {
+				foreach ($capabilities as $cap) {
+					$wp_roles->remove_cap($role_slug, $cap);
 				}
 			}
 		}
 	}
 }
 
-add_action( 'init', array( 'GravityView_Roles_Capabilities', 'get_instance' ), 1 );
\ No newline at end of file
+add_action('init', array('GravityView_Roles_Capabilities', 'get_instance'), 1);
\ No newline at end of file

includes/class-gravityview-shortcode.php

Spacing +30 added lines, -30 removed lines

@@ -25,7 +25,7 @@ 
 	private function add_hooks() {
 
 		// Shortcode to render view (directory)
-		add_shortcode( 'gravityview', array( $this, 'shortcode' ) );
+		add_shortcode('gravityview', array($this, 'shortcode'));
 	}
 
 	/**
@@ -39,23 +39,23 @@ 
 	 * @param string|null $content Content passed inside the shortcode
 	 * @return null|string If admin, null. Otherwise, output of $this->render_view()
 	 */
-	function shortcode( $passed_atts, $content = null ) {
+	function shortcode($passed_atts, $content = null) {
 
 		// Don't process when saving post.
-		if ( is_admin() ) {
+		if (is_admin()) {
 			return null;
 		}
 
-		do_action( 'gravityview_log_debug', __FUNCTION__ . ' $passed_atts: ', $passed_atts );
+		do_action('gravityview_log_debug', __FUNCTION__.' $passed_atts: ', $passed_atts);
 
 		// Get details about the current View
-		if( !empty( $passed_atts['detail'] ) ) {
-			return $this->get_view_detail( $passed_atts['detail'] );
+		if (!empty($passed_atts['detail'])) {
+			return $this->get_view_detail($passed_atts['detail']);
 		}
 
-		$atts = $this->parse_and_sanitize_atts( $passed_atts );
+		$atts = $this->parse_and_sanitize_atts($passed_atts);
 
-		return GravityView_frontend::getInstance()->render_view( $atts );
+		return GravityView_frontend::getInstance()->render_view($atts);
 	}
 
 	/**
@@ -76,26 +76,26 @@ 
 	 *
 	 * @return array Valid and sanitized attribute pairs
 	 */
-	private function parse_and_sanitize_atts( $passed_atts ) {
+	private function parse_and_sanitize_atts($passed_atts) {
 
-		$defaults = GravityView_View_Data::get_default_args( true );
+		$defaults = GravityView_View_Data::get_default_args(true);
 
-		$supported_atts = array_fill_keys( array_keys( $defaults ), '' );
+		$supported_atts = array_fill_keys(array_keys($defaults), '');
 
 		// Whittle down the attributes to only valid pairs
-		$filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' );
+		$filtered_atts = shortcode_atts($supported_atts, $passed_atts, 'gravityview');
 
 		// Only keep the passed attributes after making sure that they're valid pairs
-		$filtered_atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( $passed_atts, $filtered_atts ) : $filtered_atts;
+		$filtered_atts = function_exists('array_intersect_key') ? array_intersect_key($passed_atts, $filtered_atts) : $filtered_atts;
 
 		$atts = array();
 
-		foreach( $filtered_atts as $key => $passed_value ) {
+		foreach ($filtered_atts as $key => $passed_value) {
 
 			// Allow using {get} merge tags in shortcode attributes
-			$passed_value = GravityView_Merge_Tags::replace_get_variables( $passed_value );
+			$passed_value = GravityView_Merge_Tags::replace_get_variables($passed_value);
 
-			switch( $defaults[ $key ]['type'] ) {
+			switch ($defaults[$key]['type']) {
 
 				/**
 				 * Make sure number fields are numeric.
@@ -103,14 +103,14 @@ 
 				 * @see http://php.net/manual/en/function.is-numeric.php#107326
 				 */
 				case 'number':
-					if( is_numeric( $passed_value ) ) {
-						$atts[ $key ] = ( $passed_value + 0 );
+					if (is_numeric($passed_value)) {
+						$atts[$key] = ($passed_value + 0);
 					}
 					break;
 
 				// Checkboxes should be 1 or 0
 				case 'checkbox':
-					$atts[ $key ] = gv_empty( $passed_value ) ? 0 : 1;
+					$atts[$key] = gv_empty($passed_value) ? 0 : 1;
 					break;
 
 				/**
@@ -118,15 +118,15 @@ 
 				 */
 				case 'select':
 				case 'radio':
-					$options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options'];
-					if( in_array( $passed_value, array_keys( $options ) ) ) {
-						$atts[ $key ] = $passed_value;
+					$options = isset($defaults[$key]['choices']) ? $defaults[$key]['choices'] : $defaults[$key]['options'];
+					if (in_array($passed_value, array_keys($options))) {
+						$atts[$key] = $passed_value;
 					}
 					break;
 
 				case 'text':
 				default:
-					$atts[ $key ] = $passed_value;
+					$atts[$key] = $passed_value;
 					break;
 			}
 		}
@@ -143,26 +143,26 @@ 
 	 *
 	 * @return string Detail information
 	 */
-	private function get_view_detail( $detail = '' ) {
+	private function get_view_detail($detail = '') {
 
 		$gravityview_view = GravityView_View::getInstance();
 		$return = '';
 
-		switch( $detail ) {
+		switch ($detail) {
 			case 'total_entries':
-				$return = number_format_i18n( $gravityview_view->getTotalEntries() );
+				$return = number_format_i18n($gravityview_view->getTotalEntries());
 				break;
 			case 'first_entry':
 				$paging = $gravityview_view->getPaginationCounts();
-				$return = empty( $paging ) ? '' : number_format_i18n( $paging['first'] );
+				$return = empty($paging) ? '' : number_format_i18n($paging['first']);
 				break;
 			case 'last_entry':
 				$paging = $gravityview_view->getPaginationCounts();
-				$return = empty( $paging ) ? '' : number_format_i18n( $paging['last'] );
+				$return = empty($paging) ? '' : number_format_i18n($paging['last']);
 				break;
 			case 'page_size':
 				$paging = $gravityview_view->getPaging();
-				$return = number_format_i18n( $paging['page_size'] );
+				$return = number_format_i18n($paging['page_size']);
 				break;
 		}
 
@@ -171,7 +171,7 @@ 
 		 * @since 1.13
 		 * @param string $return Existing output
 		 */
-		$return = apply_filters( 'gravityview/shortcode/detail/' . $detail, $return );
+		$return = apply_filters('gravityview/shortcode/detail/'.$detail, $return);
 
 		return $return;
 	}

includes/class-gravityview-template.php

Spacing +36 added lines, -36 removed lines

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

includes/class-gv-license-handler.php

Spacing +86 added lines, -86 removed lines

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

includes/class-gvlogic-shortcode.php

Spacing +38 added lines, -38 removed lines

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

includes/class-oembed.php

Spacing +47 added lines, -47 removed lines

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

includes/class-post-types.php

Spacing +37 added lines, -37 removed lines

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

includes/class-settings.php

Spacing +126 added lines, -126 removed lines

@@ -69,9 +69,9 @@ 
 	 *
 	 * @param string $prevent_multiple_instances
 	 */
-	public function __construct( $prevent_multiple_instances = '' ) {
+	public function __construct($prevent_multiple_instances = '') {
 
-		if( $prevent_multiple_instances === 'get_instance' ) {
+		if ($prevent_multiple_instances === 'get_instance') {
 			return parent::__construct();
 		}
 
@@ -83,8 +83,8 @@ 
 	 */
 	public static function get_instance() {
 
-		if( empty( self::$instance ) ) {
-			self::$instance = new self( 'get_instance' );
+		if (empty(self::$instance)) {
+			self::$instance = new self('get_instance');
 		}
 
 		return self::$instance;
@@ -100,21 +100,21 @@ 
 	 *
 	 * @return bool
 	 */
-	public function current_user_can_any( $caps ) {
+	public function current_user_can_any($caps) {
 
 		/**
 		 * Prevent Gravity Forms from showing the uninstall tab on the settings page
 		 * @hack
 		 */
-		if( $caps === $this->_capabilities_uninstall ) {
+		if ($caps === $this->_capabilities_uninstall) {
 			return false;
 		}
 
-		if( empty( $caps ) ) {
-			$caps = array( 'gravityview_full_access' );
+		if (empty($caps)) {
+			$caps = array('gravityview_full_access');
 		}
 
-		return GVCommon::has_cap( $caps );
+		return GVCommon::has_cap($caps);
 	}
 
 	/**
@@ -130,10 +130,10 @@ 
 
 		$this->license_key_notice();
 
-		add_filter( 'gform_addon_app_settings_menu_gravityview', array( $this, 'modify_app_settings_menu_title' ) );
+		add_filter('gform_addon_app_settings_menu_gravityview', array($this, 'modify_app_settings_menu_title'));
 
 		/** @since 1.7.6 */
-		add_action('network_admin_menu', array( $this, 'add_network_menu' ) );
+		add_action('network_admin_menu', array($this, 'add_network_menu'));
 
 		parent::init_admin();
 	}
@@ -145,9 +145,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function modify_app_settings_menu_title( $setting_tabs ) {
+	public function modify_app_settings_menu_title($setting_tabs) {
 
-		$setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview');
+		$setting_tabs[0]['label'] = __('GravityView Settings', 'gravityview');
 
 		return $setting_tabs;
 	}
@@ -164,13 +164,13 @@ 
 	 */
 	private function _load_license_handler() {
 
-		if( !empty( $this->License_Handler ) ) {
+		if (!empty($this->License_Handler)) {
 			return;
 		}
 
-		require_once( GRAVITYVIEW_DIR . 'includes/class-gv-license-handler.php');
+		require_once(GRAVITYVIEW_DIR.'includes/class-gv-license-handler.php');
 
-		$this->License_Handler = GV_License_Handler::get_instance( $this );
+		$this->License_Handler = GV_License_Handler::get_instance($this);
 	}
 
 	/**
@@ -180,18 +180,18 @@ 
 	function license_key_notice() {
 
 		// Show license notice on all GV pages, except for settings page
-		if( gravityview_is_admin_page( '', 'settings' ) ) {
+		if (gravityview_is_admin_page('', 'settings')) {
 			return;
 		}
 
 		$license_status = self::getSetting('license_key_status');
 		$license_id = self::getSetting('license_key');
-		$license_id = empty( $license_id ) ? 'license' : $license_id;
+		$license_id = empty($license_id) ? 'license' : $license_id;
 
 		$message = esc_html__('Your GravityView license %s. This means you’re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview');
 		$title = __('Inactive License', 'gravityview');
 		$status = '';
-		switch ( $license_status ) {
+		switch ($license_status) {
 			case 'invalid':
 				$title = __('Invalid License', 'gravityview');
 				$status = __('is invalid', 'gravityview');
@@ -208,13 +208,13 @@ 
 				break;
 		}
 		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice';
-		$message = sprintf( $message, $status, "\n\n".'<a href="'.admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' ).'" class="button button-primary">', '</a>', '<a href="'.esc_url( $url ).'" class="button button-secondary">', '</a>' );
-		if( !empty( $status ) ) {
-			GravityView_Admin_Notices::add_notice( array(
+		$message = sprintf($message, $status, "\n\n".'<a href="'.admin_url('edit.php?post_type=gravityview&amp;page=gravityview_settings').'" class="button button-primary">', '</a>', '<a href="'.esc_url($url).'" class="button button-secondary">', '</a>');
+		if (!empty($status)) {
+			GravityView_Admin_Notices::add_notice(array(
 				'message' => $message,
 				'class'	=> 'updated',
 				'title' => $title,
-				'dismiss' => sha1( $license_status.'_'.$license_id ),
+				'dismiss' => sha1($license_status.'_'.$license_id),
 			));
 		}
 	}
@@ -229,15 +229,15 @@ 
 
 		$styles[] = array(
 			'handle'  => 'gravityview_settings',
-			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
+			'src'     => plugins_url('assets/css/admin-settings.css', GRAVITYVIEW_FILE),
 			'version' => GravityView_Plugin::version,
 			"deps" => array(
 				'gaddon_form_settings_css'
 			),
 			'enqueue' => array(
-				array( 'admin_page' => array(
+				array('admin_page' => array(
 					'app_settings'
-				) ),
+				)),
 			)
 		);
 
@@ -250,8 +250,8 @@ 
 	 * @return void
 	 */
 	public function add_network_menu() {
-		if( GravityView_Plugin::is_network_activated() ) {
-			add_menu_page( __( 'Settings', 'gravityview' ), __( 'GravityView', 'gravityview' ), $this->_capabilities_app_settings, "{$this->_slug}_settings", array( $this, 'app_tab_page' ), 'none' );
+		if (GravityView_Plugin::is_network_activated()) {
+			add_menu_page(__('Settings', 'gravityview'), __('GravityView', 'gravityview'), $this->_capabilities_app_settings, "{$this->_slug}_settings", array($this, 'app_tab_page'), 'none');
 		}
 	}
 
@@ -267,17 +267,17 @@ 
 		 * If multisite and not network admin, we don't want the settings to show.
 		 * @since 1.7.6
 		 */
-		$show_submenu = !is_multisite() ||  is_main_site() || !GravityView_Plugin::is_network_activated() || ( is_network_admin() && GravityView_Plugin::is_network_activated() );
+		$show_submenu = !is_multisite() || is_main_site() || !GravityView_Plugin::is_network_activated() || (is_network_admin() && GravityView_Plugin::is_network_activated());
 
 		/**
 		 * Override whether to show the Settings menu on a per-blog basis.
 		 * @since 1.7.6
 		 * @param bool $hide_if_network_activated Default: true
 		 */
-		$show_submenu = apply_filters( 'gravityview/show-settings-menu', $show_submenu );
+		$show_submenu = apply_filters('gravityview/show-settings-menu', $show_submenu);
 
-		if( $show_submenu ) {
-			add_submenu_page( 'edit.php?post_type=gravityview', __( 'Settings', 'gravityview' ), __( 'Settings', 'gravityview' ), $this->_capabilities_app_settings, $this->_slug . '_settings', array( $this, 'app_tab_page' ) );
+		if ($show_submenu) {
+			add_submenu_page('edit.php?post_type=gravityview', __('Settings', 'gravityview'), __('Settings', 'gravityview'), $this->_capabilities_app_settings, $this->_slug.'_settings', array($this, 'app_tab_page'));
 		}
 	}
 
@@ -302,20 +302,20 @@ 
 	 * @inheritDoc
 	 * @access public
 	 */
-	public function get_app_setting( $setting_name ) {
+	public function get_app_setting($setting_name) {
 
 		/**
 		 * Backward compatibility with Redux
 		 */
-		if( $setting_name === 'license' ) {
+		if ($setting_name === 'license') {
 			return array(
-				'license' => parent::get_app_setting( 'license_key' ),
-				'status' => parent::get_app_setting( 'license_key_status' ),
-				'response' => parent::get_app_setting( 'license_key_response' ),
+				'license' => parent::get_app_setting('license_key'),
+				'status' => parent::get_app_setting('license_key_status'),
+				'response' => parent::get_app_setting('license_key_response'),
 			);
 		}
 
-		return parent::get_app_setting( $setting_name );
+		return parent::get_app_setting($setting_name);
 	}
 
 	/**
@@ -330,7 +330,7 @@ 
 	 * @return array
 	 */
 	public function get_app_settings() {
-		return get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', $this->get_default_settings() );
+		return get_option('gravityformsaddon_'.$this->_slug.'_app_settings', $this->get_default_settings());
 	}
 
 
@@ -343,8 +343,8 @@ 
 	 *
 	 * @return boolean False if value was not updated and true if value was updated.
 	 */
-	public function update_app_settings( $settings ) {
-		return update_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', $settings );
+	public function update_app_settings($settings) {
+		return update_option('gravityformsaddon_'.$this->_slug.'_app_settings', $settings);
 	}
 
 	/**
@@ -352,8 +352,8 @@ 
 	 * @inheritDoc
 	 * @access public
 	 */
-	public function set_field_error( $field, $error_message = '' ) {
-		parent::set_field_error( $field, $error_message );
+	public function set_field_error($field, $error_message = '') {
+		parent::set_field_error($field, $error_message);
 	}
 
 	/**
@@ -363,15 +363,15 @@ 
 	 *
 	 * @return string
 	 */
-	protected function settings_edd_license( $field, $echo = true ) {
+	protected function settings_edd_license($field, $echo = true) {
 
-		$text = self::settings_text( $field, false );
+		$text = self::settings_text($field, false);
 
-		$activation = $this->License_Handler->settings_edd_license_activation( $field, false );
+		$activation = $this->License_Handler->settings_edd_license_activation($field, false);
 
-		$return = $text . $activation;
+		$return = $text.$activation;
 
-		if( $echo ) {
+		if ($echo) {
 			echo $return;
 		}
 
@@ -396,32 +396,32 @@ 
 	 *
 	 * @return string The HTML
 	 */
-	public function settings_submit( $field, $echo = true ) {
+	public function settings_submit($field, $echo = true) {
 
-		$field['type']  = ( isset($field['type']) && in_array( $field['type'], array('submit','reset','button') ) ) ? $field['type'] : 'submit';
+		$field['type'] = (isset($field['type']) && in_array($field['type'], array('submit', 'reset', 'button'))) ? $field['type'] : 'submit';
 
-		$attributes    = $this->get_field_attributes( $field );
-		$default_value = rgar( $field, 'value' ) ? rgar( $field, 'value' ) : rgar( $field, 'default_value' );
-		$value         = $this->get_setting( $field['name'], $default_value );
+		$attributes    = $this->get_field_attributes($field);
+		$default_value = rgar($field, 'value') ? rgar($field, 'value') : rgar($field, 'default_value');
+		$value         = $this->get_setting($field['name'], $default_value);
 
 
-		$attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary gfbutton';
-		$name    = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_'.$field['name'];
+		$attributes['class'] = isset($attributes['class']) ? esc_attr($attributes['class']) : 'button-primary gfbutton';
+		$name = ($field['name'] === 'gform-settings-save') ? $field['name'] : '_gaddon_setting_'.$field['name'];
 
-		if ( empty( $value ) ) {
-			$value = __( 'Update Settings', 'gravityview' );
+		if (empty($value)) {
+			$value = __('Update Settings', 'gravityview');
 		}
 
-		$attributes = $this->get_field_attributes( $field );
+		$attributes = $this->get_field_attributes($field);
 
 		$html = '<input
-                    type="' . $field['type'] . '"
-                    name="' . esc_attr( $name ) . '"
-                    value="' . $value . '" ' .
-		        implode( ' ', $attributes ) .
+                    type="' . $field['type'].'"
+                    name="' . esc_attr($name).'"
+                    value="' . $value.'" '.
+		        implode(' ', $attributes).
 		        ' />';
 
-		if ( $echo ) {
+		if ($echo) {
 			echo $html;
 		}
 
@@ -436,17 +436,17 @@ 
 	 *
 	 * @return string
 	 */
-	public function settings_save( $field, $echo = true ) {
+	public function settings_save($field, $echo = true) {
 		$field['type']  = 'submit';
 		$field['name']  = 'gform-settings-save';
-		$field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton';
+		$field['class'] = isset($field['class']) ? $field['class'] : 'button-primary gfbutton';
 
-		if ( ! rgar( $field, 'value' ) )
-			$field['value'] = __( 'Update Settings', 'gravityview' );
+		if (!rgar($field, 'value'))
+			$field['value'] = __('Update Settings', 'gravityview');
 
-		$output = $this->settings_submit( $field, false );
+		$output = $this->settings_submit($field, false);
 
-		if( $echo ) {
+		if ($echo) {
 			echo $output;
 		}
 
@@ -458,22 +458,22 @@ 
 	 * @inheritDoc
 	 * @param $field array
 	 */
-	public function single_setting_label( $field ) {
+	public function single_setting_label($field) {
 
 		echo $field['label'];
 
 
-		if ( isset( $field['tooltip'] ) ) {
-			echo ' ' . gform_tooltip( $field['tooltip'], rgar( $field, 'tooltip_class' ), true );
+		if (isset($field['tooltip'])) {
+			echo ' '.gform_tooltip($field['tooltip'], rgar($field, 'tooltip_class'), true);
 		}
 
-		if ( rgar( $field, 'required' ) ) {
-			echo ' ' . $this->get_required_indicator( $field );
+		if (rgar($field, 'required')) {
+			echo ' '.$this->get_required_indicator($field);
 		}
 
 		// Added by GravityView
-		if ( isset( $field['description'] ) ) {
-			echo '<span class="description">'. $field['description'] .'</span>';
+		if (isset($field['description'])) {
+			echo '<span class="description">'.$field['description'].'</span>';
 		}
 
 	}
@@ -489,10 +489,10 @@ 
 
 		$defaults = array(
 			// Set the default license in wp-config.php
-			'license_key' => defined( 'GRAVITYVIEW_LICENSE_KEY' ) ? GRAVITYVIEW_LICENSE_KEY : '',
+			'license_key' => defined('GRAVITYVIEW_LICENSE_KEY') ? GRAVITYVIEW_LICENSE_KEY : '',
 			'license_key_response' => '',
 			'license_key_status' => '',
-			'support-email' => get_bloginfo( 'admin_email' ),
+			'support-email' => get_bloginfo('admin_email'),
 			'no-conflict-mode' => '0',
 			'support_port' => '1',
 			'delete-on-uninstall' => '0',
@@ -510,10 +510,10 @@ 
 	 */
 	public function maybe_save_app_settings() {
 
-		if ( $this->is_save_postback() ) {
-			if ( ! GVCommon::has_cap( 'gravityview_edit_settings' ) ) {
+		if ($this->is_save_postback()) {
+			if (!GVCommon::has_cap('gravityview_edit_settings')) {
 				$_POST = array(); // If you don't reset the $_POST array, it *looks* like the settings were changed, but they weren't
-				GFCommon::add_error_message( __( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ) );
+				GFCommon::add_error_message(__('You don\'t have the ability to edit plugin settings.', 'gravityview'));
 				return;
 			}
 		}
@@ -532,10 +532,10 @@ 
 
 		// If the posted key doesn't match the activated/deactivated key (set using the Activate License button, AJAX response),
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
-		if( isset( $posted_settings['license_key'] ) && isset( $posted_settings['license_key_response']['license_key'] ) && $posted_settings['license_key'] !== $posted_settings['license_key_response']['license_key'] ) {
-			unset( $posted_settings['license_key_response'] );
-			unset( $posted_settings['license_key_status'] );
-			GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
+		if (isset($posted_settings['license_key']) && isset($posted_settings['license_key_response']['license_key']) && $posted_settings['license_key'] !== $posted_settings['license_key_response']['license_key']) {
+			unset($posted_settings['license_key_response']);
+			unset($posted_settings['license_key_status']);
+			GFCommon::add_error_message(__('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview'));
 		}
 
 		return $posted_settings;
@@ -549,8 +549,8 @@ 
 	 *
 	 * @return string - Returns markup of the required indicator symbol
 	 */
-	public function get_required_indicator( $field ) {
-		return '<span class="required" title="' . esc_attr__( 'Required', 'gravityview' ) . '">*</span>';
+	public function get_required_indicator($field) {
+		return '<span class="required" title="'.esc_attr__('Required', 'gravityview').'">*</span>';
 	}
 
 	/**
@@ -561,18 +561,18 @@ 
 
 		$default_settings = $this->get_default_settings();
 
-		$disabled_attribute = GVCommon::has_cap( 'gravityview_edit_settings' ) ? false : 'disabled';
+		$disabled_attribute = GVCommon::has_cap('gravityview_edit_settings') ? false : 'disabled';
 
-		$fields = apply_filters( 'gravityview_settings_fields', array(
+		$fields = apply_filters('gravityview_settings_fields', array(
 			array(
 				'name'                => 'license_key',
 				'required'               => true,
-				'label'             => __( 'License Key', 'gravityview' ),
-				'description'          => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview' ),
+				'label'             => __('License Key', 'gravityview'),
+				'description'          => __('Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview'),
 				'type'              => 'edd_license',
 				'data-pending-text' => __('Verifying license&hellip;', 'gravityview'),
 				'default_value'           => $default_settings['license_key'],
-				'class'             => ( '' == $this->get_app_setting( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
+				'class'             => ('' == $this->get_app_setting('license_key')) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
 			),
 			array(
 				'name'       => 'license_key_response',
@@ -589,8 +589,8 @@ 
 				'type'     => 'text',
 				'validate' => 'email',
 				'default_value'  => $default_settings['support-email'],
-				'label'    => __( 'Support Email', 'gravityview' ),
-				'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
+				'label'    => __('Support Email', 'gravityview'),
+				'description' => __('In order to provide responses to your support requests, please provide your email address.', 'gravityview'),
 				'class'    => 'code regular-text',
 			),
 			/**
@@ -599,7 +599,7 @@ 
 			array(
 				'name'         => 'support_port',
 				'type'       => 'radio',
-				'label'      => __( 'Show Support Port?', 'gravityview' ),
+				'label'      => __('Show Support Port?', 'gravityview'),
 				'default_value'    => $default_settings['support_port'],
 				'horizontal' => 1,
 				'choices'    => array(
@@ -612,13 +612,13 @@ 
 						'value' => '0',
 					),
 				),
-				'tooltip' => '<p><img src="' . esc_url_raw( plugins_url('assets/images/screenshots/beacon.png', GRAVITYVIEW_FILE ) ) . '" alt="' . esc_attr__( 'The Support Port looks like this.', 'gravityview' ) . '" class="alignright" style="max-width:40px; margin:.5em;" />' . esc_html__('The Support Port provides quick access to how-to articles and tutorials. For administrators, it also makes it easy to contact support.', 'gravityview') . '</p>',
-				'description'   => __( 'Show the Support Port on GravityView pages?', 'gravityview' ),
+				'tooltip' => '<p><img src="'.esc_url_raw(plugins_url('assets/images/screenshots/beacon.png', GRAVITYVIEW_FILE)).'" alt="'.esc_attr__('The Support Port looks like this.', 'gravityview').'" class="alignright" style="max-width:40px; margin:.5em;" />'.esc_html__('The Support Port provides quick access to how-to articles and tutorials. For administrators, it also makes it easy to contact support.', 'gravityview').'</p>',
+				'description'   => __('Show the Support Port on GravityView pages?', 'gravityview'),
 			),
 			array(
 				'name'         => 'no-conflict-mode',
 				'type'       => 'radio',
-				'label'      => __( 'No-Conflict Mode', 'gravityview' ),
+				'label'      => __('No-Conflict Mode', 'gravityview'),
 				'default_value'    => $default_settings['no-conflict-mode'],
 				'horizontal' => 1,
 				'choices'    => array(
@@ -631,30 +631,30 @@ 
 						'value' => '0',
 					),
 				),
-				'description'   => __( 'Set this to ON to prevent extraneous scripts and styles from being printed on GravityView admin pages, reducing conflicts with other plugins and themes.', 'gravityview' ) . ' ' . __('If your Edit View tabs are ugly, enable this setting.', 'gravityview'),
+				'description'   => __('Set this to ON to prevent extraneous scripts and styles from being printed on GravityView admin pages, reducing conflicts with other plugins and themes.', 'gravityview').' '.__('If your Edit View tabs are ugly, enable this setting.', 'gravityview'),
 			),
 			array(
 				'name'       => 'delete-on-uninstall',
 				'type'       => 'radio',
-				'label'      => __( 'Remove Data on Delete?', 'gravityview' ),
+				'label'      => __('Remove Data on Delete?', 'gravityview'),
 				'default_value'    => $default_settings['delete-on-uninstall'],
 				'horizontal' => 1,
 				'choices'    => array(
 					array(
-						'label' => _x( 'Keep GravityView Data', 'Setting: what to do when uninstalling plugin', 'gravityview' ),
+						'label' => _x('Keep GravityView Data', 'Setting: what to do when uninstalling plugin', 'gravityview'),
 						'value' => '0',
-						'tooltip' => sprintf( '<h6>%s</h6><p>%s</p>', __( 'Keep GravityView content and settings', 'gravityview' ), __( 'If you delete then re-install the plugin, all GravityView data will be kept. Views, settings, etc. will be untouched.', 'gravityview' ) ),
+						'tooltip' => sprintf('<h6>%s</h6><p>%s</p>', __('Keep GravityView content and settings', 'gravityview'), __('If you delete then re-install the plugin, all GravityView data will be kept. Views, settings, etc. will be untouched.', 'gravityview')),
 					),
 					array(
-						'label' => _x( 'Permanently Delete', 'Setting: what to do when uninstalling plugin', 'gravityview' ),
+						'label' => _x('Permanently Delete', 'Setting: what to do when uninstalling plugin', 'gravityview'),
 						'value' => 'delete',
-					    'tooltip' => sprintf( '<h6>%s</h6><p><span class="howto">%s</span></p><p>%s</p>', __( 'Delete all GravityView content and settings', 'gravityview' ), __( 'If you delete then re-install GravityView, it will be like installing GravityView for the first time.', 'gravityview' ), __( 'When GravityView is uninstalled and deleted, delete all Views, GravityView entry approvals, GravityView-generated entry notes (including approval and entry creator changes), and GravityView plugin settings. No Gravity Forms data will be touched.', 'gravityview' ) ),
+					    'tooltip' => sprintf('<h6>%s</h6><p><span class="howto">%s</span></p><p>%s</p>', __('Delete all GravityView content and settings', 'gravityview'), __('If you delete then re-install GravityView, it will be like installing GravityView for the first time.', 'gravityview'), __('When GravityView is uninstalled and deleted, delete all Views, GravityView entry approvals, GravityView-generated entry notes (including approval and entry creator changes), and GravityView plugin settings. No Gravity Forms data will be touched.', 'gravityview')),
 					),
 				),
-				'description'   => sprintf( __( 'Should GravityView content and entry approval status be removed from the site when the GravityView plugin is deleted?', 'gravityview' ), __( 'Permanently Delete', 'gravityview' ) ),
+				'description'   => sprintf(__('Should GravityView content and entry approval status be removed from the site when the GravityView plugin is deleted?', 'gravityview'), __('Permanently Delete', 'gravityview')),
 			),
 
-		) );
+		));
 
 
 
@@ -662,21 +662,21 @@ 
 		 * Redux backward compatibility
 		 * @since 1.7.4
 		 */
-		foreach ( $fields as &$field ) {
-			$field['name']          = isset( $field['name'] ) ? $field['name'] : rgget('id', $field );
-			$field['label']         = isset( $field['label'] ) ? $field['label'] : rgget('title', $field );
-			$field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : rgget('default', $field );
-			$field['description']   = isset( $field['description'] ) ? $field['description'] : rgget('subtitle', $field );
-
-			if( $disabled_attribute ) {
-				$field['disabled']  = $disabled_attribute;
+		foreach ($fields as &$field) {
+			$field['name']          = isset($field['name']) ? $field['name'] : rgget('id', $field);
+			$field['label']         = isset($field['label']) ? $field['label'] : rgget('title', $field);
+			$field['default_value'] = isset($field['default_value']) ? $field['default_value'] : rgget('default', $field);
+			$field['description']   = isset($field['description']) ? $field['description'] : rgget('subtitle', $field);
+
+			if ($disabled_attribute) {
+				$field['disabled'] = $disabled_attribute;
 			}
 		}
 
 
         $sections = array(
             array(
-                'description' =>      sprintf( '<span class="version-info description">%s</span>', sprintf( __('You are running GravityView version %s', 'gravityview'), GravityView_Plugin::version ) ),
+                'description' =>      sprintf('<span class="version-info description">%s</span>', sprintf(__('You are running GravityView version %s', 'gravityview'), GravityView_Plugin::version)),
                 'fields'      => $fields,
             )
         );
@@ -687,7 +687,7 @@ 
             'type'     => 'save',
         );
 
-		if( $disabled_attribute ) {
+		if ($disabled_attribute) {
 			$button['disabled'] = $disabled_attribute;
 		}
 
@@ -703,22 +703,22 @@ 
          * </code>
          * @param array $extension_settings Empty array, ready for extension settings!
          */
-        $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
+        $extension_sections = apply_filters('gravityview/settings/extension/sections', array());
 
 		// If there are extensions, add a section for them
-		if ( ! empty( $extension_sections ) ) {
+		if (!empty($extension_sections)) {
 
-			if( $disabled_attribute ) {
-				foreach ( $extension_sections as &$section ) {
-					foreach ( $section['fields'] as &$field ) {
+			if ($disabled_attribute) {
+				foreach ($extension_sections as &$section) {
+					foreach ($section['fields'] as &$field) {
 						$field['disabled'] = $disabled_attribute;
 					}
 				}
 			}
 
-            $k = count( $extension_sections ) - 1 ;
-            $extension_sections[ $k ]['fields'][] = $button;
-			$sections = array_merge( $sections, $extension_sections );
+            $k = count($extension_sections) - 1;
+            $extension_sections[$k]['fields'][] = $button;
+			$sections = array_merge($sections, $extension_sections);
 		} else {
             // add the 'update settings' button to the general section
             $sections[0]['fields'][] = $button;
@@ -734,8 +734,8 @@ 
 	 *
 	 * @return mixed
 	 */
-	static public function getSetting( $key ) {
-		return self::get_instance()->get_app_setting( $key );
+	static public function getSetting($key) {
+		return self::get_instance()->get_app_setting($key);
 	}
 
 }

includes/class-template.php

Spacing +125 added lines, -125 removed lines

@@ -12,12 +12,12 @@ 
  */
 
 /** If this file is called directly, abort. */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
-if( ! class_exists( 'Gamajo_Template_Loader' ) ) {
-	require( GRAVITYVIEW_DIR . 'includes/lib/class-gamajo-template-loader.php' );
+if (!class_exists('Gamajo_Template_Loader')) {
+	require(GRAVITYVIEW_DIR.'includes/lib/class-gamajo-template-loader.php');
 }
 
 class GravityView_View extends Gamajo_Template_Loader {
@@ -145,9 +145,9 @@ 
 	 * Construct the view object
 	 * @param  array       $atts Associative array to set the data of
 	 */
-	function __construct( $atts = array() ) {
+	function __construct($atts = array()) {
 
-		$atts = wp_parse_args( $atts, array(
+		$atts = wp_parse_args($atts, array(
 			'form_id' => NULL,
 			'view_id' => NULL,
 			'fields'  => NULL,
@@ -155,10 +155,10 @@ 
 			'post_id' => NULL,
 			'form'    => NULL,
 			'atts'	  => NULL,
-		) );
+		));
 
 		foreach ($atts as $key => $value) {
-			if( is_null( $value ) ) {
+			if (is_null($value)) {
 				continue;
 			}
 			$this->{$key} = $value;
@@ -166,18 +166,18 @@ 
 
 
 		// Add granular overrides
-		add_filter( $this->filter_prefix . '_get_template_part', array( $this, 'add_id_specific_templates' ), 10, 3 );
+		add_filter($this->filter_prefix.'_get_template_part', array($this, 'add_id_specific_templates'), 10, 3);
 
 
 		// widget logic
-		add_action( 'gravityview_before', array( $this, 'render_widget_hooks' ) );
-		add_action( 'gravityview_after', array( $this, 'render_widget_hooks' ) );
+		add_action('gravityview_before', array($this, 'render_widget_hooks'));
+		add_action('gravityview_after', array($this, 'render_widget_hooks'));
 
 		/**
 		 * Clear the current entry after the loop is done
 		 * @since 1.7.3
 		 */
-		add_action( 'gravityview_footer', array( $this, 'clearCurrentEntry' ), 500 );
+		add_action('gravityview_footer', array($this, 'clearCurrentEntry'), 500);
 
 		self::$instance = &$this;
 	}
@@ -187,10 +187,10 @@ 
 	 *
 	 * @return GravityView_View
 	 */
-	static function getInstance( $passed_post = NULL ) {
+	static function getInstance($passed_post = NULL) {
 
-		if( empty( self::$instance ) ) {
-			self::$instance = new self( $passed_post );
+		if (empty(self::$instance)) {
+			self::$instance = new self($passed_post);
 		}
 
 		return self::$instance;
@@ -200,11 +200,11 @@ 
 	 * @param string|null $key The key to a specific attribute of the current field
 	 * @return array|mixed|null If $key is set and attribute exists at $key, return that. If not set, return NULL. Otherwise, return current field array
 	 */
-	public function getCurrentField( $key = NULL ) {
+	public function getCurrentField($key = NULL) {
 
-		if( !empty( $key ) ) {
-			if( isset( $this->_current_field[ $key ] ) ) {
-				return $this->_current_field[ $key ];
+		if (!empty($key)) {
+			if (isset($this->_current_field[$key])) {
+				return $this->_current_field[$key];
 			}
 			return NULL;
 		}
@@ -212,19 +212,19 @@ 
 		return $this->_current_field;
 	}
 
-	public function setCurrentFieldSetting( $key, $value ) {
+	public function setCurrentFieldSetting($key, $value) {
 
-		if( !empty( $this->_current_field ) ) {
-			$this->_current_field['field_settings'][ $key ] = $value;
+		if (!empty($this->_current_field)) {
+			$this->_current_field['field_settings'][$key] = $value;
 		}
 
 	}
 
-	public function getCurrentFieldSetting( $key ) {
+	public function getCurrentFieldSetting($key) {
 		$settings = $this->getCurrentField('field_settings');
 
-		if( $settings && !empty( $settings[ $key ] ) ) {
-			return $settings[ $key ];
+		if ($settings && !empty($settings[$key])) {
+			return $settings[$key];
 		}
 
 		return NULL;
@@ -233,11 +233,11 @@ 
 	/**
 	 * @param array $passed_field
 	 */
-	public function setCurrentField( $passed_field ) {
+	public function setCurrentField($passed_field) {
 
 		$existing_field = $this->getCurrentField();
 
-		$set_field = wp_parse_args( $passed_field, $existing_field );
+		$set_field = wp_parse_args($passed_field, $existing_field);
 
 		$this->_current_field = $set_field;
 
@@ -252,11 +252,11 @@ 
 	 * @param string|null $key The key to a specific field in the fields array
 	 * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
 	 */
-	public function getAtts( $key = NULL ) {
+	public function getAtts($key = NULL) {
 
-		if( !empty( $key ) ) {
-			if( isset( $this->atts[ $key ] ) ) {
-				return $this->atts[ $key ];
+		if (!empty($key)) {
+			if (isset($this->atts[$key])) {
+				return $this->atts[$key];
 			}
 			return NULL;
 		}
@@ -267,7 +267,7 @@ 
 	/**
 	 * @param array $atts
 	 */
-	public function setAtts( $atts ) {
+	public function setAtts($atts) {
 		$this->atts = $atts;
 	}
 
@@ -281,7 +281,7 @@ 
 	/**
 	 * @param array $form
 	 */
-	public function setForm( $form ) {
+	public function setForm($form) {
 		$this->form = $form;
 	}
 
@@ -295,7 +295,7 @@ 
 	/**
 	 * @param int|null $post_id
 	 */
-	public function setPostId( $post_id ) {
+	public function setPostId($post_id) {
 		$this->post_id = $post_id;
 	}
 
@@ -309,7 +309,7 @@ 
 	/**
 	 * @param string $context
 	 */
-	public function setContext( $context ) {
+	public function setContext($context) {
 		$this->context = $context;
 	}
 
@@ -317,12 +317,12 @@ 
 	 * @param string|null $key The key to a specific field in the fields array
 	 * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
 	 */
-	public function getFields( $key = null ) {
+	public function getFields($key = null) {
 
-		$fields = empty( $this->fields ) ? NULL : $this->fields;
+		$fields = empty($this->fields) ? NULL : $this->fields;
 
-		if( $fields && !empty( $key ) ) {
-			$fields = isset( $fields[ $key ] ) ? $fields[ $key ] : NULL;
+		if ($fields && !empty($key)) {
+			$fields = isset($fields[$key]) ? $fields[$key] : NULL;
 		}
 
 		return $fields;
@@ -331,7 +331,7 @@ 
 	/**
 	 * @param array $fields
 	 */
-	public function setFields( $fields ) {
+	public function setFields($fields) {
 		$this->fields = $fields;
 	}
 
@@ -339,11 +339,11 @@ 
 	 * @param string $key The key to a specific field in the fields array
 	 * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
 	 */
-	public function getField( $key ) {
+	public function getField($key) {
 
-		if( !empty( $key ) ) {
-			if( isset( $this->fields[ $key ] ) ) {
-				return $this->fields[ $key ];
+		if (!empty($key)) {
+			if (isset($this->fields[$key])) {
+				return $this->fields[$key];
 			}
 		}
 
@@ -354,22 +354,22 @@ 
 	 * @param string $key The key to a specific field in the fields array
 	 * @param mixed $value The value to set for the field
 	 */
-	public function setField( $key, $value ) {
-		$this->fields[ $key ] = $value;
+	public function setField($key, $value) {
+		$this->fields[$key] = $value;
 	}
 
 	/**
 	 * @return int
 	 */
 	public function getViewId() {
-		return absint( $this->view_id );
+		return absint($this->view_id);
 	}
 
 	/**
 	 * @param int $view_id
 	 */
-	public function setViewId( $view_id ) {
-		$this->view_id = intval( $view_id );
+	public function setViewId($view_id) {
+		$this->view_id = intval($view_id);
 	}
 
 	/**
@@ -382,7 +382,7 @@ 
 	/**
 	 * @param int $form_id
 	 */
-	public function setFormId( $form_id ) {
+	public function setFormId($form_id) {
 		$this->form_id = $form_id;
 	}
 
@@ -396,7 +396,7 @@ 
 	/**
 	 * @param array $entries
 	 */
-	public function setEntries( $entries ) {
+	public function setEntries($entries) {
 		$this->entries = $entries;
 	}
 
@@ -410,8 +410,8 @@ 
 	/**
 	 * @param int $total_entries
 	 */
-	public function setTotalEntries( $total_entries ) {
-		$this->total_entries = intval( $total_entries );
+	public function setTotalEntries($total_entries) {
+		$this->total_entries = intval($total_entries);
 	}
 
 	/**
@@ -424,7 +424,7 @@ 
 	/**
 	 * @param array $paging
 	 */
-	public function setPaging( $paging ) {
+	public function setPaging($paging) {
 		$this->paging = $paging;
 	}
 
@@ -446,25 +446,25 @@ 
 		$page_size = $paging['page_size'];
 		$total = $this->getTotalEntries();
 
-		if ( empty( $total ) ) {
-			do_action( 'gravityview_log_debug', __METHOD__ . ': No entries. Returning empty array.' );
+		if (empty($total)) {
+			do_action('gravityview_log_debug', __METHOD__.': No entries. Returning empty array.');
 
 			return array();
 		}
 
-		$first = empty( $offset ) ? 1 : $offset + 1;
+		$first = empty($offset) ? 1 : $offset + 1;
 
 		// If the page size + starting entry is larger than total, the total is the max.
-		$last = ( $offset + $page_size > $total ) ? $total : $offset + $page_size;
+		$last = ($offset + $page_size > $total) ? $total : $offset + $page_size;
 
 		/**
 		 * @filter `gravityview_pagination_counts` Modify the displayed pagination numbers
 		 * @since 1.13
 		 * @param array $counts Array with $first, $last, $total numbers in that order
 		 */
-		list( $first, $last, $total ) = apply_filters( 'gravityview_pagination_counts', array( $first, $last, $total ) );
+		list($first, $last, $total) = apply_filters('gravityview_pagination_counts', array($first, $last, $total));
 
-		return array( 'first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total );
+		return array('first' => (int)$first, 'last' => (int)$last, 'total' => (int)$total);
 	}
 
 	/**
@@ -477,7 +477,7 @@ 
 	/**
 	 * @param array $sorting
 	 */
-	public function setSorting( $sorting ) {
+	public function setSorting($sorting) {
 		$this->sorting = $sorting;
 	}
 
@@ -486,9 +486,9 @@ 
 	 */
 	public function getBackLinkLabel() {
 
-		$back_link_label = GravityView_API::replace_variables( $this->back_link_label, $this->getForm(), $this->getCurrentEntry() );
+		$back_link_label = GravityView_API::replace_variables($this->back_link_label, $this->getForm(), $this->getCurrentEntry());
 
-		$back_link_label = do_shortcode( $back_link_label );
+		$back_link_label = do_shortcode($back_link_label);
 
 		return $back_link_label;
 	}
@@ -496,7 +496,7 @@ 
 	/**
 	 * @param string $back_link_label
 	 */
-	public function setBackLinkLabel( $back_link_label ) {
+	public function setBackLinkLabel($back_link_label) {
 		$this->back_link_label = $back_link_label;
 	}
 
@@ -510,7 +510,7 @@ 
 	/**
 	 * @param boolean $hide_until_searched
 	 */
-	public function setHideUntilSearched( $hide_until_searched ) {
+	public function setHideUntilSearched($hide_until_searched) {
 		$this->hide_until_searched = $hide_until_searched;
 	}
 
@@ -524,7 +524,7 @@ 
 	/**
 	 * @param string $template_part_slug
 	 */
-	public function setTemplatePartSlug( $template_part_slug ) {
+	public function setTemplatePartSlug($template_part_slug) {
 		$this->template_part_slug = $template_part_slug;
 	}
 
@@ -538,7 +538,7 @@ 
 	/**
 	 * @param string $template_part_name
 	 */
-	public function setTemplatePartName( $template_part_name ) {
+	public function setTemplatePartName($template_part_name) {
 		$this->template_part_name = $template_part_name;
 	}
 
@@ -548,7 +548,7 @@ 
 	 */
 	public function getCurrentEntry() {
 
-		if( in_array( $this->getContext(), array( 'edit', 'single') ) ) {
+		if (in_array($this->getContext(), array('edit', 'single'))) {
 			$entries = $this->getEntries();
 			return $entries[0];
 		}
@@ -560,7 +560,7 @@ 
 	 * @param array $current_entry
 	 * @return void
 	 */
-	public function setCurrentEntry( $current_entry ) {
+	public function setCurrentEntry($current_entry) {
 		$this->_current_entry = $current_entry;
 	}
 
@@ -582,9 +582,9 @@ 
 	 *
 	 * @return string|null
 	 */
-	public function renderZone( $zone = '', $atts = array() ) {
+	public function renderZone($zone = '', $atts = array()) {
 
-		if( empty( $zone ) ) {
+		if (empty($zone)) {
 			do_action('gravityview_log_error', 'GravityView_View[renderZone] No zone defined.');
 			return NULL;
 		}
@@ -597,32 +597,32 @@ 
 			'hide_empty' => $this->getAtts('hide_empty'),
 		);
 
-		$final_atts = wp_parse_args( $atts, $defaults );
+		$final_atts = wp_parse_args($atts, $defaults);
 
 		$output = '';
 
 		$final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}";
 
-		$fields = $this->getField( $final_atts['zone_id'] );
+		$fields = $this->getField($final_atts['zone_id']);
 
 		// Backward compatibility
-		if( 'table' === $this->getTemplatePartSlug() ) {
+		if ('table' === $this->getTemplatePartSlug()) {
 			/**
 			 * Modify the fields displayed in the table
 			 * @var array
 			 */
-			$fields = apply_filters("gravityview_table_cells", $fields, $this );
+			$fields = apply_filters("gravityview_table_cells", $fields, $this);
 		}
 
-		if( empty( $fields ) ) {
+		if (empty($fields)) {
 			return NULL;
 		}
 
 		$field_output = '';
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 			$final_atts['field'] = $field;
 
-			$field_output .= gravityview_field_output( $final_atts );
+			$field_output .= gravityview_field_output($final_atts);
 		}
 
 		/**
@@ -631,17 +631,17 @@ 
 		 * @since 1.7.6
 		 * @param boolean $hide_empty_zone Default: false
 		 */
-		if( empty( $field_output ) && apply_filters( 'gravityview/render/hide-empty-zone', false ) ) {
+		if (empty($field_output) && apply_filters('gravityview/render/hide-empty-zone', false)) {
 			return NULL;
 		}
 
-		if( !empty( $final_atts['wrapper_class'] ) ) {
-			$output .= '<div class="'.gravityview_sanitize_html_class( $final_atts['wrapper_class'] ).'">';
+		if (!empty($final_atts['wrapper_class'])) {
+			$output .= '<div class="'.gravityview_sanitize_html_class($final_atts['wrapper_class']).'">';
 		}
 
 		$output .= $field_output;
 
-		if( !empty( $final_atts['wrapper_class'] ) ) {
+		if (!empty($final_atts['wrapper_class'])) {
 			$output .= '</div>';
 		}
 
@@ -659,24 +659,24 @@ 
 	 * @see Gamajo_Template_Loader::locate_template()
 	 * @return null|string NULL: Template not found; String: path to template
 	 */
-	function locate_template( $template_names, $load = false, $require_once = true ) {
+	function locate_template($template_names, $load = false, $require_once = true) {
 
-		if( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
+		if (is_string($template_names) && isset($this->located_templates[$template_names])) {
 
-			$located = $this->located_templates[ $template_names ];
+			$located = $this->located_templates[$template_names];
 
 		} else {
 
 			// Set $load to always falso so we handle it here.
-			$located = parent::locate_template( $template_names, false, $require_once );
+			$located = parent::locate_template($template_names, false, $require_once);
 
-			if( is_string( $template_names ) ) {
-				$this->located_templates[ $template_names ] = $located;
+			if (is_string($template_names)) {
+				$this->located_templates[$template_names] = $located;
 			}
 		}
 
-		if ( $load && $located ) {
-			load_template( $located, $require_once );
+		if ($load && $located) {
+			load_template($located, $require_once);
 		}
 
 		return $located;
@@ -687,8 +687,8 @@ 
 	 * @param  string      $name Key for the data retrieval.
 	 * @return mixed|null    The stored data.
 	 */
-	public function __get( $name ) {
-		if( isset( $this->{$name} ) ) {
+	public function __get($name) {
+		if (isset($this->{$name} )) {
 			return $this->{$name};
 		} else {
 			return NULL;
@@ -712,47 +712,47 @@ 
 	 *
 	 * @return array $templates Modified template array, merged with existing $templates values
 	 */
-	function add_id_specific_templates( $templates, $slug, $name ) {
+	function add_id_specific_templates($templates, $slug, $name) {
 
 		$additional = array();
 
 		// form-19-table-body.php
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
+		$additional[] = sprintf('form-%d-%s-%s.php', $this->getFormId(), $slug, $name);
 
 		// view-3-table-body.php
-		$additional[] = sprintf( 'view-%d-%s-%s.php', $this->getViewId(), $slug, $name );
+		$additional[] = sprintf('view-%d-%s-%s.php', $this->getViewId(), $slug, $name);
 
-		if( $this->getPostId() ) {
+		if ($this->getPostId()) {
 
 			// page-19-table-body.php
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
+			$additional[] = sprintf('page-%d-%s-%s.php', $this->getPostId(), $slug, $name);
 		}
 
 		// Combine with existing table-body.php and table.php
-		$templates = array_merge( $additional, $templates );
+		$templates = array_merge($additional, $templates);
 
-		do_action( 'gravityview_log_debug', '[add_id_specific_templates] List of Template Files', $templates );
+		do_action('gravityview_log_debug', '[add_id_specific_templates] List of Template Files', $templates);
 
 		return $templates;
 	}
 
 	// Load the template
-	public function render( $slug, $name, $require_once = true ) {
+	public function render($slug, $name, $require_once = true) {
 
-		$this->setTemplatePartSlug( $slug );
+		$this->setTemplatePartSlug($slug);
 
-		$this->setTemplatePartName( $name );
+		$this->setTemplatePartName($name);
 
-		$template_file = $this->get_template_part( $slug, $name, false );
+		$template_file = $this->get_template_part($slug, $name, false);
 
-		do_action( 'gravityview_log_debug', '[render] Rendering Template File', $template_file );
+		do_action('gravityview_log_debug', '[render] Rendering Template File', $template_file);
 
-		if( !empty( $template_file) ) {
+		if (!empty($template_file)) {
 
-			if ( $require_once ) {
-				require_once( $template_file );
+			if ($require_once) {
+				require_once($template_file);
 			} else {
-				require( $template_file );
+				require($template_file);
 			}
 
 		}
@@ -762,24 +762,24 @@ 
 	 *
 	 * @param $view_id
 	 */
-	public function render_widget_hooks( $view_id ) {
+	public function render_widget_hooks($view_id) {
 
-		if( empty( $view_id ) || 'single' == gravityview_get_context() ) {
-			do_action( 'gravityview_log_debug', __METHOD__ . ' - Not rendering widgets; single entry' );
+		if (empty($view_id) || 'single' == gravityview_get_context()) {
+			do_action('gravityview_log_debug', __METHOD__.' - Not rendering widgets; single entry');
 			return;
 		}
 
-		$view_data = gravityview_get_current_view_data( $view_id );
+		$view_data = gravityview_get_current_view_data($view_id);
 
 		// TODO: Move to sep. method, use an action instead
-		wp_enqueue_style( 'gravityview_default_style');
+		wp_enqueue_style('gravityview_default_style');
 
 		// get View widget configuration
 		$widgets = $view_data['widgets'];
 
 		$rows = GravityView_Plugin::get_default_widget_areas();
 
-		switch( current_filter() ) {
+		switch (current_filter()) {
 			case 'gravityview_before':
 				$zone = 'header';
 				break;
@@ -789,8 +789,8 @@ 
 		}
 
 		// Prevent being called twice
-		if( did_action( $zone.'_'.$view_id.'_widgets' ) ) {
-			do_action( 'gravityview_log_debug', sprintf( '%s - Not rendering %s; already rendered', __METHOD__ , $zone.'_'.$view_id.'_widgets' ) );
+		if (did_action($zone.'_'.$view_id.'_widgets')) {
+			do_action('gravityview_log_debug', sprintf('%s - Not rendering %s; already rendered', __METHOD__, $zone.'_'.$view_id.'_widgets'));
 			return;
 		}
 
@@ -798,17 +798,17 @@ 
 		?>
 		<div class="gv-grid">
 			<?php
-			foreach( $rows as $row ) {
-				foreach( $row as $col => $areas ) {
+			foreach ($rows as $row) {
+				foreach ($row as $col => $areas) {
 					$column = ($col == '2-2') ? '1-2 gv-right' : $col.' gv-left';
 				?>
-					<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
+					<div class="gv-grid-col-<?php echo esc_attr($column); ?>">
 						<?php
-						if( !empty( $areas ) ) {
-							foreach( $areas as $area ) {
-								if( !empty( $widgets[ $zone .'_'. $area['areaid'] ] ) ) {
-									foreach( $widgets[ $zone .'_'. $area['areaid'] ] as $widget ) {
-										do_action( "gravityview_render_widget_{$widget['id']}", $widget );
+						if (!empty($areas)) {
+							foreach ($areas as $area) {
+								if (!empty($widgets[$zone.'_'.$area['areaid']])) {
+									foreach ($widgets[$zone.'_'.$area['areaid']] as $widget) {
+										do_action("gravityview_render_widget_{$widget['id']}", $widget);
 									}
 								}
 							}
@@ -824,8 +824,8 @@ 
 		 * Prevent widgets from being called twice.
 		 * Checking for loop_start prevents themes and plugins that pre-process shortcodes from triggering the action before displaying. Like, ahem, the Divi theme and WordPress SEO plugin
 		 */
-		if( did_action( 'loop_start' ) ) {
-			do_action( $zone.'_'.$view_id.'_widgets' );
+		if (did_action('loop_start')) {
+			do_action($zone.'_'.$view_id.'_widgets');
 		}
 	}