Completed
Pull Request — develop (#1404)
by Gennady
06:09
created
future/includes/class-gv-logger-wp-action.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -27,12 +27,12 @@  discard block
 block discarded – undo
27 27
 	 */
28 28
 	protected function log( $level, $message, $context ) {
29 29
 
30
-		$php_version = ( ! empty( $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] ) ) ?
31
-			$GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion();
30
+		$php_version = ( ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ) ?
31
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion();
32 32
 
33 33
 		if ( version_compare( $php_version, '5.4', '>=' ) ) {
34 34
 			$backtrace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, 3 );
35
-			$location = $this->interpolate( "{class}{type}{function}", $backtrace[2] );
35
+			$location = $this->interpolate( "{class}{type}{function}", $backtrace[ 2 ] );
36 36
 			$message = $this->interpolate( "[$level, $location] $message", $context );
37 37
 		} else {
38 38
 			$message = "[$level] $message";
@@ -58,14 +58,14 @@  discard block
 block discarded – undo
58 58
 			do_action(
59 59
 				sprintf( 'gravityview_log_%s_test', $action ),
60 60
 				$this->interpolate( $message, $context ),
61
-				empty( $context['data'] ) ? array() : $context['data']
61
+				empty( $context[ 'data' ] ) ? array() : $context[ 'data' ]
62 62
 			);
63 63
 		}
64 64
 		
65 65
 		do_action(
66 66
 			sprintf( 'gravityview_log_%s', $action ),
67 67
 			$this->interpolate( $message, $context ),
68
-			empty( $context['data'] ) ? array() : $context['data']
68
+			empty( $context[ 'data' ] ) ? array() : $context[ 'data' ]
69 69
 		);
70 70
 	}
71 71
 }
Please login to merge, or discard this patch.
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 5 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.
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.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -526,7 +526,7 @@
 block discarded – undo
526 526
 					$column = 'lead_id';
527 527
 				}
528 528
 
529
-				$results = $wpdb->get_results( $wpdb->prepare( "SELECT $column, meta_value FROM $table WHERE form_id = (SELECT form_id FROM $table WHERE $column = %d LIMIT 1) AND meta_key = 'gravityview_unique_id'", $id_or_string ) );
529
+				$results = $wpdb->get_results( $wpdb->prepare( "select $column, meta_value FROM $table WHERE form_id = (SELECT form_id FROM $table WHERE $column = %d LIMIT 1) AND meta_key = 'gravityview_unique_id'", $id_or_string ) );
530 530
 
531 531
 				if ( $results ) {
532 532
 					$cache = array_replace( $cache, array_combine( wp_list_pluck( $results, $column ), wp_list_pluck( $results, 'meta_value' ) ) );
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1380,7 +1380,7 @@  discard block
 block discarded – undo
1380 1380
 	$placeholders['label_value:data-label'] = trim( esc_attr( strip_tags( str_replace( '> ', '>', $placeholders['label_value'] ) ) ) );
1381 1381
 	$placeholders['label_value:esc_attr'] = esc_attr( $placeholders['label_value'] );
1382 1382
 
1383
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
1383
+	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ) {
1384 1384
 		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
1385 1385
 	}
1386 1386
 
@@ -1419,7 +1419,7 @@  discard block
 block discarded – undo
1419 1419
 	foreach ( $placeholders as $tag => $value ) {
1420 1420
 
1421 1421
 		// If the tag doesn't exist just skip it
1422
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
1422
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
1423 1423
 			continue;
1424 1424
 		}
1425 1425
 
Please login to merge, or discard this patch.
Spacing   +107 added lines, -107 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
 		}
@@ -403,9 +403,9 @@  discard block
 block discarded – undo
403 403
 
404 404
 		// If we've saved the permalink in memory, use it
405 405
 		// @since 1.3
406
-		$link = wp_cache_get( 'gv_directory_link_'.$post_id );
406
+		$link = wp_cache_get( 'gv_directory_link_' . $post_id );
407 407
 
