Completed
Pull Request — develop (#1194)
by Zack
06:38
created
includes/class-admin-views.php 1 patch
Indentation   +83 added lines, -83 removed lines patch added patch discarded remove patch
@@ -63,28 +63,28 @@  discard block
 block discarded – undo
63 63
 	}
64 64
 
65 65
 	/**
66
-     * When on the Add/Edit View screen, suggest most popular articles related to that
67
-     *
66
+	 * When on the Add/Edit View screen, suggest most popular articles related to that
67
+	 *
68 68
 	 * @param array $localization_data Data to be passed to the Support Port JS
69 69
 	 *
70 70
 	 * @return array
71 71
 	 */
72 72
 	function suggest_support_articles( $localization_data = array() ) {
73 73
 
74
-	    if( ! gravityview()->request->is_view() ) {
75
-	        return $localization_data;
76
-        }
74
+		if( ! gravityview()->request->is_view() ) {
75
+			return $localization_data;
76
+		}
77 77
 
78 78
 		$localization_data['suggest'] = array(
79
-            '57ef23539033602e61d4a560',
80
-            '54c67bb9e4b0512429885513',
81
-            '54c67bb9e4b0512429885512',
82
-            '54c67bbbe4b07997ea3f3f6b',
83
-            '54d1a33ae4b086c0c0964ce9',
84
-            '57ef253c9033602e61d4a563',
85
-            '552355bfe4b0221aadf2572b',
86
-            '54c67bcde4b051242988553e',
87
-        );
79
+			'57ef23539033602e61d4a560',
80
+			'54c67bb9e4b0512429885513',
81
+			'54c67bb9e4b0512429885512',
82
+			'54c67bbbe4b07997ea3f3f6b',
83
+			'54d1a33ae4b086c0c0964ce9',
84
+			'57ef253c9033602e61d4a563',
85
+			'552355bfe4b0221aadf2572b',
86
+			'54c67bcde4b051242988553e',
87
+		);
88 88
 
89 89
 		return $localization_data;
90 90
 	}
@@ -170,11 +170,11 @@  discard block
 block discarded – undo
170 170
 
171 171
 		if( 'form_list' === GFForms::get_page() ) {
172 172
 			$priority = 790;
173
-        }
173
+		}
174 174
 
