gravityview / GravityView

includes/class-admin-welcome.php

Braces +3 added lines, -1 removed lines

@@ -4,7 +4,9 @@
 //set_site_transient( 'update_plugins', null );
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Allows plugins to use their own update API.

Spacing +18 added lines, -18 removed lines

@@ -34,10 +34,10 @@ 
 	 * @since 1.0
 	 */
 	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'admin_menus'), 200 );
+		add_action( 'admin_menu', array( $this, 'admin_menus' ), 200 );
 		add_action( 'admin_head', array( $this, 'admin_head' ) );
-		add_action( 'admin_init', array( $this, 'welcome'    ) );
-		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page'), 10, 2 );
+		add_action( 'admin_init', array( $this, 'welcome' ) );
+		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page' ), 10, 2 );
 	}
 
 	/**
@@ -53,8 +53,8 @@ 
 		// Add help page to GravityView menu
 		add_submenu_page(
 			'edit.php?post_type=gravityview',
-			__('GravityView: Getting Started', 'gravityview'),
-			__('Getting Started', 'gravityview'),
+			__( 'GravityView: Getting Started', 'gravityview' ),
+			__( 'Getting Started', 'gravityview' ),
 			$this->minimum_capability,
 			'gv-getting-started',
 			array( $this, 'getting_started_screen' )
@@ -87,10 +87,10 @@ 
 	 *
 	 * @return boolean  $is_page   True: yep; false: nope
 	 */
