gravityview / GravityView

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 ] );
 					}
 				}

future/includes/class-gv-plugin.php

Spacing +13 added lines, -13 removed lines

@@ -304,7 +304,7 @@ 
 			return;
 		}
 
-		$locale = apply_filters( 'plugin_locale', ( ( function_exists('get_user_locale') && is_admin() ) ? get_user_locale() : get_locale() ), 'gravityview' );
+		$locale = apply_filters( 'plugin_locale', ( ( function_exists( 'get_user_locale' ) && is_admin() ) ? get_user_locale() : get_locale() ), 'gravityview' );
 
 		gravityview()->log->error( sprintf( 'Unable to load textdomain for %s locale.', $locale ) );
 	}
@@ -526,8 +526,8 @@ 
 	 */
 	private function get_php_version() {
 
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] ) ?
-			$GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion();
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ?
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion();
 	}
 
 	/**
@@ -539,8 +539,8 @@ 
 	 */
 	private function get_wordpress_version() {
 
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] ) ?
-			$GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] : $GLOBALS['wp_version'];
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] ) ?
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] : $GLOBALS[ 'wp_version' ];
 	}
 
 	/**
@@ -552,14 +552,14 @@ 
 	 */
 	private function get_gravityforms_version() {
 
-		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE'] ) ) {
+		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE' ] ) ) {
 			gravityview()->log->error( 'Gravity Forms is inactive or not installed.' );
 
 			return null;
 		}
 
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] ) ?
-			$GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] : \GFCommon::$version;
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] ) ?
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] : \GFCommon::$version;
 	}
 
 	/**
@@ -605,7 +605,7 @@ 
 		$items = get_posts( array(
 			'post_type'   => 'gravityview',
 			'post_status' => 'any',
-			'numberposts' => - 1,
+			'numberposts' => -1,
 			'fields'      => 'ids',
 		) );
 
@@ -619,9 +619,9 @@ 
 		$tables = array();
 
 		if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) {
-			$tables [] = \GFFormsModel::get_entry_meta_table_name();
+			$tables [ ] = \GFFormsModel::get_entry_meta_table_name();
 		} elseif ( ! $this->is_GF_25() ) {
-			$tables [] = \GFFormsModel::get_lead_meta_table_name();
+			$tables [ ] = \GFFormsModel::get_lead_meta_table_name();
 		}
 
 		foreach ( $tables as $meta_table ) {
@@ -640,9 +640,9 @@ 
 		$tables = array();
 
 		if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_notes_table_name' ) ) {
-			$tables[] = \GFFormsModel::get_entry_notes_table_name();
+			$tables[ ] = \GFFormsModel::get_entry_notes_table_name();
 		} elseif ( ! $this->is_GF_25() ) {
-			$tables[] = \GFFormsModel::get_lead_notes_table_name();
+			$tables[ ] = \GFFormsModel::get_lead_notes_table_name();
 		}
 
 		$disapproved = __( 'Disapproved the Entry for GravityView', 'gravityview' );

includes/class-gravityview-change-entry-creator.php

Spacing +14 added lines, -14 removed lines

@@ -83,7 +83,7 @@ 
 			array(
 				'ajaxurl'  => admin_url( 'admin-ajax.php' ),
 				'action'   => 'entry_creator_get_users',
-				'gf25'    => (bool) gravityview()->plugin->is_GF_25(),
+				'gf25'    => (bool)gravityview()->plugin->is_GF_25(),
 				'language' => array(
 					'search_placeholder' => esc_html__( 'Search by ID, login, email, or name.', 'gravityview' ),
 				),
@@ -107,11 +107,11 @@ 
 			)
 		);
 
-		if ( ! wp_verify_nonce( $post_var['gv_nonce'], 'gv_entry_creator' ) ) {
+		if ( ! wp_verify_nonce( $post_var[ 'gv_nonce' ], 'gv_entry_creator' ) ) {
 			die();
 		}
 
-		$search_string = $post_var['q'];
+		$search_string = $post_var[ 'q' ];
 
 		if ( is_numeric( $search_string ) ) {
 			$user_args = array(
@@ -158,7 +158,7 @@ 
 		}
 
 		// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
-		$result = RGFormsModel::update_entry_property( (int) $entry['id'], 'created_by', (int) $user_id, false, true );
+		$result = RGFormsModel::update_entry_property( (int)$entry[ 'id' ], 'created_by', (int)$user_id, false, true );
 
 		if ( false === $result ) {
 			$status = __( 'Error', 'gravityview' );
@@ -180,7 +180,7 @@ 
 			return;
 		}
 
-		GravityView_Entry_Notes::add_note( $entry['id'], - 1, 'GravityView', $note, 'gravityview' );
+		GravityView_Entry_Notes::add_note( $entry[ 'id' ], - 1, 'GravityView', $note, 'gravityview' );
 
 	}
 
@@ -215,7 +215,7 @@ 
 		}
 
 		// If screen mode isn't set, then we're in the wrong place.
-		if ( empty( $_REQUEST['screen_mode'] ) ) {
+		if ( empty( $_REQUEST[ 'screen_mode' ] ) ) {
 			return;
 		}
 
@@ -241,7 +241,7 @@ 
 
 		// If $_GET['screen_mode'] is set to edit, set $_POST value
 		if ( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
-			$_POST["screen_mode"] = 'edit';
+			$_POST[ "screen_mode" ] = 'edit';
 		}
 
 	}
@@ -316,7 +316,7 @@ 
 		$entry_creator_user_id = \GV\Utils::get( $entry, 'created_by' );
 
 		$entry_creator_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $entry_creator_user_id ) );
-		$entry_creator_user = isset( $entry_creator_user[0] ) ? $entry_creator_user[0] : array();
+		$entry_creator_user = isset( $entry_creator_user[ 0 ] ) ? $entry_creator_user[ 0 ] : array();
 
 		$output .= '<option value="0" ' . selected( true, empty( $entry_creator_user_id ), false ) . '> &mdash; ' . esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview' ) . ' &mdash; </option>';
 
@@ -335,18 +335,18 @@ 
 		}
 
 		$user_count      = count_users();
-		$user_count      = $user_count['total_users'];
+		$user_count      = $user_count[ 'total_users' ];
 		$users_displayed = self::DEFAULT_NUMBER_OF_USERS + ( ! empty( $entry_creator_user ) ? 1 : 0 );
 		if ( $user_count > $users_displayed ) {
 			$remaining_users = $user_count - $users_displayed;
-			$user_users = _n( esc_html__('user', 'gravityview' ), esc_html__('users', 'gravityview' ), $remaining_users );
+			$user_users = _n( esc_html__( 'user', 'gravityview' ), esc_html__( 'users', 'gravityview' ), $remaining_users );
 			$message = esc_html_x( 'Use the input above to search the remaining %d %s.', '%d is replaced with user count %s is replaced with "user" or "users"', 'gravityview' );
 			$message = sprintf( $message, $remaining_users, $user_users );
-			$output  .= '<option value="_user_count" disabled="disabled">' . esc_html( $message ) . '</option>';
+			$output .= '<option value="_user_count" disabled="disabled">' . esc_html( $message ) . '</option>';
 		}
 
 		$output .= '</select>';
-		$output .= '<input name="originally_created_by" value="' . esc_attr( $entry['created_by'] ) . '" type="hidden" />';
+		$output .= '<input name="originally_created_by" value="' . esc_attr( $entry[ 'created_by' ] ) . '" type="hidden" />';
 		$output .= wp_nonce_field( 'gv_entry_creator', 'gv_entry_creator_nonce', false, false );
 
 		echo $output;
@@ -360,8 +360,8 @@ 
 	 * @return array
 	 */
 	function register_gform_noconflict( $assets ) {
-		$assets[] = 'gravityview_selectwoo';
-		$assets[] = 'gravityview_entry_creator';
+		$assets[ ] = 'gravityview_selectwoo';
+		$assets[ ] = 'gravityview_entry_creator';
 
 		return $assets;
 	}

