gravityview / GravityView

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

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
 
 	var $is_searchable = true;
 
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
 
 	var $_gf_field_class_name = 'GF_Field_Radio';
 
@@ -40,8 +40,8 @@ 
 		// Set the $_field_id var
 		$field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id );
 		
-		if( $this->is_choice_value_enabled() ) {
-			$field_options['choice_display'] = array(
+		if ( $this->is_choice_value_enabled() ) {
+			$field_options[ 'choice_display' ] = array(
 				'type'    => 'radio',
 				'value'   => 'value',
 				'label'   => __( 'What should be displayed:', 'gravityview' ),

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

Spacing +2 added lines, -2 removed lines

@@ -44,8 +44,8 @@
 		// Set the $_field_id var
 		$field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id );
 
-		if( $this->is_choice_value_enabled() ) {
-			$field_options['choice_display'] = array(
+		if ( $this->is_choice_value_enabled() ) {
+			$field_options[ 'choice_display' ] = array(
 				'type'    => 'radio',
 				'value'   => 'value',
 				'label'   => __( 'What should be displayed:', 'gravityview' ),

future/includes/class-gv-shortcode-gventry.php

Spacing +23 added lines, -23 removed lines

@@ -47,16 +47,16 @@ 
 		 */
 		$atts = apply_filters( 'gravityview/shortcodes/gventry/atts', $atts );
 
-		$view = \GV\View::by_id( $atts['view_id'] );
+		$view = \GV\View::by_id( $atts[ 'view_id' ] );
 
 		if ( ! $view ) {
-			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts['view_id'] ) );
+			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts[ 'view_id' ] ) );
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', null, null, $atts );
 		}
 
-		$entry_id = ! empty( $atts['entry_id'] ) ? $atts['entry_id'] : $atts['id'];
+		$entry_id = ! empty( $atts[ 'entry_id' ] ) ? $atts[ 'entry_id' ] : $atts[ 'id' ];
 
-		switch( $entry_id ):
+		switch ( $entry_id ):
 			case 'last':
 				if ( class_exists( '\GF_Query' ) ) {
 					/**
@@ -65,17 +65,17 @@ 
 					 * Since we're using \GF_Query shorthand initialization we have to reverse the order parameters here.
 					 */
 					add_filter( 'gravityview_get_entries', $filter = function( $parameters, $args, $form_id ) {
-						if ( ! empty( $parameters['sorting'] ) ) {
+						if ( ! empty( $parameters[ 'sorting' ] ) ) {
 							/**
 							 * Reverse existing sorts.
 							 */
-							$sort = &$parameters['sorting'];
-							$sort['direction'] = $sort['direction'] == 'RAND' ? : ( $sort['direction'] == 'ASC' ? 'DESC' : 'ASC' );
+							$sort = &$parameters[ 'sorting' ];
+							$sort[ 'direction' ] = $sort[ 'direction' ] == 'RAND' ?: ( $sort[ 'direction' ] == 'ASC' ? 'DESC' : 'ASC' );
 						} else {
 							/**
 							 * Otherwise, sort by date_created.
 							 */
-							$parameters['sorting'] = array(
+							$parameters[ 'sorting' ] = array(
 								'key' => 'id',
 								'direction' => 'ASC',
 								'is_numeric' => true
@@ -90,7 +90,7 @@ 
 
 					/** If a sort already exists, reverse it. */
 					if ( $sort = end( $entries->sorts ) ) {
-						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ? : ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
+						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ?: ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
 					} else {
 						/** Otherwise, sort by date_created */
 						$entries = $entries->sort( new \GV\Entry_Sort( \GV\Internal_Field::by_id( 'id' ), \GV\Entry_Sort::ASC ), \GV\Entry_Sort::NUMERIC );
@@ -108,12 +108,12 @@ 
 				break;
 			default:
 				if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) {
-					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts['view_id'] ) );
+					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts[ 'view_id' ] ) );
 					return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, null, $atts );
 				}
 		endswitch;
 
-		if ( $view->form->ID != $entry['form_id'] ) {
+		if ( $view->form->ID != $entry[ 'form_id' ] ) {
 			gravityview()->log->error( 'Entry does not belong to view (form mismatch)' );
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
 		}
@@ -123,7 +123,7 @@ 
 			return apply_filters( 'gravityview/shortcodes/gventry/output', get_the_password_form( $view->ID ), $view, $entry, $atts );
 		}
 
-		if ( ! $view->form  ) {
+		if ( ! $view->form ) {
 			gravityview()->log->notice( 'View #{id} has no form attached to it.', array( 'id' => $view->ID ) );
 
 			/**
@@ -146,43 +146,43 @@ 
 		}
 
 		/** Unapproved entries. */
-		if ( $entry['status'] != 'active' ) {
+		if ( $entry[ 'status' ] != 'active' ) {
 			gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
 		}
 
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
 
 		if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 				gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 				return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
 			}
 		}
 
-		if ( $atts['edit'] ) {
+		if ( $atts[ 'edit' ] ) {
 			/**
 			 * Based on code in our unit-tests.
 			 * Mocks old context, etc.
 			 */
 			$loader = \GravityView_Edit_Entry::getInstance();
-			$render = $loader->instances['render'];
+			$render = $loader->instances[ 'render' ];
 
 			add_filter( 'gravityview/is_single_entry', '__return_true' );
 
-			$form = \GFAPI::get_form( $entry['form_id'] );
+			$form = \GFAPI::get_form( $entry[ 'form_id' ] );
 
 			$data = \GravityView_View_Data::getInstance( $view );
 			$template = \GravityView_View::getInstance( array(
 				'form' => $form,
-				'form_id' => $form['id'],
+				'form_id' => $form[ 'id' ],
 				'view_id' => $view->ID,
 				'entries' => array( $entry ),
 				'atts' => \GVCommon::get_template_settings( $view->ID ),
 			) );
 
-			$_GET['edit'] = wp_create_nonce(
-				\GravityView_Edit_Entry::get_nonce_key( $view->ID, $form['id'], $entry['id'] )
+			$_GET[ 'edit' ] = wp_create_nonce(
+				\GravityView_Edit_Entry::get_nonce_key( $view->ID, $form[ 'id' ], $entry[ 'id' ] )
 			);
 
 			add_filter( 'gravityview/edit_entry/success', $callback = function( $message ) use ( $view, $entry, $atts ) {
@@ -199,7 +199,7 @@ 
 				return apply_filters( 'gravityview/shortcodes/gventry/edit/success', $message, $view, $entry, $atts );
 			} );
 
-			ob_start() && $render->init( $data, \GV\Entry::by_id( $entry['id'] ), $view );
+			ob_start() && $render->init( $data, \GV\Entry::by_id( $entry[ 'id' ] ), $view );
 			$output = ob_get_clean(); // Render :)
 
 			remove_filter( 'gravityview/is_single_entry', '__return_true' );
@@ -211,7 +211,7 @@ 
 			$renderer = new \GV\Entry_Renderer();
 
 			$request = new \GV\Mock_Request();
-			$request->returns['is_entry'] = $entry;
+			$request->returns[ 'is_entry' ] = $entry;
 
 			$output = $renderer->render( $entry, $view, $request );
 

Doc Comments -1 removed lines

@@ -18,7 +18,6 @@
 	/**
 	 * Process and output the [gventry] shortcode.
 	 *
-	 * @param array $passed_atts The attributes passed.
 	 * @param string $content The content inside the shortcode.
 	 * @param string $tag The shortcode tag.
 	 *

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

Spacing +7 added lines, -7 removed lines

@@ -42,7 +42,7 @@ 
 
 		parent::add_hooks();
 
-		add_shortcode( 'gv_pageviews', array( $this, 'pageviews') );
+		add_shortcode( 'gv_pageviews', array( $this, 'pageviews' ) );
 
 		add_filter( 'gravityview/fields/custom/decode_shortcodes', array( $this, 'inject_entry_id' ), 10, 3 );
 
@@ -68,8 +68,8 @@ 
 	 * Used as sort of an action via the gravityview/fields/custom/decode_shortcodes filter.
 	 */
 	public function inject_entry_id( $r, $content, $context ) {
-		if ( ! empty( $context->entry['id'] ) ) {
-			$this->next_id = $context->entry['id'];
+		if ( ! empty( $context->entry[ 'id' ] ) ) {
+			$this->next_id = $context->entry[ 'id' ];
 		} else {
 			$this->next_id = false; // Nothing to look at, move along
 		}
@@ -97,13 +97,13 @@ 
 			'id'        => $this->next_id,
 		), $atts );
 
-		if ( ! $this->atts['id'] ) {
+		if ( ! $this->atts[ 'id' ] ) {
 			return; // The ID was not set
 		}
 
 		add_filter( 'pageviews_placeholder_preload', array( $this, 'preload_callback' ) );
 
-		$output = Pageviews::placeholder( 'GV' . $this->atts['id'] ); // Prefix the ID to avoid collissions with default post IDs
+		$output = Pageviews::placeholder( 'GV' . $this->atts[ 'id' ] ); // Prefix the ID to avoid collissions with default post IDs
 
 		remove_filter( 'pageviews_placeholder_preload', array( $this, 'preload_callback' ) );
 
@@ -114,7 +114,7 @@ 
 	 * Set the preload text.
 	 */
 	public function preload_callback( $preload ) {
-		return $this->atts['preload'];
+		return $this->atts[ 'preload' ];
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function increment_callback() {
 		if ( $entry = gravityview()->request->is_entry() ) {
-			$increment = 'GV' . $entry['id'];
+			$increment = 'GV' . $entry[ 'id' ];
 			?>
 				_pv_config.incr = <?php echo json_encode( $increment ); ?>;
 			<?php

includes/class-gvlogic-shortcode.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 		return self::$instance;
 	}
 
-	public function shortcode( $atts, $content = '', $tag = '') {
+	public function shortcode( $atts, $content = '', $tag = '' ) {
 		$shortcode = new \GV\Shortcodes\gvlogic();
 		return $shortcode->callback( $atts, $content, $tag );
 	}

future/includes/rest/class-gv-rest-views-route.php

Spacing +25 added lines, -25 removed lines

@@ -63,7 +63,7 @@ 
 			'total' => wp_count_posts( 'gravityview' )->publish,
 		);
 		foreach ( $items as $item ) {
-			$data['views'][] = $this->prepare_view_for_response( $item, $request );
+			$data[ 'views' ][ ] = $this->prepare_view_for_response( $item, $request );
 		}
 
 		return new \WP_REST_Response( $data, 200 );
@@ -82,7 +82,7 @@ 
 
 		$url = $request->get_url_params();
 
-		$view_id = intval( $url['id'] );
+		$view_id = intval( $url[ 'id' ] );
 
 		$item = get_post( $view_id );
 
@@ -114,7 +114,7 @@ 
 		// Only output the fields that should be displayed.
 		$allowed = array();
 		foreach ( $view->fields->by_position( "{$context}_*" )->by_visible( $view )->all() as $field ) {
-			$allowed[] = $field;
+			$allowed[ ] = $field;
 		}
 
 		/**
@@ -133,7 +133,7 @@ 
 
 		// Tack on additional fields if needed
 		foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) {
-			$allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
+			$allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
 		}
 
 		$r = new Request( $request );
@@ -211,10 +211,10 @@ 
 	public function get_sub_items( $request ) {
 
 		$url     = $request->get_url_params();
-		$view_id = intval( $url['id'] );
+		$view_id = intval( $url[ 'id' ] );
 		$format  = \GV\Utils::get( $url, 'format', 'json' );
 
-		if( $post_id = $request->get_param('post_id') ) {
+		if ( $post_id = $request->get_param( 'post_id' ) ) {
 			global $post;
 
 			$post = get_post( $post_id );
@@ -319,7 +319,7 @@ 
 
 		$data = array( 'entries' => $entries->all(), 'total' => $entries->total() );
 
-		foreach ( $data['entries'] as &$entry ) {
+		foreach ( $data[ 'entries' ] as &$entry ) {
 			$entry = $this->prepare_entry_for_response( $view, $entry, $request, 'directory' );
 		}
 
@@ -338,8 +338,8 @@ 
 	 */
 	public function get_sub_item( $request ) {
 		$url      = $request->get_url_params();
-		$view_id  = intval( $url['id'] );
-		$entry_id = intval( $url['s_id'] );
+		$view_id  = intval( $url[ 'id' ] );
+		$entry_id = intval( $url[ 's_id' ] );
 		$format   = \GV\Utils::get( $url, 'format', 'json' );
 
 		$view  = \GV\View::by_id( $view_id );
@@ -374,32 +374,32 @@ 
 		// Add all the WP_Post data
 		$view_post = $view_post->to_array();
 
-		unset( $view_post['to_ping'], $view_post['ping_status'], $view_post['pinged'], $view_post['post_type'], $view_post['filter'], $view_post['post_category'], $view_post['tags_input'], $view_post['post_content'], $view_post['post_content_filtered'] );
+		unset( $view_post[ 'to_ping' ], $view_post[ 'ping_status' ], $view_post[ 'pinged' ], $view_post[ 'post_type' ], $view_post[ 'filter' ], $view_post[ 'post_category' ], $view_post[ 'tags_input' ], $view_post[ 'post_content' ], $view_post[ 'post_content_filtered' ] );
 
 		$return = wp_parse_args( $item, $view_post );
 
-		$return['title'] = $return['post_title'];
+		$return[ 'title' ] = $return[ 'post_title' ];
 
-		$return['settings'] = isset( $return['atts'] ) ? $return['atts'] : array();
-		unset( $return['atts'], $return['view_id'] );
+		$return[ 'settings' ] = isset( $return[ 'atts' ] ) ? $return[ 'atts' ] : array();
+		unset( $return[ 'atts' ], $return[ 'view_id' ] );
 
-		$return['search_criteria'] = array(
+		$return[ 'search_criteria' ] = array(
 			'page_size' => rgars( $return, 'settings/page_size' ),
 			'sort_field' => rgars( $return, 'settings/sort_field' ),
 			'sort_direction' => rgars( $return, 'settings/sort_direction' ),
 			'offset' => rgars( $return, 'settings/offset' ),
 		);
 
-		unset( $return['settings']['page_size'], $return['settings']['sort_field'], $return['settings']['sort_direction'] );
+		unset( $return[ 'settings' ][ 'page_size' ], $return[ 'settings' ][ 'sort_field' ], $return[ 'settings' ][ 'sort_direction' ] );
 
 		// Redact for non-logged ins
 		if ( ! \GVCommon::has_cap( 'edit_others_gravityviews' ) ) {
-			unset( $return['settings'] );
-			unset( $return['search_criteria'] );
+			unset( $return[ 'settings' ] );
+			unset( $return[ 'search_criteria' ] );
 		}
 		
 		if ( ! \GFCommon::current_user_can_any( 'gravityforms_edit_forms' ) ) {
-			unset( $return['form'] );
+			unset( $return[ 'form' ] );
 		}
 
 		return $return;
@@ -415,7 +415,7 @@ 
 			$view_id = func_get_arg( 1 ); // $view_id override
 		} else {
 			$url     = $request->get_url_params();
-			$view_id = intval( $url['id'] );
+			$view_id = intval( $url[ 'id' ] );
 		}
 
 		if ( ! $view = \GV\View::by_id( $view_id ) ) {
@@ -461,8 +461,8 @@ 
 		}
 
 		$url     = $request->get_url_params();
-		$view_id = intval( $url['id'] );
-		$entry_id = intval( $url['s_id'] );
+		$view_id = intval( $url[ 'id' ] );
+		$entry_id = intval( $url[ 's_id' ] );
 
 		$view = \GV\View::by_id( $view_id );
 
@@ -470,11 +470,11 @@ 
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 		}
 
-		if ( $entry['form_id'] != $view->form->ID ) {
+		if ( $entry[ 'form_id' ] != $view->form->ID ) {
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 		}
 
-		if ( $entry['status'] != 'active' ) {
+		if ( $entry[ 'status' ] != 'active' ) {
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 		}
 
@@ -482,10 +482,10 @@ 
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 		}
 
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
 
 		if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 				return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 			}
 		}

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

Spacing +18 added lines, -18 removed lines

@@ -18,7 +18,7 @@ 
 
 	public function __construct() {
 		$this->label = esc_html__( 'Unsubscribe', 'gravityview' );
-		$this->description =  esc_attr__( 'Unsubscribe from a Payment-based entry.', 'gravityview' );
+		$this->description = esc_attr__( 'Unsubscribe from a Payment-based entry.', 'gravityview' );
 
 		$this->add_hooks();
 
@@ -57,13 +57,13 @@ 
 	 */
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
-		unset( $field_options['only_loggedin'] );
+		unset( $field_options[ 'only_loggedin' ] );
 
-		unset( $field_options['new_window'] );
+		unset( $field_options[ 'new_window' ] );
 
-		unset( $field_options['show_as_link'] );
+		unset( $field_options[ 'show_as_link' ] );
 
-		$add_options['unsub_all'] = array(
+		$add_options[ 'unsub_all' ] = array(
 			'type'       => 'checkbox',
 			'label'      => __( 'Allow admins to unsubscribe', 'gravityview' ),
 			'desc'       => __( 'Allow users with `gravityforms_edit_entries` to cancel subscriptions', 'gravityview' ),
@@ -130,9 +130,9 @@ 
 		}
 
 		foreach ( $feeds as $feed ) {
-			if ( isset( $subscription_addons[ $feed['addon_slug'] ] ) && 'subscription' === \GV\Utils::get( $feed, 'meta/transactionType' ) ) {
-				if ( ! isset( $entry_default_fields["{$this->name}"] ) && 'edit' !== $context ) {
-					$entry_default_fields["{$this->name}"] = array(
+			if ( isset( $subscription_addons[ $feed[ 'addon_slug' ] ] ) && 'subscription' === \GV\Utils::get( $feed, 'meta/transactionType' ) ) {
+				if ( ! isset( $entry_default_fields[ "{$this->name}" ] ) && 'edit' !== $context ) {
+					$entry_default_fields[ "{$this->name}" ] = array(
 						'label' => $this->label,
 						'desc'  => $this->description,
 						'type'  => $this->name,
@@ -163,10 +163,10 @@ 
 			return $output;
 		}
 
-		$can_current_user_edit = is_numeric( $entry['created_by'] ) && ( wp_get_current_user()->ID === intval( $entry['created_by'] ) );
+		$can_current_user_edit = is_numeric( $entry[ 'created_by' ] ) && ( wp_get_current_user()->ID === intval( $entry[ 'created_by' ] ) );
 
 		if ( ! $can_current_user_edit ) {
-			if ( empty( $field_settings['unsub_all'] ) || ! \GVCommon::has_cap( 'gravityforms_edit_entries', $entry['id'] ) ) {
+			if ( empty( $field_settings[ 'unsub_all' ] ) || ! \GVCommon::has_cap( 'gravityforms_edit_entries', $entry[ 'id' ] ) ) {
 				return $output;
 			}
 		}
@@ -179,21 +179,21 @@ 
 		// @todo Also make sure we check caps if moved from here
 		// @todo Also make sure test_GravityView_Field_Unsubscribe_unsubscribe_permissions is rewritten
 		if ( $entry = $this->maybe_unsubscribe( $entry ) ) {
-			if ( $entry['payment_status'] !== $status ) {
+			if ( $entry[ 'payment_status' ] !== $status ) {
 				// @todo Probably __( 'Unsubscribed', 'gravityview' );
-				return $entry['payment_status'];
+				return $entry[ 'payment_status' ];
 			}
 		}
 
-		if ( 'active' !== mb_strtolower( $entry['payment_status'] ) ) {
+		if ( 'active' !== mb_strtolower( $entry[ 'payment_status' ] ) ) {
 			return $output;
 		}
 
 		global $wp;
 		$current_url = add_query_arg( $wp->query_string, '', home_url( $wp->request ) );
 
-		$link = add_query_arg( 'unsubscribe', wp_create_nonce( 'unsubscribe_' . $entry['id'] ), $current_url );
-		$link = add_query_arg( 'uid', $entry['id'], $link );
+		$link = add_query_arg( 'unsubscribe', wp_create_nonce( 'unsubscribe_' . $entry[ 'id' ] ), $current_url );
+		$link = add_query_arg( 'uid', $entry[ 'id' ], $link );
 
 		return sprintf( '<a href="%s">%s</a>', esc_url( $link ), esc_html__( 'Unsubscribe', 'gravityview' ) );
 	}
@@ -213,11 +213,11 @@ 
 	 */
 	private function maybe_unsubscribe( $entry ) {
 
-		if ( ! wp_verify_nonce( \GV\Utils::_REQUEST( 'unsubscribe' ), 'unsubscribe_' . $entry['id'] ) ) {
+		if ( ! wp_verify_nonce( \GV\Utils::_REQUEST( 'unsubscribe' ), 'unsubscribe_' . $entry[ 'id' ] ) ) {
 			return $entry;
 		}
 
-		if ( ( ! $uid = \GV\Utils::_REQUEST( 'uid' ) ) || ! is_numeric( $uid ) || ( intval( $uid ) !== intval( $entry['id'] ) ) ) {
+		if ( ( ! $uid = \GV\Utils::_REQUEST( 'uid' ) ) || ! is_numeric( $uid ) || ( intval( $uid ) !== intval( $entry[ 'id' ] ) ) ) {
 			return $entry;
 		}
 
@@ -259,7 +259,7 @@ 
 
 						$subscription_addons[ $slug ]->cancel_subscription( $entry, $feed );
 
-						return \GFAPI::get_entry( $entry['id'] );
+						return \GFAPI::get_entry( $entry[ 'id' ] );
 					}
 				}
 			}

future/includes/class-gv-shortcode-gvlogic.php

Doc Comments +2 added lines

@@ -262,6 +262,8 @@
 	/**
 	 * Process the attributes passed to the shortcode. Make sure they're valid
 	 *
+	 * @param string $content
+	 * @param string $tag
 	 * @return array Array of attributes parsed for the shortcode
 	 */
 	private function parse_atts( $atts, $content, $tag ) {

Spacing +14 added lines, -14 removed lines

@@ -61,8 +61,8 @@ 
 		$value    = $this->get_value( $atts );
 
 		if ( false === $operator && is_null( $value ) ) {
-			if ( false !== $atts['if'] ) { // Only-if test
-				$match = $authed && ! in_array( strtolower( $atts['if'] ), array( '', '0', 'false', 'no' ) );
+			if ( false !== $atts[ 'if' ] ) { // Only-if test
+				$match = $authed && ! in_array( strtolower( $atts[ 'if' ] ), array( '', '0', 'false', 'no' ) );
 			} else {
 				$match = $authed; // Just login test
 			}
@@ -81,7 +81,7 @@ 
 
 				// Need to match all AND
 				foreach ( $and_values as $and_value ) {
-					$match = $authed && \GVCommon::matches_operation( $atts['if'], $and_value, $operator );
+					$match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $and_value, $operator );
 					if ( ! $match ) {
 						break;
 					}
@@ -92,7 +92,7 @@ 
 				// Only need to match a single OR
 				foreach ( $or_values as $or_value ) {
 
-					$match = \GVCommon::matches_operation( $atts['if'], $or_value, $operator );
+					$match = \GVCommon::matches_operation( $atts[ 'if' ], $or_value, $operator );
 
 					// Negate the negative operators
 					if ( ( $authed && $match ) || ( $authed && ( ! $match && in_array( $operator, array( 'isnot', 'not_contains', 'not_in' ) ) ) ) ) {
@@ -101,7 +101,7 @@ 
 				}
 
 			} else {
-				$match = $authed && \GVCommon::matches_operation( $atts['if'], $value, $operator );
+				$match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $value, $operator );
 			}
 
 			$output = $this->get_output( $match, $atts, $output );
@@ -189,8 +189,8 @@ 
 	 * @return string The output.
 	 */
 	private function get_output( $match, $atts, $content ) {
-		if ( ! $match && ! empty( $atts['else'] ) ) {
-			return $atts['else']; // Attributized else is easy :)
+		if ( ! $match && ! empty( $atts[ 'else' ] ) ) {
+			return $atts[ 'else' ]; // Attributized else is easy :)
 		}
 
 		$if = '';
@@ -317,18 +317,18 @@ 
 		$atts = array_intersect_key( $supplied_atts, $atts );
 
 		// Strip whitespace if it's not default false
-		if ( isset( $atts['if'] ) && is_string( $atts['if'] ) ) {
-			$atts['if'] = trim( $atts['if'] );
+		if ( isset( $atts[ 'if' ] ) && is_string( $atts[ 'if' ] ) ) {
+			$atts[ 'if' ] = trim( $atts[ 'if' ] );
 		} else {
-			$atts['if'] = false;
+			$atts[ 'if' ] = false;
 		}
 
-		if ( isset( $atts['logged_in'] ) ) {
+		if ( isset( $atts[ 'logged_in' ] ) ) {
 			// Truthy
-			if ( in_array( strtolower( $atts['logged_in'] ), array( '0', 'false', 'no' ) ) ) {
-				$atts['logged_in'] = false;
+			if ( in_array( strtolower( $atts[ 'logged_in' ] ), array( '0', 'false', 'no' ) ) ) {
+				$atts[ 'logged_in' ] = false;
 			} else {
-				$atts['logged_in'] = true;
+				$atts[ 'logged_in' ] = true;
 			}
 		}
 

Braces +18 added lines, -9 removed lines

@@ -61,14 +61,16 @@ 
 		$value    = $this->get_value( $atts );
 
 		if ( false === $operator && is_null( $value ) ) {
-			if ( false !== $atts['if'] ) { // Only-if test
+			if ( false !== $atts['if'] ) {
+// Only-if test
 				$match = $authed && ! in_array( strtolower( $atts['if'] ), array( '', '0', 'false', 'no' ) );
 			} else {
 				$match = $authed; // Just login test
 			}
 
 			$output = $this->get_output( $match, $atts, $content );
-		} else { // Regular test
+		} else {
+// Regular test
 
 			$output = $content;
 
@@ -199,12 +201,15 @@ 
 		$opens = 0; // inner opens
 		$found = false; // found split position
 
-		while ( $content ) { // scan
+		while ( $content ) {
+// scan
 
 			if ( ! preg_match( '#(.*?)(\[\/?(gvlogic|else).*?])(.*)#s', $content, $matches ) ) {
-				if ( ! $found ) { // We're still iffing.
+				if ( ! $found ) {
+// We're still iffing.
 					$if .= $content;
-				} else { // We are elsing
+				} else {
+// We are elsing
 					$else .= $content;
 				}
 				break; // No more shortcodes
@@ -212,9 +217,11 @@ 
 
 			list( $_, $before_shortcode, $shortcode, $_, $after_shortcode ) = $matches;
 
-			if ( ! $found ) { // We're still iffing.
+			if ( ! $found ) {
+// We're still iffing.
 				$if .= $before_shortcode;
-			} else { // We are elsing
+			} else {
+// We are elsing
 				$else .= $before_shortcode;
 			}
 
@@ -238,9 +245,11 @@ 
 				}
 
 				// Tack on the shortcode
-				if ( ! $found ) { // We're still iffing.
+				if ( ! $found ) {
+// We're still iffing.
 					$if .= $shortcode;
-				} else { // We are elsing
+				} else {
+// We are elsing
 					$else .= $shortcode;
 				}
 			}

includes/extensions/entry-notes/fields/notes.php

Spacing +13 added lines, -13 removed lines

@@ -9,9 +9,9 @@ 
 $gravityview_view = GravityView_View::getInstance();
 
 $visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
-$show_notes_logged_out = ( ! empty( $visibility_settings['view'] ) && ! empty( $visibility_settings['view_loggedout'] ) );
+$show_notes_logged_out = ( ! empty( $visibility_settings[ 'view' ] ) && ! empty( $visibility_settings[ 'view_loggedout' ] ) );
 
-if(	! GVCommon::has_cap( array( 'gravityview_view_entry_notes', 'gravityview_add_entry_notes', 'gravityview_delete_entry_notes' ) ) && ! $show_notes_logged_out ) {
+if ( ! GVCommon::has_cap( array( 'gravityview_view_entry_notes', 'gravityview_add_entry_notes', 'gravityview_delete_entry_notes' ) ) && ! $show_notes_logged_out ) {
 	return;
 }
 
@@ -25,20 +25,20 @@ 
 do_action( 'gravityview/field/notes/scripts' );
 
 $entry      = $gravityview_view->getCurrentEntry();
-$notes      = (array) GravityView_Entry_Notes::get_notes( $entry['id'] );
+$notes      = (array)GravityView_Entry_Notes::get_notes( $entry[ 'id' ] );
 $strings    = GravityView_Field_Notes::strings();
-$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
+$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
 
-$show_add = ! empty( $visibility_settings['add'] );
-$show_delete = ( ! empty( $visibility_settings['delete'] ) && GVCommon::has_cap( 'gravityview_delete_entry_notes' ) );
-$show_notes = $show_notes_logged_out || ( ! empty( $visibility_settings['view'] ) && GVCommon::has_cap( 'gravityview_view_entry_notes' ) );
+$show_add = ! empty( $visibility_settings[ 'add' ] );
+$show_delete = ( ! empty( $visibility_settings[ 'delete' ] ) && GVCommon::has_cap( 'gravityview_delete_entry_notes' ) );
+$show_notes = $show_notes_logged_out || ( ! empty( $visibility_settings[ 'view' ] ) && GVCommon::has_cap( 'gravityview_view_entry_notes' ) );
 
 $container_class = ( sizeof( $notes ) > 0 ? 'gv-has-notes' : 'gv-no-notes' );
 $container_class .= $show_notes ? ' gv-show-notes' : ' gv-hide-notes';
 ?>
 <div class="gv-notes <?php echo $container_class; ?>">
 <?php
-	if( $show_notes ) {
+	if ( $show_notes ) {
 ?>
 	<form method="post" class="gv-notes-list">
 		<?php if ( $show_delete ) { wp_nonce_field( 'gv_delete_notes_' . $entry_slug, 'gv_delete_notes' ); } ?>
@@ -46,21 +46,21 @@ 
 			<input type="hidden" name="action" value="gv_delete_notes" />
 			<input type="hidden" name="entry-slug" value="<?php echo esc_attr( $entry_slug ); ?>" />
 			<table>
-				<caption><?php echo $strings['caption']; ?></caption>
+				<caption><?php echo $strings[ 'caption' ]; ?></caption>
 				<?php
 				if ( $show_delete ) {
 				?>
 				<thead>
 					<tr>
 						<th colspan="2">
-							<label><input type="checkbox" value="" class="gv-notes-toggle" title="<?php echo $strings['toggle-notes']; ?>"><span class="screen-reader-text"><?php echo $strings['toggle-notes']; ?></span></label>
-							<button type="submit" class="button button-small gv-notes-delete"><?php echo $strings['delete']; ?></button>
+							<label><input type="checkbox" value="" class="gv-notes-toggle" title="<?php echo $strings[ 'toggle-notes' ]; ?>"><span class="screen-reader-text"><?php echo $strings[ 'toggle-notes' ]; ?></span></label>
+							<button type="submit" class="button button-small gv-notes-delete"><?php echo $strings[ 'delete' ]; ?></button>
 						</th>
 					</tr>
 				</thead>
 				<?php } ?>
 				<tbody>
-					<tr class="gv-notes-no-notes"><td colspan="2"><?php echo $strings['no-notes']; ?></td></tr>
+					<tr class="gv-notes-no-notes"><td colspan="2"><?php echo $strings[ 'no-notes' ]; ?></td></tr>
 					<?php
 						foreach ( $notes as $note ) {
 							echo GravityView_Field_Notes::display_note( $note, $show_delete );
@@ -73,7 +73,7 @@ 
 <?php
 	} // End if can view notes
 
-	if( $show_add ) {
+	if ( $show_add ) {
 		echo do_shortcode( '[gv_note_add]' );
 	}
 ?>