175 175
 		if( empty( $connected_views ) ) {
176 176
 
177
-		    $menu_items['gravityview'] = array(
177
+			$menu_items['gravityview'] = array(
178 178
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
179 179
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
180 180
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -205,13 +205,13 @@  discard block
 block discarded – undo
205 205
 		// If there were no items added, then let's create the parent menu
206 206
 		if( $sub_menu_items ) {
207 207
 
208
-		    $sub_menu_items[] = array(
209
-			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
210
-                'link_class' => 'gv-create-view',
211
-			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
212
-			    'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
213
-			    'capabilities'   => array( 'edit_gravityviews' ),
214
-            );
208
+			$sub_menu_items[] = array(
209
+				'label' => esc_attr__( 'Create a View', 'gravityview' ),
210
+				'link_class' => 'gv-create-view',
211
+				'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
212
+				'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
213
+				'capabilities'   => array( 'edit_gravityviews' ),
214
+			);
215 215
 
216 216
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
217 217
 			$sub_menu_items[] = array(
@@ -596,12 +596,12 @@  discard block
 block discarded – undo
596 596
 	 * Render html for displaying available fields based on a Form ID
597 597
 	 * $blacklist_field_types - contains the field types which are not proper to be shown in a directory.
598 598
 	 *
599
-     * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
599
+	 * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
600 600
 	 * @access public
601
-     *
601
+	 *
602 602
 	 * @param int $form Gravity Forms Form ID (default: '')
603 603
 	 * @param string $context (default: 'single')
604
-     *
604
+	 *
605 605
 	 * @return void
606 606
 	 */
607 607
 	function render_available_fields( $form = 0, $context = 'single' ) {
@@ -615,7 +615,7 @@  discard block
 block discarded – undo
615 615
 
616 616
 		if ( ! is_array( $blacklist_field_types ) ) {
617 617
 
618
-		    gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
618
+			gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
619 619
 
620 620
 			$blacklist_field_types = array();
621 621
 		}
@@ -747,12 +747,12 @@  discard block
 block discarded – undo
747 747
 				/**
748 748
 				 * @since 1.7.2
749 749
 				 */
750
-			    'other_entries' => array(
751
-				    'label'	=> __('Other Entries', 'gravityview'),
752
-				    'type'	=> 'other_entries',
753
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
754
-			    ),
755
-	        );
750
+				'other_entries' => array(
751
+					'label'	=> __('Other Entries', 'gravityview'),
752
+					'type'	=> 'other_entries',
753
+					'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
754
+				),
755
+			);
756 756
 
757 757
 			if( 'single' !== $zone) {
758 758
 
@@ -885,9 +885,9 @@  discard block
 block discarded – undo
885 885
 
886 886
 				$joined_forms = gravityview_get_joined_forms( $post->ID );
887 887
 
888
-                foreach ( $joined_forms as $form ) {
889
-                    $available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
890
-                }
888
+				foreach ( $joined_forms as $form ) {
889
+					$available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
890
+				}
891 891
 			} else {
892 892
 				$available_items[ $form ] = $this->get_registered_widgets();
893 893
 			}
@@ -917,9 +917,9 @@  discard block
 block discarded – undo
917 917
 
918 918
 										if ( $form_id ) {
919 919
 											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
920
-                                        } else {
920
+										} else {
921 921
 											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
922
-                                        }
922
+										}
923 923
 
924 924
 										if ( !$original_item ) {
925 925
 											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
@@ -1001,13 +1001,13 @@  discard block
 block discarded – undo
1001 1001
 	}
1002 1002
 
1003 1003
 	/**
1004
-     * Renders "Add Field" tooltips
1005
-     *
1006
-     * @since 2.0.11
1007
-     *
1004
+	 * Renders "Add Field" tooltips
1005
+	 *
1006
+	 * @since 2.0.11
1007
+	 *
1008 1008
 	 * @param string $context "directory", "single", or "edit"
1009
-     *
1010
-     * @return void
1009
+	 *
1010
+	 * @return void
1011 1011
 	 */
1012 1012
 	function render_field_pickers( $context = 'directory' ) {
1013 1013
 
@@ -1034,7 +1034,7 @@  discard block
 block discarded – undo
1034 1034
             </div>
1035 1035
 			<?php
1036 1036
 		}
1037
-    }
1037
+	}
1038 1038
 
1039 1039
 	/**
1040 1040
 	 * Render the Template Active Areas and configured active fields for a given template id and post id
@@ -1100,7 +1100,7 @@  discard block
 block discarded – undo
1100 1100
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
1101 1101
 
1102 1102
 		// Add the GV font (with the Astronaut)
1103
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1103
+		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1104 1104
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1105 1105
 
1106 1106
 		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
@@ -1108,63 +1108,63 @@  discard block
 block discarded – undo
1108 1108
 		if( GFForms::get_page() === 'form_list' ) {
1109 1109
 			wp_enqueue_style( 'gravityview_views_styles' );
1110 1110
 			return;
1111
-        }
1111
+		}
1112 1112
 
1113 1113
 		// Don't process any scripts below here if it's not a GravityView page.
1114 1114
 		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1115
-		    return;
1115
+			return;
1116 1116
 		}
1117 1117
 
1118
-        wp_enqueue_script( 'jquery-ui-datepicker' );
1119
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1120
-
1121
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1122
-
1123
-        //enqueue scripts
1124
-        wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
1125
-
1126
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1127
-            'cookiepath' => COOKIEPATH,
1128
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1129
-            'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1130
-            'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1131
-            'label_close' => __( 'Close', 'gravityview' ),
1132
-            'label_cancel' => __( 'Cancel', 'gravityview' ),
1133
-            'label_continue' => __( 'Continue', 'gravityview' ),
1134
-            'label_ok' => __( 'Ok', 'gravityview' ),
1135
-            'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1136
-            'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1137
-            'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1138
-            'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1139
-            'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1140
-        ));
1118
+		wp_enqueue_script( 'jquery-ui-datepicker' );
1119
+		wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1120
+
1121
+		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1122
+
1123
+		//enqueue scripts
1124
+		wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
1125
+
1126
+		wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1127
+			'cookiepath' => COOKIEPATH,
1128
+			'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1129
+			'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1130
+			'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1131
+			'label_close' => __( 'Close', 'gravityview' ),
1132
+			'label_cancel' => __( 'Cancel', 'gravityview' ),
1133
+			'label_continue' => __( 'Continue', 'gravityview' ),
1134
+			'label_ok' => __( 'Ok', 'gravityview' ),
1135
+			'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1136
+			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1137
+			'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1138
+			'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1139
+			'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1140
+		));
1141 1141
 
1142 1142
 		wp_enqueue_style( 'gravityview_views_styles' );
1143 1143
 
1144
-        // Enqueue scripts needed for merge tags
1145
-        self::enqueue_gravity_forms_scripts();
1144
+		// Enqueue scripts needed for merge tags
1145
+		self::enqueue_gravity_forms_scripts();
1146 1146
 	}
1147 1147
 
1148 1148
 	/**
1149 1149
 	 * Enqueue Gravity Forms scripts, needed for Merge Tags
1150
-     *
1151
-     * @since 1.0.5-beta
1152
-     *
1153
-     * @return void
1150
+	 *
1151
+	 * @since 1.0.5-beta
1152
+	 *
1153
+	 * @return void
1154 1154
 	 */
1155 1155
 	static function enqueue_gravity_forms_scripts() {
1156 1156
 		GFForms::register_scripts();
1157 1157
 
1158 1158
 		$scripts = array(
1159
-		    'sack',
1160
-		    'gform_gravityforms',
1161
-		    'gform_forms',
1162
-		    'gform_form_admin',
1163
-		    'jquery-ui-autocomplete'
1159
+			'sack',
1160
+			'gform_gravityforms',
1161
+			'gform_forms',
1162
+			'gform_form_admin',
1163
+			'jquery-ui-autocomplete'
1164 1164
 		);
1165 1165
 
1166 1166
 		if ( wp_is_mobile() ) {
1167
-		    $scripts[] = 'jquery-touch-punch';
1167
+			$scripts[] = 'jquery-touch-punch';
1168 1168
 		}
1169 1169
 
1170 1170
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.
includes/class-gravityview-change-entry-creator.php 1 patch
Indentation   +209 added lines, -209 removed lines patch added patch discarded remove patch
@@ -5,239 +5,239 @@
 block discarded – undo
5 5
  */
6 6
 class GravityView_Change_Entry_Creator {
7 7
 
8
-    function __construct() {
9
-
10
-    	/**
11
-    	 * @since  1.5.1
12
-    	 */
13
-    	add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
14
-
15
-    	// ONLY ADMIN FROM HERE ON.
16
-    	if( !is_admin() ) { return; }
17
-
18
-	    /**
19
-         * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
20
-	     * @since 1.7.4
21
-	     * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
22
-	     */
23
-	    if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
24
-		    return;
25
-	    }
26
-
27
-        /**
28
-         * Use `init` to fix bbPress warning
29
-         * @see https://bbpress.trac.wordpress.org/ticket/2309
30
-         */
31
-    	add_action('init', array( $this, 'load'), 100 );
32
-
33
-    	add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
34
-
35
-    }
36
-
37
-    /**
38
-     * When an user is created using the User Registration add-on, assign the entry to them
39
-     *
40
-     * @since  1.5.1
41
-     * @uses RGFormsModel::update_lead_property() Modify the entry `created_by` field
42
-     * @param  int $user_id  WordPress User ID
43
-     * @param  array $config   User registration feed configuration
44
-     * @param  array  $entry     GF Entry array
45
-     * @param  string $password User password
46
-     * @return void
47
-     */
48
-    function assign_new_user_to_lead( $user_id, $config, $entry = array(), $password = '' ) {
49
-
50
-    	/**
51
-    	 * Disable assigning the new user to the entry by returning false.
52
-    	 * @param  int $user_id  WordPress User ID
53
-	     * @param  array $config   User registration feed configuration
54
-	     * @param  array  $entry     GF Entry array
55
-    	 */
56
-    	$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
57
-
58
-    	// If filter returns false, do not process
59
-    	if( empty( $assign_to_lead ) ) {
60
-    		return;
61
-    	}
62
-
63
-    	// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
64
-    	$result = RGFormsModel::update_entry_property( (int) $entry['id'], 'created_by', (int) $user_id, false, true );
65
-
66
-    	if ( false === $result ) {
67
-    		$status = __('Error', 'gravityview');
68
-    		global $wpdb;
69
-		    $note = sprintf( '%s: Failed to assign User ID #%d as the entry creator (Last database error: "%s")', $status, $user_id, $wpdb->last_error );
70
-    	} else {
71
-    		$status = __('Success', 'gravityview');
72
-    	    $note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
73
-    	}
74
-
75
-    	gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note' => $note ) );
76
-
77
-	    /**
78
-	     * @filter `gravityview_disable_change_entry_creator_note` Disable adding a note when changing the entry creator
79
-	     * @since 1.21.5
80
-	     * @param boolean $disable Disable the Change Entry Creator note. Default: false.
81
-	     */
82
-	    if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) {
83
-		    return;
84
-	    }
85
-
86
-        GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
87
-
88
-    }
89
-
90
-    /**
91
-     * Disable previous functionality; use this one as the canonical.
92
-     * @return void
93
-     */
94
-    function prevent_conflicts() {
95
-
96
-    	// Plugin that was provided here:
97
-    	// @link https://gravityview.co/support/documentation/201991205/
98
-    	remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
99
-    	remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
100
-
101
-    }
102
-
103
-    /**
104
-     * @since  3.6.3
105
-     * @return void
106
-     */
107
-    function load() {
108
-
109
-    	// Does GF exist?
110
-        if( !class_exists('GFCommon') ) {
111
-            return;
112
-        }
113
-
114
-        // Can the user edit entries?
115
-        if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
116
-            return;
117
-        }
118
-
119
-        // If screen mode isn't set, then we're in the wrong place.
120
-        if( empty( $_REQUEST['screen_mode'] ) ) {
121
-            return;
122
-        }
123
-
124
-        // Now, no validation is required in the methods; let's hook in.
125
-        add_action('admin_init', array( &$this, 'set_screen_mode' ) );
126
-
127
-        add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
128
-
129
-        add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
130
-
131
-    }
132
-
133
-    /**
134
-     * Allows for edit links to work with a link instead of a form (GET instead of POST)
135
-     * @return void
136
-     */
137
-    function set_screen_mode() {
138
-
139
-    	// If $_GET['screen_mode'] is set to edit, set $_POST value
140
-        if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
141
-            $_POST["screen_mode"] = 'edit';
142
-        }
143
-
144
-    }
145
-
146
-    /**
147
-     * When the entry creator is changed, add a note to the entry
148
-     * @param  array $form   GF entry array
149
-     * @param  int $entry_id Entry ID
150
-     * @return void
151
-     */
152
-    function update_entry_creator($form, $entry_id) {
153
-            global $current_user;
8
+	function __construct() {
9
+
10
+		/**
11
+		 * @since  1.5.1
12
+		 */
13
+		add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
14
+
15
+		// ONLY ADMIN FROM HERE ON.
16
+		if( !is_admin() ) { return; }
17
+
18
+		/**
19
+		 * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
20
+		 * @since 1.7.4
21
+		 * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
22
+		 */
23
+		if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
24
+			return;
25
+		}
26
+
27
+		/**
28
+		 * Use `init` to fix bbPress warning
29
+		 * @see https://bbpress.trac.wordpress.org/ticket/2309
30
+		 */
31
+		add_action('init', array( $this, 'load'), 100 );
32
+
33
+		add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
34
+
35
+	}
36
+
37
+	/**
38
+	 * When an user is created using the User Registration add-on, assign the entry to them
39
+	 *
40
+	 * @since  1.5.1
41
+	 * @uses RGFormsModel::update_lead_property() Modify the entry `created_by` field
42
+	 * @param  int $user_id  WordPress User ID
43
+	 * @param  array $config   User registration feed configuration
44
+	 * @param  array  $entry     GF Entry array
45
+	 * @param  string $password User password
46
+	 * @return void
47
+	 */
48
+	function assign_new_user_to_lead( $user_id, $config, $entry = array(), $password = '' ) {
49
+
50
+		/**
51
+		 * Disable assigning the new user to the entry by returning false.
52
+		 * @param  int $user_id  WordPress User ID
53
+		 * @param  array $config   User registration feed configuration
54
+		 * @param  array  $entry     GF Entry array
55
+		 */
56
+		$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
57
+
58
+		// If filter returns false, do not process
59
+		if( empty( $assign_to_lead ) ) {
60
+			return;
61
+		}
62
+
63
+		// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
64
+		$result = RGFormsModel::update_entry_property( (int) $entry['id'], 'created_by', (int) $user_id, false, true );
65
+
66
+		if ( false === $result ) {
67
+			$status = __('Error', 'gravityview');
68
+			global $wpdb;
69
+			$note = sprintf( '%s: Failed to assign User ID #%d as the entry creator (Last database error: "%s")', $status, $user_id, $wpdb->last_error );
70
+		} else {
71
+			$status = __('Success', 'gravityview');
72
+			$note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
73
+		}
74
+
75
+		gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note' => $note ) );
76
+
77
+		/**
78
+		 * @filter `gravityview_disable_change_entry_creator_note` Disable adding a note when changing the entry creator
79
+		 * @since 1.21.5
80
+		 * @param boolean $disable Disable the Change Entry Creator note. Default: false.
81
+		 */
82
+		if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) {
83
+			return;
84
+		}
85
+
86
+		GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
87
+
88
+	}
89
+
90
+	/**
91
+	 * Disable previous functionality; use this one as the canonical.
92
+	 * @return void
93
+	 */
94
+	function prevent_conflicts() {
95
+
96
+		// Plugin that was provided here:
97
+		// @link https://gravityview.co/support/documentation/201991205/
98
+		remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
99
+		remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
100
+
101
+	}
102
+
103
+	/**
104
+	 * @since  3.6.3
105
+	 * @return void
106
+	 */
107
+	function load() {
108
+
109
+		// Does GF exist?
110
+		if( !class_exists('GFCommon') ) {
111
+			return;
112
+		}
113
+
114
+		// Can the user edit entries?
115
+		if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
116
+			return;
117
+		}
118
+
119
+		// If screen mode isn't set, then we're in the wrong place.
120
+		if( empty( $_REQUEST['screen_mode'] ) ) {
121
+			return;
122
+		}
123
+
124
+		// Now, no validation is required in the methods; let's hook in.
125
+		add_action('admin_init', array( &$this, 'set_screen_mode' ) );
126
+
127
+		add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
128
+
129
+		add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
130
+
131
+	}
132
+
133
+	/**
134
+	 * Allows for edit links to work with a link instead of a form (GET instead of POST)
135
+	 * @return void
136
+	 */
137
+	function set_screen_mode() {
138
+
139
+		// If $_GET['screen_mode'] is set to edit, set $_POST value
140
+		if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
141
+			$_POST["screen_mode"] = 'edit';
142
+		}
143
+
144
+	}
145
+
146
+	/**
147
+	 * When the entry creator is changed, add a note to the entry
148
+	 * @param  array $form   GF entry array
149
+	 * @param  int $entry_id Entry ID
150
+	 * @return void
151
+	 */
152
+	function update_entry_creator($form, $entry_id) {
153
+			global $current_user;
154 154
 
155
-        // Update the entry
156
-        $created_by = absint( \GV\Utils::_POST( 'created_by') );
155
+		// Update the entry
156
+		$created_by = absint( \GV\Utils::_POST( 'created_by') );
157 157
 
158
-        RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
158
+		RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
159 159
 
160
-        // If the creator has changed, let's add a note about who it used to be.
161
-        $originally_created_by = \GV\Utils::_POST( 'originally_created_by' );
160
+		// If the creator has changed, let's add a note about who it used to be.
161
+		$originally_created_by = \GV\Utils::_POST( 'originally_created_by' );
162 162
 
163
-        // If there's no owner and there didn't used to be, keep going
164
-        if( empty( $originally_created_by ) && empty( $created_by ) ) {
165
-            return;
166
-        }
163
+		// If there's no owner and there didn't used to be, keep going
164
+		if( empty( $originally_created_by ) && empty( $created_by ) ) {
165
+			return;
166
+		}
167 167
 
168
-        // If the values have changed
169
-        if( absint( $originally_created_by ) !== absint( $created_by ) ) {
168
+		// If the values have changed
169
+		if( absint( $originally_created_by ) !== absint( $created_by ) ) {
170 170
 
171
-            $user_data = get_userdata($current_user->ID);
171
+			$user_data = get_userdata($current_user->ID);
172 172
 
173
-            $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
173
+			$user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
174 174
 
175
-            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
175
+			$original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
176 176
 
177
-            if( !empty( $originally_created_by ) ) {
178
-                $originally_created_by_user_data = get_userdata($originally_created_by);
179
-                $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
180
-            }
177
+			if( !empty( $originally_created_by ) ) {
178
+				$originally_created_by_user_data = get_userdata($originally_created_by);
179
+				$original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
180
+			}
181 181
 
182
-            if( !empty( $created_by ) ) {
183
-                $created_by_user_data =  get_userdata($created_by);
184
-                $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
185
-            }
182
+			if( !empty( $created_by ) ) {
183
+				$created_by_user_data =  get_userdata($created_by);
184
+				$created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
185
+			}
186 186
 
187
-            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
188
-        }
187
+			GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
188
+		}
189 189
 
190
-    }
190
+	}
191 191
 
