Completed
Push — develop ( 23360f...05d9e5 )
by Gennady
33:43 queued 08:52
created
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
 					$this->the_field( $field, $entry );
221 221
 				}
222 222
 
@@ -227,13 +227,13 @@  discard block
 block discarded – undo
227 227
 				 */
228 228
 				do_action( 'gravityview/template/table/cells/after', $context );
229 229
 
230
-                /**
231
-                 * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
232
-                 * @since 1.0.7
230
+				/**
231
+				 * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
232
+				 * @since 1.0.7
233 233
 				 * @param \GravityView_View $this Current GravityView_View object
234 234
 				 * @deprecated Use `gravityview/template/table/cells/after`
235
-                 */
236
-                do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() );
235
+				 */
236
+				do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() );
237 237
 
238 238
 				?>
239 239
 			</tr>
@@ -271,9 +271,9 @@  discard block
 block discarded – undo
271 271
 			'value' => $value,
272 272
 			'hide_empty' => false,
273 273
 			'zone_id' => 'directory_table-columns',
274
-            'label' => self::get_field_column_label( $field, $context ),
274
+			'label' => self::get_field_column_label( $field, $context ),
275 275
 			'markup' => '<td id="{{ field_id }}" class="{{ class }}" data-label="{{label_value:data-label}}">{{ value }}</td>',
276
-            'form' => $form,
276
+			'form' => $form,
277 277
 		);
278 278
 
279 279
 		/** Output. */
@@ -298,11 +298,11 @@  discard block
 block discarded – undo
298 298
 		do_action( 'gravityview/template/table/body/before', $context );
299 299
 
300 300
 		/**
301
-		* @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
302
-		* @deprecated Use `gravityview/template/table/body/before`
303
-		* @since 1.0.7
304
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
305
-		*/
301
+		 * @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
302
+		 * @deprecated Use `gravityview/template/table/body/before`
303
+		 * @since 1.0.7
304
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
305
+		 */
306 306
 		do_action( 'gravityview_table_body_before', \GravityView_View::getInstance() /** ugh! */ );
307 307
 	}
308 308
 
@@ -324,11 +324,11 @@  discard block
 block discarded – undo
324 324
 		do_action( 'gravityview/template/table/body/after', $context );
325 325
 
326 326
 		/**
327
-		* @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
328
-		* @deprecated Use `gravityview/template/table/body/after`
329
-		* @since 1.0.7
330
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
331
-		*/
327
+		 * @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
328
+		 * @deprecated Use `gravityview/template/table/body/after`
329
+		 * @since 1.0.7
330
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
331
+		 */
332 332
 		do_action( 'gravityview_table_body_after', \GravityView_View::getInstance() /** ugh! */ );
333 333
 	}
334 334
 
Please login to merge, or discard this patch.
future/includes/class-gv-request.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -128,10 +128,10 @@
 block discarded – undo
128 128
 	 */
