Completed
Pull Request — master (#1363)
by
unknown
17:36
created
includes/class-ajax.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 
139 139
 		// template areas
140 140
 		$template_areas_directory = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'directory' );
141
-        $template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' );
141
+		$template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' );
142 142
 
143 143
 		// widget areas
144 144
 		$default_widget_areas = \GV\Widget::get_default_widget_areas();
@@ -331,40 +331,40 @@  discard block
 block discarded – undo
331 331
 		// load file
332 332
 		$xmlstr = file_get_contents( $form_file );
333 333
 
334
-        $options = array(
335
-            "page" => array("unserialize_as_array" => true),
336
-            "form"=> array("unserialize_as_array" => true),
337
-            "field"=> array("unserialize_as_array" => true),
338
-            "rule"=> array("unserialize_as_array" => true),
339
-            "choice"=> array("unserialize_as_array" => true),
340
-            "input"=> array("unserialize_as_array" => true),
341
-            "routing_item"=> array("unserialize_as_array" => true),
342
-            "creditCard"=> array("unserialize_as_array" => true),
343
-            "routin"=> array("unserialize_as_array" => true),
344
-            "confirmation" => array("unserialize_as_array" => true),
345
-            "notification" => array("unserialize_as_array" => true)
346
-        );
334
+		$options = array(
335
+			"page" => array("unserialize_as_array" => true),
336
+			"form"=> array("unserialize_as_array" => true),
337
+			"field"=> array("unserialize_as_array" => true),
338
+			"rule"=> array("unserialize_as_array" => true),
339
+			"choice"=> array("unserialize_as_array" => true),
340
+			"input"=> array("unserialize_as_array" => true),
341
+			"routing_item"=> array("unserialize_as_array" => true),
342
+			"creditCard"=> array("unserialize_as_array" => true),
343
+			"routin"=> array("unserialize_as_array" => true),
344
+			"confirmation" => array("unserialize_as_array" => true),
345
+			"notification" => array("unserialize_as_array" => true)
346
+		);
347 347
 
348 348
 		$xml = new RGXML($options);
349
-        $forms = $xml->unserialize($xmlstr);
349
+		$forms = $xml->unserialize($xmlstr);
350 350
 
351
-        if( !$forms ) {
352
-        	gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. Error importing file. (File) {path}', array( 'template_id' => $template_id, 'path' => $form_file ) );
353
-        	return false;
354
-        }
351
+		if( !$forms ) {
352
+			gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. Error importing file. (File) {path}', array( 'template_id' => $template_id, 'path' => $form_file ) );
353
+			return false;
354
+		}
355 355
 
356
-        if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
357
-        	$form = $forms[0];
358
-        }
356
+		if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
357
+			$form = $forms[0];
358
+		}
359 359
 
360
-        if( empty( $form ) ) {
361
-        	gravityview()->log->error( '$form not set.', array( 'data' => $forms ) );
362
-        	return false;
363
-        }
360
+		if( empty( $form ) ) {
361
+			gravityview()->log->error( '$form not set.', array( 'data' => $forms ) );
362
+			return false;
363
+		}
364 364
 
365
-        gravityview()->log->debug( '[pre_get_available_fields] Importing Form Fields for preset [{template_id}]. (Form)', array( 'template_id' => $template_id, 'data' => $form ) );
365
+		gravityview()->log->debug( '[pre_get_available_fields] Importing Form Fields for preset [{template_id}]. (Form)', array( 'template_id' => $template_id, 'data' => $form ) );
366 366
 
367
-        return $form;
367
+		return $form;
368 368
 
369 369
 	}
370 370
 
Please login to merge, or discard this patch.
includes/class-admin-views.php 1 patch
Indentation   +84 added lines, -84 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 ] = \GV\Widget::registered();
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 ) ) );
@@ -972,7 +972,7 @@  discard block
 block discarded – undo
972 972
 
973 973
 	/**
974 974
 	 * Render the widget active areas
975
-     * @param  string $template_id The current slug of the selected View template
975
+	 * @param  string $template_id The current slug of the selected View template
976 976
 	 * @param  string $zone    Either 'header' or 'footer'
977 977
 	 * @param  string $post_id Current Post ID (view)
978 978
 	 * @return string          html
@@ -1002,13 +1002,13 @@  discard block
 block discarded – undo
1002 1002
 	}
1003 1003
 
1004 1004
 	/**
1005
-     * Renders "Add Field" tooltips
1006
-     *
1007
-     * @since 2.0.11
1008
-     *
1005
+	 * Renders "Add Field" tooltips
1006
+	 *
1007
+	 * @since 2.0.11
1008
+	 *
1009 1009
 	 * @param string $context "directory", "single", or "edit"
1010
-     *
1011
-     * @return void
1010
+	 *
1011
+	 * @return void
1012 1012
 	 */
1013 1013
 	function render_field_pickers( $context = 'directory' ) {
1014 1014
 
@@ -1035,7 +1035,7 @@  discard block
 block discarded – undo
1035 1035
             </div>
1036 1036
 			<?php
1037 1037
 		}
1038
-    }
1038
+	}
1039 1039
 
1040 1040
 	/**
1041 1041
 	 * Render the Template Active Areas and configured active fields for a given template id and post id
@@ -1101,7 +1101,7 @@  discard block
 block discarded – undo
1101 1101
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
1102 1102
 
1103 1103
 		// Add the GV font (with the Astronaut)
1104
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1104
+		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1105 1105
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1106 1106
 
1107 1107
 		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
@@ -1109,63 +1109,63 @@  discard block
 block discarded – undo
1109 1109
 		if( GFForms::get_page() === 'form_list' ) {
1110 1110
 			wp_enqueue_style( 'gravityview_views_styles' );
1111 1111
 			return;
1112
-        }
1112
+		}
1113 1113
 
1114 1114
 		// Don't process any scripts below here if it's not a GravityView page.
1115 1115
 		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1116
-		    return;
1116
+			return;
1117 1117
 		}
1118 1118
 
1119
-        wp_enqueue_script( 'jquery-ui-datepicker' );
1120
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1121
-
1122
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1123
-
1124
-        //enqueue scripts
1125
-        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 );
1126
-
1127
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1128
-            'cookiepath' => COOKIEPATH,
1129
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1130
-            'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1131
-            'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1132
-            'label_close' => __( 'Close', 'gravityview' ),
1133
-            'label_cancel' => __( 'Cancel', 'gravityview' ),
1134
-            'label_continue' => __( 'Continue', 'gravityview' ),
1135
-            'label_ok' => __( 'Ok', 'gravityview' ),
1136
-            'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1137
-            'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1138
-            'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1139
-            'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1140
-            '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' ),
1141
-        ));
1119
+		wp_enqueue_script( 'jquery-ui-datepicker' );
1120
+		wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1121
+
1122
+		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1123
+
1124
+		//enqueue scripts
1125
+		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 );
1126
+
1127
+		wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1128
+			'cookiepath' => COOKIEPATH,
1129
+			'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1130
+			'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1131
+			'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1132
+			'label_close' => __( 'Close', 'gravityview' ),
1133
+			'label_cancel' => __( 'Cancel', 'gravityview' ),
1134
+			'label_continue' => __( 'Continue', 'gravityview' ),
1135
+			'label_ok' => __( 'Ok', 'gravityview' ),
1136
+			'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1137
+			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1138
+			'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1139
+			'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1140
+			'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' ),
1141
+		));
1142 1142
 
1143 1143
 		wp_enqueue_style( 'gravityview_views_styles' );
1144 1144
 
1145
-        // Enqueue scripts needed for merge tags
1146
-        self::enqueue_gravity_forms_scripts();
1145
+		// Enqueue scripts needed for merge tags
1146
+		self::enqueue_gravity_forms_scripts();
1147 1147
 	}
1148 1148
 
1149 1149
 	/**
1150 1150
 	 * Enqueue Gravity Forms scripts, needed for Merge Tags
1151
-     *
1152
-     * @since 1.0.5-beta
1153
-     *
1154
-     * @return void
1151
+	 *
1152
+	 * @since 1.0.5-beta
1153
+	 *
1154
+	 * @return void
1155 1155
 	 */