192
-    /**
193
-     * Output the select to change the entry creator
194
-     * @param int $form_id GF Form ID
195
-     * @param array $entry    GF entry array
196
-     * @return void
197
-     */
198
-    function add_select($form_id, $entry ) {
192
+	/**
193
+	 * Output the select to change the entry creator
194
+	 * @param int $form_id GF Form ID
195
+	 * @param array $entry    GF entry array
196
+	 * @return void
197
+	 */
198
+	function add_select($form_id, $entry ) {
199 199
 
200
-        if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
201
-            return;
202
-        }
200
+		if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
201
+			return;
202
+		}
203 203
 
204
-        $created_by_id = \GV\Utils::get( $entry, 'created_by' );
204
+		$created_by_id = \GV\Utils::get( $entry, 'created_by' );
205 205
 
206
-        $users = GVCommon::get_users( 'change_entry_creator' );
206
+		$users = GVCommon::get_users( 'change_entry_creator' );
207 207
 
208
-        $is_created_by_in_users = wp_list_filter( $users, array( 'ID' => $created_by_id ) );
208
+		$is_created_by_in_users = wp_list_filter( $users, array( 'ID' => $created_by_id ) );
209 209
 
210
-        // Make sure that the entry creator is included in the users list. If not, add them.
211
-        if ( ! empty( $created_by_id ) && empty( $is_created_by_in_users ) ) {
210
+		// Make sure that the entry creator is included in the users list. If not, add them.
211
+		if ( ! empty( $created_by_id ) && empty( $is_created_by_in_users ) ) {
212 212
 
213
-	        if ( $created_by_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $created_by_id ) ) ) {
214
-	            $users = array_merge( $users, $created_by_user );
215
-	        }
216
-	    }
213
+			if ( $created_by_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $created_by_id ) ) ) {
214
+				$users = array_merge( $users, $created_by_user );
215
+			}
216
+		}
217 217
 
218
-        $output = '<label for="change_created_by">';
219
-        $output .= esc_html__('Change Entry Creator:', 'gravityview');
220
-        $output .= '</label>';
218
+		$output = '<label for="change_created_by">';
219
+		$output .= esc_html__('Change Entry Creator:', 'gravityview');
220
+		$output .= '</label>';
221 221
 
222
-	    // If there are users who are not being shown, show a warning.
223
-	    // TODO: Use AJAX instead of <select>
224
-	    $count_users = count_users();
225
-	    if( sizeof( $users ) < $count_users['total_users'] ) {
226
-		    $output .= '<p><i class="dashicons dashicons-warning"></i> ' . sprintf( esc_html__( 'The displayed list of users has been trimmed due to the large number of users. %sLearn how to remove this limit%s.', 'gravityview' ), '<a href="https://docs.gravityview.co/article/251-i-only-see-some-users-in-the-change-entry-creator-dropdown" rel="external">', '</a>' ) . '</p>';
227
-	    }
222
+		// If there are users who are not being shown, show a warning.
223
+		// TODO: Use AJAX instead of <select>
224
+		$count_users = count_users();
225
+		if( sizeof( $users ) < $count_users['total_users'] ) {
226
+			$output .= '<p><i class="dashicons dashicons-warning"></i> ' . sprintf( esc_html__( 'The displayed list of users has been trimmed due to the large number of users. %sLearn how to remove this limit%s.', 'gravityview' ), '<a href="https://docs.gravityview.co/article/251-i-only-see-some-users-in-the-change-entry-creator-dropdown" rel="external">', '</a>' ) . '</p>';
227
+		}
228 228
 
229
-	    $output .= '<select name="created_by" id="change_created_by" class="widefat">';
230
-        $output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
231
-        foreach($users as $user) {
232
-            $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
233
-        }
234
-        $output .= '</select>';
235
-        $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
229
+		$output .= '<select name="created_by" id="change_created_by" class="widefat">';
230
+		$output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
231
+		foreach($users as $user) {
232
+			$output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
233
+		}
234
+		$output .= '</select>';
235
+		$output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
236 236
 
237
-	    unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users );
237
+		unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users );
238 238
 
239
-        echo $output;
240
-    }
239
+		echo $output;
240
+	}
241 241
 
242 242
 }
243 243
 
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-select.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
 }
17 17
 
18 18
 if( is_array( $search_field['value'] ) ) {
19
-    gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' );
19
+	gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' );
20 20
 	$search_field['value'] = reset( $search_field['value'] );
21 21
 }
22 22
 
Please login to merge, or discard this patch.
future/includes/class-gv-template-view-table.php 1 patch
Indentation   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -19,8 +19,8 @@  discard block
 block discarded – undo
19 19
 
20 20
 
21 21
 	/**
22
-     * Constructor. Add filters to modify output.
23
-     *
22
+	 * Constructor. Add filters to modify output.
23
+	 *
24 24
 	 * @since 2.0.4
25 25
 	 *
26 26
 	 * @param View $view
@@ -29,19 +29,19 @@  discard block
 block discarded – undo
29 29
 	 */
30 30
 	public function __construct( View $view, Entry_Collection $entries, Request $request ) {
31 31
 
32
-	    add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 );
32
+		add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 );
33 33
 
34 34
 		parent::__construct( $view, $entries, $request );
35 35
 	}
36 36
 
