gravityview / GravityView

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

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/lightbox/fancybox/class-gravityview-lightbox-provider-fancybox.php

Spacing +18 added lines, -18 removed lines

@@ -110,18 +110,18 @@ 
 	 */
 	public function allowed_atts( $atts = array() ) {
 
-		$atts['data-fancybox']         = null;
-		$atts['data-fancybox-trigger'] = null;
-		$atts['data-fancybox-index']   = null;
-		$atts['data-src']              = null;
-		$atts['data-type']             = null;
-		$atts['data-width']            = null;
-		$atts['data-height']           = null;
-		$atts['data-srcset']           = null;
-		$atts['data-caption']          = null;
-		$atts['data-options']          = null;
-		$atts['data-filter']           = null;
-		$atts['data-type']             = null;
+		$atts[ 'data-fancybox' ]         = null;
+		$atts[ 'data-fancybox-trigger' ] = null;
+		$atts[ 'data-fancybox-index' ]   = null;
+		$atts[ 'data-src' ]              = null;
+		$atts[ 'data-type' ]             = null;
+		$atts[ 'data-width' ]            = null;
+		$atts[ 'data-height' ]           = null;
+		$atts[ 'data-srcset' ]           = null;
+		$atts[ 'data-caption' ]          = null;
+		$atts[ 'data-options' ]          = null;
+		$atts[ 'data-filter' ]           = null;
+		$atts[ 'data-type' ]             = null;
 
 		return $atts;
 	}
@@ -136,23 +136,23 @@ 
 		}
 
 		// Prevent empty content from getting added to the lightbox gallery
-		if ( is_array( $additional_details ) && empty( $additional_details['file_path'] ) ) {
+		if ( is_array( $additional_details ) && empty( $additional_details[ 'file_path' ] ) ) {
 			return $link_atts;
 		}
 
 		// Prevent empty content from getting added to the lightbox gallery
-		if ( is_array( $additional_details ) && ! empty( $additional_details['disable_lightbox'] ) ) {
+		if ( is_array( $additional_details ) && ! empty( $additional_details[ 'disable_lightbox' ] ) ) {
 			return $link_atts;
 		}
 
-		$link_atts['class'] = \GV\Utils::get( $link_atts, 'class' ) . ' gravityview-fancybox';
+		$link_atts[ 'class' ] = \GV\Utils::get( $link_atts, 'class' ) . ' gravityview-fancybox';
 
-		$link_atts['class'] = gravityview_sanitize_html_class( $link_atts['class'] );
+		$link_atts[ 'class' ] = gravityview_sanitize_html_class( $link_atts[ 'class' ] );
 
 		if ( $context && ! empty( $context->field->field ) ) {
 			if ( $context->field->field->multipleFiles ) {
 				$entry = $context->entry->as_entry();
-				$link_atts['data-fancybox'] = 'gallery-' . sprintf( "%s-%s-%s", $entry['form_id'], $context->field->ID, $context->entry->get_slug() );
+				$link_atts[ 'data-fancybox' ] = 'gallery-' . sprintf( "%s-%s-%s", $entry[ 'form_id' ], $context->field->ID, $context->entry->get_slug() );
 			}
 		}
 
@@ -167,7 +167,7 @@ 
 				),
 			);
 
-			$link_atts['data-options'] = json_encode( $fancybox_settings );
+			$link_atts[ 'data-options' ] = json_encode( $fancybox_settings );
 		}
 
 		return $link_atts;

includes/extensions/lightbox/class-gravityview-lightbox-provider.php

Spacing +4 added lines, -4 removed lines

@@ -23,8 +23,8 @@ 
 		add_filter( 'gravityview/fields/fileupload/link_atts', array( $this, 'fileupload_link_atts' ), 10, 4 );
 		add_filter( 'gravityview/get_link/allowed_atts', array( $this, 'allowed_atts' ) );
 
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts') );
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles') );
+		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
 
 		add_action( 'gravityview/template/after', array( $this, 'print_scripts' ) );
 