1156 1156
 	static function enqueue_gravity_forms_scripts() {
1157 1157
 		GFForms::register_scripts();
1158 1158
 
1159 1159
 		$scripts = array(
1160
-		    'sack',
1161
-		    'gform_gravityforms',
1162
-		    'gform_forms',
1163
-		    'gform_form_admin',
1164
-		    'jquery-ui-autocomplete'
1160
+			'sack',
1161
+			'gform_gravityforms',
1162
+			'gform_forms',
1163
+			'gform_form_admin',
1164
+			'jquery-ui-autocomplete'
1165 1165
 		);
1166 1166
 
1167 1167
 		if ( wp_is_mobile() ) {
1168
-		    $scripts[] = 'jquery-touch-punch';
1168
+			$scripts[] = 'jquery-touch-punch';
1169 1169
 		}
1170 1170
 
1171 1171
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.
future/includes/class-gv-extension.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -305,13 +305,13 @@
 block discarded – undo
305 305
 			$this->_remote_update_url,
306 306
 			$this->_path,
307 307
 			array(
308
-            	'version'	=> $this->_version, // current version number
309
-            	'license'	=> \GV\Utils::get( $license, 'license_key', \GV\Utils::get( $license, 'license', null ) ),
310
-	            'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
311
-            	'item_name' => $this->_title,  // name of this plugin
312
-            	'author' 	=> strip_tags( $this->_author )  // author of this plugin
313
-          	)
314
-        );
308
+				'version'	=> $this->_version, // current version number
309
+				'license'	=> \GV\Utils::get( $license, 'license_key', \GV\Utils::get( $license, 'license', null ) ),
310
+				'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
311
+				'item_name' => $this->_title,  // name of this plugin
312
+				'author' 	=> strip_tags( $this->_author )  // author of this plugin
313
+		  	)
314
+		);
315 315
 	}
316 316
 
317 317
 	/**
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry-render.php 1 patch
Indentation   +289 added lines, -289 removed lines patch added patch discarded remove patch
@@ -102,10 +102,10 @@  discard block
 block discarded – undo
102 102
 
103 103
 	/**
104 104
 	 * ID of the current post. May also be ID of the current View.
105
-     *
106
-     * @since 2.0.13
107
-     * 
108
-     * @var int
105
+	 *
106
+	 * @since 2.0.13
107
+	 * 
108
+	 * @var int
109 109
 	 */
110 110
 	public $post_id;