37 37
 	/**
38
-     * Add sorting links to HTML columns that support sorting
39
-     *
40
-     * @since 2.0.4
41
-     * @since 2.0.5 Made static
42
-     *
43
-     * @static
44
-     *
38
+	 * Add sorting links to HTML columns that support sorting
39
+	 *
40
+	 * @since 2.0.4
41
+	 * @since 2.0.5 Made static
42
+	 *
43
+	 * @static
44
+	 *
45 45
 	 * @param string $column_label Label for the table column
46 46
 	 * @param \GV\Template_Context $context
47 47
 	 *
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		$sort_columns = $context->view->settings->get( 'sort_columns' );
53 53
 
54 54
 		if ( empty( $sort_columns ) ) {
55
-            return $column_label;
55
+			return $column_label;
56 56
 		}
57 57
 
58 58
 		if ( ! \GravityView_frontend::getInstance()->is_field_sortable( $context->field->ID, $context->view->form->form ) ) {
@@ -113,10 +113,10 @@  discard block
 block discarded – undo
113 113
 	}
114 114
 
115 115
 	/**
116
-     * Returns the label for a column, with support for all deprecated filters
117
-     *
118
-     * @since 2.1
119
-     *
116
+	 * Returns the label for a column, with support for all deprecated filters
117
+	 *
118
+	 * @since 2.1
119
+	 *
120 120
 	 * @param \GV\Field $field
121 121
 	 * @param \GV\Template_Context $context
122 122
 	 */
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 		$column_label = apply_filters( 'gravityview/template/field/label', $column_label, $context );
140 140
 
141 141
 		return $column_label;
142
-    }
142
+	}
143 143
 
144 144
 	/**
145 145
 	 * Output the entry row.
@@ -208,15 +208,15 @@  discard block
 block discarded – undo
208 208
 				 */
209 209
 				do_action( 'gravityview/template/table/cells/before', $context );
210 210
 
211
-                /**
212
-                 * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
213
-                 * @since 1.0.7
211
+				/**
212
+				 * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
213
+				 * @since 1.0.7
214 214
 				 * @param \GravityView_View $this Current GravityView_View object
215 215
 				 * @deprecated Use `gravityview/template/table/cells/before`
216
-                 */
217
-                do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() );
216
+				 */
217
+				do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() );
218 218
 
219
-                foreach ( $fields->all() as $field ) {
219
+				foreach ( $fields->all() as $field ) {
220 220
 					if ( isset( $this->view->unions[ $entry['form_id'] ] ) ) {
221 221
 						if ( isset( $this->view->unions[ $entry['form_id'] ][ $field->ID ] ) ) {
222 222
 							$field = $this->view->unions[ $entry['form_id'] ][ $field->ID ];
@@ -236,13 +236,13 @@  discard block
 block discarded – undo
236 236
 				 */
237 237
 				do_action( 'gravityview/template/table/cells/after', $context );
238 238
 
239
-                /**
240
-                 * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
241
-                 * @since 1.0.7
239
+				/**
240
+				 * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
241
+				 * @since 1.0.7
242 242
 				 * @param \GravityView_View $this Current GravityView_View object
243 243
 				 * @deprecated Use `gravityview/template/table/cells/after`
244
-                 */
245
-                do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() );
244
+				 */
245
+				do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() );
246 246
 
247 247
 				?>
248 248
 			</tr>
@@ -283,9 +283,9 @@  discard block
 block discarded – undo
283 283
 			'value' => $value,
284 284
 			'hide_empty' => false,
285 285
 			'zone_id' => 'directory_table-columns',
286
-            'label' => self::get_field_column_label( $field, $context ),
286
+			'label' => self::get_field_column_label( $field, $context ),
287 287
 			'markup' => '<td id="{{ field_id }}" class="{{ class }}" data-label="{{label_value:data-label}}">{{ value }}</td>',
288
-            'form' => $form,
288
+			'form' => $form,
289 289
 		);
290 290
 
291 291
 		/** Output. */
@@ -310,11 +310,11 @@  discard block
 block discarded – undo
310 310
 		do_action( 'gravityview/template/table/body/before', $context );
311 311
 
312 312
 		/**
313
-		* @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
314
-		* @deprecated Use `gravityview/template/table/body/before`
315
-		* @since 1.0.7
316
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
317
-		*/
313
+		 * @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
314
+		 * @deprecated Use `gravityview/template/table/body/before`
315
+		 * @since 1.0.7
316
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
317
+		 */
318 318
 		do_action( 'gravityview_table_body_before', \GravityView_View::getInstance() /** ugh! */ );
319 319
 	}
320 320
 
@@ -336,11 +336,11 @@  discard block
 block discarded – undo
336 336
 		do_action( 'gravityview/template/table/body/after', $context );
337 337
 
338 338
 		/**
339
-		* @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
340
-		* @deprecated Use `gravityview/template/table/body/after`
341
-		* @since 1.0.7
342
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
343
-		*/
339
+		 * @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
340
+		 * @deprecated Use `gravityview/template/table/body/after`
341
+		 * @since 1.0.7
342
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
343
+		 */
344 344
 		do_action( 'gravityview_table_body_after', \GravityView_View::getInstance() /** ugh! */ );
345 345
 	}
346 346
 
Please login to merge, or discard this patch.
includes/admin/class-gravityview-support-port.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 
14 14
 	/**
15 15
 	 * @var string The hash key used to generate secure message history
16
-     * @since 2.2.5
16
+	 * @since 2.2.5
17 17
 	 */
18 18
 	const beacon_key = 'lCXlwbQR707kipR+J0MCqcxrhGOHjGF0ldD6yNbGM0w=';
19 19
 
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 			'payment_id'       => '',
111 111
 			'customer_name'    => '',
112 112
 			'customer_email'   => '',
113
-            'price_id'         => '0',
113
+			'price_id'         => '0',
114 114
 		) );
115 115
 
116 116
 		// This is just HTML we don't need.
@@ -127,9 +127,9 @@  discard block
 block discarded – undo
127 127
 			case 3:
128 128
 				$package = 'All Access';
129 129
 				break;
130
-            case 4:
131
-                $package = 'Lifetime';
132
-                break;
130
+			case 4:
131
+				$package = 'Lifetime';
132
+				break;
133 133
 		}
134 134
 
135 135
 		$current_user = wp_get_current_user();
@@ -159,27 +159,27 @@  discard block
 block discarded – undo
159 159
 		// Help Scout length limit is 200 characters
160 160
 		foreach( $data as $key => $value ) {
161 161
 			if ( ! is_string( $value ) ) {
162
-                continue;
162
+				continue;
163 163
 			}
164
-		    $data[ $key ] = mb_substr( $value, 0, 200 );
165
-        }
164
+			$data[ $key ] = mb_substr( $value, 0, 200 );
165
+		}
166 166
 
167 167
 		$localization_data = array(
168 168
 			'contactEnabled' => (int)GVCommon::has_cap( 'gravityview_contact_support' ),
169 169
 			'data' => $data,
170 170
 			'translation' => $translation,
171
-            'suggest' => array(),
171
+			'suggest' => array(),
172 172
 		);
173 173
 
174 174
 		/**
175
-         * @filter `gravityview/support_port/localization_data` Filter data passed to the Support Port, before localize_script is run
175
+		 * @filter `gravityview/support_port/localization_data` Filter data passed to the Support Port, before localize_script is run
176 176
 		 * @since 2.0
177
-         * @param array $localization_data {
178
-         *   @type int $contactEnabled Can the user contact support?
179
-         *   @type array $data Support/license info
180
-         *   @type array $translation i18n strings
181
-         *   @type array $suggest Article IDs to recommend to the user (per page in the admin
182
-         * }
177
+		 * @param array $localization_data {
178
+		 *   @type int $contactEnabled Can the user contact support?
179
+		 *   @type array $data Support/license info
180
+		 *   @type array $translation i18n strings
181
+		 *   @type array $suggest Article IDs to recommend to the user (per page in the admin
182
+		 * }
183 183
 		 */
184 184
 		$localization_data = apply_filters( 'gravityview/support_port/localization_data', $localization_data );
185 185
 
@@ -193,11 +193,11 @@  discard block
 block discarded – undo
193 193
 	 *
194 194
 	 * If the user doesn't have the `gravityview_support_port` capability, returns false; then
195 195
 	 * If global setting is "hide", returns false; then
196
-     * If user preference is not set, return global setting; then
197
-     * If user preference is set, return that setting.
196
+	 * If user preference is not set, return global setting; then
197
+	 * If user preference is set, return that setting.
198 198
 	 *
199 199
 	 * @since 1.15
200
-     * @since 1.17.5 Changed behavior to respect global setting
200
+	 * @since 1.17.5 Changed behavior to respect global setting
201 201
 	 *
202 202
 	 * @param int $user Optional. ID of the user to check, defaults to 0 for current user.
203 203
 	 *
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 		$global_setting = gravityview()->plugin->settings->get( 'support_port' );
213 213
 
214 214
 		if ( empty( $global_setting ) ) {
215
-            return false;
215
+			return false;
216 216
 		}
217 217
 
218 218
 		// Get the per-user Support Port setting
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 	 * Modifies the output of profile.php to add GravityView Support preference
249 249
 	 *
250 250
 	 * @since 1.15
251
-     * @since 1.17.5 Only show if global setting is active
251
+	 * @since 1.17.5 Only show if global setting is active
252 252
 	 *
253 253
 	 * @param WP_User $user Current user info
254 254
 	 *
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
 		$global_setting = gravityview()->plugin->settings->get( 'support_port' );
260 260
 
261 261
 		if ( empty( $global_setting ) ) {
262
-            return;
262
+			return;
263 263
 		}
264 264
 
