Completed
Branch BUG-9352-no-txn-payments (fdcfe7)
by
unknown
63:58 queued 50:02
created
core/libraries/messages/data_class/EE_Messages_incoming_data.core.php 2 patches
Spacing   +24 added lines, -24 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
 /**
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
 	 * @param mixed $data incoming data object|array.  Suggested that child classes use type hinting for expected
287 287
 	 * data object.  But here parent will be generic because we don't know what's coming in.
288 288
 	 */
289
-	public function __construct( $data ) {
289
+	public function __construct($data) {
290 290
 		$this->_data = $data;
291 291
 		$this->_setup_data();
292 292
 
@@ -323,19 +323,19 @@  discard block
 block discarded – undo
323 323
 		$regchk = array_shift($regchk);
324 324
 		$line_items = array();
325 325
 		//verify that reg_objs is set
326
-		if ( !is_array( $this->reg_objs) && ! reset( $this->reg_objs ) instanceof EE_Registration )
327
-			throw new EE_Error( __('In order to assemble the data correctly, the "reg_objs" property must be an array of EE_Registration objects', 'event_espresso') );
326
+		if ( ! is_array($this->reg_objs) && ! reset($this->reg_objs) instanceof EE_Registration)
327
+			throw new EE_Error(__('In order to assemble the data correctly, the "reg_objs" property must be an array of EE_Registration objects', 'event_espresso'));
328 328
 
329 329
 		//get all attendee and events associated with the registrations in this transaction
330 330
 		$events = $event_setup = $evtcache = $tickets = $datetimes = array();
331 331
 		$answers = $questions = $attendees = $line_items = $registrations = array();
332 332
 		$total_ticket_count = 0;
333 333
 
334
-		if ( !empty( $this->reg_objs ) ) {
334
+		if ( ! empty($this->reg_objs)) {
335 335
 			$event_attendee_count = array();
336
-			foreach ( $this->reg_objs as $reg ) {
336
+			foreach ($this->reg_objs as $reg) {
337 337
 				//account for filtered registrations by status.
338
-				if ( ! empty( $this->filtered_reg_status ) && $this->filtered_reg_status !== $reg->status_ID() ) {
338
+				if ( ! empty($this->filtered_reg_status) && $this->filtered_reg_status !== $reg->status_ID()) {
339 339
 					continue;
340 340
 				}
341 341
 
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
 				$relateddatetime = $ticket->datetimes();
346 346
 				$total_ticket_count++;
347 347
 				$tickets[$ticket->ID()]['ticket'] = $ticket;
348
-				$tickets[$ticket->ID()]['count'] = is_array($tickets[$ticket->ID()]) && isset( $tickets[$ticket->ID()]['count'] ) ? $tickets[$ticket->ID()]['count'] + 1 : 1;
348
+				$tickets[$ticket->ID()]['count'] = is_array($tickets[$ticket->ID()]) && isset($tickets[$ticket->ID()]['count']) ? $tickets[$ticket->ID()]['count'] + 1 : 1;
349 349
 				$tickets[$ticket->ID()]['att_objs'][$reg->attendee_ID()] = $reg->attendee();
350 350
 				$tickets[$ticket->ID()]['dtt_objs'] = $relateddatetime;
351 351
 				$tickets[$ticket->ID()]['reg_objs'][$reg->ID()] = $reg;
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
 				$eventsetup[$evt_id]['reg_objs'][$reg->ID()] = $reg;
356 356
 				$eventsetup[$evt_id]['tkt_objs'][$ticket->ID()] = $ticket;
357 357
 				$eventsetup[$evt_id]['att_objs'][$reg->attendee_ID()] = $reg->attendee();
358
-				$event_attendee_count[$evt_id] = isset( $event_attendee_count[$evt_id] ) ? $event_attendee_count[$evt_id] + 1 : 0;
358
+				$event_attendee_count[$evt_id] = isset($event_attendee_count[$evt_id]) ? $event_attendee_count[$evt_id] + 1 : 0;
359 359
 				$attendees[$reg->attendee_ID()]['line_ref'][] = $evt_id;
360 360
 				$attendees[$reg->attendee_ID()]['att_obj'] = $reg->attendee();
361 361
 				$attendees[$reg->attendee_ID()]['reg_objs'][$reg->ID()] = $reg;
@@ -372,19 +372,19 @@  discard block
 block discarded – undo
372 372
 
373 373
 				//set up answer objects
374 374
 				$rel_ans = $reg->get_many_related('Answer');
375
-				foreach ( $rel_ans as $ansid => $answer ) {
376
-					if ( !isset( $questions[$ansid] ) ) {
375
+				foreach ($rel_ans as $ansid => $answer) {
376
+					if ( ! isset($questions[$ansid])) {
377 377
 						$questions[$ansid] = $answer->get_first_related('Question');
378 378
 					}
379 379
 					$answers[$ansid] = $answer;
380 380
 					$registrations[$reg->ID()]['ans_objs'][$ansid] = $answer;
381 381
 				}
382 382
 
383
-				foreach ( $relateddatetime as $dtt_id => $datetime ) {
383
+				foreach ($relateddatetime as $dtt_id => $datetime) {
384 384
 					$eventsetup[$evt_id]['dtt_objs'][$dtt_id] = $datetime;
385 385
 					$registrations[$reg->ID()]['dtt_objs'][$dtt_id] = $datetime;
386 386
 
387
-					if ( isset( $datetimes[$dtt_id] ) )
387
+					if (isset($datetimes[$dtt_id]))
388 388
 						continue; //already have this info in the datetimes array.
389 389
 
390 390
 					$datetimes[$dtt_id]['tkt_objs'][] = $ticket;
@@ -396,9 +396,9 @@  discard block
 block discarded – undo
396 396
 
397 397
 			//let's loop through the unique event=>reg items and setup data on them
398 398
 
399
-			if ( !empty( $eventsetup) ) {
400
-				foreach ( $eventsetup as $evt_id => $items ) {
401
-					$ticket_line_items_for_event = EEM_Line_Item::instance()->get_all(array(array('Ticket.Datetime.EVT_ID'=>$evt_id,'TXN_ID'=>$this->txn->ID()), 'default_where_conditions' => 'none'));
399
+			if ( ! empty($eventsetup)) {
400
+				foreach ($eventsetup as $evt_id => $items) {
401
+					$ticket_line_items_for_event = EEM_Line_Item::instance()->get_all(array(array('Ticket.Datetime.EVT_ID'=>$evt_id, 'TXN_ID'=>$this->txn->ID()), 'default_where_conditions' => 'none'));
402 402
 					$events[$evt_id] = array(
403 403
 						'ID' => $evt_id,
404 404
 						'event' => $evtcache[$evt_id],
@@ -407,13 +407,13 @@  discard block
 block discarded – undo
407 407
 						'reg_objs' => $items['reg_objs'],
408 408
 						'tkt_objs' => $items['tkt_objs'],
409 409
 						'att_objs' => $items['att_objs'],
410
-						'dtt_objs' => isset( $items['dtt_objs'] ) ? $items['dtt_objs'] : array(),
410
+						'dtt_objs' => isset($items['dtt_objs']) ? $items['dtt_objs'] : array(),
411 411
 						'line_items' => $ticket_line_items_for_event
412 412
 					);
413 413
 
414 414
 					//make sure the tickets have the line items setup for them.
415
-					foreach ( $ticket_line_items_for_event as $line_id => $line_item ) {
416
-						if ( $line_item instanceof EE_Line_Item ) {
415
+					foreach ($ticket_line_items_for_event as $line_id => $line_item) {
416
+						if ($line_item instanceof EE_Line_Item) {
417 417
 							$tickets[$line_item->ticket()->ID()]['line_item'] = $line_item;
418 418
 							$tickets[$line_item->ticket()->ID()]['sub_line_items'] = $line_item->children();
419 419
 							$line_items[$line_item->ID()]['children'] = $line_item->children();
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
437 437
 		$this->total_ticket_count = $total_ticket_count;
438 438
 		$this->registrations = $registrations;
439 439
 
440
-		$this->tax_line_items =  $this->txn->tax_items();
440
+		$this->tax_line_items = $this->txn->tax_items();
441 441
 		$this->additional_line_items = $this->txn->non_ticket_line_items();
442 442
 		$this->payments = $this->txn->payments();
443 443
 
@@ -447,10 +447,10 @@  discard block
 block discarded – undo
447 447
 		//let's get just the primary_attendee_data!  First we get the primary registration object.
448 448
 		$primary_reg = $this->txn->primary_registration(TRUE);
449 449
 		// verify
450
-		if( $primary_reg instanceof EE_Registration ) {
450
+		if ($primary_reg instanceof EE_Registration) {
451 451
 
452 452
 			// get attendee object
453
-			if( $primary_reg->attendee() instanceof EE_Attendee ) {
453
+			if ($primary_reg->attendee() instanceof EE_Attendee) {
454 454
 
455 455
 				//now we can setup the primary_attendee_data array
456 456
 				$this->primary_attendee_data = array(
@@ -462,11 +462,11 @@  discard block
 block discarded – undo
462 462
 				);
463 463
 
464 464
 			} else {
465
-				EE_Error::add_error( __('Incoming data does not have a valid Attendee object for the primary registrant.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
465
+				EE_Error::add_error(__('Incoming data does not have a valid Attendee object for the primary registrant.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
466 466
 			}
467 467
 
468 468
 		} else {
469
-			EE_Error::add_error( __('Incoming data does not have a valid Registration object for the primary registrant.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
469
+			EE_Error::add_error(__('Incoming data does not have a valid Registration object for the primary registrant.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
470 470
 		}
471 471
 	}
472 472
 
Please login to merge, or discard this patch.
Braces   +9 added lines, -5 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
@@ -323,8 +324,9 @@  discard block
 block discarded – undo
323 324
 		$regchk = array_shift($regchk);
324 325
 		$line_items = array();
325 326
 		//verify that reg_objs is set
326
-		if ( !is_array( $this->reg_objs) && ! reset( $this->reg_objs ) instanceof EE_Registration )
327
-			throw new EE_Error( __('In order to assemble the data correctly, the "reg_objs" property must be an array of EE_Registration objects', 'event_espresso') );
327
+		if ( !is_array( $this->reg_objs) && ! reset( $this->reg_objs ) instanceof EE_Registration ) {
328
+					throw new EE_Error( __('In order to assemble the data correctly, the "reg_objs" property must be an array of EE_Registration objects', 'event_espresso') );
329
+		}
328 330
 
329 331
 		//get all attendee and events associated with the registrations in this transaction
330 332
 		$events = $event_setup = $evtcache = $tickets = $datetimes = array();
@@ -384,8 +386,10 @@  discard block
 block discarded – undo
384 386
 					$eventsetup[$evt_id]['dtt_objs'][$dtt_id] = $datetime;
385 387
 					$registrations[$reg->ID()]['dtt_objs'][$dtt_id] = $datetime;
386 388
 
387
-					if ( isset( $datetimes[$dtt_id] ) )
388
-						continue; //already have this info in the datetimes array.
389
+					if ( isset( $datetimes[$dtt_id] ) ) {
390
+											continue;
391
+					}
392
+					//already have this info in the datetimes array.
389 393
 
390 394
 					$datetimes[$dtt_id]['tkt_objs'][] = $ticket;
391 395
 					$datetimes[$dtt_id]['datetime'] = $datetime;
Please login to merge, or discard this patch.
core/libraries/messages/defaults/EE_Message_Template_Defaults.core.php 2 patches
Spacing   +35 added lines, -35 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
 /**
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 	 * @access public
124 124
 	 * @return void
125 125
 	 */
126
-	public function __construct( EE_Messages $messages, $messenger_name, $message_type_name, $GRP_ID = 0 ) {
126
+	public function __construct(EE_Messages $messages, $messenger_name, $message_type_name, $GRP_ID = 0) {
127 127
 		$this->_EE_MSG = $messages;
128 128
 
129 129
 		//set the model object
@@ -135,10 +135,10 @@  discard block
 block discarded – undo
135 135
 		$this->_mt_name = $message_type_name;
136 136
 
137 137
 		//make sure required props have been set
138
-		if ( empty( $this->_m_name) || empty( $this->_mt_name ) ) {
138
+		if (empty($this->_m_name) || empty($this->_mt_name)) {
139 139
 			$msg[] = __('Message Templates cannot be generated because the Messenger and Message Types haven\'t been defined for the generator.', 'event_espresso');
140 140
 			$msg[] = __('You need to set the "$m_name" and "$mt_name" properties', 'event_espresso');
141
-			throw new EE_Error( implode( '||', $msg ) );
141
+			throw new EE_Error(implode('||', $msg));
142 142
 		}
143 143
 
144 144
 		$this->_init();
@@ -154,20 +154,20 @@  discard block
 block discarded – undo
154 154
 	 * @param string $template_pack This corresponds to a template pack class reference which will contain information about where to obtain the templates.
155 155
 	 * @return void
156 156
 	 */
157
-	final private function _set_templates( $template_pack ) {
157
+	final private function _set_templates($template_pack) {
158 158
 
159 159
 		//get the corresponding template pack object (if present.  If not then we just load the default and add a notice).  The class name should be something like 'EE_Messages_Template_Pack_Default' where "default' would be the incoming template pack reference.
160
-		$class_name = 'EE_Messages_Template_Pack_' . str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $template_pack ) ) );
160
+		$class_name = 'EE_Messages_Template_Pack_'.str_replace(' ', '_', ucwords(str_replace('_', ' ', $template_pack)));
161 161
 
162
-		if ( ! class_exists( $class_name ) ) {
163
-			EE_Error::add_error( sprintf( __('The template pack represented by a class corresponding to "%s" does not exist.  Likely the autoloader for this class has the wrong path or the incoming reference is mispelled.  The default template pack  been used to generate the templates instead.', 'event_espresso'), $class_name ), __FILE__, __FUNCTION__, __LINE__ );
162
+		if ( ! class_exists($class_name)) {
163
+			EE_Error::add_error(sprintf(__('The template pack represented by a class corresponding to "%s" does not exist.  Likely the autoloader for this class has the wrong path or the incoming reference is mispelled.  The default template pack  been used to generate the templates instead.', 'event_espresso'), $class_name), __FILE__, __FUNCTION__, __LINE__);
164 164
 			$class_name = 'EE_Messages_Template_Pack_Default';
165 165
 		}
166 166
 
167 167
 		$template_pack = new $class_name;
168 168
 
169 169
 		//get all the templates from the template pack.
170
-		$this->_templates = $template_pack->get_templates( $this->_messenger, $this->_message_type );
170
+		$this->_templates = $template_pack->get_templates($this->_messenger, $this->_message_type);
171 171
 	}
172 172
 
173 173
 
@@ -185,29 +185,29 @@  discard block
 block discarded – undo
185 185
 		$active_message_types = $this->_EE_MSG->get_installed_message_types();
186 186
 
187 187
 		//check if messenger is active
188
-		if ( !isset($active_messengers[$this->_m_name] ) ) {
188
+		if ( ! isset($active_messengers[$this->_m_name])) {
189 189
 			$msg[] = __('Message Templates cannot be generated because the given messenger is not active', 'event_espresso');
190
-			$msg[] = sprintf( __('The "$_m_name" property has "%s" as its value.  Check the spelling and make sure it matches an available messenger', 'event_espresso'), $this->_m_name );
191
-			throw new EE_Error( implode( '||', $msg ) );
190
+			$msg[] = sprintf(__('The "$_m_name" property has "%s" as its value.  Check the spelling and make sure it matches an available messenger', 'event_espresso'), $this->_m_name);
191
+			throw new EE_Error(implode('||', $msg));
192 192
 		}
193 193
 
194 194
 		//check if message type is installed
195
-		if ( !isset($active_messengers[$this->_m_name] ) ) {
195
+		if ( ! isset($active_messengers[$this->_m_name])) {
196 196
 			$msg[] = __('Message Templates cannot be generated because the given message type is not installed', 'event_espresso');
197
-			$msg[] = sprintf( __('The "$_mt_name" property has "%s" as its value.  Check the spelling and make sure it matches an available message type', 'event_espresso'), $this->_mt_name );
198
-			throw new EE_Error( implode( '||', $msg ) );
197
+			$msg[] = sprintf(__('The "$_mt_name" property has "%s" as its value.  Check the spelling and make sure it matches an available message type', 'event_espresso'), $this->_mt_name);
198
+			throw new EE_Error(implode('||', $msg));
199 199
 		}
200 200
 
201 201
 		$this->_messenger = $active_messengers[$this->_m_name];
202 202
 		$this->_message_type = $active_message_types[$this->_mt_name];
203 203
 
204 204
 		//verify we have the messenger and message type objects
205
-		if ( ! $this->_messenger instanceof EE_messenger ) {
206
-			throw new EE_Error( sprintf( __('The _messenger property must be an instance of EE_messenger by this point.  It isn\'t. Something has gone wrong. Here is the value it holds:<br /> %s', 'event_espresso' ), print_r( $this->_messenger, TRUE ) ) );
205
+		if ( ! $this->_messenger instanceof EE_messenger) {
206
+			throw new EE_Error(sprintf(__('The _messenger property must be an instance of EE_messenger by this point.  It isn\'t. Something has gone wrong. Here is the value it holds:<br /> %s', 'event_espresso'), print_r($this->_messenger, TRUE)));
207 207
 		}
208 208
 
209
-		if ( ! $this->_message_type instanceof EE_message_type ) {
210
-			throw new EE_Error( sprintf( __('The _message_type property must be an instance of EE_message_type by this point.  It isn\'t. Something has gone wrong. Here is the value it holds:<br /> %s', 'event_espresso' ), print_r( $this->_message_type, TRUE ) ) );
209
+		if ( ! $this->_message_type instanceof EE_message_type) {
210
+			throw new EE_Error(sprintf(__('The _message_type property must be an instance of EE_message_type by this point.  It isn\'t. Something has gone wrong. Here is the value it holds:<br /> %s', 'event_espresso'), print_r($this->_message_type, TRUE)));
211 211
 		}
212 212
 
213 213
 
@@ -235,13 +235,13 @@  discard block
 block discarded – undo
235 235
 	public function create_new_templates() {
236 236
 		$template_pack = 'default';
237 237
 		//if we have the GRP_ID then let's use that to see if there is a set template pack and use that for the new templates.
238
-		if ( !empty( $this->_GRP_ID ) ) {
239
-			$mtpg = EEM_Message_Template_Group::instance()->get_one_by_ID( $this->_GRP_ID );
238
+		if ( ! empty($this->_GRP_ID)) {
239
+			$mtpg = EEM_Message_Template_Group::instance()->get_one_by_ID($this->_GRP_ID);
240 240
 			$template_pack = $mtpg instanceof EE_Message_Template_Group ? $mtpg->get_template_pack_name() : 'default';
241 241
 			//we also need to reset the template variation to default
242
-			$mtpg->set_template_pack_variation( 'default' );
242
+			$mtpg->set_template_pack_variation('default');
243 243
 		}
244
-		return $this->_create_new_templates( $template_pack );
244
+		return $this->_create_new_templates($template_pack);
245 245
 	}
246 246
 
247 247
 
@@ -254,15 +254,15 @@  discard block
 block discarded – undo
254 254
 	 * @param string $template_pack This corresponds to a template pack class reference which will contain information about where to obtain the templates.
255 255
 	 * @return mixed (array|bool)            success array or false.
256 256
 	 */
257
-	private function _create_new_templates( $template_pack ) {
257
+	private function _create_new_templates($template_pack) {
258 258
 
259
-		$this->_set_templates( $template_pack );
259
+		$this->_set_templates($template_pack);
260 260
 
261 261
 		//necessary properties are set, let's save the default templates
262 262
 
263
-		if ( empty( $this->_GRP_ID ) ) {
263
+		if (empty($this->_GRP_ID)) {
264 264
 
265
-			$main_template_data =  array(
265
+			$main_template_data = array(
266 266
 				'MTP_messenger' => $this->_messenger->name,
267 267
 				'MTP_message_type' => $this->_message_type->name,
268 268
 				'MTP_is_override' => 0,
@@ -274,24 +274,24 @@  discard block
 block discarded – undo
274 274
 
275 275
 
276 276
 			//let's insert the above and get our GRP_ID, then reset the template data array to just include the GRP_ID
277
-			$grp_id = $this->_EEM_data->insert( $main_template_data );
277
+			$grp_id = $this->_EEM_data->insert($main_template_data);
278 278
 
279
-			if ( empty( $grp_id ) ) return $grp_id;
279
+			if (empty($grp_id)) return $grp_id;
280 280
 			$this->_GRP_ID = $grp_id;
281 281
 		}
282 282
 
283
-		$template_data = array( 'GRP_ID' => $this->_GRP_ID );
283
+		$template_data = array('GRP_ID' => $this->_GRP_ID);
284 284
 
285
-		foreach ( $this->_contexts as $context => $details ) {
286
-			foreach ( $this->_fields as $field => $field_type ) {
287
-				if ( $field != 'extra' ) {
285
+		foreach ($this->_contexts as $context => $details) {
286
+			foreach ($this->_fields as $field => $field_type) {
287
+				if ($field != 'extra') {
288 288
 					$template_data['MTP_context'] = $context;
289 289
 					$template_data['MTP_template_field'] = $field;
290 290
 					$template_data['MTP_content'] = $this->_templates[$context][$field];
291 291
 
292 292
 					$MTP = EEM_Message_Template::instance()->insert($template_data);
293
-					if ( !$MTP ) {
294
-						EE_Error::add_error( sprintf(__('There was an error in saving new template data for %s messenger, %s message type, %s context and %s template field.', 'event_espresso'), $this->_messenger->name, $this->_message_type->name, $context, $field), __FILE__, __FUNCTION__, __LINE__  );
293
+					if ( ! $MTP) {
294
+						EE_Error::add_error(sprintf(__('There was an error in saving new template data for %s messenger, %s message type, %s context and %s template field.', 'event_espresso'), $this->_messenger->name, $this->_message_type->name, $context, $field), __FILE__, __FUNCTION__, __LINE__);
295 295
 						return false;
296 296
 					}
297 297
 				}
Please login to merge, or discard this patch.
Braces   +5 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
@@ -276,7 +277,9 @@  discard block
 block discarded – undo
276 277
 			//let's insert the above and get our GRP_ID, then reset the template data array to just include the GRP_ID
277 278
 			$grp_id = $this->_EEM_data->insert( $main_template_data );
278 279
 
279
-			if ( empty( $grp_id ) ) return $grp_id;
280
+			if ( empty( $grp_id ) ) {
281
+				return $grp_id;
282
+			}
280 283
 			$this->_GRP_ID = $grp_id;
281 284
 		}
282 285
 
Please login to merge, or discard this patch.
libraries/messages/defaults/EE_Messages_Template_Pack_Default.class.php 2 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -21,8 +21,8 @@  discard block
 block discarded – undo
21 21
 		$this->label = __('Default', 'event_espresso');
22 22
 		$this->dbref = 'default';
23 23
 		$this->description = __('This is the default template pack included with Event Espress core messages system.', 'event_espresso');
24
-		$this->_base_url = EE_PLUGIN_DIR_URL . 'core/libraries/messages/defaults/default/';
25
-		$this->_base_path = EE_LIBRARIES . 'messages/defaults/default/';
24
+		$this->_base_url = EE_PLUGIN_DIR_URL.'core/libraries/messages/defaults/default/';
25
+		$this->_base_path = EE_LIBRARIES.'messages/defaults/default/';
26 26
 		$this->_supports = array(
27 27
 			'email' => array(
28 28
 				'cancelled_registration', 'declined_registration', 'not_approved_registration', 'pending_approval', 'registration',
@@ -33,9 +33,9 @@  discard block
 block discarded – undo
33 33
 				'receipt', 'invoice'
34 34
 				)
35 35
 			);
36
-		$this->_default_variation_labels= array(
37
-			'email' => __('Default', 'event_espresso' ),
38
-			'html' =>  __('Simple', 'event_espresso' )
36
+		$this->_default_variation_labels = array(
37
+			'email' => __('Default', 'event_espresso'),
38
+			'html' =>  __('Simple', 'event_espresso')
39 39
 			 );
40 40
 		$this->_variations = array(
41 41
 			'html' => array(
@@ -63,18 +63,18 @@  discard block
 block discarded – undo
63 63
 
64 64
 
65 65
 
66
-	public function get_default_variation( $messenger, $message_type, $type, $url, $file_extension ) {
66
+	public function get_default_variation($messenger, $message_type, $type, $url, $file_extension) {
67 67
 		$base = $url ? $this->_base_url : $this->_base_path;
68 68
 		$base_path = $this->_base_path;
69 69
 		//possible variation paths considering whether message type is present or not in the file name.
70
-		$path_string = 'variations/' . $messenger . '_' . $message_type . '_'  . $type . '_default' . $file_extension;
71
-		$default_path_string = 'variations/' . $messenger . '_' . $type . '_default' . $file_extension;
70
+		$path_string = 'variations/'.$messenger.'_'.$message_type.'_'.$type.'_default'.$file_extension;
71
+		$default_path_string = 'variations/'.$messenger.'_'.$type.'_default'.$file_extension;
72 72
 		//first see if fully validated file exists.
73
-		if ( is_readable( $base_path . $path_string ) ) {
74
-			$variation_path = $base . $path_string;
73
+		if (is_readable($base_path.$path_string)) {
74
+			$variation_path = $base.$path_string;
75 75
 		//otherwise see if default exists.
76
-		} elseif ( is_readable( $base_path . $default_path_string ) ) {
77
-			$variation_path = $base . $default_path_string;
76
+		} elseif (is_readable($base_path.$default_path_string)) {
77
+			$variation_path = $base.$default_path_string;
78 78
 		} else {
79 79
 			//no matches found so nothing is present.
80 80
 			$variation_path = '';
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,9 @@
 block discarded – undo
5 5
  * @subpackage plugin api, messages
6 6
  * @since           4.5.0
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
  * Use this to register or deregister a new message template pack variation for the EE messages system.
Please login to merge, or discard this patch.
messages/defaults/default/email_cancelled_registration_content.template.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
 						<tbody>
32 32
 							<tr>
33 33
 								<td>
34
-									<h2><?php printf( __( 'Hello, %s', 'event_espresso' ), '[RECIPIENT_FNAME]' ); ?>:</h2>
34
+									<h2><?php printf(__('Hello, %s', 'event_espresso'), '[RECIPIENT_FNAME]'); ?>:</h2>
35 35
 
36
-									<p class="lead"><?php _e( 'Your registration was cancelled for the following tickets:', 'event_espresso' ); ?></p>
36
+									<p class="lead"><?php _e('Your registration was cancelled for the following tickets:', 'event_espresso'); ?></p>
37 37
 								</td>
38 38
 							</tr>
39 39
 						</tbody>
@@ -62,10 +62,10 @@  discard block
 block discarded – undo
62 62
 									<tbody>
63 63
 										<tr>
64 64
 											<td>
65
-												<h5><?php _e( 'Connect with Us:', 'event_espresso' ); ?></h5>
66
-												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e( 'Facebook', 'event_espresso' ); ?></a>
67
-												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e( 'Twitter', 'event_espresso' ); ?></a>
68
-												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e( 'Google+', 'event_espresso' ); ?></a>
65
+												<h5><?php _e('Connect with Us:', 'event_espresso'); ?></h5>
66
+												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e('Facebook', 'event_espresso'); ?></a>
67
+												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e('Twitter', 'event_espresso'); ?></a>
68
+												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e('Google+', 'event_espresso'); ?></a>
69 69
 											</td>
70 70
 										</tr>
71 71
 									</tbody>
@@ -75,9 +75,9 @@  discard block
 block discarded – undo
75 75
 									<tbody>
76 76
 										<tr>
77 77
 											<td>
78
-												<h5><?php _e( 'Contact Info:', 'event_espresso' ); ?></h5>
79
-												<?php _e( 'Phone:', 'event_espresso' ); ?> <strong>[CO_PHONE]</strong>
80
-												<?php _e( 'Email:', 'event_espresso' ); ?>
78
+												<h5><?php _e('Contact Info:', 'event_espresso'); ?></h5>
79
+												<?php _e('Phone:', 'event_espresso'); ?> <strong>[CO_PHONE]</strong>
80
+												<?php _e('Email:', 'event_espresso'); ?>
81 81
 												<strong><a href="mailto:[CO_EMAIL]" target="_blank">[CO_EMAIL]</a></strong>
82 82
 											</td>
83 83
 										</tr>
Please login to merge, or discard this patch.
defaults/default/email_cancelled_registration_content_admin.template.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
 						<tbody>
32 32
 							<tr>
33 33
 								<td>
34
-									<h2><?php printf( __( 'Hello, %s:', 'event_espresso' ), '[EVENT_AUTHOR_FNAME]' ); ?></h2>
34
+									<h2><?php printf(__('Hello, %s:', 'event_espresso'), '[EVENT_AUTHOR_FNAME]'); ?></h2>
35 35
 
36
-									<p class="lead"><?php _e( 'Registrations were cancelled for the following events.', 'event_espresso' ); ?></p>
36
+									<p class="lead"><?php _e('Registrations were cancelled for the following events.', 'event_espresso'); ?></p>
37 37
 								</td>
38 38
 							</tr>
39 39
 						</tbody>
@@ -59,10 +59,10 @@  discard block
 block discarded – undo
59 59
 									<tbody>
60 60
 										<tr>
61 61
 											<td>
62
-												<h5><?php _e( 'Connect with Us:', 'event_espresso' ); ?></h5>
63
-												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e( 'Facebook', 'event_espresso' ); ?></a>
64
-												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e( 'Twitter', 'event_espresso' ); ?></a>
65
-												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e( 'Google+', 'event_espresso' ); ?></a>
62
+												<h5><?php _e('Connect with Us:', 'event_espresso'); ?></h5>
63
+												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e('Facebook', 'event_espresso'); ?></a>
64
+												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e('Twitter', 'event_espresso'); ?></a>
65
+												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e('Google+', 'event_espresso'); ?></a>
66 66
 											</td>
67 67
 										</tr>
68 68
 									</tbody>
@@ -72,9 +72,9 @@  discard block
 block discarded – undo
72 72
 									<tbody>
73 73
 										<tr>
74 74
 											<td>
75
-												<h5><?php _e( 'Contact Info:', 'event_espresso' ); ?></h5>
76
-												<?php _e( 'Phone:', 'event_espresso' ); ?> <strong>[CO_PHONE]</strong>
77
-												<?php _e( 'Email:', 'event_espresso' ); ?>
75
+												<h5><?php _e('Contact Info:', 'event_espresso'); ?></h5>
76
+												<?php _e('Phone:', 'event_espresso'); ?> <strong>[CO_PHONE]</strong>
77
+												<?php _e('Email:', 'event_espresso'); ?>
78 78
 												<strong><a href="mailto:[CO_EMAIL]" target="_blank">[CO_EMAIL]</a></strong>
79 79
 											</td>
80 80
 										</tr>
Please login to merge, or discard this patch.
messages/defaults/default/email_declined_registration_content.template.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
 						<tbody>
32 32
 							<tr>
33 33
 								<td>
34
-									<h2><?php printf( __( 'Hello, %s:', 'event_espresso' ), '[RECIPIENT_FNAME]' ); ?></h2>
35
-									<p class="lead"><?php _e( 'Your registration was declined for the following tickets:', 'event_espresso' ); ?></p>
34
+									<h2><?php printf(__('Hello, %s:', 'event_espresso'), '[RECIPIENT_FNAME]'); ?></h2>
35
+									<p class="lead"><?php _e('Your registration was declined for the following tickets:', 'event_espresso'); ?></p>
36 36
 								</td>
37 37
 							</tr>
38 38
 						</tbody>
@@ -61,10 +61,10 @@  discard block
 block discarded – undo
61 61
 									<tbody>
62 62
 										<tr>
63 63
 											<td>
64
-												<h5><?php _e( 'Connect with Us:', 'event_espresso' ); ?></h5>
65
-												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e( 'Facebook', 'event_espresso' ); ?></a>
66
-												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e( 'Twitter', 'event_espresso' ); ?></a>
67
-												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e( 'Google+', 'event_espresso' ); ?></a>
64
+												<h5><?php _e('Connect with Us:', 'event_espresso'); ?></h5>
65
+												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e('Facebook', 'event_espresso'); ?></a>
66
+												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e('Twitter', 'event_espresso'); ?></a>
67
+												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e('Google+', 'event_espresso'); ?></a>
68 68
 											</td>
69 69
 										</tr>
70 70
 									</tbody>
@@ -74,9 +74,9 @@  discard block
 block discarded – undo
74 74
 									<tbody>
75 75
 										<tr>
76 76
 											<td>
77
-												<h5><?php _e( 'Contact Info:', 'event_espresso' ); ?></h5>
78
-												<?php _e( 'Phone:', 'event_espresso' ); ?> <strong>[CO_PHONE]</strong>
79
-												<?php _e( 'Email:', 'event_espresso' ); ?>
77
+												<h5><?php _e('Contact Info:', 'event_espresso'); ?></h5>
78
+												<?php _e('Phone:', 'event_espresso'); ?> <strong>[CO_PHONE]</strong>
79
+												<?php _e('Email:', 'event_espresso'); ?>
80 80
 												<strong><a href="mailto:[CO_EMAIL]" target="_blank">[CO_EMAIL]</a></strong>
81 81
 											</td>
82 82
 										</tr>
Please login to merge, or discard this patch.
defaults/default/email_declined_registration_content_admin.template.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
 						<tbody>
32 32
 							<tr>
33 33
 								<td>
34
-									<h2><?php printf( __( 'Hello, %s:', 'event_espresso' ), '[EVENT_AUTHOR_FNAME]' ); ?></h2>
35
-									<p class="lead"><?php _e( 'Registrations were declined for the following events:', 'event_espresso' ); ?></p>
34
+									<h2><?php printf(__('Hello, %s:', 'event_espresso'), '[EVENT_AUTHOR_FNAME]'); ?></h2>
35
+									<p class="lead"><?php _e('Registrations were declined for the following events:', 'event_espresso'); ?></p>
36 36
 								</td>
37 37
 							</tr>
38 38
 						</tbody>
@@ -58,10 +58,10 @@  discard block
 block discarded – undo
58 58
 									<tbody>
59 59
 										<tr>
60 60
 											<td>
61
-												<h5><?php _e( 'Connect with Us:', 'event_espresso' ); ?></h5>
62
-												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e( 'Facebook', 'event_espresso' ); ?></a>
63
-												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e( 'Twitter', 'event_espresso' ); ?></a>
64
-												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e( 'Google+', 'event_espresso' ); ?></a>
61
+												<h5><?php _e('Connect with Us:', 'event_espresso'); ?></h5>
62
+												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e('Facebook', 'event_espresso'); ?></a>
63
+												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e('Twitter', 'event_espresso'); ?></a>
64
+												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e('Google+', 'event_espresso'); ?></a>
65 65
 											</td>
66 66
 										</tr>
67 67
 									</tbody>
@@ -71,9 +71,9 @@  discard block
 block discarded – undo
71 71
 									<tbody>
72 72
 										<tr>
73 73
 											<td>
74
-												<h5><?php _e( 'Contact Info:', 'event_espresso' ); ?></h5>
75
-												<?php _e( 'Phone:', 'event_espresso' ); ?> <strong>[CO_PHONE]</strong>
76
-												<?php _e( 'Email:', 'event_espresso' ); ?>
74
+												<h5><?php _e('Contact Info:', 'event_espresso'); ?></h5>
75
+												<?php _e('Phone:', 'event_espresso'); ?> <strong>[CO_PHONE]</strong>
76
+												<?php _e('Email:', 'event_espresso'); ?>
77 77
 												<strong><a href="mailto:[CO_EMAIL]" target="_blank">[CO_EMAIL]</a></strong>
78 78
 											</td>
79 79
 										</tr>
Please login to merge, or discard this patch.
messages/defaults/default/email_declined_registration_subject.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,1 +1,1 @@
 block discarded – undo
1
-<?php _e('Declined Registration Details', 'event_espresso');?>
2 1
\ No newline at end of file
2
+<?php _e('Declined Registration Details', 'event_espresso'); ?>
3 3
\ No newline at end of file
Please login to merge, or discard this patch.
defaults/default/email_not_approved_registration_attendee_list.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <h5>[FNAME] [LNAME]</h5>
2 2
 <ul>
3
-	<li><strong><?php _e( 'Registration Code:', 'event_espresso' ); ?></strong> [REGISTRATION_CODE]</li>
4
-	<li><strong><?php _e( 'Tickets:', 'event_espresso' ); ?></strong></li>
3
+	<li><strong><?php _e('Registration Code:', 'event_espresso'); ?></strong> [REGISTRATION_CODE]</li>
4
+	<li><strong><?php _e('Tickets:', 'event_espresso'); ?></strong></li>
5 5
 </ul>
6 6
 <ul>
7 7
 	<li>[TICKET_LIST]</li>
Please login to merge, or discard this patch.