111 111
 
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 	 */
177 177
 	public function prevent_maybe_process_form() {
178 178
 
179
-	    if( ! $this->is_edit_entry_submission() ) {
179
+		if( ! $this->is_edit_entry_submission() ) {
180 180
 			return;
181 181
 		}
182 182
 
@@ -210,14 +210,14 @@  discard block
 block discarded – undo
210 210
 	 * When Edit entry view is requested setup the vars
211 211
 	 */
212 212
 	private function setup_vars() {
213
-        global $post;
213
+		global $post;
214 214
 
215 215
 		$gravityview_view = GravityView_View::getInstance();
216 216
 
217 217
 
218 218
 		$entries = $gravityview_view->getEntries();
219
-	    self::$original_entry = $entries[0];
220
-	    $this->entry = $entries[0];
219
+		self::$original_entry = $entries[0];
220
+		$this->entry = $entries[0];
221 221
 
222 222
 		self::$original_form = $gravityview_view->getForm();
223 223
 		$this->form = $gravityview_view->getForm();
@@ -359,8 +359,8 @@  discard block
 block discarded – undo
359 359
 
360 360
 			GFFormsModel::save_lead( $form, $this->entry );
361 361
 
362
-	        // Delete the values for hidden inputs
363
-	        $this->unset_hidden_field_values();
362
+			// Delete the values for hidden inputs
363
+			$this->unset_hidden_field_values();
364 364
 			
365 365
 			$this->entry['date_created'] = $date_created;
366 366
 
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
 			// Perform actions normally performed after updating a lead
371 371
 			$this->after_update();
372 372
 
373
-	        /**
373
+			/**
374 374
 			 * Must be AFTER after_update()!
375 375
 			 * @see https://github.com/gravityview/GravityView/issues/764
376 376
 			 */
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
 
379 379
 			/**
380 380
 			 * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry
381
-             * @since 2.1 Added $gv_data parameter
381
+			 * @since 2.1 Added $gv_data parameter
382 382
 			 * @param array $form Gravity Forms form array
383 383
 			 * @param string $entry_id Numeric ID of the entry that was updated
384 384
 			 * @param GravityView_Edit_Entry_Render $this This object
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
 	 * @return void
403 403
 	 */
404 404
 	private function unset_hidden_field_values() {
405
-	    global $wpdb;
405
+		global $wpdb;
406 406
 
407 407
 		/**
408 408
 		 * @filter `gravityview/edit_entry/unset_hidden_field_values` Whether to delete values of fields hidden by conditional logic
@@ -424,29 +424,29 @@  discard block
 block discarded – undo
424 424
 			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) );
425 425
 		}
426 426
 
427
-	    foreach ( $this->entry as $input_id => $field_value ) {
427
+		foreach ( $this->entry as $input_id => $field_value ) {
428 428
 
429
-		    $field = RGFormsModel::get_field( $this->form, $input_id );
429
+			$field = RGFormsModel::get_field( $this->form, $input_id );
430 430
 
431
-		    // Reset fields that are hidden
432
-		    // Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic
433
-		    if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) {
431
+			// Reset fields that are hidden
432
+			// Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic
433
+			if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) {
434 434
 
435 435
 				$empty_value = $field->get_value_save_entry(
436 436
 					is_array( $field->get_entry_inputs() ) ? array() : '',
437 437
 					$this->form, '', $this->entry['id'], $this->entry
438 438
 				);
439 439
 
440
-			    $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id );
440
+				$lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id );
441 441
 
442
-			    GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value );
442
+				GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value );
443 443
 
444
-			    // Prevent the $_POST values of hidden fields from being used as default values when rendering the form
444
+				// Prevent the $_POST values of hidden fields from being used as default values when rendering the form
445 445
 				// after submission
446
-			    $post_input_id = 'input_' . str_replace( '.', '_', $input_id );
447
-			    $_POST[ $post_input_id ] = '';
448
-		    }
449
-	    }
446
+				$post_input_id = 'input_' . str_replace( '.', '_', $input_id );
447
+				$_POST[ $post_input_id ] = '';
448
+			}
449
+		}
450 450
 	}
451 451
 
452 452
 	/**
@@ -540,7 +540,7 @@  discard block
 block discarded – undo
540 540
 
541 541
 		$form = $this->filter_conditional_logic( $this->form );
542 542
 
543
-	    /** @var GF_Field $field */
543
+		/** @var GF_Field $field */
544 544
 		foreach( $form['fields'] as $k => &$field ) {
545 545
 
546 546
 			/**
@@ -556,7 +556,7 @@  discard block
 block discarded – undo
556 556
 
557 557
 			if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
558 558
 				foreach( $field->inputs as $key => $input ) {
559
-				    $field->inputs[ $key ][ 'id' ] = (string)$input['id'];
559
+					$field->inputs[ $key ][ 'id' ] = (string)$input['id'];
560 560
 				}
561 561
 			}
562 562
 		}
@@ -591,7 +591,7 @@  discard block
 block discarded – undo
591 591
 			foreach ( $this->fields_with_calculation as $field ) {
592 592
 				$inputs = $field->get_entry_inputs();
593 593
 				if ( is_array( $inputs ) ) {
594
-				    foreach ( $inputs as $input ) {
594
+					foreach ( $inputs as $input ) {
595 595
 						list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 );
596 596
 
597 597
 						if ( 'product' === $field->type ) {
@@ -610,7 +610,7 @@  discard block
 block discarded – undo
610 610
 						}
611 611
 
612 612
 						GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] );
613
-				    }
613
+					}
614 614
 				} else {
615 615
 					// Set to what it previously was if it's not editable
616 616
 					if ( ! in_array( $field->id, $allowed_fields ) ) {
@@ -656,7 +656,7 @@  discard block
 block discarded – undo
656 656
 			$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] );
657 657
 
658 658
 			$ary = ! empty( $value ) ? explode( '|:|', $value ) : array();
659
-	        $ary = stripslashes_deep( $ary );
659
+			$ary = stripslashes_deep( $ary );
660 660
 			$img_url = \GV\Utils::get( $ary, 0 );
661 661
 
662 662
 			$img_title       = count( $ary ) > 1 ? $ary[1] : '';
@@ -729,7 +729,7 @@  discard block
 block discarded – undo
729 729
 	private function maybe_update_post_fields( $form ) {
730 730
 
731 731
 		if( empty( $this->entry['post_id'] ) ) {
732
-	        gravityview()->log->debug( 'This entry has no post fields. Continuing...' );
732
+			gravityview()->log->debug( 'This entry has no post fields. Continuing...' );
733 733
 			return;
734 734
 		}
735 735
 
@@ -764,49 +764,49 @@  discard block
 block discarded – undo
764 764
 
765 765
 				switch( $field->type ) {
766 766
 
767
-				    case 'post_title':
768
-				        $post_title = $value;
769
-				        if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) {
770
-				            $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
771
-				        }
772
-				        $updated_post->post_title = $post_title;
773
-				        $updated_post->post_name  = $post_title;
774
-				        unset( $post_title );
775
-				        break;
776
-
777
-				    case 'post_content':
778
-				        $post_content = $value;
779
-				        if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) {
780
-				            $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
781
-				        }
782
-				        $updated_post->post_content = $post_content;
783
-				        unset( $post_content );
784
-				        break;
785
-				    case 'post_excerpt':
786
-				        $updated_post->post_excerpt = $value;
787
-				        break;
788
-				    case 'post_tags':
789
-				        wp_set_post_tags( $post_id, $value, false );
790
-				        break;
791
-				    case 'post_category':
792
-				        break;
793
-				    case 'post_custom_field':
767
+					case 'post_title':
768
+						$post_title = $value;
769
+						if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) {
770
+							$post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
771
+						}
772
+						$updated_post->post_title = $post_title;
773
+						$updated_post->post_name  = $post_title;
774
+						unset( $post_title );
775
+						break;
776
+
777
+					case 'post_content':
778
+						$post_content = $value;
779
+						if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) {
780
+							$post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
781
+						}
782
+						$updated_post->post_content = $post_content;
783
+						unset( $post_content );
784
+						break;
785
+					case 'post_excerpt':
786
+						$updated_post->post_excerpt = $value;
787
+						break;
788
+					case 'post_tags':
789
+						wp_set_post_tags( $post_id, $value, false );
790
+						break;
791
+					case 'post_category':
792
+						break;
793
+					case 'post_custom_field':
794 794
 						if ( is_array( $value ) && ( floatval( $field_id ) !== floatval( $field->id ) ) ) {
795 795
 							$value = $value[ $field_id ];
796 796
 						}
797 797
 
798
-				        if( ! empty( $field->customFieldTemplateEnabled ) ) {
799
-				            $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
800
-				        }
798
+						if( ! empty( $field->customFieldTemplateEnabled ) ) {
799
+							$value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
800
+						}
801 801
 
802 802
 						$value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry );
803 803
 
804
-				        update_post_meta( $post_id, $field->postCustomFieldName, $value );
805
-				        break;
804
+						update_post_meta( $post_id, $field->postCustomFieldName, $value );
805
+						break;
806 806
 
807
-				    case 'post_image':
808
-				        $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id );
809
-				        break;
807
+					case 'post_image':
808
+						$value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id );
809
+						break;
810 810
 
811 811
 				}
812 812
 
@@ -963,14 +963,14 @@  discard block
 block discarded – undo
963 963
 			?><h2 class="gv-edit-entry-title">
964 964
 				<span><?php
965 965
 
966
-				    /**
967
-				     * @filter `gravityview_edit_entry_title` Modify the edit entry title
968
-				     * @param string $edit_entry_title Modify the "Edit Entry" title
969
-				     * @param GravityView_Edit_Entry_Render $this This object
970
-				     */
971
-				    $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
966
+					/**
967
+					 * @filter `gravityview_edit_entry_title` Modify the edit entry title
968
+					 * @param string $edit_entry_title Modify the "Edit Entry" title
969
+					 * @param GravityView_Edit_Entry_Render $this This object
970
+					 */
971
+					$edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
972 972
 
973
-				    echo esc_attr( $edit_entry_title );
973
+					echo esc_attr( $edit_entry_title );
974 974
 			?></span>
975 975
 			</h2>
976 976
 
@@ -1033,26 +1033,26 @@  discard block
 block discarded – undo
1033 1033
 
1034 1034
 				switch ( $edit_redirect ) {
1035 1035
 
1036
-                    case '0':
1037
-	                    $redirect_url = $back_link;
1038
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' );
1039
-                        break;
1040
-
1041
-                    case '1':
1042
-	                    $redirect_url = $directory_link = GravityView_API::directory_link();
1043
-	                    $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>' );
1044
-	                    break;
1045
-
1046
-                    case '2':
1047
-	                    $redirect_url = $edit_redirect_url;
1048
-	                    $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' );
1049
-	                    $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>' );
1050
-                        break;
1051
-
1052
-                    case '':
1053
-                    default:
1054
-					    $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' );
1055
-                        break;
1036
+					case '0':
1037
+						$redirect_url = $back_link;
1038
+						$entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' );
1039
+						break;
1040
+
1041
+					case '1':
1042
+						$redirect_url = $directory_link = GravityView_API::directory_link();
1043
+						$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>' );
1044
+						break;
1045
+
1046
+					case '2':
1047
+						$redirect_url = $edit_redirect_url;
1048
+						$redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' );
1049
+						$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>' );
1050
+						break;
1051
+
1052
+					case '':
1053
+					default:
1054
+						$entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' );
1055
+						break;
1056 1056
 				}
1057 1057
 
1058 1058
 				if ( isset( $redirect_url ) ) {
@@ -1109,7 +1109,7 @@  discard block
 block discarded – undo
1109 1109
 
1110 1110
 		ob_get_clean();
1111 1111
 
1112
-	    remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
1112
+		remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
1113 1113
 		remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
1114 1114
 		remove_filter( 'gform_disable_view_counter', '__return_true' );
1115 1115
 		remove_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5 );
@@ -1163,7 +1163,7 @@  discard block
 block discarded – undo
1163 1163
 
1164 1164
 		// for now we don't support Save and Continue feature.
1165 1165
 		if( ! self::$supports_save_and_continue ) {
1166
-	        unset( $form['save'] );
1166
+			unset( $form['save'] );
1167 1167
 		}
1168 1168
 
1169 1169
 		$form = $this->unselect_default_values( $form );
@@ -1190,30 +1190,30 @@  discard block
 block discarded – undo
1190 1190
 			return $field_content;
1191 1191
 		}
1192 1192
 
1193
-        $message = null;
1193
+		$message = null;
1194 1194
 
1195
-        // First, make sure they have the capability to edit the post.
1196
-        if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
1195
+		// First, make sure they have the capability to edit the post.
1196
+		if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
1197 1197
 
1198
-            /**
1199
-             * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
1200
-             * @param string $message The existing "You don't have permission..." text
1201
-             */
1202
-            $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
1198
+			/**
1199
+			 * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
1200
+			 * @param string $message The existing "You don't have permission..." text
1201
+			 */
1202
+			$message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
1203 1203
 
1204
-        } elseif( null === get_post( $this->entry['post_id'] ) ) {
1205
-            /**
1206
-             * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
1207
-             * @param string $message The existing "This field is not editable; the post no longer exists." text
1208
-             */
1209
-            $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
1210
-        }
1204
+		} elseif( null === get_post( $this->entry['post_id'] ) ) {
1205
+			/**
1206
+			 * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
1207
+			 * @param string $message The existing "This field is not editable; the post no longer exists." text
1208
+			 */
1209
+			$message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
1210
+		}
1211 1211
 
1212
-        if( $message ) {
1213
-            $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
1214
-        }
1212
+		if( $message ) {
1213
+			$field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
1214
+		}
1215 1215
 
1216
-        return $field_content;
1216
+		return $field_content;
1217 1217
 	}
1218 1218
 
1219 1219
 	/**
@@ -1241,7 +1241,7 @@  discard block
 block discarded – undo
1241 1241
 			|| ! empty( $field_content )
1242 1242
 			|| in_array( $field->type, array( 'honeypot' ) )
1243 1243
 		) {
1244
-	        return $field_content;
1244
+			return $field_content;
1245 1245
 		}
1246 1246
 
1247 1247
 		// SET SOME FIELD DEFAULTS TO PREVENT ISSUES
@@ -1249,24 +1249,24 @@  discard block
 block discarded – undo
1249 1249
 
1250 1250
 		$field_value = $this->get_field_value( $field );
1251 1251
 
1252
-	    // Prevent any PHP warnings, like undefined index
1253
-	    ob_start();
1252
+		// Prevent any PHP warnings, like undefined index
1253
+		ob_start();
1254 1254
 
1255
-	    $return = null;
1255
+		$return = null;
1256 1256
 
1257 1257
 		/** @var GravityView_Field $gv_field */
1258 1258
 		if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
1259 1259
 			$return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
1260 1260
 		} else {
1261
-	        $return = $field->get_field_input( $this->form, $field_value, $this->entry );
1262
-	    }
1261
+			$return = $field->get_field_input( $this->form, $field_value, $this->entry );
1262
+		}
1263 1263
 