includes/extensions/edit-entry/partials/form-buttons.php

Indentation +12 added lines, -12 removed lines

@@ -20,16 +20,16 @@ 
 <div id="publishing-action">
 	<?php
 
-    /**
-     * @filter `gravityview/edit_entry/cancel_link` Modify the cancel button link URL
-     * @since 1.11.1
-     * @since 2.11 The cancel link now uses history.back() so the $back_link URL matters less.
-     * @param string $back_link Existing URL of the Cancel link
-     * @param array $form The Gravity Forms form
-     * @param array $entry The Gravity Forms entry
-     * @param int $view_id The current View ID
-     */
-    $back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id );
+	/**
+	 * @filter `gravityview/edit_entry/cancel_link` Modify the cancel button link URL
+	 * @since 1.11.1
+	 * @since 2.11 The cancel link now uses history.back() so the $back_link URL matters less.
+	 * @param string $back_link Existing URL of the Cancel link
+	 * @param array $form The Gravity Forms form
+	 * @param array $entry The Gravity Forms entry
+	 * @param int $view_id The current View ID
+	 */
+	$back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id );
 
 	/**
 	 * @action `gravityview/edit-entry/publishing-action/before` Triggered before the submit buttons in the Edit Entry screen, inside the `<div id="publishing-action">` container.
@@ -84,11 +84,11 @@ 
 	 * @used-by GravityView_Delete_Entry::add_delete_button()
 	 *
 	 * @since 1.5.1
-     * @since 2.0.13 Added $post_id
+	 * @since 2.0.13 Added $post_id
 	 * @param array $form The Gravity Forms form
 	 * @param array $entry The Gravity Forms entry
 	 * @param int $view_id The current View ID
-     * @param int $post_id The current Post ID
+	 * @param int $post_id The current Post ID
 	 */
 	do_action( 'gravityview/edit-entry/publishing-action/after', $object->form, $object->entry, $object->view_id, $object->post_id );
 	?>