129 129
 	public function is_edit_entry( $form_id = 0 ) {
130 130
 		/**
131
-		* @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n
132
-		* The Edit Entry functionality overrides this value.
133
-		* @param boolean $is_edit_entry
134
-		*/
131
+		 * @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n
132
+		 * The Edit Entry functionality overrides this value.
133
+		 * @param boolean $is_edit_entry
134
+		 */
135 135
 		if ( ( $entry = $this->is_entry( $form_id ) ) && apply_filters( 'gravityview_is_edit_entry', false ) ) {
136 136
 			return $entry;
137 137
 		}
Please login to merge, or discard this patch.
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/extensions/edit-entry/class-edit-entry-render.php 1 patch
Indentation   +287 added lines, -287 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();
@@ -333,8 +333,8 @@  discard block
 block discarded – undo
333 333
 
334 334
 			GFFormsModel::save_lead( $form, $this->entry );
335 335
 
336
-	        // Delete the values for hidden inputs
337
-	        $this->unset_hidden_field_values();
336
+			// Delete the values for hidden inputs
337
+			$this->unset_hidden_field_values();
338 338
 			
339 339
 			$this->entry['date_created'] = $date_created;
340 340
 
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
 			// Perform actions normally performed after updating a lead
348 348
 			$this->after_update();
349 349
 
350
-	        /**
350
+			/**
351 351
 			 * Must be AFTER after_update()!
352 352
 			 * @see https://github.com/gravityview/GravityView/issues/764
353 353
 			 */
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
 
356 356
 			/**
357 357
 			 * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry
358
-             * @since 2.1 Added $gv_data parameter
358
+			 * @since 2.1 Added $gv_data parameter
359 359
 			 * @param array $form Gravity Forms form array
360 360
 			 * @param string $entry_id Numeric ID of the entry that was updated
361 361
 			 * @param GravityView_Edit_Entry_Render $this This object
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
 	 * @return void
380 380
 	 */
381 381
 	private function unset_hidden_field_values() {
382
-	    global $wpdb;
382
+		global $wpdb;
383 383
 
384 384
 		/**
385 385
 		 * @filter `gravityview/edit_entry/unset_hidden_field_values` Whether to delete values of fields hidden by conditional logic
@@ -401,27 +401,27 @@  discard block
 block discarded – undo
401 401
 			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) );
402 402
 		}
403 403
 
404
-	    foreach ( $this->entry as $input_id => $field_value ) {
404
+		foreach ( $this->entry as $input_id => $field_value ) {
405 405
 
406
-		    $field = RGFormsModel::get_field( $this->form, $input_id );
406
+			$field = RGFormsModel::get_field( $this->form, $input_id );
407 407
 
408
-		    // Reset fields that are hidden
409
-		    // Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic
410
-		    if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) {
408
+			// Reset fields that are hidden
409
+			// Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic
410
+			if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) {
411 411
 
412
-		        // List fields are stored as empty arrays when empty
413
-			    $empty_value = $this->is_field_json_encoded( $field ) ? '[]' : '';
412
+				// List fields are stored as empty arrays when empty
413
+				$empty_value = $this->is_field_json_encoded( $field ) ? '[]' : '';
414 414
 
415
-			    $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id );
415
+				$lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id );
416 416
 
417
-			    GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value );
417
+				GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value );
418 418
 
419
-			    // Prevent the $_POST values of hidden fields from being used as default values when rendering the form
419
+				// Prevent the $_POST values of hidden fields from being used as default values when rendering the form
420 420
 				// after submission
421
-			    $post_input_id = 'input_' . str_replace( '.', '_', $input_id );
422
-			    $_POST[ $post_input_id ] = '';
423
-		    }
424
-	    }
421
+				$post_input_id = 'input_' . str_replace( '.', '_', $input_id );
422
+				$_POST[ $post_input_id ] = '';
423
+			}
424
+		}
425 425
 	}
426 426
 
427 427
 	/**
@@ -515,7 +515,7 @@  discard block
 block discarded – undo
515 515
 
516 516
 		$form = $this->form;
517 517
 
518
-	    /** @var GF_Field $field */
518
+		/** @var GF_Field $field */
519 519
 		foreach( $form['fields'] as $k => &$field ) {
520 520
 
521 521
 			/**
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
531 531
 
532 532
 			if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
533 533
 				foreach( $field->inputs as $key => $input ) {
534
-				    $field->inputs[ $key ][ 'id' ] = (string)$input['id'];
534
+					$field->inputs[ $key ][ 'id' ] = (string)$input['id'];
535 535
 				}
536 536
 			}
537 537
 		}
@@ -554,13 +554,13 @@  discard block
 block discarded – undo
554 554
 			foreach ( $this->fields_with_calculation as $calc_field ) {
555 555
 				$inputs = $calc_field->get_entry_inputs();
556 556
 				if ( is_array( $inputs ) ) {
557
-				    foreach ( $inputs as $input ) {
558
-				        $input_name = 'input_' . str_replace( '.', '_', $input['id'] );
559
-				        $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry );
560
-				    }
557
+					foreach ( $inputs as $input ) {
558
+						$input_name = 'input_' . str_replace( '.', '_', $input['id'] );
559
+						$entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry );
560
+					}
561 561
 				} else {
562
-				    $input_name = 'input_' . str_replace( '.', '_', $calc_field->id);
563
-				    $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry );
562
+					$input_name = 'input_' . str_replace( '.', '_', $calc_field->id);
563
+					$entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry );
564 564
 				}
565 565
 			}
566 566
 		}
@@ -623,7 +623,7 @@  discard block
 block discarded – undo
623 623
 			$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] );
624 624
 
625 625
 			$ary = ! empty( $value ) ? explode( '|:|', $value ) : array();
626
-	        $ary = stripslashes_deep( $ary );
626
+			$ary = stripslashes_deep( $ary );
627 627
 			$img_url = \GV\Utils::get( $ary, 0 );
628 628
 
629 629
 			$img_title       = count( $ary ) > 1 ? $ary[1] : '';
@@ -696,7 +696,7 @@  discard block
 block discarded – undo
696 696
 	private function maybe_update_post_fields( $form ) {
697 697
 
698 698
 		if( empty( $this->entry['post_id'] ) ) {
699
-	        gravityview()->log->debug( 'This entry has no post fields. Continuing...' );
699
+			gravityview()->log->debug( 'This entry has no post fields. Continuing...' );
700 700
 			return;
701 701
 		}
702 702
 
@@ -731,51 +731,51 @@  discard block
 block discarded – undo
731 731
 
732 732
 				switch( $field->type ) {
733 733
 
734
-				    case 'post_title':
735
-				        $post_title = $value;
736
-				        if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) {
737
-				            $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
738
-				        }
739
-				        $updated_post->post_title = $post_title;
740
-				        $updated_post->post_name  = $post_title;
741
-				        unset( $post_title );
742
-				        break;
743
-
744
-				    case 'post_content':
745
-				        $post_content = $value;
746
-				        if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) {
747
-				            $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
748
-				        }
749
-				        $updated_post->post_content = $post_content;
750
-				        unset( $post_content );
751
-				        break;
752
-				    case 'post_excerpt':
753
-				        $updated_post->post_excerpt = $value;
754
-				        break;
755
-				    case 'post_tags':
756
-				        wp_set_post_tags( $post_id, $value, false );
757
-				        break;
758
-				    case 'post_category':
759
-				        break;
760
-				    case 'post_custom_field':
734
+					case 'post_title':
735
+						$post_title = $value;
736
+						if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) {
737
+							$post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
738
+						}
739
+						$updated_post->post_title = $post_title;
740
+						$updated_post->post_name  = $post_title;
741
+						unset( $post_title );
742
+						break;
743
+
744
+					case 'post_content':
745
+						$post_content = $value;
746
+						if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) {
747
+							$post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
748
+						}
749
+						$updated_post->post_content = $post_content;
750
+						unset( $post_content );
751
+						break;
752
+					case 'post_excerpt':
753
+						$updated_post->post_excerpt = $value;
754
+						break;
755
+					case 'post_tags':
756
+						wp_set_post_tags( $post_id, $value, false );
757
+						break;
758
+					case 'post_category':
759
+						break;
760
+					case 'post_custom_field':
761 761
 						if ( is_array( $value ) && ( floatval( $field_id ) !== floatval( $field->id ) ) ) {
762 762
 							$value = $value[ $field_id ];
763 763
 						}
764 764
 
765
-				        if( ! empty( $field->customFieldTemplateEnabled ) ) {
766
-				            $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
767
-				        }
765
+						if( ! empty( $field->customFieldTemplateEnabled ) ) {
766
+							$value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
767
+						}
768 768
 
769
-	                    if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) {
770
-		                    $value = wp_json_encode( $value );
771
-	                    }
769
+						if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) {
770
+							$value = wp_json_encode( $value );
771
+						}
772 772
 
773
-				        update_post_meta( $post_id, $field->postCustomFieldName, $value );
774
-				        break;
773
+						update_post_meta( $post_id, $field->postCustomFieldName, $value );
774
+						break;
775 775
 
776
-				    case 'post_image':
777
-				        $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id );
778
-				        break;
776
+					case 'post_image':
777
+						$value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id );
778
+						break;
779 779
 
780 780
 				}
781 781
 
@@ -820,20 +820,20 @@  discard block
 block discarded – undo
820 820
 	 */
821 821
 	private function is_field_json_encoded( $field ) {
822 822
 
823
-	    $json_encoded = false;
823
+		$json_encoded = false;
824 824
 
825 825
 		$input_type = RGFormsModel::get_input_type( $field );
826 826
 
827
-	    // Only certain custom field types are supported
828
-	    switch( $input_type ) {
829
-		    case 'fileupload':
830
-		    case 'list':
831
-		    case 'multiselect':
832
-			    $json_encoded = true;
833
-			    break;
834
-	    }
827
+		// Only certain custom field types are supported
828
+		switch( $input_type ) {
829
+			case 'fileupload':
830
+			case 'list':
831
+			case 'multiselect':
832
+				$json_encoded = true;
833
+				break;
834
+		}
835 835
 
836
-	    return $json_encoded;
836
+		return $json_encoded;
837 837
 	}
838 838
 
839 839
 	/**
@@ -923,14 +923,14 @@  discard block
 block discarded – undo
923 923
 			?><h2 class="gv-edit-entry-title">
924 924
 				<span><?php
925 925
 
926
-				    /**
927
-				     * @filter `gravityview_edit_entry_title` Modify the edit entry title
928
-				     * @param string $edit_entry_title Modify the "Edit Entry" title
929
-				     * @param GravityView_Edit_Entry_Render $this This object
930
-				     */
931
-				    $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
926
+					/**
927
+					 * @filter `gravityview_edit_entry_title` Modify the edit entry title
928
+					 * @param string $edit_entry_title Modify the "Edit Entry" title
929
+					 * @param GravityView_Edit_Entry_Render $this This object
930
+					 */
931
+					$edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
932 932
 
933
-				    echo esc_attr( $edit_entry_title );
933
+					echo esc_attr( $edit_entry_title );
934 934
 			?></span>
935 935
 			</h2>
936 936
 
@@ -1039,7 +1039,7 @@  discard block
 block discarded – undo
1039 1039
 
1040 1040
 		ob_get_clean();
1041 1041
 
1042
-	    remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
1042
+		remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
1043 1043
 		remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
1044 1044
 		remove_filter( 'gform_disable_view_counter', '__return_true' );
1045 1045
 		remove_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5 );
@@ -1093,7 +1093,7 @@  discard block
 block discarded – undo
1093 1093
 
1094 1094
 		// for now we don't support Save and Continue feature.
1095 1095
 		if( ! self::$supports_save_and_continue ) {
1096
-	        unset( $form['save'] );
1096
+			unset( $form['save'] );
1097 1097
 		}
1098 1098
 
1099 1099
 		$form = $this->unselect_default_values( $form );
@@ -1120,30 +1120,30 @@  discard block
 block discarded – undo
1120 1120
 			return $field_content;
1121 1121
 		}
1122 1122
 
1123
-        $message = null;
1123
+		$message = null;
1124 1124
 
1125
-        // First, make sure they have the capability to edit the post.
1126
-        if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
1125
+		// First, make sure they have the capability to edit the post.
1126
+		if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
1127 1127
 
1128
-            /**
1129
-             * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
1130
-             * @param string $message The existing "You don't have permission..." text
1131
-             */
1132
-            $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
1128
+			/**
1129
+			 * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
1130
+			 * @param string $message The existing "You don't have permission..." text
1131
+			 */
1132
+			$message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
1133 1133
 
1134
-        } elseif( null === get_post( $this->entry['post_id'] ) ) {
1135
-            /**
1136
-             * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
1137
-             * @param string $message The existing "This field is not editable; the post no longer exists." text
1138
-             */
1139
-            $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
1140
-        }
1134
+		} elseif( null === get_post( $this->entry['post_id'] ) ) {
1135
+			/**
1136
+			 * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
1137
+			 * @param string $message The existing "This field is not editable; the post no longer exists." text
1138
+			 */
1139
+			$message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
1140
+		}
1141 1141
 
