Completed
Pull Request — master (#1071)
by Gennady
22:39 queued 18:20
created
gravityview.php 3 patches
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -237,26 +237,26 @@
 block discarded – undo
237 237
 
238 238
 	/** DEBUG */
239 239
 
240
-    /**
241
-     * Logs messages using Gravity Forms logging add-on
242
-     * @param  string $message log message
243
-     * @param mixed $data Additional data to display
240
+	/**
241
+	 * Logs messages using Gravity Forms logging add-on
242
+	 * @param  string $message log message
243
+	 * @param mixed $data Additional data to display
244 244
 	 * @deprecated use gravityview()->log
245
-     * @return void
246
-     */
247
-    public static function log_debug( $message, $data = null ){
245
+	 * @return void
246
+	 */
247
+	public static function log_debug( $message, $data = null ){
248 248
 		gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' );
249 249
 		gravityview()->log->debug( $message, $data );
250
-    }
250
+	}
251 251
 
252
-    /**
253
-     * Logs messages using Gravity Forms logging add-on
254
-     * @param  string $message log message
252
+	/**
253
+	 * Logs messages using Gravity Forms logging add-on
254
+	 * @param  string $message log message
255 255
 	 * @deprecated use gravityview()->log
256
-     * @return void
257
-     */
258
-    public static function log_error( $message, $data = null ){
256
+	 * @return void
257
+	 */
258
+	public static function log_error( $message, $data = null ){
259 259
 		gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' );
260 260
 		gravityview()->log->error( $message, $data );
261
-    }
261
+	}
262 262
 } // end class GravityView_Plugin
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 	 * @deprecated use gravityview()->log
245 245
      * @return void
246 246
      */
247
-    public static function log_debug( $message, $data = null ){
247
+    public static function log_debug( $message, $data = null ) {
248 248
 		gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' );
249 249
 		gravityview()->log->debug( $message, $data );
250 250
     }
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 	 * @deprecated use gravityview()->log
256 256
      * @return void
257 257
      */
258
-    public static function log_error( $message, $data = null ){
258
+    public static function log_error( $message, $data = null ) {
259 259
 		gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' );
260 260
 		gravityview()->log->error( $message, $data );
261 261
     }
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 	 * @deprecated use gravityview()->log
245 245
      * @return void
246 246
      */
247
-    public static function log_debug( $message, $data = null ){
247
+    public static function log_debug( $message, $data = null ) {
248 248
 		gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' );
249 249
 		gravityview()->log->debug( $message, $data );
250 250
     }
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 	 * @deprecated use gravityview()->log
256 256
      * @return void
257 257
      */
258
-    public static function log_error( $message, $data = null ){
258
+    public static function log_error( $message, $data = null ) {
259 259
 		gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' );
260 260
 		gravityview()->log->error( $message, $data );
261 261
     }
Please login to merge, or discard this patch.
includes/class-api.php 4 patches
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -161,20 +161,20 @@  discard block
 block discarded – undo
161 161
 
162 162
 		if( !empty( $field['custom_class'] ) ) {
163 163
 
164
-            $custom_class = $field['custom_class'];
164
+			$custom_class = $field['custom_class'];
165 165
 
166
-            if( !empty( $entry ) ) {
166
+			if( !empty( $entry ) ) {
167 167
 
168
-                // We want the merge tag to be formatted as a class. The merge tag may be
169
-                // replaced by a multiple-word value that should be output as a single class.
170
-                // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
171
-                add_filter('gform_merge_tag_filter', 'sanitize_html_class');
168
+				// We want the merge tag to be formatted as a class. The merge tag may be
169
+				// replaced by a multiple-word value that should be output as a single class.
170
+				// "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
171
+				add_filter('gform_merge_tag_filter', 'sanitize_html_class');
172 172
 
173
-                $custom_class = self::replace_variables( $custom_class, $form, $entry);
173
+				$custom_class = self::replace_variables( $custom_class, $form, $entry);
174 174
 
175
-                // And then we want life to return to normal
176
-                remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
177
-            }
175
+				// And then we want life to return to normal
176
+				remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
177
+			}
178 178
 
179 179
 			// And now we want the spaces to be handled nicely.
180 180
 			$classes[] = gravityview_sanitize_html_class( $custom_class );
@@ -531,32 +531,32 @@  discard block
 block discarded – undo
531 531
 		return sanitize_title( $slug );
532 532
 	}
533 533
 
534
-    /**
535
-     * If using the entry custom slug feature, make sure the new entries have the custom slug created and saved as meta
536
-     *
537
-     * Triggered by add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
538
-     *
539
-     * @param $entry array Gravity Forms entry object
540
-     * @param $form array Gravity Forms form object
541
-     */
542
-    public static function entry_create_custom_slug( $entry, $form ) {
543
-        /**
544
-         * @filter `gravityview_custom_entry_slug` On entry creation, check if we are using the custom entry slug feature and update the meta
545
-         * @param boolean $custom Should we process the custom entry slug?
546
-         */
547
-        $custom = apply_filters( 'gravityview_custom_entry_slug', false );
548
-        if( $custom ) {
549
-            // create the gravityview_unique_id and save it
534
+	/**
535
+	 * If using the entry custom slug feature, make sure the new entries have the custom slug created and saved as meta
536
+	 *
537
+	 * Triggered by add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
538
+	 *
539
+	 * @param $entry array Gravity Forms entry object
540
+	 * @param $form array Gravity Forms form object
541
+	 */
542
+	public static function entry_create_custom_slug( $entry, $form ) {
543
+		/**
544
+		 * @filter `gravityview_custom_entry_slug` On entry creation, check if we are using the custom entry slug feature and update the meta
545
+		 * @param boolean $custom Should we process the custom entry slug?
546
+		 */
547
+		$custom = apply_filters( 'gravityview_custom_entry_slug', false );
548
+		if( $custom ) {
549
+			// create the gravityview_unique_id and save it
550 550
 
551
-            // Get the entry hash
552
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
551
+			// Get the entry hash
552
+			$hash = self::get_custom_entry_slug( $entry['id'], $entry );
553 553
 
554
-	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry['id'], 'hash' => $hash ) );
554
+			gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry['id'], 'hash' => $hash ) );
555 555
 
556
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
556
+			gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
557 557
 
558
-        }
559
-    }
558
+		}
559
+	}
560 560
 
561 561
 
562 562
 
@@ -899,7 +899,7 @@  discard block
 block discarded – undo
899 899
 
900 900
 			// If there was an error, continue to the next term.
901 901
 			if ( is_wp_error( $term_link ) ) {
902
-			    continue;
902
+				continue;
903 903
 			}
904 904
 
905 905
 			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1324,7 +1324,7 @@  discard block
 block discarded – undo
1324 1324
 		$placeholders['label_value'] = gv_label( $field, $entry );
1325 1325
 	}
1326 1326
 
1327
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
1327
+	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ) {
1328 1328
 		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
1329 1329
 	}
1330 1330
 
@@ -1363,7 +1363,7 @@  discard block
 block discarded – undo
1363 1363
 	foreach ( $placeholders as $tag => $value ) {
1364 1364
 
1365 1365
 		// If the tag doesn't exist just skip it
1366
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
1366
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
1367 1367
 			continue;
1368 1368
 		}
1369 1369
 
Please login to merge, or discard this patch.
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -236,7 +236,6 @@  discard block
 block discarded – undo
236 236
 	 *
237 237
 	 * @access public
238 238
 	 * @param array $entry
239
-	 * @param array $field
240 239
 	 * @return null|string
241 240
 	 */
242 241
 	public static function field_value( $entry, $field_settings, $format = 'html' ) {
@@ -741,6 +740,9 @@  discard block
 block discarded – undo
741 740
 	return $value;
742 741
 }
743 742
 
743
+/**
744
+ * @param GV\Template_Context $context
745
+ */
744 746
 function gv_directory_link( $post = NULL, $add_pagination = true, $context = null ) {
745 747
 	return GravityView_API::directory_link( $post, $add_pagination, $context );
746 748
 }
@@ -1216,6 +1218,7 @@  discard block
 block discarded – undo
1216 1218
  * @param  array $passed_args Associative array with field data. `field` and `form` are required.
1217 1219
  * @since  2.0
1218 1220
  * @param  \GV\Template_Context The template context.
1221
+ * @param GV\Template_Context $context
1219 1222
  * @return string Field output. If empty value and hide empty is true, return empty.
1220 1223
  */
