Completed
Pull Request — master (#658)
by
unknown
20:45
created
gravityview.php 1 patch
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -312,11 +312,11 @@  discard block
 block discarded – undo
312 312
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-change-entry-creator.php' );
313 313
 
314 314
 
315
-        /**
316
-         * When an entry is created, check if we need to update the custom slug meta
317
-         * todo: move this to its own class..
318
-         */
319
-        add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
315
+		/**
316
+		 * When an entry is created, check if we need to update the custom slug meta
317
+		 * todo: move this to its own class..
318
+		 */
319
+		add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
320 320
 
321 321
 		/**
322 322
 		 * @action `gravityview_include_frontend_actions` Triggered after all GravityView frontend files are loaded
@@ -347,34 +347,34 @@  discard block
 block discarded – undo
347 347
 
348 348
 	/** DEBUG */
349 349
 
350
-    /**
351
-     * Logs messages using Gravity Forms logging add-on
352
-     * @param  string $message log message
353
-     * @param mixed $data Additional data to display
354
-     * @return void
355
-     */
356
-    public static function log_debug( $message, $data = null ){
357
-	    /**
358
-	     * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
359
-	     * @param string $message Message to display
360
-	     * @param mixed $data Supporting data to print alongside it
361
-	     */
362
-    	do_action( 'gravityview_log_debug', $message, $data );
363
-    }
364
-
365
-    /**
366
-     * Logs messages using Gravity Forms logging add-on
367
-     * @param  string $message log message
368
-     * @return void
369
-     */
370
-    public static function log_error( $message, $data = null ){
371
-	    /**
372
-	     * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
373
-	     * @param string $message Error message to display
374
-	     * @param mixed $data Supporting data to print alongside it
375
-	     */
376
-    	do_action( 'gravityview_log_error', $message, $data );
377
-    }
350
+	/**
351
+	 * Logs messages using Gravity Forms logging add-on
352
+	 * @param  string $message log message
353
+	 * @param mixed $data Additional data to display
354
+	 * @return void
355
+	 */
356
+	public static function log_debug( $message, $data = null ){
357
+		/**
358
+		 * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
359
+		 * @param string $message Message to display
360
+		 * @param mixed $data Supporting data to print alongside it
361
+		 */
362
+		do_action( 'gravityview_log_debug', $message, $data );
363
+	}
364
+
365
+	/**
366
+	 * Logs messages using Gravity Forms logging add-on
367
+	 * @param  string $message log message
368
+	 * @return void
369
+	 */
370
+	public static function log_error( $message, $data = null ){
371
+		/**
372
+		 * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
373
+		 * @param string $message Error message to display
374
+		 * @param mixed $data Supporting data to print alongside it
375
+		 */
376
+		do_action( 'gravityview_log_error', $message, $data );
377
+	}
378 378
 
379 379
 } // end class GravityView_Plugin
380 380
 
Please login to merge, or discard this patch.
includes/admin/field-types/type_hidden.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
 			return;
16 16
 		}
17 17
 
18
-        $class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
18
+		$class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
19 19
 
20 20
 		?>
21 21
 		<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="hidden" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>" />
Please login to merge, or discard this patch.
includes/admin/field-types/type_text.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -28,10 +28,10 @@
 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 .= !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
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 .= !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
35 35
 
36 36
 		?>
37 37
 		<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="text" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>">
Please login to merge, or discard this patch.
includes/admin/field-types/type_textarea.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -28,14 +28,14 @@
 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 ';
33
-
34
-            if( empty( $this->field['show_all_fields'] ) ) {
35
-            	$class .= ' mt-hide_all_fields';
36
-            }
37
-        }
38
-        $class .= !empty( $this->field['class'] ) ? 'widefat ' . $this->field['class'] : 'widefat';
31
+		if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
32
+			$class = ' merge-tag-support mt-position-right ';
33
+
34
+			if( empty( $this->field['show_all_fields'] ) ) {
35
+				$class .= ' mt-hide_all_fields';
36
+			}
37
+		}
38
+		$class .= !empty( $this->field['class'] ) ? 'widefat ' . $this->field['class'] : 'widefat';
39 39
 