265 265
 		/**
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry-render.php 1 patch
Indentation   +288 added lines, -288 removed lines patch added patch discarded remove patch
@@ -94,10 +94,10 @@  discard block
 block discarded – undo
94 94
 
95 95
 	/**
96 96
 	 * ID of the current post. May also be ID of the current View.
97
-     *
98
-     * @since 2.0.13
99
-     * 
100
-     * @var int
97
+	 *
98
+	 * @since 2.0.13
99
+	 * 
100
+	 * @var int
101 101
 	 */
102 102
 	public $post_id;
103 103
 
@@ -169,12 +169,12 @@  discard block
 block discarded – undo
169 169
 	public function prevent_maybe_process_form() {
170 170
 
171 171
 		if( ! empty( $_POST ) ) {
172
-	        gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', array( 'data' => esc_html( print_r( $_POST, true ) ) ) );
172
+			gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', array( 'data' => esc_html( print_r( $_POST, true ) ) ) );
173 173
 		}
174 174
 
175 175
 		if( $this->is_edit_entry_submission() ) {
176 176
 			remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
177
-	        remove_action( 'wp',  array( 'GFForms', 'maybe_process_form'), 9 );
177
+			remove_action( 'wp',  array( 'GFForms', 'maybe_process_form'), 9 );
178 178
 		}
179 179
 	}
180 180
 
@@ -202,14 +202,14 @@  discard block
 block discarded – undo
202 202
 	 * When Edit entry view is requested setup the vars
203 203
 	 */
204 204
 	private function setup_vars() {
205
-        global $post;
205
+		global $post;
206 206
 
207 207
 		$gravityview_view = GravityView_View::getInstance();
208 208
 
209 209
 
210 210
 		$entries = $gravityview_view->getEntries();
211
-	    self::$original_entry = $entries[0];
212
-	    $this->entry = $entries[0];
211
+		self::$original_entry = $entries[0];
212
+		$this->entry = $entries[0];
213 213
 
214 214
 		self::$original_form = $gravityview_view->getForm();
215 215
 		$this->form = $gravityview_view->getForm();
@@ -343,8 +343,8 @@  discard block
 block discarded – undo
343 343
 
344 344
 			GFFormsModel::save_lead( $form, $this->entry );
345 345
 
346
-	        // Delete the values for hidden inputs
347
-	        $this->unset_hidden_field_values();
346
+			// Delete the values for hidden inputs
347
+			$this->unset_hidden_field_values();
348 348
 			
349 349
 			$this->entry['date_created'] = $date_created;
350 350
 
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
 			// Perform actions normally performed after updating a lead
355 355
 			$this->after_update();
356 356
 
357
-	        /**
357
+			/**
358 358
 			 * Must be AFTER after_update()!
359 359
 			 * @see https://github.com/gravityview/GravityView/issues/764
360 360
 			 */
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
 
363 363
 			/**
364 364
 			 * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry
365
-             * @since 2.1 Added $gv_data parameter
365
+			 * @since 2.1 Added $gv_data parameter
366 366
 			 * @param array $form Gravity Forms form array
367 367
 			 * @param string $entry_id Numeric ID of the entry that was updated
368 368
 			 * @param GravityView_Edit_Entry_Render $this This object
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
 	 * @return void
387 387
 	 */
388 388
 	private function unset_hidden_field_values() {
389
-	    global $wpdb;
389
+		global $wpdb;
390 390
 
391 391
 		/**
392 392
 		 * @filter `gravityview/edit_entry/unset_hidden_field_values` Whether to delete values of fields hidden by conditional logic
@@ -408,29 +408,29 @@  discard block
 block discarded – undo
408 408
 			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) );
409 409
 		}
410 410
 
411
-	    foreach ( $this->entry as $input_id => $field_value ) {
411
+		foreach ( $this->entry as $input_id => $field_value ) {
412 412
 
413
-		    $field = RGFormsModel::get_field( $this->form, $input_id );
413
+			$field = RGFormsModel::get_field( $this->form, $input_id );
414 414
 
415
-		    // Reset fields that are hidden
416
-		    // Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic
417
-		    if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) {
415
+			// Reset fields that are hidden
416
+			// Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic
417
+			if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) {
418 418
 
419 419
 				$empty_value = $field->get_value_save_entry(
420 420
 					is_array( $field->get_entry_inputs() ) ? array() : '',
421 421
 					$this->form, '', $this->entry['id'], $this->entry
422 422
 				);
423 423
 
424
-			    $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id );
424
+				$lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id );
425 425
 
426
-			    GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value );
426
+				GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value );
427 427
 
428
-			    // Prevent the $_POST values of hidden fields from being used as default values when rendering the form
428
+				// Prevent the $_POST values of hidden fields from being used as default values when rendering the form
429 429
 				// after submission
430
-			    $post_input_id = 'input_' . str_replace( '.', '_', $input_id );
431
-			    $_POST[ $post_input_id ] = '';
432
-		    }
433
-	    }
430
+				$post_input_id = 'input_' . str_replace( '.', '_', $input_id );
431
+				$_POST[ $post_input_id ] = '';
432
+			}
433
+		}
434 434
 	}
435 435
 
436 436
 	/**
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
526 526
 
527 527
 		$non_submitted_fields = array();
528 528
 
529
-	    /** @var GF_Field $field */
529
+		/** @var GF_Field $field */
530 530
 		foreach( $form['fields'] as $k => &$field ) {
531 531
 
532 532
 			/**
@@ -542,7 +542,7 @@  discard block
 block discarded – undo
542 542
 
543 543
 			if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
544 544
 				foreach( $field->inputs as $key => $input ) {
545
-				    $field->inputs[ $key ][ 'id' ] = (string)$input['id'];
545
+					$field->inputs[ $key ][ 'id' ] = (string)$input['id'];
546 546
 				}
547 547
 			}
548 548
 
@@ -603,7 +603,7 @@  discard block
 block discarded – undo
603 603
 			foreach ( $this->fields_with_calculation as $field ) {
604 604
 				$inputs = $field->get_entry_inputs();
605 605
 				if ( is_array( $inputs ) ) {
606
-				    foreach ( $inputs as $input ) {
606
+					foreach ( $inputs as $input ) {
607 607
 						list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 );
608 608
 
609 609
 						if ( 'product' === $field->type ) {
@@ -622,7 +622,7 @@  discard block
 block discarded – undo
622 622
 						}
623 623
 
624 624
 						GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] );
625
-				    }
625
+					}
626 626
 				} else {
627 627
 					// Set to what it previously was if it's not editable
628 628
 					if ( ! in_array( $field->id, $allowed_fields ) ) {
@@ -668,7 +668,7 @@  discard block
 block discarded – undo
668 668
 			$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] );
669 669
 
670 670
 			$ary = ! empty( $value ) ? explode( '|:|', $value ) : array();
671
-	        $ary = stripslashes_deep( $ary );
671
+			$ary = stripslashes_deep( $ary );
672 672
 			$img_url = \GV\Utils::get( $ary, 0 );
673 673
 
674 674
 			$img_title       = count( $ary ) > 1 ? $ary[1] : '';
@@ -741,7 +741,7 @@  discard block
 block discarded – undo
741 741
 	private function maybe_update_post_fields( $form ) {
742 742
 
743 743
 		if( empty( $this->entry['post_id'] ) ) {
744
-	        gravityview()->log->debug( 'This entry has no post fields. Continuing...' );
744
+			gravityview()->log->debug( 'This entry has no post fields. Continuing...' );
745 745
 			return;
746 746
 		}
747 747
 
@@ -776,49 +776,49 @@  discard block
 block discarded – undo
776 776
 
777 777
 				switch( $field->type ) {
778 778
 
779
-				    case 'post_title':
780
-				        $post_title = $value;
781
-				        if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) {
782
-				            $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
783
-				        }
784
-				        $updated_post->post_title = $post_title;
785
-				        $updated_post->post_name  = $post_title;
786
-				        unset( $post_title );
787
-				        break;
788
-
789
-				    case 'post_content':
790
-				        $post_content = $value;
791
-				        if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) {
792
-				            $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
793
-				        }
794
-				        $updated_post->post_content = $post_content;
795
-				        unset( $post_content );
796
-				        break;
797
-				    case 'post_excerpt':
798
-				        $updated_post->post_excerpt = $value;
799
-				        break;
800
-				    case 'post_tags':
801
-				        wp_set_post_tags( $post_id, $value, false );
802
-				        break;
803
-				    case 'post_category':
804
-				        break;
805
-				    case 'post_custom_field':
779
+					case 'post_title':
780
+						$post_title = $value;
781
+						if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) {
782
+							$post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
783
+						}
784
+						$updated_post->post_title = $post_title;
785
+						$updated_post->post_name  = $post_title;
786
+						unset( $post_title );
787
+						break;
788
+
789
+					case 'post_content':
790
+						$post_content = $value;
791
+						if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) {
792
+							$post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
793
+						}
794
+						$updated_post->post_content = $post_content;
795
+						unset( $post_content );
796
+						break;
797
+					case 'post_excerpt':
798
+						$updated_post->post_excerpt = $value;
799
+						break;
800
+					case 'post_tags':
801
+						wp_set_post_tags( $post_id, $value, false );
802
+						break;
803
+					case 'post_category':
804
+						break;
805
+					case 'post_custom_field':
806 806
 						if ( is_array( $value ) && ( floatval( $field_id ) !== floatval( $field->id ) ) ) {
807 807
 							$value = $value[ $field_id ];
808 808
 						}
809 809
 
810
-				        if( ! empty( $field->customFieldTemplateEnabled ) ) {
811
-				            $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
812
-				        }
810
+						if( ! empty( $field->customFieldTemplateEnabled ) ) {
811
+							$value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
812
+						}
813 813
 
814 814
 						$value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry );
815 815
 
816
-				        update_post_meta( $post_id, $field->postCustomFieldName, $value );
817
-				        break;
816
+						update_post_meta( $post_id, $field->postCustomFieldName, $value );
817
+						break;
818 818
 
819
-				    case 'post_image':
820
-				        $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id );
821
-				        break;
819
+					case 'post_image':
820
+						$value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id );
821
+						break;
822 822
 
823 823
 				}
824 824
 
@@ -941,14 +941,14 @@  discard block
 block discarded – undo
941 941
 			?><h2 class="gv-edit-entry-title">
942 942
 				<span><?php
943 943
 
944
-				    /**
945
-				     * @filter `gravityview_edit_entry_title` Modify the edit entry title
946
-				     * @param string $edit_entry_title Modify the "Edit Entry" title
947
-				     * @param GravityView_Edit_Entry_Render $this This object
948
-				     */
949
-				    $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
944
+					/**
945
+					 * @filter `gravityview_edit_entry_title` Modify the edit entry title
946
+					 * @param string $edit_entry_title Modify the "Edit Entry" title
947
+					 * @param GravityView_Edit_Entry_Render $this This object
948
+					 */
949
+					$edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
950 950
 
951
-				    echo esc_attr( $edit_entry_title );
951
+					echo esc_attr( $edit_entry_title );
952 952
 			?></span>
953 953
 			</h2>
954 954
 
@@ -1011,26 +1011,26 @@  discard block
 block discarded – undo
1011 1011
 
1012 1012
 				switch ( $edit_redirect ) {
1013 1013
 
1014
-                    case '0':
1015
-	                    $redirect_url = $back_link;
1016
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' );
1017
-                        break;
1018
-
1019
-                    case '1':
1020
-	                    $redirect_url = $directory_link = GravityView_API::directory_link();
1021
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' );
1022
-	                    break;
1023
-
1024
-                    case '2':
1025
-	                    $redirect_url = $edit_redirect_url;
1026
-	                    $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' );
1027
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' );
1028
-                        break;
1029
-
1030
-                    case '':
1031
-                    default:
1032
-					    $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' );
1033
-                        break;
1014
+					case '0':
1015
+						$redirect_url = $back_link;
1016
+						$entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' );
1017
+						break;
1018
+
1019
+					case '1':
1020
+						$redirect_url = $directory_link = GravityView_API::directory_link();
1021
+						$entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' );
1022
+						break;
1023
+
1024
+					case '2':
1025
+						$redirect_url = $edit_redirect_url;
1026
+						$redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' );
1027
+						$entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' );
1028
+						break;
1029
+
1030
+					case '':
1031
+					default:
1032
+						$entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' );
1033
+						break;
1034 1034
 				}
1035 1035
 
1036 1036
 				if ( isset( $redirect_url ) ) {
@@ -1087,7 +1087,7 @@  discard block
 block discarded – undo
1087 1087
 
1088 1088
 		ob_get_clean();
1089 1089
 
1090
-	    remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
1090
+		remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
1091 1091
 		remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
1092 1092
 		remove_filter( 'gform_disable_view_counter', '__return_true' );
1093 1093
 		remove_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5 );
@@ -1141,7 +1141,7 @@  discard block
 block discarded – undo
1141 1141
 
1142 1142
 		// for now we don't support Save and Continue feature.
1143 1143
 		if( ! self::$supports_save_and_continue ) {
1144
-	        unset( $form['save'] );
1144
+			unset( $form['save'] );
1145 1145
 		}
1146 1146
 
1147 1147
 		$form = $this->unselect_default_values( $form );
@@ -1168,30 +1168,30 @@  discard block
 block discarded – undo
1168 1168
 			return $field_content;
1169 1169
 		}
1170 1170
 
1171
-        $message = null;
1171
+		$message = null;
1172 1172
 
1173
-        // First, make sure they have the capability to edit the post.
1174
-        if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
1173
+		// First, make sure they have the capability to edit the post.
1174
+		if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
1175 1175
 
1176
-            /**
1177
-             * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
1178
-             * @param string $message The existing "You don't have permission..." text
1179
-             */
1180
-            $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
1176
+			/**
1177
+			 * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
1178
+			 * @param string $message The existing "You don't have permission..." text
1179
+			 */
1180
+			$message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
1181 1181
 
1182
-        } elseif( null === get_post( $this->entry['post_id'] ) ) {
1183
-            /**
1184
-             * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
1185
-             * @param string $message The existing "This field is not editable; the post no longer exists." text
1186
-             */
1187
-            $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
1188
-        }
1182
+		} elseif( null === get_post( $this->entry['post_id'] ) ) {
1183
+			/**
1184
+			 * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
1185
+			 * @param string $message The existing "This field is not editable; the post no longer exists." text
1186
+			 */
1187
+			$message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
1188
+		}
1189 1189
 
