Completed
Branch FET-8162-relation-exists (8f4753)
by
unknown
72:24 queued 63:17
created
caffeinated/EE_Caf_Messages.class.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
72 72
 	/**
73 73
 	 * This just allows us to add additional paths to the autoloader (EED_Messages::autoload_messages()) for the messages system.
74 74
 	 * @param  array  $dir_ref original array of paths
75
-	 * @return array           appended paths
75
+	 * @return string[]           appended paths
76 76
 	 */
77 77
 	public function messages_autoload_paths( $dir_ref ) {
78 78
 		$dir_ref[] = EE_CAF_LIBRARIES . 'shortcodes/';
Please login to merge, or discard this patch.
Spacing   +117 added lines, -117 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
  * @since            4.3.2
16 16
  * @author          Darren Ethier
17 17
  */
18
-class EE_Caf_Messages  {
18
+class EE_Caf_Messages {
19 19
 
20 20
 
21 21
 	/**
@@ -34,32 +34,32 @@  discard block
 block discarded – undo
34 34
 	 * @return void
35 35
 	 */
36 36
 	private function _caf_hooks() {
37
-		add_filter('FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array( $this, 'messages_autoload_paths'), 5 );
38
-		add_filter('FHEE__EE_Email_messenger__get_validator_config', array( $this, 'email_messenger_validator_config'), 5, 2 );
39
-		add_filter('FHEE__EE_Email_messenger__get_template_fields', array( $this, 'email_messenger_template_fields'), 5, 2 );
40
-		add_filter('FHEE__EE_Messages_Template_Pack__get_specific_template__contents', array( $this, 'new_default_templates'), 5, 7 );
41
-		add_filter('FHEE__EE_Messages_Base__get_valid_shortcodes', array( $this, 'message_types_valid_shortcodes'), 5, 2 );
37
+		add_filter('FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array($this, 'messages_autoload_paths'), 5);
38
+		add_filter('FHEE__EE_Email_messenger__get_validator_config', array($this, 'email_messenger_validator_config'), 5, 2);
39
+		add_filter('FHEE__EE_Email_messenger__get_template_fields', array($this, 'email_messenger_template_fields'), 5, 2);
40
+		add_filter('FHEE__EE_Messages_Template_Pack__get_specific_template__contents', array($this, 'new_default_templates'), 5, 7);
41
+		add_filter('FHEE__EE_Messages_Base__get_valid_shortcodes', array($this, 'message_types_valid_shortcodes'), 5, 2);
42 42
 
43 43
 		//shortcode parsers
44
-		add_filter('FHEE__EE_Attendee_Shortcodes__shortcodes', array( $this, 'additional_attendee_shortcodes'), 5, 2 );
45
-		add_filter('FHEE__EE_Attendee_Shortcodes__parser_after', array( $this, 'additional_attendee_parser'), 5, 5 );
46
-		add_filter('FHEE__EE_Recipient_List_Shortcodes__shortcodes', array( $this, 'additional_recipient_details_shortcodes'), 5, 2 );
47
-		add_filter('FHEE__EE_Recipient_List_Shortcodes__parser_after', array( $this, 'additional_recipient_details_parser'), 5, 5 );
48
-		add_filter('FHEE__EE_Primary_Registration_List_Shortcodes__shortcodes', array( $this, 'additional_primary_registration_details_shortcodes'), 5, 2 );
49
-		add_filter('FHEE__EE_Primary_Registration_List_Shortcodes__parser_after', array( $this, 'additional_primary_registration_details_parser'), 5, 5 );
44
+		add_filter('FHEE__EE_Attendee_Shortcodes__shortcodes', array($this, 'additional_attendee_shortcodes'), 5, 2);
45
+		add_filter('FHEE__EE_Attendee_Shortcodes__parser_after', array($this, 'additional_attendee_parser'), 5, 5);
46
+		add_filter('FHEE__EE_Recipient_List_Shortcodes__shortcodes', array($this, 'additional_recipient_details_shortcodes'), 5, 2);
47
+		add_filter('FHEE__EE_Recipient_List_Shortcodes__parser_after', array($this, 'additional_recipient_details_parser'), 5, 5);
48
+		add_filter('FHEE__EE_Primary_Registration_List_Shortcodes__shortcodes', array($this, 'additional_primary_registration_details_shortcodes'), 5, 2);
49
+		add_filter('FHEE__EE_Primary_Registration_List_Shortcodes__parser_after', array($this, 'additional_primary_registration_details_parser'), 5, 5);
50 50
 
51 51
 		/**
52 52
 		 * @since 4.2.0
53 53
 		 */
54
-		add_filter( 'FHEE__EE_Datetime_Shortcodes__shortcodes', array( $this, 'additional_datetime_shortcodes'), 10, 2 );
55
-		add_filter( 'FHEE__EE_Datetime_Shortcodes__parser_after', array( $this, 'additional_datetime_parser'), 10, 5 );
54
+		add_filter('FHEE__EE_Datetime_Shortcodes__shortcodes', array($this, 'additional_datetime_shortcodes'), 10, 2);
55
+		add_filter('FHEE__EE_Datetime_Shortcodes__parser_after', array($this, 'additional_datetime_parser'), 10, 5);
56 56
 
57 57
 		/**
58 58
 		 * @since 4.3.0
59 59
 		 */
60 60
 		//eat our own dogfood!
61
-		add_action('EE_Brewing_Regular___messages_caf', array( $this, 'register_caf_message_types' ) );
62
-		add_action('EE_Brewing_Regular___messages_caf', array( $this, 'register_caf_shortcodes' ) );
61
+		add_action('EE_Brewing_Regular___messages_caf', array($this, 'register_caf_message_types'));
62
+		add_action('EE_Brewing_Regular___messages_caf', array($this, 'register_caf_shortcodes'));
63 63
 		do_action('EE_Brewing_Regular___messages_caf');
64 64
 	}
65 65
 
@@ -70,14 +70,14 @@  discard block
 block discarded – undo
70 70
 	 * @param  array  $dir_ref original array of paths
71 71
 	 * @return array           appended paths
72 72
 	 */
73
-	public function messages_autoload_paths( $dir_ref ) {
74
-		$dir_ref[] = EE_CAF_LIBRARIES . 'shortcodes/';
73
+	public function messages_autoload_paths($dir_ref) {
74
+		$dir_ref[] = EE_CAF_LIBRARIES.'shortcodes/';
75 75
 		return $dir_ref;
76 76
 	}
77 77
 
78 78
 
79 79
 
80
-	public function email_messenger_validator_config( $validator_config, EE_Email_messenger $messenger ) {
80
+	public function email_messenger_validator_config($validator_config, EE_Email_messenger $messenger) {
81 81
 		$validator_config['attendee_list'] = array(
82 82
 				'shortcodes' => array('attendee', 'event_list', 'ticket_list', 'question_list'),
83 83
 				'required' => array('[ATTENDEE_LIST]')
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 
93 93
 
94 94
 
95
-	public function email_messenger_template_fields( $template_fields, EE_Email_messenger $messenger ) {
95
+	public function email_messenger_template_fields($template_fields, EE_Email_messenger $messenger) {
96 96
 		$template_fields['extra']['content']['question_list'] = array(
97 97
 						'input' => 'textarea',
98 98
 						'label' => '[QUESTION_LIST]',
@@ -109,39 +109,39 @@  discard block
 block discarded – undo
109 109
 
110 110
 
111 111
 
112
-	public function new_default_templates( $contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack  ) {
112
+	public function new_default_templates($contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack) {
113 113
 
114 114
 		//we're only modifying templates for the default template pack
115
-		if ( ! $template_pack instanceof EE_Messages_Template_Pack_Default ) {
115
+		if ( ! $template_pack instanceof EE_Messages_Template_Pack_Default) {
116 116
 			return $contents;
117 117
 		}
118 118
 
119 119
 		//the template file name we're replacing contents for.
120
-		$template_file_prefix = $field . '_' . $context;
121
-		$msg_prefix = $messenger->name . '_' . $message_type->name . '_' ;
120
+		$template_file_prefix = $field.'_'.$context;
121
+		$msg_prefix = $messenger->name.'_'.$message_type->name.'_';
122 122
 
123
-		$base_path = EE_CAF_LIBRARIES . 'messages/defaults/default/';
123
+		$base_path = EE_CAF_LIBRARIES.'messages/defaults/default/';
124 124
 
125
-		if ( $messenger->name == 'email' && $message_type->name == 'registration' ) {
125
+		if ($messenger->name == 'email' && $message_type->name == 'registration') {
126 126
 
127
-			switch ( $template_file_prefix ) {
127
+			switch ($template_file_prefix) {
128 128
 
129 129
 				case 'question_list_admin' :
130 130
 				case 'question_list_attendee' :
131 131
 				case 'question_list_primary_attendee' :
132
-					$path = $base_path . $msg_prefix . 'question_list.template.php';
133
-					$contents = EEH_Template::display_template( $path, array(), true );
132
+					$path = $base_path.$msg_prefix.'question_list.template.php';
133
+					$contents = EEH_Template::display_template($path, array(), true);
134 134
 					break;
135 135
 
136 136
 				case 'attendee_list_primary_attendee' :
137
-					$path = $base_path . $msg_prefix . 'attendee_list.template.php';
138
-					$contents = EEH_Template::display_template( $path, array(), true );
137
+					$path = $base_path.$msg_prefix.'attendee_list.template.php';
138
+					$contents = EEH_Template::display_template($path, array(), true);
139 139
 					break;
140 140
 
141 141
 				case 'attendee_list_admin' :
142
-					$path = $base_path . $msg_prefix . 'attendee_list_admin.template.php';
143
-					$contents = EEH_Template::display_template( $path,
144
-						array(), true );
142
+					$path = $base_path.$msg_prefix.'attendee_list_admin.template.php';
143
+					$contents = EEH_Template::display_template($path,
144
+						array(), true);
145 145
 					break;
146 146
 
147 147
 				case 'attendee_list_attendee' :
@@ -149,26 +149,26 @@  discard block
 block discarded – undo
149 149
 					break;
150 150
 
151 151
 				case 'event_list_attendee' :
152
-					$path = $base_path . $msg_prefix . 'event_list_attendee.template.php';
153
-					$contents = EEH_Template::display_template( $path, array(), true );
152
+					$path = $base_path.$msg_prefix.'event_list_attendee.template.php';
153
+					$contents = EEH_Template::display_template($path, array(), true);
154 154
 					break;
155 155
 			}
156
-		} elseif ( $messenger->name == 'email' && $message_type->name == 'newsletter' ) {
157
-			switch( $template_file_prefix ) {
156
+		} elseif ($messenger->name == 'email' && $message_type->name == 'newsletter') {
157
+			switch ($template_file_prefix) {
158 158
 
159 159
 				case 'content_attendee' :
160
-					$path = $base_path . $msg_prefix . 'content.template.php';
161
-					$contents = EEH_Template::display_template( $path, array(), true );
160
+					$path = $base_path.$msg_prefix.'content.template.php';
161
+					$contents = EEH_Template::display_template($path, array(), true);
162 162
 					break;
163 163
 
164 164
 				case 'newsletter_content_attendee' :
165
-					$path = $base_path . $msg_prefix . 'newsletter_content.template.php';
166
-					$contents = EEH_Template::display_template( $path, array(), true );
165
+					$path = $base_path.$msg_prefix.'newsletter_content.template.php';
166
+					$contents = EEH_Template::display_template($path, array(), true);
167 167
 					break;
168 168
 
169 169
 				case 'newsletter_subject_attendee' :
170
-					$path = $base_path . $msg_prefix . 'subject.template.php';
171
-					$contents = EEH_Template::display_template( $path, array(), true );
170
+					$path = $base_path.$msg_prefix.'subject.template.php';
171
+					$contents = EEH_Template::display_template($path, array(), true);
172 172
 					break;
173 173
 			}
174 174
 		}
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 
180 180
 
181 181
 
182
-	public function message_types_valid_shortcodes( $valid_shortcodes, EE_Messages_Base $msg ) {
182
+	public function message_types_valid_shortcodes($valid_shortcodes, EE_Messages_Base $msg) {
183 183
 		//make sure question_list and question are ONLY added for the core message types.  Any other message types will have to explicitly set question_list as a valid shortcode.
184 184
 		$include_with = array(
185 185
 			'registration',
@@ -193,9 +193,9 @@  discard block
 block discarded – undo
193 193
 			'payment_reminder',
194 194
 			'pending_approval'
195 195
 			);
196
-		if ( $msg instanceof EE_message_type && in_array( $msg->name, $include_with )) {
196
+		if ($msg instanceof EE_message_type && in_array($msg->name, $include_with)) {
197 197
 			$contexts = array_keys($msg->get_contexts());
198
-				foreach ( $contexts as $context ) {
198
+				foreach ($contexts as $context) {
199 199
 					$valid_shortcodes[$context][] = 'question_list';
200 200
 					$valid_shortcodes[$context][] = 'question';
201 201
 				}
@@ -207,35 +207,35 @@  discard block
 block discarded – undo
207 207
 
208 208
 
209 209
 
210
-	public function additional_attendee_shortcodes( $shortcodes, $shortcode_parser ) {
210
+	public function additional_attendee_shortcodes($shortcodes, $shortcode_parser) {
211 211
 		$shortcodes['[ANSWER_*]'] = __('This is a special dynamic shortcode. Right after the "*", add the exact text of a existing question, and if there is an answer for that question for this registrant, that will take the place of this shortcode.', 'event_espresso');
212 212
 		return $shortcodes;
213 213
 	}
214 214
 
215 215
 
216 216
 
217
-	public function additional_attendee_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
217
+	public function additional_attendee_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser) {
218 218
 
219
-		if ( strpos( $shortcode, '[ANSWER_*' ) === FALSE || !isset( $extra_data['data']->questions) || !isset( $extra_data['data']->registrations) )
219
+		if (strpos($shortcode, '[ANSWER_*') === FALSE || ! isset($extra_data['data']->questions) || ! isset($extra_data['data']->registrations))
220 220
 			return $parsed;
221 221
 
222 222
 		//let's get the question from the code.
223 223
 		$shortcode = str_replace('[ANSWER_*', '', $shortcode);
224
-		$shortcode = trim( str_replace(']', '', $shortcode) );
224
+		$shortcode = trim(str_replace(']', '', $shortcode));
225 225
 
226 226
 		$registration = $data instanceof EE_Registration ? $data : null;
227
-		$registration = ! $registration instanceof EE_Registration && is_array( $extra_data ) && isset( $extra_data['data'] ) && $extra_data['data'] instanceof EE_Registration ? $extra_data['data'] : $registration;
227
+		$registration = ! $registration instanceof EE_Registration && is_array($extra_data) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Registration ? $extra_data['data'] : $registration;
228 228
 
229 229
 		$aee = $data instanceof EE_Messages_Addressee ? $data : null;
230
-		$aee = ! $aee instanceof EE_Messages_Adressee && is_array( $extra_data ) && isset( $extra_data['data'] ) ? $extra_data['data'] : $aee;
230
+		$aee = ! $aee instanceof EE_Messages_Adressee && is_array($extra_data) && isset($extra_data['data']) ? $extra_data['data'] : $aee;
231 231
 
232
-		if ( ! $registration instanceof EE_Registration || ! $aee instanceof EE_Messages_Addressee ) {
232
+		if ( ! $registration instanceof EE_Registration || ! $aee instanceof EE_Messages_Addressee) {
233 233
 			return $parsed;
234 234
 		}
235 235
 
236 236
 		//now let's figure out which question has this text.
237
-		foreach ( $aee->questions as $ansid => $question ) {
238
-			if ( $question->get('QST_display_text') == $shortcode && isset($aee->registrations[$registration->ID()]['ans_objs'][$ansid]) )
237
+		foreach ($aee->questions as $ansid => $question) {
238
+			if ($question->get('QST_display_text') == $shortcode && isset($aee->registrations[$registration->ID()]['ans_objs'][$ansid]))
239 239
 				return $aee->registrations[$registration->ID()]['ans_objs'][$ansid]->get_pretty('ANS_value', 'no_wpautop');
240 240
 		}
241 241
 
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
 	 * @return array                   						array of shortcodes and
257 257
 	 *                                             			descriptions
258 258
 	 */
259
-	public function additional_datetime_shortcodes( $shortcodes, $shortcode_parser ) {
259
+	public function additional_datetime_shortcodes($shortcodes, $shortcode_parser) {
260 260
 		$shortcodes['[DTT_NAME]'] = __('This will be parsed to the Title given for a Datetime', 'event_espresso');
261 261
 		$shortcodes['[DTT_DESCRIPTION]'] = __('This will be parsed to the description for a Datetime', 'event_espresso');
262 262
 		$shortcodes['[DTT_NAME_OR_DATES]'] = __('When parsed, if the Datetime has a name, it is used, otherwise a formatted string including the start date and end date will be used.', 'event_espresso');
@@ -278,13 +278,13 @@  discard block
 block discarded – undo
278 278
 	 * @param  EE_Datetime_Shortcodes $shortcode_parser
279 279
 	 * @return string                   The new parsed string.
280 280
 	 */
281
-	public function additional_datetime_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
281
+	public function additional_datetime_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser) {
282 282
 
283
-		if ( ! $data instanceof EE_Datetime ) {
283
+		if ( ! $data instanceof EE_Datetime) {
284 284
 			return ''; //get out because we can only parse with the datetime object.
285 285
 		}
286 286
 
287
-		switch ( $shortcode ) {
287
+		switch ($shortcode) {
288 288
 			case '[DTT_NAME]' :
289 289
 				return $data->name();
290 290
 				break;
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 				return $data->description();
293 293
 				break;
294 294
 			case '[DTT_NAME_OR_DATES]' :
295
-				return $data->get_dtt_display_name( TRUE );
295
+				return $data->get_dtt_display_name(TRUE);
296 296
 				break;
297 297
 			default :
298 298
 				return $parsed;
@@ -304,43 +304,43 @@  discard block
 block discarded – undo
304 304
 
305 305
 
306 306
 
307
-	public function additional_recipient_details_shortcodes( $shortcodes, $shortcode_parser ) {
307
+	public function additional_recipient_details_shortcodes($shortcodes, $shortcode_parser) {
308 308
 		$shortcodes['[RECIPIENT_QUESTION_LIST]'] = __('This is used to indicate where you want the list of questions and answers to show for the person receiving the message.', 'event_espresso');
309 309
 		return $shortcodes;
310 310
 	}
311 311
 
312 312
 
313
-	public function additional_recipient_details_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
313
+	public function additional_recipient_details_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser) {
314 314
 
315
-		if ( array($data) && ! isset( $data['data'] ) )
315
+		if (array($data) && ! isset($data['data']))
316 316
 			return $parsed;
317 317
 
318 318
 		$recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : NULL;
319
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset( $extra_data['data'] ) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
319
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
320 320
 
321
-		if ( ! $recipient instanceof EE_Messages_Addressee )
321
+		if ( ! $recipient instanceof EE_Messages_Addressee)
322 322
 			return $parsed;
323 323
 
324 324
 		$send_data = ! $data['data'] instanceof EE_Messages_Addressee ? $extra_data : $data;
325 325
 
326
-		switch ( $shortcode ) {
326
+		switch ($shortcode) {
327 327
 			case '[RECIPIENT_QUESTION_LIST]' :
328
-				if ( ! $recipient->reg_obj instanceof EE_Registration || ! $recipient->att_obj instanceof EE_Attendee )
328
+				if ( ! $recipient->reg_obj instanceof EE_Registration || ! $recipient->att_obj instanceof EE_Attendee)
329 329
 					return '';
330 330
 
331 331
 				$registration = $recipient->reg_obj;
332 332
 				$attendee = $recipient->att_obj;
333
-				$template = is_array($data['template'] ) && isset($data['template']['question_list']) ? $data['template']['question_list'] : $extra_data['template']['question_list'];
333
+				$template = is_array($data['template']) && isset($data['template']['question_list']) ? $data['template']['question_list'] : $extra_data['template']['question_list'];
334 334
 				$valid_shortcodes = array('question');
335 335
 				$shortcode_helper = $shortcode_parser->get_shortcode_helper();
336
-				$answers = !empty($recipient->registrations[$registration->ID()]['ans_objs']) ? $recipient->registrations[$registration->ID()]['ans_objs'] : array();
336
+				$answers = ! empty($recipient->registrations[$registration->ID()]['ans_objs']) ? $recipient->registrations[$registration->ID()]['ans_objs'] : array();
337 337
 				$question_list = '';
338
-				foreach ( $answers as $answer ) {
338
+				foreach ($answers as $answer) {
339 339
 					$question = $answer->question();
340
-					if ( $question instanceof EE_Question and $question->admin_only() ) {
340
+					if ($question instanceof EE_Question and $question->admin_only()) {
341 341
 						continue;
342 342
 					}
343
-					$question_list .= $shortcode_helper->parse_question_list_template( $template, $answer, $valid_shortcodes, $send_data);
343
+					$question_list .= $shortcode_helper->parse_question_list_template($template, $answer, $valid_shortcodes, $send_data);
344 344
 				}
345 345
 				return $question_list;
346 346
 				break;
@@ -352,41 +352,41 @@  discard block
 block discarded – undo
352 352
 	}
353 353
 
354 354
 
355
-	public function additional_primary_registration_details_shortcodes( $shortcodes, $shortcode_parser ) {
355
+	public function additional_primary_registration_details_shortcodes($shortcodes, $shortcode_parser) {
356 356
 		$shortcodes['[PRIMARY_REGISTRANT_QUESTION_LIST]'] = __('This is used to indicate the questions and answers for the primary_registrant. It should be placed in the "[attendee_list]" field', 'event_espresso');
357 357
 		return $shortcodes;
358 358
 	}
359 359
 
360 360
 
361
-	public function additional_primary_registration_details_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
362
-		if ( array($data) && ! isset( $data['data'] ) )
361
+	public function additional_primary_registration_details_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser) {
362
+		if (array($data) && ! isset($data['data']))
363 363
 			return $parsed;
364 364
 
365 365
 		$recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : NULL;
366
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset( $extra_data['data'] ) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
366
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
367 367
 
368
-		if ( ! $recipient instanceof EE_Messages_Addressee )
368
+		if ( ! $recipient instanceof EE_Messages_Addressee)
369 369
 			return $parsed;
370 370
 
371 371
 		$send_data = ! $data['data'] instanceof EE_Messages_Addressee ? $extra_data : $data;
372 372
 
373
-		switch ( $shortcode ) {
373
+		switch ($shortcode) {
374 374
 			case '[RECIPIENT_QUESTION_LIST]' :
375
-				if ( ! $recipient->primary_att_obj instanceof EE_Attendee || ! $recipient->primary_reg_obj instanceof EE_Registration )
375
+				if ( ! $recipient->primary_att_obj instanceof EE_Attendee || ! $recipient->primary_reg_obj instanceof EE_Registration)
376 376
 					return '';
377 377
 				$attendee = $recipient->primary_att_obj;
378 378
 				$registration = $recipient->primary_reg_obj;
379
-				$template = is_array($data['template'] ) && isset($data['template']['question_list']) ? $data['template']['question_list'] : $extra_data['template']['question_list'];
379
+				$template = is_array($data['template']) && isset($data['template']['question_list']) ? $data['template']['question_list'] : $extra_data['template']['question_list'];
380 380
 				$valid_shortcodes = array('question');
381 381
 				$shortcode_helper = $shortcode_parser->get_shortcode_helper();
382 382
 				$answers = $recipient->registrations[$registration->ID()]['ans_objs'];
383 383
 				$question_list = '';
384
-				foreach ( $answers as $answer ) {
384
+				foreach ($answers as $answer) {
385 385
 					$question = $answer->question();
386
-					if ( $question instanceof EE_Question and $question->admin_only() ) {
386
+					if ($question instanceof EE_Question and $question->admin_only()) {
387 387
 						continue;
388 388
 					}
389
-					$question_list .= $shortcode_helper->parse_question_list_template( $template, $answer, $valid_shortcodes, $send_data);
389
+					$question_list .= $shortcode_helper->parse_question_list_template($template, $answer, $valid_shortcodes, $send_data);
390 390
 				}
391 391
 				return $question_list;
392 392
 				break;
@@ -411,67 +411,67 @@  discard block
 block discarded – undo
411 411
 		$setup_args = array(
412 412
 			'mtfilename' => 'EE_Newsletter_message_type.class.php',
413 413
 			'autoloadpaths' => array(
414
-				EE_CAF_LIBRARIES . 'messages/message_type/newsletter/'
414
+				EE_CAF_LIBRARIES.'messages/message_type/newsletter/'
415 415
 				),
416
-			'messengers_to_activate_with' => array( 'email' ),
417
-			'messengers_to_validate_with' => array( 'email' )
416
+			'messengers_to_activate_with' => array('email'),
417
+			'messengers_to_validate_with' => array('email')
418 418
 			);
419
-		EE_Register_Message_Type::register( 'newsletter', $setup_args );
419
+		EE_Register_Message_Type::register('newsletter', $setup_args);
420 420
 
421 421
 		//register payment reminder message type
422 422
 		$setup_args = array(
423 423
 			'mtfilename' => 'EE_Payment_Reminder_message_type.class.php',
424
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/payment_reminder/' ),
425
-			'messengers_to_activate_with' => array( 'email' ),
426
-			'messengers_to_validate_with' => array( 'email' )
424
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/payment_reminder/'),
425
+			'messengers_to_activate_with' => array('email'),
426
+			'messengers_to_validate_with' => array('email')
427 427
 			);
428
-		EE_Register_Message_Type::register( 'payment_reminder', $setup_args );
428
+		EE_Register_Message_Type::register('payment_reminder', $setup_args);
429 429
 
430 430
 		//register payment declined message type
431 431
 		$setup_args = array(
432 432
 			'mtfilename' => 'EE_Payment_Declined_message_type.class.php',
433
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/payment_declined/' ),
434
-			'messengers_to_activate_with' => array( 'email' ),
435
-			'messengers_to_validate_with' => array( 'email' )
433
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/payment_declined/'),
434
+			'messengers_to_activate_with' => array('email'),
435
+			'messengers_to_validate_with' => array('email')
436 436
 			);
437
-		EE_Register_Message_Type::register( 'payment_declined', $setup_args );
437
+		EE_Register_Message_Type::register('payment_declined', $setup_args);
438 438
 
439 439
 		//register registration declined message type
440 440
 		$setup_args = array(
441 441
 			'mtfilename' => 'EE_Declined_Registration_message_type.class.php',
442
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/declined_registration/' ),
443
-			'messengers_to_activate_with' => array( 'email' ),
444
-			'messengers_to_validate_with' => array( 'email' )
442
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/declined_registration/'),
443
+			'messengers_to_activate_with' => array('email'),
444
+			'messengers_to_validate_with' => array('email')
445 445
 			);
446
-		EE_Register_Message_Type::register( 'declined_registration', $setup_args );
446
+		EE_Register_Message_Type::register('declined_registration', $setup_args);
447 447
 
448 448
 		//register registration cancelled message type
449 449
 		$setup_args = array(
450 450
 			'mtfilename' => 'EE_Cancelled_Registration_message_type.class.php',
451
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/cancelled_registration/' ),
452
-			'messengers_to_activate_with' => array( 'email' ),
453
-			'messengers_to_validate_with' => array( 'email' )
451
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/cancelled_registration/'),
452
+			'messengers_to_activate_with' => array('email'),
453
+			'messengers_to_validate_with' => array('email')
454 454
 			);
455
-		EE_Register_Message_Type::register( 'cancelled_registration', $setup_args );
455
+		EE_Register_Message_Type::register('cancelled_registration', $setup_args);
456 456
 
457 457
 
458 458
 		//register payment failed message type
459 459
 		$setup_args = array(
460 460
 			'mtfilename' => 'EE_Payment_Failed_message_type.class.php',
461
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/payment_failed/' ),
462
-			'messengers_to_activate_with' => array( 'email' ),
463
-			'messengers_to_validate_with' => array( 'email' )
461
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/payment_failed/'),
462
+			'messengers_to_activate_with' => array('email'),
463
+			'messengers_to_validate_with' => array('email')
464 464
 			);
465
-		EE_Register_Message_Type::register( 'payment_failed', $setup_args );
465
+		EE_Register_Message_Type::register('payment_failed', $setup_args);
466 466
 
467 467
 		//register payment declined message type
468 468
 		$setup_args = array(
469 469
 			'mtfilename' => 'EE_Payment_Cancelled_message_type.class.php',
470
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/payment_cancelled/' ),
471
-			'messengers_to_activate_with' => array( 'email' ),
472
-			'messengers_to_validate_with' => array( 'email' )
470
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/payment_cancelled/'),
471
+			'messengers_to_activate_with' => array('email'),
472
+			'messengers_to_validate_with' => array('email')
473 473
 			);
474
-		EE_Register_Message_Type::register( 'payment_cancelled', $setup_args );
474
+		EE_Register_Message_Type::register('payment_cancelled', $setup_args);
475 475
 	}
476 476
 
477 477
 
@@ -487,12 +487,12 @@  discard block
 block discarded – undo
487 487
 	public function register_caf_shortcodes() {
488 488
 		$setup_args = array(
489 489
 			'autoloadpaths' => array(
490
-				EE_CAF_LIBRARIES . 'shortcodes/'
490
+				EE_CAF_LIBRARIES.'shortcodes/'
491 491
 				),
492
-			'msgr_validator_callback' => array( 'EE_Newsletter_Shortcodes', 'messenger_validator_config' ),
493
-			'msgr_template_fields_callback' => array( 'EE_Newsletter_Shortcodes', 'messenger_template_fields' ),
494
-			'list_type_shortcodes' => array( '[NEWSLETTER_CONTENT]' )
492
+			'msgr_validator_callback' => array('EE_Newsletter_Shortcodes', 'messenger_validator_config'),
493
+			'msgr_template_fields_callback' => array('EE_Newsletter_Shortcodes', 'messenger_template_fields'),
494
+			'list_type_shortcodes' => array('[NEWSLETTER_CONTENT]')
495 495
 			);
496
-		EE_Register_Messages_Shortcode_Library::register( 'newsletter', $setup_args );
496
+		EE_Register_Messages_Shortcode_Library::register('newsletter', $setup_args);
497 497
 	}
498 498
 }
Please login to merge, or discard this patch.
Braces   +27 added lines, -17 removed lines patch added patch discarded remove patch
@@ -5,7 +5,9 @@  discard block
 block discarded – undo
5 5
  * @subpackage plugin api, messages
6 6
  * @since           4.3.2
7 7
  */
8
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
8
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
9
+	exit('No direct script access allowed');
10
+}
9 11
 
10 12
 /**
11 13
  * Used to initialize all EE messages caffeianted functionality.
@@ -216,8 +218,9 @@  discard block
 block discarded – undo
216 218
 
217 219
 	public function additional_attendee_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
218 220
 
219
-		if ( strpos( $shortcode, '[ANSWER_*' ) === FALSE || !isset( $extra_data['data']->questions) || !isset( $extra_data['data']->registrations) )
220
-			return $parsed;
221
+		if ( strpos( $shortcode, '[ANSWER_*' ) === FALSE || !isset( $extra_data['data']->questions) || !isset( $extra_data['data']->registrations) ) {
222
+					return $parsed;
223
+		}
221 224
 
222 225
 		//let's get the question from the code.
223 226
 		$shortcode = str_replace('[ANSWER_*', '', $shortcode);
@@ -235,8 +238,9 @@  discard block
 block discarded – undo
235 238
 
236 239
 		//now let's figure out which question has this text.
237 240
 		foreach ( $aee->questions as $ansid => $question ) {
238
-			if ( $question->get('QST_display_text') == $shortcode && isset($aee->registrations[$registration->ID()]['ans_objs'][$ansid]) )
239
-				return $aee->registrations[$registration->ID()]['ans_objs'][$ansid]->get_pretty('ANS_value', 'no_wpautop');
241
+			if ( $question->get('QST_display_text') == $shortcode && isset($aee->registrations[$registration->ID()]['ans_objs'][$ansid]) ) {
242
+							return $aee->registrations[$registration->ID()]['ans_objs'][$ansid]->get_pretty('ANS_value', 'no_wpautop');
243
+			}
240 244
 		}
241 245
 
242 246
 		//nothing!
@@ -312,21 +316,24 @@  discard block
 block discarded – undo
312 316
 
313 317
 	public function additional_recipient_details_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
314 318
 
315
-		if ( array($data) && ! isset( $data['data'] ) )
316
-			return $parsed;
319
+		if ( array($data) && ! isset( $data['data'] ) ) {
320
+					return $parsed;
321
+		}
317 322
 
318 323
 		$recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : NULL;
319 324
 		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset( $extra_data['data'] ) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
320 325
 
321
-		if ( ! $recipient instanceof EE_Messages_Addressee )
322
-			return $parsed;
326
+		if ( ! $recipient instanceof EE_Messages_Addressee ) {
327
+					return $parsed;
328
+		}
323 329
 
324 330
 		$send_data = ! $data['data'] instanceof EE_Messages_Addressee ? $extra_data : $data;
325 331
 
326 332
 		switch ( $shortcode ) {
327 333
 			case '[RECIPIENT_QUESTION_LIST]' :
328
-				if ( ! $recipient->reg_obj instanceof EE_Registration || ! $recipient->att_obj instanceof EE_Attendee )
329
-					return '';
334
+				if ( ! $recipient->reg_obj instanceof EE_Registration || ! $recipient->att_obj instanceof EE_Attendee ) {
335
+									return '';
336
+				}
330 337
 
331 338
 				$registration = $recipient->reg_obj;
332 339
 				$attendee = $recipient->att_obj;
@@ -359,21 +366,24 @@  discard block
 block discarded – undo
359 366
 
360 367
 
361 368
 	public function additional_primary_registration_details_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
362
-		if ( array($data) && ! isset( $data['data'] ) )
363
-			return $parsed;
369
+		if ( array($data) && ! isset( $data['data'] ) ) {
370
+					return $parsed;
371
+		}
364 372
 
365 373
 		$recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : NULL;
366 374
 		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset( $extra_data['data'] ) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
367 375
 
368
-		if ( ! $recipient instanceof EE_Messages_Addressee )
369
-			return $parsed;
376
+		if ( ! $recipient instanceof EE_Messages_Addressee ) {
377
+					return $parsed;
378
+		}
370 379
 
371 380
 		$send_data = ! $data['data'] instanceof EE_Messages_Addressee ? $extra_data : $data;
372 381
 
373 382
 		switch ( $shortcode ) {
374 383
 			case '[RECIPIENT_QUESTION_LIST]' :
375
-				if ( ! $recipient->primary_att_obj instanceof EE_Attendee || ! $recipient->primary_reg_obj instanceof EE_Registration )
376
-					return '';
384
+				if ( ! $recipient->primary_att_obj instanceof EE_Attendee || ! $recipient->primary_reg_obj instanceof EE_Registration ) {
385
+									return '';
386
+				}
377 387
 				$attendee = $recipient->primary_att_obj;
378 388
 				$registration = $recipient->primary_reg_obj;
379 389
 				$template = is_array($data['template'] ) && isset($data['template']['question_list']) ? $data['template']['question_list'] : $extra_data['template']['question_list'];
Please login to merge, or discard this patch.
caffeinated/modules/events_archive_caff/EED_Events_Archive_Caff.module.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@
 block discarded – undo
109 109
 	 *  @access 	public
110 110
 	 *  @param 	EE_Events_Archive_Config $CFG
111 111
 	 *  @param 	EE_Request_Handler $REQ
112
-	 *  @return 	void
112
+	 *  @return 	EE_Events_Archive_Config
113 113
 	 */
114 114
 	public static function update_template_settings( $CFG, $REQ ) {
115 115
 		$CFG->EED_Events_Archive = new EE_Events_Archive_Config();
Please login to merge, or discard this patch.
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	 * @return EED_Events_Archive_Caff
29 29
 	 */
30 30
 	public static function instance() {
31
-		return parent::get_instance( __CLASS__ );
31
+		return parent::get_instance(__CLASS__);
32 32
 	}
33 33
 
34 34
 
@@ -49,9 +49,9 @@  discard block
 block discarded – undo
49 49
 	 *  @return 	void
50 50
 	 */
51 51
 	public static function set_hooks_admin() {
52
-		define( 'EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
53
-		add_action( 'AHEE__template_settings__template__before_settings_form', array( 'EED_Events_Archive_Caff', 'template_settings_form' ), 10 );
54
-		add_filter( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', array( 'EED_Events_Archive_Caff', 'update_template_settings' ), 10, 2 );
52
+		define('EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
53
+		add_action('AHEE__template_settings__template__before_settings_form', array('EED_Events_Archive_Caff', 'template_settings_form'), 10);
54
+		add_filter('FHEE__General_Settings_Admin_Page__update_template_settings__data', array('EED_Events_Archive_Caff', 'update_template_settings'), 10, 2);
55 55
 	}
56 56
 
57 57
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	 * @param    WP $WP
65 65
 	 * @return    void
66 66
 	 */
67
-	public function run( $WP ) {
67
+	public function run($WP) {
68 68
 	}
69 69
 
70 70
 
@@ -79,13 +79,13 @@  discard block
 block discarded – undo
79 79
 	 */
80 80
 	public static function template_settings_form() {
81 81
 		// grab general settings admin page and remove the existing hook callback
82
-		$gen_set_admin = EE_Registry::instance()->LIB->EE_Admin_Page_Loader->get_admin_page_object( 'general_settings' );
83
-		if ( $gen_set_admin instanceof General_Settings_Admin_Page ) {
84
-			remove_action( 'AHEE__template_settings__template__before_settings_form', array( $gen_set_admin, 'template_settings_caff_features' ), 100 );
82
+		$gen_set_admin = EE_Registry::instance()->LIB->EE_Admin_Page_Loader->get_admin_page_object('general_settings');
83
+		if ($gen_set_admin instanceof General_Settings_Admin_Page) {
84
+			remove_action('AHEE__template_settings__template__before_settings_form', array($gen_set_admin, 'template_settings_caff_features'), 100);
85 85
 		}
86 86
 		$template_settings = EE_Registry::instance()->CFG->template_settings;
87
-		$template_settings->EED_Events_Archive = isset( $template_settings->EED_Events_Archive ) ? $template_settings->EED_Events_Archive : new EE_Events_Archive_Config();
88
-		$template_settings->EED_Events_Archive = apply_filters( 'FHEE__EED_Events_Archive__template_settings_form__event_list_config', $template_settings->EED_Events_Archive );
87
+		$template_settings->EED_Events_Archive = isset($template_settings->EED_Events_Archive) ? $template_settings->EED_Events_Archive : new EE_Events_Archive_Config();
88
+		$template_settings->EED_Events_Archive = apply_filters('FHEE__EED_Events_Archive__template_settings_form__event_list_config', $template_settings->EED_Events_Archive);
89 89
 		$events_archive_settings = array(
90 90
 			'display_status_banner' => 0,
91 91
 			'display_description' => 1,
@@ -94,8 +94,8 @@  discard block
 block discarded – undo
94 94
 			'display_venue' => 0,
95 95
 			'display_expired_events' => 0
96 96
 		);
97
-		$events_archive_settings = array_merge( $events_archive_settings, (array)$template_settings->EED_Events_Archive );
98
-		EEH_Template::display_template( EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH . 'admin-event-list-settings.template.php', $events_archive_settings );
97
+		$events_archive_settings = array_merge($events_archive_settings, (array) $template_settings->EED_Events_Archive);
98
+		EEH_Template::display_template(EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH.'admin-event-list-settings.template.php', $events_archive_settings);
99 99
 	}
100 100
 
101 101
 
@@ -111,16 +111,16 @@  discard block
 block discarded – undo
111 111
 	 *  @param 	EE_Request_Handler $REQ
112 112
 	 *  @return 	void
113 113
 	 */
114
-	public static function update_template_settings( $CFG, $REQ ) {
114
+	public static function update_template_settings($CFG, $REQ) {
115 115
 		$CFG->EED_Events_Archive = new EE_Events_Archive_Config();
116 116
 		// unless we are resetting the config...
117
-		if ( ! isset( $REQ['EED_Events_Archive_reset_event_list_settings'] ) || absint( $REQ['EED_Events_Archive_reset_event_list_settings'] ) !== 1 ) {
118
-			$CFG->EED_Events_Archive->display_status_banner = isset( $REQ['EED_Events_Archive_display_status_banner'] ) ? absint( $REQ['EED_Events_Archive_display_status_banner'] ) : 0;
119
-			$CFG->EED_Events_Archive->display_description = isset( $REQ['EED_Events_Archive_display_description'] ) ? absint( $REQ['EED_Events_Archive_display_description'] ) : 1;
120
-			$CFG->EED_Events_Archive->display_ticket_selector = isset( $REQ['EED_Events_Archive_display_ticket_selector'] ) ? absint( $REQ['EED_Events_Archive_display_ticket_selector'] ) : 0;
121
-			$CFG->EED_Events_Archive->display_datetimes = isset( $REQ['EED_Events_Archive_display_datetimes'] ) ? absint( $REQ['EED_Events_Archive_display_datetimes'] ) : 1;
122
-			$CFG->EED_Events_Archive->display_venue = isset( $REQ['EED_Events_Archive_display_venue'] ) ? absint( $REQ['EED_Events_Archive_display_venue'] ) : 0;
123
-			$CFG->EED_Events_Archive->display_expired_events = isset( $REQ['EED_Events_Archive_display_expired_events'] ) ? absint( $REQ['EED_Events_Archive_display_expired_events'] ) : 0;			}
117
+		if ( ! isset($REQ['EED_Events_Archive_reset_event_list_settings']) || absint($REQ['EED_Events_Archive_reset_event_list_settings']) !== 1) {
118
+			$CFG->EED_Events_Archive->display_status_banner = isset($REQ['EED_Events_Archive_display_status_banner']) ? absint($REQ['EED_Events_Archive_display_status_banner']) : 0;
119
+			$CFG->EED_Events_Archive->display_description = isset($REQ['EED_Events_Archive_display_description']) ? absint($REQ['EED_Events_Archive_display_description']) : 1;
120
+			$CFG->EED_Events_Archive->display_ticket_selector = isset($REQ['EED_Events_Archive_display_ticket_selector']) ? absint($REQ['EED_Events_Archive_display_ticket_selector']) : 0;
121
+			$CFG->EED_Events_Archive->display_datetimes = isset($REQ['EED_Events_Archive_display_datetimes']) ? absint($REQ['EED_Events_Archive_display_datetimes']) : 1;
122
+			$CFG->EED_Events_Archive->display_venue = isset($REQ['EED_Events_Archive_display_venue']) ? absint($REQ['EED_Events_Archive_display_venue']) : 0;
123
+			$CFG->EED_Events_Archive->display_expired_events = isset($REQ['EED_Events_Archive_display_expired_events']) ? absint($REQ['EED_Events_Archive_display_expired_events']) : 0; }
124 124
 		return $CFG;
125 125
 	}
126 126
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 /**
3 5
  * Event Espresso
4 6
  *
Please login to merge, or discard this patch.
caffeinated/modules/recaptcha/EED_Recaptcha.module.php 3 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
 	 * 	process_recaptcha
288 288
 	 *
289 289
 	 * 	@access private
290
-	 * 	@return 	boolean
290
+	 * 	@return 	boolean|null
291 291
 	 */
292 292
 	private static function _get_recaptcha_response() {
293 293
 		EED_Recaptcha::$_recaptcha_response = EE_Registry::instance()->REQ->get( 'g-recaptcha-response', false );
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
 	 *
575 575
 	 * @access public
576 576
 	 * @param EE_Registration_Config $EE_Registration_Config
577
-	 * @return array
577
+	 * @return EE_Registration_Config
578 578
 	 */
579 579
 	public static function update_admin_settings( EE_Registration_Config $EE_Registration_Config ) {
580 580
 		try {
Please login to merge, or discard this patch.
Spacing   +129 added lines, -130 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 	 * @return EED_Recaptcha
44 44
 	 */
45 45
 	public static function instance() {
46
-		return parent::get_instance( __CLASS__ );
46
+		return parent::get_instance(__CLASS__);
47 47
 	}
48 48
 
49 49
 
@@ -56,14 +56,14 @@  discard block
 block discarded – undo
56 56
 	 */
57 57
 	public static function set_hooks() {
58 58
 		// use_captcha ?
59
-		if ( EE_Registry::instance()->CFG->registration->use_captcha ) {
59
+		if (EE_Registry::instance()->CFG->registration->use_captcha) {
60 60
 			EED_Recaptcha::set_definitions();
61 61
 			EED_Recaptcha::enqueue_styles_and_scripts();
62
-			add_action( 'wp', array( 'EED_Recaptcha', 'set_late_hooks' ), 1, 0 );
63
-			add_action( 'AHEE__before_spco_whats_next_buttons', array( 'EED_Recaptcha', 'display_recaptcha' ), 10, 0 );
64
-			add_filter( 'FHEE__EED_Single_Page_Checkout__init___continue_reg', array( 'EED_Recaptcha', 'not_a_robot' ), 10 );
65
-			add_filter( 'FHEE__EE_SPCO_Reg_Step__set_completed___completed', array( 'EED_Recaptcha', 'not_a_robot' ), 10 );
66
-			add_filter( 'FHEE__EE_SPCO_JSON_Response___toString__JSON_response', array( 'EED_Recaptcha', 'recaptcha_response' ), 10, 1 );
62
+			add_action('wp', array('EED_Recaptcha', 'set_late_hooks'), 1, 0);
63
+			add_action('AHEE__before_spco_whats_next_buttons', array('EED_Recaptcha', 'display_recaptcha'), 10, 0);
64
+			add_filter('FHEE__EED_Single_Page_Checkout__init___continue_reg', array('EED_Recaptcha', 'not_a_robot'), 10);
65
+			add_filter('FHEE__EE_SPCO_Reg_Step__set_completed___completed', array('EED_Recaptcha', 'not_a_robot'), 10);
66
+			add_filter('FHEE__EE_SPCO_JSON_Response___toString__JSON_response', array('EED_Recaptcha', 'recaptcha_response'), 10, 1);
67 67
 		}
68 68
 	}
69 69
 
@@ -78,15 +78,15 @@  discard block
 block discarded – undo
78 78
 	public static function set_hooks_admin() {
79 79
 		EED_Recaptcha::set_definitions();
80 80
 		// use_captcha ?
81
-		if ( EE_Registry::instance()->CFG->registration->use_captcha ) {
81
+		if (EE_Registry::instance()->CFG->registration->use_captcha) {
82 82
 			EED_Recaptcha::enqueue_styles_and_scripts();
83
-			add_filter( 'FHEE__EED_Single_Page_Checkout__init___continue_reg', array( 'EED_Recaptcha', 'not_a_robot' ), 10 );
84
-			add_filter( 'FHEE__EE_SPCO_Reg_Step__set_completed___completed', array( 'EED_Recaptcha', 'not_a_robot' ), 10 );
85
-			add_filter( 'FHEE__EE_SPCO_JSON_Response___toString__JSON_response', array( 'EED_Recaptcha', 'recaptcha_response' ), 10, 1 );
83
+			add_filter('FHEE__EED_Single_Page_Checkout__init___continue_reg', array('EED_Recaptcha', 'not_a_robot'), 10);
84
+			add_filter('FHEE__EE_SPCO_Reg_Step__set_completed___completed', array('EED_Recaptcha', 'not_a_robot'), 10);
85
+			add_filter('FHEE__EE_SPCO_JSON_Response___toString__JSON_response', array('EED_Recaptcha', 'recaptcha_response'), 10, 1);
86 86
 		}
87 87
 		// admin settings
88
-		add_action( 'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template', array( 'EED_Recaptcha', 'admin_settings' ), 10, 1 );
89
-		add_filter( 'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration', array( 'EED_Recaptcha', 'update_admin_settings' ), 10, 1 );
88
+		add_action('AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template', array('EED_Recaptcha', 'admin_settings'), 10, 1);
89
+		add_filter('FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration', array('EED_Recaptcha', 'update_admin_settings'), 10, 1);
90 90
 	}
91 91
 
92 92
 
@@ -98,11 +98,11 @@  discard block
 block discarded – undo
98 98
 	 *  @return 	void
99 99
 	 */
100 100
 	public static function set_definitions() {
101
-		if ( is_user_logged_in() ) {
101
+		if (is_user_logged_in()) {
102 102
 			EED_Recaptcha::$_not_a_robot = true;
103 103
 		}
104
-		define( 'RECAPTCHA_BASE_PATH', rtrim( str_replace( array( '\\', '/' ), DS, plugin_dir_path( __FILE__ )), DS ) . DS );
105
-		define( 'RECAPTCHA_BASE_URL', plugin_dir_url( __FILE__ ));
104
+		define('RECAPTCHA_BASE_PATH', rtrim(str_replace(array('\\', '/'), DS, plugin_dir_path(__FILE__)), DS).DS);
105
+		define('RECAPTCHA_BASE_URL', plugin_dir_url(__FILE__));
106 106
 	}
107 107
 
108 108
 
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 	public static function set_late_hooks() {
117 117
 		add_filter(
118 118
 			'FHEE__Single_Page_Checkout__translate_js_strings__ajax_submit',
119
-			array( 'EED_Recaptcha', 'not_a_robot' )
119
+			array('EED_Recaptcha', 'not_a_robot')
120 120
 		);
121 121
 	}
122 122
 
@@ -129,11 +129,11 @@  discard block
 block discarded – undo
129 129
 	 *  @return 	void
130 130
 	 */
131 131
 	public static function enqueue_styles_and_scripts() {
132
-		wp_register_script( 'espresso_recaptcha', RECAPTCHA_BASE_URL . 'scripts' . DS . 'espresso_recaptcha.js', array( 'single_page_checkout' ), EVENT_ESPRESSO_VERSION, TRUE );
133
-		wp_register_script( 'google_recaptcha', 'https://www.google.com/recaptcha/api.js?hl=' . EE_Registry::instance()->CFG->registration->recaptcha_language, array( 'espresso_recaptcha' ), EVENT_ESPRESSO_VERSION, TRUE );
134
-		EE_Registry::$i18n_js_strings['no_SPCO_error'] = __( 'It appears the Single Page Checkout javascript was not loaded properly! Please refresh the page and try again or contact support.', 'event_espresso' );
135
-		EE_Registry::$i18n_js_strings['no_recaptcha_error'] = __( 'There appears to be a problem with the reCAPTCHA configuration! Please check the admin settings or contact support.', 'event_espresso' );
136
-		EE_Registry::$i18n_js_strings['recaptcha_fail'] = __( 'Please complete the anti-spam test before proceeding.', 'event_espresso' );
132
+		wp_register_script('espresso_recaptcha', RECAPTCHA_BASE_URL.'scripts'.DS.'espresso_recaptcha.js', array('single_page_checkout'), EVENT_ESPRESSO_VERSION, TRUE);
133
+		wp_register_script('google_recaptcha', 'https://www.google.com/recaptcha/api.js?hl='.EE_Registry::instance()->CFG->registration->recaptcha_language, array('espresso_recaptcha'), EVENT_ESPRESSO_VERSION, TRUE);
134
+		EE_Registry::$i18n_js_strings['no_SPCO_error'] = __('It appears the Single Page Checkout javascript was not loaded properly! Please refresh the page and try again or contact support.', 'event_espresso');
135
+		EE_Registry::$i18n_js_strings['no_recaptcha_error'] = __('There appears to be a problem with the reCAPTCHA configuration! Please check the admin settings or contact support.', 'event_espresso');
136
+		EE_Registry::$i18n_js_strings['recaptcha_fail'] = __('Please complete the anti-spam test before proceeding.', 'event_espresso');
137 137
 	}
138 138
 
139 139
 
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 	 * @access    public
145 145
 	 * @param \WP $WP
146 146
 	 */
147
-	public function run( $WP ) {
147
+	public function run($WP) {
148 148
 	}
149 149
 
150 150
 
@@ -154,8 +154,7 @@  discard block
 block discarded – undo
154 154
 	 *  @return boolean
155 155
 	 */
156 156
 	public static function not_a_robot() {
157
-		$not_a_robot = is_bool( EED_Recaptcha::$_not_a_robot ) ? EED_Recaptcha::$_not_a_robot :
158
-			EED_Recaptcha::recaptcha_passed();
157
+		$not_a_robot = is_bool(EED_Recaptcha::$_not_a_robot) ? EED_Recaptcha::$_not_a_robot : EED_Recaptcha::recaptcha_passed();
159 158
 		return $not_a_robot;
160 159
 	}
161 160
 
@@ -171,23 +170,23 @@  discard block
 block discarded – undo
171 170
 	 */
172 171
 	public static function display_recaptcha() {
173 172
 		// logged in means you have already passed a turing test of sorts
174
-		if ( is_user_logged_in() ) {
173
+		if (is_user_logged_in()) {
175 174
 			return;
176 175
 		}
177 176
 		// don't display if not using recaptcha or user is logged in
178
-		if ( EE_Registry::instance()->CFG->registration->use_captcha ) {
177
+		if (EE_Registry::instance()->CFG->registration->use_captcha) {
179 178
 			// only display if they have NOT passed the test yet
180
-			if ( ! EED_Recaptcha::$_not_a_robot ) {
181
-				EE_Registry::instance()->load_helper( 'Template' );
179
+			if ( ! EED_Recaptcha::$_not_a_robot) {
180
+				EE_Registry::instance()->load_helper('Template');
182 181
 				EEH_Template::display_template(
183
-					RECAPTCHA_BASE_PATH . DS . 'templates' . DS . 'recaptcha.template.php',
182
+					RECAPTCHA_BASE_PATH.DS.'templates'.DS.'recaptcha.template.php',
184 183
 					array(
185 184
 						'recaptcha_publickey' 	=> EE_Registry::instance()->CFG->registration->recaptcha_publickey,
186 185
 						'recaptcha_theme' 		=> EE_Registry::instance()->CFG->registration->recaptcha_theme,
187 186
 						'recaptcha_type' 			=> EE_Registry::instance()->CFG->registration->recaptcha_type
188 187
 					)
189 188
 				);
190
-				wp_enqueue_script( 'google_recaptcha' );
189
+				wp_enqueue_script('google_recaptcha');
191 190
 			}
192 191
 		}
193 192
 	}
@@ -205,17 +204,17 @@  discard block
 block discarded – undo
205 204
 	 */
206 205
 	public static function recaptcha_passed() {
207 206
 		// logged in means you have already passed a turing test of sorts
208
-		if ( is_user_logged_in() || EED_Recaptcha::_bypass_recaptcha() ) {
207
+		if (is_user_logged_in() || EED_Recaptcha::_bypass_recaptcha()) {
209 208
 			return TRUE;
210 209
 		}
211 210
 		// was test already passed?
212
-		$recaptcha_passed = EE_Registry::instance()->SSN->get_session_data( 'recaptcha_passed' );
213
-		$recaptcha_passed = filter_var( $recaptcha_passed, FILTER_VALIDATE_BOOLEAN );
211
+		$recaptcha_passed = EE_Registry::instance()->SSN->get_session_data('recaptcha_passed');
212
+		$recaptcha_passed = filter_var($recaptcha_passed, FILTER_VALIDATE_BOOLEAN);
214 213
 		// verify recaptcha
215 214
 		EED_Recaptcha::_get_recaptcha_response();
216
-		if ( ! $recaptcha_passed && EED_Recaptcha::$_recaptcha_response ) {
215
+		if ( ! $recaptcha_passed && EED_Recaptcha::$_recaptcha_response) {
217 216
 			$recaptcha_passed = EED_Recaptcha::_process_recaptcha_response();
218
-			EE_Registry::instance()->SSN->set_session_data( array( 'recaptcha_passed' => $recaptcha_passed ));
217
+			EE_Registry::instance()->SSN->set_session_data(array('recaptcha_passed' => $recaptcha_passed));
219 218
 			EE_Registry::instance()->SSN->update();
220 219
 		}
221 220
 		EED_Recaptcha::$_not_a_robot = $recaptcha_passed;
@@ -231,8 +230,8 @@  discard block
 block discarded – undo
231 230
 	 * @param array $recaptcha_response
232 231
 	 * @return boolean
233 232
 	 */
234
-	public static function recaptcha_response( $recaptcha_response = array() ) {
235
-		if ( EED_Recaptcha::_bypass_recaptcha() ) {
233
+	public static function recaptcha_response($recaptcha_response = array()) {
234
+		if (EED_Recaptcha::_bypass_recaptcha()) {
236 235
 			$recaptcha_response['bypass_recaptcha'] = TRUE;
237 236
 			$recaptcha_response['recaptcha_passed'] = TRUE;
238 237
 		} else {
@@ -252,16 +251,16 @@  discard block
 block discarded – undo
252 251
 	 */
253 252
 	private static function _bypass_recaptcha() {
254 253
 		// an array of key value pairs that must match exactly with the incoming request, in order to bypass recaptcha for the current request ONLY
255
-		$bypass_request_params_array = apply_filters( 'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array', array() );
254
+		$bypass_request_params_array = apply_filters('FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array', array());
256 255
 		// does $bypass_request_params_array have any values ?
257
-		if ( empty( $bypass_request_params_array )) {
256
+		if (empty($bypass_request_params_array)) {
258 257
 			return FALSE;
259 258
 		}
260 259
 		// initially set bypass to TRUE
261 260
 		$bypass_recaptcha = TRUE;
262
-		foreach ( $bypass_request_params_array as $key => $value ) {
261
+		foreach ($bypass_request_params_array as $key => $value) {
263 262
 			// if $key is not found or value doesn't match exactly, then toggle bypass to FALSE, otherwise carry over it's value. This way, one missed setting results in no bypass
264
-			$bypass_recaptcha = isset( $_REQUEST[ $key ] ) && $_REQUEST[ $key ] === $value ? $bypass_recaptcha : FALSE;
263
+			$bypass_recaptcha = isset($_REQUEST[$key]) && $_REQUEST[$key] === $value ? $bypass_recaptcha : FALSE;
265 264
 		}
266 265
 		return $bypass_recaptcha;
267 266
 	}
@@ -276,7 +275,7 @@  discard block
 block discarded – undo
276 275
 	 * 	@return 	boolean
277 276
 	 */
278 277
 	private static function _get_recaptcha_response() {
279
-		EED_Recaptcha::$_recaptcha_response = EE_Registry::instance()->REQ->get( 'g-recaptcha-response', false );
278
+		EED_Recaptcha::$_recaptcha_response = EE_Registry::instance()->REQ->get('g-recaptcha-response', false);
280 279
 	}
281 280
 
282 281
 
@@ -290,22 +289,22 @@  discard block
 block discarded – undo
290 289
 	 */
291 290
 	private static function _process_recaptcha_response() {
292 291
 		// verify library is loaded
293
-		if ( ! class_exists( 'ReCaptcha' )) {
294
-			require_once( RECAPTCHA_BASE_PATH . 'recaptchalib.php' );
292
+		if ( ! class_exists('ReCaptcha')) {
293
+			require_once(RECAPTCHA_BASE_PATH.'recaptchalib.php');
295 294
 		}
296 295
 		// The response from reCAPTCHA
297 296
 		EED_Recaptcha::_get_recaptcha_response();
298 297
 		$recaptcha_response = EED_Recaptcha::$_recaptcha_response;
299 298
 		// Was there a reCAPTCHA response?
300
-		if ( $recaptcha_response ) {
301
-			$reCaptcha = new ReCaptcha( EE_Registry::instance()->CFG->registration->recaptcha_privatekey );
299
+		if ($recaptcha_response) {
300
+			$reCaptcha = new ReCaptcha(EE_Registry::instance()->CFG->registration->recaptcha_privatekey);
302 301
 			$recaptcha_response = $reCaptcha->verifyResponse(
303 302
 				$_SERVER['REMOTE_ADDR'],
304 303
 				EED_Recaptcha::$_recaptcha_response
305 304
 			);
306 305
 		}
307 306
 		// sorry... it appears you can't read gibberish chicken scratches !!!
308
-		if ( $recaptcha_response instanceof ReCaptchaResponse && $recaptcha_response->success ) {
307
+		if ($recaptcha_response instanceof ReCaptchaResponse && $recaptcha_response->success) {
309 308
 			return TRUE;
310 309
 		}
311 310
 		return FALSE;
@@ -339,8 +338,8 @@  discard block
 block discarded – undo
339 338
 	 */
340 339
 	protected static function _recaptcha_settings_form() {
341 340
 
342
-		EE_Registry::instance()->load_helper( 'HTML' );
343
-		EE_Registry::instance()->load_helper( 'Template' );
341
+		EE_Registry::instance()->load_helper('HTML');
342
+		EE_Registry::instance()->load_helper('Template');
344 343
 
345 344
 		return new EE_Form_Section_Proper(
346 345
 			array(
@@ -350,12 +349,12 @@  discard block
 block discarded – undo
350 349
 				'subsections' 			=> apply_filters(
351 350
 					'FHEE__EED_Recaptcha___recaptcha_settings_form__form_subsections',
352 351
 					array(
353
-						'main_settings_hdr' 				=> new EE_Form_Section_HTML( EEH_HTML::h3( __( 'reCAPTCHA Anti-spam Settings', 'event_espresso' ) . EEH_Template::get_help_tab_link( 'recaptcha_info' ))),
352
+						'main_settings_hdr' 				=> new EE_Form_Section_HTML(EEH_HTML::h3(__('reCAPTCHA Anti-spam Settings', 'event_espresso').EEH_Template::get_help_tab_link('recaptcha_info'))),
354 353
 						'main_settings' 						=> EED_Recaptcha::_recaptcha_main_settings(),
355
-						'appearance_settings_hdr' 	=> new EE_Form_Section_HTML( EEH_HTML::h3( __( 'reCAPTCHA Appearance', 'event_espresso' ) )),
354
+						'appearance_settings_hdr' 	=> new EE_Form_Section_HTML(EEH_HTML::h3(__('reCAPTCHA Appearance', 'event_espresso'))),
356 355
 						'appearance_settings' 			=> EED_Recaptcha::_recaptcha_appearance_settings(),
357 356
 						// 'recaptcha_example' 				=> new EE_Form_Section_HTML( EED_Recaptcha::display_recaptcha() ),
358
-						'required_fields_note' 			=> new EE_Form_Section_HTML( EEH_HTML::p( __( 'All fields marked with a * are required fields', 'event_espresso' ), '', 'grey-text' ))
357
+						'required_fields_note' 			=> new EE_Form_Section_HTML(EEH_HTML::p(__('All fields marked with a * are required fields', 'event_espresso'), '', 'grey-text'))
359 358
 					)
360 359
 				)
361 360
 			)
@@ -382,28 +381,28 @@  discard block
 block discarded – undo
382 381
 					array(
383 382
 						'use_captcha' 				=> new EE_Yes_No_Input(
384 383
 							array(
385
-								'html_label_text'	 	=> __( 'Use reCAPTCHA', 'event_espresso' ),
384
+								'html_label_text'	 	=> __('Use reCAPTCHA', 'event_espresso'),
386 385
 								'html_help_text' 		=> sprintf(
387
-									__( 'reCAPTCHA is a free service that  protects your website from spam and abuse. It employs advanced risk analysis technology to separate humans from abusive actors. Sign up %1$shere%2$s to receive your Public and Private keys.', 'event_espresso' ),
386
+									__('reCAPTCHA is a free service that  protects your website from spam and abuse. It employs advanced risk analysis technology to separate humans from abusive actors. Sign up %1$shere%2$s to receive your Public and Private keys.', 'event_espresso'),
388 387
 									'<a href="https://www.google.com/recaptcha/intro/index.html">',
389 388
 									'</a>'
390 389
 								),
391
-								'default' 								=> isset( EE_Registry::instance()->CFG->registration->use_captcha ) ? EE_Registry::instance()->CFG->registration->use_captcha : FALSE,
390
+								'default' 								=> isset(EE_Registry::instance()->CFG->registration->use_captcha) ? EE_Registry::instance()->CFG->registration->use_captcha : FALSE,
392 391
 								'display_html_label_text' 	=> FALSE
393 392
 							)
394 393
 						),
395 394
 						'recaptcha_publickey' 		=> new EE_Text_Input(
396 395
 							array(
397
-								'html_label_text'	 	=> __( 'Site Key', 'event_espresso' ),
398
-								'html_help_text' 		=> __( 'The site key is used to display the widget on your site.', 'event_espresso' ),
399
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_publickey ) ? stripslashes( EE_Registry::instance()->CFG->registration->recaptcha_publickey ) : ''
396
+								'html_label_text'	 	=> __('Site Key', 'event_espresso'),
397
+								'html_help_text' 		=> __('The site key is used to display the widget on your site.', 'event_espresso'),
398
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_publickey) ? stripslashes(EE_Registry::instance()->CFG->registration->recaptcha_publickey) : ''
400 399
 							)
401 400
 						),
402 401
 						'recaptcha_privatekey' 		=> new EE_Text_Input(
403 402
 							array(
404
-								'html_label_text'	 	=> __( 'Secret Key', 'event_espresso' ),
405
-								'html_help_text' 		=> __( 'The secret key authorizes communication between your application backend and the reCAPTCHA server to verify the user\'s response. The secret key needs to be kept safe for security purposes.', 'event_espresso' ),
406
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_privatekey ) ? stripslashes( EE_Registry::instance()->CFG->registration->recaptcha_privatekey ) : ''
403
+								'html_label_text'	 	=> __('Secret Key', 'event_espresso'),
404
+								'html_help_text' 		=> __('The secret key authorizes communication between your application backend and the reCAPTCHA server to verify the user\'s response. The secret key needs to be kept safe for security purposes.', 'event_espresso'),
405
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_privatekey) ? stripslashes(EE_Registry::instance()->CFG->registration->recaptcha_privatekey) : ''
407 406
 							)
408 407
 						)
409 408
 					)
@@ -435,81 +434,81 @@  discard block
 block discarded – undo
435 434
 					array(
436 435
 						'recaptcha_theme' 		=> new EE_Radio_Button_Input(
437 436
 							array(
438
-								'light' => __( 'Light', 'event_espresso' ),
439
-								'dark' => __( 'Dark', 'event_espresso' )
437
+								'light' => __('Light', 'event_espresso'),
438
+								'dark' => __('Dark', 'event_espresso')
440 439
 							),
441 440
 							array(
442
-								'html_label_text'	 	=> __( 'Theme', 'event_espresso' ),
443
-								'html_help_text' 		=> __( 'The color theme of the widget.', 'event_espresso' ),
444
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_theme ) ? EE_Registry::instance()->CFG->registration->recaptcha_theme : 'light',
441
+								'html_label_text'	 	=> __('Theme', 'event_espresso'),
442
+								'html_help_text' 		=> __('The color theme of the widget.', 'event_espresso'),
443
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_theme) ? EE_Registry::instance()->CFG->registration->recaptcha_theme : 'light',
445 444
 								'display_html_label_text' => FALSE
446 445
 							)
447 446
 						),
448 447
 						'recaptcha_type' 		=> new EE_Radio_Button_Input(
449 448
 							array(
450
-								'image' => __( 'Image', 'event_espresso' ),
451
-								'audio' => __( 'Audio', 'event_espresso' )
449
+								'image' => __('Image', 'event_espresso'),
450
+								'audio' => __('Audio', 'event_espresso')
452 451
 							),
453 452
 							array(
454
-								'html_label_text'	 	=> __( 'Type', 'event_espresso' ),
455
-								'html_help_text' 		=> __( 'The type of CAPTCHA to serve.', 'event_espresso' ),
456
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_type ) ? EE_Registry::instance()->CFG->registration->recaptcha_type : 'image',
453
+								'html_label_text'	 	=> __('Type', 'event_espresso'),
454
+								'html_help_text' 		=> __('The type of CAPTCHA to serve.', 'event_espresso'),
455
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_type) ? EE_Registry::instance()->CFG->registration->recaptcha_type : 'image',
457 456
 								'display_html_label_text' =>FALSE
458 457
 							)
459 458
 						),
460 459
 						'recaptcha_language' 		=> new EE_Select_Input(
461 460
 							array(
462
-								 'ar' 			=> __( 'Arabic', 'event_espresso' ),
463
-								 'bg' 		=> __( 'Bulgarian', 'event_espresso' ),
464
-								 'ca' 			=> __( 'Catalan', 'event_espresso' ),
465
-								 'zh-CN' 	=>  __( 'Chinese (Simplified)', 'event_espresso' ),
466
-								 'zh-TW' 	=>  __( 'Chinese (Traditional)	', 'event_espresso' ),
467
-								 'hr' 			=> __( 'Croatian', 'event_espresso' ),
468
-								 'cs' 			=> __( 'Czech', 'event_espresso' ),
469
-								 'da' 			=> __( 'Danish', 'event_espresso' ),
470
-								 'nl' 			=> __( 'Dutch', 'event_espresso' ),
471
-								 'en-GB' 	=>  __( 'English (UK)', 'event_espresso' ),
472
-								 'en' 			=> __( 'English (US)', 'event_espresso' ),
473
-								 'fil' 			=> __( 'Filipino', 'event_espresso' ),
474
-								 'fi' 			=> __( 'Finnish', 'event_espresso' ),
475
-								 'fr' 			=> __( 'French', 'event_espresso' ),
476
-								 'fr-CA' 	=>  __( 'French (Canadian)', 'event_espresso' ),
477
-								 'de' 			=> __( 'German', 'event_espresso' ),
478
-								 'de-AT' 	=>  __( 'German (Austria)', 'event_espresso' ),
479
-								 'de-CH' 	=>  __( 'German (Switzerland)', 'event_espresso' ),
480
-								 'el' 			=> __( 'Greek', 'event_espresso' ),
481
-								 'iw' 			=> __( 'Hebrew', 'event_espresso' ),
482
-								 'hi' 			=> __( 'Hindi', 'event_espresso' ),
483
-								 'hu' 		=> __( 'Hungarian', 'event_espresso' ),
484
-								 'id' 			=> __( 'Indonesian', 'event_espresso' ),
485
-								 'it' 			=> __( 'Italian', 'event_espresso' ),
486
-								 'ja' 			=> __( 'Japanese', 'event_espresso' ),
487
-								 'ko' 			=> __( 'Korean', 'event_espresso' ),
488
-								 'lv' 			=> __( 'Latvian', 'event_espresso' ),
489
-								 'lt' 			=> __( 'Lithuanian', 'event_espresso' ),
490
-								 'no' 		=> __( 'Norwegian', 'event_espresso' ),
491
-								 'fa' 			=> __( 'Persian', 'event_espresso' ),
492
-								 'pl' 			=> __( 'Polish', 'event_espresso' ),
493
-								 'pt' 			=> __( 'Portuguese', 'event_espresso' ),
494
-								 'pt-BR' 	=>  __( 'Portuguese (Brazil)', 'event_espresso' ),
495
-								 'pt-PT' 	=>  __( 'Portuguese (Portugal)', 'event_espresso' ),
496
-								 'ro' 			=> __( 'Romanian', 'event_espresso' ),
497
-								 'ru' 			=> __( 'Russian', 'event_espresso' ),
498
-								 'sr' 			=> __( 'Serbian', 'event_espresso' ),
499
-								 'sk' 			=> __( 'Slovak', 'event_espresso' ),
500
-								 'sl' 			=> __( 'Slovenian', 'event_espresso' ),
501
-								 'es' 			=> __( 'Spanish', 'event_espresso' ),
502
-								 'es-419' 	=>  __( 'Spanish (Latin America)', 'event_espresso' ),
503
-								 'sv' 			=> __( 'Swedish', 'event_espresso' ),
504
-								 'th' 			=> __( 'Thai', 'event_espresso' ),
505
-								 'tr' 			=> __( 'Turkish', 'event_espresso' ),
506
-								 'uk' 			=> __( 'Ukrainian', 'event_espresso' ),
507
-								 'vi' 			=> __( 'Vietnamese', 'event_espresso')
461
+								 'ar' 			=> __('Arabic', 'event_espresso'),
462
+								 'bg' 		=> __('Bulgarian', 'event_espresso'),
463
+								 'ca' 			=> __('Catalan', 'event_espresso'),
464
+								 'zh-CN' 	=>  __('Chinese (Simplified)', 'event_espresso'),
465
+								 'zh-TW' 	=>  __('Chinese (Traditional)	', 'event_espresso'),
466
+								 'hr' 			=> __('Croatian', 'event_espresso'),
467
+								 'cs' 			=> __('Czech', 'event_espresso'),
468
+								 'da' 			=> __('Danish', 'event_espresso'),
469
+								 'nl' 			=> __('Dutch', 'event_espresso'),
470
+								 'en-GB' 	=>  __('English (UK)', 'event_espresso'),
471
+								 'en' 			=> __('English (US)', 'event_espresso'),
472
+								 'fil' 			=> __('Filipino', 'event_espresso'),
473
+								 'fi' 			=> __('Finnish', 'event_espresso'),
474
+								 'fr' 			=> __('French', 'event_espresso'),
475
+								 'fr-CA' 	=>  __('French (Canadian)', 'event_espresso'),
476
+								 'de' 			=> __('German', 'event_espresso'),
477
+								 'de-AT' 	=>  __('German (Austria)', 'event_espresso'),
478
+								 'de-CH' 	=>  __('German (Switzerland)', 'event_espresso'),
479
+								 'el' 			=> __('Greek', 'event_espresso'),
480
+								 'iw' 			=> __('Hebrew', 'event_espresso'),
481
+								 'hi' 			=> __('Hindi', 'event_espresso'),
482
+								 'hu' 		=> __('Hungarian', 'event_espresso'),
483
+								 'id' 			=> __('Indonesian', 'event_espresso'),
484
+								 'it' 			=> __('Italian', 'event_espresso'),
485
+								 'ja' 			=> __('Japanese', 'event_espresso'),
486
+								 'ko' 			=> __('Korean', 'event_espresso'),
487
+								 'lv' 			=> __('Latvian', 'event_espresso'),
488
+								 'lt' 			=> __('Lithuanian', 'event_espresso'),
489
+								 'no' 		=> __('Norwegian', 'event_espresso'),
490
+								 'fa' 			=> __('Persian', 'event_espresso'),
491
+								 'pl' 			=> __('Polish', 'event_espresso'),
492
+								 'pt' 			=> __('Portuguese', 'event_espresso'),
493
+								 'pt-BR' 	=>  __('Portuguese (Brazil)', 'event_espresso'),
494
+								 'pt-PT' 	=>  __('Portuguese (Portugal)', 'event_espresso'),
495
+								 'ro' 			=> __('Romanian', 'event_espresso'),
496
+								 'ru' 			=> __('Russian', 'event_espresso'),
497
+								 'sr' 			=> __('Serbian', 'event_espresso'),
498
+								 'sk' 			=> __('Slovak', 'event_espresso'),
499
+								 'sl' 			=> __('Slovenian', 'event_espresso'),
500
+								 'es' 			=> __('Spanish', 'event_espresso'),
501
+								 'es-419' 	=>  __('Spanish (Latin America)', 'event_espresso'),
502
+								 'sv' 			=> __('Swedish', 'event_espresso'),
503
+								 'th' 			=> __('Thai', 'event_espresso'),
504
+								 'tr' 			=> __('Turkish', 'event_espresso'),
505
+								 'uk' 			=> __('Ukrainian', 'event_espresso'),
506
+								 'vi' 			=> __('Vietnamese', 'event_espresso')
508 507
 							),
509 508
 							array(
510
-								'html_label_text'	 	=> __( 'Language', 'event_espresso' ),
511
-								'html_help_text' 		=> __( 'Forces the widget to render in a specific language.', 'event_espresso' ),
512
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_language ) ? EE_Registry::instance()->CFG->registration->recaptcha_language : 'en'
509
+								'html_label_text'	 	=> __('Language', 'event_espresso'),
510
+								'html_help_text' 		=> __('Forces the widget to render in a specific language.', 'event_espresso'),
511
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_language) ? EE_Registry::instance()->CFG->registration->recaptcha_language : 'en'
513 512
 							)
514 513
 						)
515 514
 					)
@@ -557,25 +556,25 @@  discard block
 block discarded – undo
557 556
 	 * @param EE_Registration_Config $EE_Registration_Config
558 557
 	 * @return array
559 558
 	 */
560
-	public static function update_admin_settings( EE_Registration_Config $EE_Registration_Config ) {
559
+	public static function update_admin_settings(EE_Registration_Config $EE_Registration_Config) {
561 560
 		try {
562 561
 			$recaptcha_settings_form = EED_Recaptcha::_recaptcha_settings_form();
563 562
 			// if not displaying a form, then check for form submission
564
-			if ( $recaptcha_settings_form->was_submitted() ) {
563
+			if ($recaptcha_settings_form->was_submitted()) {
565 564
 				// capture form data
566 565
 				$recaptcha_settings_form->receive_form_submission();
567 566
 				// validate form data
568
-				if ( $recaptcha_settings_form->is_valid() ) {
567
+				if ($recaptcha_settings_form->is_valid()) {
569 568
 					// grab validated data from form
570 569
 					$valid_data = $recaptcha_settings_form->valid_data();
571 570
 					// user proofing recaptcha:  If Use reCAPTCHA is set to yes but we dont' have site or secret keys then set Use reCAPTCHA to FALSE and give error message.
572 571
 					if (
573
-						apply_filters( 'FHEE__Extend_Registration_Form_Admin_Page__check_for_recaptcha_keys', TRUE, $EE_Registration_Config )
572
+						apply_filters('FHEE__Extend_Registration_Form_Admin_Page__check_for_recaptcha_keys', TRUE, $EE_Registration_Config)
574 573
 						&& $valid_data['main_settings']['use_captcha']
575
-						&& ( ! $EE_Registration_Config->use_captcha && ( empty( $valid_data['main_settings']['recaptcha_publickey'] ) || empty( $valid_data['main_settings']['recaptcha_privatekey'] )))
574
+						&& ( ! $EE_Registration_Config->use_captcha && (empty($valid_data['main_settings']['recaptcha_publickey']) || empty($valid_data['main_settings']['recaptcha_privatekey'])))
576 575
 					) {
577 576
 						$valid_data['main_settings']['use_captcha'] = FALSE;
578
-						EE_Error::add_error( __('The use reCAPTCHA setting has been reset to "no". In order to enable the reCAPTCHA service, you must enter a Site Key and Secret Key.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
577
+						EE_Error::add_error(__('The use reCAPTCHA setting has been reset to "no". In order to enable the reCAPTCHA service, you must enter a Site Key and Secret Key.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
579 578
 					}
580 579
 					$EE_Registration_Config->use_captcha = $valid_data['main_settings']['use_captcha'];
581 580
 					$EE_Registration_Config->recaptcha_publickey = $valid_data['main_settings']['recaptcha_publickey'];
@@ -584,12 +583,12 @@  discard block
 block discarded – undo
584 583
 					$EE_Registration_Config->recaptcha_theme = $valid_data['appearance_settings']['recaptcha_theme'];
585 584
 					$EE_Registration_Config->recaptcha_language = $valid_data['appearance_settings']['recaptcha_language'];
586 585
 				} else {
587
-					if ( $recaptcha_settings_form->submission_error_message() != '' ) {
588
-						EE_Error::add_error( $recaptcha_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ );
586
+					if ($recaptcha_settings_form->submission_error_message() != '') {
587
+						EE_Error::add_error($recaptcha_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__);
589 588
 					}
590 589
 				}
591 590
 			}
592
-		} catch( EE_Error $e ) {
591
+		} catch (EE_Error $e) {
593 592
 			$e->get_error();
594 593
 		}
595 594
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 /**
3 5
  * Event Espresso
4 6
  *
Please login to merge, or discard this patch.
modules/ticket_selector_caff/EED_Ticket_Selector_Caff.module.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@
 block discarded – undo
150 150
 	 * @param EE_Template_Config $CFG
151 151
 	 * @param array             $REQ incoming request
152 152
 	 *
153
-	 * @return void
153
+	 * @return EE_Template_Config
154 154
 	 */
155 155
 	public static function update_template_settings( EE_Template_Config $CFG, $REQ ) {
156 156
 		if ( ! isset( $CFG->EED_Ticket_Selector ) ) {
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 /**
3 5
  *
4 6
  * EED_Ticket_Selector_Caff
Please login to merge, or discard this patch.
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 	 * @return EED_Ticket_Selector_Caff
17 17
 	 */
18 18
 	public static function instance() {
19
-		return parent::get_instance( __CLASS__ );
19
+		return parent::get_instance(__CLASS__);
20 20
 	}
21 21
 
22 22
 
@@ -37,22 +37,22 @@  discard block
 block discarded – undo
37 37
 	 *  @return 	void
38 38
 	 */
39 39
 	public static function set_hooks_admin() {
40
-		define( 'TICKET_SELECTOR_CAFF_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
41
-		add_action( 'AHEE__template_settings__template__before_settings_form', array( 'EED_Ticket_Selector_Caff', 'template_settings_form' ), 10 );
42
-		add_filter( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', array( 'EED_Ticket_Selector_Caff', 'update_template_settings' ), 10, 2 );
40
+		define('TICKET_SELECTOR_CAFF_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
41
+		add_action('AHEE__template_settings__template__before_settings_form', array('EED_Ticket_Selector_Caff', 'template_settings_form'), 10);
42
+		add_filter('FHEE__General_Settings_Admin_Page__update_template_settings__data', array('EED_Ticket_Selector_Caff', 'update_template_settings'), 10, 2);
43 43
 	}
44 44
 
45 45
 
46 46
 	//just required because of abstract declaration
47
-	public function run( $WP ) {}
47
+	public function run($WP) {}
48 48
 
49 49
 
50 50
 
51 51
 
52
-	protected function set_config(){
53
-		$this->set_config_section( 'template_settings' );
54
-		$this->set_config_class( 'EE_Ticket_Selector_Config' );
55
-		$this->set_config_name( 'EED_Ticket_Selector' );
52
+	protected function set_config() {
53
+		$this->set_config_section('template_settings');
54
+		$this->set_config_class('EE_Ticket_Selector_Config');
55
+		$this->set_config_name('EED_Ticket_Selector');
56 56
 	}
57 57
 
58 58
 
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 				'subsections' => apply_filters(
87 87
 					'FHEE__EED_Ticket_Selector_Caff___ticket_selector_settings_form__form_subsections',
88 88
 					array(
89
-						'appearance_settings_hdr' 				=> new EE_Form_Section_HTML( EEH_HTML::h3( __( 'Ticket Selector Template Settings', 'event_espresso' ))),
89
+						'appearance_settings_hdr' 				=> new EE_Form_Section_HTML(EEH_HTML::h3(__('Ticket Selector Template Settings', 'event_espresso'))),
90 90
 						'appearance_settings' 			=> EED_Ticket_Selector_Caff::_ticket_selector_appearance_settings()
91 91
 					)
92 92
 				)
@@ -109,17 +109,17 @@  discard block
 block discarded – undo
109 109
 					'FHEE__EED_Ticket_Selector_Caff___ticket_selector_appearance_settings__form_subsections', array(
110 110
 						'show_ticket_details' => new EE_Yes_No_Input(
111 111
 							array(
112
-								'html_label_text' => __('Show Ticket Details?', 'event_espresso' ),
113
-								'html_help_text' => __( 'This lets you choose whether the extra ticket details section is displayed with the ticket selector.', 'event_espresso'),
114
-								'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details ) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details : true,
112
+								'html_label_text' => __('Show Ticket Details?', 'event_espresso'),
113
+								'html_help_text' => __('This lets you choose whether the extra ticket details section is displayed with the ticket selector.', 'event_espresso'),
114
+								'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details : true,
115 115
 								'display_html_label_text' => false
116 116
 								)
117 117
 							),
118 118
 						'show_ticket_sale_columns' => new EE_Yes_No_Input(
119 119
 							array(
120
-								'html_label_text' => __('Show Ticket Sale Info?', 'event_espresso' ),
121
-								'html_help_text' => __( 'This lets you indicate whether information about ticket sales is shown with ticket details in the ticket selector.', 'event_espresso'),
122
-								'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns ) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns : true,
120
+								'html_label_text' => __('Show Ticket Sale Info?', 'event_espresso'),
121
+								'html_help_text' => __('This lets you indicate whether information about ticket sales is shown with ticket details in the ticket selector.', 'event_espresso'),
122
+								'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns : true,
123 123
 								'display_html_label_text' => false
124 124
 								)
125 125
 							)
@@ -142,21 +142,21 @@  discard block
 block discarded – undo
142 142
 	 *
143 143
 	 * @return void
144 144
 	 */
145
-	public static function update_template_settings( EE_Template_Config $CFG, $REQ ) {
146
-		if ( ! isset( $CFG->EED_Ticket_Selector ) ) {
145
+	public static function update_template_settings(EE_Template_Config $CFG, $REQ) {
146
+		if ( ! isset($CFG->EED_Ticket_Selector)) {
147 147
 			$CFG->EED_Ticket_Selector = new EE_Ticket_Selector_Config();
148 148
 		}
149 149
 		try {
150 150
 			$ticket_selector_form = EED_Ticket_Selector_Caff::_ticket_selector_settings_form();
151 151
 
152 152
 			//check for form submission
153
-			if ( $ticket_selector_form->was_submitted() ) {
153
+			if ($ticket_selector_form->was_submitted()) {
154 154
 
155 155
 				//capture form data
156 156
 				$ticket_selector_form->receive_form_submission();
157 157
 
158 158
 				//validate form data
159
-				if ( $ticket_selector_form->is_valid() ) {
159
+				if ($ticket_selector_form->is_valid()) {
160 160
 
161 161
 					//grab validated data from form
162 162
 					$valid_data = $ticket_selector_form->valid_data();
@@ -165,13 +165,13 @@  discard block
 block discarded – undo
165 165
 					$CFG->EED_Ticket_Selector->show_ticket_sale_columns = $valid_data['appearance_settings']['show_ticket_sale_columns'];
166 166
 					$CFG->EED_Ticket_Selector->show_ticket_details = $valid_data['appearance_settings']['show_ticket_details'];
167 167
 				} else {
168
-					if ( $ticket_selector_form->submission_error_message() != '' ) {
169
-						EE_Error::add_error( $ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ );
168
+					if ($ticket_selector_form->submission_error_message() != '') {
169
+						EE_Error::add_error($ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__);
170 170
 					}
171 171
 				}
172 172
 
173 173
 			}
174
-		} catch( EE_Error $e ) {
174
+		} catch (EE_Error $e) {
175 175
 			$e->get_error();
176 176
 		}
177 177
 
Please login to merge, or discard this patch.
caffeinated/payment_methods/Aim/EEG_Aim.gateway.php 4 patches
Doc Comments   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -206,7 +206,8 @@  discard block
 block discarded – undo
206 206
 	/**
207 207
 	 * Posts the request to AuthorizeNet & returns response.
208 208
 	 *
209
-	 * @return AuthorizeNetARB_Response The response.
209
+	 * @param EEI_Payment $payment
210
+	 * @return EE_AuthorizeNetAIM_Response The response.
210 211
 	 */
211 212
 	private function _sendRequest($payment) {
212 213
 		$this->_x_post_fields['login'] = $this->_login_id;
@@ -353,9 +354,6 @@  discard block
 block discarded – undo
353 354
 	 * Constructor. Parses the AuthorizeNet response string.
354 355
 	 *
355 356
 	 * @param string $response	  The response from the AuthNet server.
356
-	 * @param string $delimiter	 The delimiter used (default is ",")
357
-	 * @param string $encap_char	The encap_char used (default is "|")
358
-	 * @param array  $custom_fields Any custom fields set in the request.
359 357
 	 */
360 358
 
361 359
 	public function __construct($response) {
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@
 block discarded – undo
135 135
 			//in which case, we need to generate teh invoice num per request right here...
136 136
 			$this->setField('invoice_num', wp_generate_password(12,false));//$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
137 137
 			//tell AIM that any duplicates sent in the next 5 minutes are to be ignored
138
-            $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS );
138
+			$this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS );
139 139
 
140 140
 
141 141
 			if ($this->_test_transactions) {
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 
6 7
 /**
7 8
  * Event Espresso
@@ -107,7 +108,7 @@  discard block
 block discarded – undo
107 108
 				foreach($total_line_item->tax_descendants() as $tax_line_item){
108 109
 					$this->addLineItem($item_num++, $tax_line_item->name(), $tax_line_item->desc(), 1, $tax_line_item->total(), 'N');
109 110
 				}
110
-			}else{//partial payment
111
+			} else{//partial payment
111 112
 				$order_description = sprintf(__("Payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code());
112 113
 			}
113 114
 
Please login to merge, or discard this patch.
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 
6 6
 /**
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EEG_Aim extends EE_Onsite_Gateway{
28
+class EEG_Aim extends EE_Onsite_Gateway {
29 29
 	protected $_login_id;
30 30
 	protected $_transaction_key;
31 31
 	protected $_currencies_supported = array(
@@ -98,17 +98,17 @@  discard block
 block discarded – undo
98 98
 			$primary_registrant = $transaction->primary_registration();
99 99
 			//if we're are charging for the full amount, show the normal line items
100 100
 			//and the itemized total adds up properly
101
-			if( $this->_can_easily_itemize_transaction_for( $payment ) ){
101
+			if ($this->_can_easily_itemize_transaction_for($payment)) {
102 102
 				$total_line_item = $transaction->total_line_item();
103 103
 				foreach ($total_line_item->get_items() as $line_item) {
104 104
 					$this->addLineItem($item_num++, $line_item->name(), $line_item->desc(), $line_item->quantity(), $line_item->unit_price(), 'N');
105 105
 					$order_description .= $line_item->desc().', ';
106 106
 				}
107
-				foreach($total_line_item->tax_descendants() as $tax_line_item){
107
+				foreach ($total_line_item->tax_descendants() as $tax_line_item) {
108 108
 					$this->addLineItem($item_num++, $tax_line_item->name(), $tax_line_item->desc(), 1, $tax_line_item->total(), 'N');
109 109
 				}
110
-			}else{//partial payment
111
-				$order_description = sprintf(__("Payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code());
110
+			} else {//partial payment
111
+				$order_description = sprintf(__("Payment of %s for %s", "event_espresso"), $payment->amount(), $primary_registrant->reg_code());
112 112
 			}
113 113
 
114 114
 
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 
117 117
 			//start transaction
118 118
 			$this->setField('amount', $this->format_currency($payment->amount()));
119
-			$this->setField('description',substr(rtrim($order_description, ', '), 0, 255));
119
+			$this->setField('description', substr(rtrim($order_description, ', '), 0, 255));
120 120
 			$this->setField('card_num', $billing_info['credit_card']);
121 121
 			$this->setField('exp_date', $billing_info['exp_month'].$billing_info['exp_year']);
122 122
 			$this->setField('card_code', $billing_info['cvv']);
@@ -125,17 +125,17 @@  discard block
 block discarded – undo
125 125
 			$this->setField('email', $billing_info['email']);
126 126
 			$this->setField('address', $billing_info['address'].' '.$billing_info['address2']);
127 127
 			$this->setField('city', $billing_info['city']);
128
-			$this->setField('state', $billing_info['state'] );
129
-			$this->setField('country', $billing_info['country'] );
128
+			$this->setField('state', $billing_info['state']);
129
+			$this->setField('country', $billing_info['country']);
130 130
 			$this->setField('zip', $billing_info['zip']);
131 131
 			$this->setField('cust_id', $primary_registrant->ID());
132 132
 			$this->setField('phone', $billing_info['phone']);
133 133
 			//invoice_num would be nice to have itbe unique per SPCO page-load, taht way if users
134 134
 			//press back, they don't submit a duplicate. However, we may be keepin gthe user on teh same spco page
135 135
 			//in which case, we need to generate teh invoice num per request right here...
136
-			$this->setField('invoice_num', wp_generate_password(12,false));//$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
136
+			$this->setField('invoice_num', wp_generate_password(12, false)); //$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
137 137
 			//tell AIM that any duplicates sent in the next 5 minutes are to be ignored
138
-            $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS );
138
+            $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS);
139 139
 
140 140
 
141 141
 			if ($this->_test_transactions) {
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 			//Capture response
146 146
 			$this->type = "AUTH_CAPTURE";
147 147
 			$response = $this->_sendRequest($payment);
148
-			if (!empty($response)){
148
+			if ( ! empty($response)) {
149 149
 				if ($this->_debug_mode) {
150 150
 					$txn_id = $response->invoice_number;
151 151
 				} else {
@@ -154,14 +154,14 @@  discard block
 block discarded – undo
154 154
 				$payment_status = $response->approved ? $this->_pay_model->approved_status() : $this->_pay_model->declined_status();
155 155
 				$payment->set_status($payment_status);
156 156
 				//make sure we interpret the AMT as a float, not an international string (where periods are thousand seperators)
157
-				$payment->set_amount( floatval( $response->amount ) );
158
-				$payment->set_gateway_response(sprintf("%s (code: %s)",$response->response_reason_text,$response->response_reason_code));
157
+				$payment->set_amount(floatval($response->amount));
158
+				$payment->set_gateway_response(sprintf("%s (code: %s)", $response->response_reason_text, $response->response_reason_code));
159 159
 				$payment->set_extra_accntng($primary_registrant->reg_code());
160
-				$payment->set_details(print_r($response,true));
160
+				$payment->set_details(print_r($response, true));
161 161
 			} else {
162 162
 				$payment->set_status($this->_pay_model->failed_status());
163 163
 				$payment->set_gateway_response(__("There was no response from Authorize.net", 'event_espresso'));
164
-				$payment->set_details(print_r($response,true));
164
+				$payment->set_details(print_r($response, true));
165 165
 			}
166 166
 		return $payment;
167 167
 	}
@@ -212,22 +212,22 @@  discard block
 block discarded – undo
212 212
 		$this->_x_post_fields['tran_key'] = $this->_transaction_key;
213 213
 		$x_keys = array();
214 214
 		foreach ($this->_x_post_fields as $key => $value) {
215
-			$x_keys[] = "x_$key=" . urlencode($value);
215
+			$x_keys[] = "x_$key=".urlencode($value);
216 216
 		}
217 217
 		// Add line items
218 218
 		foreach ($this->_additional_line_items as $key => $value) {
219
-			$x_keys[] =  "x_line_item=" . urlencode($value);
219
+			$x_keys[] = "x_line_item=".urlencode($value);
220 220
 		}
221 221
 		$this->_log_clean_request($x_keys, $payment);
222 222
 		$post_url = ($this->_debug_mode ? self::SANDBOX_URL : self::LIVE_URL);
223 223
 		$curl_request = curl_init($post_url);
224
-		curl_setopt($curl_request, CURLOPT_POSTFIELDS, implode("&",$x_keys));
224
+		curl_setopt($curl_request, CURLOPT_POSTFIELDS, implode("&", $x_keys));
225 225
 		curl_setopt($curl_request, CURLOPT_HEADER, 0);
226 226
 		curl_setopt($curl_request, CURLOPT_TIMEOUT, 45);
227 227
 		curl_setopt($curl_request, CURLOPT_RETURNTRANSFER, 1);
228 228
 		curl_setopt($curl_request, CURLOPT_SSL_VERIFYHOST, 2);
229 229
 		if ($this->VERIFY_PEER) {
230
-			curl_setopt($curl_request, CURLOPT_CAINFO, dirname(dirname(__FILE__)) . '/ssl/cert.pem');
230
+			curl_setopt($curl_request, CURLOPT_CAINFO, dirname(dirname(__FILE__)).'/ssl/cert.pem');
231 231
 		} else {
232 232
 			curl_setopt($curl_request, CURLOPT_SSL_VERIFYPEER, false);
233 233
 		}
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 		$response = curl_exec($curl_request);
240 240
 
241 241
 		curl_close($curl_request);
242
-		$response_obj =  new EE_AuthorizeNetAIM_Response($response);
242
+		$response_obj = new EE_AuthorizeNetAIM_Response($response);
243 243
 
244 244
 		return $this->_log_and_clean_response($response_obj, $payment);
245 245
 	}
@@ -248,18 +248,18 @@  discard block
 block discarded – undo
248 248
 	 * @param array $request_array
249 249
 	 * @param EEI_Payment $payment
250 250
 	 */
251
-	private function _log_clean_request($request_array,$payment){
252
-		$keys_to_filter_out = array( 'x_card_num', 'x_card_code', 'x_exp_date' );
253
-		foreach($request_array as $index => $keyvaltogether ) {
254
-			foreach( $keys_to_filter_out as $key ) {
255
-				if( strpos( $keyvaltogether, $key ) === 0 ){
251
+	private function _log_clean_request($request_array, $payment) {
252
+		$keys_to_filter_out = array('x_card_num', 'x_card_code', 'x_exp_date');
253
+		foreach ($request_array as $index => $keyvaltogether) {
254
+			foreach ($keys_to_filter_out as $key) {
255
+				if (strpos($keyvaltogether, $key) === 0) {
256 256
 					//found it at the first character
257 257
 					//so its one of them
258
-					unset( $request_array[ $index ] );
258
+					unset($request_array[$index]);
259 259
 				}
260 260
 			}
261 261
 		}
262
-		$this->log(array('AIM Request sent:'=>$request_array),$payment);
262
+		$this->log(array('AIM Request sent:'=>$request_array), $payment);
263 263
 	}
264 264
 
265 265
 	/**
@@ -267,9 +267,9 @@  discard block
 block discarded – undo
267 267
 	 * @param EE_AuthorizeNetAIM_Response $response_obj
268 268
 	 * @param EE_Payment $payment
269 269
 	 */
270
-	private function _log_and_clean_response($response_obj,$payment){
270
+	private function _log_and_clean_response($response_obj, $payment) {
271 271
 		$response_obj->account_number = '';
272
-		$this->log(array('AIM Response received:'=>$response_obj),$payment);
272
+		$this->log(array('AIM Response received:'=>$response_obj), $payment);
273 273
 		return $response_obj;
274 274
 	}
275 275
 
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
365 365
 			// Split Array
366 366
 			$this->response = $response;
367 367
 			if ($encap_char) {
368
-				$this->_response_array = explode($encap_char . $delimiter . $encap_char, substr($response, 1, -1));
368
+				$this->_response_array = explode($encap_char.$delimiter.$encap_char, substr($response, 1, -1));
369 369
 			} else {
370 370
 				$this->_response_array = explode($delimiter, $response);
371 371
 			}
@@ -435,7 +435,7 @@  discard block
 block discarded – undo
435 435
 			$this->held = ($this->response_code == self::HELD);
436 436
 
437 437
 			if ($this->error || $this->declined || $this->held) {
438
-				$this->error_message = '<p><strong class="credit_card_failure">Attention: your transaction was declined for the following reason(s):</strong><br />' . $this->response_reason_text . '<br /><span class="response_code">Response Code: ' . $this->response_code . '<br /></span><span class="response_subcode">Response Subcode: ' . $this->response_subcode . '</span></p><p>To try again, <a href="#payment_options">please click here</a>.</p> ';
438
+				$this->error_message = '<p><strong class="credit_card_failure">Attention: your transaction was declined for the following reason(s):</strong><br />'.$this->response_reason_text.'<br /><span class="response_code">Response Code: '.$this->response_code.'<br /></span><span class="response_subcode">Response Subcode: '.$this->response_subcode.'</span></p><p>To try again, <a href="#payment_options">please click here</a>.</p> ';
439 439
 
440 440
 
441 441
 				/* $this->error_message = "AuthorizeNet Error:
Please login to merge, or discard this patch.
caffeinated/payment_methods/Paypal_Pro/EEG_Paypal_Pro.gateway.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -392,7 +392,7 @@
 block discarded – undo
392 392
 
393 393
 
394 394
 	/**
395
-	 * @param $Request
395
+	 * @param string $Request
396 396
 	 * @return mixed
397 397
 	 */
398 398
 	private function _CURLRequest($Request) {
Please login to merge, or discard this patch.
Spacing   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 
6 6
 /**
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EEG_Paypal_Pro extends EE_Onsite_Gateway{
28
+class EEG_Paypal_Pro extends EE_Onsite_Gateway {
29 29
 	/**
30 30
 	 *
31 31
 	 * @var $_paypal_api_username string
@@ -88,21 +88,21 @@  discard block
 block discarded – undo
88 88
 	 * } @see parent::do_direct_payment for more info
89 89
 	 * @return \EE_Payment|\EEI_Payment
90 90
 	 */
91
-	public function do_direct_payment($payment,$billing_info = null){
91
+	public function do_direct_payment($payment, $billing_info = null) {
92 92
 		$transaction = $payment->transaction();
93 93
 		$primary_registrant = $transaction->primary_registration();
94
-		$order_description  = sprintf(__("'Event Registrations from %s", "event_espresso"),get_bloginfo('name'));
94
+		$order_description  = sprintf(__("'Event Registrations from %s", "event_espresso"), get_bloginfo('name'));
95 95
 		//charge for the full amount. Show itemized list
96
-		if( $this->_can_easily_itemize_transaction_for( $payment ) ){
96
+		if ($this->_can_easily_itemize_transaction_for($payment)) {
97 97
 			$item_num = 1;
98 98
 			$total_line_item = $transaction->total_line_item();
99 99
 			$order_items = array();
100 100
 			foreach ($total_line_item->get_items() as $line_item) {
101 101
 				$item = array(
102 102
 						// Item Name.  127 char max.
103
-						'l_name' => substr($line_item->name(),0,127),
103
+						'l_name' => substr($line_item->name(), 0, 127),
104 104
 						// Item description.  127 char max.
105
-						'l_desc' => substr($line_item->desc(),0,127),
105
+						'l_desc' => substr($line_item->desc(), 0, 127),
106 106
 						// Cost of individual item.
107 107
 						'l_amt' => $line_item->unit_price(),
108 108
 						// Item Number.  127 char max.
@@ -123,14 +123,14 @@  discard block
 block discarded – undo
123 123
 			}
124 124
 			$item_amount = $total_line_item->get_items_total();
125 125
 			$tax_amount = $total_line_item->get_total_tax();
126
-		}else{
126
+		} else {
127 127
 			$order_items = array();
128 128
 			$item_amount = $payment->amount();
129
-			$single_item_desc = sprintf(__("Partial payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code());
129
+			$single_item_desc = sprintf(__("Partial payment of %s for %s", "event_espresso"), $payment->amount(), $primary_registrant->reg_code());
130 130
 			$tax_amount = 0;
131
-			array_push($order_items,array(
131
+			array_push($order_items, array(
132 132
 				// Item Name.  127 char max.
133
-				'l_name' => sprintf(__("Partial payment for registration: %s", 'event_espresso'),$primary_registrant->reg_code()),
133
+				'l_name' => sprintf(__("Partial payment for registration: %s", 'event_espresso'), $primary_registrant->reg_code()),
134 134
 				// Item description.  127 char max.
135 135
 				'l_desc' => $single_item_desc,
136 136
 				// Cost of individual item.
@@ -177,11 +177,11 @@  discard block
 block discarded – undo
177 177
 			// Payer's salutation.  20 char max.
178 178
 			'salutation' => '',
179 179
 			// Payer's first name.  25 char max.
180
-			'firstname' => substr($billing_info['first_name'],0,25),
180
+			'firstname' => substr($billing_info['first_name'], 0, 25),
181 181
 			// Payer's middle name.  25 char max.
182 182
 			'middlename' => '',
183 183
 			// Payer's last name.  25 char max.
184
-			'lastname' => substr($billing_info['last_name'],0,25),
184
+			'lastname' => substr($billing_info['last_name'], 0, 25),
185 185
 			// Payer's suffix.  12 char max.
186 186
 			'suffix' => ''
187 187
 		);
@@ -194,13 +194,13 @@  discard block
 block discarded – undo
194 194
 			// Required.  Name of City.
195 195
 			'city' => $billing_info['city'],
196 196
 			// Required. Name of State or Province.
197
-			'state' => substr( $billing_info['state'], 0, 40 ),
197
+			'state' => substr($billing_info['state'], 0, 40),
198 198
 			// Required.  Country code.
199 199
 			'countrycode' => $billing_info['country'],
200 200
 			// Required.  Postal code of payer.
201 201
 			'zip' => $billing_info['zip'],
202 202
 			// Phone Number of payer.  20 char max.
203
-			'shiptophonenum' => substr($billing_info['phone'],0,20)
203
+			'shiptophonenum' => substr($billing_info['phone'], 0, 20)
204 204
 		);
205 205
 
206 206
 
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 			// Required.  Three-letter currency code.  Default is USD.
211 211
 			'currencycode' => $payment->currency_code(),
212 212
 			// Required if you include itemized cart details. (L_AMTn, etc.)  Subtotal of items not including S&H, or tax.
213
-			'itemamt' => $this->format_currency($item_amount),//
213
+			'itemamt' => $this->format_currency($item_amount), //
214 214
 			// Total shipping costs for the order.  If you specify shippingamt, you must also specify itemamt.
215 215
 			'shippingamt' => '',
216 216
 			// Total handling costs for the order.  If you specify handlingamt, you must also specify itemamt.
@@ -222,10 +222,10 @@  discard block
 block discarded – undo
222 222
 			// Free-form field for your own use.  256 char max.
223 223
 			'custom' => $primary_registrant ? $primary_registrant->ID() : '',
224 224
 			// Your own invoice or tracking number
225
-			'invnum' => wp_generate_password(12,false),//$transaction->ID(),
225
+			'invnum' => wp_generate_password(12, false), //$transaction->ID(),
226 226
 			// URL for receiving Instant Payment Notifications.  This overrides what your profile is set to use.
227 227
 			'notifyurl' => '',
228
-			'buttonsource' => 'EventEspresso_SP',//EE will blow up if you change this
228
+			'buttonsource' => 'EventEspresso_SP', //EE will blow up if you change this
229 229
 		);
230 230
 		// Wrap all data arrays into a single, "master" array which will be passed into the class function.
231 231
 		$PayPalRequestData = array(
@@ -238,32 +238,32 @@  discard block
 block discarded – undo
238 238
 				'OrderItems' => $order_items,
239 239
 		);
240 240
 		$this->_log_clean_request($PayPalRequestData, $payment);
241
-		try{
241
+		try {
242 242
 			$PayPalResult = $this->prep_and_curl_request($PayPalRequestData);
243 243
 			//remove PCI-sensitive data so it doesn't get stored
244
-			$PayPalResult = $this->_log_clean_response($PayPalResult,$payment);
244
+			$PayPalResult = $this->_log_clean_response($PayPalResult, $payment);
245 245
 
246 246
 			$message = isset($PayPalResult['L_LONGMESSAGE0']) ? $PayPalResult['L_LONGMESSAGE0'] : $PayPalResult['ACK'];
247
-			if( empty($PayPalResult[ 'RAWRESPONSE' ] ) ) {
248
-				$payment->set_status( $this->_pay_model->failed_status() ) ;
249
-				$payment->set_gateway_response( __( 'No response received from Paypal Pro', 'event_espresso' ) );
247
+			if (empty($PayPalResult['RAWRESPONSE'])) {
248
+				$payment->set_status($this->_pay_model->failed_status());
249
+				$payment->set_gateway_response(__('No response received from Paypal Pro', 'event_espresso'));
250 250
 				$payment->set_details($PayPalResult);
251
-			}else{
252
-				if($this->_APICallSuccessful($PayPalResult)){
251
+			} else {
252
+				if ($this->_APICallSuccessful($PayPalResult)) {
253 253
 					$payment->set_status($this->_pay_model->approved_status());
254
-				}else{
254
+				} else {
255 255
 					$payment->set_status($this->_pay_model->declined_status());
256 256
 				}
257 257
 				//make sure we interpret the AMT as a float, not an international string (where periods are thousand separators)
258
-				$payment->set_amount(isset($PayPalResult['AMT']) ? floatval( $PayPalResult['AMT'] ) : 0);
258
+				$payment->set_amount(isset($PayPalResult['AMT']) ? floatval($PayPalResult['AMT']) : 0);
259 259
 				$payment->set_gateway_response($message);
260
-				$payment->set_txn_id_chq_nmbr(isset( $PayPalResult['TRANSACTIONID'] )? $PayPalResult['TRANSACTIONID'] : null);
260
+				$payment->set_txn_id_chq_nmbr(isset($PayPalResult['TRANSACTIONID']) ? $PayPalResult['TRANSACTIONID'] : null);
261 261
 
262 262
 				$primary_registration_code = $primary_registrant instanceof EE_Registration ? $primary_registrant->reg_code() : '';
263 263
 				$payment->set_extra_accntng($primary_registration_code);
264 264
 				$payment->set_details($PayPalResult);
265 265
 			}
266
-		}catch(Exception $e){
266
+		} catch (Exception $e) {
267 267
 			$payment->set_status($this->_pay_model->failed_status());
268 268
 			$payment->set_gateway_response($e->getMessage());
269 269
 		}
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
 	 * @param EEI_Payment $payment
281 281
 	 * @return array
282 282
 	 */
283
-	private function _log_clean_request($request,$payment){
283
+	private function _log_clean_request($request, $payment) {
284 284
 		$cleaned_request_data = $request;
285 285
 		unset($cleaned_request_data['CCDetails']['acct']);
286 286
 		unset($cleaned_request_data['CCDetails']['cvv2']);
@@ -295,13 +295,13 @@  discard block
 block discarded – undo
295 295
 	 * @param EEI_Payment $payment
296 296
 	 * @return array cleaned
297 297
 	 */
298
-	private function _log_clean_response($response,$payment){
298
+	private function _log_clean_response($response, $payment) {
299 299
 		unset($response['REQUESTDATA']['CREDITCARDTYPE']);
300 300
 		unset($response['REQUESTDATA']['ACCT']);
301 301
 		unset($response['REQUESTDATA']['EXPDATE']);
302 302
 		unset($response['REQUESTDATA']['CVV2']);
303 303
 		unset($response['RAWREQUEST']);
304
-		$this->log(array('Paypal Response'=>$response),$payment);
304
+		$this->log(array('Paypal Response'=>$response), $payment);
305 305
 		return $response;
306 306
 	}
307 307
 
@@ -326,32 +326,32 @@  discard block
 block discarded – undo
326 326
 		// DP Fields
327 327
 		$DPFields = isset($DataArray['DPFields']) ? $DataArray['DPFields'] : array();
328 328
 		foreach ($DPFields as $DPFieldsVar => $DPFieldsVal)
329
-			$DPFieldsNVP .= '&' . strtoupper($DPFieldsVar) . '=' . urlencode($DPFieldsVal);
329
+			$DPFieldsNVP .= '&'.strtoupper($DPFieldsVar).'='.urlencode($DPFieldsVal);
330 330
 
331 331
 		// CC Details Fields
332 332
 		$CCDetails = isset($DataArray['CCDetails']) ? $DataArray['CCDetails'] : array();
333 333
 		foreach ($CCDetails as $CCDetailsVar => $CCDetailsVal)
334
-			$CCDetailsNVP .= '&' . strtoupper($CCDetailsVar) . '=' . urlencode($CCDetailsVal);
334
+			$CCDetailsNVP .= '&'.strtoupper($CCDetailsVar).'='.urlencode($CCDetailsVal);
335 335
 
336 336
 		// PayerInfo Type Fields
337 337
 		$PayerInfo = isset($DataArray['PayerInfo']) ? $DataArray['PayerInfo'] : array();
338 338
 		foreach ($PayerInfo as $PayerInfoVar => $PayerInfoVal)
339
-			$PayerInfoNVP .= '&' . strtoupper($PayerInfoVar) . '=' . urlencode($PayerInfoVal);
339
+			$PayerInfoNVP .= '&'.strtoupper($PayerInfoVar).'='.urlencode($PayerInfoVal);
340 340
 
341 341
 		// Payer Name Fields
342 342
 		$PayerName = isset($DataArray['PayerName']) ? $DataArray['PayerName'] : array();
343 343
 		foreach ($PayerName as $PayerNameVar => $PayerNameVal)
344
-			$PayerNameNVP .= '&' . strtoupper($PayerNameVar) . '=' . urlencode($PayerNameVal);
344
+			$PayerNameNVP .= '&'.strtoupper($PayerNameVar).'='.urlencode($PayerNameVal);
345 345
 
346 346
 		// Address Fields (Billing)
347 347
 		$BillingAddress = isset($DataArray['BillingAddress']) ? $DataArray['BillingAddress'] : array();
348 348
 		foreach ($BillingAddress as $BillingAddressVar => $BillingAddressVal)
349
-			$BillingAddressNVP .= '&' . strtoupper($BillingAddressVar) . '=' . urlencode($BillingAddressVal);
349
+			$BillingAddressNVP .= '&'.strtoupper($BillingAddressVar).'='.urlencode($BillingAddressVal);
350 350
 
351 351
 		// Payment Details Type Fields
352 352
 		$PaymentDetails = isset($DataArray['PaymentDetails']) ? $DataArray['PaymentDetails'] : array();
353 353
 		foreach ($PaymentDetails as $PaymentDetailsVar => $PaymentDetailsVal)
354
-			$PaymentDetailsNVP .= '&' . strtoupper($PaymentDetailsVar) . '=' . urlencode($PaymentDetailsVal);
354
+			$PaymentDetailsNVP .= '&'.strtoupper($PaymentDetailsVar).'='.urlencode($PaymentDetailsVal);
355 355
 
356 356
 		// Payment Details Item Type Fields
357 357
 		$OrderItems = isset($DataArray['OrderItems']) ? $DataArray['OrderItems'] : array();
@@ -359,22 +359,22 @@  discard block
 block discarded – undo
359 359
 		foreach ($OrderItems as $OrderItemsVar => $OrderItemsVal) {
360 360
 			$CurrentItem = $OrderItems[$OrderItemsVar];
361 361
 			foreach ($CurrentItem as $CurrentItemVar => $CurrentItemVal)
362
-				$OrderItemsNVP .= '&' . strtoupper($CurrentItemVar) . $n . '=' . urlencode($CurrentItemVal);
362
+				$OrderItemsNVP .= '&'.strtoupper($CurrentItemVar).$n.'='.urlencode($CurrentItemVal);
363 363
 			$n++;
364 364
 		}
365 365
 
366 366
 		// Ship To Address Fields
367 367
 		$ShippingAddress = isset($DataArray['ShippingAddress']) ? $DataArray['ShippingAddress'] : array();
368 368
 		foreach ($ShippingAddress as $ShippingAddressVar => $ShippingAddressVal)
369
-			$ShippingAddressNVP .= '&' . strtoupper($ShippingAddressVar) . '=' . urlencode($ShippingAddressVal);
369
+			$ShippingAddressNVP .= '&'.strtoupper($ShippingAddressVar).'='.urlencode($ShippingAddressVal);
370 370
 
371 371
 		// 3D Secure Fields
372 372
 		$Secure3D = isset($DataArray['Secure3D']) ? $DataArray['Secure3D'] : array();
373 373
 		foreach ($Secure3D as $Secure3DVar => $Secure3DVal)
374
-			$Secure3DNVP .= '&' . strtoupper($Secure3DVar) . '=' . urlencode($Secure3DVal);
374
+			$Secure3DNVP .= '&'.strtoupper($Secure3DVar).'='.urlencode($Secure3DVal);
375 375
 
376 376
 		// Now that we have each chunk we need to go ahead and append them all together for our entire NVP string
377
-		$NVPRequest = 'USER=' . $this->_username . '&PWD=' . $this->_password . '&VERSION=64.0' . '&SIGNATURE=' . $this->_signature . $DPFieldsNVP . $CCDetailsNVP . $PayerInfoNVP . $PayerNameNVP . $BillingAddressNVP . $PaymentDetailsNVP . $OrderItemsNVP . $ShippingAddressNVP . $Secure3DNVP;
377
+		$NVPRequest = 'USER='.$this->_username.'&PWD='.$this->_password.'&VERSION=64.0'.'&SIGNATURE='.$this->_signature.$DPFieldsNVP.$CCDetailsNVP.$PayerInfoNVP.$PayerNameNVP.$BillingAddressNVP.$PaymentDetailsNVP.$OrderItemsNVP.$ShippingAddressNVP.$Secure3DNVP;
378 378
 		$NVPResponse = $this->_CURLRequest($NVPRequest);
379 379
 		$NVPRequestArray = $this->_NVPToArray($NVPRequest);
380 380
 		$NVPResponseArray = $this->_NVPToArray($NVPResponse);
@@ -398,7 +398,7 @@  discard block
 block discarded – undo
398 398
 	private function _CURLRequest($Request) {
399 399
 		$EndPointURL = $this->_debug_mode ? 'https://api-3t.sandbox.paypal.com/nvp' : 'https://api-3t.paypal.com/nvp';
400 400
 		$curl = curl_init();
401
-		curl_setopt($curl, CURLOPT_VERBOSE, apply_filters('FHEE__EEG_Paypal_Pro__CurlRequest__CURLOPT_VERBOSE', TRUE ) );
401
+		curl_setopt($curl, CURLOPT_VERBOSE, apply_filters('FHEE__EEG_Paypal_Pro__CurlRequest__CURLOPT_VERBOSE', TRUE));
402 402
 		curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
403 403
 		curl_setopt($curl, CURLOPT_TIMEOUT, 60);
404 404
 		curl_setopt($curl, CURLOPT_URL, $EndPointURL);
@@ -447,9 +447,9 @@  discard block
 block discarded – undo
447 447
 	private function _APICallSuccessful($PayPalResult) {
448 448
 		$approved = false;
449 449
 		// check main response message from PayPal
450
-		if (isset($PayPalResult['ACK']) && !empty($PayPalResult['ACK'])) {
450
+		if (isset($PayPalResult['ACK']) && ! empty($PayPalResult['ACK'])) {
451 451
 			$ack = strtoupper($PayPalResult['ACK']);
452
-			$approved = ( $ack == 'SUCCESS' || $ack == 'SUCCESSWITHWARNING' || $ack == 'PARTIALSUCCESS' ) ? true : false;
452
+			$approved = ($ack == 'SUCCESS' || $ack == 'SUCCESSWITHWARNING' || $ack == 'PARTIALSUCCESS') ? true : false;
453 453
 		}
454 454
 
455 455
 		return $approved;
@@ -465,11 +465,11 @@  discard block
 block discarded – undo
465 465
 
466 466
 		$Errors = array();
467 467
 		$n = 0;
468
-		while (isset($DataArray['L_ERRORCODE' . $n . ''])) {
469
-			$LErrorCode = isset($DataArray['L_ERRORCODE' . $n . '']) ? $DataArray['L_ERRORCODE' . $n . ''] : '';
470
-			$LShortMessage = isset($DataArray['L_SHORTMESSAGE' . $n . '']) ? $DataArray['L_SHORTMESSAGE' . $n . ''] : '';
471
-			$LLongMessage = isset($DataArray['L_LONGMESSAGE' . $n . '']) ? $DataArray['L_LONGMESSAGE' . $n . ''] : '';
472
-			$LSeverityCode = isset($DataArray['L_SEVERITYCODE' . $n . '']) ? $DataArray['L_SEVERITYCODE' . $n . ''] : '';
468
+		while (isset($DataArray['L_ERRORCODE'.$n.''])) {
469
+			$LErrorCode = isset($DataArray['L_ERRORCODE'.$n.'']) ? $DataArray['L_ERRORCODE'.$n.''] : '';
470
+			$LShortMessage = isset($DataArray['L_SHORTMESSAGE'.$n.'']) ? $DataArray['L_SHORTMESSAGE'.$n.''] : '';
471
+			$LLongMessage = isset($DataArray['L_LONGMESSAGE'.$n.'']) ? $DataArray['L_LONGMESSAGE'.$n.''] : '';
472
+			$LSeverityCode = isset($DataArray['L_SEVERITYCODE'.$n.'']) ? $DataArray['L_SEVERITYCODE'.$n.''] : '';
473 473
 
474 474
 			$CurrentItem = array(
475 475
 					'L_ERRORCODE' => $LErrorCode,
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
 				elseif ($CurrentErrorVar == 'L_SEVERITYCODE')
510 510
 					$CurrentVarName = 'Severity Code';
511 511
 
512
-				$error .= '<br />' . $CurrentVarName . ': ' . $CurrentErrorVal;
512
+				$error .= '<br />'.$CurrentVarName.': '.$CurrentErrorVal;
513 513
 			}
514 514
 		}
515 515
 		return $error;
Please login to merge, or discard this patch.
Braces   +42 added lines, -31 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 
6 7
 /**
7 8
  * Event Espresso
@@ -123,7 +124,7 @@  discard block
 block discarded – undo
123 124
 			}
124 125
 			$item_amount = $total_line_item->get_items_total();
125 126
 			$tax_amount = $total_line_item->get_total_tax();
126
-		}else{
127
+		} else{
127 128
 			$order_items = array();
128 129
 			$item_amount = $payment->amount();
129 130
 			$single_item_desc = sprintf(__("Partial payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code());
@@ -248,10 +249,10 @@  discard block
 block discarded – undo
248 249
 				$payment->set_status( $this->_pay_model->failed_status() ) ;
249 250
 				$payment->set_gateway_response( __( 'No response received from Paypal Pro', 'event_espresso' ) );
250 251
 				$payment->set_details($PayPalResult);
251
-			}else{
252
+			} else{
252 253
 				if($this->_APICallSuccessful($PayPalResult)){
253 254
 					$payment->set_status($this->_pay_model->approved_status());
254
-				}else{
255
+				} else{
255 256
 					$payment->set_status($this->_pay_model->declined_status());
256 257
 				}
257 258
 				//make sure we interpret the AMT as a float, not an international string (where periods are thousand separators)
@@ -263,7 +264,7 @@  discard block
 block discarded – undo
263 264
 				$payment->set_extra_accntng($primary_registration_code);
264 265
 				$payment->set_details($PayPalResult);
265 266
 			}
266
-		}catch(Exception $e){
267
+		} catch(Exception $e){
267 268
 			$payment->set_status($this->_pay_model->failed_status());
268 269
 			$payment->set_gateway_response($e->getMessage());
269 270
 		}
@@ -325,53 +326,62 @@  discard block
 block discarded – undo
325 326
 
326 327
 		// DP Fields
327 328
 		$DPFields = isset($DataArray['DPFields']) ? $DataArray['DPFields'] : array();
328
-		foreach ($DPFields as $DPFieldsVar => $DPFieldsVal)
329
-			$DPFieldsNVP .= '&' . strtoupper($DPFieldsVar) . '=' . urlencode($DPFieldsVal);
329
+		foreach ($DPFields as $DPFieldsVar => $DPFieldsVal) {
330
+					$DPFieldsNVP .= '&' . strtoupper($DPFieldsVar) . '=' . urlencode($DPFieldsVal);
331
+		}
330 332
 
331 333
 		// CC Details Fields
332 334
 		$CCDetails = isset($DataArray['CCDetails']) ? $DataArray['CCDetails'] : array();
333
-		foreach ($CCDetails as $CCDetailsVar => $CCDetailsVal)
334
-			$CCDetailsNVP .= '&' . strtoupper($CCDetailsVar) . '=' . urlencode($CCDetailsVal);
335
+		foreach ($CCDetails as $CCDetailsVar => $CCDetailsVal) {
336
+					$CCDetailsNVP .= '&' . strtoupper($CCDetailsVar) . '=' . urlencode($CCDetailsVal);
337
+		}
335 338
 
336 339
 		// PayerInfo Type Fields
337 340
 		$PayerInfo = isset($DataArray['PayerInfo']) ? $DataArray['PayerInfo'] : array();
338
-		foreach ($PayerInfo as $PayerInfoVar => $PayerInfoVal)
339
-			$PayerInfoNVP .= '&' . strtoupper($PayerInfoVar) . '=' . urlencode($PayerInfoVal);
341
+		foreach ($PayerInfo as $PayerInfoVar => $PayerInfoVal) {
342
+					$PayerInfoNVP .= '&' . strtoupper($PayerInfoVar) . '=' . urlencode($PayerInfoVal);
343
+		}
340 344
 
341 345
 		// Payer Name Fields
342 346
 		$PayerName = isset($DataArray['PayerName']) ? $DataArray['PayerName'] : array();
343
-		foreach ($PayerName as $PayerNameVar => $PayerNameVal)
344
-			$PayerNameNVP .= '&' . strtoupper($PayerNameVar) . '=' . urlencode($PayerNameVal);
347
+		foreach ($PayerName as $PayerNameVar => $PayerNameVal) {
348
+					$PayerNameNVP .= '&' . strtoupper($PayerNameVar) . '=' . urlencode($PayerNameVal);
349
+		}
345 350
 
346 351
 		// Address Fields (Billing)
347 352
 		$BillingAddress = isset($DataArray['BillingAddress']) ? $DataArray['BillingAddress'] : array();
348
-		foreach ($BillingAddress as $BillingAddressVar => $BillingAddressVal)
349
-			$BillingAddressNVP .= '&' . strtoupper($BillingAddressVar) . '=' . urlencode($BillingAddressVal);
353
+		foreach ($BillingAddress as $BillingAddressVar => $BillingAddressVal) {
354
+					$BillingAddressNVP .= '&' . strtoupper($BillingAddressVar) . '=' . urlencode($BillingAddressVal);
355
+		}
350 356
 
351 357
 		// Payment Details Type Fields
352 358
 		$PaymentDetails = isset($DataArray['PaymentDetails']) ? $DataArray['PaymentDetails'] : array();
353
-		foreach ($PaymentDetails as $PaymentDetailsVar => $PaymentDetailsVal)
354
-			$PaymentDetailsNVP .= '&' . strtoupper($PaymentDetailsVar) . '=' . urlencode($PaymentDetailsVal);
359
+		foreach ($PaymentDetails as $PaymentDetailsVar => $PaymentDetailsVal) {
360
+					$PaymentDetailsNVP .= '&' . strtoupper($PaymentDetailsVar) . '=' . urlencode($PaymentDetailsVal);
361
+		}
355 362
 
356 363
 		// Payment Details Item Type Fields
357 364
 		$OrderItems = isset($DataArray['OrderItems']) ? $DataArray['OrderItems'] : array();
358 365
 		$n = 0;
359 366
 		foreach ($OrderItems as $OrderItemsVar => $OrderItemsVal) {
360 367
 			$CurrentItem = $OrderItems[$OrderItemsVar];
361
-			foreach ($CurrentItem as $CurrentItemVar => $CurrentItemVal)
362
-				$OrderItemsNVP .= '&' . strtoupper($CurrentItemVar) . $n . '=' . urlencode($CurrentItemVal);
368
+			foreach ($CurrentItem as $CurrentItemVar => $CurrentItemVal) {
369
+							$OrderItemsNVP .= '&' . strtoupper($CurrentItemVar) . $n . '=' . urlencode($CurrentItemVal);
370
+			}
363 371
 			$n++;
364 372
 		}
365 373
 
366 374
 		// Ship To Address Fields
367 375
 		$ShippingAddress = isset($DataArray['ShippingAddress']) ? $DataArray['ShippingAddress'] : array();
368
-		foreach ($ShippingAddress as $ShippingAddressVar => $ShippingAddressVal)
369
-			$ShippingAddressNVP .= '&' . strtoupper($ShippingAddressVar) . '=' . urlencode($ShippingAddressVal);
376
+		foreach ($ShippingAddress as $ShippingAddressVar => $ShippingAddressVal) {
377
+					$ShippingAddressNVP .= '&' . strtoupper($ShippingAddressVar) . '=' . urlencode($ShippingAddressVal);
378
+		}
370 379
 
371 380
 		// 3D Secure Fields
372 381
 		$Secure3D = isset($DataArray['Secure3D']) ? $DataArray['Secure3D'] : array();
373
-		foreach ($Secure3D as $Secure3DVar => $Secure3DVal)
374
-			$Secure3DNVP .= '&' . strtoupper($Secure3DVar) . '=' . urlencode($Secure3DVal);
382
+		foreach ($Secure3D as $Secure3DVar => $Secure3DVal) {
383
+					$Secure3DNVP .= '&' . strtoupper($Secure3DVar) . '=' . urlencode($Secure3DVal);
384
+		}
375 385
 
376 386
 		// Now that we have each chunk we need to go ahead and append them all together for our entire NVP string
377 387
 		$NVPRequest = 'USER=' . $this->_username . '&PWD=' . $this->_password . '&VERSION=64.0' . '&SIGNATURE=' . $this->_signature . $DPFieldsNVP . $CCDetailsNVP . $PayerInfoNVP . $PayerNameNVP . $BillingAddressNVP . $PaymentDetailsNVP . $OrderItemsNVP . $ShippingAddressNVP . $Secure3DNVP;
@@ -500,14 +510,15 @@  discard block
 block discarded – undo
500 510
 			$CurrentError = $Errors[$ErrorVar];
501 511
 			foreach ($CurrentError as $CurrentErrorVar => $CurrentErrorVal) {
502 512
 				$CurrentVarName = '';
503
-				if ($CurrentErrorVar == 'L_ERRORCODE')
504
-					$CurrentVarName = 'Error Code';
505
-				elseif ($CurrentErrorVar == 'L_SHORTMESSAGE')
506
-					$CurrentVarName = 'Short Message';
507
-				elseif ($CurrentErrorVar == 'L_LONGMESSAGE')
508
-					$CurrentVarName = 'Long Message';
509
-				elseif ($CurrentErrorVar == 'L_SEVERITYCODE')
510
-					$CurrentVarName = 'Severity Code';
513
+				if ($CurrentErrorVar == 'L_ERRORCODE') {
514
+									$CurrentVarName = 'Error Code';
515
+				} elseif ($CurrentErrorVar == 'L_SHORTMESSAGE') {
516
+									$CurrentVarName = 'Short Message';
517
+				} elseif ($CurrentErrorVar == 'L_LONGMESSAGE') {
518
+									$CurrentVarName = 'Long Message';
519
+				} elseif ($CurrentErrorVar == 'L_SEVERITYCODE') {
520
+									$CurrentVarName = 'Severity Code';
521
+				}
511 522
 
512 523
 				$error .= '<br />' . $CurrentVarName . ': ' . $CurrentErrorVal;
513 524
 			}
Please login to merge, or discard this patch.
core/admin/EE_Admin_Hooks.core.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -207,7 +207,7 @@
 block discarded – undo
207 207
 
208 208
 	/**
209 209
 	 * constructor
210
-	 * @param EE_Admin_Page $admin_page the calling admin_page_object
210
+	 * @param EE_Admin_Page $adminpage the calling admin_page_object
211 211
 	 */
212 212
 	public function __construct( EE_Admin_Page $adminpage ) {
213 213
 
Please login to merge, or discard this patch.
Spacing   +106 added lines, -106 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('NO direct script access allowed');
4 4
 
5 5
 /**
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 	 * constructor
210 210
 	 * @param EE_Admin_Page $admin_page the calling admin_page_object
211 211
 	 */
212
-	public function __construct( EE_Admin_Page $adminpage ) {
212
+	public function __construct(EE_Admin_Page $adminpage) {
213 213
 
214 214
 		$this->_adminpage_obj = $adminpage;
215 215
 		$this->_req_data = array_merge($_GET, $_POST);
@@ -217,11 +217,11 @@  discard block
 block discarded – undo
217 217
 		$this->_set_hooks_properties();
218 218
 
219 219
 		//first let's verify we're on the right page
220
-		if ( !isset( $this->_req_data['page'] ) || ( isset( $this->_req_data['page'] ) && $this->_adminpage_obj->page_slug != $this->_req_data['page'] ) )
220
+		if ( ! isset($this->_req_data['page']) || (isset($this->_req_data['page']) && $this->_adminpage_obj->page_slug != $this->_req_data['page']))
221 221
 			return; //get out nothing more to be done here.
222 222
 
223 223
 		//allow for extends to modify properties
224
-		if ( method_exists( $this, '_extend_properties' ) )
224
+		if (method_exists($this, '_extend_properties'))
225 225
 			$this->_extend_properties();
226 226
 
227 227
 		$this->_set_page_object();
@@ -229,9 +229,9 @@  discard block
 block discarded – undo
229 229
 		$this->_load_custom_methods();
230 230
 		$this->_load_routed_hooks();
231 231
 
232
-		add_action( 'admin_enqueue_scripts', array($this, 'enqueue_scripts_styles' ) );
233
-		add_action( 'admin_enqueue_scripts', array($this, 'add_metaboxes'), 20 );
234
-		add_action( 'admin_enqueue_scripts', array($this, 'remove_metaboxes'), 15 );
232
+		add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts_styles'));
233
+		add_action('admin_enqueue_scripts', array($this, 'add_metaboxes'), 20);
234
+		add_action('admin_enqueue_scripts', array($this, 'remove_metaboxes'), 15);
235 235
 
236 236
 		$this->_ajax_hooks();
237 237
 
@@ -272,15 +272,15 @@  discard block
 block discarded – undo
272 272
 	 */
273 273
 	public function enqueue_scripts_styles() {
274 274
 
275
-		if ( !empty( $this->_scripts_styles ) ) {
275
+		if ( ! empty($this->_scripts_styles)) {
276 276
 			//first let's do all the registrations
277
-			if ( !isset($this->_scripts_styles['registers'] ) ) {
277
+			if ( ! isset($this->_scripts_styles['registers'])) {
278 278
 				$msg[] = __('There is no "registers" index in the <code>$this->_scripts_styles</code> property.', 'event_espresso');
279
-				$msg[] = sprintf ( __('Make sure you read the phpdoc comments above the definition of the $_scripts_styles property in the <code>EE_Admin_Hooks</code> class and modify according in the %s child', 'event_espresso'), '<strong>' . $this->caller . '</strong>' );
280
-				throw new EE_Error( implode( '||', $msg ) );
279
+				$msg[] = sprintf(__('Make sure you read the phpdoc comments above the definition of the $_scripts_styles property in the <code>EE_Admin_Hooks</code> class and modify according in the %s child', 'event_espresso'), '<strong>'.$this->caller.'</strong>');
280
+				throw new EE_Error(implode('||', $msg));
281 281
 			}
282 282
 
283
-			foreach( $this->_scripts_styles['registers'] as $ref => $details ) {
283
+			foreach ($this->_scripts_styles['registers'] as $ref => $details) {
284 284
 				$defaults = array(
285 285
 					'type' => 'js',
286 286
 					'url' => '',
@@ -289,48 +289,48 @@  discard block
 block discarded – undo
289 289
 					'footer' => TRUE
290 290
 					);
291 291
 				$details = wp_parse_args($details, $defaults);
292
-				extract( $details );
292
+				extract($details);
293 293
 
294 294
 				//let's make sure that we set the 'registers' type if it's not set! We need it later to determine whhich enqueu we do
295 295
 				$this->_scripts_styles['registers'][$ref]['type'] = $type;
296 296
 
297 297
 				//let's make sure we're not missing any REQUIRED parameters
298
-				if ( empty($url) ) {
299
-					$msg[] = sprintf( __('Missing the url for the requested %s', 'event_espresso'), $type == 'js' ? 'script' : 'stylesheet' );
300
-					$msg[] = sprintf( __('Doublecheck your <code>$this->_scripts_styles</code> array in %s and make sure that there is a "url" set for the %s ref', 'event_espresso'), '<strong>' . $this->caller . '</strong>', $ref );
301
-					throw new EE_Error( implode( '||', $msg ) );
298
+				if (empty($url)) {
299
+					$msg[] = sprintf(__('Missing the url for the requested %s', 'event_espresso'), $type == 'js' ? 'script' : 'stylesheet');
300
+					$msg[] = sprintf(__('Doublecheck your <code>$this->_scripts_styles</code> array in %s and make sure that there is a "url" set for the %s ref', 'event_espresso'), '<strong>'.$this->caller.'</strong>', $ref);
301
+					throw new EE_Error(implode('||', $msg));
302 302
 				}
303 303
 				//made it here so let's do the appropriate registration
304
-				$type == 'js' ? wp_register_script( $ref, $url, $depends, $version, $footer ) : wp_register_style( $ref, $url, $depends, $version );
304
+				$type == 'js' ? wp_register_script($ref, $url, $depends, $version, $footer) : wp_register_style($ref, $url, $depends, $version);
305 305
 			}
306 306
 
307 307
 			//k now lets do the enqueues
308
-			if( !isset( $this->_scripts_styles['enqueues'] ) )
309
-				return;  //not sure if we should throw an error here or not.
310
-			foreach( $this->_scripts_styles['enqueues'] as $ref => $routes ) {
308
+			if ( ! isset($this->_scripts_styles['enqueues']))
309
+				return; //not sure if we should throw an error here or not.
310
+			foreach ($this->_scripts_styles['enqueues'] as $ref => $routes) {
311 311
 				//make sure $routes is an array
312 312
 				$routes = (array) $routes;
313 313
 
314
-				if ( in_array($this->_current_route, $routes ) ) {
314
+				if (in_array($this->_current_route, $routes)) {
315 315
 					$this->_scripts_styles['registers'][$ref]['type'] == 'js' ? wp_enqueue_script($ref) : wp_enqueue_style($ref);
316 316
 					//if we have a localization for the script let's do that too.
317
-					if ( isset( $this->_scripts_styles['localize'][$ref] ) ) {
318
-						foreach ( $this->_scripts_styles['localize'][$ref] as $object_name => $indexes ) {
319
-							wp_localize_script($ref, $object_name , $this->_scripts_styles['localize'][$ref][$object_name] );
317
+					if (isset($this->_scripts_styles['localize'][$ref])) {
318
+						foreach ($this->_scripts_styles['localize'][$ref] as $object_name => $indexes) {
319
+							wp_localize_script($ref, $object_name, $this->_scripts_styles['localize'][$ref][$object_name]);
320 320
 						}
321 321
 					}
322 322
 				}
323 323
 			}
324 324
 
325 325
 			//let's do the deregisters
326
-			if ( !isset( $this->_scripts_styles['deregisters'] ) )
326
+			if ( ! isset($this->_scripts_styles['deregisters']))
327 327
 				return;
328
-			foreach ( $this->_scripts_styles['deregisters'] as $ref => $details ) {
328
+			foreach ($this->_scripts_styles['deregisters'] as $ref => $details) {
329 329
 				$defaults = array(
330 330
 					'type' => 'js'
331 331
 					);
332
-				$details = wp_parse_args( $details, $defaults );
333
-				extract( $details );
332
+				$details = wp_parse_args($details, $defaults);
333
+				extract($details);
334 334
 
335 335
 				$type == 'js' ? wp_deregister_script($ref) : wp_deregister_style($ref);
336 336
 
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
 	 */
350 350
 	private function _set_defaults() {
351 351
 		$this->_ajax_func = $this->_init_func = $this->_metaboxes = $this->_scripts = $this->_styles = $this->_wp_action_filters_priority = array();
352
-		$this->_current_route = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'default';
352
+		$this->_current_route = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'default';
353 353
 		$this->caller = get_class($this);
354 354
 		$this->_extend = stripos($this->caller, 'Extend') ? TRUE : FALSE;
355 355
 	}
@@ -364,35 +364,35 @@  discard block
 block discarded – undo
364 364
 	 */
365 365
 	protected function _set_page_object() {
366 366
 		//first make sure $this->_name is set
367
-		if ( empty( $this->_name ) ) {
367
+		if (empty($this->_name)) {
368 368
 			$msg[] = __('We can\'t load the page object', 'event_espresso');
369
-			$msg[] = sprintf( __("This is because the %s child class has not set the
370
-				'_name' property", 'event_espresso'), $this->caller );
371
-			throw new EE_Error( implode( '||', $msg ) );
369
+			$msg[] = sprintf(__("This is because the %s child class has not set the
370
+				'_name' property", 'event_espresso'), $this->caller);
371
+			throw new EE_Error(implode('||', $msg));
372 372
 		}
373 373
 
374
-		$ref = str_replace('_' , ' ', $this->_name); //take the_message -> the message
375
-		$ref = str_replace(' ', '_', ucwords($ref) ) . '_Admin_Page'; //take the message -> The_Message
374
+		$ref = str_replace('_', ' ', $this->_name); //take the_message -> the message
375
+		$ref = str_replace(' ', '_', ucwords($ref)).'_Admin_Page'; //take the message -> The_Message
376 376
 
377 377
 		//first default file (if exists)
378
-		$decaf_file = EE_ADMIN_PAGES . $this->_name . DS . $ref . '.core.php';
379
-		if ( is_readable( $decaf_file ) )
380
-		require_once( $decaf_file );
378
+		$decaf_file = EE_ADMIN_PAGES.$this->_name.DS.$ref.'.core.php';
379
+		if (is_readable($decaf_file))
380
+		require_once($decaf_file);
381 381
 
382 382
 		//now we have to do require for extended file (if needed)
383
-		if ( $this->_extend ) {
384
-			require_once( EE_CORE_CAF_ADMIN_EXTEND . $this->_name . DS . 'Extend_' . $ref . '.core.php' );
383
+		if ($this->_extend) {
384
+			require_once(EE_CORE_CAF_ADMIN_EXTEND.$this->_name.DS.'Extend_'.$ref.'.core.php');
385 385
 		}
386 386
 
387 387
 
388 388
 		//if we've got an extended class we use that!
389
-		$ref = $this->_extend ? 'Extend_' . $ref : $ref;
389
+		$ref = $this->_extend ? 'Extend_'.$ref : $ref;
390 390
 
391 391
 		//let's make sure the class exists
392
-		if ( !class_exists( $ref ) ) {
392
+		if ( ! class_exists($ref)) {
393 393
 			$msg[] = __('We can\'t load the page object', 'event_espresso');
394
-			$msg[] = sprintf( __('The class name that was given is %s. Check the spelling and make sure its correct, also there needs to be an autoloader setup for the class', 'event_espresso'), $ref );
395
-			throw new EE_Error( implode( '||', $msg ) );
394
+			$msg[] = sprintf(__('The class name that was given is %s. Check the spelling and make sure its correct, also there needs to be an autoloader setup for the class', 'event_espresso'), $ref);
395
+			throw new EE_Error(implode('||', $msg));
396 396
 		}
397 397
 
398 398
 		$a = new ReflectionClass($ref);
@@ -417,27 +417,27 @@  discard block
 block discarded – undo
417 417
 		$method_callback = $this->_current_route == 'default' ? 'default_callback' : $this->_current_route;
418 418
 
419 419
 		//these run before the Admin_Page route executes.
420
-		if ( method_exists( $this, $method_callback ) ) {
421
-			call_user_func( array( $this, $method_callback) );
420
+		if (method_exists($this, $method_callback)) {
421
+			call_user_func(array($this, $method_callback));
422 422
 		}
423 423
 
424 424
 
425 425
 		//these run via the _redirect_after_action method in EE_Admin_Page which usually happens after non_UI methods in EE_Admin_Page classes.  There are two redirect actions, the first fires before $query_args might be manipulated by "save and close" actions and the seond fires right before the actual redirect happens.
426 426
 		//first the actions
427 427
 		//note that these action hooks will have the $query_args value available.
428
-		$admin_class_name = get_class( $this->_adminpage_obj );
428
+		$admin_class_name = get_class($this->_adminpage_obj);
429 429
 
430
-		if ( method_exists( $this, '_redirect_action_early_' . $this->_current_route ) ) {
431
-			add_action( 'AHEE__' . $admin_class_name . '___redirect_after_action__before_redirect_modification_' . $this->_current_route, array( $this, '_redirect_action_early_' . $this->_current_route ), 10 );
430
+		if (method_exists($this, '_redirect_action_early_'.$this->_current_route)) {
431
+			add_action('AHEE__'.$admin_class_name.'___redirect_after_action__before_redirect_modification_'.$this->_current_route, array($this, '_redirect_action_early_'.$this->_current_route), 10);
432 432
 		}
433 433
 
434
-		if ( method_exists( $this, '_redirect_action_' . $this->_current_route ) ) {
435
-			add_action( 'AHEE_redirect_' . $admin_class_name . $this->_current_route, array( $this, '_redirect_action_' . $this->_current_route ), 10 );
434
+		if (method_exists($this, '_redirect_action_'.$this->_current_route)) {
435
+			add_action('AHEE_redirect_'.$admin_class_name.$this->_current_route, array($this, '_redirect_action_'.$this->_current_route), 10);
436 436
 		}
437 437
 
438 438
 		//let's hook into the _redirect itself and allow for changing where the user goes after redirect.  This will have $query_args and $redirect_url available.
439
-		if ( method_exists( $this, '_redirect_filter_' . $this->_current_route ) ) {
440
-			add_filter( 'FHEE_redirect_' . $admin_class_name . $this->_current_route, array( $this, '_redirect_filter_' . $this->_current_route ), 10, 2 );
439
+		if (method_exists($this, '_redirect_filter_'.$this->_current_route)) {
440
+			add_filter('FHEE_redirect_'.$admin_class_name.$this->_current_route, array($this, '_redirect_filter_'.$this->_current_route), 10, 2);
441 441
 		}
442 442
 
443 443
 	}
@@ -460,12 +460,12 @@  discard block
 block discarded – undo
460 460
 				'argnum' => 1,
461 461
 				'priority' => 10
462 462
 				),
463
-			'FHEE_list_table_views_' . $this->_adminpage_obj->page_slug . '_' . $this->_current_route => array(
463
+			'FHEE_list_table_views_'.$this->_adminpage_obj->page_slug.'_'.$this->_current_route => array(
464 464
 				'type' => 'filter',
465 465
 				'argnum' => 1,
466 466
 				'priority' => 10
467 467
 				),
468
-			'FHEE_list_table_views_' . $this->_adminpage_obj->page_slug => array(
468
+			'FHEE_list_table_views_'.$this->_adminpage_obj->page_slug => array(
469 469
 				'type' => 'filter',
470 470
 				'argnum' => 1,
471 471
 				'priority' => 10
@@ -484,14 +484,14 @@  discard block
 block discarded – undo
484 484
 
485 485
 
486 486
 
487
-		foreach ( $hook_filter_array as $hook => $args ) {
488
-			if ( method_exists( $this, $this->_current_route . '_' . $hook ) ) {
489
-				if ( isset( $this->_wp_action_filters_priority[$hook] ) )
487
+		foreach ($hook_filter_array as $hook => $args) {
488
+			if (method_exists($this, $this->_current_route.'_'.$hook)) {
489
+				if (isset($this->_wp_action_filters_priority[$hook]))
490 490
 					$args['priority'] = $this->_wp_action_filters_priority[$hook];
491
-				if ( $args['type'] == 'action' )
492
-					add_action( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
491
+				if ($args['type'] == 'action')
492
+					add_action($hook, array($this, $this->_current_route.'_'.$hook), $args['priority'], $args['argnum']);
493 493
 				else
494
-					add_filter( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
494
+					add_filter($hook, array($this, $this->_current_route.'_'.$hook), $args['priority'], $args['argnum']);
495 495
 			}
496 496
 		}
497 497
 
@@ -504,18 +504,18 @@  discard block
 block discarded – undo
504 504
 	 */
505 505
 	private function _ajax_hooks() {
506 506
 
507
-		if ( empty( $this->_ajax_func) )
507
+		if (empty($this->_ajax_func))
508 508
 			return; //get out there's nothing to take care of.
509 509
 
510
-		foreach ( $this->_ajax_func as $action => $method ) {
510
+		foreach ($this->_ajax_func as $action => $method) {
511 511
 			//make sure method exists
512
-			if ( !method_exists($this, $method) ) {
513
-				$msg[] = __('There is no corresponding method for the hook labeled in the _ajax_func array', 'event_espresso') . '<br />';
514
-				$msg[] = sprintf( __('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso' ), $method, $this->caller );
515
-				throw new EE_Error( implode('||', $msg ) );
512
+			if ( ! method_exists($this, $method)) {
513
+				$msg[] = __('There is no corresponding method for the hook labeled in the _ajax_func array', 'event_espresso').'<br />';
514
+				$msg[] = sprintf(__('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso'), $method, $this->caller);
515
+				throw new EE_Error(implode('||', $msg));
516 516
 			}
517 517
 
518
-			add_action('wp_ajax_' . $action, array( $this, $method ) );
518
+			add_action('wp_ajax_'.$action, array($this, $method));
519 519
 		}
520 520
 
521 521
 	}
@@ -528,21 +528,21 @@  discard block
 block discarded – undo
528 528
 	 * @return void
529 529
 	 */
530 530
 	protected function _init_hooks() {
531
-		if ( empty( $this->_init_func) )
531
+		if (empty($this->_init_func))
532 532
 			return; //get out there's nothing to take care of.
533 533
 
534 534
 		//We need to determine what page_route we are on!
535
-		$current_route = isset ( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'default';
535
+		$current_route = isset ($_REQUEST['action']) ? $_REQUEST['action'] : 'default';
536 536
 
537
-		foreach ( $this->_init_func as $route => $method ) {
537
+		foreach ($this->_init_func as $route => $method) {
538 538
 			//make sure method exists
539
-			if ( !method_exists($this, $method) ) {
540
-				$msg[] = __('There is no corresponding method for the hook labeled in the _init_func array', 'event_espresso') . '<br />';
541
-				$msg[] = sprintf( __('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso' ), $method, $this->caller );
542
-				throw new EE_Error( implode('||', $msg ) );
539
+			if ( ! method_exists($this, $method)) {
540
+				$msg[] = __('There is no corresponding method for the hook labeled in the _init_func array', 'event_espresso').'<br />';
541
+				$msg[] = sprintf(__('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso'), $method, $this->caller);
542
+				throw new EE_Error(implode('||', $msg));
543 543
 			}
544
-			if ( $route == $this->_current_route )
545
-				add_action('admin_init', array( $this, $method ) );
544
+			if ($route == $this->_current_route)
545
+				add_action('admin_init', array($this, $method));
546 546
 		}
547 547
 
548 548
 	}
@@ -557,28 +557,28 @@  discard block
 block discarded – undo
557 557
 	 * @return void
558 558
 	 */
559 559
 	public function add_metaboxes() {
560
-		if ( empty( $this->_metaboxes ) )
560
+		if (empty($this->_metaboxes))
561 561
 			return; //get out we don't have any metaboxes to set for this connection
562 562
 
563
-		$this->_handle_metabox_array( $this->_metaboxes );
563
+		$this->_handle_metabox_array($this->_metaboxes);
564 564
 
565 565
 	}
566 566
 
567 567
 
568 568
 
569
-	private function _handle_metabox_array( $boxes, $add = TRUE ) {
569
+	private function _handle_metabox_array($boxes, $add = TRUE) {
570 570
 
571
-		foreach ( $boxes as $box ) {
572
-			if ( !isset($box['page_route']) )
571
+		foreach ($boxes as $box) {
572
+			if ( ! isset($box['page_route']))
573 573
 				continue; //we dont' have a valid array
574 574
 
575 575
 			//let's make sure $box['page_route'] is an array so the "foreach" will work.
576 576
 			$box['page_route'] = (array) $box['page_route'];
577 577
 
578
-			foreach ( $box['page_route'] as $route ) {
579
-				if ( $route != $this->_current_route )
578
+			foreach ($box['page_route'] as $route) {
579
+				if ($route != $this->_current_route)
580 580
 					continue; //get out we only add metaboxes for set route.
581
-				if ( $add )
581
+				if ($add)
582 582
 					$this->_add_metabox($box);
583 583
 				else
584 584
 					$this->_remove_metabox($box);
@@ -596,10 +596,10 @@  discard block
 block discarded – undo
596 596
 	 */
597 597
 	public function remove_metaboxes() {
598 598
 
599
-		if ( empty( $this->_remove_metaboxes ) )
599
+		if (empty($this->_remove_metaboxes))
600 600
 			return; //get out there are no metaboxes to remove
601 601
 
602
-		$this->_handle_metabox_array( $this->_remove_metaboxes, FALSE );
602
+		$this->_handle_metabox_array($this->_remove_metaboxes, FALSE);
603 603
 	}
604 604
 
605 605
 
@@ -609,53 +609,53 @@  discard block
 block discarded – undo
609 609
 	 * @access private
610 610
 	 * @param array $args an array of args that have been set for this metabox by the child class
611 611
 	 */
612
-	private function _add_metabox( $args ) {
612
+	private function _add_metabox($args) {
613 613
 		$current_screen = get_current_screen();
614
-		$screen_id = is_object( $current_screen ) ? $current_screen->id : NULL;
615
-		$func = isset( $args['func'] ) ? $args['func'] : 'some_invalid_callback';
614
+		$screen_id = is_object($current_screen) ? $current_screen->id : NULL;
615
+		$func = isset($args['func']) ? $args['func'] : 'some_invalid_callback';
616 616
 
617 617
 		//set defaults
618 618
 		$defaults = array(
619 619
 			'func' => $func,
620
-			'id' => $this->caller . '_' . $func . '_metabox',
620
+			'id' => $this->caller.'_'.$func.'_metabox',
621 621
 			'priority' => 'default',
622 622
 			'label' => $this->caller,
623 623
 			'context' => 'advanced',
624 624
 			'callback_args' => array(),
625
-			'page' => isset( $args['page'] ) ? $args['page'] : $screen_id
625
+			'page' => isset($args['page']) ? $args['page'] : $screen_id
626 626
 			);
627 627
 
628
-		$args = wp_parse_args( $args, $defaults );
628
+		$args = wp_parse_args($args, $defaults);
629 629
 		extract($args);
630 630
 
631 631
 
632 632
 		//make sure method exists
633
-		if ( !method_exists($this, $func) ) {
634
-			$msg[] = __('There is no corresponding method to display the metabox content', 'event_espresso') . '<br />';
635
-			$msg[] = sprintf( __('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso' ), $func, $this->caller );
636
-			throw new EE_Error( implode('||', $msg ) );
633
+		if ( ! method_exists($this, $func)) {
634
+			$msg[] = __('There is no corresponding method to display the metabox content', 'event_espresso').'<br />';
635
+			$msg[] = sprintf(__('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso'), $func, $this->caller);
636
+			throw new EE_Error(implode('||', $msg));
637 637
 		}
638 638
 
639 639
 		//everything checks out so lets add the metabox
640
-		add_meta_box( $id, $label, array( $this, $func ), $page, $context, $priority, $callback_args);
640
+		add_meta_box($id, $label, array($this, $func), $page, $context, $priority, $callback_args);
641 641
 	}
642 642
 
643 643
 
644 644
 
645
-	private function _remove_metabox( $args ) {
645
+	private function _remove_metabox($args) {
646 646
 		$current_screen = get_current_screen();
647
-		$screen_id = is_object( $current_screen ) ? $current_screen->id : NULL;
648
-		$func = isset( $args['func'] ) ? $args['func'] : 'some_invalid_callback';
647
+		$screen_id = is_object($current_screen) ? $current_screen->id : NULL;
648
+		$func = isset($args['func']) ? $args['func'] : 'some_invalid_callback';
649 649
 
650 650
 		//set defaults
651 651
 		$defaults = array(
652
-			'id' => isset( $args['id'] ) ? $args['id'] : $this->_current_route . '_' . $this->caller . '_' . $func . '_metabox',
652
+			'id' => isset($args['id']) ? $args['id'] : $this->_current_route.'_'.$this->caller.'_'.$func.'_metabox',
653 653
 			'context' => 'default',
654
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : $screen_id
654
+			'screen' => isset($args['screen']) ? $args['screen'] : $screen_id
655 655
 		);
656 656
 
657
-		$args = wp_parse_args( $args, $defaults );
658
-		extract( $args );
657
+		$args = wp_parse_args($args, $defaults);
658
+		extract($args);
659 659
 
660 660
 		//everything checks out so lets remove the box!
661 661
 		remove_meta_box($id, $screen, $context);
Please login to merge, or discard this patch.
Braces   +59 added lines, -35 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
3 3
 	exit('NO direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  * Event Espresso
@@ -217,12 +218,15 @@  discard block
 block discarded – undo
217 218
 		$this->_set_hooks_properties();
218 219
 
219 220
 		//first let's verify we're on the right page
220
-		if ( !isset( $this->_req_data['page'] ) || ( isset( $this->_req_data['page'] ) && $this->_adminpage_obj->page_slug != $this->_req_data['page'] ) )
221
-			return; //get out nothing more to be done here.
221
+		if ( !isset( $this->_req_data['page'] ) || ( isset( $this->_req_data['page'] ) && $this->_adminpage_obj->page_slug != $this->_req_data['page'] ) ) {
222
+					return;
223
+		}
224
+		//get out nothing more to be done here.
222 225
 
223 226
 		//allow for extends to modify properties
224
-		if ( method_exists( $this, '_extend_properties' ) )
225
-			$this->_extend_properties();
227
+		if ( method_exists( $this, '_extend_properties' ) ) {
228
+					$this->_extend_properties();
229
+		}
226 230
 
227 231
 		$this->_set_page_object();
228 232
 		$this->_init_hooks();
@@ -305,8 +309,10 @@  discard block
 block discarded – undo
305 309
 			}
306 310
 
307 311
 			//k now lets do the enqueues
308
-			if( !isset( $this->_scripts_styles['enqueues'] ) )
309
-				return;  //not sure if we should throw an error here or not.
312
+			if( !isset( $this->_scripts_styles['enqueues'] ) ) {
313
+							return;
314
+			}
315
+			//not sure if we should throw an error here or not.
310 316
 			foreach( $this->_scripts_styles['enqueues'] as $ref => $routes ) {
311 317
 				//make sure $routes is an array
312 318
 				$routes = (array) $routes;
@@ -323,8 +329,9 @@  discard block
 block discarded – undo
323 329
 			}
324 330
 
325 331
 			//let's do the deregisters
326
-			if ( !isset( $this->_scripts_styles['deregisters'] ) )
327
-				return;
332
+			if ( !isset( $this->_scripts_styles['deregisters'] ) ) {
333
+							return;
334
+			}
328 335
 			foreach ( $this->_scripts_styles['deregisters'] as $ref => $details ) {
329 336
 				$defaults = array(
330 337
 					'type' => 'js'
@@ -376,8 +383,9 @@  discard block
 block discarded – undo
376 383
 
377 384
 		//first default file (if exists)
378 385
 		$decaf_file = EE_ADMIN_PAGES . $this->_name . DS . $ref . '.core.php';
379
-		if ( is_readable( $decaf_file ) )
380
-		require_once( $decaf_file );
386
+		if ( is_readable( $decaf_file ) ) {
387
+				require_once( $decaf_file );
388
+		}
381 389
 
382 390
 		//now we have to do require for extended file (if needed)
383 391
 		if ( $this->_extend ) {
@@ -486,12 +494,14 @@  discard block
 block discarded – undo
486 494
 
487 495
 		foreach ( $hook_filter_array as $hook => $args ) {
488 496
 			if ( method_exists( $this, $this->_current_route . '_' . $hook ) ) {
489
-				if ( isset( $this->_wp_action_filters_priority[$hook] ) )
490
-					$args['priority'] = $this->_wp_action_filters_priority[$hook];
491
-				if ( $args['type'] == 'action' )
492
-					add_action( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
493
-				else
494
-					add_filter( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
497
+				if ( isset( $this->_wp_action_filters_priority[$hook] ) ) {
498
+									$args['priority'] = $this->_wp_action_filters_priority[$hook];
499
+				}
500
+				if ( $args['type'] == 'action' ) {
501
+									add_action( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
502
+				} else {
503
+									add_filter( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
504
+				}
495 505
 			}
496 506
 		}
497 507
 
@@ -504,8 +514,10 @@  discard block
 block discarded – undo
504 514
 	 */
505 515
 	private function _ajax_hooks() {
506 516
 
507
-		if ( empty( $this->_ajax_func) )
508
-			return; //get out there's nothing to take care of.
517
+		if ( empty( $this->_ajax_func) ) {
518
+					return;
519
+		}
520
+		//get out there's nothing to take care of.
509 521
 
510 522
 		foreach ( $this->_ajax_func as $action => $method ) {
511 523
 			//make sure method exists
@@ -528,8 +540,10 @@  discard block
 block discarded – undo
528 540
 	 * @return void
529 541
 	 */
530 542
 	protected function _init_hooks() {
531
-		if ( empty( $this->_init_func) )
532
-			return; //get out there's nothing to take care of.
543
+		if ( empty( $this->_init_func) ) {
544
+					return;
545
+		}
546
+		//get out there's nothing to take care of.
533 547
 
534 548
 		//We need to determine what page_route we are on!
535 549
 		$current_route = isset ( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'default';
@@ -541,8 +555,9 @@  discard block
 block discarded – undo
541 555
 				$msg[] = sprintf( __('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso' ), $method, $this->caller );
542 556
 				throw new EE_Error( implode('||', $msg ) );
543 557
 			}
544
-			if ( $route == $this->_current_route )
545
-				add_action('admin_init', array( $this, $method ) );
558
+			if ( $route == $this->_current_route ) {
559
+							add_action('admin_init', array( $this, $method ) );
560
+			}
546 561
 		}
547 562
 
548 563
 	}
@@ -557,8 +572,10 @@  discard block
 block discarded – undo
557 572
 	 * @return void
558 573
 	 */
559 574
 	public function add_metaboxes() {
560
-		if ( empty( $this->_metaboxes ) )
561
-			return; //get out we don't have any metaboxes to set for this connection
575
+		if ( empty( $this->_metaboxes ) ) {
576
+					return;
577
+		}
578
+		//get out we don't have any metaboxes to set for this connection
562 579
 
563 580
 		$this->_handle_metabox_array( $this->_metaboxes );
564 581
 
@@ -569,19 +586,24 @@  discard block
 block discarded – undo
569 586
 	private function _handle_metabox_array( $boxes, $add = TRUE ) {
570 587
 
571 588
 		foreach ( $boxes as $box ) {
572
-			if ( !isset($box['page_route']) )
573
-				continue; //we dont' have a valid array
589
+			if ( !isset($box['page_route']) ) {
590
+							continue;
591
+			}
592
+			//we dont' have a valid array
574 593
 
575 594
 			//let's make sure $box['page_route'] is an array so the "foreach" will work.
576 595
 			$box['page_route'] = (array) $box['page_route'];
577 596
 
578 597
 			foreach ( $box['page_route'] as $route ) {
579
-				if ( $route != $this->_current_route )
580
-					continue; //get out we only add metaboxes for set route.
581
-				if ( $add )
582
-					$this->_add_metabox($box);
583
-				else
584
-					$this->_remove_metabox($box);
598
+				if ( $route != $this->_current_route ) {
599
+									continue;
600
+				}
601
+				//get out we only add metaboxes for set route.
602
+				if ( $add ) {
603
+									$this->_add_metabox($box);
604
+				} else {
605
+									$this->_remove_metabox($box);
606
+				}
585 607
 			}
586 608
 		}
587 609
 	}
@@ -596,8 +618,10 @@  discard block
 block discarded – undo
596 618
 	 */
597 619
 	public function remove_metaboxes() {
598 620
 
599
-		if ( empty( $this->_remove_metaboxes ) )
600
-			return; //get out there are no metaboxes to remove
621
+		if ( empty( $this->_remove_metaboxes ) ) {
622
+					return;
623
+		}
624
+		//get out there are no metaboxes to remove
601 625
 
602 626
 		$this->_handle_metabox_array( $this->_remove_metaboxes, FALSE );
603 627
 	}
Please login to merge, or discard this patch.
core/admin/EE_Admin_List_Table.core.php 4 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
 	/**
305 305
 	 * _get_hidden_fields
306 306
 	 * returns a html string of hidden fields so if any table filters are used the current view will be respected.
307
-	 * @return html string
307
+	 * @return string string
308 308
 	 */
309 309
 	protected function _get_hidden_fields() {
310 310
 		$action = isset( $this->_req_data['route'] ) ? $this->_req_data['route'] : '';
@@ -512,7 +512,7 @@  discard block
 block discarded – undo
512 512
 	 * @since 4.1
513 513
 	 * @access public
514 514
 	 *
515
-	 * @param object $item The current item
515
+	 * @param EE_Message_Template_Group $item The current item
516 516
 	 */
517 517
 	public function single_row( $item ) {
518 518
 		$row_class = $this->_get_row_class( $item );
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
  */
33 33
 
34 34
 if ( ! class_exists( 'WP_List_Table' )) {
35
-    require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
35
+	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
36 36
 }
37 37
 
38 38
 abstract class EE_Admin_List_Table extends WP_List_Table {
Please login to merge, or discard this patch.
Spacing   +77 added lines, -77 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('NO direct script access allowed');
4 4
 
5 5
 
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
  * ------------------------------------------------------------------------
32 32
  */
33 33
 
34
-if ( ! class_exists( 'WP_List_Table' )) {
35
-    require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
34
+if ( ! class_exists('WP_List_Table')) {
35
+    require_once(ABSPATH.'wp-admin/includes/class-wp-list-table.php');
36 36
 }
37 37
 
38 38
 abstract class EE_Admin_List_Table extends WP_List_Table {
@@ -215,16 +215,16 @@  discard block
 block discarded – undo
215 215
 	 * constructor
216 216
 	 * @param EE_Admin_Page object $admin_page we use this for obtaining everything we need in the list table.
217 217
 	 */
218
-	public function __construct( EE_Admin_Page $admin_page ) {
218
+	public function __construct(EE_Admin_Page $admin_page) {
219 219
 		$this->_admin_page = $admin_page;
220 220
 		$this->_req_data = $this->_admin_page->get_request_data();
221 221
 		$this->_view = $this->_admin_page->get_view();
222
-		$this->_views = empty( $this->_views ) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views;
222
+		$this->_views = empty($this->_views) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views;
223 223
 		$this->_current_page = $this->get_pagenum();
224
-		$this->_screen = $this->_admin_page->get_current_page() . '_' . $this->_admin_page->get_current_view();
225
-		$this->_yes_no = array(  __('No', 'event_espresso'), __('Yes', 'event_espresso'));
224
+		$this->_screen = $this->_admin_page->get_current_page().'_'.$this->_admin_page->get_current_view();
225
+		$this->_yes_no = array(__('No', 'event_espresso'), __('Yes', 'event_espresso'));
226 226
 
227
-		$this->_per_page = $this->get_items_per_page( $this->_screen . '_per_page', 10 );
227
+		$this->_per_page = $this->get_items_per_page($this->_screen.'_per_page', 10);
228 228
 
229 229
 		$this->_setup_data();
230 230
 		$this->_add_view_counts();
@@ -307,17 +307,17 @@  discard block
 block discarded – undo
307 307
 	 * @return html string
308 308
 	 */
309 309
 	protected function _get_hidden_fields() {
310
-		$action = isset( $this->_req_data['route'] ) ? $this->_req_data['route'] : '';
311
-		$action = empty( $action ) && isset( $this->_req_data['action'] ) ? $this->_req_data['action'] : $action;
310
+		$action = isset($this->_req_data['route']) ? $this->_req_data['route'] : '';
311
+		$action = empty($action) && isset($this->_req_data['action']) ? $this->_req_data['action'] : $action;
312 312
 		//if action is STILL empty, then we set it to default
313
-		$action = empty( $action ) ? 'default' : $action;
314
-		$field = '<input type="hidden" name="page" value="' . $this->_req_data['page'] . '" />' . "\n";
315
-		$field .= '<input type="hidden" name="route" value="'. $action .'" />' . "\n";/**/
316
-		$field .= '<input type="hidden" name="perpage" value="' . $this->_per_page . '" />' . "\n";
313
+		$action = empty($action) ? 'default' : $action;
314
+		$field = '<input type="hidden" name="page" value="'.$this->_req_data['page'].'" />'."\n";
315
+		$field .= '<input type="hidden" name="route" value="'.$action.'" />'."\n"; /**/
316
+		$field .= '<input type="hidden" name="perpage" value="'.$this->_per_page.'" />'."\n";
317 317
 
318 318
 		$bulk_actions = $this->_get_bulk_actions();
319
-		foreach ( $bulk_actions as $bulk_action => $label ) {
320
-			$field .= '<input type="hidden" name="' . $bulk_action . '_nonce" value="' . wp_create_nonce  ( $bulk_action . '_nonce' ) . '" />' . "\n";
319
+		foreach ($bulk_actions as $bulk_action => $label) {
320
+			$field .= '<input type="hidden" name="'.$bulk_action.'_nonce" value="'.wp_create_nonce($bulk_action.'_nonce').'" />'."\n";
321 321
 		}
322 322
 
323 323
 		return $field;
@@ -347,15 +347,15 @@  discard block
 block discarded – undo
347 347
 		 *
348 348
 		 * @var array
349 349
 		 */
350
-		$_sortable = apply_filters( "FHEE_manage_{$this->screen->id}_sortable_columns", $_sortable, $this->_screen );
350
+		$_sortable = apply_filters("FHEE_manage_{$this->screen->id}_sortable_columns", $_sortable, $this->_screen);
351 351
 
352 352
 		$sortable = array();
353
-		foreach ( $_sortable as $id => $data ) {
354
-			if ( empty( $data ) )
353
+		foreach ($_sortable as $id => $data) {
354
+			if (empty($data))
355 355
 				continue;
356 356
 
357 357
 			//fix for offset errors with WP_List_Table default get_columninfo()
358
-			if ( is_array($data) ) {
358
+			if (is_array($data)) {
359 359
 				$_data[0] = key($data);
360 360
 				$_data[1] = isset($data[1]) ? $data[1] : false;
361 361
 			} else {
@@ -364,13 +364,13 @@  discard block
 block discarded – undo
364 364
 
365 365
 			$data = (array) $data;
366 366
 
367
-			if ( !isset( $data[1] ) )
367
+			if ( ! isset($data[1]))
368 368
 				$_data[1] = false;
369 369
 
370 370
 
371 371
 			$sortable[$id] = $_data;
372 372
 		}
373
-		$this->_column_headers = array( $columns, $hidden, $sortable );
373
+		$this->_column_headers = array($columns, $hidden, $sortable);
374 374
 	}
375 375
 
376 376
 
@@ -386,11 +386,11 @@  discard block
 block discarded – undo
386 386
 	protected function _get_bulk_actions() {
387 387
 		$actions = array();
388 388
 		//the _views property should have the bulk_actions, so let's go through and extract them into a properly formatted array for the wp_list_table();
389
-		foreach ( $this->_views as $view => $args) {
390
-			if ( isset( $args['bulk_action']) && is_array($args['bulk_action']) && $this->_view == $view )
389
+		foreach ($this->_views as $view => $args) {
390
+			if (isset($args['bulk_action']) && is_array($args['bulk_action']) && $this->_view == $view)
391 391
 				//each bulk action will correspond with a admin page route, so we can check whatever the capability is for that page route and skip adding the bulk action if no access for the current logged in user.
392
-				foreach ( $args['bulk_action'] as $route =>$label ) {
393
-					if ( $this->_admin_page->check_user_access( $route, true ) ) {
392
+				foreach ($args['bulk_action'] as $route =>$label) {
393
+					if ($this->_admin_page->check_user_access($route, true)) {
394 394
 						$actions[$route] = $label;
395 395
 					}
396 396
 				}
@@ -408,18 +408,18 @@  discard block
 block discarded – undo
408 408
 	 */
409 409
 	private function _filters() {
410 410
 		$classname = get_class($this);
411
-		$filters = apply_filters( "FHEE__{$classname}__filters", (array) $this->_get_table_filters(), $this, $this->_screen );
411
+		$filters = apply_filters("FHEE__{$classname}__filters", (array) $this->_get_table_filters(), $this, $this->_screen);
412 412
 
413
-		if ( empty( $filters )) {
413
+		if (empty($filters)) {
414 414
 			return;
415 415
 		}
416
-		foreach ( $filters as $filter ) {
416
+		foreach ($filters as $filter) {
417 417
 			echo $filter;
418 418
 		}
419 419
 		//add filter button at end
420
-		echo '<input type="submit" class="button-secondary" value="' . __('Filter', 'event_espresso') . '" id="post-query-submit" />';
420
+		echo '<input type="submit" class="button-secondary" value="'.__('Filter', 'event_espresso').'" id="post-query-submit" />';
421 421
 		//add reset filters button at end
422
-		echo '<a class="button button-secondary"  href="' . $this->_admin_page->get_current_page_view_url() . '" style="display:inline-block">' . __('Reset Filters', 'event_espresso') . '</a>';
422
+		echo '<a class="button button-secondary"  href="'.$this->_admin_page->get_current_page_view_url().'" style="display:inline-block">'.__('Reset Filters', 'event_espresso').'</a>';
423 423
 	}
424 424
 
425 425
 
@@ -436,7 +436,7 @@  discard block
 block discarded – undo
436 436
 			array(
437 437
 				'total_items' => $total_items,
438 438
 				'per_page' => $this->_per_page,
439
-				'total_pages' => ceil($total_items / $this->_per_page )
439
+				'total_pages' => ceil($total_items / $this->_per_page)
440 440
 			)
441 441
 		);
442 442
 	}
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
452 452
 	 *
453 453
 	 * @return string html content for the column
454 454
 	 */
455
-	public function column_default( $item, $column_name ) {
455
+	public function column_default($item, $column_name) {
456 456
 		/**
457 457
 		 * Dynamic hook allowing for adding additional column content in this list table.
458 458
 		 * Note that $this->screen->id is in the format
@@ -462,7 +462,7 @@  discard block
 block discarded – undo
462 462
 		 * hook prefix ("event-espresso") will be different.
463 463
 		 *
464 464
 		 */
465
-		do_action( 'AHEE__EE_Admin_List_Table__column_' . $column_name . '__' . $this->screen->id, $item, $this->_screen );
465
+		do_action('AHEE__EE_Admin_List_Table__column_'.$column_name.'__'.$this->screen->id, $item, $this->_screen);
466 466
 	}
467 467
 
468 468
 
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
 		 *
479 479
 		 * @var array
480 480
 		 */
481
-		$columns = apply_filters( 'FHEE_manage_'.$this->screen->id.'_columns', $this->_columns, $this->_screen );
481
+		$columns = apply_filters('FHEE_manage_'.$this->screen->id.'_columns', $this->_columns, $this->_screen);
482 482
 		return $columns;
483 483
 	}
484 484
 
@@ -490,18 +490,18 @@  discard block
 block discarded – undo
490 490
 		$views = $this->get_views();
491 491
 		$assembled_views = '';
492 492
 
493
-		if ( empty( $views )) {
493
+		if (empty($views)) {
494 494
 			return;
495 495
 		}
496 496
 		echo "<ul class='subsubsub'>\n";
497
-		foreach ( $views as $view ) {
498
-			$count = isset($view['count'] ) && !empty($view['count']) ? absint( $view['count'] )  : 0;
499
-			if ( isset( $view['slug'] ) && isset( $view['class'] ) && isset( $view['url'] ) && isset( $view['label']) ) {
500
-				$assembled_views[ $view['slug'] ] = "\t<li class='" . $view['class'] . "'>" . '<a href="' . $view['url'] . '">' . $view['label'] . '</a> <span class="count">(' . $count . ')</span>';
497
+		foreach ($views as $view) {
498
+			$count = isset($view['count']) && ! empty($view['count']) ? absint($view['count']) : 0;
499
+			if (isset($view['slug']) && isset($view['class']) && isset($view['url']) && isset($view['label'])) {
500
+				$assembled_views[$view['slug']] = "\t<li class='".$view['class']."'>".'<a href="'.$view['url'].'">'.$view['label'].'</a> <span class="count">('.$count.')</span>';
501 501
 			}
502 502
 		}
503 503
 
504
-		echo is_array( $assembled_views) && ! empty( $assembled_views ) ? implode( " |</li>\n", $assembled_views ) . "</li>\n" : '';
504
+		echo is_array($assembled_views) && ! empty($assembled_views) ? implode(" |</li>\n", $assembled_views)."</li>\n" : '';
505 505
 		echo "</ul>";
506 506
 	}
507 507
 
@@ -514,10 +514,10 @@  discard block
 block discarded – undo
514 514
 	 *
515 515
 	 * @param object $item The current item
516 516
 	 */
517
-	public function single_row( $item ) {
518
-		$row_class = $this->_get_row_class( $item );
519
-		echo '<tr' . $row_class . '>';
520
-		$this->single_row_columns( $item );
517
+	public function single_row($item) {
518
+		$row_class = $this->_get_row_class($item);
519
+		echo '<tr'.$row_class.'>';
520
+		$this->single_row_columns($item);
521 521
 		echo '</tr>';
522 522
 	}
523 523
 
@@ -528,16 +528,16 @@  discard block
 block discarded – undo
528 528
 	 * @param  object $item the current item
529 529
 	 * @return string
530 530
 	 */
531
-	protected function _get_row_class( $item ) {
531
+	protected function _get_row_class($item) {
532 532
 		static $row_class = '';
533
-		$row_class = ( $row_class == '' ? 'alternate' : '' );
533
+		$row_class = ($row_class == '' ? 'alternate' : '');
534 534
 
535 535
 		$new_row = $row_class;
536 536
 
537
-		if ( !empty($this->_ajax_sorting_callback) )
537
+		if ( ! empty($this->_ajax_sorting_callback))
538 538
 			$new_row .= ' rowsortable';
539 539
 
540
-		return ' class="' . $new_row . '"';
540
+		return ' class="'.$new_row.'"';
541 541
 	}
542 542
 
543 543
 
@@ -552,13 +552,13 @@  discard block
 block discarded – undo
552 552
 
553 553
 	public function get_hidden_columns() {
554 554
 		$user_id = get_current_user_id();
555
-		$has_default = get_user_option('default'. $this->screen->id . 'columnshidden', $user_id);
556
-		if ( empty( $has_default ) && !empty($this->_hidden_columns ) ) {
557
-			update_user_option($user_id, 'default'.$this->screen->id . 'columnshidden', TRUE);
558
-			update_user_option($user_id, 'manage' . $this->screen->id . 'columnshidden', $this->_hidden_columns, TRUE );
555
+		$has_default = get_user_option('default'.$this->screen->id.'columnshidden', $user_id);
556
+		if (empty($has_default) && ! empty($this->_hidden_columns)) {
557
+			update_user_option($user_id, 'default'.$this->screen->id.'columnshidden', TRUE);
558
+			update_user_option($user_id, 'manage'.$this->screen->id.'columnshidden', $this->_hidden_columns, TRUE);
559 559
 		}
560
-		$ref = 'manage' . $this->screen->id . 'columnshidden';
561
-		$saved_columns = (array) get_user_option( $ref, $user_id );
560
+		$ref = 'manage'.$this->screen->id.'columnshidden';
561
+		$saved_columns = (array) get_user_option($ref, $user_id);
562 562
 		return $saved_columns;
563 563
 	}
564 564
 
@@ -574,31 +574,31 @@  discard block
 block discarded – undo
574 574
 	 *
575 575
 	 * @param object $item The current item
576 576
 	 */
577
-	protected function single_row_columns( $item ) {
578
-		list( $columns, $hidden ) = $this->get_column_info();
577
+	protected function single_row_columns($item) {
578
+		list($columns, $hidden) = $this->get_column_info();
579 579
 
580
-		foreach ( $columns as $column_name => $column_display_name ) {
580
+		foreach ($columns as $column_name => $column_display_name) {
581 581
 			$class = "class='$column_name column-$column_name'";
582 582
 
583 583
 			$style = '';
584
-			if ( in_array( $column_name, $hidden ) )
584
+			if (in_array($column_name, $hidden))
585 585
 				$style = ' style="display:none;"';
586 586
 
587 587
 			$attributes = "$class$style";
588 588
 
589
-			if ( 'cb' == $column_name ) {
589
+			if ('cb' == $column_name) {
590 590
 				echo '<th scope="row" class="check-column">';
591
-				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content', $this->column_cb( $item ), $item, $this );
591
+				echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content', $this->column_cb($item), $item, $this);
592 592
 				echo '</th>';
593 593
 			}
594
-			elseif ( method_exists( $this, 'column_' . $column_name ) ) {
594
+			elseif (method_exists($this, 'column_'.$column_name)) {
595 595
 				echo "<td $attributes>";
596
-				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_' . $column_name . '__column_content', call_user_func( array( $this, 'column_' . $column_name ), $item ), $item, $this );
596
+				echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_'.$column_name.'__column_content', call_user_func(array($this, 'column_'.$column_name), $item), $item, $this);
597 597
 				echo "</td>";
598 598
 			}
599 599
 			else {
600 600
 				echo "<td $attributes>";
601
-				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content', $this->column_default( $item, $column_name ), $item, $column_name, $this );
601
+				echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content', $this->column_default($item, $column_name), $item, $column_name, $this);
602 602
 				echo "</td>";
603 603
 			}
604 604
 		}
@@ -606,19 +606,19 @@  discard block
 block discarded – undo
606 606
 
607 607
 
608 608
 
609
-	public function extra_tablenav( $which ) {
610
-		if ( $which == 'top' ) {
609
+	public function extra_tablenav($which) {
610
+		if ($which == 'top') {
611 611
 			$this->_filters();
612 612
 			echo $this->_get_hidden_fields();
613 613
 			echo '<br class="clear">';
614
-		}else{
614
+		} else {
615 615
 			echo '<div class="list-table-bottom-buttons alignleft actions">';
616
-			foreach($this->_bottom_buttons as $type => $action){
617
-				$route = isset( $action['route'] ) ? $action['route'] : '';
618
-				$extra_request = isset( $action['extra_request'] ) ? $action['extra_request'] : '';
616
+			foreach ($this->_bottom_buttons as $type => $action) {
617
+				$route = isset($action['route']) ? $action['route'] : '';
618
+				$extra_request = isset($action['extra_request']) ? $action['extra_request'] : '';
619 619
 				echo $this->_admin_page->get_action_link_or_button($route, $type, $extra_request);
620 620
 			}
621
-			do_action( 'AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', $this, $this->_screen );
621
+			do_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', $this, $this->_screen);
622 622
 			echo '</div>';
623 623
 		}
624 624
 		//echo $this->_entries_per_page_dropdown;
@@ -668,13 +668,13 @@  discard block
 block discarded – undo
668 668
 	 *
669 669
 	 * @return string The assembled action elements container.
670 670
 	 */
671
-	protected function _action_string( $action_items, $item, $action_container = 'ul', $action_class = '', $action_id = '' ) {
671
+	protected function _action_string($action_items, $item, $action_container = 'ul', $action_class = '', $action_id = '') {
672 672
 		$content = '';
673
-		$action_class = ! empty( $action_class ) ? ' class="' . $action_class . '"' : '';
674
-		$action_id = ! empty( $action_id ) ? ' id="' . $action_id . '"' : '';
675
-		$content .= ! empty( $action_container ) ? '<' . $action_container . $action_class . $action_id . '>' : '';
676
-		$content .= apply_filters( 'FHEE__EE_Admin_List_Table___action_string__action_items', $action_items, $item, $this );
677
-		$content .= ! empty( $container ) ? '</' . $container . '>' : '';
673
+		$action_class = ! empty($action_class) ? ' class="'.$action_class.'"' : '';
674
+		$action_id = ! empty($action_id) ? ' id="'.$action_id.'"' : '';
675
+		$content .= ! empty($action_container) ? '<'.$action_container.$action_class.$action_id.'>' : '';
676
+		$content .= apply_filters('FHEE__EE_Admin_List_Table___action_string__action_items', $action_items, $item, $this);
677
+		$content .= ! empty($container) ? '</'.$container.'>' : '';
678 678
 		return $content;
679 679
 	}
680 680
 }
Please login to merge, or discard this patch.
Braces   +20 added lines, -16 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
3 3
 	exit('NO direct script access allowed');
4
+}
4 5
 
5 6
 
6 7
 /**
@@ -351,8 +352,9 @@  discard block
 block discarded – undo
351 352
 
352 353
 		$sortable = array();
353 354
 		foreach ( $_sortable as $id => $data ) {
354
-			if ( empty( $data ) )
355
-				continue;
355
+			if ( empty( $data ) ) {
356
+							continue;
357
+			}
356 358
 
357 359
 			//fix for offset errors with WP_List_Table default get_columninfo()
358 360
 			if ( is_array($data) ) {
@@ -364,8 +366,9 @@  discard block
 block discarded – undo
364 366
 
365 367
 			$data = (array) $data;
366 368
 
367
-			if ( !isset( $data[1] ) )
368
-				$_data[1] = false;
369
+			if ( !isset( $data[1] ) ) {
370
+							$_data[1] = false;
371
+			}
369 372
 
370 373
 
371 374
 			$sortable[$id] = $_data;
@@ -387,11 +390,12 @@  discard block
 block discarded – undo
387 390
 		$actions = array();
388 391
 		//the _views property should have the bulk_actions, so let's go through and extract them into a properly formatted array for the wp_list_table();
389 392
 		foreach ( $this->_views as $view => $args) {
390
-			if ( isset( $args['bulk_action']) && is_array($args['bulk_action']) && $this->_view == $view )
391
-				//each bulk action will correspond with a admin page route, so we can check whatever the capability is for that page route and skip adding the bulk action if no access for the current logged in user.
393
+			if ( isset( $args['bulk_action']) && is_array($args['bulk_action']) && $this->_view == $view ) {
394
+							//each bulk action will correspond with a admin page route, so we can check whatever the capability is for that page route and skip adding the bulk action if no access for the current logged in user.
392 395
 				foreach ( $args['bulk_action'] as $route =>$label ) {
393 396
 					if ( $this->_admin_page->check_user_access( $route, true ) ) {
394 397
 						$actions[$route] = $label;
398
+			}
395 399
 					}
396 400
 				}
397 401
 		}
@@ -534,8 +538,9 @@  discard block
 block discarded – undo
534 538
 
535 539
 		$new_row = $row_class;
536 540
 
537
-		if ( !empty($this->_ajax_sorting_callback) )
538
-			$new_row .= ' rowsortable';
541
+		if ( !empty($this->_ajax_sorting_callback) ) {
542
+					$new_row .= ' rowsortable';
543
+		}
539 544
 
540 545
 		return ' class="' . $new_row . '"';
541 546
 	}
@@ -581,8 +586,9 @@  discard block
 block discarded – undo
581 586
 			$class = "class='$column_name column-$column_name'";
582 587
 
583 588
 			$style = '';
584
-			if ( in_array( $column_name, $hidden ) )
585
-				$style = ' style="display:none;"';
589
+			if ( in_array( $column_name, $hidden ) ) {
590
+							$style = ' style="display:none;"';
591
+			}
586 592
 
587 593
 			$attributes = "$class$style";
588 594
 
@@ -590,13 +596,11 @@  discard block
 block discarded – undo
590 596
 				echo '<th scope="row" class="check-column">';
591 597
 				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content', $this->column_cb( $item ), $item, $this );
592 598
 				echo '</th>';
593
-			}
594
-			elseif ( method_exists( $this, 'column_' . $column_name ) ) {
599
+			} elseif ( method_exists( $this, 'column_' . $column_name ) ) {
595 600
 				echo "<td $attributes>";
596 601
 				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_' . $column_name . '__column_content', call_user_func( array( $this, 'column_' . $column_name ), $item ), $item, $this );
597 602
 				echo "</td>";
598
-			}
599
-			else {
603
+			} else {
600 604
 				echo "<td $attributes>";
601 605
 				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content', $this->column_default( $item, $column_name ), $item, $column_name, $this );
602 606
 				echo "</td>";
@@ -611,7 +615,7 @@  discard block
 block discarded – undo
611 615
 			$this->_filters();
612 616
 			echo $this->_get_hidden_fields();
613 617
 			echo '<br class="clear">';
614
-		}else{
618
+		} else{
615 619
 			echo '<div class="list-table-bottom-buttons alignleft actions">';
616 620
 			foreach($this->_bottom_buttons as $type => $action){
617 621
 				$route = isset( $action['route'] ) ? $action['route'] : '';
Please login to merge, or discard this patch.
core/admin/EE_Admin_Page.core.php 4 patches
Doc Comments   +5 added lines, -6 removed lines patch added patch discarded remove patch
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
 	 *
470 470
 	 * @final
471 471
 	 * @access protected
472
-	 * @return void
472
+	 * @return false|null
473 473
 	 */
474 474
 	final protected function _page_setup() {
475 475
 
@@ -744,7 +744,7 @@  discard block
 block discarded – undo
744 744
 	 * All this method does is verify the incoming request and make sure that routes exist for it.  We do this early so we know if we need to drop out.
745 745
 	 *
746 746
 	 * @access protected
747
-	 * @return void
747
+	 * @return false|null
748 748
 	 */
749 749
 	protected function _verify_routes() {
750 750
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -806,7 +806,7 @@  discard block
 block discarded – undo
806 806
 	/**
807 807
 	 * this method simply verifies a given route and makes sure its an actual route available for the loaded page
808 808
 	 * @param  string $route the route name we're verifying
809
-	 * @return mixed  (bool|Exception)      we'll throw an exception if this isn't a valid route.
809
+	 * @return boolean  (bool|Exception)      we'll throw an exception if this isn't a valid route.
810 810
 	 */
811 811
 	protected function _verify_route( $route ) {
812 812
 		if ( array_key_exists( $this->_req_action, $this->_page_routes )) {
@@ -2189,7 +2189,7 @@  discard block
 block discarded – undo
2189 2189
 	 * @param	string	$name		key used for the action ID (i.e. event_id)
2190 2190
 	 * @param	int		$id	id attached to the item published
2191 2191
 	 * @param	string	$delete	page route callback for the delete action
2192
-	 * @param	string	$post_save_redirect_URL	custom URL to redirect to after Save & Close has been completed
2192
+	 * @param	string	$save_close_redirect_URL	custom URL to redirect to after Save & Close has been completed
2193 2193
 	 * @param	boolean	$both_btns	whether to display BOTH the "Save & Close" and "Save" buttons or just the Save button
2194 2194
 	 */
2195 2195
 	protected function _set_publish_post_box_vars( $name = NULL, $id = FALSE, $delete = FALSE, $save_close_redirect_URL = NULL, $both_btns = TRUE ) {
@@ -2689,7 +2689,7 @@  discard block
 block discarded – undo
2689 2689
 	/**
2690 2690
 	*		sort nav tabs
2691 2691
 	*		@access public
2692
-	*		@return void
2692
+	*		@return integer
2693 2693
 	*/
2694 2694
 	private function _sort_nav_tabs( $a, $b ) {
2695 2695
 		if ($a['order'] == $b['order']) {
@@ -3295,7 +3295,6 @@  discard block
 block discarded – undo
3295 3295
 	 *
3296 3296
 	 * @access 	protected
3297 3297
 	 * @param string $tab
3298
-	 * @param array $data
3299 3298
 	 * @param string $file	file where error occurred
3300 3299
 	 * @param string $func function  where error occurred
3301 3300
 	 * @param string $line	line no where error occurred
Please login to merge, or discard this patch.
Braces   +149 added lines, -94 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@  discard block
 block discarded – undo
1
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 /**
3 5
  * Event Espresso
4 6
  *
@@ -146,8 +148,9 @@  discard block
 block discarded – undo
146 148
 	 */
147 149
 	public function __construct( $routing = TRUE ) {
148 150
 
149
-		if ( strpos( $this->_get_dir(), 'caffeinated' ) !== false )
150
-			$this->_is_caf = TRUE;
151
+		if ( strpos( $this->_get_dir(), 'caffeinated' ) !== false ) {
152
+					$this->_is_caf = TRUE;
153
+		}
151 154
 
152 155
 		$this->_yes_no_values = array(
153 156
 			array('id' => TRUE, 'text' => __('Yes', 'event_espresso')),
@@ -178,8 +181,9 @@  discard block
 block discarded – undo
178 181
 		$this->_do_other_page_hooks();
179 182
 
180 183
 		//This just allows us to have extending clases do something specific before the parent constructor runs _page_setup.
181
-		if ( method_exists( $this, '_before_page_setup' ) )
182
-			$this->_before_page_setup();
184
+		if ( method_exists( $this, '_before_page_setup' ) ) {
185
+					$this->_before_page_setup();
186
+		}
183 187
 
184 188
 		//set up page dependencies
185 189
 		$this->_page_setup();
@@ -488,7 +492,9 @@  discard block
 block discarded – undo
488 492
 		global $ee_menu_slugs;
489 493
 		$ee_menu_slugs = (array) $ee_menu_slugs;
490 494
 
491
-		if ( ( !$this->_current_page || ! isset( $ee_menu_slugs[$this->_current_page] ) ) && !defined( 'DOING_AJAX') ) return FALSE;
495
+		if ( ( !$this->_current_page || ! isset( $ee_menu_slugs[$this->_current_page] ) ) && !defined( 'DOING_AJAX') ) {
496
+			return FALSE;
497
+		}
492 498
 
493 499
 
494 500
 		// becuz WP List tables have two duplicate select inputs for choosing bulk actions, we need to copy the action from the second to the first
@@ -523,12 +529,14 @@  discard block
 block discarded – undo
523 529
 		}
524 530
 
525 531
 		//for caffeinated and other extended functionality.  If there is a _extend_page_config method then let's run that to modify the all the various page configuration arrays
526
-		if ( method_exists( $this, '_extend_page_config' ) )
527
-			$this->_extend_page_config();
532
+		if ( method_exists( $this, '_extend_page_config' ) ) {
533
+					$this->_extend_page_config();
534
+		}
528 535
 
529 536
 		//for CPT and other extended functionality. If there is an _extend_page_config_for_cpt then let's run that to modify all the various page configuration arrays.
530
-		if ( method_exists( $this, '_extend_page_config_for_cpt' ) )
531
-			$this->_extend_page_config_for_cpt();
537
+		if ( method_exists( $this, '_extend_page_config_for_cpt' ) ) {
538
+					$this->_extend_page_config_for_cpt();
539
+		}
532 540
 
533 541
 		//filter routes and page_config so addons can add their stuff. Filtering done per class
534 542
 		$this->_page_routes = apply_filters( 'FHEE__' . get_class($this) . '__page_setup__page_routes', $this->_page_routes, $this );
@@ -644,8 +652,9 @@  discard block
 block discarded – undo
644 652
 		//add screen options - global, page child class, and view specific
645 653
 		$this->_add_global_screen_options();
646 654
 		$this->_add_screen_options();
647
-		if ( method_exists( $this, '_add_screen_options_' . $this->_current_view ) )
648
-			call_user_func( array( $this, '_add_screen_options_' . $this->_current_view ) );
655
+		if ( method_exists( $this, '_add_screen_options_' . $this->_current_view ) ) {
656
+					call_user_func( array( $this, '_add_screen_options_' . $this->_current_view ) );
657
+		}
649 658
 
650 659
 
651 660
 		//add help tab(s) and tours- set via page_config and qtips.
@@ -656,27 +665,31 @@  discard block
 block discarded – undo
656 665
 		//add feature_pointers - global, page child class, and view specific
657 666
 		$this->_add_feature_pointers();
658 667
 		$this->_add_global_feature_pointers();
659
-		if ( method_exists( $this, '_add_feature_pointer_' . $this->_current_view ) )
660
-			call_user_func( array( $this, '_add_feature_pointer_' . $this->_current_view ) );
668
+		if ( method_exists( $this, '_add_feature_pointer_' . $this->_current_view ) ) {
669
+					call_user_func( array( $this, '_add_feature_pointer_' . $this->_current_view ) );
670
+		}
661 671
 
662 672
 		//enqueue scripts/styles - global, page class, and view specific
663 673
 		add_action('admin_enqueue_scripts', array($this, 'load_global_scripts_styles'), 5 );
664 674
 		add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles'), 10 );
665
-		if ( method_exists( $this, 'load_scripts_styles_' . $this->_current_view ) )
666
-			add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles_' . $this->_current_view ), 15 );
675
+		if ( method_exists( $this, 'load_scripts_styles_' . $this->_current_view ) ) {
676
+					add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles_' . $this->_current_view ), 15 );
677
+		}
667 678
 
668 679
 		//admin_print_footer_scripts - global, page child class, and view specific.  NOTE, despite the name, whenever possible, scripts should NOT be loaded using this.  In most cases that's doing_it_wrong().  But adding hidden container elements etc. is a good use case. Notice the late priority we're giving these.
669 680
 		add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_eei18n_js_strings' ), 1 );
670 681
 		add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_global' ), 99 );
671 682
 		add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts' ), 100 );
672
-		if ( method_exists( $this, 'admin_footer_scripts_' . $this->_current_view ) )
673
-			add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_' . $this->_current_view ), 101 );
683
+		if ( method_exists( $this, 'admin_footer_scripts_' . $this->_current_view ) ) {
684
+					add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_' . $this->_current_view ), 101 );
685
+		}
674 686
 
675 687
 		//admin footer scripts
676 688
 		add_action('admin_footer', array( $this, 'admin_footer_global' ), 99 );
677 689
 		add_action('admin_footer', array( $this, 'admin_footer'), 100 );
678
-		if ( method_exists( $this, 'admin_footer_' . $this->_current_view ) )
679
-			add_action('admin_footer', array( $this, 'admin_footer_' . $this->_current_view ), 101 );
690
+		if ( method_exists( $this, 'admin_footer_' . $this->_current_view ) ) {
691
+					add_action('admin_footer', array( $this, 'admin_footer_' . $this->_current_view ), 101 );
692
+		}
680 693
 
681 694
 
682 695
 		do_action( 'FHEE__EE_Admin_Page___load_page_dependencies__after_load', $this->page_slug );
@@ -749,7 +762,9 @@  discard block
 block discarded – undo
749 762
 	protected function _verify_routes() {
750 763
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
751 764
 
752
-		if ( !$this->_current_page && !defined( 'DOING_AJAX')) return FALSE;
765
+		if ( !$this->_current_page && !defined( 'DOING_AJAX')) {
766
+			return FALSE;
767
+		}
753 768
 
754 769
 		$this->_route = FALSE;
755 770
 		$func = FALSE;
@@ -859,8 +874,9 @@  discard block
 block discarded – undo
859 874
 	 * @return void
860 875
 	 */
861 876
 	protected function _route_admin_request() {
862
-		if (  ! $this->_is_UI_request )
863
-			$this->_verify_routes();
877
+		if (  ! $this->_is_UI_request ) {
878
+					$this->_verify_routes();
879
+		}
864 880
 
865 881
 		$nonce_check = isset( $this->_route_config['require_nonce'] ) ? $this->_route_config['require_nonce'] : TRUE;
866 882
 
@@ -870,8 +886,9 @@  discard block
 block discarded – undo
870 886
 			$this->_verify_nonce( $nonce, $this->_req_nonce );
871 887
 		}
872 888
 		//set the nav_tabs array but ONLY if this is  UI_request
873
-		if ( $this->_is_UI_request )
874
-			$this->_set_nav_tabs();
889
+		if ( $this->_is_UI_request ) {
890
+					$this->_set_nav_tabs();
891
+		}
875 892
 
876 893
 		// grab callback function
877 894
 		$func = is_array( $this->_route ) ? $this->_route['func'] : $this->_route;
@@ -908,8 +925,9 @@  discard block
 block discarded – undo
908 925
 			}
909 926
 
910 927
 
911
-			if ( !empty( $error_msg ) && $base_call === FALSE && $addon_call === FALSE )
912
-				throw new EE_Error( $error_msg );
928
+			if ( !empty( $error_msg ) && $base_call === FALSE && $addon_call === FALSE ) {
929
+							throw new EE_Error( $error_msg );
930
+			}
913 931
 		}
914 932
 
915 933
 		//if we've routed and this route has a no headers route AND a sent_headers_route, then we need to reset the routing properties to the new route.
@@ -1036,8 +1054,9 @@  discard block
 block discarded – undo
1036 1054
 				$tour_buttons = '<div class="ee-abs-container"><div class="ee-help-tour-restart-buttons">';
1037 1055
 				foreach ( $this->_help_tour['tours'] as $tour ) {
1038 1056
 					//if this is the end tour then we don't need to setup a button
1039
-					if ( $tour instanceof EE_Help_Tour_final_stop )
1040
-						continue;
1057
+					if ( $tour instanceof EE_Help_Tour_final_stop ) {
1058
+											continue;
1059
+					}
1041 1060
 					$tb[] = '<button id="trigger-tour-' . $tour->get_slug() . '" class="button-primary trigger-ee-help-tour">' . $tour->get_label() . '</button>';
1042 1061
 				}
1043 1062
 				$tour_buttons .= implode('<br />', $tb);
@@ -1047,8 +1066,9 @@  discard block
 block discarded – undo
1047 1066
 			// let's see if there is a help_sidebar set for the current route and we'll set that up for usage as well.
1048 1067
 			if ( is_array( $config ) && isset( $config['help_sidebar'] ) ) {
1049 1068
 				//check that the callback given is valid
1050
-				if ( !method_exists($this, $config['help_sidebar'] ) )
1051
-					throw new EE_Error( sprintf( __('The _page_config array has a callback set for the "help_sidebar" option.  However the callback given (%s) is not a valid callback.  Doublecheck the spelling and make sure this method exists for the class %s', 'event_espresso'), $config['help_sidebar'], get_class($this) ) );
1069
+				if ( !method_exists($this, $config['help_sidebar'] ) ) {
1070
+									throw new EE_Error( sprintf( __('The _page_config array has a callback set for the "help_sidebar" option.  However the callback given (%s) is not a valid callback.  Doublecheck the spelling and make sure this method exists for the class %s', 'event_espresso'), $config['help_sidebar'], get_class($this) ) );
1071
+				}
1052 1072
 
1053 1073
 				$content = apply_filters( 'FHEE__' . get_class($this) . '__add_help_tabs__help_sidebar', call_user_func( array( $this, $config['help_sidebar'] ) ) );
1054 1074
 
@@ -1072,18 +1092,23 @@  discard block
 block discarded – undo
1072 1092
 				}/**/
1073 1093
 
1074 1094
 
1075
-			if ( !isset( $config['help_tabs'] ) ) return; //no help tabs for this route
1095
+			if ( !isset( $config['help_tabs'] ) ) {
1096
+				return;
1097
+			}
1098
+			//no help tabs for this route
1076 1099
 
1077 1100
 			foreach ( (array) $config['help_tabs'] as $tab_id => $cfg ) {
1078 1101
 				//we're here so there ARE help tabs!
1079 1102
 
1080 1103
 				//make sure we've got what we need
1081
-				if ( !isset( $cfg['title'] ) )
1082
-					throw new EE_Error( __('The _page_config array is not set up properly for help tabs.  It is missing a title', 'event_espresso') );
1104
+				if ( !isset( $cfg['title'] ) ) {
1105
+									throw new EE_Error( __('The _page_config array is not set up properly for help tabs.  It is missing a title', 'event_espresso') );
1106
+				}
1083 1107
 
1084 1108
 
1085
-				if ( !isset($cfg['filename']) && !isset( $cfg['callback'] ) && !isset( $cfg['content'] ) )
1086
-					throw new EE_Error( __('The _page_config array is not setup properly for help tabs. It is missing a either a filename reference, or a callback reference or a content reference so there is no way to know the content for the help tab', 'event_espresso') );
1109
+				if ( !isset($cfg['filename']) && !isset( $cfg['callback'] ) && !isset( $cfg['content'] ) ) {
1110
+									throw new EE_Error( __('The _page_config array is not setup properly for help tabs. It is missing a either a filename reference, or a callback reference or a content reference so there is no way to know the content for the help tab', 'event_espresso') );
1111
+				}
1087 1112
 
1088 1113
 
1089 1114
 
@@ -1146,14 +1171,16 @@  discard block
 block discarded – undo
1146 1171
 		$this->_help_tour = array();
1147 1172
 
1148 1173
 		//exit early if help tours are turned off globally
1149
-		if ( ! EE_Registry::instance()->CFG->admin->help_tour_activation || ( defined( 'EE_DISABLE_HELP_TOURS' ) && EE_DISABLE_HELP_TOURS ) )
1150
-			return;
1174
+		if ( ! EE_Registry::instance()->CFG->admin->help_tour_activation || ( defined( 'EE_DISABLE_HELP_TOURS' ) && EE_DISABLE_HELP_TOURS ) ) {
1175
+					return;
1176
+		}
1151 1177
 
1152 1178
 		//loop through _page_config to find any help_tour defined
1153 1179
 		foreach ( $this->_page_config as $route => $config ) {
1154 1180
 			//we're only going to set things up for this route
1155
-			if ( $route !== $this->_req_action )
1156
-				continue;
1181
+			if ( $route !== $this->_req_action ) {
1182
+							continue;
1183
+			}
1157 1184
 
1158 1185
 			if ( isset( $config['help_tour'] ) ) {
1159 1186
 
@@ -1188,8 +1215,9 @@  discard block
 block discarded – undo
1188 1215
 			}
1189 1216
 		}
1190 1217
 
1191
-		if ( !empty( $tours ) )
1192
-			$this->_help_tour['tours'] = $tours;
1218
+		if ( !empty( $tours ) ) {
1219
+					$this->_help_tour['tours'] = $tours;
1220
+		}
1193 1221
 
1194 1222
 		//thats it!  Now that the $_help_tours property is set (or not) the scripts and html should be taken care of automatically.
1195 1223
 	}
@@ -1230,15 +1258,21 @@  discard block
 block discarded – undo
1230 1258
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
1231 1259
 		$i = 0;
1232 1260
 		foreach ( $this->_page_config as $slug => $config ) {
1233
-			if ( !is_array( $config ) || ( is_array($config) && (isset($config['nav']) && !$config['nav'] ) || !isset($config['nav'] ) ) )
1234
-				continue; //no nav tab for this config
1261
+			if ( !is_array( $config ) || ( is_array($config) && (isset($config['nav']) && !$config['nav'] ) || !isset($config['nav'] ) ) ) {
1262
+							continue;
1263
+			}
1264
+			//no nav tab for this config
1235 1265
 
1236 1266
 			//check for persistent flag
1237
-			if ( isset( $config['nav']['persistent']) && !$config['nav']['persistent'] && $slug !== $this->_req_action )
1238
-				continue; //nav tab is only to appear when route requested.
1267
+			if ( isset( $config['nav']['persistent']) && !$config['nav']['persistent'] && $slug !== $this->_req_action ) {
1268
+							continue;
1269
+			}
1270
+			//nav tab is only to appear when route requested.
1239 1271
 
1240
-			if ( ! $this->check_user_access( $slug, TRUE ) )
1241
-				continue; //no nav tab becasue current user does not have access.
1272
+			if ( ! $this->check_user_access( $slug, TRUE ) ) {
1273
+							continue;
1274
+			}
1275
+			//no nav tab becasue current user does not have access.
1242 1276
 
1243 1277
 			$css_class = isset( $config['css_class'] ) ? $config['css_class'] . ' ' : '';
1244 1278
 			$this->_nav_tabs[$slug] = array(
@@ -1475,10 +1509,11 @@  discard block
 block discarded – undo
1475 1509
 			$content .= EEH_Template::display_template( $template_path, $template_args, TRUE );
1476 1510
 		}
1477 1511
 
1478
-		if ( $display )
1479
-			echo $content;
1480
-		else
1481
-			return $content;
1512
+		if ( $display ) {
1513
+					echo $content;
1514
+		} else {
1515
+					return $content;
1516
+		}
1482 1517
 	}
1483 1518
 
1484 1519
 
@@ -1495,8 +1530,9 @@  discard block
 block discarded – undo
1495 1530
 		$method_name = '_help_popup_content_' . $this->_req_action;
1496 1531
 
1497 1532
 		//if method doesn't exist let's get out.
1498
-		if ( !method_exists( $this, $method_name ) )
1499
-			return array();
1533
+		if ( !method_exists( $this, $method_name ) ) {
1534
+					return array();
1535
+		}
1500 1536
 
1501 1537
 		//k we're good to go let's retrieve the help array
1502 1538
 		$help_array = call_user_func( array( $this, $method_name ) );
@@ -1527,7 +1563,9 @@  discard block
 block discarded – undo
1527 1563
 	 */
1528 1564
 	protected function _set_help_trigger( $trigger_id, $display = TRUE, $dimensions = array( '400', '640') ) {
1529 1565
 
1530
-		if ( defined('DOING_AJAX') ) return;
1566
+		if ( defined('DOING_AJAX') ) {
1567
+			return;
1568
+		}
1531 1569
 
1532 1570
 		//let's check and see if there is any content set for this popup.  If there isn't then we'll include a default title and content so that developers know something needs to be corrected
1533 1571
 		$help_array = $this->_get_help_content();
@@ -1545,10 +1583,11 @@  discard block
 block discarded – undo
1545 1583
 		$content = '<a class="ee-dialog" href="?height='. $dimensions[0] . '&width=' . $dimensions[1] . '&inlineId=' . $trigger_id . '" target="_blank"><span class="question ee-help-popup-question"></span></a>';
1546 1584
 		$content = $content . $help_content;
1547 1585
 
1548
-		if ( $display )
1549
-			echo $content;
1550
-		else
1551
-			return $content;
1586
+		if ( $display ) {
1587
+					echo $content;
1588
+		} else {
1589
+					return $content;
1590
+		}
1552 1591
 	}
1553 1592
 
1554 1593
 
@@ -1788,8 +1827,10 @@  discard block
 block discarded – undo
1788 1827
 	protected function _set_list_table() {
1789 1828
 
1790 1829
 		//first is this a list_table view?
1791
-		if ( !isset($this->_route_config['list_table']) )
1792
-			return; //not a list_table view so get out.
1830
+		if ( !isset($this->_route_config['list_table']) ) {
1831
+					return;
1832
+		}
1833
+		//not a list_table view so get out.
1793 1834
 
1794 1835
 		//list table functions are per view specific (because some admin pages might have more than one listtable!)
1795 1836
 
@@ -1845,8 +1886,9 @@  discard block
 block discarded – undo
1845 1886
 	 */
1846 1887
 	protected function _set_list_table_object() {
1847 1888
 		if ( isset($this->_route_config['list_table'] ) ) {
1848
-			if ( !class_exists( $this->_route_config['list_table'] ) )
1849
-				throw new EE_Error( sprintf( __('The %s class defined for the list table does not exist.  Please check the spelling of the class ref in the $_page_config property on %s.', 'event_espresso'), $this->_route_config['list_table'], get_class($this) ) );
1889
+			if ( !class_exists( $this->_route_config['list_table'] ) ) {
1890
+							throw new EE_Error( sprintf( __('The %s class defined for the list table does not exist.  Please check the spelling of the class ref in the $_page_config property on %s.', 'event_espresso'), $this->_route_config['list_table'], get_class($this) ) );
1891
+			}
1850 1892
 			$a = new ReflectionClass($this->_route_config['list_table']);
1851 1893
 			$this->_list_table_object = $a->newInstance($this);
1852 1894
 		}
@@ -2122,8 +2164,9 @@  discard block
 block discarded – undo
2122 2164
 	protected function _espresso_sponsors_post_box() {
2123 2165
 
2124 2166
 		$show_sponsors = apply_filters( 'FHEE_show_sponsors_meta_box', TRUE );
2125
-		if ( $show_sponsors )
2126
-			add_meta_box('espresso_sponsors_post_box', __('Event Espresso Highlights', 'event_espresso'), array( $this, 'espresso_sponsors_post_box'), $this->_wp_page_slug, 'side');
2167
+		if ( $show_sponsors ) {
2168
+					add_meta_box('espresso_sponsors_post_box', __('Event Espresso Highlights', 'event_espresso'), array( $this, 'espresso_sponsors_post_box'), $this->_wp_page_slug, 'side');
2169
+		}
2127 2170
 	}
2128 2171
 
2129 2172
 
@@ -2406,8 +2449,9 @@  discard block
 block discarded – undo
2406 2449
 
2407 2450
 		$template_path = $sidebar ?  EE_ADMIN_TEMPLATE . 'admin_details_wrapper.template.php' : EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar.template.php';
2408 2451
 
2409
-		if ( defined('DOING_AJAX' ) )
2410
-			$template_path = EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar_ajax.template.php';
2452
+		if ( defined('DOING_AJAX' ) ) {
2453
+					$template_path = EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar_ajax.template.php';
2454
+		}
2411 2455
 
2412 2456
 		$template_path = !empty($this->_column_template_path) ? $this->_column_template_path : $template_path;
2413 2457
 
@@ -2518,10 +2562,11 @@  discard block
 block discarded – undo
2518 2562
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
2519 2563
 
2520 2564
 		// the final template wrapper
2521
-		if ( $sidebar )
2522
-			$this->display_admin_page_with_sidebar();
2523
-		else
2524
-			$this->display_admin_page_with_no_sidebar();
2565
+		if ( $sidebar ) {
2566
+					$this->display_admin_page_with_sidebar();
2567
+		} else {
2568
+					$this->display_admin_page_with_no_sidebar();
2569
+		}
2525 2570
 	}
2526 2571
 
2527 2572
 
@@ -2587,8 +2632,9 @@  discard block
 block discarded – undo
2587 2632
 
2588 2633
 
2589 2634
 		// make sure there are no php errors or headers_sent.  Then we can set correct json header.
2590
-		if ( NULL === error_get_last() || ! headers_sent() )
2591
-			header('Content-Type: application/json; charset=UTF-8');
2635
+		if ( NULL === error_get_last() || ! headers_sent() ) {
2636
+					header('Content-Type: application/json; charset=UTF-8');
2637
+		}
2592 2638
 
2593 2639
 		echo json_encode( $json );
2594 2640
 		exit();
@@ -2601,10 +2647,9 @@  discard block
 block discarded – undo
2601 2647
 	 * @return json_obj|EE_Error
2602 2648
 	 */
2603 2649
 	public function return_json() {
2604
-		if ( defined('DOING_AJAX') && DOING_AJAX )
2605
-			$this->_return_json();
2606
-
2607
-		else {
2650
+		if ( defined('DOING_AJAX') && DOING_AJAX ) {
2651
+					$this->_return_json();
2652
+		} else {
2608 2653
 			throw new EE_Error( sprintf( __('The public %s method can only be called when DOING_AJAX = TRUE', 'event_espresso'), __FUNCTION__ ) );
2609 2654
 		}
2610 2655
 	}
@@ -2753,7 +2798,9 @@  discard block
 block discarded – undo
2753 2798
 			$id = $this->_current_view . '_' . $ref;
2754 2799
 			$name = !empty($actions) ? $actions[$key] : $ref;
2755 2800
 			$this->_template_args['save_buttons'] .= '<input type="submit" class="button-primary ' . $ref . '" value="' . $button . '" name="' . $name . '" id="' . $id . '" />';
2756
-			if ( !$both ) break;
2801
+			if ( !$both ) {
2802
+				break;
2803
+			}
2757 2804
 		}
2758 2805
 
2759 2806
 	}
@@ -2993,11 +3040,13 @@  discard block
 block discarded – undo
2993 3040
 	 */
2994 3041
 	public function get_action_link_or_button($action, $type = 'add', $extra_request = array(), $class = 'button-primary', $base_url = FALSE) {
2995 3042
 		//first let's validate the action (if $base_url is FALSE otherwise validation will happen further along)
2996
-		if ( !isset($this->_page_routes[$action]) && !$base_url )
2997
-			throw new EE_Error( sprintf( __('There is no page route for given action for the button.  This action was given: %s', 'event_espresso'), $action) );
3043
+		if ( !isset($this->_page_routes[$action]) && !$base_url ) {
3044
+					throw new EE_Error( sprintf( __('There is no page route for given action for the button.  This action was given: %s', 'event_espresso'), $action) );
3045
+		}
2998 3046
 
2999
-		if ( !isset( $this->_labels['buttons'][$type] ) )
3000
-			throw new EE_Error( sprintf( __('There is no label for the given button type (%s). Labels are set in the <code>_page_config</code> property.', 'event_espresso'), $type) );
3047
+		if ( !isset( $this->_labels['buttons'][$type] ) ) {
3048
+					throw new EE_Error( sprintf( __('There is no label for the given button type (%s). Labels are set in the <code>_page_config</code> property.', 'event_espresso'), $type) );
3049
+		}
3001 3050
 
3002 3051
 		//finally check user access for this button.
3003 3052
 		$has_access = $this->check_user_access( $action, TRUE );
@@ -3011,8 +3060,9 @@  discard block
 block discarded – undo
3011 3060
 			'action' => $action  );
3012 3061
 
3013 3062
 		//merge extra_request args but make sure our original action takes precedence and doesn't get overwritten.
3014
-		if ( !empty($extra_request) )
3015
-			$query_args = array_merge( $extra_request, $query_args );
3063
+		if ( !empty($extra_request) ) {
3064
+					$query_args = array_merge( $extra_request, $query_args );
3065
+		}
3016 3066
 
3017 3067
 		$url = self::add_query_args_and_nonce( $query_args, $_base_url );
3018 3068
 
@@ -3059,13 +3109,15 @@  discard block
 block discarded – undo
3059 3109
 		if ( isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options']) ) {
3060 3110
 			check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' );
3061 3111
 
3062
-			if ( !$user = wp_get_current_user() )
3063
-			return;
3112
+			if ( !$user = wp_get_current_user() ) {
3113
+						return;
3114
+			}
3064 3115
 			$option = $_POST['wp_screen_options']['option'];
3065 3116
 			$value = $_POST['wp_screen_options']['value'];
3066 3117
 
3067
-			if ( $option != sanitize_key( $option ) )
3068
-				return;
3118
+			if ( $option != sanitize_key( $option ) ) {
3119
+							return;
3120
+			}
3069 3121
 
3070 3122
 			$map_option = $option;
3071 3123
 
@@ -3074,13 +3126,15 @@  discard block
 block discarded – undo
3074 3126
 			switch ( $map_option ) {
3075 3127
 				case $this->_current_page . '_' .  $this->_current_view . '_per_page':
3076 3128
 					$value = (int) $value;
3077
-					if ( $value < 1 || $value > 999 )
3078
-						return;
3129
+					if ( $value < 1 || $value > 999 ) {
3130
+											return;
3131
+					}
3079 3132
 					break;
3080 3133
 				default:
3081 3134
 					$value = apply_filters( 'FHEE__EE_Admin_Page___set_per_page_screen_options__value', false, $option, $value );
3082
-					if ( false === $value )
3083
-						return;
3135
+					if ( false === $value ) {
3136
+											return;
3137
+					}
3084 3138
 					break;
3085 3139
 			}
3086 3140
 
@@ -3116,8 +3170,9 @@  discard block
 block discarded – undo
3116 3170
 	protected function _add_transient( $route, $data, $notices = FALSE, $skip_route_verify = FALSE ) {
3117 3171
 		$user_id = get_current_user_id();
3118 3172
 
3119
-		if ( !$skip_route_verify )
3120
-			$this->_verify_route($route);
3173
+		if ( !$skip_route_verify ) {
3174
+					$this->_verify_route($route);
3175
+		}
3121 3176
 
3122 3177
 
3123 3178
 		//now let's set the string for what kind of transient we're setting
Please login to merge, or discard this patch.
Indentation   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -1301,8 +1301,8 @@  discard block
 block discarded – undo
1301 1301
 	 * 		verifies user access for this admin page
1302 1302
 	 * 		@param string $route_to_check if present then the capability for the route matching this string is checked.
1303 1303
 	 * 		@param bool   $verify_only Default is FALSE which means if user check fails then wp_die().  Otherwise just return false if verify fail.
1304
-	*		@return 		BOOL|wp_die()
1305
-	*/
1304
+	 *		@return 		BOOL|wp_die()
1305
+	 */
1306 1306
 	public function check_user_access( $route_to_check = '', $verify_only = FALSE ) {
1307 1307
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
1308 1308
 		$route_to_check = empty( $route_to_check ) ? $this->_req_action : $route_to_check;
@@ -1703,11 +1703,11 @@  discard block
 block discarded – undo
1703 1703
 
1704 1704
 
1705 1705
 	/**
1706
-	*		admin_footer_scripts_eei18n_js_strings
1707
-	*
1708
-	*		@access 		public
1709
-	*		@return 		void
1710
-	*/
1706
+	 *		admin_footer_scripts_eei18n_js_strings
1707
+	 *
1708
+	 *		@access 		public
1709
+	 *		@return 		void
1710
+	 */
1711 1711
 	public function admin_footer_scripts_eei18n_js_strings() {
1712 1712
 
1713 1713
 		EE_Registry::$i18n_js_strings['ajax_url'] = WP_AJAX_URL;
@@ -1763,11 +1763,11 @@  discard block
 block discarded – undo
1763 1763
 
1764 1764
 
1765 1765
 	/**
1766
-	*		load enhanced xdebug styles for ppl with failing eyesight
1767
-	*
1768
-	*		@access 		public
1769
-	*		@return 		void
1770
-	*/
1766
+	 *		load enhanced xdebug styles for ppl with failing eyesight
1767
+	 *
1768
+	 *		@access 		public
1769
+	 *		@return 		void
1770
+	 */
1771 1771
 	public function add_xdebug_style() {
1772 1772
 		echo '<style>.xdebug-error { font-size:1.5em; }</style>';
1773 1773
 	}
@@ -1824,9 +1824,9 @@  discard block
 block discarded – undo
1824 1824
 
1825 1825
 	/**
1826 1826
 	 * 		set current view for List Table
1827
-	*		@access public
1828
-	*		@return array
1829
-	*/
1827
+	 *		@access public
1828
+	 *		@return array
1829
+	 */
1830 1830
 	protected function _set_list_table_view() {
1831 1831
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
1832 1832
 
@@ -1903,7 +1903,7 @@  discard block
 block discarded – undo
1903 1903
 	 * @access protected
1904 1904
 	 * @param int $max_entries total number of rows in the table
1905 1905
 	 * @return string
1906
-	*/
1906
+	 */
1907 1907
 	protected function _entries_per_page_dropdown( $max_entries = FALSE ) {
1908 1908
 
1909 1909
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -1948,9 +1948,9 @@  discard block
 block discarded – undo
1948 1948
 
1949 1949
 	/**
1950 1950
 	 * 		_set_search_attributes
1951
-	*		@access 		protected
1952
-	*		@return 		void
1953
-	*/
1951
+	 *		@access 		protected
1952
+	 *		@return 		void
1953
+	 */
1954 1954
 	public function _set_search_attributes() {
1955 1955
 		$this->_template_args['search']['btn_label'] = sprintf( __( 'Search %s', 'event_espresso' ), empty( $this->_search_btn_label ) ? $this->page_label : $this->_search_btn_label );
1956 1956
 		$this->_template_args['search']['callback'] = 'search_' . $this->page_slug;
@@ -1970,7 +1970,7 @@  discard block
 block discarded – undo
1970 1970
 	 * @link http://codex.wordpress.org/Function_Reference/add_meta_box
1971 1971
 	 * @access private
1972 1972
 	 * @return void
1973
-	*/
1973
+	 */
1974 1974
 	private function _add_registered_meta_boxes() {
1975 1975
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
1976 1976
 
@@ -2230,9 +2230,9 @@  discard block
 block discarded – undo
2230 2230
 
2231 2231
 	/**
2232 2232
 	 * 		displays an error message to ppl who have javascript disabled
2233
-	*		@access 		private
2234
-	*		@return 		string
2235
-	*/
2233
+	 *		@access 		private
2234
+	 *		@return 		string
2235
+	 */
2236 2236
 	private function _display_no_javascript_warning() {
2237 2237
 		?>
2238 2238
 		<noscript>
@@ -2255,9 +2255,9 @@  discard block
 block discarded – undo
2255 2255
 
2256 2256
 	/**
2257 2257
 	 * 		displays espresso success and/or error notices
2258
-	*		@access 		private
2259
-	*		@return 		string
2260
-	*/
2258
+	 *		@access 		private
2259
+	 *		@return 		string
2260
+	 */
2261 2261
 	private function _display_espresso_notices() {
2262 2262
 		$notices = $this->_get_transient( TRUE );
2263 2263
 		echo stripslashes($notices);
@@ -2269,10 +2269,10 @@  discard block
 block discarded – undo
2269 2269
 
2270 2270
 
2271 2271
 	/**
2272
-	*		spinny things pacify the masses
2273
-	*		@access private
2274
-	*		@return string
2275
-	*/
2272
+	 *		spinny things pacify the masses
2273
+	 *		@access private
2274
+	 *		@return string
2275
+	 */
2276 2276
 	protected function _add_admin_page_ajax_loading_img() {
2277 2277
 		?>
2278 2278
 			<div id="espresso-ajax-loading" class="ajax-loading-grey">
@@ -2286,10 +2286,10 @@  discard block
 block discarded – undo
2286 2286
 
2287 2287
 
2288 2288
 	/**
2289
-	*		add admin page overlay for modal boxes
2290
-	*		@access private
2291
-	*		@return string
2292
-	*/
2289
+	 *		add admin page overlay for modal boxes
2290
+	 *		@access private
2291
+	 *		@return string
2292
+	 */
2293 2293
 	protected function _add_admin_page_overlay() {
2294 2294
 		?>
2295 2295
 		<div id="espresso-admin-page-overlay-dv" class=""></div>
@@ -2351,10 +2351,10 @@  discard block
 block discarded – undo
2351 2351
 
2352 2352
 
2353 2353
 	/**
2354
-	*		generates  HTML wrapper for an admin details page
2355
-	*		@access public
2356
-	*		@return void
2357
-	*/
2354
+	 *		generates  HTML wrapper for an admin details page
2355
+	 *		@access public
2356
+	 *		@return void
2357
+	 */
2358 2358
 	public function display_admin_page_with_sidebar() {
2359 2359
 
2360 2360
 		$this->_display_admin_page(TRUE);
@@ -2364,10 +2364,10 @@  discard block
 block discarded – undo
2364 2364
 
2365 2365
 
2366 2366
 	/**
2367
-	*		generates  HTML wrapper for an admin details page (except no sidebar)
2368
-	*		@access public
2369
-	*		@return void
2370
-	*/
2367
+	 *		generates  HTML wrapper for an admin details page (except no sidebar)
2368
+	 *		@access public
2369
+	 *		@return void
2370
+	 */
2371 2371
 	public function display_admin_page_with_no_sidebar() {
2372 2372
 		$this->_display_admin_page();
2373 2373
 	}
@@ -2631,11 +2631,11 @@  discard block
 block discarded – undo
2631 2631
 
2632 2632
 
2633 2633
 	/**
2634
-	*		generates  HTML wrapper with Tabbed nav for an admin page
2635
-	*		@access public
2636
-	*		@param  boolean $about whether to use the special about page wrapper or default.
2637
-	*		@return void
2638
-	*/
2634
+	 *		generates  HTML wrapper with Tabbed nav for an admin page
2635
+	 *		@access public
2636
+	 *		@param  boolean $about whether to use the special about page wrapper or default.
2637
+	 *		@return void
2638
+	 */
2639 2639
 	public function admin_page_wrapper($about = FALSE) {
2640 2640
 
2641 2641
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -2689,15 +2689,15 @@  discard block
 block discarded – undo
2689 2689
 
2690 2690
 
2691 2691
 	/**
2692
-	*		sort nav tabs
2693
-	*		@access public
2694
-	*		@return void
2695
-	*/
2692
+	 *		sort nav tabs
2693
+	 *		@access public
2694
+	 *		@return void
2695
+	 */
2696 2696
 	private function _sort_nav_tabs( $a, $b ) {
2697 2697
 		if ($a['order'] == $b['order']) {
2698
-	        return 0;
2699
-	    }
2700
-	    return ($a['order'] < $b['order']) ? -1 : 1;
2698
+			return 0;
2699
+		}
2700
+		return ($a['order'] < $b['order']) ? -1 : 1;
2701 2701
 	}
2702 2702
 
2703 2703
 
Please login to merge, or discard this patch.
Spacing   +597 added lines, -597 removed lines patch added patch discarded remove patch
@@ -144,9 +144,9 @@  discard block
 block discarded – undo
144 144
 	 * 		@access public
145 145
 	 * 		@return void
146 146
 	 */
147
-	public function __construct( $routing = TRUE ) {
147
+	public function __construct($routing = TRUE) {
148 148
 
149
-		if ( strpos( $this->_get_dir(), 'caffeinated' ) !== false )
149
+		if (strpos($this->_get_dir(), 'caffeinated') !== false)
150 150
 			$this->_is_caf = TRUE;
151 151
 
152 152
 		$this->_yes_no_values = array(
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 
158 158
 
159 159
 		//set the _req_data property.
160
-		$this->_req_data = array_merge( $_GET, $_POST );
160
+		$this->_req_data = array_merge($_GET, $_POST);
161 161
 
162 162
 
163 163
 		//routing enabled?
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 		$this->_do_other_page_hooks();
179 179
 
180 180
 		//This just allows us to have extending clases do something specific before the parent constructor runs _page_setup.
181
-		if ( method_exists( $this, '_before_page_setup' ) )
181
+		if (method_exists($this, '_before_page_setup'))
182 182
 			$this->_before_page_setup();
183 183
 
184 184
 		//set up page dependencies
@@ -448,16 +448,16 @@  discard block
 block discarded – undo
448 448
 	 */
449 449
 	protected function _global_ajax_hooks() {
450 450
 		//for lazy loading of metabox content
451
-		add_action( 'wp_ajax_espresso-ajax-content', array( $this, 'ajax_metabox_content'), 10 );
451
+		add_action('wp_ajax_espresso-ajax-content', array($this, 'ajax_metabox_content'), 10);
452 452
 	}
453 453
 
454 454
 
455 455
 
456 456
 	public function ajax_metabox_content() {
457
-		$contentid = isset( $this->_req_data['contentid'] ) ? $this->_req_data['contentid'] : '';
458
-		$url = isset( $this->_req_data['contenturl'] ) ? $this->_req_data['contenturl'] : '';
457
+		$contentid = isset($this->_req_data['contentid']) ? $this->_req_data['contentid'] : '';
458
+		$url = isset($this->_req_data['contenturl']) ? $this->_req_data['contenturl'] : '';
459 459
 
460
-		self::cached_rss_display( $contentid, $url );
460
+		self::cached_rss_display($contentid, $url);
461 461
 		wp_die();
462 462
 	}
463 463
 
@@ -478,87 +478,87 @@  discard block
 block discarded – undo
478 478
 
479 479
 
480 480
 		//admin_init stuff - global - we're setting this REALLY early so if EE_Admin pages have to hook into other WP pages they can.  But keep in mind, not everything is available from the EE_Admin Page object at this point.
481
-		add_action( 'admin_init', array( $this, 'admin_init_global' ), 5 );
481
+		add_action('admin_init', array($this, 'admin_init_global'), 5);
482 482
 
483 483
 
484 484
 		//next verify if we need to load anything...
485
-		$this->_current_page = !empty( $_GET['page'] ) ? sanitize_key( $_GET['page'] ) : FALSE;
486
-		$this->page_folder = strtolower( str_replace( '_Admin_Page', '', str_replace( 'Extend_', '', get_class($this) ) ) );
485
+		$this->_current_page = ! empty($_GET['page']) ? sanitize_key($_GET['page']) : FALSE;
486
+		$this->page_folder = strtolower(str_replace('_Admin_Page', '', str_replace('Extend_', '', get_class($this))));
487 487
 
488 488
 		global $ee_menu_slugs;
489 489
 		$ee_menu_slugs = (array) $ee_menu_slugs;
490 490
 
491
-		if ( ( !$this->_current_page || ! isset( $ee_menu_slugs[$this->_current_page] ) ) && !defined( 'DOING_AJAX') ) return FALSE;
491
+		if (( ! $this->_current_page || ! isset($ee_menu_slugs[$this->_current_page])) && ! defined('DOING_AJAX')) return FALSE;
492 492
 
493 493
 
494 494
 		// becuz WP List tables have two duplicate select inputs for choosing bulk actions, we need to copy the action from the second to the first
495
-		if ( isset( $this->_req_data['action2'] ) && $this->_req_data['action'] == -1 ) {
496
-			$this->_req_data['action'] = ! empty( $this->_req_data['action2'] ) && $this->_req_data['action2'] != -1 ? $this->_req_data['action2'] : $this->_req_data['action'];
495
+		if (isset($this->_req_data['action2']) && $this->_req_data['action'] == -1) {
496
+			$this->_req_data['action'] = ! empty($this->_req_data['action2']) && $this->_req_data['action2'] != -1 ? $this->_req_data['action2'] : $this->_req_data['action'];
497 497
 		}
498 498
 		// then set blank or -1 action values to 'default'
499
-		$this->_req_action = isset( $this->_req_data['action'] ) && ! empty( $this->_req_data['action'] ) && $this->_req_data['action'] != -1 ? sanitize_key( $this->_req_data['action'] ) : 'default';
499
+		$this->_req_action = isset($this->_req_data['action']) && ! empty($this->_req_data['action']) && $this->_req_data['action'] != -1 ? sanitize_key($this->_req_data['action']) : 'default';
500 500
 
501 501
 		//if action is 'default' after the above BUT we have  'route' var set, then let's use the route as the action.  This covers cases where we're coming in from a list table that isn't on the default route.
502
-		$this->_req_action = $this->_req_action == 'default' && isset( $this->_req_data['route'] ) ? $this->_req_data['route'] : $this->_req_action;
502
+		$this->_req_action = $this->_req_action == 'default' && isset($this->_req_data['route']) ? $this->_req_data['route'] : $this->_req_action;
503 503
 
504 504
 		//however if we are doing_ajax and we've got a 'route' set then that's what the req_action will be
505 505
 		$this->_req_action = defined('DOING_AJAX') && isset($this->_req_data['route']) ? $this->_req_data['route'] : $this->_req_action;
506 506
 
507 507
 		$this->_current_view = $this->_req_action;
508
-		$this->_req_nonce = $this->_req_action . '_nonce';
508
+		$this->_req_nonce = $this->_req_action.'_nonce';
509 509
 		$this->_define_page_props();
510 510
 
511
-		$this->_current_page_view_url = add_query_arg( array( 'page' => $this->_current_page, 'action' => $this->_current_view ),  $this->_admin_base_url );
511
+		$this->_current_page_view_url = add_query_arg(array('page' => $this->_current_page, 'action' => $this->_current_view), $this->_admin_base_url);
512 512
 
513 513
 		//default things
514
-		$this->_default_espresso_metaboxes = array('_espresso_news_post_box', '_espresso_links_post_box', '_espresso_ratings_request', '_espresso_sponsors_post_box' );
514
+		$this->_default_espresso_metaboxes = array('_espresso_news_post_box', '_espresso_links_post_box', '_espresso_ratings_request', '_espresso_sponsors_post_box');
515 515
 
516 516
 		//set page configs
517 517
 		$this->_set_page_routes();
518 518
 		$this->_set_page_config();
519 519
 
520 520
 		//let's include any referrer data in our default_query_args for this route for "stickiness".
521
-		if ( isset( $this->_req_data['wp_referer'] ) ) {
521
+		if (isset($this->_req_data['wp_referer'])) {
522 522
 			$this->_default_route_query_args['wp_referer'] = $this->_req_data['wp_referer'];
523 523
 		}
524 524
 
525 525
 		//for caffeinated and other extended functionality.  If there is a _extend_page_config method then let's run that to modify the all the various page configuration arrays
526
-		if ( method_exists( $this, '_extend_page_config' ) )
526
+		if (method_exists($this, '_extend_page_config'))
527 527
 			$this->_extend_page_config();
528 528
 
529 529
 		//for CPT and other extended functionality. If there is an _extend_page_config_for_cpt then let's run that to modify all the various page configuration arrays.
530
-		if ( method_exists( $this, '_extend_page_config_for_cpt' ) )
530
+		if (method_exists($this, '_extend_page_config_for_cpt'))
531 531
 			$this->_extend_page_config_for_cpt();
532 532
 
533 533
 		//filter routes and page_config so addons can add their stuff. Filtering done per class
534
-		$this->_page_routes = apply_filters( 'FHEE__' . get_class($this) . '__page_setup__page_routes', $this->_page_routes, $this );
535
-		$this->_page_config = apply_filters( 'FHEE__' . get_class($this) . '__page_setup__page_config', $this->_page_config, $this );
534
+		$this->_page_routes = apply_filters('FHEE__'.get_class($this).'__page_setup__page_routes', $this->_page_routes, $this);
535
+		$this->_page_config = apply_filters('FHEE__'.get_class($this).'__page_setup__page_config', $this->_page_config, $this);
536 536
 
537 537
 
538 538
 		//if AHEE__EE_Admin_Page__route_admin_request_$this->_current_view method is present then we call it hooked into the AHEE__EE_Admin_Page__route_admin_request action
539
-		if ( method_exists( $this, 'AHEE__EE_Admin_Page__route_admin_request_' . $this->_current_view ) ) {
540
-			add_action( 'AHEE__EE_Admin_Page__route_admin_request', array( $this, 'AHEE__EE_Admin_Page__route_admin_request_' . $this->_current_view ), 10, 2 );
539
+		if (method_exists($this, 'AHEE__EE_Admin_Page__route_admin_request_'.$this->_current_view)) {
540
+			add_action('AHEE__EE_Admin_Page__route_admin_request', array($this, 'AHEE__EE_Admin_Page__route_admin_request_'.$this->_current_view), 10, 2);
541 541
 		}
542 542
 
543 543
 
544 544
 		//next route only if routing enabled
545
-		if ( $this->_routing && !defined('DOING_AJAX') ) {
545
+		if ($this->_routing && ! defined('DOING_AJAX')) {
546 546
 
547 547
 			$this->_verify_routes();
548 548
 
549 549
 			//next let's just check user_access and kill if no access
550 550
 			$this->check_user_access();
551 551
 
552
-			if ( $this->_is_UI_request ) {
552
+			if ($this->_is_UI_request) {
553 553
 				//admin_init stuff - global, all views for this page class, specific view
554
-				add_action( 'admin_init', array( $this, 'admin_init' ), 10 );
555
-				if ( method_exists( $this, 'admin_init_' . $this->_current_view )) {
556
-					add_action( 'admin_init', array( $this, 'admin_init_' . $this->_current_view ), 15 );
554
+				add_action('admin_init', array($this, 'admin_init'), 10);
555
+				if (method_exists($this, 'admin_init_'.$this->_current_view)) {
556
+					add_action('admin_init', array($this, 'admin_init_'.$this->_current_view), 15);
557 557
 				}
558 558
 
559 559
 			} else {
560 560
 				//hijack regular WP loading and route admin request immediately
561
-				@ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
561
+				@ini_set('memory_limit', apply_filters('admin_memory_limit', WP_MAX_MEMORY_LIMIT));
562 562
 				$this->route_admin_request();
563 563
 			}
564 564
 		}
@@ -575,18 +575,18 @@  discard block
 block discarded – undo
575 575
 	 * @return void
576 576
 	 */
577 577
 	private function _do_other_page_hooks() {
578
-		$registered_pages = apply_filters( 'FHEE_do_other_page_hooks_' . $this->page_slug, array() );
578
+		$registered_pages = apply_filters('FHEE_do_other_page_hooks_'.$this->page_slug, array());
579 579
 
580
-		foreach ( $registered_pages as $page ) {
580
+		foreach ($registered_pages as $page) {
581 581
 
582 582
 			//now let's setup the file name and class that should be present
583 583
 			$classname = str_replace('.class.php', '', $page);
584 584
 
585 585
 			//autoloaders should take care of loading file
586
-			if ( !class_exists( $classname ) ) {
587
-				$error_msg[] = sprintf( __('Something went wrong with loading the %s admin hooks page.', 'event_espresso' ), $page);
588
-				$error_msg[] = $error_msg[0] . "\r\n" . sprintf( __( 'There is no class in place for the %s admin hooks page.%sMake sure you have <strong>%s</strong> defined. If this is a non-EE-core admin page then you also must have an autoloader in place for your class', 'event_espresso'), $page, '<br />', $classname );
589
-				throw new EE_Error( implode( '||', $error_msg ));
586
+			if ( ! class_exists($classname)) {
587
+				$error_msg[] = sprintf(__('Something went wrong with loading the %s admin hooks page.', 'event_espresso'), $page);
588
+				$error_msg[] = $error_msg[0]."\r\n".sprintf(__('There is no class in place for the %s admin hooks page.%sMake sure you have <strong>%s</strong> defined. If this is a non-EE-core admin page then you also must have an autoloader in place for your class', 'event_espresso'), $page, '<br />', $classname);
589
+				throw new EE_Error(implode('||', $error_msg));
590 590
 			}
591 591
 
592 592
 			$a = new ReflectionClass($classname);
@@ -601,7 +601,7 @@  discard block
 block discarded – undo
601 601
 	public function load_page_dependencies() {
602 602
 		try {
603 603
 			$this->_load_page_dependencies();
604
-		} catch ( EE_Error $e ) {
604
+		} catch (EE_Error $e) {
605 605
 			$e->get_error();
606 606
 		}
607 607
 	}
@@ -619,16 +619,16 @@  discard block
 block discarded – undo
619 619
 		$this->_current_screen = get_current_screen();
620 620
 
621 621
 		//load admin_notices - global, page class, and view specific
622
-		add_action( 'admin_notices', array( $this, 'admin_notices_global'), 5 );
623
-		add_action( 'admin_notices', array( $this, 'admin_notices' ), 10 );
624
-		if ( method_exists( $this, 'admin_notices_' . $this->_current_view ) ) {
625
-			add_action( 'admin_notices', array( $this, 'admin_notices_' . $this->_current_view ), 15 );
622
+		add_action('admin_notices', array($this, 'admin_notices_global'), 5);
623
+		add_action('admin_notices', array($this, 'admin_notices'), 10);
624
+		if (method_exists($this, 'admin_notices_'.$this->_current_view)) {
625
+			add_action('admin_notices', array($this, 'admin_notices_'.$this->_current_view), 15);
626 626
 		}
627 627
 
628 628
 		//load network admin_notices - global, page class, and view specific
629
-		add_action( 'network_admin_notices', array( $this, 'network_admin_notices_global'), 5 );
630
-		if ( method_exists( $this, 'network_admin_notices_' . $this->_current_view ) ) {
631
-			add_action( 'network_admin_notices', array( $this, 'network_admin_notices_' . $this->_current_view ) );
629
+		add_action('network_admin_notices', array($this, 'network_admin_notices_global'), 5);
630
+		if (method_exists($this, 'network_admin_notices_'.$this->_current_view)) {
631
+			add_action('network_admin_notices', array($this, 'network_admin_notices_'.$this->_current_view));
632 632
 		}
633 633
 
634 634
 		//this will save any per_page screen options if they are present
@@ -644,8 +644,8 @@  discard block
 block discarded – undo
644 644
 		//add screen options - global, page child class, and view specific
645 645
 		$this->_add_global_screen_options();
646 646
 		$this->_add_screen_options();
647
-		if ( method_exists( $this, '_add_screen_options_' . $this->_current_view ) )
648
-			call_user_func( array( $this, '_add_screen_options_' . $this->_current_view ) );
647
+		if (method_exists($this, '_add_screen_options_'.$this->_current_view))
648
+			call_user_func(array($this, '_add_screen_options_'.$this->_current_view));
649 649
 
650 650
 
651 651
 		//add help tab(s) and tours- set via page_config and qtips.
@@ -656,32 +656,32 @@  discard block
 block discarded – undo
656 656
 		//add feature_pointers - global, page child class, and view specific
657 657
 		$this->_add_feature_pointers();
658 658
 		$this->_add_global_feature_pointers();
659
-		if ( method_exists( $this, '_add_feature_pointer_' . $this->_current_view ) )
660
-			call_user_func( array( $this, '_add_feature_pointer_' . $this->_current_view ) );
659
+		if (method_exists($this, '_add_feature_pointer_'.$this->_current_view))
660
+			call_user_func(array($this, '_add_feature_pointer_'.$this->_current_view));
661 661
 
662 662
 		//enqueue scripts/styles - global, page class, and view specific
663
-		add_action('admin_enqueue_scripts', array($this, 'load_global_scripts_styles'), 5 );
664
-		add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles'), 10 );
665
-		if ( method_exists( $this, 'load_scripts_styles_' . $this->_current_view ) )
666
-			add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles_' . $this->_current_view ), 15 );
663
+		add_action('admin_enqueue_scripts', array($this, 'load_global_scripts_styles'), 5);
664
+		add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles'), 10);
665
+		if (method_exists($this, 'load_scripts_styles_'.$this->_current_view))
666
+			add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles_'.$this->_current_view), 15);
667 667
 
668 668
 		//admin_print_footer_scripts - global, page child class, and view specific.  NOTE, despite the name, whenever possible, scripts should NOT be loaded using this.  In most cases that's doing_it_wrong().  But adding hidden container elements etc. is a good use case. Notice the late priority we're giving these.
669
-		add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_eei18n_js_strings' ), 1 );
670
-		add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_global' ), 99 );
671
-		add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts' ), 100 );
672
-		if ( method_exists( $this, 'admin_footer_scripts_' . $this->_current_view ) )
673
-			add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_' . $this->_current_view ), 101 );
669
+		add_action('admin_print_footer_scripts', array($this, 'admin_footer_scripts_eei18n_js_strings'), 1);
670
+		add_action('admin_print_footer_scripts', array($this, 'admin_footer_scripts_global'), 99);
671
+		add_action('admin_print_footer_scripts', array($this, 'admin_footer_scripts'), 100);
672
+		if (method_exists($this, 'admin_footer_scripts_'.$this->_current_view))
673
+			add_action('admin_print_footer_scripts', array($this, 'admin_footer_scripts_'.$this->_current_view), 101);
674 674
 
675 675
 		//admin footer scripts
676
-		add_action('admin_footer', array( $this, 'admin_footer_global' ), 99 );
677
-		add_action('admin_footer', array( $this, 'admin_footer'), 100 );
678
-		if ( method_exists( $this, 'admin_footer_' . $this->_current_view ) )
679
-			add_action('admin_footer', array( $this, 'admin_footer_' . $this->_current_view ), 101 );
676
+		add_action('admin_footer', array($this, 'admin_footer_global'), 99);
677
+		add_action('admin_footer', array($this, 'admin_footer'), 100);
678
+		if (method_exists($this, 'admin_footer_'.$this->_current_view))
679
+			add_action('admin_footer', array($this, 'admin_footer_'.$this->_current_view), 101);
680 680
 
681 681
 
682
-		do_action( 'FHEE__EE_Admin_Page___load_page_dependencies__after_load', $this->page_slug );
682
+		do_action('FHEE__EE_Admin_Page___load_page_dependencies__after_load', $this->page_slug);
683 683
 		//targeted hook
684
-		do_action( 'FHEE__EE_Admin_Page___load_page_dependencies__after_load__' . $this->page_slug . '__' . $this->_req_action );
684
+		do_action('FHEE__EE_Admin_Page___load_page_dependencies__after_load__'.$this->page_slug.'__'.$this->_req_action);
685 685
 
686 686
 	}
687 687
 
@@ -696,7 +696,7 @@  discard block
 block discarded – undo
696 696
 	private function _set_defaults() {
697 697
 		$this->_current_screen = $this->_admin_page_title = $this->_req_action = $this->_req_nonce = $this->_event = $this->_template_path = $this->_column_template_path = NULL;
698 698
 
699
-		$this->_nav_tabs = $this_views = $this->_page_routes = $this->_page_config =  $this->_default_route_query_args = array();
699
+		$this->_nav_tabs = $this_views = $this->_page_routes = $this->_page_config = $this->_default_route_query_args = array();
700 700
 
701 701
 		$this->default_nav_tab_name = 'overview';
702 702
 
@@ -723,7 +723,7 @@  discard block
 block discarded – undo
723 723
 	public function route_admin_request() {
724 724
 		try {
725 725
 			$this->_route_admin_request();
726
-		} catch ( EE_Error $e ) {
726
+		} catch (EE_Error $e) {
727 727
 			$e->get_error();
728 728
 		}
729 729
 	}
@@ -734,7 +734,7 @@  discard block
 block discarded – undo
734 734
 		$this->_wp_page_slug = $wp_page_slug;
735 735
 
736 736
 		//if in network admin then we need to append "-network" to the page slug. Why? Because that's how WP rolls...
737
-		if ( is_network_admin() ) {
737
+		if (is_network_admin()) {
738 738
 			$this->_wp_page_slug .= '-network';
739 739
 		}
740 740
 	}
@@ -747,53 +747,53 @@  discard block
 block discarded – undo
747 747
 	 * @return void
748 748
 	 */
749 749
 	protected function _verify_routes() {
750
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
750
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
751 751
 
752
-		if ( !$this->_current_page && !defined( 'DOING_AJAX')) return FALSE;
752
+		if ( ! $this->_current_page && ! defined('DOING_AJAX')) return FALSE;
753 753
 
754 754
 		$this->_route = FALSE;
755 755
 		$func = FALSE;
756 756
 		$args = array();
757 757
 
758 758
 		// check that the page_routes array is not empty
759
-		if ( empty( $this->_page_routes )) {
759
+		if (empty($this->_page_routes)) {
760 760
 			// user error msg
761
-			$error_msg = sprintf( __('No page routes have been set for the %s admin page.', 'event_espresso'), $this->_admin_page_title );
761
+			$error_msg = sprintf(__('No page routes have been set for the %s admin page.', 'event_espresso'), $this->_admin_page_title);
762 762
 			// developer error msg
763
-			$error_msg .=  '||' . $error_msg . __( ' Make sure the "set_page_routes()" method exists, and is setting the "_page_routes" array properly.', 'event_espresso' );
764
-			throw new EE_Error( $error_msg );
763
+			$error_msg .= '||'.$error_msg.__(' Make sure the "set_page_routes()" method exists, and is setting the "_page_routes" array properly.', 'event_espresso');
764
+			throw new EE_Error($error_msg);
765 765
 		}
766 766
 
767 767
 		// and that the requested page route exists
768
-		if ( array_key_exists( $this->_req_action, $this->_page_routes )) {
769
-			$this->_route = $this->_page_routes[ $this->_req_action ];
768
+		if (array_key_exists($this->_req_action, $this->_page_routes)) {
769
+			$this->_route = $this->_page_routes[$this->_req_action];
770 770
 			$this->_route_config = isset($this->_page_config[$this->_req_action]) ? $this->_page_config[$this->_req_action] : array();
771 771
 		} else {
772 772
 			// user error msg
773
-			$error_msg =  sprintf( __( 'The requested page route does not exist for the %s admin page.', 'event_espresso' ), $this->_admin_page_title );
773
+			$error_msg = sprintf(__('The requested page route does not exist for the %s admin page.', 'event_espresso'), $this->_admin_page_title);
774 774
 			// developer error msg
775
-			$error_msg .=  '||' . $error_msg . sprintf( __( ' Create a key in the "_page_routes" array named "%s" and set its value to the appropriate method.', 'event_espresso' ), $this->_req_action );
776
-			throw new EE_Error( $error_msg );
775
+			$error_msg .= '||'.$error_msg.sprintf(__(' Create a key in the "_page_routes" array named "%s" and set its value to the appropriate method.', 'event_espresso'), $this->_req_action);
776
+			throw new EE_Error($error_msg);
777 777
 		}
778 778
 
779 779
 		// and that a default route exists
780
-		if ( ! array_key_exists( 'default', $this->_page_routes )) {
780
+		if ( ! array_key_exists('default', $this->_page_routes)) {
781 781
 			// user error msg
782
-			$error_msg = sprintf( __( 'A default page route has not been set for the % admin page.', 'event_espresso' ), $this->_admin_page_title );
782
+			$error_msg = sprintf(__('A default page route has not been set for the % admin page.', 'event_espresso'), $this->_admin_page_title);
783 783
 			// developer error msg
784
-			$error_msg .=  '||' . $error_msg . __( ' Create a key in the "_page_routes" array named "default" and set its value to your default page method.', 'event_espresso' );
785
-			throw new EE_Error( $error_msg );
784
+			$error_msg .= '||'.$error_msg.__(' Create a key in the "_page_routes" array named "default" and set its value to your default page method.', 'event_espresso');
785
+			throw new EE_Error($error_msg);
786 786
 		}
787 787
 
788 788
 
789 789
 		//first lets' catch if the UI request has EVER been set.
790
-		if ( $this->_is_UI_request === NULL ) {
790
+		if ($this->_is_UI_request === NULL) {
791 791
 			//lets set if this is a UI request or not.
792
-			$this->_is_UI_request = ( ! isset( $this->_req_data['noheader'] ) || $this->_req_data['noheader'] !== TRUE ) ? TRUE : FALSE;
792
+			$this->_is_UI_request = ( ! isset($this->_req_data['noheader']) || $this->_req_data['noheader'] !== TRUE) ? TRUE : FALSE;
793 793
 
794 794
 
795 795
 			//wait a minute... we might have a noheader in the route array
796
-			$this->_is_UI_request = is_array($this->_route) && isset($this->_route['noheader'] ) && $this->_route['noheader'] ? FALSE : $this->_is_UI_request;
796
+			$this->_is_UI_request = is_array($this->_route) && isset($this->_route['noheader']) && $this->_route['noheader'] ? FALSE : $this->_is_UI_request;
797 797
 		}
798 798
 
799 799
 		$this->_set_current_labels();
@@ -808,15 +808,15 @@  discard block
 block discarded – undo
808 808
 	 * @param  string $route the route name we're verifying
809 809
 	 * @return mixed  (bool|Exception)      we'll throw an exception if this isn't a valid route.
810 810
 	 */
811
-	protected function _verify_route( $route ) {
812
-		if ( array_key_exists( $this->_req_action, $this->_page_routes )) {
811
+	protected function _verify_route($route) {
812
+		if (array_key_exists($this->_req_action, $this->_page_routes)) {
813 813
 			return true;
814 814
 		} else {
815 815
 			// user error msg
816
-			$error_msg =  sprintf( __( 'The given page route does not exist for the %s admin page.', 'event_espresso' ), $this->_admin_page_title );
816
+			$error_msg = sprintf(__('The given page route does not exist for the %s admin page.', 'event_espresso'), $this->_admin_page_title);
817 817
 			// developer error msg
818
-			$error_msg .=  '||' . $error_msg . sprintf( __( ' Check the route you are using in your method (%s) and make sure it matches a route set in your "_page_routes" array property', 'event_espresso' ), $route );
819
-			throw new EE_Error( $error_msg );
818
+			$error_msg .= '||'.$error_msg.sprintf(__(' Check the route you are using in your method (%s) and make sure it matches a route set in your "_page_routes" array property', 'event_espresso'), $route);
819
+			throw new EE_Error($error_msg);
820 820
 		}
821 821
 	}
822 822
 
@@ -830,18 +830,18 @@  discard block
 block discarded – undo
830 830
 	 * @param  string $nonce_ref The nonce reference string (name0)
831 831
 	 * @return mixed (bool|die)
832 832
 	 */
833
-	protected function _verify_nonce( $nonce, $nonce_ref ) {
833
+	protected function _verify_nonce($nonce, $nonce_ref) {
834 834
 		// verify nonce against expected value
835
-		if ( ! wp_verify_nonce( $nonce, $nonce_ref) ) {
835
+		if ( ! wp_verify_nonce($nonce, $nonce_ref)) {
836 836
 			// these are not the droids you are looking for !!!
837
-			$msg = sprintf(__('%sNonce Fail.%s' , 'event_espresso'), '<a href="http://www.youtube.com/watch?v=56_S0WeTkzs">', '</a>' );
838
-			if ( WP_DEBUG ) {
839
-				$msg .= "\n  " . sprintf( __('In order to dynamically generate nonces for your actions, use the %s::add_query_args_and_nonce() method. May the Nonce be with you!', 'event_espresso' ), __CLASS__  );
837
+			$msg = sprintf(__('%sNonce Fail.%s', 'event_espresso'), '<a href="http://www.youtube.com/watch?v=56_S0WeTkzs">', '</a>');
838
+			if (WP_DEBUG) {
839
+				$msg .= "\n  ".sprintf(__('In order to dynamically generate nonces for your actions, use the %s::add_query_args_and_nonce() method. May the Nonce be with you!', 'event_espresso'), __CLASS__);
840 840
 			}
841
-			if ( ! defined( 'DOING_AJAX' )) {
842
-				wp_die( $msg );
841
+			if ( ! defined('DOING_AJAX')) {
842
+				wp_die($msg);
843 843
 			} else {
844
-				EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
844
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
845 845
 				$this->_return_json();
846 846
 			}
847 847
 		}
@@ -859,63 +859,63 @@  discard block
 block discarded – undo
859 859
 	 * @return void
860 860
 	 */
861 861
 	protected function _route_admin_request() {
862
-		if (  ! $this->_is_UI_request )
862
+		if ( ! $this->_is_UI_request)
863 863
 			$this->_verify_routes();
864 864
 
865
-		$nonce_check = isset( $this->_route_config['require_nonce'] ) ? $this->_route_config['require_nonce'] : TRUE;
865
+		$nonce_check = isset($this->_route_config['require_nonce']) ? $this->_route_config['require_nonce'] : TRUE;
866 866
 
867
-		if ( $this->_req_action != 'default' && $nonce_check ) {
867
+		if ($this->_req_action != 'default' && $nonce_check) {
868 868
 			// set nonce from post data
869
-			$nonce = isset($this->_req_data[ $this->_req_nonce  ]) ? sanitize_text_field( $this->_req_data[ $this->_req_nonce  ] ) : '';
870
-			$this->_verify_nonce( $nonce, $this->_req_nonce );
869
+			$nonce = isset($this->_req_data[$this->_req_nonce]) ? sanitize_text_field($this->_req_data[$this->_req_nonce]) : '';
870
+			$this->_verify_nonce($nonce, $this->_req_nonce);
871 871
 		}
872 872
 		//set the nav_tabs array but ONLY if this is  UI_request
873
-		if ( $this->_is_UI_request )
873
+		if ($this->_is_UI_request)
874 874
 			$this->_set_nav_tabs();
875 875
 
876 876
 		// grab callback function
877
-		$func = is_array( $this->_route ) ? $this->_route['func'] : $this->_route;
877
+		$func = is_array($this->_route) ? $this->_route['func'] : $this->_route;
878 878
 
879 879
 		// check if callback has args
880
-		$args = is_array( $this->_route ) && isset( $this->_route['args'] ) ? $this->_route['args'] : array();
880
+		$args = is_array($this->_route) && isset($this->_route['args']) ? $this->_route['args'] : array();
881 881
 
882 882
 		$error_msg = '';
883 883
 
884 884
 		//action right before calling route (hook is something like 'AHEE__Registrations_Admin_Page__route_admin_request')
885
-		if ( !did_action('AHEE__EE_Admin_Page__route_admin_request')) {
886
-			do_action( 'AHEE__EE_Admin_Page__route_admin_request', $this->_current_view, $this );
885
+		if ( ! did_action('AHEE__EE_Admin_Page__route_admin_request')) {
886
+			do_action('AHEE__EE_Admin_Page__route_admin_request', $this->_current_view, $this);
887 887
 		}
888 888
 
889 889
 		//right before calling the route, let's remove _wp_http_referer from the $_SERVER[REQUEST_URI] global (its now in _req_data for route processing).
890
-		$_SERVER['REQUEST_URI'] = remove_query_arg( '_wp_http_referer', wp_unslash( $_SERVER['REQUEST_URI'] ) );
890
+		$_SERVER['REQUEST_URI'] = remove_query_arg('_wp_http_referer', wp_unslash($_SERVER['REQUEST_URI']));
891 891
 
892
-		if ( ! empty( $func )) {
892
+		if ( ! empty($func)) {
893 893
 			$base_call = $addon_call = FALSE;
894 894
 			//try to access page route via this class
895
-			if ( ! is_array( $func ) && method_exists( $this, $func ) && ( $base_call = call_user_func_array( array( $this, &$func  ), $args ) ) === FALSE ) {
895
+			if ( ! is_array($func) && method_exists($this, $func) && ($base_call = call_user_func_array(array($this, &$func), $args)) === FALSE) {
896 896
 				// user error msg
897
-				$error_msg =  __( 'An error occurred. The  requested page route could not be found.', 'event_espresso' );
897
+				$error_msg = __('An error occurred. The  requested page route could not be found.', 'event_espresso');
898 898
 				// developer error msg
899
-				$error_msg .= '||' . sprintf( __( 'Page route "%s" could not be called. Check that the spelling for method names and actions in the "_page_routes" array are all correct.', 'event_espresso' ), $func );
899
+				$error_msg .= '||'.sprintf(__('Page route "%s" could not be called. Check that the spelling for method names and actions in the "_page_routes" array are all correct.', 'event_espresso'), $func);
900 900
 			}
901 901
 
902 902
 			//for pluggability by addons first let's see if just the function exists (this will also work in the case where $func is an array indicating class/method)
903 903
 			$args['admin_page_object'] = $this; //send along this admin page object for access by addons.
904 904
 
905
-			if ( $base_call === FALSE && ( $addon_call = call_user_func_array( $func, $args ) )=== FALSE ) {
906
-				$error_msg = __('An error occurred. The requested page route could not be found', 'event_espresso' );
907
-				$error_msg .= '||' . sprintf( __('Page route "%s" could not be called.  Check that the spelling for the function name and action in the "_page_routes" array filtered by your plugin is correct.', 'event_espresso'), $func );
905
+			if ($base_call === FALSE && ($addon_call = call_user_func_array($func, $args)) === FALSE) {
906
+				$error_msg = __('An error occurred. The requested page route could not be found', 'event_espresso');
907
+				$error_msg .= '||'.sprintf(__('Page route "%s" could not be called.  Check that the spelling for the function name and action in the "_page_routes" array filtered by your plugin is correct.', 'event_espresso'), $func);
908 908
 			}
909 909
 
910 910
 
911
-			if ( !empty( $error_msg ) && $base_call === FALSE && $addon_call === FALSE )
912
-				throw new EE_Error( $error_msg );
911
+			if ( ! empty($error_msg) && $base_call === FALSE && $addon_call === FALSE)
912
+				throw new EE_Error($error_msg);
913 913
 		}
914 914
 
915 915
 		//if we've routed and this route has a no headers route AND a sent_headers_route, then we need to reset the routing properties to the new route.
916 916
 		//now if UI request is FALSE and noheader is true AND we have a headers_sent_route in the route array then let's set UI_request to true because the no header route has a second func after headers have been sent.
917
-		if ( $this->_is_UI_request === FALSE && is_array( $this->_route) && ! empty( $this->_route['headers_sent_route'] ) ) {
918
-			$this->_reset_routing_properties( $this->_route['headers_sent_route'] );
917
+		if ($this->_is_UI_request === FALSE && is_array($this->_route) && ! empty($this->_route['headers_sent_route'])) {
918
+			$this->_reset_routing_properties($this->_route['headers_sent_route']);
919 919
 		}
920 920
 	}
921 921
 
@@ -931,7 +931,7 @@  discard block
 block discarded – undo
931 931
 	 * @param  string    $new_route   New (non header) route to redirect to.
932 932
 	 * @return   void
933 933
 	 */
934
-	protected function _reset_routing_properties( $new_route ) {
934
+	protected function _reset_routing_properties($new_route) {
935 935
 		$this->_is_UI_request = TRUE;
936 936
 		//now we set the current route to whatever the headers_sent_route is set at
937 937
 		$this->_req_data['action'] = $new_route;
@@ -976,20 +976,20 @@  discard block
 block discarded – undo
976 976
 	 *	                        	month_range]=March%202015
977 977
 	 * 	@return string
978 978
 	 */
979
-	public static function add_query_args_and_nonce( $args = array(), $url = false, $sticky = false ) {
979
+	public static function add_query_args_and_nonce($args = array(), $url = false, $sticky = false) {
980 980
 		EE_Registry::instance()->load_helper('URL');
981 981
 
982 982
 		//if there is a _wp_http_referer include the values from the request but only if sticky = true
983
-		if ( $sticky ) {
983
+		if ($sticky) {
984 984
 			$request = $_REQUEST;
985
-			unset( $request['_wp_http_referer'] );
986
-			unset( $request['wp_referer'] );
987
-			foreach ( $request as $key => $value ) {
985
+			unset($request['_wp_http_referer']);
986
+			unset($request['wp_referer']);
987
+			foreach ($request as $key => $value) {
988 988
 				//do not add nonces
989
-				if ( strpos( $key, 'nonce' ) !== false ) {
989
+				if (strpos($key, 'nonce') !== false) {
990 990
 					continue;
991 991
 				}
992
-				$args['wp_referer[' . $key . ']'] = $value;
992
+				$args['wp_referer['.$key.']'] = $value;
993 993
 			}
994 994
 		}
995 995
 
@@ -1009,8 +1009,8 @@  discard block
 block discarded – undo
1009 1009
 	 * @uses EEH_Template::get_help_tab_link()
1010 1010
 	 * @return string              generated link
1011 1011
 	 */
1012
-	protected function _get_help_tab_link( $help_tab_id, $icon_style = FALSE, $help_text = FALSE ) {
1013
-		return EEH_Template::get_help_tab_link( $help_tab_id, $this->page_slug, $this->_req_action, $icon_style, $help_text );
1012
+	protected function _get_help_tab_link($help_tab_id, $icon_style = FALSE, $help_text = FALSE) {
1013
+		return EEH_Template::get_help_tab_link($help_tab_id, $this->page_slug, $this->_req_action, $icon_style, $help_text);
1014 1014
 	}
1015 1015
 
1016 1016
 
@@ -1027,30 +1027,30 @@  discard block
 block discarded – undo
1027 1027
 	 */
1028 1028
 	protected function _add_help_tabs() {
1029 1029
 		$tour_buttons = '';
1030
-		if ( isset( $this->_page_config[$this->_req_action] ) ) {
1030
+		if (isset($this->_page_config[$this->_req_action])) {
1031 1031
 			$config = $this->_page_config[$this->_req_action];
1032 1032
 
1033 1033
 			//is there a help tour for the current route?  if there is let's setup the tour buttons
1034
-			if ( isset( $this->_help_tour[$this->_req_action]) ) {
1034
+			if (isset($this->_help_tour[$this->_req_action])) {
1035 1035
 				$tb = array();
1036 1036
 				$tour_buttons = '<div class="ee-abs-container"><div class="ee-help-tour-restart-buttons">';
1037
-				foreach ( $this->_help_tour['tours'] as $tour ) {
1037
+				foreach ($this->_help_tour['tours'] as $tour) {
1038 1038
 					//if this is the end tour then we don't need to setup a button
1039
-					if ( $tour instanceof EE_Help_Tour_final_stop )
1039
+					if ($tour instanceof EE_Help_Tour_final_stop)
1040 1040
 						continue;
1041
-					$tb[] = '<button id="trigger-tour-' . $tour->get_slug() . '" class="button-primary trigger-ee-help-tour">' . $tour->get_label() . '</button>';
1041
+					$tb[] = '<button id="trigger-tour-'.$tour->get_slug().'" class="button-primary trigger-ee-help-tour">'.$tour->get_label().'</button>';
1042 1042
 				}
1043 1043
 				$tour_buttons .= implode('<br />', $tb);
1044 1044
 				$tour_buttons .= '</div></div>';
1045 1045
 			}
1046 1046
 
1047 1047
 			// let's see if there is a help_sidebar set for the current route and we'll set that up for usage as well.
1048
-			if ( is_array( $config ) && isset( $config['help_sidebar'] ) ) {
1048
+			if (is_array($config) && isset($config['help_sidebar'])) {
1049 1049
 				//check that the callback given is valid
1050
-				if ( !method_exists($this, $config['help_sidebar'] ) )
1051
-					throw new EE_Error( sprintf( __('The _page_config array has a callback set for the "help_sidebar" option.  However the callback given (%s) is not a valid callback.  Doublecheck the spelling and make sure this method exists for the class %s', 'event_espresso'), $config['help_sidebar'], get_class($this) ) );
1050
+				if ( ! method_exists($this, $config['help_sidebar']))
1051
+					throw new EE_Error(sprintf(__('The _page_config array has a callback set for the "help_sidebar" option.  However the callback given (%s) is not a valid callback.  Doublecheck the spelling and make sure this method exists for the class %s', 'event_espresso'), $config['help_sidebar'], get_class($this)));
1052 1052
 
1053
-				$content = apply_filters( 'FHEE__' . get_class($this) . '__add_help_tabs__help_sidebar', call_user_func( array( $this, $config['help_sidebar'] ) ) );
1053
+				$content = apply_filters('FHEE__'.get_class($this).'__add_help_tabs__help_sidebar', call_user_func(array($this, $config['help_sidebar'])));
1054 1054
 
1055 1055
 				$content .= $tour_buttons; //add help tour buttons.
1056 1056
 
@@ -1059,49 +1059,49 @@  discard block
 block discarded – undo
1059 1059
 			}
1060 1060
 
1061 1061
 			//if we DON'T have config help sidebar and there ARE toure buttons then we'll just add the tour buttons to the sidebar.
1062
-			if ( !isset( $config['help_sidebar'] ) && !empty( $tour_buttons ) ) {
1062
+			if ( ! isset($config['help_sidebar']) && ! empty($tour_buttons)) {
1063 1063
 				$this->_current_screen->set_help_sidebar($tour_buttons);
1064 1064
 			}
1065 1065
 
1066 1066
 			//handle if no help_tabs are set so the sidebar will still show for the help tour buttons
1067
-			if ( !isset( $config['help_tabs'] ) && !empty($tour_buttons) ) {
1067
+			if ( ! isset($config['help_tabs']) && ! empty($tour_buttons)) {
1068 1068
 				$_ht['id'] = $this->page_slug;
1069 1069
 				$_ht['title'] = __('Help Tours', 'event_espresso');
1070
-				$_ht['content'] = '<p>' . __('The buttons to the right allow you to start/restart any help tours available for this page', 'event_espresso') . '</p>';
1070
+				$_ht['content'] = '<p>'.__('The buttons to the right allow you to start/restart any help tours available for this page', 'event_espresso').'</p>';
1071 1071
 				$this->_current_screen->add_help_tab($_ht);
1072 1072
 				}/**/
1073 1073
 
1074 1074
 
1075
-			if ( !isset( $config['help_tabs'] ) ) return; //no help tabs for this route
1075
+			if ( ! isset($config['help_tabs'])) return; //no help tabs for this route
1076 1076
 
1077
-			foreach ( (array) $config['help_tabs'] as $tab_id => $cfg ) {
1077
+			foreach ((array) $config['help_tabs'] as $tab_id => $cfg) {
1078 1078
 				//we're here so there ARE help tabs!
1079 1079
 
1080 1080
 				//make sure we've got what we need
1081
-				if ( !isset( $cfg['title'] ) )
1082
-					throw new EE_Error( __('The _page_config array is not set up properly for help tabs.  It is missing a title', 'event_espresso') );
1081
+				if ( ! isset($cfg['title']))
1082
+					throw new EE_Error(__('The _page_config array is not set up properly for help tabs.  It is missing a title', 'event_espresso'));
1083 1083
 
1084 1084
 
1085
-				if ( !isset($cfg['filename']) && !isset( $cfg['callback'] ) && !isset( $cfg['content'] ) )
1086
-					throw new EE_Error( __('The _page_config array is not setup properly for help tabs. It is missing a either a filename reference, or a callback reference or a content reference so there is no way to know the content for the help tab', 'event_espresso') );
1085
+				if ( ! isset($cfg['filename']) && ! isset($cfg['callback']) && ! isset($cfg['content']))
1086
+					throw new EE_Error(__('The _page_config array is not setup properly for help tabs. It is missing a either a filename reference, or a callback reference or a content reference so there is no way to know the content for the help tab', 'event_espresso'));
1087 1087
 
1088 1088
 
1089 1089
 
1090 1090
 				//first priority goes to content.
1091
-				if ( !empty($cfg['content'] ) ) {
1092
-					$content = !empty($cfg['content']) ? $cfg['content'] : NULL;
1091
+				if ( ! empty($cfg['content'])) {
1092
+					$content = ! empty($cfg['content']) ? $cfg['content'] : NULL;
1093 1093
 
1094 1094
 				//second priority goes to filename
1095
-				} else if ( !empty($cfg['filename'] ) ) {
1096
-					$file_path = $this->_get_dir() . '/help_tabs/' . $cfg['filename'] . '.help_tab.php';
1095
+				} else if ( ! empty($cfg['filename'])) {
1096
+					$file_path = $this->_get_dir().'/help_tabs/'.$cfg['filename'].'.help_tab.php';
1097 1097
 
1098 1098
 
1099 1099
 					//it's possible that the file is located on decaf route (and above sets up for caf route, if this is the case then lets check decaf route too)
1100
-					$file_path = !is_readable($file_path) ? EE_ADMIN_PAGES . basename($this->_get_dir()) . '/help_tabs/' . $cfg['filename'] . '.help_tab.php' : $file_path;
1100
+					$file_path = ! is_readable($file_path) ? EE_ADMIN_PAGES . basename($this->_get_dir()).'/help_tabs/'.$cfg['filename'].'.help_tab.php' : $file_path;
1101 1101
 
1102 1102
 					//if file is STILL not readable then let's do a EE_Error so its more graceful than a fatal error.
1103
-					if ( !is_readable($file_path) && !isset($cfg['callback']) ) {
1104
-						EE_Error::add_error( sprintf( __('The filename given for the help tab %s is not a valid file and there is no other configuration for the tab content.  Please check that the string you set for the help tab on this route (%s) is the correct spelling.  The file should be in %s', 'event_espresso'), $tab_id, key($config), $file_path ), __FILE__, __FUNCTION__, __LINE__ );
1103
+					if ( ! is_readable($file_path) && ! isset($cfg['callback'])) {
1104
+						EE_Error::add_error(sprintf(__('The filename given for the help tab %s is not a valid file and there is no other configuration for the tab content.  Please check that the string you set for the help tab on this route (%s) is the correct spelling.  The file should be in %s', 'event_espresso'), $tab_id, key($config), $file_path), __FILE__, __FUNCTION__, __LINE__);
1105 1105
 						return;
1106 1106
 					}
1107 1107
 					$template_args['admin_page_obj'] = $this;
@@ -1112,21 +1112,21 @@  discard block
 block discarded – undo
1112 1112
 
1113 1113
 
1114 1114
 				//check if callback is valid
1115
-				if ( empty($content) && ( !isset($cfg['callback']) || !method_exists( $this, $cfg['callback'] ) ) ) {
1116
-					EE_Error::add_error( sprintf( __('The callback given for a %s help tab on this page does not content OR a corresponding method for generating the content.  Check the spelling or make sure the method is present.', 'event_espresso'), $cfg['title'] ), __FILE__, __FUNCTION__, __LINE__ );
1115
+				if (empty($content) && ( ! isset($cfg['callback']) || ! method_exists($this, $cfg['callback']))) {
1116
+					EE_Error::add_error(sprintf(__('The callback given for a %s help tab on this page does not content OR a corresponding method for generating the content.  Check the spelling or make sure the method is present.', 'event_espresso'), $cfg['title']), __FILE__, __FUNCTION__, __LINE__);
1117 1117
 					return;
1118 1118
 				}
1119 1119
 
1120 1120
 				//setup config array for help tab method
1121
-				$id = $this->page_slug . '-' . $this->_req_action . '-' . $tab_id;
1121
+				$id = $this->page_slug.'-'.$this->_req_action.'-'.$tab_id;
1122 1122
 				$_ht = array(
1123 1123
 					'id' => $id,
1124 1124
 					'title' => $cfg['title'],
1125
-					'callback' => isset( $cfg['callback'] ) && empty($content) ? array( $this, $cfg['callback'] ) : NULL,
1125
+					'callback' => isset($cfg['callback']) && empty($content) ? array($this, $cfg['callback']) : NULL,
1126 1126
 					'content' => $content
1127 1127
 					);
1128 1128
 
1129
-				$this->_current_screen->add_help_tab( $_ht );
1129
+				$this->_current_screen->add_help_tab($_ht);
1130 1130
 			}
1131 1131
 		}
1132 1132
 	}
@@ -1146,49 +1146,49 @@  discard block
 block discarded – undo
1146 1146
 		$this->_help_tour = array();
1147 1147
 
1148 1148
 		//exit early if help tours are turned off globally
1149
-		if ( ! EE_Registry::instance()->CFG->admin->help_tour_activation || ( defined( 'EE_DISABLE_HELP_TOURS' ) && EE_DISABLE_HELP_TOURS ) )
1149
+		if ( ! EE_Registry::instance()->CFG->admin->help_tour_activation || (defined('EE_DISABLE_HELP_TOURS') && EE_DISABLE_HELP_TOURS))
1150 1150
 			return;
1151 1151
 
1152 1152
 		//loop through _page_config to find any help_tour defined
1153
-		foreach ( $this->_page_config as $route => $config ) {
1153
+		foreach ($this->_page_config as $route => $config) {
1154 1154
 			//we're only going to set things up for this route
1155
-			if ( $route !== $this->_req_action )
1155
+			if ($route !== $this->_req_action)
1156 1156
 				continue;
1157 1157
 
1158
-			if ( isset( $config['help_tour'] ) ) {
1158
+			if (isset($config['help_tour'])) {
1159 1159
 
1160
-				foreach( $config['help_tour'] as $tour ) {
1161
-					$file_path = $this->_get_dir() . '/help_tours/' . $tour . '.class.php';
1160
+				foreach ($config['help_tour'] as $tour) {
1161
+					$file_path = $this->_get_dir().'/help_tours/'.$tour.'.class.php';
1162 1162
 					//let's see if we can get that file... if not its possible this is a decaf route not set in caffienated so lets try and get the caffeinated equivalent
1163
-					$file_path = !is_readable($file_path) ? EE_ADMIN_PAGES . basename($this->_get_dir()) . '/help_tours/' . $tour . '.class.php' : $file_path;
1163
+					$file_path = ! is_readable($file_path) ? EE_ADMIN_PAGES . basename($this->_get_dir()).'/help_tours/'.$tour.'.class.php' : $file_path;
1164 1164
 
1165 1165
 					//if file is STILL not readable then let's do a EE_Error so its more graceful than a fatal error.
1166
-					if ( !is_readable($file_path) ) {
1167
-						EE_Error::add_error( sprintf( __('The file path given for the help tour (%s) is not a valid path.  Please check that the string you set for the help tour on this route (%s) is the correct spelling', 'event_espresso'), $file_path, $tour ), __FILE__, __FUNCTION__, __LINE__ );
1166
+					if ( ! is_readable($file_path)) {
1167
+						EE_Error::add_error(sprintf(__('The file path given for the help tour (%s) is not a valid path.  Please check that the string you set for the help tour on this route (%s) is the correct spelling', 'event_espresso'), $file_path, $tour), __FILE__, __FUNCTION__, __LINE__);
1168 1168
 						return;
1169 1169
 					}
1170 1170
 
1171 1171
 					require_once $file_path;
1172
-					if ( !class_exists( $tour ) ) {
1173
-						$error_msg[] = sprintf( __('Something went wrong with loading the %s Help Tour Class.', 'event_espresso' ), $tour);
1174
-						$error_msg[] = $error_msg[0] . "\r\n" . sprintf( __( 'There is no class in place for the %s help tour.%s Make sure you have <strong>%s</strong> defined in the "help_tour" array for the %s route of the % admin page.', 'event_espresso'), $tour, '<br />', $tour, $this->_req_action, get_class($this) );
1175
-						throw new EE_Error( implode( '||', $error_msg ));
1172
+					if ( ! class_exists($tour)) {
1173
+						$error_msg[] = sprintf(__('Something went wrong with loading the %s Help Tour Class.', 'event_espresso'), $tour);
1174
+						$error_msg[] = $error_msg[0]."\r\n".sprintf(__('There is no class in place for the %s help tour.%s Make sure you have <strong>%s</strong> defined in the "help_tour" array for the %s route of the % admin page.', 'event_espresso'), $tour, '<br />', $tour, $this->_req_action, get_class($this));
1175
+						throw new EE_Error(implode('||', $error_msg));
1176 1176
 					}
1177 1177
 					$a = new ReflectionClass($tour);
1178 1178
 					$tour_obj = $a->newInstance($this->_is_caf);
1179 1179
 
1180 1180
 					$tours[] = $tour_obj;
1181
-					$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator( $tour_obj );
1181
+					$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator($tour_obj);
1182 1182
 				}
1183 1183
 
1184 1184
 				//let's inject the end tour stop element common to all pages... this will only get seen once per machine.
1185 1185
 				$end_stop_tour = new EE_Help_Tour_final_stop($this->_is_caf);
1186 1186
 				$tours[] = $end_stop_tour;
1187
-				$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator( $end_stop_tour );
1187
+				$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator($end_stop_tour);
1188 1188
 			}
1189 1189
 		}
1190 1190
 
1191
-		if ( !empty( $tours ) )
1191
+		if ( ! empty($tours))
1192 1192
 			$this->_help_tour['tours'] = $tours;
1193 1193
 
1194 1194
 		//thats it!  Now that the $_help_tours property is set (or not) the scripts and html should be taken care of automatically.
@@ -1204,13 +1204,13 @@  discard block
 block discarded – undo
1204 1204
 	 * @return void
1205 1205
 	 */
1206 1206
 	protected function _add_qtips() {
1207
-		if ( isset( $this->_route_config['qtips'] ) ) {
1207
+		if (isset($this->_route_config['qtips'])) {
1208 1208
 			$qtips = (array) $this->_route_config['qtips'];
1209 1209
 			//load qtip loader
1210 1210
 			EE_Registry::instance()->load_helper('Qtip_Loader', array(), TRUE);
1211 1211
 			$path = array(
1212
-				$this->_get_dir() . '/qtips/',
1213
-				EE_ADMIN_PAGES . basename($this->_get_dir()) . '/qtips/'
1212
+				$this->_get_dir().'/qtips/',
1213
+				EE_ADMIN_PAGES.basename($this->_get_dir()).'/qtips/'
1214 1214
 				);
1215 1215
 			EEH_Qtip_Loader::instance()->register($qtips, $path);
1216 1216
 		}
@@ -1227,41 +1227,41 @@  discard block
 block discarded – undo
1227 1227
 	 * @return void
1228 1228
 	 */
1229 1229
 	protected function _set_nav_tabs() {
1230
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
1230
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
1231 1231
 		$i = 0;
1232
-		foreach ( $this->_page_config as $slug => $config ) {
1233
-			if ( !is_array( $config ) || ( is_array($config) && (isset($config['nav']) && !$config['nav'] ) || !isset($config['nav'] ) ) )
1232
+		foreach ($this->_page_config as $slug => $config) {
1233
+			if ( ! is_array($config) || (is_array($config) && (isset($config['nav']) && ! $config['nav']) || ! isset($config['nav'])))
1234 1234
 				continue; //no nav tab for this config
1235 1235
 
1236 1236
 			//check for persistent flag
1237
-			if ( isset( $config['nav']['persistent']) && !$config['nav']['persistent'] && $slug !== $this->_req_action )
1237
+			if (isset($config['nav']['persistent']) && ! $config['nav']['persistent'] && $slug !== $this->_req_action)
1238 1238
 				continue; //nav tab is only to appear when route requested.
1239 1239
 
1240
-			if ( ! $this->check_user_access( $slug, TRUE ) )
1240
+			if ( ! $this->check_user_access($slug, TRUE))
1241 1241
 				continue; //no nav tab becasue current user does not have access.
1242 1242
 
1243
-			$css_class = isset( $config['css_class'] ) ? $config['css_class'] . ' ' : '';
1243
+			$css_class = isset($config['css_class']) ? $config['css_class'].' ' : '';
1244 1244
 			$this->_nav_tabs[$slug] = array(
1245
-				'url' => isset($config['nav']['url']) ? $config['nav']['url'] : self::add_query_args_and_nonce( array( 'action'=>$slug ), $this->_admin_base_url ),
1246
-				'link_text' => isset( $config['nav']['label'] ) ? $config['nav']['label'] : ucwords(str_replace('_', ' ', $slug ) ),
1247
-				'css_class' => $this->_req_action == $slug ? $css_class . 'nav-tab-active' : $css_class,
1248
-				'order' => isset( $config['nav']['order'] ) ? $config['nav']['order'] : $i
1245
+				'url' => isset($config['nav']['url']) ? $config['nav']['url'] : self::add_query_args_and_nonce(array('action'=>$slug), $this->_admin_base_url),
1246
+				'link_text' => isset($config['nav']['label']) ? $config['nav']['label'] : ucwords(str_replace('_', ' ', $slug)),
1247
+				'css_class' => $this->_req_action == $slug ? $css_class.'nav-tab-active' : $css_class,
1248
+				'order' => isset($config['nav']['order']) ? $config['nav']['order'] : $i
1249 1249
 				);
1250 1250
 			$i++;
1251 1251
 		}
1252 1252
 
1253 1253
 		//if $this->_nav_tabs is empty then lets set the default
1254
-		if ( empty( $this->_nav_tabs ) ) {
1254
+		if (empty($this->_nav_tabs)) {
1255 1255
 			$this->_nav_tabs[$this->default_nav_tab_name] = array(
1256 1256
 				'url' => $this->admin_base_url,
1257
-				'link_text' => ucwords( str_replace( '_', ' ', $this->default_nav_tab_name ) ),
1257
+				'link_text' => ucwords(str_replace('_', ' ', $this->default_nav_tab_name)),
1258 1258
 				'css_class' => 'nav-tab-active',
1259 1259
 				'order' => 10
1260 1260
 				);
1261 1261
 		}
1262 1262
 
1263 1263
 		//now let's sort the tabs according to order
1264
-		usort( $this->_nav_tabs, array($this, '_sort_nav_tabs' ));
1264
+		usort($this->_nav_tabs, array($this, '_sort_nav_tabs'));
1265 1265
 
1266 1266
 	}
1267 1267
 
@@ -1277,10 +1277,10 @@  discard block
 block discarded – undo
1277 1277
 	 * @return void
1278 1278
 	 */
1279 1279
 	private function _set_current_labels() {
1280
-		if ( is_array($this->_route_config) && isset($this->_route_config['labels']) ) {
1281
-			foreach ( $this->_route_config['labels'] as $label => $text ) {
1282
-				if ( is_array($text) ) {
1283
-					foreach ( $text as $sublabel => $subtext ) {
1280
+		if (is_array($this->_route_config) && isset($this->_route_config['labels'])) {
1281
+			foreach ($this->_route_config['labels'] as $label => $text) {
1282
+				if (is_array($text)) {
1283
+					foreach ($text as $sublabel => $subtext) {
1284 1284
 						$this->_labels[$label][$sublabel] = $subtext;
1285 1285
 					}
1286 1286
 				} else {
@@ -1301,24 +1301,24 @@  discard block
 block discarded – undo
1301 1301
 	 * 		@param bool   $verify_only Default is FALSE which means if user check fails then wp_die().  Otherwise just return false if verify fail.
1302 1302
 	*		@return 		BOOL|wp_die()
1303 1303
 	*/
1304
-	public function check_user_access( $route_to_check = '', $verify_only = FALSE ) {
1305
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
1306
-		$route_to_check = empty( $route_to_check ) ? $this->_req_action : $route_to_check;
1307
-		$capability = ! empty( $route_to_check ) && isset( $this->_page_routes[$route_to_check] ) && is_array( $this->_page_routes[$route_to_check] ) && ! empty( $this->_page_routes[$route_to_check]['capability'] ) ? $this->_page_routes[$route_to_check]['capability'] : NULL;
1304
+	public function check_user_access($route_to_check = '', $verify_only = FALSE) {
1305
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
1306
+		$route_to_check = empty($route_to_check) ? $this->_req_action : $route_to_check;
1307
+		$capability = ! empty($route_to_check) && isset($this->_page_routes[$route_to_check]) && is_array($this->_page_routes[$route_to_check]) && ! empty($this->_page_routes[$route_to_check]['capability']) ? $this->_page_routes[$route_to_check]['capability'] : NULL;
1308 1308
 
1309
-		if ( empty( $capability ) && empty( $route_to_check )  ) {
1310
-			$capability = is_array( $this->_route ) && empty( $this->_route['capability'] ) ? 'manage_options' : $this->_route['capability'];
1309
+		if (empty($capability) && empty($route_to_check)) {
1310
+			$capability = is_array($this->_route) && empty($this->_route['capability']) ? 'manage_options' : $this->_route['capability'];
1311 1311
 		} else {
1312
-			$capability = empty( $capability ) ? 'manage_options' : $capability;
1312
+			$capability = empty($capability) ? 'manage_options' : $capability;
1313 1313
 		}
1314 1314
 
1315
-		$id = is_array( $this->_route ) && ! empty( $this->_route['obj_id'] ) ? $this->_route['obj_id'] : 0;
1315
+		$id = is_array($this->_route) && ! empty($this->_route['obj_id']) ? $this->_route['obj_id'] : 0;
1316 1316
 
1317
-		if (( ! function_exists( 'is_admin' ) || ! EE_Registry::instance()->CAP->current_user_can( $capability, $this->page_slug . '_' . $route_to_check, $id ) ) && ! defined( 'DOING_AJAX')) {
1318
-			if ( $verify_only ) {
1317
+		if (( ! function_exists('is_admin') || ! EE_Registry::instance()->CAP->current_user_can($capability, $this->page_slug.'_'.$route_to_check, $id)) && ! defined('DOING_AJAX')) {
1318
+			if ($verify_only) {
1319 1319
 				return FALSE;
1320 1320
 			} else {
1321
-				wp_die( __('You do not have access to this route.', 'event_espresso' ) );
1321
+				wp_die(__('You do not have access to this route.', 'event_espresso'));
1322 1322
 			}
1323 1323
 		}
1324 1324
 		return TRUE;
@@ -1395,7 +1395,7 @@  discard block
 block discarded – undo
1395 1395
 		$this->_add_admin_page_overlay();
1396 1396
 
1397 1397
 		//if metaboxes are present we need to add the nonce field
1398
-		if ( ( isset($this->_route_config['metaboxes']) || ( isset($this->_route_config['has_metaboxes']) && $this->_route_config['has_metaboxes'] ) || isset($this->_route_config['list_table']) ) ) {
1398
+		if ((isset($this->_route_config['metaboxes']) || (isset($this->_route_config['has_metaboxes']) && $this->_route_config['has_metaboxes']) || isset($this->_route_config['list_table']))) {
1399 1399
 			wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false);
1400 1400
 			wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false);
1401 1401
 		}
@@ -1414,20 +1414,20 @@  discard block
 block discarded – undo
1414 1414
 	 */
1415 1415
 	public function admin_footer_global() {
1416 1416
 		//dialog container for dialog helper
1417
-		$d_cont = '<div class="ee-admin-dialog-container auto-hide hidden">' . "\n";
1417
+		$d_cont = '<div class="ee-admin-dialog-container auto-hide hidden">'."\n";
1418 1418
 		$d_cont .= '<div class="ee-notices"></div>';
1419 1419
 		$d_cont .= '<div class="ee-admin-dialog-container-inner-content"></div>';
1420 1420
 		$d_cont .= '</div>';
1421 1421
 		echo $d_cont;
1422 1422
 
1423 1423
 		//help tour stuff?
1424
-		if ( isset( $this->_help_tour[$this->_req_action] ) ) {
1424
+		if (isset($this->_help_tour[$this->_req_action])) {
1425 1425
 			echo implode('<br />', $this->_help_tour[$this->_req_action]);
1426 1426
 		}
1427 1427
 
1428 1428
 		//current set timezone for timezone js
1429 1429
 		EE_Registry::instance()->load_helper('DTT_Helper');
1430
-		echo '<span id="current_timezone" class="hidden">' . EEH_DTT_Helper::get_timezone() . '</span>';
1430
+		echo '<span id="current_timezone" class="hidden">'.EEH_DTT_Helper::get_timezone().'</span>';
1431 1431
 	}
1432 1432
 
1433 1433
 
@@ -1451,18 +1451,18 @@  discard block
 block discarded – undo
1451 1451
 	 * @access protected
1452 1452
 	 * @return string content
1453 1453
 	 */
1454
-	protected function _set_help_popup_content( $help_array = array(), $display = FALSE ) {
1454
+	protected function _set_help_popup_content($help_array = array(), $display = FALSE) {
1455 1455
 		$content = '';
1456 1456
 
1457
-		$help_array = empty( $help_array ) ? $this->_get_help_content() : $help_array;
1458
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_help_popup.template.php';
1457
+		$help_array = empty($help_array) ? $this->_get_help_content() : $help_array;
1458
+		$template_path = EE_ADMIN_TEMPLATE.'admin_help_popup.template.php';
1459 1459
 
1460 1460
 
1461 1461
 		//loop through the array and setup content
1462
-		foreach ( $help_array as $trigger => $help ) {
1462
+		foreach ($help_array as $trigger => $help) {
1463 1463
 			//make sure the array is setup properly
1464
-			if ( !isset($help['title']) || !isset($help['content'] ) ) {
1465
-				throw new EE_Error( __('Does not look like the popup content array has been setup correctly.  Might want to double check that.  Read the comments for the _get_help_popup_content method found in "EE_Admin_Page" class', 'event_espresso') );
1464
+			if ( ! isset($help['title']) || ! isset($help['content'])) {
1465
+				throw new EE_Error(__('Does not look like the popup content array has been setup correctly.  Might want to double check that.  Read the comments for the _get_help_popup_content method found in "EE_Admin_Page" class', 'event_espresso'));
1466 1466
 			}
1467 1467
 
1468 1468
 			//we're good so let'd setup the template vars and then assign parsed template content to our content.
@@ -1472,10 +1472,10 @@  discard block
 block discarded – undo
1472 1472
 				'help_popup_content' => $help['content']
1473 1473
 				);
1474 1474
 
1475
-			$content .= EEH_Template::display_template( $template_path, $template_args, TRUE );
1475
+			$content .= EEH_Template::display_template($template_path, $template_args, TRUE);
1476 1476
 		}
1477 1477
 
1478
-		if ( $display )
1478
+		if ($display)
1479 1479
 			echo $content;
1480 1480
 		else
1481 1481
 			return $content;
@@ -1492,18 +1492,18 @@  discard block
 block discarded – undo
1492 1492
 	 */
1493 1493
 	private function _get_help_content() {
1494 1494
 		//what is the method we're looking for?
1495
-		$method_name = '_help_popup_content_' . $this->_req_action;
1495
+		$method_name = '_help_popup_content_'.$this->_req_action;
1496 1496
 
1497 1497
 		//if method doesn't exist let's get out.
1498
-		if ( !method_exists( $this, $method_name ) )
1498
+		if ( ! method_exists($this, $method_name))
1499 1499
 			return array();
1500 1500
 
1501 1501
 		//k we're good to go let's retrieve the help array
1502
-		$help_array = call_user_func( array( $this, $method_name ) );
1502
+		$help_array = call_user_func(array($this, $method_name));
1503 1503
 
1504 1504
 		//make sure we've got an array!
1505
-		if ( !is_array($help_array) ) {
1506
-			throw new EE_Error( __('Something went wrong with help popup content generation. Expecting an array and well, this ain\'t no array bub.', 'event_espresso' ) );
1505
+		if ( ! is_array($help_array)) {
1506
+			throw new EE_Error(__('Something went wrong with help popup content generation. Expecting an array and well, this ain\'t no array bub.', 'event_espresso'));
1507 1507
 		}
1508 1508
 
1509 1509
 		return $help_array;
@@ -1525,27 +1525,27 @@  discard block
 block discarded – undo
1525 1525
 	 * @param array $dimensions an array of dimensions for the box (array(h,w))
1526 1526
 	 * @return string
1527 1527
 	 */
1528
-	protected function _set_help_trigger( $trigger_id, $display = TRUE, $dimensions = array( '400', '640') ) {
1528
+	protected function _set_help_trigger($trigger_id, $display = TRUE, $dimensions = array('400', '640')) {
1529 1529
 
1530
-		if ( defined('DOING_AJAX') ) return;
1530
+		if (defined('DOING_AJAX')) return;
1531 1531
 
1532 1532
 		//let's check and see if there is any content set for this popup.  If there isn't then we'll include a default title and content so that developers know something needs to be corrected
1533 1533
 		$help_array = $this->_get_help_content();
1534 1534
 		$help_content = '';
1535 1535
 
1536
-		if ( empty( $help_array ) || !isset( $help_array[$trigger_id] ) ) {
1536
+		if (empty($help_array) || ! isset($help_array[$trigger_id])) {
1537 1537
 			$help_array[$trigger_id] = array(
1538 1538
 				'title' => __('Missing Content', 'event_espresso'),
1539 1539
 				'content' => __('A trigger has been set that doesn\'t have any corresponding content. Make sure you have set the help content. (see the "_set_help_popup_content" method in the EE_Admin_Page for instructions.)', 'event_espresso')
1540 1540
 				);
1541
-			$help_content = $this->_set_help_popup_content( $help_array, FALSE );
1541
+			$help_content = $this->_set_help_popup_content($help_array, FALSE);
1542 1542
 		}
1543 1543
 
1544 1544
 		//let's setup the trigger
1545
-		$content = '<a class="ee-dialog" href="?height='. $dimensions[0] . '&width=' . $dimensions[1] . '&inlineId=' . $trigger_id . '" target="_blank"><span class="question ee-help-popup-question"></span></a>';
1546
-		$content = $content . $help_content;
1545
+		$content = '<a class="ee-dialog" href="?height='.$dimensions[0].'&width='.$dimensions[1].'&inlineId='.$trigger_id.'" target="_blank"><span class="question ee-help-popup-question"></span></a>';
1546
+		$content = $content.$help_content;
1547 1547
 
1548
-		if ( $display )
1548
+		if ($display)
1549 1549
 			echo $content;
1550 1550
 		else
1551 1551
 			return $content;
@@ -1602,17 +1602,17 @@  discard block
 block discarded – undo
1602 1602
 	public function load_global_scripts_styles() {
1603 1603
 		/** STYLES **/
1604 1604
 		// add debugging styles
1605
-		if ( WP_DEBUG ) {
1606
-			add_action('admin_head', array( $this, 'add_xdebug_style' ));
1605
+		if (WP_DEBUG) {
1606
+			add_action('admin_head', array($this, 'add_xdebug_style'));
1607 1607
 		}
1608 1608
 
1609 1609
 		//register all styles
1610
-		wp_register_style( 'espresso-ui-theme', EE_GLOBAL_ASSETS_URL . 'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(),EVENT_ESPRESSO_VERSION );
1610
+		wp_register_style('espresso-ui-theme', EE_GLOBAL_ASSETS_URL.'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(), EVENT_ESPRESSO_VERSION);
1611 1611
 
1612
-		wp_register_style('jquery-jq-plot-css', JQPLOT_URL . 'jquery.jqplot.min.css', array('jquery'), EVENT_ESPRESSO_VERSION );
1613
-		wp_register_style('ee-admin-css', EE_ADMIN_URL . 'assets/ee-admin-page.css', array(), EVENT_ESPRESSO_VERSION);
1612
+		wp_register_style('jquery-jq-plot-css', JQPLOT_URL.'jquery.jqplot.min.css', array('jquery'), EVENT_ESPRESSO_VERSION);
1613
+		wp_register_style('ee-admin-css', EE_ADMIN_URL.'assets/ee-admin-page.css', array(), EVENT_ESPRESSO_VERSION);
1614 1614
 		//helpers styles
1615
-		wp_register_style('ee-text-links', EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.css', array(), EVENT_ESPRESSO_VERSION );
1615
+		wp_register_style('ee-text-links', EE_PLUGIN_DIR_URL.'core/helpers/assets/ee_text_list_helper.css', array(), EVENT_ESPRESSO_VERSION);
1616 1616
 		//enqueue global styles
1617 1617
 		wp_enqueue_style('ee-admin-css');
1618 1618
 
@@ -1620,78 +1620,78 @@  discard block
 block discarded – undo
1620 1620
 		/** SCRIPTS **/
1621 1621
 
1622 1622
 		//register all scripts
1623
-		wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
1624
-		wp_register_script('ee-dialog', EE_ADMIN_URL . 'assets/ee-dialog-helper.js', array('jquery', 'jquery-ui-draggable'), EVENT_ESPRESSO_VERSION, TRUE );
1625
-		wp_register_script('ee_admin_js', EE_ADMIN_URL . 'assets/ee-admin-page.js', array( 'espresso_core', 'ee-parse-uri', 'ee-dialog'), EVENT_ESPRESSO_VERSION, true );
1623
+		wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
1624
+		wp_register_script('ee-dialog', EE_ADMIN_URL.'assets/ee-dialog-helper.js', array('jquery', 'jquery-ui-draggable'), EVENT_ESPRESSO_VERSION, TRUE);
1625
+		wp_register_script('ee_admin_js', EE_ADMIN_URL.'assets/ee-admin-page.js', array('espresso_core', 'ee-parse-uri', 'ee-dialog'), EVENT_ESPRESSO_VERSION, true);
1626 1626
 
1627
-		wp_register_script('jquery-ui-timepicker-addon', EE_GLOBAL_ASSETS_URL . 'scripts/jquery-ui-timepicker-addon.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), EVENT_ESPRESSO_VERSION, true );
1627
+		wp_register_script('jquery-ui-timepicker-addon', EE_GLOBAL_ASSETS_URL.'scripts/jquery-ui-timepicker-addon.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), EVENT_ESPRESSO_VERSION, true);
1628 1628
 		// register jQuery Validate - see /includes/functions/wp_hooks.php
1629
-		add_filter( 'FHEE_load_jquery_validate', '__return_true' );
1629
+		add_filter('FHEE_load_jquery_validate', '__return_true');
1630 1630
 		add_filter('FHEE_load_joyride', '__return_true');
1631 1631
 
1632 1632
 		//script for sorting tables
1633
-		wp_register_script('espresso_ajax_table_sorting', EE_ADMIN_URL . "assets/espresso_ajax_table_sorting.js", array('ee_admin_js', 'jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
1633
+		wp_register_script('espresso_ajax_table_sorting', EE_ADMIN_URL."assets/espresso_ajax_table_sorting.js", array('ee_admin_js', 'jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
1634 1634
 		//script for parsing uri's
1635
-		wp_register_script( 'ee-parse-uri', EE_GLOBAL_ASSETS_URL . 'scripts/parseuri.js', array(), EVENT_ESPRESSO_VERSION, TRUE );
1635
+		wp_register_script('ee-parse-uri', EE_GLOBAL_ASSETS_URL.'scripts/parseuri.js', array(), EVENT_ESPRESSO_VERSION, TRUE);
1636 1636
 		//and parsing associative serialized form elements
1637
-		wp_register_script( 'ee-serialize-full-array', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.serializefullarray.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
1637
+		wp_register_script('ee-serialize-full-array', EE_GLOBAL_ASSETS_URL.'scripts/jquery.serializefullarray.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
1638 1638
 		//helpers scripts
1639
-		wp_register_script('ee-text-links', EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
1640
-		wp_register_script( 'ee-moment-core', EE_THIRD_PARTY_URL . 'moment/moment-with-locales.min.js', array(), EVENT_ESPRESSO_VERSION, TRUE );
1641
-		wp_register_script( 'ee-moment', EE_THIRD_PARTY_URL . 'moment/moment-timezone-with-data.min.js', array('ee-moment-core'), EVENT_ESPRESSO_VERSION, TRUE );
1642
-		wp_register_script( 'ee-datepicker', EE_ADMIN_URL . 'assets/ee-datepicker.js', array('jquery-ui-timepicker-addon','ee-moment'), EVENT_ESPRESSO_VERSION, TRUE );
1639
+		wp_register_script('ee-text-links', EE_PLUGIN_DIR_URL.'core/helpers/assets/ee_text_list_helper.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
1640
+		wp_register_script('ee-moment-core', EE_THIRD_PARTY_URL.'moment/moment-with-locales.min.js', array(), EVENT_ESPRESSO_VERSION, TRUE);
1641
+		wp_register_script('ee-moment', EE_THIRD_PARTY_URL.'moment/moment-timezone-with-data.min.js', array('ee-moment-core'), EVENT_ESPRESSO_VERSION, TRUE);
1642
+		wp_register_script('ee-datepicker', EE_ADMIN_URL.'assets/ee-datepicker.js', array('jquery-ui-timepicker-addon', 'ee-moment'), EVENT_ESPRESSO_VERSION, TRUE);
1643 1643
 
1644 1644
 		//excanvas
1645
-		wp_register_script('excanvas', JQPLOT_URL . 'excanvas.min.js', array(), EVENT_ESPRESSO_VERSION, FALSE );
1645
+		wp_register_script('excanvas', JQPLOT_URL.'excanvas.min.js', array(), EVENT_ESPRESSO_VERSION, FALSE);
1646 1646
 
1647 1647
 		//jqplot library
1648
-		wp_register_script('jqplot', JQPLOT_URL . 'jquery.jqplot.min.js', array('jquery'), '', FALSE);
1649
-		wp_register_script('jqplot-barRenderer', JQPLOT_URL . 'plugins/jqplot.barRenderer.min.js', array('jqplot'), '', FALSE);
1650
-		wp_register_script('jqplot-canvasTextRenderer', JQPLOT_URL . 'plugins/jqplot.canvasTextRenderer.min.js', array('jqplot'), '', FALSE);
1651
-		wp_register_script('jqplot-canvasAxisTickRenderer', JQPLOT_URL . 'plugins/jqplot.canvasAxisTickRenderer.min.js', array('jqplot'), '', FALSE);
1652
-		wp_register_script('jqplot-categoryAxisRenderer', JQPLOT_URL . 'plugins/jqplot.categoryAxisRenderer.min.js', array('jqplot'), '', FALSE);
1653
-		wp_register_script('jqplot-dateAxisRenderer', JQPLOT_URL . 'plugins/jqplot.dateAxisRenderer.min.js', array('jqplot'), '', FALSE);
1654
-		wp_register_script('jqplot-highlighter', JQPLOT_URL . 'plugins/jqplot.highlighter.min.js', array('jqplot'), '', FALSE);
1655
-		wp_register_script('jqplot-pointLabels', JQPLOT_URL . 'plugins/jqplot.pointLabels.min.js', array('jqplot'), '', FALSE);
1656
-		wp_register_script('jqplot-all', EE_ADMIN_URL . 'assets/ee-admin-jqlot-all.js', array('jqplot-pointLabels', 'jqplot-highlighter', 'jqplot-dateAxisRenderer', 'jqplot-categoryAxisRenderer', 'jqplot-canvasAxisTickRenderer', 'jqplot-canvasTextRenderer', 'jqplot-barRenderer'), EVENT_ESPRESSO_VERSION, FALSE );
1648
+		wp_register_script('jqplot', JQPLOT_URL.'jquery.jqplot.min.js', array('jquery'), '', FALSE);
1649
+		wp_register_script('jqplot-barRenderer', JQPLOT_URL.'plugins/jqplot.barRenderer.min.js', array('jqplot'), '', FALSE);
1650
+		wp_register_script('jqplot-canvasTextRenderer', JQPLOT_URL.'plugins/jqplot.canvasTextRenderer.min.js', array('jqplot'), '', FALSE);
1651
+		wp_register_script('jqplot-canvasAxisTickRenderer', JQPLOT_URL.'plugins/jqplot.canvasAxisTickRenderer.min.js', array('jqplot'), '', FALSE);
1652
+		wp_register_script('jqplot-categoryAxisRenderer', JQPLOT_URL.'plugins/jqplot.categoryAxisRenderer.min.js', array('jqplot'), '', FALSE);
1653
+		wp_register_script('jqplot-dateAxisRenderer', JQPLOT_URL.'plugins/jqplot.dateAxisRenderer.min.js', array('jqplot'), '', FALSE);
1654
+		wp_register_script('jqplot-highlighter', JQPLOT_URL.'plugins/jqplot.highlighter.min.js', array('jqplot'), '', FALSE);
1655
+		wp_register_script('jqplot-pointLabels', JQPLOT_URL.'plugins/jqplot.pointLabels.min.js', array('jqplot'), '', FALSE);
1656
+		wp_register_script('jqplot-all', EE_ADMIN_URL.'assets/ee-admin-jqlot-all.js', array('jqplot-pointLabels', 'jqplot-highlighter', 'jqplot-dateAxisRenderer', 'jqplot-categoryAxisRenderer', 'jqplot-canvasAxisTickRenderer', 'jqplot-canvasTextRenderer', 'jqplot-barRenderer'), EVENT_ESPRESSO_VERSION, FALSE);
1657 1657
 
1658 1658
 
1659 1659
 		//enqueue global scripts
1660 1660
 
1661 1661
 		//taking care of metaboxes
1662
-		if ( ( isset($this->_route_config['metaboxes'] ) || isset($this->_route_config['has_metaboxes']) ) && empty( $this->_cpt_route) ) {
1662
+		if ((isset($this->_route_config['metaboxes']) || isset($this->_route_config['has_metaboxes'])) && empty($this->_cpt_route)) {
1663 1663
 			wp_enqueue_script('dashboard');
1664 1664
 		}
1665 1665
 
1666 1666
 		//enqueue thickbox for ee help popups.  default is to enqueue unless its explicitly set to false since we're assuming all EE pages will have popups
1667
-		if ( !isset( $this->_route_config['has_help_popups']) || ( isset( $this->_route_config['has_help_popups']) && $this->_route_config['has_help_popups'] ) ) {
1667
+		if ( ! isset($this->_route_config['has_help_popups']) || (isset($this->_route_config['has_help_popups']) && $this->_route_config['has_help_popups'])) {
1668 1668
 			wp_enqueue_script('ee_admin_js');
1669 1669
 			wp_enqueue_style('ee-admin-css');
1670 1670
 		}
1671 1671
 
1672 1672
 
1673 1673
 		//localize script for ajax lazy loading
1674
-		$lazy_loader_container_ids = apply_filters( 'FHEE__EE_Admin_Page_Core__load_global_scripts_styles__loader_containers', array('espresso_news_post_box_content') );
1675
-		wp_localize_script( 'ee_admin_js', 'eeLazyLoadingContainers', $lazy_loader_container_ids);
1674
+		$lazy_loader_container_ids = apply_filters('FHEE__EE_Admin_Page_Core__load_global_scripts_styles__loader_containers', array('espresso_news_post_box_content'));
1675
+		wp_localize_script('ee_admin_js', 'eeLazyLoadingContainers', $lazy_loader_container_ids);
1676 1676
 
1677 1677
 
1678 1678
 		/**
1679 1679
 		 * help tour stuff
1680 1680
 		 */
1681
-		if ( !empty( $this->_help_tour ) ) {
1681
+		if ( ! empty($this->_help_tour)) {
1682 1682
 
1683 1683
 			//register the js for kicking things off
1684
-			wp_enqueue_script('ee-help-tour', EE_ADMIN_URL . 'assets/ee-help-tour.js', array('jquery-joyride'), EVENT_ESPRESSO_VERSION, TRUE );
1684
+			wp_enqueue_script('ee-help-tour', EE_ADMIN_URL.'assets/ee-help-tour.js', array('jquery-joyride'), EVENT_ESPRESSO_VERSION, TRUE);
1685 1685
 
1686 1686
 			//setup tours for the js tour object
1687
-			foreach ( $this->_help_tour['tours'] as $tour ) {
1687
+			foreach ($this->_help_tour['tours'] as $tour) {
1688 1688
 				$tours[] = array(
1689 1689
 					'id' => $tour->get_slug(),
1690 1690
 					'options' => $tour->get_options()
1691 1691
 					);
1692 1692
 			}
1693 1693
 
1694
-			wp_localize_script('ee-help-tour', 'EE_HELP_TOUR', array('tours' => $tours ) );
1694
+			wp_localize_script('ee-help-tour', 'EE_HELP_TOUR', array('tours' => $tours));
1695 1695
 
1696 1696
 			//admin_footer_global will take care of making sure our help_tour skeleton gets printed via the info stored in $this->_help_tour
1697 1697
 		}
@@ -1709,50 +1709,50 @@  discard block
 block discarded – undo
1709 1709
 	public function admin_footer_scripts_eei18n_js_strings() {
1710 1710
 
1711 1711
 		EE_Registry::$i18n_js_strings['ajax_url'] = WP_AJAX_URL;
1712
-		EE_Registry::$i18n_js_strings['confirm_delete'] = __( 'Are you absolutely sure you want to delete this item?\nThis action will delete ALL DATA asscociated with this item!!!\nThis can NOT be undone!!!', 'event_espresso' );
1713
-
1714
-		EE_Registry::$i18n_js_strings['January'] = __( 'January', 'event_espresso' );
1715
-		EE_Registry::$i18n_js_strings['February'] = __( 'February', 'event_espresso' );
1716
-		EE_Registry::$i18n_js_strings['March'] = __( 'March', 'event_espresso' );
1717
-		EE_Registry::$i18n_js_strings['April'] = __( 'April', 'event_espresso' );
1718
-		EE_Registry::$i18n_js_strings['May'] = __( 'May', 'event_espresso' );
1719
-		EE_Registry::$i18n_js_strings['June'] = __( 'June', 'event_espresso' );
1720
-		EE_Registry::$i18n_js_strings['July'] = __( 'July', 'event_espresso' );
1721
-		EE_Registry::$i18n_js_strings['August'] = __( 'August', 'event_espresso' );
1722
-		EE_Registry::$i18n_js_strings['September'] = __( 'September', 'event_espresso' );
1723
-		EE_Registry::$i18n_js_strings['October'] = __( 'October', 'event_espresso' );
1724
-		EE_Registry::$i18n_js_strings['November'] = __( 'November', 'event_espresso' );
1725
-		EE_Registry::$i18n_js_strings['December'] = __( 'December', 'event_espresso' );
1726
-		EE_Registry::$i18n_js_strings['Jan'] = __( 'Jan', 'event_espresso' );
1727
-		EE_Registry::$i18n_js_strings['Feb'] = __( 'Feb', 'event_espresso' );
1728
-		EE_Registry::$i18n_js_strings['Mar'] = __( 'Mar', 'event_espresso' );
1729
-		EE_Registry::$i18n_js_strings['Apr'] = __( 'Apr', 'event_espresso' );
1730
-		EE_Registry::$i18n_js_strings['May'] = __( 'May', 'event_espresso' );
1731
-		EE_Registry::$i18n_js_strings['Jun'] = __( 'Jun', 'event_espresso' );
1732
-		EE_Registry::$i18n_js_strings['Jul'] = __( 'Jul', 'event_espresso' );
1733
-		EE_Registry::$i18n_js_strings['Aug'] = __( 'Aug', 'event_espresso' );
1734
-		EE_Registry::$i18n_js_strings['Sep'] = __( 'Sep', 'event_espresso' );
1735
-		EE_Registry::$i18n_js_strings['Oct'] = __( 'Oct', 'event_espresso' );
1736
-		EE_Registry::$i18n_js_strings['Nov'] = __( 'Nov', 'event_espresso' );
1737
-		EE_Registry::$i18n_js_strings['Dec'] = __( 'Dec', 'event_espresso' );
1738
-
1739
-		EE_Registry::$i18n_js_strings['Sunday'] = __( 'Sunday', 'event_espresso' );
1740
-		EE_Registry::$i18n_js_strings['Monday'] = __( 'Monday', 'event_espresso' );
1741
-		EE_Registry::$i18n_js_strings['Tuesday'] = __( 'Tuesday', 'event_espresso' );
1742
-		EE_Registry::$i18n_js_strings['Wednesday'] = __( 'Wednesday', 'event_espresso' );
1743
-		EE_Registry::$i18n_js_strings['Thursday'] = __( 'Thursday', 'event_espresso' );
1744
-		EE_Registry::$i18n_js_strings['Friday'] = __( 'Friday', 'event_espresso' );
1745
-		EE_Registry::$i18n_js_strings['Saturday'] = __( 'Saturday', 'event_espresso' );
1746
-		EE_Registry::$i18n_js_strings['Sun'] = __( 'Sun', 'event_espresso' );
1747
-		EE_Registry::$i18n_js_strings['Mon'] = __( 'Mon', 'event_espresso' );
1748
-		EE_Registry::$i18n_js_strings['Tue'] = __( 'Tue', 'event_espresso' );
1749
-		EE_Registry::$i18n_js_strings['Wed'] = __( 'Wed', 'event_espresso' );
1750
-		EE_Registry::$i18n_js_strings['Thu'] = __( 'Thu', 'event_espresso' );
1751
-		EE_Registry::$i18n_js_strings['Fri'] = __( 'Fri', 'event_espresso' );
1752
-		EE_Registry::$i18n_js_strings['Sat'] = __( 'Sat', 'event_espresso' );
1753
-
1754
-		wp_localize_script( 'espresso_core', 'eei18n', EE_Registry::$i18n_js_strings );
1755
-		wp_localize_script( 'jquery-validate', 'eei18n', EE_Registry::$i18n_js_strings );
1712
+		EE_Registry::$i18n_js_strings['confirm_delete'] = __('Are you absolutely sure you want to delete this item?\nThis action will delete ALL DATA asscociated with this item!!!\nThis can NOT be undone!!!', 'event_espresso');
1713
+
1714
+		EE_Registry::$i18n_js_strings['January'] = __('January', 'event_espresso');
1715
+		EE_Registry::$i18n_js_strings['February'] = __('February', 'event_espresso');
1716
+		EE_Registry::$i18n_js_strings['March'] = __('March', 'event_espresso');
1717
+		EE_Registry::$i18n_js_strings['April'] = __('April', 'event_espresso');
1718
+		EE_Registry::$i18n_js_strings['May'] = __('May', 'event_espresso');
1719
+		EE_Registry::$i18n_js_strings['June'] = __('June', 'event_espresso');
1720
+		EE_Registry::$i18n_js_strings['July'] = __('July', 'event_espresso');
1721
+		EE_Registry::$i18n_js_strings['August'] = __('August', 'event_espresso');
1722
+		EE_Registry::$i18n_js_strings['September'] = __('September', 'event_espresso');
1723
+		EE_Registry::$i18n_js_strings['October'] = __('October', 'event_espresso');
1724
+		EE_Registry::$i18n_js_strings['November'] = __('November', 'event_espresso');
1725
+		EE_Registry::$i18n_js_strings['December'] = __('December', 'event_espresso');
1726
+		EE_Registry::$i18n_js_strings['Jan'] = __('Jan', 'event_espresso');
1727
+		EE_Registry::$i18n_js_strings['Feb'] = __('Feb', 'event_espresso');
1728
+		EE_Registry::$i18n_js_strings['Mar'] = __('Mar', 'event_espresso');
1729
+		EE_Registry::$i18n_js_strings['Apr'] = __('Apr', 'event_espresso');
1730
+		EE_Registry::$i18n_js_strings['May'] = __('May', 'event_espresso');
1731
+		EE_Registry::$i18n_js_strings['Jun'] = __('Jun', 'event_espresso');
1732
+		EE_Registry::$i18n_js_strings['Jul'] = __('Jul', 'event_espresso');
1733
+		EE_Registry::$i18n_js_strings['Aug'] = __('Aug', 'event_espresso');
1734
+		EE_Registry::$i18n_js_strings['Sep'] = __('Sep', 'event_espresso');
1735
+		EE_Registry::$i18n_js_strings['Oct'] = __('Oct', 'event_espresso');
1736
+		EE_Registry::$i18n_js_strings['Nov'] = __('Nov', 'event_espresso');
1737
+		EE_Registry::$i18n_js_strings['Dec'] = __('Dec', 'event_espresso');
1738
+
1739
+		EE_Registry::$i18n_js_strings['Sunday'] = __('Sunday', 'event_espresso');
1740
+		EE_Registry::$i18n_js_strings['Monday'] = __('Monday', 'event_espresso');
1741
+		EE_Registry::$i18n_js_strings['Tuesday'] = __('Tuesday', 'event_espresso');
1742
+		EE_Registry::$i18n_js_strings['Wednesday'] = __('Wednesday', 'event_espresso');
1743
+		EE_Registry::$i18n_js_strings['Thursday'] = __('Thursday', 'event_espresso');
1744
+		EE_Registry::$i18n_js_strings['Friday'] = __('Friday', 'event_espresso');
1745
+		EE_Registry::$i18n_js_strings['Saturday'] = __('Saturday', 'event_espresso');
1746
+		EE_Registry::$i18n_js_strings['Sun'] = __('Sun', 'event_espresso');
1747
+		EE_Registry::$i18n_js_strings['Mon'] = __('Mon', 'event_espresso');
1748
+		EE_Registry::$i18n_js_strings['Tue'] = __('Tue', 'event_espresso');
1749
+		EE_Registry::$i18n_js_strings['Wed'] = __('Wed', 'event_espresso');
1750
+		EE_Registry::$i18n_js_strings['Thu'] = __('Thu', 'event_espresso');
1751
+		EE_Registry::$i18n_js_strings['Fri'] = __('Fri', 'event_espresso');
1752
+		EE_Registry::$i18n_js_strings['Sat'] = __('Sat', 'event_espresso');
1753
+
1754
+		wp_localize_script('espresso_core', 'eei18n', EE_Registry::$i18n_js_strings);
1755
+		wp_localize_script('jquery-validate', 'eei18n', EE_Registry::$i18n_js_strings);
1756 1756
 
1757 1757
 	}
1758 1758
 
@@ -1786,23 +1786,23 @@  discard block
 block discarded – undo
1786 1786
 	protected function _set_list_table() {
1787 1787
 
1788 1788
 		//first is this a list_table view?
1789
-		if ( !isset($this->_route_config['list_table']) )
1789
+		if ( ! isset($this->_route_config['list_table']))
1790 1790
 			return; //not a list_table view so get out.
1791 1791
 
1792 1792
 		//list table functions are per view specific (because some admin pages might have more than one listtable!)
1793 1793
 
1794
-		if ( call_user_func( array( $this, '_set_list_table_views_' . $this->_req_action ) ) === FALSE ) {
1794
+		if (call_user_func(array($this, '_set_list_table_views_'.$this->_req_action)) === FALSE) {
1795 1795
 			//user error msg
1796
-			$error_msg = __('An error occurred. The requested list table views could not be found.', 'event_espresso' );
1796
+			$error_msg = __('An error occurred. The requested list table views could not be found.', 'event_espresso');
1797 1797
 			//developer error msg
1798
-			$error_msg .= '||' . sprintf( __('List table views for "%s" route could not be setup. Check that you have the corresponding method, "%s" set up for defining list_table_views for this route.', 'event_espresso' ), $this->_req_action, '_set_list_table_views_' . $this->_req_action );
1799
-			throw new EE_Error( $error_msg );
1798
+			$error_msg .= '||'.sprintf(__('List table views for "%s" route could not be setup. Check that you have the corresponding method, "%s" set up for defining list_table_views for this route.', 'event_espresso'), $this->_req_action, '_set_list_table_views_'.$this->_req_action);
1799
+			throw new EE_Error($error_msg);
1800 1800
 		}
1801 1801
 
1802 1802
 		//let's provide the ability to filter the views per PAGE AND ROUTE, per PAGE, and globally
1803
-		$this->_views = apply_filters( 'FHEE_list_table_views_' . $this->page_slug . '_' . $this->_req_action, $this->_views );
1804
-		$this->_views = apply_filters( 'FHEE_list_table_views_' . $this->page_slug, $this->_views );
1805
-		$this->_views = apply_filters( 'FHEE_list_table_views', $this->_views );
1803
+		$this->_views = apply_filters('FHEE_list_table_views_'.$this->page_slug.'_'.$this->_req_action, $this->_views);
1804
+		$this->_views = apply_filters('FHEE_list_table_views_'.$this->page_slug, $this->_views);
1805
+		$this->_views = apply_filters('FHEE_list_table_views', $this->_views);
1806 1806
 
1807 1807
 		$this->_set_list_table_view();
1808 1808
 		$this->_set_list_table_object();
@@ -1824,14 +1824,14 @@  discard block
 block discarded – undo
1824 1824
 	*		@return array
1825 1825
 	*/
1826 1826
 	protected function _set_list_table_view() {
1827
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
1827
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
1828 1828
 
1829 1829
 
1830 1830
 		// looking at active items or dumpster diving ?
1831
-		if ( ! isset( $this->_req_data['status'] ) || ! array_key_exists( $this->_req_data['status'], $this->_views )) {
1832
-			$this->_view = isset( $this->_views['in_use'] ) ? 'in_use' : 'all';
1831
+		if ( ! isset($this->_req_data['status']) || ! array_key_exists($this->_req_data['status'], $this->_views)) {
1832
+			$this->_view = isset($this->_views['in_use']) ? 'in_use' : 'all';
1833 1833
 		} else {
1834
-			$this->_view = sanitize_key( $this->_req_data['status'] );
1834
+			$this->_view = sanitize_key($this->_req_data['status']);
1835 1835
 		}
1836 1836
 	}
1837 1837
 
@@ -1842,9 +1842,9 @@  discard block
 block discarded – undo
1842 1842
 	 * WP_List_Table objects need to be loaded fairly early so automatic stuff WP does is taken care of.
1843 1843
 	 */
1844 1844
 	protected function _set_list_table_object() {
1845
-		if ( isset($this->_route_config['list_table'] ) ) {
1846
-			if ( !class_exists( $this->_route_config['list_table'] ) )
1847
-				throw new EE_Error( sprintf( __('The %s class defined for the list table does not exist.  Please check the spelling of the class ref in the $_page_config property on %s.', 'event_espresso'), $this->_route_config['list_table'], get_class($this) ) );
1845
+		if (isset($this->_route_config['list_table'])) {
1846
+			if ( ! class_exists($this->_route_config['list_table']))
1847
+				throw new EE_Error(sprintf(__('The %s class defined for the list table does not exist.  Please check the spelling of the class ref in the $_page_config property on %s.', 'event_espresso'), $this->_route_config['list_table'], get_class($this)));
1848 1848
 			$a = new ReflectionClass($this->_route_config['list_table']);
1849 1849
 			$this->_list_table_object = $a->newInstance($this);
1850 1850
 		}
@@ -1863,27 +1863,27 @@  discard block
 block discarded – undo
1863 1863
 	 *
1864 1864
 	 * @return array
1865 1865
 	 */
1866
-	public function get_list_table_view_RLs( $extra_query_args = array() ) {
1866
+	public function get_list_table_view_RLs($extra_query_args = array()) {
1867 1867
 
1868
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
1868
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
1869 1869
 
1870
-		if ( empty( $this->_views )) {
1870
+		if (empty($this->_views)) {
1871 1871
 			$this->_views = array();
1872 1872
 		}
1873 1873
 
1874 1874
 		// cycle thru views
1875
-		foreach ( $this->_views as $key => $view ) {
1875
+		foreach ($this->_views as $key => $view) {
1876 1876
 			$query_args = array();
1877 1877
 			// check for current view
1878
-			$this->_views[ $key ]['class'] = $this->_view == $view['slug'] ? 'current' : '';
1878
+			$this->_views[$key]['class'] = $this->_view == $view['slug'] ? 'current' : '';
1879 1879
 			$query_args['action'] = $this->_req_action;
1880
-			$query_args[$this->_req_action.'_nonce'] = wp_create_nonce( $query_args['action'] . '_nonce' );
1880
+			$query_args[$this->_req_action.'_nonce'] = wp_create_nonce($query_args['action'].'_nonce');
1881 1881
 			$query_args['status'] = $view['slug'];
1882 1882
 			//merge any other arguments sent in.
1883
-			if ( isset( $extra_query_args[$view['slug']] ) ) {
1884
-				$query_args = array_merge( $query_args, $extra_query_args[$view['slug']] );
1883
+			if (isset($extra_query_args[$view['slug']])) {
1884
+				$query_args = array_merge($query_args, $extra_query_args[$view['slug']]);
1885 1885
 			}
1886
-			$this->_views[ $key ]['url'] = EE_Admin_Page::add_query_args_and_nonce( $query_args, $this->_admin_base_url );
1886
+			$this->_views[$key]['url'] = EE_Admin_Page::add_query_args_and_nonce($query_args, $this->_admin_base_url);
1887 1887
 		}
1888 1888
 
1889 1889
 		return $this->_views;
@@ -1900,15 +1900,15 @@  discard block
 block discarded – undo
1900 1900
 	 * @param int $max_entries total number of rows in the table
1901 1901
 	 * @return string
1902 1902
 	*/
1903
-	protected function _entries_per_page_dropdown( $max_entries = FALSE ) {
1903
+	protected function _entries_per_page_dropdown($max_entries = FALSE) {
1904 1904
 
1905
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
1906
-		$values = array( 10, 25, 50, 100 );
1907
-		$per_page = ( ! empty( $this->_req_data['per_page'] )) ? absint( $this->_req_data['per_page'] ) : 10;
1905
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
1906
+		$values = array(10, 25, 50, 100);
1907
+		$per_page = ( ! empty($this->_req_data['per_page'])) ? absint($this->_req_data['per_page']) : 10;
1908 1908
 
1909
-		if ( $max_entries ) {
1909
+		if ($max_entries) {
1910 1910
 			$values[] = $max_entries;
1911
-			sort( $values );
1911
+			sort($values);
1912 1912
 		}
1913 1913
 
1914 1914
 		$entries_per_page_dropdown = '
@@ -1917,15 +1917,15 @@  discard block
 block discarded – undo
1917 1917
 					Show
1918 1918
 					<select id="entries-per-page-slct" name="entries-per-page-slct">';
1919 1919
 
1920
-		foreach ( $values as $value ) {
1921
-			if ( $value < $max_entries ) {
1922
-				$selected = $value == $per_page ?  ' selected="' . $per_page . '"' : '';
1920
+		foreach ($values as $value) {
1921
+			if ($value < $max_entries) {
1922
+				$selected = $value == $per_page ? ' selected="'.$per_page.'"' : '';
1923 1923
 				$entries_per_page_dropdown .= '
1924 1924
 						<option value="'.$value.'"'.$selected.'>'.$value.'&nbsp;&nbsp;</option>';
1925 1925
 			}
1926 1926
 		}
1927 1927
 
1928
-		$selected = $max_entries == $per_page ?  ' selected="' . $per_page . '"' : '';
1928
+		$selected = $max_entries == $per_page ? ' selected="'.$per_page.'"' : '';
1929 1929
 		$entries_per_page_dropdown .= '
1930 1930
 						<option value="'.$max_entries.'"'.$selected.'>All&nbsp;&nbsp;</option>';
1931 1931
 
@@ -1948,8 +1948,8 @@  discard block
 block discarded – undo
1948 1948
 	*		@return 		void
1949 1949
 	*/
1950 1950
 	public function _set_search_attributes() {
1951
-		$this->_template_args['search']['btn_label'] = sprintf( __( 'Search %s', 'event_espresso' ), empty( $this->_search_btn_label ) ? $this->page_label : $this->_search_btn_label );
1952
-		$this->_template_args['search']['callback'] = 'search_' . $this->page_slug;
1951
+		$this->_template_args['search']['btn_label'] = sprintf(__('Search %s', 'event_espresso'), empty($this->_search_btn_label) ? $this->page_label : $this->_search_btn_label);
1952
+		$this->_template_args['search']['callback'] = 'search_'.$this->page_slug;
1953 1953
 	}
1954 1954
 
1955 1955
 	/*** END LIST TABLE METHODS **/
@@ -1968,20 +1968,20 @@  discard block
 block discarded – undo
1968 1968
 	 * @return void
1969 1969
 	*/
1970 1970
 	private function _add_registered_meta_boxes() {
1971
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
1971
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
1972 1972
 
1973 1973
 		//we only add meta boxes if the page_route calls for it
1974
-		if ( is_array($this->_route_config) && isset( $this->_route_config['metaboxes'] ) && is_array($this->_route_config['metaboxes']) ) {
1974
+		if (is_array($this->_route_config) && isset($this->_route_config['metaboxes']) && is_array($this->_route_config['metaboxes'])) {
1975 1975
 
1976 1976
 
1977 1977
 			//this simply loops through the callbacks provided and checks if there is a corresponding callback registered by the child - if there is then we go ahead and process the metabox loader.
1978
-			foreach ( $this->_route_config['metaboxes'] as $metabox_callback ) {
1979
-				if ( call_user_func( array($this, &$metabox_callback) ) === FALSE ) {
1978
+			foreach ($this->_route_config['metaboxes'] as $metabox_callback) {
1979
+				if (call_user_func(array($this, &$metabox_callback)) === FALSE) {
1980 1980
 					// user error msg
1981
-				$error_msg =  __( 'An error occurred. The  requested metabox could not be found.', 'event_espresso' );
1981
+				$error_msg = __('An error occurred. The  requested metabox could not be found.', 'event_espresso');
1982 1982
 				// developer error msg
1983
-				$error_msg .= '||' . sprintf( __( 'The metabox with the string "%s" could not be called. Check that the spelling for method names and actions in the "_page_config[\'metaboxes\']" array are all correct.', 'event_espresso' ), $metabox_callback );
1984
-				throw new EE_Error( $error_msg );
1983
+				$error_msg .= '||'.sprintf(__('The metabox with the string "%s" could not be called. Check that the spelling for method names and actions in the "_page_config[\'metaboxes\']" array are all correct.', 'event_espresso'), $metabox_callback);
1984
+				throw new EE_Error($error_msg);
1985 1985
 				}
1986 1986
 			}
1987 1987
 		}
@@ -1998,17 +1998,17 @@  discard block
 block discarded – undo
1998 1998
 	 * @return void
1999 1999
 	 */
2000 2000
 	private function _add_screen_columns() {
2001
-		if ( is_array($this->_route_config) && isset( $this->_route_config['columns'] ) && is_array($this->_route_config['columns']) && count( $this->_route_config['columns'] == 2 ) ) {
2001
+		if (is_array($this->_route_config) && isset($this->_route_config['columns']) && is_array($this->_route_config['columns']) && count($this->_route_config['columns'] == 2)) {
2002 2002
 
2003
-			add_screen_option('layout_columns', array('max' => (int) $this->_route_config['columns'][0], 'default' => (int) $this->_route_config['columns'][1] ) );
2003
+			add_screen_option('layout_columns', array('max' => (int) $this->_route_config['columns'][0], 'default' => (int) $this->_route_config['columns'][1]));
2004 2004
 			$this->_template_args['num_columns'] = $this->_route_config['columns'][0];
2005 2005
 			$screen_id = $this->_current_screen->id;
2006 2006
 			$screen_columns = (int) get_user_option("screen_layout_$screen_id");
2007
-			$total_columns = !empty($screen_columns) ? $screen_columns : $this->_route_config['columns'][1];
2008
-			$this->_template_args['current_screen_widget_class'] = 'columns-' . $total_columns;
2007
+			$total_columns = ! empty($screen_columns) ? $screen_columns : $this->_route_config['columns'][1];
2008
+			$this->_template_args['current_screen_widget_class'] = 'columns-'.$total_columns;
2009 2009
 			$this->_template_args['current_page'] = $this->_wp_page_slug;
2010 2010
 			$this->_template_args['screen'] = $this->_current_screen;
2011
-			$this->_column_template_path = EE_ADMIN_TEMPLATE . 'admin_details_metabox_column_wrapper.template.php';
2011
+			$this->_column_template_path = EE_ADMIN_TEMPLATE.'admin_details_metabox_column_wrapper.template.php';
2012 2012
 
2013 2013
 			//finally if we don't have has_metaboxes set in the route config let's make sure it IS set other wise the necessary hidden fields for this won't be loaded.
2014 2014
 			$this->_route_config['has_metaboxes'] = TRUE;
@@ -2025,11 +2025,11 @@  discard block
 block discarded – undo
2025 2025
 	 */
2026 2026
 
2027 2027
 	private function _espresso_news_post_box() {
2028
-		$news_box_title = apply_filters( 'FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __( 'New @ Event Espresso', 'event_espresso' ) );
2029
-		add_meta_box( 'espresso_news_post_box', $news_box_title, array(
2028
+		$news_box_title = apply_filters('FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __('New @ Event Espresso', 'event_espresso'));
2029
+		add_meta_box('espresso_news_post_box', $news_box_title, array(
2030 2030
 			$this,
2031 2031
 			'espresso_news_post_box'
2032
-		), $this->_wp_page_slug, 'side' );
2032
+		), $this->_wp_page_slug, 'side');
2033 2033
 	}
2034 2034
 
2035 2035
 
@@ -2037,14 +2037,14 @@  discard block
 block discarded – undo
2037 2037
 	 * Code for setting up espresso ratings request metabox.
2038 2038
 	 */
2039 2039
 	protected function _espresso_ratings_request() {
2040
-		if ( ! apply_filters( 'FHEE_show_ratings_request_meta_box', true ) ) {
2040
+		if ( ! apply_filters('FHEE_show_ratings_request_meta_box', true)) {
2041 2041
 			return '';
2042 2042
 		}
2043
-		$ratings_box_title = apply_filters( 'FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __('Keep Event Espresso Decaf Free', 'event_espresso') );
2044
-		add_meta_box( 'espresso_ratings_request', $ratings_box_title, array(
2043
+		$ratings_box_title = apply_filters('FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __('Keep Event Espresso Decaf Free', 'event_espresso'));
2044
+		add_meta_box('espresso_ratings_request', $ratings_box_title, array(
2045 2045
 			$this,
2046 2046
 			'espresso_ratings_request'
2047
-		), $this->_wp_page_slug, 'side' );
2047
+		), $this->_wp_page_slug, 'side');
2048 2048
 	}
2049 2049
 
2050 2050
 
@@ -2052,35 +2052,35 @@  discard block
 block discarded – undo
2052 2052
 	 * Code for setting up espresso ratings request metabox content.
2053 2053
 	 */
2054 2054
 	public function espresso_ratings_request() {
2055
-		$template_path = EE_ADMIN_TEMPLATE . 'espresso_ratings_request_content.template.php';
2056
-		EE_Registry::instance()->load_helper( 'Template' );
2057
-		EEH_Template::display_template( $template_path, array() );
2055
+		$template_path = EE_ADMIN_TEMPLATE.'espresso_ratings_request_content.template.php';
2056
+		EE_Registry::instance()->load_helper('Template');
2057
+		EEH_Template::display_template($template_path, array());
2058 2058
 	}
2059 2059
 
2060 2060
 
2061 2061
 
2062 2062
 
2063
-	public static function cached_rss_display( $rss_id, $url ) {
2064
-		$loading = '<p class="widget-loading hide-if-no-js">' . __( 'Loading&#8230;' ) . '</p><p class="hide-if-js">' . __( 'This widget requires JavaScript.' ) . '</p>';
2065
-		$doing_ajax = ( defined( 'DOING_AJAX' ) && DOING_AJAX );
2066
-		$pre = '<div class="espresso-rss-display">' . "\n\t";
2067
-		$pre .= '<span id="' . $rss_id . '_url" class="hidden">' . $url . '</span>';
2068
-		$post = '</div>' . "\n";
2063
+	public static function cached_rss_display($rss_id, $url) {
2064
+		$loading = '<p class="widget-loading hide-if-no-js">'.__('Loading&#8230;').'</p><p class="hide-if-js">'.__('This widget requires JavaScript.').'</p>';
2065
+		$doing_ajax = (defined('DOING_AJAX') && DOING_AJAX);
2066
+		$pre = '<div class="espresso-rss-display">'."\n\t";
2067
+		$pre .= '<span id="'.$rss_id.'_url" class="hidden">'.$url.'</span>';
2068
+		$post = '</div>'."\n";
2069 2069
 
2070
-		$cache_key = 'ee_rss_' . md5( $rss_id );
2071
-		if ( FALSE != ( $output = get_transient( $cache_key ) ) ) {
2072
-			echo $pre . $output . $post;
2070
+		$cache_key = 'ee_rss_'.md5($rss_id);
2071
+		if (FALSE != ($output = get_transient($cache_key))) {
2072
+			echo $pre.$output.$post;
2073 2073
 			return TRUE;
2074 2074
 		}
2075 2075
 
2076
-		if ( ! $doing_ajax ) {
2077
-			echo $pre . $loading . $post;
2076
+		if ( ! $doing_ajax) {
2077
+			echo $pre.$loading.$post;
2078 2078
 			return FALSE;
2079 2079
 		}
2080 2080
 
2081 2081
 		ob_start();
2082
-		wp_widget_rss_output($url, array('show_date' => 0, 'items' => 5) );
2083
-		set_transient( $cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS );
2082
+		wp_widget_rss_output($url, array('show_date' => 0, 'items' => 5));
2083
+		set_transient($cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS);
2084 2084
 		return TRUE;
2085 2085
 
2086 2086
 	}
@@ -2092,13 +2092,13 @@  discard block
 block discarded – undo
2092 2092
 	  	<div id="espresso_news_post_box_content" class="infolinks">
2093 2093
 	  		<?php
2094 2094
 	  		// Get RSS Feed(s)
2095
-	  		$feed_url = apply_filters( 'FHEE__EE_Admin_Page__espresso_news_post_box__feed_url', 'http://eventespresso.com/feed/' );
2095
+	  		$feed_url = apply_filters('FHEE__EE_Admin_Page__espresso_news_post_box__feed_url', 'http://eventespresso.com/feed/');
2096 2096
 	  		$url = urlencode($feed_url);
2097
-	  		self::cached_rss_display( 'espresso_news_post_box_content', $url );
2097
+	  		self::cached_rss_display('espresso_news_post_box_content', $url);
2098 2098
 
2099 2099
 	  		?>
2100 2100
 	  	</div>
2101
-	  	<?php do_action( 'AHEE__EE_Admin_Page__espresso_news_post_box__after_content'); ?>
2101
+	  	<?php do_action('AHEE__EE_Admin_Page__espresso_news_post_box__after_content'); ?>
2102 2102
 	  </div>
2103 2103
 		<?php
2104 2104
 	}
@@ -2119,32 +2119,32 @@  discard block
 block discarded – undo
2119 2119
 
2120 2120
 	protected function _espresso_sponsors_post_box() {
2121 2121
 
2122
-		$show_sponsors = apply_filters( 'FHEE_show_sponsors_meta_box', TRUE );
2123
-		if ( $show_sponsors )
2124
-			add_meta_box('espresso_sponsors_post_box', __('Event Espresso Highlights', 'event_espresso'), array( $this, 'espresso_sponsors_post_box'), $this->_wp_page_slug, 'side');
2122
+		$show_sponsors = apply_filters('FHEE_show_sponsors_meta_box', TRUE);
2123
+		if ($show_sponsors)
2124
+			add_meta_box('espresso_sponsors_post_box', __('Event Espresso Highlights', 'event_espresso'), array($this, 'espresso_sponsors_post_box'), $this->_wp_page_slug, 'side');
2125 2125
 	}
2126 2126
 
2127 2127
 
2128 2128
 	public function espresso_sponsors_post_box() {
2129
-		$templatepath = EE_ADMIN_TEMPLATE . 'admin_general_metabox_contents_espresso_sponsors.template.php';
2130
-		EEH_Template::display_template( $templatepath );
2129
+		$templatepath = EE_ADMIN_TEMPLATE.'admin_general_metabox_contents_espresso_sponsors.template.php';
2130
+		EEH_Template::display_template($templatepath);
2131 2131
 	}
2132 2132
 
2133 2133
 
2134 2134
 
2135 2135
 	private function _publish_post_box() {
2136
-		$meta_box_ref = 'espresso_' . $this->page_slug . '_editor_overview';
2136
+		$meta_box_ref = 'espresso_'.$this->page_slug.'_editor_overview';
2137 2137
 
2138 2138
 		//if there is a array('label' => array('publishbox' => 'some title') ) present in the _page_config array then we'll use that for the metabox label.  Otherwise we'll just use publish (publishbox itself could be an array of labels indexed by routes)
2139
-		if ( !empty( $this->_labels['publishbox'] ) ) {
2140
-			$box_label = is_array( $this->_labels['publishbox'] ) ? $this->_labels['publishbox'][$this->_req_action] : $this->_labels['publishbox'];
2139
+		if ( ! empty($this->_labels['publishbox'])) {
2140
+			$box_label = is_array($this->_labels['publishbox']) ? $this->_labels['publishbox'][$this->_req_action] : $this->_labels['publishbox'];
2141 2141
 		} else {
2142 2142
 			$box_label = __('Publish', 'event_espresso');
2143 2143
 		}
2144 2144
 
2145
-		$box_label = apply_filters( 'FHEE__EE_Admin_Page___publish_post_box__box_label', $box_label, $this->_req_action, $this );
2145
+		$box_label = apply_filters('FHEE__EE_Admin_Page___publish_post_box__box_label', $box_label, $this->_req_action, $this);
2146 2146
 
2147
-		add_meta_box( $meta_box_ref, $box_label, array( $this, 'editor_overview' ), $this->_current_screen->id, 'side', 'high' );
2147
+		add_meta_box($meta_box_ref, $box_label, array($this, 'editor_overview'), $this->_current_screen->id, 'side', 'high');
2148 2148
 
2149 2149
 	}
2150 2150
 
@@ -2152,9 +2152,9 @@  discard block
 block discarded – undo
2152 2152
 
2153 2153
 	public function editor_overview() {
2154 2154
 		//if we have extra content set let's add it in if not make sure its empty
2155
-		$this->_template_args['publish_box_extra_content'] = isset( $this->_template_args['publish_box_extra_content'] ) ? $this->_template_args['publish_box_extra_content'] : '';
2156
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_details_publish_metabox.template.php';
2157
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
2155
+		$this->_template_args['publish_box_extra_content'] = isset($this->_template_args['publish_box_extra_content']) ? $this->_template_args['publish_box_extra_content'] : '';
2156
+		$template_path = EE_ADMIN_TEMPLATE.'admin_details_publish_metabox.template.php';
2157
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
2158 2158
 	}
2159 2159
 
2160 2160
 
@@ -2170,8 +2170,8 @@  discard block
 block discarded – undo
2170 2170
 	 * @see $this->_set_publish_post_box_vars for param details
2171 2171
 	 * @since 4.6.0
2172 2172
 	 */
2173
-	public function set_publish_post_box_vars( $name = null, $id = false, $delete = false, $save_close_redirect_URL = null, $both_btns = true ) {
2174
-		$this->_set_publish_post_box_vars( $name, $id, $delete, $save_close_redirect_URL, $both_btns );
2173
+	public function set_publish_post_box_vars($name = null, $id = false, $delete = false, $save_close_redirect_URL = null, $both_btns = true) {
2174
+		$this->_set_publish_post_box_vars($name, $id, $delete, $save_close_redirect_URL, $both_btns);
2175 2175
 	}
2176 2176
 
2177 2177
 
@@ -2190,24 +2190,24 @@  discard block
 block discarded – undo
2190 2190
 	 * @param	string	$post_save_redirect_URL	custom URL to redirect to after Save & Close has been completed
2191 2191
 	 * @param	boolean	$both_btns	whether to display BOTH the "Save & Close" and "Save" buttons or just the Save button
2192 2192
 	 */
2193
-	protected function _set_publish_post_box_vars( $name = NULL, $id = FALSE, $delete = FALSE, $save_close_redirect_URL = NULL, $both_btns = TRUE ) {
2193
+	protected function _set_publish_post_box_vars($name = NULL, $id = FALSE, $delete = FALSE, $save_close_redirect_URL = NULL, $both_btns = TRUE) {
2194 2194
 
2195 2195
 		// if Save & Close, use a custom redirect URL or default to the main page?
2196
-		$save_close_redirect_URL = ! empty( $save_close_redirect_URL ) ? $save_close_redirect_URL : $this->_admin_base_url;
2196
+		$save_close_redirect_URL = ! empty($save_close_redirect_URL) ? $save_close_redirect_URL : $this->_admin_base_url;
2197 2197
 		// create the Save & Close and Save buttons
2198
-		$this->_set_save_buttons( $both_btns, array(), array(), $save_close_redirect_URL );
2198
+		$this->_set_save_buttons($both_btns, array(), array(), $save_close_redirect_URL);
2199 2199
 		//if we have extra content set let's add it in if not make sure its empty
2200
-		$this->_template_args['publish_box_extra_content'] = isset( $this->_template_args['publish_box_extra_content'] ) ? $this->_template_args['publish_box_extra_content'] : '';
2200
+		$this->_template_args['publish_box_extra_content'] = isset($this->_template_args['publish_box_extra_content']) ? $this->_template_args['publish_box_extra_content'] : '';
2201 2201
 
2202 2202
 
2203
-		if ( $delete && ! empty( $id )  ) {
2203
+		if ($delete && ! empty($id)) {
2204 2204
 			$delete = is_bool($delete) ? 'delete' : $delete; //make sure we have a default if just true is sent.
2205
-			$delete_link_args = array( $name => $id );
2206
-			$delete = $this->get_action_link_or_button( $delete, $delete, $delete_link_args, 'submitdelete deletion');
2205
+			$delete_link_args = array($name => $id);
2206
+			$delete = $this->get_action_link_or_button($delete, $delete, $delete_link_args, 'submitdelete deletion');
2207 2207
 		}
2208 2208
 
2209
-		$this->_template_args['publish_delete_link'] = !empty( $id ) ? $delete : '';
2210
-		if ( ! empty( $name ) && ! empty( $id ) ) {
2209
+		$this->_template_args['publish_delete_link'] = ! empty($id) ? $delete : '';
2210
+		if ( ! empty($name) && ! empty($id)) {
2211 2211
 			$hidden_field_arr[$name] = array(
2212 2212
 				'type' => 'hidden',
2213 2213
 				'value' => $id
@@ -2217,7 +2217,7 @@  discard block
 block discarded – undo
2217 2217
 			$hf = '';
2218 2218
 		}
2219 2219
 		// add hidden field
2220
-		$this->_template_args['publish_hidden_fields'] = ! empty( $hf ) ? $hf[$name]['field'] : $hf;
2220
+		$this->_template_args['publish_hidden_fields'] = ! empty($hf) ? $hf[$name]['field'] : $hf;
2221 2221
 
2222 2222
 	}
2223 2223
 
@@ -2234,8 +2234,8 @@  discard block
 block discarded – undo
2234 2234
 		<noscript>
2235 2235
 			<div id="no-js-message" class="error">
2236 2236
 				<p style="font-size:1.3em;">
2237
-					<span style="color:red;"><?php _e( 'Warning!', 'event_espresso' ); ?></span>
2238
-					<?php _e( 'Javascript is currently turned off for your browser. Javascript must be enabled in order for all of the features on this page to function properly. Please turn your javascript back on.', 'event_espresso' ); ?>
2237
+					<span style="color:red;"><?php _e('Warning!', 'event_espresso'); ?></span>
2238
+					<?php _e('Javascript is currently turned off for your browser. Javascript must be enabled in order for all of the features on this page to function properly. Please turn your javascript back on.', 'event_espresso'); ?>
2239 2239
 				</p>
2240 2240
 			</div>
2241 2241
 		</noscript>
@@ -2255,7 +2255,7 @@  discard block
 block discarded – undo
2255 2255
 	*		@return 		string
2256 2256
 	*/
2257 2257
 	private function _display_espresso_notices() {
2258
-		$notices = $this->_get_transient( TRUE );
2258
+		$notices = $this->_get_transient(TRUE);
2259 2259
 		echo stripslashes($notices);
2260 2260
 	}
2261 2261
 
@@ -2307,11 +2307,11 @@  discard block
 block discarded – undo
2307 2307
 	 * @param string  $priority      give this metabox a priority (using accepted priorities for wp meta boxes)
2308 2308
 	 * @param boolean $create_func   default is true.  Basically we can say we don't WANT to have the runtime function created but just set our own callback for wp's add_meta_box.
2309 2309
 	 */
2310
-	public function _add_admin_page_meta_box( $action, $title, $callback, $callback_args, $column = 'normal', $priority = 'high', $create_func = true ) {
2311
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, $callback );
2310
+	public function _add_admin_page_meta_box($action, $title, $callback, $callback_args, $column = 'normal', $priority = 'high', $create_func = true) {
2311
+		do_action('AHEE_log', __FILE__, __FUNCTION__, $callback);
2312 2312
 
2313 2313
 		//if we have empty callback args and we want to automatically create the metabox callback then we need to make sure the callback args are generated.
2314
-		if ( empty( $callback_args ) && $create_func ) {
2314
+		if (empty($callback_args) && $create_func) {
2315 2315
 			$callback_args = array(
2316 2316
 				'template_path' => $this->_template_path,
2317 2317
 				'template_args' => $this->_template_args,
@@ -2321,7 +2321,7 @@  discard block
 block discarded – undo
2321 2321
 		//if $create_func is true (default) then we automatically create the function for displaying the actual meta box.  If false then we take the $callback reference passed through and use it instead (so callers can define their own callback function/method if they wish)
2322 2322
 		$call_back_func = $create_func ? create_function('$post, $metabox', 'do_action( "AHEE_log", __FILE__, __FUNCTION__, ""); echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );') : $callback;
2323 2323
 
2324
-		add_meta_box( str_replace( '_', '-', $action ) . '-mbox', $title, $call_back_func, $this->_wp_page_slug, $column, $priority, $callback_args );
2324
+		add_meta_box(str_replace('_', '-', $action).'-mbox', $title, $call_back_func, $this->_wp_page_slug, $column, $priority, $callback_args);
2325 2325
 	}
2326 2326
 
2327 2327
 
@@ -2334,7 +2334,7 @@  discard block
 block discarded – undo
2334 2334
 	 */
2335 2335
 	public function display_admin_page_with_metabox_columns() {
2336 2336
 		$this->_template_args['post_body_content'] = $this->_template_args['admin_page_content'];
2337
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $this->_column_template_path, $this->_template_args, TRUE);
2337
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_column_template_path, $this->_template_args, TRUE);
2338 2338
 
2339 2339
 		//the final wrapper
2340 2340
 		$this->admin_page_wrapper();
@@ -2377,7 +2377,7 @@  discard block
 block discarded – undo
2377 2377
 	 * @return void
2378 2378
 	 */
2379 2379
 	public function display_about_admin_page() {
2380
-		$this->_display_admin_page( FALSE, TRUE );
2380
+		$this->_display_admin_page(FALSE, TRUE);
2381 2381
 	}
2382 2382
 
2383 2383
 
@@ -2393,26 +2393,26 @@  discard block
 block discarded – undo
2393 2393
 	 * @return html           admin_page
2394 2394
 	 */
2395 2395
 	private function _display_admin_page($sidebar = false, $about = FALSE) {
2396
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
2396
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
2397 2397
 
2398 2398
 		//custom remove metaboxes hook to add or remove any metaboxes to/from Admin pages.
2399
-		do_action( 'AHEE__EE_Admin_Page___display_admin_page__modify_metaboxes' );
2399
+		do_action('AHEE__EE_Admin_Page___display_admin_page__modify_metaboxes');
2400 2400
 
2401 2401
 		// set current wp page slug - looks like: event-espresso_page_event_categories
2402 2402
 		// keep in mind "event-espresso" COULD be something else if the top level menu label has been translated.
2403 2403
 		$this->_template_args['current_page'] = $this->_wp_page_slug;
2404 2404
 
2405
-		$template_path = $sidebar ?  EE_ADMIN_TEMPLATE . 'admin_details_wrapper.template.php' : EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar.template.php';
2405
+		$template_path = $sidebar ?  EE_ADMIN_TEMPLATE . 'admin_details_wrapper.template.php' : EE_ADMIN_TEMPLATE.'admin_details_wrapper_no_sidebar.template.php';
2406 2406
 
2407
-		if ( defined('DOING_AJAX' ) )
2408
-			$template_path = EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar_ajax.template.php';
2407
+		if (defined('DOING_AJAX'))
2408
+			$template_path = EE_ADMIN_TEMPLATE.'admin_details_wrapper_no_sidebar_ajax.template.php';
2409 2409
 
2410
-		$template_path = !empty($this->_column_template_path) ? $this->_column_template_path : $template_path;
2410
+		$template_path = ! empty($this->_column_template_path) ? $this->_column_template_path : $template_path;
2411 2411
 
2412
-		$this->_template_args['post_body_content'] = isset( $this->_template_args['admin_page_content'] ) ? $this->_template_args['admin_page_content'] : '';
2412
+		$this->_template_args['post_body_content'] = isset($this->_template_args['admin_page_content']) ? $this->_template_args['admin_page_content'] : '';
2413 2413
 		$this->_template_args['before_admin_page_content'] = isset($this->_template_args['before_admin_page_content']) ? $this->_template_args['before_admin_page_content'] : '';
2414 2414
 		$this->_template_args['after_admin_page_content'] = isset($this->_template_args['after_admin_page_content']) ? $this->_template_args['after_admin_page_content'] : '';
2415
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
2415
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
2416 2416
 
2417 2417
 
2418 2418
 		// the final template wrapper
@@ -2432,7 +2432,7 @@  discard block
 block discarded – undo
2432 2432
 	 * @param bool   $display_sidebar whether to use the sidebar template or the full template for the page.  TRUE = SHOW sidebar, FALSE = no sidebar. Default no sidebar.
2433 2433
 	 * @return void
2434 2434
 	 */
2435
-	public function display_admin_caf_preview_page( $utm_campaign_source = '', $display_sidebar = TRUE ) {
2435
+	public function display_admin_caf_preview_page($utm_campaign_source = '', $display_sidebar = TRUE) {
2436 2436
 		//let's generate a default preview action button if there isn't one already present.
2437 2437
 		$this->_labels['buttons']['buy_now'] = __('Upgrade Now', 'event_espresso');
2438 2438
 		$buy_now_url = add_query_arg(
@@ -2445,10 +2445,10 @@  discard block
 block discarded – undo
2445 2445
 			),
2446 2446
 		'http://eventespresso.com/pricing/'
2447 2447
 		);
2448
-		$this->_template_args['preview_action_button'] = ! isset( $this->_template_args['preview_action_button'] ) ? $this->get_action_link_or_button( '', 'buy_now', array(), 'button-primary button-large', $buy_now_url ) : $this->_template_args['preview_action_button'];
2449
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_caf_full_page_preview.template.php';
2450
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
2451
-		$this->_display_admin_page( $display_sidebar );
2448
+		$this->_template_args['preview_action_button'] = ! isset($this->_template_args['preview_action_button']) ? $this->get_action_link_or_button('', 'buy_now', array(), 'button-primary button-large', $buy_now_url) : $this->_template_args['preview_action_button'];
2449
+		$template_path = EE_ADMIN_TEMPLATE.'admin_caf_full_page_preview.template.php';
2450
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
2451
+		$this->_display_admin_page($display_sidebar);
2452 2452
 	}
2453 2453
 
2454 2454
 
@@ -2482,41 +2482,41 @@  discard block
 block discarded – undo
2482 2482
 	 * @param boolean $sidebar whether to display with sidebar or not.
2483 2483
 	 * @return html
2484 2484
 	 */
2485
-	private function _display_admin_list_table_page( $sidebar = false ) {
2485
+	private function _display_admin_list_table_page($sidebar = false) {
2486 2486
 		//setup search attributes
2487 2487
 		$this->_set_search_attributes();
2488 2488
 		$this->_template_args['current_page'] = $this->_wp_page_slug;
2489
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_list_wrapper.template.php';
2489
+		$template_path = EE_ADMIN_TEMPLATE.'admin_list_wrapper.template.php';
2490 2490
 
2491
-		$this->_template_args['table_url'] = defined( 'DOING_AJAX') ? add_query_arg( array( 'noheader' => 'true', 'route' => $this->_req_action), $this->_admin_base_url ) : add_query_arg( array( 'route' => $this->_req_action), $this->_admin_base_url);
2491
+		$this->_template_args['table_url'] = defined('DOING_AJAX') ? add_query_arg(array('noheader' => 'true', 'route' => $this->_req_action), $this->_admin_base_url) : add_query_arg(array('route' => $this->_req_action), $this->_admin_base_url);
2492 2492
 		$this->_template_args['list_table'] = $this->_list_table_object;
2493 2493
 		$this->_template_args['current_route'] = $this->_req_action;
2494
-		$this->_template_args['list_table_class'] = get_class( $this->_list_table_object );
2494
+		$this->_template_args['list_table_class'] = get_class($this->_list_table_object);
2495 2495
 
2496 2496
 		$ajax_sorting_callback = $this->_list_table_object->get_ajax_sorting_callback();
2497
-		if( ! empty( $ajax_sorting_callback )) {
2498
-			$sortable_list_table_form_fields = wp_nonce_field( $ajax_sorting_callback . '_nonce', $ajax_sorting_callback . '_nonce', FALSE, FALSE );
2497
+		if ( ! empty($ajax_sorting_callback)) {
2498
+			$sortable_list_table_form_fields = wp_nonce_field($ajax_sorting_callback.'_nonce', $ajax_sorting_callback.'_nonce', FALSE, FALSE);
2499 2499
 //			$reorder_action = 'espresso_' . $ajax_sorting_callback . '_nonce';
2500 2500
 //			$sortable_list_table_form_fields = wp_nonce_field( $reorder_action, 'ajax_table_sort_nonce', FALSE, FALSE );
2501
-			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_page" name="ajax_table_sort_page" value="' . $this->page_slug .'" />';
2502
-			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_action" name="ajax_table_sort_action" value="' . $ajax_sorting_callback . '" />';
2501
+			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_page" name="ajax_table_sort_page" value="'.$this->page_slug.'" />';
2502
+			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_action" name="ajax_table_sort_action" value="'.$ajax_sorting_callback.'" />';
2503 2503
 		} else {
2504 2504
 			$sortable_list_table_form_fields = '';
2505 2505
 		}
2506 2506
 
2507 2507
 		$this->_template_args['sortable_list_table_form_fields'] = $sortable_list_table_form_fields;
2508
-		$hidden_form_fields = isset( $this->_template_args['list_table_hidden_fields'] ) ? $this->_template_args['list_table_hidden_fields'] : '';
2509
-		$nonce_ref = $this->_req_action . '_nonce';
2510
-		$hidden_form_fields .= '<input type="hidden" name="' . $nonce_ref . '" value="' . wp_create_nonce( $nonce_ref ) . '">';
2508
+		$hidden_form_fields = isset($this->_template_args['list_table_hidden_fields']) ? $this->_template_args['list_table_hidden_fields'] : '';
2509
+		$nonce_ref = $this->_req_action.'_nonce';
2510
+		$hidden_form_fields .= '<input type="hidden" name="'.$nonce_ref.'" value="'.wp_create_nonce($nonce_ref).'">';
2511 2511
 		$this->_template_args['list_table_hidden_fields'] = $hidden_form_fields;
2512 2512
 
2513 2513
 		//display message about search results?
2514
-		$this->_template_args['before_list_table'] .= apply_filters( 'FHEE__EE_Admin_Page___display_admin_list_table_page__before_list_table__template_arg', !empty( $this->_req_data['s'] ) ? '<p class="ee-search-results">' . sprintf( __('Displaying search results for the search string: <strong><em>%s</em></strong>', 'event_espresso'), trim($this->_req_data['s'], '%') ) . '</p>' : '', $this->page_slug, $this->_req_data, $this->_req_action );
2514
+		$this->_template_args['before_list_table'] .= apply_filters('FHEE__EE_Admin_Page___display_admin_list_table_page__before_list_table__template_arg', ! empty($this->_req_data['s']) ? '<p class="ee-search-results">'.sprintf(__('Displaying search results for the search string: <strong><em>%s</em></strong>', 'event_espresso'), trim($this->_req_data['s'], '%')).'</p>' : '', $this->page_slug, $this->_req_data, $this->_req_action);
2515 2515
 
2516
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
2516
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
2517 2517
 
2518 2518
 		// the final template wrapper
2519
-		if ( $sidebar )
2519
+		if ($sidebar)
2520 2520
 			$this->display_admin_page_with_sidebar();
2521 2521
 		else
2522 2522
 			$this->display_admin_page_with_no_sidebar();
@@ -2539,9 +2539,9 @@  discard block
 block discarded – undo
2539 2539
 	 * @param  array $items  see above for format of array
2540 2540
 	 * @return string        html string of legend
2541 2541
 	 */
2542
-	protected function _display_legend( $items ) {
2543
-		$template_args['items'] = apply_filters( 'FHEE__EE_Admin_Page___display_legend__items', (array) $items, $this );
2544
-		$legend_template = EE_ADMIN_TEMPLATE . 'admin_details_legend.template.php';
2542
+	protected function _display_legend($items) {
2543
+		$template_args['items'] = apply_filters('FHEE__EE_Admin_Page___display_legend__items', (array) $items, $this);
2544
+		$legend_template = EE_ADMIN_TEMPLATE.'admin_details_legend.template.php';
2545 2545
 		return EEH_Template::display_template($legend_template, $template_args, TRUE);
2546 2546
 	}
2547 2547
 
@@ -2566,29 +2566,29 @@  discard block
 block discarded – undo
2566 2566
 	 *
2567 2567
 	 * @return json object
2568 2568
 	 */
2569
-	protected function _return_json( $sticky_notices = FALSE ) {
2569
+	protected function _return_json($sticky_notices = FALSE) {
2570 2570
 
2571 2571
 		//make sure any EE_Error notices have been handled.
2572
-		$this->_process_notices( array(), TRUE, $sticky_notices );
2572
+		$this->_process_notices(array(), TRUE, $sticky_notices);
2573 2573
 
2574 2574
 
2575
-		$data = isset( $this->_template_args['data'] ) ? $this->_template_args['data'] : array();
2575
+		$data = isset($this->_template_args['data']) ? $this->_template_args['data'] : array();
2576 2576
 		unset($this->_template_args['data']);
2577 2577
 		$json = array(
2578
-			'error' => isset( $this->_template_args['error'] ) ? $this->_template_args['error'] : FALSE,
2579
-			'success' => isset( $this->_template_args['success'] ) ? $this->_template_args['success'] : FALSE,
2578
+			'error' => isset($this->_template_args['error']) ? $this->_template_args['error'] : FALSE,
2579
+			'success' => isset($this->_template_args['success']) ? $this->_template_args['success'] : FALSE,
2580 2580
 			'notices' => EE_Error::get_notices(),
2581
-			'content' => isset( $this->_template_args['admin_page_content'] ) ? $this->_template_args['admin_page_content'] : '',
2582
-			'data' => array_merge( $data, array('template_args' => $this->_template_args ) ),
2581
+			'content' => isset($this->_template_args['admin_page_content']) ? $this->_template_args['admin_page_content'] : '',
2582
+			'data' => array_merge($data, array('template_args' => $this->_template_args)),
2583 2583
 			'isEEajax' => TRUE //special flag so any ajax.Success methods in js can identify this return package as a EEajax package.
2584 2584
 			);
2585 2585
 
2586 2586
 
2587 2587
 		// make sure there are no php errors or headers_sent.  Then we can set correct json header.
2588
-		if ( NULL === error_get_last() || ! headers_sent() )
2588
+		if (NULL === error_get_last() || ! headers_sent())
2589 2589
 			header('Content-Type: application/json; charset=UTF-8');
2590 2590
 
2591
-		echo json_encode( $json );
2591
+		echo json_encode($json);
2592 2592
 		exit();
2593 2593
 	}
2594 2594
 
@@ -2599,11 +2599,11 @@  discard block
 block discarded – undo
2599 2599
 	 * @return json_obj|EE_Error
2600 2600
 	 */
2601 2601
 	public function return_json() {
2602
-		if ( defined('DOING_AJAX') && DOING_AJAX )
2602
+		if (defined('DOING_AJAX') && DOING_AJAX)
2603 2603
 			$this->_return_json();
2604 2604
 
2605 2605
 		else {
2606
-			throw new EE_Error( sprintf( __('The public %s method can only be called when DOING_AJAX = TRUE', 'event_espresso'), __FUNCTION__ ) );
2606
+			throw new EE_Error(sprintf(__('The public %s method can only be called when DOING_AJAX = TRUE', 'event_espresso'), __FUNCTION__));
2607 2607
 		}
2608 2608
 	}
2609 2609
 
@@ -2618,7 +2618,7 @@  discard block
 block discarded – undo
2618 2618
 	 * @access public
2619 2619
 	 * @return void
2620 2620
 	 */
2621
-	public function set_hook_object( EE_Admin_Hooks $hook_obj ) {
2621
+	public function set_hook_object(EE_Admin_Hooks $hook_obj) {
2622 2622
 		$this->_hook_obj = $hook_obj;
2623 2623
 	}
2624 2624
 
@@ -2634,33 +2634,33 @@  discard block
 block discarded – undo
2634 2634
 	*/
2635 2635
 	public function admin_page_wrapper($about = FALSE) {
2636 2636
 
2637
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
2637
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
2638 2638
 
2639 2639
 		$this->_nav_tabs = $this->_get_main_nav_tabs();
2640 2640
 
2641 2641
 		$this->_template_args['nav_tabs'] = $this->_nav_tabs;
2642 2642
 		$this->_template_args['admin_page_title'] = $this->_admin_page_title;
2643 2643
 
2644
-		$this->_template_args['before_admin_page_content'] = apply_filters( 'FHEE_before_admin_page_content' . $this->_current_page . $this->_current_view, isset( $this->_template_args['before_admin_page_content'] ) ? $this->_template_args['before_admin_page_content'] : '');
2645
-		$this->_template_args['after_admin_page_content'] = apply_filters( 'FHEE_after_admin_page_content' . $this->_current_page . $this->_current_view, isset( $this->_template_args['after_admin_page_content'] ) ? $this->_template_args['after_admin_page_content'] : '');
2644
+		$this->_template_args['before_admin_page_content'] = apply_filters('FHEE_before_admin_page_content'.$this->_current_page.$this->_current_view, isset($this->_template_args['before_admin_page_content']) ? $this->_template_args['before_admin_page_content'] : '');
2645
+		$this->_template_args['after_admin_page_content'] = apply_filters('FHEE_after_admin_page_content'.$this->_current_page.$this->_current_view, isset($this->_template_args['after_admin_page_content']) ? $this->_template_args['after_admin_page_content'] : '');
2646 2646
 
2647 2647
 		$this->_template_args['after_admin_page_content'] .= $this->_set_help_popup_content();
2648 2648
 
2649 2649
 
2650 2650
 
2651 2651
 		// load settings page wrapper template
2652
-		$template_path = !defined( 'DOING_AJAX' ) ? EE_ADMIN_TEMPLATE . 'admin_wrapper.template.php' : EE_ADMIN_TEMPLATE . 'admin_wrapper_ajax.template.php';
2652
+		$template_path = ! defined('DOING_AJAX') ? EE_ADMIN_TEMPLATE . 'admin_wrapper.template.php' : EE_ADMIN_TEMPLATE.'admin_wrapper_ajax.template.php';
2653 2653
 
2654 2654
 		//about page?
2655 2655
 		$template_path = $about ? EE_ADMIN_TEMPLATE . 'about_admin_wrapper.template.php' : $template_path;
2656 2656
 
2657 2657
 
2658
-		if ( defined( 'DOING_AJAX' ) ) {
2659
-			$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
2658
+		if (defined('DOING_AJAX')) {
2659
+			$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
2660 2660
 
2661 2661
 			$this->_return_json();
2662 2662
 		} else {
2663
-			EEH_Template::display_template( $template_path, $this->_template_args );
2663
+			EEH_Template::display_template($template_path, $this->_template_args);
2664 2664
 		}
2665 2665
 
2666 2666
 	}
@@ -2673,7 +2673,7 @@  discard block
 block discarded – undo
2673 2673
 	 */
2674 2674
 	protected function _get_main_nav_tabs() {
2675 2675
 		//let's generate the html using the EEH_Tabbed_Content helper.  We do this here so that it's possible for child classes to add in nav tabs dynamically at the last minute (rather than setting in the page_routes array)
2676
-		EE_Registry::instance()->load_helper( 'Tabbed_Content' );
2676
+		EE_Registry::instance()->load_helper('Tabbed_Content');
2677 2677
 		return EEH_Tabbed_Content::display_admin_nav_tabs($this->_nav_tabs);
2678 2678
 	}
2679 2679
 
@@ -2689,7 +2689,7 @@  discard block
 block discarded – undo
2689 2689
 	*		@access public
2690 2690
 	*		@return void
2691 2691
 	*/
2692
-	private function _sort_nav_tabs( $a, $b ) {
2692
+	private function _sort_nav_tabs($a, $b) {
2693 2693
 		if ($a['order'] == $b['order']) {
2694 2694
 	        return 0;
2695 2695
 	    }
@@ -2710,8 +2710,8 @@  discard block
 block discarded – undo
2710 2710
 	 * 	@uses EEH_Form_Fields::get_form_fields (/helper/EEH_Form_Fields.helper.php)
2711 2711
 	 * 	@uses EEH_Form_Fields::get_form_fields_array (/helper/EEH_Form_Fields.helper.php)
2712 2712
 	 */
2713
-	protected function _generate_admin_form_fields( $input_vars = array(), $generator = 'string', $id = FALSE ) {
2714
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
2713
+	protected function _generate_admin_form_fields($input_vars = array(), $generator = 'string', $id = FALSE) {
2714
+		EE_Registry::instance()->load_helper('Form_Fields');
2715 2715
 		$content = $generator == 'string' ? EEH_Form_Fields::get_form_fields($input_vars, $id) : EEH_Form_Fields::get_form_fields_array($input_vars);
2716 2716
 		return $content;
2717 2717
 	}
@@ -2733,25 +2733,25 @@  discard block
 block discarded – undo
2733 2733
 	 * @param array $actions if included allows us to set the actions that each button will carry out (i.e. via the "name" value in the button).  We can also use this to just dump default actions by submitting some other value.
2734 2734
 	 * @param bool|string|null $referrer if false then we just do the default action on save and close.  Other wise it will use the $referrer string. IF null, then we don't do ANYTHING on save and close (normal form handling).
2735 2735
 	 */
2736
-	protected function _set_save_buttons($both = TRUE, $text = array(), $actions = array(), $referrer = NULL ) {
2736
+	protected function _set_save_buttons($both = TRUE, $text = array(), $actions = array(), $referrer = NULL) {
2737 2737
 		//make sure $text and $actions are in an array
2738 2738
 		$text = (array) $text;
2739 2739
 		$actions = (array) $actions;
2740 2740
 		$referrer_url = empty($referrer) ? '' : $referrer;
2741
-		$referrer_url = !$referrer ? '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="' . $_SERVER['REQUEST_URI'] .'" />' : '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="' . $referrer .'" />';
2741
+		$referrer_url = ! $referrer ? '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="'.$_SERVER['REQUEST_URI'].'" />' : '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="'.$referrer.'" />';
2742 2742
 
2743
-		$button_text = !empty($text) ? $text : array( __('Save', 'event_espresso'), __('Save and Close', 'event_espresso') );
2744
-		$default_names = array( 'save', 'save_and_close' );
2743
+		$button_text = ! empty($text) ? $text : array(__('Save', 'event_espresso'), __('Save and Close', 'event_espresso'));
2744
+		$default_names = array('save', 'save_and_close');
2745 2745
 
2746 2746
 		//add in a hidden index for the current page (so save and close redirects properly)
2747 2747
 		$this->_template_args['save_buttons'] = $referrer_url;
2748 2748
 
2749
-		foreach ( $button_text as $key => $button ) {
2749
+		foreach ($button_text as $key => $button) {
2750 2750
 			$ref = $default_names[$key];
2751
-			$id = $this->_current_view . '_' . $ref;
2752
-			$name = !empty($actions) ? $actions[$key] : $ref;
2753
-			$this->_template_args['save_buttons'] .= '<input type="submit" class="button-primary ' . $ref . '" value="' . $button . '" name="' . $name . '" id="' . $id . '" />';
2754
-			if ( !$both ) break;
2751
+			$id = $this->_current_view.'_'.$ref;
2752
+			$name = ! empty($actions) ? $actions[$key] : $ref;
2753
+			$this->_template_args['save_buttons'] .= '<input type="submit" class="button-primary '.$ref.'" value="'.$button.'" name="'.$name.'" id="'.$id.'" />';
2754
+			if ( ! $both) break;
2755 2755
 		}
2756 2756
 
2757 2757
 	}
@@ -2764,8 +2764,8 @@  discard block
 block discarded – undo
2764 2764
 	 * @since 4.6.0
2765 2765
 	 *
2766 2766
 	 */
2767
-	public function set_add_edit_form_tags( $route = '', $additional_hidden_fields = array() ) {
2768
-		$this->_set_add_edit_form_tags( $route, $additional_hidden_fields );
2767
+	public function set_add_edit_form_tags($route = '', $additional_hidden_fields = array()) {
2768
+		$this->_set_add_edit_form_tags($route, $additional_hidden_fields);
2769 2769
 	}
2770 2770
 
2771 2771
 
@@ -2778,30 +2778,30 @@  discard block
 block discarded – undo
2778 2778
 	 * @param array $additional_hidden_fields any additional hidden fields required in the form header
2779 2779
 	 * @return void
2780 2780
 	 */
2781
-	protected function _set_add_edit_form_tags( $route = '', $additional_hidden_fields = array() ) {
2781
+	protected function _set_add_edit_form_tags($route = '', $additional_hidden_fields = array()) {
2782 2782
 
2783
-		if ( empty( $route )) {
2783
+		if (empty($route)) {
2784 2784
 			$user_msg = __('An error occurred. No action was set for this page\'s form.', 'event_espresso');
2785
-			$dev_msg = $user_msg . "\n" . sprintf( __('The $route argument is required for the %s->%s method.', 'event_espresso'), __FUNCTION__, __CLASS__ );
2786
-			EE_Error::add_error( $user_msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ );
2785
+			$dev_msg = $user_msg."\n".sprintf(__('The $route argument is required for the %s->%s method.', 'event_espresso'), __FUNCTION__, __CLASS__);
2786
+			EE_Error::add_error($user_msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__);
2787 2787
 		}
2788 2788
 		// open form
2789
-		$this->_template_args['before_admin_page_content'] = '<form name="form" method="post" action="' . $this->_admin_base_url . '" id="' . $route . '_event_form" >';
2789
+		$this->_template_args['before_admin_page_content'] = '<form name="form" method="post" action="'.$this->_admin_base_url.'" id="'.$route.'_event_form" >';
2790 2790
 		// add nonce
2791
-		$nonce = wp_nonce_field( $route . '_nonce', $route . '_nonce', FALSE, FALSE );
2791
+		$nonce = wp_nonce_field($route.'_nonce', $route.'_nonce', FALSE, FALSE);
2792 2792
 //		$nonce = wp_nonce_field( $route . '_nonce', '_wpnonce', FALSE, FALSE );
2793
-		$this->_template_args['before_admin_page_content'] .= "\n\t" . $nonce;
2793
+		$this->_template_args['before_admin_page_content'] .= "\n\t".$nonce;
2794 2794
 		// add REQUIRED form action
2795 2795
 		$hidden_fields = array(
2796
-				'action' => array( 'type' => 'hidden', 'value' => $route ),
2796
+				'action' => array('type' => 'hidden', 'value' => $route),
2797 2797
 			);
2798 2798
 		// merge arrays
2799
-		$hidden_fields = is_array( $additional_hidden_fields) ? array_merge( $hidden_fields, $additional_hidden_fields ) : $hidden_fields;
2799
+		$hidden_fields = is_array($additional_hidden_fields) ? array_merge($hidden_fields, $additional_hidden_fields) : $hidden_fields;
2800 2800
 		// generate form fields
2801
-		$form_fields = $this->_generate_admin_form_fields( $hidden_fields, 'array' );
2801
+		$form_fields = $this->_generate_admin_form_fields($hidden_fields, 'array');
2802 2802
 		// add fields to form
2803
-		foreach ( $form_fields as $field_name => $form_field ) {
2804
-			$this->_template_args['before_admin_page_content'] .= "\n\t" . $form_field['field'];
2803
+		foreach ($form_fields as $field_name => $form_field) {
2804
+			$this->_template_args['before_admin_page_content'] .= "\n\t".$form_field['field'];
2805 2805
 		}
2806 2806
 
2807 2807
 		// close form
@@ -2818,8 +2818,8 @@  discard block
 block discarded – undo
2818 2818
 	 * @see EE_Admin_Page::_redirect_after_action() for params.
2819 2819
 	 * @since 4.5.0
2820 2820
 	 */
2821
-	public function redirect_after_action( $success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE ) {
2822
-		$this->_redirect_after_action( $success, $what, $action_desc, $query_args, $override_overwrite );
2821
+	public function redirect_after_action($success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE) {
2822
+		$this->_redirect_after_action($success, $what, $action_desc, $query_args, $override_overwrite);
2823 2823
 	}
2824 2824
 
2825 2825
 
@@ -2834,32 +2834,32 @@  discard block
 block discarded – undo
2834 2834
 	 *	@access protected
2835 2835
 	 *	@return void
2836 2836
 	 */
2837
-	protected function _redirect_after_action( $success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE ) {
2837
+	protected function _redirect_after_action($success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE) {
2838 2838
 
2839
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
2839
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
2840 2840
 
2841 2841
 		//class name for actions/filters.
2842 2842
 		$classname = get_class($this);
2843 2843
 
2844 2844
 		//set redirect url. Note if there is a "page" index in the $query_args then we go with vanilla admin.php route, otherwise we go with whatever is set as the _admin_base_url
2845
-		$redirect_url = isset( $query_args['page'] ) ? admin_url('admin.php') : $this->_admin_base_url;
2846
-		$notices = EE_Error::get_notices( FALSE );
2845
+		$redirect_url = isset($query_args['page']) ? admin_url('admin.php') : $this->_admin_base_url;
2846
+		$notices = EE_Error::get_notices(FALSE);
2847 2847
 
2848 2848
 		// overwrite default success messages //BUT ONLY if overwrite not overridden
2849
-		if ( ! $override_overwrite || ! empty( $notices['errors'] )) {
2849
+		if ( ! $override_overwrite || ! empty($notices['errors'])) {
2850 2850
 			EE_Error::overwrite_success();
2851 2851
 		}
2852 2852
 		// how many records affected ? more than one record ? or just one ?
2853
-		if ( $success > 1 && empty( $notices['errors'] )) {
2853
+		if ($success > 1 && empty($notices['errors'])) {
2854 2854
 			// set plural msg
2855
-			EE_Error::add_success( sprintf( __('The "%s" have been successfully %s.', 'event_espresso'), $what, $action_desc ), __FILE__, __FUNCTION__, __LINE__);
2856
-		} else if ( $success == 1 && empty( $notices['errors'] )) {
2855
+			EE_Error::add_success(sprintf(__('The "%s" have been successfully %s.', 'event_espresso'), $what, $action_desc), __FILE__, __FUNCTION__, __LINE__);
2856
+		} else if ($success == 1 && empty($notices['errors'])) {
2857 2857
 			// set singular msg
2858
-			EE_Error::add_success( sprintf( __('The "%s" has been successfully %s.', 'event_espresso'), $what, $action_desc), __FILE__, __FUNCTION__, __LINE__ );
2858
+			EE_Error::add_success(sprintf(__('The "%s" has been successfully %s.', 'event_espresso'), $what, $action_desc), __FILE__, __FUNCTION__, __LINE__);
2859 2859
 		}
2860 2860
 
2861 2861
 		// check that $query_args isn't something crazy
2862
-		if ( ! is_array( $query_args )) {
2862
+		if ( ! is_array($query_args)) {
2863 2863
 			$query_args = array();
2864 2864
 		}
2865 2865
 
@@ -2872,36 +2872,36 @@  discard block
 block discarded – undo
2872 2872
 		 * @param array $query_args   The original query_args array coming into the
2873 2873
 		 *                          		method.
2874 2874
 		 */
2875
-		do_action( 'AHEE__' . $classname . '___redirect_after_action__before_redirect_modification_' . $this->_req_action, $query_args );
2875
+		do_action('AHEE__'.$classname.'___redirect_after_action__before_redirect_modification_'.$this->_req_action, $query_args);
2876 2876
 
2877 2877
 		//calculate where we're going (if we have a "save and close" button pushed)
2878
-		if ( isset($this->_req_data['save_and_close'] ) && isset($this->_req_data['save_and_close_referrer'] ) ) {
2878
+		if (isset($this->_req_data['save_and_close']) && isset($this->_req_data['save_and_close_referrer'])) {
2879 2879
 			// even though we have the save_and_close referrer, we need to parse the url for the action in order to generate a nonce
2880
-			$parsed_url = parse_url( $this->_req_data['save_and_close_referrer'] );
2880
+			$parsed_url = parse_url($this->_req_data['save_and_close_referrer']);
2881 2881
 			// regenerate query args array from refferer URL
2882
-			parse_str( $parsed_url['query'], $query_args );
2882
+			parse_str($parsed_url['query'], $query_args);
2883 2883
 			// correct page and action will be in the query args now
2884
-			$redirect_url = admin_url( 'admin.php' );
2884
+			$redirect_url = admin_url('admin.php');
2885 2885
 		}
2886 2886
 
2887 2887
 		//merge any default query_args set in _default_route_query_args property
2888
-		if ( ! empty( $this->_default_route_query_args ) && ! $this->_is_UI_request ) {
2888
+		if ( ! empty($this->_default_route_query_args) && ! $this->_is_UI_request) {
2889 2889
 			$args_to_merge = array();
2890
-			foreach ( $this->_default_route_query_args as $query_param => $query_value ) {
2890
+			foreach ($this->_default_route_query_args as $query_param => $query_value) {
2891 2891
 				//is there a wp_referer array in our _default_route_query_args property?
2892
-				if ( $query_param == 'wp_referer'  ) {
2892
+				if ($query_param == 'wp_referer') {
2893 2893
 					$query_value = (array) $query_value;
2894
-					foreach ( $query_value as $reference => $value ) {
2895
-						if ( strpos( $reference, 'nonce' ) !== false ) {
2894
+					foreach ($query_value as $reference => $value) {
2895
+						if (strpos($reference, 'nonce') !== false) {
2896 2896
 							continue;
2897 2897
 						}
2898 2898
 
2899 2899
 						//finally we will override any arguments in the referer with
2900 2900
 						//what might be set on the _default_route_query_args array.
2901
-						if ( isset( $this->_default_route_query_args[$reference] ) ) {
2902
-							$args_to_merge[$reference] = urlencode( $this->_default_route_query_args[$reference] );
2901
+						if (isset($this->_default_route_query_args[$reference])) {
2902
+							$args_to_merge[$reference] = urlencode($this->_default_route_query_args[$reference]);
2903 2903
 						} else {
2904
-							$args_to_merge[$reference] = urlencode( $value );
2904
+							$args_to_merge[$reference] = urlencode($value);
2905 2905
 						}
2906 2906
 					}
2907 2907
 					continue;
@@ -2912,7 +2912,7 @@  discard block
 block discarded – undo
2912 2912
 
2913 2913
 			//now let's merge these arguments but override with what was specifically sent in to the
2914 2914
 			//redirect.
2915
-			$query_args = array_merge( $args_to_merge, $query_args );
2915
+			$query_args = array_merge($args_to_merge, $query_args);
2916 2916
 		}
2917 2917
 
2918 2918
 		$this->_process_notices($query_args);
@@ -2921,19 +2921,19 @@  discard block
 block discarded – undo
2921 2921
 		// generate redirect url
2922 2922
 
2923 2923
 		// if redirecting to anything other than the main page, add a nonce
2924
-		if ( isset( $query_args['action'] )) {
2924
+		if (isset($query_args['action'])) {
2925 2925
 			// manually generate wp_nonce and merge that with the query vars becuz the wp_nonce_url function wrecks havoc on some vars
2926
-			$query_args['_wpnonce'] = wp_create_nonce( $query_args['action'] . '_nonce' );
2926
+			$query_args['_wpnonce'] = wp_create_nonce($query_args['action'].'_nonce');
2927 2927
 		}
2928 2928
 
2929 2929
 		//we're adding some hooks and filters in here for processing any things just before redirects (example: an admin page has done an insert or update and we want to run something after that).
2930
-		do_action( 'AHEE_redirect_' . $classname . $this->_req_action, $query_args );
2930
+		do_action('AHEE_redirect_'.$classname.$this->_req_action, $query_args);
2931 2931
 
2932
-		$redirect_url = apply_filters( 'FHEE_redirect_' . $classname . $this->_req_action, self::add_query_args_and_nonce( $query_args, $redirect_url ), $query_args );
2932
+		$redirect_url = apply_filters('FHEE_redirect_'.$classname.$this->_req_action, self::add_query_args_and_nonce($query_args, $redirect_url), $query_args);
2933 2933
 
2934 2934
 
2935 2935
 		// check if we're doing ajax.  If we are then lets just return the results and js can handle how it wants.
2936
-		if ( defined('DOING_AJAX' ) ) {
2936
+		if (defined('DOING_AJAX')) {
2937 2937
 			$default_data = array(
2938 2938
 				'close' => TRUE,
2939 2939
 				'redirect_url' => $redirect_url,
@@ -2942,11 +2942,11 @@  discard block
 block discarded – undo
2942 2942
 				);
2943 2943
 
2944 2944
 			$this->_template_args['success'] = $success;
2945
-			$this->_template_args['data'] = !empty($this->_template_args['data']) ? array_merge($default_data, $this->_template_args['data'] ): $default_data;
2945
+			$this->_template_args['data'] = ! empty($this->_template_args['data']) ? array_merge($default_data, $this->_template_args['data']) : $default_data;
2946 2946
 			$this->_return_json();
2947 2947
 		}
2948 2948
 
2949
-		wp_safe_redirect( $redirect_url );
2949
+		wp_safe_redirect($redirect_url);
2950 2950
 		exit();
2951 2951
 	}
2952 2952
 
@@ -2962,14 +2962,14 @@  discard block
 block discarded – undo
2962 2962
 	 * @param bool    $sticky_notices      This is used to flag that regardless of whether this is doing_ajax or not, we still save a transient for the notice.
2963 2963
 	 * @return void
2964 2964
 	 */
2965
-	protected function _process_notices( $query_args = array(), $skip_route_verify = FALSE , $sticky_notices = TRUE ) {
2965
+	protected function _process_notices($query_args = array(), $skip_route_verify = FALSE, $sticky_notices = TRUE) {
2966 2966
 
2967 2967
 		$this->_template_args['notices'] = EE_Error::get_notices();
2968 2968
 
2969 2969
 		//IF this isn't ajax we need to create a transient for the notices using the route (however, overridden if $sticky_notices == true)
2970
-		if ( ! defined( 'DOING_AJAX' ) || $sticky_notices ) {
2971
-			$route = isset( $query_args['action'] ) ? $query_args['action'] : 'default';
2972
-			$this->_add_transient( $route, $this->_template_args['notices'], TRUE, $skip_route_verify );
2970
+		if ( ! defined('DOING_AJAX') || $sticky_notices) {
2971
+			$route = isset($query_args['action']) ? $query_args['action'] : 'default';
2972
+			$this->_add_transient($route, $this->_template_args['notices'], TRUE, $skip_route_verify);
2973 2973
 		}
2974 2974
 	}
2975 2975
 
@@ -2991,30 +2991,30 @@  discard block
 block discarded – undo
2991 2991
 	 */
2992 2992
 	public function get_action_link_or_button($action, $type = 'add', $extra_request = array(), $class = 'button-primary', $base_url = FALSE) {
2993 2993
 		//first let's validate the action (if $base_url is FALSE otherwise validation will happen further along)
2994
-		if ( !isset($this->_page_routes[$action]) && !$base_url )
2995
-			throw new EE_Error( sprintf( __('There is no page route for given action for the button.  This action was given: %s', 'event_espresso'), $action) );
2994
+		if ( ! isset($this->_page_routes[$action]) && ! $base_url)
2995
+			throw new EE_Error(sprintf(__('There is no page route for given action for the button.  This action was given: %s', 'event_espresso'), $action));
2996 2996
 
2997
-		if ( !isset( $this->_labels['buttons'][$type] ) )
2998
-			throw new EE_Error( sprintf( __('There is no label for the given button type (%s). Labels are set in the <code>_page_config</code> property.', 'event_espresso'), $type) );
2997
+		if ( ! isset($this->_labels['buttons'][$type]))
2998
+			throw new EE_Error(sprintf(__('There is no label for the given button type (%s). Labels are set in the <code>_page_config</code> property.', 'event_espresso'), $type));
2999 2999
 
3000 3000
 		//finally check user access for this button.
3001
-		$has_access = $this->check_user_access( $action, TRUE );
3002
-		if ( ! $has_access ) {
3001
+		$has_access = $this->check_user_access($action, TRUE);
3002
+		if ( ! $has_access) {
3003 3003
 			return '';
3004 3004
 		}
3005 3005
 
3006
-		$_base_url = !$base_url ? $this->_admin_base_url : $base_url;
3006
+		$_base_url = ! $base_url ? $this->_admin_base_url : $base_url;
3007 3007
 
3008 3008
 		$query_args = array(
3009 3009
 			'action' => $action  );
3010 3010
 
3011 3011
 		//merge extra_request args but make sure our original action takes precedence and doesn't get overwritten.
3012
-		if ( !empty($extra_request) )
3013
-			$query_args = array_merge( $extra_request, $query_args );
3012
+		if ( ! empty($extra_request))
3013
+			$query_args = array_merge($extra_request, $query_args);
3014 3014
 
3015
-		$url = self::add_query_args_and_nonce( $query_args, $_base_url );
3015
+		$url = self::add_query_args_and_nonce($query_args, $_base_url);
3016 3016
 
3017
-		$button = EEH_Template::get_button_or_link( $url, $this->_labels['buttons'][$type], $class );
3017
+		$button = EEH_Template::get_button_or_link($url, $this->_labels['buttons'][$type], $class);
3018 3018
 
3019 3019
 		return $button;
3020 3020
 	}
@@ -3034,11 +3034,11 @@  discard block
 block discarded – undo
3034 3034
 		$args = array(
3035 3035
 			'label' => $this->_admin_page_title,
3036 3036
 			'default' => 10,
3037
-			'option' => $this->_current_page . '_' . $this->_current_view . '_per_page'
3037
+			'option' => $this->_current_page.'_'.$this->_current_view.'_per_page'
3038 3038
 			);
3039 3039
 		//ONLY add the screen option if the user has access to it.
3040
-		if ( $this->check_user_access( $this->_current_view, true ) ) {
3041
-			add_screen_option( $option, $args );
3040
+		if ($this->check_user_access($this->_current_view, true)) {
3041
+			add_screen_option($option, $args);
3042 3042
 		}
3043 3043
 	}
3044 3044
 
@@ -3054,36 +3054,36 @@  discard block
 block discarded – undo
3054 3054
 	 * @return void
3055 3055
 	 */
3056 3056
 	private function _set_per_page_screen_options() {
3057
-		if ( isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options']) ) {
3058
-			check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' );
3057
+		if (isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options'])) {
3058
+			check_admin_referer('screen-options-nonce', 'screenoptionnonce');
3059 3059
 
3060
-			if ( !$user = wp_get_current_user() )
3060
+			if ( ! $user = wp_get_current_user())
3061 3061
 			return;
3062 3062
 			$option = $_POST['wp_screen_options']['option'];
3063 3063
 			$value = $_POST['wp_screen_options']['value'];
3064 3064
 
3065
-			if ( $option != sanitize_key( $option ) )
3065
+			if ($option != sanitize_key($option))
3066 3066
 				return;
3067 3067
 
3068 3068
 			$map_option = $option;
3069 3069
 
3070 3070
 			$option = str_replace('-', '_', $option);
3071 3071
 
3072
-			switch ( $map_option ) {
3073
-				case $this->_current_page . '_' .  $this->_current_view . '_per_page':
3072
+			switch ($map_option) {
3073
+				case $this->_current_page.'_'.$this->_current_view.'_per_page':
3074 3074
 					$value = (int) $value;
3075
-					if ( $value < 1 || $value > 999 )
3075
+					if ($value < 1 || $value > 999)
3076 3076
 						return;
3077 3077
 					break;
3078 3078
 				default:
3079
-					$value = apply_filters( 'FHEE__EE_Admin_Page___set_per_page_screen_options__value', false, $option, $value );
3080
-					if ( false === $value )
3079
+					$value = apply_filters('FHEE__EE_Admin_Page___set_per_page_screen_options__value', false, $option, $value);
3080
+					if (false === $value)
3081 3081
 						return;
3082 3082
 					break;
3083 3083
 			}
3084 3084
 
3085 3085
 			update_user_meta($user->ID, $option, $value);
3086
-			wp_safe_redirect( remove_query_arg( array('pagenum', 'apage', 'paged'), wp_get_referer() ) );
3086
+			wp_safe_redirect(remove_query_arg(array('pagenum', 'apage', 'paged'), wp_get_referer()));
3087 3087
 			exit;
3088 3088
 		}
3089 3089
 	}
@@ -3094,8 +3094,8 @@  discard block
 block discarded – undo
3094 3094
 	 * This just allows for setting the $_template_args property if it needs to be set outside the object
3095 3095
 	 * @param array $data array that will be assigned to template args.
3096 3096
 	 */
3097
-	public function set_template_args( $data ) {
3098
-		$this->_template_args = array_merge( $this->_template_args, (array) $data );
3097
+	public function set_template_args($data) {
3098
+		$this->_template_args = array_merge($this->_template_args, (array) $data);
3099 3099
 	}
3100 3100
 
3101 3101
 
@@ -3111,26 +3111,26 @@  discard block
 block discarded – undo
3111 3111
 	 * @param bool $skip_route_verify Used to indicate we want to skip route verification.  This is usually ONLY used when we are adding a transient before page_routes have been defined.
3112 3112
 	 * @return void
3113 3113
 	 */
3114
-	protected function _add_transient( $route, $data, $notices = FALSE, $skip_route_verify = FALSE ) {
3114
+	protected function _add_transient($route, $data, $notices = FALSE, $skip_route_verify = FALSE) {
3115 3115
 		$user_id = get_current_user_id();
3116 3116
 
3117
-		if ( !$skip_route_verify )
3117
+		if ( ! $skip_route_verify)
3118 3118
 			$this->_verify_route($route);
3119 3119
 
3120 3120
 
3121 3121
 		//now let's set the string for what kind of transient we're setting
3122
-		$transient = $notices ? 'ee_rte_n_tx_' . $route . '_' . $user_id : 'rte_tx_' . $route . '_' . $user_id;
3123
-		$data = $notices ? array( 'notices' => $data ) : $data;
3122
+		$transient = $notices ? 'ee_rte_n_tx_'.$route.'_'.$user_id : 'rte_tx_'.$route.'_'.$user_id;
3123
+		$data = $notices ? array('notices' => $data) : $data;
3124 3124
 		//is there already a transient for this route?  If there is then let's ADD to that transient
3125
-		$existing = is_multisite() && is_network_admin() ? get_site_transient( $transient ) : get_transient( $transient );
3126
-		if ( $existing ) {
3127
-			$data = array_merge( (array) $data, (array) $existing );
3125
+		$existing = is_multisite() && is_network_admin() ? get_site_transient($transient) : get_transient($transient);
3126
+		if ($existing) {
3127
+			$data = array_merge((array) $data, (array) $existing);
3128 3128
 		}
3129 3129
 
3130
-		if ( is_multisite() && is_network_admin() ) {
3131
-			set_site_transient( $transient, $data, 8 );
3130
+		if (is_multisite() && is_network_admin()) {
3131
+			set_site_transient($transient, $data, 8);
3132 3132
 		} else {
3133
-			set_transient( $transient, $data, 8 );
3133
+			set_transient($transient, $data, 8);
3134 3134
 		}
3135 3135
 	}
3136 3136
 
@@ -3142,18 +3142,18 @@  discard block
 block discarded – undo
3142 3142
 	 * @param bool $notices true we get notices transient. False we just return normal route transient
3143 3143
 	 * @return mixed data
3144 3144
 	 */
3145
-	protected function _get_transient( $notices = FALSE, $route = FALSE ) {
3145
+	protected function _get_transient($notices = FALSE, $route = FALSE) {
3146 3146
 		$user_id = get_current_user_id();
3147
-		$route = !$route ? $this->_req_action : $route;
3148
-		$transient = $notices ? 'ee_rte_n_tx_' . $route . '_' . $user_id : 'rte_tx_' . $route . '_' . $user_id;
3149
-		$data = is_multisite() && is_network_admin() ? get_site_transient( $transient ) : get_transient( $transient );
3147
+		$route = ! $route ? $this->_req_action : $route;
3148
+		$transient = $notices ? 'ee_rte_n_tx_'.$route.'_'.$user_id : 'rte_tx_'.$route.'_'.$user_id;
3149
+		$data = is_multisite() && is_network_admin() ? get_site_transient($transient) : get_transient($transient);
3150 3150
 		//delete transient after retrieval (just in case it hasn't expired);
3151
-		if ( is_multisite() && is_network_admin() ) {
3152
-			delete_site_transient( $transient );
3151
+		if (is_multisite() && is_network_admin()) {
3152
+			delete_site_transient($transient);
3153 3153
 		} else {
3154
-			delete_transient( $transient );
3154
+			delete_transient($transient);
3155 3155
 		}
3156
-		return $notices && isset( $data['notices'] ) ? $data['notices'] : $data;
3156
+		return $notices && isset($data['notices']) ? $data['notices'] : $data;
3157 3157
 	}
3158 3158
 
3159 3159
 
@@ -3170,12 +3170,12 @@  discard block
 block discarded – undo
3170 3170
 
3171 3171
 		//retrieve all existing transients
3172 3172
 		$query = "SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%rte_tx_%' OR option_name LIKE '%rte_n_tx_%'";
3173
-		if ( $results = $wpdb->get_results( $query ) ) {
3174
-			foreach ( $results as $result ) {
3175
-				$transient = str_replace( '_transient_', '', $result->option_name );
3176
-				get_transient( $transient );
3177
-				if ( is_multisite() && is_network_admin() ) {
3178
-					get_site_transient( $transient );
3173
+		if ($results = $wpdb->get_results($query)) {
3174
+			foreach ($results as $result) {
3175
+				$transient = str_replace('_transient_', '', $result->option_name);
3176
+				get_transient($transient);
3177
+				if (is_multisite() && is_network_admin()) {
3178
+					get_site_transient($transient);
3179 3179
 				}
3180 3180
 			}
3181 3181
 		}
@@ -3299,23 +3299,23 @@  discard block
 block discarded – undo
3299 3299
 	 * @param string $line	line no where error occurred
3300 3300
 	 * @return boolean
3301 3301
 	 */
3302
-	protected function _update_espresso_configuration( $tab, $config, $file = '', $func = '', $line = '' ) {
3302
+	protected function _update_espresso_configuration($tab, $config, $file = '', $func = '', $line = '') {
3303 3303
 
3304 3304
 		//remove any options that are NOT going to be saved with the config settings.
3305
-		if ( isset( $config->core->ee_ueip_optin ) ) {
3305
+		if (isset($config->core->ee_ueip_optin)) {
3306 3306
 			$config->core->ee_ueip_has_notified = TRUE;
3307 3307
 			// TODO: remove the following two lines and make sure values are migrated from 3.1
3308
-			update_option( 'ee_ueip_optin', $config->core->ee_ueip_optin);
3309
-			update_option( 'ee_ueip_has_notified', TRUE );
3308
+			update_option('ee_ueip_optin', $config->core->ee_ueip_optin);
3309
+			update_option('ee_ueip_has_notified', TRUE);
3310 3310
 		}
3311 3311
 		// and save it (note we're also doing the network save here)
3312
-		$net_saved = is_main_site() ? EE_Network_Config::instance()->update_config( FALSE, FALSE ) : TRUE;
3313
-		$config_saved = EE_Config::instance()->update_espresso_config( FALSE, FALSE );
3314
-		if ( $config_saved && $net_saved ) {
3315
-			EE_Error::add_success( sprintf( __('"%s" have been successfully updated.', 'event_espresso'), $tab ));
3312
+		$net_saved = is_main_site() ? EE_Network_Config::instance()->update_config(FALSE, FALSE) : TRUE;
3313
+		$config_saved = EE_Config::instance()->update_espresso_config(FALSE, FALSE);
3314
+		if ($config_saved && $net_saved) {
3315
+			EE_Error::add_success(sprintf(__('"%s" have been successfully updated.', 'event_espresso'), $tab));
3316 3316
 			return TRUE;
3317 3317
 		} else {
3318
-			EE_Error::add_error( sprintf( __('The "%s" were not updated.', 'event_espresso'), $tab ), $file, $func, $line  );
3318
+			EE_Error::add_error(sprintf(__('The "%s" were not updated.', 'event_espresso'), $tab), $file, $func, $line);
3319 3319
 			return FALSE;
3320 3320
 		}
3321 3321
 	}
@@ -3328,7 +3328,7 @@  discard block
 block discarded – undo
3328 3328
 	 * Returns an array to be used for EE_FOrm_Fields.helper.php's select_input as the $values argument.
3329 3329
 	 * @return array
3330 3330
 	 */
3331
-	public function get_yes_no_values(){
3331
+	public function get_yes_no_values() {
3332 3332
 		return $this->_yes_no_values;
3333 3333
 	}
3334 3334
 
@@ -3355,8 +3355,8 @@  discard block
 block discarded – undo
3355 3355
 	 * @return bool success/fail
3356 3356
 	 */
3357 3357
 	protected function _process_resend_registration() {
3358
-		$this->_template_args['success'] = EED_Messages::process_resend( $this->_req_data );
3359
-		do_action( 'AHEE__EE_Admin_Page___process_resend_registration', $this->_template_args['success'], $this->_req_data );
3358
+		$this->_template_args['success'] = EED_Messages::process_resend($this->_req_data);
3359
+		do_action('AHEE__EE_Admin_Page___process_resend_registration', $this->_template_args['success'], $this->_req_data);
3360 3360
 		return $this->_template_args['success'];
3361 3361
 	}
3362 3362
 
@@ -3369,8 +3369,8 @@  discard block
 block discarded – undo
3369 3369
 	 * @param \EE_Payment $payment
3370 3370
 	 * @return bool success/fail
3371 3371
 	 */
3372
-	protected function _process_payment_notification( EE_Payment $payment ) {
3373
-		$success = apply_filters( 'FHEE__EE_Admin_Page___process_admin_payment_notification__success', FALSE, $payment );
3372
+	protected function _process_payment_notification(EE_Payment $payment) {
3373
+		$success = apply_filters('FHEE__EE_Admin_Page___process_admin_payment_notification__success', FALSE, $payment);
3374 3374
 		$this->_template_args['success'] = $success;
3375 3375
 		return $success;
3376 3376
 	}
Please login to merge, or discard this patch.