gravityview / GravityView

future/includes/class-gv-collection-view.php

Spacing +4 added lines, -4 removed lines

@@ -114,7 +114,7 @@ 
 			 * @deprecated
 			 * @see The `gravityview/view_collection/from_post/meta_keys` filter.
 			 */
-			$meta_keys = (array) apply_filters_deprecated( 'gravityview/data/parse/meta_keys', array( $meta_keys, $post->ID ), '2.0.7', 'gravityview/view_collection/from_post/meta_keys' );
+			$meta_keys = (array)apply_filters_deprecated( 'gravityview/data/parse/meta_keys', array( $meta_keys, $post->ID ), '2.0.7', 'gravityview/view_collection/from_post/meta_keys' );
 
 			/** What about inside post meta values? */
 			foreach ( $meta_keys as $meta_key ) {
@@ -168,12 +168,12 @@ 
 
 		/** Let's find us some [gravityview] shortcodes perhaps. */
 		foreach ( Shortcode::parse( $content ) as $shortcode ) {
-			if ( $shortcode->name != 'gravityview' || empty( $shortcode->atts['id'] ) ) {
+			if ( $shortcode->name != 'gravityview' || empty( $shortcode->atts[ 'id' ] ) ) {
 				continue;
 			}
 
-			if ( is_numeric( $shortcode->atts['id'] ) ) {
-				$view = View::by_id( $shortcode->atts['id'] );
+			if ( is_numeric( $shortcode->atts[ 'id' ] ) ) {
+				$view = View::by_id( $shortcode->atts[ 'id' ] );
 				if ( ! $view ) {
 					continue;
 				}

includes/class-gravityview-admin-notices.php

Spacing +23 added lines, -23 removed lines

@@ -60,21 +60,21 @@ 
 	public function dismiss_notice() {
 
 		// No dismiss sent
-		if( empty( $_GET['gv-dismiss'] ) || empty( $_GET['notice'] ) ) {
+		if ( empty( $_GET[ 'gv-dismiss' ] ) || empty( $_GET[ 'notice' ] ) ) {
 			return;
 		}
 
 		// Invalid nonce
-		if( !wp_verify_nonce( $_GET['gv-dismiss'], 'dismiss' ) ) {
+		if ( ! wp_verify_nonce( $_GET[ 'gv-dismiss' ], 'dismiss' ) ) {
 			return;
 		}
 
-		$notice_id = esc_attr( $_GET['notice'] );
+		$notice_id = esc_attr( $_GET[ 'notice' ] );
 
 		//don't display a message if use has dismissed the message for this version
 		$dismissed_notices = (array)get_transient( 'gravityview_dismissed_notices' );
 
-		$dismissed_notices[] = $notice_id;
+		$dismissed_notices[ ] = $notice_id;
 
 		$dismissed_notices = array_unique( $dismissed_notices );
 
@@ -97,12 +97,12 @@ 
 	private function is_notice_dismissed( $notice ) {
 
 		// There are no dismissed notices.
-		if( empty( self::$dismissed_notices ) ) {
+		if ( empty( self::$dismissed_notices ) ) {
 			return false;
 		}
 
 		// Has the
-		$is_dismissed = !empty( $notice['dismiss'] ) && in_array( $notice['dismiss'], self::$dismissed_notices );
+		$is_dismissed = ! empty( $notice[ 'dismiss' ] ) && in_array( $notice[ 'dismiss' ], self::$dismissed_notices );
 
 		return $is_dismissed ? true : false;
 	}
@@ -127,7 +127,7 @@ 
 	 */
 	private function check_show_multisite_notices() {
 
-		if( ! is_multisite() ) {
+		if ( ! is_multisite() ) {
 			return true;
 		}
 
@@ -137,7 +137,7 @@ 
 		}
 
 		// or they don't have admin capabilities
-		if( ! is_super_admin() ) {
+		if ( ! is_super_admin() ) {
 			return false;
 		}
 
@@ -160,48 +160,48 @@ 
 		 */
 		$notices = apply_filters( 'gravityview/admin/notices', self::$admin_notices );
 
-		if( empty( $notices ) || ! $this->check_show_multisite_notices() ) {
+		if ( empty( $notices ) || ! $this->check_show_multisite_notices() ) {
 			return;
 		}
 
 		//don't display a message if use has dismissed the message for this version
 		// TODO: Use get_user_meta instead of get_transient
-		self::$dismissed_notices = isset( $_GET['show-dismissed-notices'] ) ? array() : (array)get_transient( 'gravityview_dismissed_notices' );
+		self::$dismissed_notices = isset( $_GET[ 'show-dismissed-notices' ] ) ? array() : (array)get_transient( 'gravityview_dismissed_notices' );
 
 		$output = '';
 
-		foreach( $notices as $notice ) {
+		foreach ( $notices as $notice ) {
 
 			// If the user doesn't have the capability to see the warning
-			if( isset( $notice['cap'] ) && false === GVCommon::has_cap( $notice['cap'] ) ) {
+			if ( isset( $notice[ 'cap' ] ) && false === GVCommon::has_cap( $notice[ 'cap' ] ) ) {
 				gravityview()->log->debug( 'Notice not shown because user does not have the capability to view it.', array( 'data' => $notice ) );
 				continue;
 			}
 
-			if( true === $this->is_notice_dismissed( $notice ) ) {
+			if ( true === $this->is_notice_dismissed( $notice ) ) {
 				gravityview()->log->debug( 'Notice not shown because the notice has already been dismissed.', array( 'data' => $notice ) );
 				continue;
 			}
 
-			$output .= '<div id="message" style="position:relative" class="notice '. gravityview_sanitize_html_class( $notice['class'] ).'">';
+			$output .= '<div id="message" style="position:relative" class="notice ' . gravityview_sanitize_html_class( $notice[ 'class' ] ) . '">';
 
 			// Too cute to leave out.
 			$output .= gravityview_get_floaty();
 
-			if( !empty( $notice['title'] ) ) {
-				$output .= '<h3>'.esc_html( $notice['title'] ) .'</h3>';
+			if ( ! empty( $notice[ 'title' ] ) ) {
+				$output .= '<h3>' . esc_html( $notice[ 'title' ] ) . '</h3>';
 			}
 
-			$message = isset( $notice['message'] ) ? $notice['message'] : '';
+			$message = isset( $notice[ 'message' ] ) ? $notice[ 'message' ] : '';
 
-			if( !empty( $notice['dismiss'] ) ) {
+			if ( ! empty( $notice[ 'dismiss' ] ) ) {
 
-				$dismiss = esc_attr($notice['dismiss']);
+				$dismiss = esc_attr( $notice[ 'dismiss' ] );
 
 				$url = esc_url( add_query_arg( array( 'gv-dismiss' => wp_create_nonce( 'dismiss' ), 'notice' => $dismiss ) ) );
 
 				$align = is_rtl() ? 'alignleft' : 'alignright';
-				$message .= '<a href="'.$url.'" data-notice="'.$dismiss.'" class="' . $align . ' button button-link">'.esc_html__('Dismiss', 'gravityview' ).'</a></p>';
+				$message .= '<a href="' . $url . '" data-notice="' . $dismiss . '" class="' . $align . ' button button-link">' . esc_html__( 'Dismiss', 'gravityview' ) . '</a></p>';
 			}
 
 			$output .= wpautop( $message );
@@ -233,14 +233,14 @@ 
 	 */
 	public static function add_notice( $notice = array() ) {
 
-		if( !isset( $notice['message'] ) ) {
+		if ( ! isset( $notice[ 'message' ] ) ) {
 			gravityview()->log->error( 'Notice not set', array( 'data' => $notice ) );
 			return;
 		}
 
-		$notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class'];
+		$notice[ 'class' ] = empty( $notice[ 'class' ] ) ? 'error' : $notice[ 'class' ];
 
-		self::$admin_notices[] = $notice;
+		self::$admin_notices[ ] = $notice;
 	}
 }
 

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

Doc Comments +6 added lines, -3 removed lines

@@ -64,6 +64,9 @@ 
     }
 
 
+    /**
+     * @param string $component
+     */
     private function load_components( $component ) {
 
         $dir = trailingslashit( self::$file );
@@ -104,7 +107,7 @@ 
 	 *
 	 * @param array $args Existing reserved args
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	public function add_reserved_arg( $args ) {
 
@@ -200,7 +203,7 @@ 
      * "You can edit this post from the post page" fields, for example.
      *
      * @param $entry array Gravity Forms entry object
-     * @param $view_id int GravityView view id
+     * @param integer $view_id int GravityView view id
      * @param $post_id int GravityView Post ID where View may be embedded {@since 1.9.2}
      * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ }
      * @return string
@@ -303,7 +306,7 @@ 
      * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_entry for maximum security!!
      *
      * @param  array $entry Gravity Forms entry array
-     * @param \GV\View|int $view ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0
+     * @param integer $view ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0
      * @return bool
      */
     public static function check_user_cap_edit_entry( $entry, $view = 0 ) {

Indentation +157 added lines, -157 removed lines

@@ -18,84 +18,84 @@ 
 
 class GravityView_Edit_Entry {
 
-    /**
-     * @var string
-     */
+	/**
+	 * @var string
+	 */
 	static $file;
 
 	static $instance;
 
-    /**
-     * Component instances.
-     * @var array
-     */
-    public $instances = array();
+	/**
+	 * Component instances.
+	 * @var array
+	 */
+	public $instances = array();
 
 
 	function __construct() {
 
-        self::$file = plugin_dir_path( __FILE__ );
+		self::$file = plugin_dir_path( __FILE__ );
 
-        if( is_admin() ) {
-            $this->load_components( 'admin' );
-        }
+		if( is_admin() ) {
+			$this->load_components( 'admin' );
+		}
 
 		$this->load_components( 'locking' );
 
-        $this->load_components( 'render' );
+		$this->load_components( 'render' );
 
-        // If GF User Registration Add-on exists
-        $this->load_components( 'user-registration' );
+		// If GF User Registration Add-on exists
+		$this->load_components( 'user-registration' );
 
-        $this->add_hooks();
+		$this->add_hooks();
 
 		// Process hooks for addons that may or may not be present
 		$this->addon_specific_hooks();
 	}
 
 
-    static function getInstance() {
+	static function getInstance() {
 
-        if( empty( self::$instance ) ) {
-            self::$instance = new GravityView_Edit_Entry;
-        }
+		if( empty( self::$instance ) ) {
+			self::$instance = new GravityView_Edit_Entry;
+		}
 
-        return self::$instance;
-    }
+		return self::$instance;
+	}
 
 
-    private function load_components( $component ) {
+	private function load_components( $component ) {
 
-        $dir = trailingslashit( self::$file );
+		$dir = trailingslashit( self::$file );
 
-        $filename  = $dir . 'class-edit-entry-' . $component . '.php';
-        $classname = 'GravityView_Edit_Entry_' . str_replace( ' ', '_', ucwords( str_replace( '-', ' ', $component ) ) );
+		$filename  = $dir . 'class-edit-entry-' . $component . '.php';
+		$classname = 'GravityView_Edit_Entry_' . str_replace( ' ', '_', ucwords( str_replace( '-', ' ', $component ) ) );
 
-        // Loads component and pass extension's instance so that component can
-        // talk each other.
-        require_once $filename;
-        $this->instances[ $component ] = new $classname( $this );
-        $this->instances[ $component ]->load();
+		// Loads component and pass extension's instance so that component can
+		// talk each other.
+		require_once $filename;
+		$this->instances[ $component ] = new $classname( $this );
+		$this->instances[ $component ]->load();
 
-    }
+	}
 
-    private function add_hooks() {
+	private function add_hooks() {
 
-        // Add front-end access to Gravity Forms delete file action
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
+		// Add front-end access to Gravity Forms delete file action
+		add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
 
-        // Make sure this hook is run for non-admins
-        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
+		// Make sure this hook is run for non-admins
+		add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
 
-        add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
+		add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
 
-        // add template path to check for field
-        add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
+		// add template path to check for field
+		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
 
 		add_filter( 'gravityview/field/is_visible', array( $this, 'maybe_not_visible' ), 10, 3 );
 
 		add_filter( 'gravityview/api/reserved_query_args', array( $this, 'add_reserved_arg' ) );
-    }
+	}
 
 	/**
 	 * Adds "edit" to the list of internal reserved query args
@@ -166,74 +166,74 @@ 
 		return false;
 	}
 
-    /**
-     * Include this extension templates path
-     * @param array $file_paths List of template paths ordered
-     */
-    public function add_template_path( $file_paths ) {
-
-        // Index 100 is the default GravityView template path.
-        $file_paths[ 110 ] = self::$file;
-
-        return $file_paths;
-    }
-
-    /**
-     *
-     * Return a well formatted nonce key according to GravityView Edit Entry protocol
-     *
-     * @param $view_id int GravityView view id
-     * @param $form_id int Gravity Forms form id
-     * @param $entry_id int Gravity Forms entry id
-     * @return string
-     */
-    public static function get_nonce_key( $view_id, $form_id, $entry_id ) {
-        return sprintf( 'edit_%d_%d_%d', $view_id, $form_id, $entry_id );
-    }
-
-
-    /**
-     * The edit entry link creates a secure link with a nonce
-     *
-     * It also mimics the URL structure Gravity Forms expects to have so that
-     * it formats the display of the edit form like it does in the backend, like
-     * "You can edit this post from the post page" fields, for example.
-     *
-     * @param $entry array Gravity Forms entry object
-     * @param $view_id int GravityView view id
-     * @param $post_id int GravityView Post ID where View may be embedded {@since 1.9.2}
-     * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ }
-     * @return string
-     */
-    public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
-
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
-
-        $base = gv_entry_link( $entry, $post_id ? : $view_id  );
-
-        $url = add_query_arg( array(
-            'edit' => wp_create_nonce( $nonce_key )
-        ), $base );
-
-        if( $post_id ) {
-	        $url = add_query_arg( array( 'gvid' => $view_id ), $url );
-        }
-
-	    /**
-	     * Allow passing params to dynamically populate entry with values
-	     * @since 1.9.2
-	     */
-	    if( !empty( $field_values ) ) {
-
-		    if( is_array( $field_values ) ) {
-			    // If already an array, no parse_str() needed
-			    $params = $field_values;
-		    } else {
-			    parse_str( $field_values, $params );
-		    }
-
-		    $url = add_query_arg( $params, $url );
-	    }
+	/**
+	 * Include this extension templates path
+	 * @param array $file_paths List of template paths ordered
+	 */
+	public function add_template_path( $file_paths ) {
+
+		// Index 100 is the default GravityView template path.
+		$file_paths[ 110 ] = self::$file;
+
+		return $file_paths;
+	}
+
+	/**
+	 *
+	 * Return a well formatted nonce key according to GravityView Edit Entry protocol
+	 *
+	 * @param $view_id int GravityView view id
+	 * @param $form_id int Gravity Forms form id
+	 * @param $entry_id int Gravity Forms entry id
+	 * @return string
+	 */
+	public static function get_nonce_key( $view_id, $form_id, $entry_id ) {
+		return sprintf( 'edit_%d_%d_%d', $view_id, $form_id, $entry_id );
+	}
+
+
+	/**
+	 * The edit entry link creates a secure link with a nonce
+	 *
+	 * It also mimics the URL structure Gravity Forms expects to have so that
+	 * it formats the display of the edit form like it does in the backend, like
+	 * "You can edit this post from the post page" fields, for example.
+	 *
+	 * @param $entry array Gravity Forms entry object
+	 * @param $view_id int GravityView view id
+	 * @param $post_id int GravityView Post ID where View may be embedded {@since 1.9.2}
+	 * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ }
+	 * @return string
+	 */
+	public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
+
+		$nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
+
+		$base = gv_entry_link( $entry, $post_id ? : $view_id  );
+
+		$url = add_query_arg( array(
+			'edit' => wp_create_nonce( $nonce_key )
+		), $base );
+
+		if( $post_id ) {
+			$url = add_query_arg( array( 'gvid' => $view_id ), $url );
+		}
+
+		/**
+		 * Allow passing params to dynamically populate entry with values
+		 * @since 1.9.2
+		 */
+		if( !empty( $field_values ) ) {
+
+			if( is_array( $field_values ) ) {
+				// If already an array, no parse_str() needed
+				$params = $field_values;
+			} else {
+				parse_str( $field_values, $params );
+			}
+
+			$url = add_query_arg( $params, $url );
+		}
 
 		/**
 		 * @filter `gravityview/edit/link` Filter the edit URL link.
@@ -242,7 +242,7 @@ 
 		 * @param \GV\View $view The View.
 		 */
 		return apply_filters( 'gravityview/edit/link', $url, $entry, \GV\View::by_id( $view_id  ) );
-    }
+	}
 
 	/**
 	 * Edit mode doesn't allow certain field types.
@@ -297,19 +297,19 @@ 
 	}
 
 
-    /**
-     * checks if user has permissions to edit a specific entry
-     *
-     * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_entry for maximum security!!
-     *
-     * @param  array $entry Gravity Forms entry array
-     * @param \GV\View|int $view ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0
-     * @return bool
-     */
-    public static function check_user_cap_edit_entry( $entry, $view = 0 ) {
+	/**
+	 * checks if user has permissions to edit a specific entry
+	 *
+	 * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_entry for maximum security!!
+	 *
+	 * @param  array $entry Gravity Forms entry array
+	 * @param \GV\View|int $view ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0
+	 * @return bool
+	 */
+	public static function check_user_cap_edit_entry( $entry, $view = 0 ) {
 
-        // No permission by default
-        $user_can_edit = false;
+		// No permission by default
+		$user_can_edit = false;
 
 		// get user_edit setting
 		if ( empty( $view ) ) {
@@ -327,60 +327,60 @@ 
 			$user_edit = GVCommon::get_template_setting( $view_id, 'user_edit' );
 		}
 
-        // If they can edit any entries (as defined in Gravity Forms)
-        // Or if they can edit other people's entries
-        // Then we're good.
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
+		// If they can edit any entries (as defined in Gravity Forms)
+		// Or if they can edit other people's entries
+		// Then we're good.
+		if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
 
-            gravityview()->log->debug( 'User has ability to edit all entries.' );
+			gravityview()->log->debug( 'User has ability to edit all entries.' );
 
-            $user_can_edit = true;
+			$user_can_edit = true;
 
-        } else if( !isset( $entry['created_by'] ) ) {
+		} else if( !isset( $entry['created_by'] ) ) {
 
-            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
+			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
 
-            $user_can_edit = false;
+			$user_can_edit = false;
 
-        } else {
+		} else {
 
-            $current_user = wp_get_current_user();
+			$current_user = wp_get_current_user();
 
-            // User edit is disabled
-            if( empty( $user_edit ) ) {
+			// User edit is disabled
+			if( empty( $user_edit ) ) {
 
-                gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
+				gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
 
-                $user_can_edit = false;
-            }
+				$user_can_edit = false;
+			}
 
-            // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
+			// User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
+			else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
 
-                gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
+				gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
 
-                $user_can_edit = true;
+				$user_can_edit = true;
 
-            } else if( ! is_user_logged_in() ) {
+			} else if( ! is_user_logged_in() ) {
 
-                gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
+				gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
 
-	            $user_can_edit = false; // Here just for clarity
-            }
+				$user_can_edit = false; // Here just for clarity
+			}
 
-        }
+		}
 
-        /**
-         * @filter `gravityview/edit_entry/user_can_edit_entry` Modify whether user can edit an entry.
-         * @since 1.15 Added `$entry` and `$view_id` parameters
-         * @param[in,out] boolean $user_can_edit Can the current user edit the current entry? (Default: false)
-         * @param[in] array $entry Gravity Forms entry array {@since 1.15}
-         * @param[in] int $view_id ID of the view you want to check visibility against {@since 1.15}
-         */
-        $user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
+		/**
+		 * @filter `gravityview/edit_entry/user_can_edit_entry` Modify whether user can edit an entry.
+		 * @since 1.15 Added `$entry` and `$view_id` parameters
+		 * @param[in,out] boolean $user_can_edit Can the current user edit the current entry? (Default: false)
+		 * @param[in] array $entry Gravity Forms entry array {@since 1.15}
+		 * @param[in] int $view_id ID of the view you want to check visibility against {@since 1.15}
+		 */
+		$user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
 
-        return (bool) $user_can_edit;
-    }
+		return (bool) $user_can_edit;
+	}
 
 
 

Spacing +21 added lines, -21 removed lines

@@ -36,7 +36,7 @@ 
 
         self::$file = plugin_dir_path( __FILE__ );
 
-        if( is_admin() ) {
+        if ( is_admin() ) {
             $this->load_components( 'admin' );
         }
 
@@ -56,7 +56,7 @@ 
 
     static function getInstance() {
 
-        if( empty( self::$instance ) ) {
+        if ( empty( self::$instance ) ) {
             self::$instance = new GravityView_Edit_Entry;
         }
 
@@ -82,10 +82,10 @@ 
     private function add_hooks() {
 
         // Add front-end access to Gravity Forms delete file action
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
+        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file' ) );
 
         // Make sure this hook is run for non-admins
-        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
+        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file' ) );
 
         add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
 
@@ -108,7 +108,7 @@ 
 	 */
 	public function add_reserved_arg( $args ) {
 
-		$args[] = 'edit';
+		$args[ ] = 'edit';
 
 		return $args;
 	}
@@ -119,8 +119,8 @@ 
 	 */
 	private function addon_specific_hooks() {
 
-		if( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
-			add_filter('gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script'));
+		if ( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
+			add_filter( 'gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script' ) );
 		}
 
 	}
@@ -207,15 +207,15 @@ 
      */
     public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
 
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
+        $nonce_key = self::get_nonce_key( $view_id, $entry[ 'form_id' ], $entry[ 'id' ] );
 
-        $base = gv_entry_link( $entry, $post_id ? : $view_id  );
+        $base = gv_entry_link( $entry, $post_id ?: $view_id );
 
         $url = add_query_arg( array(
             'edit' => wp_create_nonce( $nonce_key )
         ), $base );
 
-        if( $post_id ) {
+        if ( $post_id ) {
 	        $url = add_query_arg( array( 'gvid' => $view_id ), $url );
         }
 
@@ -223,9 +223,9 @@ 
 	     * Allow passing params to dynamically populate entry with values
 	     * @since 1.9.2
 	     */
-	    if( !empty( $field_values ) ) {
+	    if ( ! empty( $field_values ) ) {
 
-		    if( is_array( $field_values ) ) {
+		    if ( is_array( $field_values ) ) {
 			    // If already an array, no parse_str() needed
 			    $params = $field_values;
 		    } else {
@@ -241,7 +241,7 @@ 
 		 * @param array $entry The entry.
 		 * @param \GV\View $view The View.
 		 */
-		return apply_filters( 'gravityview/edit/link', $url, $entry, \GV\View::by_id( $view_id  ) );
+		return apply_filters( 'gravityview/edit/link', $url, $entry, \GV\View::by_id( $view_id ) );
     }
 
 	/**
@@ -252,7 +252,7 @@ 
 	 */
 	public function modify_field_blacklist( $fields = array(), $context = NULL ) {
 
-		if( empty( $context ) || $context !== 'edit' ) {
+		if ( empty( $context ) || $context !== 'edit' ) {
 			return $fields;
 		}
 
@@ -330,15 +330,15 @@ 
         // If they can edit any entries (as defined in Gravity Forms)
         // Or if they can edit other people's entries
         // Then we're good.
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
+        if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry[ 'id' ] ) ) {
 
             gravityview()->log->debug( 'User has ability to edit all entries.' );
 
             $user_can_edit = true;
 
-        } else if( !isset( $entry['created_by'] ) ) {
+        } else if ( ! isset( $entry[ 'created_by' ] ) ) {
 
-            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
+            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
 
             $user_can_edit = false;
 
@@ -347,7 +347,7 @@ 
             $current_user = wp_get_current_user();
 
             // User edit is disabled
-            if( empty( $user_edit ) ) {
+            if ( empty( $user_edit ) ) {
 
                 gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
 
@@ -355,13 +355,13 @@ 
             }
 
             // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
+            else if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
 
                 gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
 
                 $user_can_edit = true;
 
-            } else if( ! is_user_logged_in() ) {
+            } else if ( ! is_user_logged_in() ) {
 
                 gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
 
@@ -379,7 +379,7 @@ 
          */
         $user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
 
-        return (bool) $user_can_edit;
+        return (bool)$user_can_edit;
     }
 
 

includes/fields/class-gravityview-field-sequence.php

Spacing +15 added lines, -15 removed lines

@@ -41,7 +41,7 @@ 
 		$this->label = esc_html__( 'Number Sequence', 'gravityview' );
 		$this->description = esc_html__( 'Display a sequential result number for each entry.', 'gravityview' );
 
-		add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'field_tooltips') );
+		add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'field_tooltips' ) );
 
 		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
 
@@ -65,7 +65,7 @@ 
 			return $entry_default_fields;
 		}
 
-		$entry_default_fields['sequence'] = array(
+		$entry_default_fields[ 'sequence' ] = array(
 			'label' => __( 'Result Number', 'gravityview' ),
 			'type'  => $this->name,
 			'desc'  => $this->description,
@@ -84,9 +84,9 @@ 
 
 		$return = $tooltips;
 
-		$return['reverse_sequence'] = array(
-			'title' => __('Reverse the order of the result numbers', 'gravityview'),
-			'value' => __('Output the number sequence in descending order. If enabled, numbers will count down from high to low.', 'gravityview'),
+		$return[ 'reverse_sequence' ] = array(
+			'title' => __( 'Reverse the order of the result numbers', 'gravityview' ),
+			'value' => __( 'Output the number sequence in descending order. If enabled, numbers will count down from high to low.', 'gravityview' ),
 		);
 
 		return $return;
@@ -94,13 +94,13 @@ 
 
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
-		unset ( $field_options['search_filter'] );
+		unset ( $field_options[ 'search_filter' ] );
 
 		$new_fields = array(
 			'start' => array(
 				'type' => 'number',
 				'label' => __( 'First Number in the Sequence', 'gravityview' ),
-				'desc' => __('For each entry, the displayed number will increase by one. When displaying ten entries, the first entry will display "1", and the last entry will show "10".', 'gravityview'),
+				'desc' => __( 'For each entry, the displayed number will increase by one. When displaying ten entries, the first entry will display "1", and the last entry will show "10".', 'gravityview' ),
 				'value' => '1',
 				'merge_tags' => false,
 			),
@@ -156,17 +156,17 @@ 
 		$return = $text;
 
 		$context = new \GV\Template_Context();
-		$context->view = \GV\View::by_id( $view_data['view_id'] );
+		$context->view = \GV\View::by_id( $view_data[ 'view_id' ] );
 		$context->entry = \GV\GF_Entry::from_entry( $entry );
 
 		$gv_field = \GV\Internal_Field::by_id( 'sequence' );
 		$merge_tag_context = \GV\Utils::get( $legacy_field, 'UID' );
-		$merge_tag_context = $entry['id'] . "/{$merge_tag_context}";
+		$merge_tag_context = $entry[ 'id' ] . "/{$merge_tag_context}";
 
 		foreach ( $matches as $match ) {
 
-			$full_tag = $match[0];
-			$property = $match[1];
+			$full_tag = $match[ 0 ];
+			$property = $match[ 1 ];
 
 			$gv_field->reverse = false;
 			$gv_field->start = 1;
@@ -185,12 +185,12 @@ 
 
 				// If there is a field with the ID of the start number, the merge tag won't work.
 				// In that case, you can use "=" instead: `{sequence start=10}`
-				if( 1 === sizeof( $maybe_start ) ) {
+				if ( 1 === sizeof( $maybe_start ) ) {
 					$maybe_start = explode( '=', $modifier );
 				}
 
 				if ( 'start' === rgar( $maybe_start, 0 ) && is_numeric( rgar( $maybe_start, 1 ) ) ) {
-					$gv_field->start = (int) rgar( $maybe_start, 1 );
+					$gv_field->start = (int)rgar( $maybe_start, 1 );
 				}
 			}
 
@@ -201,7 +201,7 @@ 
 			$merge_tag_context_modifiers = $merge_tag_context . '/' . var_export( $gv_field->reverse, true ) . '/' . $gv_field->start;
 
 			if ( ! isset( $merge_tag_sequences[ $merge_tag_context_modifiers ] ) ) {
-				$gv_field->UID = $legacy_field['UID'] . '/' . var_export( $gv_field->reverse, true ) . '/' . $gv_field->start;
+				$gv_field->UID = $legacy_field[ 'UID' ] . '/' . var_export( $gv_field->reverse, true ) . '/' . $gv_field->start;
 				$context->field = $gv_field;
 				$sequence = $merge_tag_sequences[ $merge_tag_context_modifiers ] = $this->get_sequence( $context );
 			} else {
@@ -246,7 +246,7 @@ 
 			$total = $context->view->get_entries()->total();
 			remove_filter( 'gform_gf_query_sql', $callback );
 
-			unset( $sql_query['paginate'] );
+			unset( $sql_query[ 'paginate' ] );
 
 			global $wpdb;
 

includes/admin/metaboxes/views/select-template.php

Spacing +22 added lines, -22 removed lines

@@ -26,52 +26,52 @@
 
 <?php // list all the available templates (type= fresh or custom ) ?>
 <div class="gv-grid">
-	<?php foreach( $templates as $id => $template ) {
+	<?php foreach ( $templates as $id => $template ) {
 		$selected     = ( $id == $current_template ) ? ' gv-selected' : '';
-		$placeholder  = ! empty( $template['buy_source'] );
-		$is_included  = ! empty( $template['included'] );
+		$placeholder  = ! empty( $template[ 'buy_source' ] );
+		$is_included  = ! empty( $template[ 'included' ] );
 		$plugin_data  = GravityView_Admin_Installer::get_wp_plugins_data( \GV\Utils::get( $template, 'textdomain', '' ) );
 		$button_text  = empty( $plugin_data ) ? esc_html__( 'Install Layout', 'gravityview' ) : esc_html__( 'Activate & Select Layout', 'gravityview' );
 		$button_class = 'gv-layout-' . ( empty( $plugin_data ) ? 'install' : 'activate' );
-		$template_path = isset($plugin_data['path']) ? $plugin_data['path'] : '';
+		$template_path = isset( $plugin_data[ 'path' ] ) ? $plugin_data[ 'path' ] : '';
 
 		?>
 		<div class="gv-grid-col-1-4">
-			<div class="gv-view-types-module<?php echo $selected; if( $placeholder ) { echo ' gv-view-template-placeholder'; } ?>" data-filter="<?php echo esc_attr( $template['type'] ); ?>">
+			<div class="gv-view-types-module<?php echo $selected; if ( $placeholder ) { echo ' gv-view-template-placeholder'; } ?>" data-filter="<?php echo esc_attr( $template[ 'type' ] ); ?>">
 				<div class="gv-view-types-normal">
-					<img src="<?php echo esc_url( $template['logo'] ); ?>" alt="<?php echo esc_attr( $template['label'] ); ?>">
-					<h5><?php echo esc_html( $template['label'] ); ?></h5>
-					<p class="description"><?php echo esc_html( $template['description'] ); ?></p>
+					<img src="<?php echo esc_url( $template[ 'logo' ] ); ?>" alt="<?php echo esc_attr( $template[ 'label' ] ); ?>">
+					<h5><?php echo esc_html( $template[ 'label' ] ); ?></h5>
+					<p class="description"><?php echo esc_html( $template[ 'description' ] ); ?></p>
 				</div>
 				<div class="gv-view-types-hover">
 					<div>
 						<?php
-						if( $is_included ) {
+						if ( $is_included ) {
 						?>
 							<p><a href="<?php echo esc_url( admin_url( 'edit.php?post_type=gravityview&page=gv-admin-installer' ) ); ?>" class="button button-secondary button-hero <?php echo $button_class; ?>" rel="internal" data-template-path="<?php echo $template_path; ?>"><?php echo $button_text; ?></a></p>
-							<?php if( !empty( $template['license'] ) ) { ?>
-								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), esc_html( str_replace( ' ', '&nbsp;', $template['license'] ) ) ); ?></p>
+							<?php if ( ! empty( $template[ 'license' ] ) ) { ?>
+								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), esc_html( str_replace( ' ', '&nbsp;', $template[ 'license' ] ) ) ); ?></p>
 							<?php } ?>
 						<?php
-						} elseif( $placeholder ) {
-							$utm_string = '?utm_source=plugin&utm_medium=buy_now&utm_campaign=view_type&utm_term=' . urlencode( $template['license'] ) . '&utm_content=' . urlencode( $template['slug'] );
+						} elseif ( $placeholder ) {
+							$utm_string = '?utm_source=plugin&utm_medium=buy_now&utm_campaign=view_type&utm_term=' . urlencode( $template[ 'license' ] ) . '&utm_content=' . urlencode( $template[ 'slug' ] );
 							?>
-							<p><a href="<?php echo esc_url( $template['buy_source'] ); ?>" class="button button-primary button-hero" rel="noreferrer noopener external"><?php esc_html_e( 'Buy Now', 'gravityview'); ?></a></p>
+							<p><a href="<?php echo esc_url( $template[ 'buy_source' ] ); ?>" class="button button-primary button-hero" rel="noreferrer noopener external"><?php esc_html_e( 'Buy Now', 'gravityview' ); ?></a></p>
 
-							<?php if( !empty( $template['preview'] ) ) { ?>
-								<p><a href="<?php echo esc_url( $template['preview'] ); ?>" rel="noreferrer noopener external" class="button button-secondary"><i class="dashicons dashicons-external" style="vertical-align: middle;" title="<?php esc_html_e( 'View a live demo of this layout', 'gravityview'); ?>"></i> <?php esc_html_e( 'Try a demo', 'gravityview' ); ?></a></p>
+							<?php if ( ! empty( $template[ 'preview' ] ) ) { ?>
+								<p><a href="<?php echo esc_url( $template[ 'preview' ] ); ?>" rel="noreferrer noopener external" class="button button-secondary"><i class="dashicons dashicons-external" style="vertical-align: middle;" title="<?php esc_html_e( 'View a live demo of this layout', 'gravityview' ); ?>"></i> <?php esc_html_e( 'Try a demo', 'gravityview' ); ?></a></p>
 							<?php } ?>
 
-							<?php if( ! empty( $template['license'] ) ) { ?>
-								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), '<a href="https://gravityview.co/pricing/' . esc_attr( $utm_string ) . '" rel="noreferrer noopener external">' . esc_html( str_replace( ' ', '&nbsp;', $template['license'] ) ) . '</a>' ); ?></p>
+							<?php if ( ! empty( $template[ 'license' ] ) ) { ?>
+								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), '<a href="https://gravityview.co/pricing/' . esc_attr( $utm_string ) . '" rel="noreferrer noopener external">' . esc_html( str_replace( ' ', '&nbsp;', $template[ 'license' ] ) ) . '</a>' ); ?></p>
 							<?php } ?>
 						<?php }
 
-						if ($placeholder || $is_included) { ?> </div><div class="hidden"> <?php } ?>
+						if ( $placeholder || $is_included ) { ?> </div><div class="hidden"> <?php } ?>
 
-                        <p><a href="#gv_select_template" role="button" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview'); ?></a></p>
-                        <?php if( !empty( $template['preview'] ) ) { ?>
-                            <a href="<?php echo esc_url( $template['preview'] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview'); ?>"></i></a>
+                        <p><a href="#gv_select_template" role="button" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview' ); ?></a></p>
+                        <?php if ( ! empty( $template[ 'preview' ] ) ) { ?>
+                            <a href="<?php echo esc_url( $template[ 'preview' ] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview' ); ?>"></i></a>
                         <?php } ?>
 					</div>
 				</div>

includes/fields/class-gravityview-field-consent.php

Spacing +2 added lines, -2 removed lines

@@ -97,13 +97,13 @@
 		// Set the $_field_id var
 		$field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id );
 
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
 			$default = 'tick';
 		} else {
 			$default = 'both';
 		}
 
-		$field_options['choice_display'] = array(
+		$field_options[ 'choice_display' ] = array(
 			'type'    => 'radio',
 			'class'   => 'vertical',
 			'label'   => __( 'What should be displayed:', 'gravityview' ),

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

Spacing +18 added lines, -18 removed lines

@@ -14,42 +14,42 @@
 
 		$field_info_items = array();
 
-		if( !empty( $this->item['adminLabel'] ) ) {
-			$field_info_items[] = array(
-				'value' => sprintf( __('Admin Label: %s', 'gravityview' ), $this->item['adminLabel'] ),
+		if ( ! empty( $this->item[ 'adminLabel' ] ) ) {
+			$field_info_items[ ] = array(
+				'value' => sprintf( __( 'Admin Label: %s', 'gravityview' ), $this->item[ 'adminLabel' ] ),
 				'class'	=> 'gv-sublabel'
 			);
 		}
 
 		// Fields with IDs, not like Source URL or Entry ID
-		if( is_numeric( $this->id ) ) {
+		if ( is_numeric( $this->id ) ) {
 
-			$field_type_title = GFCommon::get_field_type_title( $this->item['input_type'] );
+			$field_type_title = GFCommon::get_field_type_title( $this->item[ 'input_type' ] );
 
-			if ( ! empty( $this->item['parent'] ) ) {
-				$field_info_items[] = array(
-					'value' => sprintf( esc_html__( 'Parent: %s', 'gravityview' ), esc_attr( $this->item['parent']['label'] ) ),
+			if ( ! empty( $this->item[ 'parent' ] ) ) {
+				$field_info_items[ ] = array(
+					'value' => sprintf( esc_html__( 'Parent: %s', 'gravityview' ), esc_attr( $this->item[ 'parent' ][ 'label' ] ) ),
 				);
 			}
 
-			$field_info_items[] = array(
-				'value' => sprintf( __('Type: %s', 'gravityview'), $field_type_title ),
-				'hide_in_picker' => ! empty( $this->item['parent'] ),
+			$field_info_items[ ] = array(
+				'value' => sprintf( __( 'Type: %s', 'gravityview' ), $field_type_title ),
+				'hide_in_picker' => ! empty( $this->item[ 'parent' ] ),
 			);
 
-			$field_info_items[] = array(
-				'value' => sprintf( __('Field ID: %s', 'gravityview'), $this->id ),
+			$field_info_items[ ] = array(
+				'value' => sprintf( __( 'Field ID: %s', 'gravityview' ), $this->id ),
 			);
 		}
 
-		if( !empty( $this->item['desc'] ) ) {
-			$field_info_items[] = array(
-				'value' => $this->item['desc']
+		if ( ! empty( $this->item[ 'desc' ] ) ) {
+			$field_info_items[ ] = array(
+				'value' => $this->item[ 'desc' ]
 			);
 		}
 
-		$field_info_items[] = array(
-			'value'          => sprintf( __('Form ID: %s', 'gravityview' ), $this->form_id ),
+		$field_info_items[ ] = array(
+			'value'          => sprintf( __( 'Form ID: %s', 'gravityview' ), $this->form_id ),
 			'hide_in_picker' => true,
 		);
 

includes/fields/class-gravityview-field-source-url.php

Spacing +6 added lines, -6 removed lines

@@ -29,24 +29,24 @@
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
 		// Don't link to entry; doesn't make sense.
-		unset( $field_options['show_as_link'] );
+		unset( $field_options[ 'show_as_link' ] );
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
 		$add_options = array();
-		$add_options['link_to_source'] = array(
+		$add_options[ 'link_to_source' ] = array(
 			'type' => 'checkbox',
 			'label' => __( 'Link to URL:', 'gravityview' ),
-			'desc' => __('Display as a link to the Source URL', 'gravityview'),
+			'desc' => __( 'Display as a link to the Source URL', 'gravityview' ),
 			'value' => false,
 			'merge_tags' => false,
 		);
-		$add_options['source_link_text'] = array(
+		$add_options[ 'source_link_text' ] = array(
 			'type' => 'text',
 			'label' => __( 'Link Text:', 'gravityview' ),
-			'desc' => __('Customize the link text. If empty, the link text will be the URL.', 'gravityview'),
+			'desc' => __( 'Customize the link text. If empty, the link text will be the URL.', 'gravityview' ),
 			'value' => NULL,
 			'merge_tags' => true,
 			'requires' => 'link_to_source',

includes/fields/class-gravityview-field-address.php

Spacing +27 added lines, -27 removed lines

@@ -68,8 +68,8 @@ 
 				continue;
 			}
 
-			$field_id = intval( floor( $search_field['key'] ) );
-			$input_id = gravityview_get_input_id_from_id( $search_field['key'] );
+			$field_id = intval( floor( $search_field[ 'key' ] ) );
+			$input_id = gravityview_get_input_id_from_id( $search_field[ 'key' ] );
 			$form = GravityView_View::getInstance()->getForm();
 
 			/** @type GF_Field_Address $address_field */
@@ -78,7 +78,7 @@ 
 			$choices = array();
 
 			$method_name = 'get_choices_' . self::get_input_type_from_input_id( $input_id );
-			if( method_exists( $this, $method_name ) ) {
+			if ( method_exists( $this, $method_name ) ) {
 				/**
 				 * @uses GravityView_Field_Address::get_choices_country()
 				 * @uses GravityView_Field_Address::get_choices_state()
@@ -86,12 +86,12 @@ 
 				$choices = $this->{$method_name}( $address_field, $form );
 			}
 
-			if( ! empty( $choices ) ) {
-				$search_field['choices'] = $choices;
-				$search_field['type'] = \GV\Utils::get( $search_field, 'input');
+			if ( ! empty( $choices ) ) {
+				$search_field[ 'choices' ] = $choices;
+				$search_field[ 'type' ] = \GV\Utils::get( $search_field, 'input' );
 			} else {
-				$search_field['type'] = 'text';
-				$search_field['input'] = 'input_text';
+				$search_field[ 'type' ] = 'text';
+				$search_field[ 'input' ] = 'input_text';
 			}
 		}
 
@@ -116,7 +116,7 @@ 
 		$country_choices = array();
 
 		foreach ( $countries as $key => $country ) {
-			$country_choices[] = array(
+			$country_choices[ ] = array(
 				'value' => $country,
 				'text' => $country,
 			);
@@ -141,7 +141,7 @@ 
 	 */
 	private function get_choices_state( $address_field, $form ) {
 
-		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form['id'] ) : $address_field->addressType;
+		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form[ 'id' ] ) : $address_field->addressType;
 
 		$state_choices = array();
 
@@ -153,8 +153,8 @@ 
 				$states = GFCommon::get_canadian_provinces();
 				break;
 			default:
-				$address_types = $address_field->get_address_types( $form['id'] );
-				$states = empty( $address_types[ $address_type ]['states'] ) ? array() : $address_types[ $address_type ]['states'];
+				$address_types = $address_field->get_address_types( $form[ 'id' ] );
+				$states = empty( $address_types[ $address_type ][ 'states' ] ) ? array() : $address_types[ $address_type ][ 'states' ];
 				break;
 		}
 
@@ -163,19 +163,19 @@ 
 				$state_subchoices = array();
 
 				foreach ( $state as $key => $substate ) {
-					$state_subchoices[] = array(
+					$state_subchoices[ ] = array(
 						'value' => is_numeric( $key ) ? $substate : $key,
 						'text' => $substate,
 					);
 				}
 
-				$state_choices[] = array(
+				$state_choices[ ] = array(
 					'text' => $key,
 					'value' => $state_subchoices,
 				);
 
 			} else {
-				$state_choices[] = array(
+				$state_choices[ ] = array(
 					'value' => is_numeric( $key ) ? $state : $key,
 					'text' => $state,
 				);
@@ -199,13 +199,13 @@ 
 		// Use the same inputs as the "text" input type allows
 		$text_inputs = \GV\Utils::get( $input_types, 'text' );
 
-		$input_types['street'] = $text_inputs;
-		$input_types['street2'] = $text_inputs;
-		$input_types['city'] = $text_inputs;
+		$input_types[ 'street' ] = $text_inputs;
+		$input_types[ 'street2' ] = $text_inputs;
+		$input_types[ 'city' ] = $text_inputs;
 
-		$input_types['state'] = array( 'select', 'radio', 'link' ) + $text_inputs;
-		$input_types['zip'] = array( 'input_text' );
-		$input_types['country'] = array( 'select', 'radio', 'link' ) + $text_inputs;
+		$input_types[ 'state' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
+		$input_types[ 'zip' ] = array( 'input_text' );
+		$input_types[ 'country' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
 
 		return $input_types;
 	}
@@ -226,12 +226,12 @@ 
 		// Is this search field for an input (eg: 4.2) or the whole address field (eg: 4)?
 		$input_id = gravityview_get_input_id_from_id( $field_id );
 
-		if( 'address' !== $field_type && $input_id ) {
+		if ( 'address' !== $field_type && $input_id ) {
 			return $input_type;
 		}
 
 		// If the input ID matches an expected address input, set to that. Otherwise, keep existing input type.
-		if( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
+		if ( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
 			$input_type = $address_field_name;
 		}
 
@@ -279,17 +279,17 @@ 
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
 		// If this is NOT the full address field, return default options.
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
 			return $field_options;
 		}
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
 		$add_options = array();
 
-		$add_options['show_map_link'] = array(
+		$add_options[ 'show_map_link' ] = array(
 			'type'       => 'checkbox',
 			'label'      => __( 'Show Map Link:', 'gravityview' ),
 			'desc'       => __( 'Display a "Map It" link below the address', 'gravityview' ),
@@ -301,7 +301,7 @@ 
 
 		$this->add_field_support( 'new_window', $add_options );
 
-		$add_options['new_window']['requires'] = 'show_map_link';
+		$add_options[ 'new_window' ][ 'requires' ] = 'show_map_link';
 
 		return $add_options + $field_options;
 	}