1264
-	    // If there was output, it's an error
1265
-	    $warnings = ob_get_clean();
1264
+		// If there was output, it's an error
1265
+		$warnings = ob_get_clean();
1266 1266
 
1267
-	    if( !empty( $warnings ) ) {
1268
-		    gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) );
1269
-	    }
1267
+		if( !empty( $warnings ) ) {
1268
+			gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) );
1269
+		}
1270 1270
 
1271 1271
 		return $return;
1272 1272
 	}
@@ -1301,8 +1301,8 @@  discard block
 block discarded – undo
1301 1301
 				$input_id = strval( $input['id'] );
1302 1302
 
1303 1303
 				if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) {
1304
-				    $field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
1305
-				    $allow_pre_populated = false;
1304
+					$field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
1305
+					$allow_pre_populated = false;
1306 1306
 				}
1307 1307
 
1308 1308
 			}
@@ -1326,7 +1326,7 @@  discard block
 block discarded – undo
1326 1326
 			if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) {
1327 1327
 				$categories = array();
1328 1328
 				foreach ( explode( ',', $field_value ) as $cat_string ) {
1329
-				    $categories[] = GFCommon::format_post_category( $cat_string, true );
1329
+					$categories[] = GFCommon::format_post_category( $cat_string, true );
1330 1330
 				}
1331 1331
 				$field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
1332 1332
 			}
@@ -1336,25 +1336,25 @@  discard block
 block discarded – undo
1336 1336
 		// if value is empty get the default value if defined
1337 1337
 		$field_value = $field->get_value_default_if_empty( $field_value );
1338 1338
 