40 40
 		?>
41 41
 		<textarea name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo esc_attr( $class ); ?>" rows="5"><?php echo esc_textarea(  $this->value ); ?></textarea>
Please login to merge, or discard this patch.
includes/admin/metaboxes/class-gravityview-admin-metaboxes.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 
15 15
 		if( !GravityView_Compatibility::is_valid() ) { return; }
16 16
 
17
-        self::$metaboxes_dir = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/';
17
+		self::$metaboxes_dir = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/';
18 18
 
19 19
 		include_once self::$metaboxes_dir . 'class-gravityview-metabox-tab.php';
20 20
 
@@ -228,13 +228,13 @@  discard block
 block discarded – undo
228 228
 		$get_id_backup = isset($_GET['id']) ? $_GET['id'] : NULL;
229 229
 
230 230
 		if( isset( $form['id'] ) ) {
231
-		    $form_script = 'var form = ' . GFCommon::json_encode($form) . ';';
231
+			$form_script = 'var form = ' . GFCommon::json_encode($form) . ';';
232 232
 
233
-		    // The `gf_vars()` method needs a $_GET[id] variable set with the form ID.
234
-		    $_GET['id'] = $form['id'];
233
+			// The `gf_vars()` method needs a $_GET[id] variable set with the form ID.
234
+			$_GET['id'] = $form['id'];
235 235
 
236 236
 		} else {
237
-		    $form_script = 'var form = new Form();';
237
+			$form_script = 'var form = new Form();';
238 238
 		}
239 239
 
240 240
 		$output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars(false) . '</script>';
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/select-template.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @file select-template.php
4
- * @package GravityView
5
- * @subpackage Gravityview/admin/metaboxes/partials
6
- * @global WP_Post $post
7
- */
3
+	 * @file select-template.php
4
+	 * @package GravityView
5
+	 * @subpackage Gravityview/admin/metaboxes/partials
6
+	 * @global WP_Post $post
7
+	 */
8 8
 
9 9
 global $post;
10 10
 
Please login to merge, or discard this patch.
includes/class-admin.php 1 patch
Indentation   +59 added lines, -60 removed lines patch added patch discarded remove patch
@@ -215,39 +215,39 @@  discard block
 block discarded – undo
215 215
 		}
216 216
 
217 217
 		$wp_allowed_scripts = array(
218
-            'common',
219
-            'admin-bar',
220
-            'autosave',
221
-            'post',
218
+			'common',
219
+			'admin-bar',
220
+			'autosave',
221
+			'post',
222 222
 			'inline-edit-post',
223
-            'utils',
224
-            'svg-painter',
225
-            'wp-auth-check',
226
-            'heartbeat',
223
+			'utils',
224
+			'svg-painter',
225
+			'wp-auth-check',
226
+			'heartbeat',
227 227
 			'media-editor',
228 228
 			'media-upload',
229
-            'thickbox',
229
+			'thickbox',
230 230
 			'wp-color-picker',
231 231
 
232
-            // Settings
232
+			// Settings
233 233
 			'gv-admin-edd-license',
234 234
 
235
-            // Common
236
-            'select2-js',
237
-            'qtip-js',
235
+			// Common
236
+			'select2-js',
237
+			'qtip-js',
238 238
 
239
-            // jQuery
239
+			// jQuery
240 240
 			'jquery',
241
-            'jquery-ui-core',
242
-            'jquery-ui-sortable',
243
-            'jquery-ui-datepicker',
244
-            'jquery-ui-dialog',
245
-            'jquery-ui-slider',
241
+			'jquery-ui-core',
242
+			'jquery-ui-sortable',
243
+			'jquery-ui-datepicker',
244
+			'jquery-ui-dialog',
245
+			'jquery-ui-slider',
246 246
 			'jquery-ui-dialog',
247 247
 			'jquery-ui-tabs',
248 248
 			'jquery-ui-draggable',
249 249
 			'jquery-ui-droppable',
250
-            'jquery-ui-accordion',
250
+			'jquery-ui-accordion',
251 251
 		);
