gravityview / GravityView

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

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/class-gravityview-entry-approval-status.php

Spacing +5 added lines, -5 removed lines

@@ -113,16 +113,16 @@ 
 		$new_value = $old_value;
 
 		// Meta value does not exist yet
-		if( false === $old_value ) {
+		if ( false === $old_value ) {
 			return self::UNAPPROVED;
 		}
 
 		// Meta value does not exist yet
-		if( true === $old_value ) {
+		if ( true === $old_value ) {
 			return self::APPROVED;
 		}
 
-		switch ( (string) $old_value ) {
+		switch ( (string)$old_value ) {
 
 			// Approved values
 			case 'Approved':
@@ -247,9 +247,9 @@ 
 		foreach ( $choices as $key => $choice ) {
 
 			// Is the passed status value the same as the choice value or key?
-			if ( $status === $choice['value'] || $status === $key ) {
+			if ( $status === $choice[ 'value' ] || $status === $key ) {
 
-				if( 'key' === $attr_key ) {
+				if ( 'key' === $attr_key ) {
 					return $key;
 				} else {
 					return rgar( $choice, $attr_key, false );

includes/class-post-types.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 		// Load even when invalid to allow for export
 		add_action( 'init', array( 'GravityView_Post_Types', 'init_post_types' ) );
 
-		if( GravityView_Compatibility::is_valid() ) {
+		if ( GravityView_Compatibility::is_valid() ) {
 			add_action( 'init', array( 'GravityView_Post_Types', 'init_rewrite' ) );
 		}
 	}
@@ -43,8 +43,8 @@ 
 
 		$supports = array( 'title', 'revisions' );
 
-		if( $is_hierarchical ) {
-			$supports[] = 'page-attributes';
+		if ( $is_hierarchical ) {
+			$supports[ ] = 'page-attributes';
 		}
 
 		/**

includes/extensions/entry-notes/class-gravityview-field-notes.php

Spacing +79 added lines, -79 removed lines

@@ -63,18 +63,18 @@ 
 
 		add_shortcode( 'gv_note_add', array( 'GravityView_Field_Notes', 'get_add_note_part' ) );
 
-		add_action( 'wp', array( $this, 'maybe_delete_notes'), 1000 );
-		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes') );
-		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes') );
+		add_action( 'wp', array( $this, 'maybe_delete_notes' ), 1000 );
+		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
+		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
 
-		add_action( 'wp', array( $this, 'maybe_add_note'), 1000 );
-		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note') );
-		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note') );
+		add_action( 'wp', array( $this, 'maybe_add_note' ), 1000 );
+		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note' ) );
+		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note' ) );
 
 		// add template path to check for field
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
 
-		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') );
+		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
 		add_action( 'gravityview/field/notes/scripts', array( $this, 'enqueue_scripts' ) );
 		
 		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_entry_default_field' ), 10, 3 );
@@ -96,8 +96,8 @@ 
 	 */
 	public function add_entry_default_field( $entry_default_fields, $form, $zone ) {
 
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
-			$entry_default_fields['notes'] = array(
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
+			$entry_default_fields[ 'notes' ] = array(
 				'label' => __( 'Entry Notes', 'gravityview' ),
 				'type'  => 'notes',
 				'desc'  => __( 'Display, add, and delete notes for an entry.', 'gravityview' ),
@@ -130,23 +130,23 @@ 
 	public function enqueue_scripts() {
 		global $wp_actions;
 
-		if( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
+		if ( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
 			wp_enqueue_style( 'gravityview-notes' );
 			wp_enqueue_script( 'gravityview-notes' );
 		}
 
-		if( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
+		if ( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
 
 			$strings = self::strings();
 
 			wp_localize_script( 'gravityview-notes', 'GVNotes', array(
 				'ajaxurl' => admin_url( 'admin-ajax.php' ),
 				'text' => array(
-					'processing' => $strings['processing'],
-					'delete_confirm' => $strings['delete-confirm'],
-					'note_added' => $strings['added-note'],
-					'error_invalid' => $strings['error-invalid'],
-					'error_empty_note' => $strings['error-empty-note'],
+					'processing' => $strings[ 'processing' ],
+					'delete_confirm' => $strings[ 'delete-confirm' ],
+					'note_added' => $strings[ 'added-note' ],
+					'error_invalid' => $strings[ 'error-invalid' ],
+					'error_empty_note' => $strings[ 'error-empty-note' ],
 				),
 			) );
 		}
@@ -163,22 +163,22 @@ 
 	 */
 	function maybe_add_note() {
 
-		if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
+		if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' );
 			return;
 		}
 
-		if( 'gv_note_add' === rgpost('action') ) {
+		if ( 'gv_note_add' === rgpost( 'action' ) ) {
 
 			$post = wp_unslash( $_POST );
 
-			if( $this->doing_ajax ) {
-				parse_str( $post['data'], $data );
+			if ( $this->doing_ajax ) {
+				parse_str( $post[ 'data' ], $data );
 			} else {
 				$data = $post;
 			}
 
-			$this->process_add_note( (array) $data );
+			$this->process_add_note( (array)$data );
 		}
 	}
 
@@ -205,23 +205,23 @@ 
 		$error = false;
 		$success = false;
 
-		if( empty( $data['entry-slug'] ) ) {
+		if ( empty( $data[ 'entry-slug' ] ) ) {
 
-			$error = self::strings('error-invalid');
+			$error = self::strings( 'error-invalid' );
 			do_action( 'gravityview_log_error', __METHOD__ . ': The note is missing an Entry ID.' );
 
 		} else {
 
-			$valid = wp_verify_nonce( $data['gv_note_add'], 'gv_note_add_' . $data['entry-slug'] );
+			$valid = wp_verify_nonce( $data[ 'gv_note_add' ], 'gv_note_add_' . $data[ 'entry-slug' ] );
 			
 			$has_cap = GVCommon::has_cap( 'gravityview_add_entry_notes' );
 
-			if( ! $has_cap ) {
+			if ( ! $has_cap ) {
 				$error = self::strings( 'error-cap-add' );
 				do_action( 'gravityview_log_error', __METHOD__ . ': Adding a note failed: the user does not have the "gravityview_add_entry_notes" capability.' );
 			} elseif ( $valid ) {
 
-				$entry = gravityview_get_entry( $data['entry-slug'], true, false );
+				$entry = gravityview_get_entry( $data[ 'entry-slug' ], true, false );
 
 				$added = $this->add_note( $entry, $data );
 
@@ -239,22 +239,22 @@ 
 					$this->maybe_send_entry_notes( $note, $entry, $data );
 
 					if ( $note ) {
-						$success = self::display_note( $note, ! empty( $data['show-delete'] ) );
-						do_action( 'gravityview_log_debug', __METHOD__ . ': The note was successfully created', compact('note', 'data') );
+						$success = self::display_note( $note, ! empty( $data[ 'show-delete' ] ) );
+						do_action( 'gravityview_log_debug', __METHOD__ . ': The note was successfully created', compact( 'note', 'data' ) );
 					} else {
-						$error = self::strings('error-add-note');
-						do_action( 'gravityview_log_error', __METHOD__ . ': The note was not successfully created', compact('note', 'data') );
+						$error = self::strings( 'error-add-note' );
+						do_action( 'gravityview_log_error', __METHOD__ . ': The note was not successfully created', compact( 'note', 'data' ) );
 					}
 				}
 			} else {
-				$error = self::strings('error-invalid');
+				$error = self::strings( 'error-invalid' );
 				do_action( 'gravityview_log_error', __METHOD__ . ': Nonce validation failed; the note was not created' );
 			}
 		}
 
 
-		if( $this->doing_ajax ) {
-			if( $success ) {
+		if ( $this->doing_ajax ) {
+			if ( $success ) {
 				wp_send_json_success( array( 'html' => $success ) );
 			} else {
 				$error = $error ? $error : self::strings( 'error-invalid' );
@@ -280,11 +280,11 @@ 
 			return;
 		}
 
-		if ( isset( $_POST['action'] ) && 'gv_delete_notes' === $_POST['action'] ) {
+		if ( isset( $_POST[ 'action' ] ) && 'gv_delete_notes' === $_POST[ 'action' ] ) {
 
 			$post = wp_unslash( $_POST );
 			if ( $this->doing_ajax ) {
-				parse_str( $post['data'], $data );
+				parse_str( $post[ 'data' ], $data );
 			} else {
 				$data = $post;
 			}
@@ -315,18 +315,18 @@ 
 	 */
 	function process_delete_notes( $data ) {
 
-		$valid = wp_verify_nonce( $data['gv_delete_notes'], 'gv_delete_notes_' . $data['entry-slug'] );
+		$valid = wp_verify_nonce( $data[ 'gv_delete_notes' ], 'gv_delete_notes_' . $data[ 'entry-slug' ] );
 		$has_cap = GVCommon::has_cap( 'gravityview_delete_entry_notes' );
 		$success = false;
 
 		if ( $valid && $has_cap ) {
-			GravityView_Entry_Notes::delete_notes( $data['note'] );
+			GravityView_Entry_Notes::delete_notes( $data[ 'note' ] );
 			$success = true;
 		}
 
-		if( $this->doing_ajax ) {
+		if ( $this->doing_ajax ) {
 
-			if( $success ) {
+			if ( $success ) {
 				wp_send_json_success();
 			} else {
 				if ( ! $valid ) {
@@ -359,13 +359,13 @@ 
 
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
-		unset( $field_options['show_as_link'] );
+		unset( $field_options[ 'show_as_link' ] );
 
 		$notes_options = array(
 			'notes' => array(
 				'type' => 'checkboxes',
-				'label' => __('Note Settings', 'gravityview'),
-				'desc' => sprintf( _x('Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
+				'label' => __( 'Note Settings', 'gravityview' ),
+				'desc' => sprintf( _x( 'Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
 				'options' => array(
 					'view' => array(
 						'label' => __( 'Display notes?', 'gravityview' ),
@@ -417,7 +417,7 @@ 
 			'processing' => __( 'Processing&hellip;', 'gravityview' ),
 			'other-email' => __( 'Other email address', 'gravityview' ),
 			'email-label' => __( 'Email address', 'gravityview' ),
-			'email-placeholder' => _x('you@example.com', 'Example email address used as a placeholder', 'gravityview'),
+			'email-placeholder' => _x( 'you@example.com', 'Example email address used as a placeholder', 'gravityview' ),
 			'subject-label' => __( 'Subject', 'gravityview' ),
 			'subject' => __( 'Email subject', 'gravityview' ),
 			'default-email-subject' => __( 'New entry note', 'gravityview' ),
@@ -437,7 +437,7 @@ 
 		 */
 		$strings = gv_map_deep( apply_filters( 'gravityview/field/notes/strings', $strings ), 'esc_html' );
 
-		if( $key ) {
+		if ( $key ) {
 			return isset( $strings[ $key ] ) ? $strings[ $key ] : '';
 		}
 
@@ -456,7 +456,7 @@ 
 	 */
 	static public function display_note( $note, $show_delete = false ) {
 
-		if( ! is_object( $note ) ) {
+		if ( ! is_object( $note ) ) {
 			return '';
 		}
 
@@ -497,7 +497,7 @@ 
 		$note_row = ob_get_clean();
 
 		$replacements = array(
-			'{note_id}' => $note_content['note_id'],
+			'{note_id}' => $note_content[ 'note_id' ],
 			'{row_class}' => 'gv-note',
 			'{note_detail}' => $note_detail_html
 		);
@@ -529,13 +529,13 @@ 
 
 		$user_data = get_userdata( $current_user->ID );
 
-		$note_content = trim( $data['gv-note-content'] );
+		$note_content = trim( $data[ 'gv-note-content' ] );
 
-		if( empty( $note_content ) ) {
+		if ( empty( $note_content ) ) {
 			return new WP_Error( 'gv-add-note-empty', __( 'The note is empty.', 'gravityview' ) );
 		}
 
-		$return = GravityView_Entry_Notes::add_note( $entry['id'], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
+		$return = GravityView_Entry_Notes::add_note( $entry[ 'id' ], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
 
 		return $return;
 	}
@@ -551,7 +551,7 @@ 
 	 */
 	public static function get_add_note_part() {
 
-		if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
+		if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ': User does not have permission to add entry notes ("gravityview_add_entry_notes").' );
 			return '';
 		}
@@ -564,19 +564,19 @@ 
 
 		$visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
 		$entry = $gravityview_view->getCurrentEntry();
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
 		$nonce_field = wp_nonce_field( 'gv_note_add_' . $entry_slug, 'gv_note_add', false, false );
 
 		// Only generate the dropdown if the field settings allow it
 		$email_fields = '';
-		if( ! empty( $visibility_settings['email'] ) ) {
+		if ( ! empty( $visibility_settings[ 'email' ] ) ) {
 			$email_fields = self::get_note_email_fields( $entry_slug );
 		}
 
 		$add_note_html = str_replace( '{entry_slug}', $entry_slug, $add_note_html );
 		$add_note_html = str_replace( '{nonce_field}', $nonce_field, $add_note_html );
-		$add_note_html = str_replace( '{show_delete}', intval( $visibility_settings['delete'] ), $add_note_html );
-		$add_note_html   = str_replace( '{email_fields}', $email_fields, $add_note_html );
+		$add_note_html = str_replace( '{show_delete}', intval( $visibility_settings[ 'delete' ] ), $add_note_html );
+		$add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html );
 		$add_note_html = str_replace( '{url}', esc_url_raw( add_query_arg( array() ) ), $add_note_html );
 
 		return $add_note_html;
@@ -601,8 +601,8 @@ 
 		$note_emails = array();
 
 		foreach ( $email_fields as $email_field ) {
-			if ( ! empty( $entry["{$email_field->id}"] ) && is_email( $entry["{$email_field->id}"] ) ) {
-				$note_emails[] = $entry["{$email_field->id}"];
+			if ( ! empty( $entry[ "{$email_field->id}" ] ) && is_email( $entry[ "{$email_field->id}" ] ) ) {
+				$note_emails[ ] = $entry[ "{$email_field->id}" ];
 			}
 		}
 
@@ -614,7 +614,7 @@ 
 		 */
 		$note_emails = apply_filters( 'gravityview/field/notes/emails', $note_emails, $entry );
 
-		return (array) $note_emails;
+		return (array)$note_emails;
 	}
 
 	/**
@@ -630,7 +630,7 @@ 
 	 */
 	private static function get_note_email_fields( $entry_slug = '' ) {
 
-		if( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
+		if ( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ': User does not have permission to email entry notes ("gravityview_email_entry_notes").' );
 			return '';
 		}
@@ -652,27 +652,27 @@ 
 
 		if ( ! empty( $note_emails ) || $include_custom ) { ?>
 			<div class="gv-note-email-container">
-				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings['also-email'];  ?></label>
+				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings[ 'also-email' ]; ?></label>
 				<select class="gv-note-email-to" name="gv-note-to" id="gv-note-email-to-<?php echo $entry_slug_esc; ?>">
-					<option value=""><?php echo $strings['also-email'];  ?></option>
+					<option value=""><?php echo $strings[ 'also-email' ]; ?></option>
 					<?php foreach ( $note_emails as  $email ) {
 						?>
 						<option value="<?php echo esc_attr( $email ); ?>"><?php echo esc_html( $email ); ?></option>
 					<?php }
-					if( $include_custom ) { ?>
-					<option value="custom"><?php echo self::strings('other-email'); ?></option>
+					if ( $include_custom ) { ?>
+					<option value="custom"><?php echo self::strings( 'other-email' ); ?></option>
 					<?php } ?>
 				</select>
 				<fieldset class="gv-note-to-container">
-					<?php if( $include_custom ) { ?>
+					<?php if ( $include_custom ) { ?>
 					<div class='gv-note-to-custom-container'>
-						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings['email-label']; ?></label>
-						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings['email-placeholder']; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
+						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'email-label' ]; ?></label>
+						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings[ 'email-placeholder' ]; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
 					</div>
 					<?php } ?>
 		            <div class='gv-note-subject-container'>
-		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings['subject-label']; ?></label>
-		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings['subject']; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
+		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'subject-label' ]; ?></label>
+		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings[ 'subject' ]; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
 		            </div>
 				</fieldset>
 			</div>
@@ -695,7 +695,7 @@ 
 	 */
 	private function maybe_send_entry_notes( $note = false, $entry, $data ) {
 
-		if( ! $note || ! GVCommon::has_cap('gravityview_email_entry_notes') ) {
+		if ( ! $note || ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
 			do_action( 'gravityview_log_debug', __METHOD__ . ': User doesnt have "gravityview_email_entry_notes" cap, or $note is empty', $note );
 			return;
 		}
@@ -703,7 +703,7 @@ 
 		do_action( 'gravityview_log_debug', __METHOD__ . ': $data', $data );
 
 		//emailing notes if configured
-		if ( ! empty( $data['gv-note-to'] ) ) {
+		if ( ! empty( $data[ 'gv-note-to' ] ) ) {
 
 			$default_data = array(
 				'gv-note-to' => '',
@@ -713,11 +713,11 @@ 
                 'current-url' => '',
 			);
 
-			$current_user  = wp_get_current_user();
+			$current_user = wp_get_current_user();
 			$email_data = wp_parse_args( $data, $default_data );
 
-			$from    = $current_user->user_email;
-			$to = $email_data['gv-note-to'];
+			$from = $current_user->user_email;
+			$to = $email_data[ 'gv-note-to' ];
 
 			/**
 			 * Documented in get_note_email_fields
@@ -725,8 +725,8 @@ 
 			 */
 			$include_custom = apply_filters( 'gravityview/field/notes/custom-email', true );
 
-			if( 'custom' === $to && $include_custom ) {
-				$to = $email_data['gv-note-to-custom'];
+			if ( 'custom' === $to && $include_custom ) {
+				$to = $email_data[ 'gv-note-to-custom' ];
 				do_action( 'gravityview_log_debug', __METHOD__ . ': Sending note to a custom email address: ' . $to );
 			}
 
@@ -737,13 +737,13 @@ 
 
 			$bcc = false;
 			$reply_to = $from;
-			$subject = trim( $email_data['gv-note-subject'] );
+			$subject = trim( $email_data[ 'gv-note-subject' ] );
 
 			// We use empty() here because GF uses empty to check against, too. `0` isn't a valid subject to GF
 			$subject = empty( $subject ) ? self::strings( 'default-email-subject' ) : $subject;
-			$message = $email_data['gv-note-content'];
+			$message = $email_data[ 'gv-note-content' ];
 			$email_footer = self::strings( 'email-footer' );
-			$from_name     = $current_user->display_name;
+			$from_name = $current_user->display_name;
 			$message_format = 'html';
 
 			/**
@@ -774,7 +774,7 @@ 
 
 			GVCommon::send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name, $message_format, '', $entry, false );
 
-			$form  = isset( $entry['form_id'] ) ? GFAPI::get_form( $entry['form_id'] ) : array();
+			$form = isset( $entry[ 'form_id' ] ) ? GFAPI::get_form( $entry[ 'form_id' ] ) : array();
 
 			/**
 			 * @see https://www.gravityhelp.com/documentation/article/10146-2/ It's here for compatibility with Gravity Forms
@@ -800,7 +800,7 @@ 
 
 	    $output = '';
 
-		if( ! empty( $email_footer ) ) {
+		if ( ! empty( $email_footer ) ) {
 		    $url = rgar( $email_data, 'current-url' );
 			$url = html_entity_decode( $url );
 			$url = site_url( $url );

includes/class-cache.php

Spacing +15 added lines, -15 removed lines

@@ -79,7 +79,7 @@ 
 		/**
 		 * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
 		 */
-		foreach( $this->lead_db_columns as $column ) {
+		foreach ( $this->lead_db_columns as $column ) {
 			add_action( 'gform_update_' . $column, array( $this, 'entry_status_changed' ), 10, 3 );
 		}
 
@@ -112,9 +112,9 @@ 
 			return;
 		}
 
-		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry['form_id'] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
+		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry[ 'form_id' ] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
 		
-		$this->blacklist_add( $entry['form_id'] );
+		$this->blacklist_add( $entry[ 'form_id' ] );
 	}
 
 	/**
@@ -127,9 +127,9 @@ 
 	 */
 	public function entry_updated( $form, $lead_id ) {
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form['id'] . ' to blacklist because entry #' . $lead_id . ' was updated' );
+		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form[ 'id' ] . ' to blacklist because entry #' . $lead_id . ' was updated' );
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add( $form[ 'id' ] );
 	}
 
 	/**
@@ -144,9 +144,9 @@ 
 	 */
 	public function entry_created( $entry, $form ) {
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form['id'] . ' to blacklist because entry #' . $entry['id'] . ' was created' );
+		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form[ 'id' ] . ' to blacklist because entry #' . $entry[ 'id' ] . ' was created' );
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add( $form[ 'id' ] );
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 		// Normally just one form, but supports multiple forms
 		//
 		// Array of IDs 12, 5, 14 would result in `f-12f-5f-14`
-		$forms = 'f:' . implode( '&f:', (array) $form_ids );
+		$forms = 'f:' . implode( '&f:', (array)$form_ids );
 
 		// Prefix for transient keys
 		// Now the prefix would be: `gv-cache-f-12f-5f-14`
@@ -222,7 +222,7 @@ 
 		) );
 
 		// Add the passed form IDs
-		$blacklist = array_merge( (array) $blacklist, $form_ids );
+		$blacklist = array_merge( (array)$blacklist, $form_ids );
 
 		// Don't duplicate
 		$blacklist = array_unique( $blacklist );
@@ -242,7 +242,7 @@ 
 
 		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
 
-		$updated_list = array_diff( $blacklist, (array) $form_ids );
+		$updated_list = array_diff( $blacklist, (array)$form_ids );
 
 		do_action( 'gravityview_log_debug', 'GravityView_Cache[blacklist_remove] Removing form IDs from cache blacklist', array(
 			'$form_ids'     => $form_ids,
@@ -275,7 +275,7 @@ 
 			return false;
 		}
 
-		foreach ( (array) $form_ids as $form_id ) {
+		foreach ( (array)$form_ids as $form_id ) {
 
 			if ( in_array( $form_id, $blacklist ) ) {
 
@@ -347,7 +347,7 @@ 
 			 * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
 			 * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
 			 */
-			$cache_time = (int) apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
+			$cache_time = (int)apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
 
 			do_action( 'gravityview_log_debug', 'GravityView_Cache[set] Setting cache with transient key ' . $this->key . ' for ' . $cache_time . ' seconds' );
 
@@ -383,7 +383,7 @@ 
 			return;
 		}
 
-		foreach ( (array) $form_ids as $form_id ) {
+		foreach ( (array)$form_ids as $form_id ) {
 
 			$key = $this->get_cache_key_prefix( $form_id );
 
@@ -497,7 +497,7 @@ 
 
 		if ( GVCommon::has_cap( 'edit_gravityviews' ) ) {
 
-			if ( isset( $_GET['cache'] ) || isset( $_GET['nocache'] ) ) {
+			if ( isset( $_GET[ 'cache' ] ) || isset( $_GET[ 'nocache' ] ) ) {
 
 				do_action( 'gravityview_log_debug', 'GravityView_Cache[use_cache] Not using cache: ?cache or ?nocache is in the URL' );
 
@@ -526,7 +526,7 @@ 
 		 */
 		$use_cache = apply_filters( 'gravityview_use_cache', $use_cache, $this );
 
-		return (boolean) $use_cache;
+		return (boolean)$use_cache;
 	}
 
 }

includes/class-gravityview-shortcode.php

Spacing +9 added lines, -9 removed lines

@@ -49,8 +49,8 @@ 
 		do_action( 'gravityview_log_debug', __FUNCTION__ . ' $passed_atts: ', $passed_atts );
 
 		// Get details about the current View
-		if( !empty( $passed_atts['detail'] ) ) {
-			return $this->get_view_detail( $passed_atts['detail'] );
+		if ( ! empty( $passed_atts[ 'detail' ] ) ) {
+			return $this->get_view_detail( $passed_atts[ 'detail' ] );
 		}
 
 		$atts = $this->parse_and_sanitize_atts( $passed_atts );
@@ -86,16 +86,16 @@ 
 		$filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' );
 
 		// Only keep the passed attributes after making sure that they're valid pairs
-		$filtered_atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( (array) $passed_atts, $filtered_atts ) : $filtered_atts;
+		$filtered_atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( (array)$passed_atts, $filtered_atts ) : $filtered_atts;
 
 		$atts = array();
 
-		foreach( $filtered_atts as $key => $passed_value ) {
+		foreach ( $filtered_atts as $key => $passed_value ) {
 
 			// Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by}
 			$passed_value = GravityView_Merge_Tags::replace_variables( $passed_value );
 
-			switch( $defaults[ $key ]['type'] ) {
+			switch ( $defaults[ $key ][ 'type' ] ) {
 
 				/**
 				 * Make sure number fields are numeric.
@@ -103,7 +103,7 @@ 
 				 * @see http://php.net/manual/en/function.is-numeric.php#107326
 				 */
 				case 'number':
-					if( is_numeric( $passed_value ) ) {
+					if ( is_numeric( $passed_value ) ) {
 						$atts[ $key ] = ( $passed_value + 0 );
 					}
 					break;
@@ -118,8 +118,8 @@ 
 				 */
 				case 'select':
 				case 'radio':
-					$options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options'];
-					if( in_array( $passed_value, array_keys( $options ) ) ) {
+					$options = isset( $defaults[ $key ][ 'choices' ] ) ? $defaults[ $key ][ 'choices' ] : $defaults[ $key ][ 'options' ];
+					if ( in_array( $passed_value, array_keys( $options ) ) ) {
 						$atts[ $key ] = $passed_value;
 					}
 					break;
@@ -148,7 +148,7 @@ 
 		$gravityview_view = GravityView_View::getInstance();
 		$return = '';
 
-		switch( $detail ) {
+		switch ( $detail ) {
 			case 'total_entries':
 				$return = number_format_i18n( $gravityview_view->getTotalEntries() );
 				break;

includes/class-gravityview-entry-approval.php

Spacing +37 added lines, -37 removed lines

@@ -39,13 +39,13 @@ 
 	private function add_hooks() {
 
 		// in case entry is edited (on admin or frontend)
-		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2);
+		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2 );
 
 		// when using the User opt-in field, check on entry submission
 		add_action( 'gform_after_submission', array( $this, 'after_submission' ), 10, 2 );
 
 		// process ajax approve entry requests
-		add_action('wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved'));
+		add_action( 'wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved' ) );
 
 	}
 
@@ -62,13 +62,13 @@ 
 	 */
 	public static function get_entry_status( $entry, $value_or_label = 'label' ) {
 
-		$entry_id = is_array( $entry ) ? $entry['id'] : GVCommon::get_entry_id( $entry );
+		$entry_id = is_array( $entry ) ? $entry[ 'id' ] : GVCommon::get_entry_id( $entry );
 
 		$status = gform_get_meta( $entry_id, self::meta_key );
 
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
 
-		if( 'value' === $value_or_label ) {
+		if ( 'value' === $value_or_label ) {
 			return $status;
 		}
 
@@ -93,16 +93,16 @@ 
 	 */
 	public function ajax_update_approved() {
 
-		$form_id = intval( rgpost('form_id') );
+		$form_id = intval( rgpost( 'form_id' ) );
 
-		$entry_id = GVCommon::get_entry_id( rgpost('entry_slug') );
+		$entry_id = GVCommon::get_entry_id( rgpost( 'entry_slug' ) );
 
-		$approval_status = rgpost('approved');
+		$approval_status = rgpost( 'approved' );
 
-		$nonce = rgpost('nonce');
+		$nonce = rgpost( 'nonce' );
 
 		// Valid status
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
 
 			do_action( 'gravityview_log_error', __METHOD__ . ': Invalid approval status', $_POST );
 
@@ -133,7 +133,7 @@ 
 
 			do_action( 'gravityview_log_error', __METHOD__ . ' User does not have the `gravityview_moderate_entries` capability.' );
 
-			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview') );
+			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview' ) );
 
 		}
 
@@ -166,7 +166,7 @@ 
 	 * @param $form array Gravity Forms form object
 	 */
 	public function after_submission( $entry, $form ) {
-		$this->after_update_entry_update_approved_meta( $form , $entry['id'] );
+		$this->after_update_entry_update_approved_meta( $form, $entry[ 'id' ] );
 	}
 
 	/**
@@ -180,18 +180,18 @@ 
 	 */
 	public function after_update_entry_update_approved_meta( $form, $entry_id = NULL ) {
 
-		$approved_column = self::get_approved_column( $form['id'] );
+		$approved_column = self::get_approved_column( $form[ 'id' ] );
 
 		/**
 		 * If the form doesn't contain the approve field, don't assume anything.
 		 */
-		if( empty( $approved_column ) ) {
+		if ( empty( $approved_column ) ) {
 			return;
 		}
 
 		$entry = GFAPI::get_entry( $entry_id );
 
-		self::update_approved_meta( $entry_id, $entry[ (string)$approved_column ], $form['id'] );
+		self::update_approved_meta( $entry_id, $entry[ (string)$approved_column ], $form[ 'id' ] );
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 
 		$success = true;
 		foreach ( $entries as $entry_id ) {
-			$update_success = self::update_approved( (int) $entry_id, $approved, $form_id, $approved_column_id );
+			$update_success = self::update_approved( (int)$entry_id, $approved, $form_id, $approved_column_id );
 
 			if ( ! $update_success ) {
 				$success = false;
@@ -256,12 +256,12 @@ 
 	 */
 	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0 ) {
 
-		if( !class_exists( 'GFAPI' ) ) {
+		if ( ! class_exists( 'GFAPI' ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . 'GFAPI does not exist' );
 			return false;
 		}
 
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ': Not a valid approval value.' );
 			return false;
 		}
@@ -278,7 +278,7 @@ 
 		// If the form has an Approve/Reject field, update that value
 		$result = self::update_approved_column( $entry_id, $approved, $form_id, $approvedcolumn );
 
-		if( is_wp_error( $result ) ) {
+		if ( is_wp_error( $result ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . sprintf( ' - Entry approval not updated: %s', $result->get_error_message() ) );
 			return false;
 		}
@@ -290,7 +290,7 @@ 
 
 		// add note to entry if approval field updating worked or there was no approved field
 		// There's no validation for the meta
-		if( true === $result ) {
+		if ( true === $result ) {
 
 			// Add an entry note
 			self::add_approval_status_updated_note( $entry_id, $approved );
@@ -343,7 +343,7 @@ 
 
 		$note_id = false;
 
-		if( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
+		if ( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
 
 			$current_user = wp_get_current_user();
 
@@ -365,7 +365,7 @@ 
 	 */
 	private static function update_approved_column( $entry_id = 0, $status = '0', $form_id = 0, $approvedcolumn = 0 ) {
 
-		if( empty( $approvedcolumn ) ) {
+		if ( empty( $approvedcolumn ) ) {
 			$approvedcolumn = self::get_approved_column( $form_id );
 		}
 
@@ -413,16 +413,16 @@ 
 	private static function update_approved_meta( $entry_id, $status, $form_id = 0 ) {
 
 		if ( ! GravityView_Entry_Approval_Status::is_valid( $status ) ) {
-			do_action('gravityview_log_error', __METHOD__ . ': $is_approved not valid value', $status );
+			do_action( 'gravityview_log_error', __METHOD__ . ': $is_approved not valid value', $status );
 			return;
 		}
 
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
 
 		// update entry meta
-		if( function_exists('gform_update_meta') ) {
+		if ( function_exists( 'gform_update_meta' ) ) {
 
-			if( GravityView_Entry_Approval_Status::is_unapproved( $status ) ) {
+			if ( GravityView_Entry_Approval_Status::is_unapproved( $status ) ) {
 				gform_delete_meta( $entry_id, self::meta_key );
 			} else {
 				gform_update_meta( $entry_id, self::meta_key, $status, $form_id );
@@ -445,11 +445,11 @@ 
 			 * @since 1.18 Added "unapproved"
 			 * @param  int $entry_id ID of the Gravity Forms entry
 			 */
-			do_action( 'gravityview/approve_entries/' . $action , $entry_id );
+			do_action( 'gravityview/approve_entries/' . $action, $entry_id );
 
 		} else {
 
-			do_action('gravityview_log_error', __METHOD__ . ' - `gform_update_meta` does not exist.' );
+			do_action( 'gravityview_log_error', __METHOD__ . ' - `gform_update_meta` does not exist.' );
 
 		}
 	}
@@ -464,29 +464,29 @@ 
 	 */
 	static public function get_approved_column( $form ) {
 
-		if( empty( $form ) ) {
+		if ( empty( $form ) ) {
 			return null;
 		}
 
-		if( !is_array( $form ) ) {
+		if ( ! is_array( $form ) ) {
 			$form = GVCommon::get_form( $form );
 		}
 
-		foreach( $form['fields'] as $key => $field ) {
+		foreach ( $form[ 'fields' ] as $key => $field ) {
 
-			$field = (array) $field;
+			$field = (array)$field;
 
-			if( !empty( $field['gravityview_approved'] ) ) {
-				if( !empty($field['inputs'][0]['id']) ) {
-					return $field['inputs'][0]['id'];
+			if ( ! empty( $field[ 'gravityview_approved' ] ) ) {
+				if ( ! empty( $field[ 'inputs' ][ 0 ][ 'id' ] ) ) {
+					return $field[ 'inputs' ][ 0 ][ 'id' ];
 				}
 			}
 
 			// Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work..
-			if( 'checkbox' == $field['type'] && isset( $field['inputs'] ) && is_array( $field['inputs'] ) ) {
-				foreach ( $field['inputs'] as $key2 => $input ) {
-					if ( strtolower( $input['label'] ) == 'approved' ) {
-						return $input['id'];
+			if ( 'checkbox' == $field[ 'type' ] && isset( $field[ 'inputs' ] ) && is_array( $field[ 'inputs' ] ) ) {
+				foreach ( $field[ 'inputs' ] as $key2 => $input ) {
+					if ( strtolower( $input[ 'label' ] ) == 'approved' ) {
+						return $input[ 'id' ];
 					}
 				}
 			}

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

Spacing +24 added lines, -24 removed lines

@@ -52,9 +52,9 @@ 
 	     * @since 1.11
 	     * @param boolean $boolean Whether to trigger update on user registration (default: true)
 	     */
-	    if( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
+	    if ( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
 
-	    	add_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10, 2 );
+	    	add_action( 'gravityview/edit_entry/after_update', array( $this, 'update_user' ), 10, 2 );
 
 		    // last resort in case the current user display name don't match any of the defaults
 		    add_action( 'gform_user_updated', array( $this, 'restore_display_name' ), 10, 4 );
@@ -72,7 +72,7 @@ 
      */
     public function update_user( $form = array(), $entry_id = 0 ) {
 
-        if( ! class_exists( 'GFAPI' ) || ! class_exists( 'GF_User_Registration' ) || empty( $entry_id ) ) {
+        if ( ! class_exists( 'GFAPI' ) || ! class_exists( 'GF_User_Registration' ) || empty( $entry_id ) ) {
             return;
         }
 
@@ -101,15 +101,15 @@ 
          */
         $preserve_role = apply_filters( 'gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry );
 
-        if( $preserve_role ) {
-            $config['meta']['role'] = 'gfur_preserve_role';
+        if ( $preserve_role ) {
+            $config[ 'meta' ][ 'role' ] = 'gfur_preserve_role';
         }
 
         /**
          * Make sure the current display name is not changed with the update user method.
          * @since 1.15
          */
-        $config['meta']['displayname'] = $this->match_current_display_name( $entry['created_by'] );
+        $config[ 'meta' ][ 'displayname' ] = $this->match_current_display_name( $entry[ 'created_by' ] );
 
 
         /**
@@ -123,13 +123,13 @@ 
 
 
         // Make sure the feed is active
-	    if ( ! $config['is_active'] ) {
+	    if ( ! $config[ 'is_active' ] ) {
 			return;
 	    }
 
 	    // If an Update feed, make sure the conditions are met.
-	    if( rgars( $config, 'meta/feedType' ) === 'update' ) {
-	    	if( ! $gf_user_registration->is_feed_condition_met( $config, $form, $entry ) ) {
+	    if ( rgars( $config, 'meta/feedType' ) === 'update' ) {
+	    	if ( ! $gf_user_registration->is_feed_condition_met( $config, $form, $entry ) ) {
 			    return;
 		    }
 	    }
@@ -164,7 +164,7 @@ 
 
         // In case we can't find the current display name format, or it is the 'nickname' format (which Gravity Forms doesn't support)
         //   trigger last resort method at the 'gform_user_updated' hook
-        if( false === $format || 'nickname' === $format ) {
+        if ( false === $format || 'nickname' === $format ) {
             $this->_user_before_update = $user;
             $format = 'nickname';
         }
@@ -184,18 +184,18 @@ 
     public function generate_display_names( $profileuser ) {
 
         $public_display = array();
-        $public_display['nickname']  = $profileuser->nickname;
-        $public_display['username']  = $profileuser->user_login;
+        $public_display[ 'nickname' ]  = $profileuser->nickname;
+        $public_display[ 'username' ]  = $profileuser->user_login;
 
-        if ( !empty($profileuser->first_name) )
-            $public_display['firstname'] = $profileuser->first_name;
+        if ( ! empty( $profileuser->first_name ) )
+            $public_display[ 'firstname' ] = $profileuser->first_name;
 
-        if ( !empty($profileuser->last_name) )
-            $public_display['lastname'] = $profileuser->last_name;
+        if ( ! empty( $profileuser->last_name ) )
+            $public_display[ 'lastname' ] = $profileuser->last_name;
 
-        if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
-            $public_display['firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
-            $public_display['lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
+        if ( ! empty( $profileuser->first_name ) && ! empty( $profileuser->last_name ) ) {
+            $public_display[ 'firstlast' ] = $profileuser->first_name . ' ' . $profileuser->last_name;
+            $public_display[ 'lastfirst' ] = $profileuser->last_name . ' ' . $profileuser->first_name;
         }
 
         $public_display = array_map( 'trim', $public_display );
@@ -225,7 +225,7 @@ 
          */
         $restore_display_name = apply_filters( 'gravityview/edit_entry/restore_display_name', true );
 
-        $is_update_feed = ( $config && rgars( $config, 'meta/feed_type') === 'update' );
+        $is_update_feed = ( $config && rgars( $config, 'meta/feed_type' ) === 'update' );
 
         /**
          * Don't restore display name:
@@ -234,7 +234,7 @@ 
          *   - or we don't need as we found the correct format before updating user.
          * @since 1.14.4
          */
-        if( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
+        if ( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
             return;
         }
 
@@ -260,10 +260,10 @@ 
 
         $updated = wp_update_user( $restored_user );
 
-        if( is_wp_error( $updated ) ) {
-            do_action('gravityview_log_error', __METHOD__ . sprintf( ' - There was an error updating user #%d details', $user_id ), $updated );
+        if ( is_wp_error( $updated ) ) {
+            do_action( 'gravityview_log_error', __METHOD__ . sprintf( ' - There was an error updating user #%d details', $user_id ), $updated );
         } else {
-            do_action('gravityview_log_debug', __METHOD__ . sprintf( ' - User #%d details restored', $user_id ) );
+            do_action( 'gravityview_log_debug', __METHOD__ . sprintf( ' - User #%d details restored', $user_id ) );
         }
 
         $this->_user_before_update = null;