1221 1224
 function gravityview_field_output( $passed_args, $context = null ) {
Please login to merge, or discard this patch.
Spacing   +104 added lines, -104 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 
32 32
 		$form = $gravityview_view->getForm();
33 33
 
34
-		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS['GravityView_API_field_label_override'] ) ) {
34
+		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS[ 'GravityView_API_field_label_override' ] ) ) {
35 35
 			/** Allow to fall through for back compatibility testing purposes. */
36 36
 		} else {
37 37
 			return \GV\Mocks\GravityView_API_field_label( $form, $field, $entry, $force_show_label );
@@ -39,29 +39,29 @@  discard block
 block discarded – undo
39 39
 
40 40
 		$label = '';
41 41
 
42
-		if( !empty( $field['show_label'] ) || $force_show_label ) {
42
+		if ( ! empty( $field[ 'show_label' ] ) || $force_show_label ) {
43 43
 
44
-			$label = $field['label'];
44
+			$label = $field[ 'label' ];
45 45
 
46 46
 			// Support Gravity Forms 1.9+
47
-			if( class_exists( 'GF_Field' ) ) {
47
+			if ( class_exists( 'GF_Field' ) ) {
48 48
 
49
-				$field_object = RGFormsModel::get_field( $form, $field['id'] );
49
+				$field_object = RGFormsModel::get_field( $form, $field[ 'id' ] );
50 50
 
51
-				if( $field_object ) {
51
+				if ( $field_object ) {
52 52
 
53
-					$input = GFFormsModel::get_input( $field_object, $field['id'] );
53
+					$input = GFFormsModel::get_input( $field_object, $field[ 'id' ] );
54 54
 
55 55
 					// This is a complex field, with labels on a per-input basis
56
-					if( $input ) {
56
+					if ( $input ) {
57 57
 
58 58
 						// Does the input have a custom label on a per-input basis? Otherwise, default label.
59
-						$label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
59
+						$label = ! empty( $input[ 'customLabel' ] ) ? $input[ 'customLabel' ] : $input[ 'label' ];
60 60
 
61 61
 					} else {
62 62
 
63 63
 						// This is a field with one label
64
-						$label = $field_object->get_field_label( true, $field['label'] );
64
+						$label = $field_object->get_field_label( true, $field[ 'label' ] );
65 65
 
66 66
 					}
67 67
 
@@ -70,9 +70,9 @@  discard block
 block discarded – undo
70 70
 			}
71 71
 
72 72
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
73
-			if ( !empty( $field['custom_label'] ) ) {
73
+			if ( ! empty( $field[ 'custom_label' ] ) ) {
74 74
 
75
-				$label = self::replace_variables( $field['custom_label'], $form, $entry );
75
+				$label = self::replace_variables( $field[ 'custom_label' ], $form, $entry );
76 76
 
77 77
 			}
78 78
 
@@ -134,11 +134,11 @@  discard block
 block discarded – undo
134 134
 
135 135
 		$width = NULL;
136 136
 
137
-		if( !empty( $field['width'] ) ) {
138
-			$width = absint( $field['width'] );
137
+		if ( ! empty( $field[ 'width' ] ) ) {
138
+			$width = absint( $field[ 'width' ] );
139 139
 
140 140
 			// If using percentages, limit to 100%
141
-			if( '%d%%' === $format && $width > 100 ) {
141
+			if ( '%d%%' === $format && $width > 100 ) {
142 142
 				$width = 100;
143 143
 			}
144 144
 
@@ -159,42 +159,42 @@  discard block
 block discarded – undo
159 159
 	public static function field_class( $field, $form = NULL, $entry = NULL ) {
160 160
 		$classes = array();
161 161
 
162
-		if( !empty( $field['custom_class'] ) ) {
162
+		if ( ! empty( $field[ 'custom_class' ] ) ) {
163 163
 
164
-            $custom_class = $field['custom_class'];
164
+            $custom_class = $field[ 'custom_class' ];
165 165
 
166
-            if( !empty( $entry ) ) {
166
+            if ( ! empty( $entry ) ) {
167 167
 
168 168
                 // We want the merge tag to be formatted as a class. The merge tag may be
169 169
                 // replaced by a multiple-word value that should be output as a single class.
170 170
                 // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
171
-                add_filter('gform_merge_tag_filter', 'sanitize_html_class');
171
+                add_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
172 172
 
173
-                $custom_class = self::replace_variables( $custom_class, $form, $entry);
173
+                $custom_class = self::replace_variables( $custom_class, $form, $entry );
174 174
 
175 175
                 // And then we want life to return to normal
176
-                remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
176
+                remove_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
177 177
             }
178 178
 
179 179
 			// And now we want the spaces to be handled nicely.
180
-			$classes[] = gravityview_sanitize_html_class( $custom_class );
180
+			$classes[ ] = gravityview_sanitize_html_class( $custom_class );
181 181
 
182 182
 		}
183 183
 
184
-		if(!empty($field['id'])) {
185
-			if( !empty( $form ) && !empty( $form['id'] ) ) {
186
-				$form_id = '-'.$form['id'];
184
+		if ( ! empty( $field[ 'id' ] ) ) {
185
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
186
+				$form_id = '-' . $form[ 'id' ];
187 187
 			} else {
188 188
 				// @deprecated path. Form should always be given.
189 189
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
190 190
 				$gravityview_view = GravityView_View::getInstance();
191
-				$form_id = $gravityview_view->getFormId() ? '-'. $gravityview_view->getFormId() : '';
191
+				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
192 192
 			}
193 193
 
194
-			$classes[] = 'gv-field'.$form_id.'-'.$field['id'];
194
+			$classes[ ] = 'gv-field' . $form_id . '-' . $field[ 'id' ];
195 195
 		}
196 196
 
197
-		return esc_attr(implode(' ', $classes));
197
+		return esc_attr( implode( ' ', $classes ) );
198 198
 	}
199 199
 
200 200
 	/**
@@ -210,11 +210,11 @@  discard block
 block discarded – undo
210 210
 	 * @return string Sanitized unique HTML `id` attribute for the field
211 211
 	 */
212 212
 	public static function field_html_attr_id( $field, $form = array(), $entry = array() ) {
213
-		$id = $field['id'];
213
+		$id = $field[ 'id' ];
214 214
 
215 215
 		if ( ! empty( $id ) ) {
216
-			if ( ! empty( $form ) && ! empty( $form['id'] ) ) {
217
-				$form_id = '-' . $form['id'];
216
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
217
+				$form_id = '-' . $form[ 'id' ];
218 218
 			} else {
219 219
 				// @deprecated path. Form should always be given.
220 220
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
223 223
 			}
224 224
 
225
-			$id = 'gv-field' . $form_id . '-' . $field['id'];
225
+			$id = 'gv-field' . $form_id . '-' . $field[ 'id' ];
226 226
 		}
227 227
 
228 228
 		return esc_attr( $id );
@@ -262,14 +262,14 @@  discard block
 block discarded – undo
262 262
 	 */
263 263
 	public static function entry_link_html( $entry = array(), $anchor_text = '', $passed_tag_atts = array(), $field_settings = array(), $base_id = null ) {
264 264
 
265
-		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry['id'] ) ) {
265
+		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry[ 'id' ] ) ) {
266 266
 			gravityview()->log->debug( 'Entry not defined; returning null', array( 'data' => $entry ) );
267 267
 			return NULL;
268 268
 		}
269 269
 
270 270
 		$href = self::entry_link( $entry, $base_id );
271 271
 
272
-		if( '' === $href ) {
272
+		if ( '' === $href ) {
273 273
 			return NULL;
274 274
 		}
275 275
 
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 		} else {
307 307
 			$gravityview_view = GravityView_View::getInstance();
308 308
 
309
-			if( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
309
+			if ( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
310 310
 				$is_search = true;
311 311
 			}
312 312
 		}
@@ -402,9 +402,9 @@  discard block
 block discarded – undo
402 402
 
403 403
 		// If we've saved the permalink in memory, use it
404 404
 		// @since 1.3
405
-		$link = wp_cache_get( 'gv_directory_link_'.$post_id );
405
+		$link = wp_cache_get( 'gv_directory_link_' . $post_id );
406 406
 
407
-		if ( (int) $post_id === (int) get_option( 'page_on_front' ) ) {
407
+		if ( (int)$post_id === (int)get_option( 'page_on_front' ) ) {
408 408
 			$link = home_url();
409 409
 		}
410 410
 
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
 
414 414
 			// If not yet saved, cache the permalink.
415 415
 			// @since 1.3
416
-			wp_cache_set( 'gv_directory_link_'.$post_id, $link );
416
+			wp_cache_set( 'gv_directory_link_' . $post_id, $link );
417 417
 		}
418 418
 
419 419
 		// Deal with returning to proper pagination for embedded views
@@ -421,13 +421,13 @@  discard block
 block discarded – undo
421 421
 
422 422
 			$args = array();
423 423
 
424
-			if( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
425
-				$args['pagenum'] = intval( $pagenum );
424
+			if ( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
425
+				$args[ 'pagenum' ] = intval( $pagenum );
426 426
 			}
427 427
 
428
-			if( $sort = \GV\Utils::_GET( 'sort' ) ) {
429
-				$args['sort'] = $sort;
430
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
428
+			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
429
+				$args[ 'sort' ] = $sort;
430
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
431 431
 			}
432 432
 
433 433
 			$link = add_query_arg( $args, $link );
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
 	private static function get_custom_entry_slug( $id, $entry = array() ) {
465 465
 
466 466
 		// Generate an unique hash to use as the default value
467
-		$slug = substr( wp_hash( $id, 'gravityview'.$id ), 0, 8 );
467
+		$slug = substr( wp_hash( $id, 'gravityview' . $id ), 0, 8 );
468 468
 
469 469
 		/**
470 470
 		 * @filter `gravityview_entry_slug` Modify the unique hash ID generated, if you want to improve usability or change the format. This will allow for custom URLs, such as `{entryid}-{first-name}` or even, if unique, `{first-name}-{last-name}`
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
 		$slug = apply_filters( 'gravityview_entry_slug', $slug, $id, $entry );
476 476
 
477 477
 		// Make sure we have something - use the original ID as backup.
478
-		if( empty( $slug ) ) {
478
+		if ( empty( $slug ) ) {
479 479
 			$slug = $id;
480 480
 		}
481 481
 
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
 		 * @filter `gravityview_custom_entry_slug` Whether to enable and use custom entry slugs.
505 505
 		 * @param boolean True: Allow for slugs based on entry values. False: always use entry IDs (default)
506 506
 		 */
507
-		$custom = apply_filters('gravityview_custom_entry_slug', false );
507
+		$custom = apply_filters( 'gravityview_custom_entry_slug', false );
508 508
 
509 509
 		// If we're using custom slug...
510 510
 		if ( $custom ) {
@@ -518,7 +518,7 @@  discard block
 block discarded – undo
518 518
 			// If it does have a hash set, and the hash is expected, use it.
519 519
 			// This check allows users to change the hash structure using the
520 520
 			// gravityview_entry_hash filter and have the old hashes expire.
521
-			if( empty( $value ) || $value !== $hash ) {
521
+			if ( empty( $value ) || $value !== $hash ) {
522 522
 				gravityview()->log->debug( 'Setting hash for entry {entry}: {hash}', array( 'entry' => $id_or_string, 'hash' => $hash ) );
523 523
 				gform_update_meta( $id_or_string, 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
524 524
 			}
@@ -545,15 +545,15 @@  discard block
 block discarded – undo
545 545
          * @param boolean $custom Should we process the custom entry slug?
546 546
          */
547 547
         $custom = apply_filters( 'gravityview_custom_entry_slug', false );
548
-        if( $custom ) {
548
+        if ( $custom ) {
549 549
             // create the gravityview_unique_id and save it
550 550
 
551 551
             // Get the entry hash
552
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
552
+            $hash = self::get_custom_entry_slug( $entry[ 'id' ], $entry );
553 553
 
554
-	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry['id'], 'hash' => $hash ) );
554
+	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry[ 'id' ], 'hash' => $hash ) );
555 555
 
556
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
556
+            gform_update_meta( $entry[ 'id' ], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
557 557
 
558 558
         }
559 559
     }
@@ -572,7 +572,7 @@  discard block
 block discarded – undo
572 572
 
573 573
 		if ( ! empty( $entry ) && ! is_array( $entry ) ) {
574 574
 			$entry = GVCommon::get_entry( $entry );
575
-		} else if( empty( $entry ) ) {
575
+		} else if ( empty( $entry ) ) {
576 576
 			// @deprecated path
577 577
 			$entry = GravityView_frontend::getInstance()->getEntry();
578 578
 		}
@@ -592,9 +592,9 @@  discard block
 block discarded – undo
592 592
 
593 593
 		$query_arg_name = \GV\Entry::get_endpoint_name();
594 594
 
595
-		$entry_slug = self::get_entry_slug( $entry['id'], $entry );
595
+		$entry_slug = self::get_entry_slug( $entry[ 'id' ], $entry );
596 596
 
597
-		if ( get_option('permalink_structure') && !is_preview() ) {
597
+		if ( get_option( 'permalink_structure' ) && ! is_preview() ) {
598 598
 
599 599
 			$args = array();
600 600
 
@@ -604,9 +604,9 @@  discard block
 block discarded – undo
604 604
 			 */
605 605
 			$link_parts = explode( '?', $directory_link );
606 606
 
607
-			$query = !empty( $link_parts[1] ) ? '?'.$link_parts[1] : '';
607
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
608 608
 
609
-			$directory_link = trailingslashit( $link_parts[0] ) . $query_arg_name . '/'. $entry_slug .'/' . $query;
609
+			$directory_link = trailingslashit( $link_parts[ 0 ] ) . $query_arg_name . '/' . $entry_slug . '/' . $query;
610 610
 
611 611
 		} else {
612 612
 
@@ -618,22 +618,22 @@  discard block
 block discarded – undo
618 618
 		 */
619 619
 		if ( $add_directory_args ) {
620 620
 
621
-			if ( ! empty( $_GET['pagenum'] ) ) {
622
-				$args['pagenum'] = intval( $_GET['pagenum'] );
621
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
622
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
623 623
 			}
624 624
 
625 625
 			/**
626 626
 			 * @since 1.7
627 627
 			 */
628 628
 			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
629
-				$args['sort'] = $sort;
630
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
629
+				$args[ 'sort' ] = $sort;
630
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
631 631
 			}
632 632
 
633 633
 		}
634 634
 
635 635
 		if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() ) {
636
-			$args['gvid'] = gravityview_get_view_id();
636
+			$args[ 'gvid' ] = gravityview_get_view_id();
637 637
 		}
638 638
 
639 639
 		return add_query_arg( $args, $directory_link );
@@ -654,7 +654,7 @@  discard block
 block discarded – undo
654 654
 }
655 655
 
656 656
 function gv_class( $field, $form = NULL, $entry = array() ) {
657
-	return GravityView_API::field_class( $field, $form, $entry  );
657
+	return GravityView_API::field_class( $field, $form, $entry );
658 658
 }
659 659
 
660 660
 /**
@@ -677,7 +677,7 @@  discard block
 block discarded – undo
677 677
 		$view_id = 0;
678 678
 		if ( $context->view ) {
679 679
 			$view_id = $context->view->ID;
680
-			if( $context->view->settings->get( 'hide_until_searched' ) ) {
680
+			if ( $context->view->settings->get( 'hide_until_searched' ) ) {
681 681
 				$hide_until_searched = ( empty( $context->entry ) && ! $context->request->is_search() );
682 682
 			}
683 683
 		}
@@ -705,7 +705,7 @@  discard block
 block discarded – undo
705 705
 		$default_css_class .= ' gv-container-no-results';
706 706
 	}
707 707
 
708
-	$css_class = trim( $passed_css_class . ' '. $default_css_class );
708
+	$css_class = trim( $passed_css_class . ' ' . $default_css_class );
709 709
 
710 710
 	/**
711 711
 	 * @filter `gravityview/render/container/class` Modify the CSS class to be added to the wrapper <div> of a View
@@ -732,7 +732,7 @@  discard block
 block discarded – undo
732 732
 
733 733
 	$value = GravityView_API::field_value( $entry, $field );
734 734
 
735
-	if( $value === '' ) {
735
+	if ( $value === '' ) {
736 736
 		/**
737 737
 		 * @filter `gravityview_empty_value` What to display when a field is empty
738 738
 		 * @param string $value (empty string)
@@ -839,7 +839,7 @@  discard block
 block discarded – undo
839 839
  */
840 840
 function gravityview_get_field_value( $entry, $field_id, $display_value ) {
841 841
 
842
-	if( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
842
+	if ( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
843 843
 
844 844
 		// For the complete field value as generated by Gravity Forms
845 845
 		return $display_value;
@@ -873,16 +873,16 @@  discard block
 block discarded – undo
873 873
 		$terms = explode( ', ', $value );
874 874
 	}
875 875
 
876
-	foreach ($terms as $term_name ) {
876
+	foreach ( $terms as $term_name ) {
877 877
 
878 878
 		// If we're processing a category,
879
-		if( $taxonomy === 'category' ) {
879
+		if ( $taxonomy === 'category' ) {
880 880
 
881 881
 			// Use rgexplode to prevent errors if : doesn't exist
882 882
 			list( $term_name, $term_id ) = rgexplode( ':', $term_name, 2 );
883 883
 
884 884
 			// The explode was succesful; we have the category ID
885
-			if( !empty( $term_id )) {
885
+			if ( ! empty( $term_id ) ) {
886 886
 				$term = get_term_by( 'id', $term_id, $taxonomy );
887 887
 			} else {
888 888
 			// We have to fall back to the name
@@ -895,7 +895,7 @@  discard block
 block discarded – undo
895 895
 		}
896 896
 
897 897
 		// There's still a tag/category here.
898
-		if( $term ) {
898
+		if ( $term ) {
899 899
 
900 900
 			$term_link = get_term_link( $term, $taxonomy );
901 901
 
@@ -904,11 +904,11 @@  discard block
 block discarded – undo
904 904
 			    continue;
905 905
 			}
906 906
 
907
-			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
907
+			$output[ ] = gravityview_get_link( $term_link, esc_html( $term->name ) );
908 908
 		}
909 909
 	}
910 910
 
911
-	return implode(', ', $output );
911
+	return implode( ', ', $output );
912 912
 }
913 913
 
914 914
 /**
@@ -922,8 +922,8 @@  discard block
 block discarded – undo
922 922
 
923 923
 	$output = get_the_term_list( $post_id, $taxonomy, NULL, ', ' );
924 924
 
925
-	if( empty( $link ) ) {
926
-		return strip_tags( $output);
925
+	if ( empty( $link ) ) {
926
+		return strip_tags( $output );
927 927
 	}
928 928
 
929 929
 	return $output;
@@ -942,7 +942,7 @@  discard block
 block discarded – undo
942 942
 	$fe = GravityView_frontend::getInstance();
943 943
 
944 944
 	// Solve problem when loading content via admin-ajax.php
945
-	if( ! $fe->getGvOutputData() ) {
945
+	if ( ! $fe->getGvOutputData() ) {
946 946
 
947 947
 		gravityview()->log->debug( 'gv_output_data not defined; parsing content.' );
948 948
 
@@ -950,7 +950,7 @@  discard block
 block discarded – undo
950 950
 	}
951 951
 
952 952
 	// Make 100% sure that we're dealing with a properly called situation
953
-	if( !is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
953
+	if ( ! is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
954 954
 
955 955
 		gravityview()->log->debug( 'gv_output_data not an object or get_view not callable.', array( 'data' => $fe->getGvOutputData() ) );
956 956
 
@@ -1155,12 +1155,12 @@  discard block
 block discarded – undo
1155 1155
 function gravityview_get_files_array( $value, $gv_class = '', $context = null ) {
1156 1156
 	/** @define "GRAVITYVIEW_DIR" "../" */
1157 1157
 
1158
-	if( !class_exists( 'GravityView_Field' ) ) {
1159
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field.php' );
1158
+	if ( ! class_exists( 'GravityView_Field' ) ) {
1159
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field.php' );
1160 1160
 	}
1161 1161
 
1162
-	if( !class_exists( 'GravityView_Field_FileUpload' ) ) {
1163
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field-fileupload.php' );
1162
+	if ( ! class_exists( 'GravityView_Field_FileUpload' ) ) {
1163
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field-fileupload.php' );
1164 1164
 	}
1165 1165
 
1166 1166
 	return GravityView_Field_FileUpload::get_files_array( $value, $gv_class, $context );
@@ -1259,21 +1259,21 @@  discard block
 block discarded – undo
1259 1259
 	} else {
1260 1260
 		// @deprecated path
1261 1261
 		// Required fields.
1262
-		if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
1262
+		if ( empty( $args[ 'field' ] ) || empty( $args[ 'form' ] ) ) {
1263 1263
 			gravityview()->log->error( 'Field or form are empty.', array( 'data' => $args ) );
1264 1264
 			return '';
1265 1265
 		}
1266 1266
 	}
1267 1267
 
1268 1268
 	if ( $context instanceof \GV\Template_Context ) {
1269
-		$entry = $args['entry'] ? : ( $context->entry ? $context->entry->as_entry() : array() );
1270
-		$field = $args['field'] ? : ( $context->field ? $context->field->as_configuration() : array() );
1271
-		$form = $args['form'] ? : ( $context->view->form ? $context->view->form->form : array() );
1269
+		$entry = $args[ 'entry' ] ?: ( $context->entry ? $context->entry->as_entry() : array() );
1270
+		$field = $args[ 'field' ] ?: ( $context->field ? $context->field->as_configuration() : array() );
1271
+		$form = $args[ 'form' ] ?: ( $context->view->form ? $context->view->form->form : array() );
1272 1272
 	} else {
1273 1273
 		// @deprecated path
1274
-		$entry = empty( $args['entry'] ) ? array() : $args['entry'];
1275
-		$field = $args['field'];
1276
-		$form = $args['form'];
1274
+		$entry = empty( $args[ 'entry' ] ) ? array() : $args[ 'entry' ];
1275
+		$field = $args[ 'field' ];
1276
+		$form = $args[ 'form' ];
1277 1277
 	}
1278 1278
 
1279 1279
 	/**
@@ -1291,46 +1291,46 @@  discard block
 block discarded – undo
1291 1291
 	);
1292 1292
 
1293 1293
 	if ( $context instanceof \GV\Template_Context ) {
1294
-		$placeholders['value'] = \GV\Utils::get( $args, 'value', '' );
1294
+		$placeholders[ 'value' ] = \GV\Utils::get( $args, 'value', '' );
1295 1295
 	} else {
1296 1296
 		// @deprecated path
1297
-		$placeholders['value'] = gv_value( $entry, $field );
1297
+		$placeholders[ 'value' ] = gv_value( $entry, $field );
1298 1298
 	}
1299 1299
 
1300 1300
 	// If the value is empty and we're hiding empty, return empty.
1301
-	if ( $placeholders['value'] === '' && ! empty( $args['hide_empty'] ) ) {
1301
+	if ( $placeholders[ 'value' ] === '' && ! empty( $args[ 'hide_empty' ] ) ) {
1302 1302
 		return '';
1303 1303
 	}
1304 1304
 
1305
-	if ( $placeholders['value'] !== '' && ! empty( $args['wpautop'] ) ) {
1306
-		$placeholders['value'] = wpautop( $placeholders['value'] );
1305
+	if ( $placeholders[ 'value' ] !== '' && ! empty( $args[ 'wpautop' ] ) ) {
1306
+		$placeholders[ 'value' ] = wpautop( $placeholders[ 'value' ] );
1307 1307
 	}
1308 1308
 
1309 1309
 	// Get width setting, if exists
1310
-	$placeholders['width'] = GravityView_API::field_width( $field );
1310
+	$placeholders[ 'width' ] = GravityView_API::field_width( $field );
1311 1311
 
1312 1312
 	// If replacing with CSS inline formatting, let's do it.
1313
-	$placeholders['width:style'] = GravityView_API::field_width( $field, 'width:' . $placeholders['width'] . '%;' );
1313
+	$placeholders[ 'width:style' ] = GravityView_API::field_width( $field, 'width:' . $placeholders[ 'width' ] . '%;' );
1314 1314
 
1315 1315
 	// Grab the Class using `gv_class`
1316
-	$placeholders['class'] = gv_class( $field, $form, $entry );
1317
-	$placeholders['field_id'] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1316
+	$placeholders[ 'class' ] = gv_class( $field, $form, $entry );
1317
+	$placeholders[ 'field_id' ] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1318 1318
 
1319 1319
 
1320 1320
 	// Get field label if needed
1321
-	if ( ! empty( $args['label_markup'] ) && ! empty( $args['field']['show_label'] ) ) {
1322
-		$placeholders['label'] = str_replace( array( '{{label}}', '{{ label }}' ), '<span class="gv-field-label">{{ label_value }}</span>', $args['label_markup'] );
1321
+	if ( ! empty( $args[ 'label_markup' ] ) && ! empty( $args[ 'field' ][ 'show_label' ] ) ) {
1322
+		$placeholders[ 'label' ] = str_replace( array( '{{label}}', '{{ label }}' ), '<span class="gv-field-label">{{ label_value }}</span>', $args[ 'label_markup' ] );
1323 1323
 	}
1324 1324
 
1325 1325
 	if ( $context instanceof \GV\Template_Context ) {
1326
-		$placeholders['label_value'] = \GV\Utils::get( $args, 'label' );
1326
+		$placeholders[ 'label_value' ] = \GV\Utils::get( $args, 'label' );
1327 1327
 	} else {
1328 1328
 		// Default Label value
1329
-		$placeholders['label_value'] = gv_label( $field, $entry );
1329
+		$placeholders[ 'label_value' ] = gv_label( $field, $entry );
1330 1330
 	}
1331 1331
 
1332
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
1333
-		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
1332
+	if ( empty( $placeholders[ 'label' ] ) && ! empty( $placeholders[ 'label_value' ] ) ) {
1333
+		$placeholders[ 'label' ] = '<span class="gv-field-label">{{ label_value }}</span>';
1334 1334
 	}
1335 1335
 
1336 1336
 	/**
@@ -1341,7 +1341,7 @@  discard block
 block discarded – undo
1341 1341
 	 * @since 2.0
1342 1342
 	 * @param \GV\Template_Context $context The context.
1343 1343
 	 */
1344
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args, $context );
1344
+	$html = apply_filters( 'gravityview/field_output/pre_html', $args[ 'markup' ], $args, $context );
1345 1345
 
1346 1346
 	/**
1347 1347
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
@@ -1368,7 +1368,7 @@  discard block
 block discarded – undo
1368 1368
 	foreach ( $placeholders as $tag => $value ) {
1369 1369
 
1370 1370
 		// If the tag doesn't exist just skip it
1371
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
1371
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
1372 1372
 			continue;
1373 1373
 		}
1374 1374
 
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravity-flow.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 
34 34
 		parent::add_hooks();
35 35
 
36
-		add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown'), 10, 2 );
36
+		add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown' ), 10, 2 );
37 37
 
38 38
 	}
39 39
 	
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
 	 */
53 53
 	public static function get_status_options( $form_id = 0, $status_key = 'workflow_final_status' ) {
54 54
 
55
-		if( empty( $form_id ) ) {
55
+		if ( empty( $form_id ) ) {
56 56
 			$form_id = GravityView_View::getInstance()->getFormId();
57 57
 		}
58 58
 
59 59
 		$entry_meta = gravity_flow()->get_entry_meta( array(), $form_id );
60 60
 
61
-		return (array) \GV\Utils::get( $entry_meta, $status_key . '/filter/choices' );
61
+		return (array)\GV\Utils::get( $entry_meta, $status_key . '/filter/choices' );
62 62
 	}
63 63
 
64 64
 
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 
81 81
 		$workflow_steps = $GFlow->get_steps();
82 82
 
83
-		if( $workflow_steps ) {
83
+		if ( $workflow_steps ) {
84 84
 
85 85
 			foreach ( $workflow_steps as $step ) {
86 86
 
@@ -92,12 +92,12 @@  discard block
 block discarded – undo
92 92
 				);
93 93
 			}
94 94
 
95
-			$fields['workflow_step'] = array(
95
+			$fields[ 'workflow_step' ] = array(
96 96
 				'label' => esc_html__( 'Workflow Step', 'gravityview' ),
97 97
 				'type'  => 'select',
98 98
 			);
99 99
 
100
-			$fields['workflow_final_status'] = array(
100
+			$fields[ 'workflow_final_status' ] = array(
101 101
 				'label' => esc_html__( 'Workflow Status', 'gravityview' ),
102 102
 				'type'  => 'select',
103 103
 			);
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-plugin-hooks-yoast-seo.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 
68 68
 		parent::add_hooks();
69 69
 
70
-		if( gravityview_is_admin_page() ) {
70
+		if ( gravityview_is_admin_page() ) {
71 71
 
72 72
 				// Make Yoast metabox go down to the bottom please.
73 73
 			add_filter( 'wpseo_metabox_prio', array( $this, 'return_low' ) );
@@ -92,8 +92,8 @@  discard block
 block discarded – undo
92 92
 	 */
93 93
 	public function disable_content_analysis( $options ) {
94 94
 
95
-		$options['keyword_analysis_active'] = false;
96
-		$options['content_analysis_active'] = false;
95
+		$options[ 'keyword_analysis_active' ] = false;
96
+		$options[ 'content_analysis_active' ] = false;
97 97
 
98 98
 		return $options;
99 99
 	}
@@ -112,8 +112,8 @@  discard block
 block discarded – undo
112 112
 		global $pagenow;
113 113
 
114 114
 		// New View page
115
-		if( $pagenow === 'post-new.php' ) {
116
-			$options['hideeditbox-gravityview'] = true;
115
+		if ( $pagenow === 'post-new.php' ) {
116
+			$options[ 'hideeditbox-gravityview' ] = true;
117 117
 		}
118 118
 
119 119
 		return $options;
Please login to merge, or discard this patch.
class-gravityview-plugin-hooks-gravity-forms-signature.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 		$signature_fields = GFAPI::get_fields_by_type( $form, 'signature' );
54 54
 
55 55
 		foreach ( $signature_fields as $field ) {
56
-			unset( $_POST["input_{$field->id}"] );
56
+			unset( $_POST[ "input_{$field->id}" ] );
57 57
 		}
58 58
 	}
59 59
 
@@ -72,19 +72,19 @@  discard block
 block discarded – undo
72 72
 	 */
73 73
 	function edit_entry_field_input( $field_content = '', $field, $value = '', $lead_id = 0, $form_id = 0 ) {
74 74
 
75
-		$context = function_exists('gravityview_get_context') ? gravityview_get_context() : '';
75
+		$context = function_exists( 'gravityview_get_context' ) ? gravityview_get_context() : '';
76 76
 
77
-		if( 'signature' !== $field->type || 'edit' !== $context ) {
77
+		if ( 'signature' !== $field->type || 'edit' !== $context ) {
78 78
 			return $field_content;
79 79
 		}
80 80
 
81 81
 		// We need to fetch a fresh version of the entry, since the saved entry hasn't refreshed in GV yet.
82 82
 		$entry = GravityView_View::getInstance()->getCurrentEntry();
83
-		$entry = GFAPI::get_entry( $entry['id'] );
83
+		$entry = GFAPI::get_entry( $entry[ 'id' ] );
84 84
 		$entry_value = \GV\Utils::get( $entry, $field->id );
85 85
 
86
-		$_POST["input_{$field->id}"] = $entry_value; // Used when Edit Entry form *is* submitted
87
-		$_POST["input_{$form_id}_{$field->id}_signature_filename"] = $entry_value; // Used when Edit Entry form *is not* submitted
86
+		$_POST[ "input_{$field->id}" ] = $entry_value; // Used when Edit Entry form *is* submitted
87
+		$_POST[ "input_{$form_id}_{$field->id}_signature_filename" ] = $entry_value; // Used when Edit Entry form *is not* submitted
88 88
 
89 89
 		return ''; // Return empty string to force using $_POST values instead
90 90
 	}
Please login to merge, or discard this patch.
includes/class-gravityview-gfformsmodel.php 2 patches
Indentation   +127 added lines, -127 removed lines patch added patch discarded remove patch
@@ -48,132 +48,132 @@
 block discarded – undo
48 48
 	}
49 49
 
50 50
 	/**
51
-     * Given information provided in an entry, get array of media IDs
52
-     *
53
-     * This is necessary because GF doesn't expect to need to update post images, only to create them.
54
-     *
55
-     * @see GFFormsModel::create_post()
56
-     *
57
-     * @since 1.17
58
-     *
59
-     * @param array $form Gravity Forms form array
60
-     * @param array $entry Gravity Forms entry array
61
-     *
62
-     * @return array Array of "Field ID" => "Media IDs"
63
-     */
64
-    public static function get_post_field_images( $form, $entry ) {
65
-
66
-        $post_data = self::get_post_fields( $form, $entry );
67
-
68
-        $media = get_attached_media( 'image', $entry['post_id'] );
69
-
70
-        $post_images = array();
71
-
72
-        foreach ( $media as $media_item ) {
73
-            foreach( (array) $post_data['images'] as $post_data_item ) {
74
-                if(
75
-                    \GV\Utils::get( $post_data_item, 'title' ) === $media_item->post_title &&
76
-                    \GV\Utils::get( $post_data_item, 'description' ) === $media_item->post_content &&
77
-                    \GV\Utils::get( $post_data_item, 'caption' ) === $media_item->post_excerpt
78
-                ) {
79
-                    $post_images["{$post_data_item['field_id']}"] = $media_item->ID;
80
-                }
81
-            }
82
-        }
83
-
84
-        return $post_images;
85
-    }
86
-
87
-    /**
88
-     * Alias of GFFormsModel::get_post_fields(); just making it public
89
-     *
90
-     * @see GFFormsModel::get_post_fields()
91
-     *
92
-     * @since 1.17
93
-     *
94
-     * @param array $form Gravity Forms form array
95
-     * @param array $entry Gravity Forms entry array
96
-     *
97
-     * @return array
98
-     */
99
-    public static function get_post_fields( $form, $entry ) {
100
-
101
-        $reflection = new ReflectionMethod( 'GFFormsModel', 'get_post_fields' );
102
-
103
-        /**
104
-         * If the method changes to public, use Gravity Forms' method
105
-         * @todo: If/when the method is public, remove the unneeded copied code.
106
-         */
107
-        if( $reflection->isPublic() ) {
108
-            return parent::get_post_fields( $form, $entry );
109
-        }
110
-
111
-        // It was private; let's make it public
112
-        $reflection->setAccessible( true );
113
-
114
-        return $reflection->invoke( new GFFormsModel, $form, $entry );
115
-    }
116
-
117
-    /**
118
-     * Copied function from Gravity Forms plugin \GFFormsModel::copy_post_image since the method is private.
119
-     *
120
-     * @since 1.16.2
121
-     *
122
-     * @param string $url URL of the post image to update
123
-     * @param int $post_id ID of the post image to update
124
-     * @return array|bool Array with `file`, `url` and `type` keys. False: failed to copy file to final directory path.
125
-     */
126
-    public static function copy_post_image( $url, $post_id ) {
127
-
128
-        $reflection = new ReflectionMethod( 'GFFormsModel', 'copy_post_image' );
129
-
130
-        /**
131
-         * If the method changes to public, use Gravity Forms' method
132
-         * @todo: If/when the method is public, remove the unneeded copied code.
133
-         */
134
-        if( $reflection->isPublic() ) {
135
-            return parent::copy_post_image( $url, $post_id );
136
-        }
137
-
138
-        // It was private; let's make it public
139
-        $reflection->setAccessible( true );
140
-
141
-        return $reflection->invoke( new GFFormsModel, $url, $post_id );
142
-    }
143
-
144
-    /**
145
-     * Copied function from Gravity Forms plugin \GFFormsModel::media_handle_upload since the method is private.
146
-     *
147
-     * Note: The method became public in GF 1.9.17.7
148
-     *
149
-     * @see GFFormsModel::media_handle_upload
150
-     * @see GravityView_Edit_Entry_Render::maybe_update_post_fields
151
-     *
152
-     * @uses copy_post_image
153
-     * @uses wp_insert_attachment
154
-     * @uses wp_update_attachment_metadata
155
-     *
156
-     * @param string $url URL of the post image to update
157
-     * @param int $post_id ID of the post image to update
158
-     * @param array $post_data Array of data for the eventual attachment post type that is created using {@see wp_insert_attachment}. Supports `post_mime_type`, `guid`, `post_parent`, `post_title`, `post_content` keys.
159
-     * @return bool|int ID of attachment Post created. Returns false if file not created by copy_post_image
160
-     */
161
-    public static function media_handle_upload( $url, $post_id, $post_data = array() ) {
162
-
163
-        $reflection = new ReflectionMethod( 'GFFormsModel', 'media_handle_upload' );
164
-
165
-        /**
166
-         * If the method changes to public, use Gravity Forms' method
167
-         * @todo: If/when the method is public, remove the unneeded copied code.
168
-         */
169
-        if( $reflection->isPublic() ) {
170
-            return parent::media_handle_upload( $url, $post_id, $post_data );
171
-        }
172
-
173
-        // It was private; let's make it public
174
-        $reflection->setAccessible( true );
175
-
176
-        return $reflection->invoke( new GFFormsModel, $url, $post_id, $post_data );
177
-    }
51
+	 * Given information provided in an entry, get array of media IDs
52
+	 *
53
+	 * This is necessary because GF doesn't expect to need to update post images, only to create them.
54
+	 *
55
+	 * @see GFFormsModel::create_post()
56
+	 *
57
+	 * @since 1.17
58
+	 *
59
+	 * @param array $form Gravity Forms form array
60
+	 * @param array $entry Gravity Forms entry array
61
+	 *
62
+	 * @return array Array of "Field ID" => "Media IDs"
63
+	 */
64
+	public static function get_post_field_images( $form, $entry ) {
65
+
66
+		$post_data = self::get_post_fields( $form, $entry );
67
+
68
+		$media = get_attached_media( 'image', $entry['post_id'] );
69
+
70
+		$post_images = array();
71
+
72
+		foreach ( $media as $media_item ) {
73
+			foreach( (array) $post_data['images'] as $post_data_item ) {
74
+				if(
75
+					\GV\Utils::get( $post_data_item, 'title' ) === $media_item->post_title &&
76
+					\GV\Utils::get( $post_data_item, 'description' ) === $media_item->post_content &&
77
+					\GV\Utils::get( $post_data_item, 'caption' ) === $media_item->post_excerpt
78
+				) {
79
+					$post_images["{$post_data_item['field_id']}"] = $media_item->ID;
80
+				}
81
+			}
82
+		}
83
+
84
+		return $post_images;
85
+	}
86
+
87
+	/**
88
+	 * Alias of GFFormsModel::get_post_fields(); just making it public
89
+	 *
90
+	 * @see GFFormsModel::get_post_fields()
91
+	 *
92
+	 * @since 1.17
93
+	 *
94
+	 * @param array $form Gravity Forms form array
95
+	 * @param array $entry Gravity Forms entry array
96
+	 *
97
+	 * @return array
98
+	 */
99
+	public static function get_post_fields( $form, $entry ) {
100
+
101
+		$reflection = new ReflectionMethod( 'GFFormsModel', 'get_post_fields' );
102
+
103
+		/**
104
+		 * If the method changes to public, use Gravity Forms' method
105
+		 * @todo: If/when the method is public, remove the unneeded copied code.
106
+		 */
107
+		if( $reflection->isPublic() ) {
108
+			return parent::get_post_fields( $form, $entry );
109
+		}
110
+
111
+		// It was private; let's make it public
112
+		$reflection->setAccessible( true );
113
+
114
+		return $reflection->invoke( new GFFormsModel, $form, $entry );
115
+	}
116
+
117
+	/**
118
+	 * Copied function from Gravity Forms plugin \GFFormsModel::copy_post_image since the method is private.
119
+	 *
120
+	 * @since 1.16.2
121
+	 *
122
+	 * @param string $url URL of the post image to update
123
+	 * @param int $post_id ID of the post image to update
124
+	 * @return array|bool Array with `file`, `url` and `type` keys. False: failed to copy file to final directory path.
125
+	 */
126
+	public static function copy_post_image( $url, $post_id ) {
127
+
128
+		$reflection = new ReflectionMethod( 'GFFormsModel', 'copy_post_image' );
129
+
130
+		/**
131
+		 * If the method changes to public, use Gravity Forms' method
132
+		 * @todo: If/when the method is public, remove the unneeded copied code.
133
+		 */
134
+		if( $reflection->isPublic() ) {
135
+			return parent::copy_post_image( $url, $post_id );
136
+		}
137
+
138
+		// It was private; let's make it public
139
+		$reflection->setAccessible( true );
140
+
141
+		return $reflection->invoke( new GFFormsModel, $url, $post_id );
142
+	}
143
+
144
+	/**
145
+	 * Copied function from Gravity Forms plugin \GFFormsModel::media_handle_upload since the method is private.
146
+	 *
147
+	 * Note: The method became public in GF 1.9.17.7
148
+	 *
149
+	 * @see GFFormsModel::media_handle_upload
150
+	 * @see GravityView_Edit_Entry_Render::maybe_update_post_fields
151
+	 *
152
+	 * @uses copy_post_image
153
+	 * @uses wp_insert_attachment
154
+	 * @uses wp_update_attachment_metadata
155
+	 *
156
+	 * @param string $url URL of the post image to update
157
+	 * @param int $post_id ID of the post image to update
158
+	 * @param array $post_data Array of data for the eventual attachment post type that is created using {@see wp_insert_attachment}. Supports `post_mime_type`, `guid`, `post_parent`, `post_title`, `post_content` keys.
159
+	 * @return bool|int ID of attachment Post created. Returns false if file not created by copy_post_image
160
+	 */
161
+	public static function media_handle_upload( $url, $post_id, $post_data = array() ) {
162
+
163
+		$reflection = new ReflectionMethod( 'GFFormsModel', 'media_handle_upload' );
164
+
165
+		/**
166
+		 * If the method changes to public, use Gravity Forms' method
167
+		 * @todo: If/when the method is public, remove the unneeded copied code.
168
+		 */
169
+		if( $reflection->isPublic() ) {
170
+			return parent::media_handle_upload( $url, $post_id, $post_data );
171
+		}
172
+
173
+		// It was private; let's make it public
174
+		$reflection->setAccessible( true );
175
+
176
+		return $reflection->invoke( new GFFormsModel, $url, $post_id, $post_data );
177
+	}
178 178
 
179 179
 }
180 180
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -40,8 +40,8 @@  discard block
 block discarded – undo
40 40
 	public static function is_value_match( $field_value, $target_value, $operation = 'is', $source_field = null, $rule = null, $form = null ) {
41 41
 
42 42
 		if ( 'date_created' === $source_field ) {
43
-			$field_value = is_int( $field_value )? $field_value : strtotime( $field_value );
44
-			$target_value = is_int( $target_value )? $target_value : strtotime( $target_value );
43
+			$field_value = is_int( $field_value ) ? $field_value : strtotime( $field_value );
44
+			$target_value = is_int( $target_value ) ? $target_value : strtotime( $target_value );
45 45
 		}
46 46
 
47 47
 		return parent::is_value_match( $field_value, $target_value, $operation, $source_field, $rule, $form ); // TODO: Change the autogenerated stub
@@ -65,18 +65,18 @@  discard block
 block discarded – undo
65 65
 
66 66
         $post_data = self::get_post_fields( $form, $entry );
67 67
 
68
-        $media = get_attached_media( 'image', $entry['post_id'] );
68
+        $media = get_attached_media( 'image', $entry[ 'post_id' ] );
69 69
 
70 70
         $post_images = array();
71 71
 
72 72
         foreach ( $media as $media_item ) {
73
-            foreach( (array) $post_data['images'] as $post_data_item ) {
74
-                if(
73
+            foreach ( (array)$post_data[ 'images' ] as $post_data_item ) {
74
+                if (
75 75
                     \GV\Utils::get( $post_data_item, 'title' ) === $media_item->post_title &&
76 76
                     \GV\Utils::get( $post_data_item, 'description' ) === $media_item->post_content &&
77 77
                     \GV\Utils::get( $post_data_item, 'caption' ) === $media_item->post_excerpt
78 78
                 ) {
79
-                    $post_images["{$post_data_item['field_id']}"] = $media_item->ID;
79
+                    $post_images[ "{$post_data_item[ 'field_id' ]}" ] = $media_item->ID;
80 80
                 }
81 81
             }
82 82
         }
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
          * If the method changes to public, use Gravity Forms' method
105 105
          * @todo: If/when the method is public, remove the unneeded copied code.
106 106
          */
107
-        if( $reflection->isPublic() ) {
107
+        if ( $reflection->isPublic() ) {
108 108
             return parent::get_post_fields( $form, $entry );
109 109
         }
110 110
 
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
          * If the method changes to public, use Gravity Forms' method
132 132
          * @todo: If/when the method is public, remove the unneeded copied code.
133 133
          */
134
-        if( $reflection->isPublic() ) {
134
+        if ( $reflection->isPublic() ) {
135 135
             return parent::copy_post_image( $url, $post_id );
136 136
         }
137 137
 
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
          * If the method changes to public, use Gravity Forms' method
167 167
          * @todo: If/when the method is public, remove the unneeded copied code.
168 168
          */
169
-        if( $reflection->isPublic() ) {
169
+        if ( $reflection->isPublic() ) {
170 170
             return parent::media_handle_upload( $url, $post_id, $post_data );
171 171
         }
172 172
 
Please login to merge, or discard this patch.
includes/class-data.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 
21 21
 		if ( ! empty( $passed_post ) ) {
22 22
 			$id_or_id_array = $this->maybe_get_view_id( $passed_post );
23
-			foreach( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) {
23
+			foreach ( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) {
24 24
 				if ( \GV\View::exists( $view_id ) && ! $this->views->contains( $view_id ) ) {
25 25
 					$this->views->add( \GV\View::by_id( $view_id ) );
26 26
 				}
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 				foreach ( $passed_post as &$post ) {
76 76
 					$views = \GV\View_Collection::from_post( $post );
77 77
 					foreach ( $views->all() as $view ) {
78
-						$ids []= $view->ID;
78
+						$ids [ ] = $view->ID;
79 79
 
80 80
 						/** And as a side-effect... add each view to the global scope. */
81 81
 						if ( ! $this->views->contains( $view->ID ) ) {
@@ -89,29 +89,29 @@  discard block
 block discarded – undo
89 89
 				if ( is_string( $passed_post ) ) {
90 90
 					$shortcodes = \GV\Shortcode::parse( $passed_post );
91 91
 					foreach ( $shortcodes as $shortcode ) {
92
-						if ( $shortcode->name == 'gravityview' && !empty( $shortcode->atts['id'] ) ) {
93
-							$ids []= $shortcode->atts['id'];
92
+						if ( $shortcode->name == 'gravityview' && ! empty( $shortcode->atts[ 'id' ] ) ) {
93
+							$ids [ ] = $shortcode->atts[ 'id' ];
94 94
 
95 95
 							/** And as a side-effect... add each view to the global scope. */
96
-							if ( ! $this->views->contains( $shortcode->atts['id'] ) && \GV\View::exists( $shortcode->atts['id'] ) ) {
97
-								$this->views->add( $shortcode->atts['id'] );
96
+							if ( ! $this->views->contains( $shortcode->atts[ 'id' ] ) && \GV\View::exists( $shortcode->atts[ 'id' ] ) ) {
97
+								$this->views->add( $shortcode->atts[ 'id' ] );
98 98
 							}
99 99
 						}
100 100
 					}
101 101
 				} else {
102 102
 					$id = $this->get_id_from_atts( $passed_post );
103
-					$ids[] = intval( $id );
103
+					$ids[ ] = intval( $id );
104 104
 				}
105 105
 			}
106 106
 		}
107 107
 
108
-		if( empty($ids) ) {
108
+		if ( empty( $ids ) ) {
109 109
 			return NULL;
110 110
 		}
111 111
 
112 112
 		// If it's just one ID, return that.
113 113
 		// Otherwise, return array of IDs
114
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
114
+		return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
115 115
 	}
116 116
 
117 117
 	/**
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 	 */
120 120
 	public static function getInstance( $passed_post = NULL ) {
121 121
 
122
-		if( empty( self::$instance ) ) {
122
+		if ( empty( self::$instance ) ) {
123 123
 			self::$instance = new GravityView_View_Data( $passed_post );
124 124
 		}
125 125
 
@@ -135,8 +135,8 @@  discard block
 block discarded – undo
135 135
 			return array();
136 136
 		}
137 137
 		return array_combine(
138
-			array_map( function ( $view ) { return $view->ID; }, $this->views->all() ),
139
-			array_map( function ( $view ) { return $view->as_data(); }, $this->views->all() )
138
+			array_map( function( $view ) { return $view->ID; }, $this->views->all() ),
139
+			array_map( function( $view ) { return $view->as_data(); }, $this->views->all() )
140 140
 		);
141 141
 	}
142 142
 
@@ -245,22 +245,22 @@  discard block
 block discarded – undo
245 245
 	public function parse_post_content( $content ) {
246 246
 		$ids = array();
247 247
 		foreach ( \GV\Shortcode::parse( $content ) as $shortcode ) {
248
-			if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts['id'] ) ) {
249
-				if ( \GV\View::exists( $shortcode->atts['id'] ) && ! $this->views->contains( $shortcode->atts['id'] ) ) {
250
-					$this->views->add( \GV\View::by_id( $shortcode->atts['id'] ) );
248
+			if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts[ 'id' ] ) ) {
249
+				if ( \GV\View::exists( $shortcode->atts[ 'id' ] ) && ! $this->views->contains( $shortcode->atts[ 'id' ] ) ) {
250
+					$this->views->add( \GV\View::by_id( $shortcode->atts[ 'id' ] ) );
251 251
 				}
252 252
 				/**
253 253
 				 * The original function outputs the ID even though it wasn't added by ::add_view()
254 254
 				 * Wether this is a bug or not remains a mystery. But we need to emulate this behavior
255 255
 				 * until better times.
256 256
 				 */
257
-				$ids []= $shortcode->atts['id'];
257
+				$ids [ ] = $shortcode->atts[ 'id' ];
258 258
 			}
259 259
 		}
260 260
 		if ( empty ( $ids ) ) {
261 261
 			return null;
262 262
 		}
263
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
263
+		return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
264 264
 	}
265 265
 
266 266
 	/**
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
 		// Not invalid if not set!
284 284
 		if ( empty( $post_id ) || empty( $view_id ) ) {
285 285
 
286
-			if( $empty_is_valid ) {
286
+			if ( $empty_is_valid ) {
287 287
 				return true;
288 288
 			}
289 289
 
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 			$view_ids_in_post = array_map( function( $view ) { return $view->ID; }, $views->all() );
317 317
 
318 318
 			// The post or page specified does not contain the shortcode.
319
-			if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) {
319
+			if ( false === in_array( $view_id, (array)$view_ids_in_post ) ) {
320 320
 				$message = sprintf( esc_html__( 'The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview' ), '<br /><code>[gravityview id="' . intval( $view_id ) . '"]</code>' );
321 321
 			}
322 322
 		}
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 		if ( ! $message ) {
325 325
 			// It's a View
326 326
 			if ( \GV\View::exists( $post_id ) ) {
327
-				$message = esc_html__( 'The ID is already a View.', 'gravityview' );;
327
+				$message = esc_html__( 'The ID is already a View.', 'gravityview' ); ;
328 328
 			}
329 329
 		}
330 330
 
Please login to merge, or discard this patch.
includes/class-gvlogic-shortcode.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 */
88 88
 	public static function get_instance() {
89 89
 
90
-		if( empty( self::$instance ) ) {
90
+		if ( empty( self::$instance ) ) {
91 91
 			self::$instance = new self;
92 92
 		}
93 93
 
@@ -121,9 +121,9 @@  discard block
 block discarded – undo
121 121
 
122 122
 		$operators = array_merge( self::$SUPPORTED_ARRAY_OPERATORS, self::$SUPPORTED_NUMERIC_OPERATORS, self::$SUPPORTED_SCALAR_OPERATORS, self::$SUPPORTED_CUSTOM_OPERATORS );
123 123
 
124
-		if( $with_values ) {
124
+		if ( $with_values ) {
125 125
 			$operators_with_values = array();
126
-			foreach( $operators as $key ) {
126
+			foreach ( $operators as $key ) {
127 127
 				$operators_with_values[ $key ] = '';
128 128
 			}
129 129
 			return $operators_with_values;
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 
143 143
 		$operators = $this->get_operators( false );
144 144
 
145
-		if( !in_array( $operation, $operators ) ) {
145
+		if ( ! in_array( $operation, $operators ) ) {
146 146
 			gravityview()->log->debug( ' Attempted to add invalid operation type. {operation}', array( 'operation' => $operation ) );
147 147
 			return false;
148 148
 		}
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 			return null;
195 195
 		}
196 196
 
197
-		if( empty( $atts ) ) {
197
+		if ( empty( $atts ) ) {
198 198
 			gravityview()->log->error( '$atts are empty.', array( 'data' => $atts ) );
199 199
 			return null;
200 200
 		}
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 		$this->parse_atts();
210 210
 
211 211
 		// We need an "if"
212
-		if( false === $this->if ) {
212
+		if ( false === $this->if ) {
213 213
 			gravityview()->log->error( '$atts->if is empty.', array( 'data' => $this->passed_atts ) );
214 214
 			return null;
215 215
 		}
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 		$setup = $this->setup_operation_and_comparison();
218 218
 
219 219
 		// We need an operation and comparison value
220
-		if( ! $setup ) {
220
+		if ( ! $setup ) {
221 221
 			gravityview()->log->error( 'No valid operators were passed.', array( 'data' => $this->atts ) );
222 222
 			return null;
223 223
 		}
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
 	 */
268 268
 	private function get_output() {
269 269
 
270
-		if( $this->is_match ) {
270
+		if ( $this->is_match ) {
271 271
 			$output = $this->content;
272 272
 		} else {
273 273
 			$output = $this->else_content;
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
 		 * @param string $output HTML/text output
286 286
 		 * @param GVLogic_Shortcode $this This class
287 287
 		 */
288
-		$output = apply_filters('gravityview/gvlogic/output', $output, $this );
288
+		$output = apply_filters( 'gravityview/gvlogic/output', $output, $this );
289 289
 
290 290
 		gravityview()->log->debug( 'Output: ', array( 'data' => $output ) );
291 291
 
@@ -305,14 +305,14 @@  discard block
 block discarded – undo
305 305
 		list( $before_else, $after_else ) = array_pad( explode( '[else]', $passed_content ), 2, NULL );
306 306
 		list( $before_else_if, $after_else_if ) = array_pad( explode( '[else', $passed_content ), 2, NULL );
307 307
 
308
-		$else_attr = isset( $this->atts['else'] ) ? $this->atts['else'] : NULL;
308
+		$else_attr = isset( $this->atts[ 'else' ] ) ? $this->atts[ 'else' ] : NULL;
309 309
 		$else_content = isset( $after_else ) ? $after_else : $else_attr;
310 310
 
311 311
 		// The content is everything OTHER than the [else]
312 312
 		$this->content = $before_else_if;
313 313
 
314 314
 		if ( ! $this->is_match ) {
315
-			if( $elseif_content = $this->process_elseif( $before_else ) ) {
315
+			if ( $elseif_content = $this->process_elseif( $before_else ) ) {
316 316
 				$this->else_content = $elseif_content;
317 317
 			} else {
318 318
 				$this->else_content = $else_content;
@@ -340,16 +340,16 @@  discard block
 block discarded – undo
340 340
 		foreach ( $else_if_matches as $key => $else_if_match ) {
341 341
 
342 342
 			// If $else_if_match[5] exists and has content, check for more shortcodes
343
-			preg_match_all( '/' . $regex . '/', $else_if_match[5] . '[/else]', $recursive_matches, PREG_SET_ORDER );
343
+			preg_match_all( '/' . $regex . '/', $else_if_match[ 5 ] . '[/else]', $recursive_matches, PREG_SET_ORDER );
344 344
 
345 345
 			// If the logic passes, this is the value that should be used for $this->else_content
346
-			$else_if_value = $else_if_match[5];
347
-			$check_elseif_match = $else_if_match[0];
346
+			$else_if_value = $else_if_match[ 5 ];
347
+			$check_elseif_match = $else_if_match[ 0 ];
348 348
 
349 349
 			// Retrieve the value of the match that is currently being checked, without any other [else] tags
350
-			if( ! empty( $recursive_matches[0][0] ) ) {
351
-				$else_if_value = str_replace( $recursive_matches[0][0], '', $else_if_value );
352
-				$check_elseif_match = str_replace( $recursive_matches[0][0], '', $check_elseif_match );
350
+			if ( ! empty( $recursive_matches[ 0 ][ 0 ] ) ) {
351
+				$else_if_value = str_replace( $recursive_matches[ 0 ][ 0 ], '', $else_if_value );
352
+				$check_elseif_match = str_replace( $recursive_matches[ 0 ][ 0 ], '', $check_elseif_match );
353 353
 			}
354 354
 
355 355
 			$check_elseif_match = str_replace( '[else', '[gvlogicelse', $check_elseif_match );
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
 			}
367 367
 
368 368
 			// Process any remaining [else] tags
369
-			return $this->process_elseif( $else_if_match[5] );
369
+			return $this->process_elseif( $else_if_match[ 5 ] );
370 370
 		}
371 371
 
372 372
 		return false;
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
392 392
 		$this->atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( $this->passed_atts, $this->atts ) : $this->atts;
393 393
 
394 394
 		// Strip whitespace if it's not default false
395
-		$this->if = ( isset( $this->atts['if'] ) && is_string( $this->atts['if'] ) ) ? trim( $this->atts['if'] ) : false;
395
+		$this->if = ( isset( $this->atts[ 'if' ] ) && is_string( $this->atts[ 'if' ] ) ) ? trim( $this->atts[ 'if' ] ) : false;
396 396
 
397 397
 		/**
398 398
 		 * @action `gravityview/gvlogic/parse_atts/after` Modify shortcode attributes after it's been parsed
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
 		do_action( 'gravityview/gvlogic/parse_atts/after', $this );
404 404
 
405 405
 		// Make sure the "if" isn't processed in self::setup_operation_and_comparison()
406
-		unset( $this->atts['if'] );
406
+		unset( $this->atts[ 'if' ] );
407 407
 	}
408 408
 }
409 409
 
Please login to merge, or discard this patch.
includes/class-gravityview-admin-notices.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -60,21 +60,21 @@  discard block
 block discarded – undo
60 60
 	public function dismiss_notice() {
61 61
 
62 62
 		// No dismiss sent
63
-		if( empty( $_GET['gv-dismiss'] ) ) {
63
+		if ( empty( $_GET[ 'gv-dismiss' ] ) ) {
64 64
 			return;
65 65
 		}
66 66
 
67 67
 		// Invalid nonce
68
-		if( !wp_verify_nonce( $_GET['gv-dismiss'], 'dismiss' ) ) {
68
+		if ( ! wp_verify_nonce( $_GET[ 'gv-dismiss' ], 'dismiss' ) ) {
69 69
 			return;
70 70
 		}
71 71
 
72
-		$notice_id = esc_attr( $_GET['notice'] );
72
+		$notice_id = esc_attr( $_GET[ 'notice' ] );
73 73
 
74 74
 		//don't display a message if use has dismissed the message for this version
75 75
 		$dismissed_notices = (array)get_transient( 'gravityview_dismissed_notices' );
76 76
 
77
-		$dismissed_notices[] = $notice_id;
77
+		$dismissed_notices[ ] = $notice_id;
78 78
 
79 79
 		$dismissed_notices = array_unique( $dismissed_notices );
80 80
 
@@ -97,12 +97,12 @@  discard block
 block discarded – undo
97 97
 	private function is_notice_dismissed( $notice ) {
98 98
 
99 99
 		// There are no dismissed notices.
100
-		if( empty( self::$dismissed_notices ) ) {
100
+		if ( empty( self::$dismissed_notices ) ) {
101 101
 			return false;
102 102
 		}
103 103
 
104 104
 		// Has the
105
-		$is_dismissed = !empty( $notice['dismiss'] ) && in_array( $notice['dismiss'], self::$dismissed_notices );
105
+		$is_dismissed = ! empty( $notice[ 'dismiss' ] ) && in_array( $notice[ 'dismiss' ], self::$dismissed_notices );
106 106
 
107 107
 		return $is_dismissed ? true : false;
108 108
 	}
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 	 */
128 128
 	private function check_show_multisite_notices() {
129 129
 
130
-		if( ! is_multisite() ) {
130
+		if ( ! is_multisite() ) {
131 131
 			return true;
132 132
 		}
133 133
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 		}
138 138
 
139 139
 		// or they don't have admin capabilities
140
-		if( ! is_super_admin() ) {
140
+		if ( ! is_super_admin() ) {
141 141
 			return false;
142 142
 		}
143 143
 
@@ -160,48 +160,48 @@  discard block
 block discarded – undo
160 160
 		 */
161 161
 		$notices = apply_filters( 'gravityview/admin/notices', self::$admin_notices );
162 162
 
163
-		if( empty( $notices ) || ! $this->check_show_multisite_notices() ) {
163
+		if ( empty( $notices ) || ! $this->check_show_multisite_notices() ) {
164 164
 			return;
165 165
 		}
166 166
 
167 167
 		//don't display a message if use has dismissed the message for this version
168 168
 		// TODO: Use get_user_meta instead of get_transient
169
-		self::$dismissed_notices = isset( $_GET['show-dismissed-notices'] ) ? array() : (array)get_transient( 'gravityview_dismissed_notices' );
169
+		self::$dismissed_notices = isset( $_GET[ 'show-dismissed-notices' ] ) ? array() : (array)get_transient( 'gravityview_dismissed_notices' );
170 170
 
171 171
 		$output = '';
172 172
 
173
-		foreach( $notices as $notice ) {
173
+		foreach ( $notices as $notice ) {
174 174
 
175 175
 			// If the user doesn't have the capability to see the warning
176
-			if( isset( $notice['cap'] ) && false === GVCommon::has_cap( $notice['cap'] ) ) {
176
+			if ( isset( $notice[ 'cap' ] ) && false === GVCommon::has_cap( $notice[ 'cap' ] ) ) {
177 177
 				gravityview()->log->debug( 'Notice not shown because user does not have the capability to view it.', array( 'data' => $notice ) );
178 178
 				continue;
179 179
 			}
180 180
 
181
-			if( true === $this->is_notice_dismissed( $notice ) ) {
181
+			if ( true === $this->is_notice_dismissed( $notice ) ) {
182 182
 				gravityview()->log->debug( 'Notice not shown because the notice has already been dismissed.', array( 'data' => $notice ) );
183 183
 				continue;
184 184
 			}
185 185
 
186
-			$output .= '<div id="message" style="position:relative" class="notice '. gravityview_sanitize_html_class( $notice['class'] ).'">';
186
+			$output .= '<div id="message" style="position:relative" class="notice ' . gravityview_sanitize_html_class( $notice[ 'class' ] ) . '">';
187 187
 
188 188
 			// Too cute to leave out.
189 189
 			$output .= gravityview_get_floaty();
190 190
 
191
-			if( !empty( $notice['title'] ) ) {
192
-				$output .= '<h3>'.esc_html( $notice['title'] ) .'</h3>';
191
+			if ( ! empty( $notice[ 'title' ] ) ) {
192
+				$output .= '<h3>' . esc_html( $notice[ 'title' ] ) . '</h3>';
193 193
 			}
194 194
 
195
-			$message = isset( $notice['message'] ) ? $notice['message'] : '';
195
+			$message = isset( $notice[ 'message' ] ) ? $notice[ 'message' ] : '';
196 196
 
197
-			if( !empty( $notice['dismiss'] ) ) {
197
+			if ( ! empty( $notice[ 'dismiss' ] ) ) {
198 198
 
199
-				$dismiss = esc_attr($notice['dismiss']);
199
+				$dismiss = esc_attr( $notice[ 'dismiss' ] );
200 200
 
201 201
 				$url = esc_url( add_query_arg( array( 'gv-dismiss' => wp_create_nonce( 'dismiss' ), 'notice' => $dismiss ) ) );
202 202
 
203 203
 				$align = is_rtl() ? 'alignleft' : 'alignright';
204
-				$message .= '<a href="'.$url.'" data-notice="'.$dismiss.'" class="' . $align . ' button button-link">'.esc_html__('Dismiss', 'gravityview' ).'</a></p>';
204
+				$message .= '<a href="' . $url . '" data-notice="' . $dismiss . '" class="' . $align . ' button button-link">' . esc_html__( 'Dismiss', 'gravityview' ) . '</a></p>';
205 205
 			}
206 206
 
207 207
 			$output .= wpautop( $message );
@@ -233,14 +233,14 @@  discard block
 block discarded – undo
233 233
 	 */
234 234
 	public static function add_notice( $notice = array() ) {
235 235
 
236
-		if( !isset( $notice['message'] ) ) {
236
+		if ( ! isset( $notice[ 'message' ] ) ) {
237 237
 			gravityview()->log->error( 'Notice not set', array( 'data' => $notice ) );
238 238
 			return;
239 239
 		}
240 240
 
241
-		$notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class'];
241
+		$notice[ 'class' ] = empty( $notice[ 'class' ] ) ? 'error' : $notice[ 'class' ];
242 242
 
243
-		self::$admin_notices[] = $notice;
243
+		self::$admin_notices[ ] = $notice;
244 244
 	}
245 245
 }
246 246
 
Please login to merge, or discard this patch.