1142
-        if( $message ) {
1143
-            $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
1144
-        }
1142
+		if( $message ) {
1143
+			$field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
1144
+		}
1145 1145
 
1146
-        return $field_content;
1146
+		return $field_content;
1147 1147
 	}
1148 1148
 
1149 1149
 	/**
@@ -1171,7 +1171,7 @@  discard block
 block discarded – undo
1171 1171
 			|| ! empty( $field_content )
1172 1172
 			|| in_array( $field->type, array( 'honeypot' ) )
1173 1173
 		) {
1174
-	        return $field_content;
1174
+			return $field_content;
1175 1175
 		}
1176 1176
 
1177 1177
 		// SET SOME FIELD DEFAULTS TO PREVENT ISSUES
@@ -1179,24 +1179,24 @@  discard block
 block discarded – undo
1179 1179
 
1180 1180
 		$field_value = $this->get_field_value( $field );
1181 1181
 
1182
-	    // Prevent any PHP warnings, like undefined index
1183
-	    ob_start();
1182
+		// Prevent any PHP warnings, like undefined index
1183
+		ob_start();
1184 1184
 
1185
-	    $return = null;
1185
+		$return = null;
1186 1186
 
1187 1187
 		/** @var GravityView_Field $gv_field */
1188 1188
 		if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
1189 1189
 			$return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
1190 1190
 		} else {
1191
-	        $return = $field->get_field_input( $this->form, $field_value, $this->entry );
1192
-	    }
1191
+			$return = $field->get_field_input( $this->form, $field_value, $this->entry );
1192
+		}
1193 1193
 
1194
-	    // If there was output, it's an error
1195
-	    $warnings = ob_get_clean();
1194
+		// If there was output, it's an error
1195
+		$warnings = ob_get_clean();
1196 1196
 
1197
-	    if( !empty( $warnings ) ) {
1198
-		    gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) );
1199
-	    }
1197
+		if( !empty( $warnings ) ) {
1198
+			gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) );
1199
+		}
1200 1200
 
1201 1201
 		return $return;
1202 1202
 	}
@@ -1231,8 +1231,8 @@  discard block
 block discarded – undo
1231 1231
 				$input_id = strval( $input['id'] );
1232 1232
 				
1233 1233
 				if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) {
1234
-				    $field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
1235
-				    $allow_pre_populated = false;
1234
+					$field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
1235
+					$allow_pre_populated = false;
1236 1236
 				}
1237 1237
 
1238 1238
 			}
@@ -1256,7 +1256,7 @@  discard block
 block discarded – undo
