Completed
Branch master (3ac4b1)
by Zack
04:30
created
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   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 class GravityView_Migrate {
16 16
 
17 17
 	function __construct() {
18
-		add_action( 'admin_init', array( $this, 'update_settings' ), 1 );
18
+		add_action('admin_init', array($this, 'update_settings'), 1);
19 19
 	}
20 20
 
21 21
 	public function update_settings() {
@@ -32,8 +32,8 @@  discard block
 block discarded – undo
32 32
 	private function maybe_migrate_search_widget() {
33 33
 
34 34
 		// check if search migration is already performed
35
-		$is_updated = get_option( 'gv_migrate_searchwidget' );
36
-		if ( $is_updated ) {
35
+		$is_updated = get_option('gv_migrate_searchwidget');
36
+		if ($is_updated) {
37 37
 			return;
38 38
 		} else {
39 39
 			$this->update_search_on_views();
@@ -51,22 +51,22 @@  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'] ) ) {
59
-			$redux_settings = $this->get_redux_license_status( $redux_settings );
58
+		if (empty($redux_settings['license_key_status'])) {
59
+			$redux_settings = $this->get_redux_license_status($redux_settings);
60 60
 		}
61 61
 
62 62
 		// Get the current app settings (just defaults)
63 63
 		$current = GravityView_Settings::get_instance()->get_app_settings();
64 64
 
65 65
 		// Merge the redux settings with the defaults
66
-		$updated_settings = wp_parse_args( $redux_settings, $current );
66
+		$updated_settings = wp_parse_args($redux_settings, $current);
67 67
 
68 68
 		// Update the defaults to the new merged
69
-		GravityView_Settings::get_instance()->update_app_settings( $updated_settings );
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 72
 		delete_option('gravityview_settings');
@@ -82,20 +82,20 @@  discard block
 block discarded – undo
82 82
 	 *
83 83
 	 * @return array
84 84
 	 */
85
-	function get_redux_license_status( $redux_settings = array() ) {
85
+	function get_redux_license_status($redux_settings = array()) {
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
-		$license_call = GravityView_Settings::get_instance()->get_license_handler()->license_call( $data );
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 ) ) {
96
+		if (is_object($license_call) && isset($license_call->license)) {
97 97
 			$redux_settings['license_key_status'] = $license_call->license;
98
-			$redux_settings['license_key_response'] = json_encode( $license_call );
98
+			$redux_settings['license_key_response'] = json_encode($license_call);
99 99
 		}
100 100
 
101 101
 		return $redux_settings;
@@ -112,31 +112,31 @@  discard block
 block discarded – undo
112 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
 
119 119
 
120 120
 		$redux_settings = array(
121
-			'support-email' => rgget( 'support-email', $redux_option ),
122
-			'no-conflict-mode' => ( rgget( 'no-conflict-mode', $redux_option ) ? '1' : '0' ),
121
+			'support-email' => rgget('support-email', $redux_option),
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 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
@@ -159,94 +159,94 @@  discard block
 block discarded – undo
159 159
 			'posts_per_page' => -1,
160 160
 		);
161 161
 
162
-		$views = get_posts( $query_args );
162
+		$views = get_posts($query_args);
163 163
 
164
-		foreach( $views as $view ) {
164
+		foreach ($views as $view) {
165 165
 
166
-			$widgets = get_post_meta( $view->ID, '_gravityview_directory_widgets', true );
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
-			do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Loading View ID: ', $view->ID );
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 ) ) {
178
-						$search_fields = $this->get_search_fields( $view->ID );
177
+					if (is_null($search_fields)) {
178
+						$search_fields = $this->get_search_fields($view->ID);
179 179
 					}
180 180
 
181 181
 					// check widget settings:
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
-					$search_config = array_merge( $search_generic, $search_fields );
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
-						$search_config = json_encode( $search_config );
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
-					do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Updated Widget: ', $widgets[ $area ][ $k ] );
204
+					do_action('gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Updated Widget: ', $widgets[$area][$k]);
205 205
 				}
206 206
 			}
207 207
 
208 208
 			// update widgets view
209
-			update_post_meta( $view->ID, '_gravityview_directory_widgets', $widgets );
209
+			update_post_meta($view->ID, '_gravityview_directory_widgets', $widgets);
210 210
 
211 211
 		} // foreach Views
212 212
 
213 213
 		// all done! enjoy the new Search Widget!
214
-		update_option( 'gv_migrate_searchwidget', true );
214
+		update_option('gv_migrate_searchwidget', true);
215 215
 
216
-		do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] All done! enjoy the new Search Widget!' );
216
+		do_action('gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] All done! enjoy the new Search Widget!');
217 217
 	}
218 218
 
219 219
 
220
-	function get_search_fields( $view_id ) {
220
+	function get_search_fields($view_id) {
221 221
 
222
-		$form_id = gravityview_get_form_id( $view_id );
223
-		$form = gravityview_get_form( $form_id );
222
+		$form_id = gravityview_get_form_id($view_id);
223
+		$form = gravityview_get_form($form_id);
224 224
 
225 225
 		$search_fields = array();
226 226
 
227 227
 		// check view fields' settings
228
-		$fields = get_post_meta( $view_id, '_gravityview_directory_fields', true );
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/class-gravityview-shortcode.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 	private function add_hooks() {
26 26
 
27 27
 		// Shortcode to render view (directory)
28
-		add_shortcode( 'gravityview', array( $this, 'shortcode' ) );
28
+		add_shortcode('gravityview', array($this, 'shortcode'));
29 29
 	}
30 30
 
31 31
 	/**
@@ -39,23 +39,23 @@  discard block
 block discarded – undo
39 39
 	 * @param string|null $content Content passed inside the shortcode
40 40
 	 * @return null|string If admin, null. Otherwise, output of $this->render_view()
41 41
 	 */
42
-	function shortcode( $passed_atts, $content = null ) {
42
+	function shortcode($passed_atts, $content = null) {
43 43
 
44 44
 		// Don't process when saving post.
45
-		if ( is_admin() ) {
45
+		if (is_admin()) {
46 46
 			return null;
47 47
 		}
48 48
 
49
-		do_action( 'gravityview_log_debug', __FUNCTION__ . ' $passed_atts: ', $passed_atts );
49
+		do_action('gravityview_log_debug', __FUNCTION__.' $passed_atts: ', $passed_atts);
50 50
 
51 51
 		// Get details about the current View
52
-		if( !empty( $passed_atts['detail'] ) ) {
53
-			return $this->get_view_detail( $passed_atts['detail'] );
52
+		if (!empty($passed_atts['detail'])) {
53
+			return $this->get_view_detail($passed_atts['detail']);
54 54
 		}
55 55
 
56
-		$atts = $this->parse_and_sanitize_atts( $passed_atts );
56
+		$atts = $this->parse_and_sanitize_atts($passed_atts);
57 57
 
58
-		return GravityView_frontend::getInstance()->render_view( $atts );
58
+		return GravityView_frontend::getInstance()->render_view($atts);
59 59
 	}
60 60
 
61 61
 	/**
@@ -76,26 +76,26 @@  discard block
 block discarded – undo
76 76
 	 *
77 77
 	 * @return array Valid and sanitized attribute pairs
78 78
 	 */
79
-	private function parse_and_sanitize_atts( $passed_atts ) {
79
+	private function parse_and_sanitize_atts($passed_atts) {
80 80
 
81
-		$defaults = GravityView_View_Data::get_default_args( true );
81
+		$defaults = GravityView_View_Data::get_default_args(true);
82 82
 
83
-		$supported_atts = array_fill_keys( array_keys( $defaults ), '' );
83
+		$supported_atts = array_fill_keys(array_keys($defaults), '');
84 84
 
85 85
 		// Whittle down the attributes to only valid pairs
86
-		$filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' );
86
+		$filtered_atts = shortcode_atts($supported_atts, $passed_atts, 'gravityview');
87 87
 
88 88
 		// Only keep the passed attributes after making sure that they're valid pairs
89
-		$filtered_atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( $passed_atts, $filtered_atts ) : $filtered_atts;
89
+		$filtered_atts = function_exists('array_intersect_key') ? array_intersect_key($passed_atts, $filtered_atts) : $filtered_atts;
90 90
 
91 91
 		$atts = array();
92 92
 
93
-		foreach( $filtered_atts as $key => $passed_value ) {
93
+		foreach ($filtered_atts as $key => $passed_value) {
94 94
 
95 95
 			// Allow using {get} merge tags in shortcode attributes
96
-			$passed_value = GravityView_Merge_Tags::replace_get_variables( $passed_value );
96
+			$passed_value = GravityView_Merge_Tags::replace_get_variables($passed_value);
97 97
 
98
-			switch( $defaults[ $key ]['type'] ) {
98
+			switch ($defaults[$key]['type']) {
99 99
 
100 100
 				/**
101 101
 				 * Make sure number fields are numeric.
@@ -103,14 +103,14 @@  discard block
 block discarded – undo
103 103
 				 * @see http://php.net/manual/en/function.is-numeric.php#107326
104 104
 				 */
105 105
 				case 'number':
106
-					if( is_numeric( $passed_value ) ) {
107
-						$atts[ $key ] = ( $passed_value + 0 );
106
+					if (is_numeric($passed_value)) {
107
+						$atts[$key] = ($passed_value + 0);
108 108
 					}
109 109
 					break;
110 110
 
111 111
 				// Checkboxes should be 1 or 0
112 112
 				case 'checkbox':
113
-					$atts[ $key ] = gv_empty( $passed_value ) ? 0 : 1;
113
+					$atts[$key] = gv_empty($passed_value) ? 0 : 1;
114 114
 					break;
115 115
 
116 116
 				/**
@@ -118,15 +118,15 @@  discard block
 block discarded – undo
118 118
 				 */
119 119
 				case 'select':
120 120
 				case 'radio':
121
-					$options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options'];
122
-					if( in_array( $passed_value, array_keys( $options ) ) ) {
123
-						$atts[ $key ] = $passed_value;
121
+					$options = isset($defaults[$key]['choices']) ? $defaults[$key]['choices'] : $defaults[$key]['options'];
122
+					if (in_array($passed_value, array_keys($options))) {
123
+						$atts[$key] = $passed_value;
124 124
 					}
125 125
 					break;
126 126
 
127 127
 				case 'text':
128 128
 				default:
129
-					$atts[ $key ] = $passed_value;
129
+					$atts[$key] = $passed_value;
130 130
 					break;
131 131
 			}
132 132
 		}
@@ -143,26 +143,26 @@  discard block
 block discarded – undo
143 143
 	 *
144 144
 	 * @return string Detail information
145 145
 	 */
146
-	private function get_view_detail( $detail = '' ) {
146
+	private function get_view_detail($detail = '') {
147 147
 
148 148
 		$gravityview_view = GravityView_View::getInstance();
149 149
 		$return = '';
150 150
 
151
-		switch( $detail ) {
151
+		switch ($detail) {
152 152
 			case 'total_entries':
153
-				$return = number_format_i18n( $gravityview_view->getTotalEntries() );
153
+				$return = number_format_i18n($gravityview_view->getTotalEntries());
154 154
 				break;
155 155
 			case 'first_entry':
156 156
 				$paging = $gravityview_view->getPaginationCounts();
157
-				$return = empty( $paging ) ? '' : number_format_i18n( $paging['first'] );
157
+				$return = empty($paging) ? '' : number_format_i18n($paging['first']);
158 158
 				break;
159 159
 			case 'last_entry':
160 160
 				$paging = $gravityview_view->getPaginationCounts();
161
-				$return = empty( $paging ) ? '' : number_format_i18n( $paging['last'] );
161
+				$return = empty($paging) ? '' : number_format_i18n($paging['last']);
162 162
 				break;
163 163
 			case 'page_size':
164 164
 				$paging = $gravityview_view->getPaging();
165
-				$return = number_format_i18n( $paging['page_size'] );
165
+				$return = number_format_i18n($paging['page_size']);
166 166
 				break;
167 167
 		}
168 168
 
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 		 * @since 1.13
172 172
 		 * @param string $return Existing output
173 173
 		 */
174
-		$return = apply_filters( 'gravityview/shortcode/detail/' . $detail, $return );
174
+		$return = apply_filters('gravityview/shortcode/detail/'.$detail, $return);
175 175
 
176 176
 		return $return;
177 177
 	}
Please login to merge, or discard this patch.
includes/class-post-types.php 1 patch
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -17,10 +17,10 @@  discard block
 block discarded – undo
17 17
 
18 18
 		// Load custom post types. It's a static method.
19 19
 		// Load even when invalid to allow for export
20
-		add_action( 'init', array( 'GravityView_Post_Types', 'init_post_types' ) );
20
+		add_action('init', array('GravityView_Post_Types', 'init_post_types'));
21 21
 
22
-		if( GravityView_Compatibility::is_valid() ) {
23
-			add_action( 'init', array( 'GravityView_Post_Types', 'init_rewrite' ) );
22
+		if (GravityView_Compatibility::is_valid()) {
23
+			add_action('init', array('GravityView_Post_Types', 'init_rewrite'));
24 24
 		}
25 25
 	}
26 26
 
@@ -39,11 +39,11 @@  discard block
 block discarded – undo
39 39
 		 * @since 1.13
40 40
 		 * @param boolean $is_hierarchical Default: false
41 41
 		 */
42
-		$is_hierarchical = (bool)apply_filters( 'gravityview_is_hierarchical', false );
42
+		$is_hierarchical = (bool)apply_filters('gravityview_is_hierarchical', false);
43 43
 
44
-		$supports = array( 'title', 'revisions' );
44
+		$supports = array('title', 'revisions');
45 45
 
46
-		if( $is_hierarchical ) {
46
+		if ($is_hierarchical) {
47 47
 			$supports[] = 'page-attributes';
48 48
 		}
49 49
 
@@ -54,30 +54,30 @@  discard block
 block discarded – undo
54 54
 		 * @param array $supports Array of features associated with a functional area of the edit screen. Default: 'title', 'revisions'. If $is_hierarchical, also 'page-attributes'
55 55
 		 * @param[in] boolean $is_hierarchical Do Views support parent/child relationships? See `gravityview_is_hierarchical` filter.
56 56
 		 */
57
-		$supports = apply_filters( 'gravityview_post_type_support', $supports, $is_hierarchical );
57
+		$supports = apply_filters('gravityview_post_type_support', $supports, $is_hierarchical);
58 58
 
59 59
 		//Register Custom Post Type - gravityview
60 60
 		$labels = array(
61
-			'name'                => _x( 'Views', 'Post Type General Name', 'gravityview' ),
62
-			'singular_name'       => _x( 'View', 'Post Type Singular Name', 'gravityview' ),
63
-			'menu_name'           => _x( 'Views', 'Menu name', 'gravityview' ),
64
-			'parent_item_colon'   => __( 'Parent View:', 'gravityview' ),
65
-			'all_items'           => __( 'All Views', 'gravityview' ),
66
-			'view_item'           => _x( 'View', 'View Item', 'gravityview' ),
67
-			'add_new_item'        => __( 'Add New View', 'gravityview' ),
68
-			'add_new'             => __( 'New View', 'gravityview' ),
69
-			'edit_item'           => __( 'Edit View', 'gravityview' ),
70
-			'update_item'         => __( 'Update View', 'gravityview' ),
71
-			'search_items'        => __( 'Search Views', 'gravityview' ),
61
+			'name'                => _x('Views', 'Post Type General Name', 'gravityview'),
62
+			'singular_name'       => _x('View', 'Post Type Singular Name', 'gravityview'),
63
+			'menu_name'           => _x('Views', 'Menu name', 'gravityview'),
64
+			'parent_item_colon'   => __('Parent View:', 'gravityview'),
65
+			'all_items'           => __('All Views', 'gravityview'),
66
+			'view_item'           => _x('View', 'View Item', 'gravityview'),
67
+			'add_new_item'        => __('Add New View', 'gravityview'),
68
+			'add_new'             => __('New View', 'gravityview'),
69
+			'edit_item'           => __('Edit View', 'gravityview'),
70
+			'update_item'         => __('Update View', 'gravityview'),
71
+			'search_items'        => __('Search Views', 'gravityview'),
72 72
 			'not_found'           => self::no_views_text(),
73
-			'not_found_in_trash'  => __( 'No Views found in Trash', 'gravityview' ),
74
-			'filter_items_list'     => __( 'Filter Views list', 'gravityview' ),
75
-			'items_list_navigation' => __( 'Views list navigation', 'gravityview' ),
76
-			'items_list'            => __( 'Views list', 'gravityview' ),
73
+			'not_found_in_trash'  => __('No Views found in Trash', 'gravityview'),
74
+			'filter_items_list'     => __('Filter Views list', 'gravityview'),
75
+			'items_list_navigation' => __('Views list navigation', 'gravityview'),
76
+			'items_list'            => __('Views list', 'gravityview'),
77 77
 		);
78 78
 		$args = array(
79
-			'label'               => __( 'view', 'gravityview' ),
80
-			'description'         => __( 'Create views based on a Gravity Forms form', 'gravityview' ),
79
+			'label'               => __('view', 'gravityview'),
80
+			'description'         => __('Create views based on a Gravity Forms form', 'gravityview'),
81 81
 			'labels'              => $labels,
82 82
 			'supports'            => $supports,
83 83
 			'hierarchical'        => $is_hierarchical,
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 			 * @param[in,out] boolean `true`: allow Views to be accessible directly. `false`: Only allow Views to be embedded via shortcode. Default: `true`
89 89
 			 * @param int $view_id The ID of the View currently being requested. `0` for general setting
90 90
 			 */
91
-			'public'              => apply_filters( 'gravityview_direct_access', GravityView_Compatibility::is_valid(), 0 ),
91
+			'public'              => apply_filters('gravityview_direct_access', GravityView_Compatibility::is_valid(), 0),
92 92
 			'show_ui'             => GravityView_Compatibility::is_valid(),
93 93
 			'show_in_menu'        => GravityView_Compatibility::is_valid(),
94 94
 			'show_in_nav_menus'   => true,
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 			 * @since 1.7.3
102 102
 			 * @param boolean False: don't have frontend archive; True: yes, have archive. Default: false
103 103
 			 */
104
-			'has_archive'         => apply_filters( 'gravityview_has_archive', false ),
104
+			'has_archive'         => apply_filters('gravityview_has_archive', false),
105 105
 			'exclude_from_search' => true,
106 106
 			'rewrite'             => array(
107 107
 				/**
@@ -109,13 +109,13 @@  discard block
 block discarded – undo
109 109
 				 * @see http://docs.gravityview.co/article/62-changing-the-view-slug
110 110
 				 * @param string $slug The slug shown in the URL
111 111
 				 */
112
-				'slug' => apply_filters( 'gravityview_slug', 'view' )
112
+				'slug' => apply_filters('gravityview_slug', 'view')
113 113
 			),
114 114
 			'capability_type'     => 'gravityview',
115 115
 			'map_meta_cap'        => true,
116 116
 		);
117 117
 
118
-		register_post_type( 'gravityview', $args );
118
+		register_post_type('gravityview', $args);
119 119
 
120 120
 	}
121 121
 
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 		$endpoint = self::get_entry_var_name();
132 132
 
133 133
 		//add_permastruct( "{$endpoint}", $endpoint.'/%'.$endpoint.'%/?', true);
134
-		add_rewrite_endpoint( "{$endpoint}", EP_ALL );
134
+		add_rewrite_endpoint("{$endpoint}", EP_ALL);
135 135
 	}
136 136
 
137 137
 	/**
@@ -147,9 +147,9 @@  discard block
 block discarded – undo
147 147
 		 * @filter `gravityview_directory_endpoint` Change the slug used for single entries
148 148
 		 * @param[in,out] string $endpoint Slug to use when accessing single entry. Default: `entry`
149 149
 		 */
150
-		$endpoint = apply_filters( 'gravityview_directory_endpoint', 'entry' );
150
+		$endpoint = apply_filters('gravityview_directory_endpoint', 'entry');
151 151
 
152
-		return sanitize_title( $endpoint );
152
+		return sanitize_title($endpoint);
153 153
 	}
154 154
 
155 155
 	/**
@@ -159,20 +159,20 @@  discard block
 block discarded – undo
159 159
 	 */
160 160
 	static function no_views_text() {
161 161
 
162
-		if( !class_exists( 'GravityView_Admin' ) ) {
163
-			require_once( GRAVITYVIEW_DIR .'includes/class-admin.php' );
162
+		if (!class_exists('GravityView_Admin')) {
163
+			require_once(GRAVITYVIEW_DIR.'includes/class-admin.php');
164 164
 		}
165 165
 
166 166
 		// Floaty the astronaut
167 167
 		$image = GravityView_Admin::get_floaty();
168 168
 
169
-		if( GVCommon::has_cap( 'edit_gravityviews' ) ) {
170
-			$output = sprintf( esc_attr__( "%sYou don't have any active views. Let&rsquo;s go %screate one%s!%s\n\nIf you feel like you're lost in space and need help getting started, check out the %sGetting Started%s page.", 'gravityview' ), '<h3>', '<a href="' . admin_url( 'post-new.php?post_type=gravityview' ) . '">', '</a>', '</h3>', '<a href="' . admin_url( 'edit.php?post_type=gravityview&page=gv-getting-started' ) . '">', '</a>' );
169
+		if (GVCommon::has_cap('edit_gravityviews')) {
170
+			$output = sprintf(esc_attr__("%sYou don't have any active views. Let&rsquo;s go %screate one%s!%s\n\nIf you feel like you're lost in space and need help getting started, check out the %sGetting Started%s page.", 'gravityview'), '<h3>', '<a href="'.admin_url('post-new.php?post_type=gravityview').'">', '</a>', '</h3>', '<a href="'.admin_url('edit.php?post_type=gravityview&page=gv-getting-started').'">', '</a>');
171 171
 		} else {
172
-			$output = esc_attr__( 'There are no active Views', 'gravityview' );
172
+			$output = esc_attr__('There are no active Views', 'gravityview');
173 173
 		}
174 174
 
175
-		return $image . wpautop( $output );
175
+		return $image.wpautop($output);
176 176
 	}
177 177
 
178 178
 
Please login to merge, or discard this patch.
includes/class-template.php 1 patch
Spacing   +125 added lines, -125 removed lines patch added patch discarded remove patch
@@ -12,12 +12,12 @@  discard block
 block discarded – undo
12 12
  */
13 13
 
14 14
 /** If this file is called directly, abort. */
15
-if ( ! defined( 'ABSPATH' ) ) {
15
+if (!defined('ABSPATH')) {
16 16
 	die;
17 17
 }
18 18
 
19
-if( ! class_exists( 'Gamajo_Template_Loader' ) ) {
20
-	require( GRAVITYVIEW_DIR . 'includes/lib/class-gamajo-template-loader.php' );
19
+if (!class_exists('Gamajo_Template_Loader')) {
20
+	require(GRAVITYVIEW_DIR.'includes/lib/class-gamajo-template-loader.php');
21 21
 }
22 22
 
23 23
 class GravityView_View extends Gamajo_Template_Loader {
@@ -145,9 +145,9 @@  discard block
 block discarded – undo
145 145
 	 * Construct the view object
146 146
 	 * @param  array       $atts Associative array to set the data of
147 147
 	 */
148
-	function __construct( $atts = array() ) {
148
+	function __construct($atts = array()) {
149 149
 
150
-		$atts = wp_parse_args( $atts, array(
150
+		$atts = wp_parse_args($atts, array(
151 151
 			'form_id' => NULL,
152 152
 			'view_id' => NULL,
153 153
 			'fields'  => NULL,
@@ -155,10 +155,10 @@  discard block
 block discarded – undo
155 155
 			'post_id' => NULL,
156 156
 			'form'    => NULL,
157 157
 			'atts'	  => NULL,
158
-		) );
158
+		));
159 159
 
160 160
 		foreach ($atts as $key => $value) {
161
-			if( is_null( $value ) ) {
161
+			if (is_null($value)) {
162 162
 				continue;
163 163
 			}
164 164
 			$this->{$key} = $value;
@@ -166,18 +166,18 @@  discard block
 block discarded – undo
166 166
 
167 167
 
168 168
 		// Add granular overrides
169
-		add_filter( $this->filter_prefix . '_get_template_part', array( $this, 'add_id_specific_templates' ), 10, 3 );
169
+		add_filter($this->filter_prefix.'_get_template_part', array($this, 'add_id_specific_templates'), 10, 3);
170 170
 
171 171
 
172 172
 		// widget logic
173
-		add_action( 'gravityview_before', array( $this, 'render_widget_hooks' ) );
174
-		add_action( 'gravityview_after', array( $this, 'render_widget_hooks' ) );
173
+		add_action('gravityview_before', array($this, 'render_widget_hooks'));
174
+		add_action('gravityview_after', array($this, 'render_widget_hooks'));
175 175
 
176 176
 		/**
177 177
 		 * Clear the current entry after the loop is done
178 178
 		 * @since 1.7.3
179 179
 		 */
180
-		add_action( 'gravityview_footer', array( $this, 'clearCurrentEntry' ), 500 );
180
+		add_action('gravityview_footer', array($this, 'clearCurrentEntry'), 500);
181 181
 
182 182
 		self::$instance = &$this;
183 183
 	}
@@ -187,10 +187,10 @@  discard block
 block discarded – undo
187 187
 	 *
188 188
 	 * @return GravityView_View
189 189
 	 */
190
-	static function getInstance( $passed_post = NULL ) {
190
+	static function getInstance($passed_post = NULL) {
191 191
 
192
-		if( empty( self::$instance ) ) {
193
-			self::$instance = new self( $passed_post );
192
+		if (empty(self::$instance)) {
193
+			self::$instance = new self($passed_post);
194 194
 		}
195 195
 
196 196
 		return self::$instance;
@@ -200,11 +200,11 @@  discard block
 block discarded – undo
200 200
 	 * @param string|null $key The key to a specific attribute of the current field
201 201
 	 * @return array|mixed|null If $key is set and attribute exists at $key, return that. If not set, return NULL. Otherwise, return current field array
202 202
 	 */
203
-	public function getCurrentField( $key = NULL ) {
203
+	public function getCurrentField($key = NULL) {
204 204
 
205
-		if( !empty( $key ) ) {
206
-			if( isset( $this->_current_field[ $key ] ) ) {
207
-				return $this->_current_field[ $key ];
205
+		if (!empty($key)) {
206
+			if (isset($this->_current_field[$key])) {
207
+				return $this->_current_field[$key];
208 208
 			}
209 209
 			return NULL;
210 210
 		}
@@ -212,19 +212,19 @@  discard block
 block discarded – undo
212 212
 		return $this->_current_field;
213 213
 	}
214 214
 
215
-	public function setCurrentFieldSetting( $key, $value ) {
215
+	public function setCurrentFieldSetting($key, $value) {
216 216
 
217
-		if( !empty( $this->_current_field ) ) {
218
-			$this->_current_field['field_settings'][ $key ] = $value;
217
+		if (!empty($this->_current_field)) {
218
+			$this->_current_field['field_settings'][$key] = $value;
219 219
 		}
220 220
 
221 221
 	}
222 222
 
223
-	public function getCurrentFieldSetting( $key ) {
223
+	public function getCurrentFieldSetting($key) {
224 224
 		$settings = $this->getCurrentField('field_settings');
225 225
 
226
-		if( $settings && !empty( $settings[ $key ] ) ) {
227
-			return $settings[ $key ];
226
+		if ($settings && !empty($settings[$key])) {
227
+			return $settings[$key];
228 228
 		}
229 229
 
230 230
 		return NULL;
@@ -233,11 +233,11 @@  discard block
 block discarded – undo
233 233
 	/**
234 234
 	 * @param array $passed_field
235 235
 	 */
236
-	public function setCurrentField( $passed_field ) {
236
+	public function setCurrentField($passed_field) {
237 237
 
238 238
 		$existing_field = $this->getCurrentField();
239 239
 
240
-		$set_field = wp_parse_args( $passed_field, $existing_field );
240
+		$set_field = wp_parse_args($passed_field, $existing_field);
241 241
 
242 242
 		$this->_current_field = $set_field;
243 243
 
@@ -252,11 +252,11 @@  discard block
 block discarded – undo
252 252
 	 * @param string|null $key The key to a specific field in the fields array
253 253
 	 * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
254 254
 	 */
255
-	public function getAtts( $key = NULL ) {
255
+	public function getAtts($key = NULL) {
256 256
 
257
-		if( !empty( $key ) ) {
258
-			if( isset( $this->atts[ $key ] ) ) {
259
-				return $this->atts[ $key ];
257
+		if (!empty($key)) {
258
+			if (isset($this->atts[$key])) {
259
+				return $this->atts[$key];
260 260
 			}
261 261
 			return NULL;
262 262
 		}
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
 	/**
268 268
 	 * @param array $atts
269 269
 	 */
270
-	public function setAtts( $atts ) {
270
+	public function setAtts($atts) {
271 271
 		$this->atts = $atts;
272 272
 	}
273 273
 
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
 	/**
282 282
 	 * @param array $form
283 283
 	 */
284
-	public function setForm( $form ) {
284
+	public function setForm($form) {
285 285
 		$this->form = $form;
286 286
 	}
287 287
 
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
 	/**
296 296
 	 * @param int|null $post_id
297 297
 	 */
298
-	public function setPostId( $post_id ) {
298
+	public function setPostId($post_id) {
299 299
 		$this->post_id = $post_id;
300 300
 	}
301 301
 
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
 	/**
310 310
 	 * @param string $context
311 311
 	 */
312
-	public function setContext( $context ) {
312
+	public function setContext($context) {
313 313
 		$this->context = $context;
314 314
 	}
315 315
 
@@ -317,12 +317,12 @@  discard block
 block discarded – undo
317 317
 	 * @param string|null $key The key to a specific field in the fields array
318 318
 	 * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
319 319
 	 */
320
-	public function getFields( $key = null ) {
320
+	public function getFields($key = null) {
321 321
 
322
-		$fields = empty( $this->fields ) ? NULL : $this->fields;
322
+		$fields = empty($this->fields) ? NULL : $this->fields;
323 323
 
324
-		if( $fields && !empty( $key ) ) {
325
-			$fields = isset( $fields[ $key ] ) ? $fields[ $key ] : NULL;
324
+		if ($fields && !empty($key)) {
325
+			$fields = isset($fields[$key]) ? $fields[$key] : NULL;
326 326
 		}
327 327
 
328 328
 		return $fields;
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
 	/**
332 332
 	 * @param array $fields
333 333
 	 */
334
-	public function setFields( $fields ) {
334
+	public function setFields($fields) {
335 335
 		$this->fields = $fields;
336 336
 	}
337 337
 
@@ -339,11 +339,11 @@  discard block
 block discarded – undo
339 339
 	 * @param string $key The key to a specific field in the fields array
340 340
 	 * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
341 341
 	 */
342
-	public function getField( $key ) {
342
+	public function getField($key) {
343 343
 
344
-		if( !empty( $key ) ) {
345
-			if( isset( $this->fields[ $key ] ) ) {
346
-				return $this->fields[ $key ];
344
+		if (!empty($key)) {
345
+			if (isset($this->fields[$key])) {
346
+				return $this->fields[$key];
347 347
 			}
348 348
 		}
349 349
 
@@ -354,22 +354,22 @@  discard block
 block discarded – undo
354 354
 	 * @param string $key The key to a specific field in the fields array
355 355
 	 * @param mixed $value The value to set for the field
356 356
 	 */
357
-	public function setField( $key, $value ) {
358
-		$this->fields[ $key ] = $value;
357
+	public function setField($key, $value) {
358
+		$this->fields[$key] = $value;
359 359
 	}
360 360
 
361 361
 	/**
362 362
 	 * @return int
363 363
 	 */
364 364
 	public function getViewId() {
365
-		return absint( $this->view_id );
365
+		return absint($this->view_id);
366 366
 	}
367 367
 
368 368
 	/**
369 369
 	 * @param int $view_id
370 370
 	 */
371
-	public function setViewId( $view_id ) {
372
-		$this->view_id = intval( $view_id );
371
+	public function setViewId($view_id) {
372
+		$this->view_id = intval($view_id);
373 373
 	}
374 374
 
375 375
 	/**
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 	/**
383 383
 	 * @param int $form_id
384 384
 	 */
385
-	public function setFormId( $form_id ) {
385
+	public function setFormId($form_id) {
386 386
 		$this->form_id = $form_id;
387 387
 	}
388 388
 
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
 	/**
397 397
 	 * @param array $entries
398 398
 	 */
399
-	public function setEntries( $entries ) {
399
+	public function setEntries($entries) {
400 400
 		$this->entries = $entries;
401 401
 	}
402 402
 
@@ -410,8 +410,8 @@  discard block
 block discarded – undo
410 410
 	/**
411 411
 	 * @param int $total_entries
412 412
 	 */
413
-	public function setTotalEntries( $total_entries ) {
414
-		$this->total_entries = intval( $total_entries );
413
+	public function setTotalEntries($total_entries) {
414
+		$this->total_entries = intval($total_entries);
415 415
 	}
416 416
 
417 417
 	/**
@@ -424,7 +424,7 @@  discard block
 block discarded – undo
424 424
 	/**
425 425
 	 * @param array $paging
426 426
 	 */
427
-	public function setPaging( $paging ) {
427
+	public function setPaging($paging) {
428 428
 		$this->paging = $paging;
429 429
 	}
430 430
 
@@ -446,25 +446,25 @@  discard block
 block discarded – undo
446 446
 		$page_size = $paging['page_size'];
447 447
 		$total = $this->getTotalEntries();
448 448
 
449
-		if ( empty( $total ) ) {
450
-			do_action( 'gravityview_log_debug', __METHOD__ . ': No entries. Returning empty array.' );
449
+		if (empty($total)) {
450
+			do_action('gravityview_log_debug', __METHOD__.': No entries. Returning empty array.');
451 451
 
452 452
 			return array();
453 453
 		}
454 454
 
455
-		$first = empty( $offset ) ? 1 : $offset + 1;
455
+		$first = empty($offset) ? 1 : $offset + 1;
456 456
 
457 457
 		// If the page size + starting entry is larger than total, the total is the max.
458
-		$last = ( $offset + $page_size > $total ) ? $total : $offset + $page_size;
458
+		$last = ($offset + $page_size > $total) ? $total : $offset + $page_size;
459 459
 
460 460
 		/**
461 461
 		 * @filter `gravityview_pagination_counts` Modify the displayed pagination numbers
462 462
 		 * @since 1.13
463 463
 		 * @param array $counts Array with $first, $last, $total numbers in that order
464 464
 		 */
465
-		list( $first, $last, $total ) = apply_filters( 'gravityview_pagination_counts', array( $first, $last, $total ) );
465
+		list($first, $last, $total) = apply_filters('gravityview_pagination_counts', array($first, $last, $total));
466 466
 
467
-		return array( 'first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total );
467
+		return array('first' => (int)$first, 'last' => (int)$last, 'total' => (int)$total);
468 468
 	}
469 469
 
470 470
 	/**
@@ -477,7 +477,7 @@  discard block
 block discarded – undo
477 477
 	/**
478 478
 	 * @param array $sorting
479 479
 	 */
480
-	public function setSorting( $sorting ) {
480
+	public function setSorting($sorting) {
481 481
 		$this->sorting = $sorting;
482 482
 	}
483 483
 
@@ -486,9 +486,9 @@  discard block
 block discarded – undo
486 486
 	 */
487 487
 	public function getBackLinkLabel() {
488 488
 
489
-		$back_link_label = GravityView_API::replace_variables( $this->back_link_label, $this->getForm(), $this->getCurrentEntry() );
489
+		$back_link_label = GravityView_API::replace_variables($this->back_link_label, $this->getForm(), $this->getCurrentEntry());
490 490
 
491
-		$back_link_label = do_shortcode( $back_link_label );
491
+		$back_link_label = do_shortcode($back_link_label);
492 492
 
493 493
 		return $back_link_label;
494 494
 	}
@@ -496,7 +496,7 @@  discard block
 block discarded – undo
496 496
 	/**
497 497
 	 * @param string $back_link_label
498 498
 	 */
499
-	public function setBackLinkLabel( $back_link_label ) {
499
+	public function setBackLinkLabel($back_link_label) {
500 500
 		$this->back_link_label = $back_link_label;
501 501
 	}
502 502
 
@@ -510,7 +510,7 @@  discard block
 block discarded – undo
510 510
 	/**
511 511
 	 * @param boolean $hide_until_searched
512 512
 	 */
513
-	public function setHideUntilSearched( $hide_until_searched ) {
513
+	public function setHideUntilSearched($hide_until_searched) {
514 514
 		$this->hide_until_searched = $hide_until_searched;
515 515
 	}
516 516
 
@@ -524,7 +524,7 @@  discard block
 block discarded – undo
524 524
 	/**
525 525
 	 * @param string $template_part_slug
526 526
 	 */
527
-	public function setTemplatePartSlug( $template_part_slug ) {
527
+	public function setTemplatePartSlug($template_part_slug) {
528 528
 		$this->template_part_slug = $template_part_slug;
529 529
 	}
530 530
 
@@ -538,7 +538,7 @@  discard block
 block discarded – undo
538 538
 	/**
539 539
 	 * @param string $template_part_name
540 540
 	 */
541
-	public function setTemplatePartName( $template_part_name ) {
541
+	public function setTemplatePartName($template_part_name) {
542 542
 		$this->template_part_name = $template_part_name;
543 543
 	}
544 544
 
@@ -548,7 +548,7 @@  discard block
 block discarded – undo
548 548
 	 */
549 549
 	public function getCurrentEntry() {
550 550
 
551
-		if( in_array( $this->getContext(), array( 'edit', 'single') ) ) {
551
+		if (in_array($this->getContext(), array('edit', 'single'))) {
552 552
 			$entries = $this->getEntries();
553 553
 			return $entries[0];
554 554
 		}
@@ -560,7 +560,7 @@  discard block
 block discarded – undo
560 560
 	 * @param array $current_entry
561 561
 	 * @return void
562 562
 	 */
563
-	public function setCurrentEntry( $current_entry ) {
563
+	public function setCurrentEntry($current_entry) {
564 564
 		$this->_current_entry = $current_entry;
565 565
 	}
566 566
 
@@ -582,9 +582,9 @@  discard block
 block discarded – undo
582 582
 	 *
583 583
 	 * @return string|null
584 584
 	 */
585
-	public function renderZone( $zone = '', $atts = array() ) {
585
+	public function renderZone($zone = '', $atts = array()) {
586 586
 
587
-		if( empty( $zone ) ) {
587
+		if (empty($zone)) {
588 588
 			do_action('gravityview_log_error', 'GravityView_View[renderZone] No zone defined.');
589 589
 			return NULL;
590 590
 		}
@@ -597,32 +597,32 @@  discard block
 block discarded – undo
597 597
 			'hide_empty' => $this->getAtts('hide_empty'),
598 598
 		);
599 599
 
600
-		$final_atts = wp_parse_args( $atts, $defaults );
600
+		$final_atts = wp_parse_args($atts, $defaults);
601 601
 
602 602
 		$output = '';
603 603
 
604 604
 		$final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}";
605 605
 
606
-		$fields = $this->getField( $final_atts['zone_id'] );
606
+		$fields = $this->getField($final_atts['zone_id']);
607 607
 
608 608
 		// Backward compatibility
609
-		if( 'table' === $this->getTemplatePartSlug() ) {
609
+		if ('table' === $this->getTemplatePartSlug()) {
610 610
 			/**
611 611
 			 * Modify the fields displayed in the table
612 612
 			 * @var array
613 613
 			 */
614
-			$fields = apply_filters("gravityview_table_cells", $fields, $this );
614
+			$fields = apply_filters("gravityview_table_cells", $fields, $this);
615 615
 		}
616 616
 
617
-		if( empty( $fields ) ) {
617
+		if (empty($fields)) {
618 618
 			return NULL;
619 619
 		}
620 620
 
621 621
 		$field_output = '';
622
-		foreach ( $fields as $field ) {
622
+		foreach ($fields as $field) {
623 623
 			$final_atts['field'] = $field;
624 624
 
625
-			$field_output .= gravityview_field_output( $final_atts );
625
+			$field_output .= gravityview_field_output($final_atts);
626 626
 		}
627 627
 
628 628
 		/**
@@ -631,17 +631,17 @@  discard block
 block discarded – undo
631 631
 		 * @since 1.7.6
632 632
 		 * @param boolean $hide_empty_zone Default: false
633 633
 		 */
634
-		if( empty( $field_output ) && apply_filters( 'gravityview/render/hide-empty-zone', false ) ) {
634
+		if (empty($field_output) && apply_filters('gravityview/render/hide-empty-zone', false)) {
635 635
 			return NULL;
636 636
 		}
637 637
 
638
-		if( !empty( $final_atts['wrapper_class'] ) ) {
639
-			$output .= '<div class="'.gravityview_sanitize_html_class( $final_atts['wrapper_class'] ).'">';
638
+		if (!empty($final_atts['wrapper_class'])) {
639
+			$output .= '<div class="'.gravityview_sanitize_html_class($final_atts['wrapper_class']).'">';
640 640
 		}
641 641
 
642 642
 		$output .= $field_output;
643 643
 
644
-		if( !empty( $final_atts['wrapper_class'] ) ) {
644
+		if (!empty($final_atts['wrapper_class'])) {
645 645
 			$output .= '</div>';
646 646
 		}
647 647
 
@@ -659,24 +659,24 @@  discard block
 block discarded – undo
659 659
 	 * @see Gamajo_Template_Loader::locate_template()
660 660
 	 * @return null|string NULL: Template not found; String: path to template
661 661
 	 */
662
-	function locate_template( $template_names, $load = false, $require_once = true ) {
662
+	function locate_template($template_names, $load = false, $require_once = true) {
663 663
 
664
-		if( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
664
+		if (is_string($template_names) && isset($this->located_templates[$template_names])) {
665 665
 
666
-			$located = $this->located_templates[ $template_names ];
666
+			$located = $this->located_templates[$template_names];
667 667
 
668 668
 		} else {
669 669
 
670 670
 			// Set $load to always falso so we handle it here.
671
-			$located = parent::locate_template( $template_names, false, $require_once );
671
+			$located = parent::locate_template($template_names, false, $require_once);
672 672
 
673
-			if( is_string( $template_names ) ) {
674
-				$this->located_templates[ $template_names ] = $located;
673
+			if (is_string($template_names)) {
674
+				$this->located_templates[$template_names] = $located;
675 675
 			}
676 676
 		}
677 677
 
678
-		if ( $load && $located ) {
679
-			load_template( $located, $require_once );
678
+		if ($load && $located) {
679
+			load_template($located, $require_once);
680 680
 		}
681 681
 
682 682
 		return $located;
@@ -687,8 +687,8 @@  discard block
 block discarded – undo
687 687
 	 * @param  string      $name Key for the data retrieval.
688 688
 	 * @return mixed|null    The stored data.
689 689
 	 */
690
-	public function __get( $name ) {
691
-		if( isset( $this->{$name} ) ) {
690
+	public function __get($name) {
691
+		if (isset($this->{$name} )) {
692 692
 			return $this->{$name};
693 693
 		} else {
694 694
 			return NULL;
@@ -712,47 +712,47 @@  discard block
 block discarded – undo
712 712
 	 *
713 713
 	 * @return array $templates Modified template array, merged with existing $templates values
714 714
 	 */
715
-	function add_id_specific_templates( $templates, $slug, $name ) {
715
+	function add_id_specific_templates($templates, $slug, $name) {
716 716
 
717 717
 		$additional = array();
718 718
 
719 719
 		// form-19-table-body.php
720
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
720
+		$additional[] = sprintf('form-%d-%s-%s.php', $this->getFormId(), $slug, $name);
721 721
 
722 722
 		// view-3-table-body.php
723
-		$additional[] = sprintf( 'view-%d-%s-%s.php', $this->getViewId(), $slug, $name );
723
+		$additional[] = sprintf('view-%d-%s-%s.php', $this->getViewId(), $slug, $name);
724 724
 
725
-		if( $this->getPostId() ) {
725
+		if ($this->getPostId()) {
726 726
 
727 727
 			// page-19-table-body.php
728
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
728
+			$additional[] = sprintf('page-%d-%s-%s.php', $this->getPostId(), $slug, $name);
729 729
 		}
730 730
 
731 731
 		// Combine with existing table-body.php and table.php
732
-		$templates = array_merge( $additional, $templates );
732
+		$templates = array_merge($additional, $templates);
733 733
 
734
-		do_action( 'gravityview_log_debug', '[add_id_specific_templates] List of Template Files', $templates );
734
+		do_action('gravityview_log_debug', '[add_id_specific_templates] List of Template Files', $templates);
735 735
 
736 736
 		return $templates;
737 737
 	}
738 738
 
739 739
 	// Load the template
740
-	public function render( $slug, $name, $require_once = true ) {
740
+	public function render($slug, $name, $require_once = true) {
741 741
 
742
-		$this->setTemplatePartSlug( $slug );
742
+		$this->setTemplatePartSlug($slug);
743 743
 
744
-		$this->setTemplatePartName( $name );
744
+		$this->setTemplatePartName($name);
745 745
 
746
-		$template_file = $this->get_template_part( $slug, $name, false );
746
+		$template_file = $this->get_template_part($slug, $name, false);
747 747
 
748
-		do_action( 'gravityview_log_debug', '[render] Rendering Template File', $template_file );
748
+		do_action('gravityview_log_debug', '[render] Rendering Template File', $template_file);
749 749
 
750
-		if( !empty( $template_file) ) {
750
+		if (!empty($template_file)) {
751 751
 
752
-			if ( $require_once ) {
753
-				require_once( $template_file );
752
+			if ($require_once) {
753
+				require_once($template_file);
754 754
 			} else {
755
-				require( $template_file );
755
+				require($template_file);
756 756
 			}
757 757
 
758 758
 		}
@@ -762,24 +762,24 @@  discard block
 block discarded – undo
762 762
 	 *
763 763
 	 * @param $view_id
764 764
 	 */
765
-	public function render_widget_hooks( $view_id ) {
765
+	public function render_widget_hooks($view_id) {
766 766
 
767
-		if( empty( $view_id ) || 'single' == gravityview_get_context() ) {
768
-			do_action( 'gravityview_log_debug', __METHOD__ . ' - Not rendering widgets; single entry' );
767
+		if (empty($view_id) || 'single' == gravityview_get_context()) {
768
+			do_action('gravityview_log_debug', __METHOD__.' - Not rendering widgets; single entry');
769 769
 			return;
770 770
 		}
771 771
 
772
-		$view_data = gravityview_get_current_view_data( $view_id );
772
+		$view_data = gravityview_get_current_view_data($view_id);
773 773
 
774 774
 		// TODO: Move to sep. method, use an action instead
775
-		wp_enqueue_style( 'gravityview_default_style');
775
+		wp_enqueue_style('gravityview_default_style');
776 776
 
777 777
 		// get View widget configuration
778 778
 		$widgets = $view_data['widgets'];
779 779
 
780 780
 		$rows = GravityView_Plugin::get_default_widget_areas();
781 781
 
782
-		switch( current_filter() ) {
782
+		switch (current_filter()) {
783 783
 			case 'gravityview_before':
784 784
 				$zone = 'header';
785 785
 				break;
@@ -789,8 +789,8 @@  discard block
 block discarded – undo
789 789
 		}
790 790
 
791 791
 		// Prevent being called twice
792
-		if( did_action( $zone.'_'.$view_id.'_widgets' ) ) {
793
-			do_action( 'gravityview_log_debug', sprintf( '%s - Not rendering %s; already rendered', __METHOD__ , $zone.'_'.$view_id.'_widgets' ) );
792
+		if (did_action($zone.'_'.$view_id.'_widgets')) {
793
+			do_action('gravityview_log_debug', sprintf('%s - Not rendering %s; already rendered', __METHOD__, $zone.'_'.$view_id.'_widgets'));
794 794
 			return;
795 795
 		}
796 796
 
@@ -798,17 +798,17 @@  discard block
 block discarded – undo
798 798
 		?>
799 799
 		<div class="gv-grid">
800 800
 			<?php
801
-			foreach( $rows as $row ) {
802
-				foreach( $row as $col => $areas ) {
801
+			foreach ($rows as $row) {
802
+				foreach ($row as $col => $areas) {
803 803
 					$column = ($col == '2-2') ? '1-2 gv-right' : $col.' gv-left';
804 804
 				?>
805
-					<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
805
+					<div class="gv-grid-col-<?php echo esc_attr($column); ?>">
806 806
 						<?php
807
-						if( !empty( $areas ) ) {
808
-							foreach( $areas as $area ) {
809
-								if( !empty( $widgets[ $zone .'_'. $area['areaid'] ] ) ) {
810
-									foreach( $widgets[ $zone .'_'. $area['areaid'] ] as $widget ) {
811
-										do_action( "gravityview_render_widget_{$widget['id']}", $widget );
807
+						if (!empty($areas)) {
808
+							foreach ($areas as $area) {
809
+								if (!empty($widgets[$zone.'_'.$area['areaid']])) {
810
+									foreach ($widgets[$zone.'_'.$area['areaid']] as $widget) {
811
+										do_action("gravityview_render_widget_{$widget['id']}", $widget);
812 812
 									}
813 813
 								}
814 814
 							}
@@ -824,8 +824,8 @@  discard block
 block discarded – undo
824 824
 		 * Prevent widgets from being called twice.
825 825
 		 * Checking for loop_start prevents themes and plugins that pre-process shortcodes from triggering the action before displaying. Like, ahem, the Divi theme and WordPress SEO plugin
826 826
 		 */
827
-		if( did_action( 'loop_start' ) ) {
828
-			do_action( $zone.'_'.$view_id.'_widgets' );
827
+		if (did_action('loop_start')) {
828
+			do_action($zone.'_'.$view_id.'_widgets');
829 829
 		}
830 830
 	}
831 831
 
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/delete-entry/fields/delete_link.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -4,21 +4,21 @@
 block discarded – undo
4 4
 
5 5
 $view_id = $gravityview_view->getViewId();
6 6
 
7
-extract( $gravityview_view->getCurrentField() );
7
+extract($gravityview_view->getCurrentField());
8 8
 
9 9
 // Only show the link to logged-in users with the rigth caps.
10
-if( !GravityView_Delete_Entry::check_user_cap_delete_entry( $entry, $field_settings ) ) {
10
+if (!GravityView_Delete_Entry::check_user_cap_delete_entry($entry, $field_settings)) {
11 11
 	return;
12 12
 }
13 13
 
14
-$link_text = empty( $field_settings['delete_link'] ) ? __('Delete Entry', 'gravityview') : $field_settings['delete_link'];
14
+$link_text = empty($field_settings['delete_link']) ? __('Delete Entry', 'gravityview') : $field_settings['delete_link'];
15 15
 
16
-$link_text = apply_filters( 'gravityview_entry_link', GravityView_API::replace_variables( $link_text, $form, $entry ) );
16
+$link_text = apply_filters('gravityview_entry_link', GravityView_API::replace_variables($link_text, $form, $entry));
17 17
 
18
-$href = GravityView_Delete_Entry::get_delete_link( $entry, $view_id );
18
+$href = GravityView_Delete_Entry::get_delete_link($entry, $view_id);
19 19
 
20 20
 $attributes = array(
21 21
 	'onclick' => GravityView_Delete_Entry::get_confirm_dialog()
22 22
 );
23 23
 
24
-echo gravityview_get_link( $href, $link_text, $attributes );
24
+echo gravityview_get_link($href, $link_text, $attributes);
Please login to merge, or discard this patch.
includes/extensions/edit-entry/fields/edit_link.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -4,19 +4,19 @@
 block discarded – undo
4 4
 
5 5
 $view_id = $gravityview_view->getViewId();
6 6
 
7
-extract( $gravityview_view->getCurrentField() );
7
+extract($gravityview_view->getCurrentField());
8 8
 
9 9
 // Only show the link to logged-in users.
10
-if( !GravityView_Edit_Entry::check_user_cap_edit_entry( $entry ) ) {
10
+if (!GravityView_Edit_Entry::check_user_cap_edit_entry($entry)) {
11 11
 	return;
12 12
 }
13 13
 
14
-$link_text = empty( $field_settings['edit_link'] ) ? __('Edit Entry', 'gravityview') : $field_settings['edit_link'];
14
+$link_text = empty($field_settings['edit_link']) ? __('Edit Entry', 'gravityview') : $field_settings['edit_link'];
15 15
 
16
-$link_atts = empty( $field_settings['new_window'] ) ? '' : 'target="_blank"';
16
+$link_atts = empty($field_settings['new_window']) ? '' : 'target="_blank"';
17 17
 
18
-$output = apply_filters( 'gravityview_entry_link', GravityView_API::replace_variables( $link_text, $form, $entry ) );
18
+$output = apply_filters('gravityview_entry_link', GravityView_API::replace_variables($link_text, $form, $entry));
19 19
 
20
-$href = GravityView_Edit_Entry::get_edit_link( $entry, $view_id );
20
+$href = GravityView_Edit_Entry::get_edit_link($entry, $view_id);
21 21
 
22
-echo gravityview_get_link( $href, $output, $link_atts );
22
+echo gravityview_get_link($href, $output, $link_atts);
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   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
      * @param array $entry The Gravity Forms entry
16 16
      * @param int $view_id The current View ID
17 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 );
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.
@@ -24,12 +24,12 @@  discard block
 block discarded – undo
24 24
 	 * @param array $entry The Gravity Forms entry
25 25
 	 * @param int $view_id The current View ID
26 26
 	 */
27
-	do_action( 'gravityview/edit-entry/publishing-action/before', $object->form, $object->entry, $object->view_id );
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
-	<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>
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
34 34
 
35 35
 	/**
@@ -39,9 +39,9 @@  discard block
 block discarded – undo
39 39
 	 * @param array $entry The Gravity Forms entry
40 40
 	 * @param int $view_id The current View ID
41 41
 	 */
42
-	do_action( 'gravityview/edit-entry/publishing-action/after', $object->form, $object->entry, $object->view_id );
42
+	do_action('gravityview/edit-entry/publishing-action/after', $object->form, $object->entry, $object->view_id);
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   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 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 11
 			var mysack = new sack("<?php echo admin_url("admin-ajax.php")?>");
12 12
 			mysack.execute = 1;
Please login to merge, or discard this patch.