Completed
Push — develop ( 916819...77088b )
by
unknown
18:19
created
includes/extensions/edit-entry/class-edit-entry-render.php 1 patch
Indentation   +272 added lines, -272 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 105
 	 *
108
-     * @var int
106
+	 * @since 2.0.13
107
+	 *
108
+	 * @var int
109 109
 	 */
110 110
 	public $post_id;
111 111
 
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 	 */
190 190
 	public function prevent_maybe_process_form() {
191 191
 
192
-	    if( ! $this->is_edit_entry_submission() ) {
192
+		if( ! $this->is_edit_entry_submission() ) {
193 193
 			return;
194 194
 		}
195 195
 
@@ -228,14 +228,14 @@  discard block
 block discarded – undo
228 228
 	 * When Edit entry view is requested setup the vars
229 229
 	 */
230 230
 	private function setup_vars() {
231
-        global $post;
231
+		global $post;
232 232
 
233 233
 		$gravityview_view = GravityView_View::getInstance();
234 234
 
235 235
 
236 236
 		$entries = $gravityview_view->getEntries();
237
-	    self::$original_entry = $entries[0];
238
-	    $this->entry = $entries[0];
237
+		self::$original_entry = $entries[0];
238
+		$this->entry = $entries[0];
239 239
 
240 240
 		self::$original_form = GFAPI::get_form( $this->entry['form_id'] );
241 241
 		$this->form = $gravityview_view->getForm();
@@ -377,8 +377,8 @@  discard block
 block discarded – undo
377 377
 
378 378
 			GFFormsModel::save_lead( $form, $this->entry );
379 379
 
380
-	        // Delete the values for hidden inputs
381
-	        $this->unset_hidden_field_values();
380
+			// Delete the values for hidden inputs
381
+			$this->unset_hidden_field_values();
382 382
 
383 383
 			$this->entry['date_created'] = $date_created;
384 384
 
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 			// Perform actions normally performed after updating a lead
392 392
 			$this->after_update();
393 393
 
394
-	        /**
394
+			/**
395 395
 			 * Must be AFTER after_update()!
396 396
 			 * @see https://github.com/gravityview/GravityView/issues/764
397 397
 			 */
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
399 399
 
400 400
 			/**
401 401
 			 * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry
402
-             * @since 2.1 Added $gv_data parameter
402
+			 * @since 2.1 Added $gv_data parameter
403 403
 			 * @param array $form Gravity Forms form array
404 404
 			 * @param string $entry_id Numeric ID of the entry that was updated
405 405
 			 * @param GravityView_Edit_Entry_Render $this This object
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
 	 * @return void
424 424
 	 */
425 425
 	private function unset_hidden_field_values() {
426
-	    global $wpdb;
426
+		global $wpdb;
427 427
 
428 428
 		/**
429 429
 		 * @filter `gravityview/edit_entry/unset_hidden_field_values` Whether to delete values of fields hidden by conditional logic
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
 			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) );
448 448
 		}
449 449
 
450
-	    foreach ( $this->entry as $input_id => $field_value ) {
450
+		foreach ( $this->entry as $input_id => $field_value ) {
451 451
 
452 452
 			if ( ! is_numeric( $input_id ) ) {
453 453
 				continue;
@@ -457,8 +457,8 @@  discard block
 block discarded – undo
457 457
 				continue;
458 458
 			}
459 459
 
460
-		    // Reset fields that are or would be hidden
461
-		    if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), $this->entry ) ) {
460
+			// Reset fields that are or would be hidden
461
+			if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), $this->entry ) ) {
462 462
 
463 463
 				$empty_value = $field->get_value_save_entry(
464 464
 					is_array( $field->get_entry_inputs() ) ? array() : '',
@@ -470,16 +470,16 @@  discard block
 block discarded – undo
470 470
 					$empty_value = '';
471 471
 				}
472 472
 
473
-			    $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id );
473
+				$lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id );
474 474
 
475
-			    GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value );
475
+				GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value );
476 476
 
477
-			    // Prevent the $_POST values of hidden fields from being used as default values when rendering the form
477
+				// Prevent the $_POST values of hidden fields from being used as default values when rendering the form
478 478
 				// after submission
479
-			    $post_input_id = 'input_' . str_replace( '.', '_', $input_id );
480
-			    $_POST[ $post_input_id ] = '';
481
-		    }
482
-	    }
479
+				$post_input_id = 'input_' . str_replace( '.', '_', $input_id );
480
+				$_POST[ $post_input_id ] = '';
481
+			}
482
+		}
483 483
 	}
484 484
 
485 485
 	/**
@@ -634,7 +634,7 @@  discard block
 block discarded – undo
634 634
 
635 635
 		$form = $this->filter_conditional_logic( $this->form );
636 636
 
637
-	    /** @type GF_Field $field */
637
+		/** @type GF_Field $field */
638 638
 		foreach( $form['fields'] as $k => &$field ) {
639 639
 
640 640
 			/**
@@ -649,7 +649,7 @@  discard block
 block discarded – undo
649 649
 
650 650
 			if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
651 651
 				foreach( $field->inputs as $key => $input ) {
652
-				    $field->inputs[ $key ][ 'id' ] = (string)$input['id'];
652
+					$field->inputs[ $key ][ 'id' ] = (string)$input['id'];
653 653
 				}
654 654
 			}
655 655
 		}
@@ -689,7 +689,7 @@  discard block
 block discarded – undo
689 689
 
690 690
 				$inputs = $field->get_entry_inputs();
691 691
 				if ( is_array( $inputs ) ) {
692
-				    foreach ( $inputs as $input ) {
692
+					foreach ( $inputs as $input ) {
693 693
 						list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 );
694 694
 
695 695
 						if ( 'product' === $field->type ) {
@@ -708,7 +708,7 @@  discard block
 block discarded – undo
708 708
 						}
709 709
 
710 710
 						GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] );
711
-				    }
711
+					}
712 712
 				} else {
713 713
 					// Set to what it previously was if it's not editable
714 714
 					if ( ! in_array( $field->id, $allowed_fields ) ) {
@@ -754,7 +754,7 @@  discard block
 block discarded – undo
754 754
 			$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] );
755 755
 
756 756
 			$ary = ! empty( $value ) ? explode( '|:|', $value ) : array();
757
-	        $ary = stripslashes_deep( $ary );
757
+			$ary = stripslashes_deep( $ary );
758 758
 			$img_url = \GV\Utils::get( $ary, 0 );
759 759
 
760 760
 			$img_title       = count( $ary ) > 1 ? $ary[1] : '';
@@ -827,7 +827,7 @@  discard block
 block discarded – undo
827 827
 	private function maybe_update_post_fields( $form ) {
828 828
 
829 829
 		if( empty( $this->entry['post_id'] ) ) {
830
-	        gravityview()->log->debug( 'This entry has no post fields. Continuing...' );
830
+			gravityview()->log->debug( 'This entry has no post fields. Continuing...' );
831 831
 			return;
832 832
 		}
833 833
 
@@ -862,49 +862,49 @@  discard block
 block discarded – undo
862 862
 
863 863
 				switch( $field->type ) {
864 864
 
865
-				    case 'post_title':
866
-				        $post_title = $value;
867
-				        if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) {
868
-				            $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
869
-				        }
870
-				        $updated_post->post_title = $post_title;
871
-				        $updated_post->post_name  = $post_title;
872
-				        unset( $post_title );
873
-				        break;
874
-
875
-				    case 'post_content':
876
-				        $post_content = $value;
877
-				        if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) {
878
-				            $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
879
-				        }
880
-				        $updated_post->post_content = $post_content;
881
-				        unset( $post_content );
882
-				        break;
883
-				    case 'post_excerpt':
884
-				        $updated_post->post_excerpt = $value;
885
-				        break;
886
-				    case 'post_tags':
887
-				        wp_set_post_tags( $post_id, $value, false );
888
-				        break;
889
-				    case 'post_category':
890
-				        break;
891
-				    case 'post_custom_field':
865
+					case 'post_title':
866
+						$post_title = $value;
867
+						if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) {
868
+							$post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
869
+						}
870
+						$updated_post->post_title = $post_title;
871
+						$updated_post->post_name  = $post_title;
872
+						unset( $post_title );
873
+						break;
874
+
875
+					case 'post_content':
876
+						$post_content = $value;
877
+						if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) {
878
+							$post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
879
+						}
880
+						$updated_post->post_content = $post_content;
881
+						unset( $post_content );
882
+						break;
883
+					case 'post_excerpt':
884
+						$updated_post->post_excerpt = $value;
885
+						break;
886
+					case 'post_tags':
887
+						wp_set_post_tags( $post_id, $value, false );
888
+						break;
889
+					case 'post_category':
890
+						break;
891
+					case 'post_custom_field':
892 892
 						if ( is_array( $value ) && ( floatval( $field_id ) !== floatval( $field->id ) ) ) {
893 893
 							$value = $value[ $field_id ];
894 894
 						}
895 895
 
896
-				        if( ! empty( $field->customFieldTemplateEnabled ) ) {
897
-				            $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
898
-				        }
896
+						if( ! empty( $field->customFieldTemplateEnabled ) ) {
897
+							$value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
898
+						}
899 899
 
900 900
 						$value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry );
901 901
 
902
-				        update_post_meta( $post_id, $field->postCustomFieldName, $value );
903
-				        break;
902
+						update_post_meta( $post_id, $field->postCustomFieldName, $value );
903
+						break;
904 904
 
905
-				    case 'post_image':
906
-				        $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id );
907
-				        break;
905
+					case 'post_image':
906
+						$value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id );
907
+						break;
908 908
 
909 909
 				}
910 910
 
@@ -1074,14 +1074,14 @@  discard block
 block discarded – undo
1074 1074
 			?><h2 class="gv-edit-entry-title">
1075 1075
 				<span><?php
1076 1076
 
1077
-				    /**
1078
-				     * @filter `gravityview_edit_entry_title` Modify the edit entry title
1079
-				     * @param string $edit_entry_title Modify the "Edit Entry" title
1080
-				     * @param GravityView_Edit_Entry_Render $this This object
1081
-				     */
1082
-				    $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
1077
+					/**
1078
+					 * @filter `gravityview_edit_entry_title` Modify the edit entry title
1079
+					 * @param string $edit_entry_title Modify the "Edit Entry" title
1080
+					 * @param GravityView_Edit_Entry_Render $this This object
1081
+					 */
1082
+					$edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
1083 1083
 
1084
-				    echo esc_attr( $edit_entry_title );
1084
+					echo esc_attr( $edit_entry_title );
1085 1085
 			?></span>
1086 1086
 			</h2>
1087 1087
 
@@ -1136,13 +1136,13 @@  discard block
 block discarded – undo
1136 1136
 				);
1137 1137
 
1138 1138
 				/**
1139
-				* @filter `gravityview/edit_entry/button_labels` Modify the cancel/submit buttons' labels
1140
-				* @since 1.16.3
1141
-				* @param array $labels Default button labels associative array
1142
-				* @param array $form The Gravity Forms form
1143
-				* @param array $entry The Gravity Forms entry
1144
-				* @param int $view_id The current View ID
1145
-				*/
1139
+				 * @filter `gravityview/edit_entry/button_labels` Modify the cancel/submit buttons' labels
1140
+				 * @since 1.16.3
1141
+				 * @param array $labels Default button labels associative array
1142
+				 * @param array $form The Gravity Forms form
1143
+				 * @param array $entry The Gravity Forms entry
1144
+				 * @param int $view_id The current View ID
1145
+				 */
1146 1146
 				$labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id );
1147 1147
 
1148 1148
 				$this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels['submit'];
@@ -1179,26 +1179,26 @@  discard block
 block discarded – undo
1179 1179
 
1180 1180
 				switch ( $edit_redirect ) {
1181 1181
 
1182
-                    case '0':
1183
-	                    $redirect_url = $back_link;
1184
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' );
1185
-                        break;
1186
-
1187
-                    case '1':
1188
-	                    $redirect_url = $directory_link = GravityView_API::directory_link();
1189
-	                    $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>' );
1190
-	                    break;
1191
-
1192
-                    case '2':
1193
-	                    $redirect_url = $edit_redirect_url;
1194
-	                    $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' );
1195
-	                    $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>' );
1196
-                        break;
1197
-
1198
-                    case '':
1199
-                    default:
1200
-					    $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' );
1201
-                        break;
1182
+					case '0':
1183
+						$redirect_url = $back_link;
1184
+						$entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' );
1185
+						break;
1186
+
1187
+					case '1':
1188
+						$redirect_url = $directory_link = GravityView_API::directory_link();
1189
+						$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>' );
1190
+						break;
1191
+
1192
+					case '2':
1193
+						$redirect_url = $edit_redirect_url;
1194
+						$redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' );
1195
+						$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>' );
1196
+						break;
1197
+
1198
+					case '':
1199
+					default:
1200
+						$entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' );
1201
+						break;
1202 1202
 				}
1203 1203
 
1204 1204
 				if ( isset( $redirect_url ) ) {
@@ -1264,13 +1264,13 @@  discard block
 block discarded – undo
1264 1264
 				);
1265 1265
 
1266 1266
 				/**
1267
-				* @filter `gravityview/edit_entry/button_labels` Modify the cancel/submit buttons' labels
1268
-				* @since 1.16.3
1269
-				* @param array $labels Default button labels associative array
1270
-				* @param array $form The Gravity Forms form
1271
-				* @param array $entry The Gravity Forms entry
1272
-				* @param int $view_id The current View ID
1273
-				*/
1267
+				 * @filter `gravityview/edit_entry/button_labels` Modify the cancel/submit buttons' labels
1268
+				 * @since 1.16.3
1269
+				 * @param array $labels Default button labels associative array
1270
+				 * @param array $form The Gravity Forms form
1271
+				 * @param array $entry The Gravity Forms entry
1272
+				 * @param int $view_id The current View ID
1273
+				 */
1274 1274
 				$labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id );
1275 1275
 
1276 1276
 				GFFormDisplay::$submission[ $this->form['id'] ][ 'form' ] = $this->form;
@@ -1316,7 +1316,7 @@  discard block
 block discarded – undo
1316 1316
 
1317 1317
 		ob_get_clean();
1318 1318
 
1319
-	    remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
1319
+		remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
1320 1320
 		remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
1321 1321
 		remove_filter( 'gform_next_button', array( $this, 'render_form_buttons' ) );
1322 1322
 		remove_filter( 'gform_previous_button', array( $this, 'render_form_buttons' ) );
@@ -1376,7 +1376,7 @@  discard block
 block discarded – undo
1376 1376
 
1377 1377
 		// for now we don't support Save and Continue feature.
1378 1378
 		if( ! self::$supports_save_and_continue ) {
1379
-	        unset( $form['save'] );
1379
+			unset( $form['save'] );
1380 1380
 		}
1381 1381
 
1382 1382
 		$form = $this->unselect_default_values( $form );
@@ -1403,30 +1403,30 @@  discard block
 block discarded – undo
1403 1403
 			return $field_content;
1404 1404
 		}
1405 1405
 
1406
-        $message = null;
1406
+		$message = null;
1407 1407
 
1408
-        // First, make sure they have the capability to edit the post.
1409
-        if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
1408
+		// First, make sure they have the capability to edit the post.
1409
+		if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
1410 1410
 
1411
-            /**
1412
-             * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
1413
-             * @param string $message The existing "You don't have permission..." text
1414
-             */
1415
-            $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
1411
+			/**
1412
+			 * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
1413
+			 * @param string $message The existing "You don't have permission..." text
1414
+			 */
1415
+			$message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
1416 1416
 
1417
-        } elseif( null === get_post( $this->entry['post_id'] ) ) {
1418
-            /**
1419
-             * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
1420
-             * @param string $message The existing "This field is not editable; the post no longer exists." text
1421
-             */
1422
-            $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
1423
-        }
1417
+		} elseif( null === get_post( $this->entry['post_id'] ) ) {
1418
+			/**
1419
+			 * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
1420
+			 * @param string $message The existing "This field is not editable; the post no longer exists." text
1421
+			 */
1422
+			$message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
1423
+		}
1424 1424
 