252 252
 
253 253
 		$this->remove_conflicts( $wp_scripts, $wp_allowed_scripts, 'scripts' );
@@ -281,23 +281,23 @@  discard block
 block discarded – undo
281 281
 			return;
282 282
 		}
283 283
 
284
-        $wp_allowed_styles = array(
285
-	        'admin-bar',
286
-        	'colors',
287
-	        'ie',
288
-	        'wp-auth-check',
289
-	        'media-views',
284
+		$wp_allowed_styles = array(
285
+			'admin-bar',
286
+			'colors',
287
+			'ie',
288
+			'wp-auth-check',
289
+			'media-views',
290 290
 			'thickbox',
291 291
 			'dashicons',
292
-	        'wp-jquery-ui-dialog',
293
-	        'jquery-ui-sortable',
292
+			'wp-jquery-ui-dialog',
293
+			'jquery-ui-sortable',
294 294
 
295
-            // Settings
296
-	        'gravityview_settings',
295
+			// Settings
296
+			'gravityview_settings',
297 297
 
298
-	        // @todo qTip styles not loading for some reason!
299
-	        'jquery-qtip.js',
300
-	    );
298
+			// @todo qTip styles not loading for some reason!
299
+			'jquery-qtip.js',
300
+		);
301 301
 
302 302
 		$this->remove_conflicts( $wp_styles, $wp_allowed_styles, 'styles' );
303 303
 
@@ -317,32 +317,32 @@  discard block
 block discarded – undo
317 317
 	 */
318 318
 	private function remove_conflicts( &$wp_objects, $required_objects, $type = 'scripts' ) {
319 319
 
320
-        /**
321
-         * @filter `gravityview_noconflict_{$type}` Modify the list of no conflict scripts or styles\n
322
-         * Filter is `gravityview_noconflict_scripts` or `gravityview_noconflict_styles`
323
-         * @param array $required_objects
324
-         */
325
-        $required_objects = apply_filters( "gravityview_noconflict_{$type}", $required_objects );
326
-
327
-        //reset queue
328
-        $queue = array();
329
-        foreach( $wp_objects->queue as $object ) {
330
-	        if( in_array( $object, $required_objects ) || preg_match('/gravityview|gf_|gravityforms/ism', $object ) ) {
331
-                $queue[] = $object;
332
-            }
333
-        }
334
-        $wp_objects->queue = $queue;
335
-
336
-        $required_objects = $this->add_script_dependencies( $wp_objects->registered, $required_objects );
337
-
338
-        //unregistering scripts
339
-        $registered = array();
340
-        foreach( $wp_objects->registered as $handle => $script_registration ){
341
-            if( in_array( $handle, $required_objects ) ){
342
-                $registered[ $handle ] = $script_registration;
343
-            }
344
-        }
345
-        $wp_objects->registered = $registered;
320
+		/**
321
+		 * @filter `gravityview_noconflict_{$type}` Modify the list of no conflict scripts or styles\n
322
+		 * Filter is `gravityview_noconflict_scripts` or `gravityview_noconflict_styles`
323
+		 * @param array $required_objects
324
+		 */
325
+		$required_objects = apply_filters( "gravityview_noconflict_{$type}", $required_objects );
326
+
327
+		//reset queue
328
+		$queue = array();
329
+		foreach( $wp_objects->queue as $object ) {
330
+			if( in_array( $object, $required_objects ) || preg_match('/gravityview|gf_|gravityforms/ism', $object ) ) {
331
+				$queue[] = $object;
332
+			}
333
+		}
334
+		$wp_objects->queue = $queue;
335
+
336
+		$required_objects = $this->add_script_dependencies( $wp_objects->registered, $required_objects );
337
+
338
+		//unregistering scripts
339
+		$registered = array();
340
+		foreach( $wp_objects->registered as $handle => $script_registration ){
341
+			if( in_array( $handle, $required_objects ) ){
342
+				$registered[ $handle ] = $script_registration;
343
+			}
344
+		}
345
+		$wp_objects->registered = $registered;
346 346
 	}