408
-		if ( (int) $post_id === (int) get_option( 'page_on_front' ) ) {
408
+		if ( (int)$post_id === (int)get_option( 'page_on_front' ) ) {
409 409
 			$link = home_url();
410 410
 		}
411 411
 
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
 
415 415
 			// If not yet saved, cache the permalink.
416 416
 			// @since 1.3
417
-			wp_cache_set( 'gv_directory_link_'.$post_id, $link );
417
+			wp_cache_set( 'gv_directory_link_' . $post_id, $link );
418 418
 		}
419 419
 
420 420
 		// Deal with returning to proper pagination for embedded views
@@ -422,13 +422,13 @@  discard block
 block discarded – undo
422 422
 
423 423
 			$args = array();
424 424
 
425
-			if( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
426
-				$args['pagenum'] = intval( $pagenum );
425
+			if ( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
426
+				$args[ 'pagenum' ] = intval( $pagenum );
427 427
 			}
428 428
 
429
-			if( $sort = \GV\Utils::_GET( 'sort' ) ) {
430
-				$args['sort'] = $sort;
431
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
429
+			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
430
+				$args[ 'sort' ] = $sort;
431
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
432 432
 			}
433 433
 
434 434
 			$link = add_query_arg( $args, $link );
@@ -465,7 +465,7 @@  discard block
 block discarded – undo
465 465
 	private static function get_custom_entry_slug( $id, $entry = array() ) {
466 466
 
467 467
 		// Generate an unique hash to use as the default value
468
-		$slug = substr( wp_hash( $id, 'gravityview'.$id ), 0, 8 );
468
+		$slug = substr( wp_hash( $id, 'gravityview' . $id ), 0, 8 );
469 469
 
470 470
 		/**
471 471
 		 * @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}`
@@ -476,7 +476,7 @@  discard block
 block discarded – undo
476 476
 		$slug = apply_filters( 'gravityview_entry_slug', $slug, $id, $entry );
477 477
 
478 478
 		// Make sure we have something - use the original ID as backup.
479
-		if( empty( $slug ) ) {
479
+		if ( empty( $slug ) ) {
480 480
 			$slug = $id;
481 481
 		}
482 482
 
@@ -570,15 +570,15 @@  discard block
 block discarded – undo
570 570
          * @param boolean $custom Should we process the custom entry slug?
571 571
          */
572 572
         $custom = apply_filters( 'gravityview_custom_entry_slug', false );
573
-        if( $custom ) {
573
+        if ( $custom ) {
574 574
             // create the gravityview_unique_id and save it
575 575
 
576 576
             // Get the entry hash
577
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
577
+            $hash = self::get_custom_entry_slug( $entry[ 'id' ], $entry );
578 578
 
579
-	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry['id'], 'hash' => $hash ) );
579
+	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry[ 'id' ], 'hash' => $hash ) );
580 580
 
581
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
581
+            gform_update_meta( $entry[ 'id' ], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
582 582
 
583 583
         }
584 584
     }
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
 
598 598
 		if ( ! empty( $entry ) && ! is_array( $entry ) ) {
599 599
 			$entry = GVCommon::get_entry( $entry );
600
-		} else if( empty( $entry ) ) {
600
+		} else if ( empty( $entry ) ) {
601 601
 			// @deprecated path
602 602
 			$entry = GravityView_frontend::getInstance()->getEntry();
603 603
 		}
@@ -617,18 +617,18 @@  discard block
 block discarded – undo
617 617
 
618 618
 		$query_arg_name = \GV\Entry::get_endpoint_name();
619 619
 
