eventespresso / event-espresso-core

core/admin/templates/admin_wrapper_ajax.template.php

Spacing +4 added lines, -4 removed lines

@@ -1,13 +1,13 @@
 <div class="wrap espresso-admin">
-	<h1><?php esc_attr_e( 'Event Espresso', 'event_espresso' ); ?>&nbsp;-&nbsp;<?php echo $admin_page_title; ?></h1>
+	<h1><?php esc_attr_e('Event Espresso', 'event_espresso'); ?>&nbsp;-&nbsp;<?php echo $admin_page_title; ?></h1>
 
-	<div class="ee-notices"><?php echo isset( $ajax_notices ) ? $ajax_notices : ''; ?></div>
+	<div class="ee-notices"><?php echo isset($ajax_notices) ? $ajax_notices : ''; ?></div>
 	<?php
-	do_action( 'AHEE__admin_wrapper__template__before_admin_page_content' );
+	do_action('AHEE__admin_wrapper__template__before_admin_page_content');
 	echo $before_admin_page_content;
 	echo $admin_page_content;
 	echo $after_admin_page_content;
-	do_action( 'AHEE__admin_wrapper__template__after_admin_page_content' );
+	do_action('AHEE__admin_wrapper__template__after_admin_page_content');
 	?>
 </div>
 <!-- espresso-admin -->
\ No newline at end of file

admin_pages/transactions/templates/txn_admin_details_header.template.php

Spacing +5 added lines, -5 removed lines

@@ -1,19 +1,19 @@
 
-		<h3 class="txn-navigation-strip"><?php echo $previous_transaction . '&nbsp;'; echo __( 'Transaction # ', 'event_espresso' ) . $txn_nmbr['value']; echo '&nbsp;' . $next_transaction; ?></h3>
-		<h2 id="txn-date-h2" class="txn-date-h2"><?php echo $txn_datetime['value'];?></h2>
+		<h3 class="txn-navigation-strip"><?php echo $previous_transaction.'&nbsp;'; echo __('Transaction # ', 'event_espresso').$txn_nmbr['value']; echo '&nbsp;'.$next_transaction; ?></h3>
+		<h2 id="txn-date-h2" class="txn-date-h2"><?php echo $txn_datetime['value']; ?></h2>
 
 		<?php echo $send_payment_reminder_button; ?>
 		<h2 id="txn-status-h2" class="txn-status-h2">
-			<?php echo __( 'Transaction Status: ', 'event_espresso' );?><span id="txn-status" class="<?php echo $txn_status['class'];?>"><?php echo $txn_status['value'];?></span>
+			<?php echo __('Transaction Status: ', 'event_espresso'); ?><span id="txn-status" class="<?php echo $txn_status['class']; ?>"><?php echo $txn_status['value']; ?></span>
 		</h2>
 
 	<?php $attributes = $amount_due ? 'class="txn-amount-due-h2"' : 'class="txn-amount-due-h2 hidden"'; ?>
 		<h2 id="txn-amount-due-h2" <?php echo $attributes; ?>>
-			<?php echo __( 'Total Amount Due: ', 'event_espresso' );?><span id="txn-admin-total-amount-due" class="<?php echo $amount_due_class;?>"><?php echo $amount_due;?></span>
+			<?php echo __('Total Amount Due: ', 'event_espresso'); ?><span id="txn-admin-total-amount-due" class="<?php echo $amount_due_class; ?>"><?php echo $amount_due; ?></span>
 		</h2>
 
 		<h3 id="txn-selected-method-of-payment-h3" class="txn-selected-method-of-payment-h3">
-			<?php echo __( 'Last Method of Payment: ', 'event_espresso' );?><?php echo $method_of_payment_name;?>
+			<?php echo __('Last Method of Payment: ', 'event_espresso'); ?><?php echo $method_of_payment_name; ?>
 		</h3>
 
 

admin_pages/payments/help_tabs/payment_methods_overview.help_tab.php

Spacing +19 added lines, -19 removed lines

@@ -2,40 +2,40 @@
 <p>
 <?php _e('This page shows all available payment methods for Event Espresso.', 'event_espresso'); ?>
 </p>
-<p><strong><?php _e('Common Settings', 'event_espresso' )?></strong></p>
+<p><strong><?php _e('Common Settings', 'event_espresso')?></strong></p>
 <ul>
 	<li>
-		<strong><?php _e( 'Name', 'event_espresso' );?></strong><br>
-		<?php _e( 'The name of the payment method as customers see it in the registration form, in emails, in receipts, etc.', 'event_espresso' );?>
+		<strong><?php _e('Name', 'event_espresso'); ?></strong><br>
+		<?php _e('The name of the payment method as customers see it in the registration form, in emails, in receipts, etc.', 'event_espresso'); ?>
 	</li>
 	<li>