347 347
 
348 348
 	/**
@@ -405,7 +405,6 @@  discard block
 block discarded – undo
405 405
 	 *
406 406
 	 * @deprecated since 1.12
407 407
 	 * @see GravityView_Compatibility::get_plugin_status()
408
-
409 408
 	 * @return boolean|string True: plugin is active; False: plugin file doesn't exist at path; 'inactive' it's inactive
410 409
 	 */
411 410
 	static function get_plugin_status( $location = '' ) {
Please login to merge, or discard this patch.
includes/class-ajax.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 
137 137
 		// template areas
138 138
 		$template_areas_directory = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'directory' );
139
-        $template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' );
139
+		$template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' );
140 140
 
141 141
 		// widget areas
142 142
 		$default_widget_areas = GravityView_Plugin::get_default_widget_areas();
@@ -328,40 +328,40 @@  discard block
 block discarded – undo
328 328
 		// load file
329 329
 		$xmlstr = file_get_contents( $form_file );
330 330
 
331
-        $options = array(
332
-            "page" => array("unserialize_as_array" => true),
333
-            "form"=> array("unserialize_as_array" => true),
334
-            "field"=> array("unserialize_as_array" => true),
335
-            "rule"=> array("unserialize_as_array" => true),
336
-            "choice"=> array("unserialize_as_array" => true),
337
-            "input"=> array("unserialize_as_array" => true),
338
-            "routing_item"=> array("unserialize_as_array" => true),
339
-            "creditCard"=> array("unserialize_as_array" => true),
340
-            "routin"=> array("unserialize_as_array" => true),
341
-            "confirmation" => array("unserialize_as_array" => true),
342
-            "notification" => array("unserialize_as_array" => true)
343
-        );
331
+		$options = array(
332
+			"page" => array("unserialize_as_array" => true),
333
+			"form"=> array("unserialize_as_array" => true),
334
+			"field"=> array("unserialize_as_array" => true),
335
+			"rule"=> array("unserialize_as_array" => true),
336
+			"choice"=> array("unserialize_as_array" => true),
337
+			"input"=> array("unserialize_as_array" => true),
338
+			"routing_item"=> array("unserialize_as_array" => true),
339
+			"creditCard"=> array("unserialize_as_array" => true),
340
+			"routin"=> array("unserialize_as_array" => true),
341
+			"confirmation" => array("unserialize_as_array" => true),
342
+			"notification" => array("unserialize_as_array" => true)
343
+		);
344 344
 
345 345
 		$xml = new RGXML($options);
346
-        $forms = $xml->unserialize($xmlstr);
346
+		$forms = $xml->unserialize($xmlstr);
347 347
 
348
-        if( !$forms ) {
349
-        	do_action( 'gravityview_log_error', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. Error importing file. (File)', $form_file );
350
-        	return false;
351
-        }
348
+		if( !$forms ) {
349
+			do_action( 'gravityview_log_error', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. Error importing file. (File)', $form_file );
350
+			return false;
351
+		}
352 352
 
353
-        if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
354
-        	$form = $forms[0];
355
-        }
353
+		if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
354
+			$form = $forms[0];
355
+		}
356 356
 
357
-        if( empty( $form ) ) {
358
-        	do_action( 'gravityview_log_error', '[pre_get_available_fields] $form not set.', $forms );
359
-        	return false;
360
-        }
357
+		if( empty( $form ) ) {
358
+			do_action( 'gravityview_log_error', '[pre_get_available_fields] $form not set.', $forms );
359
+			return false;
360
+		}
361 361
 