1425
-        if( $message ) {
1426
-            $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
1427
-        }
1425
+		if( $message ) {
1426
+			$field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
1427
+		}
1428 1428
 
1429
-        return $field_content;
1429
+		return $field_content;
1430 1430
 	}
1431 1431
 
1432 1432
 	/**
@@ -1454,7 +1454,7 @@  discard block
 block discarded – undo
1454 1454
 			|| ! empty( $field_content )
1455 1455
 			|| in_array( $field->type, array( 'honeypot' ) )
1456 1456
 		) {
1457
-	        return $field_content;
1457
+			return $field_content;
1458 1458
 		}
1459 1459
 
1460 1460
 		// SET SOME FIELD DEFAULTS TO PREVENT ISSUES
@@ -1462,24 +1462,24 @@  discard block
 block discarded – undo
1462 1462
 
1463 1463
 		$field_value = $this->get_field_value( $field );
1464 1464
 
1465
-	    // Prevent any PHP warnings, like undefined index
1466
-	    ob_start();
1465
+		// Prevent any PHP warnings, like undefined index
1466
+		ob_start();
1467 1467
 
1468
-	    $return = null;
1468
+		$return = null;
1469 1469
 
1470 1470
 		/** @var GravityView_Field $gv_field */
1471 1471
 		if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