1339
-	    /**
1340
-	     * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
1341
-	     * @since 1.11
1342
-	     * @since 1.20 Added third param
1343
-	     * @param mixed $field_value field value used to populate the input
1344
-	     * @param object $field Gravity Forms field object ( Class GF_Field )
1345
-	     * @param GravityView_Edit_Entry_Render $this Current object
1346
-	     */
1347
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this );
1348
-
1349
-	    /**
1350
-	     * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type
1351
-	     * @since 1.17
1352
-	     * @since 1.20 Added third param
1353
-	     * @param mixed $field_value field value used to populate the input
1354
-	     * @param GF_Field $field Gravity Forms field object
1355
-	     * @param GravityView_Edit_Entry_Render $this Current object
1356
-	     */
1357
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
1339
+		/**
1340
+		 * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
1341
+		 * @since 1.11
1342
+		 * @since 1.20 Added third param
1343
+		 * @param mixed $field_value field value used to populate the input
1344
+		 * @param object $field Gravity Forms field object ( Class GF_Field )
1345
+		 * @param GravityView_Edit_Entry_Render $this Current object
1346
+		 */
1347
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this );
1348
+
1349
+		/**
1350
+		 * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type
1351
+		 * @since 1.17
1352
+		 * @since 1.20 Added third param
1353
+		 * @param mixed $field_value field value used to populate the input
1354
+		 * @param GF_Field $field Gravity Forms field object
1355
+		 * @param GravityView_Edit_Entry_Render $this Current object
1356
+		 */
1357
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
1358 1358
 
1359 1359
 		return $field_value;
1360 1360
 	}
@@ -1381,7 +1381,7 @@  discard block
 block discarded – undo
1381 1381
 			// This is because we're doing admin form pretending to be front-end, so Gravity Forms
1382 1382
 			// expects certain field array items to be set.
1383 1383
 			foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) {
1384
-	            $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
1384
+				$field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
1385 1385
 			}
1386 1386
 
1387 1387
 			switch( RGFormsModel::get_input_type( $field ) ) {
@@ -1395,61 +1395,61 @@  discard block
 block discarded – undo
1395 1395
 				 */
1396 1396
 				case 'fileupload':
1397 1397
 
1398
-				    // Set the previous value
1399
-				    $entry = $this->get_entry();
1398
+					// Set the previous value
1399
+					$entry = $this->get_entry();
1400 1400
 
1401
-				    $input_name = 'input_'.$field->id;
1402
-				    $form_id = $form['id'];
1401
+					$input_name = 'input_'.$field->id;
1402
+					$form_id = $form['id'];
1403 1403
 
1404
-				    $value = NULL;
1404
+					$value = NULL;
1405 1405
 
1406
-				    // Use the previous entry value as the default.
1407
-				    if( isset( $entry[ $field->id ] ) ) {
1408
-				        $value = $entry[ $field->id ];
1409
-				    }
1406
+					// Use the previous entry value as the default.
1407
+					if( isset( $entry[ $field->id ] ) ) {
1408
+						$value = $entry[ $field->id ];
1409
+					}
1410 1410
 
1411
-				    // If this is a single upload file
1412
-				    if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
1413
-				        $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
1414
-				        $value = $file_path['url'];
1411
+					// If this is a single upload file
1412
+					if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
1413
+						$file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
1414
+						$value = $file_path['url'];
1415 1415
 
1416
-				    } else {
1416
+					} else {
1417 1417
 
1418
-				        // Fix PHP warning on line 1498 of form_display.php for post_image fields
1419
-				        // Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
1420
-				        $_FILES[ $input_name ] = array('name' => '', 'size' => '' );
1418
+						// Fix PHP warning on line 1498 of form_display.php for post_image fields
1419
+						// Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
1420
+						$_FILES[ $input_name ] = array('name' => '', 'size' => '' );
1421 1421
 
1422
-				    }
1422
+					}
1423 1423
 
1424
-				    if ( \GV\Utils::get( $field, "multipleFiles" ) ) {
1424
+					if ( \GV\Utils::get( $field, "multipleFiles" ) ) {
1425 1425
 
1426
-				        // If there are fresh uploads, process and merge them.
1427
-				        // Otherwise, use the passed values, which should be json-encoded array of URLs
1428
-				        if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
1429
-				            $value = empty( $value ) ? '[]' : $value;
1430
-				            $value = stripslashes_deep( $value );
1431
-				            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
1432
-				        }
1426
+						// If there are fresh uploads, process and merge them.
1427
+						// Otherwise, use the passed values, which should be json-encoded array of URLs
1428
+						if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
1429
+							$value = empty( $value ) ? '[]' : $value;
1430
+							$value = stripslashes_deep( $value );
1431
+							$value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
1432
+						}
1433 1433
 
1434
-				    } else {
1434
+					} else {
1435 1435
 
1436
-				        // A file already exists when editing an entry
1437
-				        // We set this to solve issue when file upload fields are required.
1438
-				        GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
1436
+						// A file already exists when editing an entry
1437
+						// We set this to solve issue when file upload fields are required.
1438
+						GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
1439 1439
 
1440
-				    }
1440
+					}
1441 1441
 
1442
-				    $this->entry[ $input_name ] = $value;
1443
-				    $_POST[ $input_name ] = $value;
1442
+					$this->entry[ $input_name ] = $value;
1443
+					$_POST[ $input_name ] = $value;
1444 1444
 
1445
-				    break;
1445
+					break;
1446 1446
 
1447 1447
 				case 'number':
1448
-				    // Fix "undefined index" issue at line 1286 in form_display.php
1449
-				    if( !isset( $_POST['input_'.$field->id ] ) ) {
1450
-				        $_POST['input_'.$field->id ] = NULL;
1451
-				    }
1452
-				    break;
1448
+					// Fix "undefined index" issue at line 1286 in form_display.php
1449
+					if( !isset( $_POST['input_'.$field->id ] ) ) {
1450
+						$_POST['input_'.$field->id ] = NULL;
1451
+					}
1452
+					break;
1453 1453
 			}
1454 1454
 
1455 1455
 		}
@@ -1534,43 +1534,43 @@  discard block
 block discarded – undo
1534 1534
 				case 'fileupload' :
1535 1535
 				case 'post_image':
1536 1536
 
1537
-				    // in case nothing is uploaded but there are already files saved
1538
-				    if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
1539
-				        $field->failed_validation = false;
1540
-				        unset( $field->validation_message );
1541
-				    }
1537
+					// in case nothing is uploaded but there are already files saved
1538
+					if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
1539
+						$field->failed_validation = false;
1540
+						unset( $field->validation_message );
1541
+					}
1542 1542
 