@@ -92,8 +92,8 @@ 
 		remove_filter( 'gravityview/fields/fileupload/link_atts', array( $this, 'fileupload_link_atts' ), 10 );
 		remove_filter( 'gravityview/get_link/allowed_atts', array( $this, 'allowed_atts' ) );
 
-		remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts') );
-		remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles') );
+		remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+		remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
 
 		remove_action( 'wp_footer', array( $this, 'output_footer' ) );
 	}

includes/admin/entry-list.php

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
 		add_action( 'gform_entries_first_column_actions', array( $this, 'add_edit_link' ), 10, 5 );
 
 		// Add script to enable edit link
-		add_action( 'admin_head', array( $this, 'add_edit_script') );
+		add_action( 'admin_head', array( $this, 'add_edit_script' ) );
 	}
 
 	/**
@@ -60,14 +60,14 @@ 
 			'page' => 'gf_entries',
 			'view' => 'entry',
 			'id'	=> (int)$form_id,
-			'lid'	=>	(int)$lead["id"],
+			'lid'	=>	(int)$lead[ "id" ],
 			'screen_mode'	=> 'edit',
 		);
 		?>
 
 		<span class="edit edit_entry">
 			|
-		    <a title="<?php esc_attr_e( 'Edit this entry', 'gravityview'); ?>" href="<?php echo esc_url( add_query_arg( $params, admin_url( 'admin.php?page='.$query_string ) ) ); ?>"><?php esc_html_e( 'Edit', 'gravityview' ); ?></a>
+		    <a title="<?php esc_attr_e( 'Edit this entry', 'gravityview' ); ?>" href="<?php echo esc_url( add_query_arg( $params, admin_url( 'admin.php?page=' . $query_string ) ) ); ?>"><?php esc_html_e( 'Edit', 'gravityview' ); ?></a>
 		</span>
 		<?php
 	}

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

Spacing +23 added lines, -23 removed lines

@@ -26,21 +26,21 @@ 
 
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
-		unset( $field_options['search_filter'] );
+		unset( $field_options[ 'search_filter' ] );
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
-		$add_options['link_to_file'] = array(
+		$add_options[ 'link_to_file' ] = array(
 			'type' => 'checkbox',
 			'label' => __( 'Display as a Link:', 'gravityview' ),
-			'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'),
+			'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ),
 			'value' => false,
 			'merge_tags' => false,
 		);
 
-		$add_options['image_width'] = array(
+		$add_options[ 'image_width' ] = array(
 			'type' => 'text',
 			'label' => __( 'Custom Width:', 'gravityview' ),
 			'desc' => __( 'Override the default image width (250).', 'gravityview' ),
@@ -129,14 +129,14 @@ 
 			$base_id = null;
 
 			$is_single = gravityview_get_context() === 'single';
-			$lightbox = ! empty( $gravityview_view->atts['lightbox'] );
+			$lightbox = ! empty( $gravityview_view->atts[ 'lightbox' ] );
 			$field_compat = $gravityview_view->getCurrentField();
 		}
 
 		$output_arr = array();
 
 		// Get an array of file paths for the field.
-		$file_paths = \GV\Utils::get( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value );
+		$file_paths = \GV\Utils::get( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value );
 
 		// The $value JSON was probably truncated; let's check lead_detail_long.
 		if ( ! is_array( $file_paths ) ) {
@@ -156,7 +156,7 @@ 
 			$rendered = null;
 
 			// If the site is HTTPS, use HTTPS
-			if ( function_exists('set_url_scheme') ) {
+			if ( function_exists( 'set_url_scheme' ) ) {
 				$file_path = set_url_scheme( $file_path );
 			}
 
@@ -167,8 +167,8 @@ 
 			$file_path_info = pathinfo( $file_path );
 
 			// If pathinfo() gave us the extension of the file, run the switch statement using that.
-			$extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] );
-			$basename = $file_path_info['basename'];
+			$extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] );
+			$basename = $file_path_info[ 'basename' ];
 
 			// Get the secure download URL
 			$is_secure = false;
@@ -208,7 +208,7 @@ 
 					 */
 					$audio_settings = apply_filters( 'gravityview_audio_settings', array(
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
-						'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id']
+						'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ]
 					), $context );
 
 					/**
@@ -244,7 +244,7 @@ 
 					 */
 					$video_settings = apply_filters( 'gravityview_video_settings', array(
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
-						'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id']
+						'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ]
 					), $context );
 
 					/**
@@ -275,20 +275,20 @@ 
 					$file_path = add_query_arg( array( 'gv-iframe' => 'true' ), $file_path );
 				}
 
-				$field_settings['link_to_file'] = true;
+				$field_settings[ 'link_to_file' ] = true;
 
 			// Images
 			} else if ( in_array( $extension, array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ) ) ) {
 				$width = \GV\Utils::get( $field_settings, 'image_width', 250 );
 				$image_atts = array(
 					'src'   => $file_path,
-					'class' => 'gv-image gv-field-id-' . $field_settings['id'],
-					'alt'   => $field_settings['label'],
-					'width' => ( $is_single ? null : ( $width ? $width: 250 ) )
+					'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ],
+					'alt'   => $field_settings[ 'label' ],
+					'width' => ( $is_single ? null : ( $width ? $width : 250 ) )
 				);
 
 				if ( $is_secure ) {
-					$image_atts['validate_src'] = false;
+					$image_atts[ 'validate_src' ] = false;
 				}
 
 				/**
@@ -309,7 +309,7 @@ 
 
 				unset( $gv_entry );
 
-				if ( $lightbox && empty( $field_settings['show_as_link'] ) ) {
+				if ( $lightbox && empty( $field_settings[ 'show_as_link' ] ) ) {
 					$lightbox_link_atts = array(
 						'rel'   => sprintf( "%s-%s", $gv_class, $entry_slug ),
 						'class' => '',
@@ -323,13 +323,13 @@ 
 				}
 
 				// Show as link should render the image regardless.
-				if ( ! empty( $field_settings['show_as_link'] ) ) {
+				if ( ! empty( $field_settings[ 'show_as_link' ] ) ) {
 					$text = $rendered;
 				}
 			}
 			// For all other non-media file types (ZIP, for example), always show as a link regardless of setting.
 			else {
-				$field_settings['link_to_file'] = true;
+				$field_settings[ 'link_to_file' ] = true;
 				$disable_lightbox = true;
 			}
 
@@ -345,7 +345,7 @@ 
 			$disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', false, $field_compat, $context );
 
 			// Output textualized content where
-			if ( ! $disable_wrapped_link && ( ! empty( $field_settings['link_to_file'] ) || ! empty( $field_settings['show_as_link'] ) ) ) {
+			if ( ! $disable_wrapped_link && ( ! empty( $field_settings[ 'link_to_file' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) ) {
 				/**
 				 * Modify the link text (defaults to the file name)
 				 *
@@ -358,7 +358,7 @@ 
 				 */
 				$content = apply_filters( 'gravityview/fields/fileupload/link_content', $text, $field_compat, $context );
 