1472 1472
 			$return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
1473 1473
 		} else {
1474
-	        $return = $field->get_field_input( $this->form, $field_value, $this->entry );
1475
-	    }
1474
+			$return = $field->get_field_input( $this->form, $field_value, $this->entry );
1475
+		}
1476 1476
 
1477
-	    // If there was output, it's an error
1478
-	    $warnings = ob_get_clean();
1477
+		// If there was output, it's an error
1478
+		$warnings = ob_get_clean();
1479 1479
 
1480
-	    if( !empty( $warnings ) ) {
1481
-		    gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) );
1482
-	    }
1480
+		if( !empty( $warnings ) ) {
1481
+			gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) );
1482
+		}
1483 1483
 
1484 1484
 		return $return;
1485 1485
 	}
@@ -1514,8 +1514,8 @@  discard block
 block discarded – undo
1514 1514
 				$input_id = strval( $input['id'] );
1515 1515
 
1516 1516
 				if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) {
1517
-				    $field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
1518
-				    $allow_pre_populated = false;
1517
+					$field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
1518
+					$allow_pre_populated = false;
1519 1519
 				}
1520 1520
 
1521 1521
 			}
@@ -1539,7 +1539,7 @@  discard block
 block discarded – undo
1539 1539
 			if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) {
1540 1540
 				$categories = array();
1541 1541
 				foreach ( explode( ',', $field_value ) as $cat_string ) {
1542
-				    $categories[] = GFCommon::format_post_category( $cat_string, true );
1542
+					$categories[] = GFCommon::format_post_category( $cat_string, true );
1543 1543
 				}
1544 1544
 				$field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
1545 1545
 			}