362
-        do_action( 'gravityview_log_debug', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. (Form)', $form );
362
+		do_action( 'gravityview_log_debug', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. (Form)', $form );
363 363
 
364
-        return $form;
364
+		return $form;
365 365
 
366 366
 	}
367 367
 
Please login to merge, or discard this patch.
includes/class-common.php 1 patch
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -213,13 +213,13 @@  discard block
 block discarded – undo
213 213
 
214 214
 				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
215 215
 					foreach ( $field['inputs'] as $input ) {
216
-                        /**
217
-                         * @hack
218
-                         * In case of email/email confirmation, the input for email has the same id as the parent field
219
-                         */
220
-                        if( 'email' == rgar( $field, 'type' ) && false === strpos( $input['id'], '.' ) ) {
221
-                            continue;
222
-                        }
216
+						/**
217
+						 * @hack
218
+						 * In case of email/email confirmation, the input for email has the same id as the parent field
219
+						 */
220
+						if( 'email' == rgar( $field, 'type' ) && false === strpos( $input['id'], '.' ) ) {
221
+							continue;
222
+						}
223 223
 						$fields[ (string)$input['id'] ] = array(
224 224
 							'label' => rgar( $input, 'label' ),
225 225
 							'customLabel' => rgar( $input, 'customLabel' ),
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
466 466
 		} elseif ( 'delete' === RGForms::get( 'action' ) ) {
467 467
 			$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? $_GET['view_id'] : null;
468 468
 		} elseif( !isset( $criteria['context_view_id'] ) ) {
469
-            // Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget)
469
+			// Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget)
470 470
 			$criteria['context_view_id'] = null;
471 471
 		}
472 472
 
@@ -1082,7 +1082,7 @@  discard block
 block discarded – undo
1082 1082
 			),
1083 1083
 		);
1084 1084
 
1085
-        $fields = $date_created + $fields;
1085
+		$fields = $date_created + $fields;
1086 1086
 
1087 1087
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
1088 1088
 
@@ -1094,13 +1094,13 @@  discard block
 block discarded – undo
1094 1094
 			}
1095 1095
 		}
1096 1096
 
1097
-        /**
1098
-         * @filter `gravityview/common/sortable_fields` Filter the sortable fields
1099
-         * @since 1.12
1100
-         * @param array $fields Sub-set of GF form fields that are sortable
1101
-         * @param int $formid The Gravity Forms form ID that the fields are from
1102
-         */
1103
-        $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
1097
+		/**
1098
+		 * @filter `gravityview/common/sortable_fields` Filter the sortable fields
1099
+		 * @since 1.12
1100
+		 * @param array $fields Sub-set of GF form fields that are sortable
1101
+		 * @param int $formid The Gravity Forms form ID that the fields are from
1102
+		 */
1103
+		$fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
1104 1104
 
1105 1105
 		return $fields;
1106 1106
 	}
@@ -1365,17 +1365,17 @@  discard block
 block discarded – undo
1365 1365
 	}
1366 1366
 
1367 1367
 
1368
-    /**
1369
-     * Display updated/error notice
1370
-     *
1371
-     * @param string $notice text/HTML of notice
1372
-     * @param string $class CSS class for notice (`updated` or `error`)
1373
-     *
1374
-     * @return string
1375
-     */
1376
-    public static function generate_notice( $notice, $class = '' ) {
1377
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
1378
-    }
1368
+	/**
1369
+	 * Display updated/error notice
1370
+	 *
1371
+	 * @param string $notice text/HTML of notice
1372
+	 * @param string $class CSS class for notice (`updated` or `error`)
1373
+	 *
1374
+	 * @return string
1375
+	 */
1376
+	public static function generate_notice( $notice, $class = '' ) {
1377
+		return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
1378
+	}
1379 1379
 
1380 1380
 
1381 1381
 
Please login to merge, or discard this patch.