Spacing +12 added lines, -12 removed lines

@@ -44,35 +44,35 @@ 
 
 	if ( $object->show_previous_button ) {
 		$previous_tabindex = GFCommon::get_tabindex();
-		$previous_label = GFCommon::replace_variables( $labels['previous'], $object->form, $object->entry );
+		$previous_label = GFCommon::replace_variables( $labels[ 'previous' ], $object->form, $object->entry );
 		?>
-		<input id="gform_previous_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-previous" type="submit" <?php echo $previous_tabindex; ?> value="<?php echo esc_attr( $previous_label ); ?>" name="save" />
+		<input id="gform_previous_button_<?php echo esc_attr( $object->form[ 'id' ] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-previous" type="submit" <?php echo $previous_tabindex; ?> value="<?php echo esc_attr( $previous_label ); ?>" name="save" />
 		<?php
 	}
 
 	if ( $object->show_next_button ) {
-		$next_tabindex    = GFCommon::get_tabindex();
-		$next_label = GFCommon::replace_variables( $labels['next'], $object->form, $object->entry );
+		$next_tabindex = GFCommon::get_tabindex();
+		$next_label = GFCommon::replace_variables( $labels[ 'next' ], $object->form, $object->entry );
 		?>
-		<input id="gform_next_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-next" type="submit" <?php echo $next_tabindex; ?> value="<?php echo esc_attr( $next_label ); ?>" name="save" />
+		<input id="gform_next_button_<?php echo esc_attr( $object->form[ 'id' ] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-next" type="submit" <?php echo $next_tabindex; ?> value="<?php echo esc_attr( $next_label ); ?>" name="save" />
 		<?php
 	}
 
 	if ( $object->show_update_button ) {
-		$update_tabindex  = GFCommon::get_tabindex();
-		$update_label = GFCommon::replace_variables( $labels['submit'], $object->form, $object->entry );
+		$update_tabindex = GFCommon::get_tabindex();
+		$update_label = GFCommon::replace_variables( $labels[ 'submit' ], $object->form, $object->entry );
 		?>
-		<input id="gform_submit_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" <?php echo $update_tabindex; ?> value="<?php echo esc_attr( $update_label ); ?>" name="save" />
+		<input id="gform_submit_button_<?php echo esc_attr( $object->form[ 'id' ] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" <?php echo $update_tabindex; ?> value="<?php echo esc_attr( $update_label ); ?>" name="save" />
 		<?php
 	}
 
-	$cancel_tabindex   = GFCommon::get_tabindex();
-	$cancel_label = GFCommon::replace_variables( $labels['cancel'], $object->form, $object->entry );
+	$cancel_tabindex = GFCommon::get_tabindex();
+	$cancel_label = GFCommon::replace_variables( $labels[ 'cancel' ], $object->form, $object->entry );
 
 	// If the entry has been edited, history.back() will keep pointing to the Edit Entry screen. Go back before editing, please!
 	// On first visit, will be history.go(-1) because (0 + 1 * -1).
 	// After updating twice, history.go(-3) because (2 + 1 * -1)
-	$update_count = (int) \GV\Utils::_POST( 'update_count', 0 );
+	$update_count = (int)\GV\Utils::_POST( 'update_count', 0 );
 	$cancel_onclick = 'history.go(' . ( $update_count + 1 ) * -1 . '); return false;';
 	?>
 	<a class="btn btn-sm button button-small gv-button-cancel" onclick="<?php echo esc_attr( $cancel_onclick ); ?>" <?php echo $cancel_tabindex; ?> href="<?php echo esc_url( $back_link ); ?>"><?php echo esc_attr( $cancel_label ); ?></a>
@@ -94,5 +94,5 @@ 
 	?>
 	<input type='hidden' name='update_count' value='<?php echo $update_count + 1; ?>'/>
 	<input type="hidden" name="action" value="update" />
-	<input type="hidden" name="lid" value="<?php echo esc_attr( $object->entry['id'] ); ?>" />
+	<input type="hidden" name="lid" value="<?php echo esc_attr( $object->entry[ 'id' ] ); ?>" />
 </div>