@@ -1549,25 +1549,25 @@  discard block
 block discarded – undo
1549 1549
 		// if value is empty get the default value if defined
1550 1550
 		$field_value = $field->get_value_default_if_empty( $field_value );
1551 1551
 
1552
-	    /**
1553
-	     * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
1554
-	     * @since 1.11
1555
-	     * @since 1.20 Added third param
1556
-	     * @param mixed $field_value field value used to populate the input
1557
-	     * @param object $field Gravity Forms field object ( Class GF_Field )
1558
-	     * @param GravityView_Edit_Entry_Render $this Current object
1559
-	     */
1560
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this );
1561
-
1562
-	    /**
1563
-	     * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type
1564
-	     * @since 1.17
1565
-	     * @since 1.20 Added third param
1566
-	     * @param mixed $field_value field value used to populate the input
1567
-	     * @param GF_Field $field Gravity Forms field object
1568
-	     * @param GravityView_Edit_Entry_Render $this Current object
1569
-	     */
1570
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
1552
+		/**
1553
+		 * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
1554
+		 * @since 1.11
1555
+		 * @since 1.20 Added third param
1556
+		 * @param mixed $field_value field value used to populate the input
1557
+		 * @param object $field Gravity Forms field object ( Class GF_Field )
1558
+		 * @param GravityView_Edit_Entry_Render $this Current object
1559
+		 */
1560
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this );
1561
+
1562
+		/**
1563
+		 * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type
1564
+		 * @since 1.17
1565
+		 * @since 1.20 Added third param
1566
+		 * @param mixed $field_value field value used to populate the input
1567
+		 * @param GF_Field $field Gravity Forms field object
1568
+		 * @param GravityView_Edit_Entry_Render $this Current object
1569
+		 */
1570
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
1571 1571
 