1256 1256
 			if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) {
1257 1257
 				$categories = array();
1258 1258
 				foreach ( explode( ',', $field_value ) as $cat_string ) {
1259
-				    $categories[] = GFCommon::format_post_category( $cat_string, true );
1259
+					$categories[] = GFCommon::format_post_category( $cat_string, true );
1260 1260
 				}
1261 1261
 				$field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
1262 1262
 			}
@@ -1266,25 +1266,25 @@  discard block
 block discarded – undo
1266 1266
 		// if value is empty get the default value if defined
1267 1267
 		$field_value = $field->get_value_default_if_empty( $field_value );
1268 1268
 
1269
-	    /**
1270
-	     * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
1271
-	     * @since 1.11
1272
-	     * @since 1.20 Added third param
1273
-	     * @param mixed $field_value field value used to populate the input
1274
-	     * @param object $field Gravity Forms field object ( Class GF_Field )
1275
-	     * @param GravityView_Edit_Entry_Render $this Current object
1276
-	     */
1277
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this );
1278
-
1279
-	    /**
1280
-	     * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type
1281
-	     * @since 1.17
1282
-	     * @since 1.20 Added third param
1283
-	     * @param mixed $field_value field value used to populate the input
1284
-	     * @param GF_Field $field Gravity Forms field object
1285
-	     * @param GravityView_Edit_Entry_Render $this Current object
1286
-	     */
1287
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
1269
+		/**
1270
+		 * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
1271
+		 * @since 1.11
1272
+		 * @since 1.20 Added third param
1273
+		 * @param mixed $field_value field value used to populate the input
1274
+		 * @param object $field Gravity Forms field object ( Class GF_Field )
1275
+		 * @param GravityView_Edit_Entry_Render $this Current object
1276
+		 */
1277
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this );
1278
+
1279
+		/**
1280
+		 * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type
1281
+		 * @since 1.17
1282
+		 * @since 1.20 Added third param
1283
+		 * @param mixed $field_value field value used to populate the input
1284
+		 * @param GF_Field $field Gravity Forms field object
1285
+		 * @param GravityView_Edit_Entry_Render $this Current object
1286
+		 */
1287
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
1288 1288
 
1289 1289
 		return $field_value;
1290 1290
 	}
@@ -1311,7 +1311,7 @@  discard block
 block discarded – undo
1311 1311
 			// This is because we're doing admin form pretending to be front-end, so Gravity Forms
1312 1312
 			// expects certain field array items to be set.
1313 1313
 			foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) {
1314
-	            $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
1314
+				$field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
1315 1315
 			}
1316 1316
 
1317 1317
 			switch( RGFormsModel::get_input_type( $field ) ) {
@@ -1325,61 +1325,61 @@  discard block
 block discarded – undo
1325 1325
 				 */
1326 1326
 				case 'fileupload':
1327 1327
 
1328
-				    // Set the previous value
1329
-				    $entry = $this->get_entry();
1328
+					// Set the previous value
1329
+					$entry = $this->get_entry();
1330 1330
 
1331
-				    $input_name = 'input_'.$field->id;
1332
-				    $form_id = $form['id'];
1331
+					$input_name = 'input_'.$field->id;
1332
+					$form_id = $form['id'];
1333 1333
 
1334
-				    $value = NULL;
1334
+					$value = NULL;
1335 1335
 
1336
-				    // Use the previous entry value as the default.
1337
-				    if( isset( $entry[ $field->id ] ) ) {
1338
-				        $value = $entry[ $field->id ];
1339
-				    }
1336
+					// Use the previous entry value as the default.
1337
+					if( isset( $entry[ $field->id ] ) ) {
1338
+						$value = $entry[ $field->id ];
1339
+					}
1340 1340
 
1341
-				    // If this is a single upload file
1342
-				    if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
1343
-				        $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
1344
-				        $value = $file_path['url'];
1341
+					// If this is a single upload file
1342
+					if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
1343
+						$file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
1344
+						$value = $file_path['url'];
1345 1345
 
1346
-				    } else {
1346
+					} else {
1347 1347
 
1348
-				        // Fix PHP warning on line 1498 of form_display.php for post_image fields
1349
-				        // Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
1350
-				        $_FILES[ $input_name ] = array('name' => '', 'size' => '' );
1348
+						// Fix PHP warning on line 1498 of form_display.php for post_image fields
1349
+						// Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
1350
+						$_FILES[ $input_name ] = array('name' => '', 'size' => '' );
1351 1351
 
1352
-				    }
1352
+					}
1353 1353
 
1354
-				    if ( \GV\Utils::get( $field, "multipleFiles" ) ) {
1354
+					if ( \GV\Utils::get( $field, "multipleFiles" ) ) {
1355 1355
 
1356
-				        // If there are fresh uploads, process and merge them.
1357
-				        // Otherwise, use the passed values, which should be json-encoded array of URLs
1358
-				        if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
1359
-				            $value = empty( $value ) ? '[]' : $value;
1360
-				            $value = stripslashes_deep( $value );
1361
-				            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
1362
-				        }
1356
+						// If there are fresh uploads, process and merge them.
1357
+						// Otherwise, use the passed values, which should be json-encoded array of URLs
1358
+						if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
1359
+							$value = empty( $value ) ? '[]' : $value;
1360
+							$value = stripslashes_deep( $value );
1361
+							$value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
1362
+						}
1363 1363
 
1364
-				    } else {
1364
+					} else {
1365 1365
 
1366
-				        // A file already exists when editing an entry
1367
-				        // We set this to solve issue when file upload fields are required.
1368
-				        GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
1366
+						// A file already exists when editing an entry
1367
+						// We set this to solve issue when file upload fields are required.
1368
+						GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
1369 1369
 
1370
-				    }
1370
+					}
1371 1371
 
1372
-				    $this->entry[ $input_name ] = $value;
1373
-				    $_POST[ $input_name ] = $value;
1372
+					$this->entry[ $input_name ] = $value;
1373
+					$_POST[ $input_name ] = $value;
1374 1374
 
1375
-				    break;
1375
+					break;
1376 1376
 
1377 1377
 				case 'number':
