Completed
Pull Request — master (#641)
by Zack
23:52 queued 19:59
created
includes/class-gravityview-logging.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -12,10 +12,10 @@  discard block
 block discarded – undo
12 12
 		add_action( 'gravityview_log_debug', array( $this, 'log_debug'), 10, 2 );
13 13
 
14 14
 		// Enable debug with Gravity Forms Logging Add-on
15
-	    add_filter( 'gform_logging_supported', array( $this, 'enable_gform_logging' ) );
15
+		add_filter( 'gform_logging_supported', array( $this, 'enable_gform_logging' ) );
16 16
 
17
-	    // Load Debug Bar integration
18
-	    add_filter( 'debug_bar_panels', array( $this, 'add_debug_bar' ) );
17
+		// Load Debug Bar integration
18
+		add_filter( 'debug_bar_panels', array( $this, 'add_debug_bar' ) );
19 19
 
20 20
 	}
21 21
 
@@ -44,8 +44,8 @@  discard block
 block discarded – undo
44 44
 	 * @param array $supported_plugins List of plugins
45 45
 	 */
46 46
 	public function enable_gform_logging( $supported_plugins ) {
47
-	    $supported_plugins['gravityview'] = 'GravityView';
48
-	    return $supported_plugins;
47
+		$supported_plugins['gravityview'] = 'GravityView';
48
+		return $supported_plugins;
49 49
 	}
50 50
 
51 51
 	/**
@@ -97,8 +97,8 @@  discard block
 block discarded – undo
97 97
 
98 98
 		if ( class_exists("GFLogging") ) {
99 99
 			GFLogging::include_logger();
100
-	        GFLogging::log_message( 'gravityview', $function( $message, true ) . $function($data, true), KLogger::DEBUG );
101
-	    }
100
+			GFLogging::log_message( 'gravityview', $function( $message, true ) . $function($data, true), KLogger::DEBUG );
101
+		}
102 102
 	}
103 103
 
104 104
 	static function log_error( $message = '', $data = null  ) {
@@ -116,8 +116,8 @@  discard block
 block discarded – undo
116 116
 		}
117 117
 
118 118
 		if ( class_exists("GFLogging") ) {
119
-		    GFLogging::include_logger();
120
-		    GFLogging::log_message( 'gravityview', $function ( $message, true ) . $function ($data, true), KLogger::ERROR );
119
+			GFLogging::include_logger();
120
+			GFLogging::log_message( 'gravityview', $function ( $message, true ) . $function ($data, true), KLogger::ERROR );
121 121
 		}
122 122
 	}
123 123
 
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -7,9 +7,9 @@  discard block
 block discarded – undo
7 7
 
8 8
 	function __construct() {
9 9
 
10
-		add_action( 'gravityview_log_error', array( $this, 'log_error'), 10, 2 );
10
+		add_action( 'gravityview_log_error', array( $this, 'log_error' ), 10, 2 );
11 11
 
12
-		add_action( 'gravityview_log_debug', array( $this, 'log_debug'), 10, 2 );
12
+		add_action( 'gravityview_log_debug', array( $this, 'log_debug' ), 10, 2 );
13 13
 
14 14
 		// Enable debug with Gravity Forms Logging Add-on
15 15
 	    add_filter( 'gform_logging_supported', array( $this, 'enable_gform_logging' ) );
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 			include_once( GRAVITYVIEW_DIR . 'includes/class-debug-bar.php' );
35 35
 		}
36 36
 
37
-		$panels[] = new GravityView_Debug_Bar;
37
+		$panels[ ] = new GravityView_Debug_Bar;
38 38
 
39 39
 		return $panels;
40 40
 	}
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	 * @param array $supported_plugins List of plugins
45 45
 	 */
46 46
 	public function enable_gform_logging( $supported_plugins ) {
47
-	    $supported_plugins['gravityview'] = 'GravityView';
47
+	    $supported_plugins[ 'gravityview' ] = 'GravityView';
48 48
 	    return $supported_plugins;
49 49
 	}
50 50
 
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	 * @return string "print_r" or "var_export"
73 73
 	 */