1572 1572
 		return $field_value;
1573 1573
 	}
@@ -1594,7 +1594,7 @@  discard block
 block discarded – undo
1594 1594
 			// This is because we're doing admin form pretending to be front-end, so Gravity Forms
1595 1595
 			// expects certain field array items to be set.
1596 1596
 			foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) {
1597
-	            $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
1597
+				$field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
1598 1598
 			}
1599 1599
 
1600 1600
 			switch( RGFormsModel::get_input_type( $field ) ) {
@@ -1608,61 +1608,61 @@  discard block
 block discarded – undo
1608 1608
 				 */
1609 1609
 				case 'fileupload':
1610 1610
 
1611
-				    // Set the previous value
1612
-				    $entry = $this->get_entry();
1611
+					// Set the previous value
1612
+					$entry = $this->get_entry();
1613 1613
 
1614
-				    $input_name = 'input_'.$field->id;
1615
-				    $form_id = $form['id'];
1614
+					$input_name = 'input_'.$field->id;
1615
+					$form_id = $form['id'];
1616 1616
 
1617
-				    $value = NULL;
1617
+					$value = NULL;
1618 1618
 
1619
-				    // Use the previous entry value as the default.
1620
-				    if( isset( $entry[ $field->id ] ) ) {
1621
-				        $value = $entry[ $field->id ];
1622
-				    }
1619
+					// Use the previous entry value as the default.
1620
+					if( isset( $entry[ $field->id ] ) ) {
1621
+						$value = $entry[ $field->id ];
1622
+					}
1623 1623
 
1624
-				    // If this is a single upload file
1625
-				    if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
1626
-				        $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
1627
-				        $value = $file_path['url'];
1624
+					// If this is a single upload file
1625
+					if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
1626
+						$file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
1627
+						$value = $file_path['url'];
1628 1628
 
1629
-				    } else {
1629
+					} else {
1630 1630
 
1631
-				        // Fix PHP warning on line 1498 of form_display.php for post_image fields
1632
-				        // Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
1633
-				        $_FILES[ $input_name ] = array('name' => '', 'size' => '' );
1631
+						// Fix PHP warning on line 1498 of form_display.php for post_image fields
1632
+						// Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
1633
+						$_FILES[ $input_name ] = array('name' => '', 'size' => '' );
1634 1634
 
1635
-				    }
1635
+					}
1636 1636
 