-				if ( empty( $field_settings['show_as_link'] ) ) {
+				if ( empty( $field_settings[ 'show_as_link' ] ) ) {
 					/**
 					 * @filter `gravityview/fields/fileupload/link_atts` Modify the link attributes for a file upload field
 					 * @since 2.0 Added $context
@@ -379,7 +379,7 @@ 
 				$content = empty( $rendered ) ? $text : $rendered;
 			}
 
-			$output_arr[] = array(
+			$output_arr[ ] = array(
 				'file_path' => $file_path,
 				'content' => $content
 			);

includes/presets/register-default-templates.php

Spacing +7 added lines, -7 removed lines

@@ -59,8 +59,8 @@ 
 		'GravityView_DataTables_Template' => array(
 			'slug' => 'dt_placeholder',
 			'label' =>  __( 'DataTables Table', 'gv-datatables', 'gravityview' ),
-			'description' => __('Display items in a dynamic table powered by DataTables.', 'gravityview'),
-			'logo' => plugins_url('assets/images/templates/logo-datatables.png', GRAVITYVIEW_FILE ),
+			'description' => __( 'Display items in a dynamic table powered by DataTables.', 'gravityview' ),
+			'logo' => plugins_url( 'assets/images/templates/logo-datatables.png', GRAVITYVIEW_FILE ),
 			'buy_source' => 'https://gravityview.co/pricing/?utm_source=plugin&utm_medium=buy_now&utm_campaign=view_type&utm_term=datatables',
 			'preview' => 'https://try.gravityview.co/demo/view/datatables/?utm_source=plugin&utm_medium=try_demo&utm_campaign=view_type&utm_term=datatables',
 			'license' => esc_html__( 'All Access', 'gravityview' ),
@@ -102,13 +102,13 @@ 
 				continue;
 			}
 
-			$license_price_id = (int) \GV\Utils::get( $license, 'price_id', 0 );
-			$placeholder_price_id = (int) \GV\Utils::get( $placeholder, 'price_id' );
+			$license_price_id = (int)\GV\Utils::get( $license, 'price_id', 0 );
+			$placeholder_price_id = (int)\GV\Utils::get( $placeholder, 'price_id' );
 
-			$placeholder['type']     = 'custom';
-			$placeholder['included'] = ( $license_price_id >= $placeholder_price_id );
+			$placeholder[ 'type' ]     = 'custom';
+			$placeholder[ 'included' ] = ( $license_price_id >= $placeholder_price_id );
 
-			new GravityView_Placeholder_Template( $placeholder['slug'], $placeholder );
+			new GravityView_Placeholder_Template( $placeholder[ 'slug' ], $placeholder );
 		}
 
 	} catch ( Exception $exception ) {

includes/extensions/edit-entry/class-edit-entry-admin.php

Spacing +19 added lines, -19 removed lines

@@ -24,7 +24,7 @@ 
 
     function load() {
 
-        if( !is_admin() ) {
+        if ( ! is_admin() ) {
             return;
         }
 
@@ -38,7 +38,7 @@ 
         add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 );
 
         // add tooltips
-        add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips') );
+        add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips' ) );
 
         // custom fields' options for zone EDIT
         add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 6 );
@@ -77,12 +77,12 @@ 
      */
     function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
 
-        if( $zone !== 'edit' ) {
+        if ( $zone !== 'edit' ) {
 
-            $entry_default_fields['edit_link'] = array(
-                'label' => __('Link to Edit Entry', 'gravityview'),
+            $entry_default_fields[ 'edit_link' ] = array(
+                'label' => __( 'Link to Edit Entry', 'gravityview' ),
                 'type' => 'edit_link',
-                'desc'	=> __('A link to edit the entry. Visible based on View settings.', 'gravityview'),
+                'desc'	=> __( 'A link to edit the entry. Visible based on View settings.', 'gravityview' ),
                 'icon' => 'dashicons-welcome-write-blog',
             );
 
@@ -107,12 +107,12 @@ 
         $caps = $visibility_caps;
 
         // If we're configuring fields in the edit context, we want a limited selection
-        if( $context === 'edit' ) {
+        if ( $context === 'edit' ) {
 
             // Remove other built-in caps.
-            unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
+            unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
 
-            $caps['read'] = _x('Entry Creator','User capability', 'gravityview');
+            $caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
         }
 
         return $caps;
@@ -132,20 +132,20 @@ 
     function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
         // Always a link, never a filter
-        unset( $field_options['show_as_link'], $field_options['search_filter'] );
+        unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
 
         // Edit 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['edit_link'] = array(
+        $add_option[ 'edit_link' ] = array(
             'type' => 'text',
             'label' => __( 'Edit Link Text', 'gravityview' ),
             'desc' => NULL,
-            'value' => __('Edit Entry', 'gravityview'),
+            'value' => __( 'Edit Entry', 'gravityview' ),
             'merge_tags' => true,
         );
 
-	    $add_option['new_window'] = array(
+	    $add_option[ 'new_window' ] = array(
 		    'type' => 'checkbox',
 		    'label' => __( 'Open link in a new tab or window?', 'gravityview' ),
 		    'value' => false,
@@ -165,9 +165,9 @@ 
 
         $return = $tooltips;
 
-        $return['allow_edit_cap'] = array(
-            'title' => __('Limiting Edit Access', 'gravityview'),
-            'value' => __('Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview'),
+        $return[ 'allow_edit_cap' ] = array(
+            'title' => __( 'Limiting Edit Access', 'gravityview' ),
+            'value' => __( 'Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview' ),
         );
 
         return $return;
@@ -188,12 +188,12 @@ 
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
         // We only want to modify the settings for the edit context
-        if( 'edit' !== $context ) {
+        if ( 'edit' !== $context ) {
             return $field_options;
         }
 
         //  Entry field is only for logged in users
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
+        unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
 
         $add_options = array(
             'allow_edit_cap' => array(

Indentation +147 added lines, -147 removed lines

@@ -10,42 +10,42 @@ 
  */
 
 if ( ! defined( 'WPINC' ) ) {
-    die;
+	die;
 }
 
 
 class GravityView_Edit_Entry_Admin {
 
-    protected $loader;
+	protected $loader;
 
-    function __construct( GravityView_Edit_Entry $loader ) {
-        $this->loader = $loader;
-    }
+	function __construct( GravityView_Edit_Entry $loader ) {
+		$this->loader = $loader;
+	}
 
-    function load() {
+	function load() {
 
-        if( !is_admin() ) {
-            return;
-        }
+		if( !is_admin() ) {
+			return;
+		}
 
-        // Add Edit Link as a default field, outside those set in the Gravity Form form
-        add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
+		// Add Edit Link as a default field, outside those set in the Gravity Form form
+		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
 
-        // For the Edit Entry Link, you don't want visible to all users.
-        add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 );
+		// For the Edit Entry Link, you don't want visible to all users.
+		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 );
 
-        // Modify the field options based on the name of the field type
-        add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 );
+		// Modify the field options based on the name of the field type
+		add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 );
 
-        // add tooltips
-        add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips') );
+		// add tooltips
+		add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips') );
 
-        // custom fields' options for zone EDIT
-        add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 6 );
+		// custom fields' options for zone EDIT
+		add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 6 );
 
-        // Add Edit Entry settings to View Settings
-        add_action( 'gravityview/metaboxes/edit_entry', array( $this, 'view_settings_metabox' ) );
-    }
+		// Add Edit Entry settings to View Settings
+		add_action( 'gravityview/metaboxes/edit_entry', array( $this, 'view_settings_metabox' ) );
+	}
 
 	/**
 	 * Render Edit Entry View metabox settings
@@ -73,109 +73,109 @@ 
 		GravityView_Render_Settings::render_setting_row( 'action_label_cancel', $current_settings );
 	}
 
-    /**
-     * Add Edit Link as a default field, outside those set in the Gravity Form form
-     * @param array $entry_default_fields Existing fields
-     * @param  string|array $form form_ID or form object
-     * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
-     */
-    function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
-
-        if( $zone !== 'edit' ) {
-
-            $entry_default_fields['edit_link'] = array(
-                'label' => __('Link to Edit Entry', 'gravityview'),
-                'type' => 'edit_link',
-                'desc'	=> __('A link to edit the entry. Visible based on View settings.', 'gravityview'),
-                'icon' => 'dashicons-welcome-write-blog',
-            );
-
-        }
-
-        return $entry_default_fields;
-    }
-
-    /**
-     * Change wording for the Edit context to read Entry Creator
-     *
-     * @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       $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`
-     * @param  string      $input_type  (textarea, list, select, etc.)
-     * @return array                   Array of field options with `label`, `value`, `type`, `default` keys
-     */
-    function modify_visibility_caps( $visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
-
-        $caps = $visibility_caps;
-
-        // If we're configuring fields in the edit context, we want a limited selection
-        if( $context === 'edit' ) {
-
-            // Remove other built-in caps.
-            unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
-
-            $caps['read'] = _x('Entry Creator','User capability', 'gravityview');
-        }
-
-        return $caps;
-    }
-
-    /**
-     * Add "Edit Link Text" setting to the edit_link field settings
-     *
-     * @param array  $field_options
-     * @param string $template_id
-     * @param string $field_id
-     * @param string $context
-     * @param string $input_type
-     *
-     * @return array $field_options, with "Edit Link Text" field option
-     */
-    function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
-
-        // Always a link, never a filter
-        unset( $field_options['show_as_link'], $field_options['search_filter'] );
-
-        // Edit Entry link should only appear to visitors capable of editing entries
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
-
-        $add_option['edit_link'] = array(
-            'type' => 'text',
-            'label' => __( 'Edit Link Text', 'gravityview' ),
-            'desc' => NULL,
-            'value' => __('Edit Entry', 'gravityview'),
-            'merge_tags' => true,
-        );
-
-	    $add_option['new_window'] = array(
-		    'type' => 'checkbox',
-		    'label' => __( 'Open link in a new tab or window?', 'gravityview' ),
-		    'value' => false,
-		    'group' => 'display',
-		    'priority' => 1300,
-	    );
-
-        return array_merge( $add_option, $field_options );
-    }
-
-    /**
-     * Add tooltips
-     * @param  array $tooltips Existing tooltips
-     * @return array           Modified tooltips
-     */
-    function tooltips( $tooltips ) {
-
-        $return = $tooltips;
-
-        $return['allow_edit_cap'] = array(
-            'title' => __('Limiting Edit Access', 'gravityview'),
-            'value' => __('Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview'),
-        );
-
-        return $return;
-    }
+	/**
+	 * Add Edit Link as a default field, outside those set in the Gravity Form form
+	 * @param array $entry_default_fields Existing fields
+	 * @param  string|array $form form_ID or form object
+	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
+	 */
+	function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
+
+		if( $zone !== 'edit' ) {
+
+			$entry_default_fields['edit_link'] = array(
+				'label' => __('Link to Edit Entry', 'gravityview'),
+				'type' => 'edit_link',
+				'desc'	=> __('A link to edit the entry. Visible based on View settings.', 'gravityview'),
+				'icon' => 'dashicons-welcome-write-blog',
+			);
+
+		}
+
+		return $entry_default_fields;
+	}
+
+	/**
+	 * Change wording for the Edit context to read Entry Creator
+	 *
+	 * @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       $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`
+	 * @param  string      $input_type  (textarea, list, select, etc.)
+	 * @return array                   Array of field options with `label`, `value`, `type`, `default` keys
+	 */
+	function modify_visibility_caps( $visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
+
+		$caps = $visibility_caps;
+
+		// If we're configuring fields in the edit context, we want a limited selection
+		if( $context === 'edit' ) {
+
+			// Remove other built-in caps.
+			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
+
+			$caps['read'] = _x('Entry Creator','User capability', 'gravityview');
+		}
+
+		return $caps;
+	}
+
+	/**
+	 * Add "Edit Link Text" setting to the edit_link field settings
+	 *
+	 * @param array  $field_options
+	 * @param string $template_id
+	 * @param string $field_id
+	 * @param string $context
+	 * @param string $input_type
+	 *
+	 * @return array $field_options, with "Edit Link Text" field option
+	 */
+	function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
+
+		// Always a link, never a filter
+		unset( $field_options['show_as_link'], $field_options['search_filter'] );
+
+		// Edit Entry link should only appear to visitors capable of editing entries
+		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
+
+		$add_option['edit_link'] = array(
+			'type' => 'text',
+			'label' => __( 'Edit Link Text', 'gravityview' ),
+			'desc' => NULL,
+			'value' => __('Edit Entry', 'gravityview'),
+			'merge_tags' => true,
+		);
+
+		$add_option['new_window'] = array(
+			'type' => 'checkbox',
+			'label' => __( 'Open link in a new tab or window?', 'gravityview' ),
+			'value' => false,
+			'group' => 'display',
+			'priority' => 1300,
+		);
+
+		return array_merge( $add_option, $field_options );
+	}
+
+	/**
+	 * Add tooltips
+	 * @param  array $tooltips Existing tooltips
+	 * @return array           Modified tooltips
+	 */
+	function tooltips( $tooltips ) {
+
+		$return = $tooltips;
+
+		$return['allow_edit_cap'] = array(
+			'title' => __('Limiting Edit Access', 'gravityview'),
+			'value' => __('Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview'),
+		);
+
+		return $return;
+	}
 
 	/**
 	 * Add "Edit Link Text" setting to the edit_link field settings
@@ -191,28 +191,28 @@ 
 	 */
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
-        // We only want to modify the settings for the edit context
-        if( 'edit' !== $context ) {
-            return $field_options;
-        }
-
-        //  Entry field is only for logged in users
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
-
-        $add_options = array(
-            'allow_edit_cap' => array(
-                'type' => 'select',
-                'label' => __( 'Make field editable to:', 'gravityview' ),
-                'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
-                'tooltip' => 'allow_edit_cap',
-                'class' => 'widefat',
-                'value' => 'read', // Default: entry creator
-                'group' => 'visibility',
-            ),
-        );
-
-        return array_merge( $field_options, $add_options );
-    }
+		// We only want to modify the settings for the edit context
+		if( 'edit' !== $context ) {
+			return $field_options;
+		}
+
+		//  Entry field is only for logged in users
+		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
+
+		$add_options = array(
+			'allow_edit_cap' => array(
+				'type' => 'select',
+				'label' => __( 'Make field editable to:', 'gravityview' ),
+				'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
+				'tooltip' => 'allow_edit_cap',
+				'class' => 'widefat',
+				'value' => 'read', // Default: entry creator
+				'group' => 'visibility',
+			),
+		);
+
+		return array_merge( $field_options, $add_options );
+	}
 
 
 } // end class