74 74
 	static function get_print_function() {
75
-		if( ob_get_level() > 0 ) {
75
+		if ( ob_get_level() > 0 ) {
76 76
 			$function = 'var_export';
77 77
 		} else {
78 78
 			$function = 'print_r';
@@ -88,36 +88,36 @@  discard block
 block discarded – undo
88 88
 		$notice = array(
89 89
 			'message' => $function( $message, true ),
90 90
 			'data' => $data,
91
-			'backtrace' => function_exists('wp_debug_backtrace_summary') ? wp_debug_backtrace_summary( null, 3 ) : '',
91
+			'backtrace' => function_exists( 'wp_debug_backtrace_summary' ) ? wp_debug_backtrace_summary( null, 3 ) : '',
92 92
 		);
93 93
 
94
-		if( !in_array( $notice, self::$notices ) ) {
95
-			self::$notices[] = $notice;
94
+		if ( ! in_array( $notice, self::$notices ) ) {
95
+			self::$notices[ ] = $notice;
96 96
 		}
97 97
 
98
-		if ( class_exists("GFLogging") ) {
98
+		if ( class_exists( "GFLogging" ) ) {
99 99
 			GFLogging::include_logger();
100
-	        GFLogging::log_message( 'gravityview', $function( $message, true ) . $function($data, true), KLogger::DEBUG );
100
+	        GFLogging::log_message( 'gravityview', $function( $message, true ) . $function( $data, true ), KLogger::DEBUG );
101 101
 	    }
102 102
 	}
103 103
 
104
-	static function log_error( $message = '', $data = null  ) {
104
+	static function log_error( $message = '', $data = null ) {
105 105
 
106 106
 		$function = self::get_print_function();
107 107
 
108 108
 		$error = array(
109 109
 			'message' => $message,
110 110
 			'data' => $data,
111
-			'backtrace' => function_exists('wp_debug_backtrace_summary') ? wp_debug_backtrace_summary( null, 3 ) : '',
111
+			'backtrace' => function_exists( 'wp_debug_backtrace_summary' ) ? wp_debug_backtrace_summary( null, 3 ) : '',
112 112
 		);
113 113
 
114
-		if( !in_array( $error, self::$errors ) ) {
115
-			self::$errors[] = $error;
114
+		if ( ! in_array( $error, self::$errors ) ) {
115
+			self::$errors[ ] = $error;
116 116
 		}
117 117
 
118
-		if ( class_exists("GFLogging") ) {
118
+		if ( class_exists( "GFLogging" ) ) {
119 119
 		    GFLogging::include_logger();
120
-		    GFLogging::log_message( 'gravityview', $function ( $message, true ) . $function ($data, true), KLogger::ERROR );
120
+		    GFLogging::log_message( 'gravityview', $function( $message, true ) . $function( $data, true ), KLogger::ERROR );
121 121
 		}
122 122
 	}
123 123
 
Please login to merge, or discard this patch.
includes/class-gravityview-migrate.php 2 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.
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -51,11 +51,11 @@  discard block
 block discarded – undo
51 51
 		$redux_settings = $this->get_redux_settings();
52 52
 
53 53
 		// No need to process
54
-		if( false === $redux_settings ) {
54
+		if ( false === $redux_settings ) {
55 55
 			return;
56 56
 		}
57 57
 
58
-		if( empty(  $redux_settings['license_key_status'] ) ) {
58
+		if ( empty( $redux_settings[ 'license_key_status' ] ) ) {
59 59
 			$redux_settings = $this->get_redux_license_status( $redux_settings );
60 60
 		}
61 61
 
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
69 69
 		GravityView_Settings::get_instance()->update_app_settings( $updated_settings );
70 70
 
71 71
 		// And now remove the previous option, so this is a one-time thing.
72
-		delete_option('gravityview_settings');
73
-		delete_option('gravityview_settings-transients');
72
+		delete_option( 'gravityview_settings' );
73
+		delete_option( 'gravityview_settings-transients' );
74 74
 	}
75 75
 
76 76
 	/**
@@ -86,16 +86,16 @@  discard block
 block discarded – undo
86 86
 
87 87
 		$data = array(
88 88
 			'edd_action' => 'check_license',
89
-			'license' => rgget('license_key', $redux_settings ),
89
+			'license' => rgget( 'license_key', $redux_settings ),
90 90
 			'update' => false,
91 91
 			'format' => 'object',
92 92
 		);
93 93
 
94 94
 		$license_call = GravityView_Settings::get_instance()->get_license_handler()->license_call( $data );
95 95
 
96
-		if( is_object( $license_call ) && isset( $license_call->license ) ) {
97
-			$redux_settings['license_key_status'] = $license_call->license;
98
-			$redux_settings['license_key_response'] = json_encode( $license_call );
96
+		if ( is_object( $license_call ) && isset( $license_call->license ) ) {
97
+			$redux_settings[ 'license_key_status' ] = $license_call->license;
98
+			$redux_settings[ 'license_key_response' ] = json_encode( $license_call );
99 99
 		}
100 100
 
101 101
 		return $redux_settings;
@@ -109,10 +109,10 @@  discard block
 block discarded – undo
109 109
 	function get_redux_settings() {
110 110
 
111 111
 		// Previous settings set by Redux
112
-		$redux_option = get_option('gravityview_settings');
112
+		$redux_option = get_option( 'gravityview_settings' );
113 113
 
114 114
 		// No Redux settings? Don't proceed.
115
-		if( false === $redux_option ) {
115
+		if ( false === $redux_option ) {
116 116
 			return false;
117 117
 		}
118 118
 
@@ -122,21 +122,21 @@  discard block
 block discarded – undo
122 122
 			'no-conflict-mode' => ( rgget( 'no-conflict-mode', $redux_option ) ? '1' : '0' ),
123 123
 		);
124 124
 
125
-		if( $license_array = rgget( 'license', $redux_option ) ) {
125
+		if ( $license_array = rgget( 'license', $redux_option ) ) {
126 126
 
127
-			$redux_settings['license_key'] = $license_key = rgget( 'license', $license_array );
127
+			$redux_settings[ 'license_key' ] = $license_key = rgget( 'license', $license_array );
128 128
 
129
-			$redux_last_changed_values = get_option('gravityview_settings-transients');
129
+			$redux_last_changed_values = get_option( 'gravityview_settings-transients' );
130 130
 
131 131
 			// This contains the last response for license validation
132
-			if( !empty( $redux_last_changed_values ) && $saved_values = rgget( 'changed_values', $redux_last_changed_values ) ) {
132
+			if ( ! empty( $redux_last_changed_values ) && $saved_values = rgget( 'changed_values', $redux_last_changed_values ) ) {
133 133
 
134
-				$saved_license = rgget('license', $saved_values );
134
+				$saved_license = rgget( 'license', $saved_values );
135 135
 
136 136
 				// Only use the last-saved values if they are for the same license
137
-				if( $saved_license && rgget( 'license', $saved_license ) === $license_key ) {
138
-					$redux_settings['license_key_status'] = rgget( 'status', $saved_license );
139
-					$redux_settings['license_key_response'] = rgget( 'response', $saved_license );
137
+				if ( $saved_license && rgget( 'license', $saved_license ) === $license_key ) {
138
+					$redux_settings[ 'license_key_status' ] = rgget( 'status', $saved_license );
139
+					$redux_settings[ 'license_key_response' ] = rgget( 'response', $saved_license );
140 140
 				}
141 141
 			}
142 142
 		}
@@ -148,8 +148,8 @@  discard block
 block discarded – undo
148 148
 	/** ----  Migrate from old search widget to new search widget  ---- */
149 149
 	function update_search_on_views() {
150 150
 
151
-		if( !class_exists('GravityView_Widget_Search') ) {
152
-			include_once( GRAVITYVIEW_DIR .'includes/extensions/search-widget/class-search-widget.php' );
151
+		if ( ! class_exists( 'GravityView_Widget_Search' ) ) {
152
+			include_once( GRAVITYVIEW_DIR . 'includes/extensions/search-widget/class-search-widget.php' );
153 153
 		}
154 154
 
155 155
 		// Loop through all the views
@@ -161,20 +161,20 @@  discard block
 block discarded – undo
161 161
 
162 162
 		$views = get_posts( $query_args );
163 163
 
164
-		foreach( $views as $view ) {
164
+		foreach ( $views as $view ) {
165 165
 
166 166
 			$widgets = get_post_meta( $view->ID, '_gravityview_directory_widgets', true );
167 167
 			$search_fields = null;
168 168
 
169
-			if( empty( $widgets ) || !is_array( $widgets ) ) { continue; }
169
+			if ( empty( $widgets ) || ! is_array( $widgets ) ) { continue; }
170 170
 
171 171
 			do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Loading View ID: ', $view->ID );
172 172
 
173
-			foreach( $widgets as $area => $ws ) {
174
-				foreach( $ws as $k => $widget ) {
175
-					if( $widget['id'] !== 'search_bar' ) { continue; }
173
+			foreach ( $widgets as $area => $ws ) {
174
+				foreach ( $ws as $k => $widget ) {
175
+					if ( $widget[ 'id' ] !== 'search_bar' ) { continue; }
176 176
 
177
-					if( is_null( $search_fields ) ) {
177
+					if ( is_null( $search_fields ) ) {
178 178
 						$search_fields = $this->get_search_fields( $view->ID );
179 179
 					}
180 180
 
@@ -182,24 +182,24 @@  discard block
 block discarded – undo
182 182
 					//  [search_free] => 1
183 183
 			        //  [search_date] => 1
184 184
 			        $search_generic = array();
185
-					if( !empty( $widget['search_free'] ) ) {
186
-						$search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' );
185
+					if ( ! empty( $widget[ 'search_free' ] ) ) {
186
+						$search_generic[ ] = array( 'field' => 'search_all', 'input' => 'input_text' );
187 187
 					}
188
-					if( !empty( $widget['search_date'] ) ) {
189
-						$search_generic[] = array( 'field' => 'entry_date', 'input' => 'date' );
188
+					if ( ! empty( $widget[ 'search_date' ] ) ) {
189
+						$search_generic[ ] = array( 'field' => 'entry_date', 'input' => 'date' );
190 190
 					}
191 191
 
192 192
 					$search_config = array_merge( $search_generic, $search_fields );
193 193
 
194 194
 					// don't throw '[]' when json_encode an empty array
195
-					if( empty( $search_config ) ) {
195
+					if ( empty( $search_config ) ) {
196 196
 						$search_config = '';
197 197
 					} else {
198 198
 						$search_config = json_encode( $search_config );
199 199
 					}
200 200
 
201
-					$widgets[ $area ][ $k ]['search_fields'] = $search_config;
202
-					$widgets[ $area ][ $k ]['search_layout'] = 'horizontal';
201
+					$widgets[ $area ][ $k ][ 'search_fields' ] = $search_config;
202
+					$widgets[ $area ][ $k ][ 'search_layout' ] = 'horizontal';
203 203
 
204 204
 					do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Updated Widget: ', $widgets[ $area ][ $k ] );
205 205
 				}
@@ -227,26 +227,26 @@  discard block
 block discarded – undo
227 227
 		// check view fields' settings
228 228
 		$fields = get_post_meta( $view_id, '_gravityview_directory_fields', true );
229 229
 
230
-		if( !empty( $fields ) && is_array( $fields ) ) {
230
+		if ( ! empty( $fields ) && is_array( $fields ) ) {
231 231
 
232
-			foreach( $fields as $t => $fs ) {
232
+			foreach ( $fields as $t => $fs ) {
233 233
 
234
-				foreach( $fs as $k => $field ) {
234
+				foreach ( $fs as $k => $field ) {
235 235
 					// is field a search_filter ?
236
-					if( empty( $field['search_filter'] ) ) { continue; }
236
+					if ( empty( $field[ 'search_filter' ] ) ) { continue; }
237 237
 
238 238
 					// get field type & calculate the input type (by default)
239
-					$form_field = gravityview_get_field( $form, $field['id'] );
239
+					$form_field = gravityview_get_field( $form, $field[ 'id' ] );
240 240
 
241
-					if( empty( $form_field['type'] ) ) {
241
+					if ( empty( $form_field[ 'type' ] ) ) {
242 242
 						continue;
243 243
 					}
244 244
 
245 245
 					// depending on the field type assign a group of possible search field types
246
-					$type = GravityView_Widget_Search::get_search_input_types( $field['id'], $form_field['type'] );
246
+					$type = GravityView_Widget_Search::get_search_input_types( $field[ 'id' ], $form_field[ 'type' ] );
247 247
 
248 248
 					// add field to config
249
-					$search_fields[] = array( 'field' => $field['id'], 'input' => $type );
249
+					$search_fields[ ] = array( 'field' => $field[ 'id' ], 'input' => $type );
250 250
 
251 251
 				}
252 252
 			}
Please login to merge, or discard this patch.
includes/default-widgets.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * GravityView default widgets and generic widget class
4
- *
5
- * @deprecated 1.7.5
6
- */
3
+	 * GravityView default widgets and generic widget class
4
+	 *
5
+	 * @deprecated 1.7.5
6
+	 */
7 7
 
8 8
 include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
Please login to merge, or discard this 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/extensions/edit-entry/partials/form-buttons.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -7,15 +7,15 @@
 block discarded – undo
7 7
 <div id="publishing-action">
8 8
 	<?php
9 9
 
10
-    /**
11
-     * @filter `gravityview/edit_entry/cancel_link` Modify the cancel button link URL
12
-     * @since 1.11.1
13
-     * @param string $back_link Existing URL of the Cancel link
14
-     * @param array $form The Gravity Forms form
15
-     * @param array $entry The Gravity Forms entry
16
-     * @param int $view_id The current View ID
17
-     */
18
-    $back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id );
10
+	/**
11
+	 * @filter `gravityview/edit_entry/cancel_link` Modify the cancel button link URL
12
+	 * @since 1.11.1
13
+	 * @param string $back_link Existing URL of the Cancel link
14
+	 * @param array $form The Gravity Forms form
15
+	 * @param array $entry The Gravity Forms entry
16
+	 * @param int $view_id The current View ID
17
+	 */
18
+	$back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id );
19 19
 
20 20
 	/**
21 21
 	 * @action `gravityview/edit-entry/publishing-action/before` Triggered before the submit buttons in the Edit Entry screen, inside the `<div id="publishing-action">` container.
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	do_action( 'gravityview/edit-entry/publishing-action/before', $object->form, $object->entry, $object->view_id );
28 28
 
29 29
 	?>
30
-	<input id="gform_submit_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" tabindex="4" value="<?php esc_attr_e( 'Update', 'gravityview'); ?>" name="save" />
30
+	<input id="gform_submit_button_<?php echo esc_attr( $object->form[ 'id' ] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" tabindex="4" value="<?php esc_attr_e( 'Update', 'gravityview' ); ?>" name="save" />
31 31
 
32 32
 	<a class="btn btn-sm button button-small gv-button-cancel" tabindex="5" href="<?php echo esc_url( $back_link ); ?>"><?php esc_attr_e( 'Cancel', 'gravityview' ); ?></a>
33 33
 	<?php
@@ -43,5 +43,5 @@  discard block
 block discarded – undo
43 43
 
44 44
 	?>
45 45
 	<input type="hidden" name="action" value="update" />
46
-	<input type="hidden" name="lid" value="<?php echo esc_attr( $object->entry['id'] ); ?>" />
46
+	<input type="hidden" name="lid" value="<?php echo esc_attr( $object->entry[ 'id' ] ); ?>" />
47 47
 </div>
Please login to merge, or discard this patch.
includes/extensions/edit-entry/partials/inline-javascript.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @file inline-javascript.php
4
- * @global GravityView_Edit_Entry_Render $object
5
- */
3
+	 * @file inline-javascript.php
4
+	 * @global GravityView_Edit_Entry_Render $object
5
+	 */
6 6
 ?><script type="text/javascript">
7 7
 
8 8
 	function DeleteFile(leadId, fieldId, deleteButton){
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,17 +6,17 @@
 block discarded – undo
6 6
 ?><script type="text/javascript">
7 7
 
8 8
 	function DeleteFile(leadId, fieldId, deleteButton){
9
-		if(confirm('<?php echo esc_js( __("Would you like to permanently delete this file? 'Cancel' to stop. 'OK' to delete", 'gravityview') ); ?>')){
9
+		if(confirm('<?php echo esc_js( __( "Would you like to permanently delete this file? 'Cancel' to stop. 'OK' to delete", 'gravityview' ) ); ?>')){
10 10
 			var fileIndex = jQuery(deleteButton).parent().index();
11
-			var mysack = new sack("<?php echo admin_url("admin-ajax.php")?>");
11
+			var mysack = new sack("<?php echo admin_url( "admin-ajax.php" )?>");
12 12
 			mysack.execute = 1;
13 13
 			mysack.method = 'POST';
14 14
 			mysack.setVar( "action", "rg_delete_file" );
15
-			mysack.setVar( "rg_delete_file", "<?php echo wp_create_nonce("rg_delete_file") ?>" );
15
+			mysack.setVar( "rg_delete_file", "<?php echo wp_create_nonce( "rg_delete_file" ) ?>" );
16 16
 			mysack.setVar( "lead_id", leadId );
17 17
 			mysack.setVar( "field_id", fieldId );
18 18
 			mysack.setVar( "file_index", fileIndex );
19
-			mysack.onError = function() { alert('<?php echo esc_js(__('Ajax error while deleting field.', 'gravityview')) ?>' )};
19
+			mysack.onError = function() { alert('<?php echo esc_js( __( 'Ajax error while deleting field.', 'gravityview' ) ) ?>' )};
20 20
 			mysack.runAJAX();
21 21
 
22 22
 			return true;
Please login to merge, or discard this patch.
includes/helper-functions.php 3 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.
Doc Comments   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
  *
29 29
  * We could do this in a cleaner fashion, but this prevents a lot of code duplication, checking for URL structure, etc.
30 30
  *
31
- * @param int|WP_Post $id        Optional. Post ID or post object. Default current post.
31
+ * @param integer $id        Optional. Post ID or post object. Default current post.
32 32
  *
33 33
  * @return array URL args, if exists. Empty array if not.
34 34
  */
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
  * @since 1.15 Added $object param
136 136
  *
137 137
  * @param string $file_path Full path to a file
138
- * @param mixed $object Pass pseudo-global to the included file
138
+ * @param GravityView_Edit_Entry_Render $object Pass pseudo-global to the included file
139 139
  * @return string Included file contents
140 140
  */
141 141
 function gravityview_ob_include( $file_path, $object = NULL ) {
@@ -310,7 +310,6 @@  discard block
 block discarded – undo
310 310
  * Do a _very_ basic match for second-level TLD domains, like `.co.uk`
311 311
  *
312 312
  * Ideally, we'd use https://github.com/jeremykendall/php-domain-parser to check for this, but it's too much work for such a basic functionality. Maybe if it's needed more in the future. So instead, we use [Basic matching regex](http://stackoverflow.com/a/12372310).
313
- * @param  string $domain Domain to check if it's a TLD or subdomain
314 313
  * @return string         Extracted domain if it has a subdomain
315 314
  */
316 315
 function _gravityview_strip_subdomain( $string_maybe_has_subdomain ) {
Please login to merge, or discard this patch.
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -36,9 +36,9 @@  discard block
 block discarded – undo
36 36
 
37 37
 	$parsed_permalink = parse_url( get_permalink( $id ) );
38 38
 
39
-	$permalink_args =  isset( $parsed_permalink['query'] ) ? $parsed_permalink['query'] : false;
39
+	$permalink_args = isset( $parsed_permalink[ 'query' ] ) ? $parsed_permalink[ 'query' ] : false;
40 40
 
41
-	if( empty( $permalink_args ) ) {
41
+	if ( empty( $permalink_args ) ) {
42 42
 		return array();
43 43
 	}
44 44
 
@@ -63,15 +63,15 @@  discard block
 block discarded – undo
63 63
 function gv_selected( $value, $current, $echo = true, $type = 'selected' ) {
64 64
 
65 65
 	$output = '';
66
-	if( is_array( $current ) ) {
67
-		if( in_array( $value, $current ) ) {
66
+	if ( is_array( $current ) ) {
67
+		if ( in_array( $value, $current ) ) {
68 68
 			$output = __checked_selected_helper( true, true, false, $type );
69 69
 		}
70 70
 	} else {
71 71
 		$output = __checked_selected_helper( $value, $current, false, $type );
72 72
 	}
73 73
 
74
-	if( $echo ) {
74
+	if ( $echo ) {
75 75
 		echo $output;
76 76
 	}
77 77
 
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 }
80 80
 
81 81
 
82
-if( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
82
+if ( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
83 83
 
84 84
 	/**
85 85
 	 * sanitize_html_class doesn't handle spaces (multiple classes). We remedy that.
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
  */
126 126
 function gravityview_strip_whitespace( $string ) {
127 127
 	$string = normalize_whitespace( $string );
128
-	return preg_replace('/[\r\n\t ]+/', ' ', $string );
128
+	return preg_replace( '/[\r\n\t ]+/', ' ', $string );
129 129
 }
130 130
 
131 131
 /**
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
  * @return string Included file contents
140 140
  */
141 141
 function gravityview_ob_include( $file_path, $object = NULL ) {
142
-	if( ! file_exists( $file_path ) ) {
142
+	if ( ! file_exists( $file_path ) ) {
143 143
 		do_action( 'gravityview_log_error', __FUNCTION__ . ': File path does not exist. ', $file_path );
144 144
 		return '';
145 145
 	}
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
  */
156 156
 function gravityview_get_floaty() {
157 157
 
158
-	if( function_exists('is_rtl') && is_rtl() ) {
158
+	if ( function_exists( 'is_rtl' ) && is_rtl() ) {
159 159
 		$style = 'margin:10px 10px 10px 0;';
160 160
 		$class = 'alignright';
161 161
 	} else {
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 		$class = 'alignleft';
164 164
 	}
165 165
 
166
-	return '<img src="'.plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ).'" class="'.$class.'" height="87" width="66" alt="The GravityView Astronaut Says:" style="'.$style.'" />';
166
+	return '<img src="' . plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) . '" class="' . $class . '" height="87" width="66" alt="The GravityView Astronaut Says:" style="' . $style . '" />';
167 167
 }
168 168
 
169 169
 /**
@@ -186,9 +186,9 @@  discard block
 block discarded – undo
186 186
 function gravityview_number_format( $number, $decimals = '' ) {
187 187
 	global $wp_locale;
188 188
 
189
-	if( '' === $decimals ) {
189
+	if ( '' === $decimals ) {
190 190
 
191
-		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format['decimal_point'] : '.';
191
+		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format[ 'decimal_point' ] : '.';
192 192
 
193 193
 		/**
194 194
 		 * Calculate the position of the decimal point in the number
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 	$parts = parse_url( $value );
218 218
 
219 219
 	// No domain? Strange...show the original text.
220
-	if( empty( $parts['host'] ) ) {
220
+	if ( empty( $parts[ 'host' ] ) ) {
221 221
 		return $value;
222 222
 	}
223 223
 
@@ -230,16 +230,16 @@  discard block
 block discarded – undo
230 230
 	 * @param boolean $enable Whether to strip the scheme. Return false to show scheme. (default: true)\n
231 231
 	 * If true: `http://example.com => example.com`
232 232
 	 */
233
-	if( false === apply_filters('gravityview_anchor_text_striphttp', true) ) {
233
+	if ( false === apply_filters( 'gravityview_anchor_text_striphttp', true ) ) {
234 234
 
235
-		if( isset( $parts['scheme'] ) ) {
236
-			$return .= $parts['scheme'];
235
+		if ( isset( $parts[ 'scheme' ] ) ) {
236
+			$return .= $parts[ 'scheme' ];
237 237
 		}
238 238
 
239 239
 	}
240 240
 
241 241
 	// The domain, which may contain a subdomain
242
-	$domain = $parts['host'];
242
+	$domain = $parts[ 'host' ];
243 243
 
244 244
 	/**
245 245
 	 * @filter `gravityview_anchor_text_stripwww` Strip www from the domain?
@@ -247,10 +247,10 @@  discard block
 block discarded – undo
247 247
 	 * @param boolean $enable Whether to strip www. Return false to show www. (default: true)\n
248 248
 	 * If true: `www.example.com => example.com`
249 249
 	 */
250
-	$strip_www = apply_filters('gravityview_anchor_text_stripwww', true );
250
+	$strip_www = apply_filters( 'gravityview_anchor_text_stripwww', true );
251 251
 
252
-	if( $strip_www ) {
253
-		$domain = str_replace('www.', '', $domain );
252
+	if ( $strip_www ) {
253
+		$domain = str_replace( 'www.', '', $domain );
254 254
 	}
255 255
 
256 256
 	/**
@@ -260,11 +260,11 @@  discard block
 block discarded – undo
260 260
 	 * If true: `http://demo.example.com => example.com` \n
261 261
 	 * If false: `http://demo.example.com => demo.example.com`
262 262
 	 */
263
-	$strip_subdomains = apply_filters('gravityview_anchor_text_nosubdomain', true);
263
+	$strip_subdomains = apply_filters( 'gravityview_anchor_text_nosubdomain', true );
264 264
 
265
-	if( $strip_subdomains ) {
265
+	if ( $strip_subdomains ) {
266 266
 
267
-		$domain = _gravityview_strip_subdomain( $parts['host'] );
267
+		$domain = _gravityview_strip_subdomain( $parts[ 'host' ] );
268 268
 
269 269
 	}
270 270
 
@@ -278,12 +278,12 @@  discard block
 block discarded – undo
278 278
 	 * If true: `http://example.com/sub/directory/page.html => example.com`  \n
279 279
 	 * If false: `http://example.com/sub/directory/page.html => example.com/sub/directory/page.html`
280 280
 	 */
281
-	$root_only = apply_filters('gravityview_anchor_text_rootonly', true);
281
+	$root_only = apply_filters( 'gravityview_anchor_text_rootonly', true );
282 282
 
283
-	if( empty( $root_only ) ) {
283
+	if ( empty( $root_only ) ) {
284 284
 
285
-		if( isset( $parts['path'] ) ) {
286
-			$return .= $parts['path'];
285
+		if ( isset( $parts[ 'path' ] ) ) {
286
+			$return .= $parts[ 'path' ];
287 287
 		}
288 288
 	}
289 289
 
@@ -293,12 +293,12 @@  discard block
 block discarded – undo
293 293
 	 * @param boolean $enable Whether to enable "root only". Return false to show full path. (default: true)\n
294 294
 	 * If true: `http://example.com/?query=example => example.com`
295 295
 	 */
296
-	$strip_query_string = apply_filters('gravityview_anchor_text_noquerystring', true );
296
+	$strip_query_string = apply_filters( 'gravityview_anchor_text_noquerystring', true );
297 297
 
298
-	if( empty( $strip_query_string ) ) {
298
+	if ( empty( $strip_query_string ) ) {
299 299
 
300
-		if( isset( $parts['query'] ) ) {
301
-			$return .= '?'.$parts['query'];
300
+		if ( isset( $parts[ 'query' ] ) ) {
301
+			$return .= '?' . $parts[ 'query' ];
302 302
 		}
303 303
 
304 304
 	}
@@ -315,8 +315,8 @@  discard block
 block discarded – undo
315 315
  */
316 316
 function _gravityview_strip_subdomain( $string_maybe_has_subdomain ) {
317 317
 
318
-	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 ) ) {
319
-		return $matches['domain'];
318
+	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 ) ) {
319
+		return $matches[ 'domain' ];
320 320
 	} else {
321 321
 		return $string_maybe_has_subdomain;
322 322
 	}
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
  */
338 338
 function gv_empty( $value, $zero_is_empty = true, $allow_string_booleans = true ) {
339 339
 
340
-	if(
340
+	if (
341 341
 		! isset( $value ) // If it's not set, it's empty!
342 342
 		|| false === $value
343 343
 		|| null === $value
@@ -348,20 +348,20 @@  discard block
 block discarded – undo
348 348
 		return true;
349 349
 	}
350 350
 
351
-	if( is_string( $value ) && $allow_string_booleans ) {
351
+	if ( is_string( $value ) && $allow_string_booleans ) {
352 352
 
353 353
 		$value = trim( $value );
354 354
 		$value = strtolower( $value );
355 355
 
356 356
 		if ( in_array( $value, array( 'yes', 'true' ), true ) ) {
357 357
 			$value = true;
358
-		} else if( in_array( $value, array( 'no', 'false' ), true ) ) {
358
+		} else if ( in_array( $value, array( 'no', 'false' ), true ) ) {
359 359
 			$value = false;
360 360
 		}
361 361
 	}
362 362
 
363 363
 	// If zero isn't empty, then if $value is a number and it's empty, it's zero. Thus, return false.
364
-	if( ! $zero_is_empty && is_numeric( $value ) && empty( $value ) ) {
364
+	if ( ! $zero_is_empty && is_numeric( $value ) && empty( $value ) ) {
365 365
 		return false;
366 366
 	}
367 367
 
@@ -429,13 +429,13 @@  discard block
 block discarded – undo
429 429
 	 */
430 430
 	$args = apply_filters( 'gravityview_get_terms_choices_args', $args );
431 431
 
432
-	$terms = get_terms( $args['taxonomy'], $args );
432
+	$terms = get_terms( $args[ 'taxonomy' ], $args );
433 433
 
434 434
 	$choices = array();
435 435
 
436 436
 	if ( is_array( $terms ) ) {
437 437
 		foreach ( $terms as $term_id => $term_name ) {
438
-			$choices[] = array(
438
+			$choices[ ] = array(
439 439
 				'text'  => $term_name,
440 440
 				'value' => $term_id
441 441
 			);
Please login to merge, or discard this patch.
includes/load-plugin-and-theme-hooks.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Include files that load plugin and theme hooks
4
- *
5
- * @file      load-plugin-and-theme-hooks.php
6
- * @package   GravityView
7
- * @license   GPL2+
8
- * @author    Katz Web Services, Inc.
9
- * @link      http://gravityview.co
10
- * @copyright Copyright 2015, Katz Web Services, Inc.
11
- *
12
- * @since 1.15.2
13
- */
3
+	 * Include files that load plugin and theme hooks
4
+	 *
5
+	 * @file      load-plugin-and-theme-hooks.php
6
+	 * @package   GravityView
7
+	 * @license   GPL2+
8
+	 * @author    Katz Web Services, Inc.
9
+	 * @link      http://gravityview.co
10
+	 * @copyright Copyright 2015, Katz Web Services, Inc.
11
+	 *
12
+	 * @since 1.15.2
13
+	 */
14 14
 
15 15
 
16 16
 /** @define "GRAVITYVIEW_DIR" "../" */
Please login to merge, or discard this patch.
includes/presets/resume-board/class-gravityview-preset-resume-board.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * GravityView preset template
4
- *
5
- * @file class-gravityview-preset-resume-board.php
6
- * @package   GravityView
7
- * @license   GPL2+
8
- * @author    Katz Web Services, Inc.
9
- * @link      http://gravityview.co
10
- * @copyright Copyright 2015, Katz Web Services, Inc.
11
- *
12
- * @since 1.15
13
- */
3
+	 * GravityView preset template
4
+	 *
5
+	 * @file class-gravityview-preset-resume-board.php
6
+	 * @package   GravityView
7
+	 * @license   GPL2+
8
+	 * @author    Katz Web Services, Inc.
9
+	 * @link      http://gravityview.co
10
+	 * @copyright Copyright 2015, Katz Web Services, Inc.
11
+	 *
12
+	 * @since 1.15
13
+	 */
14 14
 
15 15
 class GravityView_Preset_Resume_Board extends GravityView_Default_Template_Table {
16 16
 
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-link.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -39,22 +39,22 @@
 block discarded – undo
39 39
 
40 40
         <?php
41 41
 
42
-        $search_value = rgget( $search_field['name'] );
42
+		$search_value = rgget( $search_field['name'] );
43 43
 
44
-        foreach ( $search_field['choices'] as $k => $choice ) {
44
+		foreach ( $search_field['choices'] as $k => $choice ) {
45 45
 
46
-            if ( 0 != $k ) {
47
-                echo esc_html( $links_sep );
48
-            }
46
+			if ( 0 != $k ) {
47
+				echo esc_html( $links_sep );
48
+			}
49 49
 
50
-            $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
50
+			$active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
51 51
 
52
-            if ( $active ) {
53
-                $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
54
-            } else {
55
-                $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
56
-            }
57
-            ?>
52
+			if ( $active ) {
53
+				$link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
54
+			} else {
55
+				$link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
56
+			}
57
+			?>
58 58
 
59 59
 			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a>
60 60
 
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 $base_url = GravityView_Widget_Search::get_search_form_action();
14 14
 
15 15
 // Make sure that there are choices to display
16
-if ( empty( $search_field['choices'] ) ) {
16
+if ( empty( $search_field[ 'choices' ] ) ) {
17 17
 	do_action( 'gravityview_log_debug', 'search-field-link.php - No choices for field' );
18 18
 	return;
19 19
 }
@@ -39,24 +39,24 @@  discard block
 block discarded – undo
39 39
 
40 40
         <?php
41 41
 
42
-        $search_value = rgget( $search_field['name'] );
42
+        $search_value = rgget( $search_field[ 'name' ] );
43 43
 
44
-        foreach ( $search_field['choices'] as $k => $choice ) {
44
+        foreach ( $search_field[ 'choices' ] as $k => $choice ) {
45 45
 
46 46
             if ( 0 != $k ) {
47 47
                 echo esc_html( $links_sep );
48 48
             }
49 49
 
50
-            $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
50
+            $active = ( '' !== $search_value && in_array( $search_value, array( $choice[ 'text' ], $choice[ 'value' ] ) ) ) ? ' class="active"' : false;
51 51
 
52 52
             if ( $active ) {
53
-                $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
53
+                $link = remove_query_arg( array( 'pagenum', $search_field[ 'name' ] ), $base_url );
54 54
             } else {
55
-                $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
55
+                $link = add_query_arg( array( $search_field[ 'name' ] => urlencode( $choice[ 'value' ] ) ), remove_query_arg( array( 'pagenum' ), $base_url ) );
56 56
             }
57 57
             ?>
58 58
 
59
-			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a>
59
+			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice[ 'text' ] ); ?></a>
60 60
 
61 61
 		<?php } ?>
62 62
 	</p>
Please login to merge, or discard this patch.