620
-		if ( ! empty( $entry['_multi'] ) ) {
620
+		if ( ! empty( $entry[ '_multi' ] ) ) {
621 621
 			$entry_slugs = array();
622
-			foreach ( $entry['_multi'] as $_multi ) {
623
-				$entry_slugs[] = self::get_entry_slug( $_multi['id'], $_multi );
624
-				$forms[] = $_multi['form_id'];
622
+			foreach ( $entry[ '_multi' ] as $_multi ) {
623
+				$entry_slugs[ ] = self::get_entry_slug( $_multi[ 'id' ], $_multi );
624
+				$forms[ ] = $_multi[ 'form_id' ];
625 625
 			}
626 626
 			$entry_slug = implode( ',', $entry_slugs );
627 627
 		} else {
628
-			$entry_slug = self::get_entry_slug( $entry['id'], $entry );
628
+			$entry_slug = self::get_entry_slug( $entry[ 'id' ], $entry );
629 629
 		}
630 630
 
631
-		if ( get_option('permalink_structure') && !is_preview() ) {
631
+		if ( get_option( 'permalink_structure' ) && ! is_preview() ) {
632 632
 
633 633
 			$args = array();
634 634
 
@@ -638,9 +638,9 @@  discard block
 block discarded – undo
638 638
 			 */
639 639
 			$link_parts = explode( '?', $directory_link );
640 640
 
641
-			$query = !empty( $link_parts[1] ) ? '?'.$link_parts[1] : '';
641
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
642 642
 
643
-			$directory_link = trailingslashit( $link_parts[0] ) . $query_arg_name . '/'. $entry_slug .'/' . $query;
643
+			$directory_link = trailingslashit( $link_parts[ 0 ] ) . $query_arg_name . '/' . $entry_slug . '/' . $query;
644 644
 
645 645
 		} else {
646 646
 
@@ -652,21 +652,21 @@  discard block
 block discarded – undo
652 652
 		 */
653 653
 		if ( $add_directory_args ) {
654 654
 
655
-			if ( ! empty( $_GET['pagenum'] ) ) {
656
-				$args['pagenum'] = intval( $_GET['pagenum'] );
655
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
656
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
657 657
 			}
658 658
 
659 659
 			/**
660 660
 			 * @since 1.7
661 661
 			 */
662 662
 			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
663
-				$args['sort'] = $sort;
664
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
663
+				$args[ 'sort' ] = $sort;
664
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
665 665
 			}
666 666
 
667 667
 		}
668 668
 
669
-		if( $post_id ) {
669
+		if ( $post_id ) {
670 670
 			$passed_post = get_post( $post_id );
671 671
 			$views       = \GV\View_Collection::from_post( $passed_post );
672 672
 			$has_multiple_views = $views->count() > 1;
@@ -675,7 +675,7 @@  discard block
 block discarded – undo
675 675
 		}
676 676
 
677 677
 		if ( $has_multiple_views ) {
678
-			$args['gvid'] = gravityview_get_view_id();
678
+			$args[ 'gvid' ] = gravityview_get_view_id();
679 679
 		}
680 680
 
681 681
 		return add_query_arg( $args, $directory_link );
@@ -696,7 +696,7 @@  discard block
 block discarded – undo
696 696
 }
697 697
 
698 698
 function gv_class( $field, $form = NULL, $entry = array() ) {
699
-	return GravityView_API::field_class( $field, $form, $entry  );
699
+	return GravityView_API::field_class( $field, $form, $entry );
700 700
 }
701 701
 
702 702
 /**
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
719 719
 		$view_id = 0;
720 720
 		if ( $context->view ) {
721 721
 			$view_id = $context->view->ID;
722
-			if( $context->view->settings->get( 'hide_until_searched' ) ) {
722
+			if ( $context->view->settings->get( 'hide_until_searched' ) ) {
723 723
 				$hide_until_searched = ( empty( $context->entry ) && ! $context->request->is_search() );
724 724
 			}
725 725
 		}
@@ -747,7 +747,7 @@  discard block
 block discarded – undo
747 747
 		$default_css_class .= ' gv-container-no-results';
748 748
 	}
749 749
 
750
-	$css_class = trim( $passed_css_class . ' '. $default_css_class );
750
+	$css_class = trim( $passed_css_class . ' ' . $default_css_class );
751 751
 
752 752
 	/**
753 753
 	 * @filter `gravityview/render/container/class` Modify the CSS class to be added to the wrapper <div> of a View
@@ -774,7 +774,7 @@  discard block
 block discarded – undo
774 774
 
775 775
 	$value = GravityView_API::field_value( $entry, $field );
776 776
 
777
-	if( $value === '' ) {
777
+	if ( $value === '' ) {
778 778
 		/**
779 779
 		 * @filter `gravityview_empty_value` What to display when a field is empty
780 780
 		 * @param string $value (empty string)
@@ -887,7 +887,7 @@  discard block
 block discarded – undo
887 887
  */
888 888
 function gravityview_get_field_value( $entry, $field_id, $display_value ) {
889 889
 
890
-	if( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
890
+	if ( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
891 891
 
892 892
 		// For the complete field value as generated by Gravity Forms
893 893
 		return $display_value;
@@ -921,16 +921,16 @@  discard block
 block discarded – undo
921 921
 		$terms = explode( ', ', $value );
922 922
 	}
923 923
 
924
-	foreach ($terms as $term_name ) {
924
+	foreach ( $terms as $term_name ) {
925 925
 
926 926
 		// If we're processing a category,
927
-		if( $taxonomy === 'category' ) {
927
+		if ( $taxonomy === 'category' ) {
928 928
 
929 929
 			// Use rgexplode to prevent errors if : doesn't exist
930 930
 			list( $term_name, $term_id ) = rgexplode( ':', $term_name, 2 );
931 931
 
932 932
 			// The explode was succesful; we have the category ID
933
-			if( !empty( $term_id )) {
933
+			if ( ! empty( $term_id ) ) {
934 934
 				$term = get_term_by( 'id', $term_id, $taxonomy );
935 935
 			} else {
936 936
 			// We have to fall back to the name
@@ -943,7 +943,7 @@  discard block
 block discarded – undo
943 943
 		}
944 944
 
945 945
 		// There's still a tag/category here.
946
-		if( $term ) {
946
+		if ( $term ) {
947 947
 
948 948
 			$term_link = get_term_link( $term, $taxonomy );
949 949
 
@@ -952,11 +952,11 @@  discard block
 block discarded – undo
952 952
 			    continue;
953 953
 			}
954 954
 
955
-			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
955
+			$output[ ] = gravityview_get_link( $term_link, esc_html( $term->name ) );
956 956
 		}
957 957
 	}
958 958
 
959
-	return implode(', ', $output );
959
+	return implode( ', ', $output );
960 960
 }
961 961
 
962 962
 /**
@@ -970,8 +970,8 @@  discard block
 block discarded – undo
970 970
 
971 971
 	$output = get_the_term_list( $post_id, $taxonomy, NULL, ', ' );
972 972
 
973
-	if( empty( $link ) ) {
974
-		return strip_tags( $output);
973
+	if ( empty( $link ) ) {
974
+		return strip_tags( $output );
975 975
 	}
976 976
 
977 977
 	return $output;
@@ -990,7 +990,7 @@  discard block
 block discarded – undo
990 990
 	$fe = GravityView_frontend::getInstance();
991 991
 
992 992
 	// Solve problem when loading content via admin-ajax.php
993
-	if( ! $fe->getGvOutputData() ) {
993
+	if ( ! $fe->getGvOutputData() ) {
994 994
 
995 995
 		gravityview()->log->debug( 'gv_output_data not defined; parsing content.' );
996 996
 
@@ -998,7 +998,7 @@  discard block
 block discarded – undo
998 998
 	}
999 999
 
1000 1000
 	// Make 100% sure that we're dealing with a properly called situation
1001
-	if( !is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
1001
+	if ( ! is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
1002 1002
 
1003 1003
 		gravityview()->log->debug( 'gv_output_data not an object or get_view not callable.', array( 'data' => $fe->getGvOutputData() ) );
1004 1004
 
@@ -1220,12 +1220,12 @@  discard block
 block discarded – undo
1220 1220
 function gravityview_get_files_array( $value, $gv_class = '', $context = null ) {
1221 1221
 	/** @define "GRAVITYVIEW_DIR" "../" */
1222 1222
 
1223
-	if( !class_exists( 'GravityView_Field' ) ) {
1224
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field.php' );
1223
+	if ( ! class_exists( 'GravityView_Field' ) ) {
1224
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field.php' );
1225 1225
 	}
1226 1226
 
1227
-	if( !class_exists( 'GravityView_Field_FileUpload' ) ) {
1228
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field-fileupload.php' );
1227
+	if ( ! class_exists( 'GravityView_Field_FileUpload' ) ) {
1228
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field-fileupload.php' );
1229 1229
 	}
1230 1230
 
1231 1231
 	if ( is_null( $context ) ) {
@@ -1328,21 +1328,21 @@  discard block
 block discarded – undo
1328 1328
 	} else {
1329 1329
 		// @deprecated path
1330 1330
 		// Required fields.
1331
-		if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
1331
+		if ( empty( $args[ 'field' ] ) || empty( $args[ 'form' ] ) ) {
1332 1332
 			gravityview()->log->error( 'Field or form are empty.', array( 'data' => $args ) );
1333 1333
 			return '';
1334 1334
 		}
1335 1335
 	}
1336 1336
 
1337 1337
 	if ( $context instanceof \GV\Template_Context ) {
1338
-		$entry = $args['entry'] ? : ( $context->entry ? $context->entry->as_entry() : array() );
1339
-		$field = $args['field'] ? : ( $context->field ? $context->field->as_configuration() : array() );
1340
-		$form = $args['form'] ? : ( $context->view->form ? $context->view->form->form : array() );
1338
+		$entry = $args[ 'entry' ] ?: ( $context->entry ? $context->entry->as_entry() : array() );
1339
+		$field = $args[ 'field' ] ?: ( $context->field ? $context->field->as_configuration() : array() );
1340
+		$form = $args[ 'form' ] ?: ( $context->view->form ? $context->view->form->form : array() );
1341 1341
 	} else {
1342 1342
 		// @deprecated path
1343
-		$entry = empty( $args['entry'] ) ? array() : $args['entry'];
1344
-		$field = $args['field'];
1345
-		$form = $args['form'];
1343
+		$entry = empty( $args[ 'entry' ] ) ? array() : $args[ 'entry' ];
1344
+		$field = $args[ 'field' ];
1345
+		$form = $args[ 'form' ];
1346 1346
 	}
1347 1347
 
1348 1348
 	/**
@@ -1362,43 +1362,43 @@  discard block
 block discarded – undo
1362 1362
 	);
1363 1363
 
1364 1364
 	if ( $context instanceof \GV\Template_Context ) {
1365
-		$placeholders['value'] = \GV\Utils::get( $args, 'value', '' );
1365
+		$placeholders[ 'value' ] = \GV\Utils::get( $args, 'value', '' );
1366 1366
 	} else {
1367 1367
 		// @deprecated path
1368
-		$placeholders['value'] = gv_value( $entry, $field );
1368
+		$placeholders[ 'value' ] = gv_value( $entry, $field );
1369 1369
 	}
1370 1370
 
1371 1371
 	// If the value is empty and we're hiding empty, return empty.
1372
-	if ( $placeholders['value'] === '' && ! empty( $args['hide_empty'] ) ) {
1372
+	if ( $placeholders[ 'value' ] === '' && ! empty( $args[ 'hide_empty' ] ) ) {
1373 1373
 		return '';
1374 1374
 	}
1375 1375
 
1376
-	if ( $placeholders['value'] !== '' && ! empty( $args['wpautop'] ) ) {
1377
-		$placeholders['value'] = wpautop( $placeholders['value'] );
1376
+	if ( $placeholders[ 'value' ] !== '' && ! empty( $args[ 'wpautop' ] ) ) {
1377
+		$placeholders[ 'value' ] = wpautop( $placeholders[ 'value' ] );
1378 1378
 	}
1379 1379
 
1380 1380
 	// Get width setting, if exists
1381
-	$placeholders['width'] = GravityView_API::field_width( $field );
1381
+	$placeholders[ 'width' ] = GravityView_API::field_width( $field );
1382 1382
 
1383 1383
 	// If replacing with CSS inline formatting, let's do it.
1384
-	$placeholders['width:style'] = GravityView_API::field_width( $field, 'width:' . $placeholders['width'] . '%;' );
1384
+	$placeholders[ 'width:style' ] = GravityView_API::field_width( $field, 'width:' . $placeholders[ 'width' ] . '%;' );
1385 1385
 
1386 1386
 	// Grab the Class using `gv_class`
1387
-	$placeholders['class'] = gv_class( $field, $form, $entry );
1388
-	$placeholders['field_id'] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1387
+	$placeholders[ 'class' ] = gv_class( $field, $form, $entry );
1388
+	$placeholders[ 'field_id' ] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1389 1389
 
1390 1390
 	if ( $context instanceof \GV\Template_Context ) {
1391
-		$placeholders['label_value'] = \GV\Utils::get( $args, 'label' );
1391
+		$placeholders[ 'label_value' ] = \GV\Utils::get( $args, 'label' );
1392 1392
 	} else {
1393 1393
 		// Default Label value
1394
-		$placeholders['label_value'] = gv_label( $field, $entry );
1394
+		$placeholders[ 'label_value' ] = gv_label( $field, $entry );
1395 1395
 	}
1396 1396
 
1397
-	$placeholders['label_value:data-label'] = trim( esc_attr( strip_tags( str_replace( '>&nbsp;', '>', $placeholders['label_value'] ) ) ) );
1398
-	$placeholders['label_value:esc_attr'] = esc_attr( $placeholders['label_value'] );
1397
+	$placeholders[ 'label_value:data-label' ] = trim( esc_attr( strip_tags( str_replace( '>&nbsp;', '>', $placeholders[ 'label_value' ] ) ) ) );
1398
+	$placeholders[ 'label_value:esc_attr' ] = esc_attr( $placeholders[ 'label_value' ] );
1399 1399
 
1400
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
1401
-		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
1400
+	if ( empty( $placeholders[ 'label' ] ) && ! empty( $placeholders[ 'label_value' ] ) ) {
1401
+		$placeholders[ 'label' ] = '<span class="gv-field-label">{{ label_value }}</span>';
1402 1402
 	}
1403 1403
 
1404 1404
 	/**
@@ -1409,7 +1409,7 @@  discard block
 block discarded – undo
1409 1409
 	 * @since 2.0
1410 1410
 	 * @param \GV\Template_Context $context The context.
1411 1411
 	 */
1412
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args, $context );
1412
+	$html = apply_filters( 'gravityview/field_output/pre_html', $args[ 'markup' ], $args, $context );
1413 1413
 
1414 1414
 	/**
1415 1415
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
@@ -1436,7 +1436,7 @@  discard block
 block discarded – undo
1436 1436
 	foreach ( $placeholders as $tag => $value ) {
1437 1437
 
1438 1438
 		// If the tag doesn't exist just skip it
1439
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
1439
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
1440 1440
 			continue;
1441 1441
 		}
1442 1442
 
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   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -40,17 +40,17 @@  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 ( in_array( $source_field, array( 'date_created', 'date_updated', 'payment_date' ), true ) ) {
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
 		if ( $source_field instanceof GF_Field && $source_field->type == 'date' ) {
48
-			$field_value = is_int( $field_value )? $field_value : strtotime( $field_value );
49
-			$target_value = is_int( $target_value )? $target_value : strtotime( $target_value );
48
+			$field_value = is_int( $field_value ) ? $field_value : strtotime( $field_value );
49
+			$target_value = is_int( $target_value ) ? $target_value : strtotime( $target_value );
50 50
 		}
51 51
 
52 52
 		if ( in_array( $_operation = str_replace( ' ', '_', trim( $operation ) ), array( 'in', 'not_in' ) ) ) {
53
-			return GVCommon::matches_operation( (array) $field_value, (array) $target_value, $_operation );
53
+			return GVCommon::matches_operation( (array)$field_value, (array)$target_value, $_operation );
54 54
 		}
55 55
 
56 56
 		return parent::is_value_match( $field_value, $target_value, $operation, $source_field, $rule, $form );
@@ -74,18 +74,18 @@  discard block
 block discarded – undo
74 74
 
75 75
         $post_data = self::get_post_fields( $form, $entry );
76 76
 
77
-        $media = get_attached_media( 'image', $entry['post_id'] );
77
+        $media = get_attached_media( 'image', $entry[ 'post_id' ] );
78 78
 
79 79
         $post_images = array();
80 80
 
81 81
         foreach ( $media as $media_item ) {
82
-            foreach( (array) $post_data['images'] as $post_data_item ) {
83
-                if(
82
+            foreach ( (array)$post_data[ 'images' ] as $post_data_item ) {
83
+                if (
84 84
                     \GV\Utils::get( $post_data_item, 'title' ) === $media_item->post_title &&
85 85
                     \GV\Utils::get( $post_data_item, 'description' ) === $media_item->post_content &&
86 86
                     \GV\Utils::get( $post_data_item, 'caption' ) === $media_item->post_excerpt
87 87
                 ) {
88
-                    $post_images["{$post_data_item['field_id']}"] = $media_item->ID;
88
+                    $post_images[ "{$post_data_item[ 'field_id' ]}" ] = $media_item->ID;
89 89
                 }
90 90
             }
91 91
         }
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
          * If the method changes to public, use Gravity Forms' method
114 114
          * @todo: If/when the method is public, remove the unneeded copied code.
115 115
          */
116
-        if( $reflection->isPublic() ) {
116
+        if ( $reflection->isPublic() ) {
117 117
             return parent::get_post_fields( $form, $entry );
118 118
         }
119 119
 
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
          * If the method changes to public, use Gravity Forms' method
141 141
          * @todo: If/when the method is public, remove the unneeded copied code.
142 142
          */
143
-        if( $reflection->isPublic() ) {
143
+        if ( $reflection->isPublic() ) {
144 144
             return parent::copy_post_image( $url, $post_id );
145 145
         }
146 146
 
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
          * If the method changes to public, use Gravity Forms' method
176 176
          * @todo: If/when the method is public, remove the unneeded copied code.
177 177
          */
178
-        if( $reflection->isPublic() ) {
178
+        if ( $reflection->isPublic() ) {
179 179
             return parent::media_handle_upload( $url, $post_id, $post_data );
180 180
         }
181 181
 
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-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.
includes/class-gravityview-entry-approval-status.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -113,16 +113,16 @@  discard block
 block discarded – undo
113 113
 		$new_value = $old_value;
114 114
 
115 115
 		// Meta value does not exist yet
116
-		if( false === $old_value ) {
116
+		if ( false === $old_value ) {
117 117
 			return self::UNAPPROVED;
118 118
 		}
119 119
 
120 120
 		// Meta value does not exist yet
121
-		if( true === $old_value ) {
121
+		if ( true === $old_value ) {
122 122
 			return self::APPROVED;
123 123
 		}
124 124
 
125
-		switch ( (string) $old_value ) {
125
+		switch ( (string)$old_value ) {
126 126
 
127 127
 			// Approved values
128 128
 			case 'Approved':
@@ -248,9 +248,9 @@  discard block
 block discarded – undo
248 248
 		foreach ( $choices as $key => $choice ) {
249 249
 
250 250
 			// Is the passed status value the same as the choice value or key?
251
-			if ( $status === $choice['value'] || $status === $key ) {
251
+			if ( $status === $choice[ 'value' ] || $status === $key ) {
252 252
 
253
-				if( 'key' === $attr_key ) {
253
+				if ( 'key' === $attr_key ) {
254 254
 					return $key;
255 255
 				} else {
256 256
 					return \GV\Utils::get( $choice, $attr_key, false );
Please login to merge, or discard this patch.
includes/widgets/class-gravityview-widget-page-links.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -11,35 +11,35 @@  discard block
 block discarded – undo
11 11
 
12 12
 	function __construct() {
13 13
 
14
-		$this->widget_description = __('Links to multiple pages of results.', 'gravityview' );
14
+		$this->widget_description = __( 'Links to multiple pages of results.', 'gravityview' );
15 15
 
16 16
 		$default_values = array( 'header' => 1, 'footer' => 1 );
17 17
 		$settings = array( 'show_all' => array(
18 18
 			'type' => 'checkbox',
19 19
 			'label' => __( 'Show each page number', 'gravityview' ),
20
-			'desc' => __('Show every page number instead of summary (eg: 1 2 3 ... 8 »)', 'gravityview'),
20
+			'desc' => __( 'Show every page number instead of summary (eg: 1 2 3 ... 8 »)', 'gravityview' ),
21 21
 			'value' => false
22
-		));
23
-		parent::__construct( __( 'Page Links', 'gravityview' ) , 'page_links', $default_values, $settings );
22
+		) );
23
+		parent::__construct( __( 'Page Links', 'gravityview' ), 'page_links', $default_values, $settings );
24 24
 
25 25
 	}
26 26
 
27
-	public function render_frontend( $widget_args, $content = '', $context = '') {
27
+	public function render_frontend( $widget_args, $content = '', $context = '' ) {
28 28
 		$gravityview_view = GravityView_View::getInstance();
29 29
 
30
-		if( !$this->pre_render_frontend() ) {
30
+		if ( ! $this->pre_render_frontend() ) {
31 31
 			return;
32 32
 		}
33 33
 
34 34
 		$atts = shortcode_atts( array(
35 35
 			'page_size' => \GV\Utils::get( $gravityview_view->paging, 'page_size' ),
36 36
 			'total' => $gravityview_view->total_entries,
37
-			'show_all' => !empty( $this->settings['show_all']['default'] ),
38
-			'current' => (int) \GV\Utils::_GET( 'pagenum', 1 ),
37
+			'show_all' => ! empty( $this->settings[ 'show_all' ][ 'default' ] ),
38
+			'current' => (int)\GV\Utils::_GET( 'pagenum', 1 ),
39 39
 		), $widget_args, 'gravityview_widget_page_links' );
40 40
 		
41 41
 		$page_link_args = array(
42
-			'base' => add_query_arg('pagenum','%#%', gv_directory_link() ),
42
+			'base' => add_query_arg( 'pagenum', '%#%', gv_directory_link() ),
43 43
 			'format' => '&pagenum=%#%',
44 44
 			'add_args' => array(), //
45 45
 			'prev_text' => '&laquo;',
@@ -47,9 +47,9 @@  discard block
 block discarded – undo
47 47
 			'type' => 'list',
48 48
 			'end_size' => 1,
49 49
 			'mid_size' => 2,
50
-			'total' => empty( $atts['page_size'] ) ? 0 : ceil( $atts['total'] / $atts['page_size'] ),
51
-			'current' => $atts['current'],
52
-			'show_all' => !empty( $atts['show_all'] ), // to be available at backoffice
50
+			'total' => empty( $atts[ 'page_size' ] ) ? 0 : ceil( $atts[ 'total' ] / $atts[ 'page_size' ] ),
51
+			'current' => $atts[ 'current' ],
52
+			'show_all' => ! empty( $atts[ 'show_all' ] ), // to be available at backoffice
53 53
 		);
54 54
 
55 55
 		/**
@@ -57,14 +57,14 @@  discard block
 block discarded – undo
57 57
 		 * @since 1.1.4
58 58
 		 * @param array  $page_link_args Array of arguments for the `paginate_links()` function. [Read more about `paginate_links()`](http://developer.wordpress.org/reference/functions/paginate_links/)
59 59
 		 */
60
-		$page_link_args = apply_filters('gravityview_page_links_args', $page_link_args );
60
+		$page_link_args = apply_filters( 'gravityview_page_links_args', $page_link_args );
61 61
 
62 62
 		$page_links = paginate_links( $page_link_args );
63 63
 
64
-		if( !empty( $page_links )) {
65
-			$class = !empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
64
+		if ( ! empty( $page_links ) ) {
65
+			$class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
66 66
 			$class = gravityview_sanitize_html_class( 'gv-widget-page-links ' . $class );
67
-			echo '<div class="'.$class.'">'. $page_links .'</div>';
67
+			echo '<div class="' . $class . '">' . $page_links . '</div>';
68 68
 		} else {
69 69
 			gravityview()->log->debug( 'No page links; paginate_links() returned empty response.' );
70 70
 		}
Please login to merge, or discard this patch.