1543
-				    // validate if multi file upload reached max number of files [maxFiles] => 2
1544
-				    if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) {
1543
+					// validate if multi file upload reached max number of files [maxFiles] => 2
1544
+					if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) {
1545 1545
 
1546
-				        $input_name = 'input_' . $field->id;
1547
-				        //uploaded
1548
-				        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
1546
+						$input_name = 'input_' . $field->id;
1547
+						//uploaded
1548
+						$file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
1549 1549
 
1550
-				        //existent
1551
-				        $entry = $this->get_entry();
1552
-				        $value = NULL;
1553
-				        if( isset( $entry[ $field->id ] ) ) {
1554
-				            $value = json_decode( $entry[ $field->id ], true );
1555
-				        }
1550
+						//existent
1551
+						$entry = $this->get_entry();
1552
+						$value = NULL;
1553
+						if( isset( $entry[ $field->id ] ) ) {
1554
+							$value = json_decode( $entry[ $field->id ], true );
1555
+						}
1556 1556
 
1557
-				        // count uploaded files and existent entry files
1558
-				        $count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) +
1559
-						               ( is_array( $value ) ? count( $value ) : 0 );
1557
+						// count uploaded files and existent entry files
1558
+						$count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) +
1559
+									   ( is_array( $value ) ? count( $value ) : 0 );
1560 1560
 
1561
-				        if( $count_files > $field->maxFiles ) {
1562
-				            $field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
1563
-				            $field->failed_validation = 1;
1564
-				            $gv_valid = false;
1561
+						if( $count_files > $field->maxFiles ) {
1562
+							$field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
1563
+							$field->failed_validation = 1;
1564
+							$gv_valid = false;
1565 1565
 
1566
-				            // in case of error make sure the newest upload files are removed from the upload input
1567
-				            GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
1568
-				        }
1566
+							// in case of error make sure the newest upload files are removed from the upload input
1567
+							GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
1568
+						}
1569 1569
 
1570
-				    }
1570
+					}
1571 1571
 
1572 1572
 
1573
-				    break;
1573
+					break;
1574 1574
 
1575 1575
 			}
1576 1576
 
@@ -1581,47 +1581,47 @@  discard block
 block discarded – undo
1581 1581
 
1582 1582
 				switch ( $field_type ) {
1583 1583
 
1584
-				    // Captchas don't need to be re-entered.
1585
-				    case 'captcha':
1584
+					// Captchas don't need to be re-entered.
1585
+					case 'captcha':
1586 1586
 
1587
-				        // Post Image fields aren't editable, so we un-fail them.
1588
-				    case 'post_image':
1589
-				        $field->failed_validation = false;
1590
-				        unset( $field->validation_message );
1591
-				        break;
1587
+						// Post Image fields aren't editable, so we un-fail them.
1588
+					case 'post_image':
1589
+						$field->failed_validation = false;
1590
+						unset( $field->validation_message );
1591
+						break;
1592 1592
 
1593 1593
 				}
1594 1594
 
1595 1595
 				// You can't continue inside a switch, so we do it after.
1596 1596
 				if( empty( $field->failed_validation ) ) {
1597
-				    continue;
1597
+					continue;
1598 1598
 				}
1599 1599
 
1600 1600
 				// checks if the No Duplicates option is not validating entry against itself, since
1601 1601
 				// we're editing a stored entry, it would also assume it's a duplicate.
1602 1602
 				if( !empty( $field->noDuplicates ) ) {
1603 1603
 
1604
-				    $entry = $this->get_entry();
1604
+					$entry = $this->get_entry();
1605 1605
 
1606
-				    // If the value of the entry is the same as the stored value
1607
-				    // Then we can assume it's not a duplicate, it's the same.
1608
-				    if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
1609
-				        //if value submitted was not changed, then don't validate
1610
-				        $field->failed_validation = false;
1606
+					// If the value of the entry is the same as the stored value
1607
+					// Then we can assume it's not a duplicate, it's the same.
1608
+					if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
1609
+						//if value submitted was not changed, then don't validate
1610
+						$field->failed_validation = false;
1611 1611
 
1612
-				        unset( $field->validation_message );
1612
+						unset( $field->validation_message );
1613 1613
 
1614
-				        gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) );
1614
+						gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) );
1615 1615
 
1616
-				        continue;
1617
-				    }
1616
+						continue;
1617
+					}
1618 1618
 				}
1619 1619
 
1620 1620
 				// if here then probably we are facing the validation 'At least one field must be filled out'
1621 1621
 				if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
1622
-				    unset( $field->validation_message );
1623
-	                $field->validation_message = false;
1624
-				    continue;
1622
+					unset( $field->validation_message );
1623
+					$field->validation_message = false;
1624
+					continue;
1625 1625
 				}
1626 1626
 
1627 1627
 				$gv_valid = false;
@@ -1685,8 +1685,8 @@  discard block
 block discarded – undo
1685 1685
 		// Hide fields depending on admin settings
1686 1686
 		$fields = $this->filter_fields( $form['fields'], $edit_fields );
1687 1687
 
1688
-	    // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
1689
-	    $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
1688
+		// If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
1689
+		$fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
1690 1690
 
1691 1691
 		/**
1692 1692
 		 * @filter `gravityview/edit_entry/form_fields` Modify the fields displayed in Edit Entry form
@@ -1746,11 +1746,11 @@  discard block
 block discarded – undo
1746 1746
 		// The edit tab has been configured, so we loop through to configured settings
1747 1747
 		foreach ( $configured_fields as $configured_field ) {
1748 1748
 
1749
-	        /** @var GF_Field $field */
1750
-	        foreach ( $fields as $field ) {
1749
+			/** @var GF_Field $field */
1750
+			foreach ( $fields as $field ) {
1751 1751
 				if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
1752
-				    $edit_fields[] = $this->merge_field_properties( $field, $configured_field );
1753
-				    break;
1752
+					$edit_fields[] = $this->merge_field_properties( $field, $configured_field );
1753
+					break;
1754 1754
 				}
1755 1755
 
1756 1756
 			}
@@ -1806,28 +1806,28 @@  discard block
 block discarded – undo
1806 1806
 	 */
1807 1807
 	private function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) {
1808 1808
 
1809
-	    /**
1809
+		/**
1810 1810
 		 * @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
1811
-	     * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators.
1812
-	     * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions
1813
-	     * @since 1.9.1
1814
-	     * @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.
1815
-	     * @param array $form GF Form array
1816
-	     * @param int $view_id View ID
1817
-	     */
1818
-	    $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
1819
-
1820
-	    if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
1811
+		 * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators.
1812
+		 * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions
1813
+		 * @since 1.9.1
1814
+		 * @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.
1815
+		 * @param array $form GF Form array
1816
+		 * @param int $view_id View ID
1817
+		 */
1818
+		$use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
1819
+
1820
+		if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
1821 1821
 			foreach( $fields as $k => $field ) {
1822 1822
 				if( $field->adminOnly ) {
1823
-				    unset( $fields[ $k ] );
1823
+					unset( $fields[ $k ] );
1824 1824
 				}
1825 1825
 			}
1826 1826
 			return array_values( $fields );
1827 1827
 		}
1828 1828
 