1637
-				    if ( \GV\Utils::get( $field, "multipleFiles" ) ) {
1637
+					if ( \GV\Utils::get( $field, "multipleFiles" ) ) {
1638 1638
 
1639
-				        // If there are fresh uploads, process and merge them.
1640
-				        // Otherwise, use the passed values, which should be json-encoded array of URLs
1641
-				        if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
1642
-				            $value = empty( $value ) ? '[]' : $value;
1643
-				            $value = stripslashes_deep( $value );
1644
-				            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
1645
-				        }
1639
+						// If there are fresh uploads, process and merge them.
1640
+						// Otherwise, use the passed values, which should be json-encoded array of URLs
1641
+						if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
1642
+							$value = empty( $value ) ? '[]' : $value;
1643
+							$value = stripslashes_deep( $value );
1644
+							$value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
1645
+						}
1646 1646
 
1647
-				    } else {
1647
+					} else {
1648 1648
 
1649
-				        // A file already exists when editing an entry
1650
-				        // We set this to solve issue when file upload fields are required.
1651
-				        GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
1649
+						// A file already exists when editing an entry
1650
+						// We set this to solve issue when file upload fields are required.
1651
+						GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
1652 1652
 
1653
-				    }
1653
+					}
1654 1654
 
1655
-				    $this->entry[ $input_name ] = $value;
1656
-				    $_POST[ $input_name ] = $value;
1655
+					$this->entry[ $input_name ] = $value;
1656
+					$_POST[ $input_name ] = $value;
1657 1657
 
1658
-				    break;
1658
+					break;
1659 1659
 
1660 1660
 				case 'number':
1661
-				    // Fix "undefined index" issue at line 1286 in form_display.php
1662
-				    if( !isset( $_POST['input_'.$field->id ] ) ) {
1663
-				        $_POST['input_'.$field->id ] = NULL;
1664
-				    }
1665
-				    break;
1661
+					// Fix "undefined index" issue at line 1286 in form_display.php
1662
+					if( !isset( $_POST['input_'.$field->id ] ) ) {
1663
+						$_POST['input_'.$field->id ] = NULL;
1664
+					}
1665
+					break;
1666 1666
 			}
1667 1667
 
1668 1668
 		}
@@ -1783,7 +1783,7 @@  discard block
 block discarded – undo
1783 1783
 
1784 1784
 						// count uploaded files and existent entry files
1785 1785
 						$count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) +
1786
-						               ( is_array( $value ) ? count( $value ) : 0 );
1786
+									   ( is_array( $value ) ? count( $value ) : 0 );
1787 1787
 
1788 1788
 						if ( $count_files > $field->maxFiles ) {
1789 1789
 							$field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
@@ -1805,47 +1805,47 @@  discard block
 block discarded – undo
1805 1805
 
1806 1806
 				switch ( $field_type ) {
1807 1807
 
1808
-				    // Captchas don't need to be re-entered.
1809
-				    case 'captcha':
1808
+					// Captchas don't need to be re-entered.
1809
+					case 'captcha':
1810 1810
 
1811
-				        // Post Image fields aren't editable, so we un-fail them.
1812
-				    case 'post_image':
1813
-				        $field->failed_validation = false;
1814
-				        unset( $field->validation_message );
1815
-				        break;
1811
+						// Post Image fields aren't editable, so we un-fail them.
1812
+					case 'post_image':
1813
+						$field->failed_validation = false;
1814
+						unset( $field->validation_message );
1815
+						break;
1816 1816
 
1817 1817
 				}
1818 1818
 
1819 1819
 				// You can't continue inside a switch, so we do it after.
1820 1820
 				if( empty( $field->failed_validation ) ) {
1821
-				    continue;
1821
+					continue;
1822 1822
 				}
1823 1823
 
1824 1824
 				// checks if the No Duplicates option is not validating entry against itself, since
1825 1825
 				// we're editing a stored entry, it would also assume it's a duplicate.
1826 1826
 				if( !empty( $field->noDuplicates ) ) {
1827 1827
 
1828
-				    $entry = $this->get_entry();
1828
+					$entry = $this->get_entry();
1829 1829
 
1830
-				    // If the value of the entry is the same as the stored value
1831
-				    // Then we can assume it's not a duplicate, it's the same.
1832
-				    if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
1833
-				        //if value submitted was not changed, then don't validate
1834
-				        $field->failed_validation = false;
1830
+					// If the value of the entry is the same as the stored value
1831
+					// Then we can assume it's not a duplicate, it's the same.
1832
+					if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
1833
+						//if value submitted was not changed, then don't validate
1834
+						$field->failed_validation = false;
1835 1835
 
1836
-				        unset( $field->validation_message );
1836
+						unset( $field->validation_message );
1837 1837
 
1838
-				        gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) );
1838
+						gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) );
1839 1839
 