1378
-				    // Fix "undefined index" issue at line 1286 in form_display.php
1379
-				    if( !isset( $_POST['input_'.$field->id ] ) ) {
1380
-				        $_POST['input_'.$field->id ] = NULL;
1381
-				    }
1382
-				    break;
1378
+					// Fix "undefined index" issue at line 1286 in form_display.php
1379
+					if( !isset( $_POST['input_'.$field->id ] ) ) {
1380
+						$_POST['input_'.$field->id ] = NULL;
1381
+					}
1382
+					break;
1383 1383
 			}
1384 1384
 
1385 1385
 		}
@@ -1464,42 +1464,42 @@  discard block
 block discarded – undo
1464 1464
 				case 'fileupload' :
1465 1465
 				case 'post_image':
1466 1466
 
1467
-				    // in case nothing is uploaded but there are already files saved
1468
-				    if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
1469
-				        $field->failed_validation = false;
1470
-				        unset( $field->validation_message );
1471
-				    }
1467
+					// in case nothing is uploaded but there are already files saved
1468
+					if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
1469
+						$field->failed_validation = false;
1470
+						unset( $field->validation_message );
1471
+					}
1472 1472
 
1473
-				    // validate if multi file upload reached max number of files [maxFiles] => 2
1474
-				    if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) {
1473
+					// validate if multi file upload reached max number of files [maxFiles] => 2
1474
+					if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) {
1475 1475
 
1476
-				        $input_name = 'input_' . $field->id;
1477
-				        //uploaded
1478
-				        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
1476
+						$input_name = 'input_' . $field->id;
1477
+						//uploaded
1478
+						$file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
1479 1479
 
1480
-				        //existent
1481
-				        $entry = $this->get_entry();
1482
-				        $value = NULL;
1483
-				        if( isset( $entry[ $field->id ] ) ) {
1484
-				            $value = json_decode( $entry[ $field->id ], true );
1485
-				        }
1480
+						//existent
1481
+						$entry = $this->get_entry();
1482
+						$value = NULL;
1483
+						if( isset( $entry[ $field->id ] ) ) {
1484
+							$value = json_decode( $entry[ $field->id ], true );
1485
+						}
1486 1486
 
1487
-				        // count uploaded files and existent entry files
1488
-				        $count_files = count( $file_names ) + count( $value );
1487
+						// count uploaded files and existent entry files
1488
+						$count_files = count( $file_names ) + count( $value );
1489 1489
 
1490
-				        if( $count_files > $field->maxFiles ) {
1491
-				            $field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
1492
-				            $field->failed_validation = 1;
1493
-				            $gv_valid = false;
1490
+						if( $count_files > $field->maxFiles ) {
1491
+							$field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
1492
+							$field->failed_validation = 1;
1493
+							$gv_valid = false;
1494 1494
 
1495
-				            // in case of error make sure the newest upload files are removed from the upload input
1496
-				            GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
1497
-				        }
1495
+							// in case of error make sure the newest upload files are removed from the upload input
1496
+							GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
1497
+						}
1498 1498
 
1499
-				    }
1499
+					}
1500 1500
 
1501 1501
 
1502
-				    break;
1502
+					break;
1503 1503
 
1504 1504
 			}
1505 1505
 
@@ -1510,47 +1510,47 @@  discard block
 block discarded – undo
1510 1510
 
1511 1511
 				switch ( $field_type ) {
1512 1512
 
1513
-				    // Captchas don't need to be re-entered.
1514
-				    case 'captcha':
1513
+					// Captchas don't need to be re-entered.
1514
+					case 'captcha':
1515 1515
 
1516
-				        // Post Image fields aren't editable, so we un-fail them.
1517
-				    case 'post_image':
1518
-				        $field->failed_validation = false;
1519
-				        unset( $field->validation_message );
1520
-				        break;
1516
+						// Post Image fields aren't editable, so we un-fail them.
1517
+					case 'post_image':
1518
+						$field->failed_validation = false;
1519
+						unset( $field->validation_message );
1520
+						break;
1521 1521
 
1522 1522
 				}
1523 1523
 
1524 1524
 				// You can't continue inside a switch, so we do it after.
1525 1525
 				if( empty( $field->failed_validation ) ) {
1526
-				    continue;
1526
+					continue;
1527 1527
 				}
1528 1528
 
1529 1529
 				// checks if the No Duplicates option is not validating entry against itself, since
1530 1530
 				// we're editing a stored entry, it would also assume it's a duplicate.
1531 1531
 				if( !empty( $field->noDuplicates ) ) {
1532 1532
 
1533
-				    $entry = $this->get_entry();
1533
+					$entry = $this->get_entry();
1534 1534
 
1535
-				    // If the value of the entry is the same as the stored value
1536
-				    // Then we can assume it's not a duplicate, it's the same.
1537
-				    if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
1538
-				        //if value submitted was not changed, then don't validate
1539
-				        $field->failed_validation = false;
1535
+					// If the value of the entry is the same as the stored value
1536
+					// Then we can assume it's not a duplicate, it's the same.
1537
+					if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
1538
+						//if value submitted was not changed, then don't validate
1539
+						$field->failed_validation = false;
1540 1540
 
1541
-				        unset( $field->validation_message );
1541
+						unset( $field->validation_message );
1542 1542
 
1543
-				        gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) );
1543
+						gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) );
1544 1544
 
1545
-				        continue;
1546
-				    }
1545
+						continue;
1546
+					}
1547 1547
 				}
1548 1548
 
1549 1549
 				// if here then probably we are facing the validation 'At least one field must be filled out'
1550 1550
 				if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
1551
-				    unset( $field->validation_message );
1552
-	                $field->validation_message = false;
1553
-				    continue;
1551
+					unset( $field->validation_message );
1552
+					$field->validation_message = false;
1553
+					continue;
1554 1554
 				}
1555 1555
 
1556 1556
 				$gv_valid = false;
@@ -1614,8 +1614,8 @@  discard block
 block discarded – undo
1614 1614
 		// Hide fields depending on admin settings
1615 1615
 		$fields = $this->filter_fields( $form['fields'], $edit_fields );
1616 1616
 
1617
-	    // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
1618
-	    $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
1617
+		// If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
1618
+		$fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
1619 1619
 