1190
-        if( $message ) {
1191
-            $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
1192
-        }
1190
+		if( $message ) {
1191
+			$field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
1192
+		}
1193 1193
 
1194
-        return $field_content;
1194
+		return $field_content;
1195 1195
 	}
1196 1196
 
1197 1197
 	/**
@@ -1219,7 +1219,7 @@  discard block
 block discarded – undo
1219 1219
 			|| ! empty( $field_content )
1220 1220
 			|| in_array( $field->type, array( 'honeypot' ) )
1221 1221
 		) {
1222
-	        return $field_content;
1222
+			return $field_content;
1223 1223
 		}
1224 1224
 
1225 1225
 		// SET SOME FIELD DEFAULTS TO PREVENT ISSUES
@@ -1227,24 +1227,24 @@  discard block
 block discarded – undo
1227 1227
 
1228 1228
 		$field_value = $this->get_field_value( $field );
1229 1229
 
1230
-	    // Prevent any PHP warnings, like undefined index
1231
-	    ob_start();
1230
+		// Prevent any PHP warnings, like undefined index
1231
+		ob_start();
1232 1232
 
1233
-	    $return = null;
1233
+		$return = null;
1234 1234
 
1235 1235
 		/** @var GravityView_Field $gv_field */
1236 1236
 		if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
1237 1237
 			$return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
1238 1238
 		} else {
1239
-	        $return = $field->get_field_input( $this->form, $field_value, $this->entry );
1240
-	    }
1239
+			$return = $field->get_field_input( $this->form, $field_value, $this->entry );
1240
+		}
1241 1241
 
1242
-	    // If there was output, it's an error
1243
-	    $warnings = ob_get_clean();
1242
+		// If there was output, it's an error
1243
+		$warnings = ob_get_clean();
1244 1244
 
1245
-	    if( !empty( $warnings ) ) {
1246
-		    gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) );
1247
-	    }
1245
+		if( !empty( $warnings ) ) {
1246
+			gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) );
1247
+		}
1248 1248
 
1249 1249
 		return $return;
1250 1250
 	}
@@ -1279,8 +1279,8 @@  discard block
 block discarded – undo
1279 1279
 				$input_id = strval( $input['id'] );
1280 1280
 
1281 1281
 				if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) {
1282
-				    $field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
1283
-				    $allow_pre_populated = false;
1282
+					$field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
1283
+					$allow_pre_populated = false;
1284 1284
 				}
1285 1285
 
1286 1286
 			}
@@ -1304,7 +1304,7 @@  discard block
 block discarded – undo
1304 1304
 			if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) {
1305 1305
 				$categories = array();
1306 1306
 				foreach ( explode( ',', $field_value ) as $cat_string ) {
1307
-				    $categories[] = GFCommon::format_post_category( $cat_string, true );
1307
+					$categories[] = GFCommon::format_post_category( $cat_string, true );
1308 1308
 				}
1309 1309
 				$field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
1310 1310
 			}
@@ -1314,25 +1314,25 @@  discard block
 block discarded – undo
1314 1314
 		// if value is empty get the default value if defined
1315 1315
 		$field_value = $field->get_value_default_if_empty( $field_value );
1316 1316
 
1317
-	    /**
1318
-	     * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
1319
-	     * @since 1.11
1320
-	     * @since 1.20 Added third param
1321
-	     * @param mixed $field_value field value used to populate the input
1322
-	     * @param object $field Gravity Forms field object ( Class GF_Field )
1323
-	     * @param GravityView_Edit_Entry_Render $this Current object
1324
-	     */
1325
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this );
1326
-
1327
-	    /**
1328
-	     * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type
1329
-	     * @since 1.17
1330
-	     * @since 1.20 Added third param
1331
-	     * @param mixed $field_value field value used to populate the input
1332
-	     * @param GF_Field $field Gravity Forms field object
1333
-	     * @param GravityView_Edit_Entry_Render $this Current object
1334
-	     */
1335
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
1317
+		/**
1318
+		 * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
1319
+		 * @since 1.11
1320
+		 * @since 1.20 Added third param
1321
+		 * @param mixed $field_value field value used to populate the input
1322
+		 * @param object $field Gravity Forms field object ( Class GF_Field )
1323
+		 * @param GravityView_Edit_Entry_Render $this Current object
1324
+		 */
1325
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this );
1326
+
1327
+		/**
1328
+		 * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type
1329
+		 * @since 1.17
1330
+		 * @since 1.20 Added third param
1331
+		 * @param mixed $field_value field value used to populate the input
1332
+		 * @param GF_Field $field Gravity Forms field object
1333
+		 * @param GravityView_Edit_Entry_Render $this Current object
1334
+		 */
1335
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
1336 1336
 