-		<strong><?php _e( 'Description', 'event_espresso' );?></strong><br/>
-		<?php _e( 'The description of how to use the payment method as customers will see it. This is mostly only seen during registration.', 'event_espresso' );?>
+		<strong><?php _e('Description', 'event_espresso'); ?></strong><br/>
+		<?php _e('The description of how to use the payment method as customers will see it. This is mostly only seen during registration.', 'event_espresso'); ?>
 	</li>
-	<li><strong><?php _e( 'Admin-Only Name', 'event_espresso' );?></strong><br/>
-		<?php _e( 'The name of the payment method as seen internally by site administrators and staff.', 'event_espresso' );?>
+	<li><strong><?php _e('Admin-Only Name', 'event_espresso'); ?></strong><br/>
+		<?php _e('The name of the payment method as seen internally by site administrators and staff.', 'event_espresso'); ?>
 	</li>
 	<li>
-		<strong><?php _e( 'Admin-Only Description', 'event_espresso' );?></strong><br/>
-		<?php _e( 'The description of the payment method as seen internally by site administrators and staff.', 'event_espresso' );?>
+		<strong><?php _e('Admin-Only Description', 'event_espresso'); ?></strong><br/>
+		<?php _e('The description of the payment method as seen internally by site administrators and staff.', 'event_espresso'); ?>
 	</li>
 	<li>
-		<strong><?php _e( 'Debug (sandbox) Mode', 'event_espresso' );?></strong><br/>
-		<?php _e( 'Many payment methods have a debug/sandbox mode where payments are not processed but are only simulated. This is helpful when setup and debugging.', 'event_espresso' );?>
+		<strong><?php _e('Debug (sandbox) Mode', 'event_espresso'); ?></strong><br/>
+		<?php _e('Many payment methods have a debug/sandbox mode where payments are not processed but are only simulated. This is helpful when setup and debugging.', 'event_espresso'); ?>
 	</li>
 	<li>
-		<strong><?php _e( 'Open by Default', 'event_espresso' );?></strong><br/>
-		<?php _e( 'If checked, this payment method will be selected by default (assuming no other valid payment methods are also marked as open by default.)', 'event_espresso' );?>
+		<strong><?php _e('Open by Default', 'event_espresso'); ?></strong><br/>
+		<?php _e('If checked, this payment method will be selected by default (assuming no other valid payment methods are also marked as open by default.)', 'event_espresso'); ?>
 	</li>
 	<li>
-		<strong><?php _e( 'Button URL', 'event_espresso' );?></strong><br/>
-		<?php printf( __( 'The URL of the button image for this payment method in the registration process. You may use any uploaded image on your website (click %s next to the field to select). If left blank, the default button image will be used.', 'event_espresso' ), '<img src="' . admin_url('images/media-button-image.gif') . '">' );?>
+		<strong><?php _e('Button URL', 'event_espresso'); ?></strong><br/>
+		<?php printf(__('The URL of the button image for this payment method in the registration process. You may use any uploaded image on your website (click %s next to the field to select). If left blank, the default button image will be used.', 'event_espresso'), '<img src="'.admin_url('images/media-button-image.gif').'">'); ?>
 	</li>
-	<li><strong><?php _e( 'Usable From', 'event_espresso' );?></strong><br/>
-	<?php _e( 'Where this payment method can be used from.', 'event_espresso' );?>
+	<li><strong><?php _e('Usable From', 'event_espresso'); ?></strong><br/>
+	<?php _e('Where this payment method can be used from.', 'event_espresso'); ?>
 		<ul>
-			<li><?php _e( 'Front-end Registration Page: the payment method will appear as an option during the normal registration process to customers and they can use it to process payments.', 'event_espresso' );?></li>
-			<li><?php _e( 'Admin Registration Page: when recording payments made from the transaction admin page, the payment method will appear as an option. Note: currently payments can only be RECORDED from the admin, they cannot be PROCESSED.', 'event_espresso' );?></li>
+			<li><?php _e('Front-end Registration Page: the payment method will appear as an option during the normal registration process to customers and they can use it to process payments.', 'event_espresso'); ?></li>
+			<li><?php _e('Admin Registration Page: when recording payments made from the transaction admin page, the payment method will appear as an option. Note: currently payments can only be RECORDED from the admin, they cannot be PROCESSED.', 'event_espresso'); ?></li>
 		</ul>
 	</li>
 </ul>

caffeinated/payment_methods/Mijireh/help_tabs/payment_methods_overview_mijireh.help_tab.php

Spacing +11 added lines, -11 removed lines

@@ -1,11 +1,11 @@ 
-<p><strong><?php _e( 'Mijireh', 'event_espresso' ); ?></strong></p>
+<p><strong><?php _e('Mijireh', 'event_espresso'); ?></strong></p>
 <p>
