eventespresso / event-espresso-core

core/libraries/payment_methods/EE_Gateway.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -208,7 +208,7 @@
 
 	/**
 	 * @param $message
-	 * @param $payment
+	 * @param EEI_Payment $payment
 	 */
 	public function log($message,$payment){
 		if($payment instanceof EEI_Payment){

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

Spacing +31 added lines, -31 removed lines

@@ -30,7 +30,7 @@ 
  * needed helpers and models (see all the methods starting with "set_", eg seg_line_item_helper which should be passed an object
  * which implements EEHI_Line_Item_Helper; etc).
  */
-abstract class EE_Gateway{
+abstract class EE_Gateway {
 	/**
 	 * a constant used as a possible value for $_currencies_supported to indicate
 	 * that ALL currencies are supported by this gateway
@@ -108,7 +108,7 @@ 
 	/**
 	 * @return EE_Gateway
 	 */
-	public function __construct(){
+	public function __construct() {
 	}
 
 	/**
@@ -120,10 +120,10 @@ 
 	 * beginning again)
 	 * @return array
 	 */
-	public function __sleep(){
+	public function __sleep() {
 		$properties = get_object_vars($this);
-		unset( $properties[ '_pay_model' ] );
-		unset( $properties[ '_pay_log' ] );
+		unset($properties['_pay_model']);
+		unset($properties['_pay_log']);
 		return array_keys($properties);
 	}
 	/**
@@ -131,7 +131,7 @@ 
 	 * see $_supports_sending_refunds
 	 * @return boolean
 	 */
-	public function supports_sending_refunds(){
+	public function supports_sending_refunds() {
 		return $this->_supports_sending_refunds;
 	}
 	/**
@@ -139,7 +139,7 @@ 
 	 * see $_supports_receiving_refunds
 	 * @return boolean
 	 */
-	public function supports_receiving_refunds(){
+	public function supports_receiving_refunds() {
 		return $this->_supports_receiving_refunds;
 	}
 
@@ -154,7 +154,7 @@ 
 	 * @return EE_Payment for the refund
 	 * @throws EE_Error
 	 */
-	public function do_direct_refund( EE_Payment $payment, $refund_info = null ) {
+	public function do_direct_refund(EE_Payment $payment, $refund_info = null) {
 		return NULL;
 	}
 
@@ -165,8 +165,8 @@ 
 	 * etc
 	 * @param array $settings_array
 	 */
-	public function set_settings($settings_array){
-		foreach($settings_array as $name => $value){
+	public function set_settings($settings_array) {
+		foreach ($settings_array as $name => $value) {
 			$property_name = "_".$name;
 			$this->$property_name = $value;
 		}
@@ -175,14 +175,14 @@ 
 	 * See this class description
 	 * @param EEMI_Payment $payment_model
 	 */
-	public function set_payment_model($payment_model){
+	public function set_payment_model($payment_model) {
 		$this->_pay_model = $payment_model;
 	}
 	/**
 	 * See this class description
 	 * @param EEMI_Payment_Log $payment_log_model
 	 */
-	public function set_payment_log($payment_log_model){
+	public function set_payment_log($payment_log_model) {
 		$this->_pay_log = $payment_log_model;
 	}
 
@@ -190,7 +190,7 @@ 
 	 * See this class description
 	 * @param EEHI_Template $template_helper
 	 */
-	public function set_template_helper($template_helper){
+	public function set_template_helper($template_helper) {
 		$this->_template = $template_helper;
 	}
 
@@ -198,7 +198,7 @@ 
 	 * See this class description
 	 * @param EEHI_Line_Item $line_item_helper
 	 */
-	public function set_line_item_helper( $line_item_helper ){
+	public function set_line_item_helper($line_item_helper) {
 		$this->_line_item = $line_item_helper;
 	}
 
@@ -206,7 +206,7 @@ 
 	 * See this class description
 	 * @param EEHI_Money $money_helper
 	 */
-	public function set_money_helper( $money_helper ){
+	public function set_money_helper($money_helper) {
 		$this->_money = $money_helper;
 	}
 
@@ -215,23 +215,23 @@ 
 	 * @param $message
 	 * @param $payment
 	 */
-	public function log($message,$payment){
-		if($payment instanceof EEI_Payment){
-			$type='Payment';
+	public function log($message, $payment) {
+		if ($payment instanceof EEI_Payment) {
+			$type = 'Payment';
 			$id = $payment->ID();
-		}else{
+		} else {
 			$type = 'Payment_Method';
 			$id = $this->_ID;
 		}
-		$this->_pay_log->gateway_log($message,$id,$type);
+		$this->_pay_log->gateway_log($message, $id, $type);
 	}
 	/**
 	 * Formats the amount so it can generally be sent to gateways
 	 * @param float $amount
 	 * @return string
 	 */
-	public function format_currency($amount){
-		return number_format( $amount, 2, '.', '' );
+	public function format_currency($amount) {
+		return number_format($amount, 2, '.', '');
 //		return $this->_template->format_currency($amount, true);
 	}
 
@@ -240,7 +240,7 @@ 
 	 * or a string indicating they're all supported (EE_gateway::all_currencies_supported)
 	 * @return mixed array or string
 	 */
-	public function currencies_supported(){
+	public function currencies_supported() {
 		return $this->_currencies_supported;
 	}
 
@@ -252,14 +252,14 @@ 
 	 * @param EE_Transaction  $transaction
 	 * @return float
 	 */
-	protected function _sum_items_and_taxes( EE_Transaction  $transaction){
+	protected function _sum_items_and_taxes(EE_Transaction  $transaction) {
 		$total_line_item = $transaction->total_line_item();
 		$total = 0;
-		foreach($total_line_item->get_items() as $item_line_item ){
-			$total += max( $item_line_item->total(), 0 );
+		foreach ($total_line_item->get_items() as $item_line_item) {
+			$total += max($item_line_item->total(), 0);
 		}
-		foreach($total_line_item->tax_descendants() as $tax_line_item ){
-			$total += max( $tax_line_item->total(), 0 );
+		foreach ($total_line_item->tax_descendants() as $tax_line_item) {
+			$total += max($tax_line_item->total(), 0);
 		}
 		return $total;
 	}
@@ -270,9 +270,9 @@ 
 	 * @param EEI_Payment $payment
 	 * @return boolean
 	 */
-	protected function _can_easily_itemize_transaction_for( EEI_Payment $payment ){
+	protected function _can_easily_itemize_transaction_for(EEI_Payment $payment) {
 		return  $this->_money->compare_floats(
-					$this->_sum_items_and_taxes( $payment->transaction() ),
+					$this->_sum_items_and_taxes($payment->transaction()),
 					$payment->transaction()->total() ) &&
 				$this->_money->compare_floats(
 					$payment->amount(),
@@ -290,7 +290,7 @@ 
 	 * @param EE_Payment $payment
 	 * @return void
 	 */
-	public function update_txn_based_on_payment( $payment ){
+	public function update_txn_based_on_payment($payment) {
 		//maybe update the transaction or line items or registrations
 		//but most gateways don't need to do this, because they only update the payment
 	}

core/libraries/payment_methods/EE_PMT_Base.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -266,7 +266,7 @@
 	 *
 	 * @param \EE_Transaction $transaction
 	 * @param array $extra_args
-	 * @return \EE_Billing_Attendee_Info_Form|\EE_Billing_Info_Form|null
+	 * @return EE_Billing_Info_Form
 	 */
 	public function billing_form( EE_Transaction $transaction = NULL, $extra_args = array() ){
 		// has billing form already been regenerated ? or overwrite cache?

Spacing +108 added lines, -108 removed lines

@@ -14,7 +14,7 @@ 
  * @since 				$VID:$
  *
  */
-abstract class EE_PMT_Base{
+abstract class EE_PMT_Base {
 
 	const onsite = 'on-site';
 	const offsite = 'off-site';
@@ -95,36 +95,36 @@ 
 	 * @return EE_PMT_Base
 	 */
 	function __construct($pm_instance = NULL) {
-		if ( $pm_instance instanceof EE_Payment_Method ){
+		if ($pm_instance instanceof EE_Payment_Method) {
 			$this->set_instance($pm_instance);
 		}
 		$this->_set_file_folder();
 		$this->_set_file_url();
-		if($this->_gateway){
-			$this->_gateway->set_payment_model( EEM_Payment::instance() );
-			$this->_gateway->set_payment_log( EEM_Change_Log::instance() );
-			EE_Registry::instance()->load_helper( 'Template' );
-			$this->_gateway->set_template_helper( new EEH_Template() );
-			EE_Registry::instance()->load_helper( 'Line_Item' );
-			$this->_gateway->set_line_item_helper( new EEH_Line_Item() );
-			EE_Registry::instance()->load_helper( 'Money' );
-			$this->_gateway->set_money_helper( new EEH_Money() );
+		if ($this->_gateway) {
+			$this->_gateway->set_payment_model(EEM_Payment::instance());
+			$this->_gateway->set_payment_log(EEM_Change_Log::instance());
+			EE_Registry::instance()->load_helper('Template');
+			$this->_gateway->set_template_helper(new EEH_Template());
+			EE_Registry::instance()->load_helper('Line_Item');
+			$this->_gateway->set_line_item_helper(new EEH_Line_Item());
+			EE_Registry::instance()->load_helper('Money');
+			$this->_gateway->set_money_helper(new EEH_Money());
 		}
-		if ( ! isset( $this->_has_billing_form ) ) {
+		if ( ! isset($this->_has_billing_form)) {
 			// by default, On Site gateways have a billing form
-			if ( $this->payment_occurs() == EE_PMT_Base::onsite ) {
-				$this->set_has_billing_form( true );
+			if ($this->payment_occurs() == EE_PMT_Base::onsite) {
+				$this->set_has_billing_form(true);
 			} else {
-				$this->set_has_billing_form( false );
+				$this->set_has_billing_form(false);
 			}
 		}
 
-		if( ! $this->_pretty_name){
+		if ( ! $this->_pretty_name) {
 			throw new EE_Error(sprintf(__("You must set the pretty name for the Payment Method Type in the constructor (_pretty_name), and please make it internationalized", "event_espresso")));
 		}
 		//if the child didn't specify a default button, use the credit card one
-		if( $this->_default_button_url === NULL){
-			$this->_default_button_url = EE_PLUGIN_DIR_URL . 'payment_methods' . DS . 'pay-by-credit-card.png';
+		if ($this->_default_button_url === NULL) {
+			$this->_default_button_url = EE_PLUGIN_DIR_URL.'payment_methods'.DS.'pay-by-credit-card.png';
 		}
 	}
 
@@ -133,8 +133,8 @@ 
 	/**
 	 * @param boolean $has_billing_form
 	 */
-	public function set_has_billing_form( $has_billing_form ) {
-		$this->_has_billing_form = filter_var( $has_billing_form, FILTER_VALIDATE_BOOLEAN );
+	public function set_has_billing_form($has_billing_form) {
+		$this->_has_billing_form = filter_var($has_billing_form, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -142,10 +142,10 @@ 
 	/**
 	 * sets the file_folder property
 	 */
-	protected function _set_file_folder(){
+	protected function _set_file_folder() {
 		$reflector = new ReflectionClass(get_class($this));
 		$fn = $reflector->getFileName();
-		$this->_file_folder =  dirname($fn).DS;
+		$this->_file_folder = dirname($fn).DS;
 	}
 
 
@@ -153,10 +153,10 @@ 
 	/**
 	 * sets the file URL with a trailing slash for this PMT
 	 */
-	protected function _set_file_url(){
-		$plugins_dir_fixed = str_replace('\\',DS,WP_PLUGIN_DIR);
-		$file_folder_fixed = str_replace('\\',DS,$this->file_folder());
-		$file_path = str_replace($plugins_dir_fixed,WP_PLUGIN_URL,$file_folder_fixed);
+	protected function _set_file_url() {
+		$plugins_dir_fixed = str_replace('\\', DS, WP_PLUGIN_DIR);
+		$file_folder_fixed = str_replace('\\', DS, $this->file_folder());
+		$file_path = str_replace($plugins_dir_fixed, WP_PLUGIN_URL, $file_folder_fixed);
 		$this->_file_url = $file_path;
 	}
 
@@ -164,7 +164,7 @@ 
 	 * Gets the default description on all payment methods of this type
 	 * @return string
 	 */
-	public function default_description(){
+	public function default_description() {
 		return $this->_default_description;
 	}
 
@@ -174,7 +174,7 @@ 
 	 * Returns the folder containing the PMT child class, with a trailing slash
 	 * @return string
 	 */
-	public function file_folder(){
+	public function file_folder() {
 		return $this->_file_folder;
 	}
 
@@ -183,7 +183,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function file_url(){
+	public function file_url() {
 		return $this->_file_url;
 	}
 
@@ -194,14 +194,14 @@ 
 	 * Its important teh payment method instance is set before
 	 * @param EE_Payment_Method $payment_method_instance
 	 */
-	function set_instance($payment_method_instance){
+	function set_instance($payment_method_instance) {
 		$this->_pm_instance = $payment_method_instance;
 		//if they have already requested the settings form, make sure its
 		//data matches this model object
-		if($this->_settings_form){
+		if ($this->_settings_form) {
 			$this->settings_form()->populate_model_obj($payment_method_instance);
 		}
-		if($this->_gateway && $this->_gateway instanceof EE_Gateway){
+		if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
 			$this->_gateway->set_settings($payment_method_instance->settings_array());
 		}
 	}
@@ -212,14 +212,14 @@ 
 	 * Gets teh form for displaying to admins where they setup the payment method
 	 * @return EE_Payment_Method_Form
 	 */
-	function settings_form(){
-		if( ! $this->_settings_form){
+	function settings_form() {
+		if ( ! $this->_settings_form) {
 			$this->_settings_form = $this->generate_new_settings_form();
-			$this->_settings_form->set_payment_method_type( $this );
-			$this->_settings_form->_construct_finalize(NULL, NULL );
+			$this->_settings_form->set_payment_method_type($this);
+			$this->_settings_form->_construct_finalize(NULL, NULL);
 			//if we have already assigned a model object to this pmt, make
 			//sure its reflected in teh form we just generated
-			if($this->_pm_instance){
+			if ($this->_pm_instance) {
 				$this->_settings_form->populate_model_obj($this->_pm_instance);
 			}
 		}
@@ -245,7 +245,7 @@ 
 	 * this payment method type's settings form later in the request
 	 * @param EE_Payment_Method_Form $form
 	 */
-	public function set_settings_form($form){
+	public function set_settings_form($form) {
 		$this->_settings_form = $form;
 	}
 
@@ -268,10 +268,10 @@ 
 	 * @param array $extra_args
 	 * @return \EE_Billing_Attendee_Info_Form|\EE_Billing_Info_Form|null
 	 */
-	public function billing_form( EE_Transaction $transaction = NULL, $extra_args = array() ){
+	public function billing_form(EE_Transaction $transaction = NULL, $extra_args = array()) {
 		// has billing form already been regenerated ? or overwrite cache?
-		if ( ! $this->_billing_form instanceof EE_Billing_Info_Form || ! $this->_cache_billing_form ){
-			$this->_billing_form = $this->generate_new_billing_form( $transaction, $extra_args );
+		if ( ! $this->_billing_form instanceof EE_Billing_Info_Form || ! $this->_cache_billing_form) {
+			$this->_billing_form = $this->generate_new_billing_form($transaction, $extra_args);
 		}
 		//if we know who the attendee is, and this is a billing form
 		//that uses attendee info, populate it
@@ -280,8 +280,8 @@ 
 			$transaction instanceof EE_Transaction &&
 			$transaction->primary_registration() instanceof EE_Registration &&
 			$transaction->primary_registration()->attendee() instanceof EE_Attendee
-		){
-			$this->_billing_form->populate_from_attendee( $transaction->primary_registration()->attendee() );
+		) {
+			$this->_billing_form->populate_from_attendee($transaction->primary_registration()->attendee());
 		}
 		return $this->_billing_form;
 	}
@@ -292,7 +292,7 @@ 
 	 * @param \EE_Transaction $transaction
 	 * @return \EE_Billing_Info_Form
 	 */
-	abstract function generate_new_billing_form( EE_Transaction $transaction = NULL );
+	abstract function generate_new_billing_form(EE_Transaction $transaction = NULL);
 
 
 
@@ -303,7 +303,7 @@ 
 	 * @param \EE_Billing_Info_Form $billing_form
 	 * @return \EE_Billing_Info_Form
 	 */
-	public function apply_billing_form_debug_settings( EE_Billing_Info_Form $billing_form ) {
+	public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form) {
 		return $billing_form;
 	}
 
@@ -314,7 +314,7 @@ 
 	 * if you have form
 	 * @param EE_Payment_Method $form
 	 */
-	public function set_billing_form($form){
+	public function set_billing_form($form) {
 		$this->_billing_form = $form;
 	}
 
@@ -324,7 +324,7 @@ 
 	 * Returns whether or not this payment method requires HTTPS to be used
 	 * @return boolean
 	 */
-	function requires_https(){
+	function requires_https() {
 		return $this->_requires_https;
 	}
 
@@ -342,9 +342,9 @@ 
 	 * @return EE_Payment
 	 * @throws EE_Error
 	 */
-	function process_payment( EE_Transaction $transaction, $amount = null, $billing_info = null, $return_url = null,$fail_url = '', $method = 'CART', $by_admin = false ){
+	function process_payment(EE_Transaction $transaction, $amount = null, $billing_info = null, $return_url = null, $fail_url = '', $method = 'CART', $by_admin = false) {
 		// @todo: add surcharge for the payment method, if any
-		if ( $this->_gateway ) {
+		if ($this->_gateway) {
 			//there is a gateway, so we're going to make a payment object
 			//but wait! do they already have a payment in progress that we thought was failed?
 			$duplicate_properties = array(
@@ -355,10 +355,10 @@ 
 				'PAY_amount' 					=> $amount !== null ? $amount : $transaction->remaining(),
 				'PAY_gateway_response' 	=> null,
 			);
-			$payment = EEM_Payment::instance()->get_one( array( $duplicate_properties ));
+			$payment = EEM_Payment::instance()->get_one(array($duplicate_properties));
 			//if we didn't already have a payment in progress for the same thing,
 			//then we actually want to make a new payment
-			if ( ! $payment instanceof EE_Payment ){
+			if ( ! $payment instanceof EE_Payment) {
 				$payment = EE_Payment::new_instance(
 					array_merge(
 						$duplicate_properties,
@@ -374,10 +374,10 @@ 
 			}
 			//make sure the payment has been saved to show we started it, and so it has an ID should the gateway try to log it
 			$payment->save();
-			$billing_values = $this->_get_billing_values_from_form( $billing_info );
+			$billing_values = $this->_get_billing_values_from_form($billing_info);
 
 			//  Offsite Gateway
-			if( $this->_gateway instanceof EE_Offsite_Gateway ){
+			if ($this->_gateway instanceof EE_Offsite_Gateway) {
 
 				$payment = $this->_gateway->set_redirection_info(
 					$payment,
@@ -393,17 +393,17 @@ 
 				);
 				$payment->save();
 			//  Onsite Gateway
-			} elseif ( $this->_gateway instanceof EE_Onsite_Gateway ) {
+			} elseif ($this->_gateway instanceof EE_Onsite_Gateway) {
 
-				$payment = $this->_gateway->do_direct_payment($payment,$billing_values);
+				$payment = $this->_gateway->do_direct_payment($payment, $billing_values);
 				$payment->save();
 
 			} else {
 				throw new EE_Error(
 					sprintf(
-						__('Gateway for payment method type "%s" is "%s", not a subclass of either EE_Offsite_Gateway or EE_Onsite_Gateway, or null (to indicate NO gateway)', 'event_espresso' ),
+						__('Gateway for payment method type "%s" is "%s", not a subclass of either EE_Offsite_Gateway or EE_Onsite_Gateway, or null (to indicate NO gateway)', 'event_espresso'),
 						get_class($this),
-						gettype( $this->_gateway )
+						gettype($this->_gateway)
 					)
 				);
 			}
@@ -425,8 +425,8 @@ 
 		}
 
 		// if there is billing info, clean it and save it now
-		if( $billing_info instanceof EE_Billing_Attendee_Info_Form ){
-			$this->_save_billing_info_to_attendee( $billing_info, $transaction );
+		if ($billing_info instanceof EE_Billing_Attendee_Info_Form) {
+			$this->_save_billing_info_to_attendee($billing_info, $transaction);
 		}
 
 		return $payment;
@@ -439,10 +439,10 @@ 
 	 * @param EE_Billing_Info_Form $billing_form
 	 * @return array
 	 */
-	protected function _get_billing_values_from_form( $billing_form ){
-		if($billing_form instanceof EE_Form_Section_Proper ){
-			return $billing_form->input_pretty_values( true );
-		}else{
+	protected function _get_billing_values_from_form($billing_form) {
+		if ($billing_form instanceof EE_Form_Section_Proper) {
+			return $billing_form->input_pretty_values(true);
+		} else {
 			return NULL;
 		}
 	}
@@ -456,13 +456,13 @@ 
 	 * @return EE_Payment
 	 * @throws EE_Error
 	 */
-	public function handle_ipn($req_data,$transaction){
+	public function handle_ipn($req_data, $transaction) {
 		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
-		if( ! $this->_gateway instanceof EE_Offsite_Gateway){
-			throw new EE_Error(sprintf(__("Could not handle IPN because '%s' is not an offsite gateway", "event_espresso"), print_r( $this->_gateway, TRUE )));
+		if ( ! $this->_gateway instanceof EE_Offsite_Gateway) {
+			throw new EE_Error(sprintf(__("Could not handle IPN because '%s' is not an offsite gateway", "event_espresso"), print_r($this->_gateway, TRUE)));
 
 		}
-		$payment = $this->_gateway->handle_payment_update( $req_data, $transaction );
+		$payment = $this->_gateway->handle_payment_update($req_data, $transaction);
 		return $payment;
 	}
 
@@ -475,22 +475,22 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return boolean success
 	 */
-	protected function _save_billing_info_to_attendee($billing_form, $transaction){
-		if( ! $transaction || ! $transaction instanceof EE_Transaction){
+	protected function _save_billing_info_to_attendee($billing_form, $transaction) {
+		if ( ! $transaction || ! $transaction instanceof EE_Transaction) {
 			EE_Error::add_error(__("Cannot save billing info because no transaction was specified", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		$primary_reg = $transaction->primary_registration();
-		if( ! $primary_reg ){
+		if ( ! $primary_reg) {
 			EE_Error::add_error(__("Cannot save billing info because the transaction has no primary registration", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		$attendee = $primary_reg->attendee();
-		if( ! $attendee ){
+		if ( ! $attendee) {
 			EE_Error::add_error(__("Cannot save billing info because the transaction's primary registration has no attendee!", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		return $attendee->save_and_clean_billing_info_for_payment_method($billing_form, $transaction->payment_method() );
+		return $attendee->save_and_clean_billing_info_for_payment_method($billing_form, $transaction->payment_method());
 
 	}
 
@@ -503,7 +503,7 @@ 
 	 * @param array $req_data
 	 * @return EE_Payment
 	 */
-	protected function find_payment_for_ipn( EE_Transaction $transaction, $req_data = array() ){
+	protected function find_payment_for_ipn(EE_Transaction $transaction, $req_data = array()) {
 		return $transaction->last_payment();
 	}
 
@@ -520,8 +520,8 @@ 
 	 * and identifies the IPN as being for this payment method (not just fo ra payment method of this type)
 	 * @throws EE_Error
 	 */
-	public function handle_unclaimed_ipn( $req_data = array() ){
-		throw new EE_Error(sprintf(__("Payment Method '%s' cannot handle unclaimed IPNs", "event_espresso"), get_class($this) ));
+	public function handle_unclaimed_ipn($req_data = array()) {
+		throw new EE_Error(sprintf(__("Payment Method '%s' cannot handle unclaimed IPNs", "event_espresso"), get_class($this)));
 	}
 
 
@@ -537,7 +537,7 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Payment
 	 */
-	public function finalize_payment_for($transaction){
+	public function finalize_payment_for($transaction) {
 		return $transaction->last_payment();
 	}
 
@@ -547,10 +547,10 @@ 
 	 * Whether or not this payment method's gateway supports sending refund requests
 	 * @return boolean
 	 */
-	public function supports_sending_refunds(){
-		if($this->_gateway && $this->_gateway instanceof EE_Gateway){
+	public function supports_sending_refunds() {
+		if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
 			return $this->_gateway->supports_sending_refunds();
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -564,14 +564,14 @@ 
 	 * @throws EE_Error
 	 * @return EE_Payment
 	 */
-	public function process_refund( EE_Payment $payment, $refund_info = array()){
-		if ( $this->_gateway && $this->_gateway instanceof EE_Gateway ) {
-			return $this->_gateway->do_direct_refund( $payment, $refund_info );
+	public function process_refund(EE_Payment $payment, $refund_info = array()) {
+		if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
+			return $this->_gateway->do_direct_refund($payment, $refund_info);
 		} else {
 			throw new EE_Error(
 				sprintf(
-					__( 'Payment Method Type "%s" does not support sending refund requests', 'event_espresso' ),
-					get_class( $this )
+					__('Payment Method Type "%s" does not support sending refund requests', 'event_espresso'),
+					get_class($this)
 				)
 			);
 		}
@@ -585,15 +585,15 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function payment_occurs(){
-		if( ! $this->_gateway){
+	public function payment_occurs() {
+		if ( ! $this->_gateway) {
 			return EE_PMT_Base::offline;
-		}elseif($this->_gateway instanceof EE_Onsite_Gateway){
+		}elseif ($this->_gateway instanceof EE_Onsite_Gateway) {
 			return EE_PMT_Base::onsite;
-		}elseif($this->_gateway instanceof EE_Offsite_Gateway){
+		}elseif ($this->_gateway instanceof EE_Offsite_Gateway) {
 			return EE_PMT_Base::offsite;
-		}else{
-			throw new EE_Error(sprintf(__("Payment method type '%s's gateway isn't an instance of EE_Onsite_Gateway, EE_Offsite_Gateway, or null. It must be one of those", "event_espresso"),get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__("Payment method type '%s's gateway isn't an instance of EE_Onsite_Gateway, EE_Offsite_Gateway, or null. It must be one of those", "event_espresso"), get_class($this)));
 		}
 	}
 
@@ -606,9 +606,9 @@ 
 	 * @param EE_Payment $payment
 	 * @return string
 	 */
-	public function payment_overview_content(EE_Payment $payment){
+	public function payment_overview_content(EE_Payment $payment) {
 		EE_Registry::instance()->load_helper('Template');
-		return EEH_Template::display_template(EE_LIBRARIES.'payment_methods'.DS.'templates'.DS.'payment_details_content.template.php', array('payment_method'=>$this->_pm_instance,'payment'=>$payment) , true);
+		return EEH_Template::display_template(EE_LIBRARIES.'payment_methods'.DS.'templates'.DS.'payment_details_content.template.php', array('payment_method'=>$this->_pm_instance, 'payment'=>$payment), true);
 	}
 
 
@@ -616,7 +616,7 @@ 
 	/**
 	 * @return array exactly like EE_Admin_Page _page_config's 'help_tabs' attribute. @see EE_Admin_Page::_set_page_config()
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array();
 	}
 
@@ -627,9 +627,9 @@ 
 	 * the payment method's table's PMT_type column)
 	 * @return string
 	 */
-	public function system_name(){
+	public function system_name() {
 		$classname = get_class($this);
-		return str_replace("EE_PMT_",'',$classname);
+		return str_replace("EE_PMT_", '', $classname);
 	}
 
 
@@ -638,7 +638,7 @@ 
 	 * A pretty i18n version of the PMT name
 	 * @return string
 	 */
-	public function pretty_name(){
+	public function pretty_name() {
 		return $this->_pretty_name;
 	}
 
@@ -648,7 +648,7 @@ 
 	 * Gets the default absolute URL to the payment method type's button
 	 * @return string
 	 */
-	public function default_button_url(){
+	public function default_button_url() {
 		return $this->_default_button_url;
 	}
 
@@ -658,7 +658,7 @@ 
 	 * Gets the gateway used by this payment method (if any)
 	 * @return EE_Gateway
 	 */
-	public function get_gateway(){
+	public function get_gateway() {
 		return $this->_gateway;
 	}
 
@@ -667,9 +667,9 @@ 
 	/**
 	 * @return string html for the link to a help tab
 	 */
-	public function get_help_tab_link(){
-		EE_Registry::instance()->load_helper( 'Template' );
-		return EEH_Template::get_help_tab_link( $this->get_help_tab_name() );
+	public function get_help_tab_link() {
+		EE_Registry::instance()->load_helper('Template');
+		return EEH_Template::get_help_tab_link($this->get_help_tab_name());
 	}
 
 
@@ -678,8 +678,8 @@ 
 	 * Returns the name of the help tab for this PMT
 	 * @return string
 	 */
-	public function get_help_tab_name(){
-		return 'ee_' . strtolower( $this->system_name() ) . '_help_tab';
+	public function get_help_tab_name() {
+		return 'ee_'.strtolower($this->system_name()).'_help_tab';
 	}
 
 	/**
@@ -687,8 +687,8 @@ 
 	 * this PMT by an admin
 	 * @return string
 	 */
-	public function cap_name(){
-		return 'ee_payment_method_' . strtolower( $this->system_name() );
+	public function cap_name() {
+		return 'ee_payment_method_'.strtolower($this->system_name());
 	}
 
 	/**
@@ -700,9 +700,9 @@ 
 	 * @param EE_Payment $payment
 	 * @return void
 	 */
-	public function update_txn_based_on_payment( $payment ){
-		if( $this->_gateway instanceof EE_Gateway ){
-			$this->_gateway->update_txn_based_on_payment( $payment );
+	public function update_txn_based_on_payment($payment) {
+		if ($this->_gateway instanceof EE_Gateway) {
+			$this->_gateway->update_txn_based_on_payment($payment);
 		}
 	}
 

Braces +5 added lines, -5 removed lines

@@ -442,7 +442,7 @@ 
 	protected function _get_billing_values_from_form( $billing_form ){
 		if($billing_form instanceof EE_Form_Section_Proper ){
 			return $billing_form->input_pretty_values( true );
-		}else{
+		} else{
 			return NULL;
 		}
 	}
@@ -550,7 +550,7 @@ 
 	public function supports_sending_refunds(){
 		if($this->_gateway && $this->_gateway instanceof EE_Gateway){
 			return $this->_gateway->supports_sending_refunds();
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -588,11 +588,11 @@ 
 	public function payment_occurs(){
 		if( ! $this->_gateway){
 			return EE_PMT_Base::offline;
-		}elseif($this->_gateway instanceof EE_Onsite_Gateway){
+		} elseif($this->_gateway instanceof EE_Onsite_Gateway){
 			return EE_PMT_Base::onsite;
-		}elseif($this->_gateway instanceof EE_Offsite_Gateway){
+		} elseif($this->_gateway instanceof EE_Offsite_Gateway){
 			return EE_PMT_Base::offsite;
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("Payment method type '%s's gateway isn't an instance of EE_Onsite_Gateway, EE_Offsite_Gateway, or null. It must be one of those", "event_espresso"),get_class($this)));
 		}
 	}

core/libraries/plugin_api/EE_Register_Addon.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -378,7 +378,7 @@
 	/**
 	 * Loads and instantiates the EE_Addon class and adds it onto the registry
 	 * @param string $addon_name
-	 * @return EE_Addon
+	 * @return boolean
 	 */
 	private static function _load_and_init_addon_class($addon_name){
 		$addon = EE_Registry::instance()->load_addon( dirname( self::$_settings[ $addon_name ]['main_file_path'] ), self::$_settings[ $addon_name ]['class_name'] );

Indentation +27 added lines, -27 removed lines

@@ -1,29 +1,29 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
- * Event Espresso
- *
- * Event Registration and Ticketing Management Plugin for WordPress
- *
- * @ package			Event Espresso
- * @ author			    Event Espresso
- * @ copyright		(c) 2008-2014 Event Espresso  All Rights Reserved.
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link					http://www.eventespresso.com
- * @ version		 	$VID:$
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Ticketing Management Plugin for WordPress
+	 *
+	 * @ package			Event Espresso
+	 * @ author			    Event Espresso
+	 * @ copyright		(c) 2008-2014 Event Espresso  All Rights Reserved.
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+	 * @ link					http://www.eventespresso.com
+	 * @ version		 	$VID:$
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 /**
- * Class EE_Register_Addon
- *
- * EEI_Plugin_API class for registering addons for use with EE core.
- * Receives an array of addon details and takes care of adding all of the necessary hooks and filters to setup things such as autoloaders, configuration settings, data migration scripts, admin pages, modules, shortcodes, and even widgets
- *
- * @package        	Event Espresso
- * @subpackage  	plugin api, addons
- * @since 				4.3.0
- * @author 				Brent Christensen
- */
+	 * Class EE_Register_Addon
+	 *
+	 * EEI_Plugin_API class for registering addons for use with EE core.
+	 * Receives an array of addon details and takes care of adding all of the necessary hooks and filters to setup things such as autoloaders, configuration settings, data migration scripts, admin pages, modules, shortcodes, and even widgets
+	 *
+	 * @package        	Event Espresso
+	 * @subpackage  	plugin api, addons
+	 * @since 				4.3.0
+	 * @author 				Brent Christensen
+	 */
 class EE_Register_Addon implements EEI_Plugin_API {
 
 
@@ -138,10 +138,10 @@ 
 	 *       		 An array of message types with the key as the message type name and the values as below:
 	 *        		@type string $mtfilename The filename of the message type being registered.  This will be the main
 	 *                                       EE_{Messagetype_Name}_message_type class. (eg. EE_Declined_Registration_message_type.class.php). Required.
-	*               @type array $autoloadpaths An array of paths to add to the messages autoloader for the new message type. Required.
-	*               @type array $messengers_to_activate_with An array of messengers that this message
-	*                           type should activate with. Each value in the array should match the name property of a EE_messenger. Optional.
-	*               @type array $messengers_to_validate_with An array of messengers that this message
+	 *               @type array $autoloadpaths An array of paths to add to the messages autoloader for the new message type. Required.
+	 *               @type array $messengers_to_activate_with An array of messengers that this message
+	 *                           type should activate with. Each value in the array should match the name property of a EE_messenger. Optional.
+	 *               @type array $messengers_to_validate_with An array of messengers that this message
 	 *                          type should validate with. Each value in the array should match the name property of an EE_messenger. Optional.
 	 *       	}
 	 *			@type array $custom_post_types

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

Spacing +170 added lines, -170 removed lines

@@ -66,23 +66,23 @@ 
 	 * @param string $min_core_version
 	 * @return string always like '4.3.0.rc.000'
 	 */
-	protected static function _effective_version( $min_core_version ) {
+	protected static function _effective_version($min_core_version) {
 		// versions: 4 . 3 . 1 . p . 123
 		// offsets:    0 . 1 . 2 . 3 . 4
-		$version_parts = explode( '.', $min_core_version );
+		$version_parts = explode('.', $min_core_version);
 		//check they specified the micro version (after 2nd period)
-		if( ! isset( $version_parts[ 2 ] ) ) {
-			$version_parts[ 2] = '0';
+		if ( ! isset($version_parts[2])) {
+			$version_parts[2] = '0';
 		}
 		//if they didn't specify the 'p', or 'rc' part. Just assume the lowest possible
 		//soon we can assume that's 'rc', but this current version is 'alpha'
-		if( ! isset( $version_parts[ 3 ] ) ) {
-			$version_parts[ 3 ] = 'dev';
+		if ( ! isset($version_parts[3])) {
+			$version_parts[3] = 'dev';
 		}
-		if( ! isset( $version_parts[ 4 ] ) ) {
-			$version_parts[ 4 ] = '000';
+		if ( ! isset($version_parts[4])) {
+			$version_parts[4] = '000';
 		}
-		return implode( '.', $version_parts );
+		return implode('.', $version_parts);
 
 	}
 
@@ -92,8 +92,8 @@ 
 	 * @param string $actual_core_version the actual core version, optional
 	 * @return boolean
 	 */
-	public static  function _meets_min_core_version_requirement( $min_core_version, $actual_core_version = EVENT_ESPRESSO_VERSION ) {
-		return version_compare( self::_effective_version( $actual_core_version ), self::_effective_version( $min_core_version ), '>=' );
+	public static  function _meets_min_core_version_requirement($min_core_version, $actual_core_version = EVENT_ESPRESSO_VERSION) {
+		return version_compare(self::_effective_version($actual_core_version), self::_effective_version($min_core_version), '>=');
 	}
 
 
@@ -155,235 +155,235 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function register( $addon_name = '', $setup_args = array()  ) {
+	public static function register($addon_name = '', $setup_args = array()) {
 		// required fields MUST be present, so let's make sure they are.
-		if ( empty( $addon_name ) || ! is_array( $setup_args )) {
-			throw new EE_Error( __( 'In order to register an EE_Addon with EE_Register_Addon::register(), you must include the "addon_name" (the name of the addon), and an array of arguments.', 'event_espresso' ));
+		if (empty($addon_name) || ! is_array($setup_args)) {
+			throw new EE_Error(__('In order to register an EE_Addon with EE_Register_Addon::register(), you must include the "addon_name" (the name of the addon), and an array of arguments.', 'event_espresso'));
 		}
-		if ( ! isset($setup_args[ 'main_file_path' ]) || empty( $setup_args[ 'main_file_path' ] ) ){
-			throw new EE_Error( sprintf( __( 'When registering an addon, you didn\'t provide the "main_file_path", which is the full path to the main file loaded directly by Wordpress. You only provided %s', 'event_espresso' ), implode(",", array_keys( $setup_args ) ) ) );
+		if ( ! isset($setup_args['main_file_path']) || empty($setup_args['main_file_path'])) {
+			throw new EE_Error(sprintf(__('When registering an addon, you didn\'t provide the "main_file_path", which is the full path to the main file loaded directly by Wordpress. You only provided %s', 'event_espresso'), implode(",", array_keys($setup_args))));
 		}
 		// check that addon has not already been registered with that name
-		if ( isset( self::$_settings[ $addon_name ] ) && ! did_action( 'activate_plugin' ) ) {
-			throw new EE_Error( sprintf( __( 'An EE_Addon with the name "%s" has already been registered and each EE_Addon requires a unique name.', 'event_espresso' ), $addon_name ));
+		if (isset(self::$_settings[$addon_name]) && ! did_action('activate_plugin')) {
+			throw new EE_Error(sprintf(__('An EE_Addon with the name "%s" has already been registered and each EE_Addon requires a unique name.', 'event_espresso'), $addon_name));
 		}
 
 
 		// no class name for addon?
-		if ( empty( $setup_args['class_name'] )) {
+		if (empty($setup_args['class_name'])) {
 			// generate one by first separating name with spaces
-			$class_name = str_replace( array( '-', '_' ), ' ', trim( $addon_name ));
+			$class_name = str_replace(array('-', '_'), ' ', trim($addon_name));
 			//capitalize, then replace spaces with underscores
-			$class_name = str_replace( ' ', '_', ucwords( $class_name ));
+			$class_name = str_replace(' ', '_', ucwords($class_name));
 		} else {
 			$class_name = $setup_args['class_name'];
 		}
-		$class_name = strpos( $class_name, 'EE_' ) === 0 ? $class_name : 'EE_' . $class_name;
+		$class_name = strpos($class_name, 'EE_') === 0 ? $class_name : 'EE_'.$class_name;
 		//setup $_settings array from incoming values.
 		$addon_settings = array(
 			// generated from the addon name, changes something like "calendar" to "EE_Calendar"
 			'class_name' 						=> $class_name,
 			// the addon slug for use in URLs, etc
-			'plugin_slug' 						=> isset( $setup_args['plugin_slug'] ) ? (string)$setup_args['plugin_slug'] : '',
+			'plugin_slug' 						=> isset($setup_args['plugin_slug']) ? (string) $setup_args['plugin_slug'] : '',
 			// page slug to be used when generating the "Settings" link on the WP plugin page
-			'plugin_action_slug' 			=> isset( $setup_args[ 'plugin_action_slug' ] ) ? (string)$setup_args[ 'plugin_action_slug' ] : '',
+			'plugin_action_slug' 			=> isset($setup_args['plugin_action_slug']) ? (string) $setup_args['plugin_action_slug'] : '',
 			// the "software" version for the addon
-			'version' 								=> isset( $setup_args['version'] ) ? (string)$setup_args['version'] : '',
+			'version' 								=> isset($setup_args['version']) ? (string) $setup_args['version'] : '',
 			// the minimum version of EE Core that the addon will work with
-			'min_core_version' 			=> isset( $setup_args['min_core_version'] ) ? (string)$setup_args['min_core_version'] : '',
+			'min_core_version' 			=> isset($setup_args['min_core_version']) ? (string) $setup_args['min_core_version'] : '',
 			// full server path to main file (file loaded directly by WP)
-			'main_file_path' 					=> isset( $setup_args['main_file_path'] ) ? (string)$setup_args['main_file_path'] : '',
+			'main_file_path' 					=> isset($setup_args['main_file_path']) ? (string) $setup_args['main_file_path'] : '',
 			// path to folder containing files for integrating with the EE core admin and/or setting up EE admin pages
-			'admin_path' 						=> isset( $setup_args['admin_path'] ) ? (string)$setup_args['admin_path'] : '',
+			'admin_path' 						=> isset($setup_args['admin_path']) ? (string) $setup_args['admin_path'] : '',
 			// a method to be called when the EE Admin is first invoked, can be used for hooking into any admin page
-			'admin_callback' 				=> isset( $setup_args['admin_callback'] ) ? (string)$setup_args['admin_callback'] : '',
+			'admin_callback' 				=> isset($setup_args['admin_callback']) ? (string) $setup_args['admin_callback'] : '',
 			// the section name for this addon's configuration settings section (defaults to "addons")
-			'config_section' 					=> isset( $setup_args['config_section'] ) ? (string)$setup_args['config_section'] : 'addons',
+			'config_section' 					=> isset($setup_args['config_section']) ? (string) $setup_args['config_section'] : 'addons',
 			// the class name for this addon's configuration settings object
-			'config_class' 						=> isset( $setup_args['config_class'] ) ? (string)$setup_args['config_class'] : '',
+			'config_class' 						=> isset($setup_args['config_class']) ? (string) $setup_args['config_class'] : '',
 			//the name given to the config for this addons' configuration settings object (optional)
-			'config_name' 					=> isset( $setup_args['config_name'] ) ? (string) $setup_args['config_name']: '',
+			'config_name' 					=> isset($setup_args['config_name']) ? (string) $setup_args['config_name'] : '',
 			// an array of "class names" => "full server paths" for any classes that might be invoked by the addon
-			'autoloader_paths' 			=> isset( $setup_args['autoloader_paths'] ) ? (array)$setup_args['autoloader_paths'] : array(),
+			'autoloader_paths' 			=> isset($setup_args['autoloader_paths']) ? (array) $setup_args['autoloader_paths'] : array(),
 			// an array of  "full server paths" for any folders containing classes that might be invoked by the addon
-			'autoloader_folders' 			=> isset( $setup_args['autoloader_folders'] ) ? (array)$setup_args['autoloader_folders'] : array(),
+			'autoloader_folders' 			=> isset($setup_args['autoloader_folders']) ? (array) $setup_args['autoloader_folders'] : array(),
 			// array of full server paths to any EE_DMS data migration scripts used by the addon
-			'dms_paths' 						=> isset( $setup_args['dms_paths'] ) ? (array)$setup_args['dms_paths'] : array(),
+			'dms_paths' 						=> isset($setup_args['dms_paths']) ? (array) $setup_args['dms_paths'] : array(),
 			// array of full server paths to any EED_Modules used by the addon
-			'module_paths' 					=> isset( $setup_args['module_paths'] ) ? (array)$setup_args['module_paths'] : array(),
+			'module_paths' 					=> isset($setup_args['module_paths']) ? (array) $setup_args['module_paths'] : array(),
 			// array of full server paths to any EES_Shortcodes used by the addon
-			'shortcode_paths'			 	=> isset( $setup_args['shortcode_paths'] ) ? (array)$setup_args['shortcode_paths'] : array(),
+			'shortcode_paths'			 	=> isset($setup_args['shortcode_paths']) ? (array) $setup_args['shortcode_paths'] : array(),
 			// array of full server paths to any WP_Widgets used by the addon
-			'widget_paths' 					=> isset( $setup_args['widget_paths'] ) ? (array)$setup_args['widget_paths'] : array(),
+			'widget_paths' 					=> isset($setup_args['widget_paths']) ? (array) $setup_args['widget_paths'] : array(),
 			// array of PUE options used by the addon
-			'pue_options' 						=> isset( $setup_args['pue_options'] ) ? (array)$setup_args['pue_options'] : array(),
-			'message_types' 				=> isset( $setup_args['message_types'] ) ? (array) $setup_args['message_types'] : array(),
-			'capabilities' 						=> isset( $setup_args['capabilities'] ) ? (array) $setup_args['capabilities'] : array(),
-			'capability_maps' 				=> isset( $setup_args['capability_maps'] ) ? (array) $setup_args['capability_maps'] : array(),
-			'model_paths' 					=> isset( $setup_args['model_paths'] ) ? (array) $setup_args['model_paths'] : array(),
-			'class_paths' 						=> isset( $setup_args['class_paths'] ) ? (array) $setup_args['class_paths'] : array(),
-			'model_extension_paths' 	=> isset( $setup_args['model_extension_paths'] ) ? (array) $setup_args['model_extension_paths'] : array(),
-			'class_extension_paths' 		=> isset( $setup_args['class_extension_paths'] ) ? (array) $setup_args['class_extension_paths'] : array(),
-			'custom_post_types' 			=> isset( $setup_args['custom_post_types'] ) ? (array) $setup_args['custom_post_types'] : array(),
-			'custom_taxonomies' 		=> isset( $setup_args['custom_taxonomies'] ) ? (array) $setup_args['custom_taxonomies'] : array(),
-			'payment_method_paths'	=> isset( $setup_args[ 'payment_method_paths' ] ) ? (array) $setup_args[ 'payment_method_paths' ] : array(),
-			'default_terms' 					=> isset( $setup_args['default_terms'] ) ? (array) $setup_args['default_terms'] : array(),
+			'pue_options' 						=> isset($setup_args['pue_options']) ? (array) $setup_args['pue_options'] : array(),
+			'message_types' 				=> isset($setup_args['message_types']) ? (array) $setup_args['message_types'] : array(),
+			'capabilities' 						=> isset($setup_args['capabilities']) ? (array) $setup_args['capabilities'] : array(),
+			'capability_maps' 				=> isset($setup_args['capability_maps']) ? (array) $setup_args['capability_maps'] : array(),
+			'model_paths' 					=> isset($setup_args['model_paths']) ? (array) $setup_args['model_paths'] : array(),
+			'class_paths' 						=> isset($setup_args['class_paths']) ? (array) $setup_args['class_paths'] : array(),
+			'model_extension_paths' 	=> isset($setup_args['model_extension_paths']) ? (array) $setup_args['model_extension_paths'] : array(),
+			'class_extension_paths' 		=> isset($setup_args['class_extension_paths']) ? (array) $setup_args['class_extension_paths'] : array(),
+			'custom_post_types' 			=> isset($setup_args['custom_post_types']) ? (array) $setup_args['custom_post_types'] : array(),
+			'custom_taxonomies' 		=> isset($setup_args['custom_taxonomies']) ? (array) $setup_args['custom_taxonomies'] : array(),
+			'payment_method_paths'	=> isset($setup_args['payment_method_paths']) ? (array) $setup_args['payment_method_paths'] : array(),
+			'default_terms' 					=> isset($setup_args['default_terms']) ? (array) $setup_args['default_terms'] : array(),
 			// if not empty, inserts a new table row after this plugin's row on the WP Plugins page that can be used for adding upgrading/marketing info
-			'plugins_page_row' 			=> isset( $setup_args['plugins_page_row'] ) ? $setup_args['plugins_page_row'] : '',
+			'plugins_page_row' 			=> isset($setup_args['plugins_page_row']) ? $setup_args['plugins_page_row'] : '',
 		);
 
 		// if plugin_action_slug is NOT set, but an admin page path IS set, then let's just use the plugin_slug since that will be used for linking to the admin page
-		$addon_settings[ 'plugin_action_slug' ] = empty( $addon_settings[ 'plugin_action_slug' ] ) && ! empty( $addon_settings[ 'admin_path' ] ) ? $addon_settings[ 'plugin_slug' ] : $addon_settings[ 'plugin_action_slug' ];
+		$addon_settings['plugin_action_slug'] = empty($addon_settings['plugin_action_slug']) && ! empty($addon_settings['admin_path']) ? $addon_settings['plugin_slug'] : $addon_settings['plugin_action_slug'];
 		// full server path to main file (file loaded directly by WP)
-		$addon_settings['plugin_basename'] = plugin_basename( $addon_settings[ 'main_file_path' ] );
+		$addon_settings['plugin_basename'] = plugin_basename($addon_settings['main_file_path']);
 
 		//check whether this addon version is compatible with EE core
-		if ( isset( EE_Register_Addon::$_incompatible_addons[ $addon_name ] ) &&
-				! self::_meets_min_core_version_requirement( EE_Register_Addon::$_incompatible_addons[ $addon_name ], $addon_settings[ 'version' ] ) ) {
+		if (isset(EE_Register_Addon::$_incompatible_addons[$addon_name]) &&
+				! self::_meets_min_core_version_requirement(EE_Register_Addon::$_incompatible_addons[$addon_name], $addon_settings['version'])) {
 			$incompatibility_message = sprintf(
-				__( 'The Event Espresso "%1$s" addon was deactivated because it is incompatible with this version of core.%2$s Only version %3$s or higher of "%1$s" can run with this version of core. This can happen when attempting to run beta versions or release candidates with older versions of core, or running old versions of addons with a newer version of core.%2$sPlease upgrade Event Espresso Core and the "%1$s" addon, then re-attempt activating it.', 'event_espresso' ),
+				__('The Event Espresso "%1$s" addon was deactivated because it is incompatible with this version of core.%2$s Only version %3$s or higher of "%1$s" can run with this version of core. This can happen when attempting to run beta versions or release candidates with older versions of core, or running old versions of addons with a newer version of core.%2$sPlease upgrade Event Espresso Core and the "%1$s" addon, then re-attempt activating it.', 'event_espresso'),
 				$addon_name,
 				'<br />',
-				EE_Register_Addon::$_incompatible_addons[ $addon_name ]
+				EE_Register_Addon::$_incompatible_addons[$addon_name]
 			);
-		} else if ( ! self::_meets_min_core_version_requirement( $setup_args[ 'min_core_version' ], espresso_version() ) ) {
+		} else if ( ! self::_meets_min_core_version_requirement($setup_args['min_core_version'], espresso_version())) {
 			$incompatibility_message = sprintf(
-				__( 'The Event Espresso "%1$s" addon could not be activated because it requires Event Espresso Core version "%2$s" or higher in order to run.%4$sYour version of Event Espresso Core is currently at "%3$s". Please upgrade Event Espresso Core first and then re-attempt activating "%1$s".', 'event_espresso' ),
+				__('The Event Espresso "%1$s" addon could not be activated because it requires Event Espresso Core version "%2$s" or higher in order to run.%4$sYour version of Event Espresso Core is currently at "%3$s". Please upgrade Event Espresso Core first and then re-attempt activating "%1$s".', 'event_espresso'),
 				$addon_name,
-				self::_effective_version( $setup_args[ 'min_core_version' ] ),
-				self::_effective_version( espresso_version() ),
+				self::_effective_version($setup_args['min_core_version']),
+				self::_effective_version(espresso_version()),
 				'<br />'
 			);
 		} else {
 			$incompatibility_message = '';
 		}
-		if ( ! empty( $incompatibility_message ) ) {
+		if ( ! empty($incompatibility_message)) {
 			//remove 'activate' from the REQUEST so WP doesn't erroneously tell the user the
 			//plugin activated fine when it didn't
-			if( isset( $_GET[ 'activate' ]) ) {
-				unset( $_GET[ 'activate' ] );
+			if (isset($_GET['activate'])) {
+				unset($_GET['activate']);
 			}
-			if( isset( $_REQUEST[ 'activate' ] ) ){
-				unset( $_REQUEST[ 'activate' ] );
+			if (isset($_REQUEST['activate'])) {
+				unset($_REQUEST['activate']);
 			}
 			//and show an error message indicating the plugin didn't activate properly
-			EE_Error::add_error( $incompatibility_message, __FILE__, __FUNCTION__, __LINE__ );
-			if ( current_user_can( 'activate_plugins' )) {
-				require_once( ABSPATH.'wp-admin/includes/plugin.php' );
-				deactivate_plugins( plugin_basename( $addon_settings[ 'main_file_path' ] ), TRUE );
+			EE_Error::add_error($incompatibility_message, __FILE__, __FUNCTION__, __LINE__);
+			if (current_user_can('activate_plugins')) {
+				require_once(ABSPATH.'wp-admin/includes/plugin.php');
+				deactivate_plugins(plugin_basename($addon_settings['main_file_path']), TRUE);
 			}
 			return;
 		}
 		//this is an activation request
-		if( did_action( 'activate_plugin' ) ){
+		if (did_action('activate_plugin')) {
 			//to find if THIS is the addon that was activated,
 			//just check if we have already registered it or not
 			//(as the newly-activated addon wasn't around the first time addons were registered)
-			if( ! isset( self::$_settings[ $addon_name ] ) ){
-				self::$_settings[ $addon_name ] = $addon_settings;
+			if ( ! isset(self::$_settings[$addon_name])) {
+				self::$_settings[$addon_name] = $addon_settings;
 				$addon = self::_load_and_init_addon_class($addon_name);
 				$addon->set_activation_indicator_option();
 				//dont bother setting up the rest of the addon.
 				//we know it was just activated and the request will end soon
 			}
 			return;
-		}else{
+		} else {
 			// make sure this was called in the right place!
-			if ( ! did_action( 'AHEE__EE_System__load_espresso_addons' ) || did_action( 'AHEE__EE_System___detect_if_activation_or_upgrade__begin' )) {
+			if ( ! did_action('AHEE__EE_System__load_espresso_addons') || did_action('AHEE__EE_System___detect_if_activation_or_upgrade__begin')) {
 				EE_Error::doing_it_wrong(
 					__METHOD__,
 					sprintf(
-						__( 'An attempt to register an EE_Addon named "%s" has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register addons.','event_espresso'),
+						__('An attempt to register an EE_Addon named "%s" has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register addons.', 'event_espresso'),
 						$addon_name
 					),
 					'4.3.0'
 				);
 			}
-			self::$_settings[ $addon_name ] = $addon_settings;
+			self::$_settings[$addon_name] = $addon_settings;
 		}
 		// we need cars
-		if ( ! empty( self::$_settings[ $addon_name ]['autoloader_paths'] )) {
+		if ( ! empty(self::$_settings[$addon_name]['autoloader_paths'])) {
 			// setup autoloader for single file
-			EEH_Autoloader::instance()->register_autoloader( self::$_settings[ $addon_name ]['autoloader_paths'] );
+			EEH_Autoloader::instance()->register_autoloader(self::$_settings[$addon_name]['autoloader_paths']);
 		}
 		// setup autoloaders for folders
-		if ( ! empty( self::$_settings[ $addon_name ]['autoloader_folders'] )) {
-			foreach ( self::$_settings[ $addon_name ]['autoloader_folders'] as $autoloader_folder ) {
-				EEH_Autoloader::register_autoloaders_for_each_file_in_folder( $autoloader_folder );
+		if ( ! empty(self::$_settings[$addon_name]['autoloader_folders'])) {
+			foreach (self::$_settings[$addon_name]['autoloader_folders'] as $autoloader_folder) {
+				EEH_Autoloader::register_autoloaders_for_each_file_in_folder($autoloader_folder);
 			}
 		}
 		// register new models
-		if ( ! empty( self::$_settings[ $addon_name ]['model_paths'] ) || ! empty( self::$_settings[ $addon_name ]['class_paths'] )) {
-			EE_Register_Model::register( $addon_name, array( 'model_paths' => self::$_settings[ $addon_name ]['model_paths'] , 'class_paths' => self::$_settings[ $addon_name ]['class_paths']));
+		if ( ! empty(self::$_settings[$addon_name]['model_paths']) || ! empty(self::$_settings[$addon_name]['class_paths'])) {
+			EE_Register_Model::register($addon_name, array('model_paths' => self::$_settings[$addon_name]['model_paths'], 'class_paths' => self::$_settings[$addon_name]['class_paths']));
 		}
 		// register model extensions
-		if ( ! empty( self::$_settings[ $addon_name ]['model_extension_paths'] ) || ! empty( self::$_settings[ $addon_name ]['class_extension_paths'] )) {
-			EE_Register_Model_Extensions::register( $addon_name, array( 'model_extension_paths' => self::$_settings[ $addon_name ]['model_extension_paths'] , 'class_extension_paths' => self::$_settings[ $addon_name ]['class_extension_paths']));
+		if ( ! empty(self::$_settings[$addon_name]['model_extension_paths']) || ! empty(self::$_settings[$addon_name]['class_extension_paths'])) {
+			EE_Register_Model_Extensions::register($addon_name, array('model_extension_paths' => self::$_settings[$addon_name]['model_extension_paths'], 'class_extension_paths' => self::$_settings[$addon_name]['class_extension_paths']));
 		}
 		// setup DMS
-		if ( ! empty( self::$_settings[ $addon_name ]['dms_paths'] )) {
-			EE_Register_Data_Migration_Scripts::register( $addon_name, array( 'dms_paths' => self::$_settings[ $addon_name ]['dms_paths'] ));
+		if ( ! empty(self::$_settings[$addon_name]['dms_paths'])) {
+			EE_Register_Data_Migration_Scripts::register($addon_name, array('dms_paths' => self::$_settings[$addon_name]['dms_paths']));
 		}
 		// if config_class is present let's register config.
-		if ( ! empty( self::$_settings[ $addon_name ]['config_class'] )) {
+		if ( ! empty(self::$_settings[$addon_name]['config_class'])) {
 			EE_Register_Config::register(
-				self::$_settings[ $addon_name ]['config_class'],
+				self::$_settings[$addon_name]['config_class'],
 				array(
-					'config_section' => self::$_settings[ $addon_name ]['config_section'],
-					'config_name' => self::$_settings[ $addon_name ]['config_name']
+					'config_section' => self::$_settings[$addon_name]['config_section'],
+					'config_name' => self::$_settings[$addon_name]['config_name']
 				)
 			);
 		}
 		// register admin page
-		if ( ! empty( self::$_settings[ $addon_name ]['admin_path'] )) {
-			EE_Register_Admin_Page::register( $addon_name, array( 'page_path' => self::$_settings[ $addon_name ]['admin_path'] ));
+		if ( ! empty(self::$_settings[$addon_name]['admin_path'])) {
+			EE_Register_Admin_Page::register($addon_name, array('page_path' => self::$_settings[$addon_name]['admin_path']));
 
 		}
 		// add to list of modules to be registered
-		if ( ! empty( self::$_settings[ $addon_name ]['module_paths'] )) {
-			EE_Register_Module::register( $addon_name, array( 'module_paths' => self::$_settings[ $addon_name ]['module_paths'] ));
+		if ( ! empty(self::$_settings[$addon_name]['module_paths'])) {
+			EE_Register_Module::register($addon_name, array('module_paths' => self::$_settings[$addon_name]['module_paths']));
 		}
 		// add to list of shortcodes to be registered
-		if ( ! empty( self::$_settings[ $addon_name ]['shortcode_paths'] )) {
-			EE_Register_Shortcode::register( $addon_name, array( 'shortcode_paths' => self::$_settings[ $addon_name ]['shortcode_paths'] ));
+		if ( ! empty(self::$_settings[$addon_name]['shortcode_paths'])) {
+			EE_Register_Shortcode::register($addon_name, array('shortcode_paths' => self::$_settings[$addon_name]['shortcode_paths']));
 		}
 		// add to list of widgets to be registered
-		if ( ! empty( self::$_settings[ $addon_name ]['widget_paths'] )) {
-			EE_Register_Widget::register( $addon_name, array( 'widget_paths' => self::$_settings[ $addon_name ]['widget_paths'] ));
+		if ( ! empty(self::$_settings[$addon_name]['widget_paths'])) {
+			EE_Register_Widget::register($addon_name, array('widget_paths' => self::$_settings[$addon_name]['widget_paths']));
 		}
 
 		//register capability related stuff.
-		if ( ! empty( self::$_settings[ $addon_name ]['capabilities'] ) ) {
-			EE_Register_Capabilities::register( $addon_name , array( 'capabilities' => self::$_settings[$addon_name]['capabilities'], 'capability_maps' => self::$_settings[$addon_name]['capability_maps'] ) );
+		if ( ! empty(self::$_settings[$addon_name]['capabilities'])) {
+			EE_Register_Capabilities::register($addon_name, array('capabilities' => self::$_settings[$addon_name]['capabilities'], 'capability_maps' => self::$_settings[$addon_name]['capability_maps']));
 		}
 		//any message type to register?
-		if (  !empty( self::$_settings[$addon_name]['message_types'] ) ) {
-				add_action( 'EE_Brewing_Regular___messages_caf', array( 'EE_Register_Addon', 'register_message_types' ) );
+		if ( ! empty(self::$_settings[$addon_name]['message_types'])) {
+				add_action('EE_Brewing_Regular___messages_caf', array('EE_Register_Addon', 'register_message_types'));
 		}
 
 		// if plugin update engine is being used for auto-updates (not needed if PUE is not being used)
-		if ( ! empty( $setup_args['pue_options'] )) {
-			self::$_settings[ $addon_name ]['pue_options'] = array(
-				'pue_plugin_slug' 	=> isset( $setup_args['pue_options']['pue_plugin_slug'] ) ? (string)$setup_args['pue_options']['pue_plugin_slug'] : 'espresso_' . strtolower( $class_name ),
-				'plugin_basename' => isset( $setup_args['pue_options']['plugin_basename'] ) ? (string)$setup_args['pue_options']['plugin_basename'] : plugin_basename( self::$_settings[ $addon_name ]['main_file_path'] ),
-				'checkPeriod' 			=> isset( $setup_args['pue_options']['checkPeriod'] ) ? (string)$setup_args['pue_options']['checkPeriod'] : '24',
-				'use_wp_update'		=> isset( $setup_args['pue_options']['use_wp_update'] ) ? (string)$setup_args['pue_options']['use_wp_update'] : FALSE
+		if ( ! empty($setup_args['pue_options'])) {
+			self::$_settings[$addon_name]['pue_options'] = array(
+				'pue_plugin_slug' 	=> isset($setup_args['pue_options']['pue_plugin_slug']) ? (string) $setup_args['pue_options']['pue_plugin_slug'] : 'espresso_'.strtolower($class_name),
+				'plugin_basename' => isset($setup_args['pue_options']['plugin_basename']) ? (string) $setup_args['pue_options']['plugin_basename'] : plugin_basename(self::$_settings[$addon_name]['main_file_path']),
+				'checkPeriod' 			=> isset($setup_args['pue_options']['checkPeriod']) ? (string) $setup_args['pue_options']['checkPeriod'] : '24',
+				'use_wp_update'		=> isset($setup_args['pue_options']['use_wp_update']) ? (string) $setup_args['pue_options']['use_wp_update'] : FALSE
 			);
-			add_action( 'AHEE__EE_System__brew_espresso__after_pue_init', array( 'EE_Register_Addon', 'load_pue_update' ));
+			add_action('AHEE__EE_System__brew_espresso__after_pue_init', array('EE_Register_Addon', 'load_pue_update'));
 		}
 
 		//any custom post type/ custom capabilities or default terms to register
-		if ( !empty( self::$_settings[$addon_name]['custom_post_types'] ) || !empty( self::$_settings[$addon_name]['custom_taxonomies'] ) ) {
-			EE_Register_CPT::register( $addon_name, array( 'cpts' => self::$_settings[$addon_name]['custom_post_types'] , 'cts' => self::$_settings[$addon_name]['custom_taxonomies'], 'default_terms' => self::$_settings[$addon_name]['default_terms'] ) );
+		if ( ! empty(self::$_settings[$addon_name]['custom_post_types']) || ! empty(self::$_settings[$addon_name]['custom_taxonomies'])) {
+			EE_Register_CPT::register($addon_name, array('cpts' => self::$_settings[$addon_name]['custom_post_types'], 'cts' => self::$_settings[$addon_name]['custom_taxonomies'], 'default_terms' => self::$_settings[$addon_name]['default_terms']));
 		}
-		if( ! empty( self::$_settings[ $addon_name ][ 'payment_method_paths' ] ) ){
-			EE_Register_Payment_Method::register($addon_name, array( 'payment_method_paths' => self::$_settings[ $addon_name ][ 'payment_method_paths' ] ) );
+		if ( ! empty(self::$_settings[$addon_name]['payment_method_paths'])) {
+			EE_Register_Payment_Method::register($addon_name, array('payment_method_paths' => self::$_settings[$addon_name]['payment_method_paths']));
 		}
 		// load and instantiate main addon class
 		$addon = self::_load_and_init_addon_class($addon_name);
 		// call any additional admin_callback functions during load_admin_controller hook
-		if ( ! empty( self::$_settings[ $addon_name ]['admin_callback'] )) {
-			add_action( 'AHEE__EE_System__load_controllers__load_admin_controllers', array( $addon, self::$_settings[ $addon_name ]['admin_callback'] ));
+		if ( ! empty(self::$_settings[$addon_name]['admin_callback'])) {
+			add_action('AHEE__EE_System__load_controllers__load_admin_controllers', array($addon, self::$_settings[$addon_name]['admin_callback']));
 		}
 	}
 
@@ -394,22 +394,22 @@ 
 	 * @param string $addon_name
 	 * @return EE_Addon
 	 */
-	private static function _load_and_init_addon_class($addon_name){
-		$addon = EE_Registry::instance()->load_addon( dirname( self::$_settings[ $addon_name ]['main_file_path'] ), self::$_settings[ $addon_name ]['class_name'] );
-		$addon->set_name( $addon_name );
-		$addon->set_plugin_slug( self::$_settings[ $addon_name ][ 'plugin_slug' ] );
-		$addon->set_plugin_basename( self::$_settings[ $addon_name ][ 'plugin_basename' ] );
-		$addon->set_main_plugin_file( self::$_settings[ $addon_name ]['main_file_path'] );
-		$addon->set_plugin_action_slug( self::$_settings[ $addon_name ][ 'plugin_action_slug' ] );
-		$addon->set_plugins_page_row( self::$_settings[ $addon_name ][ 'plugins_page_row' ] );
-		$addon->set_version( self::$_settings[ $addon_name ]['version'] );
-		$addon->set_min_core_version( self::_effective_version( self::$_settings[ $addon_name ]['min_core_version'] ) );
-		$addon->set_config_section( self::$_settings[ $addon_name ]['config_section'] );
-		$addon->set_config_class( self::$_settings[ $addon_name ]['config_class'] );
-		$addon->set_config_name( self::$_settings[ $addon_name ]['config_name'] );
+	private static function _load_and_init_addon_class($addon_name) {
+		$addon = EE_Registry::instance()->load_addon(dirname(self::$_settings[$addon_name]['main_file_path']), self::$_settings[$addon_name]['class_name']);
+		$addon->set_name($addon_name);
+		$addon->set_plugin_slug(self::$_settings[$addon_name]['plugin_slug']);
+		$addon->set_plugin_basename(self::$_settings[$addon_name]['plugin_basename']);
+		$addon->set_main_plugin_file(self::$_settings[$addon_name]['main_file_path']);
+		$addon->set_plugin_action_slug(self::$_settings[$addon_name]['plugin_action_slug']);
+		$addon->set_plugins_page_row(self::$_settings[$addon_name]['plugins_page_row']);
+		$addon->set_version(self::$_settings[$addon_name]['version']);
+		$addon->set_min_core_version(self::_effective_version(self::$_settings[$addon_name]['min_core_version']));
+		$addon->set_config_section(self::$_settings[$addon_name]['config_section']);
+		$addon->set_config_class(self::$_settings[$addon_name]['config_class']);
+		$addon->set_config_name(self::$_settings[$addon_name]['config_name']);
 		//unfortunately this can't be hooked in upon construction, because we don't have
 		//the plugin mainfile's path upon construction.
-		register_deactivation_hook($addon->get_main_plugin_file(), array($addon,'deactivation'));
+		register_deactivation_hook($addon->get_main_plugin_file(), array($addon, 'deactivation'));
 		return $addon;
 	}
 
@@ -422,18 +422,18 @@ 
 	 */
 	public static function load_pue_update() {
 		// load PUE client
-		require_once  EE_THIRD_PARTY . 'pue' . DS . 'pue-client.php';
+		require_once  EE_THIRD_PARTY.'pue'.DS.'pue-client.php';
 		// cycle thru settings
-		foreach ( self::$_settings as $settings ) {
-			if ( ! empty( $settings['pue_options'] )) {
+		foreach (self::$_settings as $settings) {
+			if ( ! empty($settings['pue_options'])) {
 				// initiate the class and start the plugin update engine!
 				new PluginUpdateEngineChecker(
 				// host file URL
 					'https://eventespresso.com',
 					// plugin slug(s)
 					array(
-						'premium' => array( 'p' => $settings['pue_options']['pue_plugin_slug'] ),
-						'prerelease' => array( 'beta' => $settings['pue_options']['pue_plugin_slug'] . '-pr' )
+						'premium' => array('p' => $settings['pue_options']['pue_plugin_slug']),
+						'prerelease' => array('beta' => $settings['pue_options']['pue_plugin_slug'].'-pr')
 					),
 					// options
 					array(
@@ -461,9 +461,9 @@ 
 	 * @return void
 	 */
 	public static function register_message_types() {
-		foreach ( self::$_settings as $settings ) {
-			foreach( $settings['message_types'] as $message_type => $message_type_settings ) {
-				EE_Register_Message_Type::register( $message_type, $message_type_settings );
+		foreach (self::$_settings as $settings) {
+			foreach ($settings['message_types'] as $message_type => $message_type_settings) {
+				EE_Register_Message_Type::register($message_type, $message_type_settings);
 			}
 		}
 	}
@@ -479,60 +479,60 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function deregister( $addon_name = NULL ) {
-		if ( isset( self::$_settings[ $addon_name ] )) {
-			$class_name = self::$_settings[ $addon_name ]['class_name'];
-			if ( ! empty( self::$_settings[ $addon_name ]['dms_paths'] )) {
+	public static function deregister($addon_name = NULL) {
+		if (isset(self::$_settings[$addon_name])) {
+			$class_name = self::$_settings[$addon_name]['class_name'];
+			if ( ! empty(self::$_settings[$addon_name]['dms_paths'])) {
 				// setup DMS
-				EE_Register_Data_Migration_Scripts::deregister( $addon_name );
+				EE_Register_Data_Migration_Scripts::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['admin_path'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['admin_path'])) {
 				// register admin page
-				EE_Register_Admin_Page::deregister( $addon_name );
+				EE_Register_Admin_Page::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['module_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['module_paths'])) {
 				// add to list of modules to be registered
-				EE_Register_Module::deregister( $addon_name );
+				EE_Register_Module::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['shortcode_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['shortcode_paths'])) {
 				// add to list of shortcodes to be registered
-				EE_Register_Shortcode::deregister( $addon_name );
+				EE_Register_Shortcode::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['config_class'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['config_class'])) {
 				// if config_class present let's register config.
-				EE_Register_Config::deregister( self::$_settings[ $addon_name ]['config_class']);
+				EE_Register_Config::deregister(self::$_settings[$addon_name]['config_class']);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['widget_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['widget_paths'])) {
 				// add to list of widgets to be registered
-				EE_Register_Widget::deregister( $addon_name );
+				EE_Register_Widget::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['model_paths'] ) ||
-					! empty( self::$_settings[ $addon_name ]['class_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['model_paths']) ||
+					! empty(self::$_settings[$addon_name]['class_paths'])) {
 				// add to list of shortcodes to be registered
-				EE_Register_Model::deregister( $addon_name );
+				EE_Register_Model::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['model_extension_paths'] ) ||
-					! empty( self::$_settings[ $addon_name ]['class_extension_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['model_extension_paths']) ||
+					! empty(self::$_settings[$addon_name]['class_extension_paths'])) {
 				// add to list of shortcodes to be registered
-				EE_Register_Model_Extensions::deregister( $addon_name );
+				EE_Register_Model_Extensions::deregister($addon_name);
 				}
-			if (  !empty( self::$_settings[$addon_name]['message_types'] ) ) {
-				foreach( self::$_settings[$addon_name]['message_types'] as $message_type => $message_type_settings ) {
-					EE_Register_Message_Type::deregister( $message_type );
+			if ( ! empty(self::$_settings[$addon_name]['message_types'])) {
+				foreach (self::$_settings[$addon_name]['message_types'] as $message_type => $message_type_settings) {
+					EE_Register_Message_Type::deregister($message_type);
 				}
 			}
 			//deregister capabilities for addon
-			if ( ! empty( self::$_settings[$addon_name]['capabilities'] ) || ! empty( self::$_settings[$addon_name]['capability_maps']) ) {
-				EE_Register_Capabilities::deregister( $addon_name );
+			if ( ! empty(self::$_settings[$addon_name]['capabilities']) || ! empty(self::$_settings[$addon_name]['capability_maps'])) {
+				EE_Register_Capabilities::deregister($addon_name);
 			}
 			//deregister custom_post_types for addon
-			if ( ! empty( self::$_settings[$addon_name]['custom_post_types'] ) ) {
-				EE_Register_CPT::deregister( $addon_name );
+			if ( ! empty(self::$_settings[$addon_name]['custom_post_types'])) {
+				EE_Register_CPT::deregister($addon_name);
 			}
-			remove_action('deactivate_'.EE_Registry::instance()->addons->{$class_name}->get_main_plugin_file_basename(),  array( EE_Registry::instance()->addons->{$class_name}, 'deactivation' ) );
-			remove_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( EE_Registry::instance()->addons->{$class_name}, 'initialize_db_if_no_migrations_required' ) );
+			remove_action('deactivate_'.EE_Registry::instance()->addons->{$class_name}->get_main_plugin_file_basename(), array(EE_Registry::instance()->addons->{$class_name}, 'deactivation'));
+			remove_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array(EE_Registry::instance()->addons->{$class_name}, 'initialize_db_if_no_migrations_required'));
 			unset(EE_Registry::instance()->addons->{$class_name});
-			unset( self::$_settings[ $addon_name ] );
+			unset(self::$_settings[$addon_name]);
 		}
 	}
 

core/libraries/qtips/EE_Qtip_Config.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
 	 * return the _qtips property contents
 	 *
 	 * @access public
-	 * @return EE_Qtip[]
+	 * @return EE_Qtip
 	 */
 	public function get_tips() {
 		return $this->_qtips;

Spacing +10 added lines, -10 removed lines

@@ -142,7 +142,7 @@ 
 				'event' => 'mouseleave', //similar as what you do for show.event.
 				'target' => false, //Options jQuery::#selector. which html element will trigger hide event. When false, the element the .qtip() method was called upon is used.
 				'delay' => 0, //set time in milliseconds for delaying the hide of the tooltip
-				'inactive' => false,  //if integer, time in millisecons in which the tooltip should be hidden if remains inactive (not interacted with)
+				'inactive' => false, //if integer, time in millisecons in which the tooltip should be hidden if remains inactive (not interacted with)
 				'fixed' => false, //when set to true, the tooltip will not hide if moused over.
 				'leave' => 'window', //specify whether the tooltip will hide when leaving the window it's conained within.
 				'distance' => false, //if integer, distance in pixels that the tooltip hides when the mouse is moved from the point it triggered the tooltip.
@@ -175,21 +175,21 @@ 
 	 * @return void
 	 */
 	protected function _construct_tips() {
-		foreach ( $this->_qtipsa as $qt ) {
+		foreach ($this->_qtipsa as $qt) {
 			//make sure we have what we need.
-			if ( !isset( $qt['content_id'] ) || !isset( $qt['target'] ) || !isset( $qt['content'] ) )
-				throw new EE_Error( sprintf( __('There is something wrong with the _qtipsa property setup for the %s qtip config class.  The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true) ) );
+			if ( ! isset($qt['content_id']) || ! isset($qt['target']) || ! isset($qt['content']))
+				throw new EE_Error(sprintf(__('There is something wrong with the _qtipsa property setup for the %s qtip config class.  The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true)));
 
 			//make sure the options include defaults and just override via set config.
-			$options_override = isset( $qt['options'] ) ? (array) $qt['options'] : array();
-			$options = array_merge( $this->_default_options, $options_override );
+			$options_override = isset($qt['options']) ? (array) $qt['options'] : array();
+			$options = array_merge($this->_default_options, $options_override);
 			$setup = array(
 				'content_id' => $qt['content_id'],
 				'options' => $options,
 				'target' => $qt['target'],
 				'content' => $qt['content']
 				);
-			$this->_qtips[] = new EE_Qtip( $setup );
+			$this->_qtips[] = new EE_Qtip($setup);
 		}
 	}
 
@@ -264,9 +264,9 @@ 
 	public $target;
 	public $content;
 
-	public function __construct( $setup_array ) {
-		foreach ( $setup_array as $prop => $value ) {
-			if ( EEH_Class_Tools::has_property( $this, $prop ) )
+	public function __construct($setup_array) {
+		foreach ($setup_array as $prop => $value) {
+			if (EEH_Class_Tools::has_property($this, $prop))
 				$this->$prop = $value;
 		}
 	}

Braces +6 added lines, -4 removed lines

@@ -177,8 +177,9 @@ 
 	protected function _construct_tips() {
 		foreach ( $this->_qtipsa as $qt ) {
 			//make sure we have what we need.
-			if ( !isset( $qt['content_id'] ) || !isset( $qt['target'] ) || !isset( $qt['content'] ) )
-				throw new EE_Error( sprintf( __('There is something wrong with the _qtipsa property setup for the %s qtip config class.  The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true) ) );
+			if ( !isset( $qt['content_id'] ) || !isset( $qt['target'] ) || !isset( $qt['content'] ) ) {
+							throw new EE_Error( sprintf( __('There is something wrong with the _qtipsa property setup for the %s qtip config class.  The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true) ) );
+			}
 
 			//make sure the options include defaults and just override via set config.
 			$options_override = isset( $qt['options'] ) ? (array) $qt['options'] : array();
@@ -266,8 +267,9 @@ 
 
 	public function __construct( $setup_array ) {
 		foreach ( $setup_array as $prop => $value ) {
-			if ( EEH_Class_Tools::has_property( $this, $prop ) )
-				$this->{$prop} = $value;
+			if ( EEH_Class_Tools::has_property( $this, $prop ) ) {
+							$this->{$prop} = $value;
+			}
 		}
 	}
 }
\ No newline at end of file

core/libraries/shortcodes/EE_Event_Shortcodes.lib.php

Doc Comments +1 added lines

@@ -179,6 +179,7 @@
 	/**
 	 * returns the link to the event
 	 * @param  boolean $full_link if TRUE (default) we return the html for the name of the event linked to the event.  Otherwise we just return the url of the event.
+	 * @param EE_Event $event
 	 * @return string
 	 */
 	private function _get_event_link( $event, $full_link = TRUE ) {

Braces +11 added lines, -7 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -85,8 +86,9 @@ 
 
 
 		//If there is no event objecdt by now then get out.
-		if ( ! $this->_event instanceof EE_Event )
-			return '';
+		if ( ! $this->_event instanceof EE_Event ) {
+					return '';
+		}
 
 		switch ( $shortcode ) {
 
@@ -125,14 +127,16 @@ 
 
 			case '[VIRTUAL_URL]' :
 				$venue = $this->_event->get_first_related('Venue');
-				if ( empty( $venue ) )
-					return '';
+				if ( empty( $venue ) ) {
+									return '';
+				}
 				return $venue->get('VNU_virtual_url');
 
 			case '[VIRTUAL_PHONE]' :
 				$venue = $this->_event->get_first_related('Venue');
-				if ( empty( $venue ) )
-					return '';
+				if ( empty( $venue ) ) {
+									return '';
+				}
 				return $venue->get('VNU_virtual_phone');
 				break;
 

Spacing +32 added lines, -32 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -56,34 +56,34 @@ 
 			'[EVENT_NAME]' => __("This also can be used for the name of the event", 'event_espresso'),
 			'[EVENT_PHONE]' => __('The phone number for the event (usually an info number)', 'event_espresso'),
 			'[EVENT_DESCRIPTION]' => __('The description of the event', 'event_espresso'),
-			'[EVENT_EXCERPT]' => __( 'This gets parsed to the value for the excerpt field in the event or blank if there is no excerpt.', 'event_espresso' ),
+			'[EVENT_EXCERPT]' => __('This gets parsed to the value for the excerpt field in the event or blank if there is no excerpt.', 'event_espresso'),
 			'[EVENT_LINK]' => __('A link associated with the event', 'event_espresso'),
 			'[EVENT_URL]' => __('A link to the event set up on the host site.', 'event_espresso'),
 			'[VIRTUAL_URL]' => __('What was used for the "URL of Event" field in the Venue settings', 'event_espresso'),
 			'[VIRTUAL_PHONE]' => __('An alternate phone number for the event. Typically used as a "call-in" number', 'event_espresso'),
 			'[EVENT_IMAGE]' => __('This will parse to the Feature image for the event.', 'event_espresso'),
 			'[EVENT_TOTAL_AVAILABLE_SPACES_*]' => sprintf(
-				__( 'This will parse to the total available spaces for an event. Calculating total spaces is approximate because it is dependent on the complexity of limits on your event.  There are two methods of calculation (which can be indicated by the %1$smethod%2$s param on the shortcode).  %1$scurrent%2$s which will do a more accurate calculation of total available spaces based on current sales, and %1$sfull%2$s which will be the maximum total available spaces that is on the event in optimal conditions. The shortcode will default to current.', 'event_espresso' ),
+				__('This will parse to the total available spaces for an event. Calculating total spaces is approximate because it is dependent on the complexity of limits on your event.  There are two methods of calculation (which can be indicated by the %1$smethod%2$s param on the shortcode).  %1$scurrent%2$s which will do a more accurate calculation of total available spaces based on current sales, and %1$sfull%2$s which will be the maximum total available spaces that is on the event in optimal conditions. The shortcode will default to current.', 'event_espresso'),
 				'<code>',
 				'</code>'
 				),
-			'[EVENT_TOTAL_SPOTS_TAKEN]' => __( 'This shortcode will parse to the output the total approved registrations for this event', 'event_espresso' ),
+			'[EVENT_TOTAL_SPOTS_TAKEN]' => __('This shortcode will parse to the output the total approved registrations for this event', 'event_espresso'),
 			'[EVENT_FACEBOOK_URL]' => __('This will return the Facebook URL for the event if you have it set via custom field in your event, otherwise it will use the Facebook URL set in "Your Organization Settings". To set the facebook url in your event, add a custom field with the key as <code>event_facebook</code> and the value as your facebook url.', 'event_espresso'),
 			'[EVENT_TWITTER_URL]' => __('This will return the Twitter URL for the event if you have it set via custom field in your event, otherwise it will use the Twitter URL set in "Your Organization Settings". To set the facebook url in your event, add a custom field with the key as <code>event_twitter</code> and the value as your facebook url', 'event_espresso'),
 			'[EVENT_META_*]' => __('This is a special dynamic shortcode. After the "*", add the exact name for your custom field, if there is a value set for that custom field within the event then it will be output in place of this shortcode.', 'event_espresso'),
-			'[REGISTRATION_LIST_TABLE_FOR_EVENT_URL]' => __( 'This parses to the url for the registration list table filtered by registrations for this event.', 'event_espresso' ),
+			'[REGISTRATION_LIST_TABLE_FOR_EVENT_URL]' => __('This parses to the url for the registration list table filtered by registrations for this event.', 'event_espresso'),
 			);
 	}
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		EE_Registry::instance()->load_helper( 'Formatter' );
+		EE_Registry::instance()->load_helper('Formatter');
 
 		$this->_event = $this->_data instanceof EE_Event ? $this->_data : null;
 
 		//if no event, then let's see if there is a reg_obj.  If there IS, then we'll try and grab the event from the reg_obj instead.
-		if ( empty( $this->_event ) ) {
+		if (empty($this->_event)) {
 			$aee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
 			$aee = $this->_extra_data instanceof EE_Messages_Addressee ? $this->_extra_data : $aee;
 
@@ -92,17 +92,17 @@ 
 
 
 		//If there is no event objecdt by now then get out.
-		if ( ! $this->_event instanceof EE_Event )
+		if ( ! $this->_event instanceof EE_Event)
 			return '';
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[EVENT_ID]' :
 				return $this->_event->ID();
 				break;
 
 			case '[EVENT_IDENTIFIER]' :
-				return isset($this->_data['line_ref']) ? $this->_data['line_ref']: '';
+				return isset($this->_data['line_ref']) ? $this->_data['line_ref'] : '';
 				break;
 
 			case '[EVENT]' :
@@ -132,71 +132,71 @@ 
 
 			case '[VIRTUAL_URL]' :
 				$venue = $this->_event->get_first_related('Venue');
-				if ( empty( $venue ) )
+				if (empty($venue))
 					return '';
 				return $venue->get('VNU_virtual_url');
 
 			case '[VIRTUAL_PHONE]' :
 				$venue = $this->_event->get_first_related('Venue');
-				if ( empty( $venue ) )
+				if (empty($venue))
 					return '';
 				return $venue->get('VNU_virtual_phone');
 				break;
 
 			case '[EVENT_IMAGE]' :
-				$image = $this->_event->feature_image_url(array(600,300) );
+				$image = $this->_event->feature_image_url(array(600, 300));
 				// @todo: eventually we should make this an attribute shortcode so that em can send along what size they want returned.
-				return !empty( $image ) ? '<img src="' . $image . '" alt="' . sprintf( esc_attr__( '%s Feature Image', 'event_espresso'), $this->_event->get('EVT_name') ) . '" />' : '';
+				return ! empty($image) ? '<img src="'.$image.'" alt="'.sprintf(esc_attr__('%s Feature Image', 'event_espresso'), $this->_event->get('EVT_name')).'" />' : '';
 				break;
 
 			case '[EVENT_FACEBOOK_URL]' :
-				$facebook_url = $this->_event->get_post_meta('event_facebook', true );
-				return empty( $facebook_url ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' ) : $facebook_url;
+				$facebook_url = $this->_event->get_post_meta('event_facebook', true);
+				return empty($facebook_url) ? EE_Registry::instance()->CFG->organization->get_pretty('facebook') : $facebook_url;
 				break;
 
 			case '[EVENT_TWITTER_URL]' :
 				$twitter_url = $this->_event->get_post_meta('event_twitter', true);
-				return empty( $twitter_url ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' ) : $twitter_url;
+				return empty($twitter_url) ? EE_Registry::instance()->CFG->organization->get_pretty('twitter') : $twitter_url;
 				break;
 
 			case '[EVENT_AUTHOR_EMAIL]' :
 				$author_id = $this->_event->get('EVT_wp_user');
-				$user_data = get_userdata( (int) $author_id );
+				$user_data = get_userdata((int) $author_id);
 				return $user_data->user_email;
 				break;
 
 			case '[EVENT_TOTAL_SPOTS_TAKEN]' :
-				return EEM_Registration::instance()->count( array( array( 'EVT_ID' => $this->_event->ID(), 'STS_ID' => EEM_Registration::status_id_approved ) ), 'REG_ID', true );
+				return EEM_Registration::instance()->count(array(array('EVT_ID' => $this->_event->ID(), 'STS_ID' => EEM_Registration::status_id_approved)), 'REG_ID', true);
 				break;
 
 			case '[REGISTRATION_LIST_TABLE_FOR_EVENT_URL]' :
-				EE_Registry::instance()->load_helper( 'URL' );
+				EE_Registry::instance()->load_helper('URL');
 				return EEH_URL::add_query_args_and_nonce(
 					array(
 						'event_id' => $this->_event->ID(),
 						'page' => 'espresso_registrations',
 						'action' => 'default'
 					),
-					admin_url( 'admin.php' ),
+					admin_url('admin.php'),
 					true
 				);
 				break;
 		}
 
-		if ( strpos( $shortcode, '[EVENT_META_*' ) !== false ) {
-			$shortcode = str_replace( '[EVENT_META_*', '', $shortcode );
-			$shortcode = trim( str_replace( ']', '', $shortcode ) );
+		if (strpos($shortcode, '[EVENT_META_*') !== false) {
+			$shortcode = str_replace('[EVENT_META_*', '', $shortcode);
+			$shortcode = trim(str_replace(']', '', $shortcode));
 
 			//pull the meta value from the event post
-			$event_meta = $this->_event->get_post_meta( $shortcode, true );
+			$event_meta = $this->_event->get_post_meta($shortcode, true);
 
-			return !empty( $event_meta ) ? $this->_event->get_post_meta( $shortcode, true ) : '';
+			return ! empty($event_meta) ? $this->_event->get_post_meta($shortcode, true) : '';
 
 		}
 
-		if ( strpos( $shortcode, '[EVENT_TOTAL_AVAILABLE_SPACES_*' ) !== false ) {
-			$attrs = $this->_get_shortcode_attrs( $shortcode );
-			$method = empty( $attrs['method'] ) ? 'current' : $attrs['method'];
+		if (strpos($shortcode, '[EVENT_TOTAL_AVAILABLE_SPACES_*') !== false) {
+			$attrs = $this->_get_shortcode_attrs($shortcode);
+			$method = empty($attrs['method']) ? 'current' : $attrs['method'];
 			$method = $method === 'current';
 			$available = $this->_event->total_available_spaces($method);
 			return $available === INF ? '&infin;' : $available;
@@ -212,10 +212,10 @@ 
 	 * @param  boolean $full_link if TRUE (default) we return the html for the name of the event linked to the event.  Otherwise we just return the url of the event.
 	 * @return string
 	 */
-	private function _get_event_link( $event, $full_link = TRUE ) {
+	private function _get_event_link($event, $full_link = TRUE) {
 		$url = get_permalink($event->ID());
 
-		return $full_link ? '<a href="' . $url . '">' . $event->get('EVT_name') . '</a>' : $url;
+		return $full_link ? '<a href="'.$url.'">'.$event->get('EVT_name').'</a>' : $url;
 	}
 
 

core/libraries/shortcodes/EE_Messenger_Shortcodes.lib.php

Doc Comments +1 added lines

@@ -116,6 +116,7 @@
 	 *
 	 * @since 4.5.0
 	 *
+	 * @param string $type
 	 * @return string The generated url for displaying the link.
 	 */
 	private function _get_url( EE_Messages_Addressee $recipient, $type ) {

Spacing +24 added lines, -24 removed lines

@@ -44,18 +44,18 @@ 
 		//add messages about what happens  when the messenger is active.
 		$this->_active_messengers = EE_Registry::instance()->load_lib('messages')->get_active_messengers();
 
-		$this->_shortcodes['[DISPLAY_HTML_URL]'] =__('This will return a link to view the template in a browser if the html messenger is active.', 'event_espresso');
-		$this->_shortcodes['[DISPLAY_PDF_URL]'] = __('This will return a link to generate a pdf for the template if the pdf messenger is active.', 'event_espresso' );
+		$this->_shortcodes['[DISPLAY_HTML_URL]'] = __('This will return a link to view the template in a browser if the html messenger is active.', 'event_espresso');
+		$this->_shortcodes['[DISPLAY_PDF_URL]'] = __('This will return a link to generate a pdf for the template if the pdf messenger is active.', 'event_espresso');
 		$this->_shortcodes['[DISPLAY_PDF_BUTTON]'] = __('This will return html for a download pdf button trigger if the pdf messenger is active.', 'event_espresso');
 
 		//show error message about buttons/urls not working as expected if messenger deactivated.
-		if ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'update_message_template' ) {
-			if ( ! isset( $this->_active_messengers['pdf'] ) ) {
-				EE_Error::add_attention( __('Be aware that the pdf messenger is inactive.  This means that any pdf related shortcodes will parse to an empty string.', 'event_espresso' ) );
+		if (is_admin() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'update_message_template') {
+			if ( ! isset($this->_active_messengers['pdf'])) {
+				EE_Error::add_attention(__('Be aware that the pdf messenger is inactive.  This means that any pdf related shortcodes will parse to an empty string.', 'event_espresso'));
 			}
 
-			if ( !isset( $this->_active_messengers['html'] ) ) {
-				EE_Error::add_attention( __('Be aware that the html messenger is inactive. This means that any html related shortcodes will parse to an empty string.', 'event_espresso' ) );
+			if ( ! isset($this->_active_messengers['html'])) {
+				EE_Error::add_attention(__('Be aware that the html messenger is inactive. This means that any html related shortcodes will parse to an empty string.', 'event_espresso'));
 			}
 		}
 
@@ -63,24 +63,24 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 		//make sure we end up with a copy of the EE_Messages_Addressee object
 		$recipient = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $recipient;
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $recipient;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $recipient;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $recipient;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee )
+		if ( ! $recipient instanceof EE_Messages_Addressee)
 			return '';
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[DISPLAY_HTML_URL]' :
-				return  isset( $this->_active_messengers['html'] ) ? $this->_get_url( $recipient, 'html' ) : '';
+				return  isset($this->_active_messengers['html']) ? $this->_get_url($recipient, 'html') : '';
 				break;
 			case '[DISPLAY_PDF_URL]' :
-				return  isset( $this->_active_messengers['pdf'] ) ? $this->_get_url( $recipient, 'pdf' ) : '';
+				return  isset($this->_active_messengers['pdf']) ? $this->_get_url($recipient, 'pdf') : '';
 				break;
 			case '[DISPLAY_PDF_BUTTON]' :
-				return  isset( $this->_active_messengers['pdf'] ) ? $this->_get_button( $recipient, 'pdf' ) : '';
+				return  isset($this->_active_messengers['pdf']) ? $this->_get_button($recipient, 'pdf') : '';
 				break;
 		}
 		return '';
@@ -98,11 +98,11 @@ 
 	 *
 	 * @return string                Generated html
 	 */
-	private function _get_button( EE_Messages_Addressee $recipient, $type ) {
-		$download_text = $type == 'pdf' ? __('Download PDF', 'event_espresso') : __('Show HTML', 'event_espresso' );
+	private function _get_button(EE_Messages_Addressee $recipient, $type) {
+		$download_text = $type == 'pdf' ? __('Download PDF', 'event_espresso') : __('Show HTML', 'event_espresso');
 		$content = '
-<form method="post" action="' . $this->_get_url( $recipient, $type ) . '" >
-	<input class="print_button" type="submit" value="' . $download_text . '" />
+<form method="post" action="' . $this->_get_url($recipient, $type).'" >
+	<input class="print_button" type="submit" value="' . $download_text.'" />
 </form>
 		';
 		return $content;
@@ -118,10 +118,10 @@ 
 	 *
 	 * @return string The generated url for displaying the link.
 	 */
-	private function _get_url( EE_Messages_Addressee $recipient, $type ) {
+	private function _get_url(EE_Messages_Addressee $recipient, $type) {
 
 		//get out early if the given messenger is not active!
-		if ( ! isset( $this->_active_messengers[$type]) ) {
+		if ( ! isset($this->_active_messengers[$type])) {
 			return '';
 		}
 
@@ -129,12 +129,12 @@ 
 		$reg = ! $reg instanceof EE_Registration ? $recipient->primary_reg_obj : $reg;
 
 		//if no reg object then we really can't do anything at this point.
-		if ( ! $reg instanceof EE_Registration ) {
+		if ( ! $reg instanceof EE_Registration) {
 			return '';
 		}
 
-		if ( $this->_message_type instanceof EE_message_type ) {
-			return $this->_message_type->get_url_trigger( $this->_context, $type, $reg );
+		if ($this->_message_type instanceof EE_message_type) {
+			return $this->_message_type->get_url_trigger($this->_context, $type, $reg);
 		}
 
 		return '';

Braces +6 added lines, -3 removed lines

@@ -6,7 +6,9 @@ 
  * @package Event Espresso
  * @subpackage shortcodes library
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * EE_Messenger_Shortcodes
  *
@@ -69,8 +71,9 @@ 
 		$recipient = ! $recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $recipient;
 		$recipient = ! $recipient instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $recipient;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee )
-			return '';
+		if ( ! $recipient instanceof EE_Messages_Addressee ) {
+					return '';
+		}
 
 		switch ( $shortcode ) {
 			case '[DISPLAY_HTML_URL]' :

core/libraries/shortcodes/EE_Primary_Registration_List_Shortcodes.lib.php

Doc Comments +6 added lines

@@ -109,6 +109,9 @@ 
 	}
 
 
+	/**
+	 * @param EE_Registration $reg
+	 */
 	private function _get_tickets_from_event( EE_Event $event, $reg = NULL ) {
 		$evt_tkts = isset($this->_extra_data['data']->events) ? $this->_extra_data['data']->events[$event->ID()]['tkt_objs'] : array();
 
@@ -177,6 +180,9 @@ 
 
 
 
+	/**
+	 * @param EE_Registration $reg
+	 */
 	private function _get_datetimes_from_event( EE_Event $event, $reg = NULL ) {
 		$evt_dtts = isset($this->_extra_data['data']->events) ? $this->_extra_data['data']->events[$event->ID()]['dtt_objs'] : array();
 

Spacing +40 added lines, -40 removed lines

@@ -43,15 +43,15 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
-		switch ( $shortcode ) {
+	protected function _parser($shortcode) {
+		switch ($shortcode) {
 
 			case '[PRIMARY_REGISTRANT_TICKET_LIST]' :
-				return $this->_get_recipient_ticket_list( TRUE );
+				return $this->_get_recipient_ticket_list(TRUE);
 				break;
 
 			case '[PRIMARY_REGISTRANT_DATETIME_LIST]' :
-				return $this->_get_recipient_datetime_list( TRUE );
+				return $this->_get_recipient_datetime_list(TRUE);
 				break;
 		}
 		return '';
@@ -65,58 +65,58 @@ 
 	 * @param  boolean $primary whether we're getting the primary registrant ticket_list.
 	 * @return string
 	 */
-	private function _get_recipient_ticket_list( $primary = FALSE ) {
+	private function _get_recipient_ticket_list($primary = FALSE) {
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_ticket_list_parsed( $this->_data['data'], $primary );
+		if ($this->_data['data'] instanceof EE_Messages_Addressee)
+			return $this->_get_recipient_ticket_list_parsed($this->_data['data'], $primary);
 
-		else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_ticket_list_parsed( $this->_extra_data['data'], $primary );
+		else if ($this->_extra_data['data'] instanceof EE_Messages_Addressee)
+			return $this->_get_recipient_ticket_list_parsed($this->_extra_data['data'], $primary);
 
 		else
 			return '';
 	}
 
 
-	private function _get_recipient_ticket_list_parsed( EE_Messages_Addressee $data, $primary = FALSE ) {
+	private function _get_recipient_ticket_list_parsed(EE_Messages_Addressee $data, $primary = FALSE) {
 		$registration = $primary ? $data->primary_reg_obj : $data->reg_obj;
-			if ( ! $registration instanceof EE_Registration ) return '';
+			if ( ! $registration instanceof EE_Registration) return '';
 		//setup valid shortcodes depending on what the status of the $this->_data property is
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
-			$valid_shortcodes = array('ticket', 'event_list', 'attendee_list','datetime_list', 'registration_details', 'attendee');
+		if ($this->_data['data'] instanceof EE_Messages_Addressee) {
+			$valid_shortcodes = array('ticket', 'event_list', 'attendee_list', 'datetime_list', 'registration_details', 'attendee');
 			$template = $this->_data['template'];
 			$tkts = array($data->registrations[$registration->ID()]['tkt_obj']);
 			$data = $this->_data;
-		} elseif ( $this->_data['data'] instanceof EE_Event ) {
+		} elseif ($this->_data['data'] instanceof EE_Event) {
 			$valid_shortcodes = array('ticket', 'attendee_list', 'datetime_list', 'attendee');
-			$template = is_array($this->_data['template'] ) && isset($this->_data['template']['ticket_list']) ? $this->_data['template']['ticket_list'] : $this->_extra_data['template']['ticket_list'];
+			$template = is_array($this->_data['template']) && isset($this->_data['template']['ticket_list']) ? $this->_data['template']['ticket_list'] : $this->_extra_data['template']['ticket_list'];
 			//let's remove any existing [EVENT_LIST] shortcode from the ticket list template so that we don't get recursion.
 			$template = str_replace('[EVENT_LIST]', '', $template);
 			//data will be tickets for this event for this recipient.
-			$tkts = $this->_get_tickets_from_event( $this->_data['data'], $registration );
+			$tkts = $this->_get_tickets_from_event($this->_data['data'], $registration);
 			$data = $this->_extra_data;
 		} else {
 			return '';
 		}
 
 		$tktparsed = '';
-		foreach ( $tkts as $ticket ) {
-			$tktparsed .= $this->_shortcode_helper->parse_ticket_list_template( $template, $ticket, $valid_shortcodes, $data );
+		foreach ($tkts as $ticket) {
+			$tktparsed .= $this->_shortcode_helper->parse_ticket_list_template($template, $ticket, $valid_shortcodes, $data);
 		}
 		return $tktparsed;
 	}
 
 
-	private function _get_tickets_from_event( EE_Event $event, $reg = NULL ) {
+	private function _get_tickets_from_event(EE_Event $event, $reg = NULL) {
 		$evt_tkts = isset($this->_extra_data['data']->events) ? $this->_extra_data['data']->events[$event->ID()]['tkt_objs'] : array();
 
-		if ( $reg instanceof EE_Registration && $this->_extra_data['data'] instanceof EE_Messages_Addressee ) {
+		if ($reg instanceof EE_Registration && $this->_extra_data['data'] instanceof EE_Messages_Addressee) {
 			$adj_tkts = array();
 			//return only tickets for the given attendee
-			foreach ( $evt_tkts as $tkt ) {
-				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj'] ) && $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']->ID() == $tkt->ID() )
+			foreach ($evt_tkts as $tkt) {
+				if (isset($this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']) && $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']->ID() == $tkt->ID())
 					$adj_tkts[] = $tkt;
 			}
 			$evt_tkts = $adj_tkts;
@@ -133,58 +133,58 @@ 
 	 * @param  boolean $primary whether we're getting the primary registrant ticket_list.
 	 * @return string
 	 */
-	private function _get_recipient_datetime_list( $primary = FALSE ) {
+	private function _get_recipient_datetime_list($primary = FALSE) {
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary );
+		if ($this->_data['data'] instanceof EE_Messages_Addressee)
+			return $this->_get_recipient_datetime_list_parsed($this->_data['data'], $primary);
 
-		else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_datetime_list_parsed( $this->_extra_data['data'], $primary );
+		else if ($this->_extra_data['data'] instanceof EE_Messages_Addressee)
+			return $this->_get_recipient_datetime_list_parsed($this->_extra_data['data'], $primary);
 
 		else
 			return '';
 
-		return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary);
+		return $this->_get_recipient_datetime_list_parsed($this->_data['data'], $primary);
 	}
 
 
-	private function _get_recipient_datetime_list_parsed( EE_Messages_Addressee $data, $primary = FALSE ) {
+	private function _get_recipient_datetime_list_parsed(EE_Messages_Addressee $data, $primary = FALSE) {
 		$registration = $primary ? $data->primary_reg_obj : $data->reg_obj;
-		if ( ! $registration instanceof EE_Registration ) return '';
+		if ( ! $registration instanceof EE_Registration) return '';
 		//setup valid shortcodes depending on what the status of the $this->_data property is
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
+		if ($this->_data['data'] instanceof EE_Messages_Addressee) {
 			$valid_shortcodes = array('datetime', 'attendee');
 			$template = $this->_data['template'];
 			$dtts = $data->registrations[$registration->ID()]['dtt_objs'];
 			$data = $this->_data;
-		} elseif ( $this->_data['data'] instanceof EE_Event ) {
+		} elseif ($this->_data['data'] instanceof EE_Event) {
 			$valid_shortcodes = array('datetime', 'attendee');
-			$template = is_array($this->_data['template'] ) && isset($this->_data['template']['datetime_list']) ? $this->_data['template']['datetime_list'] : $this->_extra_data['template']['datetime_list'];
-			$dtts = $this->_get_datetimes_from_event( $this->_data['data'], $registration );
+			$template = is_array($this->_data['template']) && isset($this->_data['template']['datetime_list']) ? $this->_data['template']['datetime_list'] : $this->_extra_data['template']['datetime_list'];
+			$dtts = $this->_get_datetimes_from_event($this->_data['data'], $registration);
 			$data = $this->_extra_data;
 		} else {
 			return '';
 		}
 
 		$dtt_parsed = '';
-		foreach ( $dtts as $datetime ) {
-			$dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template( $template, $datetime, $valid_shortcodes, $this->_extra_data );
+		foreach ($dtts as $datetime) {
+			$dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template($template, $datetime, $valid_shortcodes, $this->_extra_data);
 		}
 		return $dtt_parsed;
 	}
 
 
 
-	private function _get_datetimes_from_event( EE_Event $event, $reg = NULL ) {
+	private function _get_datetimes_from_event(EE_Event $event, $reg = NULL) {
 		$evt_dtts = isset($this->_extra_data['data']->events) ? $this->_extra_data['data']->events[$event->ID()]['dtt_objs'] : array();
 
-		if ( $reg instanceof EE_Registration && $this->_extra_data['data'] instanceof EE_Messages_Addressee ) {
+		if ($reg instanceof EE_Registration && $this->_extra_data['data'] instanceof EE_Messages_Addressee) {
 			$adj_dtts = array();
 			//return only dtts for the given attendee
-			foreach ( $evt_dtts as $dtt ) {
-				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['dtt_objs'][$dtt->ID()] ) )
+			foreach ($evt_dtts as $dtt) {
+				if (isset($this->_extra_data['data']->registrations[$reg->ID()]['dtt_objs'][$dtt->ID()]))
 					$adj_dtts[] = $dtt;
 			}
 			$evt_dtts = $adj_dtts;

Braces +26 added lines, -22 removed lines

@@ -69,20 +69,21 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_ticket_list_parsed( $this->_data['data'], $primary );
-
-		else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_ticket_list_parsed( $this->_extra_data['data'], $primary );
-
-		else
-			return '';
+		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_recipient_ticket_list_parsed( $this->_data['data'], $primary );
+		} else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_recipient_ticket_list_parsed( $this->_extra_data['data'], $primary );
+		} else {
+					return '';
+		}
 	}
 
 
 	private function _get_recipient_ticket_list_parsed( EE_Messages_Addressee $data, $primary = FALSE ) {
 		$registration = $primary ? $data->primary_reg_obj : $data->reg_obj;
-			if ( ! $registration instanceof EE_Registration ) return '';
+			if ( ! $registration instanceof EE_Registration ) {
+				return '';
+			}
 		//setup valid shortcodes depending on what the status of the $this->_data property is
 		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
 			$valid_shortcodes = array('ticket', 'event_list', 'attendee_list','datetime_list', 'registration_details', 'attendee');
@@ -116,8 +117,9 @@ 
 			$adj_tkts = array();
 			//return only tickets for the given attendee
 			foreach ( $evt_tkts as $tkt ) {
-				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj'] ) && $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']->ID() == $tkt->ID() )
-					$adj_tkts[] = $tkt;
+				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj'] ) && $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']->ID() == $tkt->ID() ) {
+									$adj_tkts[] = $tkt;
+				}
 			}
 			$evt_tkts = $adj_tkts;
 		}
@@ -137,14 +139,13 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary );
-
-		else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_datetime_list_parsed( $this->_extra_data['data'], $primary );
-
-		else
-			return '';
+		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary );
+		} else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_recipient_datetime_list_parsed( $this->_extra_data['data'], $primary );
+		} else {
+					return '';
+		}
 
 		return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary);
 	}
@@ -152,7 +153,9 @@ 
 
 	private function _get_recipient_datetime_list_parsed( EE_Messages_Addressee $data, $primary = FALSE ) {
 		$registration = $primary ? $data->primary_reg_obj : $data->reg_obj;
-		if ( ! $registration instanceof EE_Registration ) return '';
+		if ( ! $registration instanceof EE_Registration ) {
+			return '';
+		}
 		//setup valid shortcodes depending on what the status of the $this->_data property is
 		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
 			$valid_shortcodes = array('datetime', 'attendee');
@@ -184,8 +187,9 @@ 
 			$adj_dtts = array();
 			//return only dtts for the given attendee
 			foreach ( $evt_dtts as $dtt ) {
-				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['dtt_objs'][$dtt->ID()] ) )
-					$adj_dtts[] = $dtt;
+				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['dtt_objs'][$dtt->ID()] ) ) {
+									$adj_dtts[] = $dtt;
+				}
 			}
 			$evt_dtts = $adj_dtts;
 		}

Indentation +25 added lines, -25 removed lines

@@ -1,30 +1,30 @@
 <?php
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package			Event Espresso
- * @ author				Seth Shoultes
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link				http://www.eventespresso.com
- * @ version		 	4.0
- *
- * ------------------------------------------------------------------------
- *
- * EE_Primary_Registration_List_Shortcodes
- *
- * this is a child class for the EE_Shortcodes library.  The EE_Primary_Registration_List_Shortcodes lists all list type shortcodes related to primary registration specific info.  Meaning, that when this is parsed, this only parses for Primary Registrants.
- *
- * NOTE: if a method doesn't have any phpdoc commenting the details can be found in the comments in EE_Shortcodes parent class.
- *
- * @package		Event Espresso
- * @subpackage	libraries/shortcodes/EE_Primary_Registration_List_Shortcodes.lib.php
- * @author		Darren Ethier
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package			Event Espresso
+	 * @ author				Seth Shoultes
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+	 * @ link				http://www.eventespresso.com
+	 * @ version		 	4.0
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * EE_Primary_Registration_List_Shortcodes
+	 *
+	 * this is a child class for the EE_Shortcodes library.  The EE_Primary_Registration_List_Shortcodes lists all list type shortcodes related to primary registration specific info.  Meaning, that when this is parsed, this only parses for Primary Registrants.
+	 *
+	 * NOTE: if a method doesn't have any phpdoc commenting the details can be found in the comments in EE_Shortcodes parent class.
+	 *
+	 * @package		Event Espresso
+	 * @subpackage	libraries/shortcodes/EE_Primary_Registration_List_Shortcodes.lib.php
+	 * @author		Darren Ethier
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 class EE_Primary_Registration_List_Shortcodes extends EE_Shortcodes {
 
 	public function __construct() {

core/libraries/shortcodes/EE_Transaction_Shortcodes.lib.php

Doc Comments +3 added lines

@@ -269,6 +269,9 @@
 
 
 
+	/**
+	 * @param EE_Transaction $transaction
+	 */
 	private function _get_payment_gateway( $transaction ) {
 		$pm = $this->_get_payment_method( $transaction );
 		return $pm instanceof EE_Payment_Method ? $pm->name() : '';

Braces +8 added lines, -6 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -92,8 +93,9 @@ 
 		$payment = ! $payment instanceof EE_Payment && is_array( $this->_extra_data ) &&  isset( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->payment: $payment;
 
 
-		if ( ! $transaction instanceof EE_Transaction )
-			return '';
+		if ( ! $transaction instanceof EE_Transaction ) {
+					return '';
+		}
 
 		switch ( $shortcode ) {
 			case '[TXN_ID]' :
@@ -290,7 +292,7 @@ 
 		$pm = $this->_get_payment_method();
 		if ( $pm instanceof EE_Payment_Method ){
 			$invoice_logo_url = $pm->get_extra_meta( 'pdf_logo_image', TRUE );
-		}else{
+		} else{
 			$invoice_logo_url = NULL;
 		}
 		if( empty( $invoice_logo_url ) ){
@@ -311,7 +313,7 @@ 
 		//if image is wider than 200px, set the wideth to 200
 		if ( $image_size[0] > 300 ) {
 			$image_width = 300;
-		}else{
+		} else{
 			$image_width = $image_size[0];
 		}
 
@@ -349,7 +351,7 @@ 
 				return apply_filters( 'FHEE__EE_Transaction_Shortcodes__get_payment_method__default', EEM_Payment_Method::instance()->get_one_of_type('Invoice'));
 			}
 			return $payment_method;
-		}else{
+		} else{
 			//get the first payment method we can find
 			return apply_filters( 'FHEE__EE_Transaction_Shortcodes__get_payment_method__default', EEM_Payment_Method::instance()->get_one_of_type('Invoice'));
 		}

Spacing +140 added lines, -140 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -42,25 +42,25 @@ 
 		$this->_shortcodes = array(
 			'[TXN_ID]' => __('The transaction id for the purchase.', 'event_espresso'),
 			'[PAYMENT_URL]' => __('This is a link to make a payment for the event', 'event_espresso'),
-			'[PAYMENT_LINK_IF_NEEDED_*]' => __('This is a special dynamic shortcode that allows one to insert a payment link conditional on there being amount owing on the transaction. Three params are available on this shortcode:', 'event_espresso') . '<ul>'
-				. '<li>' . sprintf( __('%class:%s This can be used to indicate css class is given to the containing css element (default is "callout").', 'event_espresso' ), '<strong>', '</strong>' ) . '</li>'
-				. '<li>' . sprintf( __('%scustom_text:%s This should be a sprintf format text string (with %%s for where the hyperlink tags go) that is used for the generated link text (The default is "You can %%smake a payment here »%%s.)', 'event_espresso' ), '<strong>', '</strong>' ) . '</li>'
-				. '<li>' . sprintf( __('%scontainer_tag:%s Use this to indicate what container tag you want surrounding the payment link (default is "p").', 'event_espresso' ), '<strong>', '</strong>' ) . '</li>'
+			'[PAYMENT_LINK_IF_NEEDED_*]' => __('This is a special dynamic shortcode that allows one to insert a payment link conditional on there being amount owing on the transaction. Three params are available on this shortcode:', 'event_espresso').'<ul>'
+				. '<li>'.sprintf(__('%class:%s This can be used to indicate css class is given to the containing css element (default is "callout").', 'event_espresso'), '<strong>', '</strong>').'</li>'
+				. '<li>'.sprintf(__('%scustom_text:%s This should be a sprintf format text string (with %%s for where the hyperlink tags go) that is used for the generated link text (The default is "You can %%smake a payment here »%%s.)', 'event_espresso'), '<strong>', '</strong>').'</li>'
+				. '<li>'.sprintf(__('%scontainer_tag:%s Use this to indicate what container tag you want surrounding the payment link (default is "p").', 'event_espresso'), '<strong>', '</strong>').'</li>'
 				. '</ul>',
-			'[PAYMENT_DUE_DATE_*]' => __( 'This is a special dynamic shortcode that allows one to output a payment due date.  It will only result in a date shown if there is money owing.  Three parameters are available on this shortcode:', 'event_espresso' )
+			'[PAYMENT_DUE_DATE_*]' => __('This is a special dynamic shortcode that allows one to output a payment due date.  It will only result in a date shown if there is money owing.  Three parameters are available on this shortcode:', 'event_espresso')
 				. '<ul>'
-				. '<li>' . sprintf( __( '%sformat:%s This is used to indicate what format the date is in.  Default is whatever is set as date formats for your website.', 'event_espresso' ), '<strong>', '</strong>' ) . '</li>'
-				. '<li>' . sprintf( __( '%days_until_due:%s This is the number of days form the transaction creation date that the payment is due.  Defaults to 30.', 'event_espresso' ), '<strong>', '</strong>' ) . '</li>'
-				. '<li>' . sprintf( __( '%sprefix_text:%s You can use this to indicate what text will prefix the date string.  Defaults to "Payment in full due by:"', 'event_espresso' ), '<strong>', '</strong>' ) . '</li>',
+				. '<li>'.sprintf(__('%sformat:%s This is used to indicate what format the date is in.  Default is whatever is set as date formats for your website.', 'event_espresso'), '<strong>', '</strong>').'</li>'
+				. '<li>'.sprintf(__('%days_until_due:%s This is the number of days form the transaction creation date that the payment is due.  Defaults to 30.', 'event_espresso'), '<strong>', '</strong>').'</li>'
+				. '<li>'.sprintf(__('%sprefix_text:%s You can use this to indicate what text will prefix the date string.  Defaults to "Payment in full due by:"', 'event_espresso'), '<strong>', '</strong>').'</li>',
 			'[INVOICE_LINK]' => __('This is a full html link to the invoice', 'event_espresso'),
 			'[INVOICE_URL]' => __('This is just the url for the invoice', 'event_espresso'),
 			'[INVOICE_LOGO_URL]' => __('This returns the url for the logo uploaded via the invoice settings page.', 'event_espresso'),
 			'[INVOICE_LOGO]' => __('This returns the logo uploaded via the invoice settings page wrapped in img_tags and with a "logo screen" classes. The image size is also set in the img tags automatically to match the uploaded logo.', 'event_espresso'),
 			'[INVOICE_PAYEE_NAME]' => __('This will parse to either: the value of the "Company Name" field in the invoice payment method settings; if that is blank, then the value of the Company Name in the "Your Organization Settings", if that is blank then an empty string.', 'event_espresso'),
-			'[INVOICE_PAYEE_ADDRESS]' => __('This will parse to either: the value of the "Company Address" field in the invoice payment method settings; if that is blank, then the value of the Company Address in the "Your Organization Settings", if that is blank then an empty string.', 'event_espresso' ),
-			'[INVOICE_PAYMENT_INSTRUCTIONS]' => __('This will parse to the value of the "Payment Instructions" field found on the Invoice payment methods settings page', 'event_espresso' ),
-			'[INVOICE_PAYEE_EMAIL]' => __('This will parse to either: the value of the "Company Email" field in the invoice payment method settings; if that is blank, then the value of the Company Email in the "Your Organization Settings", if that is blank then an empty string.', 'event_espresso' ),
-			'[INVOICE_PAYEE_TAX_NUMBER_*]' => __('This will parse to either: the value of the "Company Tax Number" field in the invoice payment method settings; if that is blank, then the value of the Company Tax Number in the "Your Organization Settings", if that is blank then an empty string. Note this is also a special dynamic shortcode. You can use the "prefix" parameter to indicate what text you want to use as a prefix before this tax number.  It defaults to "VAT/Tax Number:". To change this prefix you do the following format for this shortcode: <code>[INVOICE_PAYEE_TAX_NUMBER_* prefix="GST:"]</code> and that will ouptut: GST: 12345t56.  If you have no tax number in your settings, then no prefix will be output either.', 'event_espresso' ),
+			'[INVOICE_PAYEE_ADDRESS]' => __('This will parse to either: the value of the "Company Address" field in the invoice payment method settings; if that is blank, then the value of the Company Address in the "Your Organization Settings", if that is blank then an empty string.', 'event_espresso'),
+			'[INVOICE_PAYMENT_INSTRUCTIONS]' => __('This will parse to the value of the "Payment Instructions" field found on the Invoice payment methods settings page', 'event_espresso'),
+			'[INVOICE_PAYEE_EMAIL]' => __('This will parse to either: the value of the "Company Email" field in the invoice payment method settings; if that is blank, then the value of the Company Email in the "Your Organization Settings", if that is blank then an empty string.', 'event_espresso'),
+			'[INVOICE_PAYEE_TAX_NUMBER_*]' => __('This will parse to either: the value of the "Company Tax Number" field in the invoice payment method settings; if that is blank, then the value of the Company Tax Number in the "Your Organization Settings", if that is blank then an empty string. Note this is also a special dynamic shortcode. You can use the "prefix" parameter to indicate what text you want to use as a prefix before this tax number.  It defaults to "VAT/Tax Number:". To change this prefix you do the following format for this shortcode: <code>[INVOICE_PAYEE_TAX_NUMBER_* prefix="GST:"]</code> and that will ouptut: GST: 12345t56.  If you have no tax number in your settings, then no prefix will be output either.', 'event_espresso'),
 			'[TOTAL_COST]' => __('The total cost for the transaction', 'event_espresso'),
 			'[TXN_STATUS]' => __('The transaction status for the transaction.', 'event_espresso'),
 			'[TXN_STATUS_ID]' => __('The ID representing the transaction status as saved in the db.  This tends to be useful for including with css classes for styling certain statuses differently from others.', 'event_espresso'),
@@ -71,54 +71,54 @@ 
 			'[TOTAL_OWING]' => __('The total owing on a transaction with no attributes.', 'event_espresso'),
 			'[TXN_SUBTOTAL]' => __('The subtotal for all txn line items.', 'event_espresso'),
 			'[TXN_TAX_SUBTOTAL]' => __('The subtotal for all tax line items.', 'event_espresso'),
-			'[OWING_STATUS_MESSAGE_*]' => __('A dynamic shortcode for adjusting how total oweing gets shown. The acceptable attributes on the shortcode are:', 'event_espresso') . '<p></ul>' .
-				'<li><strong>still_owing</strong>:' . __('If the transaction is not paid in full, then whatever is set for this attribute is shown (otherwise its just the amount oweing). The default is:', 'event_espresso' ) . sprintf( __( '%sPlease make a payment.%s', 'event_espresso'),  '<a href="[PAYMENT_URL]" class="noPrint">', '</a>' ) . '</li>' .
-				'<li><strong>none_owing</strong>:' . __('If the transaction is paid in full, then you can indicate how this gets displayed.  Note, that it defaults to just be the total oweing.', 'event_espresso') . '</li></ul></p>',
+			'[OWING_STATUS_MESSAGE_*]' => __('A dynamic shortcode for adjusting how total oweing gets shown. The acceptable attributes on the shortcode are:', 'event_espresso').'<p></ul>'.
+				'<li><strong>still_owing</strong>:'.__('If the transaction is not paid in full, then whatever is set for this attribute is shown (otherwise its just the amount oweing). The default is:', 'event_espresso').sprintf(__('%sPlease make a payment.%s', 'event_espresso'), '<a href="[PAYMENT_URL]" class="noPrint">', '</a>').'</li>'.
+				'<li><strong>none_owing</strong>:'.__('If the transaction is paid in full, then you can indicate how this gets displayed.  Note, that it defaults to just be the total oweing.', 'event_espresso').'</li></ul></p>',
 			'[TXN_TOTAL_TICKETS]' => __('The total number of all tickets purchased in a transaction', 'event_espresso'),
 			'[TKT_QTY_PURCHASED]' => __('The total number of all tickets purchased in a transaction. <strong>NOTE: This shortcode is good to use in the "[TICKET_LIST]" field but has been deprecated from all other contexts in favor of the more explicit [TXN_TOTAL_TICKETS] shortcode.</strong>', 'event_espresso'),
 			'[TRANSACTION_ADMIN_URL]' => __('The url to the admin page for this transaction', 'event_espresso'),
 			'[RECEIPT_URL]' => __('This parses to the generated url for retrieving the receipt for the transaction', 'event_espresso'),
-			'[INVOICE_RECEIPT_SWITCHER_URL]' => __( 'This parses to the url that will switch to the receipt if an invoice is displayed, and switch to the invoice if receipt is displayed. If a message type OTHER than invoice or receipt is displayed then this will just return the url for the invoice. If the related message type is not active  then will parse to an empty string.', 'event_espresso'),
-			'[INVOICE_RECEIPT_SWITCHER_BUTTON]' => sprintf( __( 'The same as %1$s[INVOICE_RECEIPT_SWITCHER_URL]%2$s except this returns the html for a button linked to the invoice or receipt.', 'event_espresso' ), '<code>', '</code>' )
+			'[INVOICE_RECEIPT_SWITCHER_URL]' => __('This parses to the url that will switch to the receipt if an invoice is displayed, and switch to the invoice if receipt is displayed. If a message type OTHER than invoice or receipt is displayed then this will just return the url for the invoice. If the related message type is not active  then will parse to an empty string.', 'event_espresso'),
+			'[INVOICE_RECEIPT_SWITCHER_BUTTON]' => sprintf(__('The same as %1$s[INVOICE_RECEIPT_SWITCHER_URL]%2$s except this returns the html for a button linked to the invoice or receipt.', 'event_espresso'), '<code>', '</code>')
 			);
 	}
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		EE_Registry::instance()->load_helper( 'Template' );
+		EE_Registry::instance()->load_helper('Template');
 
 		//attempt to get the transaction.  Since this is potentially used in more fields, we may have to look in the _extra_data for the transaction.
 		$transaction = $this->_data->txn instanceof EE_Transaction ? $this->_data->txn : null;
-		$transaction = ! $transaction instanceof EE_Transaction && is_array( $this->_extra_data ) &&  isset( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->txn: $transaction;
+		$transaction = ! $transaction instanceof EE_Transaction && is_array($this->_extra_data) && isset($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->txn : $transaction;
 
 		//payment
 		$payment = $this->_data->payment instanceof EE_Payment ? $this->_data->payment : null;
-		$payment = ! $payment instanceof EE_Payment && is_array( $this->_extra_data ) &&  isset( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->payment: $payment;
+		$payment = ! $payment instanceof EE_Payment && is_array($this->_extra_data) && isset($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->payment : $payment;
 
 
-		if ( ! $transaction instanceof EE_Transaction )
+		if ( ! $transaction instanceof EE_Transaction)
 			return '';
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[TXN_ID]' :
 				return $transaction->ID();
 				break;
 
 			case '[PAYMENT_URL]' :
 				$payment_url = $transaction->payment_overview_url();
-				return empty( $payment_url ) ? __( 'http://dummypaymenturlforpreview.com', 'event_espresso') : $payment_url;
+				return empty($payment_url) ? __('http://dummypaymenturlforpreview.com', 'event_espresso') : $payment_url;
 				break;
 
 			case '[INVOICE_LINK]' :
 				$invoice_url = $transaction->invoice_url();
-				$invoice_url = empty( $invoice_url ) ? 'http://dummyinvoicelinksforpreview.com' : $invoice_url;
-				return sprintf( __('%sClick here for Invoice%s', 'event_espresso'), '<a href="' . $invoice_url . '">', '</a>' );
+				$invoice_url = empty($invoice_url) ? 'http://dummyinvoicelinksforpreview.com' : $invoice_url;
+				return sprintf(__('%sClick here for Invoice%s', 'event_espresso'), '<a href="'.$invoice_url.'">', '</a>');
 				break; /**/
 
 			case '[INVOICE_URL]' :
 				$invoice_url = $transaction->invoice_url();
-				return empty( $invoice_url ) ? 'http://dummyinvoicelinksforpreview.com' : $invoice_url;
+				return empty($invoice_url) ? 'http://dummyinvoicelinksforpreview.com' : $invoice_url;
 				break;
 
 			case '[INVOICE_LOGO_URL]' :
@@ -126,7 +126,7 @@ 
 				break;
 
 			case '[INVOICE_LOGO]' :
-				return $this->_get_invoice_logo( TRUE );
+				return $this->_get_invoice_logo(TRUE);
 				break;
 
 			case '[INVOICE_PAYEE_NAME]' :
@@ -148,18 +148,18 @@ 
 
 			case "[TOTAL_COST]" :
 				$total = $transaction->total();
-				return ! empty($total) ? EEH_Template::format_currency( $total ) : '';
+				return ! empty($total) ? EEH_Template::format_currency($total) : '';
 				break;
 
 			case "[PAYMENT_STATUS]" :
 				$status = $transaction->pretty_status();
-				return !empty($status) ? $status : __('Unknown', 'event_espresso');
+				return ! empty($status) ? $status : __('Unknown', 'event_espresso');
 				break; /**/
 
 			// note the [payment_status] shortcode is kind of misleading because payment status might be different from txn status so I'm adding this here for clarity.
 			case "[TXN_STATUS]" :
 				$status = $transaction->pretty_status();
-				return !empty( $status ) ? $status : __('Unknown', 'event_espresso');
+				return ! empty($status) ? $status : __('Unknown', 'event_espresso');
 				break;
 
 			case "[TXN_STATUS_ID]" :
@@ -167,21 +167,21 @@ 
 				break;
 
 			case "[PAYMENT_GATEWAY]" :
-				return $this->_get_payment_gateway( $transaction );
+				return $this->_get_payment_gateway($transaction);
 				break;
 
 			case "[AMOUNT_PAID]" :
 				$amount = $payment instanceof EE_Payment ? $payment->amount() : 0;
-				return EEH_Template::format_currency( $amount );
+				return EEH_Template::format_currency($amount);
 				break;
 
 			case "[TOTAL_AMOUNT_PAID]" :
-				return EEH_Template::format_currency( $transaction->paid() );
+				return EEH_Template::format_currency($transaction->paid());
 				break;
 
 			case "[TOTAL_OWING]" :
 				$total_owing = $transaction->remaining();
-				return EEH_Template::format_currency( $total_owing );
+				return EEH_Template::format_currency($total_owing);
 				break;
 
 			case "[TXN_SUBTOTAL]" :
@@ -189,7 +189,7 @@ 
 				break;
 
 			case "[TXN_TAX_SUBTOTAL]" :
-				return EEH_Template::format_currency($this->_get_subtotal( TRUE ));
+				return EEH_Template::format_currency($this->_get_subtotal(TRUE));
 				break;
 
 			case "[TKT_QTY_PURCHASED]" :
@@ -198,9 +198,9 @@ 
 				break;
 
 			case "[TRANSACTION_ADMIN_URL]" :
-				require_once EE_CORE . 'admin/EE_Admin_Page.core.php';
-				$query_args = array( 'page' => 'espresso_transactions', 'action' => 'view_transaction', 'TXN_ID' => $transaction->ID() );
-				$url = EE_Admin_Page::add_query_args_and_nonce( $query_args, admin_url('admin.php') );
+				require_once EE_CORE.'admin/EE_Admin_Page.core.php';
+				$query_args = array('page' => 'espresso_transactions', 'action' => 'view_transaction', 'TXN_ID' => $transaction->ID());
+				$url = EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php'));
 				return $url;
 				break;
 
@@ -208,14 +208,14 @@ 
 				//get primary_registration
 				$reg = $this->_data->primary_reg_obj;
 
-				if ( ! $reg instanceof EE_Registration ) {
+				if ( ! $reg instanceof EE_Registration) {
 					return '';
 				}
 				return $reg->receipt_url();
 				break;
 
 			case "[INVOICE_RECEIPT_SWITCHER_URL]" :
-				return $this->_get_invoice_receipt_switcher( FALSE );
+				return $this->_get_invoice_receipt_switcher(FALSE);
 				break;
 
 			case "[INVOICE_RECEIPT_SWITCHER_BUTTON]" :
@@ -225,20 +225,20 @@ 
 
 		}
 
-		if ( strpos( $shortcode, '[OWING_STATUS_MESSAGE_*' ) !== FALSE ) {
-			return $this->_get_custom_total_oweing( $shortcode );
+		if (strpos($shortcode, '[OWING_STATUS_MESSAGE_*') !== FALSE) {
+			return $this->_get_custom_total_oweing($shortcode);
 		}
 
-		if ( strpos( $shortcode, '[INVOICE_PAYEE_TAX_NUMBER_*' ) !== FALSE ) {
-			return $this->_get_invoice_payee_tax_number( $shortcode );
+		if (strpos($shortcode, '[INVOICE_PAYEE_TAX_NUMBER_*') !== FALSE) {
+			return $this->_get_invoice_payee_tax_number($shortcode);
 		}
 
-		if ( strpos( $shortcode, '[PAYMENT_LINK_IF_NEEDED_*' ) !== FALSE ) {
-			return $this->_get_payment_link_if_needed( $shortcode );
+		if (strpos($shortcode, '[PAYMENT_LINK_IF_NEEDED_*') !== FALSE) {
+			return $this->_get_payment_link_if_needed($shortcode);
 		}
 
-		if ( strpos( $shortcode, '[PAYMENT_DUE_DATE_*' ) !== false ) {
-			return $this->_get_payment_due_date( $shortcode, $transaction );
+		if (strpos($shortcode, '[PAYMENT_DUE_DATE_*') !== false) {
+			return $this->_get_payment_due_date($shortcode, $transaction);
 		}
 
 		return '';
@@ -255,22 +255,22 @@ 
 	 *
 	 * @return string parsed.
 	 */
-	private function _get_custom_total_oweing( $shortcode ) {
-		$valid_shortcodes = array( 'transaction' );
-		$attrs = $this->_get_shortcode_attrs( $shortcode );
+	private function _get_custom_total_oweing($shortcode) {
+		$valid_shortcodes = array('transaction');
+		$attrs = $this->_get_shortcode_attrs($shortcode);
 
 		//ensure default is set.
 		$addressee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
 		$total_owing = $addressee instanceof EE_Messages_Addressee && $addressee->txn instanceof EE_Transaction ? $addressee->txn->remaining() : 0;
 
-		if ( $total_owing > 0 ) {
-			$owing_content = ! empty( $attrs['still_owing'] ) ? $attrs['still_owing'] : sprintf( __( '%sPlease make a payment.%s', 'event_espresso'),  '<a href="[PAYMENT_URL]" class="noPrint">', '</a>' );
+		if ($total_owing > 0) {
+			$owing_content = ! empty($attrs['still_owing']) ? $attrs['still_owing'] : sprintf(__('%sPlease make a payment.%s', 'event_espresso'), '<a href="[PAYMENT_URL]" class="noPrint">', '</a>');
 
 			//we need to re run this string through the parser to catch any shortcodes that are in it.
 			$this->_set_shortcode_helper();
-			$owing_content = $this->_shortcode_helper->parse_message_template( $owing_content, $addressee, $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_context, $this->_GRP_ID );
+			$owing_content = $this->_shortcode_helper->parse_message_template($owing_content, $addressee, $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_context, $this->_GRP_ID);
 		} else {
-			$owing_content = !empty( $attrs['none_owing']) ? $attrs['none_owing'] : '';
+			$owing_content = ! empty($attrs['none_owing']) ? $attrs['none_owing'] : '';
 		}
 
 		return $owing_content;
@@ -278,8 +278,8 @@ 
 
 
 
-	private function _get_payment_gateway( $transaction ) {
-		$pm = $this->_get_payment_method( $transaction );
+	private function _get_payment_gateway($transaction) {
+		$pm = $this->_get_payment_method($transaction);
 		return $pm instanceof EE_Payment_Method ? $pm->name() : '';
 	}
 
@@ -294,37 +294,37 @@ 
 	 *
 	 * @return string url or html
 	 */
-	private function _get_invoice_logo( $img_tags = FALSE ) {
+	private function _get_invoice_logo($img_tags = FALSE) {
 		//try to get the invoice payment method's logo for this transaction image first
 		$pm = $this->_get_payment_method();
-		if ( $pm instanceof EE_Payment_Method ){
-			$invoice_logo_url = $pm->get_extra_meta( 'pdf_logo_image', TRUE );
-		}else{
+		if ($pm instanceof EE_Payment_Method) {
+			$invoice_logo_url = $pm->get_extra_meta('pdf_logo_image', TRUE);
+		} else {
 			$invoice_logo_url = NULL;
 		}
-		if( empty( $invoice_logo_url ) ){
+		if (empty($invoice_logo_url)) {
 			$invoice_logo_url = EE_Registry::instance()->CFG->organization->logo_url;
 		}
 
-		if ( empty( $invoice_logo_url ) ) {
+		if (empty($invoice_logo_url)) {
 			return '';
 		}
 
-		if ( ! $img_tags ) {
+		if ( ! $img_tags) {
 			return $invoice_logo_url;
 		}
 
 		//image tags have been requested.
-		$image_size = getimagesize( $invoice_logo_url );
+		$image_size = getimagesize($invoice_logo_url);
 		
 		//if image is wider than 200px, set the wideth to 200
-		if ( $image_size[0] > 300 ) {
+		if ($image_size[0] > 300) {
 			$image_width = 300;
-		}else{
+		} else {
 			$image_width = $image_size[0];
 		}
 
-		return '<img class="logo screen" src="' . $invoice_logo_url . '" width="' . $image_width . '" alt="logo" />';
+		return '<img class="logo screen" src="'.$invoice_logo_url.'" width="'.$image_width.'" alt="logo" />';
 	}
 
 
@@ -341,26 +341,26 @@ 
 	private function _get_invoice_payee_name() {
 		$payee_name = NULL;
 		$pm = $this->_get_payment_method();
-		if( $pm instanceof EE_Payment_Method ){
-			$payee_name = $pm->get_extra_meta( 'pdf_payee_name', TRUE );
+		if ($pm instanceof EE_Payment_Method) {
+			$payee_name = $pm->get_extra_meta('pdf_payee_name', TRUE);
 		}
-		$payee_name = empty( $payee_name ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) : $payee_name;
+		$payee_name = empty($payee_name) ? EE_Registry::instance()->CFG->organization->get_pretty('name') : $payee_name;
 		return $payee_name;
 	}
 
 	/**
 	 * gets the payment method for this transaction. Otherwise gets a default one.
 	 */
-	private function _get_payment_method( $transaction = null ){
-		if( $transaction instanceof EE_Transaction ) {
+	private function _get_payment_method($transaction = null) {
+		if ($transaction instanceof EE_Transaction) {
 			$payment_method = $transaction->payment_method();
-			if ( empty( $payment_method ) ) {
-				return apply_filters( 'FHEE__EE_Transaction_Shortcodes__get_payment_method__default', EEM_Payment_Method::instance()->get_one_of_type('Invoice'));
+			if (empty($payment_method)) {
+				return apply_filters('FHEE__EE_Transaction_Shortcodes__get_payment_method__default', EEM_Payment_Method::instance()->get_one_of_type('Invoice'));
 			}
 			return $payment_method;
-		}else{
+		} else {
 			//get the first payment method we can find
-			return apply_filters( 'FHEE__EE_Transaction_Shortcodes__get_payment_method__default', EEM_Payment_Method::instance()->get_one_of_type('Invoice'));
+			return apply_filters('FHEE__EE_Transaction_Shortcodes__get_payment_method__default', EEM_Payment_Method::instance()->get_one_of_type('Invoice'));
 		}
 	}
 
@@ -377,10 +377,10 @@ 
 	private function _get_invoice_payee_email() {
 		$payee_email = NULL;
 		$pm = $this->_get_payment_method();
-		if( $pm instanceof EE_Payment_Method ){
-			$payee_email = $pm->get_extra_meta( 'pdf_payee_email', TRUE );
+		if ($pm instanceof EE_Payment_Method) {
+			$payee_email = $pm->get_extra_meta('pdf_payee_email', TRUE);
 		}
-		$payee_email = empty( $payee_email ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'email' ) : $payee_email;
+		$payee_email = empty($payee_email) ? EE_Registry::instance()->CFG->organization->get_pretty('email') : $payee_email;
 		return $payee_email;
 	}
 
@@ -396,24 +396,24 @@ 
 	 *
 	 * @return string
 	 */
-	private function _get_invoice_payee_tax_number( $shortcode ) {
+	private function _get_invoice_payee_tax_number($shortcode) {
 		$payee_tax_number = NULL;
 		$pm = $this->_get_payment_method();
-		if( $pm instanceof EE_Payment_Method ){
-			$payee_tax_number = $pm->get_extra_meta( 'pdf_payee_tax_number', TRUE );
+		if ($pm instanceof EE_Payment_Method) {
+			$payee_tax_number = $pm->get_extra_meta('pdf_payee_tax_number', TRUE);
 		}
-		$payee_tax_number = empty( $payee_tax_number ) ? EE_Registry::instance()->CFG->organization->vat : $payee_tax_number;
+		$payee_tax_number = empty($payee_tax_number) ? EE_Registry::instance()->CFG->organization->vat : $payee_tax_number;
 
-		if ( empty( $payee_tax_number ) ) {
+		if (empty($payee_tax_number)) {
 			return '';
 		}
 
 		//any attributes?
-		$attrs = $this->_get_shortcode_attrs( $shortcode );
+		$attrs = $this->_get_shortcode_attrs($shortcode);
 
 		//prefix?
-		$prefix = isset( $attrs['prefix'] ) ? $attrs['prefix'] : __( 'VAT/Tax Number: ', 'event_espresso' );
-		return $prefix . $payee_tax_number;
+		$prefix = isset($attrs['prefix']) ? $attrs['prefix'] : __('VAT/Tax Number: ', 'event_espresso');
+		return $prefix.$payee_tax_number;
 	}
 
 
@@ -430,22 +430,22 @@ 
 	private function _get_invoice_payee_address() {
 		$payee_address = NULL;
 		$pm = $this->_get_payment_method();
-		if( $pm instanceof EE_Payment_Method ){
-			$payee_address = $pm->get_extra_meta( 'pdf_payee_address', TRUE );
+		if ($pm instanceof EE_Payment_Method) {
+			$payee_address = $pm->get_extra_meta('pdf_payee_address', TRUE);
 		}
-		if ( empty( $payee_address ) ) {
+		if (empty($payee_address)) {
 			$organization = EE_Registry::instance()->CFG->organization;
-			$payee_address = $organization->get_pretty( 'address_1' ) . '<br>';
-			$payee_address .= !empty( $organization->address_2 ) ? $organization->get_pretty( 'address_2' ) . '<br>' : '';
-			$payee_address .= $organization->get_pretty( 'city' ) . '<br>';
+			$payee_address = $organization->get_pretty('address_1').'<br>';
+			$payee_address .= ! empty($organization->address_2) ? $organization->get_pretty('address_2').'<br>' : '';
+			$payee_address .= $organization->get_pretty('city').'<br>';
 
 			//state
-			$state = EE_Registry::instance()->load_model( 'State' )->get_one_by_ID( $organization->STA_ID );
-			$payee_address .= $state instanceof EE_State ? $state->name()  : '';
+			$state = EE_Registry::instance()->load_model('State')->get_one_by_ID($organization->STA_ID);
+			$payee_address .= $state instanceof EE_State ? $state->name() : '';
 
 			//Country
-			$payee_address .= ! empty( $organization->CNT_ISO ) ? ', ' . $organization->CNT_ISO . '<br>' : '';
-			$payee_address .= ! empty( $organization->zip ) ? $organization->zip : '';
+			$payee_address .= ! empty($organization->CNT_ISO) ? ', '.$organization->CNT_ISO.'<br>' : '';
+			$payee_address .= ! empty($organization->zip) ? $organization->zip : '';
 		}
 		return $payee_address;
 	}
@@ -463,7 +463,7 @@ 
 	private function _get_invoice_payment_instructions() {
 		$instructions = NULL;
 		$pm = $this->_get_payment_method();
-		return ( $pm instanceof EE_Payment_Method ) ? $pm->get_extra_meta( 'pdf_instructions', TRUE) : '';
+		return ($pm instanceof EE_Payment_Method) ? $pm->get_extra_meta('pdf_instructions', TRUE) : '';
 	}
 
 
@@ -477,27 +477,27 @@ 
 	 *
 	 * @return string
 	 */
-	protected function _get_invoice_receipt_switcher( $button = TRUE ) {
+	protected function _get_invoice_receipt_switcher($button = TRUE) {
 		$reg = $this->_data->primary_reg_obj;
-		$message_type = isset( $this->_extra_data['message_type'] ) ? $this->_extra_data['message_type'] : '';
-		if ( ! $reg instanceof EE_Registration || empty( $message_type ) ) {
+		$message_type = isset($this->_extra_data['message_type']) ? $this->_extra_data['message_type'] : '';
+		if ( ! $reg instanceof EE_Registration || empty($message_type)) {
 			return'';
 		}
 
-		$switch_to_invoice = ! $message_type instanceof EE_Invoice_message_type  ? true : false;
-		$switch_to_label = $switch_to_invoice && ! $message_type instanceof EE_Receipt_message_type ? __('View Invoice', 'event_espresso' ) : __( 'Switch to Invoice', 'event_espresso' );
-		$switch_to_label = ! $switch_to_invoice ? __( 'Switch to Receipt', 'event_espresso' ) : $switch_to_label;
+		$switch_to_invoice = ! $message_type instanceof EE_Invoice_message_type ? true : false;
+		$switch_to_label = $switch_to_invoice && ! $message_type instanceof EE_Receipt_message_type ? __('View Invoice', 'event_espresso') : __('Switch to Invoice', 'event_espresso');
+		$switch_to_label = ! $switch_to_invoice ? __('Switch to Receipt', 'event_espresso') : $switch_to_label;
 		$switch_to_url = $switch_to_invoice ? $reg->invoice_url() : $reg->receipt_url();
 
-		if ( ! $button ) {
+		if ( ! $button) {
 			return $switch_to_url;
 		}
 
-		if ( ! empty( $switch_to_url ) ) {
+		if ( ! empty($switch_to_url)) {
 
 		return  '
-<form method="post" action="' . $switch_to_url . '" >
-	<input class="print_button" type="submit" value="' . $switch_to_label . '" />
+<form method="post" action="' . $switch_to_url.'" >
+	<input class="print_button" type="submit" value="' . $switch_to_label.'" />
 </form>
 		';
 		}
@@ -517,11 +517,11 @@ 
 	 *
 	 * @return string
 	 */
-	private function _get_receipt_url( EE_Transaction $transaction ) {
+	private function _get_receipt_url(EE_Transaction $transaction) {
 		//get primary_registration
 		$reg = $this->_data->primary_reg_obj;
 
-		if ( ! $reg instanceof EE_Registration ) {
+		if ( ! $reg instanceof EE_Registration) {
 			return '';
 		}
 
@@ -537,10 +537,10 @@ 
 	 *
 	 * @return int
 	 */
-	private function _get_subtotal( $tax = FALSE ) {
-		$grand_total = isset( $this->_data->grand_total_line_item ) ? $this->_data->grand_total_line_item : NULL;
+	private function _get_subtotal($tax = FALSE) {
+		$grand_total = isset($this->_data->grand_total_line_item) ? $this->_data->grand_total_line_item : NULL;
 
-		if ( ! $grand_total instanceof EE_Line_Item ) {
+		if ( ! $grand_total instanceof EE_Line_Item) {
 			return 0;
 		}
 
@@ -559,27 +559,27 @@ 
 	 *
 	 * @return string parsed.
 	 */
-	private function _get_payment_link_if_needed( $shortcode ) {
-		$valid_shortcodes = array( 'transaction' );
-		$attrs = $this->_get_shortcode_attrs( $shortcode );
+	private function _get_payment_link_if_needed($shortcode) {
+		$valid_shortcodes = array('transaction');
+		$attrs = $this->_get_shortcode_attrs($shortcode);
 
 		//ensure default is set.
 		$addressee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
 		$total_owing = $addressee instanceof EE_Messages_Addressee && $addressee->txn instanceof EE_Transaction ? $addressee->txn->remaining() : 0;
 
-		if ( $total_owing > 0 ) {
-			$class = isset( $attrs['class'] ) ? $attrs['class'] : 'callout';
-			$custom_text = isset( $attrs['custom_text'] ) ? $attrs['custom_text'] : 'You can %smake a payment here »%s.';
-			$container_tag = isset( $attrs['container_tag'] ) ? $attrs['container_tag'] : 'p';
-			$opening_tag = ! empty( $container_tag ) ? '<' . $container_tag : '';
-			$opening_tag .= ! empty( $opening_tag ) && !empty( $class ) ? ' class="' . $class . '"' : $opening_tag;
-			$opening_tag .= !empty( $opening_tag ) ? '>' : $opening_tag;
-			$closing_tag = ! empty( $container_tag ) ? '</' . $container_tag .'>' : '';
-			$content = $opening_tag . sprintf( $custom_text, '<a href="[PAYMENT_URL]">', '</a>' ) . $closing_tag;
+		if ($total_owing > 0) {
+			$class = isset($attrs['class']) ? $attrs['class'] : 'callout';
+			$custom_text = isset($attrs['custom_text']) ? $attrs['custom_text'] : 'You can %smake a payment here »%s.';
+			$container_tag = isset($attrs['container_tag']) ? $attrs['container_tag'] : 'p';
+			$opening_tag = ! empty($container_tag) ? '<'.$container_tag : '';
+			$opening_tag .= ! empty($opening_tag) && ! empty($class) ? ' class="'.$class.'"' : $opening_tag;
+			$opening_tag .= ! empty($opening_tag) ? '>' : $opening_tag;
+			$closing_tag = ! empty($container_tag) ? '</'.$container_tag.'>' : '';
+			$content = $opening_tag.sprintf($custom_text, '<a href="[PAYMENT_URL]">', '</a>').$closing_tag;
 
 			//we need to re run this string through the parser to catch any shortcodes that are in it.
 			$this->_set_shortcode_helper();
-			$owing_content = $this->_shortcode_helper->parse_message_template( $content, $addressee, $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_context, $this->_GRP_ID );
+			$owing_content = $this->_shortcode_helper->parse_message_template($content, $addressee, $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_context, $this->_GRP_ID);
 		} else {
 			return '';
 		}
@@ -599,31 +599,31 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return string
 	 */
-	protected function _get_payment_due_date( $shortcode, EE_Transaction $transaction ) {
+	protected function _get_payment_due_date($shortcode, EE_Transaction $transaction) {
 		//if transaction is paid in full then we can just return an empty string
-		if ( $transaction->remaining() === 0 ) {
+		if ($transaction->remaining() === 0) {
 			return '';
 		}
 
-		$attrs = $this->_get_shortcode_attrs( $shortcode );
-		$format = isset( $attrs['format'] ) ? $attrs['format'] : get_option( 'date_format' );
-		$days_until_due = isset( $attrs['days_until_due'] ) ? (int) $attrs['days_until_due'] : 30;
-		$prefix_text = isset( $attrs['prefix_text'] ) ? $attrs['prefix_text'] : __( 'Payment in full due by: ', 'event_espresso' );
-		$transaction_created = $transaction->get_DateTime_object( 'TXN_timestamp' );
+		$attrs = $this->_get_shortcode_attrs($shortcode);
+		$format = isset($attrs['format']) ? $attrs['format'] : get_option('date_format');
+		$days_until_due = isset($attrs['days_until_due']) ? (int) $attrs['days_until_due'] : 30;
+		$prefix_text = isset($attrs['prefix_text']) ? $attrs['prefix_text'] : __('Payment in full due by: ', 'event_espresso');
+		$transaction_created = $transaction->get_DateTime_object('TXN_timestamp');
 
 		//setup date due:
 		try {
-			if ( $transaction_created instanceof DateTime ) {
-				$date_due = $transaction_created->add( new DateInterval( 'P' . $days_until_due . 'D' ) )->format( $format );
+			if ($transaction_created instanceof DateTime) {
+				$date_due = $transaction_created->add(new DateInterval('P'.$days_until_due.'D'))->format($format);
 			} else {
 				throw new Exception();
 			}
-		} catch( Exception $e ) {
+		} catch (Exception $e) {
 			//format was likely invalid.
 			$date_due = 'Unable to calculate date due, likely the format string is invalid.';
 		}
 
-		return $prefix_text . $date_due;
+		return $prefix_text.$date_due;
 	}
 
 } //end EE_Transaction Shortcodes library

core/libraries/shortcodes/EE_Venue_Shortcodes.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
 
 	/**
 	 * This retrieves the specified venue information
-	 * @param  string $what What to retrieve from database
+	 * @param string $db_ref
 	 * @return string       What was retrieved!
 	 */
 	private function _venue( $db_ref ) {

Spacing +18 added lines, -18 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -62,9 +62,9 @@ 
 	}
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[VENUE_TITLE]' :
 				return $this->_venue('title');
@@ -132,38 +132,38 @@ 
 	 * @param  string $what What to retrieve from database
 	 * @return string       What was retrieved!
 	 */
-	private function _venue( $db_ref ) {
+	private function _venue($db_ref) {
 
 		//we need the EE_Event object to get the venue.
 
 		$this->_event = $this->_data instanceof EE_Event ? $this->_data : null;
 
 		//if no event, then let's see if there is a reg_obj.  If there IS, then we'll try and grab the event from the reg_obj instead.
-		if ( empty( $this->_event ) ) {
+		if (empty($this->_event)) {
 			$aee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
 			$aee = $this->_extra_data instanceof EE_Messages_Addressee ? $this->_extra_data : $aee;
 
 			$this->_event = $aee instanceof EE_Messages_Addressee && $aee->reg_obj instanceof EE_Registration ? $aee->reg_obj->event() : NULL;
 
 			//if still empty do we have a ticket data item?
-			$this->_event = empty( $this->_event ) && $this->_data instanceof EE_Ticket && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->tickets[$this->_data->ID()]['EE_Event'] : $this->_event;
+			$this->_event = empty($this->_event) && $this->_data instanceof EE_Ticket && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->tickets[$this->_data->ID()]['EE_Event'] : $this->_event;
 
 			//if STILL empty event, let's try to get the first event in the list of events via EE_Messages_Addressee and use that.
-			$event = $aee instanceof EE_Messages_Addressee ? reset( $aee->events ) : array();
-			$this->_event = empty( $this->_event ) && !empty( $events ) ? $event : $this->_event;
+			$event = $aee instanceof EE_Messages_Addressee ? reset($aee->events) : array();
+			$this->_event = empty($this->_event) && ! empty($events) ? $event : $this->_event;
 		}
 
 
 		//If there is no event objecdt by now then get out.
-		if ( ! $this->_event instanceof EE_Event )
+		if ( ! $this->_event instanceof EE_Event)
 			return '';
 
 		$venue = $this->_event->get_first_related('Venue');
 
-		if ( empty( $venue ) )
+		if (empty($venue))
 			return ''; //no venue so get out.
 
-		switch ( $db_ref ) {
+		switch ($db_ref) {
 			case 'title':
 				return $venue->get('VNU_name');
 				break;
@@ -174,11 +174,11 @@ 
 
 			case 'url':
 				$url = $venue->get('VNU_url');
-				return empty( $url ) ? $venue->get_permalink() : $url;
+				return empty($url) ? $venue->get_permalink() : $url;
 				break;
 
 			case 'image':
-				return '<img src="' . $venue->feature_image_url(array(200,200) ) . '" alt="' . sprintf( esc_attr__( '%s Feature Image', 'event_espresso'), $venue->get('VNU_name') ) . '" />';
+				return '<img src="'.$venue->feature_image_url(array(200, 200)).'" alt="'.sprintf(esc_attr__('%s Feature Image', 'event_espresso'), $venue->get('VNU_name')).'" />';
 				break;
 
 			case 'phone':
@@ -212,22 +212,22 @@ 
 				break;
 
 			case 'formatted_address' :
-				EE_Registry::instance()->load_helper( 'Formatter' );
-				return EEH_Address::format( $venue );
+				EE_Registry::instance()->load_helper('Formatter');
+				return EEH_Address::format($venue);
 				break;
 
 			case 'gmap_link':
 			case 'gmap_link_img':
-				EE_Registry::instance()->load_helper( 'Maps' );
+				EE_Registry::instance()->load_helper('Maps');
 				$state = $venue->state_obj();
 				$country = $venue->country_obj();
 				$atts = array(
 					'id' => $venue->ID(),
 					'address' => $venue->get('VNU_address'),
 					'city' => $venue->get('VNU_city'),
-					'state' => is_object( $state ) ? $state->get('STA_name') : '',
+					'state' => is_object($state) ? $state->get('STA_name') : '',
 					'zip' => $venue->get('VNU_zip'),
-					'country' => is_object( $country ) ? $country->get('CNT_name'): '',
+					'country' => is_object($country) ? $country->get('CNT_name') : '',
 					'type' => $db_ref == 'gmap_link' ? 'url' : 'map',
 					'map_w' => 200,
 					'map_h' => 200

Braces +9 added lines, -5 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -155,13 +156,16 @@ 
 
 
 		//If there is no event objecdt by now then get out.
-		if ( ! $this->_event instanceof EE_Event )
-			return '';
+		if ( ! $this->_event instanceof EE_Event ) {
+					return '';
+		}
 
 		$venue = $this->_event->get_first_related('Venue');
 
-		if ( empty( $venue ) )
-			return ''; //no venue so get out.
+		if ( empty( $venue ) ) {
+					return '';
+		}
+		//no venue so get out.
 
 		switch ( $db_ref ) {
 			case 'title':