1840
-				        continue;
1841
-				    }
1840
+						continue;
1841
+					}
1842 1842
 				}
1843 1843
 
1844 1844
 				// if here then probably we are facing the validation 'At least one field must be filled out'
1845 1845
 				if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
1846
-				    unset( $field->validation_message );
1846
+					unset( $field->validation_message );
1847 1847
 					$field->failed_validation = false;
1848
-				    continue;
1848
+					continue;
1849 1849
 				}
1850 1850
 
1851 1851
 				$gv_valid = false;
@@ -1909,8 +1909,8 @@  discard block
 block discarded – undo
1909 1909
 		// Hide fields depending on admin settings
1910 1910
 		$fields = $this->filter_fields( $form['fields'], $edit_fields );
1911 1911
 
1912
-	    // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
1913
-	    $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
1912
+		// If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
1913
+		$fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
1914 1914
 
1915 1915
 		/**
1916 1916
 		 * @filter `gravityview/edit_entry/form_fields` Modify the fields displayed in Edit Entry form
@@ -2001,11 +2001,11 @@  discard block
 block discarded – undo
2001 2001
 		// The edit tab has been configured, so we loop through to configured settings
2002 2002
 		foreach ( $configured_fields as $configured_field ) {
2003 2003
 
2004
-	        /** @var GF_Field $field */
2005
-	        foreach ( $fields as $field ) {
2004
+			/** @var GF_Field $field */
2005
+			foreach ( $fields as $field ) {
2006 2006
 				if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
2007
-				    $edit_fields[] = $this->merge_field_properties( $field, $configured_field );
2008
-				    break;
2007
+					$edit_fields[] = $this->merge_field_properties( $field, $configured_field );
2008
+					break;
2009 2009
 				}
2010 2010
 
2011 2011
 			}
@@ -2061,28 +2061,28 @@  discard block
 block discarded – undo
2061 2061
 	 */
2062 2062
 	private function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) {
2063 2063
 
2064
-	    /**
2064
+		/**
2065 2065
 		 * @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
2066
-	     * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators.
2067
-	     * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions
2068
-	     * @since 1.9.1
2069
-	     * @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.
2070
-	     * @param array $form GF Form array
2071
-	     * @param int $view_id View ID
2072
-	     */
2073
-	    $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
2074
-
2075
-	    if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
2066
+		 * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators.
2067
+		 * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions
2068
+		 * @since 1.9.1
2069
+		 * @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.
2070
+		 * @param array $form GF Form array
2071
+		 * @param int $view_id View ID
2072
+		 */
2073
+		$use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
2074
+
2075
+		if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
2076 2076
 			foreach( $fields as $k => $field ) {
2077 2077
 				if( $field->adminOnly ) {
2078
-				    unset( $fields[ $k ] );
2078
+					unset( $fields[ $k ] );
2079 2079
 				}
2080 2080
 			}
2081 2081
 			return array_values( $fields );
2082 2082
 		}
2083 2083
 
