Completed
Push — develop ( a51f26...2ecf95 )
by Zack
15:32
created
includes/admin/field-types/type_hidden.php 2 patches
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.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,12 +10,12 @@
 block discarded – undo
10 10
 
11 11
 	function render_input( $override_input = null ) {
12 12
 
13
-		if( isset( $override_input ) ) {
13
+		if ( isset( $override_input ) ) {
14 14
 			echo $override_input;
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/class-admin-welcome.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,9 @@
 block discarded – undo
12 12
  */
13 13
 
14 14
 // Exit if accessed directly
15
-if ( ! defined( 'ABSPATH' ) ) exit;
15
+if ( ! defined( 'ABSPATH' ) ) {
16
+	exit;
17
+}
16 18
 
17 19
 /**
18 20
  * GravityView_Welcome Class
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
 	public function __construct() {
36 36
 		add_action( 'gk/foundation/initialized', array( $this, 'admin_menus' ) );
37 37
 		add_action( 'admin_head', array( $this, 'admin_head' ) );
38
-		add_action( 'admin_init', array( $this, 'welcome'    ) );
39
-		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page'), 10, 2 );
38
+		add_action( 'admin_init', array( $this, 'welcome' ) );
39
+		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page' ), 10, 2 );
40 40
 	}
41 41
 
42 42
 	/**
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	public function is_dashboard_page( $is_page = false, $hook = NULL ) {
97 97
 		global $pagenow;
98 98
 
99
-		if ( empty( $_GET['page'] ) ) {
99
+		if ( empty( $_GET[ 'page' ] ) ) {
100 100
 			return $is_page;
101 101
 		}
102 102
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 			return $is_page;
105 105
 		}
106 106
 
107
-		return 'admin.php' === $pagenow && in_array( $_GET['page'], array( 'gv-changelog', 'gv-credits', 'gv-getting-started' ), true );
107
+		return 'admin.php' === $pagenow && in_array( $_GET[ 'page' ], array( 'gv-changelog', 'gv-credits', 'gv-getting-started' ), true );
108 108
 	}
109 109
 
110 110
 	/**
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 		$admin_menu::remove_submenu_item( 'gv-credits' );
122 122
 		$admin_menu::remove_submenu_item( 'gv-changelog' );
123 123
 
124
-		if( ! $this->is_dashboard_page() ) {
124
+		if ( ! $this->is_dashboard_page() ) {
125 125
 			return;
126 126
 		}
127 127
 
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 		// Don't fetch -beta, etc.
145 145
 		list( $display_version ) = explode( '-', GV_PLUGIN_VERSION );
146 146
 
147
-		$selected = !empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
147
+		$selected = ! empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
148 148
 
149 149
 		echo gravityview_get_floaty( 132 );
150 150
 		?>
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
 					<h3>Create a View</h3>
194 194
 
195 195
 					<ol class="ol-decimal">
196
-						<li>Go to the GravityKit menu and click on <a href="<?php echo admin_url('post-new.php?post_type=gravityview'); ?>">New View</a></li>
196
+						<li>Go to the GravityKit menu and click on <a href="<?php echo admin_url( 'post-new.php?post_type=gravityview' ); ?>">New View</a></li>
197 197
 						<li>If you want to <strong>create a new form</strong>, click the "Use a Form Preset" button</li>
198 198
 						<li>If you want to <strong>use an existing form&rsquo;s entries</strong>, select from the dropdown.</li>
199 199
 						<li>Select the type of View you would like to create. There are two core types of Views: <strong>Table</strong> and <strong>Listing</strong>.
@@ -783,7 +783,7 @@  discard block
 block discarded – undo
783 783
 				</ul>
784 784
 
785 785
 				<h3><?php esc_attr_e( 'Want to contribute?', 'gk-gravityview' ); ?></h3>
786
-				<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gk-gravityview'), '<a href="https://github.com/gravityview/GravityView">', '</a>' ); ?></p>
786
+				<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gk-gravityview' ), '<a href="https://github.com/gravityview/GravityView">', '</a>' ); ?></p>
787 787
 			</div>
788 788
 
789 789
 			<hr class="clear" />
@@ -824,7 +824,7 @@  discard block
 block discarded – undo
824 824
 		global $plugin_page;
825 825
 
826 826
 		// Bail if we're just editing the plugin
827
-		if( $plugin_page === 'plugin-editor.php' ) { return; }
827
+		if ( $plugin_page === 'plugin-editor.php' ) { return; }
828 828
 
829 829
 		// Bail if no activation redirect
830 830
 		if ( ! get_transient( '_gv_activation_redirect' ) ) { return; }
@@ -835,7 +835,7 @@  discard block
 block discarded – undo
835 835
 		$upgrade = get_option( 'gv_version_upgraded_from' );
836 836
 
837 837
 		// Don't do anything if they've already seen the new version info
838
-		if( $upgrade === GV_PLUGIN_VERSION ) {
838
+		if ( $upgrade === GV_PLUGIN_VERSION ) {
839 839
 			return;
840 840
 		}
841 841
 
@@ -843,10 +843,10 @@  discard block
 block discarded – undo
843 843
 		update_option( 'gv_version_upgraded_from', GV_PLUGIN_VERSION );
844 844
 
845 845
 		// Bail if activating from network, or bulk
846
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) { return; }
846
+		if ( is_network_admin() || isset( $_GET[ 'activate-multi' ] ) ) { return; }
847 847
 
848 848
 		// First time install
849
-		if( ! $upgrade ) {
849
+		if ( ! $upgrade ) {
850 850
 			wp_safe_redirect( admin_url( 'admin.php?page=gv-getting-started' ) ); exit;
851 851
 		}
852 852
 		// Update
Please login to merge, or discard this patch.
includes/class-gravityview-image.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
 	var $style = NULL;
24 24
 
25 25
 	/**
26
- 	 * String representing size of image - Choose from "full", "medium", "thumb", "tiny"
26
+	 * String representing size of image - Choose from "full", "medium", "thumb", "tiny"
27 27
 	 * @var string
28 28
 	 */
29 29
 	var $size = NULL;
Please login to merge, or discard this patch.
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -65,11 +65,11 @@  discard block
 block discarded – undo
65 65
 
66 66
 		$atts = wp_parse_args( $atts, $defaults );
67 67
 
68
-		foreach( $atts as $key => $val ) {
68
+		foreach ( $atts as $key => $val ) {
69 69
 			$this->{$key} = $val;
70 70
 		}
71 71
 
72
-		$this->class = !empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class;
72
+		$this->class = ! empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class;
73 73
 
74 74
 		$this->set_image_size();
75 75
 
@@ -85,13 +85,13 @@  discard block
 block discarded – undo
85 85
 	 */
86 86
 	function validate_image_src() {
87 87
 
88
-		if ( !$this->validate_src ) { return true; }
88
+		if ( ! $this->validate_src ) { return true; }
89 89
 
90 90
 		$info = pathinfo( $this->src );
91 91
 
92 92
 		$image_exts = self::get_image_extensions();
93 93
 
94
-		return isset( $info['extension'] ) && in_array( strtolower( $info['extension'] ), $image_exts);
94
+		return isset( $info[ 'extension' ] ) && in_array( strtolower( $info[ 'extension' ] ), $image_exts );
95 95
 	}
96 96
 
97 97
 	/**
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 		 */
110 110
 		$image_exts = apply_filters( 'gravityview_image_extensions', array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico', 'webp' ) );
111 111
 
112
-		return (array) $image_exts;
112
+		return (array)$image_exts;
113 113
 	}
114 114
 
115 115
 	/**
@@ -125,16 +125,16 @@  discard block
 block discarded – undo
125 125
 
126 126
 			// And there is no string size passed
127 127
 			// 		And we want to get the image size using PHP
128
-			if ( empty( $string ) && !empty( $this->getimagesize ) ) {
128
+			if ( empty( $string ) && ! empty( $this->getimagesize ) ) {
129 129
 
130 130
 				$image_size = @getimagesize( $this->src );
131 131
 
132 132
 				// If it didn't return a response, it may be a HTTPS/SSL error
133
-				if ( empty( $image_size[0] ) ) {
133
+				if ( empty( $image_size[ 0 ] ) ) {
134 134
 					$image_size = @getimagesize( set_url_scheme( $this->src, 'http' ) );
135 135
 				}
136 136
 
137
-				if ( !empty( $image_size ) ) {
137
+				if ( ! empty( $image_size ) ) {
138 138
 					list( $width, $height ) = $image_size;
139 139
 				}
140 140
 
@@ -147,33 +147,33 @@  discard block
 block discarded – undo
147 147
 				 * @param array $image_sizes Array of image sizes with the key being the size slug, and the value being an array with `width` and `height` defined, in pixels
148 148
 				 */
149 149
 				$image_sizes = apply_filters( 'gravityview_image_sizes', array(
150
-					'tiny' => array('width' => 40, 'height' => 30),
151
-					'small' => array('width' => 100, 'height' => 75),
152
-					'medium' => array('width' => 250, 'height' => 188),
153
-					'large' => array('width' => 448, 'height' => 336),
150
+					'tiny' => array( 'width' => 40, 'height' => 30 ),
151
+					'small' => array( 'width' => 100, 'height' => 75 ),
152
+					'medium' => array( 'width' => 250, 'height' => 188 ),
153
+					'large' => array( 'width' => 448, 'height' => 336 ),
154 154
 				) );
155 155
 
156
-				switch( $this->size ) {
156
+				switch ( $this->size ) {
157 157
 					case 'tiny':
158
-						extract($image_sizes['tiny']);
158
+						extract( $image_sizes[ 'tiny' ] );
159 159
 						break;
160 160
 					case 'small':
161 161
 					case 's':
162 162
 					case 'thumb':
163
-						extract($image_sizes['small']);
163
+						extract( $image_sizes[ 'small' ] );
164 164
 						break;
165 165
 					case 'm':
166 166
 					case 'medium':
167
-						extract($image_sizes['medium']);
167
+						extract( $image_sizes[ 'medium' ] );
168 168
 						break;
169 169
 					case 'large':
170 170
 					case 'l':
171
-						extract($image_sizes['large']);
171
+						extract( $image_sizes[ 'large' ] );
172 172
 						break;
173 173
 					default:
174 174
 						// Verify that the passed sizes are integers.
175
-						$width = !empty( $width ) ? intval( $width ) : intval( $this->width );
176
-						$height = !empty( $height ) ? intval( $height ) : intval( $this->height );
175
+						$width = ! empty( $width ) ? intval( $width ) : intval( $this->width );
176
+						$height = ! empty( $height ) ? intval( $height ) : intval( $this->height );
177 177
 				}
178 178
 
179 179
 			}
Please login to merge, or discard this patch.
includes/class-gravityview-migrate.php 3 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -180,8 +180,8 @@
 block discarded – undo
180 180
 
181 181
 					// check widget settings:
182 182
 					//  [search_free] => 1
183
-			        //  [search_date] => 1
184
-			        $search_generic = array();
183
+					//  [search_date] => 1
184
+					$search_generic = array();
185 185
 					if( !empty( $widget['search_free'] ) ) {
186 186
 						$search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' );
187 187
 					}
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@
 block discarded – undo
66 66
 			$table_name = GFFormsModel::get_lead_meta_table_name();
67 67
 		}
68 68
 
69
-		$sql = "UPDATE {$table_name} SET `meta_value` = %s WHERE `meta_key` = 'is_approved' AND `meta_value` = %s";
69
+		$sql = "update {$table_name} SET `meta_value` = %s WHERE `meta_key` = 'is_approved' AND `meta_value` = %s";
70 70
 
71 71
 		$approved_result = $wpdb->query( $wpdb->prepare( $sql, GravityView_Entry_Approval_Status::APPROVED, 'Approved' ) );
72 72
 
Please login to merge, or discard this patch.
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 		}
46 46
 
47 47
 		// Provide redirect for old GravityView settings page.
48
-		if( 'edit.php' !== $pagenow ) {
48
+		if ( 'edit.php' !== $pagenow ) {
49 49
 			return;
50 50
 		}
51 51
 
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 
107 107
 		$disapproved_result = $wpdb->query( $wpdb->prepare( $sql, GravityView_Entry_Approval_Status::DISAPPROVED, '0' ) );
108 108
 
109
-		if( false === $approved_result || false === $disapproved_result ) {
109
+		if ( false === $approved_result || false === $disapproved_result ) {
110 110
 			gravityview()->log->error( 'There was an error processing the query. {error}', array( 'error' => $wpdb->last_error ) );
111 111
 		} else {
112 112
 			// All done: Meta values are migrated
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 		$redux_settings = $this->get_redux_settings();
140 140
 
141 141
 		// No need to process
142
-		if( false === $redux_settings ) {
142
+		if ( false === $redux_settings ) {
143 143
 			return;
144 144
 		}
145 145
 
@@ -153,8 +153,8 @@  discard block
 block discarded – undo
153 153
 		gravityview()->plugin->settings->update( $updated_settings );
154 154
 
155 155
 		// And now remove the previous option, so this is a one-time thing.
156
-		delete_option('gravityview_settings');
157
-		delete_option('gravityview_settings-transients');
156
+		delete_option( 'gravityview_settings' );
157
+		delete_option( 'gravityview_settings-transients' );
158 158
 	}
159 159
 
160 160
 	/**
@@ -165,10 +165,10 @@  discard block
 block discarded – undo
165 165
 	function get_redux_settings() {
166 166
 
167 167
 		// Previous settings set by Redux
168
-		$redux_option = get_option('gravityview_settings');
168
+		$redux_option = get_option( 'gravityview_settings' );
169 169
 
170 170
 		// No Redux settings? Don't proceed.
171
-		if( false === $redux_option ) {
171
+		if ( false === $redux_option ) {
172 172
 			return false;
173 173
 		}
174 174
 
@@ -184,8 +184,8 @@  discard block
 block discarded – undo
184 184
 	/** ----  Migrate from old search widget to new search widget  ---- */
185 185
 	function update_search_on_views() {
186 186
 
187
-		if( !class_exists('GravityView_Widget_Search') ) {
188
-			include_once( GRAVITYVIEW_DIR .'includes/extensions/search-widget/class-search-widget.php' );
187
+		if ( ! class_exists( 'GravityView_Widget_Search' ) ) {
188
+			include_once( GRAVITYVIEW_DIR . 'includes/extensions/search-widget/class-search-widget.php' );
189 189
 		}
190 190
 
191 191
 		// Loop through all the views
@@ -197,20 +197,20 @@  discard block
 block discarded – undo
197 197
 
198 198
 		$views = get_posts( $query_args );
199 199
 
200
-		foreach( $views as $view ) {
200
+		foreach ( $views as $view ) {
201 201
 
202 202
 			$widgets = gravityview_get_directory_widgets( $view->ID );
203 203
 			$search_fields = null;
204 204
 
205
-			if( empty( $widgets ) || !is_array( $widgets ) ) { continue; }
205
+			if ( empty( $widgets ) || ! is_array( $widgets ) ) { continue; }
206 206
 
207 207
 			gravityview()->log->debug( '[GravityView_Migrate/update_search_on_views] Loading View ID: {view_id}', array( 'view_id' => $view->ID ) );
208 208
 
209
-			foreach( $widgets as $area => $ws ) {
210
-				foreach( $ws as $k => $widget ) {
211
-					if( $widget['id'] !== 'search_bar' ) { continue; }
209
+			foreach ( $widgets as $area => $ws ) {
210
+				foreach ( $ws as $k => $widget ) {
211
+					if ( $widget[ 'id' ] !== 'search_bar' ) { continue; }
212 212
 
213
-					if( is_null( $search_fields ) ) {
213
+					if ( is_null( $search_fields ) ) {
214 214
 						$search_fields = $this->get_search_fields( $view->ID );
215 215
 					}
216 216
 
@@ -218,24 +218,24 @@  discard block
 block discarded – undo
218 218
 					//  [search_free] => 1
219 219
 			        //  [search_date] => 1
220 220
 			        $search_generic = array();
221
-					if( !empty( $widget['search_free'] ) ) {
222
-						$search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' );
221
+					if ( ! empty( $widget[ 'search_free' ] ) ) {
222
+						$search_generic[ ] = array( 'field' => 'search_all', 'input' => 'input_text' );
223 223
 					}
224
-					if( !empty( $widget['search_date'] ) ) {
225
-						$search_generic[] = array( 'field' => 'entry_date', 'input' => 'date' );
224
+					if ( ! empty( $widget[ 'search_date' ] ) ) {
225
+						$search_generic[ ] = array( 'field' => 'entry_date', 'input' => 'date' );
226 226
 					}
227 227
 
228 228
 					$search_config = array_merge( $search_generic, $search_fields );
229 229
 
230 230
 					// don't throw '[]' when json_encode an empty array
231
-					if( empty( $search_config ) ) {
231
+					if ( empty( $search_config ) ) {
232 232
 						$search_config = '';
233 233
 					} else {
234 234
 						$search_config = json_encode( $search_config );
235 235
 					}
236 236
 
237
-					$widgets[ $area ][ $k ]['search_fields'] = $search_config;
238
-					$widgets[ $area ][ $k ]['search_layout'] = 'horizontal';
237
+					$widgets[ $area ][ $k ][ 'search_fields' ] = $search_config;
238
+					$widgets[ $area ][ $k ][ 'search_layout' ] = 'horizontal';
239 239
 
240 240
 					gravityview()->log->debug( '[GravityView_Migrate/update_search_on_views] Updated Widget: ', array( 'data' => $widgets[ $area ][ $k ] ) );
241 241
 				}
@@ -263,26 +263,26 @@  discard block
 block discarded – undo
263 263
 		// check view fields' settings
264 264
 		$fields = gravityview_get_directory_fields( $view_id, false );
265 265
 
266
-		if( !empty( $fields ) && is_array( $fields ) ) {
266
+		if ( ! empty( $fields ) && is_array( $fields ) ) {
267 267
 
268
-			foreach( $fields as $t => $fs ) {
268
+			foreach ( $fields as $t => $fs ) {
269 269
 
270
-				foreach( $fs as $k => $field ) {
270
+				foreach ( $fs as $k => $field ) {
271 271
 					// is field a search_filter ?
272
-					if( empty( $field['search_filter'] ) ) { continue; }
272
+					if ( empty( $field[ 'search_filter' ] ) ) { continue; }
273 273
 
274 274
 					// get field type & calculate the input type (by default)
275
-					$form_field = gravityview_get_field( $form, $field['id'] );
275
+					$form_field = gravityview_get_field( $form, $field[ 'id' ] );
276 276
 
277
-					if( empty( $form_field['type'] ) ) {
277
+					if ( empty( $form_field[ 'type' ] ) ) {
278 278
 						continue;
279 279
 					}
280 280
 
281 281
 					// depending on the field type assign a group of possible search field types
282
-					$type = GravityView_Widget_Search::get_search_input_types( $field['id'], $form_field['type'] );
282
+					$type = GravityView_Widget_Search::get_search_input_types( $field[ 'id' ], $form_field[ 'type' ] );
283 283
 
284 284
 					// add field to config
285
-					$search_fields[] = array( 'field' => $field['id'], 'input' => $type );
285
+					$search_fields[ ] = array( 'field' => $field[ 'id' ], 'input' => $type );
286 286
 
287 287
 				}
288 288
 			}
Please login to merge, or discard this patch.
includes/class-gravityview-roles-capabilities.php 2 patches
Indentation   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -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
 
@@ -360,7 +360,6 @@  discard block
 block discarded – undo
360 360
 	 * Add Gravity Forms and GravityView's "full access" caps when any other caps are checked against.
361 361
 	 *
362 362
 	 * @since 1.15
363
-
364 363
 	 * @param array $caps_to_check
365 364
 	 *
366 365
 	 * @return array
Please login to merge, or discard this 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/helper-functions.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -307,7 +307,7 @@
 block discarded – undo
307 307
 		! isset( $value ) // If it's not set, it's empty!
308 308
 		|| false === $value
309 309
 		|| null === $value
310
-	    || '' === $value // Empty string
310
+		|| '' === $value // Empty string
311 311
 		|| array() === $value // Empty array
312 312
 		|| ( is_object( $value ) && ! get_object_vars( $value ) ) // Empty object
313 313
 	) {
Please login to merge, or discard this patch.
Spacing   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -32,19 +32,19 @@  discard block
 block discarded – undo
32 32
 	// If there's an overriding CSS file in the current template folder, use it.
33 33
 	$template_css_path = trailingslashit( get_stylesheet_directory() ) . 'gravityview/css/' . $css_file;
34 34
 
35
-	if( file_exists( $template_css_path ) ) {
35
+	if ( file_exists( $template_css_path ) ) {
36 36
 		$path = trailingslashit( get_stylesheet_directory_uri() ) . 'gravityview/css/' . $css_file;
37 37
 		gravityview()->log->debug( 'Stylesheet override ({css_file})', array( 'css_file' => esc_attr( $css_file ) ) );
38 38
 	} else {
39 39
 		// Default: use GravityView CSS file
40 40
 
41 41
 		// If no path is provided, assume default plugin templates CSS folder
42
-		if( '' === $dir_path ) {
42
+		if ( '' === $dir_path ) {
43 43
 			$dir_path = GRAVITYVIEW_DIR . 'templates/css/';
44 44
 		}
45 45
 
46 46
 		// plugins_url() expects a path to a file, not directory. We append a file to be stripped.
47
-		$path = plugins_url( $css_file, trailingslashit( $dir_path )  . 'stripped-by-plugin_basename.php' );
47
+		$path = plugins_url( $css_file, trailingslashit( $dir_path ) . 'stripped-by-plugin_basename.php' );
48 48
 	}
49 49
 
50 50
 	return $path;
@@ -82,9 +82,9 @@  discard block
 block discarded – undo
82 82
 
83 83
 	$parsed_permalink = parse_url( get_permalink( $id ) );
84 84
 
85
-	$permalink_args =  isset( $parsed_permalink['query'] ) ? $parsed_permalink['query'] : false;
85
+	$permalink_args = isset( $parsed_permalink[ 'query' ] ) ? $parsed_permalink[ 'query' ] : false;
86 86
 
87
-	if( empty( $permalink_args ) ) {
87
+	if ( empty( $permalink_args ) ) {
88 88
 		return array();
89 89
 	}
90 90
 
@@ -109,15 +109,15 @@  discard block
 block discarded – undo
109 109
 function gv_selected( $value, $current, $echo = true, $type = 'selected' ) {
110 110
 
111 111
 	$output = '';
112
-	if( is_array( $current ) ) {
113
-		if( in_array( $value, $current ) ) {
112
+	if ( is_array( $current ) ) {
113
+		if ( in_array( $value, $current ) ) {
114 114
 			$output = __checked_selected_helper( true, true, false, $type );
115 115
 		}
116 116
 	} else {
117 117
 		$output = __checked_selected_helper( $value, $current, false, $type );
118 118
 	}
119 119
 
120
-	if( $echo ) {
120
+	if ( $echo ) {
121 121
 		echo $output;
122 122
 	}
123 123
 
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 }
126 126
 
127 127
 
128
-if( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
128
+if ( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
129 129
 
130 130
 	/**
131 131
 	 * sanitize_html_class doesn't handle spaces (multiple classes). We remedy that.
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
  */
172 172
 function gravityview_strip_whitespace( $string ) {
173 173
 	$string = normalize_whitespace( $string );
174
-	return preg_replace('/[\r\n\t ]+/', ' ', $string );
174
+	return preg_replace( '/[\r\n\t ]+/', ' ', $string );
175 175
 }
176 176
 
177 177
 /**
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
  * @return string Included file contents
186 186
  */
187 187
 function gravityview_ob_include( $file_path, $object = NULL ) {
188
-	if( ! file_exists( $file_path ) ) {
188
+	if ( ! file_exists( $file_path ) ) {
189 189
 		gravityview()->log->error( 'File path does not exist. {path}', array( 'path' => $file_path ) );
190 190
 		return '';
191 191
 	}
@@ -209,15 +209,15 @@  discard block
 block discarded – undo
209 209
 
210 210
 	$width = $height * 0.7586206897;
211 211
 
212
-	if( function_exists('is_rtl') && is_rtl() ) {
213
-		$style = 'margin:10px 10px 10px 0; height='. $height .'px; width: '. $width .'px;';
212
+	if ( function_exists( 'is_rtl' ) && is_rtl() ) {
213
+		$style = 'margin:10px 10px 10px 0; height=' . $height . 'px; width: ' . $width . 'px;';
214 214
 		$css_class = is_string( $css_class ) ? $css_class : 'alignright';
215 215
 	} else {
216
-		$style = 'margin:10px 10px 10px 0; height='. $height .'px; width: '. $width .'px;';
216
+		$style = 'margin:10px 10px 10px 0; height=' . $height . 'px; width: ' . $width . 'px;';
217 217
 		$css_class = is_string( $css_class ) ? $css_class : 'alignleft';
218 218
 	}
219 219
 
220
-	return '<img src="'. esc_url( plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) ) .'" class="'. gravityview_sanitize_html_class( $css_class ).'" height="'.intval( $height ).'" width="'.round( $width, 2 ).'" alt="The GravityView Astronaut Says:" style="'.$style.'" />';
220
+	return '<img src="' . esc_url( plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) ) . '" class="' . gravityview_sanitize_html_class( $css_class ) . '" height="' . intval( $height ) . '" width="' . round( $width, 2 ) . '" alt="The GravityView Astronaut Says:" style="' . $style . '" />';
221 221
 }
222 222
 
223 223
 /**
@@ -241,9 +241,9 @@  discard block
 block discarded – undo
241 241
 function gravityview_number_format( $number, $decimals = '', $separator = true ) {
242 242
 	global $wp_locale;
243 243
 
244
-	if( '' === $decimals ) {
244
+	if ( '' === $decimals ) {
245 245
 
246
-		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format['decimal_point'] : '.';
246
+		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format[ 'decimal_point' ] : '.';
247 247
 
248 248
 		/**
249 249
 		 * Calculate the position of the decimal point in the number
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 	$parts = parse_url( $value );
277 277
 
278 278
 	// No domain? Strange...show the original text.
279
-	if( empty( $parts['host'] ) ) {
279
+	if ( empty( $parts[ 'host' ] ) ) {
280 280
 		return $value;
281 281
 	}
282 282
 
@@ -289,16 +289,16 @@  discard block
 block discarded – undo
289 289
 	 * @param boolean $enable Whether to strip the scheme. Return false to show scheme. (default: true)\n
290 290
 	 * If true: `http://example.com => example.com`
291 291
 	 */
292
-	if( false === apply_filters('gravityview_anchor_text_striphttp', true) ) {
292
+	if ( false === apply_filters( 'gravityview_anchor_text_striphttp', true ) ) {
293 293
 
294
-		if( isset( $parts['scheme'] ) ) {
295
-			$return .= $parts['scheme'];
294
+		if ( isset( $parts[ 'scheme' ] ) ) {
295
+			$return .= $parts[ 'scheme' ];
296 296
 		}
297 297
 
298 298
 	}
299 299
 
300 300
 	// The domain, which may contain a subdomain
301
-	$domain = $parts['host'];
301
+	$domain = $parts[ 'host' ];
302 302
 
303 303
 	/**
304 304
 	 * @filter `gravityview_anchor_text_stripwww` Strip www from the domain?
@@ -306,10 +306,10 @@  discard block
 block discarded – undo
306 306
 	 * @param boolean $enable Whether to strip www. Return false to show www. (default: true)\n
307 307
 	 * If true: `www.example.com => example.com`
308 308
 	 */
309
-	$strip_www = apply_filters('gravityview_anchor_text_stripwww', true );
309
+	$strip_www = apply_filters( 'gravityview_anchor_text_stripwww', true );
310 310
 
311
-	if( $strip_www ) {
312
-		$domain = str_replace('www.', '', $domain );
311
+	if ( $strip_www ) {
312
+		$domain = str_replace( 'www.', '', $domain );
313 313
 	}
314 314
 
315 315
 	/**
@@ -319,11 +319,11 @@  discard block
 block discarded – undo
319 319
 	 * If true: `http://demo.example.com => example.com` \n
320 320
 	 * If false: `http://demo.example.com => demo.example.com`
321 321
 	 */
322
-	$strip_subdomains = apply_filters('gravityview_anchor_text_nosubdomain', true);
322
+	$strip_subdomains = apply_filters( 'gravityview_anchor_text_nosubdomain', true );
323 323
 
324
-	if( $strip_subdomains ) {
324
+	if ( $strip_subdomains ) {
325 325
 
326
-		$domain = _gravityview_strip_subdomain( $parts['host'] );
326
+		$domain = _gravityview_strip_subdomain( $parts[ 'host' ] );
327 327
 
328 328
 	}
329 329
 
@@ -337,12 +337,12 @@  discard block
 block discarded – undo
337 337
 	 * If true: `http://example.com/sub/directory/page.html => example.com`  \n
338 338
 	 * If false: `http://example.com/sub/directory/page.html => example.com/sub/directory/page.html`
339 339
 	 */
340
-	$root_only = apply_filters('gravityview_anchor_text_rootonly', true);
340
+	$root_only = apply_filters( 'gravityview_anchor_text_rootonly', true );
341 341
 
342
-	if( empty( $root_only ) ) {
342
+	if ( empty( $root_only ) ) {
343 343
 
344
-		if( isset( $parts['path'] ) ) {
345
-			$return .= $parts['path'];
344
+		if ( isset( $parts[ 'path' ] ) ) {
345
+			$return .= $parts[ 'path' ];
346 346
 		}
347 347
 	}
348 348
 
@@ -352,12 +352,12 @@  discard block
 block discarded – undo
352 352
 	 * @param boolean $enable Whether to enable "root only". Return false to show full path. (default: true)\n
353 353
 	 * If true: `http://example.com/?query=example => example.com`
354 354
 	 */
355
-	$strip_query_string = apply_filters('gravityview_anchor_text_noquerystring', true );
355
+	$strip_query_string = apply_filters( 'gravityview_anchor_text_noquerystring', true );
356 356
 
357
-	if( empty( $strip_query_string ) ) {
357
+	if ( empty( $strip_query_string ) ) {
358 358
 
359
-		if( isset( $parts['query'] ) ) {
360
-			$return .= '?'.$parts['query'];
359
+		if ( isset( $parts[ 'query' ] ) ) {
360
+			$return .= '?' . $parts[ 'query' ];
361 361
 		}
362 362
 
363 363
 	}
@@ -374,8 +374,8 @@  discard block
 block discarded – undo
374 374
  */
375 375
 function _gravityview_strip_subdomain( $string_maybe_has_subdomain ) {
376 376
 
377
-	if( preg_match("/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
378
-		return $matches['domain'];
377
+	if ( preg_match( "/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
378
+		return $matches[ 'domain' ];
379 379
 	} else {
380 380
 		return $string_maybe_has_subdomain;
381 381
 	}
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
 
445 445
 		if ( in_array( $value, array( 'yes', 'true' ), true ) ) {
446 446
 			$value = true;
447
-		} else if( in_array( $value, array( 'no', 'false' ), true ) ) {
447
+		} else if ( in_array( $value, array( 'no', 'false' ), true ) ) {
448 448
 			$value = false;
449 449
 		}
450 450
 	}
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
473 473
  */
474 474
 function gv_maybe_json_decode( $value, $assoc = false, $depth = 512, $options = 0 ) {
475 475
 
476
-	if( ! is_string( $value ) ) {
476
+	if ( ! is_string( $value ) ) {
477 477
 		return $value;
478 478
 	}
479 479
 
@@ -484,12 +484,12 @@  discard block
 block discarded – undo
484 484
 	}
485 485
 
486 486
 	// There was a JSON error (PHP 5.3+)
487
-	if( function_exists('json_last_error') && JSON_ERROR_NONE !== json_last_error() ) {
487
+	if ( function_exists( 'json_last_error' ) && JSON_ERROR_NONE !== json_last_error() ) {
488 488
 		return $value;
489 489
 	}
490 490
 
491 491
 	// It wasn't JSON (PHP < 5.3 fallback)
492
-	if( is_null( $decoded ) ) {
492
+	if ( is_null( $decoded ) ) {
493 493
 		return $value;
494 494
 	}
495 495
 
@@ -556,7 +556,7 @@  discard block
 block discarded – undo
556 556
 
557 557
 	$exploded = explode( '.', "{$field_id}" );
558 558
 
559
-	return isset( $exploded[1] ) ? intval( $exploded[1] ) : false;
559
+	return isset( $exploded[ 1 ] ) ? intval( $exploded[ 1 ] ) : false;
560 560
 }
561 561
 
562 562
 /**
@@ -597,13 +597,13 @@  discard block
 block discarded – undo
597 597
 	 */
598 598
 	$args = apply_filters( 'gravityview_get_terms_choices_args', $args );
599 599
 
600
-	$terms = get_terms( $args['taxonomy'], $args );
600
+	$terms = get_terms( $args[ 'taxonomy' ], $args );
601 601
 
602 602
 	$choices = array();
603 603
 
604 604
 	if ( is_array( $terms ) ) {
605 605
 		foreach ( $terms as $term_id => $term_name ) {
606
-			$choices[] = array(
606
+			$choices[ ] = array(
607 607
 				'text'  => $term_name,
608 608
 				'value' => $term_id
609 609
 			);
@@ -627,21 +627,21 @@  discard block
 block discarded – undo
627 627
 function _gravityview_process_posted_fields() {
628 628
 	$fields = array();
629 629
 
630
-	if( !empty( $_POST['gv_fields'] ) ) {
631
-		if ( ! is_array( $_POST['gv_fields'] ) ) {
630
+	if ( ! empty( $_POST[ 'gv_fields' ] ) ) {
631
+		if ( ! is_array( $_POST[ 'gv_fields' ] ) ) {
632 632
 
633 633
 			// We are not using parse_str() due to max_input_vars limitation with large View configurations
634 634
 			$fields_holder = array();
635
-			GVCommon::gv_parse_str( stripslashes( $_POST['gv_fields'] ), $fields_holder );
635
+			GVCommon::gv_parse_str( stripslashes( $_POST[ 'gv_fields' ] ), $fields_holder );
636 636
 
637
-			if ( isset( $fields_holder['fields'] ) ) {
638
-				$fields = $fields_holder['fields'];
637
+			if ( isset( $fields_holder[ 'fields' ] ) ) {
638
+				$fields = $fields_holder[ 'fields' ];
639 639
 			} else {
640 640
 				gravityview()->log->error( 'No `fields` key was found after parsing $fields string', array( 'data' => $fields_holder ) );
641 641
 			}
642 642
 
643 643
 		} else {
644
-			$fields = $_POST['gv_fields'];
644
+			$fields = $_POST[ 'gv_fields' ];
645 645
 		}
646 646
 	}
647 647
 
@@ -672,7 +672,7 @@  discard block
 block discarded – undo
672 672
 		return false;
673 673
 	}
674 674
 
675
-	if( false !== strpos( strtolower( $value ), "relative:") ) {
675
+	if ( false !== strpos( strtolower( $value ), "relative:" ) ) {
676 676
 		$value = str_replace( 'relative:', '', $value );
677 677
 
678 678
 		$timestamp = strtotime( $value );
@@ -691,15 +691,15 @@  discard block
 block discarded – undo
691 691
 		return false;
692 692
 	}
693 693
 
694
-	$year  = (int) rgar( $parsed_date, 'year' );
695
-	$month = (int) rgar( $parsed_date, 'month' );
696
-	$day   = (int) rgar( $parsed_date, 'day' );
694
+	$year  = (int)rgar( $parsed_date, 'year' );
695
+	$month = (int)rgar( $parsed_date, 'month' );
696
+	$day   = (int)rgar( $parsed_date, 'day' );
697 697
 
698 698
 	// If the month is greater than 12, it's probably a day (in d/m/Y format). This may be why strtotime() failed.
699 699
 	// Let's correct this by swapping the day and month.
700 700
 	if ( ! checkdate( $month, $day, $year ) ) {
701
-		$day   = (int) rgar( $parsed_date, 'month' );
702
-		$month = (int) rgar( $parsed_date, 'day' );
701
+		$day   = (int)rgar( $parsed_date, 'month' );
702
+		$month = (int)rgar( $parsed_date, 'day' );
703 703
 	}
704 704
 
705 705
 	// Still not valid. Perhaps not a date.
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-time.php 2 patches
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -255,7 +255,6 @@
 block discarded – undo
255 255
 	 * Get the default date format for a field based on the field ID and the time format setting
256 256
 	 *
257 257
 	 * @since 1.14
258
-
259 258
 	 * @param string $time_format The time format ("12" or "24"). Default: "12" {@since 1.14}
260 259
 	 * @param int $field_id The ID of the field. Used to figure out full time/hours/minutes/am/pm {@since 1.14}
261 260
 	 *
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
 		add_filter( 'gravityview/sorting/time', array( $this, 'modify_sort_id' ), 10, 2 );
64 64
 
65
-		add_filter('gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 );
65
+		add_filter( 'gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 );
66 66
 	}
67 67
 
68 68
 	/**
@@ -103,35 +103,35 @@  discard block
 block discarded – undo
103 103
 	public function _maybe_filter_gravity_forms_query( $criteria, $form_ids, $view_id ) {
104 104
 
105 105
 		// If the search is not being sorted, return early
106
-		if( empty( $criteria['sorting']['key'] ) ) {
106
+		if ( empty( $criteria[ 'sorting' ][ 'key' ] ) ) {
107 107
 			return $criteria;
108 108
 		}
109 109
 
110
-		$pieces = explode( $this->_sort_divider, $criteria['sorting']['key'] );
110
+		$pieces = explode( $this->_sort_divider, $criteria[ 'sorting' ][ 'key' ] );
111 111
 
112 112
 		/**
113 113
 		 * If the sort key does not match the key set in modify_sort_id(), do not modify the Gravity Forms query SQL
114 114
 		 * @see modify_sort_id()
115 115
 		 */
116
-		if( empty( $pieces[1] ) ) {
116
+		if ( empty( $pieces[ 1 ] ) ) {
117 117
 			return $criteria;
118 118
 		}
119 119
 
120 120
 		// Pass these to the _modify_query_sort_by_time_hack() method
121
-		$this->_time_format = $pieces[1];
122
-		$this->_date_format = $pieces[2];
121
+		$this->_time_format = $pieces[ 1 ];
122
+		$this->_date_format = $pieces[ 2 ];
123 123
 
124 124
 		// Remove fake input IDs (5.1 doesn't exist. Use 5)
125
-		$criteria['sorting']['key'] = floor( $pieces[0] );
125
+		$criteria[ 'sorting' ][ 'key' ] = floor( $pieces[ 0 ] );
126 126
 
127 127
 		/**
128 128
 		 * Make sure sorting is numeric (# of seconds). IMPORTANT.
129 129
 		 * @see GVCommon::is_field_numeric() is_numeric should also be set here
130 130
 		 */
131
-		$criteria['sorting']['is_numeric'] = true;
131
+		$criteria[ 'sorting' ][ 'is_numeric' ] = true;
132 132
 
133 133
 		// Modify the Gravity Forms WP Query
134
-		add_filter('query', array( $this, '_modify_query_sort_by_time_hack' ) );
134
+		add_filter( 'query', array( $this, '_modify_query_sort_by_time_hack' ) );
135 135
 
136 136
 		return $criteria;
137 137
 	}
@@ -152,9 +152,9 @@  discard block
 block discarded – undo
152 152
 		 * then we want to modify the query.
153 153
 		 * @see GFFormsModel::sort_by_field_query()
154 154
 		 */
155
-		if( strpos( $query, self::GF_SORTING_SQL ) > 0 ) {
155
+		if ( strpos( $query, self::GF_SORTING_SQL ) > 0 ) {
156 156
 
157
-			if( $this->_time_format === '24' ) {
157
+			if ( $this->_time_format === '24' ) {
158 158
 				$sql_str_to_date = "STR_TO_DATE( `value`, '%H:%i' )";
159 159
 			} else {
160 160
 				$sql_str_to_date = "STR_TO_DATE( `value`, '%h:%i %p' )";
@@ -200,18 +200,18 @@  discard block
 block discarded – undo
200 200
 		// Set variables
201 201
 		parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id );
202 202
 
203
-		if( 'edit' === $context ) {
203
+		if ( 'edit' === $context ) {
204 204
 			return $field_options;
205 205
 		}
206 206
 
207 207
 		/**
208 208
 		 * Set default date format based on field ID and Form ID
209 209
 		 */
210
-		add_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
210
+		add_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
211 211
 
212
-		$this->add_field_support('date_display', $field_options );
212
+		$this->add_field_support( 'date_display', $field_options );
213 213
 
214
-		remove_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
214
+		remove_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
215 215
 
216 216
 		return $field_options;
217 217
 	}
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 	private function _get_time_format() {
227 227
 		global $post;
228 228
 
229
-		$current_form = isset( $_POST['form_id'] ) ? intval( $_POST['form_id'] ) : gravityview_get_form_id( $post->ID );
229
+		$current_form = isset( $_POST[ 'form_id' ] ) ? intval( $_POST[ 'form_id' ] ) : gravityview_get_form_id( $post->ID );
230 230
 
231 231
 		return self::_get_time_format_for_field( $this->_field_id, $current_form );
232 232
 	}
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
 		// GF defaults to 12, so should we.
246 246
 		$time_format = '12';
247 247
 
248
-		if( $form_id ) {
248
+		if ( $form_id ) {
249 249
 			$form = GFAPI::get_form( $form_id );
250 250
 
251 251
 			if ( $form ) {
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 		$default = 'h:i A';
293 293
 
294 294
 		// This doesn't take into account 24-hour
295
-		switch( $field_input_id ) {
295
+		switch ( $field_input_id ) {
296 296
 			// Hours
297 297
 			case 1:
298 298
 				return ( $time_format === '12' ) ? 'h' : 'H';
Please login to merge, or discard this patch.
includes/default-widgets.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,4 +5,4 @@
 block discarded – undo
5 5
  * @deprecated 1.7.5
6 6
  */
7 7
 
8
-include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
8
+include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' );
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/gravityview-navigation.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,8 +14,8 @@
 block discarded – undo
14 14
 <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
15 15
 	<?php
16 16
 
17
-	foreach( $metaboxes as $metabox ) {
18
-		$class = !isset( $class ) ? 'nav-tab-active' : '';
17
+	foreach ( $metaboxes as $metabox ) {
18
+		$class = ! isset( $class ) ? 'nav-tab-active' : '';
19 19
 	?>
20 20
 	<li class="ui-state-default">
21 21
 		<a class="nav-tab ui-tabs-anchor <?php echo $class; ?>" href="#<?php echo esc_attr( $metabox->id ); ?>">
Please login to merge, or discard this patch.