gravityview / GravityView

includes/class-gravityview-html-elements.php

Spacing +25 added lines, -25 removed lines

@@ -42,16 +42,16 @@ 
 
 		$args = wp_parse_args( $args, $defaults );
 
-		$forms = gravityview_get_forms( (bool) $args['active'], (bool) $args['trash'] );
+		$forms = gravityview_get_forms( (bool)$args[ 'active' ], (bool)$args[ 'trash' ] );
 
-		if( array() === $args['options'] ) {
+		if ( array() === $args[ 'options' ] ) {
 			foreach ( $forms as $form ) {
 
-				if ( in_array( $form['id'], $args['exclude'] ) ) {
+				if ( in_array( $form[ 'id' ], $args[ 'exclude' ] ) ) {
 					continue;
 				}
 
-				$args['options'][ $form['id'] ] = esc_html( $form['title'] );
+				$args[ 'options' ][ $form[ 'id' ] ] = esc_html( $form[ 'title' ] );
 			}
 		}
 
@@ -83,15 +83,15 @@ 
 
 		$args = wp_parse_args( $args, $defaults );
 
-		if( empty( $args['form_id'] ) ) {
+		if ( empty( $args[ 'form_id' ] ) ) {
 			return '';
 		}
 
-		$fields = GVCommon::get_sortable_fields_array( $args['form_id'] );
+		$fields = GVCommon::get_sortable_fields_array( $args[ 'form_id' ] );
 
-		if( array() === $args['options'] ) {
+		if ( array() === $args[ 'options' ] ) {
 			foreach ( $fields as $field_id => $field ) {
-				$args['options'][ $field_id ] = esc_html( $field['label'] );
+				$args[ 'options' ][ $field_id ] = esc_html( $field[ 'label' ] );
 			}
 		}
 
@@ -127,43 +127,43 @@ 
 		$args = wp_parse_args( $args, $defaults );
 
 		$data_elements = '';
-		foreach ( $args['data'] as $key => $value ) {
+		foreach ( $args[ 'data' ] as $key => $value ) {
 			$data_elements .= ' data-' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
 		}
 
-		if( $args['multiple'] ) {
+		if ( $args[ 'multiple' ] ) {
 			$multiple = ' MULTIPLE';
 		} else {
 			$multiple = '';
 		}
 
-		if( $args['placeholder'] ) {
-			$placeholder = $args['placeholder'];
+		if ( $args[ 'placeholder' ] ) {
+			$placeholder = $args[ 'placeholder' ];
 		} else {
 			$placeholder = '';
 		}
 
-		$disabled = $args['disabled'] ? ' disabled="disabled"' : '';
-		$class  = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
-		$output = '<select name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( str_replace( '-', '_', $args['id'] ) ) . '" class="gravityview-select ' . $class . '"' . $multiple . $disabled . ' data-placeholder="' . $placeholder . '"'. $data_elements . '>';
+		$disabled = $args[ 'disabled' ] ? ' disabled="disabled"' : '';
+		$class  = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args[ 'class' ] ) ) );
+		$output = '<select name="' . esc_attr( $args[ 'name' ] ) . '" id="' . esc_attr( str_replace( '-', '_', $args[ 'id' ] ) ) . '" class="gravityview-select ' . $class . '"' . $multiple . $disabled . ' data-placeholder="' . $placeholder . '"' . $data_elements . '>';
 
-		if ( ! empty( $args['options'] ) ) {
+		if ( ! empty( $args[ 'options' ] ) ) {
 
-			if ( $args['show_option_none'] ) {
-				if( $args['multiple'] ) {
-					$selected = selected( true, in_array( -1, $args['selected'] ), false );
+			if ( $args[ 'show_option_none' ] ) {
+				if ( $args[ 'multiple' ] ) {
+					$selected = selected( true, in_array( -1, $args[ 'selected' ] ), false );
 				} else {
-					$selected = selected( $args['selected'], -1, false );
+					$selected = selected( $args[ 'selected' ], -1, false );
 				}
-				$output .= '<option value="-1"' . $selected . '>' . esc_html( $args['show_option_none'] ) . '</option>';
+				$output .= '<option value="-1"' . $selected . '>' . esc_html( $args[ 'show_option_none' ] ) . '</option>';
 			}
 
-			foreach( $args['options'] as $key => $option ) {
+			foreach ( $args[ 'options' ] as $key => $option ) {
 
-				if( $args['multiple'] && is_array( $args['selected'] ) ) {
-					$selected = selected( true, in_array( $key, $args['selected'], true ), false );
+				if ( $args[ 'multiple' ] && is_array( $args[ 'selected' ] ) ) {
+					$selected = selected( true, in_array( $key, $args[ 'selected' ], true ), false );
 				} else {
-					$selected = selected( $args['selected'], $key, false );
+					$selected = selected( $args[ 'selected' ], $key, false );
 				}
 
 				$output .= '<option value="' . esc_attr( $key ) . '"' . $selected . '>' . esc_html( $option ) . '</option>';

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-ultimate-member.php

Spacing +3 added lines, -3 removed lines

@@ -43,12 +43,12 @@ 
 	function parse_um_profile_post_content( $args = array() ) {
 		global $ultimatemember;
 
-		if( ! $ultimatemember || ! is_object( $ultimatemember ) || ! class_exists( 'GravityView_View_Data' ) ) {
+		if ( ! $ultimatemember || ! is_object( $ultimatemember ) || ! class_exists( 'GravityView_View_Data' ) ) {
 			return;
 		}
 
 		// @todo Support Ultimate Member 2.0 - for now, prevent fatal error
-		if( ! isset( $ultimatemember->profile ) ) {
+		if ( ! isset( $ultimatemember->profile ) ) {
 			return;
 		}
 
@@ -64,7 +64,7 @@ 
 			return;
 		}
 
-		GravityView_View_Data::getInstance()->parse_post_content( $active_tab[0]->post_content );
+		GravityView_View_Data::getInstance()->parse_post_content( $active_tab[ 0 ]->post_content );
 
 		wp_reset_postdata();
 	}

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-acf.php

Spacing +7 added lines, -7 removed lines

@@ -44,20 +44,20 @@ 
 	function add_meta_keys_from_post( $meta_keys = array(), $post_id = 0 ) {
 
 		// Can never be too careful: double-check that ACF is active and the function exists
-		if ( ! function_exists( 'get_field_objects' ) || ! class_exists('acf_field_functions' ) ) {
+		if ( ! function_exists( 'get_field_objects' ) || ! class_exists( 'acf_field_functions' ) ) {
 			return $meta_keys;
 		}
 
 		$acf_field_functions = new acf_field_functions;
 
-		remove_action('acf/format_value', array( $acf_field_functions, 'format_value'), 5 );
+		remove_action( 'acf/format_value', array( $acf_field_functions, 'format_value' ), 5 );
 
 		$acf_keys = get_field_objects( $post_id, array( 'load_value' => false ) );
 
 		// Restore existing filters added by format_value
-		add_action('acf/format_value', array( $acf_field_functions, 'format_value'), 5, 3 );
+		add_action( 'acf/format_value', array( $acf_field_functions, 'format_value' ), 5, 3 );
 
-		if( $acf_keys ) {
+		if ( $acf_keys ) {
 			return array_merge( array_keys( $acf_keys ), $meta_keys );
 		}
 
@@ -72,9 +72,9 @@ 
 	 * @return void
 	 */
 	private function fix_posted_fields() {
-		if( is_admin() && isset( $_POST['action'] ) && isset( $_POST['post_type'] ) ) {
-			if( 'editpost' === $_POST['action'] && 'gravityview' === $_POST['post_type'] ) {
-				$_POST['fields'] = _gravityview_process_posted_fields();
+		if ( is_admin() && isset( $_POST[ 'action' ] ) && isset( $_POST[ 'post_type' ] ) ) {
+			if ( 'editpost' === $_POST[ 'action' ] && 'gravityview' === $_POST[ 'post_type' ] ) {
+				$_POST[ 'fields' ] = _gravityview_process_posted_fields();
 			}
 		}
 	}

includes/class-gravityview-gfformsmodel.php

Indentation +127 added lines, -127 removed lines

@@ -24,132 +24,132 @@
 	}
 
 	/**
-     * Given information provided in an entry, get array of media IDs
-     *
-     * This is necessary because GF doesn't expect to need to update post images, only to create them.
-     *
-     * @see GFFormsModel::create_post()
-     *
-     * @since 1.17
-     *
-     * @param array $form Gravity Forms form array
-     * @param array $entry Gravity Forms entry array
-     *
-     * @return array Array of "Field ID" => "Media IDs"
-     */
-    public static function get_post_field_images( $form, $entry ) {
-
-        $post_data = self::get_post_fields( $form, $entry );
-
-        $media = get_attached_media( 'image', $entry['post_id'] );
-
-        $post_images = array();
-
-        foreach ( $media as $media_item ) {
-            foreach( (array) $post_data['images'] as $post_data_item ) {
-                if(
-                    rgar( $post_data_item, 'title' ) === $media_item->post_title &&
-                    rgar( $post_data_item, 'description' ) === $media_item->post_content &&
-                    rgar( $post_data_item, 'caption' ) === $media_item->post_excerpt
-                ) {
-                    $post_images["{$post_data_item['field_id']}"] = $media_item->ID;
-                }
-            }
-        }
-
-        return $post_images;
-    }
-
-    /**
-     * Alias of GFFormsModel::get_post_fields(); just making it public
-     *
-     * @see GFFormsModel::get_post_fields()
-     *
-     * @since 1.17
-     *
-     * @param array $form Gravity Forms form array
-     * @param array $entry Gravity Forms entry array
-     *
-     * @return array
-     */
-    public static function get_post_fields( $form, $entry ) {
-
-        $reflection = new ReflectionMethod( 'GFFormsModel', 'get_post_fields' );
-
-        /**
-         * If the method changes to public, use Gravity Forms' method
-         * @todo: If/when the method is public, remove the unneeded copied code.
-         */
-        if( $reflection->isPublic() ) {
-            return parent::get_post_fields( $form, $entry );
-        }
-
-        // It was private; let's make it public
-        $reflection->setAccessible( true );
-
-        return $reflection->invoke( new GFFormsModel, $form, $entry );
-    }
-
-    /**
-     * Copied function from Gravity Forms plugin \GFFormsModel::copy_post_image since the method is private.
-     *
-     * @since 1.16.2
-     *
-     * @param string $url URL of the post image to update
-     * @param int $post_id ID of the post image to update
-     * @return array|bool Array with `file`, `url` and `type` keys. False: failed to copy file to final directory path.
-     */
-    public static function copy_post_image( $url, $post_id ) {
-
-        $reflection = new ReflectionMethod( 'GFFormsModel', 'copy_post_image' );
-
-        /**
-         * If the method changes to public, use Gravity Forms' method
-         * @todo: If/when the method is public, remove the unneeded copied code.
-         */
-        if( $reflection->isPublic() ) {
-            return parent::copy_post_image( $url, $post_id );
-        }
-
-        // It was private; let's make it public
-        $reflection->setAccessible( true );
-
-        return $reflection->invoke( new GFFormsModel, $url, $post_id );
-    }
-
-    /**
-     * Copied function from Gravity Forms plugin \GFFormsModel::media_handle_upload since the method is private.
-     *
-     * Note: The method became public in GF 1.9.17.7
-     *
-     * @see GFFormsModel::media_handle_upload
-     * @see GravityView_Edit_Entry_Render::maybe_update_post_fields
-     *
-     * @uses copy_post_image
-     * @uses wp_insert_attachment
-     * @uses wp_update_attachment_metadata
-     *
-     * @param string $url URL of the post image to update
-     * @param int $post_id ID of the post image to update
-     * @param array $post_data Array of data for the eventual attachment post type that is created using {@see wp_insert_attachment}. Supports `post_mime_type`, `guid`, `post_parent`, `post_title`, `post_content` keys.
-     * @return bool|int ID of attachment Post created. Returns false if file not created by copy_post_image
-     */
-    public static function media_handle_upload( $url, $post_id, $post_data = array() ) {
-
-        $reflection = new ReflectionMethod( 'GFFormsModel', 'media_handle_upload' );
-
-        /**
-         * If the method changes to public, use Gravity Forms' method
-         * @todo: If/when the method is public, remove the unneeded copied code.
-         */
-        if( $reflection->isPublic() ) {
-            return parent::media_handle_upload( $url, $post_id, $post_data );
-        }
-
-        // It was private; let's make it public
-        $reflection->setAccessible( true );
-
-        return $reflection->invoke( new GFFormsModel, $url, $post_id, $post_data );
-    }
+	 * Given information provided in an entry, get array of media IDs
+	 *
+	 * This is necessary because GF doesn't expect to need to update post images, only to create them.
+	 *
+	 * @see GFFormsModel::create_post()
+	 *
+	 * @since 1.17
+	 *
+	 * @param array $form Gravity Forms form array
+	 * @param array $entry Gravity Forms entry array
+	 *
+	 * @return array Array of "Field ID" => "Media IDs"
+	 */
+	public static function get_post_field_images( $form, $entry ) {
+
+		$post_data = self::get_post_fields( $form, $entry );
+
+		$media = get_attached_media( 'image', $entry['post_id'] );
+
+		$post_images = array();
+
+		foreach ( $media as $media_item ) {
+			foreach( (array) $post_data['images'] as $post_data_item ) {
+				if(
+					rgar( $post_data_item, 'title' ) === $media_item->post_title &&
+					rgar( $post_data_item, 'description' ) === $media_item->post_content &&
+					rgar( $post_data_item, 'caption' ) === $media_item->post_excerpt
+				) {
+					$post_images["{$post_data_item['field_id']}"] = $media_item->ID;
+				}
+			}
+		}
+
+		return $post_images;
+	}
+
+	/**
+	 * Alias of GFFormsModel::get_post_fields(); just making it public
+	 *
+	 * @see GFFormsModel::get_post_fields()
+	 *
+	 * @since 1.17
+	 *
+	 * @param array $form Gravity Forms form array
+	 * @param array $entry Gravity Forms entry array
+	 *
+	 * @return array
+	 */
+	public static function get_post_fields( $form, $entry ) {
+
+		$reflection = new ReflectionMethod( 'GFFormsModel', 'get_post_fields' );
+
+		/**
+		 * If the method changes to public, use Gravity Forms' method
+		 * @todo: If/when the method is public, remove the unneeded copied code.
+		 */
+		if( $reflection->isPublic() ) {
+			return parent::get_post_fields( $form, $entry );
+		}
+
+		// It was private; let's make it public
+		$reflection->setAccessible( true );
+
+		return $reflection->invoke( new GFFormsModel, $form, $entry );
+	}
+
+	/**
+	 * Copied function from Gravity Forms plugin \GFFormsModel::copy_post_image since the method is private.
+	 *
+	 * @since 1.16.2
+	 *
+	 * @param string $url URL of the post image to update
+	 * @param int $post_id ID of the post image to update
+	 * @return array|bool Array with `file`, `url` and `type` keys. False: failed to copy file to final directory path.
+	 */
+	public static function copy_post_image( $url, $post_id ) {
+
+		$reflection = new ReflectionMethod( 'GFFormsModel', 'copy_post_image' );
+
+		/**
+		 * If the method changes to public, use Gravity Forms' method
+		 * @todo: If/when the method is public, remove the unneeded copied code.
+		 */
+		if( $reflection->isPublic() ) {
+			return parent::copy_post_image( $url, $post_id );
+		}
+
+		// It was private; let's make it public
+		$reflection->setAccessible( true );
+
+		return $reflection->invoke( new GFFormsModel, $url, $post_id );
+	}
+
+	/**
+	 * Copied function from Gravity Forms plugin \GFFormsModel::media_handle_upload since the method is private.
+	 *
+	 * Note: The method became public in GF 1.9.17.7
+	 *
+	 * @see GFFormsModel::media_handle_upload
+	 * @see GravityView_Edit_Entry_Render::maybe_update_post_fields
+	 *
+	 * @uses copy_post_image
+	 * @uses wp_insert_attachment
+	 * @uses wp_update_attachment_metadata
+	 *
+	 * @param string $url URL of the post image to update
+	 * @param int $post_id ID of the post image to update
+	 * @param array $post_data Array of data for the eventual attachment post type that is created using {@see wp_insert_attachment}. Supports `post_mime_type`, `guid`, `post_parent`, `post_title`, `post_content` keys.
+	 * @return bool|int ID of attachment Post created. Returns false if file not created by copy_post_image
+	 */
+	public static function media_handle_upload( $url, $post_id, $post_data = array() ) {
+
+		$reflection = new ReflectionMethod( 'GFFormsModel', 'media_handle_upload' );
+
+		/**
+		 * If the method changes to public, use Gravity Forms' method
+		 * @todo: If/when the method is public, remove the unneeded copied code.
+		 */
+		if( $reflection->isPublic() ) {
+			return parent::media_handle_upload( $url, $post_id, $post_data );
+		}
+
+		// It was private; let's make it public
+		$reflection->setAccessible( true );
+
+		return $reflection->invoke( new GFFormsModel, $url, $post_id, $post_data );
+	}
 
 }
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -40,8 +40,8 @@ 
 	public static function is_value_match( $field_value, $target_value, $operation = 'is', $source_field = null, $rule = null, $form = null ) {
 
 		if ( 'date_created' === $source_field ) {
-			$field_value = is_int( $field_value )? $field_value : strtotime( $field_value );
-			$target_value = is_int( $target_value )? $target_value : strtotime( $target_value );
+			$field_value = is_int( $field_value ) ? $field_value : strtotime( $field_value );
+			$target_value = is_int( $target_value ) ? $target_value : strtotime( $target_value );
 		}
 
 		return parent::is_value_match( $field_value, $target_value, $operation, $source_field, $rule, $form ); // TODO: Change the autogenerated stub
@@ -65,18 +65,18 @@ 
 
         $post_data = self::get_post_fields( $form, $entry );
 
-        $media = get_attached_media( 'image', $entry['post_id'] );
+        $media = get_attached_media( 'image', $entry[ 'post_id' ] );
 
         $post_images = array();
 
         foreach ( $media as $media_item ) {
-            foreach( (array) $post_data['images'] as $post_data_item ) {
-                if(
+            foreach ( (array)$post_data[ 'images' ] as $post_data_item ) {
+                if (
                     rgar( $post_data_item, 'title' ) === $media_item->post_title &&
                     rgar( $post_data_item, 'description' ) === $media_item->post_content &&
                     rgar( $post_data_item, 'caption' ) === $media_item->post_excerpt
                 ) {
-                    $post_images["{$post_data_item['field_id']}"] = $media_item->ID;
+                    $post_images[ "{$post_data_item[ 'field_id' ]}" ] = $media_item->ID;
                 }
             }
         }
@@ -104,7 +104,7 @@ 
          * If the method changes to public, use Gravity Forms' method
          * @todo: If/when the method is public, remove the unneeded copied code.
          */
-        if( $reflection->isPublic() ) {
+        if ( $reflection->isPublic() ) {
             return parent::get_post_fields( $form, $entry );
         }
 
@@ -131,7 +131,7 @@ 
          * If the method changes to public, use Gravity Forms' method
          * @todo: If/when the method is public, remove the unneeded copied code.
          */
-        if( $reflection->isPublic() ) {
+        if ( $reflection->isPublic() ) {
             return parent::copy_post_image( $url, $post_id );
         }
 
@@ -166,7 +166,7 @@ 
          * If the method changes to public, use Gravity Forms' method
          * @todo: If/when the method is public, remove the unneeded copied code.
          */
-        if( $reflection->isPublic() ) {
+        if ( $reflection->isPublic() ) {
             return parent::media_handle_upload( $url, $post_id, $post_data );
         }
 

includes/class-gravityview-uninstall.php

Spacing +6 added lines, -6 removed lines

@@ -42,9 +42,9 @@ 
 		$tables = array();
 
 		if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) {
-			$tables []= GFFormsModel::get_entry_meta_table_name();
+			$tables [ ] = GFFormsModel::get_entry_meta_table_name();
 		}
-		$tables []= GFFormsModel::get_lead_meta_table_name();
+		$tables [ ] = GFFormsModel::get_lead_meta_table_name();
 
 		$suppress = $wpdb->suppress_errors();
 		foreach ( $tables as $meta_table ) {
@@ -70,13 +70,13 @@ 
 		$tables = array();
 
 		if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_notes_table_name' ) ) {
-			$tables[] = GFFormsModel::get_entry_notes_table_name();
+			$tables[ ] = GFFormsModel::get_entry_notes_table_name();
 		}
 
-		$tables[] = GFFormsModel::get_lead_notes_table_name();
+		$tables[ ] = GFFormsModel::get_lead_notes_table_name();
 
-		$disapproved = __('Disapproved the Entry for GravityView', 'gravityview');
-		$approved = __('Approved the Entry for GravityView', 'gravityview');
+		$disapproved = __( 'Disapproved the Entry for GravityView', 'gravityview' );
+		$approved = __( 'Approved the Entry for GravityView', 'gravityview' );
 
 		$suppress = $wpdb->suppress_errors();
 		foreach ( $tables as $notes_table ) {

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

Spacing +36 added lines, -36 removed lines

@@ -34,7 +34,7 @@ 
 
 		$default_settings = array(
 			'id' => array(
-				'label' => __('View ID', 'gravityview'),
+				'label' => __( 'View ID', 'gravityview' ),
 				'type' => 'number',
 				'group'	=> 'default',
 				'value' => NULL,
@@ -42,7 +42,7 @@ 
 				'show_in_shortcode' => false,
 			),
 			'page_size' => array(
-				'label' 	=> __('Number of entries per page', 'gravityview'),
+				'label' 	=> __( 'Number of entries per page', 'gravityview' ),
 				'type' => 'number',
 				'class'	=> 'small-text',
 				'group'	=> 'default',
@@ -50,7 +50,7 @@ 
 				'show_in_shortcode' => true,
 			),
 			'offset' => array(
-				'label' 	=> __('Offset entries starting from', 'gravityview'),
+				'label' 	=> __( 'Offset entries starting from', 'gravityview' ),
 				'type' => 'number',
 				'class'	=> 'small-text',
 				'group'	=> 'default',
@@ -74,8 +74,8 @@ 
 			),
 			'admin_show_all_statuses' => array(
 				'label' => __( 'Show all entries to administrators', 'gravityview' ),
-				'desc'	=> __('Administrators will be able to see entries with any approval status.', 'gravityview'),
-				'tooltip' => __('Logged-out visitors and non-administrators will only see approved entries, while administrators will see entries with all statuses. This makes it easier for administrators to moderate entries from a View.', 'gravityview'),
+				'desc'	=> __( 'Administrators will be able to see entries with any approval status.', 'gravityview' ),
+				'tooltip' => __( 'Logged-out visitors and non-administrators will only see approved entries, while administrators will see entries with all statuses. This makes it easier for administrators to moderate entries from a View.', 'gravityview' ),
 				'requires' => 'show_only_approved',
 				'type' => 'checkbox',
 				'group'	=> 'default',
@@ -100,40 +100,40 @@ 
 			'user_edit' => array(
 				'label'	=> __( 'Allow User Edit', 'gravityview' ),
 				'group'	=> 'default',
-				'desc'	=> __('Allow logged-in users to edit entries they created.', 'gravityview'),
+				'desc'	=> __( 'Allow logged-in users to edit entries they created.', 'gravityview' ),
 				'value'	=> 0,
-				'tooltip' => __('Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview'),
+				'tooltip' => __( 'Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview' ),
 				'type'	=> 'checkbox',
 				'show_in_shortcode' => true,
 			),
 			'user_delete' => array(
 				'label'	=> __( 'Allow User Delete', 'gravityview' ),
 				'group'	=> 'default',
-				'desc'	=> __('Allow logged-in users to delete entries they created.', 'gravityview'),
+				'desc'	=> __( 'Allow logged-in users to delete entries they created.', 'gravityview' ),
 				'value'	=> 0,
-				'tooltip' => __('Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview'),
+				'tooltip' => __( 'Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview' ),
 				'type'	=> 'checkbox',
 				'show_in_shortcode' => true,
 			),
 			'sort_field' => array(
-				'label'	=> __('Sort by field', 'gravityview'),
+				'label'	=> __( 'Sort by field', 'gravityview' ),
 				'type' => 'select',
 				'value' => '',
 				'group'	=> 'sort',
 				'options' => array(
-					'' => __( 'Default', 'gravityview'),
-					'date_created' => __( 'Date Created', 'gravityview'),
+					'' => __( 'Default', 'gravityview' ),
+					'date_created' => __( 'Date Created', 'gravityview' ),
 				),
 				'show_in_shortcode' => true,
 			),
 			'sort_direction' => array(
-				'label' 	=> __('Sort direction', 'gravityview'),
+				'label' 	=> __( 'Sort direction', 'gravityview' ),
 				'type' => 'select',
 				'value' => 'ASC',
 				'group'	=> 'sort',
 				'options' => array(
-					'ASC' => __('ASC', 'gravityview'),
-					'DESC' => __('DESC', 'gravityview'),
+					'ASC' => __( 'ASC', 'gravityview' ),
+					'DESC' => __( 'DESC', 'gravityview' ),
 				),
 				'show_in_shortcode' => true,
 			),
@@ -148,69 +148,69 @@ 
 				'show_in_template' => array( 'default_table', 'preset_business_data', 'preset_issue_tracker', 'preset_resume_board', 'preset_job_board' ),
 			),
 			'start_date' => array(
-				'label' 	=> __('Filter by Start Date', 'gravityview'),
+				'label' 	=> __( 'Filter by Start Date', 'gravityview' ),
 				'class'	=> 'gv-datepicker',
-				'desc'	=> __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
+				'desc'	=> __( 'Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
 				'show_in_shortcode' => true,
 			),
 			'end_date' => array(
-				'label' 	=> __('Filter by End Date', 'gravityview'),
+				'label' 	=> __( 'Filter by End Date', 'gravityview' ),
 				'class'	=> 'gv-datepicker',
-				'desc'	=> __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
+				'desc'	=> __( 'Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
 				'show_in_shortcode' => true,
 			),
 			'class' => array(
-				'label' 	=> __('CSS Class', 'gravityview'),
-				'desc'	=> __('CSS class to add to the wrapping HTML container.', 'gravityview'),
+				'label' 	=> __( 'CSS Class', 'gravityview' ),
+				'desc'	=> __( 'CSS class to add to the wrapping HTML container.', 'gravityview' ),
 				'group'	=> 'default',
 				'type' => 'text',
 				'value' => '',
 				'show_in_shortcode' => false,
 			),
 			'search_value' => array(
-				'label' 	=> __('Search Value', 'gravityview'),
-				'desc'	=> __('Define a default search value for the View', 'gravityview'),
+				'label' 	=> __( 'Search Value', 'gravityview' ),
+				'desc'	=> __( 'Define a default search value for the View', 'gravityview' ),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
 				'show_in_shortcode' => false,
 			),
 			'search_field' => array(
-				'label' 	=> __('Search Field', 'gravityview'),
-				'desc'	=> __('If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview'),
+				'label' 	=> __( 'Search Field', 'gravityview' ),
+				'desc'	=> __( 'If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview' ),
 				'type' => 'number',
 				'value' => '',
 				'group'	=> 'filter',
 				'show_in_shortcode' => false,
 			),
 			'single_title' => array(
-				'label'	=> __('Single Entry Title', 'gravityview'),
+				'label'	=> __( 'Single Entry Title', 'gravityview' ),
 				'type'	=> 'text',
-				'desc'	=> __('When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview'),
+				'desc'	=> __( 'When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview' ),
 				'group'	=> 'default',
 				'value'	=> '',
 				'show_in_shortcode' => false,
 				'full_width' => true,
 			),
 			'back_link_label' => array(
-				'label'	=> __('Back Link Label', 'gravityview'),
+				'label'	=> __( 'Back Link Label', 'gravityview' ),
 				'group'	=> 'default',
-				'desc'	=> __('The text of the link that returns to the multiple entries view.', 'gravityview'),
+				'desc'	=> __( 'The text of the link that returns to the multiple entries view.', 'gravityview' ),
 				'type'	=> 'text',
 				'value'	=> '',
 				'show_in_shortcode' => false,
 				'full_width' => true,
 			),
 			'embed_only' => array(
-				'label'	=> __('Prevent Direct Access', 'gravityview'),
+				'label'	=> __( 'Prevent Direct Access', 'gravityview' ),
 				'group'	=> 'default',
-				'desc'	=> __('Only allow access to this View when embedded using the shortcode.', 'gravityview'),
+				'desc'	=> __( 'Only allow access to this View when embedded using the shortcode.', 'gravityview' ),
 				'type'	=> 'checkbox',
 				'value'	=> '',
 				'tooltip' => false,
@@ -225,7 +225,7 @@ 
 		);
 
 		if ( version_compare( \GFCommon::$version, '2.3-beta-4', '>=' ) ) {
-			$default_settings['sort_direction']['options']['RAND'] = __( 'Random', 'gravityview' );
+			$default_settings[ 'sort_direction' ][ 'options' ][ 'RAND' ] = __( 'Random', 'gravityview' );
 		}
 
 		/**
@@ -245,19 +245,19 @@ 
 		// By default, we only want the key => value pairing, not the whole array.
 		if ( ! $detailed ) {
 			$defaults = array();
-			foreach( $default_settings as $key => $value ) {
-				$defaults[ $key ] = $value['value'];
+			foreach ( $default_settings as $key => $value ) {
+				$defaults[ $key ] = $value[ 'value' ];
 			}
 			return $defaults;
 
 		// But sometimes, we want all the details.
 		} else {
-			foreach ($default_settings as $key => $value) {
+			foreach ( $default_settings as $key => $value ) {
 
 				// If the $group argument is set for the method,
 				// ignore any settings that aren't in that group.
 				if ( ! empty( $group ) && is_string( $group ) ) {
-					if ( empty( $value['group'] ) || $value['group'] !== $group ) {
+					if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) {
 						unset( $default_settings[ $key ] );
 					}
 				}