Completed
Push — develop ( 859fa4...87b48c )
by Gennady
16:11
created
class-gravityview-plugin-hooks-gravity-forms-dropbox.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
 	 */
46 46
 	function filter_file_path( $file_path = '', $file_path_info = array(), $field_settings = array() ) {
47 47
 
48
-		$file_path = str_replace('www.dropbox.com', 'dl.dropboxusercontent.com', $file_path );
48
+		$file_path = str_replace( 'www.dropbox.com', 'dl.dropboxusercontent.com', $file_path );
49 49
 		$file_path = str_replace( '?dl=0', '', $file_path );
50 50
 
51 51
 		return $file_path;
Please login to merge, or discard this patch.
includes/class-gravityview-roles-capabilities.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 	 */
34 34
 	public static function get_instance() {
35 35
 
36
-		if( ! self::$instance ) {
36
+		if ( ! self::$instance ) {
37 37
 			self::$instance = new self;
38 38
 		}
39 39
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 		add_filter( 'members_get_capabilities', array( 'GravityView_Roles_Capabilities', 'merge_with_all_caps' ) );
57 57
 		add_action( 'members_register_cap_groups', array( $this, 'members_register_cap_group' ), 20 );
58 58
 		add_filter( 'user_has_cap', array( $this, 'filter_user_has_cap' ), 10, 4 );
59
-        add_action( 'admin_init', array( $this, 'add_caps') );
59
+        add_action( 'admin_init', array( $this, 'add_caps' ) );
60 60
 	}
61 61
 
62 62
 
@@ -77,18 +77,18 @@  discard block
 block discarded – undo
77 77
 	public function filter_user_has_cap( $usercaps = array(), $caps = array(), $args = array(), $user = NULL ) {
78 78
 
79 79
 		// Empty caps_to_check array
80
-		if( ! $usercaps || ! $caps ) {
80
+		if ( ! $usercaps || ! $caps ) {
81 81
 			return $usercaps;
82 82
 		}
83 83
 
84 84
 		/**
85 85
 		 * Enable all GravityView caps_to_check if `gravityview_full_access` is enabled
86 86
 		 */
87
-		if( ! empty( $usercaps['gravityview_full_access'] ) ) {
87
+		if ( ! empty( $usercaps[ 'gravityview_full_access' ] ) ) {
88 88
 
89 89
 			$all_gravityview_caps = self::all_caps();
90 90
 
91
-			foreach( $all_gravityview_caps as $gv_cap ) {
91
+			foreach ( $all_gravityview_caps as $gv_cap ) {
92 92
 				$usercaps[ $gv_cap ] = true;
93 93
 			}
94 94
 
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 		$all = $administrator;
307 307
 
308 308
 		// If role is set, return caps_to_check for just that role.
309
-		if( $single_role ) {
309
+		if ( $single_role ) {
310 310
 			$caps = isset( ${$single_role} ) ? ${$single_role} : false;
311 311
 			return $flat_array ? $caps : array( $single_role => $caps );
312 312
 		}
@@ -355,9 +355,9 @@  discard block
 block discarded – undo
355 355
 
356 356
 		if ( true === $allow_logged_out ) {
357 357
 
358
-			$all_caps = self::all_caps('editor');
358
+			$all_caps = self::all_caps( 'editor' );
359 359
 
360
-			if( array_intersect( $all_caps, (array) $caps_to_check ) ) {
360
+			if ( array_intersect( $all_caps, (array)$caps_to_check ) ) {
361 361
 				return true;
362 362
 			}
363 363
 		}
@@ -378,13 +378,13 @@  discard block
 block discarded – undo
378 378
 		$caps_to_check = self::maybe_add_full_access_caps( $caps_to_check );
379 379
 
380 380
 		foreach ( $caps_to_check as $cap ) {
381
-			if( ! is_null( $object_id ) ) {
381
+			if ( ! is_null( $object_id ) ) {
382 382
 				$has_cap = $user_id ? user_can( $user_id, $cap, $object_id ) : current_user_can( $cap, $object_id );
383 383
 			} else {
384 384
 				$has_cap = $user_id ? user_can( $user_id, $cap ) : current_user_can( $cap );
385 385
 			}
386 386
 			// At the first successful response, stop checking
387
-			if( $has_cap ) {
387
+			if ( $has_cap ) {
388 388
 				break;
389 389
 			}
390 390
 		}
@@ -408,15 +408,15 @@  discard block
 block discarded – undo
408 408
 		$all_gravityview_caps = self::all_caps();
409 409
 
410 410
 		// Are there any $caps_to_check that are from GravityView?
411
-		if( $has_gravityview_caps = array_intersect( $caps_to_check, $all_gravityview_caps ) ) {
412
-			$caps_to_check[] = 'gravityview_full_access';
411
+		if ( $has_gravityview_caps = array_intersect( $caps_to_check, $all_gravityview_caps ) ) {
412
+			$caps_to_check[ ] = 'gravityview_full_access';
413 413
 		}
414 414
 
415 415
 		$all_gravity_forms_caps = class_exists( 'GFCommon' ) ? GFCommon::all_caps() : array();
416 416
 
417 417
 		// Are there any $caps_to_check that are from Gravity Forms?
418
-		if( $all_gravity_forms_caps = array_intersect( $caps_to_check, $all_gravity_forms_caps ) ) {
419
-			$caps_to_check[] = 'gform_full_access';
418
+		if ( $all_gravity_forms_caps = array_intersect( $caps_to_check, $all_gravity_forms_caps ) ) {
419
+			$caps_to_check[ ] = 'gform_full_access';
420 420
 		}
421 421
 
422 422
 		return array_unique( $caps_to_check );
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
 			$capabilities = self::all_caps();
439 439
 
440 440
 			// Loop through each role and remove GV caps_to_check
441
-			foreach( $wp_roles->get_names() as $role_slug => $role_name ) {
441
+			foreach ( $wp_roles->get_names() as $role_slug => $role_name ) {
442 442
 				foreach ( $capabilities as $cap ) {
443 443
 					$wp_roles->remove_cap( $role_slug, $cap );
444 444
 				}
Please login to merge, or discard this patch.
includes/plugin-and-theme-hooks/class-gravityview-theme-hooks-wpml.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
 		add_filter( 'icl_ls_languages', array( $this, 'wpml_ls_filter' ) );
66 66
 
67
-		add_filter( 'gravityview_directory_link', array( $this, 'filter_gravityview_back_link') );
67
+		add_filter( 'gravityview_directory_link', array( $this, 'filter_gravityview_back_link' ) );
68 68
 	}
69 69
 
70 70
 	/**
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	function filter_gravityview_back_link( $link ) {
85 85
 		global $wpml_url_filters;
86 86
 
87
-		if( $wpml_url_filters ) {
87
+		if ( $wpml_url_filters ) {
88 88
 			$link = $wpml_url_filters->permalink_filter( $link, GravityView_frontend::getInstance()->getPostId() );
89 89
 		}
90 90
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 	private function remove_url_hooks() {
102 102
 		global $wpml_url_filters;
103 103
 
104
-		if( ! $wpml_url_filters ) {
104
+		if ( ! $wpml_url_filters ) {
105 105
 			return;
106 106
 		}
107 107
 
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 	private function add_url_hooks() {
130 130
 		global $wpml_url_filters;
131 131
 
132
-		if( ! $wpml_url_filters ) {
132
+		if ( ! $wpml_url_filters ) {
133 133
 			return;
134 134
 		}
135 135
 
@@ -178,10 +178,10 @@  discard block
 block discarded – undo
178 178
 
179 179
 			$this->remove_url_hooks();
180 180
 
181
-			if( $translations ) {
181
+			if ( $translations ) {
182 182
 				foreach ( $languages as $lang_code => $language ) {
183 183
 
184
-					if( ! isset( $translations[ $lang_code ] ) || ! is_object( $translations[ $lang_code ] ) ) {
184
+					if ( ! isset( $translations[ $lang_code ] ) || ! is_object( $translations[ $lang_code ] ) ) {
185 185
 						continue;
186 186
 					}
187 187
 
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 							break;
216 216
 					}
217 217
 
218
-					$languages[ $lang_code ]['url'] = $entry_link;
218
+					$languages[ $lang_code ][ 'url' ] = $entry_link;
219 219
 				}
220 220
 			}
221 221
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-hidden.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	function edit_entry_fix_hidden_fields( $fields ) {
50 50
 
51 51
 		/** @var GF_Field $field */
52
-		foreach( $fields as &$field ) {
52
+		foreach ( $fields as &$field ) {
53 53
 			if ( 'hidden' === $field->type ) {
54 54
 
55 55
 				/**
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 				 */
61 61
 				$reveal_hidden_field = apply_filters( 'gravityview/edit_entry/reveal_hidden_field', true, $field );
62 62
 
63
-				if( ! $reveal_hidden_field ) {
63
+				if ( ! $reveal_hidden_field ) {
64 64
 					continue;
65 65
 				}
66 66
 
Please login to merge, or discard this patch.
future/loader.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 			printf( '<body style="padding: 0; margin: 0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">' );
26 26
 			printf( '<img src="' . plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) . '" alt="The GravityView Astronaut Says:" style="float: left; height: 60px; margin-right : 10px;" />' );
27 27
 			printf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ),
28
-				'<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION , "</h3>\n\n", $version );
28
+				'<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION, "</h3>\n\n", $version );
29 29
 			printf( '</body>' );
30 30
 		}
31 31
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 }
35 35
 
36 36
 /** The future branch of GravityView requires PHP 5.3+ namespaces and SPL. */
37
-if ( version_compare( phpversion(), '5.3.0' , '<' ) ) {
37
+if ( version_compare( phpversion(), '5.3.0', '<' ) ) {
38 38
 	require GRAVITYVIEW_DIR . 'future/_stubs.php';
39 39
 
40 40
 /** All looks fine. */
Please login to merge, or discard this patch.
future/includes/class-gv-shortcode.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 */
77 77
 	public static function remove() {
78 78
 		$shortcode = new static();
79
-		unset( self::$shortcodes[$shortcode->name] );
79
+		unset( self::$shortcodes[ $shortcode->name ] );
80 80
 		remove_shortcode( $shortcode->name );
81 81
 	}
82 82
 
@@ -108,14 +108,14 @@  discard block
 block discarded – undo
108 108
 		preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER );
109 109
 
110 110
 		foreach ( $matches as $shortcode ) {
111
-			$shortcode_name = $shortcode[2];
111
+			$shortcode_name = $shortcode[ 2 ];
112 112
 
113
-			$shortcode_atts = shortcode_parse_atts( $shortcode[3] );
114
-			$shortcode_content = $shortcode[5];
113
+			$shortcode_atts = shortcode_parse_atts( $shortcode[ 3 ] );
114
+			$shortcode_content = $shortcode[ 5 ];
115 115
 
116 116
 			/** This is a registered GravityView shortcode. */
117
-			if ( !empty( self::$shortcodes[$shortcode_name] ) ) {
118
-				$shortcode = clone self::$shortcodes[$shortcode_name];
117
+			if ( ! empty( self::$shortcodes[ $shortcode_name ] ) ) {
118
+				$shortcode = clone self::$shortcodes[ $shortcode_name ];
119 119
 			} else {
120 120
 				/** This is some generic shortcode. */
121 121
 				$shortcode = new self;
Please login to merge, or discard this patch.
future/includes/class-gv-field-gravityforms.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,17 +27,17 @@  discard block
 block discarded – undo
27 27
 	 * @return \GV\GF_Field|null The field implementation or null on error.
28 28
 	 */
29 29
 	public static function from_configuration( $configuration ) {
30
-		if ( empty( $configuration['id'] ) || ! is_numeric( $configuration['id'] ) ) {
30
+		if ( empty( $configuration[ 'id' ] ) || ! is_numeric( $configuration[ 'id' ] ) ) {
31 31
 			gravityview()->log->error( 'Invalid configuration[id] supplied.' );
32 32
 			return null;
33 33
 		}
34 34
 
35
-		if ( empty( $configuration['form_id'] ) || ! $form = \GV\GF_Form::by_id( $configuration['form_id'] )  ) {
35
+		if ( empty( $configuration[ 'form_id' ] ) || ! $form = \GV\GF_Form::by_id( $configuration[ 'form_id' ] ) ) {
36 36
 			gravityview()->log->error( 'Invalid configuration[form_id] supplied.' );
37 37
 			return null;
38 38
 		}
39 39
 
40
-		$field = self::by_id( $form, $configuration['id'] );
40
+		$field = self::by_id( $form, $configuration[ 'id' ] );
41 41
 
42 42
 		if ( ! $field ) {
43 43
 			gravityview()->log->error( 'Invalid configuration[id] supplied.' );
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 
112 112
 		/** This is a complex Gravity Forms input. */
113 113
 		if ( $input = \GFFormsModel::get_input( $this->field, $this->ID ) ) {
114
-			$label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
114
+			$label = ! empty( $input[ 'customLabel' ] ) ? $input[ 'customLabel' ] : $input[ 'label' ];
115 115
 		} else {
116 116
 			/** This is a field with one label. */
117 117
 			$label = $this->field->get_field_label( true, $this->label );
Please login to merge, or discard this patch.
future/includes/class-gv-widget.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 		$enable_custom_class = apply_filters( 'gravityview/widget/enable_custom_class', false, $this );
152 152
 
153 153
 		if ( $enable_custom_class ) {
154
-			$settings['custom_class'] = array(
154
+			$settings[ 'custom_class' ] = array(
155 155
 				'type' => 'text',
156 156
 				'label' => __( 'Custom CSS Class:', 'gravityview' ),
157 157
 				'desc' => __( 'This class will be added to the widget container', 'gravityview' ),
@@ -203,8 +203,8 @@  discard block
 block discarded – undo
203 203
 	 */
204 204
 	public static function get_default_widget_areas() {
205 205
 		$default_areas = array(
206
-			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ) , 'subtitle' => '' ) ) ),
207
-			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ) , 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ) , 'subtitle' => '' ) ) ),
206
+			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ), 'subtitle' => '' ) ) ),
207
+			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ), 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ), 'subtitle' => '' ) ) ),
208 208
 		);
209 209
 
210 210
 		/**
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 		}
235 235
 
236 236
 		$widgets[ $this->get_widget_id() ] = array(
237
-			'label' => $this->widget_label ,
237
+			'label' => $this->widget_label,
238 238
 			'description' => $this->widget_description,
239 239
 			'subtitle' => $this->widget_subtitle,
240 240
 			'class' => get_called_class(),
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 	 */
256 256
 	public function assign_widget_options( $options = array(), $template = '', $widget = '' ) {
257 257
 		if ( $this->get_widget_id() === $widget ) {
258
-			if( $settings = $this->get_settings() ) {
258
+			if ( $settings = $this->get_settings() ) {
259 259
 				$options = array_merge( $options, $settings );
260 260
 			}
261 261
 		}
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 			return;
307 307
 		}
308 308
 
309
-		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode') );
309
+		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode' ) );
310 310
 	}
311 311
 
312 312
 	/**
Please login to merge, or discard this patch.
future/includes/class-gv-template-entry-legacy.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 		global $post;
35 35
 
36 36
 		if ( $post ) {
37
-			$context['post'] = $post;
37
+			$context[ 'post' ] = $post;
38 38
 		}
39 39
 
40 40
 		\GV\Mocks\Legacy_Context::push( $context );
Please login to merge, or discard this patch.