Completed
Pull Request — master (#822)
by Zack
23:55 queued 20:40
created
includes/admin/field-types/type_textarea.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -28,13 +28,13 @@
 block discarded – undo
28 28
 
29 29
 		$show_mt = $this->show_merge_tags();
30 30
 
31
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
32
-            $class .= ' merge-tag-support mt-position-right ';
31
+		if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
32
+			$class .= ' merge-tag-support mt-position-right ';
33 33
 
34
-            if( empty( $this->field['show_all_fields'] ) ) {
35
-            	$class .= ' mt-hide_all_fields ';
36
-            }
37
-        }
34
+			if( empty( $this->field['show_all_fields'] ) ) {
35
+				$class .= ' mt-hide_all_fields ';
36
+			}
37
+		}
38 38
 		$class .= rgar( $this->field, 'class' );
39 39
 		$placeholder = rgar( $this->field, 'placeholder' );
40 40
 		?>
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 		?>
10 10
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
11 11
 
12
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
12
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
13 13
 			echo $this->get_tooltip() . $this->get_field_desc();
14 14
 		?><div>
15 15
 				<?php $this->render_input(); ?>
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 	}
20 20
 
21 21
 	function render_input( $override_input = null ) {
22
-		if( isset( $override_input ) ) {
22
+		if ( isset( $override_input ) ) {
23 23
 			echo $override_input;
24 24
 			return;
25 25
 		}
@@ -28,17 +28,17 @@  discard block
 block discarded – undo
28 28
 
29 29
 		$show_mt = $this->show_merge_tags();
30 30
 
31
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
31
+        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
32 32
             $class .= ' merge-tag-support mt-position-right ';
33 33
 
34
-            if( empty( $this->field['show_all_fields'] ) ) {
34
+            if ( empty( $this->field[ 'show_all_fields' ] ) ) {
35 35
             	$class .= ' mt-hide_all_fields ';
36 36
             }
37 37
         }
38 38
 		$class .= rgar( $this->field, 'class' );
39 39
 		$placeholder = rgar( $this->field, 'placeholder' );
40 40
 		?>
41
-		<textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="5"><?php echo esc_textarea(  $this->value ); ?></textarea>
41
+		<textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="5"><?php echo esc_textarea( $this->value ); ?></textarea>
42 42
        	<?php
43 43
 	}
44 44
 
Please login to merge, or discard this patch.
includes/admin/field-types/type_text.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -28,11 +28,11 @@
 block discarded – undo
28 28
 
29 29
 		$show_mt = $this->show_merge_tags();
30 30
 
31
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
32
-            $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
33
-        }
34
-        $class .= rgar( $this->field, 'class', 'widefat' );
35
-        $placeholder = rgar( $this->field, 'placeholder' );
31
+		if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
32
+			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
33
+		}
34
+		$class .= rgar( $this->field, 'class', 'widefat' );
35
+		$placeholder = rgar( $this->field, 'placeholder' );
36 36
 		?>
37 37
 		<input name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" type="text" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>">
38 38
 		<?php
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 		?>
9 9
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
10 10
 
11
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
11
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
12 12
 			echo $this->get_tooltip() . $this->get_field_desc();
13 13
 		?><div>