1620 1620
 		/**
1621 1621
 		 * @filter `gravityview/edit_entry/form_fields` Modify the fields displayed in Edit Entry form
@@ -1675,11 +1675,11 @@  discard block
 block discarded – undo
1675 1675
 		// The edit tab has been configured, so we loop through to configured settings
1676 1676
 		foreach ( $configured_fields as $configured_field ) {
1677 1677
 
1678
-	        /** @var GF_Field $field */
1679
-	        foreach ( $fields as $field ) {
1678
+			/** @var GF_Field $field */
1679
+			foreach ( $fields as $field ) {
1680 1680
 				if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
1681
-				    $edit_fields[] = $this->merge_field_properties( $field, $configured_field );
1682
-				    break;
1681
+					$edit_fields[] = $this->merge_field_properties( $field, $configured_field );
1682
+					break;
1683 1683
 				}
1684 1684
 
1685 1685
 			}
@@ -1735,28 +1735,28 @@  discard block
 block discarded – undo
1735 1735
 	 */
1736 1736
 	private function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) {
1737 1737
 
1738
-	    /**
1738
+		/**
1739 1739
 		 * @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
1740
-	     * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators.
1741
-	     * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions
1742
-	     * @since 1.9.1
1743
-	     * @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.
1744
-	     * @param array $form GF Form array
1745
-	     * @param int $view_id View ID
1746
-	     */
1747
-	    $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
1748
-
1749
-	    if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
1740
+		 * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators.
1741
+		 * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions
1742
+		 * @since 1.9.1
1743
+		 * @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.
1744
+		 * @param array $form GF Form array
1745
+		 * @param int $view_id View ID
1746
+		 */
1747
+		$use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
1748
+
1749
+		if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
1750 1750
 			foreach( $fields as $k => $field ) {
1751 1751
 				if( $field->adminOnly ) {
1752
-				    unset( $fields[ $k ] );
1752
+					unset( $fields[ $k ] );
1753 1753
 				}
1754 1754
 			}
1755 1755
 			return array_values( $fields );
1756 1756
 		}
1757 1757
 
1758
-	    foreach( $fields as &$field ) {
1759
-		    $field->adminOnly = false;
1758
+		foreach( $fields as &$field ) {
1759
+			$field->adminOnly = false;
1760 1760
 		}
1761 1761
 
1762 1762
 		return $fields;
@@ -1776,13 +1776,13 @@  discard block
 block discarded – undo
1776 1776
 	 */
1777 1777
 	private function unselect_default_values( $form ) {
1778 1778
 
1779
-	    foreach ( $form['fields'] as &$field ) {
1779
+		foreach ( $form['fields'] as &$field ) {
1780 1780
 
1781 1781
 			if ( empty( $field->choices ) ) {
1782
-                continue;
1782
+				continue;
1783 1783
 			}
1784 1784
 
1785
-            foreach ( $field->choices as &$choice ) {
1785
+			foreach ( $field->choices as &$choice ) {
1786 1786
 				if ( \GV\Utils::get( $choice, 'isSelected' ) ) {
1787 1787
 					$choice['isSelected'] = false;
1788 1788
 				}
@@ -1819,36 +1819,36 @@  discard block
 block discarded – undo
1819 1819
 
1820 1820
 			if( 'checkbox' === $field->type ) {
1821 1821
 				foreach ( $field->get_entry_inputs() as $key => $input ) {
1822
-				    $input_id = $input['id'];
1823
-				    $choice = $field->choices[ $key ];
1824
-				    $value = \GV\Utils::get( $this->entry, $input_id );
1825
-				    $match = RGFormsModel::choice_value_match( $field, $choice, $value );
1826
-				    if( $match ) {
1827
-				        $field->choices[ $key ]['isSelected'] = true;
1828
-				    }
1822
+					$input_id = $input['id'];
1823
+					$choice = $field->choices[ $key ];
1824
+					$value = \GV\Utils::get( $this->entry, $input_id );
1825
+					$match = RGFormsModel::choice_value_match( $field, $choice, $value );
1826
+					if( $match ) {
1827
+						$field->choices[ $key ]['isSelected'] = true;
1828
+					}
1829 1829
 				}
1830 1830
 			} else {
1831 1831
 
1832 1832
 				// We need to run through each field to set the default values
1833 1833
 				foreach ( $this->entry as $field_id => $field_value ) {
1834 1834
 
1835
-				    if( floatval( $field_id ) === floatval( $field->id ) ) {
1835
+					if( floatval( $field_id ) === floatval( $field->id ) ) {
1836 1836
 
1837
-				        if( 'list' === $field->type ) {
1838
-				            $list_rows = maybe_unserialize( $field_value );
1837
+						if( 'list' === $field->type ) {
1838
+							$list_rows = maybe_unserialize( $field_value );
1839 1839
 
1840
-				            $list_field_value = array();
1841
-				            foreach ( (array) $list_rows as $row ) {
1842
-				                foreach ( (array) $row as $column ) {
1843
-				                    $list_field_value[] = $column;
1844
-				                }
1845
-				            }
1840
+							$list_field_value = array();
1841
+							foreach ( (array) $list_rows as $row ) {
1842
+								foreach ( (array) $row as $column ) {
1843
+									$list_field_value[] = $column;
1844
+								}
1845
+							}
1846 1846
 
1847
-				            $field->defaultValue = serialize( $list_field_value );
1848
-				        } else {
1849
-				            $field->defaultValue = $field_value;
1850
-				        }
1851
-				    }
1847
+							$field->defaultValue = serialize( $list_field_value );
1848
+						} else {
1849
+							$field->defaultValue = $field_value;
1850
+						}
1851
+					}
1852 1852
 				}
1853 1853
 			}
1854 1854
 		}
@@ -1905,7 +1905,7 @@  discard block
 block discarded – undo
1905 1905
 			return $has_conditional_logic;
1906 1906
 		}
1907 1907
 
1908
-	    /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */
1908
+		/** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */
1909 1909
 		return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form );
1910 1910
 	}
1911 1911
 
@@ -1972,14 +1972,14 @@  discard block
 block discarded – undo
1972 1972
 
1973 1973
 		if( $echo && $error !== true ) {
1974 1974
 
1975
-	        $error = esc_html( $error );
1975
+			$error = esc_html( $error );
1976 1976
 
1977
-	        /**
1978
-	         * @since 1.9
1979
-	         */
1980
-	        if ( ! empty( $this->entry ) ) {
1981
-		        $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;" ) );
1982
-	        }
1977
+			/**
1978
+			 * @since 1.9
1979
+			 */
1980
+			if ( ! empty( $this->entry ) ) {
1981
+				$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;" ) );
1982
+			}
1983 1983
 
1984 1984
 			echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
1985 1985
 		}
Please login to merge, or discard this patch.
includes/class-gravityview-change-entry-creator.php 1 patch
Indentation   +205 added lines, -205 removed lines patch added patch discarded remove patch
@@ -5,251 +5,251 @@
 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_lead_property( $entry['id'], 'created_by', $user_id, false, true );
65
-
66
-    	if ( false === $result ) {
67
-    		$status = __('Error', 'gravityview');
68
-    	} else {
69
-    		$status = __('Success', 'gravityview');
70
-    	}
71
-
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
-    	gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note' => $note ) );
75
-
76
-	    /**
77
-	     * @filter `gravityview_disable_change_entry_creator_note` Disable adding a note when changing the entry creator
78
-	     * @since 1.21.5
79
-	     * @param boolean $disable Disable the Change Entry Creator note. Default: false.
80
-	     */
81
-	    if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) {
82
-		    return;
83
-	    }
84
-
85
-        GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
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_lead_property( $entry['id'], 'created_by', $user_id, false, true );
65
+
66
+		if ( false === $result ) {
67
+			$status = __('Error', 'gravityview');
68
+		} else {
69
+			$status = __('Success', 'gravityview');
70
+		}
71
+
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
+		gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note' => $note ) );
75
+
76
+		/**
77
+		 * @filter `gravityview_disable_change_entry_creator_note` Disable adding a note when changing the entry creator
78
+		 * @since 1.21.5
79
+		 * @param boolean $disable Disable the Change Entry Creator note. Default: false.
80
+		 */
81
+		if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) {
82
+			return;
83
+		}
84
+
85
+		GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
86 86
 
