gravityview / GravityView

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/extensions/duplicate-entry/class-duplicate-entry.php

Doc Comments +1 added lines, -2 removed lines

@@ -87,7 +87,7 @@ 
 	 *
 	 * @param array $file_paths List of template paths ordered
 	 *
-	 * @return array File paths, with duplicate field path added at index 117
+	 * @return string[] File paths, with duplicate field path added at index 117
 	 */
 	public function add_template_path( $file_paths ) {
 
@@ -193,7 +193,6 @@ 
 	 * @since 2.5
 	 *
 	 * @param  array 	    $visibility_caps        Array of capabilities to display in field dropdown.
-	 * @param  string       $field_type  Type of field options to render (`field` or `widget`)
 	 * @param  string       $template_id Table slug
 	 * @param  float|string $field_id    GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by`
 	 * @param  string       $context     What context are we in? Example: `single` or `directory`

Indentation +3 added lines, -3 removed lines

@@ -246,7 +246,7 @@ 
 	 */
 	public static function get_duplicate_link( $entry, $view_id, $post_id = null ) {
 
-        $base = GravityView_API::directory_link( $post_id ? : $view_id, true );
+		$base = GravityView_API::directory_link( $post_id ? : $view_id, true );
 
 		if ( empty( $base ) ) {
 			gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) );
@@ -257,7 +257,7 @@ 
 			'action'	=> 'duplicate',
 			'entry_id'	=> $entry['id'],
 			'gvid' => $view_id,
-            'view_id' => $view_id,
+			'view_id' => $view_id,
 		), $base );
 
 		return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry['id'] ) ), $actionurl );
@@ -460,7 +460,7 @@ 
 		 * @since 2.5
 		 * @param  array $duplicated_entry The duplicated entry
 		 * @param  array $entry The original entry
-		*/
+		 */
 		do_action( 'gravityview/duplicate-entry/duplicated', $duplicated_entry, $entry );
 
 		gravityview()->log->debug( 'Duplicate response: {duplicate_response}', array( 'duplicate_response' => $duplicate_response ) );

Spacing +52 added lines, -52 removed lines

@@ -115,12 +115,12 @@ 
 	public function duplicate_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
 		// Always a link, never a filter, always same window
-		unset( $field_options['show_as_link'], $field_options['search_filter'], $field_options['new_window'] );
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ], $field_options[ 'new_window' ] );
 
 		// Duplicate Entry link should only appear to visitors capable of editing entries
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
 
-		$add_option['duplicate_link'] = array(
+		$add_option[ 'duplicate_link' ] = array(
 			'type' => 'text',
 			'label' => __( 'Duplicate Link Text', 'gravityview' ),
 			'desc' => NULL,
@@ -128,7 +128,7 @@ 
 			'merge_tags' => true,
 		);
 
-		$field_options['allow_duplicate_cap'] = array(
+		$field_options[ 'allow_duplicate_cap' ] = array(
 			'type' => 'select',
 			'label' => __( 'Allow the following users to duplicate the entry:', 'gravityview' ),
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -155,7 +155,7 @@ 
 	public function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
 
 		if ( 'edit' !== $zone ) {
-			$entry_default_fields['duplicate_link'] = array(
+			$entry_default_fields[ 'duplicate_link' ] = array(
 				'label' => __( 'Duplicate Entry', 'gravityview' ),
 				'type'  => 'duplicate_link',
 				'desc'  => __( 'A link to duplicate the entry. Respects the Duplicate Entry permissions.', 'gravityview' ),
@@ -176,7 +176,7 @@ 
 	 */
 	public function add_available_field( $available_fields = array() ) {
 
-		$available_fields['duplicate_link'] = array(
+		$available_fields[ 'duplicate_link' ] = array(
 			'label_text' => __( 'Duplicate Entry', 'gravityview' ),
 			'field_id' => 'duplicate_link',
 			'label_type' => 'field',
@@ -209,9 +209,9 @@ 
 		if ( 'duplicate_link' === $field_id ) {
 
 			// Remove other built-in caps.
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['duplicate_others_posts'] );
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'duplicate_others_posts' ] );
 
-			$caps['read'] = _x( 'Entry Creator', 'User capability', 'gravityview' );
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
 		}
 
 		return $caps;
@@ -246,7 +246,7 @@ 
 	 */
 	public static function get_duplicate_link( $entry, $view_id, $post_id = null ) {
 
-        $base = GravityView_API::directory_link( $post_id ? : $view_id, true );
+        $base = GravityView_API::directory_link( $post_id ?: $view_id, true );
 
 		if ( empty( $base ) ) {
 			gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) );
@@ -255,12 +255,12 @@ 
 
 		$actionurl = add_query_arg( array(
 			'action'	=> 'duplicate',
-			'entry_id'	=> $entry['id'],
+			'entry_id'	=> $entry[ 'id' ],
 			'gvid' => $view_id,
             'view_id' => $view_id,
 		), $base );
 
-		return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry['id'] ) ), $actionurl );
+		return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry[ 'id' ] ) ), $actionurl );
 	}
 
 	/**
@@ -281,12 +281,12 @@ 
 	public function process_duplicate() {
 
 		// If the form is submitted
-		if ( ( ! isset( $_GET['action'] ) ) || 'duplicate' !== $_GET['action'] || ( ! isset( $_GET['entry_id'] ) ) ) {
+		if ( ( ! isset( $_GET[ 'action' ] ) ) || 'duplicate' !== $_GET[ 'action' ] || ( ! isset( $_GET[ 'entry_id' ] ) ) ) {
 			return;
 		}
 
 		// Make sure it's a GravityView request
-		$valid_nonce_key = wp_verify_nonce( \GV\Utils::_GET( 'duplicate' ), self::get_nonce_key( $_GET['entry_id'] ) );
+		$valid_nonce_key = wp_verify_nonce( \GV\Utils::_GET( 'duplicate' ), self::get_nonce_key( $_GET[ 'entry_id' ] ) );
 
 		if ( ! $valid_nonce_key ) {
 			gravityview()->log->debug( 'Duplicate entry not processed: nonce validation failed.' );
@@ -294,7 +294,7 @@ 
 		}
 
 		// Get the entry slug
-		$entry_slug = esc_attr( $_GET['entry_id'] );
+		$entry_slug = esc_attr( $_GET[ 'entry_id' ] );
 
 		// See if there's an entry there
 		$entry = gravityview_get_entry( $entry_slug, true, false );
@@ -388,17 +388,17 @@ 
 			return new WP_Error( 'gravityview-duplicate-entry-missing', __( 'The entry does not exist.', 'gravityview' ) );
 		}
 
-		$form = GFAPI::get_form( $entry['form_id'] );
+		$form = GFAPI::get_form( $entry[ 'form_id' ] );
 
-		$row['id'] = null;
-		$row['date_created'] = date( 'Y-m-d H:i:s', time() );
-		$row['date_updated'] = $row['date_created'];
-		$row['is_starred'] = false;
-		$row['is_read'] = false;
-		$row['ip'] = rgars( $form, 'personalData/preventIP' ) ? '' : GFFormsModel::get_ip();
-		$row['source_url'] = esc_url_raw( remove_query_arg( array( 'action', 'gvid', 'result', 'duplicate', 'entry_id' ) ) );
-		$row['user_agent'] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
-		$row['created_by'] = wp_get_current_user()->ID;
+		$row[ 'id' ] = null;
+		$row[ 'date_created' ] = date( 'Y-m-d H:i:s', time() );
+		$row[ 'date_updated' ] = $row[ 'date_created' ];
+		$row[ 'is_starred' ] = false;
+		$row[ 'is_read' ] = false;
+		$row[ 'ip' ] = rgars( $form, 'personalData/preventIP' ) ? '' : GFFormsModel::get_ip();
+		$row[ 'source_url' ] = esc_url_raw( remove_query_arg( array( 'action', 'gvid', 'result', 'duplicate', 'entry_id' ) ) );
+		$row[ 'user_agent' ] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
+		$row[ 'created_by' ] = wp_get_current_user()->ID;
 
 		/**
 		 * @filter `gravityview/entry/duplicate/details` Modify the new entry details before it's created.
@@ -426,15 +426,15 @@ 
 
 		$save_this_meta = array();
 		foreach ( $duplicate_meta->get_output() as $m ) {
-			$save_this_meta[] = array(
-				'meta_key' => $m['meta_key'],
-				'meta_value' => $m['meta_value'],
-				'item_index' => $m['item_index'],
+			$save_this_meta[ ] = array(
+				'meta_key' => $m[ 'meta_key' ],
+				'meta_value' => $m[ 'meta_value' ],
+				'item_index' => $m[ 'item_index' ],
 			);
 		}
 
 		// Update the row ID for later usage
-		$row['id'] = $duplicated_id;
+		$row[ 'id' ] = $duplicated_id;
 
 		/**
 		 * @filter `gravityview/entry/duplicate/meta` Modify the new entry meta details.
@@ -445,8 +445,8 @@ 
 		$save_this_meta = apply_filters( 'gravityview/entry/duplicate/meta', $save_this_meta, $row, $entry );
 
 		foreach ( $save_this_meta as $data ) {
-			$data['form_id'] = $entry['form_id'];
-			$data['entry_id'] = $duplicated_id;
+			$data[ 'form_id' ] = $entry[ 'form_id' ];
+			$data[ 'entry_id' ] = $duplicated_id;
 
 			if ( ! $wpdb->insert( $entry_meta_table, $data ) ) {
 				return new WP_Error( 'gravityview-duplicate-entry-db-meta', __( 'There was an error duplicating the entry.', 'gravityview' ) );
@@ -480,13 +480,13 @@ 
 	public function verify_nonce() {
 
 		// No duplicate entry request was made
-		if ( empty( $_GET['entry_id'] ) || empty( $_GET['duplicate'] ) ) {
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'duplicate' ] ) ) {
 			return false;
 		}
 
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
 
-		$valid = wp_verify_nonce( $_GET['duplicate'], $nonce_key );
+		$valid = wp_verify_nonce( $_GET[ 'duplicate' ], $nonce_key );
 
 		/**
 		 * @filter `gravityview/duplicate-entry/verify_nonce` Override Duplicate Entry nonce validation. Return true to declare nonce valid.
@@ -522,7 +522,7 @@ 
 			return '';
 		}
 
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
 	}
 
 	/**
@@ -576,7 +576,7 @@ 
 	public static function check_user_cap_duplicate_entry( $entry, $field = array(), $view_id = 0 ) {
 		$current_user = wp_get_current_user();
 
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : null;
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : null;
 
 		// Or if they can duplicate any entries (as defined in Gravity Forms), we're good.
 		if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gform_full_access', 'gravityview_full_access' ), $entry_id ) ) {
@@ -591,17 +591,17 @@ 
 		if ( ! empty( $field ) ) {
 
 			// If capability is not defined, something is not right!
-			if ( empty( $field['allow_duplicate_cap'] ) ) {
+			if ( empty( $field[ 'allow_duplicate_cap' ] ) ) {
 
 				gravityview()->log->error( 'Cannot read duplicate entry field caps', array( 'data' => $field ) );
 
 				return false;
 			}
 
-			if ( GVCommon::has_cap( $field['allow_duplicate_cap'] ) ) {
+			if ( GVCommon::has_cap( $field[ 'allow_duplicate_cap' ] ) ) {
 
 				// Do not return true if cap is read, as we need to check if the current user created the entry
-				if ( 'read' !== $field['allow_duplicate_cap'] ) {
+				if ( 'read' !== $field[ 'allow_duplicate_cap' ] ) {
 					return true;
 				}
 
@@ -614,7 +614,7 @@ 
 
 		}
 
-		if ( ! isset( $entry['created_by'] ) ) {
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
 
 			gravityview()->log->error( 'Cannot duplicate entry; entry `created_by` doesn\'t exist.' );
 
@@ -639,7 +639,7 @@ 
 		}
 
 		// If the logged-in user is the same as the user who created the entry, we're good.
-		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
 
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
 
@@ -663,12 +663,12 @@ 
 	 * @return void
 	 */
 	public function maybe_display_message( $current_view_id = 0 ) {
-		if ( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
 			return;
 		}
 
 		// Entry wasn't duplicated from current View
-		if ( isset( $_GET['view_id'] ) && ( intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) ) {
+		if ( isset( $_GET[ 'view_id' ] ) && ( intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) ) {
 			return;
 		}
 
@@ -676,11 +676,11 @@ 
 	}
 
 	public function display_message() {
-		if ( empty( $_GET['status'] ) || empty( $_GET['duplicate'] ) ) {
+		if ( empty( $_GET[ 'status' ] ) || empty( $_GET[ 'duplicate' ] ) ) {
 			return;
 		}
 
-		$status = esc_attr( $_GET['status'] );
+		$status = esc_attr( $_GET[ 'status' ] );
 		$message_from_url = \GV\Utils::_GET( 'message' );
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
 		$class = '';
@@ -706,7 +706,7 @@ 
 		$message = apply_filters( 'gravityview/duplicate-entry/message', esc_attr( $message ), $status, $message_from_url );
 
 		// DISPLAY ERROR/SUCCESS MESSAGE
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
 	}
 
 	/**
@@ -737,7 +737,7 @@ 
 		?>
 		<span class="gv-duplicate">
 			|
-			<a href="<?php echo wp_nonce_url( add_query_arg( 'entry_id', $entry['id'] ), self::get_nonce_key( $entry['id'] ), 'duplicate' ); ?>"><?php esc_html_e( 'Duplicate', 'gravityview' ); ?></a>
+			<a href="<?php echo wp_nonce_url( add_query_arg( 'entry_id', $entry[ 'id' ] ), self::get_nonce_key( $entry[ 'id' ] ), 'duplicate' ); ?>"><?php esc_html_e( 'Duplicate', 'gravityview' ); ?></a>
 		</span>
 		<?php
 	}
@@ -759,9 +759,9 @@ 
 
 		if ( 'success' === \GV\Utils::_GET( 'result' ) ) {
 			add_filter( 'gform_admin_messages', function( $messages ) {
-				$messages = (array) $messages;
+				$messages = (array)$messages;
 
-				$messages[] = esc_html__( 'Entry duplicated.', 'gravityview' );
+				$messages[ ] = esc_html__( 'Entry duplicated.', 'gravityview' );
 				return $messages;
 			} );
 		}
@@ -772,7 +772,7 @@ 
 
 			$check_logs_message = '';
 
-			if( $is_logging_active ) {
+			if ( $is_logging_active ) {
 				$check_logs_message = sprintf( ' <a href="%s">%s</a>',
 					esc_url( admin_url( 'admin.php?page=gf_settings&subview=gravityformslogging' ) ),
 					esc_html_x( 'Check the GravityView logs for more information.', 'Error message links to logging page', 'gravityview' )
@@ -780,9 +780,9 @@ 
 			}
 
 			add_filter( 'gform_admin_error_messages', function( $messages ) use ( $check_logs_message ) {
-				$messages = (array) $messages;
+				$messages = (array)$messages;
 
-				$messages[] = esc_html__( 'There was an error duplicating the entry.', 'gravityview' ) . $check_logs_message;
+				$messages[ ] = esc_html__( 'There was an error duplicating the entry.', 'gravityview' ) . $check_logs_message;
 
 				return $messages;
 			} );

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 +12 added lines, -12 removed lines

@@ -58,13 +58,13 @@ 
 		$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
 			}
 		} else { // Regular test
-			$match = $authed && \GVCommon::matches_operation( $atts['if'], $value, $operator );
+			$match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $value, $operator );
 		}
 
 		$output = $this->get_output( $match, $atts, $content );
@@ -150,8 +150,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 = '';
@@ -278,18 +278,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

@@ -58,12 +58,14 @@ 
 		$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
 			}
-		} else { // Regular test
+		} else {
+// Regular test
 			$match = $authed && \GVCommon::matches_operation( $atts['if'], $value, $operator );
 		}
 
@@ -160,12 +162,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
@@ -173,9 +178,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;
 			}
 
@@ -199,9 +206,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]' );
 	}
 ?>

includes/admin/class.render.settings.php

Spacing +74 added lines, -74 removed lines

@@ -30,7 +30,7 @@ 
 
 		$is_table_layout = preg_match( '/table/ism', $template_id );
 
-		if( 'field' === $field_type ) {
+		if ( 'field' === $field_type ) {
 
 			// Default options - fields
 			$field_options = array(
@@ -49,7 +49,7 @@ 
 				'custom_class' => array(
 					'type' => 'text',
 					'label' => __( 'Custom CSS Class:', 'gravityview' ),
-					'desc' => __( 'This class will be added to the field container', 'gravityview'),
+					'desc' => __( 'This class will be added to the field container', 'gravityview' ),
 					'value' => '',
 					'merge_tags' => true,
 					'tooltip' => 'gv_css_merge_tags',
@@ -70,11 +70,11 @@ 
 			);
 
 			// Match Table as well as DataTables
-			if( $is_table_layout && 'directory' === $context ) {
-				$field_options['width'] = array(
+			if ( $is_table_layout && 'directory' === $context ) {
+				$field_options[ 'width' ] = array(
 					'type' => 'number',
-					'label' => __('Percent Width', 'gravityview'),
-					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview'),
+					'label' => __( 'Percent Width', 'gravityview' ),
+					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview' ),
 					'class' => 'code widefat',
 					'value' => '',
 				);
@@ -129,8 +129,8 @@ 
 			'manage_options' => __( 'Administrator', 'gravityview' ),
 		);
 
-		if( is_multisite() ) {
-			$select_cap_choices['manage_network'] = __('Multisite Super Admin', 'gravityview' );
+		if ( is_multisite() ) {
+			$select_cap_choices[ 'manage_network' ] = __( 'Multisite Super Admin', 'gravityview' );
 		}
 
 		/**
@@ -143,7 +143,7 @@ 
 		 * @param  string $context     Optional. What context are we in? Example: `single` or `directory`
 		 * @param  string $input_type  Optional. (textarea, list, select, etc.)
 		 */
-		$select_cap_choices = apply_filters('gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
+		$select_cap_choices = apply_filters( 'gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
 
 		return $select_cap_choices;
 	}
@@ -171,27 +171,27 @@ 
 	 */
 	public static function render_field_options( $form_id, $field_type, $template_id, $field_id, $field_label, $area, $input_type = NULL, $uniqid = '', $current = '', $context = 'single', $item = array() ) {
 
-		if( empty( $uniqid ) ) {
+		if ( empty( $uniqid ) ) {
 			//generate a unique field id
-			$uniqid = uniqid('', false);
+			$uniqid = uniqid( '', false );
 		}
 
 		// get field/widget options
 		$options = self::get_default_field_options( $field_type, $template_id, $field_id, $context, $input_type, $form_id );
 
 		// two different post arrays, depending of the field type
-		$name_prefix = $field_type .'s' .'['. $area .']['. $uniqid .']';
+		$name_prefix = $field_type . 's' . '[' . $area . '][' . $uniqid . ']';
 
 		// build output
 		$output = '';
-		$output .= '<input type="hidden" class="field-key" name="'. $name_prefix .'[id]" value="'. esc_attr( $field_id ) .'">';
-		$output .= '<input type="hidden" class="field-label" name="'. $name_prefix .'[label]" value="'. esc_attr( $field_label ) .'">';
+		$output .= '<input type="hidden" class="field-key" name="' . $name_prefix . '[id]" value="' . esc_attr( $field_id ) . '">';
+		$output .= '<input type="hidden" class="field-label" name="' . $name_prefix . '[label]" value="' . esc_attr( $field_label ) . '">';
 		if ( $form_id ) {
-			$output .= '<input type="hidden" class="field-form-id" name="'. $name_prefix .'[form_id]" value="'. esc_attr( $form_id ) .'">';
+			$output .= '<input type="hidden" class="field-form-id" name="' . $name_prefix . '[form_id]" value="' . esc_attr( $form_id ) . '">';
 		}
 
 		// If there are no options, return what we got.
-		if(empty($options)) {
+		if ( empty( $options ) ) {
 
 			// This is here for checking if the output is empty in render_label()
 			$output .= '<!-- No Options -->';
@@ -199,33 +199,33 @@ 
 			return $output;
 		}
 
-		$output .= '<div class="gv-dialog-options" title="'. esc_attr( sprintf( __( 'Options: %s', 'gravityview' ) , strip_tags( html_entity_decode( $field_label ) ) ) ) .'">';
+		$output .= '<div class="gv-dialog-options" title="' . esc_attr( sprintf( __( 'Options: %s', 'gravityview' ), strip_tags( html_entity_decode( $field_label ) ) ) ) . '">';
 
 		/**
 		 * @since 1.8
 		 */
-		if( !empty( $item['subtitle'] ) ) {
-			$output .= '<div class="subtitle">' . $item['subtitle'] . '</div>';
+		if ( ! empty( $item[ 'subtitle' ] ) ) {
+			$output .= '<div class="subtitle">' . $item[ 'subtitle' ] . '</div>';
 		}
 
-		foreach( $options as $key => $option ) {
+		foreach ( $options as $key => $option ) {
 
 			$value = isset( $current[ $key ] ) ? $current[ $key ] : NULL;
 
-			$field_output = self::render_field_option( $name_prefix . '['. $key .']' , $option, $value);
+			$field_output = self::render_field_option( $name_prefix . '[' . $key . ']', $option, $value );
 
 			// The setting is empty
-			if( empty( $field_output ) ) {
+			if ( empty( $field_output ) ) {
 				continue;
 			}
 
-			switch( $option['type'] ) {
+			switch ( $option[ 'type' ] ) {
 				// Hide hidden fields
 				case 'hidden':
-					$output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . ' screen-reader-text">'. $field_output . '</div>';
+					$output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . ' screen-reader-text">' . $field_output . '</div>';
 					break;
 				default:
-					$output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . '">'. $field_output .'</div>';
+					$output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . '">' . $field_output . '</div>';
 			}
 		}
 
@@ -254,17 +254,17 @@ 
 		 * @deprecated setting index 'default' was replaced by 'value'
 		 * @see GravityView_FieldType::get_field_defaults
 		 */
-		if( !empty( $option['default'] ) && empty( $option['value'] ) ) {
-			$option['value'] = $option['default'];
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting '. $name .' details' );
+		if ( ! empty( $option[ 'default' ] ) && empty( $option[ 'value' ] ) ) {
+			$option[ 'value' ] = $option[ 'default' ];
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting ' . $name . ' details' );
 		}
 
 		// prepare to render option field type
-		if( isset( $option['type'] ) ) {
+		if ( isset( $option[ 'type' ] ) ) {
 
 			$type_class = self::load_type_class( $option );
 
-			if( class_exists( $type_class ) ) {
+			if ( class_exists( $type_class ) ) {
 
 				/** @var GravityView_FieldType $render_type */
 				$render_type = new $type_class( $name, $option, $curr_value );
@@ -281,7 +281,7 @@ 
 				 * @param[in,out] string $output field class name
 				 * @param[in] array $option  option field data
 				 */
-				$output = apply_filters( "gravityview/option/output/{$option['type']}" , $output, $option );
+				$output = apply_filters( "gravityview/option/output/{$option[ 'type' ]}", $output, $option );
 			}
 
 		} // isset option[type]
@@ -316,27 +316,27 @@ 
 		 * @deprecated setting index 'name' was replaced by 'label'
 		 * @see GravityView_FieldType::get_field_defaults
 		 */
-		if( isset( $setting['name'] ) && empty( $setting['label'] ) ) {
-			$setting['label'] = $setting['name'];
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting '. $key .' details' );
+		if ( isset( $setting[ 'name' ] ) && empty( $setting[ 'label' ] ) ) {
+			$setting[ 'label' ] = $setting[ 'name' ];
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting ' . $key . ' details' );
 		}
 
 		$name = esc_attr( sprintf( $name, $key ) );
-		$setting['id'] = esc_attr( sprintf( $id, $key ) );
-		$setting['tooltip'] = 'gv_' . $key;
+		$setting[ 'id' ] = esc_attr( sprintf( $id, $key ) );
+		$setting[ 'tooltip' ] = 'gv_' . $key;
 
 		// Use default if current setting isn't set.
-		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting['value'];
+		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting[ 'value' ];
 
 		// default setting type = text
-		$setting['type'] = empty( $setting['type'] ) ? 'text' : $setting['type'];
+		$setting[ 'type' ] = empty( $setting[ 'type' ] ) ? 'text' : $setting[ 'type' ];
 
 		// merge tags
-		if( !isset( $setting['merge_tags'] ) ) {
-			if( $setting['type'] === 'text' ) {
-				$setting['merge_tags'] = true;
+		if ( ! isset( $setting[ 'merge_tags' ] ) ) {
+			if ( $setting[ 'type' ] === 'text' ) {
+				$setting[ 'merge_tags' ] = true;
 			} else {
-				$setting['merge_tags'] = false;
+				$setting[ 'merge_tags' ] = false;
 			}
 		}
 
@@ -344,7 +344,7 @@ 
 
 		// render the setting
 		$type_class = self::load_type_class( $setting );
-		if( class_exists( $type_class ) ) {
+		if ( class_exists( $type_class ) ) {
 			/** @var GravityView_FieldType $render_type */
 			$render_type = new $type_class( $name, $setting, $curr_value );
 			ob_start();
@@ -353,25 +353,25 @@ 
 		}
 
 		// Check if setting is specific for a template
-		if( !empty( $setting['show_in_template'] ) ) {
-			if( !is_array( $setting['show_in_template'] ) ) {
-				$setting['show_in_template'] = array( $setting['show_in_template'] );
+		if ( ! empty( $setting[ 'show_in_template' ] ) ) {
+			if ( ! is_array( $setting[ 'show_in_template' ] ) ) {
+				$setting[ 'show_in_template' ] = array( $setting[ 'show_in_template' ] );
 			}
-			$show_if = ' data-show-if="'. implode( ' ', $setting['show_in_template'] ).'"';
+			$show_if = ' data-show-if="' . implode( ' ', $setting[ 'show_in_template' ] ) . '"';
 		} else {
 			$show_if = '';
 		}
 
-		if( ! empty( $setting['requires'] ) ) {
-			$show_if .= sprintf( ' data-requires="%s"', $setting['requires'] );
+		if ( ! empty( $setting[ 'requires' ] ) ) {
+			$show_if .= sprintf( ' data-requires="%s"', $setting[ 'requires' ] );
 		}
 
-		if( ! empty( $setting['requires_not'] ) ) {
-			$show_if .= sprintf( ' data-requires-not="%s"', $setting['requires_not'] );
+		if ( ! empty( $setting[ 'requires_not' ] ) ) {
+			$show_if .= sprintf( ' data-requires-not="%s"', $setting[ 'requires_not' ] );
 		}
 
 		// output
-		echo '<tr valign="top" '. $show_if .'>' . $output . '</tr>';
+		echo '<tr valign="top" ' . $show_if . '>' . $output . '</tr>';
 
 	}
 
@@ -383,7 +383,7 @@ 
 	 */
 	public static function load_type_class( $field = NULL ) {
 
-		if( empty( $field['type'] ) ) {
+		if ( empty( $field[ 'type' ] ) ) {
 			return NULL;
 		}
 
@@ -392,19 +392,19 @@ 
 		 * @param string $class_suffix  field class suffix; `GravityView_FieldType_{$class_suffix}`
 		 * @param array $field   field data
 		 */
-		$type_class = apply_filters( "gravityview/setting/class/{$field['type']}", 'GravityView_FieldType_' . $field['type'], $field );
+		$type_class = apply_filters( "gravityview/setting/class/{$field[ 'type' ]}", 'GravityView_FieldType_' . $field[ 'type' ], $field );
 
-		if( !class_exists( $type_class ) ) {
+		if ( ! class_exists( $type_class ) ) {
 
 			/**
 			 * @filter `gravityview/setting/class_file/{field_type}`
 			 * @param string  $field_type_include_path field class file path
 			 * @param array $field  field data
 			 */
-			$class_file = apply_filters( "gravityview/setting/class_file/{$field['type']}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field['type']}.php", $field );
+			$class_file = apply_filters( "gravityview/setting/class_file/{$field[ 'type' ]}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field[ 'type' ]}.php", $field );
 
-			if( $class_file ) {
-				if( file_exists( $class_file ) ) {
+			if ( $class_file ) {
+				if ( file_exists( $class_file ) ) {
 					require_once( $class_file );
 				}
 			}
@@ -429,8 +429,8 @@ 
 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_checkbox::render_input' );
 
-		$output  = '<input name="'. esc_attr( $name ) .'" type="hidden" value="0">';
-		$output .= '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="checkbox" value="1" '. checked( $current, '1', false ) .' >';
+		$output  = '<input name="' . esc_attr( $name ) . '" type="hidden" value="0">';
+		$output .= '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="checkbox" value="1" ' . checked( $current, '1', false ) . ' >';
 
 		return $output;
 	}
@@ -450,22 +450,22 @@ 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_text::render_input' );
 
 		// Show the merge tags if the field is a list view
-		$is_list = ( preg_match( '/_list-/ism', $name ));
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
 
 		// Or is a single entry view
-		$is_single = ( preg_match( '/single_/ism', $name ));
+		$is_single = ( preg_match( '/single_/ism', $name ) );
 		$show = ( $is_single || $is_list );
 
 		$class = '';
 		// and $add_merge_tags is not false
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
 		}
 
-		$class .= !empty( $args['class'] ) ? $args['class'] : 'widefat';
-		$type = !empty( $args['type'] ) ? $args['type'] : 'text';
+		$class .= ! empty( $args[ 'class' ] ) ? $args[ 'class' ] : 'widefat';
+		$type = ! empty( $args[ 'type' ] ) ? $args[ 'type' ] : 'text';
 
-		return '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="'.esc_attr($type).'" value="'. esc_attr( $current ) .'" class="'.esc_attr( $class ).'">';
+		return '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="' . esc_attr( $type ) . '" value="' . esc_attr( $current ) . '" class="' . esc_attr( $class ) . '">';
 	}
 
 	/**
@@ -482,21 +482,21 @@ 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_textarea::render_input' );
 
 		// Show the merge tags if the field is a list view
-		$is_list = ( preg_match( '/_list-/ism', $name ));
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
 
 		// Or is a single entry view
-		$is_single = ( preg_match( '/single_/ism', $name ));
+		$is_single = ( preg_match( '/single_/ism', $name ) );
 		$show = ( $is_single || $is_list );
 
 		$class = '';
 		// and $add_merge_tags is not false
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
 		}
 
-		$class .= !empty( $args['class'] ) ? 'widefat '.$args['class'] : 'widefat';
+		$class .= ! empty( $args[ 'class' ] ) ? 'widefat ' . $args[ 'class' ] : 'widefat';
 
-		return '<textarea name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" class="'.esc_attr( $class ).'">'. esc_textarea( $current ) .'</textarea>';
+		return '<textarea name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class ) . '">' . esc_textarea( $current ) . '</textarea>';
 	}
 
 	/**
@@ -512,9 +512,9 @@ 
 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_select::render_input' );
 
-		$output = '<select name="'. $name .'" id="'. $id .'">';
-		foreach( $choices as $value => $label ) {
-			$output .= '<option value="'. esc_attr( $value ) .'" '. selected( $value, $current, false ) .'>'. esc_html( $label ) .'</option>';
+		$output = '<select name="' . $name . '" id="' . $id . '">';
+		foreach ( $choices as $value => $label ) {
+			$output .= '<option value="' . esc_attr( $value ) . '" ' . selected( $value, $current, false ) . '>' . esc_html( $label ) . '</option>';
 		}
 		$output .= '</select>';
 

includes/admin/metaboxes/views/view-configuration.php

Indentation +9 added lines, -9 removed lines

@@ -31,11 +31,11 @@ 
 
 			<?php
 
-                do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
+				do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
 
-    			do_action('gravityview_render_field_pickers', 'directory' );
+				do_action('gravityview_render_field_pickers', 'directory' );
 
-            ?>
+			?>
 
 			<?php // list of available widgets to be shown in the popup ?>
             <div id="directory-available-widgets" class="hide-if-js gv-tooltip">
@@ -60,13 +60,13 @@ 
 
 			<div id="single-active-fields" class="gv-grid">
 				<?php
-                if(!empty( $curr_template ) ) {
-				    do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
-                }
-			    ?>
+				if(!empty( $curr_template ) ) {
+					do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
+				}
+				?>
 			</div>
             <?php
-                do_action('gravityview_render_field_pickers', 'single' );
+				do_action('gravityview_render_field_pickers', 'single' );
 			?>
 		</div>
 
@@ -85,7 +85,7 @@ 
 			</div>
 
 			<?php
-			    do_action('gravityview_render_field_pickers', 'edit' );
+				do_action('gravityview_render_field_pickers', 'edit' );
 			?>
 
 		</div>

Spacing +16 added lines, -16 removed lines

@@ -15,32 +15,32 @@ 
 
 		<div id="directory-fields" class="gv-section">
 
-			<h4><?php esc_html_e( 'Above Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview'); ?></span></h4>
+			<h4><?php esc_html_e( 'Above Entries Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview' ); ?></span></h4>
 
-			<?php do_action('gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?>
+			<?php do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?>
 
-			<h4><?php esc_html_e( 'Entries Fields', 'gravityview'); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview'); ?></span></h4>
+			<h4><?php esc_html_e( 'Entries Fields', 'gravityview' ); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview' ); ?></span></h4>
 
 			<div id="directory-active-fields" class="gv-grid">
-				<?php if(!empty( $curr_template ) ) {
-					do_action('gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true );
+				<?php if ( ! empty( $curr_template ) ) {
+					do_action( 'gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true );
 				} ?>
 			</div>
 
-			<h4><?php esc_html_e( 'Below Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown below entries.', 'gravityview'); ?></span></h4>
+			<h4><?php esc_html_e( 'Below Entries Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown below entries.', 'gravityview' ); ?></span></h4>
 
 			<?php
 
-                do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
+                do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
 
-    			do_action('gravityview_render_field_pickers', 'directory' );
+    			do_action( 'gravityview_render_field_pickers', 'directory' );
 
             ?>
 
 			<?php // list of available widgets to be shown in the popup ?>
             <div id="directory-available-widgets" class="hide-if-js gv-tooltip">
                 <span class="close" role="button" aria-label="<?php esc_html_e( 'Close', 'gravityview' ); ?>"><i class="dashicons dashicons-dismiss"></i></span>
-				<?php do_action('gravityview_render_available_widgets' ); ?>
+				<?php do_action( 'gravityview_render_available_widgets' ); ?>
             </div>
 
 		</div>
@@ -56,17 +56,17 @@ 
 
 		<div id="single-fields" class="gv-section">
 
-			<h4><?php esc_html_e( 'These fields will be shown in Single Entry view.', 'gravityview'); ?></h4>
+			<h4><?php esc_html_e( 'These fields will be shown in Single Entry view.', 'gravityview' ); ?></h4>
 
 			<div id="single-active-fields" class="gv-grid">
 				<?php
-                if(!empty( $curr_template ) ) {
-				    do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
+                if ( ! empty( $curr_template ) ) {
+				    do_action( 'gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
                 }
 			    ?>
 			</div>
             <?php
-                do_action('gravityview_render_field_pickers', 'single' );
+                do_action( 'gravityview_render_field_pickers', 'single' );
 			?>
 		</div>
 
@@ -76,16 +76,16 @@ 
 
 		<div id="edit-fields" class="gv-section">
 
-			<h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview'); ?> <span><?php esc_html_e('If not configured, all form fields will be displayed.', 'gravityview'); ?></span></h4>
+			<h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview' ); ?> <span><?php esc_html_e( 'If not configured, all form fields will be displayed.', 'gravityview' ); ?></span></h4>
 
 			<div id="edit-active-fields" class="gv-grid">
 				<?php
-				do_action('gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true );
+				do_action( 'gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true );
 				?>
 			</div>
 
 			<?php
-			    do_action('gravityview_render_field_pickers', 'edit' );
+			    do_action( 'gravityview_render_field_pickers', 'edit' );
 			?>
 
 		</div>

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

Spacing +10 added lines, -10 removed lines

@@ -22,27 +22,27 @@
 
 <?php // list all the available templates (type= fresh or custom ) ?>
 <div class="gv-grid">
-	<?php foreach( $templates as $id => $template ) {
+	<?php foreach ( $templates as $id => $template ) {
 		$selected = ( $id == $current_template ) ? ' gv-selected' : ''; ?>
 
 		<div class="gv-grid-col-1-3">
-			<div class="gv-view-types-module<?php echo $selected; ?>" data-filter="<?php echo esc_attr( $template['type'] ); ?>">
+			<div class="gv-view-types-module<?php echo $selected; ?>" data-filter="<?php echo esc_attr( $template[ 'type' ] ); ?>">
 				<div class="gv-view-types-hover">
 					<div>
-						<?php if( !empty( $template['buy_source'] ) ) { ?>
-							<p><a href="<?php echo esc_url( $template['buy_source'] ); ?>" class="button-primary button-buy-now"><?php esc_html_e( 'Buy Now', 'gravityview'); ?></a></p>
+						<?php if ( ! empty( $template[ 'buy_source' ] ) ) { ?>
+							<p><a href="<?php echo esc_url( $template[ 'buy_source' ] ); ?>" class="button-primary button-buy-now"><?php esc_html_e( 'Buy Now', 'gravityview' ); ?></a></p>
 						<?php } else { ?>
-							<p><button href="#gv_select_template" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview'); ?></button></p>
-							<?php if( !empty( $template['preview'] ) ) { ?>
-								<a href="<?php echo esc_url( $template['preview'] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview'); ?>"></i></a>
+							<p><button href="#gv_select_template" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview' ); ?></button></p>
+							<?php if ( ! empty( $template[ 'preview' ] ) ) { ?>
+								<a href="<?php echo esc_url( $template[ 'preview' ] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview' ); ?>"></i></a>
 							<?php } ?>
 						<?php } ?>
 					</div>
 				</div>
 				<div class="gv-view-types-normal">
-					<img src="<?php echo esc_url( $template['logo'] ); ?>" alt="<?php echo esc_attr( $template['label'] ); ?>">
-					<h5><?php echo esc_html( $template['label'] ); ?></h5>
-					<p class="description"><?php echo esc_html( $template['description'] ); ?></p>
+					<img src="<?php echo esc_url( $template[ 'logo' ] ); ?>" alt="<?php echo esc_attr( $template[ 'label' ] ); ?>">
+					<h5><?php echo esc_html( $template[ 'label' ] ); ?></h5>
+					<p class="description"><?php echo esc_html( $template[ 'description' ] ); ?></p>
 				</div>
 			</div>
 		</div>

includes/admin/metaboxes/views/data-source.php

Spacing +7 added lines, -7 removed lines

@@ -10,13 +10,13 @@ 
 wp_nonce_field( 'gravityview_select_form', 'gravityview_select_form_nonce' );
 
 //current value
-$current_form = (int) \GV\Utils::_GET( 'form_id', gravityview_get_form_id( $post->ID ) );
+$current_form = (int)\GV\Utils::_GET( 'form_id', gravityview_get_form_id( $post->ID ) );
 
 // If form is in trash or not existing, show error
 GravityView_Admin::connected_form_warning( $current_form );
 
 // check for available gravity forms
-$forms = gravityview_get_forms('any');
+$forms = gravityview_get_forms( 'any' );
 
 /**
  * @param int $current_form Form currently selected in the View (0 if none selected)
@@ -35,24 +35,24 @@ 
 		?>
 		<a class="button button-primary" href="#gv_start_fresh" title="<?php esc_attr_e( 'Use a Form Preset', 'gravityview' ); ?>"><?php esc_html_e( 'Use a Form Preset', 'gravityview' ); ?></a>
 
-		<?php if( !empty( $forms ) ) { ?>
+		<?php if ( ! empty( $forms ) ) { ?>
 			<span>&nbsp;<?php esc_html_e( 'or use an existing form', 'gravityview' ); ?>&nbsp;</span>
 		<?php }
 	}
 
 	// If there are no forms to select, show no forms.
-	if( !empty( $forms ) ) { ?>
+	if ( ! empty( $forms ) ) { ?>
 		<select name="gravityview_form_id" id="gravityview_form_id">
 			<option value="" <?php selected( '', $current_form, true ); ?>>&mdash; <?php esc_html_e( 'list of forms', 'gravityview' ); ?> &mdash;</option>
-			<?php foreach( $forms as $form ) { ?>
-				<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
+			<?php foreach ( $forms as $form ) { ?>
+				<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
 			<?php } ?>
 		</select>
 	<?php } else { ?>
 		<select name="gravityview_form_id" id="gravityview_form_id" class="hidden"><option selected="selected" value=""></option></select>
 	<?php } ?>
 
-	&nbsp;<button class="button button-primary" <?php if( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></button>
+	&nbsp;<button class="button button-primary" <?php if ( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></button>
 </p>
 
 <?php // confirm dialog box ?>