1829
-	    foreach( $fields as &$field ) {
1830
-		    $field->adminOnly = false;
1829
+		foreach( $fields as &$field ) {
1830
+			$field->adminOnly = false;
1831 1831
 		}
1832 1832
 
1833 1833
 		return $fields;
@@ -1847,13 +1847,13 @@  discard block
 block discarded – undo
1847 1847
 	 */
1848 1848
 	private function unselect_default_values( $form ) {
1849 1849
 
1850
-	    foreach ( $form['fields'] as &$field ) {
1850
+		foreach ( $form['fields'] as &$field ) {
1851 1851
 
1852 1852
 			if ( empty( $field->choices ) ) {
1853
-                continue;
1853
+				continue;
1854 1854
 			}
1855 1855
 
1856
-            foreach ( $field->choices as &$choice ) {
1856
+			foreach ( $field->choices as &$choice ) {
1857 1857
 				if ( \GV\Utils::get( $choice, 'isSelected' ) ) {
1858 1858
 					$choice['isSelected'] = false;
1859 1859
 				}
@@ -1890,36 +1890,36 @@  discard block
 block discarded – undo
1890 1890
 
1891 1891
 			if( 'checkbox' === $field->type ) {
1892 1892
 				foreach ( $field->get_entry_inputs() as $key => $input ) {
1893
-				    $input_id = $input['id'];
1894
-				    $choice = $field->choices[ $key ];
1895
-				    $value = \GV\Utils::get( $this->entry, $input_id );
1896
-				    $match = RGFormsModel::choice_value_match( $field, $choice, $value );
1897
-				    if( $match ) {
1898
-				        $field->choices[ $key ]['isSelected'] = true;
1899
-				    }
1893
+					$input_id = $input['id'];
1894
+					$choice = $field->choices[ $key ];
1895
+					$value = \GV\Utils::get( $this->entry, $input_id );
1896
+					$match = RGFormsModel::choice_value_match( $field, $choice, $value );
1897
+					if( $match ) {
1898
+						$field->choices[ $key ]['isSelected'] = true;
1899
+					}
1900 1900
 				}
1901 1901
 			} else {
1902 1902
 
1903 1903
 				// We need to run through each field to set the default values
1904 1904
 				foreach ( $this->entry as $field_id => $field_value ) {
1905 1905
 
1906
-				    if( floatval( $field_id ) === floatval( $field->id ) ) {
1906
+					if( floatval( $field_id ) === floatval( $field->id ) ) {
1907 1907
 
1908
-				        if( 'list' === $field->type ) {
1909
-				            $list_rows = maybe_unserialize( $field_value );
1908
+						if( 'list' === $field->type ) {
1909
+							$list_rows = maybe_unserialize( $field_value );
1910 1910
 
1911
-				            $list_field_value = array();
1912
-				            foreach ( (array) $list_rows as $row ) {
1913
-				                foreach ( (array) $row as $column ) {
1914
-				                    $list_field_value[] = $column;
1915
-				                }
1916
-				            }
1911
+							$list_field_value = array();
1912
+							foreach ( (array) $list_rows as $row ) {
1913
+								foreach ( (array) $row as $column ) {
1914
+									$list_field_value[] = $column;
1915
+								}
1916
+							}
1917 1917
 
1918
-				            $field->defaultValue = serialize( $list_field_value );
1919
-				        } else {
1920
-				            $field->defaultValue = $field_value;
1921
-				        }
1922
-				    }
1918
+							$field->defaultValue = serialize( $list_field_value );
1919
+						} else {
1920
+							$field->defaultValue = $field_value;
1921
+						}
1922
+					}
1923 1923
 				}
1924 1924
 			}
1925 1925
 		}
@@ -1973,7 +1973,7 @@  discard block
 block discarded – undo
1973 1973
 			foreach ( $form['fields'] as &$field ) {
1974 1974
 				foreach ( $remove_conditions_rule as $_remove_conditions_r ) {
1975 1975
 
1976
-				    list( $rule_field_id, $rule_i ) = $_remove_conditions_r;
1976
+					list( $rule_field_id, $rule_i ) = $_remove_conditions_r;
1977 1977
 
1978 1978
 					if ( $field['id'] == $rule_field_id ) {
1979 1979
 						unset( $field->conditionalLogic['rules'][ $rule_i ] );
@@ -2024,7 +2024,7 @@  discard block
 block discarded – undo
2024 2024
 			return $has_conditional_logic;
2025 2025
 		}
2026 2026
 
2027
-	    /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */
2027
+		/** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */
2028 2028
 		return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form );
2029 2029
 	}
2030 2030
 
@@ -2091,14 +2091,14 @@  discard block
 block discarded – undo
2091 2091
 
2092 2092
 		if( $echo && $error !== true ) {
2093 2093
 
2094
-	        $error = esc_html( $error );
2094
+			$error = esc_html( $error );
2095 2095
 
2096
-	        /**
2097
-	         * @since 1.9
2098
-	         */
2099
-	        if ( ! empty( $this->entry ) ) {
2100
-		        $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;" ) );
2101
-	        }
2096
+			/**
2097
+			 * @since 1.9
2098
+			 */
2099
+			if ( ! empty( $this->entry ) ) {
2100
+				$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;" ) );
2101
+			}
2102 2102
 
2103 2103
 			echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
2104 2104
 		}
Please login to merge, or discard this patch.
includes/class-gravityview-change-entry-creator.php 1 patch
Indentation   +213 added lines, -213 removed lines patch added patch discarded remove patch
@@ -5,243 +5,243 @@
 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( 'view' === \GV\Utils::_POST( 'screen_mode' ) ) {
140
-    		return;
141
-	    }
142
-
143
-    	// If $_GET['screen_mode'] is set to edit, set $_POST value
144
-        if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
145
-            $_POST["screen_mode"] = 'edit';
146
-        }
147
-
148
-    }
149
-
150
-    /**
151
-     * When the entry creator is changed, add a note to the entry
152
-     * @param  array $form   GF entry array
153
-     * @param  int $entry_id Entry ID
154
-     * @return void
155
-     */
156
-    function update_entry_creator($form, $entry_id) {
157
-            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( 'view' === \GV\Utils::_POST( 'screen_mode' ) ) {
140
+			return;
141
+		}
142
+
143
+		// If $_GET['screen_mode'] is set to edit, set $_POST value
144
+		if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
145
+			$_POST["screen_mode"] = 'edit';
146
+		}
147
+
148
+	}
149
+
150
+	/**
151
+	 * When the entry creator is changed, add a note to the entry
152
+	 * @param  array $form   GF entry array
153
+	 * @param  int $entry_id Entry ID
154
+	 * @return void
155
+	 */
156
+	function update_entry_creator($form, $entry_id) {
157
+			global $current_user;
158 158
 
159
-        // Update the entry
160
-        $created_by = absint( \GV\Utils::_POST( 'created_by') );
159
+		// Update the entry
160
+		$created_by = absint( \GV\Utils::_POST( 'created_by') );
161 161
 
162
-        RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
162
+		RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
163 163
 
164
-        // If the creator has changed, let's add a note about who it used to be.
165
-        $originally_created_by = \GV\Utils::_POST( 'originally_created_by' );
164
+		// If the creator has changed, let's add a note about who it used to be.
165
+		$originally_created_by = \GV\Utils::_POST( 'originally_created_by' );
166 166
 
167
-        // If there's no owner and there didn't used to be, keep going
168
-        if( empty( $originally_created_by ) && empty( $created_by ) ) {
169
-            return;
170
-        }
167
+		// If there's no owner and there didn't used to be, keep going
168
+		if( empty( $originally_created_by ) && empty( $created_by ) ) {
169
+			return;
170
+		}
171 171
 
172
-        // If the values have changed
173
-        if( absint( $originally_created_by ) !== absint( $created_by ) ) {
172
+		// If the values have changed
173
+		if( absint( $originally_created_by ) !== absint( $created_by ) ) {
174 174
 
175
-            $user_data = get_userdata($current_user->ID);
175
+			$user_data = get_userdata($current_user->ID);
176 176
 
177
-            $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
177
+			$user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
178 178
 
179
-            $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');
179
+			$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');
180 180
 
181
-            if( !empty( $originally_created_by ) ) {
182
-                $originally_created_by_user_data = get_userdata($originally_created_by);
183
-                $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
184
-            }
181
+			if( !empty( $originally_created_by ) ) {
182
+				$originally_created_by_user_data = get_userdata($originally_created_by);
183
+				$original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
184
+			}
185 185
 
186
-            if( !empty( $created_by ) ) {
187
-                $created_by_user_data =  get_userdata($created_by);
188
-                $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
189
-            }
186
+			if( !empty( $created_by ) ) {
187
+				$created_by_user_data =  get_userdata($created_by);
188
+				$created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
189
+			}
190 190
 
191
-            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' );
192
-        }
191
+			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' );
192
+		}
193 193
 
194
-    }
194
+	}
195 195
 
196
-    /**
197
-     * Output the select to change the entry creator
198
-     * @param int $form_id GF Form ID
199
-     * @param array $entry    GF entry array
200
-     * @return void
201
-     */
202
-    function add_select($form_id, $entry ) {
196
+	/**
197
+	 * Output the select to change the entry creator
198
+	 * @param int $form_id GF Form ID
199
+	 * @param array $entry    GF entry array
200
+	 * @return void
201
+	 */
202
+	function add_select($form_id, $entry ) {
203 203
 
204
-        if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
205
-            return;
206
-        }
204
+		if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
205
+			return;
206
+		}
207 207
 
208
-        $created_by_id = \GV\Utils::get( $entry, 'created_by' );
208
+		$created_by_id = \GV\Utils::get( $entry, 'created_by' );
209 209
 
210
-        $users = GVCommon::get_users( 'change_entry_creator' );
210
+		$users = GVCommon::get_users( 'change_entry_creator' );
211 211
 
212
-        $is_created_by_in_users = wp_list_filter( $users, array( 'ID' => $created_by_id ) );
212
+		$is_created_by_in_users = wp_list_filter( $users, array( 'ID' => $created_by_id ) );
213 213
 
214
-        // Make sure that the entry creator is included in the users list. If not, add them.
215
-        if ( ! empty( $created_by_id ) && empty( $is_created_by_in_users ) ) {
214
+		// Make sure that the entry creator is included in the users list. If not, add them.
215
+		if ( ! empty( $created_by_id ) && empty( $is_created_by_in_users ) ) {
216 216
 
217
-	        if ( $created_by_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $created_by_id ) ) ) {
218
-	            $users = array_merge( $users, $created_by_user );
219
-	        }
220
-	    }
217
+			if ( $created_by_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $created_by_id ) ) ) {
218
+				$users = array_merge( $users, $created_by_user );
219
+			}
220
+		}
221 221
 