-	public function is_dashboard_page($is_page = false, $hook = NULL) {
+	public function is_dashboard_page( $is_page = false, $hook = NULL ) {
 		global $plugin_page;
 
-		if($is_page) { return $is_page; }
+		if ( $is_page ) { return $is_page; }
 
 		return in_array( $plugin_page, array( 'gv-about', 'gv-credits', 'gv-getting-started' ) );
 	}
@@ -108,7 +108,7 @@ 
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-credits' );
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-changelog' );
 
-		if( !$this->is_dashboard_page() ) { return; }
+		if ( ! $this->is_dashboard_page() ) { return; }
 
 		?>
 		<style type="text/css" media="screen">
@@ -141,20 +141,20 @@ 
 		// Don't fetch -beta, etc.
 		list( $display_version ) = explode( '-', GravityView_Plugin::version );
 
-		$selected = !empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
+		$selected = ! empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
 		?>
 
 		<h1><img class="alignleft" src="<?php echo plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ); ?>" width="100" height="132" /><?php printf( esc_html__( 'Welcome to GravityView %s', 'gravityview' ), $display_version ); ?></h1>
 		<div class="about-text"><?php esc_html_e( 'Thank you for installing GravityView. Beautifully display your Gravity Forms entries.', 'gravityview' ); ?></div>
 
 		<h2 class="nav-tab-wrapper clear">
-			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
 				<?php _e( "Getting Started", 'gravityview' ); ?>
 			</a>
-			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
 				<?php _e( "List of Changes", 'gravityview' ); ?>
 			</a>
-			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
 				<?php _e( 'Credits', 'gravityview' ); ?>
 			</a>
 		</h2>
@@ -190,7 +190,7 @@ 
 					<h2>Create a View</h2>
 
 					<ol class="ol-decimal">
-						<li>Go to <a href="<?php echo admin_url('post-new.php?post_type=gravityview'); ?>">Views &gt; New View</a></li>
+						<li>Go to <a href="<?php echo admin_url( 'post-new.php?post_type=gravityview' ); ?>">Views &gt; New View</a></li>
 						<li>If you want to <strong>create a new form</strong>, click the "Start Fresh" button</li>
 						<li>If you want to <strong>use an existing form&rsquo;s entries</strong>, select from the dropdown.</li>
 						<li>Select the type of View you would like to create. There are two core types of Views: <strong>Table</strong> and <strong>Listing</strong>.
@@ -525,7 +525,7 @@ 
 					</ul>
 
 					<h4><?php esc_attr_e( 'Want to contribute?', 'gravityview' ); ?></h4>
-					<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview'), '<a href="https://github.com/katzwebservices/GravityView">', '</a>' ); ?></p>
+					<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview' ), '<a href="https://github.com/katzwebservices/GravityView">', '</a>' ); ?></p>
 				</div>
 			</div>
 
@@ -565,7 +565,7 @@ 
 		global $plugin_page;
 
 		// Bail if we're just editing the plugin
-		if( $plugin_page === 'plugin-editor.php' ) { return; }
+		if ( $plugin_page === 'plugin-editor.php' ) { return; }
 
 		// Bail if no activation redirect
 		if ( ! get_transient( '_gv_activation_redirect' ) ) { return; }
@@ -576,7 +576,7 @@ 
 		$upgrade = get_option( 'gv_version_upgraded_from' );
 
 		// Don't do anything if they've already seen the new version info
-		if( $upgrade === GravityView_Plugin::version ) {
+		if ( $upgrade === GravityView_Plugin::version ) {
 			return;
 		}
 
@@ -584,10 +584,10 @@ 
 		update_option( 'gv_version_upgraded_from', GravityView_Plugin::version );
 
 		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) { return; }
+		if ( is_network_admin() || isset( $_GET[ 'activate-multi' ] ) ) { return; }
 
 		// First time install
-		if( ! $upgrade ) {
+		if ( ! $upgrade ) {
 			wp_safe_redirect( admin_url( 'edit.php?post_type=gravityview&page=gv-getting-started' ) ); exit;
 		}
 		// Update

includes/wordpress-widgets/class-gravityview-recent-entries-widget.php

Indentation +2 added lines, -2 removed lines

@@ -184,8 +184,8 @@
 		// Get the settings for the View ID
 		$view_settings = gravityview_get_template_settings( $instance['view_id'] );
 
-        // Set the context view ID to avoid conflicts with the Advanced Filter extension.
-        $criteria['context_view_id'] = $instance['view_id'];
+		// Set the context view ID to avoid conflicts with the Advanced Filter extension.
+		$criteria['context_view_id'] = $instance['view_id'];
 
 		$instance['limit'] = isset( $instance['limit'] ) ? $instance['limit'] : 10;
 		$view_settings['id'] = $instance['view_id'];

Doc Comments +1 added lines

@@ -176,6 +176,7 @@
 	 * Get the entries that will be shown in the current widget
 	 *
 	 * @param  array $instance Settings for the current widget
+	 * @param false|string $form_id
 	 *
 	 * @return array $entries Multidimensional array of Gravity Forms entries
 	 */

Spacing +64 added lines, -64 removed lines

@@ -12,7 +12,7 @@ 
 
 	function __construct( ) {
 
-		$name = __('GravityView Recent Entries', 'gravityview');
+		$name = __( 'GravityView Recent Entries', 'gravityview' );
 
 		$widget_options = array(
 			'description' => __( 'Display the most recent entries for a View', 'gravityview' ),
@@ -25,7 +25,7 @@ 
 
 	private function initialize() {
 
-		add_action('admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts') );
+		add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
 
 		add_action( 'wp_ajax_gv_get_view_merge_tag_data', array( $this, 'ajax_get_view_merge_tag_data' ) );
 
@@ -38,21 +38,21 @@ 
 	 */
 	function ajax_get_view_merge_tag_data() {
 
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajax_widget' ) ) {
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajax_widget' ) ) {
 			exit( false );
 		}
 
-		$form_id  = gravityview_get_form_id( $_POST['view_id'] );
+		$form_id = gravityview_get_form_id( $_POST[ 'view_id' ] );
 
 		$form = RGFormsModel::get_form_meta( $form_id );
 
 		$output = array(
 			'form' => array(
-				'id' => $form['id'],
-				'title' => $form['title'],
-				'fields' => $form['fields'],
+				'id' => $form[ 'id' ],
+				'title' => $form[ 'title' ],
+				'fields' => $form[ 'fields' ],
 			),
-			'mergeTags' => GFCommon::get_merge_tags( $form['fields'], '', false ),
+			'mergeTags' => GFCommon::get_merge_tags( $form[ 'fields' ], '', false ),
 		);
 
 		echo json_encode( $output );
@@ -68,19 +68,19 @@ 
 	function admin_enqueue_scripts() {
 		global $pagenow;
 
-		if( $pagenow === 'widgets.php' ) {
+		if ( $pagenow === 'widgets.php' ) {
 
-			$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+			$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
 			GravityView_Admin_Views::enqueue_gravity_forms_scripts();
 
-			wp_enqueue_script( 'gravityview_widgets', plugins_url('assets/js/admin-widgets'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery', 'gform_gravityforms' ), GravityView_Plugin::version );
+			wp_enqueue_script( 'gravityview_widgets', plugins_url( 'assets/js/admin-widgets' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery', 'gform_gravityforms' ), GravityView_Plugin::version );
 
 			wp_localize_script( 'gravityview_widgets', 'GVWidgets', array(
 				'nonce' => wp_create_nonce( 'gravityview_ajax_widget' )
-			));
+			) );
 
-			wp_enqueue_style( 'gravityview_views_styles', plugins_url('assets/css/admin-views.css', GRAVITYVIEW_FILE), array('dashicons' ), GravityView_Plugin::version );
+			wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons' ), GravityView_Plugin::version );
 		}
 
 	}
@@ -95,19 +95,19 @@ 
 	function widget( $args, $instance ) {
 
 		// Don't have the Customizer render too soon.
-		if( empty( $instance['view_id'] ) ) {
+		if ( empty( $instance[ 'view_id' ] ) ) {
 			return;
 		}
 
-		$args['id']        = ( isset( $args['id'] ) ) ? $args['id'] : 'gv_recent_entries';
-		$instance['title'] = ( isset( $instance['title'] ) ) ? $instance['title'] : '';
+		$args[ 'id' ]        = ( isset( $args[ 'id' ] ) ) ? $args[ 'id' ] : 'gv_recent_entries';
+		$instance[ 'title' ] = ( isset( $instance[ 'title' ] ) ) ? $instance[ 'title' ] : '';
 
-		$title = apply_filters( 'widget_title', $instance[ 'title' ], $instance, $args['id'] );
+		$title = apply_filters( 'widget_title', $instance[ 'title' ], $instance, $args[ 'id' ] );
 
-		echo $args['before_widget'];
+		echo $args[ 'before_widget' ];
 
-		if ( !empty( $title ) ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+		if ( ! empty( $title ) ) {
+			echo $args[ 'before_title' ] . $title . $args[ 'after_title' ];
 		}
 
 		/**
@@ -127,7 +127,7 @@ 
 		 */
 		do_action( 'gravityview/widget/recent-entries/after_widget', $args, $instance );
 
-		echo $args['after_widget'];
+		echo $args[ 'after_widget' ];
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	 */
 	private function get_output( $instance ) {
 
-		$form_id = gravityview_get_form_id( $instance['view_id'] );
+		$form_id = gravityview_get_form_id( $instance[ 'view_id' ] );
 
 		$form = gravityview_get_form( $form_id );
 
@@ -151,13 +151,13 @@ 
 		 * @since 1.6.1
 		 * @var int $entry_link_post_id The ID to use as the parent post for the entry
 		 */
-		$entry_link_post_id = ( empty( $instance['error_post_id'] ) && !empty( $instance['post_id'] ) ) ? $instance['post_id'] : $instance['view_id'];
+		$entry_link_post_id = ( empty( $instance[ 'error_post_id' ] ) && ! empty( $instance[ 'post_id' ] ) ) ? $instance[ 'post_id' ] : $instance[ 'view_id' ];
 
 		/**
 		 * Generate list output
 		 * @since 1.7.2
 		 */
-		$List = new GravityView_Entry_List( $entries, $entry_link_post_id, $form, $instance['link_format'], $instance['after_link'], 'recent-entries-widget' );
+		$List = new GravityView_Entry_List( $entries, $entry_link_post_id, $form, $instance[ 'link_format' ], $instance[ 'after_link' ], 'recent-entries-widget' );
 
 		$output = $List->get_output();
 
@@ -182,30 +182,30 @@ 
 	private function get_entries( $instance, $form_id ) {
 
 		// Get the settings for the View ID
-		$view_settings = gravityview_get_template_settings( $instance['view_id'] );
+		$view_settings = gravityview_get_template_settings( $instance[ 'view_id' ] );
 
         // Set the context view ID to avoid conflicts with the Advanced Filter extension.
-        $criteria['context_view_id'] = $instance['view_id'];
+        $criteria[ 'context_view_id' ] = $instance[ 'view_id' ];
 
-		$instance['limit'] = isset( $instance['limit'] ) ? $instance['limit'] : 10;
-		$view_settings['id'] = $instance['view_id'];
-		$view_settings['page_size'] = $instance['limit'];
+		$instance[ 'limit' ] = isset( $instance[ 'limit' ] ) ? $instance[ 'limit' ] : 10;
+		$view_settings[ 'id' ] = $instance[ 'view_id' ];
+		$view_settings[ 'page_size' ] = $instance[ 'limit' ];
 
 		// Prepare paging criteria
-		$criteria['paging'] = array(
+		$criteria[ 'paging' ] = array(
 			'offset' => 0,
-			'page_size' => $instance['limit']
+			'page_size' => $instance[ 'limit' ]
 		);
 
 		// Prepare Search Criteria
-		$criteria['search_criteria'] = array( 'field_filters' => array() );
-		$criteria['search_criteria'] = GravityView_frontend::process_search_only_approved( $view_settings, $criteria['search_criteria']);
-		$criteria['search_criteria']['status'] = apply_filters( 'gravityview_status', 'active', $view_settings );
+		$criteria[ 'search_criteria' ] = array( 'field_filters' => array() );
+		$criteria[ 'search_criteria' ] = GravityView_frontend::process_search_only_approved( $view_settings, $criteria[ 'search_criteria' ] );
+		$criteria[ 'search_criteria' ][ 'status' ] = apply_filters( 'gravityview_status', 'active', $view_settings );
 
 		/**
 		 * Modify the search parameters before the entries are fetched
 		 */
-		$criteria = apply_filters('gravityview/widget/recent-entries/criteria', $criteria, $instance, $form_id );
+		$criteria = apply_filters( 'gravityview/widget/recent-entries/criteria', $criteria, $instance, $form_id );
 
 		$results = GVCommon::get_entries( $form_id, $criteria );
 
@@ -226,23 +226,23 @@ 
 		$instance = $new_instance;
 
 		// Force positive number
-		$instance['limit'] = empty( $instance['limit'] ) ? 10 : absint( $instance['limit'] );
+		$instance[ 'limit' ] = empty( $instance[ 'limit' ] ) ? 10 : absint( $instance[ 'limit' ] );
 
-		$instance['view_id'] = intval( $instance['view_id'] );
+		$instance[ 'view_id' ] = intval( $instance[ 'view_id' ] );
 
-		$instance['link_format'] = trim( rtrim( $instance['link_format'] ) );
+		$instance[ 'link_format' ] = trim( rtrim( $instance[ 'link_format' ] ) );
 
-		$instance['link_format'] = empty( $instance['link_format'] ) ? $old_instance['link_format'] : $instance['link_format'];
+		$instance[ 'link_format' ] = empty( $instance[ 'link_format' ] ) ? $old_instance[ 'link_format' ] : $instance[ 'link_format' ];
 
-		$instance['post_id'] = empty( $instance['post_id'] ) ? '' : intval( $instance['post_id'] );
+		$instance[ 'post_id' ] = empty( $instance[ 'post_id' ] ) ? '' : intval( $instance[ 'post_id' ] );
 
-		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance['post_id'], $instance['view_id'] );
+		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance[ 'post_id' ], $instance[ 'view_id' ] );
 
 		//check if post_id is a valid post with embedded View
-		$instance['error_post_id'] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
+		$instance[ 'error_post_id' ] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
 
 		// Share that the widget isn't brand new
-		$instance['updated']  = 1;
+		$instance[ 'updated' ] = 1;
 
 		/**
 		 * Modify the updated instance. This will allow for validating any added instance settings externally.
@@ -264,22 +264,22 @@ 
 
 		// Set up some default widget settings.
 		$defaults = array(
-			'title' 			=> __('Recent Entries', 'gravityview'),
+			'title' 			=> __( 'Recent Entries', 'gravityview' ),
 			'view_id'           => NULL,
 			'post_id'           => NULL,
 			'limit'            => 10,
-			'link_format'       => __('Entry #{entry_id}', 'gravityview'),
+			'link_format'       => __( 'Entry #{entry_id}', 'gravityview' ),
 			'after_link'        => ''
 		);
 
-		$instance = wp_parse_args( (array) $instance, $defaults );
+		$instance = wp_parse_args( (array)$instance, $defaults );
 
 		?>
 
 		<!-- Title -->
 		<p>
 			<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:', 'gravityview' ) ?></label>
-			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $instance['title'] ); ?>" />
+			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $instance[ 'title' ] ); ?>" />
 		</p>
 
 		<!-- Download -->
@@ -292,7 +292,7 @@ 
 		$views = get_posts( $args );
 
 		// If there are no views set up yet, we get outta here.
-		if( empty( $views ) ) {
+		if ( empty( $views ) ) {
 			echo '<div id="select_gravityview_view"><div class="wrap">' . GravityView_Admin::no_views_text() . '</div></div>';
 			return;
 		}
@@ -304,10 +304,10 @@ 
 		 * Display errors generated for invalid embed IDs
 		 * @see GravityView_View_Data::is_valid_embed_id
 		 */
-		if( isset( $instance['updated'] ) && empty( $instance['view_id'] ) ) {
+		if ( isset( $instance[ 'updated' ] ) && empty( $instance[ 'view_id' ] ) ) {
 			?>
 			<div class="error inline hide-on-view-change">
-				<p><?php esc_html_e('Please select a View to search.', 'gravityview'); ?></p>
+				<p><?php esc_html_e( 'Please select a View to search.', 'gravityview' ); ?></p>
 			</div>
 			<?php
 			unset ( $error );
@@ -315,14 +315,14 @@ 
 		?>
 
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>"><?php esc_html_e('Select a View', 'gravityview'); ?></label>
+			<label for="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>"><?php esc_html_e( 'Select a View', 'gravityview' ); ?></label>
 			<select class="widefat gv-recent-entries-select-view" name="<?php echo esc_attr( $this->get_field_name( 'view_id' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>">
 				<option value=""><?php esc_html_e( '&mdash; Select a View as Entries Source &mdash;', 'gravityview' ); ?></option>
 				<?php
 
-				foreach( $views as $view ) {
-					$title = empty( $view->post_title ) ? __('(no title)', 'gravityview') : $view->post_title;
-					echo '<option value="'. $view->ID .'"'.selected( absint( $instance['view_id'] ), $view->ID ).'>'. esc_html( sprintf('%s #%d', $title, $view->ID ) ) .'</option>';
+				foreach ( $views as $view ) {
+					$title = empty( $view->post_title ) ? __( '(no title)', 'gravityview' ) : $view->post_title;
+					echo '<option value="' . $view->ID . '"' . selected( absint( $instance[ 'view_id' ] ), $view->ID ) . '>' . esc_html( sprintf( '%s #%d', $title, $view->ID ) ) . '</option>';
 				}
 
 				?>
@@ -334,10 +334,10 @@ 
 		 * Display errors generated for invalid embed IDs
 		 * @see GravityView_View_Data::is_valid_embed_id
 		 */
-		if( !empty( $instance['error_post_id'] ) ) {
+		if ( ! empty( $instance[ 'error_post_id' ] ) ) {
 			?>
 			<div class="error inline">
-				<p><?php echo $instance['error_post_id']; ?></p>
+				<p><?php echo $instance[ 'error_post_id' ]; ?></p>
 			</div>
 			<?php
 			unset ( $error );
@@ -345,11 +345,11 @@ 
 		?>
 
 		<p>
-			<label for="<?php echo $this->get_field_id('post_id'); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
-			<input class="code" size="3" id="<?php echo $this->get_field_id('post_id'); ?>" name="<?php echo $this->get_field_name('post_id'); ?>" type="text" value="<?php echo esc_attr( $instance['post_id'] ); ?>" />
+			<label for="<?php echo $this->get_field_id( 'post_id' ); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
+			<input class="code" size="3" id="<?php echo $this->get_field_id( 'post_id' ); ?>" name="<?php echo $this->get_field_name( 'post_id' ); ?>" type="text" value="<?php echo esc_attr( $instance[ 'post_id' ] ); ?>" />
 			<span class="howto"><?php
-				esc_html_e('To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
-				echo ' '.gravityview_get_link('http://docs.gravityview.co/article/222-the-search-widget', __('Learn more&hellip;', 'gravityview' ), 'target=_blank' );
+				esc_html_e( 'To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
+				echo ' ' . gravityview_get_link( 'http://docs.gravityview.co/article/222-the-search-widget', __( 'Learn more&hellip;', 'gravityview' ), 'target=_blank' );
 				?></span>
 		</p>
 
@@ -357,21 +357,21 @@ 
 			<label for="<?php echo $this->get_field_id( 'limit' ); ?>">
 				<span><?php _e( 'Number of entries to show:', 'gravityview' ); ?></span>
 			</label>
-			<input class="code" id="<?php echo $this->get_field_id( 'limit' ); ?>" name="<?php echo $this->get_field_name( 'limit' ); ?>" type="number" value="<?php echo intval( $instance['limit'] ); ?>" size="3" />
+			<input class="code" id="<?php echo $this->get_field_id( 'limit' ); ?>" name="<?php echo $this->get_field_name( 'limit' ); ?>" type="number" value="<?php echo intval( $instance[ 'limit' ] ); ?>" size="3" />
 		</p>
 
 		<p>
 			<label for="<?php echo $this->get_field_id( 'link_format' ); ?>">
 				<span><?php _e( 'Entry link text (required)', 'gravityview' ); ?></span>
 			</label>
-			<input id="<?php echo $this->get_field_id( 'link_format' ); ?>" name="<?php echo $this->get_field_name( 'link_format' ); ?>" type="text" value="<?php echo esc_attr( $instance['link_format'] ); ?>" class="widefat merge-tag-support mt-position-right mt-hide_all_fields" />
+			<input id="<?php echo $this->get_field_id( 'link_format' ); ?>" name="<?php echo $this->get_field_name( 'link_format' ); ?>" type="text" value="<?php echo esc_attr( $instance[ 'link_format' ] ); ?>" class="widefat merge-tag-support mt-position-right mt-hide_all_fields" />
 		</p>
 
 		<p>
 			<label for="<?php echo $this->get_field_id( 'after_link' ); ?>">
 				<span><?php _e( 'Text or HTML to display after the link (optional)', 'gravityview' ); ?></span>
 			</label>
-			<textarea id="<?php echo $this->get_field_id( 'after_link' ); ?>" name="<?php echo $this->get_field_name( 'after_link' ); ?>" rows="5" class="widefat code merge-tag-support mt-position-right mt-hide_all_fields"><?php echo esc_textarea( $instance['after_link'] ); ?></textarea>
+			<textarea id="<?php echo $this->get_field_id( 'after_link' ); ?>" name="<?php echo $this->get_field_name( 'after_link' ); ?>" rows="5" class="widefat code merge-tag-support mt-position-right mt-hide_all_fields"><?php echo esc_textarea( $instance[ 'after_link' ] ); ?></textarea>
 		</p>
 
 		<?php
@@ -381,7 +381,7 @@ 
 		 * @param GravityView_Recent_Entries_Widget $this WP_Widget object
 		 * @param array $instance Current widget instance
 		 */
-		do_action( 'gravityview_recent_entries_widget_form' , $this, $instance );
+		do_action( 'gravityview_recent_entries_widget_form', $this, $instance );
 
 		?>
 

includes/admin/class.field.type.php

Doc Comments +1 added lines

@@ -158,6 +158,7 @@
     /**
      * important! Override this class if needed
      * outputs the field setting html
+     * @param string $override_input
      */
     function render_setting( $override_input = NULL ) {
 

Indentation +140 added lines, -140 removed lines

@@ -10,159 +10,159 @@ 
 	 *
 	 * @var string
 	 */
-    protected $name;
+	protected $name;
 
 	/**
 	 * Field settings
 	 *
 	 * @var array
 	 */
-    protected $field;
+	protected $field;
 
 	/**
 	 * Field current value
 	 *
 	 * @var mixed
 	 */
-    protected $value;
-
-    function __construct( $name = '', $field = array(), $curr_value = NULL ) {
-
-        $this->name = $name;
-
-        $defaults = self::get_field_defaults();
-
-        // Backward compatibility
-        if( !empty( $field['choices'] ) ) {
-        	$field['options'] = $field['choices'];
-        	unset( $field['choices'] );
-        }
-
-        $this->field =  wp_parse_args( $field, $defaults );
-
-        $this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
-
-    }
-
-    /**
-     * Returns the default details for a field option
-     *
-     * - default    // default option value, in case nothing is defined (@deprecated)
-     * - desc       // option description
-     * - value      // the option default value
-     * - label      // the option label
-     * - left_label // In case of checkboxes, left label will appear on the left of the checkbox
-     * - id         // the field id
-     * - type       // the option type ( text, checkbox, select, ... )
-     * - options    // when type is select, define the select options ('choices' is @deprecated)
-     * - merge_tags // if the option supports merge tags feature
-     * - class      // (new) define extra classes for the field
-     * - tooltip    //
-     *
-     * @return array
-     */
-    public static function get_field_defaults() {
-        return array(
-            'desc' => '',
-            'value' => NULL,
-            'label' => '',
-            'left_label' => NULL,
-            'id' => NULL,
-            'type'  => 'text',
-            'options' => NULL,
-            'merge_tags' => true,
-            'class' => '',
-            'tooltip' => NULL
-        );
-    }
-
-
-    function get_tooltip() {
-        if( !function_exists('gform_tooltip') ) {
-            return NULL;
-        }
-
-        return !empty( $this->field['tooltip'] ) ? ' '.gform_tooltip( $this->field['tooltip'] , false, true ) : NULL;
-    }
-
-    /**
-     * Build input id based on the name
-     * @return string
-     */
-    function get_field_id() {
-        if( isset( $this->field['id'] ) ) {
-            return esc_attr( $this->field['id'] );
-        }
-        return esc_attr( sanitize_html_class( $this->name ) );
-    }
-
-    /**
-     * Retrieve field label
-     * @return string
-     */
-    function get_field_label() {
-        return esc_html( trim( $this->field['label'] ) );
-    }
+	protected $value;
+
+	function __construct( $name = '', $field = array(), $curr_value = NULL ) {
+
+		$this->name = $name;
+
+		$defaults = self::get_field_defaults();
+
+		// Backward compatibility
+		if( !empty( $field['choices'] ) ) {
+			$field['options'] = $field['choices'];
+			unset( $field['choices'] );
+		}
+
+		$this->field =  wp_parse_args( $field, $defaults );
+
+		$this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
+
+	}
+
+	/**
+	 * Returns the default details for a field option
+	 *
+	 * - default    // default option value, in case nothing is defined (@deprecated)
+	 * - desc       // option description
+	 * - value      // the option default value
+	 * - label      // the option label
+	 * - left_label // In case of checkboxes, left label will appear on the left of the checkbox
+	 * - id         // the field id
+	 * - type       // the option type ( text, checkbox, select, ... )
+	 * - options    // when type is select, define the select options ('choices' is @deprecated)
+	 * - merge_tags // if the option supports merge tags feature
+	 * - class      // (new) define extra classes for the field
+	 * - tooltip    //
+	 *
+	 * @return array
+	 */
+	public static function get_field_defaults() {
+		return array(
+			'desc' => '',
+			'value' => NULL,
+			'label' => '',
+			'left_label' => NULL,
+			'id' => NULL,
+			'type'  => 'text',
+			'options' => NULL,
+			'merge_tags' => true,
+			'class' => '',
+			'tooltip' => NULL
+		);
+	}
+
+
+	function get_tooltip() {
+		if( !function_exists('gform_tooltip') ) {
+			return NULL;
+		}
+
+		return !empty( $this->field['tooltip'] ) ? ' '.gform_tooltip( $this->field['tooltip'] , false, true ) : NULL;
+	}
+
+	/**
+	 * Build input id based on the name
+	 * @return string
+	 */
+	function get_field_id() {
+		if( isset( $this->field['id'] ) ) {
+			return esc_attr( $this->field['id'] );
+		}
+		return esc_attr( sanitize_html_class( $this->name ) );
+	}
+
+	/**
+	 * Retrieve field label
+	 * @return string
+	 */
+	function get_field_label() {
+		return esc_html( trim( $this->field['label'] ) );
+	}
 
 	/**
 	 * Retrieve field left label
-     *
-     * @since 1.7
-     *
+	 *
+	 * @since 1.7
+	 *
 	 * @return string
 	 */
 	function get_field_left_label() {
 		return ! empty( $this->field['left_label'] ) ? esc_html( trim( $this->field['left_label'] ) ) : NULL;
 	}
 
-    /**
-     * Retrieve field label class
-     * @return string
-     */
-    function get_label_class() {
-        return 'gv-label-'. sanitize_html_class( $this->field['type'] );
-    }
-
-
-    /**
-     * Retrieve field description
-     * @return string
-     */
-    function get_field_desc() {
-        return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
-    }
-
-
-    /**
-     * Verify if field should have merge tags
-     * @return boolean
-     */
-    function show_merge_tags() {
-        // Show the merge tags if the field is a list view
-        $is_list = preg_match( '/_list-/ism', $this->name );
-        // Or is a single entry view
-        $is_single = preg_match( '/single_/ism', $this->name );
-
-        return ( $is_single || $is_list );
-    }
-
-
-
-    /**
-     * important! Override this class
-     * outputs the field option html
-     */
-    function render_option() {
-        // to replace on each field
-    }
-
-    /**
-     * important! Override this class if needed
-     * outputs the field setting html
-     */
-    function render_setting( $override_input = NULL ) {
-
-        if( !empty( $this->field['full_width'] ) ) { ?>
+	/**
+	 * Retrieve field label class
+	 * @return string
+	 */
+	function get_label_class() {
+		return 'gv-label-'. sanitize_html_class( $this->field['type'] );
+	}
+
+
+	/**
+	 * Retrieve field description
+	 * @return string
+	 */
+	function get_field_desc() {
+		return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
+	}
+
+
+	/**
+	 * Verify if field should have merge tags
+	 * @return boolean
+	 */
+	function show_merge_tags() {
+		// Show the merge tags if the field is a list view
+		$is_list = preg_match( '/_list-/ism', $this->name );
+		// Or is a single entry view
+		$is_single = preg_match( '/single_/ism', $this->name );
+
+		return ( $is_single || $is_list );
+	}
+
+
+
+	/**
+	 * important! Override this class
+	 * outputs the field option html
+	 */
+	function render_option() {
+		// to replace on each field
+	}
+
+	/**
+	 * important! Override this class if needed
+	 * outputs the field setting html
+	 */
+	function render_setting( $override_input = NULL ) {
+
+		if( !empty( $this->field['full_width'] ) ) { ?>
             <th scope="row" colspan="2">
                 <div>
                     <label for="<?php echo $this->get_field_id(); ?>">
@@ -182,14 +182,14 @@ 
             </td>
         <?php }
 
-    }
+	}
 
-    /**
-     * important! Override this class
-     * outputs the input html part
-     */
-    function render_input( $override_input ) {
-        echo '';
-    }
+	/**
+	 * important! Override this class
+	 * outputs the input html part
+	 */
+	function render_input( $override_input ) {
+		echo '';
+	}
 
 }

Spacing +14 added lines, -14 removed lines

@@ -33,14 +33,14 @@ 
         $defaults = self::get_field_defaults();
 
         // Backward compatibility
-        if( !empty( $field['choices'] ) ) {
-        	$field['options'] = $field['choices'];
-        	unset( $field['choices'] );
+        if ( ! empty( $field[ 'choices' ] ) ) {
+        	$field[ 'options' ] = $field[ 'choices' ];
+        	unset( $field[ 'choices' ] );
         }
 
-        $this->field =  wp_parse_args( $field, $defaults );
+        $this->field = wp_parse_args( $field, $defaults );
 
-        $this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
+        $this->value = is_null( $curr_value ) ? $this->field[ 'value' ] : $curr_value;
 
     }
 
@@ -78,11 +78,11 @@ 
 
 
     function get_tooltip() {
-        if( !function_exists('gform_tooltip') ) {
+        if ( ! function_exists( 'gform_tooltip' ) ) {
             return NULL;
         }
 
-        return !empty( $this->field['tooltip'] ) ? ' '.gform_tooltip( $this->field['tooltip'] , false, true ) : NULL;
+        return ! empty( $this->field[ 'tooltip' ] ) ? ' ' . gform_tooltip( $this->field[ 'tooltip' ], false, true ) : NULL;
     }
 
     /**
@@ -90,8 +90,8 @@ 
      * @return string
      */
     function get_field_id() {
-        if( isset( $this->field['id'] ) ) {
-            return esc_attr( $this->field['id'] );
+        if ( isset( $this->field[ 'id' ] ) ) {
+            return esc_attr( $this->field[ 'id' ] );
         }
         return esc_attr( sanitize_html_class( $this->name ) );
     }
@@ -101,7 +101,7 @@ 
      * @return string
      */
     function get_field_label() {
-        return esc_html( trim( $this->field['label'] ) );
+        return esc_html( trim( $this->field[ 'label' ] ) );
     }
 
 	/**
@@ -112,7 +112,7 @@ 
 	 * @return string
 	 */
 	function get_field_left_label() {
-		return ! empty( $this->field['left_label'] ) ? esc_html( trim( $this->field['left_label'] ) ) : NULL;
+		return ! empty( $this->field[ 'left_label' ] ) ? esc_html( trim( $this->field[ 'left_label' ] ) ) : NULL;
 	}
 
     /**
@@ -120,7 +120,7 @@ 
      * @return string
      */
     function get_label_class() {
-        return 'gv-label-'. sanitize_html_class( $this->field['type'] );
+        return 'gv-label-' . sanitize_html_class( $this->field[ 'type' ] );
     }
 
 
@@ -129,7 +129,7 @@ 
      * @return string
      */
     function get_field_desc() {
-        return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
+        return ! empty( $this->field[ 'desc' ] ) ? '<span class="howto">' . $this->field[ 'desc' ] . '</span>' : '';
     }
 
 
@@ -162,7 +162,7 @@ 
      */
     function render_setting( $override_input = NULL ) {
 
-        if( !empty( $this->field['full_width'] ) ) { ?>
+        if ( ! empty( $this->field[ 'full_width' ] ) ) { ?>
             <th scope="row" colspan="2">
                 <div>
                     <label for="<?php echo $this->get_field_id(); ?>">

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

Doc Comments +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 	 *
 	 * @param GF_Field_List $field Gravity Forms field
 	 * @param string|array $field_value Serialized or unserialized array value for the field
-	 * @param int|string $column_id The numeric key of the column (0-index) or the label of the column
+	 * @param integer $column_id The numeric key of the column (0-index) or the label of the column
 	 * @param string $format If set to 'raw', return an array of values for the column. Otherwise, allow Gravity Forms to render using `html` or `text`
 	 *
 	 * @return array|string|null Returns null if the $field_value passed wasn't an array or serialized array

Spacing +13 added lines, -13 removed lines

@@ -62,7 +62,7 @@ 
 		// Add the list columns
 		foreach ( $list_fields as $list_field ) {
 
-			if( empty( $list_field->enableColumns ) ) {
+			if ( empty( $list_field->enableColumns ) ) {
 				continue;
 			}
 
@@ -83,7 +83,7 @@ 
 			}
 
 			// If there are columns, add them under the parent field
-			if( ! empty( $list_columns ) ) {
+			if ( ! empty( $list_columns ) ) {
 
 				$index = array_search( $list_field->id, array_keys( $fields ) ) + 1;
 
@@ -91,7 +91,7 @@ 
 				 * Merge the $list_columns into the $fields array at $index
 				 * @see https://stackoverflow.com/a/1783125
 				 */
-				$fields = array_slice( $fields, 0, $index, true) + $list_columns + array_slice( $fields, $index, null, true);
+				$fields = array_slice( $fields, 0, $index, true ) + $list_columns + array_slice( $fields, $index, null, true );
 			}
 
 			unset( $list_columns, $index, $input_id );
@@ -118,7 +118,7 @@ 
 
 		$list_rows = maybe_unserialize( $field_value );
 
-		if( ! is_array( $list_rows ) ) {
+		if ( ! is_array( $list_rows ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ' - $field_value did not unserialize', $field_value );
 			return null;
 		}
@@ -131,15 +131,15 @@ 
 			foreach ( $list_row as $column_key => $column_value ) {
 
 				// If the label of the column matches $column_id, or the numeric key value matches, add the value
-				if( (string)$column_key === (string)$column_id || ( is_numeric( $column_id ) && (int)$column_id === $current_column ) ) {
-					$column_values[] = $column_value;
+				if ( (string)$column_key === (string)$column_id || ( is_numeric( $column_id ) && (int)$column_id === $current_column ) ) {
+					$column_values[ ] = $column_value;
 				}
 				$current_column++;
 			}
 		}
 
 		// Return the array of values
-		if( 'raw' === $format ) {
+		if ( 'raw' === $format ) {
 			return $column_values;
 		}
 		// Return the Gravity Forms Field output
@@ -162,22 +162,22 @@ 
 	 */
 	public function _filter_field_label( $label, $field, $form, $entry ) {
 
-		$field_object = RGFormsModel::get_field( $form, $field['id'] );
+		$field_object = RGFormsModel::get_field( $form, $field[ 'id' ] );
 
 		// Not a list field
-		if( ! $field_object || 'list' !== $field_object->type ) {
+		if ( ! $field_object || 'list' !== $field_object->type ) {
 			return $label;
 		}
 
 		// Custom label is defined, so use it
-		if( ! empty( $field['custom_label'] ) ) {
+		if ( ! empty( $field[ 'custom_label' ] ) ) {
 			return $label;
 		}
 
-		$column_id = gravityview_get_input_id_from_id( $field['id'] );
+		$column_id = gravityview_get_input_id_from_id( $field[ 'id' ] );
 
 		// Parent field, not column field
-		if( false === $column_id ) {
+		if ( false === $column_id ) {
 			return $label;
 		}
 
@@ -198,7 +198,7 @@ 
 	public static function get_column_label( GF_Field_List $field, $column_id, $backup_label = '' ) {
 
 		// Doesn't have columns enabled
-		if( ! isset( $field->choices ) || ! $field->enableColumns ) {
+		if ( ! isset( $field->choices ) || ! $field->enableColumns ) {
 			return $backup_label;
 		}
 

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

Indentation +1 added lines, -1 removed lines

@@ -227,7 +227,7 @@
 				 */
 				$content = apply_filters( 'gravityview/fields/fileupload/link_content', $content, $gravityview_view->getCurrentField() );
 
-                $content = gravityview_get_link( $link, $content, $link_atts );
+				$content = gravityview_get_link( $link, $content, $link_atts );
 			}
 
 			$output_arr[] = array(

Spacing +32 added lines, -32 removed lines

@@ -20,16 +20,16 @@ 
 
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
-		unset( $field_options['search_filter'] );
+		unset( $field_options[ 'search_filter' ] );
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
-		$add_options['link_to_file'] = array(
+		$add_options[ 'link_to_file' ] = array(
 			'type' => 'checkbox',
 			'label' => __( 'Display as a Link:', 'gravityview' ),
-			'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'),
+			'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ),
 			'value' => false,
 			'merge_tags' => false,
 		);
@@ -65,7 +65,7 @@ 
 		$output_arr = array();
 
 		// Get an array of file paths for the field.
-		$file_paths = rgar( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value );
+		$file_paths = rgar( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value );
 
 		// The $value JSON was probably truncated; let's check lead_detail_long.
 		if ( ! is_array( $file_paths ) ) {
@@ -79,19 +79,19 @@ 
 		}
 
 		// Process each file path
-		foreach( $file_paths as $file_path ) {
+		foreach ( $file_paths as $file_path ) {
 
 			// If the site is HTTPS, use HTTPS
-			if(function_exists('set_url_scheme')) { $file_path = set_url_scheme($file_path); }
+			if ( function_exists( 'set_url_scheme' ) ) { $file_path = set_url_scheme( $file_path ); }
 
 			// This is from Gravity Forms's code
-			$file_path = esc_attr(str_replace(" ", "%20", $file_path));
+			$file_path = esc_attr( str_replace( " ", "%20", $file_path ) );
 
 			// If the field is set to link to the single entry, link to it.
-			$link = !empty( $field_settings['show_as_link'] ) ? GravityView_API::entry_link( $entry, $field ) : $file_path;
+			$link = ! empty( $field_settings[ 'show_as_link' ] ) ? GravityView_API::entry_link( $entry, $field ) : $file_path;
 
 			// Get file path information
-			$file_path_info = pathinfo($file_path);
+			$file_path_info = pathinfo( $file_path );
 
 			$html_format = NULL;
 
@@ -100,30 +100,30 @@ 
 			$disable_wrapped_link = false;
 
 			// Is this an image?
-			$image = new GravityView_Image(array(
+			$image = new GravityView_Image( array(
 				'src' => $file_path,
-				'class' => 'gv-image gv-field-id-'.$field_settings['id'],
-				'alt' => $field_settings['label'],
-				'width' => (gravityview_get_context() === 'single' ? NULL : 250)
-			));
+				'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ],
+				'alt' => $field_settings[ 'label' ],
+				'width' => ( gravityview_get_context() === 'single' ? NULL : 250 )
+			) );
 
 			$content = $image->html();
 
 			// The new default content is the image, if it exists. If not, use the file name as the content.
-			$content = !empty( $content ) ? $content : $file_path_info['basename'];
+			$content = ! empty( $content ) ? $content : $file_path_info[ 'basename' ];
 
 			// If pathinfo() gave us the extension of the file, run the switch statement using that.
-			$extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] );
+			$extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] );
 
 
-			switch( true ) {
+			switch ( true ) {
 
 				// Audio file
 				case in_array( $extension, wp_get_audio_extensions() ):
 
 					$disable_lightbox = true;
 
-					if( shortcode_exists( 'audio' ) ) {
+					if ( shortcode_exists( 'audio' ) ) {
 
 						$disable_wrapped_link = true;
 
@@ -134,8 +134,8 @@ 
 						 */
 						$audio_settings = apply_filters( 'gravityview_audio_settings', array(
 							'src' => $file_path,
-							'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id']
-						));
+							'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ]
+						) );
 
 						/**
 						 * Generate the audio shortcode
@@ -153,7 +153,7 @@ 
 
 					$disable_lightbox = true;
 
-					if( shortcode_exists( 'video' ) ) {
+					if ( shortcode_exists( 'video' ) ) {
 
 						$disable_wrapped_link = true;
 
@@ -164,8 +164,8 @@ 
 						 */
 						$video_settings = apply_filters( 'gravityview_video_settings', array(
 							'src' => $file_path,
-							'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id']
-						));
+							'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ]
+						) );
 
 						/**
 						 * Generate the video shortcode
@@ -187,7 +187,7 @@ 
 					break;
 
 				// if not image, do not set the lightbox (@since 1.5.3)
-				case !in_array( $extension, array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ) ):
+				case ! in_array( $extension, array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ) ):
 
 					$disable_lightbox = true;
 
@@ -197,10 +197,10 @@ 
 
 			// If using Link to File, override the content.
 			// (We do this here so that the $disable_lightbox can be set. Yes, there's a little more processing time, but oh well.)
-			if( !empty( $field_settings['link_to_file'] ) ) {
+			if ( ! empty( $field_settings[ 'link_to_file' ] ) ) {
 
 				// Force the content to be the file name
-				$content =  $file_path_info["basename"];
+				$content = $file_path_info[ "basename" ];
 
 				// Restore the wrapped link
 				$disable_wrapped_link = false;
@@ -208,13 +208,13 @@ 
 			}
 
 			// Whether to use lightbox or not
-			if( $disable_lightbox || empty( $gravityview_view->atts['lightbox'] ) || !empty( $field_settings['show_as_link'] ) ) {
+			if ( $disable_lightbox || empty( $gravityview_view->atts[ 'lightbox' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) {
 
-				$link_atts = empty( $field_settings['show_as_link'] ) ? array( 'target' => '_blank' ) : array();
+				$link_atts = empty( $field_settings[ 'show_as_link' ] ) ? array( 'target' => '_blank' ) : array();
 
 			} else {
 
-				$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
+				$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
 
 				$link_atts = array(
 					'rel' => sprintf( "%s-%s", $gv_class, $entry_slug ),
@@ -240,7 +240,7 @@ 
 			$disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', $disable_wrapped_link, $gravityview_view->getCurrentField() );
 
 			// If the HTML output hasn't been overridden by the switch statement above, use the default format
-			if( !empty( $content ) && empty( $disable_wrapped_link ) ) {
+			if ( ! empty( $content ) && empty( $disable_wrapped_link ) ) {
 
 				/**
 				 * Modify the link text (defaults to the file name)
@@ -255,7 +255,7 @@ 
                 $content = gravityview_get_link( $link, $content, $link_atts );
 			}
 
-			$output_arr[] = array(
+			$output_arr[ ] = array(
 				'file_path' => $file_path,
 				'content' => $content
 			);

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

Indentation +7 added lines, -7 removed lines

@@ -21,13 +21,13 @@
 			'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ),
 		);
 
-        $field_options['make_clickable'] = array(
-            'type' => 'checkbox',
-            'merge_tags' => false,
-            'value' => 0,
-            'label' => __( 'Convert text URLs to HTML links', 'gravityview' ),
-            'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
-        );
+		$field_options['make_clickable'] = array(
+			'type' => 'checkbox',
+			'merge_tags' => false,
+			'value' => 0,
+			'label' => __( 'Convert text URLs to HTML links', 'gravityview' ),
+			'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
+		);
 
 		return $field_options;
 	}

Spacing +3 added lines, -3 removed lines

@@ -25,11 +25,11 @@ 
 
 	function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
-		$field_options['trim_words'] = array(
+		$field_options[ 'trim_words' ] = array(
 			'type' => 'number',
 			'merge_tags' => false,
 			'value' => null,
@@ -37,7 +37,7 @@ 
 			'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ),
 		);
 
-        $field_options['make_clickable'] = array(
+        $field_options[ 'make_clickable' ] = array(
             'type' => 'checkbox',
             'merge_tags' => false,
             'value' => 0,

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

Indentation -1 removed lines

@@ -255,7 +255,6 @@
 	 * Get the default date format for a field based on the field ID and the time format setting
 	 *
 	 * @since 1.14
-
 	 * @param string $time_format The time format ("12" or "24"). Default: "12" {@since 1.14}
 	 * @param int $field_id The ID of the field. Used to figure out full time/hours/minutes/am/pm {@since 1.14}
 	 *

Spacing +18 added lines, -18 removed lines

@@ -59,7 +59,7 @@ 
 
 		add_filter( 'gravityview/sorting/time', array( $this, 'modify_sort_id' ), 10, 2 );
 
-		add_filter('gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 );
+		add_filter( 'gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 );
 	}
 
 	/**
@@ -100,31 +100,31 @@ 
 	public function _maybe_filter_gravity_forms_query( $criteria, $form_ids, $view_id ) {
 
 		// If the search is being sorted
-		if( ! empty( $criteria['sorting']['key'] ) ) {
+		if ( ! empty( $criteria[ 'sorting' ][ 'key' ] ) ) {
 
-			$pieces = explode( $this->_sort_divider, $criteria['sorting']['key'] );
+			$pieces = explode( $this->_sort_divider, $criteria[ 'sorting' ][ 'key' ] );
 
 			/**
 			 * And the sort key matches the key set in modify_sort_id(), then modify the Gravity Forms query SQL
 			 * @see modify_sort_id()
 			 */
-			if( ! empty( $pieces[1] ) ) {
+			if ( ! empty( $pieces[ 1 ] ) ) {
 
 				// Pass these to the _modify_query_sort_by_time_hack() method
-				$this->_time_format = $pieces[1];
-				$this->_date_format = $pieces[2];
+				$this->_time_format = $pieces[ 1 ];
+				$this->_date_format = $pieces[ 2 ];
 
 				// Remove fake input IDs (5.1 doesn't exist. Use 5)
-				$criteria['sorting']['key'] = floor( $pieces[0] );
+				$criteria[ 'sorting' ][ 'key' ] = floor( $pieces[ 0 ] );
 
 				/**
 				 * Make sure sorting is numeric (# of seconds). IMPORTANT.
 				 * @see GVCommon::is_field_numeric() is_numeric should also be set here
 				 */
-				$criteria['sorting']['is_numeric'] = true;
+				$criteria[ 'sorting' ][ 'is_numeric' ] = true;
 
 				// Modify the Gravity Forms WP Query
-				add_filter('query', array( $this, '_modify_query_sort_by_time_hack' ) );
+				add_filter( 'query', array( $this, '_modify_query_sort_by_time_hack' ) );
 			}
 		}
 
@@ -147,9 +147,9 @@ 
 		 * then we want to modify the query.
 		 * @see GFFormsModel::sort_by_field_query()
 		 */
-		if( strpos( $query, self::GF_SORTING_SQL ) > 0 ) {
+		if ( strpos( $query, self::GF_SORTING_SQL ) > 0 ) {
 
-			if( $this->_time_format === '24' ) {
+			if ( $this->_time_format === '24' ) {
 				$sql_str_to_date = "STR_TO_DATE( `value`, '%H:%i' )";
 			} else {
 				$sql_str_to_date = "STR_TO_DATE( `value`, '%h:%i %p' )";
@@ -195,18 +195,18 @@ 
 		// Set variables
 		parent::field_options( $field_options, $template_id, $field_id, $context, $input_type );
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
 		/**
 		 * Set default date format based on field ID and Form ID
 		 */
-		add_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
+		add_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
 
-		$this->add_field_support('date_display', $field_options );
+		$this->add_field_support( 'date_display', $field_options );
 
-		remove_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
+		remove_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
 
 		return $field_options;
 	}
@@ -221,7 +221,7 @@ 
 	private function _get_time_format() {
 		global $post;
 
-		$current_form = isset( $_POST['form_id'] ) ? intval( $_POST['form_id'] ) : gravityview_get_form_id( $post->ID );
+		$current_form = isset( $_POST[ 'form_id' ] ) ? intval( $_POST[ 'form_id' ] ) : gravityview_get_form_id( $post->ID );
 
 		return self::_get_time_format_for_field( $this->_field_id, $current_form );
 	}
@@ -240,7 +240,7 @@ 
 		// GF defaults to 12, so should we.
 		$time_format = '12';
 
-		if( $form_id ) {
+		if ( $form_id ) {
 			$form = GFAPI::get_form( $form_id );
 
 			if ( $form ) {
@@ -287,7 +287,7 @@ 
 		$default = 'h:i A';
 
 		// This doesn't take into account 24-hour
-		switch( $field_input_id ) {
+		switch ( $field_input_id ) {
 			// Hours
 			case 1:
 				return ( $time_format === '12' ) ? 'h' : 'H';

includes/fields/class-gravityview-field-transaction-type.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 	 *
 	 * @since 1.16
 	 *
-	 * @param int|string $value Number value for the field
+	 * @param string $value Number value for the field
 	 *
 	 * @return string Based on $value; `1`: "One-Time Payment"; `2`: "Subscription"
 	 */

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 	public function get_content( $output, $entry, $field_settings, $field ) {
 
 		/** Overridden by a template. */
-		if( ! empty( $field['field_path'] ) ) { return $output; }
+		if ( ! empty( $field[ 'field_path' ] ) ) { return $output; }
 
 		return $this->get_string_from_value( $output );
 	}
@@ -78,11 +78,11 @@ 
 		switch ( intval( $value ) ) {
 			case self::ONE_TIME_PAYMENT:
 			default:
-				$return = __('One-Time Payment', 'gravityview');
+				$return = __( 'One-Time Payment', 'gravityview' );
 				break;
 
 			case self::SUBSCRIPTION:
-				$return = __('Subscription', 'gravityview');
+				$return = __( 'Subscription', 'gravityview' );
 				break;
 		}
 

includes/fields/class-gravityview-field.php

Doc Comments +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 	 * @param bool $url_encode Whether to URL-encode output
 	 * @param bool $esc_html Whether to apply `esc_html()` to output
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	public static function replace_gv_merge_tags(  $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
 

Spacing +16 added lines, -16 removed lines

@@ -114,12 +114,12 @@ 
 
 		add_filter( 'gravityview/sortable/field_blacklist', array( $this, '_filter_sortable_fields' ), 1 );
 
-		if( $this->_custom_merge_tag ) {
+		if ( $this->_custom_merge_tag ) {
 			add_filter( 'gform_custom_merge_tags', array( $this, '_filter_gform_custom_merge_tags' ), 10, 4 );
 			add_filter( 'gform_replace_merge_tags', array( $this, '_filter_gform_replace_merge_tags' ), 10, 7 );
 		}
 
-		if( 'meta' === $this->group || '' !== $this->default_search_label ) {
+		if ( 'meta' === $this->group || '' !== $this->default_search_label ) {
 			add_filter( 'gravityview_search_field_label', array( $this, 'set_default_search_label' ), 10, 3 );
 		}
 
@@ -141,7 +141,7 @@ 
 	 */
 	function set_default_search_label( $label = '', $gf_field = null, $field = array() ) {
 
-		if( $this->name === $field['field'] && '' === $label ) {
+		if ( $this->name === $field[ 'field' ] && '' === $label ) {
 			$label = esc_html( $this->default_search_label );
 		}
 
@@ -162,7 +162,7 @@ 
 	 *
 	 * @return string Original text if {_custom_merge_tag} isn't found. Otherwise, replaced text.
 	 */
-	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
+	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
 
 		/**
 		 * This prevents the gform_replace_merge_tags filter from being called twice, as defined in:
@@ -170,7 +170,7 @@ 
 		 * @see GFCommon::replace_variables_prepopulate()
 		 * @todo Remove eventually: Gravity Forms fixed this issue in 1.9.14
 		 */
-		if( false === $form ) {
+		if ( false === $form ) {
 			return $text;
 		}
 
@@ -203,19 +203,19 @@ 
 	 */
 	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
 
-		foreach( $matches as $match ) {
+		foreach ( $matches as $match ) {
 
-			$full_tag = $match[0];
+			$full_tag = $match[ 0 ];
 
 			// Strip the Merge Tags
-			$tag = str_replace( array( '{', '}'), '', $full_tag );
+			$tag = str_replace( array( '{', '}' ), '', $full_tag );
 
 			// Replace the value from the entry, if exists
-			if( isset( $entry[ $tag ] ) ) {
+			if ( isset( $entry[ $tag ] ) ) {
 
 				$value = $entry[ $tag ];
 
-				if( is_callable( array( $this, 'get_content') ) ) {
+				if ( is_callable( array( $this, 'get_content' ) ) ) {
 					$value = $this->get_content( $value );
 				}
 
@@ -288,8 +288,8 @@ 
 	 */
 	public function _filter_sortable_fields( $not_sortable ) {
 
-		if( ! $this->is_sortable ) {
-			$not_sortable[] = $this->name;
+		if ( ! $this->is_sortable ) {
+			$not_sortable[ ] = $this->name;
 		}
 
 		return $not_sortable;
@@ -318,7 +318,7 @@ 
 			'date_display' => array(
 				'type' => 'text',
 				'label' => __( 'Override Date Format', 'gravityview' ),
-				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview'), '<a href="https://codex.wordpress.org/Formatting_Date_and_Time">', '</a>' ),
+				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview' ), '<a href="https://codex.wordpress.org/Formatting_Date_and_Time">', '</a>' ),
 				/**
 				 * @filter `gravityview_date_format` Override the date format with a [PHP date format](https://codex.wordpress.org/Formatting_Date_and_Time)
 				 * @param[in,out] null|string $date_format Date Format (default: null)
@@ -343,7 +343,7 @@ 
 
 		$options = $this->field_support_options();
 
-		if( isset( $options[ $key ] ) ) {
+		if ( isset( $options[ $key ] ) ) {
 			$field_options[ $key ] = $options[ $key ];
 		}
 
@@ -407,11 +407,11 @@ 
 		$connected_form = rgpost( 'form_id' );
 
 		// Otherwise, get the Form ID from the Post page
-		if( empty( $connected_form ) ) {
+		if ( empty( $connected_form ) ) {
 			$connected_form = gravityview_get_form_id( get_the_ID() );
 		}
 
-		if( empty( $connected_form ) ) {
+		if ( empty( $connected_form ) ) {
 			do_action( 'gravityview_log_error', sprintf( '%s: Form not found for form ID "%s"', __METHOD__, $connected_form ) );
 			return false;
 		}