2084
-	    foreach( $fields as &$field ) {
2085
-		    $field->adminOnly = false;
2084
+		foreach( $fields as &$field ) {
2085
+			$field->adminOnly = false;
2086 2086
 		}
2087 2087
 
2088 2088
 		return $fields;
@@ -2102,13 +2102,13 @@  discard block
 block discarded – undo
2102 2102
 	 */
2103 2103
 	private function unselect_default_values( $form ) {
2104 2104
 
2105
-	    foreach ( $form['fields'] as &$field ) {
2105
+		foreach ( $form['fields'] as &$field ) {
2106 2106
 
2107 2107
 			if ( empty( $field->choices ) ) {
2108
-                continue;
2108
+				continue;
2109 2109
 			}
2110 2110
 
2111
-            foreach ( $field->choices as &$choice ) {
2111
+			foreach ( $field->choices as &$choice ) {
2112 2112
 				if ( \GV\Utils::get( $choice, 'isSelected' ) ) {
2113 2113
 					$choice['isSelected'] = false;
2114 2114
 				}
@@ -2145,36 +2145,36 @@  discard block
 block discarded – undo
2145 2145
 
2146 2146
 			if( 'checkbox' === $field->type ) {
2147 2147
 				foreach ( $field->get_entry_inputs() as $key => $input ) {
2148
-				    $input_id = $input['id'];
2149
-				    $choice = $field->choices[ $key ];
2150
-				    $value = \GV\Utils::get( $this->entry, $input_id );
2151
-				    $match = RGFormsModel::choice_value_match( $field, $choice, $value );
2152
-				    if( $match ) {
2153
-				        $field->choices[ $key ]['isSelected'] = true;
2154
-				    }
2148
+					$input_id = $input['id'];
2149
+					$choice = $field->choices[ $key ];
2150
+					$value = \GV\Utils::get( $this->entry, $input_id );
2151
+					$match = RGFormsModel::choice_value_match( $field, $choice, $value );
2152
+					if( $match ) {
2153
+						$field->choices[ $key ]['isSelected'] = true;
2154
+					}
2155 2155
 				}
2156 2156
 			} else {
2157 2157
 
2158 2158
 				// We need to run through each field to set the default values
2159 2159
 				foreach ( $this->entry as $field_id => $field_value ) {
2160 2160
 
2161
-				    if( floatval( $field_id ) === floatval( $field->id ) ) {
2161
+					if( floatval( $field_id ) === floatval( $field->id ) ) {
2162 2162
 
2163
-				        if( 'list' === $field->type ) {
2164
-				            $list_rows = maybe_unserialize( $field_value );
2163
+						if( 'list' === $field->type ) {
2164
+							$list_rows = maybe_unserialize( $field_value );
2165 2165
 
2166
-				            $list_field_value = array();
2167
-				            foreach ( (array) $list_rows as $row ) {
2168
-				                foreach ( (array) $row as $column ) {
2169
-				                    $list_field_value[] = $column;
2170
-				                }
2171
-				            }
2166
+							$list_field_value = array();
2167
+							foreach ( (array) $list_rows as $row ) {
2168
+								foreach ( (array) $row as $column ) {
2169
+									$list_field_value[] = $column;
2170
+								}
2171
+							}
2172 2172
 
2173
-				            $field->defaultValue = serialize( $list_field_value );
2174
-				        } else {
2175
-				            $field->defaultValue = $field_value;
2176
-				        }
2177
-				    }
2173
+							$field->defaultValue = serialize( $list_field_value );
2174
+						} else {
2175
+							$field->defaultValue = $field_value;
2176
+						}
2177
+					}
2178 2178
 				}
2179 2179
 			}
2180 2180
 		}
@@ -2235,7 +2235,7 @@  discard block
 block discarded – undo
2235 2235
 			foreach ( $form['fields'] as &$field ) {
2236 2236
 				foreach ( $remove_conditions_rule as $_remove_conditions_r ) {
2237 2237
 
2238
-				    list( $rule_field_id, $rule_i ) = $_remove_conditions_r;
2238
+					list( $rule_field_id, $rule_i ) = $_remove_conditions_r;
2239 2239
 
2240 2240
 					if ( $field['id'] == $rule_field_id ) {
2241 2241
 						unset( $field->conditionalLogic['rules'][ $rule_i ] );
@@ -2286,7 +2286,7 @@  discard block
 block discarded – undo
2286 2286
 			return $has_conditional_logic;
2287 2287
 		}
2288 2288
 
2289
-	    /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */
2289
+		/** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */
2290 2290
 		return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form );
2291 2291
 	}
2292 2292
 
@@ -2353,14 +2353,14 @@  discard block
 block discarded – undo
2353 2353
 
2354 2354
 		if( $echo && $error !== true ) {
2355 2355
 
2356
-	        $error = esc_html( $error );
2356
+			$error = esc_html( $error );
2357 2357
 
2358
-	        /**
2359
-	         * @since 1.9
2360
-	         */
2361
-	        if ( ! empty( $this->entry ) ) {
2362
-		        $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;" ) );
2363
-	        }
2358
+			/**
2359
+			 * @since 1.9
2360
+			 */
2361
+			if ( ! empty( $this->entry ) ) {
2362
+				$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;" ) );
2363
+			}
2364 2364
 
2365 2365
 			echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
2366 2366
 		}
Please login to merge, or discard this patch.