-	<?php _e( 'Adjust the settings for the Mijireh payment gateway.', 'event_espresso' ); ?>
+	<?php _e('Adjust the settings for the Mijireh payment gateway.', 'event_espresso'); ?>
 </p>
 <p>
 	<?php
 	printf(
-		__( 'Mijireh is basically a middle-man between Event Espresso and over 90 payment gateways. Most of the configuration occurs on %1$sMijireh\' website%2$s, where you configure your Mijireh store with the %3$spayment gateway of your choice%4$s.', 'event_espresso' ),
+		__('Mijireh is basically a middle-man between Event Espresso and over 90 payment gateways. Most of the configuration occurs on %1$sMijireh\' website%2$s, where you configure your Mijireh store with the %3$spayment gateway of your choice%4$s.', 'event_espresso'),
 		'<a href="http://www.mijireh.com/" target="_blank">',
 		'</a>',
 		'<a href="http://www.mijireh.com/docs/payment-gateways/" target="_blank">',
@@ -14,26 +14,26 @@ 
 	?>
 </p>
 <p>
-	<?php _e( 'For information on what currencies you can use with Mijireh, please consult the payment gateway Mijireh is setup to use.', 'event_espresso' ) ?>
+	<?php _e('For information on what currencies you can use with Mijireh, please consult the payment gateway Mijireh is setup to use.', 'event_espresso') ?>
 </p>
 <ul>
 	<li>
-		<strong><?php _e( 'Mijireh Access Key', 'event_espresso' ); ?></strong><br/>
+		<strong><?php _e('Mijireh Access Key', 'event_espresso'); ?></strong><br/>
 		<?php
 		printf(
-			__( 'Enter your Access Key for Mijireh. Your Access Key can be found in your %1$sMijireh account dashboard%2$s.', 'event_espresso' ),
+			__('Enter your Access Key for Mijireh. Your Access Key can be found in your %1$sMijireh account dashboard%2$s.', 'event_espresso'),
 			'<a href="https://secure.mijireh.com/login" target="_blank">',
 			'</a>'
 		);
 		?>
 	</li>
 	<li>
-		<strong><?php _e( 'Button Image URL', 'event_espresso' ); ?></strong><br/>
-		<?php _e( 'Change the image that is used for this payment gateway.', 'event_espresso' ); ?>
+		<strong><?php _e('Button Image URL', 'event_espresso'); ?></strong><br/>
+		<?php _e('Change the image that is used for this payment gateway.', 'event_espresso'); ?>
 	</li>
 </ul>
-<p><strong><?php _e( 'Mijireh Checkout Page Design', 'event_espresso' ); ?></strong></p>
+<p><strong><?php _e('Mijireh Checkout Page Design', 'event_espresso'); ?></strong></p>
 <p>
-	<?php _e( "As you are probably aware, when users pay with Mijireh Payment Method, they are taken to a secure offsite page, hosted by Mijireh. This page can easily be made to have the look-and-feel of your website through a process called 'slurping', where Mijireh 'slurps' up your website's design and uses it on their checkout page.", 'event_espresso' ); ?>
-	<?php printf( __( "In order to do this, we automatically create a new WordPress page which is designed to be slurped by Mijireh. You can customize the page like any other, but the page must contain Mijireh's special '{{mijireh-checkout-form}}' shortcode. Once you have finished designing the page, publish it, and %s then click the special 'slurp now' button%s. Mijireh may take several minutes to slurp the page. Once Mijireh is finished slurping, you can delete the page, or mark it as a draft.", 'event_espresso' ), '<a href="http://ee-screenshots.s3.amazonaws.com/ee4/event-espresso-mijireh-slurp-page-example.jpg" target="_blank">', '</a>' ); ?>
+	<?php _e("As you are probably aware, when users pay with Mijireh Payment Method, they are taken to a secure offsite page, hosted by Mijireh. This page can easily be made to have the look-and-feel of your website through a process called 'slurping', where Mijireh 'slurps' up your website's design and uses it on their checkout page.", 'event_espresso'); ?>
+	<?php printf(__("In order to do this, we automatically create a new WordPress page which is designed to be slurped by Mijireh. You can customize the page like any other, but the page must contain Mijireh's special '{{mijireh-checkout-form}}' shortcode. Once you have finished designing the page, publish it, and %s then click the special 'slurp now' button%s. Mijireh may take several minutes to slurp the page. Once Mijireh is finished slurping, you can delete the page, or mark it as a draft.", 'event_espresso'), '<a href="http://ee-screenshots.s3.amazonaws.com/ee4/event-espresso-mijireh-slurp-page-example.jpg" target="_blank">', '</a>'); ?>
 </p>
\ No newline at end of file

caffeinated/admin/extend/events/help_tabs/import_page.help_tab.php

Spacing +8 added lines, -8 removed lines

@@ -2,18 +2,18 @@
 <p>
 <?php _e('The importer can be used to import event information into Event Espresso using a CSV file.', 'event_espresso'); ?>
 </p>
-<p><strong><?php _e("Importing from other Event Espresso 4 Sites", 'event_espresso');?></strong></p>
+<p><strong><?php _e("Importing from other Event Espresso 4 Sites", 'event_espresso'); ?></strong></p>
 <p>
 <?php _e('To import Event Espresso data from another Event Espresso 4 install, export a CSV file from the admin Events overview page, or anywhere you can generate a CSV export file from. Then upload that file here (regardless of what type of information was exported).', 'event_espresso'); ?>
 </p>
 <p>
 <?php _e('Note: its possible that data from the other site have the same IDs as data in this site. The importer recognizes that this data is from a different database and inserts new items for each item in the CSV file, regardless of whether its ID matches that of an item in this site\'s database or not. However, the importer also remembers the mapping from the old site\'s database to this site\'s database, and on subsequent CSV importers from that site, the data in this database will be updated instead of re-inserting new items.', 'event_espresso'); ?>
 </p>
-<p><strong><?php _e("Importing from this Site", 'event_espresso');?></strong></p>
-<p><?php _e("You may want to export data from this site, modify it (or modify the database), and re-import it. When this is done, the importer recognizes that the data is from this site\'s database and updates the records (instead of inserting new items like it would have, had the CSV data been from a different site).", 'event_espresso');?></p>
+<p><strong><?php _e("Importing from this Site", 'event_espresso'); ?></strong></p>
+<p><?php _e("You may want to export data from this site, modify it (or modify the database), and re-import it. When this is done, the importer recognizes that the data is from this site\'s database and updates the records (instead of inserting new items like it would have, had the CSV data been from a different site).", 'event_espresso'); ?></p>
 
-	<p><strong><?php _e("Notes about Generating your own CSV Import Files", "event_espresso");?></strong></p>
-	<p><?php _e("If you think you could save time entering data into a CSV file, you can use the sample import file below. Note that creating your own CSV file is more complicated than in Event Espresso 3.1 because of the more advanced data structure, and so we recommend creating/editing your events using the normal web-interface.", "event_espresso");?></p>
-	<p><?php _e("The export file is just an export of an event, or if you do not have any events in your system, it will only contain column headers. Do not change those column headers. Add as many rows as you like. ", "event_espresso");?></p>
-	<p><?php _e("In the ID columns (columns ending in '_ID'), you should enter 'temporary IDs', which are unique numbers/words that identify that item, which can be used later when you want to refer to that item. (For example, if you assign an event's EVT_ID to be a temporary id of 'my-event-1', then use that same phrase 'my-event-1' to refer to that event in the Datetime model's EVT_ID column)", "event_espresso");?></p>
-	<p><?php _e("Also note, you do NOT have to enter info in for each model. (You can, for example, only enter in Term_Taxonomies and Term model data)", "event_espresso");?></p>
\ No newline at end of file
+	<p><strong><?php _e("Notes about Generating your own CSV Import Files", "event_espresso"); ?></strong></p>
+	<p><?php _e("If you think you could save time entering data into a CSV file, you can use the sample import file below. Note that creating your own CSV file is more complicated than in Event Espresso 3.1 because of the more advanced data structure, and so we recommend creating/editing your events using the normal web-interface.", "event_espresso"); ?></p>
+	<p><?php _e("The export file is just an export of an event, or if you do not have any events in your system, it will only contain column headers. Do not change those column headers. Add as many rows as you like. ", "event_espresso"); ?></p>
+	<p><?php _e("In the ID columns (columns ending in '_ID'), you should enter 'temporary IDs', which are unique numbers/words that identify that item, which can be used later when you want to refer to that item. (For example, if you assign an event's EVT_ID to be a temporary id of 'my-event-1', then use that same phrase 'my-event-1' to refer to that event in the Datetime model's EVT_ID column)", "event_espresso"); ?></p>
+	<p><?php _e("Also note, you do NOT have to enter info in for each model. (You can, for example, only enter in Term_Taxonomies and Term model data)", "event_espresso"); ?></p>
\ No newline at end of file

core/libraries/messages/EE_Message_To_Generate.php

Doc Comments +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
 	 * generates an EE_Message using the supplied arguments and some defaults
 	 *
 	 * @param array $properties
-	 * @return string
+	 * @return EE_Message
 	 */
 	protected function _generate_message( $properties = array() ) {
 		$message = EE_Message_Factory::create(

Spacing +18 added lines, -18 removed lines

@@ -105,14 +105,14 @@ 
 	public function __construct(
 		$messenger_name,
 		$message_type_name,
-		$data 	 = array(),
+		$data = array(),
 		$context = '',
 		$preview = false,
 		$status  = EEM_Message::status_incomplete
 	) {
-		$this->_messenger_name 		= $messenger_name;
-		$this->_message_type_name 	= $message_type_name;
-		$this->_data 				= is_array( $data ) ? $data : array( $data );
+		$this->_messenger_name = $messenger_name;
+		$this->_message_type_name = $message_type_name;
+		$this->_data = is_array($data) ? $data : array($data);
 		$this->_context 			= $context;
 		$this->_preview 			= $preview;
 		$this->_status 				= $status;
@@ -170,8 +170,8 @@ 
 	/**
 	 * @param boolean $preview
 	 */
-	public function set_preview( $preview ) {
-		$this->_preview = filter_var( $preview, FILTER_VALIDATE_BOOLEAN );
+	public function set_preview($preview) {
+		$this->_preview = filter_var($preview, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -202,7 +202,7 @@ 
 	 * @param array $properties
 	 * @return string
 	 */
-	protected function _generate_message( $properties = array() ) {
+	protected function _generate_message($properties = array()) {
 		$message = EE_Message_Factory::create(
 			array_merge(
 				array(
@@ -216,12 +216,12 @@ 
 		);
 		// validate the message, and if it's good, set some properties
 		try {
-			$message->is_valid_for_sending_or_generation( true );
+			$message->is_valid_for_sending_or_generation(true);
 			$this->_valid = true;
 			$this->_messenger = $message->messenger_object();
 			$this->_message_type = $message->message_type_object();
 			$this->_send_now = $message->send_now();
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			$this->_valid = false;
 			$this->_error_msg[] = $e->getMessage();
 		}
@@ -237,7 +237,7 @@ 
 	 */
 	public function get_EE_Message() {
 		// already set ?
-		if ( $this->_message instanceof EE_Message ) {
+		if ($this->_message instanceof EE_Message) {
 			return $this->_message;
 		}
 		// no? then let's create one
@@ -255,15 +255,15 @@ 
 	 * @param   bool    $preview    Used to indicate that the preview data handler is to be returned.
 	 * @return  string
 	 */
-	public function get_data_handler_class_name( $preview = false ) {
-		if ( $this->_data_handler_class_name === '' && $this->valid() ) {
-			$ref = $preview ? 'Preview' : $this->_message_type->get_data_handler( $this->_data );
+	public function get_data_handler_class_name($preview = false) {
+		if ($this->_data_handler_class_name === '' && $this->valid()) {
+			$ref = $preview ? 'Preview' : $this->_message_type->get_data_handler($this->_data);
 			//make sure internal data is updated.
 			$this->_data = $this->_message_type->get_data();
 
 			//verify
-			$this->_data_handler_class_name = EE_Message_To_Generate::verify_and_retrieve_class_name_for_data_handler_reference( $ref );
-			if ( $this->_data_handler_class_name === '' ) {
+			$this->_data_handler_class_name = EE_Message_To_Generate::verify_and_retrieve_class_name_for_data_handler_reference($ref);
+			if ($this->_data_handler_class_name === '') {
 				$this->_valid = false;
 			}
 		}
@@ -279,9 +279,9 @@ 
 	 * @param string $data_handler_reference
 	 * @return string
 	 */
-	public static function verify_and_retrieve_class_name_for_data_handler_reference( $data_handler_reference ) {
-		$class_name = 'EE_Messages_' . $data_handler_reference . '_incoming_data';
-		if ( ! class_exists( $class_name ) ) {
+	public static function verify_and_retrieve_class_name_for_data_handler_reference($data_handler_reference) {
+		$class_name = 'EE_Messages_'.$data_handler_reference.'_incoming_data';
+		if ( ! class_exists($class_name)) {
 			EE_Error::add_error(
 				sprintf(
 					__(

core/libraries/messages/EE_Message_To_Generate_From_Request.php

Spacing +18 added lines, -18 removed lines

@@ -38,20 +38,20 @@ 
 	 * @param   EE_Message_Resource_Manager $message_resource_manager
 	 * @param   EE_Request_Handler 			$request
 	 */
-	public function __construct( EE_Message_Resource_Manager $message_resource_manager, EE_Request_Handler $request ) {
+	public function __construct(EE_Message_Resource_Manager $message_resource_manager, EE_Request_Handler $request) {
 		parent::__construct(
-			$request->get( 'gen_msgr' ),
-			$request->get( 'message_type' ),
+			$request->get('gen_msgr'),
+			$request->get('message_type'),
 			array(),
-			$request->get( 'context' )
+			$request->get('context')
 		);
-		if ( ! $this->valid() ) {
+		if ( ! $this->valid()) {
 			return;
 		}
-		$this->_sending_messenger = $message_resource_manager->get_active_messenger( $request->get( 'snd_msgr' ) );
-		$this->token = $request->get( 'token' );
+		$this->_sending_messenger = $message_resource_manager->get_active_messenger($request->get('snd_msgr'));
+		$this->token = $request->get('token');
 		$this->_validate_request();
-		$this->_data = $this->_get_data_from_request( $request->get( 'id' ) );
+		$this->_data = $this->_get_data_from_request($request->get('id'));
 	}
 
 
@@ -75,10 +75,10 @@ 
 			! $this->_sending_messenger instanceof EE_Messenger
 			|| ! $this->_messenger instanceof EE_Messenger
 			|| ! $this->_message_type instanceof EE_message_type
-			|| empty( $this->_context )
-			|| empty( $this->token )
+			|| empty($this->_context)
+			|| empty($this->token)
 		) {
-			throw new EE_Error( __( 'The request for the "msg_url_trigger" route has a malformed url.', 'event_espresso' ) );
+			throw new EE_Error(__('The request for the "msg_url_trigger" route has a malformed url.', 'event_espresso'));
 		}
 	}
 
@@ -90,16 +90,16 @@ 
 	 * @throws EE_Error
 	 * @return mixed (whatever the data is returned from the message type).
 	 */
-	protected function _get_data_from_request( $id ) {
+	protected function _get_data_from_request($id) {
 		//get the EE_Registration from the token
 		/** @type EE_Registration $registration */
-		$registration = EEM_Registration::instance()->get_one( array( array( 'REG_url_link' => $this->token ) ) );
+		$registration = EEM_Registration::instance()->get_one(array(array('REG_url_link' => $this->token)));
 		//if no registration then bail early.
-		if ( ! $registration instanceof EE_Registration ) {
-			throw new EE_Error( __( 'Unable to complete the request because the token is invalid.', 'event_espresso' ) );
+		if ( ! $registration instanceof EE_Registration) {
+			throw new EE_Error(__('Unable to complete the request because the token is invalid.', 'event_espresso'));
 		}
 
-		return $this->_get_data_to_use( $registration, $id );
+		return $this->_get_data_to_use($registration, $id);
 	}
 
 
@@ -111,9 +111,9 @@ 
 	 * @param int             $data_id   This is sometimes used for secondary data a message type requires.
 	 * @return mixed   Data prepared as needed for generating this message.
 	 */
-	protected function _get_data_to_use( $registration, $data_id ) {
+	protected function _get_data_to_use($registration, $data_id) {
 		//use incoming data from url to setup data for the message type requirements
-		return $this->_message_type->get_data_for_context( $this->_context, $registration, $data_id );
+		return $this->_message_type->get_data_for_context($this->_context, $registration, $data_id);
 	}
 
 

core/db_classes/EE_Price.class.php

Spacing +32 added lines, -32 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -35,9 +35,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -48,8 +48,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -60,8 +60,8 @@ 
 	 * @access        public
 	 * @param        int $PRT_ID
 	 */
-	public function set_type( $PRT_ID = 0 ) {
-		$this->set( 'PRT_ID', $PRT_ID );
+	public function set_type($PRT_ID = 0) {
+		$this->set('PRT_ID', $PRT_ID);
 	}
 
 
@@ -72,8 +72,8 @@ 
 	 * @access        public
 	 * @param        float $PRC_amount
 	 */
-	public function set_amount( $PRC_amount = 0.00 ) {
-		$this->set( 'PRC_amount', $PRC_amount );
+	public function set_amount($PRC_amount = 0.00) {
+		$this->set('PRC_amount', $PRC_amount);
 	}
 
 
@@ -84,8 +84,8 @@ 
 	 * @access        public
 	 * @param        string $PRC_name
 	 */
-	public function set_name( $PRC_name = '' ) {
-		$this->set( 'PRC_name', $PRC_name );
+	public function set_name($PRC_name = '') {
+		$this->set('PRC_name', $PRC_name);
 	}
 
 
@@ -96,8 +96,8 @@ 
 	 * @access        public
 	 * @param        string $PRC_desc
 	 */
-	public function set_description( $PRC_desc = '' ) {
-		$this->Set( 'PRC_desc', $PRC_desc );
+	public function set_description($PRC_desc = '') {
+		$this->Set('PRC_desc', $PRC_desc);
 	}
 
 
@@ -108,8 +108,8 @@ 
 	* 		@access		public
 	*		@param		bool		$PRC_is_default
 	*/
-	public function set_is_default( $PRC_is_default = FALSE ) {
-		$this->set( 'PRC_is_default', $PRC_is_default );
+	public function set_is_default($PRC_is_default = FALSE) {
+		$this->set('PRC_is_default', $PRC_is_default);
 	}
 
 
@@ -120,8 +120,8 @@ 
 	* 		@access		public
 	*		@param		bool		$PRC_deleted
 	*/
-	public function set_deleted( $PRC_deleted = NULL ) {
-		$this->set( 'PRC_deleted', $PRC_deleted );
+	public function set_deleted($PRC_deleted = NULL) {
+		$this->set('PRC_deleted', $PRC_deleted);
 	}
 
 
@@ -132,7 +132,7 @@ 
 	 * @return        int
 	 */
 	public function type() {
-		return $this->get( 'PRT_ID' );
+		return $this->get('PRT_ID');
 	}
 
 
@@ -143,7 +143,7 @@ 
 	 * @return        float
 	 */
 	public function amount() {
-		return $this->get( 'PRC_amount' );
+		return $this->get('PRC_amount');
 	}
 
 
@@ -154,7 +154,7 @@ 
 	 * @return        string
 	 */
 	public function name() {
-		return $this->get( 'PRC_name' );
+		return $this->get('PRC_name');
 	}
 
 
@@ -165,7 +165,7 @@ 
 	 * @return        string
 	 */
 	public function desc() {
-		return $this->get( 'PRC_desc' );
+		return $this->get('PRC_desc');
 	}
 
 
@@ -176,7 +176,7 @@ 
 	 * @return        int
 	 */
 	public function overrides() {
-		return $this->get( 'PRC_overrides' );
+		return $this->get('PRC_overrides');
 	}
 
 
@@ -187,7 +187,7 @@ 
 	 * @return        int
 	 */
 	public function order() {
-		return $this->get( 'PRC_order' );
+		return $this->get('PRC_order');
 	}
 
 
@@ -211,7 +211,7 @@ 
 	 * @return        bool
 	 */
 	public function is_default() {
-		return $this->get( 'PRC_is_default' );
+		return $this->get('PRC_is_default');
 	}
 
 
@@ -222,7 +222,7 @@ 
 	 * @return        bool
 	 */
 	public function deleted() {
-		return $this->get( 'PRC_deleted' );
+		return $this->get('PRC_deleted');
 	}
 
 
@@ -231,7 +231,7 @@ 
 	 * @return bool
 	 */
 	public function parent() {
-		return $this->get( 'PRC_parent' );
+		return $this->get('PRC_parent');
 	}
 
 
@@ -253,7 +253,7 @@ 
 	 * @return EE_Price_Type
 	 */
 	public function type_obj() {
-		return $this->get_first_related( 'Price_Type' );
+		return $this->get_first_related('Price_Type');
 	}
 
 
@@ -275,7 +275,7 @@ 
 	 */
 	public function is_percent() {
 		$price_type = $this->type_obj();
-		return $price_type->get( 'PRT_is_percent' );
+		return $price_type->get('PRT_is_percent');
 	}
 
 
@@ -287,7 +287,7 @@ 
 	 * @return string
 	 */
 	public function pretty_price() {
-		return ! $this->is_percent() ? $this->get_pretty('PRC_amount') : $this->get('PRC_amount') . '%';
+		return ! $this->is_percent() ? $this->get_pretty('PRC_amount') : $this->get('PRC_amount').'%';
 	}
 
 
@@ -296,7 +296,7 @@ 
 	 * @return mixed
 	 */
 	public function get_price_without_currency_symbol() {
-		return str_replace( EE_Registry::instance()->CFG->currency->sign, '', $this->get_pretty( 'PRC_amount' ) );
+		return str_replace(EE_Registry::instance()->CFG->currency->sign, '', $this->get_pretty('PRC_amount'));
 	}
 }
 

Doc Comments +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 	 * @param array $props_n_values  incoming values from the database
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
 	 *                          		the website will be used.
-	 * @return EE_Attendee
+	 * @return EE_Price
 	 */
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
 		return new self( $props_n_values, TRUE, $timezone );

Indentation +10 added lines, -10 removed lines

@@ -103,11 +103,11 @@ 
 
 
 	/**
-	*		set is_default
-	*
-	* 		@access		public
-	*		@param		bool		$PRC_is_default
-	*/
+	 *		set is_default
+	 *
+	 * 		@access		public
+	 *		@param		bool		$PRC_is_default
+	 */
 	public function set_is_default( $PRC_is_default = FALSE ) {
 		$this->set( 'PRC_is_default', $PRC_is_default );
 	}
@@ -115,11 +115,11 @@ 
 
 
 	/**
-	*		set deleted
-	*
-	* 		@access		public
-	*		@param		bool		$PRC_deleted
-	*/
+	 *		set deleted
+	 *
+	 * 		@access		public
+	 *		@param		bool		$PRC_deleted
+	 */
 	public function set_deleted( $PRC_deleted = NULL ) {
 		$this->set( 'PRC_deleted', $PRC_deleted );
 	}

core/db_classes/EE_Question_Option.class.php

Spacing +28 added lines, -28 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -45,9 +45,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -58,8 +58,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -69,8 +69,8 @@ 
 	 * @param string $value
 	 * @return bool success
 	 */
-	public function set_value( $value ) {
-		$this->set( 'QSO_value', $value );
+	public function set_value($value) {
+		$this->set('QSO_value', $value);
 	}
 
 
@@ -80,8 +80,8 @@ 
 	 * @param string $text
 	 * @return bool success
 	 */
-	public function set_desc( $text ) {
-		$this->set( 'QSO_desc', $text );
+	public function set_desc($text) {
+		$this->set('QSO_desc', $text);
 	}
 
 
@@ -93,8 +93,8 @@ 
 	 * @param integer $order
 	 * @return bool      $success
 	 */
-	public function set_order( $order ) {
-		$this->set( 'QSO_order', $order );
+	public function set_order($order) {
+		$this->set('QSO_order', $order);
 	}
 
 
@@ -104,8 +104,8 @@ 
 	 * @param int $question_ID
 	 * @return bool success
 	 */
-	public function set_question_ID( $question_ID ) {
-		$this->set( 'QST_ID', $question_ID );
+	public function set_question_ID($question_ID) {
+		$this->set('QST_ID', $question_ID);
 	}
 
 
@@ -115,7 +115,7 @@ 
 	 * @param string $text
 	 * @return bool success
 	 */
-	public function set_opt_group( $text ) {
+	public function set_opt_group($text) {
 		return $this->_QSO_opt_group = $text;
 	}
 
@@ -126,7 +126,7 @@ 
 	 * @return string
 	 */
 	public function value() {
-		return $this->get( 'QSO_value' );
+		return $this->get('QSO_value');
 	}
 
 
@@ -136,7 +136,7 @@ 
 	 * @return string
 	 */
 	public function desc() {
-		return $this->get( 'QSO_desc' );
+		return $this->get('QSO_desc');
 	}
 
 
@@ -146,7 +146,7 @@ 
 	 * @return boolean
 	 */
 	public function deleted() {
-		return $this->get( 'QSO_deleted' );
+		return $this->get('QSO_deleted');
 	}
 
 
@@ -158,7 +158,7 @@ 
 	 * @return integer
 	 */
 	public function order() {
-		return $this->get( 'QSO_option' );
+		return $this->get('QSO_option');
 	}
 
 
@@ -168,7 +168,7 @@ 
 	 * @return int
 	 */
 	public function question_ID() {
-		return $this->get( 'QST_ID' );
+		return $this->get('QST_ID');
 	}
 
 
@@ -178,7 +178,7 @@ 
 	 * @return EE_Question
 	 */
 	public function question() {
-		return $this->get_first_related( 'Question' );
+		return $this->get_first_related('Question');
 	}
 
 
@@ -197,11 +197,11 @@ 
 	 * @param array $options {
 	 *	@type int $QST_ID the QST_ID attribute of this question option, otherwise it will be for the same question as the original
 	 */
-	public function duplicate( $options = array() ) {
+	public function duplicate($options = array()) {
 		$new_question_option = clone $this;
-		$new_question_option->set( 'QSO_ID', null );
-		if( array_key_exists( 'QST_ID', $options ) ) {//use array_key_exists instead of isset because NULL might be a valid value
-			$new_question_option->set_question_ID( $options[ 'QST_ID' ] );
+		$new_question_option->set('QSO_ID', null);
+		if (array_key_exists('QST_ID', $options)) {//use array_key_exists instead of isset because NULL might be a valid value
+			$new_question_option->set_question_ID($options['QST_ID']);
 		}
 		$new_question_option->save();
 	}
@@ -219,8 +219,8 @@ 
 	 * @param string $QSO_system
 	 * @return bool
 	 */
-	public function set_system( $QSO_system ) {
-		return $this->set( 'QSO_system', $QSO_system );
+	public function set_system($QSO_system) {
+		return $this->set('QSO_system', $QSO_system);
 	}
 }
 

Doc Comments +7 added lines, -7 removed lines

@@ -56,7 +56,7 @@ 
 	 * @param array $props_n_values  incoming values from the database
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
 	 *                          		the website will be used.
-	 * @return EE_Attendee
+	 * @return EE_Question_Option
 	 */
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
 		return new self( $props_n_values, TRUE, $timezone );
@@ -67,7 +67,7 @@ 
 	/**
 	 * Sets the option's key value
 	 * @param string $value
-	 * @return bool success
+	 * @return boolean|null success
 	 */
 	public function set_value( $value ) {
 		$this->set( 'QSO_value', $value );
@@ -78,7 +78,7 @@ 
 	/**
 	 * Sets the option's Display Text
 	 * @param string $text
-	 * @return bool success
+	 * @return boolean|null success
 	 */
 	public function set_desc( $text ) {
 		$this->set( 'QSO_desc', $text );
@@ -91,7 +91,7 @@ 
 	 *
 	 * @access public
 	 * @param integer $order
-	 * @return bool      $success
+	 * @return boolean|null      $success
 	 */
 	public function set_order( $order ) {
 		$this->set( 'QSO_order', $order );
@@ -102,7 +102,7 @@ 
 	/**
 	 * Sets the ID of the related question
 	 * @param int $question_ID
-	 * @return bool success
+	 * @return boolean|null success
 	 */
 	public function set_question_ID( $question_ID ) {
 		$this->set( 'QST_ID', $question_ID );
@@ -113,7 +113,7 @@ 
 	/**
 	 * Sets the option's opt_group
 	 * @param string $text
-	 * @return bool success
+	 * @return string success
 	 */
 	public function set_opt_group( $text ) {
 		return $this->_QSO_opt_group = $text;
@@ -217,7 +217,7 @@ 
 	/**
 	 * Sets QSO_system
 	 * @param string $QSO_system
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function set_system( $QSO_system ) {
 		return $this->set( 'QSO_system', $QSO_system );