includes/class-data.php

Spacing +19 added lines, -19 removed lines

@@ -20,7 +20,7 @@ 
 
 		if ( ! empty( $passed_post ) ) {
 			$id_or_id_array = $this->maybe_get_view_id( $passed_post );
-			foreach( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) {
+			foreach ( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) {
 				if ( \GV\View::exists( $view_id ) && ! $this->views->contains( $view_id ) ) {
 					$this->views->add( \GV\View::by_id( $view_id ) );
 				}
@@ -78,7 +78,7 @@ 
 			foreach ( $passed_post as &$post ) {
 				$views = \GV\View_Collection::from_post( $post );
 				foreach ( $views->all() as $view ) {
-					$ids []= $view->ID;
+					$ids [ ] = $view->ID;
 
 					/** And as a side-effect... add each view to the global scope. */
 					if ( ! $this->views->contains( $view->ID ) ) {
@@ -92,18 +92,18 @@ 
 			if ( is_string( $passed_post ) ) {
 				$shortcodes = \GV\Shortcode::parse( $passed_post );
 				foreach ( $shortcodes as $shortcode ) {
-					if ( $shortcode->name == 'gravityview' && !empty( $shortcode->atts['id'] ) ) {
-						$ids []= $shortcode->atts['id'];
+					if ( $shortcode->name == 'gravityview' && ! empty( $shortcode->atts[ 'id' ] ) ) {
+						$ids [ ] = $shortcode->atts[ 'id' ];
 
 						/** And as a side-effect... add each view to the global scope. */
-						if ( ! $this->views->contains( $shortcode->atts['id'] ) && \GV\View::exists( $shortcode->atts['id'] ) ) {
-							$this->views->add( $shortcode->atts['id'] );
+						if ( ! $this->views->contains( $shortcode->atts[ 'id' ] ) && \GV\View::exists( $shortcode->atts[ 'id' ] ) ) {
+							$this->views->add( $shortcode->atts[ 'id' ] );
 						}
 					}
 				}
 			} else {
 				$id = $this->get_id_from_atts( $passed_post );
-				$ids[] = intval( $id );
+				$ids[ ] = intval( $id );
 			}
 		}
 
@@ -113,7 +113,7 @@ 
 
 		// If it's just one ID, return that.
 		// Otherwise, return array of IDs
-		return ( count( $ids ) === 1 ) ? $ids[0] : $ids;
+		return ( count( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 */
 	public static function getInstance( $passed_post = NULL ) {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new GravityView_View_Data( $passed_post );
 		}
 
@@ -137,8 +137,8 @@ 
 			return array();
 		}
 		return array_combine(
-			array_map( function ( $view ) { return $view->ID; }, $this->views->all() ),
-			array_map( function ( $view ) { return $view->as_data(); }, $this->views->all() )
+			array_map( function( $view ) { return $view->ID; }, $this->views->all() ),
+			array_map( function( $view ) { return $view->as_data(); }, $this->views->all() )
 		);
 	}
 
@@ -252,22 +252,22 @@ 
 	public function parse_post_content( $content ) {
 		$ids = array();
 		foreach ( \GV\Shortcode::parse( $content ) as $shortcode ) {
-			if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts['id'] ) ) {
-				if ( \GV\View::exists( $shortcode->atts['id'] ) && ! $this->views->contains( $shortcode->atts['id'] ) ) {
-					$this->views->add( \GV\View::by_id( $shortcode->atts['id'] ) );
+			if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts[ 'id' ] ) ) {
+				if ( \GV\View::exists( $shortcode->atts[ 'id' ] ) && ! $this->views->contains( $shortcode->atts[ 'id' ] ) ) {
+					$this->views->add( \GV\View::by_id( $shortcode->atts[ 'id' ] ) );
 				}
 				/**
 				 * The original function outputs the ID even though it wasn't added by ::add_view()
 				 * Wether this is a bug or not remains a mystery. But we need to emulate this behavior
 				 * until better times.
 				 */
-				$ids []= $shortcode->atts['id'];
+				$ids [ ] = $shortcode->atts[ 'id' ];
 			}
 		}
 		if ( empty ( $ids ) ) {
 			return null;
 		}
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
+		return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
 	}
 
 	/**
@@ -290,7 +290,7 @@ 
 		// Not invalid if not set!
 		if ( empty( $post_id ) || empty( $view_id ) ) {
 
-			if( $empty_is_valid ) {
+			if ( $empty_is_valid ) {
 				return true;
 			}
 
@@ -323,7 +323,7 @@ 
 			$view_ids_in_post = array_map( function( $view ) { return $view->ID; }, $views->all() );
 
 			// The post or page specified does not contain the shortcode.
-			if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) {
+			if ( false === in_array( $view_id, (array)$view_ids_in_post ) ) {
 				$message = sprintf( esc_html__( 'The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview' ), '<br /><code>[gravityview id="' . intval( $view_id ) . '"]</code>' );
 			}
 		}
@@ -331,7 +331,7 @@ 
 		if ( ! $message ) {
 			// It's a View
 			if ( \GV\View::exists( $post_id ) ) {
-				$message = esc_html__( 'The ID is already a View.', 'gravityview' );;
+				$message = esc_html__( 'The ID is already a View.', 'gravityview' ); ;
 			}
 		}
 

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

Spacing +2 added lines, -2 removed lines

@@ -555,7 +555,7 @@ 
 		if ( ! $detailed ) {
 			$defaults = array();
 			foreach ( $default_settings as $key => $value ) {
-				$defaults[ $key ] = $value['value'];
+				$defaults[ $key ] = $value[ 'value' ];
 			}
 			return $defaults;
 
@@ -566,7 +566,7 @@ 
 				// If the $group argument is set for the method,
 				// ignore any settings that aren't in that group.
 				if ( ! empty( $group ) && is_string( $group ) ) {
-					if ( empty( $value['group'] ) || $value['group'] !== $group ) {
+					if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) {
 						unset( $default_settings[ $key ] );
 					}
 				}