Completed
Push — develop ( 177769...43d0d5 )
by Zack
18:22
created
includes/admin/class-gravityview-admin-view-item.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -44,12 +44,12 @@  discard block
 block discarded – undo
44 44
 	 */
45 45
 	protected $form_id;
46 46
 
47
-	function __construct( $title = '', $item_id = '', $item = array(), $settings = array(), $form_id = null) {
47
+	function __construct( $title = '', $item_id = '', $item = array(), $settings = array(), $form_id = null ) {
48 48
 
49 49
 		// Backward compat
50
-		if ( ! empty( $item['type'] ) ) {
51
-			$item['input_type'] = $item['type'];
52
-			unset( $item['type'] );
50
+		if ( ! empty( $item[ 'type' ] ) ) {
51
+			$item[ 'input_type' ] = $item[ 'type' ];
52
+			unset( $item[ 'type' ] );
53 53
 		}
54 54
 
55 55
 		if ( $admin_label = \GV\Utils::get( $settings, 'admin_label' ) ) {
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 		$this->id         = $item_id;
77 77
 		$this->form_id    = $form_id;
78 78
 		$this->settings   = $settings;
79
-		$this->label_type = $item['label_type'];
79
+		$this->label_type = $item[ 'label_type' ];
80 80
 	}
81 81
 
82 82
 	/**
@@ -120,14 +120,14 @@  discard block
 block discarded – undo
120 120
 
121 121
 			foreach ( $field_info_items as $item ) {
122 122
 
123
-				if( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
123
+				if ( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
124 124
 					continue;
125 125
 				}
126 126
 
127
-				$class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description';
127
+				$class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description';
128 128
 				// Add the title in case the value's long, in which case, it'll be truncated by CSS.
129 129
 				$output .= '<span class="' . $class . '">';
130
-				$output .= esc_html( $item['value'] );
130
+				$output .= esc_html( $item[ 'value' ] );
131 131
 				$output .= '</span>';
132 132
 			}
133 133
 
@@ -156,46 +156,46 @@  discard block
 block discarded – undo
156 156
 
157 157
 		// $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know.
158 158
 		// TODO: Un-hack this
159
-		$hide_settings_link_class = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
160
-		$settings_link      = sprintf( '<button class="gv-field-settings %2$s" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class );
159
+		$hide_settings_link_class = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
160
+		$settings_link = sprintf( '<button class="gv-field-settings %2$s" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class );
161 161
 
162 162
 		// When a field label is empty, use the Field ID
163 163
 		$label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title;
164 164
 
165 165
 		// If there's a custom label, and show label is checked, use that as the field heading
166
-		if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) {
167
-			$label = $this->settings['custom_label'];
168
-		} else if ( ! empty( $this->item['customLabel'] ) ) {
169
-			$label = $this->item['customLabel'];
166
+		if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) {
167
+			$label = $this->settings[ 'custom_label' ];
168
+		} else if ( ! empty( $this->item[ 'customLabel' ] ) ) {
169
+			$label = $this->item[ 'customLabel' ];
170 170
 		}
171 171
 		$label = esc_attr( $label );
172 172
 
173 173
 		$field_icon = '';
174 174
 
175 175
 		$form = ! empty( $this->form_id ) ? GVCommon::get_form( $this->form_id ) : false;
176
-		$nonexistent_form_field = $form && $this->id && preg_match('/^\d+\.\d+$|^\d+$/', $this->id) && ! gravityview_get_field( $form, $this->id );
176
+		$nonexistent_form_field = $form && $this->id && preg_match( '/^\d+\.\d+$|^\d+$/', $this->id ) && ! gravityview_get_field( $form, $this->id );
177 177
 
178
-		if ( $this->item['icon'] && ! \GV\Utils::get( $this->item, 'parent' ) ) {
178
+		if ( $this->item[ 'icon' ] && ! \GV\Utils::get( $this->item, 'parent' ) ) {
179 179
 
180
-			$has_gf_icon = ( false !== strpos( $this->item['icon'], 'gform-icon' ) );
181
-			$has_dashicon = ( false !== strpos( $this->item['icon'], 'dashicons' ) );
180
+			$has_gf_icon = ( false !== strpos( $this->item[ 'icon' ], 'gform-icon' ) );
181
+			$has_dashicon = ( false !== strpos( $this->item[ 'icon' ], 'dashicons' ) );
182 182
 
183
-			if ( 0 === strpos( $this->item['icon'], 'data:' ) ) {
183
+			if ( 0 === strpos( $this->item[ 'icon' ], 'data:' ) ) {
184 184
 				// Inline icon SVG
185
-				$field_icon = '<i class="dashicons background-icon" style="background-image: url(\'' . esc_attr( $this->item['icon'] ) . '\');"></i>';
186
-			} elseif( $has_gf_icon && gravityview()->plugin->is_GF_25() ) {
185
+				$field_icon = '<i class="dashicons background-icon" style="background-image: url(\'' . esc_attr( $this->item[ 'icon' ] ) . '\');"></i>';
186
+			} elseif ( $has_gf_icon && gravityview()->plugin->is_GF_25() ) {
187 187
 				// Gravity Forms icon font
188
-				$field_icon = '<i class="gform-icon ' . esc_attr( $this->item['icon'] ) . '"></i>';
189
-			} elseif( $has_dashicon ) {
188
+				$field_icon = '<i class="gform-icon ' . esc_attr( $this->item[ 'icon' ] ) . '"></i>';
189
+			} elseif ( $has_dashicon ) {
190 190
 				// Dashicon; prefix with "dashicons"
191
-				$field_icon = '<i class="dashicons ' . esc_attr( $this->item['icon'] ) . '"></i>';
191
+				$field_icon = '<i class="dashicons ' . esc_attr( $this->item[ 'icon' ] ) . '"></i>';
192 192
 			} else {
193 193
 				// Not dashicon icon
194
-				$field_icon = '<i class="' . esc_attr( $this->item['icon'] ) . '"></i>';
194
+				$field_icon = '<i class="' . esc_attr( $this->item[ 'icon' ] ) . '"></i>';
195 195
 			}
196 196
 
197 197
 			$field_icon = $field_icon . ' ';
198
-		} elseif( \GV\Utils::get( $this->item, 'parent' ) ) {
198
+		} elseif ( \GV\Utils::get( $this->item, 'parent' ) ) {
199 199
 			$field_icon = '<i class="gv-icon gv-icon-level-down"></i>' . ' ';
200 200
 		}
201 201
 
@@ -222,19 +222,19 @@  discard block
 block discarded – undo
222 222
 
223 223
 		$output .= '</h5>';
224 224
 
225
-		$container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : '';
225
+		$container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : '';
226 226
 
227 227
 		$container_class .= $nonexistent_form_field ? ' gv-nonexistent-form-field' : '';
228 228
 
229
-		$container_class .= empty( $this->settings['show_as_link'] ) ? '' : ' has-single-entry-link';
229
+		$container_class .= empty( $this->settings[ 'show_as_link' ] ) ? '' : ' has-single-entry-link';
230 230
 
231
-		$container_class .= empty( $this->settings['only_loggedin'] ) ? '' : ' has-custom-visibility';
231
+		$container_class .= empty( $this->settings[ 'only_loggedin' ] ) ? '' : ' has-custom-visibility';
232 232
 
233
-		$data_form_id   = $form ? ' data-formid="' . esc_attr( $this->form_id ) . '"' : '';
233
+		$data_form_id = $form ? ' data-formid="' . esc_attr( $this->form_id ) . '"' : '';
234 234
 
235
-		$data_parent_label = ! empty( $this->item['parent'] ) ? ' data-parent-label="' . esc_attr( $this->item['parent']['label'] ) . '"' : '';
235
+		$data_parent_label = ! empty( $this->item[ 'parent' ] ) ? ' data-parent-label="' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . '"' : '';
236 236
 
237
-		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . $data_parent_label . ' data-inputtype="' . esc_attr( $this->item['input_type'] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item['settings_html'] . '</div>';
237
+		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . $data_parent_label . ' data-inputtype="' . esc_attr( $this->item[ 'input_type' ] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item[ 'settings_html' ] . '</div>';
238 238
 
239 239
 		return $output;
240 240
 	}
@@ -252,12 +252,12 @@  discard block
 block discarded – undo
252 252
 
253 253
 		$icons = array(
254 254
 			'show_as_link' => array(
255
-				'visible' => ( ! empty( $this->settings['show_as_link'] ) ),
255
+				'visible' => ( ! empty( $this->settings[ 'show_as_link' ] ) ),
256 256
 				'title' => __( 'This field links to the Single Entry', 'gravityview' ),
257 257
 				'css_class' => 'dashicons dashicons-media-default icon-link-to-single-entry',
258 258
 			),
259 259
 			'only_loggedin' => array(
260
-				'visible' => ( \GV\Utils::get( $this->settings, 'only_loggedin' ) || isset( $this->settings['allow_edit_cap'] ) && 'read' !== $this->settings['allow_edit_cap'] ),
260
+				'visible' => ( \GV\Utils::get( $this->settings, 'only_loggedin' ) || isset( $this->settings[ 'allow_edit_cap' ] ) && 'read' !== $this->settings[ 'allow_edit_cap' ] ),
261 261
 				'title' => __( 'This field has modified visibility', 'gravityview' ),
262 262
 				'css_class' => 'dashicons dashicons-lock icon-custom-visibility',
263 263
 			),
@@ -271,21 +271,21 @@  discard block
 block discarded – undo
271 271
 		 * @param array $icons Array of icons to be shown, with `visible`, `title`, `css_class` keys.
272 272
 		 * @param array $item_settings Settings for the current item (widget or field)
273 273
 		 */
274
-		$icons = (array) apply_filters( 'gravityview/admin/indicator_icons', $icons, $this->settings );
274
+		$icons = (array)apply_filters( 'gravityview/admin/indicator_icons', $icons, $this->settings );
275 275
 
276 276
 		foreach ( $icons as $icon ) {
277 277
 
278
-			if ( empty( $icon['css_class'] ) || empty( $icon['title'] ) ) {
278
+			if ( empty( $icon[ 'css_class' ] ) || empty( $icon[ 'title' ] ) ) {
279 279
 				continue;
280 280
 			}
281 281
 
282
-			$css_class = trim( $icon['css_class'] );
282
+			$css_class = trim( $icon[ 'css_class' ] );
283 283
 
284
-			if ( empty( $icon['visible'] ) ) {
284
+			if ( empty( $icon[ 'visible' ] ) ) {
285 285
 				$css_class .= ' hide-if-js';
286 286
 			}
287 287
 
288
-			$output .= '<span class="' . gravityview_sanitize_html_class( $css_class ) . '" title="' . esc_attr( $icon['title'] ) . '"></span>';
288
+			$output .= '<span class="' . gravityview_sanitize_html_class( $css_class ) . '" title="' . esc_attr( $icon[ 'title' ] ) . '"></span>';
289 289
 		}
290 290
 
291 291
 		return $output;
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravityformsquiz.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -50,26 +50,26 @@
 block discarded – undo
50 50
 
51 51
 		if ( ! empty( $quiz_fields ) ) {
52 52
 
53
-			$fields['gquiz_score']   = array(
53
+			$fields[ 'gquiz_score' ] = array(
54 54
 				'label' => __( 'Quiz Score Total', 'gravityview' ),
55 55
 				'type'  => 'quiz_score',
56 56
 				'desc'  => __( 'Displays the number of correct Quiz answers the user submitted.', 'gravityview' ),
57 57
 				'icon'  => 'dashicons-forms',
58 58
 			);
59
-			$fields['gquiz_percent'] = array(
59
+			$fields[ 'gquiz_percent' ] = array(
60 60
 				'label' => __( 'Quiz Percentage Grade', 'gravityview' ),
61 61
 				'type'  => 'quiz_percent',
62 62
 				'desc'  => __( 'Displays the percentage of correct Quiz answers the user submitted.', 'gravityview' ),
63 63
 				'icon'  => 'dashicons-forms',
64 64
 			);
65
-			$fields['gquiz_grade']   = array(
65
+			$fields[ 'gquiz_grade' ] = array(
66 66
 				/* translators: This is a field type used by the Gravity Forms Quiz Addon. "A" is 100-90, "B" is 89-80, "C" is 79-70, etc.  */
67 67
 				'label' => __( 'Quiz Letter Grade', 'gravityview' ),
68 68
 				'type'  => 'quiz_grade',
69 69
 				'desc'  => __( 'Displays the Grade the user achieved based on Letter Grading configured in the Quiz Settings.', 'gravityview' ),
70 70
 				'icon'  => 'dashicons-forms',
71 71
 			);
72
-			$fields['gquiz_is_pass'] = array(
72
+			$fields[ 'gquiz_is_pass' ] = array(
73 73
 				'label' => __( 'Quiz Pass/Fail', 'gravityview' ),
74 74
 				'type'  => 'quiz_is_pass',
75 75
 				'desc'  => __( 'Displays either Passed or Failed based on the Pass/Fail settings configured in the Quiz Settings.', 'gravityview' ),
Please login to merge, or discard this patch.
includes/class-cache.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 		/**
82 82
 		 * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
83 83
 		 */
84
-		foreach( $this->lead_db_columns as $column ) {
84
+		foreach ( $this->lead_db_columns as $column ) {
85 85
 			add_action( 'gform_update_' . $column, array( $this, 'entry_status_changed' ), 10, 3 );
86 86
 		}
87 87
 
@@ -112,9 +112,9 @@  discard block
 block discarded – undo
112 112
 			return;
113 113
 		}
114 114
 
115
-		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{lead_id} was deleted', array( 'form_id' => $entry['form_id'], 'entry_id' => $lead_id, 'data' => array( 'value' => $property_value, 'previous' => $previous_value ) ) );
115
+		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{lead_id} was deleted', array( 'form_id' => $entry[ 'form_id' ], 'entry_id' => $lead_id, 'data' => array( 'value' => $property_value, 'previous' => $previous_value ) ) );
116 116
 
117
-		$this->blacklist_add( $entry['form_id'] );
117
+		$this->blacklist_add( $entry[ 'form_id' ] );
118 118
 	}
119 119
 
120 120
 	/**
@@ -127,9 +127,9 @@  discard block
 block discarded – undo
127 127
 	 */
128 128
 	public function entry_updated( $form, $lead_id ) {
129 129
 
130
-		gravityview()->log->debug(' adding form {form_id} to blacklist because entry #{entry_id} was updated', array( 'form_id' => $form['id'], 'entry_id' => $lead_id ) );
130
+		gravityview()->log->debug( ' adding form {form_id} to blacklist because entry #{entry_id} was updated', array( 'form_id' => $form[ 'id' ], 'entry_id' => $lead_id ) );
131 131
 
132
-		$this->blacklist_add( $form['id'] );
132
+		$this->blacklist_add( $form[ 'id' ] );
133 133
 	}
134 134
 
135 135
 	/**
@@ -144,9 +144,9 @@  discard block
 block discarded – undo
144 144
 	 */
145 145
 	public function entry_created( $entry, $form ) {
146 146
 
147
-		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was created', array( 'form_id' => $form['id'], 'entry_id' => $entry['id'] ) );
147
+		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was created', array( 'form_id' => $form[ 'id' ], 'entry_id' => $entry[ 'id' ] ) );
148 148
 
149
-		$this->blacklist_add( $form['id'] );
149
+		$this->blacklist_add( $form[ 'id' ] );
150 150
 	}
151 151
 
152 152
 	/**
@@ -162,9 +162,9 @@  discard block
 block discarded – undo
162 162
 			return;
163 163
 		}
164 164
 
165
-		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was added', array( 'form_id' => $form['id'], 'entry_id' => $entry['id'] ) );
165
+		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was added', array( 'form_id' => $form[ 'id' ], 'entry_id' => $entry[ 'id' ] ) );
166 166
 
167
-		$this->blacklist_add( $form['id'] );
167
+		$this->blacklist_add( $form[ 'id' ] );
168 168
 	}
169 169
 
170 170
 	/**
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 		// Normally just one form, but supports multiple forms
184 184
 		//
185 185
 		// Array of IDs 12, 5, 14 would result in `f:12-f:5-f:14`
186
-		$forms = 'f:' . implode( '-f:', (array) $form_ids );
186
+		$forms = 'f:' . implode( '-f:', (array)$form_ids );
187 187
 
188 188
 		// Prefix for transient keys
189 189
 		// Now the prefix would be: `gv-cache-f:12-f:5-f:14-`
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
 		$form_ids = is_array( $form_ids ) ? $form_ids : array( $form_ids );
236 236
 
237 237
 		// Add the passed form IDs
238
-		$blacklist = array_merge( (array) $blacklist, $form_ids );
238
+		$blacklist = array_merge( (array)$blacklist, $form_ids );
239 239
 
240 240
 		// Don't duplicate
241 241
 		$blacklist = array_unique( $blacklist );
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 
267 267
 		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
268 268
 
269
-		$updated_list = array_diff( $blacklist, (array) $form_ids );
269
+		$updated_list = array_diff( $blacklist, (array)$form_ids );
270 270
 
271 271
 		gravityview()->log->debug( 'Removing form IDs from cache blacklist', array( 'data' => array(
272 272
 			'$form_ids'     => $form_ids,
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
 			return false;
300 300
 		}
301 301
 
302
-		foreach ( (array) $form_ids as $form_id ) {
302
+		foreach ( (array)$form_ids as $form_id ) {
303 303
 
304 304
 			if ( in_array( $form_id, $blacklist ) ) {
305 305
 
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
373 373
 			 * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
374 374
 			 * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
375 375
 			 */
376
-			$cache_time = (int) apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
376
+			$cache_time = (int)apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
377 377
 
378 378
 			gravityview()->log->debug( 'Setting cache with transient key {key} for {cache_time} seconds', array( 'key' => $this->key, 'cache_time' => $cache_time ) );
379 379
 
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
 			return;
410 410
 		}
411 411
 
412
-		foreach ( (array) $form_ids as $form_id ) {
412
+		foreach ( (array)$form_ids as $form_id ) {
413 413
 
414 414
 			$key = '_transient_gv-cache-';
415 415
 
@@ -520,7 +520,7 @@  discard block
 block discarded – undo
520 520
 	public function use_cache() {
521 521
 
522 522
 		// Exit early if debugging (unless running PHPUnit)
523
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG && ! ( defined('DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) ) {
523
+		if ( defined( 'WP_DEBUG' ) && WP_DEBUG && ! ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) ) {
524 524
 			return apply_filters( 'gravityview_use_cache', false, $this );
525 525
 		}
526 526
 
@@ -528,7 +528,7 @@  discard block
 block discarded – undo
528 528
 
529 529
 		if ( GVCommon::has_cap( 'edit_gravityviews' ) ) {
530 530
 
531
-			if ( isset( $_GET['cache'] ) || isset( $_GET['nocache'] ) ) {
531
+			if ( isset( $_GET[ 'cache' ] ) || isset( $_GET[ 'nocache' ] ) ) {
532 532
 
533 533
 				gravityview()->log->debug( 'Not using cache: ?cache or ?nocache is in the URL' );
534 534
 
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
555 555
 		 */
556 556
 		$use_cache = apply_filters( 'gravityview_use_cache', $use_cache, $this );
557 557
 
558
-		return (boolean) $use_cache;
558
+		return (boolean)$use_cache;
559 559
 	}
560 560
 
561 561
 }
Please login to merge, or discard this patch.
future/includes/class-gv-shortcode-gvlogic.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -61,8 +61,8 @@  discard block
 block discarded – undo
61 61
 		$value    = $this->get_value( $atts );
62 62
 
63 63
 		if ( false === $operator && is_null( $value ) ) {
64
-			if ( false !== $atts['if'] ) { // Only-if test
65
-				$match = $authed && ! in_array( strtolower( $atts['if'] ), array( '', '0', 'false', 'no' ) );
64
+			if ( false !== $atts[ 'if' ] ) { // Only-if test
65
+				$match = $authed && ! in_array( strtolower( $atts[ 'if' ] ), array( '', '0', 'false', 'no' ) );
66 66
 			} else {
67 67
 				$match = $authed; // Just login test
68 68
 			}
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
 				// Need to match all AND
83 83
 				foreach ( $and_values as $and_value ) {
84
-					$match = $authed && \GVCommon::matches_operation( $atts['if'], $and_value, $operator );
84
+					$match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $and_value, $operator );
85 85
 					if ( ! $match ) {
86 86
 						break;
87 87
 					}
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 				// Only need to match a single OR
93 93
 				foreach ( $or_values as $or_value ) {
94 94
 
95
-					$match = \GVCommon::matches_operation( $atts['if'], $or_value, $operator );
95
+					$match = \GVCommon::matches_operation( $atts[ 'if' ], $or_value, $operator );
96 96
 
97 97
 					// Negate the negative operators
98 98
 					if ( ( $authed && $match ) || ( $authed && ( ! $match && in_array( $operator, array( 'isnot', 'not_contains', 'not_in' ) ) ) ) ) {
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 				}
102 102
 
103 103
 			} else {
104
-				$match = $authed && \GVCommon::matches_operation( $atts['if'], $value, $operator );
104
+				$match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $value, $operator );
105 105
 			}
106 106
 
107 107
 			$output = $this->get_output( $match, $atts, $output );
@@ -189,8 +189,8 @@  discard block
 block discarded – undo
189 189
 	 * @return string The output.
190 190
 	 */
191 191
 	private function get_output( $match, $atts, $content ) {
192
-		if ( ! $match && ! empty( $atts['else'] ) ) {
193
-			return $atts['else']; // Attributized else is easy :)
192
+		if ( ! $match && ! empty( $atts[ 'else' ] ) ) {
193
+			return $atts[ 'else' ]; // Attributized else is easy :)
194 194
 		}
195 195
 
196 196
 		$if = '';
@@ -317,18 +317,18 @@  discard block
 block discarded – undo
317 317
 		$atts = array_intersect_key( $supplied_atts, $atts );
318 318
 
319 319
 		// Strip whitespace if it's not default false
320
-		if ( isset( $atts['if'] ) && is_string( $atts['if'] ) ) {
321
-			$atts['if'] = trim( $atts['if'] );
320
+		if ( isset( $atts[ 'if' ] ) && is_string( $atts[ 'if' ] ) ) {
321
+			$atts[ 'if' ] = trim( $atts[ 'if' ] );
322 322
 		} else {
323
-			$atts['if'] = false;
323
+			$atts[ 'if' ] = false;
324 324
 		}
325 325
 
326
-		if ( isset( $atts['logged_in'] ) ) {
326
+		if ( isset( $atts[ 'logged_in' ] ) ) {
327 327
 			// Truthy
328
-			if ( in_array( strtolower( $atts['logged_in'] ), array( '0', 'false', 'no' ) ) ) {
329
-				$atts['logged_in'] = false;
328
+			if ( in_array( strtolower( $atts[ 'logged_in' ] ), array( '0', 'false', 'no' ) ) ) {
329
+				$atts[ 'logged_in' ] = false;
330 330
 			} else {
331
-				$atts['logged_in'] = true;
331
+				$atts[ 'logged_in' ] = true;
332 332
 			}
333 333
 		}
334 334
 
Please login to merge, or discard this patch.
Braces   +18 added lines, -9 removed lines patch added patch discarded remove patch
@@ -61,14 +61,16 @@  discard block
 block discarded – undo
61 61
 		$value    = $this->get_value( $atts );
62 62
 
63 63
 		if ( false === $operator && is_null( $value ) ) {
64
-			if ( false !== $atts['if'] ) { // Only-if test
64
+			if ( false !== $atts['if'] ) {
65
+// Only-if test
65 66
 				$match = $authed && ! in_array( strtolower( $atts['if'] ), array( '', '0', 'false', 'no' ) );
66 67
 			} else {
67 68
 				$match = $authed; // Just login test
68 69
 			}
69 70
 
70 71
 			$output = $this->get_output( $match, $atts, $content );
71
-		} else { // Regular test
72
+		} else {
73
+// Regular test
72 74
 
73 75
 			$output = $content;
74 76
 
@@ -199,12 +201,15 @@  discard block
 block discarded – undo
199 201
 		$opens = 0; // inner opens
200 202
 		$found = false; // found split position
201 203
 
202
-		while ( $content ) { // scan
204
+		while ( $content ) {
205
+// scan
203 206
 
204 207
 			if ( ! preg_match( '#(.*?)(\[\/?(gvlogic|else).*?])(.*)#s', $content, $matches ) ) {
205
-				if ( ! $found ) { // We're still iffing.
208
+				if ( ! $found ) {
209
+// We're still iffing.
206 210
 					$if .= $content;
207
-				} else { // We are elsing
211
+				} else {
212
+// We are elsing
208 213
 					$else .= $content;
209 214
 				}
210 215
 				break; // No more shortcodes
@@ -212,9 +217,11 @@  discard block
 block discarded – undo
212 217
 
213 218
 			list( $_, $before_shortcode, $shortcode, $_, $after_shortcode ) = $matches;
214 219
 
215
-			if ( ! $found ) { // We're still iffing.
220
+			if ( ! $found ) {
221
+// We're still iffing.
216 222
 				$if .= $before_shortcode;
217
-			} else { // We are elsing
223
+			} else {
224
+// We are elsing
218 225
 				$else .= $before_shortcode;
219 226
 			}
220 227
 
@@ -238,9 +245,11 @@  discard block
 block discarded – undo
238 245
 				}
239 246
 
240 247
 				// Tack on the shortcode
241
-				if ( ! $found ) { // We're still iffing.
248
+				if ( ! $found ) {
249
+// We're still iffing.
242 250
 					$if .= $shortcode;
243
-				} else { // We are elsing
251
+				} else {
252
+// We are elsing
244 253
 					$else .= $shortcode;
245 254
 				}
246 255
 			}
Please login to merge, or discard this patch.
lightbox/fancybox/class-gravityview-lightbox-provider-fancybox.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -110,18 +110,18 @@  discard block
 block discarded – undo
110 110
 	 */
111 111
 	public function allowed_atts( $atts = array() ) {
112 112
 
113
-		$atts['data-fancybox']         = null;
114
-		$atts['data-fancybox-trigger'] = null;
115
-		$atts['data-fancybox-index']   = null;
116
-		$atts['data-src']              = null;
117
-		$atts['data-type']             = null;
118
-		$atts['data-width']            = null;
119
-		$atts['data-height']           = null;
120
-		$atts['data-srcset']           = null;
121
-		$atts['data-caption']          = null;
122
-		$atts['data-options']          = null;
123
-		$atts['data-filter']           = null;
124
-		$atts['data-type']             = null;
113
+		$atts[ 'data-fancybox' ]         = null;
114
+		$atts[ 'data-fancybox-trigger' ] = null;
115
+		$atts[ 'data-fancybox-index' ]   = null;
116
+		$atts[ 'data-src' ]              = null;
117
+		$atts[ 'data-type' ]             = null;
118
+		$atts[ 'data-width' ]            = null;
119
+		$atts[ 'data-height' ]           = null;
120
+		$atts[ 'data-srcset' ]           = null;
121
+		$atts[ 'data-caption' ]          = null;
122
+		$atts[ 'data-options' ]          = null;
123
+		$atts[ 'data-filter' ]           = null;
124
+		$atts[ 'data-type' ]             = null;
125 125
 
126 126
 		return $atts;
127 127
 	}
@@ -136,23 +136,23 @@  discard block
 block discarded – undo
136 136
 		}
137 137
 
138 138
 		// Prevent empty content from getting added to the lightbox gallery
139
-		if ( is_array( $additional_details ) && empty( $additional_details['file_path'] ) ) {
139
+		if ( is_array( $additional_details ) && empty( $additional_details[ 'file_path' ] ) ) {
140 140
 			return $link_atts;
141 141
 		}
142 142
 
143 143
 		// Prevent empty content from getting added to the lightbox gallery
144
-		if ( is_array( $additional_details ) && ! empty( $additional_details['disable_lightbox'] ) ) {
144
+		if ( is_array( $additional_details ) && ! empty( $additional_details[ 'disable_lightbox' ] ) ) {
145 145
 			return $link_atts;
146 146
 		}
147 147
 
148
-		$link_atts['class'] = \GV\Utils::get( $link_atts, 'class' ) . ' gravityview-fancybox';
148
+		$link_atts[ 'class' ] = \GV\Utils::get( $link_atts, 'class' ) . ' gravityview-fancybox';
149 149
 
150
-		$link_atts['class'] = gravityview_sanitize_html_class( $link_atts['class'] );
150
+		$link_atts[ 'class' ] = gravityview_sanitize_html_class( $link_atts[ 'class' ] );
151 151
 
152 152
 		if ( $context && ! empty( $context->field->field ) ) {
153 153
 			if ( $context->field->field->multipleFiles ) {
154 154
 				$entry = $context->entry->as_entry();
155
-				$link_atts['data-fancybox'] = 'gallery-' . sprintf( "%s-%s-%s", $entry['form_id'], $context->field->ID, $context->entry->get_slug() );
155
+				$link_atts[ 'data-fancybox' ] = 'gallery-' . sprintf( "%s-%s-%s", $entry[ 'form_id' ], $context->field->ID, $context->entry->get_slug() );
156 156
 			}
157 157
 		}
158 158
 
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
 				),
168 168
 			);
169 169
 
170
-			$link_atts['data-options'] = json_encode( $fancybox_settings );
170
+			$link_atts[ 'data-options' ] = json_encode( $fancybox_settings );
171 171
 		}
172 172
 
173 173
 		return $link_atts;
Please login to merge, or discard this patch.
includes/extensions/lightbox/class-gravityview-lightbox-provider.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -23,8 +23,8 @@  discard block
 block discarded – undo
23 23
 		add_filter( 'gravityview/fields/fileupload/link_atts', array( $this, 'fileupload_link_atts' ), 10, 4 );
24 24
 		add_filter( 'gravityview/get_link/allowed_atts', array( $this, 'allowed_atts' ) );
25 25
 
26
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts') );
27
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles') );
26
+		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
27
+		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
28 28
 
29 29
 		add_action( 'gravityview/template/after', array( $this, 'print_scripts' ) );
30 30
 
@@ -92,8 +92,8 @@  discard block
 block discarded – undo
92 92
 		remove_filter( 'gravityview/fields/fileupload/link_atts', array( $this, 'fileupload_link_atts' ), 10 );
93 93
 		remove_filter( 'gravityview/get_link/allowed_atts', array( $this, 'allowed_atts' ) );
94 94
 
95
-		remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts') );
96
-		remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles') );
95
+		remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
96
+		remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
97 97
 
98 98
 		remove_action( 'wp_footer', array( $this, 'output_footer' ) );
99 99
 	}
Please login to merge, or discard this patch.
includes/admin/entry-list.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 		add_action( 'gform_entries_first_column_actions', array( $this, 'add_edit_link' ), 10, 5 );
12 12
 
13 13
 		// Add script to enable edit link
14
-		add_action( 'admin_head', array( $this, 'add_edit_script') );
14
+		add_action( 'admin_head', array( $this, 'add_edit_script' ) );
15 15
 	}
16 16
 
17 17
 	/**
@@ -60,14 +60,14 @@  discard block
 block discarded – undo
60 60
 			'page' => 'gf_entries',
61 61
 			'view' => 'entry',
62 62
 			'id'	=> (int)$form_id,
63
-			'lid'	=>	(int)$lead["id"],
63
+			'lid'	=>	(int)$lead[ "id" ],
64 64
 			'screen_mode'	=> 'edit',
65 65
 		);
66 66
 		?>
67 67
 
68 68
 		<span class="edit edit_entry">
69 69
 			|
70
-		    <a title="<?php esc_attr_e( 'Edit this entry', 'gravityview'); ?>" href="<?php echo esc_url( add_query_arg( $params, admin_url( 'admin.php?page='.$query_string ) ) ); ?>"><?php esc_html_e( 'Edit', 'gravityview' ); ?></a>
70
+		    <a title="<?php esc_attr_e( 'Edit this entry', 'gravityview' ); ?>" href="<?php echo esc_url( add_query_arg( $params, admin_url( 'admin.php?page=' . $query_string ) ) ); ?>"><?php esc_html_e( 'Edit', 'gravityview' ); ?></a>
71 71
 		</span>
72 72
 		<?php
73 73
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-fileupload.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -26,21 +26,21 @@  discard block
 block discarded – undo
26 26
 
27 27
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
28 28
 
29
-		unset( $field_options['search_filter'] );
29
+		unset( $field_options[ 'search_filter' ] );
30 30
 
31
-		if( 'edit' === $context ) {
31
+		if ( 'edit' === $context ) {
32 32
 			return $field_options;
33 33
 		}
34 34
 
35
-		$add_options['link_to_file'] = array(
35
+		$add_options[ 'link_to_file' ] = array(
36 36
 			'type' => 'checkbox',
37 37
 			'label' => __( 'Display as a Link:', 'gravityview' ),
38
-			'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'),
38
+			'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ),
39 39
 			'value' => false,
40 40
 			'merge_tags' => false,
41 41
 		);
42 42
 
43
-		$add_options['image_width'] = array(
43
+		$add_options[ 'image_width' ] = array(
44 44
 			'type' => 'text',
45 45
 			'label' => __( 'Custom Width:', 'gravityview' ),
46 46
 			'desc' => __( 'Override the default image width (250).', 'gravityview' ),
@@ -129,14 +129,14 @@  discard block
 block discarded – undo
129 129
 			$base_id = null;
130 130
 
131 131
 			$is_single = gravityview_get_context() === 'single';
132
-			$lightbox = ! empty( $gravityview_view->atts['lightbox'] );
132
+			$lightbox = ! empty( $gravityview_view->atts[ 'lightbox' ] );
133 133
 			$field_compat = $gravityview_view->getCurrentField();
134 134
 		}
135 135
 
136 136
 		$output_arr = array();
137 137
 
138 138
 		// Get an array of file paths for the field.
139
-		$file_paths = \GV\Utils::get( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value );
139
+		$file_paths = \GV\Utils::get( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value );
140 140
 
141 141
 		// The $value JSON was probably truncated; let's check lead_detail_long.
142 142
 		if ( ! is_array( $file_paths ) ) {
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 			$rendered = null;
157 157
 
158 158
 			// If the site is HTTPS, use HTTPS
159
-			if ( function_exists('set_url_scheme') ) {
159
+			if ( function_exists( 'set_url_scheme' ) ) {
160 160
 				$file_path = set_url_scheme( $file_path );
161 161
 			}
162 162
 
@@ -167,8 +167,8 @@  discard block
 block discarded – undo
167 167
 			$file_path_info = pathinfo( $file_path );
168 168
 
169 169
 			// If pathinfo() gave us the extension of the file, run the switch statement using that.
170
-			$extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] );
171
-			$basename = $file_path_info['basename'];
170
+			$extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] );
171
+			$basename = $file_path_info[ 'basename' ];
172 172
 
173 173
 			// Get the secure download URL
174 174
 			$is_secure = false;
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 					 */
209 209
 					$audio_settings = apply_filters( 'gravityview_audio_settings', array(
210 210
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
211
-						'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id']
211
+						'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ]
212 212
 					), $context );
213 213
 
214 214
 					/**
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 					 */
245 245
 					$video_settings = apply_filters( 'gravityview_video_settings', array(
246 246
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
247
-						'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id']
247
+						'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ]
248 248
 					), $context );
249 249
 
250 250
 					/**
@@ -275,20 +275,20 @@  discard block
 block discarded – undo
275 275
 					$file_path = add_query_arg( array( 'gv-iframe' => 'true' ), $file_path );
276 276
 				}
277 277
 
278
-				$field_settings['link_to_file'] = true;
278
+				$field_settings[ 'link_to_file' ] = true;
279 279
 
280 280
 			// Images
281 281
 			} else if ( in_array( $extension, array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ) ) ) {
282 282
 				$width = \GV\Utils::get( $field_settings, 'image_width', 250 );
283 283
 				$image_atts = array(
284 284
 					'src'   => $file_path,
285
-					'class' => 'gv-image gv-field-id-' . $field_settings['id'],
286
-					'alt'   => $field_settings['label'],
287
-					'width' => ( $is_single ? null : ( $width ? $width: 250 ) )
285
+					'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ],
286
+					'alt'   => $field_settings[ 'label' ],
287
+					'width' => ( $is_single ? null : ( $width ? $width : 250 ) )
288 288
 				);
289 289
 
290 290
 				if ( $is_secure ) {
291
-					$image_atts['validate_src'] = false;
291
+					$image_atts[ 'validate_src' ] = false;
292 292
 				}
293 293
 
294 294
 				/**
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
 
310 310
 				unset( $gv_entry );
311 311
 
312
-				if ( $lightbox && empty( $field_settings['show_as_link'] ) ) {
312
+				if ( $lightbox && empty( $field_settings[ 'show_as_link' ] ) ) {
313 313
 					$lightbox_link_atts = array(
314 314
 						'rel'   => sprintf( "%s-%s", $gv_class, $entry_slug ),
315 315
 						'class' => '',
@@ -323,13 +323,13 @@  discard block
 block discarded – undo
323 323
 				}
324 324
 
325 325
 				// Show as link should render the image regardless.
326
-				if ( ! empty( $field_settings['show_as_link'] ) ) {
326
+				if ( ! empty( $field_settings[ 'show_as_link' ] ) ) {
327 327
 					$text = $rendered;
328 328
 				}
329 329
 			}
330 330
 			// For all other non-media file types (ZIP, for example), always show as a link regardless of setting.
331 331
 			else {
332
-				$field_settings['link_to_file'] = true;
332
+				$field_settings[ 'link_to_file' ] = true;
333 333
 				$disable_lightbox = true;
334 334
 			}
335 335
 
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
 			$disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', false, $field_compat, $context );
346 346
 
347 347
 			// Output textualized content where
348
-			if ( ! $disable_wrapped_link && ( ! empty( $field_settings['link_to_file'] ) || ! empty( $field_settings['show_as_link'] ) ) ) {
348
+			if ( ! $disable_wrapped_link && ( ! empty( $field_settings[ 'link_to_file' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) ) {
349 349
 				/**
350 350
 				 * Modify the link text (defaults to the file name)
351 351
 				 *
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
 				 */
359 359
 				$content = apply_filters( 'gravityview/fields/fileupload/link_content', $text, $field_compat, $context );
360 360
 
361
-				if ( empty( $field_settings['show_as_link'] ) ) {
361
+				if ( empty( $field_settings[ 'show_as_link' ] ) ) {
362 362
 					/**
363 363
 					 * @filter `gravityview/fields/fileupload/link_atts` Modify the link attributes for a file upload field
364 364
 					 * @since 2.0 Added $context
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
 				$content = empty( $rendered ) ? $text : $rendered;
380 380
 			}
381 381
 
382
-			$output_arr[] = array(
382
+			$output_arr[ ] = array(
383 383
 				'file_path' => $file_path,
384 384
 				'content' => $content
385 385
 			);
Please login to merge, or discard this patch.
includes/presets/register-default-templates.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -59,8 +59,8 @@  discard block
 block discarded – undo
59 59
 		'GravityView_DataTables_Template' => array(
60 60
 			'slug' => 'dt_placeholder',
61 61
 			'label' =>  __( 'DataTables Table', 'gv-datatables', 'gravityview' ),
62
-			'description' => __('Display items in a dynamic table powered by DataTables.', 'gravityview'),
63
-			'logo' => plugins_url('assets/images/templates/logo-datatables.png', GRAVITYVIEW_FILE ),
62
+			'description' => __( 'Display items in a dynamic table powered by DataTables.', 'gravityview' ),
63
+			'logo' => plugins_url( 'assets/images/templates/logo-datatables.png', GRAVITYVIEW_FILE ),
64 64
 			'buy_source' => 'https://gravityview.co/pricing/?utm_source=plugin&utm_medium=buy_now&utm_campaign=view_type&utm_term=datatables',
65 65
 			'preview' => 'https://try.gravityview.co/demo/view/datatables/?utm_source=plugin&utm_medium=try_demo&utm_campaign=view_type&utm_term=datatables',
66 66
 			'license' => esc_html__( 'All Access', 'gravityview' ),
@@ -102,13 +102,13 @@  discard block
 block discarded – undo
102 102
 				continue;
103 103
 			}
104 104
 
105
-			$license_price_id = (int) \GV\Utils::get( $license, 'price_id', 0 );
106
-			$placeholder_price_id = (int) \GV\Utils::get( $placeholder, 'price_id' );
105
+			$license_price_id = (int)\GV\Utils::get( $license, 'price_id', 0 );
106
+			$placeholder_price_id = (int)\GV\Utils::get( $placeholder, 'price_id' );
107 107
 
108
-			$placeholder['type']     = 'custom';
109
-			$placeholder['included'] = ( $license_price_id >= $placeholder_price_id );
108
+			$placeholder[ 'type' ]     = 'custom';
109
+			$placeholder[ 'included' ] = ( $license_price_id >= $placeholder_price_id );
110 110
 
111
-			new GravityView_Placeholder_Template( $placeholder['slug'], $placeholder );
111
+			new GravityView_Placeholder_Template( $placeholder[ 'slug' ], $placeholder );
112 112
 		}
113 113
 
114 114
 	} catch ( Exception $exception ) {
Please login to merge, or discard this patch.