1337 1337
 		return $field_value;
1338 1338
 	}
@@ -1359,7 +1359,7 @@  discard block
 block discarded – undo
1359 1359
 			// This is because we're doing admin form pretending to be front-end, so Gravity Forms
1360 1360
 			// expects certain field array items to be set.
1361 1361
 			foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) {
1362
-	            $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
1362
+				$field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
1363 1363
 			}
1364 1364
 
1365 1365
 			switch( RGFormsModel::get_input_type( $field ) ) {
@@ -1373,61 +1373,61 @@  discard block
 block discarded – undo
1373 1373
 				 */
1374 1374
 				case 'fileupload':
1375 1375
 
1376
-				    // Set the previous value
1377
-				    $entry = $this->get_entry();
1376
+					// Set the previous value
1377
+					$entry = $this->get_entry();
1378 1378
 
1379
-				    $input_name = 'input_'.$field->id;
1380
-				    $form_id = $form['id'];
1379
+					$input_name = 'input_'.$field->id;
1380
+					$form_id = $form['id'];
1381 1381
 
1382
-				    $value = NULL;
1382
+					$value = NULL;
1383 1383
 
1384
-				    // Use the previous entry value as the default.
1385
-				    if( isset( $entry[ $field->id ] ) ) {
1386
-				        $value = $entry[ $field->id ];
1387
-				    }
1384
+					// Use the previous entry value as the default.
1385
+					if( isset( $entry[ $field->id ] ) ) {
1386
+						$value = $entry[ $field->id ];
1387
+					}
1388 1388
 
1389
-				    // If this is a single upload file
1390
-				    if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
1391
-				        $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
1392
-				        $value = $file_path['url'];
1389
+					// If this is a single upload file
1390
+					if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
1391
+						$file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
1392
+						$value = $file_path['url'];
1393 1393
 
1394
-				    } else {
1394
+					} else {
1395 1395
 
1396
-				        // Fix PHP warning on line 1498 of form_display.php for post_image fields
1397
-				        // Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
1398
-				        $_FILES[ $input_name ] = array('name' => '', 'size' => '' );
1396
+						// Fix PHP warning on line 1498 of form_display.php for post_image fields
1397
+						// Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
1398
+						$_FILES[ $input_name ] = array('name' => '', 'size' => '' );
1399 1399
 
1400
-				    }
1400
+					}
1401 1401
 
1402
-				    if ( \GV\Utils::get( $field, "multipleFiles" ) ) {
1402
+					if ( \GV\Utils::get( $field, "multipleFiles" ) ) {
1403 1403
 
1404
-				        // If there are fresh uploads, process and merge them.
1405
-				        // Otherwise, use the passed values, which should be json-encoded array of URLs
1406
-				        if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
1407
-				            $value = empty( $value ) ? '[]' : $value;
1408
-				            $value = stripslashes_deep( $value );
1409
-				            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
1410
-				        }
1404
+						// If there are fresh uploads, process and merge them.
1405
+						// Otherwise, use the passed values, which should be json-encoded array of URLs
1406
+						if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
1407
+							$value = empty( $value ) ? '[]' : $value;
1408
+							$value = stripslashes_deep( $value );
1409
+							$value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
1410
+						}
1411 1411
 
1412
-				    } else {
1412
+					} else {
1413 1413
 
1414
-				        // A file already exists when editing an entry
1415
-				        // We set this to solve issue when file upload fields are required.
1416
-				        GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
1414
+						// A file already exists when editing an entry
1415
+						// We set this to solve issue when file upload fields are required.
1416
+						GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
1417 1417
 
1418
-				    }
1418
+					}
1419 1419
 
1420
-				    $this->entry[ $input_name ] = $value;
1421
-				    $_POST[ $input_name ] = $value;
1420
+					$this->entry[ $input_name ] = $value;
1421
+					$_POST[ $input_name ] = $value;
1422 1422
 
1423
-				    break;
1423
+					break;
1424 1424
 
1425 1425
 				case 'number':
1426
-				    // Fix "undefined index" issue at line 1286 in form_display.php
1427
-				    if( !isset( $_POST['input_'.$field->id ] ) ) {
1428
-				        $_POST['input_'.$field->id ] = NULL;
1429
-				    }
1430
-				    break;
1426
+					// Fix "undefined index" issue at line 1286 in form_display.php
1427
+					if( !isset( $_POST['input_'.$field->id ] ) ) {
1428
+						$_POST['input_'.$field->id ] = NULL;
1429
+					}
1430
+					break;
1431 1431
 			}
1432 1432
 
1433 1433
 		}
@@ -1512,42 +1512,42 @@  discard block
 block discarded – undo
1512 1512
 				case 'fileupload' :
1513 1513
 				case 'post_image':
1514 1514
 
1515
-				    // in case nothing is uploaded but there are already files saved
1516
-				    if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
1517
-				        $field->failed_validation = false;
1518
-				        unset( $field->validation_message );
1519
-				    }
1515
+					// in case nothing is uploaded but there are already files saved
1516
+					if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
1517
+						$field->failed_validation = false;
1518
+						unset( $field->validation_message );
1519
+					}
1520 1520
 
1521
-				    // validate if multi file upload reached max number of files [maxFiles] => 2
1522
-				    if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) {
1521
+					// validate if multi file upload reached max number of files [maxFiles] => 2
1522
+					if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) {
1523 1523
 
1524
-				        $input_name = 'input_' . $field->id;
1525
-				        //uploaded
1526
-				        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
1524
+						$input_name = 'input_' . $field->id;
1525
+						//uploaded
1526
+						$file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
1527 1527
 
1528
-				        //existent
1529
-				        $entry = $this->get_entry();
1530
-				        $value = NULL;
1531
-				        if( isset( $entry[ $field->id ] ) ) {
1532
-				            $value = json_decode( $entry[ $field->id ], true );
1533
-				        }
1528
+						//existent
1529
+						$entry = $this->get_entry();
1530
+						$value = NULL;
1531
+						if( isset( $entry[ $field->id ] ) ) {
1532
+							$value = json_decode( $entry[ $field->id ], true );
1533
+						}
1534 1534
 
1535
-				        // count uploaded files and existent entry files
1536
-				        $count_files = count( $file_names ) + count( $value );
1535
+						// count uploaded files and existent entry files
1536
+						$count_files = count( $file_names ) + count( $value );
1537 1537
 
1538
-				        if( $count_files > $field->maxFiles ) {
1539
-				            $field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
1540
-				            $field->failed_validation = 1;
1541
-				            $gv_valid = false;
1538
+						if( $count_files > $field->maxFiles ) {
1539
+							$field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
1540
+							$field->failed_validation = 1;
1541
+							$gv_valid = false;
1542 1542
 
1543
-				            // in case of error make sure the newest upload files are removed from the upload input
1544
-				            GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
1545
-				        }
1543
+							// in case of error make sure the newest upload files are removed from the upload input
1544
+							GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
1545
+						}
1546 1546
 
1547
-				    }
1547
+					}
1548 1548
 
1549 1549
 
1550
-				    break;
1550
+					break;
1551 1551
 
1552 1552
 			}
1553 1553
 
@@ -1558,47 +1558,47 @@  discard block
 block discarded – undo
1558 1558
 
1559 1559
 				switch ( $field_type ) {
1560 1560
 
1561
-				    // Captchas don't need to be re-entered.
1562
-				    case 'captcha':
1561
+					// Captchas don't need to be re-entered.
1562
+					case 'captcha':
1563 1563
 
1564
-				        // Post Image fields aren't editable, so we un-fail them.
1565
-				    case 'post_image':
1566
-				        $field->failed_validation = false;
1567
-				        unset( $field->validation_message );
1568
-				        break;
1564
+						// Post Image fields aren't editable, so we un-fail them.
1565
+					case 'post_image':
1566
+						$field->failed_validation = false;
1567
+						unset( $field->validation_message );
1568
+						break;
1569 1569
 
1570 1570
 				}
1571 1571
 
1572 1572
 				// You can't continue inside a switch, so we do it after.
1573 1573
 				if( empty( $field->failed_validation ) ) {
1574
-				    continue;
1574
+					continue;
1575 1575
 				}
1576 1576
 
1577 1577
 				// checks if the No Duplicates option is not validating entry against itself, since
1578 1578
 				// we're editing a stored entry, it would also assume it's a duplicate.
