Completed
Push — develop ( 107abd...28890b )
by Zack
07:51
created
includes/fields/class-gravityview-field.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -134,17 +134,17 @@  discard block
 block discarded – undo
134 134
 
135 135
 		add_filter( 'gravityview/sortable/field_blacklist', array( $this, '_filter_sortable_fields' ), 1 );
136 136
 
137
-		if( $this->entry_meta_key ) {
137
+		if ( $this->entry_meta_key ) {
138 138
 			add_filter( 'gform_entry_meta', array( $this, 'add_entry_meta' ) );
139 139
 			add_filter( 'gravityview/common/sortable_fields', array( $this, 'add_sortable_field' ), 10, 2 );
140 140
 		}
141 141
 
142
-		if( $this->_custom_merge_tag ) {
142
+		if ( $this->_custom_merge_tag ) {
143 143
 			add_filter( 'gform_custom_merge_tags', array( $this, '_filter_gform_custom_merge_tags' ), 10, 4 );
144 144
 			add_filter( 'gform_replace_merge_tags', array( $this, '_filter_gform_replace_merge_tags' ), 10, 7 );
145 145
 		}
146 146
 
147
-		if( 'meta' === $this->group || '' !== $this->default_search_label ) {
147
+		if ( 'meta' === $this->group || '' !== $this->default_search_label ) {
148 148
 			add_filter( 'gravityview_search_field_label', array( $this, 'set_default_search_label' ), 10, 3 );
149 149
 		}
150 150
 
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 		 * Auto-assign label from Gravity Forms label, if exists
153 153
 		 * @since 1.20
154 154
 		 */
155
-		if( empty( $this->label ) && ! empty( $this->_gf_field_class_name ) && class_exists( $this->_gf_field_class_name ) ) {
155
+		if ( empty( $this->label ) && ! empty( $this->_gf_field_class_name ) && class_exists( $this->_gf_field_class_name ) ) {
156 156
 			$this->label = ucfirst( GF_Fields::get( $this->name )->get_form_editor_field_title() );
157 157
 		}
158 158
 
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 			'type'  => $this->name
180 180
 		);
181 181
 
182
-		$fields["{$this->entry_meta_key}"] = $added_field;
182
+		$fields[ "{$this->entry_meta_key}" ] = $added_field;
183 183
 
184 184
 		return $fields;
185 185
 	}
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 	 */
200 200
 	function set_default_search_label( $label = '', $gf_field = null, $field = array() ) {
201 201
 
202
-		if( $this->name === $field['field'] && '' === $label ) {
202
+		if ( $this->name === $field[ 'field' ] && '' === $label ) {
203 203
 			$label = esc_html( $this->default_search_label );
204 204
 		}
205 205
 
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 	 *
221 221
 	 * @return string Original text if {_custom_merge_tag} isn't found. Otherwise, replaced text.
222 222
 	 */
223
-	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
223
+	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
224 224
 
225 225
 		// Is there is field merge tag? Strip whitespace off the ned, too.
226 226
 		preg_match_all( '/{' . preg_quote( $this->_custom_merge_tag ) . ':?(.*?)(?:\s)?}/ism', $text, $matches, PREG_SET_ORDER );
@@ -253,19 +253,19 @@  discard block
 block discarded – undo
253 253
 	 */
254 254
 	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
255 255
 
256
-		foreach( $matches as $match ) {
256
+		foreach ( $matches as $match ) {
257 257
 
258
-			$full_tag = $match[0];
258
+			$full_tag = $match[ 0 ];
259 259
 
260 260
 			// Strip the Merge Tags
261
-			$tag = str_replace( array( '{', '}'), '', $full_tag );
261
+			$tag = str_replace( array( '{', '}' ), '', $full_tag );
262 262
 
263 263
 			// Replace the value from the entry, if exists
264
-			if( isset( $entry[ $tag ] ) ) {
264
+			if ( isset( $entry[ $tag ] ) ) {
265 265
 
266 266
 				$value = $entry[ $tag ];
267 267
 
268
-				if( is_callable( array( $this, 'get_content') ) ) {
268
+				if ( is_callable( array( $this, 'get_content' ) ) ) {
269 269
 					$value = $this->get_content( $value );
270 270
 				}
271 271
 
@@ -338,8 +338,8 @@  discard block
 block discarded – undo
338 338
 	 */
339 339
 	public function _filter_sortable_fields( $not_sortable ) {
340 340
 
341
-		if( ! $this->is_sortable ) {
342
-			$not_sortable[] = $this->name;
341
+		if ( ! $this->is_sortable ) {
342
+			$not_sortable[ ] = $this->name;
343 343
 		}
344 344
 
345 345
 		return $not_sortable;
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
 	 */
357 357
 	function add_entry_meta( $entry_meta ) {
358 358
 
359
-		if( ! isset( $entry_meta["{$this->entry_meta_key}"] ) ) {
359
+		if ( ! isset( $entry_meta[ "{$this->entry_meta_key}" ] ) ) {
360 360
 
361 361
 			$added_meta = array(
362 362
 				'label'             => $this->label,
@@ -365,13 +365,13 @@  discard block
 block discarded – undo
365 365
 			);
366 366
 
367 367
 			if ( $this->entry_meta_update_callback && is_callable( $this->entry_meta_update_callback ) ) {
368
-				$added_meta['update_entry_meta_callback'] = $this->entry_meta_update_callback;
368
+				$added_meta[ 'update_entry_meta_callback' ] = $this->entry_meta_update_callback;
369 369
 			}
370 370
 
371
-			$entry_meta["{$this->entry_meta_key}"] = $added_meta;
371
+			$entry_meta[ "{$this->entry_meta_key}" ] = $added_meta;
372 372
 
373 373
 		} else {
374
-			gravityview()->log->error( 'Entry meta already set: {meta_key}', array( 'meta_key' => $this->entry_meta_key, 'data' =>  $entry_meta["{$this->entry_meta_key}"] ) );
374
+			gravityview()->log->error( 'Entry meta already set: {meta_key}', array( 'meta_key' => $this->entry_meta_key, 'data' =>  $entry_meta[ "{$this->entry_meta_key}" ] ) );
375 375
 		}
376 376
 
377 377
 		return $entry_meta;
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
 			'date_display' => array(
401 401
 				'type' => 'text',
402 402
 				'label' => __( 'Override Date Format', 'gravityview' ),
403
-				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview'), '<a href="https://wordpress.org/support/article/formatting-date-and-time/" rel="external">', '</a>' ),
403
+				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview' ), '<a href="https://wordpress.org/support/article/formatting-date-and-time/" rel="external">', '</a>' ),
404 404
 				/**
405 405
 				 * @filter `gravityview_date_format` Override the date format with a [PHP date format](https://codex.wordpress.org/Formatting_Date_and_Time)
406 406
 				 * @param[in,out] null|string $date_format Date Format (default: null)
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
 
427 427
 		$options = $this->field_support_options();
428 428
 
429
-		if( isset( $options[ $key ] ) ) {
429
+		if ( isset( $options[ $key ] ) ) {
430 430
 			$field_options[ $key ] = $options[ $key ];
431 431
 		}
432 432
 
@@ -490,11 +490,11 @@  discard block
 block discarded – undo
490 490
 		$connected_form = \GV\Utils::_POST( 'form_id' );
491 491
 
492 492
 		// Otherwise, get the Form ID from the Post page
493
-		if( empty( $connected_form ) ) {
493
+		if ( empty( $connected_form ) ) {
494 494
 			$connected_form = gravityview_get_form_id( get_the_ID() );
495 495
 		}
496 496
 
497
-		if( empty( $connected_form ) ) {
497
+		if ( empty( $connected_form ) ) {
498 498
 			gravityview()->log->error( 'Form not found for form ID "{form_id}"', array( 'form_id' => $connected_form ) );
499 499
 			return false;
500 500
 		}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-time.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
 		add_filter( 'gravityview/sorting/time', array( $this, 'modify_sort_id' ), 10, 2 );
64 64
 
65
-		add_filter('gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 );
65
+		add_filter( 'gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 );
66 66
 	}
67 67
 
68 68
 	/**
@@ -103,35 +103,35 @@  discard block
 block discarded – undo
103 103
 	public function _maybe_filter_gravity_forms_query( $criteria, $form_ids, $view_id ) {
104 104
 
105 105
 		// If the search is not being sorted, return early
106
-		if( empty( $criteria['sorting']['key'] ) ) {
106
+		if ( empty( $criteria[ 'sorting' ][ 'key' ] ) ) {
107 107
 			return $criteria;
108 108
 		}
109 109
 
110
-		$pieces = explode( $this->_sort_divider, $criteria['sorting']['key'] );
110
+		$pieces = explode( $this->_sort_divider, $criteria[ 'sorting' ][ 'key' ] );
111 111
 
112 112
 		/**
113 113
 		 * If the sort key does not match the key set in modify_sort_id(), do not modify the Gravity Forms query SQL
114 114
 		 * @see modify_sort_id()
115 115
 		 */
116
-		if( empty( $pieces[1] ) ) {
116
+		if ( empty( $pieces[ 1 ] ) ) {
117 117
 			return $criteria;
118 118
 		}
119 119
 
120 120
 		// Pass these to the _modify_query_sort_by_time_hack() method
121
-		$this->_time_format = $pieces[1];
122
-		$this->_date_format = $pieces[2];
121
+		$this->_time_format = $pieces[ 1 ];
122
+		$this->_date_format = $pieces[ 2 ];
123 123
 
124 124
 		// Remove fake input IDs (5.1 doesn't exist. Use 5)
125
-		$criteria['sorting']['key'] = floor( $pieces[0] );
125
+		$criteria[ 'sorting' ][ 'key' ] = floor( $pieces[ 0 ] );
126 126
 
127 127
 		/**
128 128
 		 * Make sure sorting is numeric (# of seconds). IMPORTANT.
129 129
 		 * @see GVCommon::is_field_numeric() is_numeric should also be set here
130 130
 		 */
131
-		$criteria['sorting']['is_numeric'] = true;
131
+		$criteria[ 'sorting' ][ 'is_numeric' ] = true;
132 132
 
133 133
 		// Modify the Gravity Forms WP Query
134
-		add_filter('query', array( $this, '_modify_query_sort_by_time_hack' ) );
134
+		add_filter( 'query', array( $this, '_modify_query_sort_by_time_hack' ) );
135 135
 
136 136
 		return $criteria;
137 137
 	}
@@ -152,9 +152,9 @@  discard block
 block discarded – undo
152 152
 		 * then we want to modify the query.
153 153
 		 * @see GFFormsModel::sort_by_field_query()
154 154
 		 */
155
-		if( strpos( $query, self::GF_SORTING_SQL ) > 0 ) {
155
+		if ( strpos( $query, self::GF_SORTING_SQL ) > 0 ) {
156 156
 
157
-			if( $this->_time_format === '24' ) {
157
+			if ( $this->_time_format === '24' ) {
158 158
 				$sql_str_to_date = "STR_TO_DATE( `value`, '%H:%i' )";
159 159
 			} else {
160 160
 				$sql_str_to_date = "STR_TO_DATE( `value`, '%h:%i %p' )";
@@ -200,18 +200,18 @@  discard block
 block discarded – undo
200 200
 		// Set variables
201 201
 		parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id );
202 202
 
203
-		if( 'edit' === $context ) {
203
+		if ( 'edit' === $context ) {
204 204
 			return $field_options;
205 205
 		}
206 206
 
207 207
 		/**
208 208
 		 * Set default date format based on field ID and Form ID
209 209
 		 */
210
-		add_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
210
+		add_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
211 211
 
212
-		$this->add_field_support('date_display', $field_options );
212
+		$this->add_field_support( 'date_display', $field_options );
213 213
 
214
-		remove_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
214
+		remove_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
215 215
 
216 216
 		return $field_options;
217 217
 	}
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 	private function _get_time_format() {
227 227
 		global $post;
228 228
 
229
-		$current_form = isset( $_POST['form_id'] ) ? intval( $_POST['form_id'] ) : gravityview_get_form_id( $post->ID );
229
+		$current_form = isset( $_POST[ 'form_id' ] ) ? intval( $_POST[ 'form_id' ] ) : gravityview_get_form_id( $post->ID );
230 230
 
231 231
 		return self::_get_time_format_for_field( $this->_field_id, $current_form );
232 232
 	}
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
 		// GF defaults to 12, so should we.
246 246
 		$time_format = '12';
247 247
 
248
-		if( $form_id ) {
248
+		if ( $form_id ) {
249 249
 			$form = GFAPI::get_form( $form_id );
250 250
 
251 251
 			if ( $form ) {
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 		$default = 'h:i A';
293 293
 
294 294
 		// This doesn't take into account 24-hour
295
-		switch( $field_input_id ) {
295
+		switch ( $field_input_id ) {
296 296
 			// Hours
297 297
 			case 1:
298 298
 				return ( $time_format === '12' ) ? 'h' : 'H';
Please login to merge, or discard this patch.