222
-        $output = '<label for="change_created_by">';
223
-        $output .= esc_html__('Change Entry Creator:', 'gravityview');
224
-        $output .= '</label>';
222
+		$output = '<label for="change_created_by">';
223
+		$output .= esc_html__('Change Entry Creator:', 'gravityview');
224
+		$output .= '</label>';
225 225
 
226
-	    // If there are users who are not being shown, show a warning.
227
-	    // TODO: Use AJAX instead of <select>
228
-	    $count_users = count_users();
229
-	    if( sizeof( $users ) < $count_users['total_users'] ) {
230
-		    $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>';
231
-	    }
226
+		// If there are users who are not being shown, show a warning.
227
+		// TODO: Use AJAX instead of <select>
228
+		$count_users = count_users();
229
+		if( sizeof( $users ) < $count_users['total_users'] ) {
230
+			$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>';
231
+		}
232 232
 
233
-	    $output .= '<select name="created_by" id="change_created_by" class="widefat">';
234
-        $output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
235
-        foreach($users as $user) {
236
-            $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
237
-        }
238
-        $output .= '</select>';
239
-        $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
233
+		$output .= '<select name="created_by" id="change_created_by" class="widefat">';
234
+		$output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
235
+		foreach($users as $user) {
236
+			$output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
237
+		}
238
+		$output .= '</select>';
239
+		$output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
240 240
 
241
-	    unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users );
241
+		unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users );
242 242
 
243
-        echo $output;
244
-    }
243
+		echo $output;
244
+	}
245 245
 
246 246
 }
247 247
 
Please login to merge, or discard this patch.
includes/class-admin.php 1 patch
Indentation   +3 added lines, -4 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	 * @return void
93 93
 	 */
94 94
 	public static function connected_form_warning( $form_id = 0 ) {
95
-        global $pagenow;
95
+		global $pagenow;
96 96
 
97 97
 		if ( empty( $form_id ) || $pagenow === 'post-new.php' ) {
98 98
 			return;
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 			<?php
120 120
 		}
121 121
 
122
-        remove_action( 'gravityview/metaboxes/data-source/before', array( 'GravityView_Admin', 'connected_form_warning' ) );
122
+		remove_action( 'gravityview/metaboxes/data-source/before', array( 'GravityView_Admin', 'connected_form_warning' ) );
123 123
 	}
124 124
 
125 125
 	/**
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
242 242
 			8  => __( 'View submitted.', 'gravityview' ),
243 243
 			9  => sprintf(
244
-		        /* translators: Date and time the View is scheduled to be published */
244
+				/* translators: Date and time the View is scheduled to be published */
245 245
 				__( 'View scheduled for: %1$s.', 'gravityview' ),
246 246
 				// translators: Publish box date format, see http://php.net/date
247 247
 				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
@@ -298,7 +298,6 @@  discard block
 block discarded – undo
298 298
 	 *
299 299
 	 * @deprecated since 1.12
300 300
 	 * @see GravityView_Compatibility::get_plugin_status()
301
-
302 301
 	 * @return boolean|string True: plugin is active; False: plugin file doesn't exist at path; 'inactive' it's inactive
303 302
 	 */
304 303
 	static function get_plugin_status( $location = '' ) {
Please login to merge, or discard this patch.