1579 1579
 				if( !empty( $field->noDuplicates ) ) {
1580 1580
 
1581
-				    $entry = $this->get_entry();
1581
+					$entry = $this->get_entry();
1582 1582
 
1583
-				    // If the value of the entry is the same as the stored value
1584
-				    // Then we can assume it's not a duplicate, it's the same.
1585
-				    if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
1586
-				        //if value submitted was not changed, then don't validate
1587
-				        $field->failed_validation = false;
1583
+					// If the value of the entry is the same as the stored value
1584
+					// Then we can assume it's not a duplicate, it's the same.
1585
+					if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
1586
+						//if value submitted was not changed, then don't validate
1587
+						$field->failed_validation = false;
1588 1588
 
1589
-				        unset( $field->validation_message );
1589
+						unset( $field->validation_message );
1590 1590
 
1591
-				        gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) );
1591
+						gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) );
1592 1592
 
1593
-				        continue;
1594
-				    }
1593
+						continue;
1594
+					}
1595 1595
 				}
1596 1596
 
1597 1597
 				// if here then probably we are facing the validation 'At least one field must be filled out'
1598 1598
 				if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
1599
-				    unset( $field->validation_message );
1600
-	                $field->validation_message = false;
1601
-				    continue;
1599
+					unset( $field->validation_message );
1600
+					$field->validation_message = false;
1601
+					continue;
1602 1602
 				}
1603 1603
 
1604 1604
 				$gv_valid = false;
@@ -1662,8 +1662,8 @@  discard block
 block discarded – undo
1662 1662
 		// Hide fields depending on admin settings
1663 1663
 		$fields = $this->filter_fields( $form['fields'], $edit_fields );
1664 1664
 
1665
-	    // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
1666
-	    $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
1665
+		// If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
1666
+		$fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
1667 1667
 
1668 1668
 		/**
1669 1669
 		 * @filter `gravityview/edit_entry/form_fields` Modify the fields displayed in Edit Entry form
@@ -1723,11 +1723,11 @@  discard block
 block discarded – undo
1723 1723
 		// The edit tab has been configured, so we loop through to configured settings
1724 1724
 		foreach ( $configured_fields as $configured_field ) {
1725 1725
 
1726
-	        /** @var GF_Field $field */
1727
-	        foreach ( $fields as $field ) {
1726
+			/** @var GF_Field $field */
1727
+			foreach ( $fields as $field ) {
1728 1728
 				if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
1729
-				    $edit_fields[] = $this->merge_field_properties( $field, $configured_field );
1730
-				    break;
1729
+					$edit_fields[] = $this->merge_field_properties( $field, $configured_field );
1730
+					break;
1731 1731
 				}
1732 1732
 
1733 1733
 			}
@@ -1783,28 +1783,28 @@  discard block
 block discarded – undo
1783 1783
 	 */
1784 1784
 	private function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) {
1785 1785
 
1786
-	    /**
1786
+		/**
1787 1787
 		 * @filter `gravityview/edit_entry/use_gf_admin_only_setting` When Edit tab isn't configured, should the Gravity Forms "Admin Only" field settings be used to control field display to non-admins? Default: true
1788
-	     * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators.
1789
-	     * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions
1790
-	     * @since 1.9.1
1791
-	     * @param boolean $use_gf_adminonly_setting True: Hide field if set to Admin Only in GF and the user is not an admin. False: show field based on GV permissions, ignoring GF permissions.
1792
-	     * @param array $form GF Form array
1793
-	     * @param int $view_id View ID
1794
-	     */
1795
-	    $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
1796
-
1797
-	    if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
1788
+		 * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators.
1789
+		 * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions
1790
+		 * @since 1.9.1
1791
+		 * @param boolean $use_gf_adminonly_setting True: Hide field if set to Admin Only in GF and the user is not an admin. False: show field based on GV permissions, ignoring GF permissions.
1792
+		 * @param array $form GF Form array
1793
+		 * @param int $view_id View ID
1794
+		 */
1795
+		$use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
1796
+
1797
+		if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
1798 1798
 			foreach( $fields as $k => $field ) {
1799 1799
 				if( $field->adminOnly ) {
1800
-				    unset( $fields[ $k ] );
1800
+					unset( $fields[ $k ] );
1801 1801
 				}
1802 1802
 			}
1803 1803
 			return array_values( $fields );
1804 1804
 		}
1805 1805
 
1806
-	    foreach( $fields as &$field ) {
1807
-		    $field->adminOnly = false;
1806
+		foreach( $fields as &$field ) {
1807
+			$field->adminOnly = false;
1808 1808
 		}
1809 1809
 
1810 1810
 		return $fields;
@@ -1824,13 +1824,13 @@  discard block
 block discarded – undo
1824 1824
 	 */
1825 1825
 	private function unselect_default_values( $form ) {
1826 1826
 
1827
-	    foreach ( $form['fields'] as &$field ) {
1827
+		foreach ( $form['fields'] as &$field ) {
1828 1828
 
1829 1829
 			if ( empty( $field->choices ) ) {
1830
-                continue;
1830
+				continue;
1831 1831
 			}
1832 1832
 
1833
-            foreach ( $field->choices as &$choice ) {
1833
+			foreach ( $field->choices as &$choice ) {
1834 1834
 				if ( \GV\Utils::get( $choice, 'isSelected' ) ) {
1835 1835
 					$choice['isSelected'] = false;
1836 1836
 				}
@@ -1867,36 +1867,36 @@  discard block
 block discarded – undo
1867 1867
 
1868 1868
 			if( 'checkbox' === $field->type ) {
1869 1869
 				foreach ( $field->get_entry_inputs() as $key => $input ) {
1870
-				    $input_id = $input['id'];
1871
-				    $choice = $field->choices[ $key ];
1872
-				    $value = \GV\Utils::get( $this->entry, $input_id );
1873
-				    $match = RGFormsModel::choice_value_match( $field, $choice, $value );
1874
-				    if( $match ) {
1875
-				        $field->choices[ $key ]['isSelected'] = true;
1876
-				    }
1870
+					$input_id = $input['id'];
1871
+					$choice = $field->choices[ $key ];
1872
+					$value = \GV\Utils::get( $this->entry, $input_id );
1873
+					$match = RGFormsModel::choice_value_match( $field, $choice, $value );
1874
+					if( $match ) {
1875
+						$field->choices[ $key ]['isSelected'] = true;
1876
+					}
1877 1877
 				}
1878 1878
 			} else {
1879 1879
 
1880 1880
 				// We need to run through each field to set the default values
1881 1881
 				foreach ( $this->entry as $field_id => $field_value ) {
1882 1882
 
1883
-				    if( floatval( $field_id ) === floatval( $field->id ) ) {
1883
+					if( floatval( $field_id ) === floatval( $field->id ) ) {
1884 1884
 
1885
-				        if( 'list' === $field->type ) {
1886
-				            $list_rows = maybe_unserialize( $field_value );
1885
+						if( 'list' === $field->type ) {
1886
+							$list_rows = maybe_unserialize( $field_value );
1887 1887
 
1888
-				            $list_field_value = array();
1889
-				            foreach ( (array) $list_rows as $row ) {
1890
-				                foreach ( (array) $row as $column ) {
1891
-				                    $list_field_value[] = $column;
1892
-				                }
1893
-				            }
1888
+							$list_field_value = array();
1889
+							foreach ( (array) $list_rows as $row ) {
1890
+								foreach ( (array) $row as $column ) {
1891
+									$list_field_value[] = $column;
1892
+								}
1893
+							}
1894 1894
 
1895
-				            $field->defaultValue = serialize( $list_field_value );
1896
-				        } else {
1897
-				            $field->defaultValue = $field_value;
1898
-				        }
1899
-				    }
1895
+							$field->defaultValue = serialize( $list_field_value );
1896
+						} else {
1897
+							$field->defaultValue = $field_value;
1898
+						}
1899
+					}
1900 1900
 				}
1901 1901
 			}
1902 1902
 		}
@@ -1953,7 +1953,7 @@  discard block
 block discarded – undo
1953 1953
 			return $has_conditional_logic;
1954 1954
 		}
1955 1955
 
1956
-	    /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */
1956
+		/** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */
1957 1957
 		return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form );
1958 1958
 	}
1959 1959
 
@@ -2020,14 +2020,14 @@  discard block
 block discarded – undo
2020 2020
 
2021 2021
 		if( $echo && $error !== true ) {
2022 2022
 
2023
-	        $error = esc_html( $error );
2023
+			$error = esc_html( $error );
2024 2024
 
2025
-	        /**
2026
-	         * @since 1.9
2027
-	         */
2028
-	        if ( ! empty( $this->entry ) ) {
2029
-		        $error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) );
2030
-	        }
2025
+			/**
2026
+			 * @since 1.9
2027
+			 */
2028
+			if ( ! empty( $this->entry ) ) {
2029
+				$error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) );
2030
+			}
2031 2031
 
2032 2032
 			echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
2033 2033
 		}
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/sort-filter.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
 		$secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'][1] );
34 34
 	} else {
35 35
 		$primary_sort_fields = $secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'] );
36
-    }
36
+	}
37 37
 
38 38
 
39 39
 	GravityView_Render_Settings::render_setting_row( 'sort_field', $current_settings, sprintf( $sort_fields_input, 1, $primary_sort_fields ) );
Please login to merge, or discard this patch.