14 14
 				<?php $this->render_input(); ?>
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 
20 20
 	function render_input( $override_input = null ) {
21 21
 
22
-		if( isset( $override_input ) ) {
22
+		if ( isset( $override_input ) ) {
23 23
 			echo $override_input;
24 24
 			return;
25 25
 		}
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 
29 29
 		$show_mt = $this->show_merge_tags();
30 30
 
31
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
31
+        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
32 32
             $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
33 33
         }
34 34
         $class .= rgar( $this->field, 'class', 'widefat' );
Please login to merge, or discard this patch.
includes/admin/class.render.settings.php 1 patch
Spacing   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 
28 28
 		$field_options = array();
29 29
 
30
-		if( 'field' === $field_type ) {
30
+		if ( 'field' === $field_type ) {
31 31
 
32 32
 			// Default options - fields
33 33
 			$field_options = array(
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 				'custom_class' => array(
46 46
 					'type' => 'text',
47 47
 					'label' => __( 'Custom CSS Class:', 'gravityview' ),
48
-					'desc' => __( 'This class will be added to the field container', 'gravityview'),
48
+					'desc' => __( 'This class will be added to the field container', 'gravityview' ),
49 49
 					'value' => '',
50 50
 					'merge_tags' => true,
51 51
 					'tooltip' => 'gv_css_merge_tags',
@@ -65,11 +65,11 @@  discard block
 block discarded – undo
65 65
 			);
66 66
 
67 67
 			// Match Table as well as DataTables
68
-			if( preg_match( '/table/ism', $template_id ) && 'directory' === $context ) {
69
-				$field_options['width'] = array(
68
+			if ( preg_match( '/table/ism', $template_id ) && 'directory' === $context ) {
69
+				$field_options[ 'width' ] = array(
70 70
 					'type' => 'number',
71
-					'label' => __('Percent Width', 'gravityview'),
72
-					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview'),
71
+					'label' => __( 'Percent Width', 'gravityview' ),
72
+					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview' ),
73 73
 					'class' => 'code widefat',
74 74
 					'value' => '',
75 75
 				);
@@ -122,8 +122,8 @@  discard block
 block discarded – undo
122 122
 			'manage_options' => __( 'Administrator', 'gravityview' ),
123 123
 		);
124 124
 
125
-		if( is_multisite() ) {
126
-			$select_cap_choices['manage_network'] = __('Multisite Super Admin', 'gravityview' );
125
+		if ( is_multisite() ) {
126
+			$select_cap_choices[ 'manage_network' ] = __( 'Multisite Super Admin', 'gravityview' );
127 127
 		}
128 128
 
129 129
 		/**
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 		 * @param  string $context     Optional. What context are we in? Example: `single` or `directory`
137 137
 		 * @param  string $input_type  Optional. (textarea, list, select, etc.)
138 138
 		 */
139
-		$select_cap_choices = apply_filters('gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
139
+		$select_cap_choices = apply_filters( 'gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
140 140
 
141 141
 		return $select_cap_choices;
142 142
 	}
@@ -163,24 +163,24 @@  discard block
 block discarded – undo
163 163
 	 */
164 164
 	public static function render_field_options( $field_type, $template_id, $field_id, $field_label, $area, $input_type = NULL, $uniqid = '', $current = '', $context = 'single', $item = array() ) {
165 165
 
166
-		if( empty( $uniqid ) ) {
166
+		if ( empty( $uniqid ) ) {
167 167
 			//generate a unique field id
168
-			$uniqid = uniqid('', false);
168
+			$uniqid = uniqid( '', false );
169 169
 		}
170 170
 
171 171
 		// get field/widget options
172 172
 		$options = self::get_default_field_options( $field_type, $template_id, $field_id, $context, $input_type );
173 173
 
174 174
 		// two different post arrays, depending of the field type
175
-		$name_prefix = $field_type .'s' .'['. $area .']['. $uniqid .']';
175
+		$name_prefix = $field_type . 's' . '[' . $area . '][' . $uniqid . ']';
176 176
 
177 177
 		// build output
178 178
 		$output = '';
179
-		$output .= '<input type="hidden" class="field-key" name="'. $name_prefix .'[id]" value="'. esc_attr( $field_id ) .'">';
180
-		$output .= '<input type="hidden" class="field-label" name="'. $name_prefix .'[label]" value="'. esc_attr( $field_label ) .'">';
179
+		$output .= '<input type="hidden" class="field-key" name="' . $name_prefix . '[id]" value="' . esc_attr( $field_id ) . '">';
180
+		$output .= '<input type="hidden" class="field-label" name="' . $name_prefix . '[label]" value="' . esc_attr( $field_label ) . '">';
181 181
 
182 182
 		// If there are no options, return what we got.
183
-		if(empty($options)) {
183
+		if ( empty( $options ) ) {
184 184
 
185 185
 			// This is here for checking if the output is empty in render_label()
186 186
 			$output .= '<!-- No Options -->';
@@ -188,33 +188,33 @@  discard block
 block discarded – undo
188 188
 			return $output;
189 189
 		}
190 190
 
191
-		$output .= '<div class="gv-dialog-options" title="'. esc_attr( sprintf( __( 'Options: %s', 'gravityview' ) , strip_tags( html_entity_decode( $field_label ) ) ) ) .'">';
191
+		$output .= '<div class="gv-dialog-options" title="' . esc_attr( sprintf( __( 'Options: %s', 'gravityview' ), strip_tags( html_entity_decode( $field_label ) ) ) ) . '">';
192 192
 
193 193
 		/**
194 194
 		 * @since 1.8
195 195
 		 */
196
-		if( !empty( $item['subtitle'] ) ) {
197
-			$output .= '<div class="subtitle">' . $item['subtitle'] . '</div>';
196
+		if ( ! empty( $item[ 'subtitle' ] ) ) {
197
+			$output .= '<div class="subtitle">' . $item[ 'subtitle' ] . '</div>';
198 198
 		}
199 199
 
200
-		foreach( $options as $key => $option ) {
200
+		foreach ( $options as $key => $option ) {
201 201
 
202 202
 			$value = isset( $current[ $key ] ) ? $current[ $key ] : NULL;
203 203
 
204
-			$field_output = self::render_field_option( $name_prefix . '['. $key .']' , $option, $value);
204
+			$field_output = self::render_field_option( $name_prefix . '[' . $key . ']', $option, $value );
205 205
 
206 206
 			// The setting is empty
207
-			if( empty( $field_output ) ) {
207
+			if ( empty( $field_output ) ) {
208 208
 				continue;
209 209
 			}
210 210
 
211
-			switch( $option['type'] ) {
211
+			switch ( $option[ 'type' ] ) {
212 212
 				// Hide hidden fields
213 213
 				case 'hidden':
214
-					$output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . ' screen-reader-text">'. $field_output . '</div>';
214
+					$output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . ' screen-reader-text">' . $field_output . '</div>';
215 215
 					break;
216 216
 				default:
217
-					$output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . '">'. $field_output .'</div>';
217
+					$output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . '">' . $field_output . '</div>';
218 218
 			}
219 219
 		}
220 220
 
@@ -243,17 +243,17 @@  discard block
 block discarded – undo
243 243
 		 * @deprecated setting index 'default' was replaced by 'value'
244 244
 		 * @see GravityView_FieldType::get_field_defaults
245 245
 		 */
246
-		if( !empty( $option['default'] ) && empty( $option['value'] ) ) {
247
-			$option['value'] = $option['default'];
248
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting '. $name .' details' );
246
+		if ( ! empty( $option[ 'default' ] ) && empty( $option[ 'value' ] ) ) {
247
+			$option[ 'value' ] = $option[ 'default' ];
248
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting ' . $name . ' details' );
249 249
 		}
250 250
 
251 251
 		// prepare to render option field type
252
-		if( isset( $option['type'] ) ) {
252
+		if ( isset( $option[ 'type' ] ) ) {
253 253
 
254 254
 			$type_class = self::load_type_class( $option );
255 255
 
256
-			if( class_exists( $type_class ) ) {
256
+			if ( class_exists( $type_class ) ) {
257 257
 
258 258
 				/** @var GravityView_FieldType $render_type */
259 259
 				$render_type = new $type_class( $name, $option, $curr_value );
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 				 * @param[in,out] string $output field class name
271 271
 				 * @param[in] array $option  option field data
272 272
 				 */
273
-				$output = apply_filters( "gravityview/option/output/{$option['type']}" , $output, $option );
273
+				$output = apply_filters( "gravityview/option/output/{$option[ 'type' ]}", $output, $option );
274 274
 			}
275 275
 
276 276
 		} // isset option[type]
@@ -297,33 +297,33 @@  discard block
 block discarded – undo
297 297
 		$setting = GravityView_View_Data::get_default_arg( $key, true );
298 298
 
299 299
 		// If the key doesn't exist, there's something wrong.
300
-		if( empty( $setting ) ) { return; }
300
+		if ( empty( $setting ) ) { return; }
301 301
 
302 302
 		/**
303 303
 		 * @deprecated setting index 'name' was replaced by 'label'
304 304
 		 * @see GravityView_FieldType::get_field_defaults
305 305
 		 */
306
-		if( isset( $setting['name'] ) && empty( $setting['label'] ) ) {
307
-			$setting['label'] = $setting['name'];
308
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting '. $key .' details' );
306
+		if ( isset( $setting[ 'name' ] ) && empty( $setting[ 'label' ] ) ) {
307
+			$setting[ 'label' ] = $setting[ 'name' ];
308
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting ' . $key . ' details' );
309 309
 		}
310 310
 
311 311
 		$name = esc_attr( sprintf( $name, $key ) );
312
-		$setting['id'] = esc_attr( sprintf( $id, $key ) );
313
-		$setting['tooltip'] = 'gv_' . $key;
312
+		$setting[ 'id' ] = esc_attr( sprintf( $id, $key ) );
313
+		$setting[ 'tooltip' ] = 'gv_' . $key;
314 314
 
315 315
 		// Use default if current setting isn't set.
316
-		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting['value'];
316
+		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting[ 'value' ];
317 317
 
318 318
 		// default setting type = text
319
-		$setting['type'] = empty( $setting['type'] ) ? 'text' : $setting['type'];
319
+		$setting[ 'type' ] = empty( $setting[ 'type' ] ) ? 'text' : $setting[ 'type' ];
320 320
 
321 321
 		// merge tags
322
-		if( !isset( $setting['merge_tags'] ) ) {
323
-			if( $setting['type'] === 'text' ) {
324
-				$setting['merge_tags'] = true;
322
+		if ( ! isset( $setting[ 'merge_tags' ] ) ) {
323
+			if ( $setting[ 'type' ] === 'text' ) {
324
+				$setting[ 'merge_tags' ] = true;
325 325
 			} else {
326
-				$setting['merge_tags'] = false;
326
+				$setting[ 'merge_tags' ] = false;
327 327
 			}
328 328
 		}
329 329
 
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
 
332 332
 		// render the setting
333 333
 		$type_class = self::load_type_class( $setting );
334
-		if( class_exists( $type_class ) ) {
334
+		if ( class_exists( $type_class ) ) {
335 335
 			/** @var GravityView_FieldType $render_type */
336 336
 			$render_type = new $type_class( $name, $setting, $curr_value );
337 337
 			ob_start();
@@ -340,21 +340,21 @@  discard block
 block discarded – undo
340 340
 		}
341 341
 
342 342
 		// Check if setting is specific for a template
343
-		if( !empty( $setting['show_in_template'] ) ) {
344
-			if( !is_array( $setting['show_in_template'] ) ) {
345
-				$setting['show_in_template'] = array( $setting['show_in_template'] );
343
+		if ( ! empty( $setting[ 'show_in_template' ] ) ) {
344
+			if ( ! is_array( $setting[ 'show_in_template' ] ) ) {
345
+				$setting[ 'show_in_template' ] = array( $setting[ 'show_in_template' ] );
346 346
 			}
347
-			$show_if = ' data-show-if="'. implode( ' ', $setting['show_in_template'] ).'"';
347
+			$show_if = ' data-show-if="' . implode( ' ', $setting[ 'show_in_template' ] ) . '"';
348 348
 		} else {
349 349
 			$show_if = '';
350 350
 		}
351 351
 
352
-		if( ! empty( $setting['requires'] ) ) {
353
-			$show_if .= sprintf( ' data-requires="%s"', $setting['requires'] );
352
+		if ( ! empty( $setting[ 'requires' ] ) ) {
353
+			$show_if .= sprintf( ' data-requires="%s"', $setting[ 'requires' ] );
354 354
 		}
355 355
 
356 356
 		// output
357
-		echo '<tr valign="top" '. $show_if .'>' . $output . '</tr>';
357
+		echo '<tr valign="top" ' . $show_if . '>' . $output . '</tr>';
358 358
 
359 359
 	}
360 360
 
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
 	 */
367 367
 	public static function load_type_class( $field = NULL ) {
368 368
 
369
-		if( empty( $field['type'] ) ) {
369
+		if ( empty( $field[ 'type' ] ) ) {
370 370
 			return NULL;
371 371
 		}
372 372
 
@@ -375,19 +375,19 @@  discard block
 block discarded – undo
375 375
 		 * @param string $class_suffix  field class suffix; `GravityView_FieldType_{$class_suffix}`
376 376
 		 * @param array $field   field data
377 377
 		 */
378
-		$type_class = apply_filters( "gravityview/setting/class/{$field['type']}", 'GravityView_FieldType_' . $field['type'], $field );
378
+		$type_class = apply_filters( "gravityview/setting/class/{$field[ 'type' ]}", 'GravityView_FieldType_' . $field[ 'type' ], $field );
379 379
 
380
-		if( !class_exists( $type_class ) ) {
380
+		if ( ! class_exists( $type_class ) ) {
381 381
 
382 382
 			/**
383 383
 			 * @filter `gravityview/setting/class_file/{field_type}`
384 384
 			 * @param string  $field_type_include_path field class file path
385 385
 			 * @param array $field  field data
386 386
 			 */
387
-			$class_file = apply_filters( "gravityview/setting/class_file/{$field['type']}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field['type']}.php", $field );
387
+			$class_file = apply_filters( "gravityview/setting/class_file/{$field[ 'type' ]}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field[ 'type' ]}.php", $field );
388 388
 
389
-			if( $class_file ) {
390
-				if( file_exists( $class_file ) ) {
389
+			if ( $class_file ) {
390
+				if ( file_exists( $class_file ) ) {
391 391
 					require_once( $class_file );
392 392
 				}
393 393
 			}
@@ -412,8 +412,8 @@  discard block
 block discarded – undo
412 412
 
413 413
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_checkbox::render_input' );
414 414
 
415
-		$output  = '<input name="'. esc_attr( $name ) .'" type="hidden" value="0">';
416
-		$output .= '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="checkbox" value="1" '. checked( $current, '1', false ) .' >';
415
+		$output  = '<input name="' . esc_attr( $name ) . '" type="hidden" value="0">';
416
+		$output .= '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="checkbox" value="1" ' . checked( $current, '1', false ) . ' >';
417 417
 
418 418
 		return $output;
419 419
 	}
@@ -433,22 +433,22 @@  discard block
 block discarded – undo
433 433
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_text::render_input' );
434 434
 
435 435
 		// Show the merge tags if the field is a list view
436
-		$is_list = ( preg_match( '/_list-/ism', $name ));
436
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
437 437
 
438 438
 		// Or is a single entry view
439
-		$is_single = ( preg_match( '/single_/ism', $name ));
439
+		$is_single = ( preg_match( '/single_/ism', $name ) );
440 440
 		$show = ( $is_single || $is_list );
441 441
 
442 442
 		$class = '';
443 443
 		// and $add_merge_tags is not false
444
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
444
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
445 445
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
446 446
 		}
447 447
 
448
-		$class .= !empty( $args['class'] ) ? $args['class'] : 'widefat';
449
-		$type = !empty( $args['type'] ) ? $args['type'] : 'text';
448
+		$class .= ! empty( $args[ 'class' ] ) ? $args[ 'class' ] : 'widefat';
449
+		$type = ! empty( $args[ 'type' ] ) ? $args[ 'type' ] : 'text';
450 450
 
451
-		return '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="'.esc_attr($type).'" value="'. esc_attr( $current ) .'" class="'.esc_attr( $class ).'">';
451
+		return '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="' . esc_attr( $type ) . '" value="' . esc_attr( $current ) . '" class="' . esc_attr( $class ) . '">';
452 452
 	}
453 453
 
454 454
 	/**
@@ -465,21 +465,21 @@  discard block
 block discarded – undo
465 465
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_textarea::render_input' );
466 466
 
467 467
 		// Show the merge tags if the field is a list view
468
-		$is_list = ( preg_match( '/_list-/ism', $name ));
468
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
469 469
 
470 470
 		// Or is a single entry view
471
-		$is_single = ( preg_match( '/single_/ism', $name ));
471
+		$is_single = ( preg_match( '/single_/ism', $name ) );
472 472
 		$show = ( $is_single || $is_list );
473 473
 
474 474
 		$class = '';
475 475
 		// and $add_merge_tags is not false
476
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
476
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
477 477
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
478 478
 		}
479 479
 
480
-		$class .= !empty( $args['class'] ) ? 'widefat '.$args['class'] : 'widefat';
480
+		$class .= ! empty( $args[ 'class' ] ) ? 'widefat ' . $args[ 'class' ] : 'widefat';
481 481
 
482
-		return '<textarea name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" class="'.esc_attr( $class ).'">'. esc_textarea( $current ) .'</textarea>';
482
+		return '<textarea name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class ) . '">' . esc_textarea( $current ) . '</textarea>';
483 483
 	}
484 484
 
485 485
 	/**
@@ -495,9 +495,9 @@  discard block
 block discarded – undo
495 495
 
496 496
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_select::render_input' );
497 497
 
498
-		$output = '<select name="'. $name .'" id="'. $id .'">';
499
-		foreach( $choices as $value => $label ) {
500
-			$output .= '<option value="'. esc_attr( $value ) .'" '. selected( $value, $current, false ) .'>'. esc_html( $label ) .'</option>';
498
+		$output = '<select name="' . $name . '" id="' . $id . '">';
499
+		foreach ( $choices as $value => $label ) {
500
+			$output .= '<option value="' . esc_attr( $value ) . '" ' . selected( $value, $current, false ) . '>' . esc_html( $label ) . '</option>';
501 501
 		}
502 502
 		$output .= '</select>';
503 503
 
Please login to merge, or discard this patch.
includes/class-admin.php 2 patches
Spacing   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -4,10 +4,10 @@  discard block
 block discarded – undo
4 4
 
5 5
 	function __construct() {
6 6
 
7
-		if( ! is_admin() ) { return; }
7
+		if ( ! is_admin() ) { return; }
8 8
 
9 9
 		// If Gravity Forms isn't active or compatibile, stop loading
10
-		if( false === GravityView_Compatibility::is_valid() ) {
10
+		if ( false === GravityView_Compatibility::is_valid() ) {
11 11
 			return;
12 12
 		}
13 13
 
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-migrate.php' );
26 26
 
27 27
 		// Don't load tooltips if on Gravity Forms, otherwise it overrides translations
28
-		if( class_exists( 'GFCommon' ) && class_exists( 'GFForms' ) && !GFForms::is_gravity_page() ) {
28
+		if ( class_exists( 'GFCommon' ) && class_exists( 'GFForms' ) && ! GFForms::is_gravity_page() ) {
29 29
 			require_once( GFCommon::get_base_path() . '/tooltips.php' );
30 30
 		}
31 31
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 		add_filter( 'post_updated_messages', array( $this, 'post_updated_messages' ) );
54 54
 		add_filter( 'bulk_post_updated_messages', array( $this, 'post_updated_messages' ) );
55 55
 
56
-		add_filter( 'plugin_action_links_'. plugin_basename( GRAVITYVIEW_FILE ) , array( $this, 'plugin_action_links' ) );
56
+		add_filter( 'plugin_action_links_' . plugin_basename( GRAVITYVIEW_FILE ), array( $this, 'plugin_action_links' ) );
57 57
 
58 58
 		add_action( 'plugins_loaded', array( $this, 'backend_actions' ), 100 );
59 59
 
@@ -68,9 +68,9 @@  discard block
 block discarded – undo
68 68
 	 */
69 69
 	public static function no_views_text() {
70 70
 		
71
-		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] ) {
71
+		if ( isset( $_REQUEST[ 'post_status' ] ) && 'trash' === $_REQUEST[ 'post_status' ] ) {
72 72
 			return __( 'No Views found in Trash', 'gravityview' );
73
-		} elseif( ! empty( $_GET['s'] ) ) {
73
+		} elseif ( ! empty( $_GET[ 's' ] ) ) {
74 74
 			return __( 'No Views found.', 'gravityview' );
75 75
 		}
76 76
 
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 			$error .= ' ' . esc_html__( 'Select another form as the data source for this View.', 'gravityview' );
114 114
 		}
115 115
 
116
-		if( $error ) {
116
+		if ( $error ) {
117 117
 			?>
118 118
 			<div class="wp-dialog notice-warning inline error wp-clearfix">
119 119
 				<?php echo gravityview_get_floaty(); ?>
@@ -132,22 +132,22 @@  discard block
 block discarded – undo
132 132
 	public function backend_actions() {
133 133
 
134 134
 		/** @define "GRAVITYVIEW_DIR" "../" */
135
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.field.type.php' );
136
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.render.settings.php' );
137
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-item.php' );
138
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-field.php' );
139
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-widget.php' );
140
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-views.php' );
141
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-welcome.php' );
142
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-add-shortcode.php' );
143
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
135
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class.field.type.php' );
136
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class.render.settings.php' );
137
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-item.php' );
138
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-field.php' );
139
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-widget.php' );
140
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-views.php' );
141
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-welcome.php' );
142
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-add-shortcode.php' );
143
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' );
144 144
 
145 145
 		/**
146 146
 		 * @action `gravityview_include_backend_actions` Triggered after all GravityView admin files are loaded
147 147
 		 *
148 148
 		 * Nice place to insert extensions' backend stuff
149 149
 		 */
150
-		do_action('gravityview_include_backend_actions');
150
+		do_action( 'gravityview_include_backend_actions' );
151 151
 	}
152 152
 
153 153
 	/**
@@ -163,12 +163,12 @@  discard block
 block discarded – undo
163 163
 
164 164
 		$actions = array();
165 165
 
166
-		if( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
167
-			$actions[] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
166
+		if ( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
167
+			$actions[ ] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
168 168
 		}
169 169
 
170
-		if( GVCommon::has_cap( 'gravityview_support_port' ) ) {
171
-			$actions[] = '<a href="http://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
170
+		if ( GVCommon::has_cap( 'gravityview_support_port' ) ) {
171
+			$actions[ ] = '<a href="http://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
172 172
 		}
173 173
 
174 174
 		return array_merge( $actions, $links );
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 		// By default, there will only be one item being modified.
197 197
 		// When in the `bulk_post_updated_messages` filter, there will be passed a number
198 198
 		// of modified items that will override this array.
199
-		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1 , 'locked' => 1 , 'deleted' => 1 , 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
199
+		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1, 'locked' => 1, 'deleted' => 1, 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
200 200
 
201 201
 		// If we're starting fresh, a new form was created.
202 202
 		// We should let the user know this is the case.
@@ -204,60 +204,60 @@  discard block
 block discarded – undo
204 204
 
205 205
 		$new_form_text = '';
206 206
 
207
-		if( !empty( $start_fresh ) ) {
207
+		if ( ! empty( $start_fresh ) ) {
208 208
 
209 209
 			// Get the form that was created
210 210
 			$connected_form = gravityview_get_form_id( $post_id );
211 211
 
212
-			if( !empty( $connected_form ) ) {
212
+			if ( ! empty( $connected_form ) ) {
213 213
 				$form = gravityview_get_form( $connected_form );
214
-				$form_name = esc_attr( $form['title'] );
214
+				$form_name = esc_attr( $form[ 'title' ] );
215 215
 				$image = self::get_floaty();
216
-				$new_form_text .= '<h3>'.$image.sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ).'</h3>';
217
-				$new_form_text .=  sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
216
+				$new_form_text .= '<h3>' . $image . sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ) . '</h3>';
217
+				$new_form_text .= sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
218 218
 
219 219
 					You can %sedit the form%s in Gravity Forms and the updated fields will be available here. Don&rsquo;t forget to %scustomize the form settings%s.
220
-					', 'gravityview' ), '<strong>', '</strong>', '<a href="'.site_url( '?gf_page=preview&amp;id='.$connected_form ).'">', '</a>', '<code>[gravityform id="'.$connected_form.'" name="'.$form_name.'"]</code>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;id='.$connected_form ).'">', '</a>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id='.$connected_form ).'">', '</a>');
220
+					', 'gravityview' ), '<strong>', '</strong>', '<a href="' . site_url( '?gf_page=preview&amp;id=' . $connected_form ) . '">', '</a>', '<code>[gravityform id="' . $connected_form . '" name="' . $form_name . '"]</code>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&amp;id=' . $connected_form ) . '">', '</a>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=' . $connected_form ) . '">', '</a>' );
221 221
 				$new_form_text = wpautop( $new_form_text );
222 222
 
223 223
 				delete_post_meta( $post_id, '_gravityview_start_fresh' );
224 224
 			}
225 225
 		}
226 226
 
227
-		$messages['gravityview'] = array(
227
+		$messages[ 'gravityview' ] = array(
228 228
 			0  => '', // Unused. Messages start at index 1.
229 229
 			/* translators: %s and %s are HTML tags linking to the View on the website */
230
-			1  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
230
+			1  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
231 231
 			/* translators: %s and %s are HTML tags linking to the View on the website */
232
-			2  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
232
+			2  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
233 233
 			3  => __( 'View deleted.', 'gravityview' ),
234 234
 			/* translators: %s and %s are HTML tags linking to the View on the website */
235
-			4  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
235
+			4  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
236 236
 			/* translators: %s: date and time of the revision */
237
-			5  => isset( $_GET['revision'] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
237
+			5  => isset( $_GET[ 'revision' ] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int)$_GET[ 'revision' ], false ) ) : false,
238 238
 			/* translators: %s and %s are HTML tags linking to the View on the website */
239
-			6  => sprintf(__( 'View published. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
239
+			6  => sprintf( __( 'View published. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
240 240
 			/* translators: %s and %s are HTML tags linking to the View on the website */
241
-			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
241
+			7  => sprintf( __( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
242 242
 			8  => __( 'View submitted.', 'gravityview' ),
243 243
 			9  => sprintf(
244 244
 		        /* translators: Date and time the View is scheduled to be published */
245 245
 				__( 'View scheduled for: %1$s.', 'gravityview' ),
246 246
 				// translators: Publish box date format, see http://php.net/date
247
-				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
247
+				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL ) ) )
248 248
 			) . $new_form_text,
249 249
 			/* translators: %s and %s are HTML tags linking to the View on the website */
250
-			10  => sprintf(__( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
250
+			10  => sprintf( __( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
251 251
 
252 252
 			/**
253 253
 			 * These apply to `bulk_post_updated_messages`
254 254
 			 * @file wp-admin/edit.php
255 255
 			 */
256
-			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts['updated'], 'gravityview' ),
257
-			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts['locked'], 'gravityview' ),
258
-			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts['deleted'], 'gravityview' ),
259
-			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts['trashed'], 'gravityview' ),
260
-			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts['untrashed'], 'gravityview' ),
256
+			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts[ 'updated' ], 'gravityview' ),
257
+			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts[ 'locked' ], 'gravityview' ),
258
+			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts[ 'deleted' ], 'gravityview' ),
259
+			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts[ 'trashed' ], 'gravityview' ),
260
+			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts[ 'untrashed' ], 'gravityview' ),
261 261
 		);
262 262
 
263 263
 		return $messages;
@@ -317,29 +317,29 @@  discard block
 block discarded – undo
317 317
 	static function is_admin_page( $hook = '', $page = NULL ) {
318 318
 		global $current_screen, $plugin_page, $pagenow, $post;
319 319
 
320
-		if( ! is_admin() ) { return false; }
320
+		if ( ! is_admin() ) { return false; }
321 321
 
322 322
 		$is_page = false;
323 323
 
324
-		$is_gv_screen = (!empty($current_screen) && isset($current_screen->post_type) && $current_screen->post_type === 'gravityview');
324
+		$is_gv_screen = ( ! empty( $current_screen ) && isset( $current_screen->post_type ) && $current_screen->post_type === 'gravityview' );
325 325
 
326
-		$is_gv_post_type_get = (isset($_GET['post_type']) && $_GET['post_type'] === 'gravityview');
326
+		$is_gv_post_type_get = ( isset( $_GET[ 'post_type' ] ) && $_GET[ 'post_type' ] === 'gravityview' );
327 327
 
328
-		$is_gv_settings_get = isset( $_GET['page'] ) && $_GET['page'] === 'gravityview_settings';
328
+		$is_gv_settings_get = isset( $_GET[ 'page' ] ) && $_GET[ 'page' ] === 'gravityview_settings';
329 329
 
330
-		if( empty( $post ) && $pagenow === 'post.php' && !empty( $_GET['post'] ) ) {
331
-			$gv_post = get_post( intval( $_GET['post'] ) );
332
-			$is_gv_post_type = (!empty($gv_post) && !empty($gv_post->post_type) && $gv_post->post_type === 'gravityview');
330
+		if ( empty( $post ) && $pagenow === 'post.php' && ! empty( $_GET[ 'post' ] ) ) {
331
+			$gv_post = get_post( intval( $_GET[ 'post' ] ) );
332
+			$is_gv_post_type = ( ! empty( $gv_post ) && ! empty( $gv_post->post_type ) && $gv_post->post_type === 'gravityview' );
333 333
 		} else {
334
-			$is_gv_post_type = (!empty($post) && !empty($post->post_type) && $post->post_type === 'gravityview');
334
+			$is_gv_post_type = ( ! empty( $post ) && ! empty( $post->post_type ) && $post->post_type === 'gravityview' );
335 335
 		}
336 336
 
337
-		if( $is_gv_screen || $is_gv_post_type || $is_gv_post_type || $is_gv_post_type_get || $is_gv_settings_get ) {
337
+		if ( $is_gv_screen || $is_gv_post_type || $is_gv_post_type || $is_gv_post_type_get || $is_gv_settings_get ) {
338 338
 
339 339
 			// $_GET `post_type` variable
340
-			if(in_array($pagenow, array( 'post.php' , 'post-new.php' )) ) {
340
+			if ( in_array( $pagenow, array( 'post.php', 'post-new.php' ) ) ) {
341 341
 				$is_page = 'single';
342
-			} else if ( in_array( $plugin_page, array( 'gravityview_settings', 'gravityview_page_gravityview_settings' ) ) || ( !empty( $_GET['page'] ) && $_GET['page'] === 'gravityview_settings' ) ) {
342
+			} else if ( in_array( $plugin_page, array( 'gravityview_settings', 'gravityview_page_gravityview_settings' ) ) || ( ! empty( $_GET[ 'page' ] ) && $_GET[ 'page' ] === 'gravityview_settings' ) ) {
343 343
 				$is_page = 'settings';
344 344
 			} else {
345 345
 				$is_page = 'views';
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
 		$is_page = apply_filters( 'gravityview_is_admin_page', $is_page, $hook );
355 355
 
356 356
 		// If the current page is the same as the compared page
357
-		if( !empty( $page ) ) {
357
+		if ( ! empty( $page ) ) {
358 358
 			return $is_page === $page;
359 359
 		}
360 360
 
@@ -375,6 +375,6 @@  discard block
 block discarded – undo
375 375
  *
376 376
  * @return bool|string|void If `false`, not a GravityView page. `true` if $page is passed and is the same as current page. Otherwise, the name of the page (`single`, `settings`, or `views`)
377 377
  */
378
-function gravityview_is_admin_page($hook = '', $page = NULL) {
378
+function gravityview_is_admin_page( $hook = '', $page = NULL ) {
379 379
 	return GravityView_Admin::is_admin_page( $hook, $page );
380 380
 }
Please login to merge, or discard this patch.
Indentation   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	 * @return void
97 97
 	 */
98 98
 	public static function connected_form_warning( $form_id = 0 ) {
99
-        global $pagenow;
99
+		global $pagenow;
100 100
 
101 101
 		if ( ! is_int( $form_id ) || $pagenow === 'post-new.php' ) {
102 102
 			return;
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
243 243
 			8  => __( 'View submitted.', 'gravityview' ),
244 244
 			9  => sprintf(
245
-		        /* translators: Date and time the View is scheduled to be published */
245
+				/* translators: Date and time the View is scheduled to be published */
246 246
 				__( 'View scheduled for: %1$s.', 'gravityview' ),
247 247
 				// translators: Publish box date format, see http://php.net/date
248 248
 				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
@@ -299,7 +299,6 @@  discard block
 block discarded – undo
299 299
 	 *
300 300
 	 * @deprecated since 1.12
301 301
 	 * @see GravityView_Compatibility::get_plugin_status()
302
-
303 302
 	 * @return boolean|string True: plugin is active; False: plugin file doesn't exist at path; 'inactive' it's inactive
304 303
 	 */
305 304
 	static function get_plugin_status( $location = '' ) {
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/data-source.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -11,13 +11,13 @@  discard block
 block discarded – undo
11 11
 wp_nonce_field( 'gravityview_select_form', 'gravityview_select_form_nonce' );
12 12
 
13 13
 //current value
14
-$current_form = (int) rgar( (array) $_GET, 'form_id', gravityview_get_form_id( $post->ID ) );
14
+$current_form = (int)rgar( (array)$_GET, 'form_id', gravityview_get_form_id( $post->ID ) );
15 15
 
16 16
 // If form is in trash or not existing, show error
17 17
 GravityView_Admin::connected_form_warning( $current_form );
18 18
 
19 19
 // check for available gravity forms
20
-$forms = gravityview_get_forms('any');
20
+$forms = gravityview_get_forms( 'any' );
21 21
 ?>
22 22
 <label for="gravityview_form_id" ><?php esc_html_e( 'Where would you like the data to come from for this View?', 'gravityview' ); ?></label>
23 23
 
@@ -28,24 +28,24 @@  discard block
 block discarded – undo
28 28
 		?>
29 29
 		<a class="button button-primary" href="#gv_start_fresh" title="<?php esc_attr_e( 'Start Fresh', 'gravityview' ); ?>"><?php esc_html_e( 'Start Fresh', 'gravityview' ); ?></a>
30 30
 
31
-		<?php if( !empty( $forms ) ) { ?>
31
+		<?php if ( ! empty( $forms ) ) { ?>
32 32
 			<span>&nbsp;<?php esc_html_e( 'or use an existing form', 'gravityview' ); ?>&nbsp;</span>
33 33
 		<?php }
34 34
 	}
35 35
 
36 36
 	// If there are no forms to select, show no forms.
37
-	if( !empty( $forms ) ) { ?>
37
+	if ( ! empty( $forms ) ) { ?>
38 38
 		<select name="gravityview_form_id" id="gravityview_form_id">
39 39
 			<option value="" <?php selected( '', $current_form, true ); ?>>&mdash; <?php esc_html_e( 'list of forms', 'gravityview' ); ?> &mdash;</option>
40
-			<?php foreach( $forms as $form ) { ?>
41
-				<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
40
+			<?php foreach ( $forms as $form ) { ?>
41
+				<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
42 42
 			<?php } ?>
43 43
 		</select>
44 44
 	<?php } else { ?>
45 45
 		<select name="gravityview_form_id" id="gravityview_form_id" class="hidden"><option selected="selected" value=""></option></select>
46 46
 	<?php } ?>
47 47
 
48
-	&nbsp;<a class="button button-primary" <?php if( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" href="#gv_switch_view" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></a>
48
+	&nbsp;<a class="button button-primary" <?php if ( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" href="#gv_switch_view" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></a>
49 49
 </p>
50 50
 
51 51
 <?php // confirm dialog box ?>
Please login to merge, or discard this patch.
includes/class-gravityview-entry-approval.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
 	 * @param  int $entry_id ID of the Gravity Forms entry
372 372
 	 * @param  string $status String whether entry is approved or not. `0` for not approved, `Approved` for approved.
373 373
 	 * @param int $form_id ID of the form of the entry being updated. Improves query performance.
374
-	 * @param string $approvedcolumn Gravity Forms Field ID
374
+	 * @param integer $approvedcolumn Gravity Forms Field ID
375 375
 	 *
376 376
 	 * @return true|WP_Error
377 377
 	 */
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
 	 *
423 423
 	 * When approving a field via the entry meta, we
424 424
 	 *
425
-	 * @param array|int $form Form ID or form array
425
+	 * @param integer $form Form ID or form array
426 426
 	 * @param string $approved_column Approved column field ID
427 427
 	 *
428 428
 	 * @return string|null
Please login to merge, or discard this patch.
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -39,13 +39,13 @@  discard block
 block discarded – undo
39 39
 	private function add_hooks() {
40 40
 
41 41
 		// in case entry is edited (on admin or frontend)
42
-		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2);
42
+		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2 );
43 43
 
44 44
 		// when using the User opt-in field, check on entry submission
45 45
 		add_action( 'gform_after_submission', array( $this, 'after_submission' ), 10, 2 );
46 46
 
47 47
 		// process ajax approve entry requests
48
-		add_action('wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved'));
48
+		add_action( 'wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved' ) );
49 49
 
50 50
 	}
51 51
 
@@ -62,13 +62,13 @@  discard block
 block discarded – undo
62 62
 	 */
63 63
 	public static function get_entry_status( $entry, $value_or_label = 'label' ) {
64 64
 
65
-		$entry_id = is_array( $entry ) ? $entry['id'] : GVCommon::get_entry_id( $entry, true );
65
+		$entry_id = is_array( $entry ) ? $entry[ 'id' ] : GVCommon::get_entry_id( $entry, true );
66 66
 
67 67
 		$status = gform_get_meta( $entry_id, self::meta_key );
68 68
 
69 69
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
70 70
 
71
-		if( 'value' === $value_or_label ) {
71
+		if ( 'value' === $value_or_label ) {
72 72
 			return $status;
73 73
 		}
74 74
 
@@ -93,20 +93,20 @@  discard block
 block discarded – undo
93 93
 	 */
94 94
 	public function ajax_update_approved() {
95 95
 		
96
-		$form_id = intval( rgpost('form_id') );
96
+		$form_id = intval( rgpost( 'form_id' ) );
97 97
 
98 98
 		// We always want requests from the admin to allow entry IDs, but not from the frontend
99 99
 		// There's another nonce sent when approving entries in the admin that we check
100 100
 		$force_entry_ids = rgpost( 'admin_nonce' ) && wp_verify_nonce( rgpost( 'admin_nonce' ), 'gravityview_admin_entry_approval' );
101 101
 		
102
-		$entry_id = GVCommon::get_entry_id( rgpost('entry_slug'), $force_entry_ids );
102
+		$entry_id = GVCommon::get_entry_id( rgpost( 'entry_slug' ), $force_entry_ids );
103 103
 
104
-		$approval_status = rgpost('approved');
104
+		$approval_status = rgpost( 'approved' );
105 105
 
106
-		$nonce = rgpost('nonce');
106
+		$nonce = rgpost( 'nonce' );
107 107
 
108 108
 		// Valid status
109
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
109
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
110 110
 
111 111
 			do_action( 'gravityview_log_error', __METHOD__ . ': Invalid approval status', $_POST );
112 112
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 
138 138
 			do_action( 'gravityview_log_error', __METHOD__ . ' User does not have the `gravityview_moderate_entries` capability.' );
139 139
 
140
-			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview') );
140
+			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview' ) );
141 141
 
142 142
 		}
143 143
 
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 	 * @param $form array Gravity Forms form object
171 171
 	 */
172 172
 	public function after_submission( $entry, $form ) {
173
-		$this->after_update_entry_update_approved_meta( $form , $entry['id'] );
173
+		$this->after_update_entry_update_approved_meta( $form, $entry[ 'id' ] );
174 174
 	}
175 175
 
176 176
 	/**
@@ -184,12 +184,12 @@  discard block
 block discarded – undo
184 184
 	 */
185 185
 	public function after_update_entry_update_approved_meta( $form, $entry_id = NULL ) {
186 186
 
187
-		$approved_column = self::get_approved_column( $form['id'] );
187
+		$approved_column = self::get_approved_column( $form[ 'id' ] );
188 188
 
189 189
 		/**
190 190
 		 * If the form doesn't contain the approve field, don't assume anything.
191 191
 		 */
192
-		if( empty( $approved_column ) ) {
192
+		if ( empty( $approved_column ) ) {
193 193
 			return;
194 194
 		}
195 195
 
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
 			$value = GravityView_Entry_Approval_Status::APPROVED;
204 204
 		}
205 205
 
206
-		self::update_approved_meta( $entry_id, $value, $form['id'] );
206
+		self::update_approved_meta( $entry_id, $value, $form[ 'id' ] );
207 207
 	}
208 208
 
209 209
 	/**
@@ -221,12 +221,12 @@  discard block
 block discarded – undo
221 221
 	 */
222 222
 	public static function update_bulk( $entries = array(), $approved, $form_id ) {
223 223
 
224
-		if( empty($entries) || ( $entries !== true && !is_array($entries) ) ) {
224
+		if ( empty( $entries ) || ( $entries !== true && ! is_array( $entries ) ) ) {
225 225
 			do_action( 'gravityview_log_error', __METHOD__ . ' Entries were empty or malformed.', $entries );
226 226
 			return NULL;
227 227
 		}
228 228
 
229
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
229
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
230 230
 			do_action( 'gravityview_log_error', __METHOD__ . ' User does not have the `gravityview_moderate_entries` capability.' );
231 231
 			return NULL;
232 232
 		}
@@ -241,10 +241,10 @@  discard block
 block discarded – undo
241 241
 		$approved_column_id = self::get_approved_column( $form_id );
242 242
 
243 243
 		$success = true;
244
-		foreach( $entries as $entry_id ) {
244
+		foreach ( $entries as $entry_id ) {
245 245
 			$update_success = self::update_approved( (int)$entry_id, $approved, $form_id, $approved_column_id );
246 246
 
247
-			if( ! $update_success ) {
247
+			if ( ! $update_success ) {
248 248
 				$success = false;
249 249
 			}
250 250
 		}
@@ -268,12 +268,12 @@  discard block
 block discarded – undo
268 268
 	 */
269 269
 	public static function update_approved( $entry_id = 0, $approved = 2, $form_id = 0, $approvedcolumn = 0 ) {
270 270
 
271
-		if( !class_exists( 'GFAPI' ) ) {
271
+		if ( ! class_exists( 'GFAPI' ) ) {
272 272
 			do_action( 'gravityview_log_error', __METHOD__ . 'GFAPI does not exist' );
273 273
 			return false;
274 274
 		}
275 275
 
276
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
276
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
277 277
 			do_action( 'gravityview_log_error', __METHOD__ . ': Not a valid approval value.' );
278 278
 			return false;
279 279
 		}
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 		// If the form has an Approve/Reject field, update that value
291 291
 		$result = self::update_approved_column( $entry_id, $approved, $form_id, $approvedcolumn );
292 292
 
293
-		if( is_wp_error( $result ) ) {
293
+		if ( is_wp_error( $result ) ) {
294 294
 			do_action( 'gravityview_log_error', __METHOD__ . sprintf( ' - Entry approval not updated: %s', $result->get_error_message() ) );
295 295
 			return false;
296 296
 		}
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
 
303 303
 		// add note to entry if approval field updating worked or there was no approved field
304 304
 		// There's no validation for the meta
305
-		if( true === $result ) {
305
+		if ( true === $result ) {
306 306
 
307 307
 			// Add an entry note
308 308
 			self::add_approval_status_updated_note( $entry_id, $approved );
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
 
356 356
 		$note_id = false;
357 357
 
358
-		if( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
358
+		if ( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
359 359
 
360 360
 			$current_user = wp_get_current_user();
361 361
 
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
 	 */
378 378
 	private static function update_approved_column( $entry_id = 0, $status = '0', $form_id = 0, $approvedcolumn = 0 ) {
379 379
 
380
-		if( empty( $approvedcolumn ) ) {
380
+		if ( empty( $approvedcolumn ) ) {
381 381
 			$approvedcolumn = self::get_approved_column( $form_id );
382 382
 		}
383 383
 
@@ -400,12 +400,12 @@  discard block
 block discarded – undo
400 400
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
401 401
 
402 402
 		$new_value = '';
403
-		if( GravityView_Entry_Approval_Status::APPROVED === $status ) {
403
+		if ( GravityView_Entry_Approval_Status::APPROVED === $status ) {
404 404
 			$new_value = self::get_approved_column_input_label( $form_id, $approvedcolumn );
405 405
 		}
406 406
 
407 407
 		//update entry
408
-		$entry["{$approvedcolumn}"] = $new_value;
408
+		$entry[ "{$approvedcolumn}" ] = $new_value;
409 409
 
410 410
 		/**
411 411
 		 * Note: GFAPI::update_entry() doesn't trigger `gform_after_update_entry`, so we trigger updating the meta ourselves
@@ -434,12 +434,12 @@  discard block
 block discarded – undo
434 434
 		// If the user has enabled a different value than the label (for some reason), use it.
435 435
 		// This is highly unlikely
436 436
 		if ( is_array( $field->choices ) && ! empty( $field->choices ) ) {
437
-			return isset( $field->choices[0]['value'] ) ? $field->choices[0]['value'] : $field->choices[0]['text'];
437
+			return isset( $field->choices[ 0 ][ 'value' ] ) ? $field->choices[ 0 ][ 'value' ] : $field->choices[ 0 ][ 'text' ];
438 438
 		}
439 439
 
440 440
 		// Otherwise, fall back on the inputs array
441 441
 		if ( is_array( $field->inputs ) && ! empty( $field->inputs ) ) {
442
-			return $field->inputs[0]['label'];
442
+			return $field->inputs[ 0 ][ 'label' ];
443 443
 		}
444 444
 
445 445
 		return null;
@@ -460,16 +460,16 @@  discard block
 block discarded – undo
460 460
 	private static function update_approved_meta( $entry_id, $status, $form_id = 0 ) {
461 461
 
462 462
 		if ( ! GravityView_Entry_Approval_Status::is_valid( $status ) ) {
463
-			do_action('gravityview_log_error', __METHOD__ . ': $is_approved not valid value', $status );
463
+			do_action( 'gravityview_log_error', __METHOD__ . ': $is_approved not valid value', $status );
464 464
 			return;
465 465
 		}
466 466
 
467 467
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
468 468
 
469 469
 		// update entry meta
470
-		if( function_exists('gform_update_meta') ) {
470
+		if ( function_exists( 'gform_update_meta' ) ) {
471 471
 
472
-			if( GravityView_Entry_Approval_Status::is_unapproved( $status ) ) {
472
+			if ( GravityView_Entry_Approval_Status::is_unapproved( $status ) ) {
473 473
 				gform_delete_meta( $entry_id, self::meta_key );
474 474
 			} else {
475 475
 				gform_update_meta( $entry_id, self::meta_key, $status, $form_id );
@@ -492,11 +492,11 @@  discard block
 block discarded – undo
492 492
 			 * @since 1.18 Added "unapproved"
493 493
 			 * @param  int $entry_id ID of the Gravity Forms entry
494 494
 			 */
495
-			do_action( 'gravityview/approve_entries/' . $action , $entry_id );
495
+			do_action( 'gravityview/approve_entries/' . $action, $entry_id );
496 496
 
497 497
 		} else {
498 498
 
499
-			do_action('gravityview_log_error', __METHOD__ . ' - `gform_update_meta` does not exist.' );
499
+			do_action( 'gravityview_log_error', __METHOD__ . ' - `gform_update_meta` does not exist.' );
500 500
 
501 501
 		}
502 502
 	}
@@ -511,11 +511,11 @@  discard block
 block discarded – undo
511 511
 	 */
512 512
 	static public function get_approved_column( $form ) {
513 513
 
514
-		if( empty( $form ) ) {
514
+		if ( empty( $form ) ) {
515 515
 			return null;
516 516
 		}
517 517
 
518
-		if( !is_array( $form ) ) {
518
+		if ( ! is_array( $form ) ) {
519 519
 			$form = GVCommon::get_form( $form );
520 520
 		}
521 521
 
@@ -525,22 +525,22 @@  discard block
 block discarded – undo
525 525
 		 * @var string $key
526 526
 		 * @var GF_Field $field
527 527
 		 */
528
-		foreach( $form['fields'] as $key => $field ) {
528
+		foreach ( $form[ 'fields' ] as $key => $field ) {
529 529
 
530 530
 			$inputs = $field->get_entry_inputs();
531 531
 
532
-			if( !empty( $field->gravityview_approved ) ) {
533
-				if ( ! empty( $inputs ) && !empty( $inputs[0]['id'] ) ) {
534
-					$approved_column_id = $inputs[0]['id'];
532
+			if ( ! empty( $field->gravityview_approved ) ) {
533
+				if ( ! empty( $inputs ) && ! empty( $inputs[ 0 ][ 'id' ] ) ) {
534
+					$approved_column_id = $inputs[ 0 ][ 'id' ];
535 535
 					break;
536 536
 				}
537 537
 			}
538 538
 
539 539
 			// Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work..
540
-			if( 'checkbox' === $field->type && ! empty( $inputs ) ) {
540
+			if ( 'checkbox' === $field->type && ! empty( $inputs ) ) {
541 541
 				foreach ( $inputs as $input ) {
542
-					if ( 'approved' === strtolower( $input['label'] ) ) {
543
-						$approved_column_id = $input['id'];
542
+					if ( 'approved' === strtolower( $input[ 'label' ] ) ) {
543
+						$approved_column_id = $input[ 'id' ];
544 544
 						break;
545 545
 					}
546 546
 				}
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' => rgar( $gravityview_view->paging, 'page_size' ),
36 36
 			'total' => $gravityview_view->total_entries,
37
-			'show_all' => !empty( $this->settings['show_all']['default'] ),
38
-			'current' => (int) rgar( $_GET, 'pagenum', 1 ),
37
+			'show_all' => ! empty( $this->settings[ 'show_all' ][ 'default' ] ),
38
+			'current' => (int)rgar( $_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
 			do_action( 'gravityview_log_debug', 'GravityView_Widget_Page_Links[render_frontend] No page links; paginate_links() returned empty response.' );
70 70
 		}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-custom.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@
 block discarded – undo
102 102
 				$field_data = array(
103 103
 					'label' => rgar( $edit_field, 'custom_label' ),
104 104
 					'customLabel' => rgar( $edit_field, 'custom_label' ),
105
-				    'content' => rgar( $edit_field, 'content' ),
105
+					'content' => rgar( $edit_field, 'content' ),
106 106
 				);
107 107
 
108 108
 				// Replace merge tags in the content
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 
41 41
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
42 42
 
43
-		unset ( $field_options['search_filter'], $field_options['show_as_link'] );
43
+		unset ( $field_options[ 'search_filter' ], $field_options[ 'show_as_link' ] );
44 44
 
45 45
 		$new_fields = array(
46 46
 			'content' => array(
@@ -60,8 +60,8 @@  discard block
 block discarded – undo
60 60
 			),
61 61
 		);
62 62
 
63
-		if( 'edit' === $context ) {
64
-			unset( $field_options['custom_label'], $field_options['show_label'], $field_options['allow_edit_cap'], $new_fields['wpautop'] );
63
+		if ( 'edit' === $context ) {
64
+			unset( $field_options[ 'custom_label' ], $field_options[ 'show_label' ], $field_options[ 'allow_edit_cap' ], $new_fields[ 'wpautop' ] );
65 65
 		}
66 66
 
67 67
 		return $new_fields + $field_options;
@@ -95,9 +95,9 @@  discard block
 block discarded – undo
95 95
 
96 96
 		// Loop through the configured Edit Entry fields and add Custom Content fields if there are any
97 97
 		// TODO: Make this available to other custom GV field types
98
-		foreach ( (array) $edit_fields as $edit_field ) {
98
+		foreach ( (array)$edit_fields as $edit_field ) {
99 99
 
100
-			if( 'custom' === rgar( $edit_field, 'id') ) {
100
+			if ( 'custom' === rgar( $edit_field, 'id' ) ) {
101 101
 
102 102
 				$field_data = array(
103 103
 					'label' => rgar( $edit_field, 'custom_label' ),
@@ -110,13 +110,13 @@  discard block
 block discarded – undo
110 110
 					$field_data[ $key ] = GravityView_Merge_Tags::replace_variables( $field_datum, $form, $entry, false, false );
111 111
 				}
112 112
 
113
-				$field_data['cssClass'] = rgar( $edit_field, 'custom_class' );
113
+				$field_data[ 'cssClass' ] = rgar( $edit_field, 'custom_class' );
114 114
 
115
-				$new_fields[] = new GF_Field_HTML( $field_data );
115
+				$new_fields[ ] = new GF_Field_HTML( $field_data );
116 116
 
117 117
 			} else {
118
-				if( isset( $fields[ $i ] ) ) {
119
-					$new_fields[] =  $fields[ $i ];
118
+				if ( isset( $fields[ $i ] ) ) {
119
+					$new_fields[ ] = $fields[ $i ];
120 120
 				}
121 121
 				$i++;
122 122
 			}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-address.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -54,8 +54,8 @@  discard block
 block discarded – undo
54 54
 
55 55
 			if ( 'address' === rgar( $search_field, 'type' ) ) {
56 56
 
57
-				$field_id = intval( floor( $search_field['key'] ) );
58
-				$input_id = gravityview_get_input_id_from_id( $search_field['key'] );
57
+				$field_id = intval( floor( $search_field[ 'key' ] ) );
58
+				$input_id = gravityview_get_input_id_from_id( $search_field[ 'key' ] );
59 59
 				$form = GravityView_View::getInstance()->getForm();
60 60
 
61 61
 				/** @var GF_Field_Address $address_field */
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 				$choices = array();
65 65
 
66 66
 				$method_name = 'get_choices_' . self::get_input_type_from_input_id( $input_id );
67
-				if( method_exists( $this, $method_name ) ) {
67
+				if ( method_exists( $this, $method_name ) ) {
68 68
 					/**
69 69
 					 * @uses GravityView_Field_Address::get_choices_country()
70 70
 					 * @uses GravityView_Field_Address::get_choices_state()
@@ -72,12 +72,12 @@  discard block
 block discarded – undo
72 72
 					$choices = $this->{$method_name}( $address_field );
73 73
 				}
74 74
 
75
-				if( ! empty( $choices ) ) {
76
-					$search_field['choices'] = $choices;
77
-					$search_field['type'] = rgar( $search_field, 'input');
75
+				if ( ! empty( $choices ) ) {
76
+					$search_field[ 'choices' ] = $choices;
77
+					$search_field[ 'type' ] = rgar( $search_field, 'input' );
78 78
 				} else {
79
-					$search_field['type'] = 'text';
80
-					$search_field['input'] = 'input_text';
79
+					$search_field[ 'type' ] = 'text';
80
+					$search_field[ 'input' ] = 'input_text';
81 81
 				}
82 82
 			}
83 83
 		}
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 		$country_choices = array();
104 104
 
105 105
 		foreach ( $countries as $key => $country ) {
106
-			$country_choices[] = array(
106
+			$country_choices[ ] = array(
107 107
 				'value' => $country,
108 108
 				'text' => $country,
109 109
 			);
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 	 */
128 128
 	private function get_choices_state( $address_field ) {
129 129
 
130
-		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form['id'] ) : $address_field->addressType;
130
+		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form[ 'id' ] ) : $address_field->addressType;
131 131
 
132 132
 		$state_choices = array();
133 133
 
@@ -139,19 +139,19 @@  discard block
 block discarded – undo
139 139
 				$states = GFCommon::get_canadian_provinces();
140 140
 				break;
141 141
 			default:
142
-				$states = empty( $address_types[ $address_type ]['states'] ) ? array() : $address_types[ $address_type ]['states'];
142
+				$states = empty( $address_types[ $address_type ][ 'states' ] ) ? array() : $address_types[ $address_type ][ 'states' ];
143 143
 				break;
144 144
 		}
145 145
 
146 146
 		foreach ( $states as $key => $state ) {
147 147
 
148
-			if( 'us' === $address_type ) {
148
+			if ( 'us' === $address_type ) {
149 149
 				$value = GFCommon::get_us_state_code( $state );
150 150
 			} else {
151 151
 				$value = $state;
152 152
 			}
153 153
 
154
-			$state_choices[] = array(
154
+			$state_choices[ ] = array(
155 155
 				'value' => $value,
156 156
 				'text' => $state,
157 157
 			);
@@ -174,13 +174,13 @@  discard block
 block discarded – undo
174 174
 		// Use the same inputs as the "text" input type allows
175 175
 		$text_inputs = rgar( $input_types, 'text' );
176 176
 
177
-		$input_types['street'] = $text_inputs;
178
-		$input_types['street2'] = $text_inputs;
179
-		$input_types['city'] = $text_inputs;
177
+		$input_types[ 'street' ] = $text_inputs;
178
+		$input_types[ 'street2' ] = $text_inputs;
179
+		$input_types[ 'city' ] = $text_inputs;
180 180
 
181
-		$input_types['state'] = array( 'select', 'radio', 'link' ) + $text_inputs;
182
-		$input_types['zip'] = array( 'input_text' );
183
-		$input_types['country'] = array( 'select', 'radio', 'link' ) + $text_inputs;
181
+		$input_types[ 'state' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
182
+		$input_types[ 'zip' ] = array( 'input_text' );
183
+		$input_types[ 'country' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
184 184
 
185 185
 		return $input_types;
186 186
 	}
@@ -201,10 +201,10 @@  discard block
 block discarded – undo
201 201
 		// Is this search field for an input (eg: 4.2) or the whole address field (eg: 4)?
202 202
 		$input_id = gravityview_get_input_id_from_id( $field_id );
203 203
 
204
-		if( 'address' === $field_type && $input_id ) {
204
+		if ( 'address' === $field_type && $input_id ) {
205 205
 
206 206
 			// If the input ID matches an expected address input, set to that. Otherwise, keep existing input type.
207
-			if( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
207
+			if ( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
208 208
 				$input_type = $address_field_name;
209 209
 			}
210 210
 		}
@@ -253,20 +253,20 @@  discard block
 block discarded – undo
253 253
 	function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
254 254
 
255 255
 		// If this is NOT the full address field, return default options.
256
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
256
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
257 257
 			return $field_options;
258 258
 		}
259 259
 
260
-		if( 'edit' === $context ) {
260
+		if ( 'edit' === $context ) {
261 261
 			return $field_options;
262 262
 		}
263 263
 
264 264
 		$add_options = array();
265 265
 
266
-		$add_options['show_map_link'] = array(
266
+		$add_options[ 'show_map_link' ] = array(
267 267
 			'type' => 'checkbox',
268 268
 			'label' => __( 'Show Map Link:', 'gravityview' ),
269
-			'desc' => __('Display a "Map It" link below the address', 'gravityview'),
269
+			'desc' => __( 'Display a "Map It" link below the address', 'gravityview' ),
270 270
 			'value' => true,
271 271
 			'merge_tags' => false,
272 272
 		);
Please login to merge, or discard this patch.