87
-    }
87
+	}
88 88
 
89
-    /**
90
-     * Disable previous functionality; use this one as the canonical.
91
-     * @return void
92
-     */
93
-    function prevent_conflicts() {
89
+	/**
90
+	 * Disable previous functionality; use this one as the canonical.
91
+	 * @return void
92
+	 */
93
+	function prevent_conflicts() {
94 94
 
95
-    	// Plugin that was provided here:
96
-    	// @link https://gravityview.co/support/documentation/201991205/
97
-    	remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
98
-    	remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
99
-
100
-    	// Disable for Gravity Forms Add-ons 3.6.2 and lower
101
-    	if( class_exists( 'KWS_GF_Change_Lead_Creator' ) ) {
95
+		// Plugin that was provided here:
96
+		// @link https://gravityview.co/support/documentation/201991205/
97
+		remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
98
+		remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
99
+
100
+		// Disable for Gravity Forms Add-ons 3.6.2 and lower
101
+		if( class_exists( 'KWS_GF_Change_Lead_Creator' ) ) {
102 102
 
103
-    		$Old_Lead_Creator = new KWS_GF_Change_Lead_Creator;
103
+			$Old_Lead_Creator = new KWS_GF_Change_Lead_Creator;
104 104
 
105
-    		// Now, no validation is required in the methods; let's hook in.
106
-    		remove_action('admin_init', array( $Old_Lead_Creator, 'set_screen_mode' ) );
107
-
108
-    		remove_action("gform_entry_info", array( $Old_Lead_Creator, 'add_select' ), 10 );
109
-
110
-    		remove_action("gform_after_update_entry", array( $Old_Lead_Creator, 'update_entry_creator' ), 10 );
111
-    	}
112
-
113
-    }
114
-
115
-    /**
116
-     * @since  3.6.3
117
-     * @return void
118
-     */
119
-    function load() {
105
+			// Now, no validation is required in the methods; let's hook in.
106
+			remove_action('admin_init', array( $Old_Lead_Creator, 'set_screen_mode' ) );
107
+
108
+			remove_action("gform_entry_info", array( $Old_Lead_Creator, 'add_select' ), 10 );
109
+
110
+			remove_action("gform_after_update_entry", array( $Old_Lead_Creator, 'update_entry_creator' ), 10 );
111
+		}
112
+
113
+	}
114
+
115
+	/**
116
+	 * @since  3.6.3
117
+	 * @return void
118
+	 */
119
+	function load() {
120 120
 
121
-    	// Does GF exist?
122
-        if( !class_exists('GFCommon') ) {
123
-            return;
124
-        }
121
+		// Does GF exist?
122
+		if( !class_exists('GFCommon') ) {
123
+			return;
124
+		}
125 125
 
126
-        // Can the user edit entries?
127
-        if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
128
-            return;
129
-        }
126
+		// Can the user edit entries?
127
+		if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
128
+			return;
129
+		}
130 130
 
131
-        // If screen mode isn't set, then we're in the wrong place.
132
-        if( empty( $_REQUEST['screen_mode'] ) ) {
133
-            return;
134
-        }
131
+		// If screen mode isn't set, then we're in the wrong place.
132
+		if( empty( $_REQUEST['screen_mode'] ) ) {
133
+			return;
134
+		}
135 135
 
136
-        // Now, no validation is required in the methods; let's hook in.
137
-        add_action('admin_init', array( &$this, 'set_screen_mode' ) );
136
+		// Now, no validation is required in the methods; let's hook in.
137
+		add_action('admin_init', array( &$this, 'set_screen_mode' ) );
138 138
 
139
-        add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
139
+		add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
140 140
 
141
-        add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
141
+		add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
142 142
 
143
-    }
143
+	}
144 144
 
145
-    /**
146
-     * Allows for edit links to work with a link instead of a form (GET instead of POST)
147
-     * @return void
148
-     */
149
-    function set_screen_mode() {
145
+	/**
146
+	 * Allows for edit links to work with a link instead of a form (GET instead of POST)
147
+	 * @return void
148
+	 */
149
+	function set_screen_mode() {
150 150
 
151
-    	// If $_GET['screen_mode'] is set to edit, set $_POST value
152
-        if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
153
-            $_POST["screen_mode"] = 'edit';
154
-        }
151
+		// If $_GET['screen_mode'] is set to edit, set $_POST value
152
+		if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
153
+			$_POST["screen_mode"] = 'edit';
154
+		}
155 155
 
156
-    }
156
+	}
157 157
 
