Completed
Push — master ( 90bb80...5e9bea )
by Zack
42:43 queued 26:59
created
includes/class-gravityview-admin-duplicate-view.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -15,12 +15,12 @@  discard block
 block discarded – undo
15 15
 	function __construct() {
16 16
 
17 17
 		// Only run on Admin
18
-		if ( !is_admin() ) {
18
+		if ( ! is_admin() ) {
19 19
 			return;
20 20
 		}
21 21
 
22 22
 		// If the Duplicate Post plugin is active, don't run.
23
-		if( defined('DUPLICATE_POST_CURRENT_VERSION') ) {
23
+		if ( defined( 'DUPLICATE_POST_CURRENT_VERSION' ) ) {
24 24
 			return;
25 25
 		}
26 26
 
@@ -60,10 +60,10 @@  discard block
 block discarded – undo
60 60
 		global $post;
61 61
 
62 62
 		// We only want to add Clone links to the Edit View metabox
63
-		if( !$this->is_all_views_page() ) {
63
+		if ( ! $this->is_all_views_page() ) {
64 64
 
65
-			if( $duplicate_links = $this->make_duplicate_link_row( array(), $post ) ) {
66
-				$links[] = '<span>' . $duplicate_links['edit_as_new_draft'] . '</span>';
65
+			if ( $duplicate_links = $this->make_duplicate_link_row( array(), $post ) ) {
66
+				$links[ ] = '<span>' . $duplicate_links[ 'edit_as_new_draft' ] . '</span>';
67 67
 			}
68 68
 
69 69
 		}
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 		 * @param string|null If string, the status to set for the new View. If empty, use existing View status.
124 124
 		 * @param WP_Post $post View being cloned
125 125
 		 */
126
-		$new_view_status = apply_filters('gravityview/duplicate-view/status', $status, $post );
126
+		$new_view_status = apply_filters( 'gravityview/duplicate-view/status', $status, $post );
127 127
 
128 128
 		$new_view = array(
129 129
 			'menu_order'     => $post->menu_order,
@@ -146,11 +146,11 @@  discard block
 block discarded – undo
146 146
 		 * @param boolean $copy_date Whether the copy the date from the existing View. Default: `false`
147 147
 		 * @param WP_Post $post View being cloned
148 148
 		 */
149
-		$copy_date = apply_filters('gravityview/duplicate-view/copy-date', false, $post );
149
+		$copy_date = apply_filters( 'gravityview/duplicate-view/copy-date', false, $post );
150 150
 
151 151
 		if ( $copy_date ) {
152
-			$new_view['post_date']     = $new_post_date = $post->post_date;
153
-			$new_view['post_date_gmt'] = get_gmt_from_date( $new_post_date );
152
+			$new_view[ 'post_date' ]     = $new_post_date = $post->post_date;
153
+			$new_view[ 'post_date_gmt' ] = get_gmt_from_date( $new_post_date );
154 154
 		}
155 155
 
156 156
 		/**
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 		 * @param array $new_view Array of settings to be passed to wp_insert_post()
160 160
 		 * @param WP_Post $post View being cloned
161 161
 		 */
162
-		$new_view = apply_filters('gravityview/duplicate-view/new-view', $new_view, $post );
162
+		$new_view = apply_filters( 'gravityview/duplicate-view/new-view', $new_view, $post );
163 163
 
164 164
 		// Magic happens here.
165 165
 		$new_view_id = wp_insert_post( $new_view );
@@ -241,13 +241,13 @@  discard block
 block discarded – undo
241 241
 			$clone_text = __( 'Clone', 'gravityview' );
242 242
 			$clone_title = __( 'Clone this View', 'gravityview' );
243 243
 
244
-			$actions['clone'] = gravityview_get_link( $clone_link, $clone_text, 'title='.$clone_title );
244
+			$actions[ 'clone' ] = gravityview_get_link( $clone_link, $clone_text, 'title=' . $clone_title );
245 245
 
246 246
 			$clone_draft_link = $this->get_clone_view_link( $post->ID );
247 247
 			$clone_draft_text = $this->is_all_views_page() ? __( 'New Draft', 'gravityview' ) : __( 'Clone View', 'gravityview' );
248 248
 			$clone_draft_title = __( 'Copy as a new draft View', 'gravityview' );
249 249
 
250
-			$actions['edit_as_new_draft'] = gravityview_get_link( $clone_draft_link, esc_html( $clone_draft_text ), 'title='.$clone_draft_title );
250
+			$actions[ 'edit_as_new_draft' ] = gravityview_get_link( $clone_draft_link, esc_html( $clone_draft_text ), 'title=' . $clone_draft_title );
251 251
 		}
252 252
 
253 253
 		return $actions;
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
 		}
272 272
 
273 273
 		// Verify the View exists
274
-		if ( !$view = get_post( $id ) ) {
274
+		if ( ! $view = get_post( $id ) ) {
275 275
 			return '';
276 276
 		}
277 277
 
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
 		$post_type_object = get_post_type_object( $view->post_type );
287 287
 
288 288
 		/** If there's no gravityview post type for some reason, abort! */
289
-		if ( !$post_type_object ) {
289
+		if ( ! $post_type_object ) {
290 290
 			gravityview()->log->error( 'No gravityview post type exists when trying to clone the View.', array( 'data' => $view ) );
291 291
 			return '';
292 292
 		}
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 		 * @param int $view_id View ID
299 299
 		 * @param string $context How to display the link. If "display", the URL is run through esc_html(). Default: `display`
300 300
 		 */
301
-		$clone_view_link = apply_filters( 'gravityview/duplicate-view/get_clone_view_link', admin_url( "admin.php". $action ), $view->ID, $context );
301
+		$clone_view_link = apply_filters( 'gravityview/duplicate-view/get_clone_view_link', admin_url( "admin.php" . $action ), $view->ID, $context );
302 302
 
303 303
 		return $clone_view_link;
304 304
 	}
@@ -325,14 +325,14 @@  discard block
 block discarded – undo
325 325
 	 */
326 326
 	public function save_as_new_view( $status = '' ) {
327 327
 
328
-		if ( ! ( isset( $_GET['post'] ) || isset( $_POST['post'] ) ) ) {
328
+		if ( ! ( isset( $_GET[ 'post' ] ) || isset( $_POST[ 'post' ] ) ) ) {
329 329
 			wp_die( __( 'No post to duplicate has been supplied!', 'gravityview' ) );
330 330
 		}
331 331
 
332 332
 		// Get the original post
333
-		$id   = ( isset( $_GET['post'] ) ? $_GET['post'] : $_POST['post'] );
333
+		$id = ( isset( $_GET[ 'post' ] ) ? $_GET[ 'post' ] : $_POST[ 'post' ] );
334 334
 
335
-		if( ! $this->current_user_can_copy( $id ) ) {
335
+		if ( ! $this->current_user_can_copy( $id ) ) {
336 336
 			wp_die( __( 'You don\'t have permission to copy this View.', 'gravityview' ) );
337 337
 		}
338 338
 
Please login to merge, or discard this patch.
class-gravityview-plugin-hooks-gravity-forms-survey.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 
46 46
 		$return = $input_type;
47 47
 
48
-		if( 'survey' === $field_type ) {
48
+		if ( 'survey' === $field_type ) {
49 49
 			$return = 'select';
50 50
 		}
51 51
 
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
65 65
 	public function fix_survey_fields( $fields ) {
66 66
 
67 67
 		/** @var GF_Field $field */
68
-		foreach( $fields as &$field ) {
69
-			if( 'survey' === $field->type ) {
68
+		foreach ( $fields as &$field ) {
69
+			if ( 'survey' === $field->type ) {
70 70
 				$field->allowsPrepopulate = true;
71 71
 			}
72 72
 		}
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 	 * @return void
83 83
 	 */
84 84
 	function add_render_hooks() {
85
-		add_filter( 'gform_field_value', array( $this, 'fix_survey_field_value'), 10, 3 );
85
+		add_filter( 'gform_field_value', array( $this, 'fix_survey_field_value' ), 10, 3 );
86 86
 	}
87 87
 
88 88
 	/**
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 	 * @return void
96 96
 	 */
97 97
 	function remove_render_hooks() {
98
-		remove_filter( 'gform_field_value', array( $this, 'fix_survey_field_value'), 10 );
98
+		remove_filter( 'gform_field_value', array( $this, 'fix_survey_field_value' ), 10 );
99 99
 	}
100 100
 
101 101
 	/**
@@ -113,9 +113,9 @@  discard block
 block discarded – undo
113 113
 	 */
114 114
 	public function fix_survey_field_value( $value, $field, $name ) {
115 115
 
116
-		if( 'survey' === $field->type ) {
116
+		if ( 'survey' === $field->type ) {
117 117
 
118
-			$entry = GravityView_Edit_Entry::getInstance()->instances['render']->get_entry();
118
+			$entry = GravityView_Edit_Entry::getInstance()->instances[ 'render' ]->get_entry();
119 119
 
120 120
 			// We need to run through each survey row until we find a match for expected values
121 121
 			foreach ( $entry as $field_id => $field_value ) {
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 					list( $row_val, $col_val ) = explode( ':', $field_value, 2 );
129 129
 
130 130
 					// If the $name matches the $row_val, we are processing the correct row
131
-					if( $row_val === $name ) {
131
+					if ( $row_val === $name ) {
132 132
 						$value = $field_value;
133 133
 						break;
134 134
 					}
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravity-flow.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 
34 34
 		parent::add_hooks();
35 35
 
36
-		add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown'), 10, 2 );
36
+		add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown' ), 10, 2 );
37 37
 
38 38
 	}
39 39
 	
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
 	 */
53 53
 	public static function get_status_options( $form_id = 0, $status_key = 'workflow_final_status' ) {
54 54
 
55
-		if( empty( $form_id ) ) {
55
+		if ( empty( $form_id ) ) {
56 56
 			$form_id = GravityView_View::getInstance()->getFormId();
57 57
 		}
58 58
 
59 59
 		$entry_meta = gravity_flow()->get_entry_meta( array(), $form_id );
60 60
 
61
-		return (array) \GV\Utils::get( $entry_meta, $status_key . '/filter/choices' );
61
+		return (array)\GV\Utils::get( $entry_meta, $status_key . '/filter/choices' );
62 62
 	}
63 63
 
64 64
 
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 
81 81
 		$workflow_steps = $GFlow->get_steps();
82 82
 
83
-		if( $workflow_steps ) {
83
+		if ( $workflow_steps ) {
84 84
 
85 85
 			foreach ( $workflow_steps as $step ) {
86 86
 
@@ -92,12 +92,12 @@  discard block
 block discarded – undo
92 92
 				);
93 93
 			}
94 94
 
95
-			$fields['workflow_step'] = array(
95
+			$fields[ 'workflow_step' ] = array(
96 96
 				'label' => esc_html__( 'Workflow Step', 'gravityview' ),
97 97
 				'type'  => 'select',
98 98
 			);
99 99
 
100
-			$fields['workflow_final_status'] = array(
100
+			$fields[ 'workflow_final_status' ] = array(
101 101
 				'label' => esc_html__( 'Workflow Status', 'gravityview' ),
102 102
 				'type'  => 'select',
103 103
 			);
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-plugin-hooks-yoast-seo.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 
68 68
 		parent::add_hooks();
69 69
 
70
-		if( gravityview_is_admin_page() ) {
70
+		if ( gravityview_is_admin_page() ) {
71 71
 
72 72
 				// Make Yoast metabox go down to the bottom please.
73 73
 			add_filter( 'wpseo_metabox_prio', array( $this, 'return_low' ) );
@@ -92,8 +92,8 @@  discard block
 block discarded – undo
92 92
 	 */
93 93
 	public function disable_content_analysis( $options ) {
94 94
 
95
-		$options['keyword_analysis_active'] = false;
96
-		$options['content_analysis_active'] = false;
95
+		$options[ 'keyword_analysis_active' ] = false;
96
+		$options[ 'content_analysis_active' ] = false;
97 97
 
98 98
 		return $options;
99 99
 	}
@@ -112,8 +112,8 @@  discard block
 block discarded – undo
112 112
 		global $pagenow;
113 113
 
114 114
 		// New View page
115
-		if( $pagenow === 'post-new.php' ) {
116
-			$options['hideeditbox-gravityview'] = true;
115
+		if ( $pagenow === 'post-new.php' ) {
116
+			$options[ 'hideeditbox-gravityview' ] = true;
117 117
 		}
118 118
 
119 119
 		return $options;
Please login to merge, or discard this patch.
class-gravityview-plugin-hooks-gravity-forms-signature.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 		$signature_fields = GFAPI::get_fields_by_type( $form, 'signature' );
54 54
 
55 55
 		foreach ( $signature_fields as $field ) {
56
-			unset( $_POST["input_{$field->id}"] );
56
+			unset( $_POST[ "input_{$field->id}" ] );
57 57
 		}
58 58
 	}
59 59
 
@@ -72,19 +72,19 @@  discard block
 block discarded – undo
72 72
 	 */
73 73
 	function edit_entry_field_input( $field_content = '', $field, $value = '', $lead_id = 0, $form_id = 0 ) {
74 74
 
75
-		$context = function_exists('gravityview_get_context') ? gravityview_get_context() : '';
75
+		$context = function_exists( 'gravityview_get_context' ) ? gravityview_get_context() : '';
76 76
 
77
-		if( 'signature' !== $field->type || 'edit' !== $context ) {
77
+		if ( 'signature' !== $field->type || 'edit' !== $context ) {
78 78
 			return $field_content;
79 79
 		}
80 80
 
81 81
 		// We need to fetch a fresh version of the entry, since the saved entry hasn't refreshed in GV yet.
82 82
 		$entry = GravityView_View::getInstance()->getCurrentEntry();
83
-		$entry = GFAPI::get_entry( $entry['id'] );
83
+		$entry = GFAPI::get_entry( $entry[ 'id' ] );
84 84
 		$entry_value = \GV\Utils::get( $entry, $field->id );
85 85
 
86
-		$_POST["input_{$field->id}"] = $entry_value; // Used when Edit Entry form *is* submitted
87
-		$_POST["input_{$form_id}_{$field->id}_signature_filename"] = $entry_value; // Used when Edit Entry form *is not* submitted
86
+		$_POST[ "input_{$field->id}" ] = $entry_value; // Used when Edit Entry form *is* submitted
87
+		$_POST[ "input_{$form_id}_{$field->id}_signature_filename" ] = $entry_value; // Used when Edit Entry form *is not* submitted
88 88
 
89 89
 		return ''; // Return empty string to force using $_POST values instead
90 90
 	}
Please login to merge, or discard this patch.
includes/class-gravityview-gfformsmodel.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -40,8 +40,8 @@  discard block
 block discarded – undo
40 40
 	public static function is_value_match( $field_value, $target_value, $operation = 'is', $source_field = null, $rule = null, $form = null ) {
41 41
 
42 42
 		if ( 'date_created' === $source_field ) {
43
-			$field_value = is_int( $field_value )? $field_value : strtotime( $field_value );
44
-			$target_value = is_int( $target_value )? $target_value : strtotime( $target_value );
43
+			$field_value = is_int( $field_value ) ? $field_value : strtotime( $field_value );
44
+			$target_value = is_int( $target_value ) ? $target_value : strtotime( $target_value );
45 45
 		}
46 46
 
47 47
 		return parent::is_value_match( $field_value, $target_value, $operation, $source_field, $rule, $form ); // TODO: Change the autogenerated stub
@@ -65,18 +65,18 @@  discard block
 block discarded – undo
65 65
 
66 66
         $post_data = self::get_post_fields( $form, $entry );
67 67
 
68
-        $media = get_attached_media( 'image', $entry['post_id'] );
68
+        $media = get_attached_media( 'image', $entry[ 'post_id' ] );
69 69
 
70 70
         $post_images = array();
71 71
 
72 72
         foreach ( $media as $media_item ) {
73
-            foreach( (array) $post_data['images'] as $post_data_item ) {
74
-                if(
73
+            foreach ( (array)$post_data[ 'images' ] as $post_data_item ) {
74
+                if (
75 75
                     \GV\Utils::get( $post_data_item, 'title' ) === $media_item->post_title &&
76 76
                     \GV\Utils::get( $post_data_item, 'description' ) === $media_item->post_content &&
77 77
                     \GV\Utils::get( $post_data_item, 'caption' ) === $media_item->post_excerpt
78 78
                 ) {
79
-                    $post_images["{$post_data_item['field_id']}"] = $media_item->ID;
79
+                    $post_images[ "{$post_data_item[ 'field_id' ]}" ] = $media_item->ID;
80 80
                 }
81 81
             }
82 82
         }
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
          * If the method changes to public, use Gravity Forms' method
105 105
          * @todo: If/when the method is public, remove the unneeded copied code.
106 106
          */
107
-        if( $reflection->isPublic() ) {
107
+        if ( $reflection->isPublic() ) {
108 108
             return parent::get_post_fields( $form, $entry );
109 109
         }
110 110
 
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
          * If the method changes to public, use Gravity Forms' method
132 132
          * @todo: If/when the method is public, remove the unneeded copied code.
133 133
          */
134
-        if( $reflection->isPublic() ) {
134
+        if ( $reflection->isPublic() ) {
135 135
             return parent::copy_post_image( $url, $post_id );
136 136
         }
137 137
 
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
          * If the method changes to public, use Gravity Forms' method
167 167
          * @todo: If/when the method is public, remove the unneeded copied code.
168 168
          */
169
-        if( $reflection->isPublic() ) {
169
+        if ( $reflection->isPublic() ) {
170 170
             return parent::media_handle_upload( $url, $post_id, $post_data );
171 171
         }
172 172
 
Please login to merge, or discard this patch.
includes/class-data.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 
21 21
 		if ( ! empty( $passed_post ) ) {
22 22
 			$id_or_id_array = $this->maybe_get_view_id( $passed_post );
23
-			foreach( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) {
23
+			foreach ( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) {
24 24
 				if ( \GV\View::exists( $view_id ) && ! $this->views->contains( $view_id ) ) {
25 25
 					$this->views->add( \GV\View::by_id( $view_id ) );
26 26
 				}
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 				foreach ( $passed_post as &$post ) {
76 76
 					$views = \GV\View_Collection::from_post( $post );
77 77
 					foreach ( $views->all() as $view ) {
78
-						$ids []= $view->ID;
78
+						$ids [ ] = $view->ID;
79 79
 
80 80
 						/** And as a side-effect... add each view to the global scope. */
81 81
 						if ( ! $this->views->contains( $view->ID ) ) {
@@ -89,29 +89,29 @@  discard block
 block discarded – undo
89 89
 				if ( is_string( $passed_post ) ) {
90 90
 					$shortcodes = \GV\Shortcode::parse( $passed_post );
91 91
 					foreach ( $shortcodes as $shortcode ) {
92
-						if ( $shortcode->name == 'gravityview' && !empty( $shortcode->atts['id'] ) ) {
93
-							$ids []= $shortcode->atts['id'];
92
+						if ( $shortcode->name == 'gravityview' && ! empty( $shortcode->atts[ 'id' ] ) ) {
93
+							$ids [ ] = $shortcode->atts[ 'id' ];
94 94
 
95 95
 							/** And as a side-effect... add each view to the global scope. */
96
-							if ( ! $this->views->contains( $shortcode->atts['id'] ) && \GV\View::exists( $shortcode->atts['id'] ) ) {
97
-								$this->views->add( $shortcode->atts['id'] );
96
+							if ( ! $this->views->contains( $shortcode->atts[ 'id' ] ) && \GV\View::exists( $shortcode->atts[ 'id' ] ) ) {
97
+								$this->views->add( $shortcode->atts[ 'id' ] );
98 98
 							}
99 99
 						}
100 100
 					}
101 101
 				} else {
102 102
 					$id = $this->get_id_from_atts( $passed_post );
103
-					$ids[] = intval( $id );
103
+					$ids[ ] = intval( $id );
104 104
 				}
105 105
 			}
106 106
 		}
107 107
 
108
-		if( empty($ids) ) {
108
+		if ( empty( $ids ) ) {
109 109
 			return NULL;
110 110
 		}
111 111
 
112 112
 		// If it's just one ID, return that.
113 113
 		// Otherwise, return array of IDs
114
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
114
+		return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
115 115
 	}
116 116
 
117 117
 	/**
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 	 */
120 120
 	public static function getInstance( $passed_post = NULL ) {
121 121
 
122
-		if( empty( self::$instance ) ) {
122
+		if ( empty( self::$instance ) ) {
123 123
 			self::$instance = new GravityView_View_Data( $passed_post );
124 124
 		}
125 125
 
@@ -135,8 +135,8 @@  discard block
 block discarded – undo
135 135
 			return array();
136 136
 		}
137 137
 		return array_combine(
138
-			array_map( function ( $view ) { return $view->ID; }, $this->views->all() ),
139
-			array_map( function ( $view ) { return $view->as_data(); }, $this->views->all() )
138
+			array_map( function( $view ) { return $view->ID; }, $this->views->all() ),
139
+			array_map( function( $view ) { return $view->as_data(); }, $this->views->all() )
140 140
 		);
141 141
 	}
142 142
 
@@ -245,22 +245,22 @@  discard block
 block discarded – undo
245 245
 	public function parse_post_content( $content ) {
246 246
 		$ids = array();
247 247
 		foreach ( \GV\Shortcode::parse( $content ) as $shortcode ) {
248
-			if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts['id'] ) ) {
249
-				if ( \GV\View::exists( $shortcode->atts['id'] ) && ! $this->views->contains( $shortcode->atts['id'] ) ) {
250
-					$this->views->add( \GV\View::by_id( $shortcode->atts['id'] ) );
248
+			if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts[ 'id' ] ) ) {
249
+				if ( \GV\View::exists( $shortcode->atts[ 'id' ] ) && ! $this->views->contains( $shortcode->atts[ 'id' ] ) ) {
250
+					$this->views->add( \GV\View::by_id( $shortcode->atts[ 'id' ] ) );
251 251
 				}
252 252
 				/**
253 253
 				 * The original function outputs the ID even though it wasn't added by ::add_view()
254 254
 				 * Wether this is a bug or not remains a mystery. But we need to emulate this behavior
255 255
 				 * until better times.
256 256
 				 */
257
-				$ids []= $shortcode->atts['id'];
257
+				$ids [ ] = $shortcode->atts[ 'id' ];
258 258
 			}
259 259
 		}
260 260
 		if ( empty ( $ids ) ) {
261 261
 			return null;
262 262
 		}
263
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
263
+		return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
264 264
 	}
265 265
 
266 266
 	/**
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
 		// Not invalid if not set!
284 284
 		if ( empty( $post_id ) || empty( $view_id ) ) {
285 285
 
286
-			if( $empty_is_valid ) {
286
+			if ( $empty_is_valid ) {
287 287
 				return true;
288 288
 			}
289 289
 
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 			$view_ids_in_post = array_map( function( $view ) { return $view->ID; }, $views->all() );
317 317
 
318 318
 			// The post or page specified does not contain the shortcode.
319
-			if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) {
319
+			if ( false === in_array( $view_id, (array)$view_ids_in_post ) ) {
320 320
 				$message = sprintf( esc_html__( 'The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview' ), '<br /><code>[gravityview id="' . intval( $view_id ) . '"]</code>' );
321 321
 			}
322 322
 		}
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 		if ( ! $message ) {
325 325
 			// It's a View
326 326
 			if ( \GV\View::exists( $post_id ) ) {
327
-				$message = esc_html__( 'The ID is already a View.', 'gravityview' );;
327
+				$message = esc_html__( 'The ID is already a View.', 'gravityview' ); ;
328 328
 			}
329 329
 		}
330 330
 
Please login to merge, or discard this patch.
includes/class-gvlogic-shortcode.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 */
88 88
 	public static function get_instance() {
89 89
 
90
-		if( empty( self::$instance ) ) {
90
+		if ( empty( self::$instance ) ) {
91 91
 			self::$instance = new self;
92 92
 		}
93 93
 
@@ -121,9 +121,9 @@  discard block
 block discarded – undo
121 121
 
122 122
 		$operators = array_merge( self::$SUPPORTED_ARRAY_OPERATORS, self::$SUPPORTED_NUMERIC_OPERATORS, self::$SUPPORTED_SCALAR_OPERATORS, self::$SUPPORTED_CUSTOM_OPERATORS );
123 123
 
124
-		if( $with_values ) {
124
+		if ( $with_values ) {
125 125
 			$operators_with_values = array();
126
-			foreach( $operators as $key ) {
126
+			foreach ( $operators as $key ) {
127 127
 				$operators_with_values[ $key ] = '';
128 128
 			}
129 129
 			return $operators_with_values;
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 
143 143
 		$operators = $this->get_operators( false );
144 144
 
145
-		if( !in_array( $operation, $operators ) ) {
145
+		if ( ! in_array( $operation, $operators ) ) {
146 146
 			gravityview()->log->debug( ' Attempted to add invalid operation type. {operation}', array( 'operation' => $operation ) );
147 147
 			return false;
148 148
 		}
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 			return null;
195 195
 		}
196 196
 
197
-		if( empty( $atts ) ) {
197
+		if ( empty( $atts ) ) {
198 198
 			gravityview()->log->error( '$atts are empty.', array( 'data' => $atts ) );
199 199
 			return null;
200 200
 		}
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 		$this->parse_atts();
210 210
 
211 211
 		// We need an "if"
212
-		if( false === $this->if ) {
212
+		if ( false === $this->if ) {
213 213
 			gravityview()->log->error( '$atts->if is empty.', array( 'data' => $this->passed_atts ) );
214 214
 			return null;
215 215
 		}
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 		$setup = $this->setup_operation_and_comparison();
218 218
 
219 219
 		// We need an operation and comparison value
220
-		if( ! $setup ) {
220
+		if ( ! $setup ) {
221 221
 			gravityview()->log->error( 'No valid operators were passed.', array( 'data' => $this->atts ) );
222 222
 			return null;
223 223
 		}
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
 	 */
268 268
 	private function get_output() {
269 269
 
270
-		if( $this->is_match ) {
270
+		if ( $this->is_match ) {
271 271
 			$output = $this->content;
272 272
 		} else {
273 273
 			$output = $this->else_content;
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
 		 * @param string $output HTML/text output
286 286
 		 * @param GVLogic_Shortcode $this This class
287 287
 		 */
288
-		$output = apply_filters('gravityview/gvlogic/output', $output, $this );
288
+		$output = apply_filters( 'gravityview/gvlogic/output', $output, $this );
289 289
 
290 290
 		gravityview()->log->debug( 'Output: ', array( 'data' => $output ) );
291 291
 
@@ -305,14 +305,14 @@  discard block
 block discarded – undo
305 305
 		list( $before_else, $after_else ) = array_pad( explode( '[else]', $passed_content ), 2, NULL );
306 306
 		list( $before_else_if, $after_else_if ) = array_pad( explode( '[else', $passed_content ), 2, NULL );
307 307
 
308
-		$else_attr = isset( $this->atts['else'] ) ? $this->atts['else'] : NULL;
308
+		$else_attr = isset( $this->atts[ 'else' ] ) ? $this->atts[ 'else' ] : NULL;
309 309
 		$else_content = isset( $after_else ) ? $after_else : $else_attr;
310 310
 
311 311
 		// The content is everything OTHER than the [else]
312 312
 		$this->content = $before_else_if;
313 313
 
314 314
 		if ( ! $this->is_match ) {
315
-			if( $elseif_content = $this->process_elseif( $before_else ) ) {
315
+			if ( $elseif_content = $this->process_elseif( $before_else ) ) {
316 316
 				$this->else_content = $elseif_content;
317 317
 			} else {
318 318
 				$this->else_content = $else_content;
@@ -340,16 +340,16 @@  discard block
 block discarded – undo
340 340
 		foreach ( $else_if_matches as $key => $else_if_match ) {
341 341
 
342 342
 			// If $else_if_match[5] exists and has content, check for more shortcodes
343
-			preg_match_all( '/' . $regex . '/', $else_if_match[5] . '[/else]', $recursive_matches, PREG_SET_ORDER );
343
+			preg_match_all( '/' . $regex . '/', $else_if_match[ 5 ] . '[/else]', $recursive_matches, PREG_SET_ORDER );
344 344
 
345 345
 			// If the logic passes, this is the value that should be used for $this->else_content
346
-			$else_if_value = $else_if_match[5];
347
-			$check_elseif_match = $else_if_match[0];
346
+			$else_if_value = $else_if_match[ 5 ];
347
+			$check_elseif_match = $else_if_match[ 0 ];
348 348
 
349 349
 			// Retrieve the value of the match that is currently being checked, without any other [else] tags
350
-			if( ! empty( $recursive_matches[0][0] ) ) {
351
-				$else_if_value = str_replace( $recursive_matches[0][0], '', $else_if_value );
352
-				$check_elseif_match = str_replace( $recursive_matches[0][0], '', $check_elseif_match );
350
+			if ( ! empty( $recursive_matches[ 0 ][ 0 ] ) ) {
351
+				$else_if_value = str_replace( $recursive_matches[ 0 ][ 0 ], '', $else_if_value );
352
+				$check_elseif_match = str_replace( $recursive_matches[ 0 ][ 0 ], '', $check_elseif_match );
353 353
 			}
354 354
 
355 355
 			$check_elseif_match = str_replace( '[else', '[gvlogicelse', $check_elseif_match );
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
 			}
367 367
 
368 368
 			// Process any remaining [else] tags
369
-			return $this->process_elseif( $else_if_match[5] );
369
+			return $this->process_elseif( $else_if_match[ 5 ] );
370 370
 		}
371 371
 
372 372
 		return false;
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
392 392
 		$this->atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( $this->passed_atts, $this->atts ) : $this->atts;
393 393
 
394 394
 		// Strip whitespace if it's not default false
395
-		$this->if = ( isset( $this->atts['if'] ) && is_string( $this->atts['if'] ) ) ? trim( $this->atts['if'] ) : false;
395
+		$this->if = ( isset( $this->atts[ 'if' ] ) && is_string( $this->atts[ 'if' ] ) ) ? trim( $this->atts[ 'if' ] ) : false;
396 396
 
397 397
 		/**
398 398
 		 * @action `gravityview/gvlogic/parse_atts/after` Modify shortcode attributes after it's been parsed
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
 		do_action( 'gravityview/gvlogic/parse_atts/after', $this );
404 404
 
405 405
 		// Make sure the "if" isn't processed in self::setup_operation_and_comparison()
406
-		unset( $this->atts['if'] );
406
+		unset( $this->atts[ 'if' ] );
407 407
 	}
408 408
 }
409 409
 
Please login to merge, or discard this patch.
includes/class-gravityview-admin-notices.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -60,21 +60,21 @@  discard block
 block discarded – undo
60 60
 	public function dismiss_notice() {
61 61
 
62 62
 		// No dismiss sent
63
-		if( empty( $_GET['gv-dismiss'] ) ) {
63
+		if ( empty( $_GET[ 'gv-dismiss' ] ) ) {
64 64
 			return;
65 65
 		}
66 66
 
67 67
 		// Invalid nonce
68
-		if( !wp_verify_nonce( $_GET['gv-dismiss'], 'dismiss' ) ) {
68
+		if ( ! wp_verify_nonce( $_GET[ 'gv-dismiss' ], 'dismiss' ) ) {
69 69
 			return;
70 70
 		}
71 71
 
72
-		$notice_id = esc_attr( $_GET['notice'] );
72
+		$notice_id = esc_attr( $_GET[ 'notice' ] );
73 73
 
74 74
 		//don't display a message if use has dismissed the message for this version
75 75
 		$dismissed_notices = (array)get_transient( 'gravityview_dismissed_notices' );
76 76
 
77
-		$dismissed_notices[] = $notice_id;
77
+		$dismissed_notices[ ] = $notice_id;
78 78
 
79 79
 		$dismissed_notices = array_unique( $dismissed_notices );
80 80
 
@@ -97,12 +97,12 @@  discard block
 block discarded – undo
97 97
 	private function is_notice_dismissed( $notice ) {
98 98
 
99 99
 		// There are no dismissed notices.
100
-		if( empty( self::$dismissed_notices ) ) {
100
+		if ( empty( self::$dismissed_notices ) ) {
101 101
 			return false;
102 102
 		}
103 103
 
104 104
 		// Has the
105
-		$is_dismissed = !empty( $notice['dismiss'] ) && in_array( $notice['dismiss'], self::$dismissed_notices );
105
+		$is_dismissed = ! empty( $notice[ 'dismiss' ] ) && in_array( $notice[ 'dismiss' ], self::$dismissed_notices );
106 106
 
107 107
 		return $is_dismissed ? true : false;
108 108
 	}
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 	 */
128 128
 	private function check_show_multisite_notices() {
129 129
 
130
-		if( ! is_multisite() ) {
130
+		if ( ! is_multisite() ) {
131 131
 			return true;
132 132
 		}
133 133
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 		}
138 138
 
139 139
 		// or they don't have admin capabilities
140
-		if( ! is_super_admin() ) {
140
+		if ( ! is_super_admin() ) {
141 141
 			return false;
142 142
 		}
143 143
 
@@ -160,48 +160,48 @@  discard block
 block discarded – undo
160 160
 		 */
161 161
 		$notices = apply_filters( 'gravityview/admin/notices', self::$admin_notices );
162 162
 
163
-		if( empty( $notices ) || ! $this->check_show_multisite_notices() ) {
163
+		if ( empty( $notices ) || ! $this->check_show_multisite_notices() ) {
164 164
 			return;
165 165
 		}
166 166
 
167 167
 		//don't display a message if use has dismissed the message for this version
168 168
 		// TODO: Use get_user_meta instead of get_transient
169
-		self::$dismissed_notices = isset( $_GET['show-dismissed-notices'] ) ? array() : (array)get_transient( 'gravityview_dismissed_notices' );
169
+		self::$dismissed_notices = isset( $_GET[ 'show-dismissed-notices' ] ) ? array() : (array)get_transient( 'gravityview_dismissed_notices' );
170 170
 
171 171
 		$output = '';
172 172
 
173
-		foreach( $notices as $notice ) {
173
+		foreach ( $notices as $notice ) {
174 174
 
175 175
 			// If the user doesn't have the capability to see the warning
176
-			if( isset( $notice['cap'] ) && false === GVCommon::has_cap( $notice['cap'] ) ) {
176
+			if ( isset( $notice[ 'cap' ] ) && false === GVCommon::has_cap( $notice[ 'cap' ] ) ) {
177 177
 				gravityview()->log->debug( 'Notice not shown because user does not have the capability to view it.', array( 'data' => $notice ) );
178 178
 				continue;
179 179
 			}
180 180
 
181
-			if( true === $this->is_notice_dismissed( $notice ) ) {
181
+			if ( true === $this->is_notice_dismissed( $notice ) ) {
182 182
 				gravityview()->log->debug( 'Notice not shown because the notice has already been dismissed.', array( 'data' => $notice ) );
183 183
 				continue;
184 184
 			}
185 185
 
186
-			$output .= '<div id="message" style="position:relative" class="notice '. gravityview_sanitize_html_class( $notice['class'] ).'">';
186
+			$output .= '<div id="message" style="position:relative" class="notice ' . gravityview_sanitize_html_class( $notice[ 'class' ] ) . '">';
187 187
 
188 188
 			// Too cute to leave out.
189 189
 			$output .= gravityview_get_floaty();
190 190
 
191
-			if( !empty( $notice['title'] ) ) {
192
-				$output .= '<h3>'.esc_html( $notice['title'] ) .'</h3>';
191
+			if ( ! empty( $notice[ 'title' ] ) ) {
192
+				$output .= '<h3>' . esc_html( $notice[ 'title' ] ) . '</h3>';
193 193
 			}
194 194
 
195
-			$message = isset( $notice['message'] ) ? $notice['message'] : '';
195
+			$message = isset( $notice[ 'message' ] ) ? $notice[ 'message' ] : '';
196 196
 
197
-			if( !empty( $notice['dismiss'] ) ) {
197
+			if ( ! empty( $notice[ 'dismiss' ] ) ) {
198 198
 
199
-				$dismiss = esc_attr($notice['dismiss']);
199
+				$dismiss = esc_attr( $notice[ 'dismiss' ] );
200 200
 
201 201
 				$url = esc_url( add_query_arg( array( 'gv-dismiss' => wp_create_nonce( 'dismiss' ), 'notice' => $dismiss ) ) );
202 202
 
203 203
 				$align = is_rtl() ? 'alignleft' : 'alignright';
204
-				$message .= '<a href="'.$url.'" data-notice="'.$dismiss.'" class="' . $align . ' button button-link">'.esc_html__('Dismiss', 'gravityview' ).'</a></p>';
204
+				$message .= '<a href="' . $url . '" data-notice="' . $dismiss . '" class="' . $align . ' button button-link">' . esc_html__( 'Dismiss', 'gravityview' ) . '</a></p>';
205 205
 			}
206 206
 
207 207
 			$output .= wpautop( $message );
@@ -233,14 +233,14 @@  discard block
 block discarded – undo
233 233
 	 */
234 234
 	public static function add_notice( $notice = array() ) {
235 235
 
236
-		if( !isset( $notice['message'] ) ) {
236
+		if ( ! isset( $notice[ 'message' ] ) ) {
237 237
 			gravityview()->log->error( 'Notice not set', array( 'data' => $notice ) );
238 238
 			return;
239 239
 		}
240 240
 
241
-		$notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class'];
241
+		$notice[ 'class' ] = empty( $notice[ 'class' ] ) ? 'error' : $notice[ 'class' ];
242 242
 
243
-		self::$admin_notices[] = $notice;
243
+		self::$admin_notices[ ] = $notice;
244 244
 	}
245 245
 }
246 246
 
Please login to merge, or discard this patch.