158
-    /**
159
-     * When the entry creator is changed, add a note to the entry
160
-     * @param  array $form   GF entry array
161
-     * @param  int $entry_id Entry ID
162
-     * @return void
163
-     */
164
-    function update_entry_creator($form, $entry_id) {
165
-            global $current_user;
158
+	/**
159
+	 * When the entry creator is changed, add a note to the entry
160
+	 * @param  array $form   GF entry array
161
+	 * @param  int $entry_id Entry ID
162
+	 * @return void
163
+	 */
164
+	function update_entry_creator($form, $entry_id) {
165
+			global $current_user;
166 166
 
167
-        // Update the entry
168
-        $created_by = absint( \GV\Utils::_POST( 'created_by') );
167
+		// Update the entry
168
+		$created_by = absint( \GV\Utils::_POST( 'created_by') );
169 169
 
170
-        RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
170
+		RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
171 171
 
172
-        // If the creator has changed, let's add a note about who it used to be.
173
-        $originally_created_by = \GV\Utils::_POST( 'originally_created_by' );
172
+		// If the creator has changed, let's add a note about who it used to be.
173
+		$originally_created_by = \GV\Utils::_POST( 'originally_created_by' );
174 174
 
175
-        // If there's no owner and there didn't used to be, keep going
176
-        if( empty( $originally_created_by ) && empty( $created_by ) ) {
177
-            return;
178
-        }
175
+		// If there's no owner and there didn't used to be, keep going
176
+		if( empty( $originally_created_by ) && empty( $created_by ) ) {
177
+			return;
178
+		}
179 179
 
180
-        // If the values have changed
181
-        if( absint( $originally_created_by ) !== absint( $created_by ) ) {
180
+		// If the values have changed
181
+		if( absint( $originally_created_by ) !== absint( $created_by ) ) {
182 182
 
183
-            $user_data = get_userdata($current_user->ID);
183
+			$user_data = get_userdata($current_user->ID);
184 184
 
185
-            $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
185
+			$user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
186 186
 
187
-            $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');
187
+			$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');
188 188
 
189
-            if( !empty( $originally_created_by ) ) {
190
-                $originally_created_by_user_data = get_userdata($originally_created_by);
191
-                $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
192
-            }
189
+			if( !empty( $originally_created_by ) ) {
190
+				$originally_created_by_user_data = get_userdata($originally_created_by);
191
+				$original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
192
+			}
193 193
 
194
-            if( !empty( $created_by ) ) {
195
-                $created_by_user_data =  get_userdata($created_by);
196
-                $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
197
-            }
194
+			if( !empty( $created_by ) ) {
195
+				$created_by_user_data =  get_userdata($created_by);
196
+				$created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
197
+			}
198 198
 
199
-            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' );
200
-        }
199
+			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' );
200
+		}
201 201
 
202
-    }
202
+	}
203 203
 
204
-    /**
205
-     * Output the select to change the entry creator
206
-     * @param int $form_id GF Form ID
207
-     * @param array $entry    GF entry array
208
-     * @return void
209
-     */
210
-    function add_select($form_id, $entry ) {
204
+	/**
205
+	 * Output the select to change the entry creator
206
+	 * @param int $form_id GF Form ID
207
+	 * @param array $entry    GF entry array
208
+	 * @return void
209
+	 */
210
+	function add_select($form_id, $entry ) {
211 211
 
212
-        if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
213
-            return;
214
-        }
212
+		if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
213
+			return;
214
+		}
215 215
 
216
-        $created_by_id = \GV\Utils::get( $entry, 'created_by' );
216
+		$created_by_id = \GV\Utils::get( $entry, 'created_by' );
217 217
 
218
-        $users = GVCommon::get_users( 'change_entry_creator' );
218
+		$users = GVCommon::get_users( 'change_entry_creator' );
219 219
 
220
-        $is_created_by_in_users = wp_list_filter( $users, array( 'ID' => $created_by_id ) );
220
+		$is_created_by_in_users = wp_list_filter( $users, array( 'ID' => $created_by_id ) );
221 221
 
222
-        // Make sure that the entry creator is included in the users list. If not, add them.
223
-        if ( ! empty( $created_by_id ) && empty( $is_created_by_in_users ) ) {
222
+		// Make sure that the entry creator is included in the users list. If not, add them.
223
+		if ( ! empty( $created_by_id ) && empty( $is_created_by_in_users ) ) {
224 224
 
225
-	        if ( $created_by_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $created_by_id ) ) ) {
226
-	            $users = array_merge( $users, $created_by_user );
227
-	        }
228
-	    }
225
+			if ( $created_by_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $created_by_id ) ) ) {
226
+				$users = array_merge( $users, $created_by_user );
227
+			}
228
+		}
229 229
 
230
-        $output = '<label for="change_created_by">';
231
-        $output .= esc_html__('Change Entry Creator:', 'gravityview');
232
-        $output .= '</label>';
230
+		$output = '<label for="change_created_by">';
231
+		$output .= esc_html__('Change Entry Creator:', 'gravityview');
232
+		$output .= '</label>';
233 233
 
234
-	    // If there are users who are not being shown, show a warning.
235
-	    // TODO: Use AJAX instead of <select>
236
-	    $count_users = count_users();
237
-	    if( sizeof( $users ) < $count_users['total_users'] ) {
238
-		    $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>';
239
-	    }
234
+		// If there are users who are not being shown, show a warning.
235
+		// TODO: Use AJAX instead of <select>
236
+		$count_users = count_users();
237
+		if( sizeof( $users ) < $count_users['total_users'] ) {
238
+			$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>';
239
+		}
240 240
 
241
-	    $output .= '<select name="created_by" id="change_created_by" class="widefat">';
242
-        $output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
243
-        foreach($users as $user) {
244
-            $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
245
-        }
246
-        $output .= '</select>';
247
-        $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
241
+		$output .= '<select name="created_by" id="change_created_by" class="widefat">';
242
+		$output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
243
+		foreach($users as $user) {
244
+			$output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
245
+		}
246
+		$output .= '</select>';
247
+		$output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
248 248
 
249
-	    unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users );
249
+		unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users );
250 250
 
251
-        echo $output;
252
-    }
251
+		echo $output;
252
+	}
253 253
 
254 254
 }
255 255
 
Please login to merge, or discard this patch.